[Pkg-mysql-commits] [mariadb-5.5] 01/05: Imported Upstream version 5.5.44
Otto Kekäläinen
ottok-guest at moszumanska.debian.org
Sat Jun 13 20:51:25 UTC 2015
This is an automated email from the git hooks/post-receive script.
ottok-guest pushed a commit to branch master
in repository mariadb-5.5.
commit 3f8c7c9300ba880c29009b65071cbc96451bb744
Author: Otto Kekäläinen <otto at seravo.fi>
Date: Sat Jun 13 20:57:27 2015 +0300
Imported Upstream version 5.5.44
---
.gitattributes | 23 +
.gitignore | 1 +
Docs/INFO_SRC | 10 +-
VERSION | 2 +-
client/mysqlcheck.c | 40 +-
cmake/do_abi_check.cmake | 2 +-
cmake/make_dist.cmake.in | 10 +-
cmake/mysql_add_executable.cmake | 112 +-
cmake/versioninfo.rc.in | 76 +-
cmd-line-utils/libedit/el_terminal.h | 4 +-
cmd-line-utils/libedit/emacs.c | 8 +-
cmd-line-utils/libedit/terminal.c | 15 +-
cmd-line-utils/libedit/vi.c | 8 +-
config.h.cmake | 24 +-
debian/dist/Debian/control | 7 +-
debian/dist/Ubuntu/control | 7 +-
debian/po/it.po | 10 +-
debian/po/sv.po | 12 +-
include/mysql.h.pp | 7 -
include/mysql/client_plugin.h.pp | 2 -
include/mysql/plugin_audit.h.pp | 12 -
include/mysql/plugin_auth.h.pp | 13 -
include/mysql/plugin_ftparser.h.pp | 11 -
include/mysql/psi/psi_abi_v1.h.pp | 1 -
include/mysql/psi/psi_abi_v2.h.pp | 1 -
libmysql/CMakeLists.txt | 2 +-
mysql-test/r/ctype_utf8.result | 15 +
mysql-test/r/dyncol.result | 6 +
mysql-test/r/empty_server_name-8224.result | 1 +
mysql-test/r/gis.result | 2 +-
mysql-test/r/group_by.result | 2 +-
mysql-test/r/information_schema2.result | 12 +
mysql-test/r/myisam.result | 11 +
mysql-test/r/mysql_tzinfo_to_sql_symlink.result | 9 +
mysql-test/r/mysql_upgrade_view.result | 35 +
mysql-test/r/mysqlcheck.result | 23 +
mysql-test/r/partition_innodb.result | 23 +-
mysql-test/r/range_innodb.result | 39 +
mysql-test/r/repair.result | 7 +
mysql-test/r/ssl_7937,nossl.result | 15 +
mysql-test/r/ssl_7937.result | 16 +
mysql-test/r/truncate-stale-6500.result | 33 +
mysql-test/r/type_decimal.result | 21 +
mysql-test/r/update_innodb.result | 31 +
mysql-test/r/view.result | 18 +
mysql-test/std_data/old_decimal/t1dec102.MYD | 1 +
mysql-test/std_data/old_decimal/t1dec102.MYI | Bin 0 -> 1024 bytes
mysql-test/std_data/old_decimal/t1dec102.frm | Bin 0 -> 8554 bytes
.../suite/binlog/r/binlog_mysqlbinlog_row.result | 65 +
.../suite/binlog/t/binlog_mysqlbinlog_row.test | 13 +-
.../binlog/t/binlog_row_mysqlbinlog_options.test | 4 +-
mysql-test/suite/innodb/r/xa_recovery.result | 17 +
mysql-test/suite/innodb/t/foreign-keys.test | 5 -
mysql-test/suite/innodb/t/innodb-autoinc.test | 5 -
mysql-test/suite/innodb/t/insert_debug.test | 5 -
mysql-test/suite/innodb/t/sp_temp_table.test | 5 -
mysql-test/suite/innodb/t/strict_mode.test | 5 -
mysql-test/suite/innodb/t/xa_recovery.test | 47 +
mysql-test/suite/maria/optimize.result | 11 +
mysql-test/suite/maria/optimize.test | 10 +
.../suite/optimizer_unfixed_bugs/t/bug42991.test | 496 +-
.../parts/r/partition_debug_sync_innodb.result | 11 +-
.../suite/parts/t/partition_debug_sync_innodb.test | 5 +-
mysql-test/suite/plugins/r/server_audit.result | 9 +
...udit.result => thread_pool_server_audit.result} | 9 +
mysql-test/suite/plugins/t/server_audit.test | 7 +
.../suite/plugins/t/thread_pool_server_audit.opt | 2 +
...er_audit.test => thread_pool_server_audit.test} | 9 +-
mysql-test/suite/rpl/r/rpl_old_decimal.result | 9 +
.../suite/rpl/r/rpl_tmp_table_and_DDL.result | 5 +
mysql-test/suite/rpl/t/rpl_old_decimal.test | 25 +
mysql-test/suite/rpl/t/rpl_tmp_table_and_DDL.test | 10 +
mysql-test/suite/sphinx/my.cnf | 3 +-
.../sys_vars/t/innodb_buffer_pool_evict_basic.test | 5 -
.../t/innodb_thread_sleep_delay_basic.test | 5 -
mysql-test/suite/tokudb.bugs/r/db805.result | 18 +
mysql-test/suite/tokudb.bugs/r/db806.result | 9 +
mysql-test/suite/tokudb.bugs/r/db811.result | 14 +
mysql-test/suite/tokudb.bugs/r/db811s.result | 14 +
mysql-test/suite/tokudb.bugs/r/db823.result | 11 +
mysql-test/suite/tokudb.bugs/t/db805.test | 17 +
mysql-test/suite/tokudb.bugs/t/db806.test | 13 +
mysql-test/suite/tokudb.bugs/t/db811.test | 22 +
mysql-test/suite/tokudb.bugs/t/db811s.test | 22 +
mysql-test/suite/tokudb.bugs/t/db823.test | 16 +
mysql-test/t/aborted_clients.test | 56 +-
mysql-test/t/auth_rpl.test | 132 +-
mysql-test/t/ctype_utf8.test | 16 +
mysql-test/t/dyncol.test | 6 +
mysql-test/t/empty_server_name-8224.test | 9 +
mysql-test/t/func_gconcat.test | 6 +-
mysql-test/t/group_by.test | 2 +-
mysql-test/t/information_schema2.test | 13 +
mysql-test/t/lowercase_table4.test | 214 +-
mysql-test/t/myisam.test | 10 +
mysql-test/t/mysql_tzinfo_to_sql_symlink.test | 11 +
mysql-test/t/mysql_upgrade_view.test | 29 +
mysql-test/t/mysqlcheck.test | 45 +-
mysql-test/t/partition_innodb.test | 28 +-
mysql-test/t/range_innodb.test | 47 +
mysql-test/t/repair.test | 9 +
mysql-test/t/ssl_7937.combinations | 5 +
mysql-test/t/ssl_7937.test | 35 +
mysql-test/t/truncate-stale-6500.test | 32 +
mysql-test/t/type_decimal.test | 24 +
mysql-test/t/update_innodb.test | 39 +
mysql-test/t/view.test | 13 +
mysys/my_gethwaddr.c | 2 +-
mysys/my_init.c | 2 +-
packaging/WiX/CPackWixConfig.cmake | 238 +-
packaging/WiX/create_msi.cmake.in | 796 +-
packaging/WiX/custom_ui.wxs | 230 +-
packaging/WiX/extra.wxs.in | 162 +-
packaging/WiX/mysql_server.wxs.in | 392 +-
packaging/rpm-oel/mysql.spec.in | 4 +-
plugin/server_audit/server_audit.c | 14 +-
sql-bench/limits/access_odbc.cfg | 894 +-
sql-common/client.c | 23 +-
sql/field.cc | 10 +-
sql/field.h | 1 +
sql/field_conv.cc | 5 +-
sql/filesort.cc | 11 +-
sql/ha_ndbcluster_binlog.cc | 6 +-
sql/item.cc | 35 +
sql/item.h | 9 +-
sql/item_strfunc.cc | 10 +
sql/item_sum.cc | 18 +-
sql/log.h | 8 +-
sql/log_event.cc | 6 +
sql/message.h | 154 +-
sql/message.rc | 4 +-
sql/rpl_utility.cc | 2 +-
sql/slave.cc | 4 +-
sql/sql_admin.cc | 2 +-
sql/sql_base.cc | 3 +-
sql/sql_connect.cc | 13 +-
sql/sql_lex.cc | 15 +-
sql/sql_lex.h | 3 +-
sql/sql_partition_admin.cc | 11 +-
sql/sql_plugin.cc | 38 +-
sql/sql_select.cc | 18 +-
sql/sql_servers.cc | 3 +-
sql/sql_show.cc | 22 +-
sql/sql_table.cc | 2 +-
sql/sql_view.cc | 2 +-
sql/sql_yacc.cc | 18301 ++++++++++---------
sql/sql_yacc.yy | 62 +-
sql/table.h | 2 +
sql/tztime.cc | 3 +-
sql/winservice.h | 80 +-
storage/federatedx/CMakeLists.txt | 8 +-
storage/federatedx/README.windows | 46 +-
storage/innobase/CMakeLists.txt | 2 +
storage/innobase/buf/buf0buf.c | 5 +-
storage/innobase/dict/dict0dict.c | 2 +-
storage/innobase/handler/ha_innodb.cc | 40 +-
storage/innobase/handler/i_s.cc | 6 +-
storage/innobase/include/os0sync.h | 2 +-
storage/innobase/srv/srv0start.c | 4 +-
storage/innobase/sync/sync0arr.c | 7 +-
storage/maria/ma_check.c | 6 +-
storage/maria/ma_test_force_start.pl | 2 +-
storage/myisam/mi_check.c | 6 +-
storage/myisam/rt_split.c | 9 +-
storage/tokudb/CMakeLists.txt | 2 +-
storage/tokudb/ft-index/buildheader/make_tdb.cc | 3 +-
storage/tokudb/ft-index/ft/ft-verify.cc | 20 +-
storage/tokudb/ft-index/ft/logger/recover.cc | 62 +-
storage/tokudb/ft-index/ft/txn/txn.cc | 5 +
storage/tokudb/ft-index/ft/txn/txn.h | 3 +
.../src/tests/test_iterate_live_transactions.cc | 4 +-
storage/tokudb/ft-index/src/tests/test_stress0.cc | 4 +-
storage/tokudb/ft-index/src/ydb.cc | 21 +-
storage/tokudb/ft-index/src/ydb_txn.cc | 6 +
storage/tokudb/ft-index/tools/CMakeLists.txt | 9 +-
.../tools/{tdb_logprint.cc => tokuft_logprint.cc} | 2 -
storage/tokudb/ft-index/tools/tokuftdump.cc | 6 +-
storage/tokudb/ft-index/util/scoped_malloc.cc | 25 +-
storage/tokudb/ft-index/util/scoped_malloc.h | 4 +
storage/tokudb/ha_tokudb.cc | 67 +-
storage/tokudb/ha_tokudb_admin.cc | 18 +-
storage/tokudb/ha_tokudb_alter_56.cc | 15 +-
storage/tokudb/hatoku_defines.h | 1 +
storage/tokudb/hatoku_hton.cc | 18 +-
.../tokudb/r/i_s_tokudb_lock_waits_released.result | 10 +-
.../tokudb/r/i_s_tokudb_lock_waits_timeout.result | 6 +-
.../mysql-test/tokudb/r/i_s_tokudb_trx.result | 10 +-
.../tokudb/t/i_s_tokudb_lock_waits_released.test | 10 +-
.../tokudb/t/i_s_tokudb_lock_waits_timeout.test | 6 +-
.../tokudb/mysql-test/tokudb/t/i_s_tokudb_trx.test | 10 +-
.../mysql-test/tokudb_bugs/r/tokudb718.result | 5 +-
.../tokudb/mysql-test/tokudb_bugs/t/tokudb718.test | 3 +-
storage/xtradb/CMakeLists.txt | 2 +
storage/xtradb/handler/ha_innodb.cc | 6 +-
storage/xtradb/handler/i_s.cc | 7 +-
storage/xtradb/include/os0sync.h | 2 +-
storage/xtradb/include/univ.i | 4 +-
support-files/mysql.spec.sh | 4 +-
.../tdb_logprint.cc => util/tests/sm-basic.cc | 69 +-
.../tests/sm-crash-double-free.cc | 72 +-
vio/viosslfactories.c | 52 +-
win/packaging/COPYING.rtf | 122 +-
win/packaging/CPackWixConfig.cmake | 230 +-
win/packaging/ca/CustomAction.cpp | 84 +-
win/packaging/custom_ui.wxs | 364 +-
win/packaging/extra.wxs.in | 1826 +-
win/packaging/heidisql.cmake | 46 +-
win/packaging/heidisql.wxi.in | 154 +-
win/packaging/heidisql_feature.wxi.in | 20 +-
win/packaging/mysql_server.wxs.in | 178 +-
win/upgrade_wizard/stdafx.h | 94 +-
win/upgrade_wizard/targetver.h | 16 +-
win/upgrade_wizard/upgrade.cpp | 114 +-
win/upgrade_wizard/upgrade.h | 62 +-
win/upgrade_wizard/upgrade.rc | 296 +-
win/upgrade_wizard/upgradeDlg.h | 146 +-
win/upgrade_wizard/upgrade_wizard.exe.manifest | 28 +-
217 files changed, 14953 insertions(+), 13644 deletions(-)
diff --git a/.gitattributes b/.gitattributes
index cdfedef..5e7e12a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,26 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+*.c text
+*.ic text
+*.cc text
+*.cpp text
+*.h text
+*.test text
+
+# These files should be checked out as is
+*.result -text -whitespace
+*.dat -text -whitespace
+
+# Denote all files that are truly binary and should not be modified.
+*.png binary
+*.jpg binary
+*.frm binary
+*.MYD binary
+*.MYI binary
+
*.c diff=cpp
*.h diff=cpp
*.cc diff=cpp
diff --git a/.gitignore b/.gitignore
index fc97ceb..c3d50ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -193,6 +193,7 @@ storage/tokudb/ft-index/tools/tokudb_dump
storage/tokudb/ft-index/tools/tokudb_gen
storage/tokudb/ft-index/tools/tokudb_load
storage/tokudb/ft-index/tools/tokuftdump
+storage/tokudb/ft-index/tools/tokuft_logprint
storage/tokudb/ft-index/ft/ftverify
storage/tokudb/ft-index/ft/tdb-recover
storage/tokudb/ft-index/ft/tdb_logprint
diff --git a/Docs/INFO_SRC b/Docs/INFO_SRC
index 4c84d5d..56070a8 100644
--- a/Docs/INFO_SRC
+++ b/Docs/INFO_SRC
@@ -1,8 +1,8 @@
-commit: 4c87f727734955f9e4a0ffde25aae4d43ec0b2a5
-date: 2015-04-29 16:24:52 +0200
-build-date: 2015-04-29 20:55:40 +0200
-short: 4c87f72
+commit: 5a44e1a4024f1760021e5c6fd65773584d60513a
+date: 2015-06-09 22:16:26 +0200
+build-date: 2015-06-09 22:25:59 +0200
+short: 5a44e1a
branch: HEAD
-MySQL source 5.5.43
+MySQL source 5.5.44
diff --git a/VERSION b/VERSION
index dbfc5f8..fa54860 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
MYSQL_VERSION_MAJOR=5
MYSQL_VERSION_MINOR=5
-MYSQL_VERSION_PATCH=43
+MYSQL_VERSION_PATCH=44
MYSQL_VERSION_EXTRA=
diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c
index 021b89e..37ede5c 100644
--- a/client/mysqlcheck.c
+++ b/client/mysqlcheck.c
@@ -53,6 +53,7 @@ static char *opt_password = 0, *current_user = 0,
static char *opt_plugin_dir= 0, *opt_default_auth= 0;
static int first_error = 0;
DYNAMIC_ARRAY tables4repair, tables4rebuild, alter_table_cmds;
+DYNAMIC_ARRAY views4repair;
static char *shared_memory_base_name=0;
static uint opt_protocol=0;
@@ -861,11 +862,19 @@ static int handle_request_for_tables(char *tables, size_t length, my_bool view)
switch (what_to_do) {
case DO_CHECK:
op = "CHECK";
- if (opt_quick) end = strmov(end, " QUICK");
- if (opt_fast) end = strmov(end, " FAST");
- if (opt_medium_check) end = strmov(end, " MEDIUM"); /* Default */
- if (opt_extended) end = strmov(end, " EXTENDED");
- if (opt_check_only_changed) end = strmov(end, " CHANGED");
+ if (view)
+ {
+ if (opt_fast || opt_check_only_changed)
+ DBUG_RETURN(0);
+ }
+ else
+ {
+ if (opt_quick) end = strmov(end, " QUICK");
+ if (opt_fast) end = strmov(end, " FAST");
+ if (opt_extended) end = strmov(end, " EXTENDED");
+ if (opt_medium_check) end = strmov(end, " MEDIUM"); /* Default */
+ if (opt_check_only_changed) end = strmov(end, " CHANGED");
+ }
if (opt_upgrade) end = strmov(end, " FOR UPGRADE");
break;
case DO_REPAIR:
@@ -948,6 +957,7 @@ static void print_result()
uint length_of_db;
uint i;
my_bool found_error=0, table_rebuild=0;
+ DYNAMIC_ARRAY *array4repair= &tables4repair;
DBUG_ENTER("print_result");
res = mysql_use_result(sock);
@@ -984,9 +994,10 @@ static void print_result()
else
{
char *table_name= prev + (length_of_db+1);
- insert_dynamic(&tables4repair, (uchar*) table_name);
+ insert_dynamic(array4repair, (uchar*) table_name);
}
}
+ array4repair= &tables4repair;
found_error=0;
table_rebuild=0;
prev_alter[0]= 0;
@@ -1002,8 +1013,11 @@ static void print_result()
we have to run upgrade on it. In this case we write a nicer message
than "Please do "REPAIR TABLE""...
*/
- if (!strcmp(row[2],"error") && strstr(row[3],"REPAIR TABLE"))
+ if (!strcmp(row[2],"error") && strstr(row[3],"REPAIR "))
+ {
printf("%-50s %s", row[0], "Needs upgrade");
+ array4repair= strstr(row[3], "VIEW") ? &views4repair : &tables4repair;
+ }
else
printf("%s\n%-9s: %s", row[0], row[2], row[3]);
if (opt_auto_repair && strcmp(row[2],"note"))
@@ -1053,7 +1067,7 @@ static void print_result()
else
{
char *table_name= prev + (length_of_db+1);
- insert_dynamic(&tables4repair, (uchar*) table_name);
+ insert_dynamic(array4repair, (uchar*) table_name);
}
}
mysql_free_result(res);
@@ -1165,6 +1179,7 @@ int main(int argc, char **argv)
if (opt_auto_repair &&
(my_init_dynamic_array(&tables4repair, sizeof(char)*(NAME_LEN*2+2),16,64) ||
+ my_init_dynamic_array(&views4repair, sizeof(char)*(NAME_LEN*2+2),16,64) ||
my_init_dynamic_array(&tables4rebuild, sizeof(char)*(NAME_LEN*2+2),16,64) ||
my_init_dynamic_array(&alter_table_cmds, MAX_ALTER_STR_SIZE, 0, 1)))
goto end;
@@ -1193,6 +1208,13 @@ int main(int argc, char **argv)
rebuild_table((char*) dynamic_array_ptr(&tables4rebuild, i));
for (i = 0; i < alter_table_cmds.elements ; i++)
run_query((char*) dynamic_array_ptr(&alter_table_cmds, i));
+ if (!opt_silent && views4repair.elements)
+ puts("\nRepairing views");
+ for (i = 0; i < views4repair.elements ; i++)
+ {
+ char *name= (char*) dynamic_array_ptr(&views4repair, i);
+ handle_request_for_tables(name, fixed_name_length(name), TRUE);
+ }
}
ret= test(first_error);
@@ -1200,8 +1222,10 @@ int main(int argc, char **argv)
dbDisconnect(current_host);
if (opt_auto_repair)
{
+ delete_dynamic(&views4repair);
delete_dynamic(&tables4repair);
delete_dynamic(&tables4rebuild);
+ delete_dynamic(&alter_table_cmds);
}
end1:
my_free(opt_password);
diff --git a/cmake/do_abi_check.cmake b/cmake/do_abi_check.cmake
index c831aaf..c0ffce3 100644
--- a/cmake/do_abi_check.cmake
+++ b/cmake/do_abi_check.cmake
@@ -58,7 +58,7 @@ FOREACH(file ${ABI_HEADERS})
EXECUTE_PROCESS(
COMMAND ${COMPILER}
- -E -nostdinc -dI -DMYSQL_ABI_CHECK -I${SOURCE_DIR}/include
+ -E -nostdinc -DMYSQL_ABI_CHECK -I${SOURCE_DIR}/include
-I${BINARY_DIR}/include -I${SOURCE_DIR}/include/mysql -I${SOURCE_DIR}/sql
${file}
ERROR_QUIET OUTPUT_FILE ${tmpfile})
diff --git a/cmake/make_dist.cmake.in b/cmake/make_dist.cmake.in
index c561baa..f35d168 100644
--- a/cmake/make_dist.cmake.in
+++ b/cmake/make_dist.cmake.in
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2015, 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
@@ -60,9 +60,9 @@ IF(NOT GIT_EXECUTABLE)
# Save bison output first.
CONFIGURE_FILE(${CMAKE_BINARY_DIR}/sql/sql_yacc.cc
- ${CMAKE_BINARY_DIR}/sql_yacc.cc COPY_ONLY)
+ ${CMAKE_BINARY_DIR}/sql_yacc.cc COPYONLY)
CONFIGURE_FILE(${CMAKE_BINARY_DIR}/sql/sql_yacc.h
- ${CMAKE_BINARY_DIR}/sql_yacc.h COPY_ONLY)
+ ${CMAKE_BINARY_DIR}/sql_yacc.h COPYONLY)
IF(CMAKE_GENERATOR MATCHES "Makefiles")
# make clean
@@ -74,9 +74,9 @@ IF(NOT GIT_EXECUTABLE)
# Restore bison output
CONFIGURE_FILE(${CMAKE_BINARY_DIR}/sql_yacc.cc
- ${CMAKE_BINARY_DIR}/sql/sql_yacc.cc COPY_ONLY)
+ ${CMAKE_BINARY_DIR}/sql/sql_yacc.cc COPYONLY)
CONFIGURE_FILE(${CMAKE_BINARY_DIR}/sql_yacc.h
- ${CMAKE_BINARY_DIR}/sql/sql_yacc.h COPY_ONLY)
+ ${CMAKE_BINARY_DIR}/sql/sql_yacc.h COPYONLY)
FILE(REMOVE ${CMAKE_BINARY_DIR}/sql_yacc.cc)
FILE(REMOVE ${CMAKE_BINARY_DIR}/sql_yacc.h)
ENDIF()
diff --git a/cmake/mysql_add_executable.cmake b/cmake/mysql_add_executable.cmake
index b5f6b27..0c93fb1 100644
--- a/cmake/mysql_add_executable.cmake
+++ b/cmake/mysql_add_executable.cmake
@@ -1,56 +1,56 @@
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-# Add executable plus some additional MySQL specific stuff
-# Usage (same as for standard CMake's ADD_EXECUTABLE)
-#
-# MYSQL_ADD_EXECUTABLE(target source1...sourceN)
-#
-# MySQL specifics:
-# - instruct CPack to install executable under ${CMAKE_INSTALL_PREFIX}/bin directory
-# On Windows :
-# - add version resource
-# - instruct CPack to do autenticode signing if SIGNCODE is set
-
-INCLUDE(cmake_parse_arguments)
-
-FUNCTION (MYSQL_ADD_EXECUTABLE)
- # Pass-through arguments for ADD_EXECUTABLE
- MYSQL_PARSE_ARGUMENTS(ARG
- "WIN32;MACOSX_BUNDLE;EXCLUDE_FROM_ALL;DESTINATION;COMPONENT"
- ""
- ${ARGN}
- )
- LIST(GET ARG_DEFAULT_ARGS 0 target)
- LIST(REMOVE_AT ARG_DEFAULT_ARGS 0)
-
- SET(sources ${ARG_DEFAULT_ARGS})
- ADD_VERSION_INFO(${target} EXECUTABLE sources)
- ADD_EXECUTABLE(${target} ${ARG_WIN32} ${ARG_MACOSX_BUNDLE} ${ARG_EXCLUDE_FROM_ALL} ${sources})
- # tell CPack where to install
- IF(NOT ARG_EXCLUDE_FROM_ALL)
- IF(NOT ARG_DESTINATION)
- SET(ARG_DESTINATION ${INSTALL_BINDIR})
- ENDIF()
- IF(ARG_COMPONENT)
- SET(COMP COMPONENT ${ARG_COMPONENT})
- ELSEIF(MYSQL_INSTALL_COMPONENT)
- SET(COMP COMPONENT ${MYSQL_INSTALL_COMPONENT})
- ELSE()
- SET(COMP COMPONENT Client)
- ENDIF()
- MYSQL_INSTALL_TARGETS(${target} DESTINATION ${ARG_DESTINATION} ${COMP})
- ENDIF()
-ENDFUNCTION()
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+# Add executable plus some additional MySQL specific stuff
+# Usage (same as for standard CMake's ADD_EXECUTABLE)
+#
+# MYSQL_ADD_EXECUTABLE(target source1...sourceN)
+#
+# MySQL specifics:
+# - instruct CPack to install executable under ${CMAKE_INSTALL_PREFIX}/bin directory
+# On Windows :
+# - add version resource
+# - instruct CPack to do autenticode signing if SIGNCODE is set
+
+INCLUDE(cmake_parse_arguments)
+
+FUNCTION (MYSQL_ADD_EXECUTABLE)
+ # Pass-through arguments for ADD_EXECUTABLE
+ MYSQL_PARSE_ARGUMENTS(ARG
+ "WIN32;MACOSX_BUNDLE;EXCLUDE_FROM_ALL;DESTINATION;COMPONENT"
+ ""
+ ${ARGN}
+ )
+ LIST(GET ARG_DEFAULT_ARGS 0 target)
+ LIST(REMOVE_AT ARG_DEFAULT_ARGS 0)
+
+ SET(sources ${ARG_DEFAULT_ARGS})
+ ADD_VERSION_INFO(${target} EXECUTABLE sources)
+ ADD_EXECUTABLE(${target} ${ARG_WIN32} ${ARG_MACOSX_BUNDLE} ${ARG_EXCLUDE_FROM_ALL} ${sources})
+ # tell CPack where to install
+ IF(NOT ARG_EXCLUDE_FROM_ALL)
+ IF(NOT ARG_DESTINATION)
+ SET(ARG_DESTINATION ${INSTALL_BINDIR})
+ ENDIF()
+ IF(ARG_COMPONENT)
+ SET(COMP COMPONENT ${ARG_COMPONENT})
+ ELSEIF(MYSQL_INSTALL_COMPONENT)
+ SET(COMP COMPONENT ${MYSQL_INSTALL_COMPONENT})
+ ELSE()
+ SET(COMP COMPONENT Client)
+ ENDIF()
+ MYSQL_INSTALL_TARGETS(${target} DESTINATION ${ARG_DESTINATION} ${COMP})
+ ENDIF()
+ENDFUNCTION()
diff --git a/cmake/versioninfo.rc.in b/cmake/versioninfo.rc.in
index 6eb8539..cd880b9 100644
--- a/cmake/versioninfo.rc.in
+++ b/cmake/versioninfo.rc.in
@@ -1,38 +1,38 @@
-// Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-#include <windows.h>
-VS_VERSION_INFO VERSIONINFO
-FILEVERSION @MAJOR_VERSION@, at MINOR_VERSION@, at PATCH_VERSION@, at TINY_VERSION@
-PRODUCTVERSION @MAJOR_VERSION@, at MINOR_VERSION@, at PATCH_VERSION@, at TINY_VERSION@
-FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-FILEFLAGS 0
-FILEOS VOS__WINDOWS32
-FILETYPE @FILETYPE@
-FILESUBTYPE VFT2_UNKNOWN
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904E4"
- BEGIN
- VALUE "FileVersion", "@MAJOR_VERSION at .@MINOR_VERSION at .@PATCH_VERSION at .@TINY_VERSION@\0"
- VALUE "ProductVersion", "@MAJOR_VERSION at .@MINOR_VERSION at .@PATCH_VERSION at .@TINY_VERSION@\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1252
- END
-END
+// Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; version 2 of the License.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+#include <windows.h>
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION @MAJOR_VERSION@, at MINOR_VERSION@, at PATCH_VERSION@, at TINY_VERSION@
+PRODUCTVERSION @MAJOR_VERSION@, at MINOR_VERSION@, at PATCH_VERSION@, at TINY_VERSION@
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEFLAGS 0
+FILEOS VOS__WINDOWS32
+FILETYPE @FILETYPE@
+FILESUBTYPE VFT2_UNKNOWN
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904E4"
+ BEGIN
+ VALUE "FileVersion", "@MAJOR_VERSION at .@MINOR_VERSION at .@PATCH_VERSION at .@TINY_VERSION@\0"
+ VALUE "ProductVersion", "@MAJOR_VERSION at .@MINOR_VERSION at .@PATCH_VERSION at .@TINY_VERSION@\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1252
+ END
+END
diff --git a/cmd-line-utils/libedit/el_terminal.h b/cmd-line-utils/libedit/el_terminal.h
index 807c651..db0bb94 100644
--- a/cmd-line-utils/libedit/el_terminal.h
+++ b/cmd-line-utils/libedit/el_terminal.h
@@ -1,7 +1,7 @@
/* $NetBSD: terminal.h,v 1.3 2011/07/29 23:44:45 christos Exp $ */
/*-
- * Copyright (c) 1992, 1993
+ * Copyright (c) 1992, 2015
* The Regents of the University of California. All rights reserved.
*
* This code is derived from software contributed to Berkeley by
@@ -103,7 +103,7 @@ protected int terminal_settc(EditLine *, int, const Char **);
protected int terminal_gettc(EditLine *, int, char **);
protected int terminal_telltc(EditLine *, int, const Char **);
protected int terminal_echotc(EditLine *, int, const Char **);
-protected void terminal_writec(EditLine *, Int);
+protected int terminal_writec(EditLine *, Int);
protected int terminal__putc(EditLine *, Int);
protected void terminal__flush(EditLine *);
diff --git a/cmd-line-utils/libedit/emacs.c b/cmd-line-utils/libedit/emacs.c
index 554d397..1f1033a 100644
--- a/cmd-line-utils/libedit/emacs.c
+++ b/cmd-line-utils/libedit/emacs.c
@@ -1,7 +1,7 @@
/* $NetBSD: emacs.c,v 1.25 2011/07/29 15:16:33 christos Exp $ */
/*-
- * Copyright (c) 1992, 1993
+ * Copyright (c) 1992, 2015
* The Regents of the University of California. All rights reserved.
*
* This code is derived from software contributed to Berkeley by
@@ -58,8 +58,10 @@ em_delete_or_list(EditLine *el, Int c)
/* if I'm at the end */
if (el->el_line.cursor == el->el_line.buffer) {
/* and the beginning */
- terminal_writec(el, c); /* then do an EOF */
- return CC_EOF;
+ if(!(terminal_writec(el, c))) /* then do an EOF */
+ return CC_EOF;
+ else
+ return CC_ERROR;
} else {
/*
* Here we could list completions, but it is an
diff --git a/cmd-line-utils/libedit/terminal.c b/cmd-line-utils/libedit/terminal.c
index fb5600a..18b789a 100644
--- a/cmd-line-utils/libedit/terminal.c
+++ b/cmd-line-utils/libedit/terminal.c
@@ -1,7 +1,7 @@
/* $NetBSD: terminal.c,v 1.10 2011/10/04 15:27:04 christos Exp $ */
/*-
- * Copyright (c) 1992, 1993
+ * Copyright (c) 1992, 2015
* The Regents of the University of California. All rights reserved.
*
* This code is derived from software contributed to Berkeley by
@@ -1271,14 +1271,19 @@ terminal__flush(EditLine *el)
/* terminal_writec():
* Write the given character out, in a human readable form
*/
-protected void
+protected int
terminal_writec(EditLine *el, Int c)
{
Char visbuf[VISUAL_WIDTH_MAX +1];
ssize_t vcnt = ct_visual_char(visbuf, VISUAL_WIDTH_MAX, c);
- visbuf[vcnt] = '\0';
- terminal_overwrite(el, visbuf, (size_t)vcnt);
- terminal__flush(el);
+ if(vcnt == -1)
+ return 1; /* Error due to insufficient space */
+ else {
+ visbuf[vcnt] = '\0';
+ terminal_overwrite(el, visbuf, (size_t)vcnt);
+ terminal__flush(el);
+ return 0;
+ }
}
diff --git a/cmd-line-utils/libedit/vi.c b/cmd-line-utils/libedit/vi.c
index 9a4b97a..4124203 100644
--- a/cmd-line-utils/libedit/vi.c
+++ b/cmd-line-utils/libedit/vi.c
@@ -1,7 +1,7 @@
/* $NetBSD: vi.c,v 1.41 2011/10/04 15:27:04 christos Exp $ */
/*-
- * Copyright (c) 1992, 1993
+ * Copyright (c) 1992, 2015
* The Regents of the University of California. All rights reserved.
*
* This code is derived from software contributed to Berkeley by
@@ -607,8 +607,10 @@ vi_list_or_eof(EditLine *el, Int c)
if (el->el_line.cursor == el->el_line.lastchar) {
if (el->el_line.cursor == el->el_line.buffer) {
- terminal_writec(el, c); /* then do a EOF */
- return CC_EOF;
+ if(!(terminal_writec(el, c))) /* then do a EOF */
+ return CC_EOF;
+ else
+ return CC_ERROR;
} else {
/*
* Here we could list completions, but it is an
diff --git a/config.h.cmake b/config.h.cmake
index 34f77db..73dc918 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -203,7 +203,7 @@
#cmakedefine HAVE_MADVISE 1
#cmakedefine HAVE_DECL_MADVISE 1
#cmakedefine HAVE_DECL_TGOTO 1
-#cmakedefine HAVE_DECL_MHA_MAPSIZE_VA
+#cmakedefine HAVE_DECL_MHA_MAPSIZE_VA 1
#cmakedefine HAVE_MALLINFO 1
#cmakedefine HAVE_MEMCPY 1
#cmakedefine HAVE_MEMMOVE 1
@@ -396,7 +396,7 @@
#cmakedefine SOCKET_SIZE_TYPE @SOCKET_SIZE_TYPE@
-#cmakedefine HAVE_MBSTATE_T
+#cmakedefine HAVE_MBSTATE_T 1
#define MAX_INDEXES 64
@@ -431,15 +431,15 @@
#cmakedefine HAVE_WCTYPE_H 1
#cmakedefine HAVE_WCHAR_H 1
#cmakedefine HAVE_LANGINFO_H 1
-#cmakedefine HAVE_MBRLEN
-#cmakedefine HAVE_MBSCMP
-#cmakedefine HAVE_MBSRTOWCS
-#cmakedefine HAVE_WCRTOMB
-#cmakedefine HAVE_MBRTOWC
-#cmakedefine HAVE_WCSCOLL
-#cmakedefine HAVE_WCSDUP
-#cmakedefine HAVE_WCWIDTH
-#cmakedefine HAVE_WCTYPE
+#cmakedefine HAVE_MBRLEN 1
+#cmakedefine HAVE_MBSCMP 1
+#cmakedefine HAVE_MBSRTOWCS 1
+#cmakedefine HAVE_WCRTOMB 1
+#cmakedefine HAVE_MBRTOWC 1
+#cmakedefine HAVE_WCSCOLL 1
+#cmakedefine HAVE_WCSDUP 1
+#cmakedefine HAVE_WCWIDTH 1
+#cmakedefine HAVE_WCTYPE 1
#cmakedefine HAVE_ISWLOWER 1
#cmakedefine HAVE_ISWUPPER 1
#cmakedefine HAVE_TOWLOWER 1
@@ -453,7 +453,7 @@
#cmakedefine HAVE_STRCASECMP 1
#cmakedefine HAVE_STRNCASECMP 1
#cmakedefine HAVE_STRDUP 1
-#cmakedefine HAVE_LANGINFO_CODESET
+#cmakedefine HAVE_LANGINFO_CODESET 1
#cmakedefine HAVE_TCGETATTR 1
#cmakedefine HAVE_FLOCKFILE 1
diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control
index 104917d..e83ac1f 100644
--- a/debian/dist/Debian/control
+++ b/debian/dist/Debian/control
@@ -4,7 +4,12 @@ Priority: optional
Maintainer: MariaDB Developers <maria-developers at lists.launchpad.net>
XSBC-Original-Maintainer: Maria Developers <maria-developers at lists.launchpad.net>
Uploaders: MariaDB Developers <maria-developers at lists.launchpad.net>
-Build-Depends: libtool (>= 1.4.2-7), procps | hurd, debhelper, file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, libevent-dev, libssl-dev, libpam0g-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, ghostscript | gs-gpl, dpatch, gawk, bison, lsb-release, hardening-wrapper, ${CMAKE_DEP}libaio-dev, libjemalloc-dev (>= 3.0.0)
+Build-Depends: procps | hurd, debhelper, libncurses5-dev (>= 5.0-6),
+ perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3),
+ zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, libevent-dev,
+ libssl-dev, libpam0g-dev, psmisc, po-debconf, chrpath,
+ dpatch, gawk, bison, lsb-release, hardening-wrapper,
+ ${CMAKE_DEP}libaio-dev, libjemalloc-dev (>= 3.0.0)
Standards-Version: 3.8.3
Homepage: http://mariadb.org/
Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/5.5/files
diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control
index 0c33163..94424f3 100644
--- a/debian/dist/Ubuntu/control
+++ b/debian/dist/Ubuntu/control
@@ -4,7 +4,12 @@ Priority: optional
Maintainer: MariaDB Developers <maria-developers at lists.launchpad.net>
XSBC-Original-Maintainer: Maria Developers <maria-developers at lists.launchpad.net>
Uploaders: MariaDB Developers <maria-developers at lists.launchpad.net>
-Build-Depends: libtool (>= 1.4.2-7), procps | hurd, debhelper, file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, libevent-dev, libssl-dev, libpam0g-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, ghostscript | gs-gpl, dpatch, gawk, bison, lsb-release, hardening-wrapper, ${CMAKE_DEP}libaio-dev, libjemalloc-dev (>= 3.0.0)
+Build-Depends: procps | hurd, debhelper, libncurses5-dev (>= 5.0-6),
+ perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3),
+ zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, libevent-dev,
+ libssl-dev, libpam0g-dev, psmisc, po-debconf, chrpath,
+ dpatch, gawk, bison, lsb-release, hardening-wrapper,
+ ${CMAKE_DEP}libaio-dev, libjemalloc-dev (>= 3.0.0)
Standards-Version: 3.8.2
Homepage: http://mariadb.org/
Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/5.5/files
diff --git a/debian/po/it.po b/debian/po/it.po
index b377d9f..b1a3eba 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -1,8 +1,8 @@
-# Italian (it) translation of debconf templates for mysql-dfsg-5.1
-# Copyright (C) 2009 Software in the Public Interest
-# This file is distributed under the same license as the mysql-dfsg-5.1 package.
-# Luca Monducci <luca.mo at tiscali.it>, 2006 - 2009.
-#
+# Italian (it) translation of debconf templates for mysql-dfsg-5.1
+# Copyright (C) 2009 Software in the Public Interest
+# This file is distributed under the same license as the mysql-dfsg-5.1 package.
+# Luca Monducci <luca.mo at tiscali.it>, 2006 - 2009.
+#
msgid ""
msgstr ""
"Project-Id-Version: mysql-dfsg-5.1 5.1.37 italian debconf templates\n"
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 297a2fb..a05943f 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -1,9 +1,9 @@
-# Translation of mysql-dfsg-5.1 debconf template to Swedish
-# Copyright (C) 2009 Martin Bagge <brother at bsnet.se>
-# This file is distributed under the same license as the mysql-dfsg-5.1 package.
-#
-# Andreas Henriksson <andreas at fatal.se>, 2007
-# Martin Bagge <brother at bsnet.se>, 2009
+# Translation of mysql-dfsg-5.1 debconf template to Swedish
+# Copyright (C) 2009 Martin Bagge <brother at bsnet.se>
+# This file is distributed under the same license as the mysql-dfsg-5.1 package.
+#
+# Andreas Henriksson <andreas at fatal.se>, 2007
+# Martin Bagge <brother at bsnet.se>, 2009
msgid ""
msgstr ""
"Project-Id-Version: mysql-dfsg-5.1 5.0.21-3\n"
diff --git a/include/mysql.h.pp b/include/mysql.h.pp
index f6be582..4f74070 100644
--- a/include/mysql.h.pp
+++ b/include/mysql.h.pp
@@ -1,7 +1,5 @@
typedef char my_bool;
typedef int my_socket;
-#include "mysql_version.h"
-#include "mysql_com.h"
enum enum_server_command
{
COM_SLEEP, COM_QUIT, COM_INIT_DB, COM_QUERY, COM_FIELD_LIST,
@@ -142,7 +140,6 @@ void get_tty_password_buff(const char *opt_message, char *to, size_t length);
const char *mysql_errno_to_sqlstate(unsigned int mysql_errno);
my_bool my_thread_init(void);
void my_thread_end(void);
-#include "mysql_time.h"
enum enum_mysql_timestamp_type
{
MYSQL_TIMESTAMP_NONE= -2, MYSQL_TIMESTAMP_ERROR= -1,
@@ -155,7 +152,6 @@ typedef struct st_mysql_time
my_bool neg;
enum enum_mysql_timestamp_type time_type;
} MYSQL_TIME;
-#include "my_list.h"
typedef struct st_list {
struct st_list *prev,*next;
void *data;
@@ -197,8 +193,6 @@ typedef struct st_mysql_field {
typedef char **MYSQL_ROW;
typedef unsigned int MYSQL_FIELD_OFFSET;
typedef unsigned long long my_ulonglong;
-#include "typelib.h"
-#include "my_alloc.h"
typedef struct st_used_mem
{
struct st_used_mem *next;
@@ -242,7 +236,6 @@ typedef struct st_mysql_rows {
unsigned long length;
} MYSQL_ROWS;
typedef MYSQL_ROWS *MYSQL_ROW_OFFSET;
-#include "my_alloc.h"
typedef struct embedded_query_result EMBEDDED_QUERY_RESULT;
typedef struct st_mysql_data {
MYSQL_ROWS *data;
diff --git a/include/mysql/client_plugin.h.pp b/include/mysql/client_plugin.h.pp
index f3a0b57..b6ba9cf 100644
--- a/include/mysql/client_plugin.h.pp
+++ b/include/mysql/client_plugin.h.pp
@@ -3,7 +3,6 @@ struct st_mysql_client_plugin
int type; unsigned int interface_version; const char *name; const char *author; const char *desc; unsigned int version[3]; const char *license; void *mysql_api; int (*init)(char *, size_t, int, va_list); int (*deinit)(); int (*options)(const char *option, const void *);
};
struct st_mysql;
-#include <mysql/plugin_auth_common.h>
typedef struct st_plugin_vio_info
{
enum { MYSQL_VIO_INVALID, MYSQL_VIO_TCP, MYSQL_VIO_SOCKET,
@@ -24,7 +23,6 @@ struct st_mysql_client_plugin_AUTHENTICATION
int type; unsigned int interface_version; const char *name; const char *author; const char *desc; unsigned int version[3]; const char *license; void *mysql_api; int (*init)(char *, size_t, int, va_list); int (*deinit)(); int (*options)(const char *option, const void *);
int (*authenticate_user)(MYSQL_PLUGIN_VIO *vio, struct st_mysql *mysql);
};
-#include <mysql/auth_dialog_client.h>
struct st_mysql;
typedef char *(*mysql_authentication_dialog_ask_t)(struct st_mysql *mysql,
int type, const char *prompt, char *buf, int buf_len);
diff --git a/include/mysql/plugin_audit.h.pp b/include/mysql/plugin_audit.h.pp
index b0ace08..74903fd 100644
--- a/include/mysql/plugin_audit.h.pp
+++ b/include/mysql/plugin_audit.h.pp
@@ -1,13 +1,9 @@
-#include "plugin.h"
-#include <mysql/services.h>
-#include <mysql/service_my_snprintf.h>
extern struct my_snprintf_service_st {
size_t (*my_snprintf_type)(char*, size_t, const char*, ...);
size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list);
} *my_snprintf_service;
size_t my_snprintf(char* to, size_t n, const char* fmt, ...);
size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap);
-#include <mysql/service_thd_alloc.h>
struct st_mysql_lex_string
{
char *str;
@@ -31,7 +27,6 @@ void *thd_memdup(void* thd, const void* str, unsigned int size);
MYSQL_LEX_STRING *thd_make_lex_string(void* thd, MYSQL_LEX_STRING *lex_str,
const char *str, unsigned int size,
int allocate_lex_string);
-#include <mysql/service_thd_wait.h>
typedef enum _thd_wait_type_e {
THD_WAIT_SLEEP= 1,
THD_WAIT_DISKIO= 2,
@@ -51,7 +46,6 @@ extern struct thd_wait_service_st {
} *thd_wait_service;
void thd_wait_begin(void* thd, int wait_type);
void thd_wait_end(void* thd);
-#include <mysql/service_thread_scheduler.h>
struct scheduler_functions;
extern struct my_thread_scheduler_service {
int (*set)(struct scheduler_functions *scheduler);
@@ -59,7 +53,6 @@ extern struct my_thread_scheduler_service {
} *my_thread_scheduler_service;
int my_thread_scheduler_set(struct scheduler_functions *scheduler);
int my_thread_scheduler_reset();
-#include <mysql/service_progress_report.h>
extern struct progress_report_service_st {
void (*thd_progress_init_func)(void* thd, unsigned int max_stage);
void (*thd_progress_report_func)(void* thd,
@@ -80,9 +73,7 @@ void thd_progress_next_stage(void* thd);
void thd_progress_end(void* thd);
const char *set_thd_proc_info(void*, const char * info, const char *func,
const char *file, unsigned int line);
-#include <mysql/service_debug_sync.h>
extern void (*debug_sync_C_callback_ptr)(void*, const char *, size_t);
-#include <mysql/service_kill_statement.h>
enum thd_kill_levels {
THD_IS_NOT_KILLED=0,
THD_ABORT_SOFTLY=50,
@@ -92,7 +83,6 @@ extern struct kill_statement_service_st {
enum thd_kill_levels (*thd_kill_level_func)(const void*);
} *thd_kill_statement_service;
enum thd_kill_levels thd_kill_level(const void*);
-#include <mysql/service_logger.h>
typedef struct logger_handle_st LOGGER_HANDLE;
extern struct logger_service_st {
void (*logger_init_mutexes)();
@@ -175,8 +165,6 @@ struct st_maria_plugin
const char *version_info;
unsigned int maturity;
};
-#include "plugin_ftparser.h"
-#include "plugin.h"
enum enum_ftparser_mode
{
MYSQL_FTPARSER_SIMPLE_MODE= 0,
diff --git a/include/mysql/plugin_auth.h.pp b/include/mysql/plugin_auth.h.pp
index 7a01a33..84b2434 100644
--- a/include/mysql/plugin_auth.h.pp
+++ b/include/mysql/plugin_auth.h.pp
@@ -1,13 +1,9 @@
-#include <mysql/plugin.h>
-#include <mysql/services.h>
-#include <mysql/service_my_snprintf.h>
extern struct my_snprintf_service_st {
size_t (*my_snprintf_type)(char*, size_t, const char*, ...);
size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list);
} *my_snprintf_service;
size_t my_snprintf(char* to, size_t n, const char* fmt, ...);
size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap);
-#include <mysql/service_thd_alloc.h>
struct st_mysql_lex_string
{
char *str;
@@ -31,7 +27,6 @@ void *thd_memdup(void* thd, const void* str, unsigned int size);
MYSQL_LEX_STRING *thd_make_lex_string(void* thd, MYSQL_LEX_STRING *lex_str,
const char *str, unsigned int size,
int allocate_lex_string);
-#include <mysql/service_thd_wait.h>
typedef enum _thd_wait_type_e {
THD_WAIT_SLEEP= 1,
THD_WAIT_DISKIO= 2,
@@ -51,7 +46,6 @@ extern struct thd_wait_service_st {
} *thd_wait_service;
void thd_wait_begin(void* thd, int wait_type);
void thd_wait_end(void* thd);
-#include <mysql/service_thread_scheduler.h>
struct scheduler_functions;
extern struct my_thread_scheduler_service {
int (*set)(struct scheduler_functions *scheduler);
@@ -59,7 +53,6 @@ extern struct my_thread_scheduler_service {
} *my_thread_scheduler_service;
int my_thread_scheduler_set(struct scheduler_functions *scheduler);
int my_thread_scheduler_reset();
-#include <mysql/service_progress_report.h>
extern struct progress_report_service_st {
void (*thd_progress_init_func)(void* thd, unsigned int max_stage);
void (*thd_progress_report_func)(void* thd,
@@ -80,9 +73,7 @@ void thd_progress_next_stage(void* thd);
void thd_progress_end(void* thd);
const char *set_thd_proc_info(void*, const char * info, const char *func,
const char *file, unsigned int line);
-#include <mysql/service_debug_sync.h>
extern void (*debug_sync_C_callback_ptr)(void*, const char *, size_t);
-#include <mysql/service_kill_statement.h>
enum thd_kill_levels {
THD_IS_NOT_KILLED=0,
THD_ABORT_SOFTLY=50,
@@ -92,7 +83,6 @@ extern struct kill_statement_service_st {
enum thd_kill_levels (*thd_kill_level_func)(const void*);
} *thd_kill_statement_service;
enum thd_kill_levels thd_kill_level(const void*);
-#include <mysql/service_logger.h>
typedef struct logger_handle_st LOGGER_HANDLE;
extern struct logger_service_st {
void (*logger_init_mutexes)();
@@ -175,8 +165,6 @@ struct st_maria_plugin
const char *version_info;
unsigned int maturity;
};
-#include "plugin_ftparser.h"
-#include "plugin.h"
enum enum_ftparser_mode
{
MYSQL_FTPARSER_SIMPLE_MODE= 0,
@@ -266,7 +254,6 @@ void mysql_query_cache_invalidate4(void* thd,
void *thd_get_ha_data(const void* thd, const struct handlerton *hton);
void thd_set_ha_data(void* thd, const struct handlerton *hton,
const void *ha_data);
-#include <mysql/plugin_auth_common.h>
typedef struct st_plugin_vio_info
{
enum { MYSQL_VIO_INVALID, MYSQL_VIO_TCP, MYSQL_VIO_SOCKET,
diff --git a/include/mysql/plugin_ftparser.h.pp b/include/mysql/plugin_ftparser.h.pp
index a41c478..8cb6348 100644
--- a/include/mysql/plugin_ftparser.h.pp
+++ b/include/mysql/plugin_ftparser.h.pp
@@ -1,13 +1,9 @@
-#include "plugin.h"
-#include <mysql/services.h>
-#include <mysql/service_my_snprintf.h>
extern struct my_snprintf_service_st {
size_t (*my_snprintf_type)(char*, size_t, const char*, ...);
size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list);
} *my_snprintf_service;
size_t my_snprintf(char* to, size_t n, const char* fmt, ...);
size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap);
-#include <mysql/service_thd_alloc.h>
struct st_mysql_lex_string
{
char *str;
@@ -31,7 +27,6 @@ void *thd_memdup(void* thd, const void* str, unsigned int size);
MYSQL_LEX_STRING *thd_make_lex_string(void* thd, MYSQL_LEX_STRING *lex_str,
const char *str, unsigned int size,
int allocate_lex_string);
-#include <mysql/service_thd_wait.h>
typedef enum _thd_wait_type_e {
THD_WAIT_SLEEP= 1,
THD_WAIT_DISKIO= 2,
@@ -51,7 +46,6 @@ extern struct thd_wait_service_st {
} *thd_wait_service;
void thd_wait_begin(void* thd, int wait_type);
void thd_wait_end(void* thd);
-#include <mysql/service_thread_scheduler.h>
struct scheduler_functions;
extern struct my_thread_scheduler_service {
int (*set)(struct scheduler_functions *scheduler);
@@ -59,7 +53,6 @@ extern struct my_thread_scheduler_service {
} *my_thread_scheduler_service;
int my_thread_scheduler_set(struct scheduler_functions *scheduler);
int my_thread_scheduler_reset();
-#include <mysql/service_progress_report.h>
extern struct progress_report_service_st {
void (*thd_progress_init_func)(void* thd, unsigned int max_stage);
void (*thd_progress_report_func)(void* thd,
@@ -80,9 +73,7 @@ void thd_progress_next_stage(void* thd);
void thd_progress_end(void* thd);
const char *set_thd_proc_info(void*, const char * info, const char *func,
const char *file, unsigned int line);
-#include <mysql/service_debug_sync.h>
extern void (*debug_sync_C_callback_ptr)(void*, const char *, size_t);
-#include <mysql/service_kill_statement.h>
enum thd_kill_levels {
THD_IS_NOT_KILLED=0,
THD_ABORT_SOFTLY=50,
@@ -92,7 +83,6 @@ extern struct kill_statement_service_st {
enum thd_kill_levels (*thd_kill_level_func)(const void*);
} *thd_kill_statement_service;
enum thd_kill_levels thd_kill_level(const void*);
-#include <mysql/service_logger.h>
typedef struct logger_handle_st LOGGER_HANDLE;
extern struct logger_service_st {
void (*logger_init_mutexes)();
@@ -175,7 +165,6 @@ struct st_maria_plugin
const char *version_info;
unsigned int maturity;
};
-#include "plugin_ftparser.h"
struct st_mysql_daemon
{
int interface_version;
diff --git a/include/mysql/psi/psi_abi_v1.h.pp b/include/mysql/psi/psi_abi_v1.h.pp
index adb3010..9f82524 100644
--- a/include/mysql/psi/psi_abi_v1.h.pp
+++ b/include/mysql/psi/psi_abi_v1.h.pp
@@ -1,4 +1,3 @@
-#include "mysql/psi/psi.h"
C_MODE_START
struct PSI_mutex;
struct PSI_rwlock;
diff --git a/include/mysql/psi/psi_abi_v2.h.pp b/include/mysql/psi/psi_abi_v2.h.pp
index 63f8c52..9da270e 100644
--- a/include/mysql/psi/psi_abi_v2.h.pp
+++ b/include/mysql/psi/psi_abi_v2.h.pp
@@ -1,4 +1,3 @@
-#include "mysql/psi/psi.h"
C_MODE_START
struct PSI_mutex;
struct PSI_rwlock;
diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt
index 4ce4ab0..e611efa 100644
--- a/libmysql/CMakeLists.txt
+++ b/libmysql/CMakeLists.txt
@@ -358,7 +358,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
CONFIGURE_FILE(
${VERSION_SCRIPT_TEMPLATE}
${CMAKE_CURRENT_BINARY_DIR}/libmysql_versions.ld
- @ONLY@
+ @ONLY
)
SET(VERSION_SCRIPT_LINK_FLAGS
"-Wl,${CMAKE_CURRENT_BINARY_DIR}/libmysql_versions.ld")
diff --git a/mysql-test/r/ctype_utf8.result b/mysql-test/r/ctype_utf8.result
index b8ecc05..a964384 100644
--- a/mysql-test/r/ctype_utf8.result
+++ b/mysql-test/r/ctype_utf8.result
@@ -5762,5 +5762,20 @@ DROP TABLE t1;
# End of ctype_utf8_ilseq.inc
#
#
+# MDEV-8067 correct fix for MySQL Bug # 19699237: UNINITIALIZED VARIABLE IN ITEM_FIELD::STR_RESULT
+#
+CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET utf8);
+CREATE TABLE t2 (a VARCHAR(10) CHARACTER SET latin1);
+INSERT INTO t1 VALUES ('aaa');
+INSERT INTO t2 VALUES ('aaa');
+SELECT (SELECT CONCAT(a),1 FROM t1) <=> (SELECT CONCAT(a),1 FROM t2);
+(SELECT CONCAT(a),1 FROM t1) <=> (SELECT CONCAT(a),1 FROM t2)
+1
+INSERT INTO t1 VALUES ('aaa');
+INSERT INTO t2 VALUES ('aaa');
+SELECT (SELECT CONCAT(a),1 FROM t1) <=> (SELECT CONCAT(a),1 FROM t2);
+ERROR 21000: Subquery returns more than 1 row
+DROP TABLE t1, t2;
+#
# End of 5.5 tests
#
diff --git a/mysql-test/r/dyncol.result b/mysql-test/r/dyncol.result
index aacb536..ca6908f 100644
--- a/mysql-test/r/dyncol.result
+++ b/mysql-test/r/dyncol.result
@@ -1444,3 +1444,9 @@ column_get(column_create(1, "18446744073709552001" as char), 1 as int)
Warnings:
Warning 1918 Encountered illegal value '18446744073709552001' when converting to INT
Note 1105 Cast to signed converted positive out-of-range integer to it's negative complement
+#
+# MDEV-7505 - Too large scale in DECIMAL dynamic column getter crashes
+# mysqld
+#
+SELECT COLUMN_GET(`x`, 'y' AS DECIMAL(5,34));
+ERROR 42000: Too big scale 34 specified for ''y''. Maximum is 30.
diff --git a/mysql-test/r/empty_server_name-8224.result b/mysql-test/r/empty_server_name-8224.result
new file mode 100644
index 0000000..6423114
--- /dev/null
+++ b/mysql-test/r/empty_server_name-8224.result
@@ -0,0 +1 @@
+create server '' foreign data wrapper w2 options (host '127.0.0.1');
diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result
index c2de65e..02e121b 100644
--- a/mysql-test/r/gis.result
+++ b/mysql-test/r/gis.result
@@ -934,7 +934,7 @@ LINESTRING(0 0,1 1,2 2)
create table t2 as select f2 as a from t1 union select f3 from t1;
desc t2;
Field Type Null Key Default Extra
-a point YES NULL
+a geometry YES NULL
select AsText(a) from t2;
AsText(a)
POINT(1 1)
diff --git a/mysql-test/r/group_by.result b/mysql-test/r/group_by.result
index 1518a2f..0b4973c 100644
--- a/mysql-test/r/group_by.result
+++ b/mysql-test/r/group_by.result
@@ -2342,7 +2342,7 @@ DROP TABLE t1;
create table t1 (a int, b int);
insert into t1 values (1,11), (1,12), (2,22),(2,23), (4,44),(4,45);
create table t2 (c int, d int);
-insert into t2 values (1,11), (1,12), (2,22),(2,23), (4,44),(4,45);
+insert into t2 values (1,11), (2,22), (4,44);
select distinct a,sum(b), (select d from t2 where c=a order by max(b) limit 1) from t1 group by a order by max(b);
a sum(b) (select d from t2 where c=a order by max(b) limit 1)
1 23 11
diff --git a/mysql-test/r/information_schema2.result b/mysql-test/r/information_schema2.result
index 60a2094..3f7f3ec 100644
--- a/mysql-test/r/information_schema2.result
+++ b/mysql-test/r/information_schema2.result
@@ -6,3 +6,15 @@ select variable_name from information_schema.session_variables where variable_na
(select variable_name from information_schema.session_variables where variable_name = 'basedir');
variable_name
BASEDIR
+create table t1 (a char);
+insert t1 values ('a'),('t'),('z');
+flush status;
+select a, exists (select 1 from information_schema.columns where table_schema=concat('tes',a)) from t1;
+a exists (select 1 from information_schema.columns where table_schema=concat('tes',a))
+a 0
+t 1
+z 0
+show status like 'created_tmp_tables';
+Variable_name Value
+Created_tmp_tables 38
+drop table t1;
diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result
index c969b23..85af643 100644
--- a/mysql-test/r/myisam.result
+++ b/mysql-test/r/myisam.result
@@ -2522,6 +2522,17 @@ test.t1 check error Size of indexfile is: 1024 Should be: 2048
test.t1 check warning Size of datafile is: 14 Should be: 7
test.t1 check error Corrupt
DROP TABLE t1;
+#
+# MDEV-3870 - Valgrind warnings on OPTIMIZE MyISAM or Aria TABLE with
+# disabled keys
+#
+CREATE TABLE t1 (a INT, KEY(a)) ENGINE=MyISAM;
+INSERT INTO t1 VALUES (4),(3),(1),(0);
+ALTER TABLE t1 DISABLE KEYS;
+OPTIMIZE TABLE t1;
+Table Op Msg_type Msg_text
+test.t1 optimize status OK
+DROP TABLE t1;
show variables like 'myisam_block_size';
Variable_name Value
myisam_block_size 1024
diff --git a/mysql-test/r/mysql_tzinfo_to_sql_symlink.result b/mysql-test/r/mysql_tzinfo_to_sql_symlink.result
index dda7329..f127e75 100644
--- a/mysql-test/r/mysql_tzinfo_to_sql_symlink.result
+++ b/mysql-test/r/mysql_tzinfo_to_sql_symlink.result
@@ -60,3 +60,12 @@ INSERT INTO time_zone_transition_type (Time_zone_id, Transition_type_id, Offset,
#
TRUNCATE TABLE time_zone_leap_second;
ALTER TABLE time_zone_leap_second ORDER BY Transition_time;
+#
+# MDEV-6236 - [PATCH] mysql_tzinfo_to_sql may produce invalid SQL
+#
+TRUNCATE TABLE time_zone;
+TRUNCATE TABLE time_zone_name;
+TRUNCATE TABLE time_zone_transition;
+TRUNCATE TABLE time_zone_transition_type;
+ALTER TABLE time_zone_transition ORDER BY Time_zone_id, Transition_time;
+ALTER TABLE time_zone_transition_type ORDER BY Time_zone_id, Transition_type_id;
diff --git a/mysql-test/r/mysql_upgrade_view.result b/mysql-test/r/mysql_upgrade_view.result
index 0e71d7f..fa0ea5e 100644
--- a/mysql-test/r/mysql_upgrade_view.result
+++ b/mysql-test/r/mysql_upgrade_view.result
@@ -3,6 +3,41 @@ drop table if exists t1,v1,v2,v3,v4,v1badcheck;
drop view if exists t1,v1,v2,v3,v4,v1badcheck;
create table t1(a int);
create table kv(k varchar(30) NOT NULL PRIMARY KEY,v varchar(50));
+create view v1 as select 1;
+repair table t1 quick;
+Table Op Msg_type Msg_text
+test.t1 repair status OK
+repair table t1 extended;
+Table Op Msg_type Msg_text
+test.t1 repair status OK
+repair table t1 use_frm;
+Table Op Msg_type Msg_text
+test.t1 repair status OK
+repair table t1 from mysql;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'from mysql' at line 1
+repair view v1 quick;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'quick' at line 1
+repair view v1 extended;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'extended' at line 1
+repair view v1 use_frm;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'use_frm' at line 1
+repair view v1 from mysql;
+Table Op Msg_type Msg_text
+test.v1 repair status OK
+check view v1 quick;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'quick' at line 1
+check view v1 fast;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'fast' at line 1
+check view v1 medium;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'medium' at line 1
+check view v1 extended;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'extended' at line 1
+check view v1 changed;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'changed' at line 1
+check view v1 for upgrade;
+Table Op Msg_type Msg_text
+test.v1 check status OK
+drop view v1;
flush tables;
check view v1;
Table Op Msg_type Msg_text
diff --git a/mysql-test/r/mysqlcheck.result b/mysql-test/r/mysqlcheck.result
index 40ac4d8..c5ba3e7 100644
--- a/mysql-test/r/mysqlcheck.result
+++ b/mysql-test/r/mysqlcheck.result
@@ -316,3 +316,26 @@ CREATE TABLE test.`t.1` (id int);
mysqlcheck test t.1
test.t.1 OK
drop table test.`t.1`;
+create view v1 as select 1;
+mysqlcheck --process-views test
+test.v1 OK
+mysqlcheck --process-views --extended test
+test.v1 OK
+mysqlcheck --process-views --fast test
+mysqlcheck --process-views --quick test
+test.v1 OK
+mysqlcheck --process-views --check-only-changed test
+mysqlcheck --process-views --medium-check test
+test.v1 OK
+mysqlcheck --process-views --check-upgrade test
+test.v1 OK
+drop view v1;
+create table t1(a int);
+mysqlcheck --process-views --check-upgrade --auto-repair test
+test.t1 OK
+test.v1 Needs upgrade
+
+Repairing views
+test.v1 OK
+drop view v1;
+drop table t1;
diff --git a/mysql-test/r/partition_innodb.result b/mysql-test/r/partition_innodb.result
index 72cfa84..1da7dce 100644
--- a/mysql-test/r/partition_innodb.result
+++ b/mysql-test/r/partition_innodb.result
@@ -367,33 +367,33 @@ DROP TABLE t1;
create table t1 (a int) engine=innodb partition by hash(a) ;
show table status like 't1';
Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment
-t1 InnoDB 10 Compact 2 8192 16384 0 0 # NULL NULL NULL NULL latin1_swedish_ci NULL partitioned
+t1 InnoDB 10 Compact 2 8192 16384 0 0 # NULL # NULL NULL latin1_swedish_ci NULL partitioned
drop table t1;
create table t1 (a int)
engine = innodb
partition by key (a);
show table status;
Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment
-t1 InnoDB 10 Compact 2 8192 16384 0 0 # NULL NULL NULL NULL latin1_swedish_ci NULL partitioned
+t1 InnoDB 10 Compact 2 8192 16384 0 0 # NULL # NULL NULL latin1_swedish_ci NULL partitioned
insert into t1 values (0), (1), (2), (3);
show table status;
Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment
-t1 InnoDB 10 Compact 4 4096 16384 0 0 # NULL NULL NULL NULL latin1_swedish_ci NULL partitioned
+t1 InnoDB 10 Compact 4 4096 16384 0 0 # NULL # NULL NULL latin1_swedish_ci NULL partitioned
drop table t1;
create table t1 (a int auto_increment primary key)
engine = innodb
partition by key (a);
show table status;
Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment
-t1 InnoDB 10 Compact 2 8192 16384 0 0 # 1 NULL NULL NULL latin1_swedish_ci NULL partitioned
+t1 InnoDB 10 Compact 2 8192 16384 0 0 # 1 # NULL NULL latin1_swedish_ci NULL partitioned
insert into t1 values (NULL), (NULL), (NULL), (NULL);
show table status;
Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment
-t1 InnoDB 10 Compact 4 4096 16384 0 0 # 5 NULL NULL NULL latin1_swedish_ci NULL partitioned
+t1 InnoDB 10 Compact 4 4096 16384 0 0 # 5 # NULL NULL latin1_swedish_ci NULL partitioned
insert into t1 values (NULL), (NULL), (NULL), (NULL);
show table status;
Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment
-t1 InnoDB 10 Compact 8 2048 16384 0 0 # 9 NULL NULL NULL latin1_swedish_ci NULL partitioned
+t1 InnoDB 10 Compact 8 2048 16384 0 0 # 9 # NULL NULL latin1_swedish_ci NULL partitioned
drop table t1;
create table t1 (a int)
partition by key (a)
@@ -575,6 +575,17 @@ a b
0 1
DROP TABLE t1;
#
+# Bug #17299181 CREATE_TIME AND UPDATE_TIME ARE
+# WRONG FOR PARTITIONED TABLES
+#
+CREATE TABLE t1 (a int, PRIMARY KEY (a)) ENGINE=InnoDB
+PARTITION BY HASH (a) PARTITIONS 2;
+SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE
+CREATE_TIME IS NOT NULL AND TABLE_NAME='t1';
+COUNT(*)
+1
+DROP TABLE t1;
+#
# BUG#12912171 - ASSERTION FAILED: QUICK->HEAD->READ_SET ==
# SAVE_READ_SET
#
diff --git a/mysql-test/r/range_innodb.result b/mysql-test/r/range_innodb.result
new file mode 100644
index 0000000..794e6c7
--- /dev/null
+++ b/mysql-test/r/range_innodb.result
@@ -0,0 +1,39 @@
+#
+# Range optimizer (and related) tests that need InnoDB.
+#
+drop table if exists t0, t1, t2;
+#
+# MDEV-6735: Range checked for each record used with key
+#
+create table t0(a int);
+insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
+create table t1(a int);
+insert into t1 select A.a + B.a* 10 + C.a * 100 + D.a * 1000
+from t0 A, t0 B, t0 C, t0 D;
+create table t2 (
+a int,
+b int,
+filler1 char(100),
+filler2 char(100),
+filler3 char(100),
+filler4 char(100),
+key(a),
+key(b)
+) engine=innodb;
+insert into t2
+select
+a,a,
+repeat('0123456789', 10),
+repeat('0123456789', 10),
+repeat('0123456789', 10),
+repeat('0123456789', 10)
+from t1;
+analyze table t2;
+Table Op Msg_type Msg_text
+test.t2 analyze status OK
+# The following must not use "Range checked for each record":
+explain select * from t0 left join t2 on t2.a <t0.a and t2.b between 50 and 250;
+id select_type table type possible_keys key key_len ref rows Extra
+1 SIMPLE t0 ALL NULL NULL NULL NULL 10
+1 SIMPLE t2 range a,b b 5 NULL 201 Using where; Using join buffer (flat, BNL join)
+drop table t0,t1,t2;
diff --git a/mysql-test/r/repair.result b/mysql-test/r/repair.result
index 52ae9c3..51c3374 100644
--- a/mysql-test/r/repair.result
+++ b/mysql-test/r/repair.result
@@ -207,3 +207,10 @@ check table t1;
Table Op Msg_type Msg_text
test.t1 check status OK
drop table t1;
+create table t1 (a blob);
+create view v1 as select * from t1;
+repair view v1;
+Table Op Msg_type Msg_text
+test.v1 repair status OK
+drop view v1;
+drop table t1;
diff --git a/mysql-test/r/ssl_7937,nossl.result b/mysql-test/r/ssl_7937,nossl.result
new file mode 100644
index 0000000..7269323
--- /dev/null
+++ b/mysql-test/r/ssl_7937,nossl.result
@@ -0,0 +1,15 @@
+create procedure have_ssl()
+select if(variable_value > '','yes','no') as 'have_ssl'
+ from information_schema.session_status
+where variable_name='ssl_cipher';
+mysql --ssl-ca=cacert.pem -e "call test.have_ssl()"
+have_ssl
+no
+mysql --ssl -e "call test.have_ssl()"
+have_ssl
+no
+mysql --ssl-ca=cacert.pem --ssl-verify-server-cert -e "call test.have_ssl()"
+ERROR 2026 (HY000): SSL connection error: SSL is required, but the server does not support it
+mysql --ssl --ssl-verify-server-cert -e "call test.have_ssl()"
+ERROR 2026 (HY000): SSL connection error: SSL is required, but the server does not support it
+drop procedure have_ssl;
diff --git a/mysql-test/r/ssl_7937.result b/mysql-test/r/ssl_7937.result
new file mode 100644
index 0000000..a94ca3b
--- /dev/null
+++ b/mysql-test/r/ssl_7937.result
@@ -0,0 +1,16 @@
+create procedure have_ssl()
+select if(variable_value > '','yes','no') as 'have_ssl'
+ from information_schema.session_status
+where variable_name='ssl_cipher';
+mysql --ssl-ca=cacert.pem -e "call test.have_ssl()"
+have_ssl
+yes
+mysql --ssl -e "call test.have_ssl()"
+have_ssl
+yes
+mysql --ssl-ca=cacert.pem --ssl-verify-server-cert -e "call test.have_ssl()"
+have_ssl
+yes
+mysql --ssl --ssl-verify-server-cert -e "call test.have_ssl()"
+ERROR 2026 (HY000): SSL connection error: Failed to verify the server certificate
+drop procedure have_ssl;
diff --git a/mysql-test/r/truncate-stale-6500.result b/mysql-test/r/truncate-stale-6500.result
new file mode 100644
index 0000000..b622271
--- /dev/null
+++ b/mysql-test/r/truncate-stale-6500.result
@@ -0,0 +1,33 @@
+SET GLOBAL query_cache_size=1024*1024*8;
+CREATE TABLE `test` (
+`uniqueId` INT NOT NULL,
+`partitionId` INT NOT NULL,
+PRIMARY KEY (`uniqueId`,`partitionId`)
+) ENGINE=InnoDB PARTITION BY LIST (partitionId) (
+PARTITION p01 VALUES IN (1),
+PARTITION p02 VALUES IN (2)
+);
+INSERT INTO `test`(`uniqueId`,`partitionId`) VALUES(407237055, 2);
+SELECT * FROM `test`;
+uniqueId partitionId
+407237055 2
+#Confirms 1 row in partition 'p02'
+SELECT TABLE_NAME, PARTITION_NAME, TABLE_ROWS FROM information_schema.PARTITIONS where TABLE_NAME = 'test';
+TABLE_NAME PARTITION_NAME TABLE_ROWS
+test p01 0
+test p02 1
+ALTER TABLE `test` TRUNCATE PARTITION `p02`;
+#Confirms no more rows in partition 'p02'
+SELECT TABLE_NAME, PARTITION_NAME, TABLE_ROWS FROM information_schema.PARTITIONS where TABLE_NAME = 'test';
+TABLE_NAME PARTITION_NAME TABLE_ROWS
+test p01 0
+test p02 0
+#Before the patch, this returned the previously existing values.
+SELECT * FROM `test`;
+uniqueId partitionId
+SELECT SQL_CACHE * FROM `test`;
+uniqueId partitionId
+SELECT SQL_NO_CACHE * FROM `test`;
+uniqueId partitionId
+DROP TABLE test;
+SET GLOBAL query_cache_size=DEFAULT;
diff --git a/mysql-test/r/type_decimal.result b/mysql-test/r/type_decimal.result
index f8649f0..cde8816 100644
--- a/mysql-test/r/type_decimal.result
+++ b/mysql-test/r/type_decimal.result
@@ -994,3 +994,24 @@ GROUP BY t2.col0
WHERE CONCAT(t1.col1, CAST(subq.col0 AS DECIMAL));
1
DROP TABLE t1, t2;
+#
+# Start of 5.5 tests
+#
+#
+# MDEV-8267 Add /*old*/ comment into I_S.COLUMN_TYPE for old DECIMAL
+#
+SHOW CREATE TABLE t1dec102;
+Table Create Table
+t1dec102 CREATE TABLE `t1dec102` (
+ `a` decimal(10,2)/*old*/ DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+SHOW COLUMNS FROM t1dec102;
+Field Type Null Key Default Extra
+a decimal(10,2)/*old*/ YES NULL
+SELECT COLUMN_NAME, DATA_TYPE, COLUMN_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='t1dec102';
+COLUMN_NAME DATA_TYPE COLUMN_TYPE
+a decimal decimal(10,2)/*old*/
+DROP TABLE t1dec102;
+#
+# End of 5.5 tests
+#
diff --git a/mysql-test/r/update_innodb.result b/mysql-test/r/update_innodb.result
new file mode 100644
index 0000000..88c86c5
--- /dev/null
+++ b/mysql-test/r/update_innodb.result
@@ -0,0 +1,31 @@
+CREATE TABLE `t1` (
+`c1` int(11) NOT NULL,
+`c2` datetime DEFAULT NULL,
+PRIMARY KEY (`c1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+CREATE TABLE `t2` (
+`c0` varchar(10) NOT NULL,
+`c1` int(11) NOT NULL,
+`c2` int(11) NOT NULL,
+PRIMARY KEY (`c0`,`c1`),
+KEY `c1` (`c1`),
+KEY `c2` (`c2`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+CREATE TABLE `t3` (
+`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+`c1` datetime NOT NULL,
+`c2` bigint(20) NOT NULL,
+`c3` int(4) unsigned NOT NULL,
+PRIMARY KEY (`id`),
+KEY `c2` (`c2`),
+KEY `c3` (`c3`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+CREATE TABLE `t4` (
+`c1` int(11) NOT NULL,
+`c2` bigint(20) DEFAULT NULL,
+`c3` int(11) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+CREATE ALGORITHM=UNDEFINED VIEW `v1` AS select `t4`.`c1` AS `c1`,`t4`.`c2` AS `c2`,`t4`.`c3` AS `c3` from `t4`;
+UPDATE t1 a JOIN t2 b ON a.c1 = b.c1 JOIN v1 vw ON b.c2 = vw.c1 JOIN t3 del ON vw.c2 = del.c2 SET a.c2 = ( SELECT max(t.c1) FROM t3 t, v1 i WHERE del.c2 = t.c2 AND vw.c3 = i.c3 AND t.c3 = 4 ) WHERE a.c2 IS NULL OR a.c2 < '2011-05-01';
+drop view v1;
+drop table t1,t2,t3,t4;
diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result
index ee9779a..cbacb2c 100644
--- a/mysql-test/r/view.result
+++ b/mysql-test/r/view.result
@@ -5411,6 +5411,24 @@ create view v2 as select t2.* from (t2 left join v1 using (id));
update t3 left join v2 using (id) set flag=flag+1;
drop view v2, v1;
drop table t1, t2, t3;
+#
+# MDEV-7207 - ALTER VIEW does not change ALGORITM
+#
+create table t1 (a int, b int);
+create algorithm=temptable view v2 (c) as select b+1 from t1;
+show create view v2;
+View Create View character_set_client collation_connection
+v2 CREATE ALGORITHM=TEMPTABLE DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select (`t1`.`b` + 1) AS `c` from `t1` latin1 latin1_swedish_ci
+alter algorithm=undefined view v2 (c) as select b+1 from t1;
+show create view v2;
+View Create View character_set_client collation_connection
+v2 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select (`t1`.`b` + 1) AS `c` from `t1` latin1 latin1_swedish_ci
+alter algorithm=merge view v2 (c) as select b+1 from t1;
+show create view v2;
+View Create View character_set_client collation_connection
+v2 CREATE ALGORITHM=MERGE DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select (`t1`.`b` + 1) AS `c` from `t1` latin1 latin1_swedish_ci
+drop view v2;
+drop table t1;
# -----------------------------------------------------------------
# -- End of 5.5 tests.
# -----------------------------------------------------------------
diff --git a/mysql-test/std_data/old_decimal/t1dec102.MYD b/mysql-test/std_data/old_decimal/t1dec102.MYD
new file mode 100644
index 0000000..59e4385
--- /dev/null
+++ b/mysql-test/std_data/old_decimal/t1dec102.MYD
@@ -0,0 +1 @@
+� 123.45� 123.46� 123.47
\ No newline at end of file
diff --git a/mysql-test/std_data/old_decimal/t1dec102.MYI b/mysql-test/std_data/old_decimal/t1dec102.MYI
new file mode 100644
index 0000000..e0b2d4a
Binary files /dev/null and b/mysql-test/std_data/old_decimal/t1dec102.MYI differ
diff --git a/mysql-test/std_data/old_decimal/t1dec102.frm b/mysql-test/std_data/old_decimal/t1dec102.frm
new file mode 100644
index 0000000..652cfc3
Binary files /dev/null and b/mysql-test/std_data/old_decimal/t1dec102.frm differ
diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result
index fc22085..469e670 100644
--- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result
+++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result
@@ -327,6 +327,18 @@ INSERT INTO t2 SET a=1;
INSERT INTO t2 SET b=1;
UPDATE t1, t2 SET t1.a=10, t2.a=20;
DROP TABLE t1,t2;
+INSERT INTO t1dec102 VALUES (-999.99);
+INSERT INTO t1dec102 VALUES (0);
+INSERT INTO t1dec102 VALUES (999.99);
+SELECT * FROM t1dec102 ORDER BY a;
+a
+-999.99
+0.00
+123.45
+123.46
+123.47
+999.99
+DROP TABLE t1dec102;
flush logs;
/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
@@ -4131,6 +4143,59 @@ SET TIMESTAMP=1000000000/*!*/;
DROP TABLE `t1`,`t2` /* generated by server */
/*!*/;
# at #
+#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0
+SET TIMESTAMP=1000000000/*!*/;
+BEGIN
+/*!*/;
+# at #
+# at #
+#010909 4:46:40 server id 1 end_log_pos # Table_map: `test`.`t1dec102` mapped to number #
+#010909 4:46:40 server id 1 end_log_pos # Write_rows: table id # flags: STMT_END_F
+### INSERT INTO `test`.`t1dec102`
+### SET
+### @1=!! Old DECIMAL (mysql-4.1 or earlier). Not enough metadata to display the value. # at #
+#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0
+SET TIMESTAMP=1000000000/*!*/;
+COMMIT
+/*!*/;
+# at #
+#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0
+SET TIMESTAMP=1000000000/*!*/;
+BEGIN
+/*!*/;
+# at #
+# at #
+#010909 4:46:40 server id 1 end_log_pos # Table_map: `test`.`t1dec102` mapped to number #
+#010909 4:46:40 server id 1 end_log_pos # Write_rows: table id # flags: STMT_END_F
+### INSERT INTO `test`.`t1dec102`
+### SET
+### @1=!! Old DECIMAL (mysql-4.1 or earlier). Not enough metadata to display the value. # at #
+#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0
+SET TIMESTAMP=1000000000/*!*/;
+COMMIT
+/*!*/;
+# at #
+#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0
+SET TIMESTAMP=1000000000/*!*/;
+BEGIN
+/*!*/;
+# at #
+# at #
+#010909 4:46:40 server id 1 end_log_pos # Table_map: `test`.`t1dec102` mapped to number #
+#010909 4:46:40 server id 1 end_log_pos # Write_rows: table id # flags: STMT_END_F
+### INSERT INTO `test`.`t1dec102`
+### SET
+### @1=!! Old DECIMAL (mysql-4.1 or earlier). Not enough metadata to display the value. # at #
+#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0
+SET TIMESTAMP=1000000000/*!*/;
+COMMIT
+/*!*/;
+# at #
+#010909 4:46:40 server id 1 end_log_pos # Query thread_id=# exec_time=# error_code=0
+SET TIMESTAMP=1000000000/*!*/;
+DROP TABLE `t1dec102` /* generated by server */
+/*!*/;
+# at #
#010909 4:46:40 server id 1 end_log_pos # Rotate to master-bin.000002 pos: 4
DELIMITER ;
# End of log file
diff --git a/mysql-test/suite/binlog/t/binlog_mysqlbinlog_row.test b/mysql-test/suite/binlog/t/binlog_mysqlbinlog_row.test
index 9b41c63..9609a9a 100644
--- a/mysql-test/suite/binlog/t/binlog_mysqlbinlog_row.test
+++ b/mysql-test/suite/binlog/t/binlog_mysqlbinlog_row.test
@@ -438,9 +438,20 @@ INSERT INTO t2 SET b=1;
UPDATE t1, t2 SET t1.a=10, t2.a=20;
DROP TABLE t1,t2;
+let $MYSQLD_DATADIR= `select @@datadir`;
+
+--copy_file std_data/old_decimal/t1dec102.frm $MYSQLD_DATADIR/test/t1dec102.frm
+--copy_file std_data/old_decimal/t1dec102.MYD $MYSQLD_DATADIR/test/t1dec102.MYD
+--copy_file std_data/old_decimal/t1dec102.MYI $MYSQLD_DATADIR/test/t1dec102.MYI
+
+INSERT INTO t1dec102 VALUES (-999.99);
+INSERT INTO t1dec102 VALUES (0);
+INSERT INTO t1dec102 VALUES (999.99);
+SELECT * FROM t1dec102 ORDER BY a;
+DROP TABLE t1dec102;
+
flush logs;
-let $MYSQLD_DATADIR= `select @@datadir`;
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
--replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/ /server v [^ ]*/server v #.##.##/ /(@[0-9]*=[0-9]*[.][0-9]{1,3})[0-9e+-]*[^ ]*(.*(FLOAT|DOUBLE).*[*].)/\1...\2/
--exec $MYSQL_BINLOG --base64-output=decode-rows -v -v $MYSQLD_DATADIR/master-bin.000001
diff --git a/mysql-test/suite/binlog/t/binlog_row_mysqlbinlog_options.test b/mysql-test/suite/binlog/t/binlog_row_mysqlbinlog_options.test
index c1756b2..daf4969 100644
--- a/mysql-test/suite/binlog/t/binlog_row_mysqlbinlog_options.test
+++ b/mysql-test/suite/binlog/t/binlog_row_mysqlbinlog_options.test
@@ -45,8 +45,8 @@ INSERT INTO t3 VALUES (1),(2);
INSERT INTO test1.t1 VALUES (3,3);
USE test1;
-LOAD DATA INFILE '../../std_data/loaddata7.dat' INTO TABLE t1
- FIELDS TERMINATED BY ',' LINES TERMINATED BY '\r\n';
+LOAD DATA INFILE '../../std_data/loaddata7.dat' INTO TABLE t1
+ FIELDS TERMINATED BY ',' LINES TERMINATED BY '\r\n';
DELETE FROM test3.t3 WHERE a=1;
flush logs;
diff --git a/mysql-test/suite/innodb/r/xa_recovery.result b/mysql-test/suite/innodb/r/xa_recovery.result
new file mode 100644
index 0000000..84cb37e
--- /dev/null
+++ b/mysql-test/suite/innodb/r/xa_recovery.result
@@ -0,0 +1,17 @@
+CREATE TABLE t1 (a INT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1);
+XA START 'x';
+UPDATE t1 set a=2;
+XA END 'x';
+XA PREPARE 'x';
+call mtr.add_suppression("Found 1 prepared XA transactions");
+SELECT * FROM t1 LOCK IN SHARE MODE;
+SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+SELECT * FROM t1;
+a
+2
+XA ROLLBACK 'x';
+SELECT * FROM t1;
+a
+1
+DROP TABLE t1;
diff --git a/mysql-test/suite/innodb/t/foreign-keys.test b/mysql-test/suite/innodb/t/foreign-keys.test
index 8ee9634..2d586e2 100644
--- a/mysql-test/suite/innodb/t/foreign-keys.test
+++ b/mysql-test/suite/innodb/t/foreign-keys.test
@@ -1,11 +1,6 @@
--source include/have_innodb.inc
--source include/have_debug.inc
-if (`select plugin_auth_version <= "5.5.39-MariaDB-36.0" from information_schema.plugins where plugin_name='innodb'`)
-{
- --skip Not fixed in XtraDB as of 5.5.39-MariaDB-36.0 or earlier
-}
-
--echo #
--echo # Bug #19471516 SERVER CRASHES WHEN EXECUTING ALTER TABLE
--echo # ADD FOREIGN KEY
diff --git a/mysql-test/suite/innodb/t/innodb-autoinc.test b/mysql-test/suite/innodb/t/innodb-autoinc.test
index fd40b50..a8dda12 100644
--- a/mysql-test/suite/innodb/t/innodb-autoinc.test
+++ b/mysql-test/suite/innodb/t/innodb-autoinc.test
@@ -1,8 +1,3 @@
-if (`select plugin_auth_version <= "5.5.37-MariaDB-34.0" from information_schema.plugins where plugin_name='innodb'`)
-{
- --skip Not fixed in XtraDB as of 5.5.37-MariaDB-34.0 or earlier
-}
-
--source include/have_innodb.inc
# embedded server ignores 'delayed', so skip this
-- source include/not_embedded.inc
diff --git a/mysql-test/suite/innodb/t/insert_debug.test b/mysql-test/suite/innodb/t/insert_debug.test
index d9096c4..36ceba2 100644
--- a/mysql-test/suite/innodb/t/insert_debug.test
+++ b/mysql-test/suite/innodb/t/insert_debug.test
@@ -2,11 +2,6 @@
--source include/have_debug.inc
--source include/have_partition.inc
-if (`select plugin_auth_version <= "5.5.40-MariaDB-36.1" from information_schema.plugins where plugin_name='innodb'`)
-{
- --skip Not fixed in XtraDB as of 5.5.40-MariaDB-36.1 or earlier
-}
-
--echo #
--echo # Bug#19904003 INNODB_LIMIT_OPTIMISTIC_INSERT_DEBUG=1
--echo # CAUSES INFINITE PAGE SPLIT
diff --git a/mysql-test/suite/innodb/t/sp_temp_table.test b/mysql-test/suite/innodb/t/sp_temp_table.test
index fca661f..b2883f5 100644
--- a/mysql-test/suite/innodb/t/sp_temp_table.test
+++ b/mysql-test/suite/innodb/t/sp_temp_table.test
@@ -1,11 +1,6 @@
--source include/have_innodb.inc
--source include/big_test.inc
-if (`select plugin_auth_version <= "5.5.40-MariaDB-36.1" from information_schema.plugins where plugin_name='innodb'`)
-{
- --skip Not fixed in XtraDB as of 5.5.40-MariaDB-36.1 or earlier
-}
-
--echo #
--echo # Bug #19306524 FAILING ASSERTION WITH TEMP TABLE FOR A PROCEDURE
--echo # CALLED FROM A FUNCTION
diff --git a/mysql-test/suite/innodb/t/strict_mode.test b/mysql-test/suite/innodb/t/strict_mode.test
index 9b11509..86b56a0 100644
--- a/mysql-test/suite/innodb/t/strict_mode.test
+++ b/mysql-test/suite/innodb/t/strict_mode.test
@@ -1,10 +1,5 @@
--source include/have_innodb.inc
-if (`select plugin_auth_version <= "5.5.40-MariaDB-36.1" from information_schema.plugins where plugin_name='innodb'`)
-{
- --skip Not fixed in XtraDB as of 5.5.40-MariaDB-36.1 or earlier
-}
-
--echo #
--echo # Bug #17852083 PRINT A WARNING WHEN DDL HAS AN ERROR IN
--echo # INNODB_STRICT_MODE = 1
diff --git a/mysql-test/suite/innodb/t/xa_recovery.test b/mysql-test/suite/innodb/t/xa_recovery.test
new file mode 100644
index 0000000..ff6da07
--- /dev/null
+++ b/mysql-test/suite/innodb/t/xa_recovery.test
@@ -0,0 +1,47 @@
+if (`select plugin_auth_version <= "5.5.43-MariaDB-37.2" from information_schema.plugins where plugin_name='innodb'`)
+{
+ --skip Not fixed in XtraDB as of 5.5.43-MariaDB-37.2 or earlier
+}
+--source include/have_innodb.inc
+# Embedded server does not support restarting.
+--source include/not_embedded.inc
+
+CREATE TABLE t1 (a INT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1);
+connect (con1,localhost,root);
+XA START 'x'; UPDATE t1 set a=2; XA END 'x'; XA PREPARE 'x';
+connection default;
+
+call mtr.add_suppression("Found 1 prepared XA transactions");
+
+# Kill and restart the server.
+-- exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+-- shutdown_server 0
+-- source include/wait_until_disconnected.inc
+
+-- exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+-- enable_reconnect
+-- source include/wait_until_connected_again.inc
+-- disable_reconnect
+
+disconnect con1;
+connect (con1,localhost,root);
+--send SELECT * FROM t1 LOCK IN SHARE MODE
+
+connection default;
+let $wait_condition=
+ select count(*) = 1 from information_schema.processlist
+ where state = 'Sending data' and
+ info = 'SELECT * FROM t1 LOCK IN SHARE MODE';
+--source include/wait_condition.inc
+
+--source include/restart_mysqld.inc
+
+disconnect con1;
+
+SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+SELECT * FROM t1;
+XA ROLLBACK 'x';
+SELECT * FROM t1;
+
+DROP TABLE t1;
diff --git a/mysql-test/suite/maria/optimize.result b/mysql-test/suite/maria/optimize.result
index 9cce55d..a78e8e4 100644
--- a/mysql-test/suite/maria/optimize.result
+++ b/mysql-test/suite/maria/optimize.result
@@ -6,3 +6,14 @@ OPTIMIZE TABLE t1;
Table Op Msg_type Msg_text
test.t1 optimize status OK
drop table t1;
+#
+# MDEV-3870 - Valgrind warnings on OPTIMIZE MyISAM or Aria TABLE with
+# disabled keys
+#
+CREATE TABLE t1 (a INT, KEY(a)) ENGINE=Aria;
+INSERT INTO t1 VALUES (4),(3),(1),(0);
+ALTER TABLE t1 DISABLE KEYS;
+OPTIMIZE TABLE t1;
+Table Op Msg_type Msg_text
+test.t1 optimize status OK
+DROP TABLE t1;
diff --git a/mysql-test/suite/maria/optimize.test b/mysql-test/suite/maria/optimize.test
index 6b310b1..b1fc250 100644
--- a/mysql-test/suite/maria/optimize.test
+++ b/mysql-test/suite/maria/optimize.test
@@ -160,3 +160,13 @@ INSERT /*! IGNORE */ INTO t1 VALUES ('urxjxqvwabikpugvexxbxdpxjkeqiuhhuadbcuhoz
check table t1;
OPTIMIZE TABLE t1;
drop table t1;
+
+--echo #
+--echo # MDEV-3870 - Valgrind warnings on OPTIMIZE MyISAM or Aria TABLE with
+--echo # disabled keys
+--echo #
+CREATE TABLE t1 (a INT, KEY(a)) ENGINE=Aria;
+INSERT INTO t1 VALUES (4),(3),(1),(0);
+ALTER TABLE t1 DISABLE KEYS;
+OPTIMIZE TABLE t1;
+DROP TABLE t1;
diff --git a/mysql-test/suite/optimizer_unfixed_bugs/t/bug42991.test b/mysql-test/suite/optimizer_unfixed_bugs/t/bug42991.test
index 6c6b416..2b5864a 100644
--- a/mysql-test/suite/optimizer_unfixed_bugs/t/bug42991.test
+++ b/mysql-test/suite/optimizer_unfixed_bugs/t/bug42991.test
@@ -1,248 +1,248 @@
---source include/have_debug.inc
-# Test for BUG#42991 "invalid memory access and/or crash when using
-# index condition pushdown + InnoDB"
-# Note that you need to run with --valgrind to see the warnings
-# about invalid memory accesses.
-
---source include/have_innodb.inc
-
-# Valgrind errors happen only with this:
-set session debug_dbug="+d,optimizer_innodb_icp";
-
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
-
-DROP TABLE IF EXISTS `table5`;
-SET @saved_cs_client = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `table5` (
- `col0` mediumtext,
- `col1` varchar(90) DEFAULT NULL,
- `col2` tinytext,
- `col3` time DEFAULT NULL,
- `col4` tinyint(1) DEFAULT NULL,
- `col5` tinytext,
- `col6` tinyint(1) DEFAULT NULL,
- `col7` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
- `col8` tinyblob,
- `col9` tinyint(4) DEFAULT NULL,
- `col10` year(4) DEFAULT NULL,
- `col11` set('test1','test2','test3') DEFAULT NULL,
- `col12` text,
- `col13` char(248) DEFAULT NULL,
- `col14` bigint(20) DEFAULT NULL,
- `col15` text,
- `col16` tinyint(4) DEFAULT NULL,
- `col17` decimal(10,0) DEFAULT NULL,
- `col18` set('test1','test2','test3') DEFAULT NULL,
- `col19` varchar(255) DEFAULT NULL,
- `col20` float DEFAULT NULL,
- `col21` int(11) DEFAULT NULL,
- `col22` text,
- `col23` tinyint(1) DEFAULT NULL,
- `col24` decimal(10,0) NOT NULL DEFAULT '0',
- `col25` double DEFAULT NULL,
- `col26` float DEFAULT NULL,
- `col27` tinyblob,
- `col28` decimal(10,0) DEFAULT NULL,
- `col29` mediumblob,
- `col30` date DEFAULT NULL,
- `col31` longtext,
- `col32` date DEFAULT NULL,
- `col33` float DEFAULT NULL,
- `col34` bigint(20) DEFAULT NULL,
- `col35` tinytext,
- `col36` mediumtext,
- `col37` time DEFAULT NULL,
- `col38` int(11) DEFAULT NULL,
- `col39` tinyint(4) DEFAULT NULL,
- `col40` set('test1','test2','test3') DEFAULT NULL,
- `col41` char(130) DEFAULT NULL,
- `col42` smallint(6) DEFAULT NULL,
- `col43` int(11) DEFAULT NULL,
- `col44` mediumtext,
- `col45` varchar(126) DEFAULT NULL,
- `col46` int(11) DEFAULT NULL,
- `col47` double DEFAULT NULL,
- `col48` bigint(20) DEFAULT NULL,
- `col49` mediumtext,
- `col50` tinyblob,
- `col51` mediumint(9) DEFAULT NULL,
- `col52` text,
- `col53` varchar(208) DEFAULT NULL,
- `col54` varchar(207) DEFAULT NULL,
- `col55` decimal(10,0) DEFAULT NULL,
- `col56` datetime DEFAULT NULL,
- `col57` enum('test1','test2','test3') DEFAULT NULL,
- `col58` decimal(10,0) DEFAULT NULL,
- `col59` tinyblob,
- `col60` varchar(73) DEFAULT NULL,
- `col61` mediumtext,
- `col62` tinyblob,
- `col63` datetime DEFAULT NULL,
- `col64` decimal(10,0) DEFAULT NULL,
- `col65` mediumint(9) DEFAULT NULL,
- `col66` datetime DEFAULT NULL,
- `col67` decimal(10,0) DEFAULT NULL,
- `col68` tinyint(4) DEFAULT NULL,
- `col69` varchar(58) DEFAULT NULL,
- `col70` decimal(10,0) DEFAULT NULL,
- `col71` mediumtext,
- `col72` date DEFAULT NULL,
- `col73` time DEFAULT NULL,
- `col74` double DEFAULT NULL,
- `col75` decimal(10,0) DEFAULT NULL,
- `col76` mediumblob,
- `col77` double DEFAULT NULL,
- `col78` year(4) DEFAULT NULL,
- `col79` year(4) DEFAULT NULL,
- `col80` varchar(255) DEFAULT NULL,
- `col81` blob,
- `col82` bigint(20) DEFAULT NULL,
- `col83` enum('test1','test2','test3') DEFAULT NULL,
- `col84` decimal(10,0) DEFAULT NULL,
- `col85` set('test1','test2','test3') DEFAULT NULL,
- `col86` mediumtext,
- `col87` varchar(255) DEFAULT NULL,
- `col88` time DEFAULT NULL,
- `col89` enum('test1','test2','test3') DEFAULT NULL,
- `col90` decimal(10,0) DEFAULT NULL,
- `col91` float DEFAULT NULL,
- `col92` datetime DEFAULT NULL,
- `col93` tinytext,
- `col94` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
- `col95` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
- `col96` text,
- `col97` double DEFAULT NULL,
- `col98` varchar(198) DEFAULT NULL,
- `col99` time DEFAULT NULL,
- `col100` tinyint(4) DEFAULT NULL,
- `col101` bigint(20) DEFAULT NULL,
- `col102` varchar(255) DEFAULT NULL,
- `col103` varchar(255) DEFAULT NULL,
- `col104` mediumint(9) DEFAULT NULL,
- `col105` mediumtext,
- `col106` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
- `col107` smallint(6) DEFAULT NULL,
- `col108` decimal(10,0) DEFAULT NULL,
- `col109` decimal(10,0) DEFAULT NULL,
- `col110` float DEFAULT NULL,
- `col111` decimal(10,0) DEFAULT NULL,
- `col112` double DEFAULT NULL,
- `col113` tinytext,
- `col114` float DEFAULT NULL,
- `col115` varchar(7) DEFAULT NULL,
- `col116` longtext,
- `col117` date DEFAULT NULL,
- `col118` bigint(20) DEFAULT NULL,
- `col119` text,
- `col120` bigint(20) DEFAULT NULL,
- `col121` blob,
- `col122` char(110) DEFAULT NULL,
- `col123` decimal(10,0) DEFAULT NULL,
- `col124` mediumblob,
- `col125` decimal(10,0) DEFAULT NULL,
- `col126` decimal(10,0) DEFAULT NULL,
- `col127` tinyint(1) DEFAULT NULL,
- `col128` time DEFAULT NULL,
- `col129` tinyblob,
- `col130` tinyblob,
- `col131` date DEFAULT NULL,
- `col132` int(11) DEFAULT NULL,
- `col133` varchar(123) DEFAULT NULL,
- `col134` char(238) DEFAULT NULL,
- `col135` varchar(225) DEFAULT NULL,
- `col136` longtext,
- `col137` varchar(255) DEFAULT NULL,
- `col138` double DEFAULT NULL,
- `col139` tinyblob,
- `col140` datetime DEFAULT NULL,
- `col141` tinytext,
- `col142` varchar(255) DEFAULT NULL,
- `col143` bigint(20) DEFAULT NULL,
- `col144` varchar(236) DEFAULT NULL,
- `col145` text,
- `col146` year(4) DEFAULT NULL,
- `col147` decimal(10,0) DEFAULT NULL,
- `col148` text,
- `col149` mediumblob,
- `col150` tinyint(4) DEFAULT NULL,
- `col151` tinyint(1) DEFAULT NULL,
- `col152` varchar(72) DEFAULT NULL,
- `col153` int(11) DEFAULT NULL,
- `col154` varchar(165) DEFAULT NULL,
- `col155` tinyint(4) DEFAULT NULL,
- `col156` mediumtext,
- `col157` double DEFAULT NULL,
- `col158` time DEFAULT NULL,
- `col159` mediumblob,
- `col160` varchar(255) DEFAULT NULL,
- `col161` datetime DEFAULT NULL,
- `col162` double DEFAULT NULL,
- `col163` blob,
- `col164` enum('test1','test2','test3') DEFAULT NULL,
- `col165` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
- `col166` date DEFAULT NULL,
- `col167` tinyblob,
- `col168` tinyblob,
- `col169` varchar(255) DEFAULT NULL,
- `col170` datetime DEFAULT NULL,
- `col171` bigint(20) DEFAULT NULL,
- `col172` varchar(30) DEFAULT NULL,
- `col173` longtext,
- `col174` time DEFAULT NULL,
- `col175` float DEFAULT NULL,
- PRIMARY KEY (`col24`),
- KEY `idx0` (`col16`,`col156`(139),`col97`,`col120`),
- KEY `idx1` (`col24`,`col0`(108)),
- KEY `idx2` (`col117`,`col173`(34),`col132`,`col82`),
- KEY `idx3` (`col2`(86)),
- KEY `idx4` (`col2`(43)),
- KEY `idx5` (`col83`,`col35`(87),`col111`),
- KEY `idx6` (`col6`,`col134`,`col92`),
- KEY `idx7` (`col56`),
- KEY `idx8` (`col30`,`col53`,`col129`(66)),
- KEY `idx9` (`col53`,`col113`(211),`col32`,`col15`(75)),
- KEY `idx10` (`col34`),
- KEY `idx11` (`col126`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
-
-
-LOCK TABLES `table5` WRITE;
-/*!40000 ALTER TABLE `table5` DISABLE KEYS */;
-INSERT INTO `table5` VALUES ('referenda','hermaphroditism','superable','00:00:00',-128,NULL,-128,'0000-00-00 00:00:00',NULL,-128,1901,NULL,'blandly',NULL,6541,'unsuspectingly',NULL,'7250','',NULL,-31358,26248,'Kilmarnock\'s',127,'-27305',28987,NULL,NULL,'-30388','utilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitarians [...]
-INSERT INTO `table5` VALUES ('hemoglobin\'s','Toffey\'s','Juvenal','00:00:00',-128,'harmonicon',-128,'2004-02-13 09:45:46',NULL,NULL,1911,'','Tananarive\'s',NULL,30666,'spiniferous',127,'30675','','Frederick\'sFrederick\'sFrederick\'sFrederick\'sFrederick\'sFrederick\'sFrederick\'sFrederick\'sFrederick\'sFrederick\'sFrederick\'sFrederick\'sFrederick\'sFrederick\'sFrederick\'sFrederick\'sFrederick\'sFrederick\'sFrederick\'sFrederick\'sFrederick\'sFrederick\'sFrederick\'sFr',30388,4769,'Er [...]
-INSERT INTO `table5` VALUES (NULL,'Annmarie','intangibleness\'s','00:00:00',-128,'transmogrify',127,'0000-00-00 00:00:00',NULL,127,2093,'','enamored','refired',-21296,'neglectful',127,'-9992','',NULL,NULL,3583,'Lockheed\'s',127,'-15717',-29743,-16280,'embouchureembouchureembouchureembouchureembouchureembouchureembouchureembouchureembouchureembouchureembouchureembouchureembouchureembouchureembouchureembouchureembouchureembouchureembouchureembouchureembouchureembouchureembouchureembouchure [...]
-INSERT INTO `table5` VALUES ('caddishly',NULL,'Kotah','00:00:00',-128,'tailoring',127,'0000-00-00 00:00:00','trustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustie',-128,1967,NULL,NULL,'parallelisms',NULL,NULL,127,NULL,'',NULL,NULL,-513,NULL,NULL,'-14518',NULL,-22393,'AngeliAngeliAngeliAnge [...]
-INSERT INTO `table5` VALUES ('bassoonist\'s',NULL,'refastens','114:27:50',127,'unrestricted',127,'2032-01-13 11:11:22','abstainer\'sabstainer\'sabstainer\'sabstainer\'sabstainer\'sabstainer\'sabstainer\'sabstainer\'sabstainer\'sabstainer\'sabstainer\'sabstainer\'sabstainer\'sabstainer\'sabstainer\'sabstainer\'sabstainer\'sabstainer\'sabstainer\'sabstainer\'sabstainer\'sabstainer\'sabstainer\'s',NULL,1955,'','Hodosh','allocates',-5067,'Cenac\'s',-128,'31546',NULL,'impassabilityimpassabili [...]
-INSERT INTO `table5` VALUES ('segmentation\'s','shapelessness\'s','coagulators','127:46:24',-128,NULL,127,'0000-00-00 00:00:00','seekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingsee',NULL,2085,'','indent','flyblown',NULL,'Alegre',-128,'-27917','','DesiraeDesiraeDesiraeDesiraeDesiraeDesira [...]
-INSERT INTO `table5` VALUES ('Frasquito\'s','unsatisfactory','jetted','00:00:00',NULL,'Merlin\'s',127,'0000-00-00 00:00:00',NULL,NULL,1998,'','decomposer','Commons',-14813,'oversimplification\'s',NULL,'-5368','','engirdengirdengirdengirdengirdengirdengirdengirdengird',-13627,14305,'frontally',127,'18421',-32295,NULL,NULL,'21841',NULL,'0000-00-00','cytology','2424-00-17',-30542,-17621,'octarchy\'s','outfoxed','00:00:00',27469,-128,'','Kamat\'s',-24130,-5948,'riband','Betsy',NULL,-18769,NU [...]
-/*!40000 ALTER TABLE `table5` ENABLE KEYS */;
-UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
-
-#explain select * from `table5` where (col2 <= '6566-06-15' AND col24 <> 'd') group by `col83` order by `col83` desc ;
-
-select * from `table5` where (col2 <= '6566-06-15' AND col24 <> 'd') group by `col83` order by `col83` desc ;
-
-drop table `table5`;
+--source include/have_debug.inc
+# Test for BUG#42991 "invalid memory access and/or crash when using
+# index condition pushdown + InnoDB"
+# Note that you need to run with --valgrind to see the warnings
+# about invalid memory accesses.
+
+--source include/have_innodb.inc
+
+# Valgrind errors happen only with this:
+set session debug_dbug="+d,optimizer_innodb_icp";
+
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+
+DROP TABLE IF EXISTS `table5`;
+SET @saved_cs_client = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `table5` (
+ `col0` mediumtext,
+ `col1` varchar(90) DEFAULT NULL,
+ `col2` tinytext,
+ `col3` time DEFAULT NULL,
+ `col4` tinyint(1) DEFAULT NULL,
+ `col5` tinytext,
+ `col6` tinyint(1) DEFAULT NULL,
+ `col7` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ `col8` tinyblob,
+ `col9` tinyint(4) DEFAULT NULL,
+ `col10` year(4) DEFAULT NULL,
+ `col11` set('test1','test2','test3') DEFAULT NULL,
+ `col12` text,
+ `col13` char(248) DEFAULT NULL,
+ `col14` bigint(20) DEFAULT NULL,
+ `col15` text,
+ `col16` tinyint(4) DEFAULT NULL,
+ `col17` decimal(10,0) DEFAULT NULL,
+ `col18` set('test1','test2','test3') DEFAULT NULL,
+ `col19` varchar(255) DEFAULT NULL,
+ `col20` float DEFAULT NULL,
+ `col21` int(11) DEFAULT NULL,
+ `col22` text,
+ `col23` tinyint(1) DEFAULT NULL,
+ `col24` decimal(10,0) NOT NULL DEFAULT '0',
+ `col25` double DEFAULT NULL,
+ `col26` float DEFAULT NULL,
+ `col27` tinyblob,
+ `col28` decimal(10,0) DEFAULT NULL,
+ `col29` mediumblob,
+ `col30` date DEFAULT NULL,
+ `col31` longtext,
+ `col32` date DEFAULT NULL,
+ `col33` float DEFAULT NULL,
+ `col34` bigint(20) DEFAULT NULL,
+ `col35` tinytext,
+ `col36` mediumtext,
+ `col37` time DEFAULT NULL,
+ `col38` int(11) DEFAULT NULL,
+ `col39` tinyint(4) DEFAULT NULL,
+ `col40` set('test1','test2','test3') DEFAULT NULL,
+ `col41` char(130) DEFAULT NULL,
+ `col42` smallint(6) DEFAULT NULL,
+ `col43` int(11) DEFAULT NULL,
+ `col44` mediumtext,
+ `col45` varchar(126) DEFAULT NULL,
+ `col46` int(11) DEFAULT NULL,
+ `col47` double DEFAULT NULL,
+ `col48` bigint(20) DEFAULT NULL,
+ `col49` mediumtext,
+ `col50` tinyblob,
+ `col51` mediumint(9) DEFAULT NULL,
+ `col52` text,
+ `col53` varchar(208) DEFAULT NULL,
+ `col54` varchar(207) DEFAULT NULL,
+ `col55` decimal(10,0) DEFAULT NULL,
+ `col56` datetime DEFAULT NULL,
+ `col57` enum('test1','test2','test3') DEFAULT NULL,
+ `col58` decimal(10,0) DEFAULT NULL,
+ `col59` tinyblob,
+ `col60` varchar(73) DEFAULT NULL,
+ `col61` mediumtext,
+ `col62` tinyblob,
+ `col63` datetime DEFAULT NULL,
+ `col64` decimal(10,0) DEFAULT NULL,
+ `col65` mediumint(9) DEFAULT NULL,
+ `col66` datetime DEFAULT NULL,
+ `col67` decimal(10,0) DEFAULT NULL,
+ `col68` tinyint(4) DEFAULT NULL,
+ `col69` varchar(58) DEFAULT NULL,
+ `col70` decimal(10,0) DEFAULT NULL,
+ `col71` mediumtext,
+ `col72` date DEFAULT NULL,
+ `col73` time DEFAULT NULL,
+ `col74` double DEFAULT NULL,
+ `col75` decimal(10,0) DEFAULT NULL,
+ `col76` mediumblob,
+ `col77` double DEFAULT NULL,
+ `col78` year(4) DEFAULT NULL,
+ `col79` year(4) DEFAULT NULL,
+ `col80` varchar(255) DEFAULT NULL,
+ `col81` blob,
+ `col82` bigint(20) DEFAULT NULL,
+ `col83` enum('test1','test2','test3') DEFAULT NULL,
+ `col84` decimal(10,0) DEFAULT NULL,
+ `col85` set('test1','test2','test3') DEFAULT NULL,
+ `col86` mediumtext,
+ `col87` varchar(255) DEFAULT NULL,
+ `col88` time DEFAULT NULL,
+ `col89` enum('test1','test2','test3') DEFAULT NULL,
+ `col90` decimal(10,0) DEFAULT NULL,
+ `col91` float DEFAULT NULL,
+ `col92` datetime DEFAULT NULL,
+ `col93` tinytext,
+ `col94` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+ `col95` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+ `col96` text,
+ `col97` double DEFAULT NULL,
+ `col98` varchar(198) DEFAULT NULL,
+ `col99` time DEFAULT NULL,
+ `col100` tinyint(4) DEFAULT NULL,
+ `col101` bigint(20) DEFAULT NULL,
+ `col102` varchar(255) DEFAULT NULL,
+ `col103` varchar(255) DEFAULT NULL,
+ `col104` mediumint(9) DEFAULT NULL,
+ `col105` mediumtext,
+ `col106` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+ `col107` smallint(6) DEFAULT NULL,
+ `col108` decimal(10,0) DEFAULT NULL,
+ `col109` decimal(10,0) DEFAULT NULL,
+ `col110` float DEFAULT NULL,
+ `col111` decimal(10,0) DEFAULT NULL,
+ `col112` double DEFAULT NULL,
+ `col113` tinytext,
+ `col114` float DEFAULT NULL,
+ `col115` varchar(7) DEFAULT NULL,
+ `col116` longtext,
+ `col117` date DEFAULT NULL,
+ `col118` bigint(20) DEFAULT NULL,
+ `col119` text,
+ `col120` bigint(20) DEFAULT NULL,
+ `col121` blob,
+ `col122` char(110) DEFAULT NULL,
+ `col123` decimal(10,0) DEFAULT NULL,
+ `col124` mediumblob,
+ `col125` decimal(10,0) DEFAULT NULL,
+ `col126` decimal(10,0) DEFAULT NULL,
+ `col127` tinyint(1) DEFAULT NULL,
+ `col128` time DEFAULT NULL,
+ `col129` tinyblob,
+ `col130` tinyblob,
+ `col131` date DEFAULT NULL,
+ `col132` int(11) DEFAULT NULL,
+ `col133` varchar(123) DEFAULT NULL,
+ `col134` char(238) DEFAULT NULL,
+ `col135` varchar(225) DEFAULT NULL,
+ `col136` longtext,
+ `col137` varchar(255) DEFAULT NULL,
+ `col138` double DEFAULT NULL,
+ `col139` tinyblob,
+ `col140` datetime DEFAULT NULL,
+ `col141` tinytext,
+ `col142` varchar(255) DEFAULT NULL,
+ `col143` bigint(20) DEFAULT NULL,
+ `col144` varchar(236) DEFAULT NULL,
+ `col145` text,
+ `col146` year(4) DEFAULT NULL,
+ `col147` decimal(10,0) DEFAULT NULL,
+ `col148` text,
+ `col149` mediumblob,
+ `col150` tinyint(4) DEFAULT NULL,
+ `col151` tinyint(1) DEFAULT NULL,
+ `col152` varchar(72) DEFAULT NULL,
+ `col153` int(11) DEFAULT NULL,
+ `col154` varchar(165) DEFAULT NULL,
+ `col155` tinyint(4) DEFAULT NULL,
+ `col156` mediumtext,
+ `col157` double DEFAULT NULL,
+ `col158` time DEFAULT NULL,
+ `col159` mediumblob,
+ `col160` varchar(255) DEFAULT NULL,
+ `col161` datetime DEFAULT NULL,
+ `col162` double DEFAULT NULL,
+ `col163` blob,
+ `col164` enum('test1','test2','test3') DEFAULT NULL,
+ `col165` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+ `col166` date DEFAULT NULL,
+ `col167` tinyblob,
+ `col168` tinyblob,
+ `col169` varchar(255) DEFAULT NULL,
+ `col170` datetime DEFAULT NULL,
+ `col171` bigint(20) DEFAULT NULL,
+ `col172` varchar(30) DEFAULT NULL,
+ `col173` longtext,
+ `col174` time DEFAULT NULL,
+ `col175` float DEFAULT NULL,
+ PRIMARY KEY (`col24`),
+ KEY `idx0` (`col16`,`col156`(139),`col97`,`col120`),
+ KEY `idx1` (`col24`,`col0`(108)),
+ KEY `idx2` (`col117`,`col173`(34),`col132`,`col82`),
+ KEY `idx3` (`col2`(86)),
+ KEY `idx4` (`col2`(43)),
+ KEY `idx5` (`col83`,`col35`(87),`col111`),
+ KEY `idx6` (`col6`,`col134`,`col92`),
+ KEY `idx7` (`col56`),
+ KEY `idx8` (`col30`,`col53`,`col129`(66)),
+ KEY `idx9` (`col53`,`col113`(211),`col32`,`col15`(75)),
+ KEY `idx10` (`col34`),
+ KEY `idx11` (`col126`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+
+LOCK TABLES `table5` WRITE;
+/*!40000 ALTER TABLE `table5` DISABLE KEYS */;
+INSERT INTO `table5` VALUES ('referenda','hermaphroditism','superable','00:00:00',-128,NULL,-128,'0000-00-00 00:00:00',NULL,-128,1901,NULL,'blandly',NULL,6541,'unsuspectingly',NULL,'7250','',NULL,-31358,26248,'Kilmarnock\'s',127,'-27305',28987,NULL,NULL,'-30388','utilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitariansutilitarians [...]
+INSERT INTO `table5` VALUES ('hemoglobin\'s','Toffey\'s','Juvenal','00:00:00',-128,'harmonicon',-128,'2004-02-13 09:45:46',NULL,NULL,1911,'','Tananarive\'s',NULL,30666,'spiniferous',127,'30675','','Frederick\'sFrederick\'sFrederick\'sFrederick\'sFrederick\'sFrederick\'sFrederick\'sFrederick\'sFrederick\'sFrederick\'sFrederick\'sFrederick\'sFrederick\'sFrederick\'sFrederick\'sFrederick\'sFrederick\'sFrederick\'sFrederick\'sFrederick\'sFrederick\'sFrederick\'sFrederick\'sFr',30388,4769,'Er [...]
+INSERT INTO `table5` VALUES (NULL,'Annmarie','intangibleness\'s','00:00:00',-128,'transmogrify',127,'0000-00-00 00:00:00',NULL,127,2093,'','enamored','refired',-21296,'neglectful',127,'-9992','',NULL,NULL,3583,'Lockheed\'s',127,'-15717',-29743,-16280,'embouchureembouchureembouchureembouchureembouchureembouchureembouchureembouchureembouchureembouchureembouchureembouchureembouchureembouchureembouchureembouchureembouchureembouchureembouchureembouchureembouchureembouchureembouchureembouchure [...]
+INSERT INTO `table5` VALUES ('caddishly',NULL,'Kotah','00:00:00',-128,'tailoring',127,'0000-00-00 00:00:00','trustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustiestrustie',-128,1967,NULL,NULL,'parallelisms',NULL,NULL,127,NULL,'',NULL,NULL,-513,NULL,NULL,'-14518',NULL,-22393,'AngeliAngeliAngeliAnge [...]
+INSERT INTO `table5` VALUES ('bassoonist\'s',NULL,'refastens','114:27:50',127,'unrestricted',127,'2032-01-13 11:11:22','abstainer\'sabstainer\'sabstainer\'sabstainer\'sabstainer\'sabstainer\'sabstainer\'sabstainer\'sabstainer\'sabstainer\'sabstainer\'sabstainer\'sabstainer\'sabstainer\'sabstainer\'sabstainer\'sabstainer\'sabstainer\'sabstainer\'sabstainer\'sabstainer\'sabstainer\'sabstainer\'s',NULL,1955,'','Hodosh','allocates',-5067,'Cenac\'s',-128,'31546',NULL,'impassabilityimpassabili [...]
+INSERT INTO `table5` VALUES ('segmentation\'s','shapelessness\'s','coagulators','127:46:24',-128,NULL,127,'0000-00-00 00:00:00','seekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingseekingsee',NULL,2085,'','indent','flyblown',NULL,'Alegre',-128,'-27917','','DesiraeDesiraeDesiraeDesiraeDesiraeDesira [...]
+INSERT INTO `table5` VALUES ('Frasquito\'s','unsatisfactory','jetted','00:00:00',NULL,'Merlin\'s',127,'0000-00-00 00:00:00',NULL,NULL,1998,'','decomposer','Commons',-14813,'oversimplification\'s',NULL,'-5368','','engirdengirdengirdengirdengirdengirdengirdengirdengird',-13627,14305,'frontally',127,'18421',-32295,NULL,NULL,'21841',NULL,'0000-00-00','cytology','2424-00-17',-30542,-17621,'octarchy\'s','outfoxed','00:00:00',27469,-128,'','Kamat\'s',-24130,-5948,'riband','Betsy',NULL,-18769,NU [...]
+/*!40000 ALTER TABLE `table5` ENABLE KEYS */;
+UNLOCK TABLES;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+
+#explain select * from `table5` where (col2 <= '6566-06-15' AND col24 <> 'd') group by `col83` order by `col83` desc ;
+
+select * from `table5` where (col2 <= '6566-06-15' AND col24 <> 'd') group by `col83` order by `col83` desc ;
+
+drop table `table5`;
diff --git a/mysql-test/suite/parts/r/partition_debug_sync_innodb.result b/mysql-test/suite/parts/r/partition_debug_sync_innodb.result
index 268db30..77129d6 100644
--- a/mysql-test/suite/parts/r/partition_debug_sync_innodb.result
+++ b/mysql-test/suite/parts/r/partition_debug_sync_innodb.result
@@ -58,7 +58,10 @@ t1.frm
t1.par
SET DEBUG_SYNC='before_open_in_get_all_tables SIGNAL parked WAIT_FOR open';
SET DEBUG_SYNC='partition_open_error SIGNAL alter WAIT_FOR finish';
-SELECT * FROM INFORMATION_SCHEMA.PARTITIONS WHERE TABLE_NAME = 't1' AND TABLE_SCHEMA = 'test';
+SELECT TABLE_SCHEMA, TABLE_NAME, PARTITION_NAME, PARTITION_ORDINAL_POSITION,
+PARTITION_DESCRIPTION, TABLE_ROWS
+FROM INFORMATION_SCHEMA.PARTITIONS
+WHERE TABLE_NAME = 't1' AND TABLE_SCHEMA = 'test';
SET DEBUG_SYNC = 'now WAIT_FOR parked';
# When waiting for the name lock in get_all_tables in sql_show.cc
# this will not be concurrent any more, thus the TIMEOUT
@@ -70,9 +73,9 @@ ALTER TABLE t1 REORGANIZE PARTITION p0 INTO
PARTITION p10 VALUES LESS THAN MAXVALUE);
Warnings:
Warning 1639 debug sync point wait timed out
-TABLE_CATALOG TABLE_SCHEMA TABLE_NAME PARTITION_NAME SUBPARTITION_NAME PARTITION_ORDINAL_POSITION SUBPARTITION_ORDINAL_POSITION PARTITION_METHOD SUBPARTITION_METHOD PARTITION_EXPRESSION SUBPARTITION_EXPRESSION PARTITION_DESCRIPTION TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE CREATE_TIME UPDATE_TIME CHECK_TIME CHECKSUM PARTITION_COMMENT NODEGROUP TABLESPACE_NAME
-def test t1 p0 NULL 1 NULL RANGE NULL a NULL 10 1 16384 16384 NULL 0 0 NULL NULL NULL NULL default NULL
-def test t1 p10 NULL 2 NULL RANGE NULL a NULL MAXVALUE 3 5461 16384 NULL 0 0 NULL NULL NULL NULL default NULL
+TABLE_SCHEMA TABLE_NAME PARTITION_NAME PARTITION_ORDINAL_POSITION PARTITION_DESCRIPTION TABLE_ROWS
+test t1 p0 1 10 1
+test t1 p10 2 MAXVALUE 3
t1#P#p0.ibd
t1#P#p10.ibd
t1.frm
diff --git a/mysql-test/suite/parts/t/partition_debug_sync_innodb.test b/mysql-test/suite/parts/t/partition_debug_sync_innodb.test
index fce2613..df9c060 100644
--- a/mysql-test/suite/parts/t/partition_debug_sync_innodb.test
+++ b/mysql-test/suite/parts/t/partition_debug_sync_innodb.test
@@ -62,7 +62,10 @@ SHOW CREATE TABLE t1;
SET DEBUG_SYNC='before_open_in_get_all_tables SIGNAL parked WAIT_FOR open';
SET DEBUG_SYNC='partition_open_error SIGNAL alter WAIT_FOR finish';
send
-SELECT * FROM INFORMATION_SCHEMA.PARTITIONS WHERE TABLE_NAME = 't1' AND TABLE_SCHEMA = 'test';
+SELECT TABLE_SCHEMA, TABLE_NAME, PARTITION_NAME, PARTITION_ORDINAL_POSITION,
+ PARTITION_DESCRIPTION, TABLE_ROWS
+FROM INFORMATION_SCHEMA.PARTITIONS
+WHERE TABLE_NAME = 't1' AND TABLE_SCHEMA = 'test';
connect (con1, localhost, root,,);
SET DEBUG_SYNC = 'now WAIT_FOR parked';
diff --git a/mysql-test/suite/plugins/r/server_audit.result b/mysql-test/suite/plugins/r/server_audit.result
index c9ec79d..69c9bc3 100644
--- a/mysql-test/suite/plugins/r/server_audit.result
+++ b/mysql-test/suite/plugins/r/server_audit.result
@@ -45,6 +45,11 @@ id
2
alter table t1 rename renamed_t1;
set global server_audit_events='connect,query';
+select 1,
+2,
+3;
+1 2 3
+1 2 3
insert into t2 values (1), (2);
select * from t2;
id
@@ -157,6 +162,8 @@ id
CREATE USER u1 IDENTIFIED BY 'pwd-123';
GRANT ALL ON sa_db TO u2 IDENTIFIED BY "pwd-321";
SET PASSWORD FOR u1 = PASSWORD('pwd 098');
+SET PASSWORD FOR u1=<secret>;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '=<secret>' at line 1
CREATE USER u3 IDENTIFIED BY '';
drop user u1, u2, u3;
select 2;
@@ -244,6 +251,7 @@ TIME,HOSTNAME,root,localhost,ID,ID,ALTER,test,t1,
TIME,HOSTNAME,root,localhost,ID,ID,RENAME,test,t1|test.renamed_t1,
TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'alter table t1 rename renamed_t1',0
TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'set global server_audit_events=\'connect,query\'',0
+TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'select 1, 2, 3',0
TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'insert into t2 values (1), (2)',0
TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'select * from t2',0
TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'select * from t_doesnt_exist',ID
@@ -318,6 +326,7 @@ TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'/*comment*/ select 2',0
TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'CREATE USER u1 IDENTIFIED BY *****',0
TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'GRANT ALL ON sa_db TO u2 IDENTIFIED BY *****',0
TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'SET PASSWORD FOR u1 = PASSWORD(*****)',0
+TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'SET PASSWORD FOR u1=<secret>',ID
TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'CREATE USER u3 IDENTIFIED BY *****',0
TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'drop user u1, u2, u3',0
TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'set global server_audit_events=\'\'',0
diff --git a/mysql-test/suite/plugins/r/server_audit.result b/mysql-test/suite/plugins/r/thread_pool_server_audit.result
similarity index 97%
copy from mysql-test/suite/plugins/r/server_audit.result
copy to mysql-test/suite/plugins/r/thread_pool_server_audit.result
index c9ec79d..69c9bc3 100644
--- a/mysql-test/suite/plugins/r/server_audit.result
+++ b/mysql-test/suite/plugins/r/thread_pool_server_audit.result
@@ -45,6 +45,11 @@ id
2
alter table t1 rename renamed_t1;
set global server_audit_events='connect,query';
+select 1,
+2,
+3;
+1 2 3
+1 2 3
insert into t2 values (1), (2);
select * from t2;
id
@@ -157,6 +162,8 @@ id
CREATE USER u1 IDENTIFIED BY 'pwd-123';
GRANT ALL ON sa_db TO u2 IDENTIFIED BY "pwd-321";
SET PASSWORD FOR u1 = PASSWORD('pwd 098');
+SET PASSWORD FOR u1=<secret>;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '=<secret>' at line 1
CREATE USER u3 IDENTIFIED BY '';
drop user u1, u2, u3;
select 2;
@@ -244,6 +251,7 @@ TIME,HOSTNAME,root,localhost,ID,ID,ALTER,test,t1,
TIME,HOSTNAME,root,localhost,ID,ID,RENAME,test,t1|test.renamed_t1,
TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'alter table t1 rename renamed_t1',0
TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'set global server_audit_events=\'connect,query\'',0
+TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'select 1, 2, 3',0
TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'insert into t2 values (1), (2)',0
TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'select * from t2',0
TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'select * from t_doesnt_exist',ID
@@ -318,6 +326,7 @@ TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'/*comment*/ select 2',0
TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'CREATE USER u1 IDENTIFIED BY *****',0
TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'GRANT ALL ON sa_db TO u2 IDENTIFIED BY *****',0
TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'SET PASSWORD FOR u1 = PASSWORD(*****)',0
+TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'SET PASSWORD FOR u1=<secret>',ID
TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'CREATE USER u3 IDENTIFIED BY *****',0
TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'drop user u1, u2, u3',0
TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'set global server_audit_events=\'\'',0
diff --git a/mysql-test/suite/plugins/t/server_audit.test b/mysql-test/suite/plugins/t/server_audit.test
index 3c9544d..5242890 100644
--- a/mysql-test/suite/plugins/t/server_audit.test
+++ b/mysql-test/suite/plugins/t/server_audit.test
@@ -13,6 +13,7 @@ set global server_audit_incl_users=null;
set global server_audit_file_path='server_audit.log';
set global server_audit_output_type=file;
set global server_audit_logging=on;
+--sleep 2
connect (con1,localhost,root,,mysql);
connection default;
disconnect con1;
@@ -35,6 +36,9 @@ insert into t2 values (1), (2);
select * from t2;
alter table t1 rename renamed_t1;
set global server_audit_events='connect,query';
+select 1,
+ 2,
+ 3;
insert into t2 values (1), (2);
select * from t2;
--error ER_NO_SUCH_TABLE
@@ -46,6 +50,7 @@ show variables like 'server_audit%';
set global server_audit_mode=1;
set global server_audit_events='';
create database sa_db;
+--sleep 2
connect (con1,localhost,root,,test);
connection con1;
--sleep 2
@@ -102,6 +107,8 @@ select * from t1;
CREATE USER u1 IDENTIFIED BY 'pwd-123';
GRANT ALL ON sa_db TO u2 IDENTIFIED BY "pwd-321";
SET PASSWORD FOR u1 = PASSWORD('pwd 098');
+--error 1064
+SET PASSWORD FOR u1=<secret>;
CREATE USER u3 IDENTIFIED BY '';
drop user u1, u2, u3;
select 2;
diff --git a/mysql-test/suite/plugins/t/thread_pool_server_audit.opt b/mysql-test/suite/plugins/t/thread_pool_server_audit.opt
new file mode 100644
index 0000000..30953d0
--- /dev/null
+++ b/mysql-test/suite/plugins/t/thread_pool_server_audit.opt
@@ -0,0 +1,2 @@
+--thread_handling=pool-of-threads
+
diff --git a/mysql-test/suite/plugins/t/server_audit.test b/mysql-test/suite/plugins/t/thread_pool_server_audit.test
similarity index 96%
copy from mysql-test/suite/plugins/t/server_audit.test
copy to mysql-test/suite/plugins/t/thread_pool_server_audit.test
index 3c9544d..626d413 100644
--- a/mysql-test/suite/plugins/t/server_audit.test
+++ b/mysql-test/suite/plugins/t/thread_pool_server_audit.test
@@ -1,5 +1,5 @@
-
--source include/not_embedded.inc
+--source include/have_pool_of_threads.inc
if (!$SERVER_AUDIT_SO) {
skip No SERVER_AUDIT plugin;
@@ -13,6 +13,7 @@ set global server_audit_incl_users=null;
set global server_audit_file_path='server_audit.log';
set global server_audit_output_type=file;
set global server_audit_logging=on;
+--sleep 2
connect (con1,localhost,root,,mysql);
connection default;
disconnect con1;
@@ -35,6 +36,9 @@ insert into t2 values (1), (2);
select * from t2;
alter table t1 rename renamed_t1;
set global server_audit_events='connect,query';
+select 1,
+ 2,
+ 3;
insert into t2 values (1), (2);
select * from t2;
--error ER_NO_SUCH_TABLE
@@ -46,6 +50,7 @@ show variables like 'server_audit%';
set global server_audit_mode=1;
set global server_audit_events='';
create database sa_db;
+--sleep 2
connect (con1,localhost,root,,test);
connection con1;
--sleep 2
@@ -102,6 +107,8 @@ select * from t1;
CREATE USER u1 IDENTIFIED BY 'pwd-123';
GRANT ALL ON sa_db TO u2 IDENTIFIED BY "pwd-321";
SET PASSWORD FOR u1 = PASSWORD('pwd 098');
+--error 1064
+SET PASSWORD FOR u1=<secret>;
CREATE USER u3 IDENTIFIED BY '';
drop user u1, u2, u3;
select 2;
diff --git a/mysql-test/suite/rpl/r/rpl_old_decimal.result b/mysql-test/suite/rpl/r/rpl_old_decimal.result
new file mode 100644
index 0000000..3e2fa3b
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_old_decimal.result
@@ -0,0 +1,9 @@
+include/master-slave.inc
+[connection master]
+CREATE TABLE t1dec102 (a DECIMAL(10,2));
+INSERT INTO t1dec102 VALUES(999.99);
+call mtr.add_suppression("Slave SQL.*Column 0 of table .* cannot be converted from type.* Error_code: 1677");
+include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
+Last_SQL_Error = 'Column 0 of table 'test.t1dec102' cannot be converted from type 'decimal(0,?)/*old*/' to type 'decimal(10,2)''
+DROP TABLE t1dec102;
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_tmp_table_and_DDL.result b/mysql-test/suite/rpl/r/rpl_tmp_table_and_DDL.result
index 550b3f5..0264c94 100644
--- a/mysql-test/suite/rpl/r/rpl_tmp_table_and_DDL.result
+++ b/mysql-test/suite/rpl/r/rpl_tmp_table_and_DDL.result
@@ -182,6 +182,11 @@ DROP USER test_3 at localhost;
ERROR HY000: Table 'user' was not locked with LOCK TABLES
INSERT INTO t2 VALUES ("DROP USER test_3 at localhost with table locked");
UNLOCK TABLE;
+CREATE DATABASE db;
+CREATE TABLE db.t1 LIKE t2;
+CREATE TABLE t3 LIKE t2;
+DROP TABLE t3;
+DROP DATABASE db;
DROP USER test_3 at localhost;
DROP FUNCTION f2;
DROP PROCEDURE p2;
diff --git a/mysql-test/suite/rpl/t/rpl_old_decimal.test b/mysql-test/suite/rpl/t/rpl_old_decimal.test
new file mode 100644
index 0000000..79fd275
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_old_decimal.test
@@ -0,0 +1,25 @@
+--source include/have_binlog_format_row.inc
+--source include/master-slave.inc
+
+
+--connection slave
+CREATE TABLE t1dec102 (a DECIMAL(10,2));
+
+--connection master
+let $MYSQLD_DATADIR= `select @@datadir`;
+
+--copy_file std_data/old_decimal/t1dec102.frm $MYSQLD_DATADIR/test/t1dec102.frm
+--copy_file std_data/old_decimal/t1dec102.MYD $MYSQLD_DATADIR/test/t1dec102.MYD
+--copy_file std_data/old_decimal/t1dec102.MYI $MYSQLD_DATADIR/test/t1dec102.MYI
+INSERT INTO t1dec102 VALUES(999.99);
+
+--let $slave_sql_errno=1677
+--let $show_slave_sql_error= 1
+call mtr.add_suppression("Slave SQL.*Column 0 of table .* cannot be converted from type.* Error_code: 1677");
+--source include/wait_for_slave_sql_error_and_skip.inc
+
+--connection master
+DROP TABLE t1dec102;
+--sync_slave_with_master
+
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_tmp_table_and_DDL.test b/mysql-test/suite/rpl/t/rpl_tmp_table_and_DDL.test
index e9cc098..bc4119f 100644
--- a/mysql-test/suite/rpl/t/rpl_tmp_table_and_DDL.test
+++ b/mysql-test/suite/rpl/t/rpl_tmp_table_and_DDL.test
@@ -150,6 +150,16 @@ DROP USER test_3 at localhost;
INSERT INTO t2 VALUES ("DROP USER test_3 at localhost with table locked");
UNLOCK TABLE;
+
+# Bug #20439913 CREATE TABLE DB.TABLE LIKE TMPTABLE IS
+# BINLOGGED INCORRECTLY - BREAKS A SLAVE
+CREATE DATABASE db;
+CREATE TABLE db.t1 LIKE t2;
+CREATE TABLE t3 LIKE t2;
+DROP TABLE t3;
+DROP DATABASE db;
+# end of Bug #20439913 test
+
DROP USER test_3 at localhost;
DROP FUNCTION f2;
DROP PROCEDURE p2;
diff --git a/mysql-test/suite/sphinx/my.cnf b/mysql-test/suite/sphinx/my.cnf
index a3789a0..f60380b 100644
--- a/mysql-test/suite/sphinx/my.cnf
+++ b/mysql-test/suite/sphinx/my.cnf
@@ -16,7 +16,6 @@ mem_limit = 32M
[searchd]
read_timeout = 5
max_children = 30
-max_matches = 1000
seamless_rotate = 1
preopen_indexes = 0
unlink_old = 1
@@ -24,7 +23,7 @@ log = @ENV.MYSQLTEST_VARDIR/searchd/sphinx-searchd.log
query_log = @ENV.MYSQLTEST_VARDIR/searchd/sphinx-query.log
#log-error = @ENV.MYSQLTEST_VARDIR/searchd/sphinx.log
pid_file = @ENV.MYSQLTEST_VARDIR/run/searchd.pid
-port = @ENV.SPHINXSEARCH_PORT
+listen = @ENV.SPHINXSEARCH_PORT
[ENV]
SPHINXSEARCH_PORT = @OPT.port
diff --git a/mysql-test/suite/sys_vars/t/innodb_buffer_pool_evict_basic.test b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_evict_basic.test
index ce42f64..11634e1 100644
--- a/mysql-test/suite/sys_vars/t/innodb_buffer_pool_evict_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_evict_basic.test
@@ -2,11 +2,6 @@
# This is a debug variable for now
-- source include/have_debug.inc
-if (`select plugin_auth_version <= "5.5.31-MariaDB-30.2" from information_schema.plugins where plugin_name='innodb'`)
-{
- --skip Not fixed in XtraDB 5.5.31-MariaDB-30.2 or earlier
-}
-
SELECT @@global.innodb_buffer_pool_evict;
SET GLOBAL innodb_buffer_pool_evict = 'uncompressed';
diff --git a/mysql-test/suite/sys_vars/t/innodb_thread_sleep_delay_basic.test b/mysql-test/suite/sys_vars/t/innodb_thread_sleep_delay_basic.test
index 782fb47..85ae235 100644
--- a/mysql-test/suite/sys_vars/t/innodb_thread_sleep_delay_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_thread_sleep_delay_basic.test
@@ -1,8 +1,3 @@
-if (`select plugin_auth_version <= "5.5.37-MariaDB-34.0" from information_schema.plugins where plugin_name='innodb'`)
-{
- --skip Not fixed in XtraDB as of 5.5.37-MariaDB-34.0 or earlier
-}
-
#
# 2010-01-27 - Added
#
diff --git a/mysql-test/suite/tokudb.bugs/r/db805.result b/mysql-test/suite/tokudb.bugs/r/db805.result
new file mode 100644
index 0000000..1bc0372
--- /dev/null
+++ b/mysql-test/suite/tokudb.bugs/r/db805.result
@@ -0,0 +1,18 @@
+drop table if exists t1,t3;
+create table t3(a3 int,b3 decimal(0,0),c3 int,d3 int,primary key(a3,b3)) engine=TOKUDB;
+LOCK TABLES t3 WRITE;
+create temporary table t1(f1 int,index(f1)) engine=innodb;
+INSERT INTO t1 VALUES(1),(1),(1);
+select * from t1;
+f1
+1
+1
+1
+ALTER TABLE t1 engine=TOKUDB;
+select * from t1;
+f1
+1
+1
+1
+unlock tables;
+drop table t1,t3;
diff --git a/mysql-test/suite/tokudb.bugs/r/db806.result b/mysql-test/suite/tokudb.bugs/r/db806.result
new file mode 100644
index 0000000..ae87dba
--- /dev/null
+++ b/mysql-test/suite/tokudb.bugs/r/db806.result
@@ -0,0 +1,9 @@
+drop table if exists t1,t3;
+CREATE TABLE t3(a int,c int,d int)engine=TOKUDB;
+lock table t3 read;
+create temporary table t1 engine=tokudb as SELECT 1;
+select * from t1;
+1
+1
+unlock tables;
+drop table t1,t3;
diff --git a/mysql-test/suite/tokudb.bugs/r/db811.result b/mysql-test/suite/tokudb.bugs/r/db811.result
new file mode 100644
index 0000000..1d26f43
--- /dev/null
+++ b/mysql-test/suite/tokudb.bugs/r/db811.result
@@ -0,0 +1,14 @@
+drop table if exists t2,t3,t4;
+CREATE TABLE t3(a INT,b INT,UNIQUE KEY (a,b)) engine=TOKUDB;
+CREATE TABLE t4(c1 FLOAT ZEROFILL) engine=innodb;
+CREATE TABLE t2(a int KEY,b CHAR (1)) engine=TOKUDB PARTITION BY HASH (a) PARTITIONS 13;
+LOCK TABLES t4 WRITE,t3 WRITE,t2 WRITE;
+INSERT INTO t2(a)VALUES (REPEAT(0,1));
+ALTER TABLE t2 ADD COLUMN(c INT);
+alter table t4 add column c int;
+UPDATE t2 SET a=1;
+select * from t2;
+a b c
+1 NULL NULL
+unlock tables;
+drop table t2,t3,t4;
diff --git a/mysql-test/suite/tokudb.bugs/r/db811s.result b/mysql-test/suite/tokudb.bugs/r/db811s.result
new file mode 100644
index 0000000..0a50e63
--- /dev/null
+++ b/mysql-test/suite/tokudb.bugs/r/db811s.result
@@ -0,0 +1,14 @@
+drop table if exists t2,t3,t4;
+CREATE TABLE t3(a INT,b INT,UNIQUE KEY (a,b)) engine=TOKUDB;
+CREATE TABLE t4(c1 FLOAT ZEROFILL) engine=innodb;
+CREATE TABLE t2(a int KEY,b CHAR (1)) engine=TOKUDB PARTITION BY HASH (a) PARTITIONS 1;
+LOCK TABLES t4 WRITE,t3 WRITE,t2 WRITE;
+INSERT INTO t2(a)VALUES (REPEAT(0,1));
+ALTER TABLE t2 ADD COLUMN(c INT);
+alter table t4 add column c int;
+UPDATE t2 SET a=1;
+select * from t2;
+a b c
+1 NULL NULL
+unlock tables;
+drop table t2,t3,t4;
diff --git a/mysql-test/suite/tokudb.bugs/r/db823.result b/mysql-test/suite/tokudb.bugs/r/db823.result
new file mode 100644
index 0000000..d94da5c
--- /dev/null
+++ b/mysql-test/suite/tokudb.bugs/r/db823.result
@@ -0,0 +1,11 @@
+drop table if exists s,t;
+create table s (id int) engine=tokudb;
+lock tables s write;
+create temporary table t (id int, key(id)) engine=innodb;
+insert into t values (1);
+alter table t engine=tokudb;
+select * from t;
+id
+1
+unlock tables;
+drop table s, t;
diff --git a/mysql-test/suite/tokudb.bugs/t/db805.test b/mysql-test/suite/tokudb.bugs/t/db805.test
new file mode 100644
index 0000000..1114de6
--- /dev/null
+++ b/mysql-test/suite/tokudb.bugs/t/db805.test
@@ -0,0 +1,17 @@
+# DB-805 test that conversion of t1 from innodb to tokudb can write rows
+source include/have_tokudb.inc;
+source include/have_innodb.inc;
+disable_warnings;
+drop table if exists t1,t3;
+enable_warnings;
+
+create table t3(a3 int,b3 decimal(0,0),c3 int,d3 int,primary key(a3,b3)) engine=TOKUDB;
+LOCK TABLES t3 WRITE;
+create temporary table t1(f1 int,index(f1)) engine=innodb;
+INSERT INTO t1 VALUES(1),(1),(1);
+select * from t1;
+ALTER TABLE t1 engine=TOKUDB;
+select * from t1;
+unlock tables;
+
+drop table t1,t3;
diff --git a/mysql-test/suite/tokudb.bugs/t/db806.test b/mysql-test/suite/tokudb.bugs/t/db806.test
new file mode 100644
index 0000000..3815e59
--- /dev/null
+++ b/mysql-test/suite/tokudb.bugs/t/db806.test
@@ -0,0 +1,13 @@
+# DB-806 test that lock tables and create select can write rows to the new table
+source include/have_tokudb.inc;
+disable_warnings;
+drop table if exists t1,t3;
+enable_warnings;
+
+CREATE TABLE t3(a int,c int,d int)engine=TOKUDB;
+lock table t3 read;
+create temporary table t1 engine=tokudb as SELECT 1;
+select * from t1;
+unlock tables;
+
+drop table t1,t3;
\ No newline at end of file
diff --git a/mysql-test/suite/tokudb.bugs/t/db811.test b/mysql-test/suite/tokudb.bugs/t/db811.test
new file mode 100644
index 0000000..509f482
--- /dev/null
+++ b/mysql-test/suite/tokudb.bugs/t/db811.test
@@ -0,0 +1,22 @@
+# DB-811 test that alter table t2 updates both the schema (FRM) and the data (tokudb files)
+
+source include/have_tokudb.inc;
+source include/have_innodb.inc;
+source include/have_partition.inc;
+disable_warnings;
+drop table if exists t2,t3,t4;
+enable_warnings;
+
+CREATE TABLE t3(a INT,b INT,UNIQUE KEY (a,b)) engine=TOKUDB;
+CREATE TABLE t4(c1 FLOAT ZEROFILL) engine=innodb;
+CREATE TABLE t2(a int KEY,b CHAR (1)) engine=TOKUDB PARTITION BY HASH (a) PARTITIONS 13;
+LOCK TABLES t4 WRITE,t3 WRITE,t2 WRITE;
+INSERT INTO t2(a)VALUES (REPEAT(0,1));
+ALTER TABLE t2 ADD COLUMN(c INT);
+alter table t4 add column c int;
+UPDATE t2 SET a=1;
+select * from t2;
+unlock tables;
+
+drop table t2,t3,t4;
+
diff --git a/mysql-test/suite/tokudb.bugs/t/db811s.test b/mysql-test/suite/tokudb.bugs/t/db811s.test
new file mode 100644
index 0000000..5b8c6ed
--- /dev/null
+++ b/mysql-test/suite/tokudb.bugs/t/db811s.test
@@ -0,0 +1,22 @@
+# DB-811 test that alter table t2 updates both the schema (FRM) and the data (tokudb files)
+
+source include/have_tokudb.inc;
+source include/have_innodb.inc;
+source include/have_partition.inc;
+disable_warnings;
+drop table if exists t2,t3,t4;
+enable_warnings;
+
+CREATE TABLE t3(a INT,b INT,UNIQUE KEY (a,b)) engine=TOKUDB;
+CREATE TABLE t4(c1 FLOAT ZEROFILL) engine=innodb;
+CREATE TABLE t2(a int KEY,b CHAR (1)) engine=TOKUDB PARTITION BY HASH (a) PARTITIONS 1;
+LOCK TABLES t4 WRITE,t3 WRITE,t2 WRITE;
+INSERT INTO t2(a)VALUES (REPEAT(0,1));
+ALTER TABLE t2 ADD COLUMN(c INT);
+alter table t4 add column c int;
+UPDATE t2 SET a=1;
+select * from t2;
+unlock tables;
+
+drop table t2,t3,t4;
+
diff --git a/mysql-test/suite/tokudb.bugs/t/db823.test b/mysql-test/suite/tokudb.bugs/t/db823.test
new file mode 100644
index 0000000..2e01c0e
--- /dev/null
+++ b/mysql-test/suite/tokudb.bugs/t/db823.test
@@ -0,0 +1,16 @@
+# test DB-823
+# test that the conversion of table t from innodb to tokudb succeeds.
+source include/have_tokudb.inc;
+source include/have_innodb.inc;
+disable_warnings;
+drop table if exists s,t;
+enable_warnings;
+create table s (id int) engine=tokudb;
+lock tables s write;
+create temporary table t (id int, key(id)) engine=innodb;
+insert into t values (1);
+alter table t engine=tokudb;
+select * from t;
+unlock tables;
+drop table s, t;
+
diff --git a/mysql-test/t/aborted_clients.test b/mysql-test/t/aborted_clients.test
index fafcfb6..20ddc99 100644
--- a/mysql-test/t/aborted_clients.test
+++ b/mysql-test/t/aborted_clients.test
@@ -1,28 +1,28 @@
-# Test case for MDEV-246, lp:992983
-# Check that ordinary connect/disconnect does not increase aborted_clients
-# status variable, but KILL connection does
-
--- source include/not_embedded.inc
--- source include/count_sessions.inc
-
-FLUSH STATUS;
-# Connect/Disconnect look that aborted_clients stays 0
-connect (con1,localhost,root,,);
-disconnect con1;
-connection default;
--- source include/wait_until_count_sessions.inc
-# Check that there is 0 aborted clients so far
-SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='aborted_clients';
-
-# Kill a connection, check that aborted_clients is incremented
-connect(con2,localhost,root,,);
---disable_reconnect
---error ER_CONNECTION_KILLED
-KILL CONNECTION_ID();
-disconnect con2;
-connection default;
--- source include/wait_until_count_sessions.inc
-
-# aborted clients must be 1 now
-SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='aborted_clients';
-FLUSH STATUS;
+# Test case for MDEV-246, lp:992983
+# Check that ordinary connect/disconnect does not increase aborted_clients
+# status variable, but KILL connection does
+
+-- source include/not_embedded.inc
+-- source include/count_sessions.inc
+
+FLUSH STATUS;
+# Connect/Disconnect look that aborted_clients stays 0
+connect (con1,localhost,root,,);
+disconnect con1;
+connection default;
+-- source include/wait_until_count_sessions.inc
+# Check that there is 0 aborted clients so far
+SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='aborted_clients';
+
+# Kill a connection, check that aborted_clients is incremented
+connect(con2,localhost,root,,);
+--disable_reconnect
+--error ER_CONNECTION_KILLED
+KILL CONNECTION_ID();
+disconnect con2;
+connection default;
+-- source include/wait_until_count_sessions.inc
+
+# aborted clients must be 1 now
+SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='aborted_clients';
+FLUSH STATUS;
diff --git a/mysql-test/t/auth_rpl.test b/mysql-test/t/auth_rpl.test
index c413a84..0ff024c 100644
--- a/mysql-test/t/auth_rpl.test
+++ b/mysql-test/t/auth_rpl.test
@@ -1,66 +1,66 @@
---source include/have_plugin_auth.inc
---source include/not_embedded.inc
---source include/master-slave.inc
-
-#
-# Check that replication slave can connect to master using an account
-# which authenticates with an external authentication plugin (bug#12897501).
-
-#
-# First stop the slave to guarantee that nothing is replicated.
-#
---connection slave
---echo [connection slave]
---source include/stop_slave.inc
-#
-# Create an replication account on the master.
-#
---connection master
---echo [connection master]
-CREATE USER 'plug_user' IDENTIFIED WITH 'test_plugin_server' AS 'plug_user';
-GRANT REPLICATION SLAVE ON *.* TO plug_user;
-FLUSH PRIVILEGES;
-
-#
-# Now go to slave and change the replication user.
-#
---connection slave
---echo [connection slave]
---let $master_user= query_get_value(SHOW SLAVE STATUS, Master_User, 1)
-CHANGE MASTER TO
- MASTER_USER= 'plug_user',
- MASTER_PASSWORD= 'plug_user';
-
-#
-# Start slave with new replication account - this should trigger connection
-# to the master server.
-#
---source include/start_slave.inc
-
-# Replicate all statements executed on master, in this case,
-# (creation of the plug_user account).
-#
---connection master
---sync_slave_with_master
---echo # Slave in-sync with master now.
-
-SELECT user, plugin, authentication_string FROM mysql.user WHERE user LIKE 'plug_user';
-
-#
-# Now we can stop the slave and clean up.
-#
-# Note: it is important that slave is stopped at this
-# moment - otherwise master's cleanup statements
-# would be replicated on slave!
-#
---echo # Cleanup (on slave).
---source include/stop_slave.inc
-eval CHANGE MASTER TO MASTER_USER='$master_user';
-DROP USER 'plug_user';
-
---echo # Cleanup (on master).
---connection master
-DROP USER 'plug_user';
-
---let $rpl_only_running_threads= 1
---source include/rpl_end.inc
+--source include/have_plugin_auth.inc
+--source include/not_embedded.inc
+--source include/master-slave.inc
+
+#
+# Check that replication slave can connect to master using an account
+# which authenticates with an external authentication plugin (bug#12897501).
+
+#
+# First stop the slave to guarantee that nothing is replicated.
+#
+--connection slave
+--echo [connection slave]
+--source include/stop_slave.inc
+#
+# Create an replication account on the master.
+#
+--connection master
+--echo [connection master]
+CREATE USER 'plug_user' IDENTIFIED WITH 'test_plugin_server' AS 'plug_user';
+GRANT REPLICATION SLAVE ON *.* TO plug_user;
+FLUSH PRIVILEGES;
+
+#
+# Now go to slave and change the replication user.
+#
+--connection slave
+--echo [connection slave]
+--let $master_user= query_get_value(SHOW SLAVE STATUS, Master_User, 1)
+CHANGE MASTER TO
+ MASTER_USER= 'plug_user',
+ MASTER_PASSWORD= 'plug_user';
+
+#
+# Start slave with new replication account - this should trigger connection
+# to the master server.
+#
+--source include/start_slave.inc
+
+# Replicate all statements executed on master, in this case,
+# (creation of the plug_user account).
+#
+--connection master
+--sync_slave_with_master
+--echo # Slave in-sync with master now.
+
+SELECT user, plugin, authentication_string FROM mysql.user WHERE user LIKE 'plug_user';
+
+#
+# Now we can stop the slave and clean up.
+#
+# Note: it is important that slave is stopped at this
+# moment - otherwise master's cleanup statements
+# would be replicated on slave!
+#
+--echo # Cleanup (on slave).
+--source include/stop_slave.inc
+eval CHANGE MASTER TO MASTER_USER='$master_user';
+DROP USER 'plug_user';
+
+--echo # Cleanup (on master).
+--connection master
+DROP USER 'plug_user';
+
+--let $rpl_only_running_threads= 1
+--source include/rpl_end.inc
diff --git a/mysql-test/t/ctype_utf8.test b/mysql-test/t/ctype_utf8.test
index f4b16c9..bed026a 100644
--- a/mysql-test/t/ctype_utf8.test
+++ b/mysql-test/t/ctype_utf8.test
@@ -1617,5 +1617,21 @@ SET NAMES utf8 COLLATE utf8_general_ci;
--source include/ctype_utf8_ilseq.inc
--echo #
+--echo # MDEV-8067 correct fix for MySQL Bug # 19699237: UNINITIALIZED VARIABLE IN ITEM_FIELD::STR_RESULT
+--echo #
+CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET utf8);
+CREATE TABLE t2 (a VARCHAR(10) CHARACTER SET latin1);
+INSERT INTO t1 VALUES ('aaa');
+INSERT INTO t2 VALUES ('aaa');
+SELECT (SELECT CONCAT(a),1 FROM t1) <=> (SELECT CONCAT(a),1 FROM t2);
+INSERT INTO t1 VALUES ('aaa');
+INSERT INTO t2 VALUES ('aaa');
+# Running the below query crashed with two rows
+--error ER_SUBQUERY_NO_1_ROW
+SELECT (SELECT CONCAT(a),1 FROM t1) <=> (SELECT CONCAT(a),1 FROM t2);
+DROP TABLE t1, t2;
+
+
+--echo #
--echo # End of 5.5 tests
--echo #
diff --git a/mysql-test/t/dyncol.test b/mysql-test/t/dyncol.test
index 68e10a5..f0d9467 100644
--- a/mysql-test/t/dyncol.test
+++ b/mysql-test/t/dyncol.test
@@ -643,3 +643,9 @@ SELECT
#
select column_get(column_create(1, "18446744073709552001" as char), 1 as int);
+--echo #
+--echo # MDEV-7505 - Too large scale in DECIMAL dynamic column getter crashes
+--echo # mysqld
+--echo #
+--error ER_TOO_BIG_SCALE
+SELECT COLUMN_GET(`x`, 'y' AS DECIMAL(5,34));
diff --git a/mysql-test/t/empty_server_name-8224.test b/mysql-test/t/empty_server_name-8224.test
new file mode 100644
index 0000000..528bce5
--- /dev/null
+++ b/mysql-test/t/empty_server_name-8224.test
@@ -0,0 +1,9 @@
+#
+# MDEV-8224 Server crashes in get_server_from_table_to_cache on empty name
+#
+--source include/not_embedded.inc
+create server '' foreign data wrapper w2 options (host '127.0.0.1');
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--shutdown_server 10
+--source include/wait_until_disconnected.inc
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
diff --git a/mysql-test/t/func_gconcat.test b/mysql-test/t/func_gconcat.test
index 20fbed7..42a3076 100644
--- a/mysql-test/t/func_gconcat.test
+++ b/mysql-test/t/func_gconcat.test
@@ -49,9 +49,9 @@ select grp,group_concat(c order by grp desc) from t1 group by grp order by grp;
# Test transfer to real values
-select grp, group_concat(a separator "")+0 from t1 group by grp;
-select grp, group_concat(a separator "")+0.0 from t1 group by grp;
-select grp, ROUND(group_concat(a separator "")) from t1 group by grp;
+select grp, group_concat(a separator "")+0 from t1 group by grp;
+select grp, group_concat(a separator "")+0.0 from t1 group by grp;
+select grp, ROUND(group_concat(a separator "")) from t1 group by grp;
drop table t1;
# Test NULL values
diff --git a/mysql-test/t/group_by.test b/mysql-test/t/group_by.test
index e5beeef..c94d27b 100644
--- a/mysql-test/t/group_by.test
+++ b/mysql-test/t/group_by.test
@@ -1523,7 +1523,7 @@ DROP TABLE t1;
create table t1 (a int, b int);
insert into t1 values (1,11), (1,12), (2,22),(2,23), (4,44),(4,45);
create table t2 (c int, d int);
-insert into t2 values (1,11), (1,12), (2,22),(2,23), (4,44),(4,45);
+insert into t2 values (1,11), (2,22), (4,44);
select distinct a,sum(b), (select d from t2 where c=a order by max(b) limit 1) from t1 group by a order by max(b);
drop table t1, t2;
diff --git a/mysql-test/t/information_schema2.test b/mysql-test/t/information_schema2.test
index c247908..06bc6d1 100644
--- a/mysql-test/t/information_schema2.test
+++ b/mysql-test/t/information_schema2.test
@@ -7,3 +7,16 @@ select variable_name from information_schema.session_status where variable_name
select variable_name from information_schema.session_variables where variable_name =
(select variable_name from information_schema.session_variables where variable_name = 'basedir');
+#
+# information_schema tables inside subqueries, they should not be re-populated
+# (i_s.columns needs to scan i_s itself, creating a tmp table for every i_s
+# table. if it's re-populated, it'll do that multiple times)
+#
+create table t1 (a char);
+insert t1 values ('a'),('t'),('z');
+flush status;
+select a, exists (select 1 from information_schema.columns where table_schema=concat('tes',a)) from t1;
+# fix the result in ps-protocol
+--replace_result 39 38
+show status like 'created_tmp_tables';
+drop table t1;
diff --git a/mysql-test/t/lowercase_table4.test b/mysql-test/t/lowercase_table4.test
index 783a4fc..0775d87 100644
--- a/mysql-test/t/lowercase_table4.test
+++ b/mysql-test/t/lowercase_table4.test
@@ -1,108 +1,108 @@
---source include/have_case_insensitive_file_system.inc
---source include/have_innodb.inc
-
---echo #
---echo # Bug#46941 crash with lower_case_table_names=2 and
---echo # foreign data dictionary confusion
---echo #
-
-CREATE DATABASE XY;
-USE XY;
-
-#
-# Logs are disabled, since the number of creates tables
-# and subsequent select statements may vary between
-# versions
-#
---disable_query_log
---disable_result_log
-
+--source include/have_case_insensitive_file_system.inc
+--source include/have_innodb.inc
+
+--echo #
+--echo # Bug#46941 crash with lower_case_table_names=2 and
+--echo # foreign data dictionary confusion
+--echo #
+
+CREATE DATABASE XY;
+USE XY;
+
+#
+# Logs are disabled, since the number of creates tables
+# and subsequent select statements may vary between
+# versions
+#
+--disable_query_log
+--disable_result_log
+
let $tcs = `SELECT @@table_open_cache + 1`;
-
-let $i = $tcs;
-
-while ($i)
-{
- eval CREATE TABLE XY.T_$i (a INT NOT NULL, b INT NOT NULL, c INT NOT NULL, d INT,
- primary key(a, b), unique(b)) ENGINE=InnoDB;
- dec $i;
-}
-
-eval ALTER TABLE XY.T_$tcs ADD INDEX I1 (c, b),
- ADD CONSTRAINT C1 FOREIGN KEY (c, b) REFERENCES XY.T_1 (a, b);
-
-eval ALTER TABLE XY.T_$tcs ADD INDEX I2 (b),
- ADD CONSTRAINT C2 FOREIGN KEY (b) REFERENCES XY.T_1(a);
-
-let $i = $tcs;
-while ($i)
-{
- eval SELECT * FROM XY.T_$i LIMIT 1;
- dec $i;
-}
-
-DROP DATABASE XY;
-CREATE DATABASE XY;
-USE XY;
-eval CREATE TABLE XY.T_$tcs (a INT NOT NULL, b INT NOT NULL, c INT NOT NULL, d INT,
- PRIMARY KEY(a, b), UNIQUE(b)) ENGINE=InnoDB;
-#
-# The bug causes this SELECT to err
-eval SELECT * FROM XY.T_$tcs LIMIT 1;
-
---enable_query_log
---enable_result_log
-DROP DATABASE XY;
-USE TEST;
-
---echo #
---echo # Bug55222 Mysqldump table names case bug in REFERENCES clause
---echo # InnoDB did not handle lower_case_table_names=2 for
---echo # foreign_table_names and referenced_table_names.
---echo #
-
-SHOW VARIABLES LIKE 'lower_case_table_names';
-
---disable_warnings
-DROP TABLE IF EXISTS `Table2`;
-DROP TABLE IF EXISTS `Table1`;
---disable_warnings
-
-CREATE TABLE `Table1`(c1 INT PRIMARY KEY) ENGINE=InnoDB;
-CREATE TABLE `Table2`(c1 INT PRIMARY KEY, c2 INT) ENGINE=InnoDB;
-ALTER TABLE `Table2` ADD CONSTRAINT fk1 FOREIGN KEY(c2) REFERENCES `Table1`(c1);
-query_vertical SHOW CREATE TABLE `Table2`;
-query_vertical SELECT * FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS;
-DROP TABLE `Table2`;
-DROP TABLE `Table1`;
-
---disable_warnings
-DROP TABLE IF EXISTS Product_Order;
-DROP TABLE IF EXISTS Product;
-DROP TABLE IF EXISTS Customer;
---enable_warnings
-
-CREATE TABLE Product (Category INT NOT NULL, Id INT NOT NULL,
- Price DECIMAL, PRIMARY KEY(Category, Id)) ENGINE=InnoDB;
-CREATE TABLE Customer (Id INT NOT NULL, PRIMARY KEY (Id)) ENGINE=InnoDB;
-CREATE TABLE Product_Order (No INT NOT NULL AUTO_INCREMENT,
- Product_Category INT NOT NULL,
- Product_Id INT NOT NULL,
- Customer_Id INT NOT NULL,
- PRIMARY KEY(No),
- INDEX (Product_Category, Product_Id),
- FOREIGN KEY (Product_Category, Product_Id)
- REFERENCES Product(Category, Id) ON UPDATE CASCADE ON DELETE RESTRICT,
- INDEX (Customer_Id),
- FOREIGN KEY (Customer_Id)
- REFERENCES Customer(Id)
- ) ENGINE=INNODB;
-
-query_vertical SHOW CREATE TABLE Product_Order;
-query_vertical SHOW CREATE TABLE Product;
-query_vertical SHOW CREATE TABLE Customer;
-query_vertical SELECT * FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS;
-DROP TABLE Product_Order;
-DROP TABLE Product;
-DROP TABLE Customer;
-
+
+let $i = $tcs;
+
+while ($i)
+{
+ eval CREATE TABLE XY.T_$i (a INT NOT NULL, b INT NOT NULL, c INT NOT NULL, d INT,
+ primary key(a, b), unique(b)) ENGINE=InnoDB;
+ dec $i;
+}
+
+eval ALTER TABLE XY.T_$tcs ADD INDEX I1 (c, b),
+ ADD CONSTRAINT C1 FOREIGN KEY (c, b) REFERENCES XY.T_1 (a, b);
+
+eval ALTER TABLE XY.T_$tcs ADD INDEX I2 (b),
+ ADD CONSTRAINT C2 FOREIGN KEY (b) REFERENCES XY.T_1(a);
+
+let $i = $tcs;
+while ($i)
+{
+ eval SELECT * FROM XY.T_$i LIMIT 1;
+ dec $i;
+}
+
+DROP DATABASE XY;
+CREATE DATABASE XY;
+USE XY;
+eval CREATE TABLE XY.T_$tcs (a INT NOT NULL, b INT NOT NULL, c INT NOT NULL, d INT,
+ PRIMARY KEY(a, b), UNIQUE(b)) ENGINE=InnoDB;
+#
+# The bug causes this SELECT to err
+eval SELECT * FROM XY.T_$tcs LIMIT 1;
+
+--enable_query_log
+--enable_result_log
+DROP DATABASE XY;
+USE TEST;
+
+--echo #
+--echo # Bug55222 Mysqldump table names case bug in REFERENCES clause
+--echo # InnoDB did not handle lower_case_table_names=2 for
+--echo # foreign_table_names and referenced_table_names.
+--echo #
+
+SHOW VARIABLES LIKE 'lower_case_table_names';
+
+--disable_warnings
+DROP TABLE IF EXISTS `Table2`;
+DROP TABLE IF EXISTS `Table1`;
+--disable_warnings
+
+CREATE TABLE `Table1`(c1 INT PRIMARY KEY) ENGINE=InnoDB;
+CREATE TABLE `Table2`(c1 INT PRIMARY KEY, c2 INT) ENGINE=InnoDB;
+ALTER TABLE `Table2` ADD CONSTRAINT fk1 FOREIGN KEY(c2) REFERENCES `Table1`(c1);
+query_vertical SHOW CREATE TABLE `Table2`;
+query_vertical SELECT * FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS;
+DROP TABLE `Table2`;
+DROP TABLE `Table1`;
+
+--disable_warnings
+DROP TABLE IF EXISTS Product_Order;
+DROP TABLE IF EXISTS Product;
+DROP TABLE IF EXISTS Customer;
+--enable_warnings
+
+CREATE TABLE Product (Category INT NOT NULL, Id INT NOT NULL,
+ Price DECIMAL, PRIMARY KEY(Category, Id)) ENGINE=InnoDB;
+CREATE TABLE Customer (Id INT NOT NULL, PRIMARY KEY (Id)) ENGINE=InnoDB;
+CREATE TABLE Product_Order (No INT NOT NULL AUTO_INCREMENT,
+ Product_Category INT NOT NULL,
+ Product_Id INT NOT NULL,
+ Customer_Id INT NOT NULL,
+ PRIMARY KEY(No),
+ INDEX (Product_Category, Product_Id),
+ FOREIGN KEY (Product_Category, Product_Id)
+ REFERENCES Product(Category, Id) ON UPDATE CASCADE ON DELETE RESTRICT,
+ INDEX (Customer_Id),
+ FOREIGN KEY (Customer_Id)
+ REFERENCES Customer(Id)
+ ) ENGINE=INNODB;
+
+query_vertical SHOW CREATE TABLE Product_Order;
+query_vertical SHOW CREATE TABLE Product;
+query_vertical SHOW CREATE TABLE Customer;
+query_vertical SELECT * FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS;
+DROP TABLE Product_Order;
+DROP TABLE Product;
+DROP TABLE Customer;
+
diff --git a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test
index 8323890..43c12b4 100644
--- a/mysql-test/t/myisam.test
+++ b/mysql-test/t/myisam.test
@@ -1749,6 +1749,16 @@ CHECK TABLE t1;
DROP TABLE t1;
+--echo #
+--echo # MDEV-3870 - Valgrind warnings on OPTIMIZE MyISAM or Aria TABLE with
+--echo # disabled keys
+--echo #
+CREATE TABLE t1 (a INT, KEY(a)) ENGINE=MyISAM;
+INSERT INTO t1 VALUES (4),(3),(1),(0);
+ALTER TABLE t1 DISABLE KEYS;
+OPTIMIZE TABLE t1;
+DROP TABLE t1;
+
#
# Check some variables
#
diff --git a/mysql-test/t/mysql_tzinfo_to_sql_symlink.test b/mysql-test/t/mysql_tzinfo_to_sql_symlink.test
index 1ba4e91..8ca82b8 100644
--- a/mysql-test/t/mysql_tzinfo_to_sql_symlink.test
+++ b/mysql-test/t/mysql_tzinfo_to_sql_symlink.test
@@ -37,3 +37,14 @@
#
--exec rm -rf $MYSQLTEST_VARDIR/zoneinfo
+
+--echo #
+--echo # MDEV-6236 - [PATCH] mysql_tzinfo_to_sql may produce invalid SQL
+--echo #
+--exec mkdir $MYSQLTEST_VARDIR/zoneinfo
+--copy_file std_data/zoneinfo/GMT $MYSQLTEST_VARDIR/zoneinfo/Factory
+
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--exec $MYSQL_TZINFO_TO_SQL $MYSQLTEST_VARDIR/zoneinfo 2>&1
+
+--exec rm -rf $MYSQLTEST_VARDIR/zoneinfo
diff --git a/mysql-test/t/mysql_upgrade_view.test b/mysql-test/t/mysql_upgrade_view.test
index 3ecf66d..7a098aa 100644
--- a/mysql-test/t/mysql_upgrade_view.test
+++ b/mysql-test/t/mysql_upgrade_view.test
@@ -8,6 +8,35 @@ drop view if exists t1,v1,v2,v3,v4,v1badcheck;
create table t1(a int);
create table kv(k varchar(30) NOT NULL PRIMARY KEY,v varchar(50));
+create view v1 as select 1;
+
+repair table t1 quick;
+repair table t1 extended;
+repair table t1 use_frm;
+--error ER_PARSE_ERROR
+repair table t1 from mysql;
+
+--error ER_PARSE_ERROR
+repair view v1 quick;
+--error ER_PARSE_ERROR
+repair view v1 extended;
+--error ER_PARSE_ERROR
+repair view v1 use_frm;
+repair view v1 from mysql;
+
+--error ER_PARSE_ERROR
+check view v1 quick;
+--error ER_PARSE_ERROR
+check view v1 fast;
+--error ER_PARSE_ERROR
+check view v1 medium;
+--error ER_PARSE_ERROR
+check view v1 extended;
+--error ER_PARSE_ERROR
+check view v1 changed;
+check view v1 for upgrade;
+
+drop view v1;
let $MYSQLD_DATADIR= `select @@datadir`;
diff --git a/mysql-test/t/mysqlcheck.test b/mysql-test/t/mysqlcheck.test
index 7c55bb7..ac42e1e 100644
--- a/mysql-test/t/mysqlcheck.test
+++ b/mysql-test/t/mysqlcheck.test
@@ -7,6 +7,7 @@
# check that CSV engine was compiled in, as the result of the test
# depends on the presence of the log tables (which are CSV-based).
--source include/have_csv.inc
+let $MYSQLD_DATADIR= `select @@datadir`;
#
# Clean up after previous tests
@@ -65,7 +66,6 @@ create table t_bug25347 (a int) engine=myisam;
create view v_bug25347 as select * from t_bug25347;
insert into t_bug25347 values (1),(2),(3);
flush tables;
-let $MYSQLD_DATADIR= `select @@datadir`;
--echo removing and creating
--remove_file $MYSQLD_DATADIR/d_bug25347/t_bug25347.MYI
--write_file $MYSQLD_DATADIR/d_bug25347/t_bug25347.MYI
@@ -117,7 +117,6 @@ DROP TABLE t1, t2;
create table t1(a int) engine=myisam;
create view v1 as select * from t1;
show tables;
-let $MYSQLD_DATADIR= `select @@datadir`;
--copy_file $MYSQLD_DATADIR/test/v1.frm $MYSQLD_DATADIR/test/v-1.frm
show tables;
--exec $MYSQL_CHECK --check-upgrade --databases test
@@ -162,24 +161,23 @@ CREATE TABLE `#mysql50#c at d` (a INT) engine=myisam;
CREATE TABLE t1 (a INT) engine=myisam;
# Create 5.0 like triggers
-let $MYSQLTEST_VARDIR= `select @@datadir`;
---write_file $MYSQLTEST_VARDIR/a at b/c at d.TRG
+--write_file $MYSQLD_DATADIR/a at b/c at d.TRG
TYPE=TRIGGERS
triggers='CREATE DEFINER=`root`@`localhost` TRIGGER tr1 BEFORE INSERT ON `c at d` FOR EACH ROW SET NEW.a = 10 * NEW.a'
sql_modes=0
definers='root at localhost'
EOF
---write_file $MYSQLTEST_VARDIR/a at b/tr1.TRN
+--write_file $MYSQLD_DATADIR/a at b/tr1.TRN
TYPE=TRIGGERNAME
trigger_table=c at d
EOF
---write_file $MYSQLTEST_VARDIR/a at b/t1.TRG
+--write_file $MYSQLD_DATADIR/a at b/t1.TRG
TYPE=TRIGGERS
triggers='CREATE DEFINER=`root`@`localhost` TRIGGER tr2 BEFORE INSERT ON `a at b`.t1 FOR EACH ROW SET NEW.a = 100 * NEW.a'
sql_modes=0
definers='root at localhost'
EOF
---write_file $MYSQLTEST_VARDIR/a at b/tr2.TRN
+--write_file $MYSQLD_DATADIR/a at b/tr2.TRN
TYPE=TRIGGERNAME
trigger_table=t1
EOF
@@ -253,7 +251,6 @@ INSERT INTO bug47205 VALUES ("foobar");
FLUSH TABLE bug47205;
--echo # Replace the FRM with a 5.0 FRM that will require upgrade
-let $MYSQLD_DATADIR= `select @@datadir`;
--remove_file $MYSQLD_DATADIR/test/bug47205.frm
--copy_file std_data/bug47205.frm $MYSQLD_DATADIR/test/bug47205.frm
@@ -280,7 +277,6 @@ CREATE TABLE bug47205(a VARCHAR(20) PRIMARY KEY)
FLUSH TABLE bug47205;
--echo # Replace the FRM with a 5.0 FRM that will require upgrade
-let $MYSQLD_DATADIR= `select @@datadir`;
--remove_file $MYSQLD_DATADIR/test/bug47205.frm
--copy_file std_data/bug47205.frm $MYSQLD_DATADIR/test/bug47205.frm
@@ -323,3 +319,34 @@ CREATE TABLE test.`t.1` (id int);
--exec $MYSQL_CHECK test t.1
drop table test.`t.1`;
+
+#
+# MDEV-8123 mysqlcheck: new --process-views option conflicts with --quick, --extended and such
+#
+create view v1 as select 1;
+--echo mysqlcheck --process-views test
+--exec $MYSQL_CHECK --process-views test
+--echo mysqlcheck --process-views --extended test
+--exec $MYSQL_CHECK --process-views --extended test
+--echo mysqlcheck --process-views --fast test
+--exec $MYSQL_CHECK --process-views --fast test
+--echo mysqlcheck --process-views --quick test
+--exec $MYSQL_CHECK --process-views --quick test
+--echo mysqlcheck --process-views --check-only-changed test
+--exec $MYSQL_CHECK --process-views --check-only-changed test
+--echo mysqlcheck --process-views --medium-check test
+--exec $MYSQL_CHECK --process-views --medium-check test
+--echo mysqlcheck --process-views --check-upgrade test
+--exec $MYSQL_CHECK --process-views --check-upgrade test
+drop view v1;
+
+
+#
+# MDEV-8124 mysqlcheck: --auto-repair runs REPAIR TABLE instead of REPAIR VIEW on views
+#
+create table t1(a int);
+--copy_file $MYSQL_TEST_DIR/std_data/mysql_upgrade/v1.frm $MYSQLD_DATADIR/test/v1.frm
+--echo mysqlcheck --process-views --check-upgrade --auto-repair test
+--exec $MYSQL_CHECK --process-views --check-upgrade --auto-repair test
+drop view v1;
+drop table t1;
diff --git a/mysql-test/t/partition_innodb.test b/mysql-test/t/partition_innodb.test
index 1ef367a..8ee15d3 100644
--- a/mysql-test/t/partition_innodb.test
+++ b/mysql-test/t/partition_innodb.test
@@ -1,3 +1,7 @@
+if (`select plugin_auth_version <= "5.5.43-MariaDB-37.2" from information_schema.plugins where plugin_name='innodb'`)
+{
+ --skip Not fixed in XtraDB as of 5.5.43-MariaDB-37.2 or earlier
+}
--source include/not_embedded.inc
--source include/have_partition.inc
--source include/have_innodb.inc
@@ -390,7 +394,7 @@ DROP TABLE t1;
create table t1 (a int) engine=innodb partition by hash(a) ;
# Data_free for InnoDB tablespace varies depending on which
# tests have been run before this one
---replace_column 10 #
+--replace_column 10 # 12 #
show table status like 't1';
drop table t1;
@@ -402,12 +406,12 @@ engine = innodb
partition by key (a);
# Data_free for InnoDB tablespace varies depending on which
# tests have been run before this one
---replace_column 10 #
+--replace_column 10 # 12 #
show table status;
insert into t1 values (0), (1), (2), (3);
# Data_free for InnoDB tablespace varies depending on which
# tests have been run before this one
---replace_column 10 #
+--replace_column 10 # 12 #
show table status;
drop table t1;
@@ -416,17 +420,17 @@ engine = innodb
partition by key (a);
# Data_free for InnoDB tablespace varies depending on which
# tests have been run before this one
---replace_column 10 #
+--replace_column 10 # 12 #
show table status;
insert into t1 values (NULL), (NULL), (NULL), (NULL);
# Data_free for InnoDB tablespace varies depending on which
# tests have been run before this one
---replace_column 10 #
+--replace_column 10 # 12 #
show table status;
insert into t1 values (NULL), (NULL), (NULL), (NULL);
# Data_free for InnoDB tablespace varies depending on which
# tests have been run before this one
---replace_column 10 #
+--replace_column 10 # 12 #
show table status;
drop table t1;
@@ -662,6 +666,18 @@ ALTER TABLE t1 ADD UNIQUE KEY (b);
SHOW CREATE TABLE t1;
SELECT * FROM t1;
DROP TABLE t1;
+--echo #
+--echo # Bug #17299181 CREATE_TIME AND UPDATE_TIME ARE
+--echo # WRONG FOR PARTITIONED TABLES
+--echo #
+
+CREATE TABLE t1 (a int, PRIMARY KEY (a)) ENGINE=InnoDB
+PARTITION BY HASH (a) PARTITIONS 2;
+
+SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE
+CREATE_TIME IS NOT NULL AND TABLE_NAME='t1';
+
+DROP TABLE t1;
--echo #
--echo # BUG#12912171 - ASSERTION FAILED: QUICK->HEAD->READ_SET ==
diff --git a/mysql-test/t/range_innodb.test b/mysql-test/t/range_innodb.test
new file mode 100644
index 0000000..f767948
--- /dev/null
+++ b/mysql-test/t/range_innodb.test
@@ -0,0 +1,47 @@
+--echo #
+--echo # Range optimizer (and related) tests that need InnoDB.
+--echo #
+
+--source include/have_innodb.inc
+
+--disable_warnings
+drop table if exists t0, t1, t2;
+--enable_warnings
+
+--echo #
+--echo # MDEV-6735: Range checked for each record used with key
+--echo #
+
+create table t0(a int);
+insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
+
+create table t1(a int);
+insert into t1 select A.a + B.a* 10 + C.a * 100 + D.a * 1000
+from t0 A, t0 B, t0 C, t0 D;
+
+create table t2 (
+ a int,
+ b int,
+ filler1 char(100),
+ filler2 char(100),
+ filler3 char(100),
+ filler4 char(100),
+ key(a),
+ key(b)
+) engine=innodb;
+
+insert into t2
+select
+ a,a,
+ repeat('0123456789', 10),
+ repeat('0123456789', 10),
+ repeat('0123456789', 10),
+ repeat('0123456789', 10)
+from t1;
+
+analyze table t2;
+--echo # The following must not use "Range checked for each record":
+explain select * from t0 left join t2 on t2.a <t0.a and t2.b between 50 and 250;
+
+drop table t0,t1,t2;
+
diff --git a/mysql-test/t/repair.test b/mysql-test/t/repair.test
index 337b73f..f625965 100644
--- a/mysql-test/t/repair.test
+++ b/mysql-test/t/repair.test
@@ -208,3 +208,12 @@ repair table t1 use_frm;
select count(*) from t1;
check table t1;
drop table t1;
+
+#
+# MDEV-8115 mysql_upgrade crashes the server with REPAIR VIEW
+#
+create table t1 (a blob);
+create view v1 as select * from t1;
+repair view v1;
+drop view v1;
+drop table t1;
diff --git a/mysql-test/t/ssl_7937.combinations b/mysql-test/t/ssl_7937.combinations
new file mode 100644
index 0000000..46a4568
--- /dev/null
+++ b/mysql-test/t/ssl_7937.combinations
@@ -0,0 +1,5 @@
+[ssl]
+--loose-enable-ssl
+
+[nossl]
+--loose-disable-ssl
diff --git a/mysql-test/t/ssl_7937.test b/mysql-test/t/ssl_7937.test
new file mode 100644
index 0000000..d593b9d
--- /dev/null
+++ b/mysql-test/t/ssl_7937.test
@@ -0,0 +1,35 @@
+#
+# MDEV-7937: Enforce SSL when --ssl client option is used
+#
+
+source include/have_ssl_crypto_functs.inc;
+
+# create a procedure instead of SHOW STATUS LIKE 'ssl_cipher'
+# because the cipher depends on openssl (or yassl) version,
+# and it's actual value doesn't matter here anyway
+create procedure have_ssl()
+ select if(variable_value > '','yes','no') as 'have_ssl'
+ from information_schema.session_status
+ where variable_name='ssl_cipher';
+
+--disable_abort_on_error
+--echo mysql --ssl-ca=cacert.pem -e "call test.have_ssl()"
+--exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem -e "call test.have_ssl()" 2>&1
+--echo mysql --ssl -e "call test.have_ssl()"
+--exec $MYSQL --ssl -e "call test.have_ssl()" 2>&1
+--echo mysql --ssl-ca=cacert.pem --ssl-verify-server-cert -e "call test.have_ssl()"
+--exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem --ssl-verify-server-cert -e "call test.have_ssl()" 2>&1
+
+--echo mysql --ssl --ssl-verify-server-cert -e "call test.have_ssl()"
+# this is the test where certificate verification fails.
+# but yassl doesn't support certificate verification, so
+# we fake the test result for yassl
+let yassl=`select variable_value='Unknown' from information_schema.session_status where variable_name='Ssl_session_cache_mode'`;
+if (!$yassl) {
+ --exec $MYSQL --ssl --ssl-verify-server-cert -e "call test.have_ssl()" 2>&1
+}
+if ($yassl) {
+ --echo ERROR 2026 (HY000): SSL connection error: Failed to verify the server certificate
+}
+
+drop procedure have_ssl;
diff --git a/mysql-test/t/truncate-stale-6500.test b/mysql-test/t/truncate-stale-6500.test
new file mode 100644
index 0000000..47dffb1
--- /dev/null
+++ b/mysql-test/t/truncate-stale-6500.test
@@ -0,0 +1,32 @@
+--source include/have_innodb.inc
+--source include/have_partition.inc
+
+SET GLOBAL query_cache_size=1024*1024*8;
+CREATE TABLE `test` (
+ `uniqueId` INT NOT NULL,
+ `partitionId` INT NOT NULL,
+ PRIMARY KEY (`uniqueId`,`partitionId`)
+) ENGINE=InnoDB PARTITION BY LIST (partitionId) (
+ PARTITION p01 VALUES IN (1),
+ PARTITION p02 VALUES IN (2)
+);
+
+
+INSERT INTO `test`(`uniqueId`,`partitionId`) VALUES(407237055, 2);
+
+SELECT * FROM `test`;
+
+--echo #Confirms 1 row in partition 'p02'
+SELECT TABLE_NAME, PARTITION_NAME, TABLE_ROWS FROM information_schema.PARTITIONS where TABLE_NAME = 'test';
+ALTER TABLE `test` TRUNCATE PARTITION `p02`;
+
+--echo #Confirms no more rows in partition 'p02'
+SELECT TABLE_NAME, PARTITION_NAME, TABLE_ROWS FROM information_schema.PARTITIONS where TABLE_NAME = 'test';
+
+--echo #Before the patch, this returned the previously existing values.
+SELECT * FROM `test`;
+SELECT SQL_CACHE * FROM `test`;
+SELECT SQL_NO_CACHE * FROM `test`;
+
+DROP TABLE test;
+SET GLOBAL query_cache_size=DEFAULT;
diff --git a/mysql-test/t/type_decimal.test b/mysql-test/t/type_decimal.test
index 1d4ef34..659e752 100644
--- a/mysql-test/t/type_decimal.test
+++ b/mysql-test/t/type_decimal.test
@@ -583,3 +583,27 @@ JOIN
WHERE CONCAT(t1.col1, CAST(subq.col0 AS DECIMAL));
DROP TABLE t1, t2;
+
+
+--echo #
+--echo # Start of 5.5 tests
+--echo #
+
+--echo #
+--echo # MDEV-8267 Add /*old*/ comment into I_S.COLUMN_TYPE for old DECIMAL
+--echo #
+
+let $MYSQLD_DATADIR= `select @@datadir`;
+
+--copy_file std_data/old_decimal/t1dec102.frm $MYSQLD_DATADIR/test/t1dec102.frm
+--copy_file std_data/old_decimal/t1dec102.MYD $MYSQLD_DATADIR/test/t1dec102.MYD
+--copy_file std_data/old_decimal/t1dec102.MYI $MYSQLD_DATADIR/test/t1dec102.MYI
+
+SHOW CREATE TABLE t1dec102;
+SHOW COLUMNS FROM t1dec102;
+SELECT COLUMN_NAME, DATA_TYPE, COLUMN_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='t1dec102';
+DROP TABLE t1dec102;
+
+--echo #
+--echo # End of 5.5 tests
+--echo #
diff --git a/mysql-test/t/update_innodb.test b/mysql-test/t/update_innodb.test
new file mode 100644
index 0000000..67c356c
--- /dev/null
+++ b/mysql-test/t/update_innodb.test
@@ -0,0 +1,39 @@
+--source include/have_innodb.inc
+
+CREATE TABLE `t1` (
+ `c1` int(11) NOT NULL,
+ `c2` datetime DEFAULT NULL,
+ PRIMARY KEY (`c1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+CREATE TABLE `t2` (
+ `c0` varchar(10) NOT NULL,
+ `c1` int(11) NOT NULL,
+ `c2` int(11) NOT NULL,
+ PRIMARY KEY (`c0`,`c1`),
+ KEY `c1` (`c1`),
+ KEY `c2` (`c2`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+CREATE TABLE `t3` (
+ `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+ `c1` datetime NOT NULL,
+ `c2` bigint(20) NOT NULL,
+ `c3` int(4) unsigned NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `c2` (`c2`),
+ KEY `c3` (`c3`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+CREATE TABLE `t4` (
+ `c1` int(11) NOT NULL,
+ `c2` bigint(20) DEFAULT NULL,
+ `c3` int(11) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+ CREATE ALGORITHM=UNDEFINED VIEW `v1` AS select `t4`.`c1` AS `c1`,`t4`.`c2` AS `c2`,`t4`.`c3` AS `c3` from `t4`;
+
+UPDATE t1 a JOIN t2 b ON a.c1 = b.c1 JOIN v1 vw ON b.c2 = vw.c1 JOIN t3 del ON vw.c2 = del.c2 SET a.c2 = ( SELECT max(t.c1) FROM t3 t, v1 i WHERE del.c2 = t.c2 AND vw.c3 = i.c3 AND t.c3 = 4 ) WHERE a.c2 IS NULL OR a.c2 < '2011-05-01';
+
+drop view v1;
+drop table t1,t2,t3,t4;
diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test
index b967992..0432db0 100644
--- a/mysql-test/t/view.test
+++ b/mysql-test/t/view.test
@@ -5367,6 +5367,19 @@ update t3 left join v2 using (id) set flag=flag+1;
drop view v2, v1;
drop table t1, t2, t3;
+--echo #
+--echo # MDEV-7207 - ALTER VIEW does not change ALGORITM
+--echo #
+create table t1 (a int, b int);
+create algorithm=temptable view v2 (c) as select b+1 from t1;
+show create view v2;
+alter algorithm=undefined view v2 (c) as select b+1 from t1;
+show create view v2;
+alter algorithm=merge view v2 (c) as select b+1 from t1;
+show create view v2;
+drop view v2;
+drop table t1;
+
--echo # -----------------------------------------------------------------
--echo # -- End of 5.5 tests.
--echo # -----------------------------------------------------------------
diff --git a/mysys/my_gethwaddr.c b/mysys/my_gethwaddr.c
index 74dae29..db026c1 100644
--- a/mysys/my_gethwaddr.c
+++ b/mysys/my_gethwaddr.c
@@ -130,7 +130,7 @@ err:
#elif defined(_WIN32)
#include <winsock2.h>
#include <iphlpapi.h>
-#pragma comment(lib, "iphlpapi.lib")
+#pragma comment(lib, "iphlpapi.lib")
#define ETHER_ADDR_LEN 6
diff --git a/mysys/my_init.c b/mysys/my_init.c
index 193c828..99efba1 100644
--- a/mysys/my_init.c
+++ b/mysys/my_init.c
@@ -25,7 +25,7 @@
#ifdef _MSC_VER
#include <locale.h>
#include <crtdbg.h>
-/* WSAStartup needs winsock library*/
+/* WSAStartup needs winsock library*/
#pragma comment(lib, "ws2_32")
#endif
my_bool have_tcpip=0;
diff --git a/packaging/WiX/CPackWixConfig.cmake b/packaging/WiX/CPackWixConfig.cmake
index c782b7c..9caae83 100644
--- a/packaging/WiX/CPackWixConfig.cmake
+++ b/packaging/WiX/CPackWixConfig.cmake
@@ -1,119 +1,119 @@
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-IF(ESSENTIALS)
- SET(CPACK_COMPONENTS_USED "Server;Client;DataFiles")
- SET(CPACK_WIX_UI "WixUI_InstallDir")
- IF(CMAKE_SIZEOF_VOID_P MATCHES 8)
- SET(CPACK_PACKAGE_FILE_NAME "mysql-essential-${VERSION}-winx64")
- ELSE()
- SET(CPACK_PACKAGE_FILE_NAME "mysql-essential-${VERSION}-win32")
- ENDIF()
-ELSE()
- SET(CPACK_COMPONENTS_USED
- "Server;Client;DataFiles;Development;SharedLibraries;Documentation;IniFiles;Readme;Server_Scripts;DebugBinaries")
-ENDIF()
-
-
-# Some components like Embedded are optional
-# We will build MSI without embedded if it was not selected for build
-#(need to modify CPACK_COMPONENTS_ALL for that)
-SET(CPACK_ALL)
-FOREACH(comp1 ${CPACK_COMPONENTS_USED})
- SET(found)
- FOREACH(comp2 ${CPACK_COMPONENTS_ALL})
- IF(comp1 STREQUAL comp2)
- SET(found 1)
- BREAK()
- ENDIF()
- ENDFOREACH()
- IF(found)
- SET(CPACK_ALL ${CPACK_ALL} ${comp1})
- ENDIF()
-ENDFOREACH()
-SET(CPACK_COMPONENTS_ALL ${CPACK_ALL})
-
-# Always install (hidden), includes Readme files
-SET(CPACK_COMPONENT_GROUP_ALWAYSINSTALL_HIDDEN 1)
-SET(CPACK_COMPONENT_README_GROUP "AlwaysInstall")
-
-# Feature MySQL Server
-SET(CPACK_COMPONENT_GROUP_MYSQLSERVER_DISPLAY_NAME "MySQL Server")
-SET(CPACK_COMPONENT_GROUP_MYSQLSERVER_EXPANDED "1")
-SET(CPACK_COMPONENT_GROUP_MYSQLSERVER_DESCRIPTION "Install MySQL Server")
- # Subfeature "Server" (hidden)
- SET(CPACK_COMPONENT_SERVER_GROUP "MySQLServer")
- SET(CPACK_COMPONENT_SERVER_HIDDEN 1)
- # Subfeature "Client"
- SET(CPACK_COMPONENT_CLIENT_GROUP "MySQLServer")
- SET(CPACK_COMPONENT_CLIENT_DISPLAY_NAME "Client Programs")
- SET(CPACK_COMPONENT_CLIENT_DESCRIPTION
- "Various helpful (commandline) tools including the mysql command line client" )
- # Subfeature "Debug binaries"
- SET(CPACK_COMPONENT_DEBUGBINARIES_GROUP "MySQLServer")
- SET(CPACK_COMPONENT_DEBUGBINARIES_DISPLAY_NAME "Debug binaries")
- SET(CPACK_COMPONENT_DEBUGBINARIES_DESCRIPTION
- "Debug/trace versions of executables and libraries" )
- #SET(CPACK_COMPONENT_DEBUGBINARIES_WIX_LEVEL 2)
-
-
- #Subfeature "Data Files"
- SET(CPACK_COMPONENT_DATAFILES_GROUP "MySQLServer")
- SET(CPACK_COMPONENT_DATAFILES_DISPLAY_NAME "Server data files")
- SET(CPACK_COMPONENT_DATAFILES_DESCRIPTION "Server data files" )
- SET(CPACK_COMPONENT_DATAFILES_HIDDEN 1)
-
-
-#Feature "Devel"
-SET(CPACK_COMPONENT_GROUP_DEVEL_DISPLAY_NAME "Development Components")
-SET(CPACK_COMPONENT_GROUP_DEVEL_DESCRIPTION "Installs C/C++ header files and libraries")
- #Subfeature "Development"
- SET(CPACK_COMPONENT_DEVELOPMENT_GROUP "Devel")
- SET(CPACK_COMPONENT_DEVELOPMENT_HIDDEN 1)
-
- #Subfeature "Shared libraries"
- SET(CPACK_COMPONENT_SHAREDLIBRARIES_GROUP "Devel")
- SET(CPACK_COMPONENT_SHAREDLIBRARIES_DISPLAY_NAME "Client C API library (shared)")
- SET(CPACK_COMPONENT_SHAREDLIBRARIES_DESCRIPTION "Installs shared client library")
-
- #Subfeature "Embedded"
- SET(CPACK_COMPONENT_EMBEDDED_GROUP "Devel")
- SET(CPACK_COMPONENT_EMBEDDED_DISPLAY_NAME "Embedded server library")
- SET(CPACK_COMPONENT_EMBEDDED_DESCRIPTION "Installs embedded server library")
- SET(CPACK_COMPONENT_EMBEDDED_WIX_LEVEL 2)
-
-#Feature Debug Symbols
-SET(CPACK_COMPONENT_GROUP_DEBUGSYMBOLS_DISPLAY_NAME "Debug Symbols")
-SET(CPACK_COMPONENT_GROUP_DEBUGSYMBOLS_DESCRIPTION "Installs Debug Symbols")
-SET(CPACK_COMPONENT_GROUP_DEBUGSYMBOLS_WIX_LEVEL 2)
- SET(CPACK_COMPONENT_DEBUGINFO_GROUP "DebugSymbols")
- SET(CPACK_COMPONENT_DEBUGINFO_HIDDEN 1)
-
-#Feature Documentation
-SET(CPACK_COMPONENT_DOCUMENTATION_DISPLAY_NAME "Documentation")
-SET(CPACK_COMPONENT_DOCUMENTATION_DESCRIPTION "Installs documentation")
-SET(CPACK_COMPONENT_DOCUMENTATION_WIX_LEVEL 2)
-
-#Feature tests
-SET(CPACK_COMPONENT_TEST_DISPLAY_NAME "Tests")
-SET(CPACK_COMPONENT_TEST_DESCRIPTION "Installs unittests (requires Perl to run)")
-SET(CPACK_COMPONENT_TEST_WIX_LEVEL 2)
-
-
-#Feature Misc (hidden, installs only if everything is installed)
-SET(CPACK_COMPONENT_GROUP_MISC_HIDDEN 1)
-SET(CPACK_COMPONENT_GROUP_MISC_WIX_LEVEL 100)
- SET(CPACK_COMPONENT_INIFILES_GROUP "Misc")
- SET(CPACK_COMPONENT_SERVER_SCRIPTS_GROUP "Misc")
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+IF(ESSENTIALS)
+ SET(CPACK_COMPONENTS_USED "Server;Client;DataFiles")
+ SET(CPACK_WIX_UI "WixUI_InstallDir")
+ IF(CMAKE_SIZEOF_VOID_P MATCHES 8)
+ SET(CPACK_PACKAGE_FILE_NAME "mysql-essential-${VERSION}-winx64")
+ ELSE()
+ SET(CPACK_PACKAGE_FILE_NAME "mysql-essential-${VERSION}-win32")
+ ENDIF()
+ELSE()
+ SET(CPACK_COMPONENTS_USED
+ "Server;Client;DataFiles;Development;SharedLibraries;Documentation;IniFiles;Readme;Server_Scripts;DebugBinaries")
+ENDIF()
+
+
+# Some components like Embedded are optional
+# We will build MSI without embedded if it was not selected for build
+#(need to modify CPACK_COMPONENTS_ALL for that)
+SET(CPACK_ALL)
+FOREACH(comp1 ${CPACK_COMPONENTS_USED})
+ SET(found)
+ FOREACH(comp2 ${CPACK_COMPONENTS_ALL})
+ IF(comp1 STREQUAL comp2)
+ SET(found 1)
+ BREAK()
+ ENDIF()
+ ENDFOREACH()
+ IF(found)
+ SET(CPACK_ALL ${CPACK_ALL} ${comp1})
+ ENDIF()
+ENDFOREACH()
+SET(CPACK_COMPONENTS_ALL ${CPACK_ALL})
+
+# Always install (hidden), includes Readme files
+SET(CPACK_COMPONENT_GROUP_ALWAYSINSTALL_HIDDEN 1)
+SET(CPACK_COMPONENT_README_GROUP "AlwaysInstall")
+
+# Feature MySQL Server
+SET(CPACK_COMPONENT_GROUP_MYSQLSERVER_DISPLAY_NAME "MySQL Server")
+SET(CPACK_COMPONENT_GROUP_MYSQLSERVER_EXPANDED "1")
+SET(CPACK_COMPONENT_GROUP_MYSQLSERVER_DESCRIPTION "Install MySQL Server")
+ # Subfeature "Server" (hidden)
+ SET(CPACK_COMPONENT_SERVER_GROUP "MySQLServer")
+ SET(CPACK_COMPONENT_SERVER_HIDDEN 1)
+ # Subfeature "Client"
+ SET(CPACK_COMPONENT_CLIENT_GROUP "MySQLServer")
+ SET(CPACK_COMPONENT_CLIENT_DISPLAY_NAME "Client Programs")
+ SET(CPACK_COMPONENT_CLIENT_DESCRIPTION
+ "Various helpful (commandline) tools including the mysql command line client" )
+ # Subfeature "Debug binaries"
+ SET(CPACK_COMPONENT_DEBUGBINARIES_GROUP "MySQLServer")
+ SET(CPACK_COMPONENT_DEBUGBINARIES_DISPLAY_NAME "Debug binaries")
+ SET(CPACK_COMPONENT_DEBUGBINARIES_DESCRIPTION
+ "Debug/trace versions of executables and libraries" )
+ #SET(CPACK_COMPONENT_DEBUGBINARIES_WIX_LEVEL 2)
+
+
+ #Subfeature "Data Files"
+ SET(CPACK_COMPONENT_DATAFILES_GROUP "MySQLServer")
+ SET(CPACK_COMPONENT_DATAFILES_DISPLAY_NAME "Server data files")
+ SET(CPACK_COMPONENT_DATAFILES_DESCRIPTION "Server data files" )
+ SET(CPACK_COMPONENT_DATAFILES_HIDDEN 1)
+
+
+#Feature "Devel"
+SET(CPACK_COMPONENT_GROUP_DEVEL_DISPLAY_NAME "Development Components")
+SET(CPACK_COMPONENT_GROUP_DEVEL_DESCRIPTION "Installs C/C++ header files and libraries")
+ #Subfeature "Development"
+ SET(CPACK_COMPONENT_DEVELOPMENT_GROUP "Devel")
+ SET(CPACK_COMPONENT_DEVELOPMENT_HIDDEN 1)
+
+ #Subfeature "Shared libraries"
+ SET(CPACK_COMPONENT_SHAREDLIBRARIES_GROUP "Devel")
+ SET(CPACK_COMPONENT_SHAREDLIBRARIES_DISPLAY_NAME "Client C API library (shared)")
+ SET(CPACK_COMPONENT_SHAREDLIBRARIES_DESCRIPTION "Installs shared client library")
+
+ #Subfeature "Embedded"
+ SET(CPACK_COMPONENT_EMBEDDED_GROUP "Devel")
+ SET(CPACK_COMPONENT_EMBEDDED_DISPLAY_NAME "Embedded server library")
+ SET(CPACK_COMPONENT_EMBEDDED_DESCRIPTION "Installs embedded server library")
+ SET(CPACK_COMPONENT_EMBEDDED_WIX_LEVEL 2)
+
+#Feature Debug Symbols
+SET(CPACK_COMPONENT_GROUP_DEBUGSYMBOLS_DISPLAY_NAME "Debug Symbols")
+SET(CPACK_COMPONENT_GROUP_DEBUGSYMBOLS_DESCRIPTION "Installs Debug Symbols")
+SET(CPACK_COMPONENT_GROUP_DEBUGSYMBOLS_WIX_LEVEL 2)
+ SET(CPACK_COMPONENT_DEBUGINFO_GROUP "DebugSymbols")
+ SET(CPACK_COMPONENT_DEBUGINFO_HIDDEN 1)
+
+#Feature Documentation
+SET(CPACK_COMPONENT_DOCUMENTATION_DISPLAY_NAME "Documentation")
+SET(CPACK_COMPONENT_DOCUMENTATION_DESCRIPTION "Installs documentation")
+SET(CPACK_COMPONENT_DOCUMENTATION_WIX_LEVEL 2)
+
+#Feature tests
+SET(CPACK_COMPONENT_TEST_DISPLAY_NAME "Tests")
+SET(CPACK_COMPONENT_TEST_DESCRIPTION "Installs unittests (requires Perl to run)")
+SET(CPACK_COMPONENT_TEST_WIX_LEVEL 2)
+
+
+#Feature Misc (hidden, installs only if everything is installed)
+SET(CPACK_COMPONENT_GROUP_MISC_HIDDEN 1)
+SET(CPACK_COMPONENT_GROUP_MISC_WIX_LEVEL 100)
+ SET(CPACK_COMPONENT_INIFILES_GROUP "Misc")
+ SET(CPACK_COMPONENT_SERVER_SCRIPTS_GROUP "Misc")
diff --git a/packaging/WiX/create_msi.cmake.in b/packaging/WiX/create_msi.cmake.in
index 8de271f..d0a8f00 100644
--- a/packaging/WiX/create_msi.cmake.in
+++ b/packaging/WiX/create_msi.cmake.in
@@ -1,398 +1,398 @@
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-SET(CMAKE_BINARY_DIR "@CMAKE_BINARY_DIR@")
-SET(CMAKE_CURRENT_SOURCE_DIR "@CMAKE_CURRENT_SOURCE_DIR@")
-SET(CANDLE_EXECUTABLE "@CANDLE_EXECUTABLE@")
-SET(LIGHT_EXECUTABLE "@LIGHT_EXECUTABLE@")
-SET(CMAKE_COMMAND "@CMAKE_COMMAND@")
-SET(CMAKE_CFG_INTDIR "@CMAKE_CFG_INTDIR@")
-SET(VERSION "@VERSION@")
-SET(MAJOR_VERSION "@MAJOR_VERSION@")
-SET(MINOR_VERSION "@MINOR_VERSION@")
-SET(PATCH_VERSION "@PATCH_VERSION@")
-SET(CMAKE_SIZEOF_VOID_P @CMAKE_SIZEOF_VOID_P@)
-SET(MANUFACTURER "@MANUFACTURER@")
-SET(WIXCA_LOCATION "@WIXCA_LOCATION@")
-SET(COPYING_RTF "@COPYING_RTF@")
-SET(CPACK_WIX_CONFIG "@CPACK_WIX_CONFIG@")
-SET(CPACK_WIX_INCLUDE "@CPACK_WIX_INCLUDE@")
-
-LIST(APPEND EXCLUDE_DIRS
- bin/debug
- data/test
- lib/plugin/debug
- mysql-test
- scripts
- sql-bench
-)
-
-LIST(APPEND EXCLUDE_FILES
- bin/echo.exe
- bin/mysql_client_test_embedded.exe
- bin/mysqld-debug.exe
- bin/mysqltest_embedded.exe
- bin/replace.exe
- lib/debug/mysqlserver.lib
- lib/libmysqld.dll
- lib/libmysqld.lib
- lib/mysqlserver.lib
- lib/mysqlservices.lib
-)
-
-IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
- SET(Win64 " Win64='yes'")
- SET(Platform x64)
- SET(PlatformProgramFilesFolder ProgramFiles64Folder)
-ELSE()
- SET(Platform x86)
- SET(PlatformProgramFilesFolder ProgramFilesFolder)
- SET(Win64)
-ENDIF()
-
-SET(ENV{VS_UNICODE_OUTPUT})
-
-# Switch off the monolithic install
-EXECUTE_PROCESS(
- COMMAND ${CMAKE_COMMAND} -DCPACK_MONOLITHIC_INSTALL=0 ${CMAKE_BINARY_DIR}
- OUTPUT_QUIET
-)
-
-INCLUDE(${CMAKE_BINARY_DIR}/CPackConfig.cmake)
-
-IF(CPACK_WIX_CONFIG)
- INCLUDE(${CPACK_WIX_CONFIG})
-ENDIF()
-
-IF(NOT CPACK_WIX_UI)
- SET(CPACK_WIX_UI "WixUI_Mondo_Custom")
-ENDIF()
-
-SET(WIX_FEATURES)
-FOREACH(comp ${CPACK_COMPONENTS_ALL})
- STRING(TOUPPER "${comp}" comp_upper)
- IF(NOT CPACK_COMPONENT_${comp_upper}_GROUP)
- SET(WIX_FEATURE_${comp_upper}_COMPONENTS "${comp}")
- SET(CPACK_COMPONENT_${comp_upper}_HIDDEN 1)
- SET(CPACK_COMPONENT_GROUP_${comp_upper}_DISPLAY_NAME ${CPACK_COMPONENT_${comp_upper}_DISPLAY_NAME})
- SET(CPACK_COMPONENT_GROUP_${comp_upper}_DESCRIPTION ${CPACK_COMPONENT_${comp_upper}_DESCRIPTION})
- SET(CPACK_COMPONENT_GROUP_${comp_upper}_WIX_LEVEL ${CPACK_COMPONENT_${comp_upper}_WIX_LEVEL})
- SET(WIX_FEATURES ${WIX_FEATURES} WIX_FEATURE_${comp_upper})
- ELSE()
- SET(FEATURE_NAME WIX_FEATURE_${CPACK_COMPONENT_${comp_upper}_GROUP})
- SET(WIX_FEATURES ${WIX_FEATURES} ${FEATURE_NAME})
- LIST(APPEND ${FEATURE_NAME}_COMPONENTS ${comp})
- ENDIF()
-ENDFOREACH()
-
-LIST(REMOVE_DUPLICATES WIX_FEATURES)
-
-SET(CPACK_WIX_FEATURES)
-
-FOREACH(f ${WIX_FEATURES})
- STRING(TOUPPER "${f}" f_upper)
- STRING(REPLACE "WIX_FEATURE_" "" f_upper ${f_upper})
- IF (CPACK_COMPONENT_GROUP_${f_upper}_DISPLAY_NAME)
- SET(TITLE ${CPACK_COMPONENT_GROUP_${f_upper}_DISPLAY_NAME})
- ELSE()
- SET(TITLE CPACK_COMPONENT_GROUP_${f_upper}_DISPLAY_NAME)
- ENDIF()
-
- IF (CPACK_COMPONENT_GROUP_${f_upper}_DESCRIPTION)
- SET(DESCRIPTION ${CPACK_COMPONENT_GROUP_${f_upper}_DESCRIPTION})
- ELSE()
- SET(DESCRIPTION CPACK_COMPONENT_GROUP_${f_upper}_DESCRIPTION)
- ENDIF()
- IF(CPACK_COMPONENT_${f_upper}_WIX_LEVEL)
- SET(Level ${CPACK_COMPONENT_${f_upper}_WIX_LEVEL})
- ELSE()
- SET(Level 1)
- ENDIF()
- IF(CPACK_COMPONENT_GROUP_${f_upper}_HIDDEN)
- SET(DISPLAY "Display='hidden'")
- SET(TITLE ${f_upper})
- SET(DESCRIPTION ${f_upper})
- ELSE()
- SET(DISPLAY)
- IF(CPACK_COMPONENT_GROUP_${f_upper}_EXPANDED)
- SET(DISPLAY "Display='expand'")
- ENDIF()
- IF (CPACK_COMPONENT_GROUP_${f_upper}_DISPLAY_NAME)
- SET(TITLE ${CPACK_COMPONENT_GROUP_${f_upper}_DISPLAY_NAME})
- ELSE()
- SET(TITLE CPACK_COMPONENT_GROUP_${f_upper}_DISPLAY_NAME)
- ENDIF()
- IF (CPACK_COMPONENT_GROUP_${f_upper}_DESCRIPTION)
- SET(DESCRIPTION ${CPACK_COMPONENT_GROUP_${f_upper}_DESCRIPTION})
- ELSE()
- SET(DESCRIPTION CPACK_COMPONENT_GROUP_${f_upper}_DESCRIPTION)
- ENDIF()
- ENDIF()
-
- SET(CPACK_WIX_FEATURES
- "${CPACK_WIX_FEATURES}
- <Feature Id='${f_upper}'
- Title='${TITLE}'
- Description='${DESCRIPTION}'
- ConfigurableDirectory='INSTALLDIR'
- Level='${Level}' ${DISPLAY} >"
- )
- FOREACH(c ${${f}_COMPONENTS})
- STRING(TOUPPER "${c}" c_upper)
- IF (CPACK_COMPONENT_${c_upper}_DISPLAY_NAME)
- SET(TITLE ${CPACK_COMPONENT_${c_upper}_DISPLAY_NAME})
- ELSE()
- SET(TITLE CPACK_COMPONENT_${c_upper}_DISPLAY_NAME)
- ENDIF()
-
- IF (CPACK_COMPONENT_${c_upper}_DESCRIPTION)
- SET(DESCRIPTION ${CPACK_COMPONENT_${c_upper}_DESCRIPTION})
- ELSE()
- SET(DESCRIPTION CPACK_COMPONENT_${c_upper}_DESCRIPTION)
- ENDIF()
- IF(CPACK_COMPONENT_${c_upper}_WIX_LEVEL)
- SET(Level ${CPACK_COMPONENT_${c_upper}_WIX_LEVEL})
- ELSE()
- SET(Level 1)
- ENDIF()
- IF(CPACK_COMPONENT_${c_upper}_HIDDEN)
- SET(CPACK_WIX_FEATURES
- "${CPACK_WIX_FEATURES}
- <ComponentGroupRef Id='componentgroup.${c}'/>")
- ELSE()
- SET(CPACK_WIX_FEATURES
- "${CPACK_WIX_FEATURES}
- <Feature Id='${c}'
- Title='${TITLE}'
- Description='${DESCRIPTION}'
- ConfigurableDirectory='INSTALLDIR'
- Level='${Level}'>
- <ComponentGroupRef Id='componentgroup.${c}'/>
- </Feature>")
- ENDIF()
-
- ENDFOREACH()
- SET(CPACK_WIX_FEATURES
- "${CPACK_WIX_FEATURES}
- </Feature>
- ")
-ENDFOREACH()
-
-
-IF(CMAKE_INSTALL_CONFIG_NAME)
- STRING(REPLACE "${CMAKE_CFG_INTDIR}" "${CMAKE_INSTALL_CONFIG_NAME}"
- WIXCA_LOCATION "${WIXCA_LOCATION}")
- SET(CONFIG_PARAM "-DCMAKE_INSTALL_CONFIG_NAME=${CMAKE_INSTALL_CONFIG_NAME}")
-ENDIF()
-
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_server.wxs.in
- ${CMAKE_CURRENT_BINARY_DIR}/mysql_server.wxs)
-
-
-FOREACH(comp ${CPACK_COMPONENTS_ALL})
- SET(ENV{DESTDIR} testinstall/${comp})
- SET(DIRS ${DIRS} testinstall/${comp})
- EXECUTE_PROCESS(
- COMMAND ${CMAKE_COMMAND} ${CONFIG_PARAM} -DCMAKE_INSTALL_COMPONENT=${comp}
- -DCMAKE_INSTALL_PREFIX= -P ${CMAKE_BINARY_DIR}/cmake_install.cmake
- OUTPUT_QUIET
- )
-ENDFOREACH()
-
-MACRO(GENERATE_GUID VarName)
- EXECUTE_PROCESS(COMMAND uuidgen -c
- OUTPUT_VARIABLE ${VarName}
- OUTPUT_STRIP_TRAILING_WHITESPACE)
-ENDMACRO()
-
-SET(INC_VAR 0)
-MACRO(MAKE_WIX_IDENTIFIER str varname)
- STRING(REPLACE "/" "." ${varname} "${str}")
- STRING(REGEX REPLACE "[^a-zA-Z_0-9.]" "_" ${varname} "${${varname}}")
- STRING(LENGTH "${${varname}}" len)
- # Identifier should be smaller than 72 character
- # We have to cut down the length to 70 chars, since we add 2 char prefix
- # pretty often
- IF(len GREATER 70)
- STRING(SUBSTRING "${${varname}}" 0 67 shortstr)
- MATH(EXPR INC_VAR ${INC_VAR}+1)
- SET(${varname} "${shortstr}${INC_VAR}")
- ENDIF()
-ENDMACRO()
-
-
-FUNCTION(TRAVERSE_FILES dir topdir file file_comp dir_root)
- FILE(RELATIVE_PATH dir_rel ${topdir} ${dir})
- IF(dir_rel)
- LIST(FIND EXCLUDE_DIRS ${dir_rel} TO_EXCLUDE)
- IF(NOT TO_EXCLUDE EQUAL -1)
- MESSAGE(STATUS "excluding directory: ${dir_rel}")
- RETURN()
- ENDIF()
- ENDIF()
- FILE(GLOB all_files ${dir}/*)
- IF(NOT all_files)
- RETURN()
- ENDIF()
- IF(dir_rel)
- MAKE_DIRECTORY(${dir_root}/${dir_rel})
- MAKE_WIX_IDENTIFIER("${dir_rel}" id)
- SET(DirectoryRefId "D.${id}")
- ELSE()
- SET(DirectoryRefId "INSTALLDIR")
- ENDIF()
- FILE(APPEND ${file} "<DirectoryRef Id='${DirectoryRefId}'>\n")
-
- SET(NONEXEFILES)
- FOREACH(f ${all_files})
- IF(NOT IS_DIRECTORY ${f})
- FILE(RELATIVE_PATH rel ${topdir} ${f})
- SET(TO_EXCLUDE)
- IF(rel MATCHES "\\.pdb$")
- SET(TO_EXCLUDE TRUE)
- ELSE()
- LIST(FIND EXCLUDE_FILES ${rel} RES)
- IF(NOT RES EQUAL -1)
- SET(TO_EXCLUDE TRUE)
- ENDIF()
- ENDIF()
- IF(TO_EXCLUDE)
- MESSAGE(STATUS "excluding file: ${rel}")
- ELSE()
- MAKE_WIX_IDENTIFIER("${rel}" id)
- FILE(TO_NATIVE_PATH ${f} f_native)
- GET_FILENAME_COMPONENT(f_ext "${f}" EXT)
- # According to MSDN each DLL or EXE should be in the own component
- IF(f_ext MATCHES ".exe" OR f_ext MATCHES ".dll")
-
- FILE(APPEND ${file} " <Component Id='C.${id}' Guid='*' ${Win64}>\n")
- FILE(APPEND ${file} " <File Id='F.${id}' KeyPath='yes' Source='${f_native}'/>\n")
- FILE(APPEND ${file} " </Component>\n")
- FILE(APPEND ${file_comp} " <ComponentRef Id='C.${id}'/>\n")
- ELSE()
- SET(NONEXEFILES "${NONEXEFILES}\n<File Id='F.${id}' Source='${f_native}'/>" )
- ENDIF()
- ENDIF()
- ENDIF()
- ENDFOREACH()
- FILE(APPEND ${file} "</DirectoryRef>\n")
- IF(NONEXEFILES)
- GENERATE_GUID(guid)
- SET(ComponentId "C._files_${COMP_NAME}.${DirectoryRefId}")
- FILE(APPEND ${file}
- "<DirectoryRef Id='${DirectoryRefId}'>\n<Component Guid='${guid}' Id='${ComponentId}' ${Win64}>${NONEXEFILES}\n</Component></DirectoryRef>\n")
- FILE(APPEND ${file_comp} " <ComponentRef Id='${ComponentId}'/>\n")
- ENDIF()
- FOREACH(f ${all_files})
- IF(IS_DIRECTORY ${f})
- TRAVERSE_FILES(${f} ${topdir} ${file} ${file_comp} ${dir_root})
- ENDIF()
- ENDFOREACH()
-ENDFUNCTION()
-
-FUNCTION(TRAVERSE_DIRECTORIES dir topdir file prefix)
- FILE(RELATIVE_PATH rel ${topdir} ${dir})
- IF(rel)
- MAKE_WIX_IDENTIFIER("${rel}" id)
- GET_FILENAME_COMPONENT(name ${dir} NAME)
- FILE(APPEND ${file} "${prefix}<Directory Id='D.${id}' Name='${name}'>\n")
- ENDIF()
- FILE(GLOB all_files ${dir}/*)
- FOREACH(f ${all_files})
- IF(IS_DIRECTORY ${f})
- TRAVERSE_DIRECTORIES(${f} ${topdir} ${file} "${prefix} ")
- ENDIF()
- ENDFOREACH()
- IF(rel)
- FILE(APPEND ${file} "${prefix}</Directory>\n")
- ENDIF()
-ENDFUNCTION()
-
-SET(CPACK_WIX_COMPONENTS)
-SET(CPACK_WIX_COMPONENT_GROUPS)
-GET_FILENAME_COMPONENT(abs . ABSOLUTE)
-FOREACH(d ${DIRS})
- GET_FILENAME_COMPONENT(d ${d} ABSOLUTE)
- GET_FILENAME_COMPONENT(d_name ${d} NAME)
- FILE(WRITE ${abs}/${d_name}_component_group.wxs "<ComponentGroup Id='componentgroup.${d_name}'>")
- SET(COMP_NAME ${d_name})
- TRAVERSE_FILES(${d} ${d} ${abs}/${d_name}.wxs ${abs}/${d_name}_component_group.wxs "${abs}/dirs")
- FILE(APPEND ${abs}/${d_name}_component_group.wxs "</ComponentGroup>")
- IF(EXISTS ${d_name}.wxs)
- FILE(READ ${d_name}.wxs WIX_TMP)
- SET(CPACK_WIX_COMPONENTS "${CPACK_WIX_COMPONENTS}\n${WIX_TMP}")
- FILE(REMOVE ${d_name}.wxs)
- ENDIF()
-
- FILE(READ ${d_name}_component_group.wxs WIX_TMP)
-
- SET(CPACK_WIX_COMPONENT_GROUPS "${CPACK_WIX_COMPONENT_GROUPS}\n${WIX_TMP}")
- FILE(REMOVE ${d_name}_component_group.wxs)
-ENDFOREACH()
-
-FILE(WRITE directories.wxs "<DirectoryRef Id='INSTALLDIR'>\n")
-TRAVERSE_DIRECTORIES(${abs}/dirs ${abs}/dirs directories.wxs "")
-FILE(APPEND directories.wxs "</DirectoryRef>\n")
-
-FILE(READ directories.wxs CPACK_WIX_DIRECTORIES)
-FILE(REMOVE directories.wxs)
-
-
-FOREACH(src ${CPACK_WIX_INCLUDE})
-SET(CPACK_WIX_INCLUDES
-"${CPACK_WIX_INCLUDES}
- <?include ${src}?>"
-)
-ENDFOREACH()
-
-
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_server.wxs.in
- ${CMAKE_CURRENT_BINARY_DIR}/mysql_server.wxs)
-
-SET(EXTRA_CANDLE_ARGS)
-IF("$ENV{EXTRA_CANDLE_ARGS}")
- SET(EXTRA_CANDLE_ARGS "$ENV{EXTRA_CANDLE_ARGS}")
-ENDIF()
-
-SET(EXTRA_LIGHT_ARGS)
-IF("$ENV{EXTRA_LIGHT_ARGS}")
- SET(EXTRA_LIGHT_ARGS "$ENV{EXTRA_LIGHT_ARGS}")
-ENDIF()
-
-FILE(REMOVE mysql_server.wixobj)
-EXECUTE_PROCESS(
- COMMAND ${CANDLE_EXECUTABLE} -ext WixUtilExtension mysql_server.wxs ${EXTRA_CANDLE_ARGS}
- RESULT_VARIABLE CANDLE_RESULT
-)
-
-IF(CANDLE_RESULT)
- MESSAGE(FATAL_ERROR "ERROR: can't run candle")
-ENDIF()
-
-EXECUTE_PROCESS(
- COMMAND ${LIGHT_EXECUTABLE} -ext WixUIExtension -ext WixUtilExtension
- mysql_server.wixobj -out ${CPACK_PACKAGE_FILE_NAME}.msi
- ${EXTRA_LIGHT_ARGS}
- RESULT_VARIABLE LIGHT_RESULT
-)
-
-IF(LIGHT_RESULT)
- MESSAGE(FATAL_ERROR "ERROR: can't run light")
-ENDIF()
-
-# Switch monolithic install on again
-EXECUTE_PROCESS(
- COMMAND ${CMAKE_COMMAND} -DCPACK_MONOLITHIC_INSTALL=1 ${CMAKE_BINARY_DIR}
-)
+# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+SET(CMAKE_BINARY_DIR "@CMAKE_BINARY_DIR@")
+SET(CMAKE_CURRENT_SOURCE_DIR "@CMAKE_CURRENT_SOURCE_DIR@")
+SET(CANDLE_EXECUTABLE "@CANDLE_EXECUTABLE@")
+SET(LIGHT_EXECUTABLE "@LIGHT_EXECUTABLE@")
+SET(CMAKE_COMMAND "@CMAKE_COMMAND@")
+SET(CMAKE_CFG_INTDIR "@CMAKE_CFG_INTDIR@")
+SET(VERSION "@VERSION@")
+SET(MAJOR_VERSION "@MAJOR_VERSION@")
+SET(MINOR_VERSION "@MINOR_VERSION@")
+SET(PATCH_VERSION "@PATCH_VERSION@")
+SET(CMAKE_SIZEOF_VOID_P @CMAKE_SIZEOF_VOID_P@)
+SET(MANUFACTURER "@MANUFACTURER@")
+SET(WIXCA_LOCATION "@WIXCA_LOCATION@")
+SET(COPYING_RTF "@COPYING_RTF@")
+SET(CPACK_WIX_CONFIG "@CPACK_WIX_CONFIG@")
+SET(CPACK_WIX_INCLUDE "@CPACK_WIX_INCLUDE@")
+
+LIST(APPEND EXCLUDE_DIRS
+ bin/debug
+ data/test
+ lib/plugin/debug
+ mysql-test
+ scripts
+ sql-bench
+)
+
+LIST(APPEND EXCLUDE_FILES
+ bin/echo.exe
+ bin/mysql_client_test_embedded.exe
+ bin/mysqld-debug.exe
+ bin/mysqltest_embedded.exe
+ bin/replace.exe
+ lib/debug/mysqlserver.lib
+ lib/libmysqld.dll
+ lib/libmysqld.lib
+ lib/mysqlserver.lib
+ lib/mysqlservices.lib
+)
+
+IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
+ SET(Win64 " Win64='yes'")
+ SET(Platform x64)
+ SET(PlatformProgramFilesFolder ProgramFiles64Folder)
+ELSE()
+ SET(Platform x86)
+ SET(PlatformProgramFilesFolder ProgramFilesFolder)
+ SET(Win64)
+ENDIF()
+
+SET(ENV{VS_UNICODE_OUTPUT})
+
+# Switch off the monolithic install
+EXECUTE_PROCESS(
+ COMMAND ${CMAKE_COMMAND} -DCPACK_MONOLITHIC_INSTALL=0 ${CMAKE_BINARY_DIR}
+ OUTPUT_QUIET
+)
+
+INCLUDE(${CMAKE_BINARY_DIR}/CPackConfig.cmake)
+
+IF(CPACK_WIX_CONFIG)
+ INCLUDE(${CPACK_WIX_CONFIG})
+ENDIF()
+
+IF(NOT CPACK_WIX_UI)
+ SET(CPACK_WIX_UI "WixUI_Mondo_Custom")
+ENDIF()
+
+SET(WIX_FEATURES)
+FOREACH(comp ${CPACK_COMPONENTS_ALL})
+ STRING(TOUPPER "${comp}" comp_upper)
+ IF(NOT CPACK_COMPONENT_${comp_upper}_GROUP)
+ SET(WIX_FEATURE_${comp_upper}_COMPONENTS "${comp}")
+ SET(CPACK_COMPONENT_${comp_upper}_HIDDEN 1)
+ SET(CPACK_COMPONENT_GROUP_${comp_upper}_DISPLAY_NAME ${CPACK_COMPONENT_${comp_upper}_DISPLAY_NAME})
+ SET(CPACK_COMPONENT_GROUP_${comp_upper}_DESCRIPTION ${CPACK_COMPONENT_${comp_upper}_DESCRIPTION})
+ SET(CPACK_COMPONENT_GROUP_${comp_upper}_WIX_LEVEL ${CPACK_COMPONENT_${comp_upper}_WIX_LEVEL})
+ SET(WIX_FEATURES ${WIX_FEATURES} WIX_FEATURE_${comp_upper})
+ ELSE()
+ SET(FEATURE_NAME WIX_FEATURE_${CPACK_COMPONENT_${comp_upper}_GROUP})
+ SET(WIX_FEATURES ${WIX_FEATURES} ${FEATURE_NAME})
+ LIST(APPEND ${FEATURE_NAME}_COMPONENTS ${comp})
+ ENDIF()
+ENDFOREACH()
+
+LIST(REMOVE_DUPLICATES WIX_FEATURES)
+
+SET(CPACK_WIX_FEATURES)
+
+FOREACH(f ${WIX_FEATURES})
+ STRING(TOUPPER "${f}" f_upper)
+ STRING(REPLACE "WIX_FEATURE_" "" f_upper ${f_upper})
+ IF (CPACK_COMPONENT_GROUP_${f_upper}_DISPLAY_NAME)
+ SET(TITLE ${CPACK_COMPONENT_GROUP_${f_upper}_DISPLAY_NAME})
+ ELSE()
+ SET(TITLE CPACK_COMPONENT_GROUP_${f_upper}_DISPLAY_NAME)
+ ENDIF()
+
+ IF (CPACK_COMPONENT_GROUP_${f_upper}_DESCRIPTION)
+ SET(DESCRIPTION ${CPACK_COMPONENT_GROUP_${f_upper}_DESCRIPTION})
+ ELSE()
+ SET(DESCRIPTION CPACK_COMPONENT_GROUP_${f_upper}_DESCRIPTION)
+ ENDIF()
+ IF(CPACK_COMPONENT_${f_upper}_WIX_LEVEL)
+ SET(Level ${CPACK_COMPONENT_${f_upper}_WIX_LEVEL})
+ ELSE()
+ SET(Level 1)
+ ENDIF()
+ IF(CPACK_COMPONENT_GROUP_${f_upper}_HIDDEN)
+ SET(DISPLAY "Display='hidden'")
+ SET(TITLE ${f_upper})
+ SET(DESCRIPTION ${f_upper})
+ ELSE()
+ SET(DISPLAY)
+ IF(CPACK_COMPONENT_GROUP_${f_upper}_EXPANDED)
+ SET(DISPLAY "Display='expand'")
+ ENDIF()
+ IF (CPACK_COMPONENT_GROUP_${f_upper}_DISPLAY_NAME)
+ SET(TITLE ${CPACK_COMPONENT_GROUP_${f_upper}_DISPLAY_NAME})
+ ELSE()
+ SET(TITLE CPACK_COMPONENT_GROUP_${f_upper}_DISPLAY_NAME)
+ ENDIF()
+ IF (CPACK_COMPONENT_GROUP_${f_upper}_DESCRIPTION)
+ SET(DESCRIPTION ${CPACK_COMPONENT_GROUP_${f_upper}_DESCRIPTION})
+ ELSE()
+ SET(DESCRIPTION CPACK_COMPONENT_GROUP_${f_upper}_DESCRIPTION)
+ ENDIF()
+ ENDIF()
+
+ SET(CPACK_WIX_FEATURES
+ "${CPACK_WIX_FEATURES}
+ <Feature Id='${f_upper}'
+ Title='${TITLE}'
+ Description='${DESCRIPTION}'
+ ConfigurableDirectory='INSTALLDIR'
+ Level='${Level}' ${DISPLAY} >"
+ )
+ FOREACH(c ${${f}_COMPONENTS})
+ STRING(TOUPPER "${c}" c_upper)
+ IF (CPACK_COMPONENT_${c_upper}_DISPLAY_NAME)
+ SET(TITLE ${CPACK_COMPONENT_${c_upper}_DISPLAY_NAME})
+ ELSE()
+ SET(TITLE CPACK_COMPONENT_${c_upper}_DISPLAY_NAME)
+ ENDIF()
+
+ IF (CPACK_COMPONENT_${c_upper}_DESCRIPTION)
+ SET(DESCRIPTION ${CPACK_COMPONENT_${c_upper}_DESCRIPTION})
+ ELSE()
+ SET(DESCRIPTION CPACK_COMPONENT_${c_upper}_DESCRIPTION)
+ ENDIF()
+ IF(CPACK_COMPONENT_${c_upper}_WIX_LEVEL)
+ SET(Level ${CPACK_COMPONENT_${c_upper}_WIX_LEVEL})
+ ELSE()
+ SET(Level 1)
+ ENDIF()
+ IF(CPACK_COMPONENT_${c_upper}_HIDDEN)
+ SET(CPACK_WIX_FEATURES
+ "${CPACK_WIX_FEATURES}
+ <ComponentGroupRef Id='componentgroup.${c}'/>")
+ ELSE()
+ SET(CPACK_WIX_FEATURES
+ "${CPACK_WIX_FEATURES}
+ <Feature Id='${c}'
+ Title='${TITLE}'
+ Description='${DESCRIPTION}'
+ ConfigurableDirectory='INSTALLDIR'
+ Level='${Level}'>
+ <ComponentGroupRef Id='componentgroup.${c}'/>
+ </Feature>")
+ ENDIF()
+
+ ENDFOREACH()
+ SET(CPACK_WIX_FEATURES
+ "${CPACK_WIX_FEATURES}
+ </Feature>
+ ")
+ENDFOREACH()
+
+
+IF(CMAKE_INSTALL_CONFIG_NAME)
+ STRING(REPLACE "${CMAKE_CFG_INTDIR}" "${CMAKE_INSTALL_CONFIG_NAME}"
+ WIXCA_LOCATION "${WIXCA_LOCATION}")
+ SET(CONFIG_PARAM "-DCMAKE_INSTALL_CONFIG_NAME=${CMAKE_INSTALL_CONFIG_NAME}")
+ENDIF()
+
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_server.wxs.in
+ ${CMAKE_CURRENT_BINARY_DIR}/mysql_server.wxs)
+
+
+FOREACH(comp ${CPACK_COMPONENTS_ALL})
+ SET(ENV{DESTDIR} testinstall/${comp})
+ SET(DIRS ${DIRS} testinstall/${comp})
+ EXECUTE_PROCESS(
+ COMMAND ${CMAKE_COMMAND} ${CONFIG_PARAM} -DCMAKE_INSTALL_COMPONENT=${comp}
+ -DCMAKE_INSTALL_PREFIX= -P ${CMAKE_BINARY_DIR}/cmake_install.cmake
+ OUTPUT_QUIET
+ )
+ENDFOREACH()
+
+MACRO(GENERATE_GUID VarName)
+ EXECUTE_PROCESS(COMMAND uuidgen -c
+ OUTPUT_VARIABLE ${VarName}
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ENDMACRO()
+
+SET(INC_VAR 0)
+MACRO(MAKE_WIX_IDENTIFIER str varname)
+ STRING(REPLACE "/" "." ${varname} "${str}")
+ STRING(REGEX REPLACE "[^a-zA-Z_0-9.]" "_" ${varname} "${${varname}}")
+ STRING(LENGTH "${${varname}}" len)
+ # Identifier should be smaller than 72 character
+ # We have to cut down the length to 70 chars, since we add 2 char prefix
+ # pretty often
+ IF(len GREATER 70)
+ STRING(SUBSTRING "${${varname}}" 0 67 shortstr)
+ MATH(EXPR INC_VAR ${INC_VAR}+1)
+ SET(${varname} "${shortstr}${INC_VAR}")
+ ENDIF()
+ENDMACRO()
+
+
+FUNCTION(TRAVERSE_FILES dir topdir file file_comp dir_root)
+ FILE(RELATIVE_PATH dir_rel ${topdir} ${dir})
+ IF(dir_rel)
+ LIST(FIND EXCLUDE_DIRS ${dir_rel} TO_EXCLUDE)
+ IF(NOT TO_EXCLUDE EQUAL -1)
+ MESSAGE(STATUS "excluding directory: ${dir_rel}")
+ RETURN()
+ ENDIF()
+ ENDIF()
+ FILE(GLOB all_files ${dir}/*)
+ IF(NOT all_files)
+ RETURN()
+ ENDIF()
+ IF(dir_rel)
+ MAKE_DIRECTORY(${dir_root}/${dir_rel})
+ MAKE_WIX_IDENTIFIER("${dir_rel}" id)
+ SET(DirectoryRefId "D.${id}")
+ ELSE()
+ SET(DirectoryRefId "INSTALLDIR")
+ ENDIF()
+ FILE(APPEND ${file} "<DirectoryRef Id='${DirectoryRefId}'>\n")
+
+ SET(NONEXEFILES)
+ FOREACH(f ${all_files})
+ IF(NOT IS_DIRECTORY ${f})
+ FILE(RELATIVE_PATH rel ${topdir} ${f})
+ SET(TO_EXCLUDE)
+ IF(rel MATCHES "\\.pdb$")
+ SET(TO_EXCLUDE TRUE)
+ ELSE()
+ LIST(FIND EXCLUDE_FILES ${rel} RES)
+ IF(NOT RES EQUAL -1)
+ SET(TO_EXCLUDE TRUE)
+ ENDIF()
+ ENDIF()
+ IF(TO_EXCLUDE)
+ MESSAGE(STATUS "excluding file: ${rel}")
+ ELSE()
+ MAKE_WIX_IDENTIFIER("${rel}" id)
+ FILE(TO_NATIVE_PATH ${f} f_native)
+ GET_FILENAME_COMPONENT(f_ext "${f}" EXT)
+ # According to MSDN each DLL or EXE should be in the own component
+ IF(f_ext MATCHES ".exe" OR f_ext MATCHES ".dll")
+
+ FILE(APPEND ${file} " <Component Id='C.${id}' Guid='*' ${Win64}>\n")
+ FILE(APPEND ${file} " <File Id='F.${id}' KeyPath='yes' Source='${f_native}'/>\n")
+ FILE(APPEND ${file} " </Component>\n")
+ FILE(APPEND ${file_comp} " <ComponentRef Id='C.${id}'/>\n")
+ ELSE()
+ SET(NONEXEFILES "${NONEXEFILES}\n<File Id='F.${id}' Source='${f_native}'/>" )
+ ENDIF()
+ ENDIF()
+ ENDIF()
+ ENDFOREACH()
+ FILE(APPEND ${file} "</DirectoryRef>\n")
+ IF(NONEXEFILES)
+ GENERATE_GUID(guid)
+ SET(ComponentId "C._files_${COMP_NAME}.${DirectoryRefId}")
+ FILE(APPEND ${file}
+ "<DirectoryRef Id='${DirectoryRefId}'>\n<Component Guid='${guid}' Id='${ComponentId}' ${Win64}>${NONEXEFILES}\n</Component></DirectoryRef>\n")
+ FILE(APPEND ${file_comp} " <ComponentRef Id='${ComponentId}'/>\n")
+ ENDIF()
+ FOREACH(f ${all_files})
+ IF(IS_DIRECTORY ${f})
+ TRAVERSE_FILES(${f} ${topdir} ${file} ${file_comp} ${dir_root})
+ ENDIF()
+ ENDFOREACH()
+ENDFUNCTION()
+
+FUNCTION(TRAVERSE_DIRECTORIES dir topdir file prefix)
+ FILE(RELATIVE_PATH rel ${topdir} ${dir})
+ IF(rel)
+ MAKE_WIX_IDENTIFIER("${rel}" id)
+ GET_FILENAME_COMPONENT(name ${dir} NAME)
+ FILE(APPEND ${file} "${prefix}<Directory Id='D.${id}' Name='${name}'>\n")
+ ENDIF()
+ FILE(GLOB all_files ${dir}/*)
+ FOREACH(f ${all_files})
+ IF(IS_DIRECTORY ${f})
+ TRAVERSE_DIRECTORIES(${f} ${topdir} ${file} "${prefix} ")
+ ENDIF()
+ ENDFOREACH()
+ IF(rel)
+ FILE(APPEND ${file} "${prefix}</Directory>\n")
+ ENDIF()
+ENDFUNCTION()
+
+SET(CPACK_WIX_COMPONENTS)
+SET(CPACK_WIX_COMPONENT_GROUPS)
+GET_FILENAME_COMPONENT(abs . ABSOLUTE)
+FOREACH(d ${DIRS})
+ GET_FILENAME_COMPONENT(d ${d} ABSOLUTE)
+ GET_FILENAME_COMPONENT(d_name ${d} NAME)
+ FILE(WRITE ${abs}/${d_name}_component_group.wxs "<ComponentGroup Id='componentgroup.${d_name}'>")
+ SET(COMP_NAME ${d_name})
+ TRAVERSE_FILES(${d} ${d} ${abs}/${d_name}.wxs ${abs}/${d_name}_component_group.wxs "${abs}/dirs")
+ FILE(APPEND ${abs}/${d_name}_component_group.wxs "</ComponentGroup>")
+ IF(EXISTS ${d_name}.wxs)
+ FILE(READ ${d_name}.wxs WIX_TMP)
+ SET(CPACK_WIX_COMPONENTS "${CPACK_WIX_COMPONENTS}\n${WIX_TMP}")
+ FILE(REMOVE ${d_name}.wxs)
+ ENDIF()
+
+ FILE(READ ${d_name}_component_group.wxs WIX_TMP)
+
+ SET(CPACK_WIX_COMPONENT_GROUPS "${CPACK_WIX_COMPONENT_GROUPS}\n${WIX_TMP}")
+ FILE(REMOVE ${d_name}_component_group.wxs)
+ENDFOREACH()
+
+FILE(WRITE directories.wxs "<DirectoryRef Id='INSTALLDIR'>\n")
+TRAVERSE_DIRECTORIES(${abs}/dirs ${abs}/dirs directories.wxs "")
+FILE(APPEND directories.wxs "</DirectoryRef>\n")
+
+FILE(READ directories.wxs CPACK_WIX_DIRECTORIES)
+FILE(REMOVE directories.wxs)
+
+
+FOREACH(src ${CPACK_WIX_INCLUDE})
+SET(CPACK_WIX_INCLUDES
+"${CPACK_WIX_INCLUDES}
+ <?include ${src}?>"
+)
+ENDFOREACH()
+
+
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_server.wxs.in
+ ${CMAKE_CURRENT_BINARY_DIR}/mysql_server.wxs)
+
+SET(EXTRA_CANDLE_ARGS)
+IF("$ENV{EXTRA_CANDLE_ARGS}")
+ SET(EXTRA_CANDLE_ARGS "$ENV{EXTRA_CANDLE_ARGS}")
+ENDIF()
+
+SET(EXTRA_LIGHT_ARGS)
+IF("$ENV{EXTRA_LIGHT_ARGS}")
+ SET(EXTRA_LIGHT_ARGS "$ENV{EXTRA_LIGHT_ARGS}")
+ENDIF()
+
+FILE(REMOVE mysql_server.wixobj)
+EXECUTE_PROCESS(
+ COMMAND ${CANDLE_EXECUTABLE} -ext WixUtilExtension mysql_server.wxs ${EXTRA_CANDLE_ARGS}
+ RESULT_VARIABLE CANDLE_RESULT
+)
+
+IF(CANDLE_RESULT)
+ MESSAGE(FATAL_ERROR "ERROR: can't run candle")
+ENDIF()
+
+EXECUTE_PROCESS(
+ COMMAND ${LIGHT_EXECUTABLE} -ext WixUIExtension -ext WixUtilExtension
+ mysql_server.wixobj -out ${CPACK_PACKAGE_FILE_NAME}.msi
+ ${EXTRA_LIGHT_ARGS}
+ RESULT_VARIABLE LIGHT_RESULT
+)
+
+IF(LIGHT_RESULT)
+ MESSAGE(FATAL_ERROR "ERROR: can't run light")
+ENDIF()
+
+# Switch monolithic install on again
+EXECUTE_PROCESS(
+ COMMAND ${CMAKE_COMMAND} -DCPACK_MONOLITHIC_INSTALL=1 ${CMAKE_BINARY_DIR}
+)
diff --git a/packaging/WiX/custom_ui.wxs b/packaging/WiX/custom_ui.wxs
index a28c3c9..0ccd30f 100644
--- a/packaging/WiX/custom_ui.wxs
+++ b/packaging/WiX/custom_ui.wxs
@@ -1,115 +1,115 @@
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi"
- xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-
-<!--
- Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
--->
-
- <UI Id="WixUI_Mondo_Custom">
- <Dialog Id="CustomWelcomeDlg" Width="370" Height="270" Title="[ProductName] Setup" NoMinimize="yes">
- <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
- <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
- </Control>
- <Control Id="Next" Type="PushButton" X="220" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)">
- <Publish Event="NewDialog" Value="LicenseAgreementDlg">NOT OLDERVERSIONBEINGUPGRADED</Publish>
- <Publish Event="NewDialog" Value="UpgradeDlg">OLDERVERSIONBEINGUPGRADED</Publish>
- </Control>
- <Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" Disabled="yes" />
- <Control Id="Description" Type="Text" X="135" Y="80" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgDescription)" />
- <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgTitle)" />
- <Control Id="CopyrightText" Type="Text" X="135" Y="200" Width="220" Height="40" Transparent="yes" Text="Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved." />
- <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.WelcomeDlgBitmap)" />
- <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
- </Dialog>
-
- <Dialog Id="UpgradeDlg" Width="370" Height="270" Title="[ProductName] Setup" NoMinimize="yes">
- <Control Id="Install" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes" Text="Upgrade">
- <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
- <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
- <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
- <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
- <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
- </Control>
- <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
- <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
- </Control>
- <Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)">
- <Condition Action="default">WixUI_InstallMode = "Remove"</Condition>
- </Control>
- <Control Id="InstallTitle" Type="Text" X="15" Y="15" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgInstallTitle)">
- <Condition Action="show">NOT Installed</Condition>
- </Control>
- <Control Id="InstallText" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="yes" Text="!(loc.VerifyReadyDlgInstallText)">
- <Condition Action="show">NOT Installed</Condition>
- </Control>
- <Control Id="UpgradeText" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="no" NoPrefix="yes"
- Text="Click Upgrade to upgrade your installation from version [OLDERVERSION] to version [ProductVersion]. Click Cancel to exit the upgrade."/>
- <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.VerifyReadyDlgBannerBitmap)" />
- <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
- <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
- </Dialog>
-
- <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
- <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
- <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
-
- <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
- <Property Id="WixUI_Mode" Value="Mondo" />
-
- <DialogRef Id="ErrorDlg" />
- <DialogRef Id="FatalError" />
- <DialogRef Id="FilesInUse" />
- <DialogRef Id="MsiRMFilesInUse" />
- <DialogRef Id="PrepareDlg" />
- <DialogRef Id="ProgressDlg" />
- <DialogRef Id="ResumeDlg" />
- <DialogRef Id="UserExit" />
-
- <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
-
- <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="CustomWelcomeDlg">1</Publish>
- <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="SetupTypeDlg" Order="2">LicenseAccepted = "1"</Publish>
-
- <Publish Dialog="SetupTypeDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
- <Publish Dialog="SetupTypeDlg" Control="TypicalButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
- <Publish Dialog="SetupTypeDlg" Control="CustomButton" Event="NewDialog" Value="CustomizeDlg">1</Publish>
- <Publish Dialog="SetupTypeDlg" Control="CompleteButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
-
- <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="1">WixUI_InstallMode = "Change"</Publish>
- <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg" Order="2">WixUI_InstallMode = "InstallCustom"</Publish>
- <Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
-
- <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="1">WixUI_InstallMode = "InstallCustom"</Publish>
- <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg" Order="2">WixUI_InstallMode = "InstallTypical" OR WixUI_InstallMode = "InstallComplete"</Publish>
- <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="3">WixUI_InstallMode = "Change"</Publish>
- <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="4">WixUI_InstallMode = "Repair" OR WixUI_InstallMode = "Remove"</Publish>
-
- <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
-
- <Publish Dialog="MaintenanceTypeDlg" Control="ChangeButton" Event="NewDialog" Value="CustomizeDlg">1</Publish>
- <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
- <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
- <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
-
- <Publish Dialog="UpgradeDlg" Control="Back" Event="NewDialog" Value="CustomWelcomeDlg">1</Publish>
-
- <InstallUISequence>
- <Show Dialog="CustomWelcomeDlg" Before="ProgressDlg">NOT Installed</Show>
- </InstallUISequence>
- </UI>
-
- <UIRef Id="WixUI_Common" />
-</Include>
+<Include xmlns="http://schemas.microsoft.com/wix/2006/wi"
+ xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+
+<!--
+ Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+-->
+
+ <UI Id="WixUI_Mondo_Custom">
+ <Dialog Id="CustomWelcomeDlg" Width="370" Height="270" Title="[ProductName] Setup" NoMinimize="yes">
+ <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
+ <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+ </Control>
+ <Control Id="Next" Type="PushButton" X="220" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)">
+ <Publish Event="NewDialog" Value="LicenseAgreementDlg">NOT OLDERVERSIONBEINGUPGRADED</Publish>
+ <Publish Event="NewDialog" Value="UpgradeDlg">OLDERVERSIONBEINGUPGRADED</Publish>
+ </Control>
+ <Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" Disabled="yes" />
+ <Control Id="Description" Type="Text" X="135" Y="80" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgDescription)" />
+ <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgTitle)" />
+ <Control Id="CopyrightText" Type="Text" X="135" Y="200" Width="220" Height="40" Transparent="yes" Text="Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved." />
+ <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.WelcomeDlgBitmap)" />
+ <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+ </Dialog>
+
+ <Dialog Id="UpgradeDlg" Width="370" Height="270" Title="[ProductName] Setup" NoMinimize="yes">
+ <Control Id="Install" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes" Text="Upgrade">
+ <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
+ <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
+ <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+ <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+ <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
+ </Control>
+ <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
+ <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+ </Control>
+ <Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)">
+ <Condition Action="default">WixUI_InstallMode = "Remove"</Condition>
+ </Control>
+ <Control Id="InstallTitle" Type="Text" X="15" Y="15" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgInstallTitle)">
+ <Condition Action="show">NOT Installed</Condition>
+ </Control>
+ <Control Id="InstallText" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="yes" Text="!(loc.VerifyReadyDlgInstallText)">
+ <Condition Action="show">NOT Installed</Condition>
+ </Control>
+ <Control Id="UpgradeText" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="no" NoPrefix="yes"
+ Text="Click Upgrade to upgrade your installation from version [OLDERVERSION] to version [ProductVersion]. Click Cancel to exit the upgrade."/>
+ <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.VerifyReadyDlgBannerBitmap)" />
+ <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
+ <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+ </Dialog>
+
+ <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
+ <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
+ <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
+
+ <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
+ <Property Id="WixUI_Mode" Value="Mondo" />
+
+ <DialogRef Id="ErrorDlg" />
+ <DialogRef Id="FatalError" />
+ <DialogRef Id="FilesInUse" />
+ <DialogRef Id="MsiRMFilesInUse" />
+ <DialogRef Id="PrepareDlg" />
+ <DialogRef Id="ProgressDlg" />
+ <DialogRef Id="ResumeDlg" />
+ <DialogRef Id="UserExit" />
+
+ <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
+
+ <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="CustomWelcomeDlg">1</Publish>
+ <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="SetupTypeDlg" Order="2">LicenseAccepted = "1"</Publish>
+
+ <Publish Dialog="SetupTypeDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
+ <Publish Dialog="SetupTypeDlg" Control="TypicalButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+ <Publish Dialog="SetupTypeDlg" Control="CustomButton" Event="NewDialog" Value="CustomizeDlg">1</Publish>
+ <Publish Dialog="SetupTypeDlg" Control="CompleteButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+
+ <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="1">WixUI_InstallMode = "Change"</Publish>
+ <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg" Order="2">WixUI_InstallMode = "InstallCustom"</Publish>
+ <Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="1">WixUI_InstallMode = "InstallCustom"</Publish>
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg" Order="2">WixUI_InstallMode = "InstallTypical" OR WixUI_InstallMode = "InstallComplete"</Publish>
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="3">WixUI_InstallMode = "Change"</Publish>
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="4">WixUI_InstallMode = "Repair" OR WixUI_InstallMode = "Remove"</Publish>
+
+ <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
+
+ <Publish Dialog="MaintenanceTypeDlg" Control="ChangeButton" Event="NewDialog" Value="CustomizeDlg">1</Publish>
+ <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+ <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+ <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
+
+ <Publish Dialog="UpgradeDlg" Control="Back" Event="NewDialog" Value="CustomWelcomeDlg">1</Publish>
+
+ <InstallUISequence>
+ <Show Dialog="CustomWelcomeDlg" Before="ProgressDlg">NOT Installed</Show>
+ </InstallUISequence>
+ </UI>
+
+ <UIRef Id="WixUI_Common" />
+</Include>
diff --git a/packaging/WiX/extra.wxs.in b/packaging/WiX/extra.wxs.in
index 91bf3f6..92a7906 100644
--- a/packaging/WiX/extra.wxs.in
+++ b/packaging/WiX/extra.wxs.in
@@ -1,81 +1,81 @@
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi"
- xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-
-<!--
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
--->
-
- <!-- Datafiles that installation will copy to CommonAppData (initial database)
- They are declared Permanent and NeverOverwrite since it is user data -->
- <DirectoryRef Id='TARGETDIR'>
- <Directory Id="CommonAppDataFolder">
- <Directory Id="datadir.mysql" Name="MySQL">
- <Directory Id="datadir.mysql.mysqlserver"
- Name="MySQL Server @MAJOR_VERSION at .@MINOR_VERSION@">
- <Directory Id="DATADIR" Name=".">
- <Component Id="component.datadir" Guid="d3491319-5dbc-4477-95f3-4f809ef1dd2d">
- <CreateFolder>
- <util:PermissionEx User="[LogonUser]" GenericAll="yes" />
- </CreateFolder>
- </Component>
- <Directory Id="datadir.mysql.mysqlserver.data" Name="data">
- <Directory Id="datadir.mysql.mysqlserver.data.mysql" Name="mysql">
- <Component Id="component.datadir.mysql"
- Guid="19ec0f1f-1a7f-424e-a788-b09346c0a709"
- Permanent="yes" NeverOverwrite="yes">
- <CreateFolder>
- <util:PermissionEx User="[LogonUser]" GenericAll="yes" />
- </CreateFolder>
- @DATADIR_MYSQL_FILES@
- </Component>
- </Directory>
- <Directory Id="datadir.mysql.mysqlserver.data.performance_schema"
- Name="performance_schema">
- <Component Id="component.datadir.performance_schema"
- Guid="af2a6776-2655-431f-a748-9e9f4645acc3"
- Permanent="yes" NeverOverwrite="yes">
- <CreateFolder>
- <util:PermissionEx User="[LogonUser]" GenericAll="yes" />
- </CreateFolder>
- @DATADIR_PERFORMANCE_SCHEMA_FILES@
- </Component>
- </Directory>
- <Directory Id="datadir.mysql.mysqlserver.data.test" Name="test">
- <Component Id="component.datadir.test" Guid="52fa9f0a-fcd1-420a-b2ac-95a8f70ad20a">
- <CreateFolder/>
- </Component>
- </Directory>
- </Directory>
- </Directory>
- </Directory>
- </Directory>
- </Directory>
- </DirectoryRef>
-
- <Feature Id='UserEditableDataFiles'
- Title='Server data files'
- Description='Server data files'
- ConfigurableDirectory='DATADIR'
- Level='1'>
- <ComponentRef Id="component.datadir"/>
- <ComponentRef Id="component.datadir.mysql"/>
- <ComponentRef Id="component.datadir.performance_schema"/>
- <ComponentRef Id="component.datadir.test"/>
- </Feature>
-</Include>
-
-
-
+<Include xmlns="http://schemas.microsoft.com/wix/2006/wi"
+ xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+
+<!--
+ Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+-->
+
+ <!-- Datafiles that installation will copy to CommonAppData (initial database)
+ They are declared Permanent and NeverOverwrite since it is user data -->
+ <DirectoryRef Id='TARGETDIR'>
+ <Directory Id="CommonAppDataFolder">
+ <Directory Id="datadir.mysql" Name="MySQL">
+ <Directory Id="datadir.mysql.mysqlserver"
+ Name="MySQL Server @MAJOR_VERSION at .@MINOR_VERSION@">
+ <Directory Id="DATADIR" Name=".">
+ <Component Id="component.datadir" Guid="d3491319-5dbc-4477-95f3-4f809ef1dd2d">
+ <CreateFolder>
+ <util:PermissionEx User="[LogonUser]" GenericAll="yes" />
+ </CreateFolder>
+ </Component>
+ <Directory Id="datadir.mysql.mysqlserver.data" Name="data">
+ <Directory Id="datadir.mysql.mysqlserver.data.mysql" Name="mysql">
+ <Component Id="component.datadir.mysql"
+ Guid="19ec0f1f-1a7f-424e-a788-b09346c0a709"
+ Permanent="yes" NeverOverwrite="yes">
+ <CreateFolder>
+ <util:PermissionEx User="[LogonUser]" GenericAll="yes" />
+ </CreateFolder>
+ @DATADIR_MYSQL_FILES@
+ </Component>
+ </Directory>
+ <Directory Id="datadir.mysql.mysqlserver.data.performance_schema"
+ Name="performance_schema">
+ <Component Id="component.datadir.performance_schema"
+ Guid="af2a6776-2655-431f-a748-9e9f4645acc3"
+ Permanent="yes" NeverOverwrite="yes">
+ <CreateFolder>
+ <util:PermissionEx User="[LogonUser]" GenericAll="yes" />
+ </CreateFolder>
+ @DATADIR_PERFORMANCE_SCHEMA_FILES@
+ </Component>
+ </Directory>
+ <Directory Id="datadir.mysql.mysqlserver.data.test" Name="test">
+ <Component Id="component.datadir.test" Guid="52fa9f0a-fcd1-420a-b2ac-95a8f70ad20a">
+ <CreateFolder/>
+ </Component>
+ </Directory>
+ </Directory>
+ </Directory>
+ </Directory>
+ </Directory>
+ </Directory>
+ </DirectoryRef>
+
+ <Feature Id='UserEditableDataFiles'
+ Title='Server data files'
+ Description='Server data files'
+ ConfigurableDirectory='DATADIR'
+ Level='1'>
+ <ComponentRef Id="component.datadir"/>
+ <ComponentRef Id="component.datadir.mysql"/>
+ <ComponentRef Id="component.datadir.performance_schema"/>
+ <ComponentRef Id="component.datadir.test"/>
+ </Feature>
+</Include>
+
+
+
diff --git a/packaging/WiX/mysql_server.wxs.in b/packaging/WiX/mysql_server.wxs.in
index 1802bae..1e7c204 100644
--- a/packaging/WiX/mysql_server.wxs.in
+++ b/packaging/WiX/mysql_server.wxs.in
@@ -1,196 +1,196 @@
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
- xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-
-<!--
- Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
--->
-
- <Product
- Id="*"
- UpgradeCode="49EB7A6A-1CEF-4A1E-9E89-B9A4993963E3"
- Name="MySQL Server @MAJOR_VERSION at .@MINOR_VERSION@"
- Version="@MAJOR_VERSION at .@MINOR_VERSION at .@PATCH_VERSION@"
- Language="1033"
- Manufacturer="@MANUFACTURER@">
-
- <Package Id='*'
- Keywords='Installer'
- Description="MySQL Database Server"
- Manufacturer='@MANUFACTURER@'
- InstallerVersion='200'
- Languages='1033'
- Compressed='yes'
- SummaryCodepage='1252'
- Platform='@Platform@'
- InstallScope="perMachine"/>
-
- <Media Id='1' Cabinet='product.cab' EmbedCab='yes' />
-
- <!-- Upgrade -->
- <Upgrade Id="49EB7A6A-1CEF-4A1E-9E89-B9A4993963E3">
- <UpgradeVersion
- Minimum="@MAJOR_VERSION at .@MINOR_VERSION at .0"
- IncludeMinimum="yes"
- Maximum="@MAJOR_VERSION at .@MINOR_VERSION at .@PATCH_VERSION@"
- IncludeMaximum="yes"
- Property="OLDERVERSIONBEINGUPGRADED"
- MigrateFeatures="yes"
- />
- <UpgradeVersion
- Minimum="@MAJOR_VERSION at .@MINOR_VERSION at .@PATCH_VERSION@"
- IncludeMinimum="no"
- OnlyDetect="yes"
- Property="NEWERVERSIONDETECTED" />
- </Upgrade>
- <Condition Message="A later version of [ProductName] is already installed. Setup will now exit.">
- NOT NEWERVERSIONDETECTED OR Installed
- </Condition>
- <InstallExecuteSequence>
- <RemoveExistingProducts After="InstallInitialize"/>
- </InstallExecuteSequence>
-
- <!-- Save/restore install location -->
- <CustomAction Id="SaveTargetDir" Property="ARPINSTALLLOCATION" Value="[INSTALLDIR]" />
- <InstallExecuteSequence>
- <Custom Action="SaveTargetDir" After="InstallValidate">
- NOT
- Installed
- </Custom>
- </InstallExecuteSequence>
- <InstallUISequence>
- <!-- App search is what does FindInstallLocation, and it is dependent on FindRelatedProducts -->
- <AppSearch After="FindRelatedProducts"/>
- </InstallUISequence>
-
- <!-- Find previous installation -->
- <Property Id="INSTALLDIR">
- <RegistrySearch Id="FindInstallLocation"
- Root="HKLM"
- Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[OLDERVERSIONBEINGUPGRADED]"
- Name="InstallLocation"
- Type="raw" />
- </Property>
- <?if @Platform@ != "x64" ?>
- <Property Id="OLDERVERSION">
- <RegistrySearch Id="FindOlderVersion"
- Root="HKLM"
- Win64 = "no"
- Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[OLDERVERSIONBEINGUPGRADED]"
- Name="DisplayVersion"
- Type="raw" />
- </Property>
- <?else ?>
- <Property Id="OLDERVERSION">
- <RegistrySearch Id="FindOlderVersion"
- Root="HKLM"
- Win64 = "yes"
- Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[OLDERVERSIONBEINGUPGRADED]"
- Name="DisplayVersion"
- Type="raw" />
- </Property>
- <?endif ?>
- <Property Id="DATADIR">
- <RegistrySearch Id="FindDataDir"
- Root="HKLM"
- Key="SOFTWARE\MySQL AB\[ProductName]"
- Name="DataLocation"
- Type="raw" />
- </Property>
- <Property Id="INSTALLDIR2">
- <RegistrySearch Id="FindInstallLocation2"
- Root="HKLM"
- Key="SOFTWARE\MySQL AB\[ProductName]"
- Name="Location"
- Type="raw" />
- </Property>
- <CustomAction Id="SetInstallDir2" Property="INSTALLDIR" Value="[INSTALLDIR2]" />
- <InstallUISequence>
- <Custom Action="SetInstallDir2" After="AppSearch">INSTALLDIR2</Custom>
- </InstallUISequence>
-
-
- <!-- UI -->
- <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"></Property>
- <UIRef Id="@CPACK_WIX_UI@" />
- <UIRef Id="WixUI_ErrorProgressText" />
- <WixVariable
- Id="WixUIBannerBmp"
- Value="@CMAKE_CURRENT_SOURCE_DIR@/AdminHeader.jpg" />
- <WixVariable
- Id="WixUIDialogBmp"
- Value="@CMAKE_CURRENT_SOURCE_DIR@/AdminBackground.jpg" />
- <Icon
- Id="icon.ico"
- SourceFile="@CMAKE_CURRENT_SOURCE_DIR@/MySQLServer.ico"/>
- <Property
- Id="ARPPRODUCTICON"
- Value="icon.ico" />
-
- <!-- License -->
- <WixVariable
- Id="WixUILicenseRtf"
- Value="@COPYING_RTF@"/>
-
- <!-- How to remove the service on uninstall -->
- <Binary Id='wixca.dll' SourceFile='@WIXCA_LOCATION@' />
- <CustomAction Id="UnregisterProperty" Property="UnregisterService" Value="[INSTALLDIR]" Return="check" />
- <CustomAction Id="UnregisterPropertySilent" Property="UnregisterServiceSilently" Value="[INSTALLDIR]" Return="check" />
- <CustomAction Id="UnregisterService"
- BinaryKey="wixca.dll"
- DllEntry="RemoveService"
- Execute="deferred"
- Impersonate="no"
- Return="check" />
- <CustomAction Id="UnregisterServiceSilently"
- BinaryKey="wixca.dll"
- DllEntry="RemoveServiceNoninteractive"
- Execute="deferred"
- Impersonate="no"
- Return="check" />
- <InstallExecuteSequence>
- <Custom Action="UnregisterProperty" After="InstallInitialize">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL"</Custom>
- <Custom Action="UnregisterPropertySilent" After="InstallInitialize">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL"</Custom>
- <Custom Action="UnregisterService" After="UnregisterProperty">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL" And UILevel>4</Custom>
- <Custom Action="UnregisterServiceSilently" After="UnregisterPropertySilent">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL" And UILevel<=4</Custom>
- </InstallExecuteSequence>
-
- <!-- Installation root-->
- <Directory Id='TARGETDIR' Name='SourceDir'>
- <Directory Id='@PlatformProgramFilesFolder@'>
- <Directory Id='directory.MySQL' Name='MySQL'>
- <Directory Id='INSTALLDIR' Name='MySQL Server @MAJOR_VERSION at .@MINOR_VERSION@'>
- </Directory>
- </Directory>
- </Directory>
- </Directory>
-
- <!-- CPACK_WIX_FEATURES -->
- @CPACK_WIX_FEATURES@
-
- <!-- CPACK_WIX_DIRECTORIES -->
- @CPACK_WIX_DIRECTORIES@
-
- <!--CPACK_WIX_COMPONENTS-->
- @CPACK_WIX_COMPONENTS@
-
- <!--CPACK_WIX_COMPONENTS_GROUPS -->
- @CPACK_WIX_COMPONENT_GROUPS@
-
- <!--CPACK_WIX_INCLUDES -->
- @CPACK_WIX_INCLUDES@
- </Product>
-
-</Wix>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+ xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+
+<!--
+ Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+-->
+
+ <Product
+ Id="*"
+ UpgradeCode="49EB7A6A-1CEF-4A1E-9E89-B9A4993963E3"
+ Name="MySQL Server @MAJOR_VERSION at .@MINOR_VERSION@"
+ Version="@MAJOR_VERSION at .@MINOR_VERSION at .@PATCH_VERSION@"
+ Language="1033"
+ Manufacturer="@MANUFACTURER@">
+
+ <Package Id='*'
+ Keywords='Installer'
+ Description="MySQL Database Server"
+ Manufacturer='@MANUFACTURER@'
+ InstallerVersion='200'
+ Languages='1033'
+ Compressed='yes'
+ SummaryCodepage='1252'
+ Platform='@Platform@'
+ InstallScope="perMachine"/>
+
+ <Media Id='1' Cabinet='product.cab' EmbedCab='yes' />
+
+ <!-- Upgrade -->
+ <Upgrade Id="49EB7A6A-1CEF-4A1E-9E89-B9A4993963E3">
+ <UpgradeVersion
+ Minimum="@MAJOR_VERSION at .@MINOR_VERSION at .0"
+ IncludeMinimum="yes"
+ Maximum="@MAJOR_VERSION at .@MINOR_VERSION at .@PATCH_VERSION@"
+ IncludeMaximum="yes"
+ Property="OLDERVERSIONBEINGUPGRADED"
+ MigrateFeatures="yes"
+ />
+ <UpgradeVersion
+ Minimum="@MAJOR_VERSION at .@MINOR_VERSION at .@PATCH_VERSION@"
+ IncludeMinimum="no"
+ OnlyDetect="yes"
+ Property="NEWERVERSIONDETECTED" />
+ </Upgrade>
+ <Condition Message="A later version of [ProductName] is already installed. Setup will now exit.">
+ NOT NEWERVERSIONDETECTED OR Installed
+ </Condition>
+ <InstallExecuteSequence>
+ <RemoveExistingProducts After="InstallInitialize"/>
+ </InstallExecuteSequence>
+
+ <!-- Save/restore install location -->
+ <CustomAction Id="SaveTargetDir" Property="ARPINSTALLLOCATION" Value="[INSTALLDIR]" />
+ <InstallExecuteSequence>
+ <Custom Action="SaveTargetDir" After="InstallValidate">
+ NOT
+ Installed
+ </Custom>
+ </InstallExecuteSequence>
+ <InstallUISequence>
+ <!-- App search is what does FindInstallLocation, and it is dependent on FindRelatedProducts -->
+ <AppSearch After="FindRelatedProducts"/>
+ </InstallUISequence>
+
+ <!-- Find previous installation -->
+ <Property Id="INSTALLDIR">
+ <RegistrySearch Id="FindInstallLocation"
+ Root="HKLM"
+ Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[OLDERVERSIONBEINGUPGRADED]"
+ Name="InstallLocation"
+ Type="raw" />
+ </Property>
+ <?if @Platform@ != "x64" ?>
+ <Property Id="OLDERVERSION">
+ <RegistrySearch Id="FindOlderVersion"
+ Root="HKLM"
+ Win64 = "no"
+ Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[OLDERVERSIONBEINGUPGRADED]"
+ Name="DisplayVersion"
+ Type="raw" />
+ </Property>
+ <?else ?>
+ <Property Id="OLDERVERSION">
+ <RegistrySearch Id="FindOlderVersion"
+ Root="HKLM"
+ Win64 = "yes"
+ Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[OLDERVERSIONBEINGUPGRADED]"
+ Name="DisplayVersion"
+ Type="raw" />
+ </Property>
+ <?endif ?>
+ <Property Id="DATADIR">
+ <RegistrySearch Id="FindDataDir"
+ Root="HKLM"
+ Key="SOFTWARE\MySQL AB\[ProductName]"
+ Name="DataLocation"
+ Type="raw" />
+ </Property>
+ <Property Id="INSTALLDIR2">
+ <RegistrySearch Id="FindInstallLocation2"
+ Root="HKLM"
+ Key="SOFTWARE\MySQL AB\[ProductName]"
+ Name="Location"
+ Type="raw" />
+ </Property>
+ <CustomAction Id="SetInstallDir2" Property="INSTALLDIR" Value="[INSTALLDIR2]" />
+ <InstallUISequence>
+ <Custom Action="SetInstallDir2" After="AppSearch">INSTALLDIR2</Custom>
+ </InstallUISequence>
+
+
+ <!-- UI -->
+ <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"></Property>
+ <UIRef Id="@CPACK_WIX_UI@" />
+ <UIRef Id="WixUI_ErrorProgressText" />
+ <WixVariable
+ Id="WixUIBannerBmp"
+ Value="@CMAKE_CURRENT_SOURCE_DIR@/AdminHeader.jpg" />
+ <WixVariable
+ Id="WixUIDialogBmp"
+ Value="@CMAKE_CURRENT_SOURCE_DIR@/AdminBackground.jpg" />
+ <Icon
+ Id="icon.ico"
+ SourceFile="@CMAKE_CURRENT_SOURCE_DIR@/MySQLServer.ico"/>
+ <Property
+ Id="ARPPRODUCTICON"
+ Value="icon.ico" />
+
+ <!-- License -->
+ <WixVariable
+ Id="WixUILicenseRtf"
+ Value="@COPYING_RTF@"/>
+
+ <!-- How to remove the service on uninstall -->
+ <Binary Id='wixca.dll' SourceFile='@WIXCA_LOCATION@' />
+ <CustomAction Id="UnregisterProperty" Property="UnregisterService" Value="[INSTALLDIR]" Return="check" />
+ <CustomAction Id="UnregisterPropertySilent" Property="UnregisterServiceSilently" Value="[INSTALLDIR]" Return="check" />
+ <CustomAction Id="UnregisterService"
+ BinaryKey="wixca.dll"
+ DllEntry="RemoveService"
+ Execute="deferred"
+ Impersonate="no"
+ Return="check" />
+ <CustomAction Id="UnregisterServiceSilently"
+ BinaryKey="wixca.dll"
+ DllEntry="RemoveServiceNoninteractive"
+ Execute="deferred"
+ Impersonate="no"
+ Return="check" />
+ <InstallExecuteSequence>
+ <Custom Action="UnregisterProperty" After="InstallInitialize">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL"</Custom>
+ <Custom Action="UnregisterPropertySilent" After="InstallInitialize">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL"</Custom>
+ <Custom Action="UnregisterService" After="UnregisterProperty">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL" And UILevel>4</Custom>
+ <Custom Action="UnregisterServiceSilently" After="UnregisterPropertySilent">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL" And UILevel<=4</Custom>
+ </InstallExecuteSequence>
+
+ <!-- Installation root-->
+ <Directory Id='TARGETDIR' Name='SourceDir'>
+ <Directory Id='@PlatformProgramFilesFolder@'>
+ <Directory Id='directory.MySQL' Name='MySQL'>
+ <Directory Id='INSTALLDIR' Name='MySQL Server @MAJOR_VERSION at .@MINOR_VERSION@'>
+ </Directory>
+ </Directory>
+ </Directory>
+ </Directory>
+
+ <!-- CPACK_WIX_FEATURES -->
+ @CPACK_WIX_FEATURES@
+
+ <!-- CPACK_WIX_DIRECTORIES -->
+ @CPACK_WIX_DIRECTORIES@
+
+ <!--CPACK_WIX_COMPONENTS-->
+ @CPACK_WIX_COMPONENTS@
+
+ <!--CPACK_WIX_COMPONENTS_GROUPS -->
+ @CPACK_WIX_COMPONENT_GROUPS@
+
+ <!--CPACK_WIX_INCLUDES -->
+ @CPACK_WIX_INCLUDES@
+ </Product>
+
+</Wix>
diff --git a/packaging/rpm-oel/mysql.spec.in b/packaging/rpm-oel/mysql.spec.in
index d8cf49f..bb232fb 100644
--- a/packaging/rpm-oel/mysql.spec.in
+++ b/packaging/rpm-oel/mysql.spec.in
@@ -1,4 +1,4 @@
-# Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -370,7 +370,7 @@ Obsoletes: mariadb-embedded
Obsoletes: MySQL-embedded < %{version}-%{release}
Obsoletes: mysql-embedded < %{version}-%{release}
Provides: mysql-embedded = %{version}-%{release}
-Provides: mysql-emdedded%{?_isa} = %{version}-%{release}
+Provides: mysql-embedded%{?_isa} = %{version}-%{release}
%description embedded
This package contains the MySQL server as an embedded library.
diff --git a/plugin/server_audit/server_audit.c b/plugin/server_audit/server_audit.c
index a4d726b..bede4c9 100644
--- a/plugin/server_audit/server_audit.c
+++ b/plugin/server_audit/server_audit.c
@@ -1118,6 +1118,8 @@ static size_t escape_string(const char *str, unsigned int len,
*(result++)= '\\';
*(result++)= '\\';
}
+ else if (is_space(*str))
+ *(result++)= ' ';
else
*(result++)= *str;
str++;
@@ -1173,9 +1175,15 @@ static size_t escape_string_hide_passwords(const char *str, unsigned int len,
for (c=0; c<d_len; c++)
result[c]= is_space(str[c]) ? ' ' : str[c];
- memmove(result + d_len, "*****", 5);
- result+= d_len + 5;
- b_char= *(next_s++);
+ if (*next_s)
+ {
+ memmove(result + d_len, "*****", 5);
+ result+= d_len + 5;
+ b_char= *(next_s++);
+ }
+ else
+ result+= d_len;
+
while (*next_s)
{
if (*next_s == b_char)
diff --git a/sql-bench/limits/access_odbc.cfg b/sql-bench/limits/access_odbc.cfg
index cc2e05c..8fd07fc 100644
--- a/sql-bench/limits/access_odbc.cfg
+++ b/sql-bench/limits/access_odbc.cfg
@@ -1,448 +1,448 @@
-#This file is automaticly generated by crash-me 1.37
-
-NEG=yes # update of column= -column
-alter_add_col=yes # Alter table add column
-alter_add_multi_col=without add # Alter table add many columns
-alter_alter_col=no # Alter table alter column
-alter_change_col=no # Alter table change column
-alter_drop_col=yes # Alter table drop column
-alter_modify_col=no # Alter table modify column
-alter_rename_table=no # Alter table rename table
-atomic_updates=no # atomic updates
-binary_items=yes # binary items (0x41)
-case_insensitive_strings=yes # case insensitive compare
-char_is_space_filled=no # char are space filled
-column_alias=yes # Column alias
-columns_in_group_by=11 # number of columns in group by
-columns_in_order_by=11 # number of columns in order by
-comment_#=no # # as comment
-comment_--=no # -- as comment
-comment_/**/=no # /* */ as comment
-comment_//=no # // as comment
-compute=no # Compute
-connections=64 # Simultaneous connections
-constraint_check=no # CHECK constraint
-constraint_null=yes # NULL constraint (SyBase style)
-crash_me_safe=no # crash me safe
-crash_me_version=1.37 # crash me version
-create_default=no # default value for column
-create_default_func=no # default value function for column
-create_if_not_exists=no # create table if not exists
-create_index=yes # create index
-create_table_select=no # create table from select
-cross_join=no # cross join (same as from a,b)
-date_as_string=error # String functions on date columns
-date_with_YY=yes # Supports YY-MM-DD 2000 compilant dates
-date_zero=no # Supports 0000-00-00 dates
-double_quotes=yes # Double '' as ' in strings
-drop_if_exists=no # drop table if exists
-drop_index=with 'ON' # drop index
-end_colon=yes # allows end ';'
-except=no # except
-except_all=no # except all
-float_int_expr=yes # mixing of integer and float in expression
-foreign_key_syntax=no # foreign key syntax
-full_outer_join=no # full outer join
-func_extra_!=no # Function NOT as '!' in SELECT
-func_extra_%=no # Function MOD as %
-func_extra_&=error # Function & (bitwise and)
-func_extra_&&=no # Function AND as '&&'
-func_extra_<>=yes # Function <> in SELECT
-func_extra_==yes # Function =
-func_extra_add_months=no # Function ADD_MONTHS
-func_extra_and_or=yes # Function AND and OR in SELECT
-func_extra_atn2=no # Function ATN2
-func_extra_auto_num2string=no # Function automatic num->string convert
-func_extra_auto_string2num=yes # Function automatic string->num convert
-func_extra_between=yes # Function BETWEEN in SELECT
-func_extra_binary_shifts=no # Function << and >> (bitwise shifts)
-func_extra_bit_count=no # Function BIT_COUNT
-func_extra_ceil=no # Function CEIL
-func_extra_charindex=no # Function CHARINDEX
-func_extra_chr=yes # Function CHR
-func_extra_coalesce=no # Function COALESCE
-func_extra_concat_as_+=yes # Function concatenation with +
-func_extra_concat_list=no # Function CONCAT(list)
-func_extra_convert=no # Function CONVERT
-func_extra_cosh=no # Function COSH
-func_extra_date_format=no # Function DATE_FORMAT
-func_extra_dateadd=no # Function DATEADD
-func_extra_datediff=no # Function DATEDIFF
-func_extra_datename=no # Function DATENAME
-func_extra_datepart=no # Function DATEPART
-func_extra_elt=no # Function ELT
-func_extra_encrypt=no # Function ENCRYPT
-func_extra_field=no # Function FIELD
-func_extra_format=error # Function FORMAT
-func_extra_from_days=no # Function FROM_DAYS
-func_extra_from_unixtime=no # Function FROM_UNIXTIME
-func_extra_getdate=no # Function GETDATE
-func_extra_greatest=no # Function GREATEST
-func_extra_if=no # Function IF
-func_extra_in_num=yes # Function IN on numbers in SELECT
-func_extra_in_str=yes # Function IN on strings in SELECT
-func_extra_initcap=no # Function INITCAP
-func_extra_instr=yes # Function LOCATE as INSTR
-func_extra_instr_oracle=no # Function INSTR (Oracle syntax)
-func_extra_instrb=no # Function INSTRB
-func_extra_interval=no # Function INTERVAL
-func_extra_last_day=no # Function LAST_DAY
-func_extra_last_insert_id=no # Function LAST_INSERT_ID
-func_extra_least=no # Function LEAST
-func_extra_lengthb=no # Function LENGTHB
-func_extra_like=yes # Function LIKE in SELECT
-func_extra_like_escape=no # Function LIKE ESCAPE in SELECT
-func_extra_ln=no # Function LN
-func_extra_log(m_n)=no # Function LOG(m,n)
-func_extra_logn=no # Function LOGN
-func_extra_lpad=no # Function LPAD
-func_extra_mdy=no # Function MDY
-func_extra_mid=yes # Function SUBSTRING as MID
-func_extra_months_between=no # Function MONTHS_BETWEEN
-func_extra_not=yes # Function NOT in SELECT
-func_extra_not_between=yes # Function NOT BETWEEN in SELECT
-func_extra_not_like=yes # Function NOT LIKE in SELECT
-func_extra_odbc_convert=no # Function ODBC CONVERT
-func_extra_password=no # Function PASSWORD
-func_extra_patindex=no # Function PATINDEX
-func_extra_period_add=no # Function PERIOD_ADD
-func_extra_period_diff=no # Function PERIOD_DIFF
-func_extra_pow=no # Function POW
-func_extra_range=no # Function RANGE
-func_extra_regexp=no # Function REGEXP in SELECT
-func_extra_replicate=no # Function REPLICATE
-func_extra_reverse=no # Function REVERSE
-func_extra_root=no # Function ROOT
-func_extra_round1=yes # Function ROUND(1 arg)
-func_extra_rpad=no # Function RPAD
-func_extra_sec_to_time=no # Function SEC_TO_TIME
-func_extra_sinh=no # Function SINH
-func_extra_str=no # Function STR
-func_extra_strcmp=no # Function STRCMP
-func_extra_stuff=no # Function STUFF
-func_extra_substrb=no # Function SUBSTRB
-func_extra_substring_index=no # Function SUBSTRING_INDEX
-func_extra_sysdate=no # Function SYSDATE
-func_extra_tanh=no # Function TANH
-func_extra_time_to_sec=no # Function TIME_TO_SEC
-func_extra_to_days=no # Function TO_DAYS
-func_extra_translate=no # Function TRANSLATE
-func_extra_trim_many_char=no # Function TRIM; Many char extension
-func_extra_trim_substring=no # Function TRIM; Substring extension
-func_extra_trunc=no # Function TRUNC
-func_extra_uid=no # Function UID
-func_extra_unix_timestamp=no # Function UNIX_TIMESTAMP
-func_extra_userenv=no # Function USERENV
-func_extra_version=no # Function VERSION
-func_extra_weekday=error # Function WEEKDAY
-func_extra_|=no # Function | (bitwise or)
-func_extra_||=no # Function OR as '||'
-func_odbc_abs=yes # Function ABS
-func_odbc_acos=no # Function ACOS
-func_odbc_ascii=no # Function ASCII
-func_odbc_asin=no # Function ASIN
-func_odbc_atan=no # Function ATAN
-func_odbc_atan2=no # Function ATAN2
-func_odbc_ceiling=no # Function CEILING
-func_odbc_char=no # Function CHAR
-func_odbc_concat=no # Function CONCAT(2 arg)
-func_odbc_cos=yes # Function COS
-func_odbc_cot=no # Function COT
-func_odbc_curdate=no # Function CURDATE
-func_odbc_curtime=no # Function CURTIME
-func_odbc_database=no # Function DATABASE
-func_odbc_dayname=no # Function DAYNAME
-func_odbc_dayofmonth=no # Function DAYOFMONTH
-func_odbc_dayofweek=no # Function DAYOFWEEK
-func_odbc_dayofyear=no # Function DAYOFYEAR
-func_odbc_degrees=no # Function DEGREES
-func_odbc_difference=no # Function DIFFERENCE()
-func_odbc_exp=yes # Function EXP
-func_odbc_extract=no # Function EXTRACT
-func_odbc_floor=no # Function FLOOR
-func_odbc_fn_left=yes # Function ODBC syntax LEFT & RIGHT
-func_odbc_hour=yes # Function HOUR
-func_odbc_hour_time=no # Function ANSI HOUR
-func_odbc_ifnull=no # Function IFNULL
-func_odbc_insert=no # Function INSERT
-func_odbc_lcase=yes # Function LCASE
-func_odbc_left=yes # Function LEFT
-func_odbc_length=no # Function REAL LENGTH
-func_odbc_length_without_space=no # Function ODBC LENGTH
-func_odbc_locate_2=no # Function LOCATE(2 arg)
-func_odbc_locate_3=no # Function LOCATE(3 arg)
-func_odbc_log=yes # Function LOG
-func_odbc_log10=no # Function LOG10
-func_odbc_ltrim=yes # Function LTRIM
-func_odbc_minute=yes # Function MINUTE
-func_odbc_mod=no # Function MOD
-func_odbc_month=yes # Function MONTH
-func_odbc_monthname=no # Function MONTHNAME
-func_odbc_now=yes # Function NOW
-func_odbc_pi=no # Function PI
-func_odbc_power=no # Function POWER
-func_odbc_quarter=no # Function QUARTER
-func_odbc_radians=no # Function RADIANS
-func_odbc_rand=no # Function RAND
-func_odbc_repeat=no # Function REPEAT
-func_odbc_replace=no # Function REPLACE
-func_odbc_right=yes # Function RIGHT
-func_odbc_round=yes # Function ROUND(2 arg)
-func_odbc_rtrim=yes # Function RTRIM
-func_odbc_second=yes # Function SECOND
-func_odbc_sign=no # Function SIGN
-func_odbc_sin=yes # Function SIN
-func_odbc_soundex=no # Function SOUNDEX
-func_odbc_space=yes # Function SPACE
-func_odbc_sqrt=no # Function SQRT
-func_odbc_substring=no # Function ODBC SUBSTRING
-func_odbc_tan=yes # Function TAN
-func_odbc_timestampadd=no # Function TIMESTAMPADD
-func_odbc_timestampdiff=no # Function TIMESTAMPDIFF
-func_odbc_truncate=no # Function TRUNCATE
-func_odbc_ucase=yes # Function UCASE
-func_odbc_user()=no # Function USER()
-func_odbc_week=no # Function WEEK
-func_odbc_year=yes # Function YEAR
-func_sql_+=yes # Function +, -, * and /
-func_sql_bit_length=no # Function BIT_LENGTH
-func_sql_case=no # Function CASE
-func_sql_cast=no # Function CAST
-func_sql_char_length=no # Function CHAR_LENGTH
-func_sql_char_length(constant)=no # Function CHAR_LENGTH(constant)
-func_sql_character_length=no # Function CHARACTER_LENGTH
-func_sql_concat_as_||=no # Function concatenation with ||
-func_sql_current_date=no # Function CURRENT_DATE
-func_sql_current_time=no # Function CURRENT_TIME
-func_sql_current_timestamp=no # Function CURRENT_TIMESTAMP
-func_sql_current_user=no # Function CURRENT_USER
-func_sql_lower=no # Function LOWER
-func_sql_octet_length=no # Function OCTET_LENGTH
-func_sql_position=no # Function POSITION
-func_sql_session_user=no # Function SESSION_USER
-func_sql_substring=no # Function ANSI SQL SUBSTRING
-func_sql_system_user=no # Function SYSTEM_USER
-func_sql_trim=no # Function TRIM
-func_sql_upper=no # Function UPPER
-func_sql_user=no # Function USER
-func_where_between=yes # Function BETWEEN
-func_where_eq_all=yes # Function = ALL
-func_where_eq_any=yes # Function = ANY
-func_where_eq_some=yes # Function = SOME
-func_where_exists=yes # Function EXISTS
-func_where_in_num=yes # Function IN on numbers
-func_where_like=yes # Function LIKE
-func_where_like_escape=no # Function LIKE ESCAPE
-func_where_match=no # Function MATCH
-func_where_match_unique=no # Function MATCH UNIQUE
-func_where_matches=no # Function MATCHES
-func_where_not_between=yes # Function NOT BETWEEN
-func_where_not_exists=yes # Function NOT EXISTS
-func_where_not_like=yes # Function NOT LIKE
-func_where_not_unique=no # Function NOT UNIQUE
-func_where_unique=no # Function UNIQUE
-functions=yes # Functions
-group_by=yes # Group by
-group_by_alias=no # Group by alias
-group_by_null=yes # group on column with null values
-group_by_position=no # Group by position
-group_distinct_functions=no # Group functions with distinct
-group_func_extra_bit_and=no # Group function BIT_AND
-group_func_extra_bit_or=no # Group function BIT_OR
-group_func_extra_count_distinct_list=no # Group function COUNT(DISTINCT expr,expr,...)
-group_func_extra_std=no # Group function STD
-group_func_extra_stddev=no # Group function STDDEV
-group_func_extra_variance=no # Group function VARIANCE
-group_func_sql_avg=yes # Group function AVG
-group_func_sql_count_*=yes # Group function COUNT (*)
-group_func_sql_count_column=yes # Group function COUNT column name
-group_func_sql_count_distinct=no # Group function COUNT(DISTINCT expr)
-group_func_sql_max=yes # Group function MAX on numbers
-group_func_sql_max_str=yes # Group function MAX on strings
-group_func_sql_min=yes # Group function MIN on numbers
-group_func_sql_min_str=yes # Group function MIN on strings
-group_func_sql_sum=yes # Group function SUM
-group_functions=yes # Group functions
-having=yes # Having
-having_with_alias=no # Having on alias
-having_with_group=yes # Having with group function
-ignore_end_space=yes # ignore end space in compare
-index_in_create=no # index in create table
-index_namespace=yes # different namespace for index
-index_parts=no # index on column part (extension)
-insert_empty_string=yes # insert empty string
-insert_select=no # insert INTO ... SELECT ...
-insert_with_set=no # INSERT with set syntax
-intersect=no # intersect
-intersect_all=no # intersect all
-join_tables=32 # tables in join
-left_outer_join=yes # left outer join
-left_outer_join_using=no # left outer join using
-like_with_column=yes # column LIKE column
-like_with_number=yes # LIKE on numbers
-lock_tables=no # lock table
-logical_value=-1 # Value of logical operation (1=1)
-max_big_expressions=1 # big expressions
-max_char_size=255 # max char() size
-max_column_name=59 # column name length
-max_columns=255 # Columns in table
-max_conditions=97 # OR and AND in WHERE
-max_expressions=+10000 # simple expressions
-max_index=32 # max index
-max_index_length=2026 # index length
-max_index_name=64 # index name length
-max_index_part_length=255 # max index part length
-max_index_parts=10 # index parts
-max_index_varchar_part_length=85 # index varchar part length
-max_row_length=2025 # max table row length (without blobs)
-max_row_length_with_null=2025 # table row length with nulls (without blobs)
-max_select_alias_name=64 # select alias name length
-max_stack_expression=14 # stacked expressions
-max_table_alias_name=253 # table alias name length
-max_table_name=64 # table name length
-max_text_size=17 # max text or blob size
-max_unique_index=32 # unique indexes
-max_varchar_size=85 # max varchar() size
-minus=no # minus
-minus_neg=yes # Calculate 1--1
-multi_drop=yes # many tables to drop table
-multi_strings=no # Multiple line strings
-multi_table_delete=yes # DELETE FROM table1,table2...
-multi_table_update=yes # Update with many tables
+#This file is automaticly generated by crash-me 1.37
+
+NEG=yes # update of column= -column
+alter_add_col=yes # Alter table add column
+alter_add_multi_col=without add # Alter table add many columns
+alter_alter_col=no # Alter table alter column
+alter_change_col=no # Alter table change column
+alter_drop_col=yes # Alter table drop column
+alter_modify_col=no # Alter table modify column
+alter_rename_table=no # Alter table rename table
+atomic_updates=no # atomic updates
+binary_items=yes # binary items (0x41)
+case_insensitive_strings=yes # case insensitive compare
+char_is_space_filled=no # char are space filled
+column_alias=yes # Column alias
+columns_in_group_by=11 # number of columns in group by
+columns_in_order_by=11 # number of columns in order by
+comment_#=no # # as comment
+comment_--=no # -- as comment
+comment_/**/=no # /* */ as comment
+comment_//=no # // as comment
+compute=no # Compute
+connections=64 # Simultaneous connections
+constraint_check=no # CHECK constraint
+constraint_null=yes # NULL constraint (SyBase style)
+crash_me_safe=no # crash me safe
+crash_me_version=1.37 # crash me version
+create_default=no # default value for column
+create_default_func=no # default value function for column
+create_if_not_exists=no # create table if not exists
+create_index=yes # create index
+create_table_select=no # create table from select
+cross_join=no # cross join (same as from a,b)
+date_as_string=error # String functions on date columns
+date_with_YY=yes # Supports YY-MM-DD 2000 compilant dates
+date_zero=no # Supports 0000-00-00 dates
+double_quotes=yes # Double '' as ' in strings
+drop_if_exists=no # drop table if exists
+drop_index=with 'ON' # drop index
+end_colon=yes # allows end ';'
+except=no # except
+except_all=no # except all
+float_int_expr=yes # mixing of integer and float in expression
+foreign_key_syntax=no # foreign key syntax
+full_outer_join=no # full outer join
+func_extra_!=no # Function NOT as '!' in SELECT
+func_extra_%=no # Function MOD as %
+func_extra_&=error # Function & (bitwise and)
+func_extra_&&=no # Function AND as '&&'
+func_extra_<>=yes # Function <> in SELECT
+func_extra_==yes # Function =
+func_extra_add_months=no # Function ADD_MONTHS
+func_extra_and_or=yes # Function AND and OR in SELECT
+func_extra_atn2=no # Function ATN2
+func_extra_auto_num2string=no # Function automatic num->string convert
+func_extra_auto_string2num=yes # Function automatic string->num convert
+func_extra_between=yes # Function BETWEEN in SELECT
+func_extra_binary_shifts=no # Function << and >> (bitwise shifts)
+func_extra_bit_count=no # Function BIT_COUNT
+func_extra_ceil=no # Function CEIL
+func_extra_charindex=no # Function CHARINDEX
+func_extra_chr=yes # Function CHR
+func_extra_coalesce=no # Function COALESCE
+func_extra_concat_as_+=yes # Function concatenation with +
+func_extra_concat_list=no # Function CONCAT(list)
+func_extra_convert=no # Function CONVERT
+func_extra_cosh=no # Function COSH
+func_extra_date_format=no # Function DATE_FORMAT
+func_extra_dateadd=no # Function DATEADD
+func_extra_datediff=no # Function DATEDIFF
+func_extra_datename=no # Function DATENAME
+func_extra_datepart=no # Function DATEPART
+func_extra_elt=no # Function ELT
+func_extra_encrypt=no # Function ENCRYPT
+func_extra_field=no # Function FIELD
+func_extra_format=error # Function FORMAT
+func_extra_from_days=no # Function FROM_DAYS
+func_extra_from_unixtime=no # Function FROM_UNIXTIME
+func_extra_getdate=no # Function GETDATE
+func_extra_greatest=no # Function GREATEST
+func_extra_if=no # Function IF
+func_extra_in_num=yes # Function IN on numbers in SELECT
+func_extra_in_str=yes # Function IN on strings in SELECT
+func_extra_initcap=no # Function INITCAP
+func_extra_instr=yes # Function LOCATE as INSTR
+func_extra_instr_oracle=no # Function INSTR (Oracle syntax)
+func_extra_instrb=no # Function INSTRB
+func_extra_interval=no # Function INTERVAL
+func_extra_last_day=no # Function LAST_DAY
+func_extra_last_insert_id=no # Function LAST_INSERT_ID
+func_extra_least=no # Function LEAST
+func_extra_lengthb=no # Function LENGTHB
+func_extra_like=yes # Function LIKE in SELECT
+func_extra_like_escape=no # Function LIKE ESCAPE in SELECT
+func_extra_ln=no # Function LN
+func_extra_log(m_n)=no # Function LOG(m,n)
+func_extra_logn=no # Function LOGN
+func_extra_lpad=no # Function LPAD
+func_extra_mdy=no # Function MDY
+func_extra_mid=yes # Function SUBSTRING as MID
+func_extra_months_between=no # Function MONTHS_BETWEEN
+func_extra_not=yes # Function NOT in SELECT
+func_extra_not_between=yes # Function NOT BETWEEN in SELECT
+func_extra_not_like=yes # Function NOT LIKE in SELECT
+func_extra_odbc_convert=no # Function ODBC CONVERT
+func_extra_password=no # Function PASSWORD
+func_extra_patindex=no # Function PATINDEX
+func_extra_period_add=no # Function PERIOD_ADD
+func_extra_period_diff=no # Function PERIOD_DIFF
+func_extra_pow=no # Function POW
+func_extra_range=no # Function RANGE
+func_extra_regexp=no # Function REGEXP in SELECT
+func_extra_replicate=no # Function REPLICATE
+func_extra_reverse=no # Function REVERSE
+func_extra_root=no # Function ROOT
+func_extra_round1=yes # Function ROUND(1 arg)
+func_extra_rpad=no # Function RPAD
+func_extra_sec_to_time=no # Function SEC_TO_TIME
+func_extra_sinh=no # Function SINH
+func_extra_str=no # Function STR
+func_extra_strcmp=no # Function STRCMP
+func_extra_stuff=no # Function STUFF
+func_extra_substrb=no # Function SUBSTRB
+func_extra_substring_index=no # Function SUBSTRING_INDEX
+func_extra_sysdate=no # Function SYSDATE
+func_extra_tanh=no # Function TANH
+func_extra_time_to_sec=no # Function TIME_TO_SEC
+func_extra_to_days=no # Function TO_DAYS
+func_extra_translate=no # Function TRANSLATE
+func_extra_trim_many_char=no # Function TRIM; Many char extension
+func_extra_trim_substring=no # Function TRIM; Substring extension
+func_extra_trunc=no # Function TRUNC
+func_extra_uid=no # Function UID
+func_extra_unix_timestamp=no # Function UNIX_TIMESTAMP
+func_extra_userenv=no # Function USERENV
+func_extra_version=no # Function VERSION
+func_extra_weekday=error # Function WEEKDAY
+func_extra_|=no # Function | (bitwise or)
+func_extra_||=no # Function OR as '||'
+func_odbc_abs=yes # Function ABS
+func_odbc_acos=no # Function ACOS
+func_odbc_ascii=no # Function ASCII
+func_odbc_asin=no # Function ASIN
+func_odbc_atan=no # Function ATAN
+func_odbc_atan2=no # Function ATAN2
+func_odbc_ceiling=no # Function CEILING
+func_odbc_char=no # Function CHAR
+func_odbc_concat=no # Function CONCAT(2 arg)
+func_odbc_cos=yes # Function COS
+func_odbc_cot=no # Function COT
+func_odbc_curdate=no # Function CURDATE
+func_odbc_curtime=no # Function CURTIME
+func_odbc_database=no # Function DATABASE
+func_odbc_dayname=no # Function DAYNAME
+func_odbc_dayofmonth=no # Function DAYOFMONTH
+func_odbc_dayofweek=no # Function DAYOFWEEK
+func_odbc_dayofyear=no # Function DAYOFYEAR
+func_odbc_degrees=no # Function DEGREES
+func_odbc_difference=no # Function DIFFERENCE()
+func_odbc_exp=yes # Function EXP
+func_odbc_extract=no # Function EXTRACT
+func_odbc_floor=no # Function FLOOR
+func_odbc_fn_left=yes # Function ODBC syntax LEFT & RIGHT
+func_odbc_hour=yes # Function HOUR
+func_odbc_hour_time=no # Function ANSI HOUR
+func_odbc_ifnull=no # Function IFNULL
+func_odbc_insert=no # Function INSERT
+func_odbc_lcase=yes # Function LCASE
+func_odbc_left=yes # Function LEFT
+func_odbc_length=no # Function REAL LENGTH
+func_odbc_length_without_space=no # Function ODBC LENGTH
+func_odbc_locate_2=no # Function LOCATE(2 arg)
+func_odbc_locate_3=no # Function LOCATE(3 arg)
+func_odbc_log=yes # Function LOG
+func_odbc_log10=no # Function LOG10
+func_odbc_ltrim=yes # Function LTRIM
+func_odbc_minute=yes # Function MINUTE
+func_odbc_mod=no # Function MOD
+func_odbc_month=yes # Function MONTH
+func_odbc_monthname=no # Function MONTHNAME
+func_odbc_now=yes # Function NOW
+func_odbc_pi=no # Function PI
+func_odbc_power=no # Function POWER
+func_odbc_quarter=no # Function QUARTER
+func_odbc_radians=no # Function RADIANS
+func_odbc_rand=no # Function RAND
+func_odbc_repeat=no # Function REPEAT
+func_odbc_replace=no # Function REPLACE
+func_odbc_right=yes # Function RIGHT
+func_odbc_round=yes # Function ROUND(2 arg)
+func_odbc_rtrim=yes # Function RTRIM
+func_odbc_second=yes # Function SECOND
+func_odbc_sign=no # Function SIGN
+func_odbc_sin=yes # Function SIN
+func_odbc_soundex=no # Function SOUNDEX
+func_odbc_space=yes # Function SPACE
+func_odbc_sqrt=no # Function SQRT
+func_odbc_substring=no # Function ODBC SUBSTRING
+func_odbc_tan=yes # Function TAN
+func_odbc_timestampadd=no # Function TIMESTAMPADD
+func_odbc_timestampdiff=no # Function TIMESTAMPDIFF
+func_odbc_truncate=no # Function TRUNCATE
+func_odbc_ucase=yes # Function UCASE
+func_odbc_user()=no # Function USER()
+func_odbc_week=no # Function WEEK
+func_odbc_year=yes # Function YEAR
+func_sql_+=yes # Function +, -, * and /
+func_sql_bit_length=no # Function BIT_LENGTH
+func_sql_case=no # Function CASE
+func_sql_cast=no # Function CAST
+func_sql_char_length=no # Function CHAR_LENGTH
+func_sql_char_length(constant)=no # Function CHAR_LENGTH(constant)
+func_sql_character_length=no # Function CHARACTER_LENGTH
+func_sql_concat_as_||=no # Function concatenation with ||
+func_sql_current_date=no # Function CURRENT_DATE
+func_sql_current_time=no # Function CURRENT_TIME
+func_sql_current_timestamp=no # Function CURRENT_TIMESTAMP
+func_sql_current_user=no # Function CURRENT_USER
+func_sql_lower=no # Function LOWER
+func_sql_octet_length=no # Function OCTET_LENGTH
+func_sql_position=no # Function POSITION
+func_sql_session_user=no # Function SESSION_USER
+func_sql_substring=no # Function ANSI SQL SUBSTRING
+func_sql_system_user=no # Function SYSTEM_USER
+func_sql_trim=no # Function TRIM
+func_sql_upper=no # Function UPPER
+func_sql_user=no # Function USER
+func_where_between=yes # Function BETWEEN
+func_where_eq_all=yes # Function = ALL
+func_where_eq_any=yes # Function = ANY
+func_where_eq_some=yes # Function = SOME
+func_where_exists=yes # Function EXISTS
+func_where_in_num=yes # Function IN on numbers
+func_where_like=yes # Function LIKE
+func_where_like_escape=no # Function LIKE ESCAPE
+func_where_match=no # Function MATCH
+func_where_match_unique=no # Function MATCH UNIQUE
+func_where_matches=no # Function MATCHES
+func_where_not_between=yes # Function NOT BETWEEN
+func_where_not_exists=yes # Function NOT EXISTS
+func_where_not_like=yes # Function NOT LIKE
+func_where_not_unique=no # Function NOT UNIQUE
+func_where_unique=no # Function UNIQUE
+functions=yes # Functions
+group_by=yes # Group by
+group_by_alias=no # Group by alias
+group_by_null=yes # group on column with null values
+group_by_position=no # Group by position
+group_distinct_functions=no # Group functions with distinct
+group_func_extra_bit_and=no # Group function BIT_AND
+group_func_extra_bit_or=no # Group function BIT_OR
+group_func_extra_count_distinct_list=no # Group function COUNT(DISTINCT expr,expr,...)
+group_func_extra_std=no # Group function STD
+group_func_extra_stddev=no # Group function STDDEV
+group_func_extra_variance=no # Group function VARIANCE
+group_func_sql_avg=yes # Group function AVG
+group_func_sql_count_*=yes # Group function COUNT (*)
+group_func_sql_count_column=yes # Group function COUNT column name
+group_func_sql_count_distinct=no # Group function COUNT(DISTINCT expr)
+group_func_sql_max=yes # Group function MAX on numbers
+group_func_sql_max_str=yes # Group function MAX on strings
+group_func_sql_min=yes # Group function MIN on numbers
+group_func_sql_min_str=yes # Group function MIN on strings
+group_func_sql_sum=yes # Group function SUM
+group_functions=yes # Group functions
+having=yes # Having
+having_with_alias=no # Having on alias
+having_with_group=yes # Having with group function
+ignore_end_space=yes # ignore end space in compare
+index_in_create=no # index in create table
+index_namespace=yes # different namespace for index
+index_parts=no # index on column part (extension)
+insert_empty_string=yes # insert empty string
+insert_select=no # insert INTO ... SELECT ...
+insert_with_set=no # INSERT with set syntax
+intersect=no # intersect
+intersect_all=no # intersect all
+join_tables=32 # tables in join
+left_outer_join=yes # left outer join
+left_outer_join_using=no # left outer join using
+like_with_column=yes # column LIKE column
+like_with_number=yes # LIKE on numbers
+lock_tables=no # lock table
+logical_value=-1 # Value of logical operation (1=1)
+max_big_expressions=1 # big expressions
+max_char_size=255 # max char() size
+max_column_name=59 # column name length
+max_columns=255 # Columns in table
+max_conditions=97 # OR and AND in WHERE
+max_expressions=+10000 # simple expressions
+max_index=32 # max index
+max_index_length=2026 # index length
+max_index_name=64 # index name length
+max_index_part_length=255 # max index part length
+max_index_parts=10 # index parts
+max_index_varchar_part_length=85 # index varchar part length
+max_row_length=2025 # max table row length (without blobs)
+max_row_length_with_null=2025 # table row length with nulls (without blobs)
+max_select_alias_name=64 # select alias name length
+max_stack_expression=14 # stacked expressions
+max_table_alias_name=253 # table alias name length
+max_table_name=64 # table name length
+max_text_size=17 # max text or blob size
+max_unique_index=32 # unique indexes
+max_varchar_size=85 # max varchar() size
+minus=no # minus
+minus_neg=yes # Calculate 1--1
+multi_drop=yes # many tables to drop table
+multi_strings=no # Multiple line strings
+multi_table_delete=yes # DELETE FROM table1,table2...
+multi_table_update=yes # Update with many tables
insert_multi_value=no # Value lists in INSERT
-natural_join=no # natural join
-natural_left_outer_join=no # natural left outer join
-no_primary_key=yes # Tables without primary key
-null_in_index=yes # null in index
-null_in_unique=yes # null in unique
-odbc_left_outer_join=yes # left outer join odbc style
-operating_system=Windows 98 [Version 4.10.1998] # crash-me tested on
-order_by=yes # Order by
-order_by_alias=no # Order by alias
-order_by_function=yes # Order by function
-order_by_position=yes # Order by position
-order_by_remember_desc=no # Order by DESC is remembered
-primary_key_in_create=yes # primary key in create table
-query_size=16777216 # query size
-quote_ident_with_"=yes # " as identifier quote (ANSI SQL)
-quote_ident_with_[=yes # [] as identifier quote
-quote_ident_with_`=yes # ` as identifier quote
-quote_with_"=no # Allows ' and " as string markers
-recursive_subqueries=49 # recursive subqueries
-remember_end_space=no # Remembers end space in char()
-remember_end_space_varchar=yes # Remembers end space in varchar()
-right_outer_join=yes # right outer join
-rowid=no # Type for row id
-select_constants=yes # Select constants
-select_limit=no # SELECT with LIMIT
-select_limit2=no # SELECT with LIMIT #,#
-select_string_size=516076 # constant string size in SELECT
-select_table_update=no # Update with sub select
-select_without_from=yes # SELECT without FROM
-server_version=Access 2000 # server version
-simple_joins=yes # ANSI SQL simple joins
-subqueries=yes # subqueries
-table_alias=yes # Table alias
-table_name_case=yes # case independent table names
-table_wildcard=yes # Select table_name.*
-tempoary_table=no # temporary tables
-transactions=yes # transactions
-type_extra_abstime=no # Type abstime
-type_extra_bfile=no # Type bfile
-type_extra_blob=no # Type blob
-type_extra_bool=no # Type bool
-type_extra_box=no # Type box
-type_extra_byte=yes # Type byte
-type_extra_char(1_arg)_binary=no # Type char(1 arg) binary
-type_extra_circle=no # Type circle
-type_extra_clob=no # Type clob
-type_extra_datetime=yes # Type datetime
-type_extra_double=yes # Type double
-type_extra_enum(1_arg)=no # Type enum(1 arg)
-type_extra_float(2_arg)=no # Type float(2 arg)
-type_extra_float4=yes # Type float4
-type_extra_float8=yes # Type float8
-type_extra_image=yes # Type image
-type_extra_int(1_arg)_zerofill=no # Type int(1 arg) zerofill
-type_extra_int1=no # Type int1
-type_extra_int2=no # Type int2
-type_extra_int3=no # Type int3
-type_extra_int4=no # Type int4
-type_extra_int8=no # Type int8
-type_extra_int_auto_increment=no # Type int not null auto_increment
-type_extra_int_unsigned=no # Type int unsigned
-type_extra_interval=no # Type interval
-type_extra_line=no # Type line
-type_extra_long=yes # Type long
-type_extra_long_raw=no # Type long raw
-type_extra_long_varbinary=no # Type long varbinary
-type_extra_long_varchar(1_arg)=no # Type long varchar(1 arg)
-type_extra_lseg=no # Type lseg
-type_extra_mediumint=no # Type mediumint
-type_extra_mediumtext=no # Type mediumtext
-type_extra_middleint=no # Type middleint
-type_extra_mlslabel=no # Type mlslabel
-type_extra_money=yes # Type money
-type_extra_nclob=no # Type nclob
-type_extra_number=yes # Type number
-type_extra_number(1_arg)=no # Type number(1 arg)
-type_extra_number(2_arg)=no # Type number(2 arg)
-type_extra_nvarchar2(1_arg)=no # Type nvarchar2(1 arg)
-type_extra_path=no # Type path
-type_extra_point=no # Type point
-type_extra_polygon=no # Type polygon
-type_extra_raw(1_arg)=no # Type raw(1 arg)
-type_extra_reltime=no # Type reltime
-type_extra_rowid=no # Type rowid
-type_extra_serial=no # Type serial
-type_extra_set(1_arg)=no # Type set(1 arg)
-type_extra_smalldatetime=no # Type smalldatetime
-type_extra_smallfloat=no # Type smallfloat
-type_extra_smallmoney=no # Type smallmoney
-type_extra_text=yes # Type text
-type_extra_text(1_arg)=yes # Type text(1 arg)
-type_extra_timespan=no # Type timespan
-type_extra_uint=no # Type uint
-type_extra_varchar2(1_arg)=no # Type varchar2(1 arg)
-type_extra_year=no # Type year
-type_odbc_bigint=no # Type bigint
-type_odbc_binary(1_arg)=yes # Type binary(1 arg)
-type_odbc_datetime=yes # Type datetime
-type_odbc_tinyint=no # Type tinyint
-type_odbc_varbinary(1_arg)=yes # Type varbinary(1 arg)
-type_sql_bit=yes # Type bit
-type_sql_bit(1_arg)=no # Type bit(1 arg)
-type_sql_bit_varying(1_arg)=no # Type bit varying(1 arg)
-type_sql_char(1_arg)=yes # Type char(1 arg)
-type_sql_char_varying(1_arg)=no # Type char varying(1 arg)
-type_sql_character(1_arg)=no # Type character(1 arg)
-type_sql_character_varying(1_arg)=no # Type character varying(1 arg)
-type_sql_date=yes # Type date
-type_sql_dec(2_arg)=no # Type dec(2 arg)
-type_sql_decimal(2_arg)=no # Type decimal(2 arg)
-type_sql_double_precision=no # Type double precision
-type_sql_float=yes # Type float
-type_sql_float(1_arg)=no # Type float(1 arg)
-type_sql_int=yes # Type int
-type_sql_integer=yes # Type integer
-type_sql_interval_day_to_second=no # Type interval day to second
-type_sql_interval_year=no # Type interval year
-type_sql_interval_year_to_month=no # Type interval year to month
-type_sql_national_char_varying(1_arg)=no # Type national char varying(1 arg)
-type_sql_national_character(1_arg)=no # Type national character(1 arg)
-type_sql_national_character_varying(1_arg)=no # Type national character varying(1 arg)
-type_sql_nchar(1_arg)=no # Type nchar(1 arg)
-type_sql_nchar_varying(1_arg)=no # Type nchar varying(1 arg)
-type_sql_numeric(2_arg)=no # Type numeric(2 arg)
-type_sql_real=yes # Type real
-type_sql_smallint=yes # Type smallint
-type_sql_time=yes # Type time
-type_sql_timestamp=yes # Type timestamp
-type_sql_timestamp_with_time_zone=no # Type timestamp with time zone
-type_sql_varchar(1_arg)=yes # Type varchar(1 arg)
-union=yes # union
-union_all=yes # union all
-unique_in_create=yes # unique in create table
-unique_null_in_create=yes # unique null in create
-views=no # views
-where_string_size=258035 # constant string size in where
+natural_join=no # natural join
+natural_left_outer_join=no # natural left outer join
+no_primary_key=yes # Tables without primary key
+null_in_index=yes # null in index
+null_in_unique=yes # null in unique
+odbc_left_outer_join=yes # left outer join odbc style
+operating_system=Windows 98 [Version 4.10.1998] # crash-me tested on
+order_by=yes # Order by
+order_by_alias=no # Order by alias
+order_by_function=yes # Order by function
+order_by_position=yes # Order by position
+order_by_remember_desc=no # Order by DESC is remembered
+primary_key_in_create=yes # primary key in create table
+query_size=16777216 # query size
+quote_ident_with_"=yes # " as identifier quote (ANSI SQL)
+quote_ident_with_[=yes # [] as identifier quote
+quote_ident_with_`=yes # ` as identifier quote
+quote_with_"=no # Allows ' and " as string markers
+recursive_subqueries=49 # recursive subqueries
+remember_end_space=no # Remembers end space in char()
+remember_end_space_varchar=yes # Remembers end space in varchar()
+right_outer_join=yes # right outer join
+rowid=no # Type for row id
+select_constants=yes # Select constants
+select_limit=no # SELECT with LIMIT
+select_limit2=no # SELECT with LIMIT #,#
+select_string_size=516076 # constant string size in SELECT
+select_table_update=no # Update with sub select
+select_without_from=yes # SELECT without FROM
+server_version=Access 2000 # server version
+simple_joins=yes # ANSI SQL simple joins
+subqueries=yes # subqueries
+table_alias=yes # Table alias
+table_name_case=yes # case independent table names
+table_wildcard=yes # Select table_name.*
+tempoary_table=no # temporary tables
+transactions=yes # transactions
+type_extra_abstime=no # Type abstime
+type_extra_bfile=no # Type bfile
+type_extra_blob=no # Type blob
+type_extra_bool=no # Type bool
+type_extra_box=no # Type box
+type_extra_byte=yes # Type byte
+type_extra_char(1_arg)_binary=no # Type char(1 arg) binary
+type_extra_circle=no # Type circle
+type_extra_clob=no # Type clob
+type_extra_datetime=yes # Type datetime
+type_extra_double=yes # Type double
+type_extra_enum(1_arg)=no # Type enum(1 arg)
+type_extra_float(2_arg)=no # Type float(2 arg)
+type_extra_float4=yes # Type float4
+type_extra_float8=yes # Type float8
+type_extra_image=yes # Type image
+type_extra_int(1_arg)_zerofill=no # Type int(1 arg) zerofill
+type_extra_int1=no # Type int1
+type_extra_int2=no # Type int2
+type_extra_int3=no # Type int3
+type_extra_int4=no # Type int4
+type_extra_int8=no # Type int8
+type_extra_int_auto_increment=no # Type int not null auto_increment
+type_extra_int_unsigned=no # Type int unsigned
+type_extra_interval=no # Type interval
+type_extra_line=no # Type line
+type_extra_long=yes # Type long
+type_extra_long_raw=no # Type long raw
+type_extra_long_varbinary=no # Type long varbinary
+type_extra_long_varchar(1_arg)=no # Type long varchar(1 arg)
+type_extra_lseg=no # Type lseg
+type_extra_mediumint=no # Type mediumint
+type_extra_mediumtext=no # Type mediumtext
+type_extra_middleint=no # Type middleint
+type_extra_mlslabel=no # Type mlslabel
+type_extra_money=yes # Type money
+type_extra_nclob=no # Type nclob
+type_extra_number=yes # Type number
+type_extra_number(1_arg)=no # Type number(1 arg)
+type_extra_number(2_arg)=no # Type number(2 arg)
+type_extra_nvarchar2(1_arg)=no # Type nvarchar2(1 arg)
+type_extra_path=no # Type path
+type_extra_point=no # Type point
+type_extra_polygon=no # Type polygon
+type_extra_raw(1_arg)=no # Type raw(1 arg)
+type_extra_reltime=no # Type reltime
+type_extra_rowid=no # Type rowid
+type_extra_serial=no # Type serial
+type_extra_set(1_arg)=no # Type set(1 arg)
+type_extra_smalldatetime=no # Type smalldatetime
+type_extra_smallfloat=no # Type smallfloat
+type_extra_smallmoney=no # Type smallmoney
+type_extra_text=yes # Type text
+type_extra_text(1_arg)=yes # Type text(1 arg)
+type_extra_timespan=no # Type timespan
+type_extra_uint=no # Type uint
+type_extra_varchar2(1_arg)=no # Type varchar2(1 arg)
+type_extra_year=no # Type year
+type_odbc_bigint=no # Type bigint
+type_odbc_binary(1_arg)=yes # Type binary(1 arg)
+type_odbc_datetime=yes # Type datetime
+type_odbc_tinyint=no # Type tinyint
+type_odbc_varbinary(1_arg)=yes # Type varbinary(1 arg)
+type_sql_bit=yes # Type bit
+type_sql_bit(1_arg)=no # Type bit(1 arg)
+type_sql_bit_varying(1_arg)=no # Type bit varying(1 arg)
+type_sql_char(1_arg)=yes # Type char(1 arg)
+type_sql_char_varying(1_arg)=no # Type char varying(1 arg)
+type_sql_character(1_arg)=no # Type character(1 arg)
+type_sql_character_varying(1_arg)=no # Type character varying(1 arg)
+type_sql_date=yes # Type date
+type_sql_dec(2_arg)=no # Type dec(2 arg)
+type_sql_decimal(2_arg)=no # Type decimal(2 arg)
+type_sql_double_precision=no # Type double precision
+type_sql_float=yes # Type float
+type_sql_float(1_arg)=no # Type float(1 arg)
+type_sql_int=yes # Type int
+type_sql_integer=yes # Type integer
+type_sql_interval_day_to_second=no # Type interval day to second
+type_sql_interval_year=no # Type interval year
+type_sql_interval_year_to_month=no # Type interval year to month
+type_sql_national_char_varying(1_arg)=no # Type national char varying(1 arg)
+type_sql_national_character(1_arg)=no # Type national character(1 arg)
+type_sql_national_character_varying(1_arg)=no # Type national character varying(1 arg)
+type_sql_nchar(1_arg)=no # Type nchar(1 arg)
+type_sql_nchar_varying(1_arg)=no # Type nchar varying(1 arg)
+type_sql_numeric(2_arg)=no # Type numeric(2 arg)
+type_sql_real=yes # Type real
+type_sql_smallint=yes # Type smallint
+type_sql_time=yes # Type time
+type_sql_timestamp=yes # Type timestamp
+type_sql_timestamp_with_time_zone=no # Type timestamp with time zone
+type_sql_varchar(1_arg)=yes # Type varchar(1 arg)
+union=yes # union
+union_all=yes # union all
+unique_in_create=yes # unique in create table
+unique_null_in_create=yes # unique null in create
+views=no # views
+where_string_size=258035 # constant string size in where
diff --git a/sql-common/client.c b/sql-common/client.c
index ac372a4..01f7397 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -1801,6 +1801,7 @@ mysql_ssl_set(MYSQL *mysql __attribute__((unused)) ,
mysql->options.ssl_ca= strdup_if_not_null(ca);
mysql->options.ssl_capath= strdup_if_not_null(capath);
mysql->options.ssl_cipher= strdup_if_not_null(cipher);
+ mysql->options.use_ssl= TRUE;
#endif /* HAVE_OPENSSL && !EMBEDDED_LIBRARY */
DBUG_RETURN(0);
}
@@ -2491,13 +2492,10 @@ static int send_client_reply_packet(MCPVIO_EXT *mpvio,
mysql->client_flag|= CLIENT_MULTI_RESULTS;
#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
- if (mysql->options.ssl_key || mysql->options.ssl_cert ||
- mysql->options.ssl_ca || mysql->options.ssl_capath ||
- mysql->options.ssl_cipher)
- mysql->options.use_ssl= 1;
if (mysql->options.use_ssl)
mysql->client_flag|= CLIENT_SSL;
#endif /* HAVE_OPENSSL && !EMBEDDED_LIBRARY*/
+
if (mpvio->db)
mysql->client_flag|= CLIENT_CONNECT_WITH_DB;
@@ -2526,6 +2524,23 @@ static int send_client_reply_packet(MCPVIO_EXT *mpvio,
end= buff+5;
}
#ifdef HAVE_OPENSSL
+
+ /*
+ If client uses ssl and client also has to verify the server
+ certificate, a ssl connection is required.
+ If the server does not support ssl, we abort the connection.
+ */
+ if (mysql->options.use_ssl &&
+ (mysql->client_flag & CLIENT_SSL_VERIFY_SERVER_CERT) &&
+ !(mysql->server_capabilities & CLIENT_SSL))
+ {
+ set_mysql_extended_error(mysql, CR_SSL_CONNECTION_ERROR, unknown_sqlstate,
+ ER(CR_SSL_CONNECTION_ERROR),
+ "SSL is required, but the server does not "
+ "support it");
+ goto error;
+ }
+
if (mysql->client_flag & CLIENT_SSL)
{
/* Do the SSL layering. */
diff --git a/sql/field.cc b/sql/field.cc
index 52a4909..a24ffe2 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -2483,7 +2483,7 @@ void Field_decimal::sql_type(String &res) const
if (dec)
tmp--;
res.length(cs->cset->snprintf(cs,(char*) res.ptr(),res.alloced_length(),
- "decimal(%d,%d)",tmp,dec));
+ "decimal(%d,%d)/*old*/",tmp,dec));
add_zerofill_and_unsigned(res);
}
@@ -7629,6 +7629,14 @@ err_exit:
return -1;
}
+Field::geometry_type Field_geom::geometry_type_merge(geometry_type a,
+ geometry_type b)
+{
+ if (a == b)
+ return a;
+ return Field::GEOM_GEOMETRY;
+}
+
#endif /*HAVE_SPATIAL*/
/****************************************************************************
diff --git a/sql/field.h b/sql/field.h
index a43b3b5..130d33e 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -1998,6 +1998,7 @@ public:
int reset(void) { return Field_blob::reset() || !maybe_null(); }
geometry_type get_geometry_type() { return geom_type; };
+ static geometry_type geometry_type_merge(geometry_type, geometry_type);
};
#endif /*HAVE_SPATIAL*/
diff --git a/sql/field_conv.cc b/sql/field_conv.cc
index 6c3fcc0..d6a53a9 100644
--- a/sql/field_conv.cc
+++ b/sql/field_conv.cc
@@ -828,8 +828,9 @@ Copy_field::get_copy_func(Field *to,Field *from)
int field_conv(Field *to,Field *from)
{
+ bool blob_type_dest= to->flags & BLOB_FLAG;
if (to->real_type() == from->real_type() &&
- !(to->type() == MYSQL_TYPE_BLOB && to->table->copy_blobs))
+ !(blob_type_dest && to->table->copy_blobs))
{
if (to->pack_length() == from->pack_length() &&
!(to->flags & UNSIGNED_FLAG && !(from->flags & UNSIGNED_FLAG)) &&
@@ -858,7 +859,7 @@ int field_conv(Field *to,Field *from)
return 0;
}
}
- if (to->type() == MYSQL_TYPE_BLOB)
+ if (blob_type_dest)
{ // Be sure the value is stored
Field_blob *blob=(Field_blob*) to;
from->val_str(&blob->value);
diff --git a/sql/filesort.cc b/sql/filesort.cc
index d6cb22e..5bb5c64 100644
--- a/sql/filesort.cc
+++ b/sql/filesort.cc
@@ -1,5 +1,5 @@
-/* Copyright (c) 2000, 2014, Oracle and/or its affiliates.
- Copyright (c) 2009, 2014, Monty Program Ab.
+/* Copyright (c) 2000, 2015, Oracle and/or its affiliates.
+ Copyright (c) 2009, 2015, 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
@@ -199,6 +199,13 @@ ha_rows filesort(THD *thd, TABLE *table, SORT_FIELD *sortorder, uint s_length,
set_if_bigger(min_sort_memory, sizeof(BUFFPEK*)*MERGEBUFF2);
if (!table_sort.sort_keys)
{
+ /*
+ Cannot depend on num_rows. For external sort, space for upto MERGEBUFF2
+ rows is required.
+ */
+ if (num_rows < MERGEBUFF2)
+ num_rows= MERGEBUFF2;
+
while (memory_available >= min_sort_memory)
{
ulonglong keys= memory_available / (param.rec_length + sizeof(char*));
diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc
index 013929c..ae7bd12 100644
--- a/sql/ha_ndbcluster_binlog.cc
+++ b/sql/ha_ndbcluster_binlog.cc
@@ -1,5 +1,4 @@
-/* Copyright (c) 2006, 2013, Oracle and/or its affiliates.
- Copyright (c) 2012, 2013, Monty Proram Ab.
+/* Copyright (c) 2006, 2015, 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
@@ -2530,7 +2529,8 @@ ndbcluster_check_if_local_tables_in_db(THD *thd, const char *dbname)
char path[FN_REFLEN + 1];
build_table_filename(path, sizeof(path) - 1, dbname, "", "", 0);
- if (find_files(thd, &files, dbname, path, NullS, 0) != FIND_FILES_OK)
+ if (find_files(thd, &files, dbname, path, NullS, 0, NULL) !=
+ FIND_FILES_OK)
{
DBUG_PRINT("info", ("Failed to find files"));
DBUG_RETURN(true);
diff --git a/sql/item.cc b/sql/item.cc
index 87336dc..f8d1c85 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -1136,6 +1136,36 @@ Item *Item::safe_charset_converter(CHARSET_INFO *tocs)
/**
+ Some pieces of the code do not support changing of
+ Item_cache to other Item types.
+
+ Example:
+ Item_singlerow_subselect has "Item_cache **row".
+ Creating of Item_func_conv_charset followed by THD::change_item_tree()
+ should not change row[i] from Item_cache directly to Item_func_conv_charset, because Item_singlerow_subselect
+ because Item_singlerow_subselect later calls Item_cache-specific methods,
+ e.g. row[i]->store() and row[i]->cache_value().
+
+ Let's wrap Item_func_conv_charset to a new Item_cache,
+ so the Item_cache-specific methods can still be used for
+ Item_singlerow_subselect::row[i] safely.
+
+ TODO: we should eventually check all other use cases of change_item_tree().
+ Perhaps some more potentially dangerous substitution examples exist.
+*/
+Item *Item_cache::safe_charset_converter(CHARSET_INFO *tocs)
+{
+ Item_func_conv_charset *conv= new Item_func_conv_charset(example, tocs, 1);
+ Item_cache *cache;
+ if (!conv || !conv->safe || !(cache= new Item_cache_str(conv)))
+ return NULL; // Safe conversion is not possible, or OEM
+ cache->setup(conv);
+ cache->fixed= false; // Make Item::fix_fields() happy
+ return cache;
+}
+
+
+/**
@details
Created mostly for mysql_prepare_table(). Important
when a string ENUM/SET column is described with a numeric default value:
@@ -9486,6 +9516,11 @@ bool Item_type_holder::join_types(THD *thd, Item *item)
item_decimals= 0;
decimals= max(decimals, item_decimals);
}
+
+ if (fld_type == FIELD_TYPE_GEOMETRY)
+ geometry_type=
+ Field_geom::geometry_type_merge(geometry_type, item->get_geometry_type());
+
if (Field::result_merge_type(fld_type) == DECIMAL_RESULT)
{
decimals= min(max(decimals, item->decimals), DECIMAL_MAX_SCALE);
diff --git a/sql/item.h b/sql/item.h
index ac4fa86..4aaa67d 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -4056,7 +4056,6 @@ class Item_cache: public Item_basic_constant
{
protected:
Item *example;
- table_map used_table_map;
/**
Field that this object will get value from. This is used by
index-based subquery engines to detect and remove the equality injected
@@ -4074,7 +4073,7 @@ protected:
bool value_cached;
public:
Item_cache():
- example(0), used_table_map(0), cached_field(0),
+ example(0), cached_field(0),
cached_field_type(MYSQL_TYPE_STRING),
value_cached(0)
{
@@ -4083,7 +4082,7 @@ public:
null_value= 1;
}
Item_cache(enum_field_types field_type_arg):
- example(0), used_table_map(0), cached_field(0),
+ example(0), cached_field(0),
cached_field_type(field_type_arg),
value_cached(0)
{
@@ -4092,8 +4091,6 @@ public:
null_value= 1;
}
- void set_used_tables(table_map map) { used_table_map= map; }
-
virtual bool allocate(uint i) { return 0; }
virtual bool setup(Item *item)
{
@@ -4110,7 +4107,6 @@ public:
enum_field_types field_type() const { return cached_field_type; }
static Item_cache* get_cache(const Item *item);
static Item_cache* get_cache(const Item* item, const Item_result type);
- table_map used_tables() const { return used_table_map; }
virtual void keep_array() {}
virtual void print(String *str, enum_query_type query_type);
bool eq_def(Field *field)
@@ -4161,6 +4157,7 @@ public:
return TRUE;
return (this->*processor)(arg);
}
+ virtual Item *safe_charset_converter(CHARSET_INFO *tocs);
};
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index eedf149..aca66fc 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -4467,6 +4467,16 @@ null:
void Item_dyncol_get::print(String *str, enum_query_type query_type)
{
+ /*
+ Parent cast doesn't exist yet, only print dynamic column name. This happens
+ when called from create_func_cast() / wrong_precision_error().
+ */
+ if (!str->length())
+ {
+ args[1]->print(str, query_type);
+ return;
+ }
+
/* see create_func_dyncol_get */
DBUG_ASSERT(str->length() >= 5);
DBUG_ASSERT(strncmp(str->ptr() + str->length() - 5, "cast(", 5) == 0);
diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index 27456a9..d8970ca 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -1,5 +1,5 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates.
- Copyright (c) 2008, 2014, SkySQL Ab.
+/* Copyright (c) 2000, 2015, Oracle and/or its affiliates.
+ Copyright (c) 2008, 2015, 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
@@ -3294,7 +3294,19 @@ void Item_func_group_concat::cleanup()
}
DBUG_ASSERT(tree == 0);
}
-
+ /*
+ As the ORDER structures pointed to by the elements of the
+ 'order' array may be modified in find_order_in_list() called
+ from Item_func_group_concat::setup() to point to runtime
+ created objects, we need to reset them back to the original
+ arguments of the function.
+ */
+ ORDER **order_ptr= order;
+ for (uint i= 0; i < arg_count_order; i++)
+ {
+ (*order_ptr)->item= &args[arg_count_field + i];
+ order_ptr++;
+ }
DBUG_VOID_RETURN;
}
diff --git a/sql/log.h b/sql/log.h
index 4eb23d4..e771be7 100644
--- a/sql/log.h
+++ b/sql/log.h
@@ -864,11 +864,9 @@ uint purge_log_get_error_code(int res);
int vprint_msg_to_log(enum loglevel level, const char *format, va_list args);
void sql_print_error(const char *format, ...);
-void sql_print_warning(const char *format, ...) ATTRIBUTE_FORMAT(printf, 1, 2);
-void sql_print_information(const char *format, ...)
- ATTRIBUTE_FORMAT(printf, 1, 2);
-typedef void (*sql_print_message_func)(const char *format, ...)
- ATTRIBUTE_FORMAT_FPTR(printf, 1, 2);
+void sql_print_warning(const char *format, ...);
+void sql_print_information(const char *format, ...);
+typedef void (*sql_print_message_func)(const char *format, ...);
extern sql_print_message_func sql_print_message_handlers[];
int error_log_print(enum loglevel level, const char *format,
diff --git a/sql/log_event.cc b/sql/log_event.cc
index d04ac1e..e63884e 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -2192,6 +2192,12 @@ log_event_print_value(IO_CACHE *file, const uchar *ptr,
my_snprintf(typestr, typestr_length, "STRING(%d)", length);
return my_b_write_quoted_with_length(file, ptr, length);
+ case MYSQL_TYPE_DECIMAL:
+ my_b_printf(file,
+ "!! Old DECIMAL (mysql-4.1 or earlier). "
+ "Not enough metadata to display the value. ");
+ break;
+
default:
{
char tmp[5];
diff --git a/sql/message.h b/sql/message.h
index dac0576..6641453 100644
--- a/sql/message.h
+++ b/sql/message.h
@@ -1,77 +1,77 @@
-#ifndef MESSAGE_INCLUDED
-#define MESSAGE_INCLUDED
-/* Copyright (c) 2008, 2009 Sun Microsystems, Inc.
- Use is subject to license terms.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
-
-/*
- To change or add messages mysqld writes to the Windows error log, run
- mc.exe message.mc
- and checkin generated messages.h, messages.rc and msg000001.bin under the
- source control.
- mc.exe can be installed with Windows SDK, some Visual Studio distributions
- do not include it.
-*/
-
-
-//
-// Values are 32 bit values layed out as follows:
-//
-// 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1
-// 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
-// +---+-+-+-----------------------+-------------------------------+
-// |Sev|C|R| Facility | Code |
-// +---+-+-+-----------------------+-------------------------------+
-//
-// where
-//
-// Sev - is the severity code
-//
-// 00 - Success
-// 01 - Informational
-// 10 - Warning
-// 11 - Error
-//
-// C - is the Customer code flag
-//
-// R - is a reserved bit
-//
-// Facility - is the facility code
-//
-// Code - is the facility's status code
-//
-//
-// Define the facility codes
-//
-
-
-//
-// Define the severity codes
-//
-
-
-//
-// MessageId: MSG_DEFAULT
-//
-// MessageText:
-//
-// %1For more information, see Help and Support Center at http://www.mysql.com.
-//
-//
-//
-#define MSG_DEFAULT 0xC0000064L
-
-#endif /* MESSAGE_INCLUDED */
-
+#ifndef MESSAGE_INCLUDED
+#define MESSAGE_INCLUDED
+/* Copyright (c) 2008, 2009 Sun Microsystems, Inc.
+ Use is subject to license terms.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
+
+/*
+ To change or add messages mysqld writes to the Windows error log, run
+ mc.exe message.mc
+ and checkin generated messages.h, messages.rc and msg000001.bin under the
+ source control.
+ mc.exe can be installed with Windows SDK, some Visual Studio distributions
+ do not include it.
+*/
+
+
+//
+// Values are 32 bit values layed out as follows:
+//
+// 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1
+// 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
+// +---+-+-+-----------------------+-------------------------------+
+// |Sev|C|R| Facility | Code |
+// +---+-+-+-----------------------+-------------------------------+
+//
+// where
+//
+// Sev - is the severity code
+//
+// 00 - Success
+// 01 - Informational
+// 10 - Warning
+// 11 - Error
+//
+// C - is the Customer code flag
+//
+// R - is a reserved bit
+//
+// Facility - is the facility code
+//
+// Code - is the facility's status code
+//
+//
+// Define the facility codes
+//
+
+
+//
+// Define the severity codes
+//
+
+
+//
+// MessageId: MSG_DEFAULT
+//
+// MessageText:
+//
+// %1For more information, see Help and Support Center at http://www.mysql.com.
+//
+//
+//
+#define MSG_DEFAULT 0xC0000064L
+
+#endif /* MESSAGE_INCLUDED */
+
diff --git a/sql/message.rc b/sql/message.rc
index 116522b..0885a89 100644
--- a/sql/message.rc
+++ b/sql/message.rc
@@ -1,2 +1,2 @@
-LANGUAGE 0x9,0x1
-1 11 MSG00001.bin
+LANGUAGE 0x9,0x1
+1 11 MSG00001.bin
diff --git a/sql/rpl_utility.cc b/sql/rpl_utility.cc
index 22241da..e05ad5a 100644
--- a/sql/rpl_utility.cc
+++ b/sql/rpl_utility.cc
@@ -417,7 +417,7 @@ void show_sql_type(enum_field_types type, uint16 metadata, String *str, CHARSET_
CHARSET_INFO *cs= str->charset();
uint32 length=
cs->cset->snprintf(cs, (char*) str->ptr(), str->alloced_length(),
- "decimal(%d,?)", metadata);
+ "decimal(%d,?)/*old*/", metadata);
str->length(length);
}
break;
diff --git a/sql/slave.cc b/sql/slave.cc
index a03deb1..2fe7ebb 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -4738,8 +4738,8 @@ static int connect_to_master(THD* thd, MYSQL* mysql, Master_info* mi,
mysql_options(mysql, MYSQL_SET_CHARSET_DIR, (char *) charsets_dir);
/* Set MYSQL_PLUGIN_DIR in case master asks for an external authentication plugin */
- if (opt_plugin_dir_ptr && *opt_plugin_dir_ptr)
- mysql_options(mysql, MYSQL_PLUGIN_DIR, opt_plugin_dir_ptr);
+ if (opt_plugin_dir_ptr && *opt_plugin_dir_ptr)
+ mysql_options(mysql, MYSQL_PLUGIN_DIR, opt_plugin_dir_ptr);
/* we disallow empty users */
if (mi->user == NULL || mi->user[0] == 0)
diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc
index 44057b6..9827c67 100644
--- a/sql/sql_admin.cc
+++ b/sql/sql_admin.cc
@@ -901,7 +901,7 @@ send_result_message:
break;
}
}
- if (table->table)
+ if (table->table && !table->view)
{
if (table->table->s->tmp_table)
{
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 592215d..fcd17b2 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -8291,9 +8291,10 @@ bool setup_tables(THD *thd, Name_resolution_context *context,
if (select_lex->first_cond_optimization)
{
leaves.empty();
- if (!select_lex->is_prep_leaf_list_saved)
+ if (select_lex->prep_leaf_list_state != SELECT_LEX::SAVED)
{
make_leaves_list(leaves, tables, full_table_list, first_select_table);
+ select_lex->prep_leaf_list_state= SELECT_LEX::READY;
select_lex->leaf_tables_exec.empty();
}
else
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc
index 041d2a5..16b53da 100644
--- a/sql/sql_connect.cc
+++ b/sql/sql_connect.cc
@@ -1017,7 +1017,7 @@ bool setup_connection_thread_globals(THD *thd)
bool login_connection(THD *thd)
{
NET *net= &thd->net;
- int error;
+ int error= 0;
DBUG_ENTER("login_connection");
DBUG_PRINT("info", ("login_connection called by thread %lu",
thd->thread_id));
@@ -1036,7 +1036,8 @@ bool login_connection(THD *thd)
my_sleep(1000); /* must wait after eof() */
#endif
statistic_increment(aborted_connects,&LOCK_status);
- DBUG_RETURN(1);
+ error=1;
+ goto exit;
}
/* Connect completed, set read/write timeouts back to default */
my_net_set_read_timeout(net, thd->variables.net_read_timeout);
@@ -1046,10 +1047,13 @@ bool login_connection(THD *thd)
if (increment_connection_count(thd, TRUE))
{
my_error(ER_OUTOFMEMORY, MYF(0), 2*sizeof(USER_STATS));
- DBUG_RETURN(1);
+ error= 1;
+ goto exit;
}
- DBUG_RETURN(0);
+exit:
+ MYSQL_AUDIT_NOTIFY_CONNECTION_CONNECT(thd);
+ DBUG_RETURN(error);
}
@@ -1187,7 +1191,6 @@ bool thd_prepare_connection(THD *thd)
bool rc;
lex_start(thd);
rc= login_connection(thd);
- MYSQL_AUDIT_NOTIFY_CONNECTION_CONNECT(thd);
if (rc)
return rc;
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 74591b5..1d62acd 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -533,6 +533,7 @@ void lex_start(THD *thd)
lex->is_lex_started= TRUE;
lex->used_tables= 0;
+ lex->only_view= FALSE;
lex->reset_slave_info.all= false;
lex->limit_rows_examined= 0;
lex->limit_rows_examined_cnt= ULONGLONG_MAX;
@@ -1881,7 +1882,7 @@ void st_select_lex::init_query()
exclude_from_table_unique_test= no_wrap_view_item= FALSE;
nest_level= 0;
link_next= 0;
- is_prep_leaf_list_saved= FALSE;
+ prep_leaf_list_state= UNINIT;
bzero((char*) expr_cache_may_be_used, sizeof(expr_cache_may_be_used));
m_non_agg_field_used= false;
m_agg_func_used= false;
@@ -4128,12 +4129,22 @@ bool st_select_lex::save_prep_leaf_tables(THD *thd)
{
List_iterator_fast<TABLE_LIST> li(leaf_tables);
TABLE_LIST *table;
+
+ /*
+ Check that the SELECT_LEX was really prepared and so tables are setup.
+
+ It can be subquery in SET clause of UPDATE which was not prepared yet, so
+ its tables are not yet setup and ready for storing.
+ */
+ if (prep_leaf_list_state != READY)
+ return FALSE;
+
while ((table= li++))
{
if (leaf_tables_prep.push_back(table))
return TRUE;
}
- is_prep_leaf_list_saved= TRUE;
+ prep_leaf_list_state= SAVED;
for (SELECT_LEX_UNIT *u= first_inner_unit(); u; u= u->next_unit())
{
for (SELECT_LEX *sl= u->first_select(); sl; sl= sl->next_select())
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index 69ee5cc..a0f8e45 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -789,7 +789,8 @@ public:
List<TABLE_LIST> leaf_tables;
List<TABLE_LIST> leaf_tables_exec;
List<TABLE_LIST> leaf_tables_prep;
- bool is_prep_leaf_list_saved;
+ enum leaf_list_state {UNINIT, READY, SAVED};
+ enum leaf_list_state prep_leaf_list_state;
uint insert_tables;
st_select_lex *merged_into; /* select which this select is merged into */
/* (not 0 only for views/derived tables) */
diff --git a/sql/sql_partition_admin.cc b/sql/sql_partition_admin.cc
index a03dcc5..a104676 100644
--- a/sql/sql_partition_admin.cc
+++ b/sql/sql_partition_admin.cc
@@ -174,9 +174,16 @@ bool Alter_table_truncate_partition_statement::execute(THD *thd)
log. The exception is a unimplemented truncate method or failure
before any call to handler::truncate() is done.
Also, it is logged in statement format, regardless of the binlog format.
+
+ Since we've changed data within the table, we also have to invalidate
+ the query cache for it.
*/
- if (error != HA_ERR_WRONG_COMMAND && binlog_stmt)
- error|= write_bin_log(thd, !error, thd->query(), thd->query_length());
+ if (error != HA_ERR_WRONG_COMMAND)
+ {
+ query_cache_invalidate3(thd, first_table, FALSE);
+ if (binlog_stmt)
+ error|= write_bin_log(thd, !error, thd->query(), thd->query_length());
+ }
/*
A locked table ticket was upgraded to a exclusive lock. After the
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc
index d1838ba..dbbc262 100644
--- a/sql/sql_plugin.cc
+++ b/sql/sql_plugin.cc
@@ -271,13 +271,15 @@ public:
{ TRASH(ptr_arg, size); }
sys_var_pluginvar(sys_var_chain *chain, const char *name_arg,
- struct st_mysql_sys_var *plugin_var_arg)
+ struct st_mysql_sys_var *plugin_var_arg,
+ struct st_plugin_int *plugin_arg)
:sys_var(chain, name_arg, plugin_var_arg->comment,
(plugin_var_arg->flags & PLUGIN_VAR_THDLOCAL ? SESSION : GLOBAL) |
(plugin_var_arg->flags & PLUGIN_VAR_READONLY ? READONLY : 0),
0, -1, NO_ARG, pluginvar_show_type(plugin_var_arg), 0, 0,
VARIABLE_NOT_IN_BINLOG, NULL, NULL, NULL),
- plugin_var(plugin_var_arg), orig_pluginvar_name(plugin_var_arg->name)
+ plugin(plugin_arg), plugin_var(plugin_var_arg),
+ orig_pluginvar_name(plugin_var_arg->name)
{ plugin_var->name= name_arg; }
sys_var_pluginvar *cast_pluginvar() { return this; }
bool check_update_type(Item_result type);
@@ -310,8 +312,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 *);
-#define my_intern_plugin_lock(A,B) intern_plugin_lock(A,B)
-#define my_intern_plugin_lock_ci(A,B) intern_plugin_lock(A,B)
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);
@@ -990,7 +990,7 @@ plugin_ref plugin_lock(THD *thd, plugin_ref ptr)
#endif
mysql_mutex_lock(&LOCK_plugin);
plugin_ref_to_int(ptr)->locks_total++;
- rc= my_intern_plugin_lock_ci(lex, ptr);
+ rc= intern_plugin_lock(lex, ptr);
mysql_mutex_unlock(&LOCK_plugin);
DBUG_RETURN(rc);
}
@@ -1004,7 +1004,7 @@ plugin_ref plugin_lock_by_name(THD *thd, const LEX_STRING *name, int type)
DBUG_ENTER("plugin_lock_by_name");
mysql_mutex_lock(&LOCK_plugin);
if ((plugin= plugin_find_internal(name, type)))
- rc= my_intern_plugin_lock_ci(lex, plugin_int_to_ref(plugin));
+ rc= intern_plugin_lock(lex, plugin_int_to_ref(plugin));
mysql_mutex_unlock(&LOCK_plugin);
DBUG_RETURN(rc);
}
@@ -1409,22 +1409,6 @@ static int plugin_initialize(MEM_ROOT *tmp_root, struct st_plugin_int *plugin,
#endif /* FIX_LATER */
}
- /*
- set the plugin attribute of plugin's sys vars so they are pointing
- to the active plugin
- */
- if (plugin->system_vars)
- {
- sys_var_pluginvar *var= plugin->system_vars->cast_pluginvar();
- for (;;)
- {
- var->plugin= plugin;
- if (!var->next)
- break;
- var= var->next->cast_pluginvar();
- }
- }
-
ret= 0;
err:
@@ -1625,7 +1609,7 @@ int plugin_init(int *argc, char **argv, int flags)
{
DBUG_ASSERT(!global_system_variables.table_plugin);
global_system_variables.table_plugin=
- my_intern_plugin_lock(NULL, plugin_int_to_ref(plugin_ptr));
+ intern_plugin_lock(NULL, plugin_int_to_ref(plugin_ptr));
DBUG_ASSERT(plugin_ptr->ref_count == 1);
}
}
@@ -2711,7 +2695,7 @@ sys_var *find_sys_var(THD *thd, const char *str, uint length)
{
mysql_rwlock_unlock(&LOCK_system_variables_hash);
LEX *lex= thd ? thd->lex : 0;
- if (!(plugin= my_intern_plugin_lock(lex, plugin_int_to_ref(pi->plugin))))
+ if (!(plugin= intern_plugin_lock(lex, plugin_int_to_ref(pi->plugin))))
var= NULL; /* failed to lock it, it must be uninstalling */
else
if (!(plugin_state(plugin) & PLUGIN_IS_READY))
@@ -3046,7 +3030,7 @@ void plugin_thdvar_init(THD *thd)
mysql_mutex_lock(&LOCK_plugin);
thd->variables.table_plugin=
- my_intern_plugin_lock(NULL, global_system_variables.table_plugin);
+ intern_plugin_lock(NULL, global_system_variables.table_plugin);
intern_plugin_unlock(NULL, old_table_plugin);
mysql_mutex_unlock(&LOCK_plugin);
DBUG_VOID_RETURN;
@@ -3927,7 +3911,7 @@ static int test_plugin_options(MEM_ROOT *tmp_root, struct st_plugin_int *tmp,
if (o->flags & PLUGIN_VAR_NOSYSVAR)
continue;
if ((var= find_bookmark(plugin_name.str, o->name, o->flags)))
- v= new (mem_root) sys_var_pluginvar(&chain, var->key + 1, o);
+ v= new (mem_root) sys_var_pluginvar(&chain, var->key + 1, o, tmp);
else
{
len= plugin_name.length + strlen(o->name) + 2;
@@ -3935,7 +3919,7 @@ static int test_plugin_options(MEM_ROOT *tmp_root, struct st_plugin_int *tmp,
strxmov(varname, plugin_name.str, "-", o->name, NullS);
my_casedn_str(&my_charset_latin1, varname);
convert_dash_to_underscore(varname, len-1);
- v= new (mem_root) sys_var_pluginvar(&chain, varname, o);
+ v= new (mem_root) sys_var_pluginvar(&chain, varname, o, tmp);
}
DBUG_ASSERT(v); /* check that an object was actually constructed */
} /* end for */
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 0373f0b..fb7cafc 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -9013,10 +9013,24 @@ make_join_select(JOIN *join,SQL_SELECT *select,COND *cond)
if (!sel->quick_keys.is_subset(tab->checked_keys) ||
!sel->needed_reg.is_subset(tab->checked_keys))
{
+ /*
+ "Range checked for each record" is a "last resort" access method
+ that should only be used when the other option is a cross-product
+ join.
+
+ We use the following condition (it's approximate):
+ 1. There are potential keys for (sel->needed_reg)
+ 2. There were no possible ways to construct a quick select, or
+ the quick select would be more expensive than the full table
+ scan.
+ */
tab->use_quick= (!sel->needed_reg.is_clear_all() &&
(sel->quick_keys.is_clear_all() ||
- (sel->quick &&
- (sel->quick->records >= 100L)))) ?
+ (sel->quick &&
+ sel->quick->read_time >
+ tab->table->file->scan_time() +
+ tab->table->file->stats.records/TIME_FOR_COMPARE
+ ))) ?
2 : 1;
sel->read_tables= used_tables & ~current_map;
sel->quick_keys.clear_all();
diff --git a/sql/sql_servers.cc b/sql/sql_servers.cc
index dce679a..dad7ab1 100644
--- a/sql/sql_servers.cc
+++ b/sql/sql_servers.cc
@@ -326,7 +326,8 @@ get_server_from_table_to_cache(TABLE *table)
table->use_all_columns();
/* get each field into the server struct ptr */
- server->server_name= get_field(&mem, table->field[0]);
+ ptr= get_field(&mem, table->field[0]);
+ server->server_name= ptr ? ptr : blank;
server->server_name_length= (uint) strlen(server->server_name);
ptr= get_field(&mem, table->field[1]);
server->host= ptr ? ptr : blank;
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index f6ed570..2248474 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -1,5 +1,5 @@
-/* Copyright (c) 2000, 2014, Oracle and/or its affiliates.
- Copyright (c) 2009, 2014, Monty Program Ab.
+/* Copyright (c) 2000, 2015, Oracle and/or its affiliates.
+ Copyright (c) 2009, 2015, 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
@@ -1486,6 +1486,11 @@ static void append_create_options(THD *thd, String *packet,
to tailor the format of the statement. Can be
NULL, in which case only SQL_MODE is considered
when building the statement.
+ show_database If true, then print the database before the table
+ name. The database name is only printed in the event
+ that it is different from the current database.
+ If false, then do not print the database before
+ the table name.
NOTE
Currently always return 0, but might return error code in the
@@ -2189,7 +2194,8 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose)
Security_context *tmp_sctx= tmp->security_ctx;
struct st_my_thread_var *mysys_var;
if ((tmp->vio_ok() || tmp->system_thread) &&
- (!user || (tmp_sctx->user && !strcmp(tmp_sctx->user, user))))
+ (!user || (!tmp->system_thread &&
+ tmp_sctx->user && !strcmp(tmp_sctx->user, user))))
{
thread_info *thd_info= new thread_info;
@@ -2314,7 +2320,8 @@ int fill_schema_processlist(THD* thd, TABLE_LIST* tables, COND* cond)
ulonglong max_counter;
if ((!tmp->vio_ok() && !tmp->system_thread) ||
- (user && (!tmp_sctx->user || strcmp(tmp_sctx->user, user))))
+ (user && (tmp->system_thread || !tmp_sctx->user ||
+ strcmp(tmp_sctx->user, user))))
continue;
restore_record(table, s->default_values);
@@ -7720,15 +7727,20 @@ bool get_schema_tables_result(JOIN *join,
TABLE_LIST *table_list= tab->table->pos_in_table_list;
if (table_list->schema_table && thd->fill_information_schema_tables())
{
+#if MYSQL_VERSION_ID > 100105
+#error I_S tables only need to be re-populated if make_cond_for_info_schema() will preserve outer fields
bool is_subselect= (&lex->unit != lex->current_select->master_unit() &&
lex->current_select->master_unit()->item);
+#else
+#define is_subselect false
+#endif
/* A value of 0 indicates a dummy implementation */
if (table_list->schema_table->fill_table == 0)
continue;
/* skip I_S optimizations specific to get_all_tables */
- if (thd->lex->describe &&
+ if (lex->describe &&
(table_list->schema_table->fill_table != get_all_tables))
continue;
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 6ec99cd..4139aa7 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -4894,7 +4894,7 @@ bool mysql_create_like_table(THD* thd, TABLE_LIST* table, TABLE_LIST* src_table,
int result __attribute__((unused))=
store_create_info(thd, table, &query,
- create_info, FALSE /* show_database */);
+ create_info, TRUE /* show_database */);
DBUG_ASSERT(result == 0); // store_create_info() always return 0
if (write_bin_log(thd, TRUE, query.ptr(), query.length()))
diff --git a/sql/sql_view.cc b/sql/sql_view.cc
index 47b2387..255f876 100644
--- a/sql/sql_view.cc
+++ b/sql/sql_view.cc
@@ -228,7 +228,7 @@ fill_defined_view_parts (THD *thd, TABLE_LIST *view)
view->definer.user= decoy.definer.user;
lex->definer= &view->definer;
}
- if (lex->create_view_algorithm == DTYPE_ALGORITHM_UNDEFINED)
+ if (lex->create_view_algorithm == VIEW_ALGORITHM_INHERIT)
lex->create_view_algorithm= (uint8) decoy.algorithm;
if (lex->create_view_suid == VIEW_SUID_DEFAULT)
lex->create_view_suid= decoy.view_suid ?
diff --git a/sql/sql_yacc.cc b/sql/sql_yacc.cc
index 25caef6..9908510 100644
--- a/sql/sql_yacc.cc
+++ b/sql/sql_yacc.cc
@@ -2345,18 +2345,18 @@ union yyalloc
#endif
/* YYFINAL -- State number of the termination state. */
-#define YYFINAL 604
+#define YYFINAL 602
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 56493
+#define YYLAST 56458
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 639
/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 925
+#define YYNNTS 930
/* YYNRULES -- Number of rules. */
-#define YYNRULES 2636
+#define YYNRULES 2643
/* YYNRULES -- Number of states. */
-#define YYNSTATES 4464
+#define YYNSTATES 4474
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
@@ -2563,272 +2563,273 @@ static const yytype_uint16 yyprhs[] =
2765, 2766, 2768, 2770, 2772, 2773, 2779, 2783, 2784, 2790,
2794, 2798, 2799, 2803, 2804, 2807, 2809, 2813, 2814, 2816,
2818, 2819, 2822, 2824, 2828, 2829, 2835, 2836, 2838, 2840,
- 2841, 2848, 2849, 2851, 2853, 2856, 2858, 2860, 2862, 2865,
- 2866, 2872, 2875, 2876, 2882, 2883, 2885, 2887, 2890, 2892,
- 2894, 2896, 2898, 2900, 2903, 2904, 2910, 2911, 2913, 2915,
- 2916, 2921, 2926, 2930, 2936, 2938, 2942, 2946, 2947, 2954,
- 2956, 2958, 2960, 2964, 2967, 2971, 2973, 2975, 2976, 2983,
- 2985, 2987, 2989, 2993, 2997, 3002, 3003, 3010, 3011, 3014,
- 3015, 3020, 3021, 3024, 3026, 3029, 3034, 3037, 3041, 3044,
- 3048, 3049, 3053, 3054, 3055, 3062, 3065, 3067, 3069, 3072,
- 3075, 3084, 3089, 3090, 3092, 3095, 3097, 3099, 3101, 3103,
- 3104, 3107, 3112, 3116, 3118, 3120, 3124, 3129, 3130, 3131,
- 3132, 3135, 3138, 3140, 3142, 3143, 3146, 3150, 3151, 3154,
- 3158, 3162, 3166, 3169, 3173, 3178, 3182, 3187, 3191, 3196,
- 3198, 3202, 3207, 3211, 3215, 3222, 3224, 3230, 3237, 3243,
- 3251, 3258, 3267, 3273, 3280, 3285, 3290, 3296, 3300, 3305,
- 3307, 3311, 3315, 3319, 3323, 3327, 3331, 3337, 3343, 3347,
- 3351, 3355, 3359, 3363, 3367, 3369, 3371, 3373, 3375, 3377,
- 3379, 3381, 3383, 3385, 3387, 3389, 3391, 3393, 3395, 3397,
- 3399, 3401, 3402, 3405, 3407, 3410, 3412, 3414, 3416, 3419,
- 3422, 3424, 3426, 3429, 3432, 3437, 3439, 3443, 3445, 3447,
- 3449, 3451, 3453, 3457, 3459, 3461, 3463, 3465, 3469, 3472,
- 3475, 3478, 3481, 3485, 3489, 3495, 3502, 3507, 3512, 3520,
- 3523, 3530, 3536, 3543, 3550, 3555, 3560, 3566, 3571, 3578,
- 3581, 3586, 3591, 3596, 3607, 3614, 3623, 3630, 3635, 3640,
- 3647, 3652, 3657, 3662, 3669, 3674, 3682, 3690, 3698, 3705,
- 3712, 3719, 3726, 3730, 3735, 3742, 3751, 3754, 3757, 3766,
- 3775, 3782, 3789, 3792, 3799, 3806, 3815, 3824, 3831, 3840,
- 3847, 3850, 3859, 3868, 3871, 3874, 3877, 3884, 3891, 3898,
- 3903, 3908, 3917, 3922, 3927, 3932, 3937, 3941, 3950, 3955,
- 3960, 3967, 3972, 3977, 3982, 3989, 3998, 4005, 4010, 4017,
- 4019, 4026, 4031, 4036, 4041, 4046, 4051, 4058, 4063, 4064,
- 4070, 4077, 4080, 4084, 4085, 4090, 4091, 4095, 4096, 4098,
- 4100, 4104, 4109, 4114, 4120, 4125, 4130, 4135, 4141, 4146,
- 4147, 4148, 4156, 4161, 4167, 4172, 4178, 4183, 4188, 4193,
- 4198, 4203, 4209, 4210, 4219, 4220, 4224, 4228, 4230, 4235,
- 4236, 4238, 4239, 4242, 4243, 4244, 4249, 4254, 4257, 4258,
- 4262, 4265, 4269, 4272, 4274, 4276, 4279, 4281, 4284, 4286,
- 4289, 4292, 4295, 4296, 4300, 4301, 4303, 4305, 4309, 4311,
- 4315, 4317, 4321, 4322, 4324, 4325, 4328, 4333, 4339, 4341,
- 4343, 4345, 4347, 4352, 4354, 4358, 4362, 4366, 4367, 4374,
- 4375, 4382, 4383, 4392, 4397, 4398, 4407, 4408, 4419, 4426,
- 4427, 4436, 4437, 4448, 4455, 4457, 4460, 4463, 4464, 4469,
- 4473, 4479, 4482, 4483, 4484, 4492, 4494, 4495, 4496, 4503,
- 4504, 4508, 4509, 4510, 4516, 4517, 4519, 4520, 4522, 4523,
- 4526, 4530, 4534, 4536, 4538, 4539, 4547, 4548, 4556, 4558,
- 4561, 4562, 4563, 4566, 4567, 4570, 4571, 4573, 4575, 4577,
- 4579, 4583, 4585, 4589, 4591, 4593, 4595, 4597, 4599, 4601,
- 4603, 4605, 4607, 4609, 4611, 4613, 4615, 4617, 4619, 4621,
- 4623, 4625, 4627, 4629, 4631, 4633, 4635, 4637, 4639, 4640,
- 4642, 4644, 4645, 4648, 4649, 4651, 4652, 4653, 4657, 4658,
- 4659, 4663, 4666, 4667, 4668, 4673, 4678, 4681, 4682, 4684,
- 4686, 4690, 4694, 4696, 4699, 4700, 4702, 4703, 4708, 4713,
- 4716, 4717, 4719, 4721, 4722, 4724, 4725, 4727, 4730, 4736,
- 4741, 4743, 4747, 4751, 4753, 4755, 4757, 4759, 4761, 4763,
- 4764, 4767, 4771, 4776, 4778, 4781, 4784, 4786, 4788, 4790,
- 4792, 4794, 4796, 4798, 4800, 4802, 4804, 4806, 4808, 4810,
- 4812, 4814, 4816, 4818, 4820, 4822, 4824, 4826, 4828, 4830,
- 4832, 4834, 4836, 4837, 4838, 4845, 4846, 4848, 4852, 4854,
- 4858, 4859, 4862, 4866, 4868, 4871, 4873, 4874, 4878, 4879,
- 4880, 4888, 4891, 4893, 4894, 4898, 4899, 4907, 4908, 4915,
- 4920, 4927, 4932, 4937, 4942, 4943, 4950, 4955, 4960, 4966,
- 4973, 4978, 4980, 4984, 4986, 4988, 4992, 4994, 4995, 4998,
- 4999, 5001, 5002, 5003, 5012, 5013, 5014, 5021, 5022, 5024,
- 5026, 5028, 5030, 5032, 5035, 5037, 5039, 5041, 5045, 5050,
- 5051, 5055, 5059, 5061, 5064, 5067, 5068, 5072, 5073, 5079,
- 5083, 5085, 5089, 5091, 5095, 5097, 5099, 5100, 5102, 5103,
- 5108, 5109, 5111, 5115, 5117, 5119, 5121, 5122, 5123, 5130,
- 5131, 5132, 5144, 5148, 5150, 5154, 5158, 5160, 5164, 5165,
- 5167, 5168, 5173, 5174, 5181, 5182, 5188, 5189, 5196, 5198,
- 5202, 5205, 5210, 5211, 5214, 5215, 5218, 5220, 5222, 5224,
- 5225, 5230, 5231, 5233, 5234, 5236, 5238, 5242, 5244, 5246,
- 5249, 5252, 5255, 5257, 5259, 5261, 5263, 5264, 5268, 5269,
- 5273, 5276, 5281, 5286, 5290, 5295, 5300, 5302, 5306, 5310,
- 5317, 5320, 5323, 5324, 5331, 5332, 5339, 5345, 5348, 5350,
- 5352, 5354, 5360, 5366, 5369, 5372, 5374, 5379, 5383, 5386,
- 5390, 5393, 5396, 5398, 5402, 5407, 5411, 5415, 5418, 5421,
- 5423, 5425, 5427, 5429, 5433, 5437, 5441, 5445, 5449, 5453,
- 5457, 5461, 5463, 5465, 5467, 5469, 5471, 5472, 5474, 5475,
- 5478, 5479, 5481, 5483, 5485, 5486, 5489, 5490, 5493, 5494,
- 5497, 5500, 5501, 5506, 5507, 5512, 5514, 5516, 5517, 5519,
- 5521, 5522, 5524, 5526, 5527, 5532, 5533, 5534, 5540, 5542,
- 5543, 5548, 5552, 5554, 5557, 5560, 5563, 5566, 5569, 5572,
- 5575, 5577, 5579, 5581, 5583, 5585, 5587, 5589, 5591, 5593,
- 5595, 5597, 5599, 5600, 5602, 5603, 5607, 5608, 5612, 5616,
- 5618, 5619, 5623, 5625, 5628, 5629, 5631, 5632, 5636, 5640,
- 5643, 5646, 5647, 5653, 5654, 5656, 5658, 5659, 5661, 5663,
- 5665, 5668, 5671, 5672, 5673, 5674, 5675, 5697, 5699, 5701,
- 5702, 5704, 5705, 5707, 5709, 5710, 5712, 5714, 5715, 5718,
- 5721, 5723, 5727, 5732, 5736, 5740, 5741, 5744, 5747, 5749,
- 5753, 5757, 5758, 5763, 5764, 5768, 5770, 5772, 5773, 5777,
- 5780, 5784, 5786, 5788, 5791, 5792, 5795, 5799, 5801, 5807,
- 5809, 5811, 5814, 5817, 5819, 5821, 5823, 5825, 5827, 5829,
- 5832, 5835, 5837, 5839, 5841, 5843, 5845, 5847, 5849, 5851,
- 5854, 5857, 5860, 5863, 5866, 5868, 5870, 5872, 5874, 5876,
- 5878, 5880, 5884, 5890, 5892, 5894, 5896, 5898, 5900, 5904,
- 5909, 5915, 5917, 5923, 5927, 5930, 5932, 5936, 5939, 5942,
- 5947, 5949, 5951, 5953, 5955, 5957, 5959, 5961, 5963, 5965,
- 5967, 5969, 5971, 5973, 5975, 5979, 5982, 5984, 5986, 5988,
- 5990, 5992, 5994, 5996, 5998, 6000, 6002, 6004, 6006, 6008,
- 6010, 6012, 6014, 6016, 6018, 6020, 6022, 6024, 6026, 6028,
- 6030, 6032, 6034, 6036, 6038, 6040, 6042, 6044, 6046, 6048,
- 6050, 6052, 6054, 6056, 6058, 6060, 6062, 6064, 6066, 6068,
- 6070, 6072, 6074, 6076, 6078, 6080, 6082, 6084, 6086, 6088,
- 6090, 6092, 6094, 6096, 6098, 6100, 6102, 6104, 6106, 6108,
- 6110, 6112, 6114, 6116, 6118, 6120, 6122, 6124, 6126, 6128,
- 6130, 6132, 6134, 6136, 6138, 6140, 6142, 6144, 6146, 6148,
- 6150, 6152, 6154, 6156, 6158, 6160, 6162, 6164, 6166, 6168,
- 6170, 6172, 6174, 6176, 6178, 6180, 6182, 6184, 6186, 6188,
- 6190, 6192, 6194, 6196, 6198, 6200, 6202, 6204, 6206, 6208,
- 6210, 6212, 6214, 6216, 6218, 6220, 6222, 6224, 6226, 6228,
- 6230, 6232, 6234, 6236, 6238, 6240, 6242, 6244, 6246, 6248,
- 6250, 6252, 6254, 6256, 6258, 6260, 6262, 6264, 6266, 6268,
- 6270, 6272, 6274, 6276, 6278, 6280, 6282, 6284, 6286, 6288,
- 6290, 6292, 6294, 6296, 6298, 6300, 6302, 6304, 6306, 6308,
- 6310, 6312, 6314, 6316, 6318, 6320, 6322, 6324, 6326, 6328,
- 6330, 6332, 6334, 6336, 6338, 6340, 6342, 6344, 6346, 6348,
- 6350, 6352, 6354, 6356, 6358, 6360, 6362, 6364, 6366, 6368,
- 6370, 6372, 6374, 6376, 6378, 6380, 6382, 6384, 6386, 6388,
- 6390, 6392, 6394, 6396, 6398, 6400, 6402, 6404, 6406, 6408,
- 6410, 6412, 6414, 6416, 6418, 6420, 6422, 6424, 6426, 6428,
- 6430, 6432, 6434, 6436, 6438, 6440, 6442, 6444, 6446, 6448,
- 6450, 6452, 6454, 6456, 6458, 6460, 6462, 6464, 6466, 6468,
- 6470, 6472, 6474, 6476, 6478, 6480, 6482, 6484, 6486, 6488,
- 6490, 6492, 6494, 6496, 6498, 6500, 6502, 6504, 6506, 6508,
- 6510, 6512, 6514, 6516, 6518, 6520, 6522, 6524, 6526, 6528,
- 6530, 6532, 6534, 6536, 6538, 6540, 6542, 6544, 6546, 6548,
- 6550, 6552, 6554, 6556, 6558, 6560, 6562, 6564, 6566, 6568,
- 6570, 6572, 6574, 6576, 6578, 6580, 6582, 6584, 6586, 6588,
- 6590, 6592, 6594, 6596, 6598, 6600, 6602, 6604, 6606, 6608,
- 6610, 6612, 6614, 6616, 6618, 6620, 6622, 6624, 6626, 6628,
- 6630, 6632, 6634, 6636, 6638, 6640, 6642, 6644, 6646, 6648,
- 6650, 6652, 6654, 6656, 6658, 6660, 6662, 6664, 6666, 6668,
- 6670, 6672, 6674, 6676, 6678, 6680, 6682, 6684, 6686, 6687,
- 6692, 6693, 6695, 6697, 6701, 6702, 6705, 6707, 6709, 6711,
- 6713, 6714, 6716, 6717, 6719, 6721, 6723, 6724, 6727, 6730,
- 6733, 6735, 6738, 6743, 6749, 6754, 6761, 6764, 6768, 6772,
- 6776, 6782, 6784, 6788, 6792, 6795, 6798, 6801, 6803, 6805,
- 6810, 6815, 6817, 6819, 6821, 6823, 6825, 6826, 6831, 6833,
- 6835, 6837, 6839, 6841, 6845, 6849, 6851, 6853, 6856, 6859,
- 6862, 6863, 6867, 6872, 6876, 6877, 6885, 6887, 6890, 6892,
- 6894, 6896, 6898, 6900, 6902, 6903, 6909, 6911, 6913, 6915,
- 6917, 6919, 6923, 6930, 6937, 6944, 6952, 6958, 6962, 6971,
- 6980, 6989, 6996, 6997, 6999, 7001, 7004, 7005, 7007, 7009,
- 7013, 7014, 7018, 7019, 7023, 7024, 7028, 7029, 7033, 7035,
- 7037, 7039, 7041, 7043, 7045, 7047, 7049, 7051, 7053, 7055,
- 7058, 7061, 7063, 7067, 7070, 7073, 7076, 7079, 7082, 7085,
- 7088, 7091, 7093, 7095, 7098, 7099, 7101, 7105, 7107, 7110,
- 7113, 7116, 7118, 7122, 7126, 7128, 7130, 7134, 7136, 7140,
- 7142, 7144, 7146, 7148, 7153, 7159, 7164, 7171, 7173, 7174,
- 7178, 7182, 7184, 7186, 7187, 7190, 7193, 7196, 7199, 7200,
- 7203, 7204, 7208, 7211, 7213, 7216, 7219, 7222, 7225, 7228,
- 7229, 7233, 7234, 7236, 7237, 7241, 7244, 7245, 7247, 7250,
- 7251, 7253, 7258, 7263, 7269, 7272, 7276, 7277, 7279, 7280,
- 7285, 7286, 7288, 7290, 7291, 7293, 7294, 7297, 7300, 7302,
- 7303, 7305, 7307, 7310, 7314, 7317, 7318, 7325, 7329, 7330,
- 7331, 7332, 7334, 7337, 7339, 7341, 7343, 7345, 7347, 7349,
- 7351, 7353, 7355, 7358, 7361, 7365, 7367, 7369, 7371, 7373,
- 7375, 7377, 7379, 7381, 7383, 7385, 7387, 7389, 7391, 7392,
- 7396, 7398, 7401, 7403, 7406, 7410, 7414, 7418, 7419, 7423,
- 7427, 7428, 7436, 7437, 7441, 7443, 7447, 7448, 7452, 7455,
- 7460, 7461, 7465, 7470, 7475, 7476, 7477, 7478, 7495, 7504,
- 7512, 7513, 7514, 7515, 7516, 7517, 7533, 7534, 7535, 7536,
- 7537, 7550, 7555, 7560, 7564, 7569, 7573, 7576, 7578, 7582,
- 7588, 7590, 7592, 7593, 7595, 7597, 7598, 7601, 7602, 7603,
- 7607, 7608, 7611, 7617, 7621, 7625, 7629
+ 2844, 2845, 2850, 2851, 2856, 2857, 2859, 2861, 2864, 2866,
+ 2868, 2870, 2871, 2874, 2875, 2881, 2884, 2888, 2889, 2894,
+ 2895, 2899, 2900, 2902, 2904, 2907, 2909, 2911, 2913, 2915,
+ 2917, 2920, 2921, 2924, 2925, 2931, 2932, 2934, 2936, 2937,
+ 2942, 2947, 2951, 2957, 2959, 2963, 2967, 2968, 2975, 2977,
+ 2979, 2981, 2985, 2988, 2992, 2994, 2996, 2997, 3004, 3006,
+ 3008, 3010, 3014, 3018, 3023, 3024, 3031, 3032, 3035, 3036,
+ 3041, 3042, 3045, 3047, 3050, 3055, 3058, 3062, 3065, 3069,
+ 3070, 3074, 3075, 3076, 3083, 3086, 3088, 3090, 3093, 3096,
+ 3105, 3110, 3111, 3113, 3116, 3118, 3120, 3122, 3124, 3125,
+ 3128, 3133, 3137, 3139, 3141, 3145, 3150, 3151, 3152, 3153,
+ 3156, 3159, 3161, 3163, 3164, 3167, 3171, 3172, 3175, 3179,
+ 3183, 3187, 3190, 3194, 3199, 3203, 3208, 3212, 3217, 3219,
+ 3223, 3228, 3232, 3236, 3243, 3245, 3251, 3258, 3264, 3272,
+ 3279, 3288, 3294, 3301, 3306, 3311, 3317, 3321, 3326, 3328,
+ 3332, 3336, 3340, 3344, 3348, 3352, 3358, 3364, 3368, 3372,
+ 3376, 3380, 3384, 3388, 3390, 3392, 3394, 3396, 3398, 3400,
+ 3402, 3404, 3406, 3408, 3410, 3412, 3414, 3416, 3418, 3420,
+ 3422, 3423, 3426, 3428, 3431, 3433, 3435, 3437, 3440, 3443,
+ 3445, 3447, 3450, 3453, 3458, 3460, 3464, 3466, 3468, 3470,
+ 3472, 3474, 3478, 3480, 3482, 3484, 3486, 3490, 3493, 3496,
+ 3499, 3502, 3506, 3510, 3516, 3523, 3528, 3533, 3541, 3544,
+ 3551, 3557, 3564, 3571, 3576, 3581, 3587, 3592, 3599, 3602,
+ 3607, 3612, 3617, 3628, 3635, 3644, 3651, 3656, 3661, 3668,
+ 3673, 3678, 3683, 3690, 3695, 3703, 3711, 3719, 3726, 3733,
+ 3740, 3747, 3751, 3756, 3763, 3772, 3775, 3778, 3787, 3796,
+ 3803, 3810, 3813, 3820, 3827, 3836, 3845, 3852, 3861, 3868,
+ 3871, 3880, 3889, 3892, 3895, 3898, 3905, 3912, 3919, 3924,
+ 3929, 3938, 3943, 3948, 3953, 3958, 3962, 3971, 3976, 3981,
+ 3988, 3993, 3998, 4003, 4010, 4019, 4026, 4031, 4038, 4040,
+ 4047, 4052, 4057, 4062, 4067, 4072, 4079, 4084, 4085, 4091,
+ 4098, 4101, 4105, 4106, 4111, 4112, 4116, 4117, 4119, 4121,
+ 4125, 4130, 4135, 4141, 4146, 4151, 4156, 4162, 4167, 4168,
+ 4169, 4177, 4182, 4188, 4193, 4199, 4204, 4209, 4214, 4219,
+ 4224, 4230, 4231, 4240, 4241, 4245, 4249, 4251, 4256, 4257,
+ 4259, 4260, 4263, 4264, 4265, 4270, 4275, 4278, 4279, 4283,
+ 4286, 4290, 4293, 4295, 4297, 4300, 4302, 4305, 4307, 4310,
+ 4313, 4316, 4317, 4321, 4322, 4324, 4326, 4330, 4332, 4336,
+ 4338, 4342, 4343, 4345, 4346, 4349, 4354, 4360, 4362, 4364,
+ 4366, 4368, 4373, 4375, 4379, 4383, 4387, 4388, 4395, 4396,
+ 4403, 4404, 4413, 4418, 4419, 4428, 4429, 4440, 4447, 4448,
+ 4457, 4458, 4469, 4476, 4478, 4481, 4484, 4485, 4490, 4494,
+ 4500, 4503, 4504, 4505, 4513, 4515, 4516, 4517, 4524, 4525,
+ 4529, 4530, 4531, 4537, 4538, 4540, 4541, 4543, 4544, 4547,
+ 4551, 4555, 4557, 4559, 4560, 4568, 4569, 4577, 4579, 4582,
+ 4583, 4584, 4587, 4588, 4591, 4592, 4594, 4596, 4598, 4600,
+ 4604, 4606, 4610, 4612, 4614, 4616, 4618, 4620, 4622, 4624,
+ 4626, 4628, 4630, 4632, 4634, 4636, 4638, 4640, 4642, 4644,
+ 4646, 4648, 4650, 4652, 4654, 4656, 4658, 4660, 4661, 4663,
+ 4665, 4666, 4669, 4670, 4672, 4673, 4674, 4678, 4679, 4680,
+ 4684, 4687, 4688, 4689, 4694, 4699, 4702, 4703, 4705, 4707,
+ 4711, 4715, 4717, 4720, 4721, 4723, 4724, 4729, 4734, 4737,
+ 4738, 4740, 4742, 4743, 4745, 4746, 4748, 4751, 4757, 4762,
+ 4764, 4768, 4772, 4774, 4776, 4778, 4780, 4782, 4784, 4785,
+ 4788, 4792, 4797, 4799, 4802, 4805, 4807, 4809, 4811, 4813,
+ 4815, 4817, 4819, 4821, 4823, 4825, 4827, 4829, 4831, 4833,
+ 4835, 4837, 4839, 4841, 4843, 4845, 4847, 4849, 4851, 4853,
+ 4855, 4857, 4858, 4859, 4866, 4867, 4869, 4873, 4875, 4879,
+ 4880, 4883, 4887, 4889, 4892, 4894, 4895, 4899, 4900, 4901,
+ 4909, 4912, 4914, 4915, 4919, 4920, 4928, 4929, 4936, 4941,
+ 4948, 4953, 4958, 4963, 4964, 4971, 4976, 4981, 4987, 4994,
+ 4999, 5001, 5005, 5007, 5009, 5013, 5015, 5016, 5019, 5020,
+ 5022, 5023, 5024, 5033, 5034, 5035, 5042, 5043, 5045, 5047,
+ 5049, 5051, 5053, 5056, 5058, 5060, 5062, 5066, 5071, 5072,
+ 5076, 5080, 5082, 5085, 5088, 5089, 5093, 5094, 5100, 5104,
+ 5106, 5110, 5112, 5116, 5118, 5120, 5121, 5123, 5124, 5129,
+ 5130, 5132, 5136, 5138, 5140, 5142, 5143, 5144, 5151, 5152,
+ 5153, 5165, 5169, 5171, 5175, 5179, 5181, 5185, 5186, 5188,
+ 5189, 5194, 5195, 5202, 5203, 5209, 5210, 5217, 5219, 5223,
+ 5226, 5231, 5232, 5235, 5236, 5239, 5241, 5243, 5245, 5246,
+ 5251, 5252, 5254, 5255, 5257, 5259, 5263, 5265, 5267, 5270,
+ 5273, 5276, 5278, 5280, 5282, 5284, 5285, 5289, 5290, 5294,
+ 5297, 5302, 5307, 5311, 5316, 5321, 5323, 5327, 5331, 5338,
+ 5341, 5344, 5345, 5352, 5353, 5360, 5366, 5369, 5371, 5373,
+ 5375, 5381, 5387, 5390, 5393, 5395, 5400, 5404, 5407, 5411,
+ 5414, 5417, 5419, 5423, 5428, 5432, 5436, 5439, 5442, 5444,
+ 5446, 5448, 5450, 5454, 5458, 5462, 5466, 5470, 5474, 5478,
+ 5482, 5484, 5486, 5488, 5490, 5492, 5493, 5495, 5496, 5499,
+ 5500, 5502, 5504, 5506, 5507, 5510, 5511, 5514, 5515, 5518,
+ 5521, 5522, 5527, 5528, 5533, 5535, 5537, 5538, 5540, 5542,
+ 5543, 5545, 5547, 5548, 5553, 5554, 5555, 5561, 5563, 5564,
+ 5569, 5573, 5575, 5578, 5581, 5584, 5587, 5590, 5593, 5596,
+ 5598, 5600, 5602, 5604, 5606, 5608, 5610, 5612, 5614, 5616,
+ 5618, 5620, 5621, 5623, 5624, 5628, 5629, 5633, 5637, 5639,
+ 5640, 5644, 5646, 5649, 5650, 5652, 5653, 5657, 5661, 5664,
+ 5667, 5668, 5674, 5675, 5677, 5679, 5680, 5682, 5684, 5686,
+ 5689, 5692, 5693, 5694, 5695, 5696, 5718, 5720, 5722, 5723,
+ 5725, 5726, 5728, 5730, 5731, 5733, 5735, 5736, 5739, 5742,
+ 5744, 5748, 5753, 5757, 5761, 5762, 5765, 5768, 5770, 5774,
+ 5778, 5779, 5784, 5785, 5789, 5791, 5793, 5794, 5798, 5801,
+ 5805, 5807, 5809, 5812, 5813, 5816, 5820, 5822, 5828, 5830,
+ 5832, 5835, 5838, 5840, 5842, 5844, 5846, 5848, 5850, 5853,
+ 5856, 5858, 5860, 5862, 5864, 5866, 5868, 5870, 5872, 5875,
+ 5878, 5881, 5884, 5887, 5889, 5891, 5893, 5895, 5897, 5899,
+ 5901, 5905, 5911, 5913, 5915, 5917, 5919, 5921, 5925, 5930,
+ 5936, 5938, 5944, 5948, 5951, 5953, 5957, 5960, 5963, 5968,
+ 5970, 5972, 5974, 5976, 5978, 5980, 5982, 5984, 5986, 5988,
+ 5990, 5992, 5994, 5996, 6000, 6003, 6005, 6007, 6009, 6011,
+ 6013, 6015, 6017, 6019, 6021, 6023, 6025, 6027, 6029, 6031,
+ 6033, 6035, 6037, 6039, 6041, 6043, 6045, 6047, 6049, 6051,
+ 6053, 6055, 6057, 6059, 6061, 6063, 6065, 6067, 6069, 6071,
+ 6073, 6075, 6077, 6079, 6081, 6083, 6085, 6087, 6089, 6091,
+ 6093, 6095, 6097, 6099, 6101, 6103, 6105, 6107, 6109, 6111,
+ 6113, 6115, 6117, 6119, 6121, 6123, 6125, 6127, 6129, 6131,
+ 6133, 6135, 6137, 6139, 6141, 6143, 6145, 6147, 6149, 6151,
+ 6153, 6155, 6157, 6159, 6161, 6163, 6165, 6167, 6169, 6171,
+ 6173, 6175, 6177, 6179, 6181, 6183, 6185, 6187, 6189, 6191,
+ 6193, 6195, 6197, 6199, 6201, 6203, 6205, 6207, 6209, 6211,
+ 6213, 6215, 6217, 6219, 6221, 6223, 6225, 6227, 6229, 6231,
+ 6233, 6235, 6237, 6239, 6241, 6243, 6245, 6247, 6249, 6251,
+ 6253, 6255, 6257, 6259, 6261, 6263, 6265, 6267, 6269, 6271,
+ 6273, 6275, 6277, 6279, 6281, 6283, 6285, 6287, 6289, 6291,
+ 6293, 6295, 6297, 6299, 6301, 6303, 6305, 6307, 6309, 6311,
+ 6313, 6315, 6317, 6319, 6321, 6323, 6325, 6327, 6329, 6331,
+ 6333, 6335, 6337, 6339, 6341, 6343, 6345, 6347, 6349, 6351,
+ 6353, 6355, 6357, 6359, 6361, 6363, 6365, 6367, 6369, 6371,
+ 6373, 6375, 6377, 6379, 6381, 6383, 6385, 6387, 6389, 6391,
+ 6393, 6395, 6397, 6399, 6401, 6403, 6405, 6407, 6409, 6411,
+ 6413, 6415, 6417, 6419, 6421, 6423, 6425, 6427, 6429, 6431,
+ 6433, 6435, 6437, 6439, 6441, 6443, 6445, 6447, 6449, 6451,
+ 6453, 6455, 6457, 6459, 6461, 6463, 6465, 6467, 6469, 6471,
+ 6473, 6475, 6477, 6479, 6481, 6483, 6485, 6487, 6489, 6491,
+ 6493, 6495, 6497, 6499, 6501, 6503, 6505, 6507, 6509, 6511,
+ 6513, 6515, 6517, 6519, 6521, 6523, 6525, 6527, 6529, 6531,
+ 6533, 6535, 6537, 6539, 6541, 6543, 6545, 6547, 6549, 6551,
+ 6553, 6555, 6557, 6559, 6561, 6563, 6565, 6567, 6569, 6571,
+ 6573, 6575, 6577, 6579, 6581, 6583, 6585, 6587, 6589, 6591,
+ 6593, 6595, 6597, 6599, 6601, 6603, 6605, 6607, 6609, 6611,
+ 6613, 6615, 6617, 6619, 6621, 6623, 6625, 6627, 6629, 6631,
+ 6633, 6635, 6637, 6639, 6641, 6643, 6645, 6647, 6649, 6651,
+ 6653, 6655, 6657, 6659, 6661, 6663, 6665, 6667, 6669, 6671,
+ 6673, 6675, 6677, 6679, 6681, 6683, 6685, 6687, 6689, 6691,
+ 6693, 6695, 6697, 6699, 6701, 6703, 6705, 6707, 6708, 6713,
+ 6714, 6716, 6718, 6722, 6723, 6726, 6728, 6730, 6732, 6734,
+ 6735, 6737, 6738, 6740, 6742, 6744, 6745, 6748, 6751, 6754,
+ 6756, 6759, 6764, 6770, 6775, 6782, 6785, 6789, 6793, 6797,
+ 6803, 6805, 6809, 6813, 6816, 6819, 6822, 6824, 6826, 6831,
+ 6836, 6838, 6840, 6842, 6844, 6846, 6847, 6852, 6854, 6856,
+ 6858, 6862, 6866, 6868, 6870, 6873, 6876, 6879, 6880, 6884,
+ 6889, 6893, 6894, 6902, 6904, 6907, 6909, 6911, 6913, 6915,
+ 6917, 6919, 6920, 6926, 6928, 6930, 6932, 6934, 6936, 6940,
+ 6947, 6954, 6961, 6969, 6975, 6979, 6988, 6997, 7006, 7013,
+ 7014, 7016, 7018, 7021, 7022, 7024, 7026, 7030, 7031, 7035,
+ 7036, 7040, 7041, 7045, 7046, 7050, 7052, 7054, 7056, 7058,
+ 7060, 7062, 7064, 7066, 7068, 7070, 7072, 7075, 7078, 7080,
+ 7084, 7087, 7090, 7093, 7096, 7099, 7102, 7105, 7108, 7110,
+ 7112, 7115, 7116, 7118, 7122, 7124, 7127, 7130, 7133, 7135,
+ 7139, 7143, 7145, 7147, 7151, 7153, 7157, 7159, 7161, 7163,
+ 7165, 7170, 7176, 7181, 7188, 7190, 7191, 7195, 7199, 7201,
+ 7203, 7204, 7207, 7210, 7213, 7216, 7217, 7220, 7221, 7225,
+ 7228, 7230, 7233, 7236, 7239, 7242, 7245, 7246, 7250, 7251,
+ 7253, 7254, 7258, 7261, 7262, 7264, 7267, 7268, 7270, 7275,
+ 7280, 7286, 7289, 7293, 7294, 7296, 7297, 7302, 7303, 7305,
+ 7307, 7308, 7310, 7311, 7314, 7317, 7319, 7320, 7322, 7324,
+ 7327, 7331, 7334, 7335, 7342, 7346, 7347, 7348, 7349, 7351,
+ 7354, 7356, 7358, 7360, 7362, 7364, 7366, 7368, 7370, 7372,
+ 7375, 7378, 7382, 7384, 7386, 7388, 7390, 7392, 7394, 7396,
+ 7398, 7400, 7402, 7404, 7406, 7408, 7409, 7413, 7415, 7418,
+ 7420, 7423, 7427, 7431, 7435, 7436, 7440, 7444, 7445, 7453,
+ 7454, 7458, 7460, 7464, 7465, 7469, 7472, 7477, 7478, 7482,
+ 7487, 7492, 7493, 7494, 7495, 7512, 7521, 7529, 7530, 7531,
+ 7532, 7533, 7534, 7550, 7551, 7552, 7553, 7554, 7567, 7572,
+ 7577, 7581, 7586, 7590, 7593, 7595, 7599, 7605, 7607, 7609,
+ 7610, 7612, 7614, 7615, 7618, 7619, 7620, 7624, 7625, 7628,
+ 7634, 7638, 7642, 7646
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
static const yytype_int16 yyrhs[] =
{
640, 0, -1, 157, -1, -1, 643, 641, 635, 642,
- -1, 643, 157, -1, -1, 157, -1, 644, -1, 1491,
- -1, 1002, -1, 1064, -1, 1066, -1, 693, -1, 656,
- -1, 1067, -1, 1056, -1, 1497, -1, 663, -1, 645,
- -1, 1314, -1, 1346, -1, 1266, -1, 1268, -1, 649,
- -1, 1352, -1, 1463, -1, 1454, -1, 654, -1, 1278,
- -1, 1561, -1, 1563, -1, 1080, -1, 1372, -1, 1378,
- -1, 1445, -1, 1072, -1, 928, -1, 837, -1, 1087,
- -1, 647, -1, 1368, -1, 1500, -1, 1075, -1, 1059,
- -1, 1281, -1, 1362, -1, 728, -1, 1461, -1, 1498,
- -1, 1499, -1, 1099, -1, 1428, -1, 721, -1, 1332,
- -1, 1045, -1, 1048, -1, 1325, -1, 1562, -1, 1452,
- -1, 1306, -1, 1377, -1, 1553, -1, 646, 400, 1422,
- -1, 124, -1, 145, -1, 400, 1422, 192, 648, -1,
- 1419, -1, 636, 1424, -1, -1, 171, 1422, 650, 651,
+ -1, 643, 157, -1, -1, 157, -1, 644, -1, 1496,
+ -1, 1002, -1, 1067, -1, 1069, -1, 693, -1, 656,
+ -1, 1072, -1, 1056, -1, 1502, -1, 663, -1, 645,
+ -1, 1320, -1, 1352, -1, 1272, -1, 1274, -1, 649,
+ -1, 1358, -1, 1468, -1, 1459, -1, 654, -1, 1284,
+ -1, 1566, -1, 1568, -1, 1086, -1, 1378, -1, 1384,
+ -1, 1451, -1, 1078, -1, 928, -1, 837, -1, 1093,
+ -1, 647, -1, 1374, -1, 1505, -1, 1081, -1, 1061,
+ -1, 1287, -1, 1368, -1, 728, -1, 1466, -1, 1503,
+ -1, 1504, -1, 1105, -1, 1434, -1, 721, -1, 1338,
+ -1, 1045, -1, 1048, -1, 1331, -1, 1567, -1, 1457,
+ -1, 1312, -1, 1383, -1, 1558, -1, 646, 400, 1428,
+ -1, 124, -1, 145, -1, 400, 1428, 192, 648, -1,
+ 1425, -1, 636, 1430, -1, -1, 171, 1428, 650, 651,
-1, -1, 585, 652, -1, 652, 631, 653, -1, 653,
- -1, 636, 1424, -1, -1, 212, 655, 1424, -1, -1,
+ -1, 636, 1430, -1, -1, 212, 655, 1430, -1, -1,
57, 301, 551, 657, 658, -1, 659, -1, 658, 631,
- 659, -1, 288, 161, 1419, -1, 302, 161, 1419, -1,
- 291, 161, 1419, -1, 292, 161, 1245, -1, 287, 161,
- 1245, -1, 299, 161, 1245, -1, 295, 161, 1419, -1,
- 294, 161, 1419, -1, 296, 161, 1419, -1, 297, 161,
- 1419, -1, 298, 161, 1419, -1, 300, 161, 1245, -1,
- 303, 161, 1407, -1, 227, 161, 629, 660, 630, -1,
- 662, -1, -1, 661, -1, 660, 631, 661, -1, 1245,
- -1, 289, 161, 1419, -1, 290, 161, 1247, -1, 430,
- 161, 1419, -1, 431, 161, 1245, -1, -1, 103, 889,
- 534, 892, 1415, 664, 825, -1, -1, 103, 980, 230,
- 1422, 984, 363, 1415, 665, 629, 997, 630, 985, -1,
- -1, 103, 981, 230, 1422, 983, 363, 1415, 666, 629,
- 997, 630, 986, -1, -1, 103, 982, 230, 1422, 983,
- 363, 1415, 667, 629, 997, 630, 987, -1, -1, 103,
- 111, 892, 1422, 668, 886, -1, -1, 103, 669, 1519,
- -1, 103, 581, 686, 1479, -1, 103, 278, 205, 788,
- -1, 103, 531, 785, -1, 103, 670, -1, 473, 1424,
- 189, 114, 610, 1424, 369, 629, 671, 630, -1, 672,
- -1, 671, 631, 672, -1, 581, 1419, -1, 216, 1419,
- -1, 111, 1419, -1, 379, 1419, -1, 390, 1419, -1,
- 489, 1419, -1, 397, 1245, -1, -1, 1116, 168, 892,
+ 659, -1, 288, 161, 1425, -1, 302, 161, 1425, -1,
+ 291, 161, 1425, -1, 292, 161, 1251, -1, 287, 161,
+ 1251, -1, 299, 161, 1251, -1, 295, 161, 1425, -1,
+ 294, 161, 1425, -1, 296, 161, 1425, -1, 297, 161,
+ 1425, -1, 298, 161, 1425, -1, 300, 161, 1251, -1,
+ 303, 161, 1413, -1, 227, 161, 629, 660, 630, -1,
+ 662, -1, -1, 661, -1, 660, 631, 661, -1, 1251,
+ -1, 289, 161, 1425, -1, 290, 161, 1253, -1, 430,
+ 161, 1425, -1, 431, 161, 1251, -1, -1, 103, 889,
+ 534, 892, 1421, 664, 825, -1, -1, 103, 980, 230,
+ 1428, 984, 363, 1421, 665, 629, 997, 630, 985, -1,
+ -1, 103, 981, 230, 1428, 983, 363, 1421, 666, 629,
+ 997, 630, 986, -1, -1, 103, 982, 230, 1428, 983,
+ 363, 1421, 667, 629, 997, 630, 987, -1, -1, 103,
+ 111, 892, 1428, 668, 886, -1, -1, 103, 669, 1524,
+ -1, 103, 581, 686, 1484, -1, 103, 278, 205, 788,
+ -1, 103, 531, 785, -1, 103, 670, -1, 473, 1430,
+ 189, 114, 610, 1430, 369, 629, 671, 630, -1, 672,
+ -1, 671, 631, 672, -1, 581, 1425, -1, 216, 1425,
+ -1, 111, 1425, -1, 379, 1425, -1, 390, 1425, -1,
+ 489, 1425, -1, 397, 1251, -1, -1, 1122, 168, 892,
687, 674, 363, 462, 675, 680, 677, 682, 144, 683,
- -1, -1, 169, 1121, 1215, 676, 678, 679, -1, 23,
- 1121, -1, -1, 153, -1, 138, 363, 485, -1, 138,
- -1, -1, 509, 1121, -1, -1, 156, 1121, -1, -1,
+ -1, -1, 169, 1127, 1221, 676, 678, 679, -1, 23,
+ 1127, -1, -1, 153, -1, 138, 363, 485, -1, 138,
+ -1, -1, 509, 1127, -1, -1, 156, 1127, -1, -1,
681, -1, 363, 86, 401, -1, 363, 86, 352, 401,
- -1, -1, 82, 1419, -1, -1, 684, 685, -1, 734,
+ -1, -1, 82, 1425, -1, -1, 684, 685, -1, 734,
-1, 736, -1, 732, -1, 753, -1, 771, -1, 773,
-1, 768, -1, 738, -1, 740, -1, 741, -1, 742,
- -1, 743, -1, 745, -1, -1, 1422, 637, 1422, -1,
- 1422, -1, -1, 688, 690, -1, -1, 689, 691, -1,
- 82, 1419, -1, 256, 505, -1, 354, 505, -1, 96,
+ -1, 743, -1, 745, -1, -1, 1428, 637, 1428, -1,
+ 1428, -1, -1, 688, 690, -1, -1, 689, 691, -1,
+ 82, 1425, -1, 256, 505, -1, 354, 505, -1, 96,
505, -1, 416, 505, 114, -1, 328, 505, 114, -1,
- 692, -1, 690, -1, 136, -1, 1127, 136, -1, 505,
+ 692, -1, 690, -1, 136, -1, 1133, 136, -1, 505,
466, 129, -1, 505, 466, 243, -1, -1, 50, 687,
694, 695, -1, -1, 629, 696, 630, -1, -1, 697,
- -1, 697, 631, 1121, -1, 1121, -1, -1, 699, -1,
- 699, 631, 701, -1, 701, -1, -1, 1422, 700, 951,
+ -1, 697, 631, 1127, -1, 1127, -1, -1, 699, -1,
+ 699, 631, 701, -1, 701, -1, -1, 1428, 700, 951,
-1, -1, 703, -1, 703, 631, 704, -1, 704, -1,
- 705, 700, 1422, 951, -1, -1, 244, -1, 378, -1,
+ 705, 700, 1428, 951, -1, -1, 244, -1, 378, -1,
235, -1, -1, 706, 731, 635, -1, 731, 635, -1,
707, 731, 635, -1, -1, 708, 709, 635, -1, -1,
- 127, 729, 710, 951, 730, -1, 127, 1422, 89, 190,
+ 127, 729, 710, 951, 730, -1, 127, 1428, 89, 190,
717, -1, -1, 127, 714, 208, 190, 711, 715, 731,
- -1, 127, 1422, 108, 190, 712, -1, -1, 713, 1099,
+ -1, 127, 1428, 108, 190, 712, -1, -1, 713, 1105,
-1, 173, -1, 98, -1, 716, -1, 715, 631, 716,
- -1, 720, -1, 1245, -1, 718, -1, 497, 719, 1420,
- -1, -1, 590, -1, 717, -1, 1422, -1, 498, -1,
- 1127, 191, -1, 496, -1, 482, 722, 724, -1, 1422,
+ -1, 720, -1, 1251, -1, 718, -1, 497, 719, 1426,
+ -1, -1, 590, -1, 717, -1, 1428, -1, 498, -1,
+ 1133, 191, -1, 496, -1, 482, 722, 724, -1, 1428,
-1, 718, -1, -1, 722, -1, -1, 475, 725, -1,
727, 161, 726, -1, 725, 631, 727, 161, 726, -1,
- 1406, -1, 1152, -1, 1411, -1, 65, -1, 518, -1,
+ 1412, -1, 1158, -1, 1417, -1, 65, -1, 518, -1,
93, -1, 95, -1, 94, -1, 55, -1, 463, -1,
536, -1, 81, -1, 109, -1, 319, -1, 337, -1,
- 445, 723, 724, -1, 1422, -1, 729, 631, 1422, -1,
- -1, 128, 1121, -1, 734, -1, 736, -1, 732, -1,
+ 445, 723, 724, -1, 1428, -1, 729, 631, 1428, -1,
+ -1, 128, 1127, -1, 734, -1, 736, -1, 732, -1,
753, -1, 771, -1, 773, -1, 768, -1, 738, -1,
740, -1, 741, -1, 742, -1, 743, -1, 745, -1,
-1, 225, 733, 748, 155, 225, -1, -1, 735, 644,
- -1, -1, 451, 737, 1121, -1, -1, 739, 777, -1,
- 262, 1423, -1, 250, 1423, -1, 367, 1422, -1, -1,
- 181, 746, 1422, 241, 744, 747, -1, 68, 1422, -1,
- -1, 348, 192, -1, 192, -1, 1422, -1, 747, 631,
- 1422, -1, -1, -1, -1, 749, 1121, 543, 750, 707,
+ -1, -1, 451, 737, 1127, -1, -1, 739, 777, -1,
+ 262, 1429, -1, 250, 1429, -1, 367, 1428, -1, -1,
+ 181, 746, 1428, 241, 744, 747, -1, 68, 1428, -1,
+ -1, 348, 192, -1, 192, -1, 1428, -1, 747, 631,
+ 1428, -1, -1, -1, -1, 749, 1127, 543, 750, 707,
751, 752, -1, -1, 152, 748, -1, 151, 707, -1,
- 754, -1, 757, -1, -1, -1, 53, 755, 1121, 756,
+ 754, -1, 757, -1, -1, -1, 53, 755, 1127, 756,
759, 767, 155, 53, -1, -1, 53, 758, 760, 767,
155, 53, -1, 761, -1, 759, 761, -1, 764, -1,
- 760, 764, -1, -1, -1, 603, 762, 1121, 763, 543,
- 707, -1, -1, -1, 603, 765, 1121, 766, 543, 707,
- -1, -1, 151, 707, -1, -1, 1423, 638, 769, 777,
- 770, -1, -1, 1423, -1, -1, 1423, 638, 772, 775,
+ 760, 764, -1, -1, -1, 603, 762, 1127, 763, 543,
+ 707, -1, -1, -1, 603, 765, 1127, 766, 543, 707,
+ -1, -1, 151, 707, -1, -1, 1429, 638, 769, 777,
+ 770, -1, -1, 1429, -1, -1, 1429, 638, 772, 775,
770, -1, -1, 774, 775, -1, -1, 31, 776, 708,
706, 155, -1, 284, 707, 155, 284, -1, -1, -1,
- 605, 778, 1121, 144, 779, 707, 155, 605, -1, -1,
- 440, 707, 577, 780, 1121, 155, 440, -1, 30, -1,
+ 605, 778, 1127, 144, 779, 707, 155, 605, -1, -1,
+ 440, 707, 577, 780, 1127, 155, 440, -1, 30, -1,
8, -1, 237, -1, 578, -1, 132, -1, 810, 812,
-1, 810, 57, 807, 791, -1, 810, 6, 807, 786,
- 795, -1, -1, 584, 278, 205, 1422, -1, 810, 6,
+ 795, -1, -1, 584, 278, 205, 1428, -1, 810, 6,
807, 798, -1, 810, 145, 807, 798, -1, 811, 790,
801, -1, 811, 790, 804, -1, 6, 808, -1, 6,
809, -1, -1, 792, 793, -1, 794, -1, 793, 794,
@@ -2842,65 +2843,65 @@ static const yytype_int16 yyrhs[] =
813, -1, 817, -1, 818, -1, 819, -1, 821, -1,
823, -1, 820, -1, 805, -1, 806, -1, 805, 806,
-1, 805, 631, 806, -1, 813, -1, 821, -1, 823,
- -1, 113, 1419, -1, 567, 1419, -1, 423, 1419, -1,
- 1422, -1, 1422, -1, 417, -1, 419, -1, 352, 4,
- -1, 233, 1298, 824, -1, 25, 1298, 824, -1, 308,
- 1298, 824, -1, 176, 1298, 824, -1, 568, 1298, 824,
- -1, 424, 1298, 824, -1, 349, 1298, 1246, -1, 82,
- 1298, 1419, -1, 1339, 159, 1298, 900, -1, -1, 823,
- -1, 600, -1, 355, -1, 1248, -1, 1418, -1, 629,
- 826, -1, 893, 832, 829, -1, 267, 1415, -1, 629,
- 267, 1415, 630, -1, -1, 906, 630, 827, 893, 832,
- 829, -1, -1, 832, 882, 630, 828, 1504, -1, -1,
- -1, 1386, 885, 882, 830, 1501, -1, -1, 1386, 885,
- 629, 882, 630, 831, 1504, -1, 833, -1, -1, 834,
+ -1, 113, 1425, -1, 567, 1425, -1, 423, 1425, -1,
+ 1428, -1, 1428, -1, 417, -1, 419, -1, 352, 4,
+ -1, 233, 1304, 824, -1, 25, 1304, 824, -1, 308,
+ 1304, 824, -1, 176, 1304, 824, -1, 568, 1304, 824,
+ -1, 424, 1304, 824, -1, 349, 1304, 1252, -1, 82,
+ 1304, 1425, -1, 1345, 159, 1304, 900, -1, -1, 823,
+ -1, 600, -1, 355, -1, 1254, -1, 1424, -1, 629,
+ 826, -1, 893, 832, 829, -1, 267, 1421, -1, 629,
+ 267, 1421, 630, -1, -1, 906, 630, 827, 893, 832,
+ 829, -1, -1, 832, 882, 630, 828, 1509, -1, -1,
+ -1, 1392, 885, 882, 830, 1506, -1, -1, 1392, 885,
+ 629, 882, 630, 831, 1509, -1, 833, -1, -1, 834,
-1, -1, 389, 836, 835, 839, -1, -1, -1, 389,
838, 839, -1, 47, 840, 850, 851, 858, -1, 842,
254, 843, 629, 844, 630, -1, -1, 842, 210, 841,
848, -1, 415, 848, -1, 415, 847, -1, 272, 848,
-1, 272, 847, -1, -1, 269, -1, -1, 11, 161,
- 1246, -1, -1, 845, -1, 846, -1, 845, 631, 846,
- -1, 1422, -1, 73, 629, 844, 630, -1, 629, 1116,
- 856, 1117, 630, -1, 629, 1116, 856, 1117, 630, -1,
- -1, 388, 1246, -1, -1, -1, 522, 47, 842, 210,
+ 1252, -1, -1, 845, -1, 846, -1, 845, 631, 846,
+ -1, 1428, -1, 73, 629, 844, 630, -1, 629, 1122,
+ 856, 1123, 630, -1, 629, 1122, 856, 1123, 630, -1,
+ -1, 388, 1252, -1, -1, -1, 522, 47, 842, 210,
849, 852, 857, -1, -1, 522, 47, 842, 254, 843,
629, 854, 630, 853, 857, -1, 855, -1, 854, 631,
- 855, -1, 1422, -1, 1124, -1, -1, 521, 1246, -1,
+ 855, -1, 1428, -1, 1130, -1, -1, 521, 1252, -1,
-1, 629, 859, 630, -1, 860, -1, 859, 631, 860,
- -1, -1, 389, 861, 862, 863, 879, 874, -1, 1422,
+ -1, -1, 389, 861, 862, 863, 879, 874, -1, 1428,
-1, -1, -1, 589, 264, 542, 864, 866, -1, -1,
589, 244, 865, 867, -1, 312, -1, 869, -1, 869,
-1, 629, 868, 630, -1, 869, -1, 868, 631, 869,
-1, -1, -1, 629, 870, 872, 871, 630, -1, 873,
- -1, 872, 631, 873, -1, 312, -1, 1124, -1, -1,
+ -1, 872, 631, 873, -1, 312, -1, 1130, -1, -1,
629, 875, 630, -1, 876, -1, 875, 631, 876, -1,
- -1, 522, 877, 878, 879, -1, 1424, -1, -1, 880,
- -1, 880, 881, -1, 881, -1, 531, 1298, 1424, -1,
- 1339, 159, 1298, 900, -1, 90, 1298, 1419, -1, 349,
- 1298, 1246, -1, 307, 1298, 1248, -1, 325, 1298, 1248,
- -1, 114, 137, 1298, 1419, -1, 230, 137, 1298, 1419,
- -1, 82, 1298, 1419, -1, -1, -1, 467, 883, 1110,
- 1114, 884, 904, -1, -1, 19, -1, -1, 887, -1,
+ -1, 522, 877, 878, 879, -1, 1430, -1, -1, 880,
+ -1, 880, 881, -1, 881, -1, 531, 1304, 1430, -1,
+ 1345, 159, 1304, 900, -1, 90, 1304, 1425, -1, 349,
+ 1304, 1252, -1, 307, 1304, 1254, -1, 325, 1304, 1254,
+ -1, 114, 137, 1304, 1425, -1, 230, 137, 1304, 1425,
+ -1, 82, 1304, 1425, -1, -1, -1, 467, 883, 1116,
+ 1120, 884, 904, -1, -1, 19, -1, -1, 887, -1,
888, -1, 887, 888, -1, 899, -1, 898, -1, -1,
890, -1, 891, -1, 891, 890, -1, 537, -1, -1,
- 225, 1127, 172, -1, -1, 895, -1, 896, -1, 896,
+ 225, 1133, 172, -1, -1, 895, -1, 896, -1, 896,
894, -1, 896, -1, 896, 895, -1, 896, 631, 895,
- -1, 159, 1298, 900, -1, 307, 1298, 1247, -1, 325,
- 1298, 1247, -1, 27, 1298, 1245, -1, 390, 1298, 1419,
- -1, 82, 1298, 1419, -1, 26, 1298, 1247, -1, 380,
- 1298, 1245, -1, 380, 1298, 128, -1, 62, 1298, 1245,
- -1, 535, 1298, 1245, -1, 382, 1298, 1251, -1, 131,
- 1298, 1245, -1, 458, 1298, 902, -1, -1, 572, 1298,
- 897, 629, 1360, 630, -1, 898, -1, 899, -1, 238,
- 1298, 903, -1, 114, 137, 1298, 1419, -1, 230, 137,
- 1298, 1419, -1, 531, 1422, -1, 515, 140, -1, 515,
- 317, -1, 90, 1298, 1419, -1, 253, 1298, 1245, -1,
- 554, 1298, 1251, -1, 1418, 1297, 1419, -1, 1418, 1297,
- 1422, -1, 1418, 1297, 1248, -1, 1418, 1297, 128, -1,
- 963, 954, 1298, 956, -1, 963, 71, 1298, 962, -1,
- 1424, -1, 1424, -1, 128, -1, 184, -1, 149, -1,
+ -1, 159, 1304, 900, -1, 307, 1304, 1253, -1, 325,
+ 1304, 1253, -1, 27, 1304, 1251, -1, 390, 1304, 1425,
+ -1, 82, 1304, 1425, -1, 26, 1304, 1253, -1, 380,
+ 1304, 1251, -1, 380, 1304, 128, -1, 62, 1304, 1251,
+ -1, 535, 1304, 1251, -1, 382, 1304, 1257, -1, 131,
+ 1304, 1251, -1, 458, 1304, 902, -1, -1, 572, 1304,
+ 897, 629, 1366, 630, -1, 898, -1, 899, -1, 238,
+ 1304, 903, -1, 114, 137, 1304, 1425, -1, 230, 137,
+ 1304, 1425, -1, 531, 1428, -1, 515, 140, -1, 515,
+ 317, -1, 90, 1304, 1425, -1, 253, 1304, 1251, -1,
+ 554, 1304, 1257, -1, 1424, 1303, 1425, -1, 1424, 1303,
+ 1428, -1, 1424, 1303, 1254, -1, 1424, 1303, 128, -1,
+ 963, 954, 1304, 956, -1, 963, 71, 1304, 962, -1,
+ 1430, -1, 1430, -1, 128, -1, 184, -1, 149, -1,
87, -1, 425, -1, 85, -1, 381, -1, 354, -1,
- 183, -1, 257, -1, 1238, -1, 1109, 1113, -1, 517,
+ 183, -1, 257, -1, 1244, -1, 1115, 1119, -1, 517,
-1, 420, -1, 126, -1, 242, -1, 907, -1, 908,
-1, 907, 631, 908, -1, 909, -1, 910, -1, 919,
915, -1, 919, 969, -1, -1, 975, 999, 984, 629,
@@ -2909,13 +2910,13 @@ static const yytype_int16 yyrhs[] =
983, 629, 997, 630, 913, 987, -1, -1, 917, 976,
999, 984, 629, 997, 630, 914, 985, -1, 917, 189,
254, 999, 629, 997, 630, 969, -1, 917, 916, -1,
- -1, 916, -1, 63, 629, 1121, 630, -1, -1, 918,
- -1, 92, 999, -1, -1, 1414, 920, 921, -1, 930,
+ -1, 916, -1, 63, 629, 1127, 630, -1, -1, 918,
+ -1, 92, 999, -1, -1, 1420, 920, 921, -1, 930,
948, -1, -1, 930, 923, 19, 922, 629, 929, 630,
924, 925, -1, -1, 198, 14, -1, -1, 599, -1,
391, -1, -1, 926, -1, 926, 927, -1, 927, -1,
- 573, -1, 573, 254, -1, 82, 1419, -1, 385, 629,
- 929, 630, -1, 1116, 1121, 1117, -1, 938, 946, 942,
+ 573, -1, 573, 254, -1, 82, 1425, -1, 385, 629,
+ 929, 630, -1, 1122, 1127, 1123, -1, 938, 946, 942,
-1, 939, 947, 942, -1, 186, 940, 942, -1, 39,
-1, 39, 945, -1, 44, -1, 43, -1, 934, 945,
966, -1, 934, 966, -1, 935, 945, 967, -1, 935,
@@ -2940,22 +2941,22 @@ static const yytype_int16 yyrhs[] =
618, -1, 629, 282, 630, -1, 629, 563, 630, -1,
629, 125, 630, -1, 629, 358, 630, -1, -1, 945,
-1, -1, 941, -1, -1, 949, -1, 949, 950, -1,
- 950, -1, 357, -1, 1127, 357, -1, 128, 952, -1,
- 363, 578, 353, 1120, -1, 26, -1, 471, 128, 590,
+ 950, -1, 357, -1, 1133, 357, -1, 128, 952, -1,
+ 363, 578, 353, 1126, -1, 26, -1, 471, 128, 590,
-1, 968, 254, -1, 573, -1, 573, 254, -1, 82,
- 1419, -1, 71, 960, -1, 1418, 1297, 1419, -1, 1418,
- 1297, 1422, -1, 1418, 1297, 1248, -1, 1418, 1297, 128,
- -1, 930, 961, -1, 353, 1120, -1, 1405, -1, 213,
- -1, 214, -1, 60, 475, -1, 59, -1, 1424, -1,
+ 1425, -1, 71, 960, -1, 1424, 1303, 1425, -1, 1424,
+ 1303, 1428, -1, 1424, 1303, 1254, -1, 1424, 1303, 128,
+ -1, 930, 961, -1, 353, 1126, -1, 1411, -1, 213,
+ -1, 214, -1, 60, 475, -1, 59, -1, 1430, -1,
34, -1, 955, -1, 128, -1, -1, 954, 956, -1,
- 1424, -1, 34, -1, 958, -1, 128, -1, 1424, -1,
+ 1430, -1, 34, -1, 958, -1, 128, -1, 1430, -1,
-1, 71, 962, -1, 960, -1, 128, -1, -1, 128,
-1, 21, -1, 34, 21, -1, 21, 34, -1, 570,
-1, 570, 34, -1, 34, 570, -1, -1, 964, -1,
965, -1, 48, -1, 954, 955, 967, -1, 34, -1,
34, 954, 955, -1, -1, 34, -1, -1, 403, -1,
- 426, 1415, 970, 972, 973, -1, -1, 629, 971, 630,
- -1, 971, 631, 1422, -1, 1422, -1, -1, 304, 193,
+ 426, 1421, 970, 972, 973, -1, -1, 629, 971, 630,
+ -1, 971, 631, 1428, -1, 1428, -1, -1, 304, 193,
-1, 304, 386, -1, 304, 484, -1, -1, 363, 578,
974, -1, 363, 132, 974, -1, 363, 578, 974, 363,
132, 974, -1, 363, 132, 974, 363, 578, 974, -1,
@@ -2966,536 +2967,537 @@ static const yytype_int16 yyrhs[] =
-1, -1, 983, -1, 983, 991, -1, -1, 988, -1,
-1, 990, -1, -1, 989, -1, 993, -1, 988, 993,
-1, 994, -1, 989, 994, -1, 995, -1, 990, 995,
- -1, 585, 996, -1, 561, 996, -1, 253, 1298, 1245,
- -1, 82, 1419, -1, 1418, 1297, 1419, -1, 1418, 1297,
- 1422, -1, 1418, 1297, 1248, -1, 1418, 1297, 128, -1,
+ -1, 585, 996, -1, 561, 996, -1, 253, 1304, 1251,
+ -1, 82, 1425, -1, 1424, 1303, 1425, -1, 1424, 1303,
+ 1428, -1, 1424, 1303, 1254, -1, 1424, 1303, 128, -1,
992, -1, 991, -1, 992, -1, 992, -1, 606, 384,
- 1418, -1, 46, -1, 460, -1, 210, -1, 997, 631,
- 998, 1236, -1, 998, 1236, -1, 1422, -1, 1422, 629,
- 358, 630, -1, -1, 1414, -1, -1, 637, 1422, -1,
- 1403, -1, 1001, 631, 1403, -1, -1, 13, 1037, 534,
- 1415, 1003, 1014, -1, -1, 13, 111, 1013, 1004, 887,
- -1, 13, 111, 1422, 579, 114, 137, 339, -1, -1,
+ 1424, -1, 46, -1, 460, -1, 210, -1, 997, 631,
+ 998, 1242, -1, 998, 1242, -1, 1428, -1, 1428, 629,
+ 358, 630, -1, -1, 1420, -1, -1, 637, 1428, -1,
+ 1409, -1, 1001, 631, 1409, -1, -1, 13, 1037, 534,
+ 1421, 1003, 1014, -1, -1, 13, 111, 1013, 1004, 887,
+ -1, 13, 111, 1428, 579, 114, 137, 339, -1, -1,
13, 405, 687, 1005, 688, -1, -1, 13, 195, 687,
- 1006, 688, -1, -1, 13, 1527, 1522, 1007, 1529, -1,
- -1, 13, 1522, 1008, 1529, -1, -1, 13, 1522, 168,
+ 1006, 688, -1, -1, 13, 1532, 1527, 1007, 1534, -1,
+ -1, 13, 1527, 1008, 1534, -1, -1, 13, 1527, 168,
687, 1009, 1010, 1011, 677, 682, 1012, -1, 13, 531,
787, -1, 13, 278, 205, 789, -1, 13, 531, 784,
- -1, 13, 531, 783, -1, 13, 473, 1424, 369, 629,
+ -1, 13, 531, 783, -1, 13, 473, 1430, 369, 629,
671, 630, -1, -1, 363, 462, 675, -1, 681, -1,
363, 462, 675, 681, -1, -1, 436, 551, 687, -1,
- -1, 144, 683, -1, -1, 1422, -1, -1, 139, 531,
+ -1, 144, 683, -1, -1, 1428, -1, -1, 139, 531,
-1, 228, 531, -1, 1029, 833, -1, 1029, 1018, -1,
1018, -1, 834, -1, 1020, -1, 145, 389, 1027, -1,
- 421, 389, 1074, 1019, -1, -1, 368, 389, 1074, 1019,
- 1015, 1074, -1, 15, 389, 1074, 1019, -1, -1, 63,
- 389, 1019, 1016, 1069, -1, -1, 438, 389, 1074, 1019,
- 1017, 1061, -1, 69, 389, 1074, 1246, -1, 559, 389,
+ 421, 389, 1080, 1019, -1, -1, 368, 389, 1080, 1019,
+ 1015, 1080, -1, 15, 389, 1080, 1019, -1, -1, 63,
+ 389, 1019, 1016, 1074, -1, -1, 438, 389, 1080, 1019,
+ 1017, 1063, -1, 69, 389, 1080, 1252, -1, 559, 389,
1019, -1, 1023, -1, 435, 387, -1, 12, -1, 1027,
- -1, -1, 6, 389, 1074, 1021, 1022, -1, -1, 629,
- 859, 630, -1, 388, 1246, -1, -1, 437, 389, 1074,
+ -1, -1, 6, 389, 1080, 1021, 1022, -1, -1, 629,
+ 859, 630, -1, 388, 1252, -1, -1, 437, 389, 1080,
1024, 1025, -1, -1, -1, 1027, 1026, 241, 629, 859,
- 630, -1, 1028, -1, 1027, 631, 1028, -1, 1422, -1,
+ 630, -1, 1028, -1, 1027, 631, 1028, -1, 1428, -1,
1031, -1, 1029, 631, 1031, -1, 6, 1035, -1, 1030,
909, 1043, -1, 6, 910, -1, 1030, 629, 906, 630,
- -1, -1, 57, 1035, 1414, 1032, 919, 1043, -1, -1,
- -1, 329, 1035, 1414, 1033, 921, 1034, 1043, -1, 145,
- 1035, 1414, 1042, -1, 145, 189, 254, 999, -1, 145,
- 403, 254, -1, 145, 977, 1414, -1, 138, 252, -1,
- 153, 252, -1, 13, 1035, 1414, 475, 128, 1405, -1,
- 13, 1035, 1414, 145, 128, -1, 436, 1044, 1415, -1,
+ -1, -1, 57, 1035, 1420, 1032, 919, 1043, -1, -1,
+ -1, 329, 1035, 1420, 1033, 921, 1034, 1043, -1, 145,
+ 1035, 1420, 1042, -1, 145, 189, 254, 999, -1, 145,
+ 403, 254, -1, 145, 977, 1420, -1, 138, 252, -1,
+ 153, 252, -1, 13, 1035, 1420, 475, 128, 1411, -1,
+ 13, 1035, 1420, 145, 128, -1, 436, 1044, 1421, -1,
100, 551, 954, 956, 961, -1, 894, -1, 188, -1,
- 1229, -1, -1, 80, -1, -1, 226, -1, -1, 1038,
+ 1235, -1, -1, 80, -1, -1, 226, -1, -1, 1038,
1039, -1, -1, 1040, -1, 1040, 1041, -1, 1041, -1,
226, -1, 366, -1, -1, 448, -1, 51, -1, -1,
- 8, 1422, -1, 183, -1, -1, 551, -1, 161, -1,
+ 8, 1428, -1, 183, -1, -1, 551, -1, 161, -1,
19, -1, -1, 510, 485, 1050, 1046, 1054, -1, 514,
485, 1050, -1, -1, 485, 510, 1050, 1047, 1054, -1,
485, 514, 1050, -1, 510, 553, 1049, -1, -1, 606,
91, 488, -1, -1, 1051, 1052, -1, 1053, -1, 1052,
631, 1053, -1, -1, 506, -1, 432, -1, -1, 577,
1055, -1, 662, -1, 1055, 631, 662, -1, -1, 62,
- 1447, 1057, 1272, 1058, -1, -1, 414, -1, 175, -1,
- -1, 438, 1074, 1448, 1060, 1272, 1061, -1, -1, 1062,
- -1, 1063, -1, 1063, 1062, -1, 414, -1, 175, -1,
- 583, -1, 192, 336, -1, -1, 15, 1074, 1447, 1065,
- 1272, -1, 35, 1419, -1, -1, 63, 1448, 1068, 1272,
- 1069, -1, -1, 1070, -1, 1071, -1, 1071, 1070, -1,
- 414, -1, 179, -1, 316, -1, 175, -1, 58, -1,
- 190, 579, -1, -1, 368, 1074, 1447, 1073, 1272, -1,
- -1, 356, -1, 274, -1, -1, 436, 1447, 1076, 1078,
- -1, 436, 581, 686, 1077, -1, 1425, 551, 1425, -1,
- 1077, 631, 1425, 551, 1425, -1, 1079, -1, 1078, 631,
- 1079, -1, 1415, 551, 1415, -1, -1, 49, 230, 1081,
- 1082, 244, 1086, -1, 1083, -1, 1085, -1, 1084, -1,
- 1083, 631, 1084, -1, 1415, 1095, -1, 1415, 1093, 1095,
- -1, 1422, -1, 128, -1, -1, 273, 230, 241, 49,
- 1088, 1089, -1, 1092, -1, 1090, -1, 1091, -1, 1090,
- 631, 1091, -1, 1415, 1095, 1098, -1, 1415, 1093, 1095,
- 1098, -1, -1, 389, 836, 1094, 629, 1019, 630, -1,
- -1, 1096, 1097, -1, -1, 977, 629, 1211, 630, -1,
- -1, 226, 261, -1, 1100, -1, 467, 1103, -1, 629,
- 1101, 630, 1504, -1, 467, 1105, -1, 629, 1101, 630,
- -1, 467, 1190, -1, 629, 1102, 630, -1, -1, 1105,
- 1104, 1501, -1, -1, -1, 1106, 1110, 1114, 1107, 1108,
- 1113, -1, 1232, 1238, -1, 1261, -1, 1109, -1, 1261,
- 1109, -1, 1109, 1261, -1, 192, 1172, 1221, 1226, 1223,
- 1232, 1238, 1252, -1, 192, 146, 1221, 1238, -1, -1,
- 1111, -1, 1111, 1112, -1, 1112, -1, 1518, -1, 503,
- -1, 501, -1, -1, 190, 578, -1, 277, 244, 477,
- 327, -1, 1114, 631, 1115, -1, 1115, -1, 624, -1,
- 1116, 1409, 1117, -1, 1116, 1121, 1117, 1118, -1, -1,
- -1, -1, 19, 1422, -1, 19, 1419, -1, 1422, -1,
- 1419, -1, -1, 629, 630, -1, 629, 1246, 630, -1,
- -1, 629, 630, -1, 1121, 1125, 1121, -1, 1121, 615,
- 1121, -1, 1121, 1126, 1121, -1, 352, 1121, -1, 1122,
- 247, 558, -1, 1122, 247, 1127, 558, -1, 1122, 247,
- 178, -1, 1122, 247, 1127, 178, -1, 1122, 247, 574,
- -1, 1122, 247, 1127, 574, -1, 1122, -1, 1122, 247,
- 357, -1, 1122, 247, 1127, 357, -1, 1122, 162, 1123,
- -1, 1122, 1129, 1123, -1, 1122, 1129, 1130, 629, 1513,
- 630, -1, 1123, -1, 1124, 244, 629, 1513, 630, -1,
- 1124, 1127, 244, 629, 1513, 630, -1, 1124, 244, 629,
- 1121, 630, -1, 1124, 244, 629, 1121, 631, 1165, 630,
- -1, 1124, 1127, 244, 629, 1121, 630, -1, 1124, 1127,
- 244, 629, 1121, 631, 1165, 630, -1, 1124, 32, 1124,
- 17, 1123, -1, 1124, 1127, 32, 1124, 17, 1123, -1,
- 1124, 492, 267, 1124, -1, 1124, 267, 1135, 1225, -1,
- 1124, 1127, 267, 1135, 1225, -1, 1124, 427, 1124, -1,
- 1124, 1127, 427, 1124, -1, 1124, -1, 1124, 620, 1124,
- -1, 1124, 621, 1124, -1, 1124, 478, 1124, -1, 1124,
- 479, 1124, -1, 1124, 623, 1124, -1, 1124, 622, 1124,
- -1, 1124, 623, 240, 1121, 1215, -1, 1124, 622, 240,
- 1121, 1215, -1, 1124, 624, 1124, -1, 1124, 625, 1124,
- -1, 1124, 626, 1124, -1, 1124, 142, 1124, -1, 1124,
- 330, 1124, -1, 1124, 627, 1124, -1, 1135, -1, 375,
- -1, 372, -1, 17, -1, 16, -1, 352, -1, 351,
- -1, 632, -1, 351, -1, 161, -1, 196, -1, 207,
- -1, 259, -1, 286, -1, 345, -1, 12, -1, 18,
- -1, -1, 19, 1132, -1, 242, -1, 576, 242, -1,
- 143, -1, 420, -1, 186, -1, 126, 940, -1, 934,
- 966, -1, 935, -1, 118, -1, 547, 946, -1, 115,
- 946, -1, 1121, 631, 1121, 1131, -1, 1133, -1, 1134,
- 631, 1133, -1, 1411, -1, 1136, -1, 1137, -1, 1140,
- -1, 1138, -1, 1135, 71, 1424, -1, 1406, -1, 1404,
- -1, 1152, -1, 1148, -1, 1135, 374, 1135, -1, 623,
- 1135, -1, 622, 1135, -1, 628, 1135, -1, 1128, 1135,
- -1, 629, 1513, 630, -1, 629, 1121, 630, -1, 629,
- 1121, 631, 1165, 630, -1, 459, 629, 1121, 631, 1165,
- 630, -1, 172, 629, 1513, 630, -1, 633, 1422, 1121,
- 634, -1, 304, 1166, 9, 629, 1124, 1142, 630, -1,
- 34, 1135, -1, 54, 629, 1121, 19, 1162, 630, -1,
- 53, 1168, 1170, 1169, 155, -1, 100, 629, 1121, 631,
- 1162, 630, -1, 100, 629, 1121, 585, 955, 630, -1,
- 128, 629, 1411, 630, -1, 589, 629, 1412, 630, -1,
- 240, 1121, 1215, 623, 1121, -1, 60, 629, 1165, 630,
- -1, 60, 629, 1165, 585, 955, 630, -1, 107, 1120,
- -1, 118, 629, 1121, 630, -1, 123, 629, 1121, 630,
- -1, 221, 629, 1121, 630, -1, 237, 629, 1121, 631,
- 1121, 631, 1121, 631, 1121, 630, -1, 240, 629, 1121,
- 631, 1121, 630, -1, 240, 629, 1121, 631, 1121, 631,
- 1165, 630, -1, 263, 629, 1121, 631, 1121, 630, -1,
- 324, 629, 1121, 630, -1, 331, 629, 1121, 630, -1,
- 453, 629, 1121, 631, 1121, 630, -1, 465, 629, 1121,
- 630, -1, 547, 629, 1121, 630, -1, 544, 629, 1121,
- 630, -1, 544, 629, 1121, 631, 1121, 630, -1, 557,
- 629, 1121, 630, -1, 557, 629, 260, 1121, 192, 1121,
- 630, -1, 557, 629, 552, 1121, 192, 1121, 630, -1,
- 557, 629, 45, 1121, 192, 1121, 630, -1, 557, 629,
- 260, 192, 1121, 630, -1, 557, 629, 552, 192, 1121,
- 630, -1, 557, 629, 45, 192, 1121, 630, -1, 557,
- 629, 1121, 192, 1121, 630, -1, 581, 629, 630, -1,
- 617, 629, 1121, 630, -1, 7, 629, 1121, 631, 1121,
- 630, -1, 7, 629, 1121, 631, 240, 1121, 1215, 630,
- -1, 106, 1120, -1, 110, 1119, -1, 116, 629, 1121,
- 631, 240, 1121, 1215, 630, -1, 117, 629, 1121, 631,
- 240, 1121, 1215, 630, -1, 177, 629, 1215, 192, 1121,
- 630, -1, 201, 629, 1217, 631, 1121, 630, -1, 353,
- 1119, -1, 398, 629, 1124, 244, 1121, 630, -1, 519,
- 629, 1121, 631, 1121, 630, -1, 519, 629, 1121, 631,
- 240, 1121, 1215, 630, -1, 523, 629, 1121, 631, 1121,
- 631, 1121, 630, -1, 523, 629, 1121, 631, 1121, 630,
- -1, 523, 629, 1121, 192, 1121, 190, 1121, 630, -1,
- 523, 629, 1121, 192, 1121, 630, -1, 529, 1119, -1,
- 545, 629, 1216, 631, 1121, 631, 1121, 630, -1, 546,
- 629, 1216, 631, 1121, 631, 1121, 630, -1, 586, 1120,
- -1, 588, 1119, -1, 587, 1119, -1, 74, 629, 1121,
- 631, 1134, 630, -1, 76, 629, 1121, 631, 1165, 630,
- -1, 77, 629, 1121, 631, 1121, 630, -1, 79, 629,
- 1121, 630, -1, 75, 629, 1134, 630, -1, 78, 629,
- 1121, 631, 1121, 19, 1162, 630, -1, 21, 629, 1121,
- 630, -1, 59, 629, 1121, 630, -1, 69, 629, 1165,
- 630, -1, 72, 629, 1121, 630, -1, 111, 629, 630,
- -1, 225, 629, 1121, 631, 1121, 631, 1121, 630, -1,
- 258, 629, 1165, 630, -1, 320, 629, 1121, 630, -1,
- 330, 629, 1121, 631, 1121, 630, -1, 362, 629, 1121,
- 630, -1, 390, 629, 1121, 630, -1, 412, 629, 1121,
- 630, -1, 440, 629, 1121, 631, 1121, 630, -1, 441,
- 629, 1121, 631, 1121, 631, 1121, 630, -1, 559, 629,
- 1121, 631, 1121, 630, -1, 602, 629, 1121, 630, -1,
- 602, 629, 1121, 631, 1121, 630, -1, 1139, -1, 96,
- 629, 1121, 631, 1121, 630, -1, 199, 629, 1165, 630,
- -1, 271, 629, 1165, 630, -1, 332, 629, 1165, 630,
- -1, 333, 629, 1165, 630, -1, 334, 629, 1165, 630,
- -1, 395, 629, 1121, 631, 1121, 630, -1, 396, 629,
- 1165, 630, -1, -1, 1418, 629, 1141, 1145, 630, -1,
- 1422, 637, 1422, 629, 1164, 630, -1, 1143, 1144, -1,
- 244, 43, 327, -1, -1, 244, 341, 256, 327, -1,
- -1, 606, 413, 174, -1, -1, 1146, -1, 1147, -1,
- 1146, 631, 1147, -1, 1116, 1121, 1117, 1118, -1, 28,
- 629, 1160, 630, -1, 28, 629, 141, 1160, 630, -1,
- 37, 629, 1160, 630, -1, 38, 629, 1160, 630, -1,
- 40, 629, 1160, 630, -1, 101, 629, 1220, 624, 630,
- -1, 101, 629, 1160, 630, -1, -1, -1, 101, 629,
- 141, 1149, 1165, 1150, 630, -1, 326, 629, 1160, 630,
- -1, 326, 629, 141, 1160, 630, -1, 309, 629, 1160,
- 630, -1, 309, 629, 141, 1160, 630, -1, 513, 629,
- 1160, 630, -1, 594, 629, 1160, 630, -1, 512, 629,
- 1160, 630, -1, 596, 629, 1160, 630, -1, 524, 629,
- 1160, 630, -1, 524, 629, 141, 1160, 630, -1, -1,
- 206, 629, 1155, 1151, 1165, 1157, 1156, 630, -1, -1,
- 636, 1153, 1154, -1, 1424, 476, 1121, -1, 1424, -1,
- 636, 1437, 1424, 1000, -1, -1, 141, -1, -1, 469,
- 1403, -1, -1, -1, 373, 47, 1158, 1159, -1, 1159,
- 631, 1410, 1236, -1, 1410, 1236, -1, -1, 1220, 1161,
- 1121, -1, 34, 946, -1, 60, 946, 966, -1, 343,
- 946, -1, 242, -1, 483, -1, 483, 242, -1, 576,
- -1, 576, 242, -1, 118, -1, 547, 946, -1, 115,
- 946, -1, 126, 940, -1, -1, 143, 1163, 947, -1,
- -1, 1165, -1, 1121, -1, 1165, 631, 1121, -1, 1167,
- -1, 629, 1167, 630, -1, 1411, -1, 1167, 631, 1411,
- -1, -1, 1121, -1, -1, 151, 1121, -1, 603, 1121,
- 543, 1121, -1, 1170, 603, 1121, 543, 1121, -1, 1184,
- -1, 1175, -1, 1174, -1, 1171, -1, 633, 1422, 1171,
- 634, -1, 1173, -1, 1174, 631, 1173, -1, 1171, 1183,
- 1171, -1, 1171, 516, 1184, -1, -1, 1171, 1183, 1171,
- 363, 1176, 1121, -1, -1, 1171, 516, 1184, 363, 1177,
- 1121, -1, -1, 1171, 1183, 1171, 585, 1178, 629, 1214,
- 630, -1, 1171, 341, 251, 1184, -1, -1, 1171, 263,
- 1200, 251, 1171, 363, 1179, 1121, -1, -1, 1171, 263,
- 1200, 251, 1184, 1180, 585, 629, 1214, 630, -1, 1171,
- 341, 263, 1200, 251, 1184, -1, -1, 1171, 453, 1200,
- 251, 1171, 363, 1181, 1121, -1, -1, 1171, 453, 1200,
- 251, 1184, 1182, 585, 629, 1214, 630, -1, 1171, 341,
- 453, 1200, 251, 1184, -1, 251, -1, 234, 251, -1,
- 104, 251, -1, -1, 1185, 1415, 1219, 1209, -1, 1199,
- 1198, 1195, -1, 629, 1198, 1186, 630, 1219, -1, 1193,
- 1505, -1, -1, -1, 1186, 572, 1509, 1187, 1510, 1188,
- 1505, -1, 1190, -1, -1, -1, 1191, 1516, 1114, 1192,
- 904, 1113, -1, -1, 1198, 1194, 1174, -1, -1, -1,
- 1196, 1110, 1114, 1197, 904, -1, -1, 467, -1, -1,
- 376, -1, -1, 190, 251, -1, 190, 373, 47, -1,
- 190, 205, 47, -1, 188, -1, 226, -1, -1, 1202,
- 977, 1201, 1204, 629, 1213, 630, -1, -1, 584, 977,
- 1201, 1205, 629, 1211, 630, -1, 1203, -1, 1206, 1203,
- -1, -1, -1, 1208, 1206, -1, -1, 1210, 1207, -1,
- -1, 1213, -1, 1422, -1, 403, -1, 1212, -1, 1213,
- 631, 1212, -1, 1422, -1, 1214, 631, 1422, -1, 1216,
- -1, 119, -1, 120, -1, 121, -1, 122, -1, 218,
- -1, 219, -1, 220, -1, 322, -1, 323, -1, 464,
- -1, 616, -1, 123, -1, 602, -1, 221, -1, 324,
- -1, 331, -1, 412, -1, 465, -1, 320, -1, 617,
- -1, 118, -1, 547, -1, 115, -1, 544, -1, -1,
- 19, -1, 161, -1, -1, 1218, 1422, -1, -1, 12,
- -1, -1, -1, 604, 1222, 1121, -1, -1, -1, 211,
- 1224, 1121, -1, 166, 1135, -1, -1, -1, 205, 47,
- 1227, 1228, -1, 1227, 631, 1410, 1236, -1, 1410, 1236,
- -1, -1, 607, -1, 608, -1, 373, 47, 1230, -1,
- 1230, 631, 1231, -1, 1231, -1, 1412, 1236, -1, -1,
- 1233, -1, -1, 373, 47, 1234, 1235, -1, 1235, 631,
- 1410, 1236, -1, 1410, 1236, -1, -1, 20, -1, 133,
- -1, -1, 1239, -1, -1, 1239, -1, 268, 1240, -1,
- 268, 1240, 457, 170, 1242, -1, 268, 457, 170, 1242,
- -1, 1241, -1, 1241, 631, 1241, -1, 1241, 361, 1241,
- -1, 1422, -1, 1404, -1, 563, -1, 282, -1, 358,
- -1, 1241, -1, -1, 268, 1241, -1, 268, 457, 170,
- -1, 268, 1241, 457, 170, -1, 358, -1, 622, 358,
- -1, 622, 282, -1, 358, -1, 213, -1, 282, -1,
- 563, -1, 125, -1, 185, -1, 358, -1, 213, -1,
- 282, -1, 563, -1, 1249, -1, 358, -1, 563, -1,
- 282, -1, 125, -1, 185, -1, 358, -1, 563, -1,
- 213, -1, 282, -1, 1249, -1, 1250, -1, 125, -1,
- 185, -1, 1245, -1, 128, -1, -1, -1, 405, 1422,
- 1253, 629, 1254, 630, -1, -1, 1255, -1, 1255, 631,
- 1256, -1, 1256, -1, 1116, 1121, 1117, -1, -1, 1258,
- 1259, -1, 1259, 631, 1260, -1, 1260, -1, 636, 1424,
- -1, 1424, -1, -1, 241, 1262, 1263, -1, -1, -1,
- 377, 1421, 1264, 957, 1265, 1387, 1390, -1, 147, 1421,
- -1, 1257, -1, -1, 144, 1267, 1165, -1, -1, 145,
- 1277, 1447, 1276, 1269, 1272, 1042, -1, -1, 145, 230,
- 1422, 363, 1415, 1270, -1, 145, 111, 1276, 1422, -1,
- 145, 195, 1276, 1422, 637, 1422, -1, 145, 195, 1276,
- 1422, -1, 145, 405, 1276, 687, -1, 145, 581, 686,
- 1478, -1, -1, 145, 598, 1276, 1271, 1272, 1042, -1,
- 145, 168, 1276, 687, -1, 145, 556, 1276, 687, -1,
- 145, 531, 810, 821, 822, -1, 145, 278, 205, 811,
- 821, 822, -1, 145, 473, 1276, 1424, -1, 1273, -1,
- 1272, 631, 1273, -1, 1415, -1, 1275, -1, 1274, 631,
- 1275, -1, 1416, -1, -1, 225, 172, -1, -1, 537,
- -1, -1, -1, 237, 1279, 1284, 1036, 1286, 1280, 1288,
- 1304, -1, -1, -1, 441, 1282, 1285, 1286, 1283, 1288,
- -1, -1, 285, -1, 130, -1, 215, -1, 1313, -1,
- 130, -1, 241, 1287, -1, 1287, -1, 1273, -1, 1291,
- -1, 629, 630, 1291, -1, 629, 1290, 630, 1291, -1,
- -1, 475, 1289, 1295, -1, 1290, 631, 1408, -1, 1408,
- -1, 589, 1294, -1, 590, 1294, -1, -1, 882, 1292,
- 1501, -1, -1, 629, 882, 630, 1293, 1504, -1, 1294,
- 631, 1299, -1, 1299, -1, 1295, 631, 1296, -1, 1296,
- -1, 1412, 1297, 1303, -1, 161, -1, 476, -1, -1,
- 1297, -1, -1, 629, 1300, 1301, 630, -1, -1, 1302,
- -1, 1302, 631, 1303, -1, 1303, -1, 1121, -1, 128,
- -1, -1, -1, 363, 148, 1305, 254, 578, 1311, -1,
- -1, -1, 578, 1307, 1313, 1036, 1172, 475, 1309, 1308,
- 1221, 1232, 1243, -1, 1309, 631, 1310, -1, 1310, -1,
- 1412, 1297, 1303, -1, 1311, 631, 1312, -1, 1312, -1,
- 1412, 1297, 1303, -1, -1, 285, -1, -1, 132, 1315,
- 1323, 1316, -1, -1, 192, 1415, 1317, 1221, 1232, 1243,
- -1, -1, 1320, 1318, 192, 1172, 1221, -1, -1, 192,
- 1274, 1319, 585, 1172, 1221, -1, 1321, -1, 1320, 631,
- 1321, -1, 1422, 1322, -1, 1422, 637, 1422, 1322, -1,
- -1, 637, 624, -1, -1, 1324, 1323, -1, 414, -1,
- 285, -1, 226, -1, -1, 559, 1327, 1326, 1273, -1,
- -1, 534, -1, -1, 1329, -1, 1330, -1, 1329, 631,
- 1330, -1, 102, -1, 317, -1, 42, 245, -1, 97,
- 528, -1, 381, 180, -1, 246, -1, 527, -1, 493,
- -1, 12, -1, -1, 190, 413, 358, -1, -1, 480,
- 1333, 1334, -1, 112, 1345, -1, 1341, 530, 1340, 1345,
- -1, 1341, 555, 1340, 1345, -1, 167, 1340, 1345, -1,
- 534, 511, 1340, 1345, -1, 367, 530, 1340, 1345, -1,
- 393, -1, 159, 901, 1337, -1, 159, 12, 1337, -1,
- 1341, 73, 1342, 1415, 1340, 1345, -1, 1338, 279, -1,
- 485, 217, -1, -1, 35, 167, 1343, 1344, 1335, 1237,
- -1, -1, 429, 167, 1343, 1344, 1336, 1237, -1, 979,
- 1342, 1415, 1340, 1221, -1, 1339, 158, -1, 24, -1,
- 99, -1, 404, -1, 101, 629, 624, 630, 601, -1,
- 101, 629, 624, 630, 164, -1, 601, 1237, -1, 164,
- 1237, -1, 409, -1, 408, 1328, 1331, 1237, -1, 1436,
- 511, 1345, -1, 1341, 407, -1, 1436, 593, 1345, -1,
- 954, 1345, -1, 72, 1345, -1, 204, -1, 204, 190,
- 1425, -1, 103, 111, 892, 1422, -1, 103, 534, 1415,
- -1, 103, 598, 1415, -1, 301, 511, -1, 485, 511,
- -1, 67, -1, 582, -1, 533, -1, 231, -1, 103,
- 405, 687, -1, 103, 195, 687, -1, 103, 556, 687,
- -1, 405, 511, 1345, -1, 195, 511, 1345, -1, 405,
- 70, 687, -1, 195, 70, 687, -1, 103, 168, 687,
- -1, 511, -1, 335, -1, 279, -1, 301, -1, 34,
- -1, -1, 515, -1, -1, 1342, 1422, -1, -1, 193,
- -1, 192, -1, 244, -1, -1, 244, 1419, -1, -1,
- 192, 1247, -1, -1, 267, 1419, -1, 604, 1121, -1,
- -1, 1349, 1415, 1347, 1351, -1, -1, 1349, 1350, 1348,
- 1099, -1, 133, -1, 134, -1, -1, 175, -1, 388,
- -1, -1, 1403, -1, 1422, -1, -1, 187, 1074, 1353,
- 1354, -1, -1, -1, 1447, 1355, 1360, 1356, 1357, -1,
- 1358, -1, -1, 606, 418, 277, 1361, -1, 1358, 631,
- 1359, -1, 1359, -1, 163, 279, -1, 159, 279, -1,
- 197, 279, -1, 486, 279, -1, 34, 279, -1, 428,
- 279, -1, 413, 49, -1, 217, -1, 404, -1, 279,
- -1, 511, -1, 485, -1, 67, -1, 582, -1, 533,
- -1, 231, -1, 301, -1, 135, -1, 446, -1, -1,
- 1272, -1, -1, 17, 138, 61, -1, -1, 444, 1363,
- 1364, -1, 1364, 631, 1365, -1, 1365, -1, -1, 485,
- 1366, 1367, -1, 301, -1, 413, 49, -1, -1, 12,
- -1, -1, 411, 1369, 1370, -1, 1338, 279, 1371, -1,
- 551, 1419, -1, 30, 1121, -1, -1, 255, 1373, 1374,
- 1375, 1376, -1, -1, 209, -1, 490, -1, -1, 90,
- -1, 413, -1, 1121, -1, 581, 1425, -1, 584, 1422,
- -1, -1, -1, -1, -1, 273, 1383, 1379, 1385, 1384,
- 232, 1421, 1380, 1386, 241, 534, 1415, 1381, 957, 1382,
- 1393, 1387, 1390, 1394, 1396, 1399, -1, 114, -1, 614,
- -1, -1, 274, -1, -1, 88, -1, 285, -1, -1,
- 441, -1, 226, -1, -1, 73, 1388, -1, 1388, 1389,
- -1, 1389, -1, 539, 47, 1403, -1, 371, 154, 47,
- 1403, -1, 154, 47, 1403, -1, 165, 47, 1403, -1,
- -1, 270, 1391, -1, 1391, 1392, -1, 1392, -1, 539,
- 47, 1403, -1, 508, 47, 1403, -1, -1, 457, 223,
- 47, 1403, -1, -1, 226, 358, 1395, -1, 270, -1,
- 457, -1, -1, 629, 1397, 630, -1, 629, 630, -1,
- 1397, 631, 1398, -1, 1398, -1, 1412, -1, 636, 1424,
- -1, -1, 475, 1400, -1, 1400, 631, 1401, -1, 1401,
- -1, 1412, 1297, 1116, 1303, 1117, -1, 540, -1, 342,
- -1, 566, 540, -1, 1402, 1420, -1, 1420, -1, 213,
- -1, 214, -1, 36, -1, 383, -1, 1406, -1, 623,
- 1407, -1, 622, 1407, -1, 1402, -1, 1407, -1, 357,
- -1, 178, -1, 558, -1, 213, -1, 214, -1, 36,
- -1, 566, 953, -1, 566, 36, -1, 118, 1402, -1,
- 547, 1402, -1, 544, 1402, -1, 358, -1, 282, -1,
- 563, -1, 125, -1, 185, -1, 1412, -1, 1409, -1,
- 1422, 637, 624, -1, 1422, 637, 1422, 637, 624, -1,
- 1121, -1, 1422, -1, 1413, -1, 1422, -1, 1413, -1,
- 1422, 637, 1422, -1, 637, 1422, 637, 1422, -1, 1422,
- 637, 1422, 637, 1422, -1, 1422, -1, 1422, 637, 1422,
- 637, 1422, -1, 1422, 637, 1422, -1, 637, 1422, -1,
- 1422, -1, 1422, 637, 1422, -1, 637, 1422, -1, 1422,
- 1322, -1, 1422, 637, 1422, 1322, -1, 1422, -1, 222,
- -1, 224, -1, 540, -1, 540, -1, 540, -1, 1418,
- -1, 1426, -1, 1418, -1, 1427, -1, 1422, -1, 1419,
- -1, 266, -1, 1424, -1, 1424, 636, 1424, -1, 107,
- 1120, -1, 1427, -1, 21, -1, 29, -1, 31, -1,
- 48, -1, 49, -1, 59, -1, 62, -1, 61, -1,
- 68, -1, 74, -1, 75, -1, 76, -1, 77, -1,
- 78, -1, 79, -1, 82, -1, 84, -1, 96, -1,
- 124, -1, 144, -1, 155, -1, 170, -1, 171, -1,
- 187, -1, 208, -1, 212, -1, 216, -1, 239, -1,
- 256, -1, 354, -1, 367, -1, 370, -1, 369, -1,
- 379, -1, 384, -1, 389, -1, 397, -1, 400, -1,
- 435, -1, 438, -1, 444, -1, 447, -1, 454, -1,
- 461, -1, 466, -1, 473, -1, 483, -1, 489, -1,
- 485, -1, 491, -1, 510, -1, 514, -1, 559, -1,
- 570, -1, 571, -1, 610, -1, 613, -1, 579, -1,
- 5, -1, 7, -1, 8, -1, 9, -1, 10, -1,
- 11, -1, 14, -1, 18, -1, 23, -1, 24, -1,
- 26, -1, 25, -1, 27, -1, 28, -1, 35, -1,
- 39, -1, 42, -1, 44, -1, 43, -1, 46, -1,
- 52, -1, 55, -1, 56, -1, 58, -1, 64, -1,
- 67, -1, 66, -1, 65, -1, 69, -1, 70, -1,
- 72, -1, 81, -1, 73, -1, 83, -1, 85, -1,
- 86, -1, 87, -1, 88, -1, 90, -1, 91, -1,
- 93, -1, 95, -1, 94, -1, 97, -1, 99, -1,
- 102, -1, 105, -1, 109, -1, 114, -1, 113, -1,
- 115, -1, 118, -1, 123, -1, 129, -1, 131, -1,
- 135, -1, 137, -1, 138, -1, 139, -1, 140, -1,
- 147, -1, 148, -1, 149, -1, 156, -1, 160, -1,
- 159, -1, 158, -1, 163, -1, 164, -1, 166, -1,
- 168, -1, 167, -1, 169, -1, 174, -1, 175, -1,
- 176, -1, 180, -1, 179, -1, 191, -1, 153, -1,
- 193, -1, 182, -1, 183, -1, 184, -1, 197, -1,
- 198, -1, 200, -1, 199, -1, 201, -1, 204, -1,
- 202, -1, 210, -1, 209, -1, 217, -1, 221, -1,
- 223, -1, 227, -1, 231, -1, 243, -1, 228, -1,
- 229, -1, 233, -1, 245, -1, 246, -1, 248, -1,
- 249, -1, 238, -1, 253, -1, 258, -1, 257, -1,
- 261, -1, 264, -1, 265, -1, 271, -1, 272, -1,
- 274, -1, 276, -1, 278, -1, 279, -1, 307, -1,
- 301, -1, 303, -1, 288, -1, 292, -1, 289, -1,
- 290, -1, 302, -1, 291, -1, 293, -1, 287, -1,
- 299, -1, 295, -1, 294, -1, 296, -1, 297, -1,
- 298, -1, 305, -1, 306, -1, 308, -1, 310, -1,
- 311, -1, 316, -1, 317, -1, 318, -1, 319, -1,
- 320, -1, 321, -1, 324, -1, 325, -1, 329, -1,
- 327, -1, 331, -1, 332, -1, 333, -1, 334, -1,
- 335, -1, 336, -1, 337, -1, 339, -1, 338, -1,
- 340, -1, 343, -1, 344, -1, 348, -1, 347, -1,
- 355, -1, 349, -1, 350, -1, 360, -1, 361, -1,
- 362, -1, 364, -1, 365, -1, 366, -1, 380, -1,
- 381, -1, 386, -1, 387, -1, 388, -1, 390, -1,
- 391, -1, 392, -1, 394, -1, 393, -1, 395, -1,
- 396, -1, 401, -1, 402, -1, 404, -1, 406, -1,
- 407, -1, 408, -1, 409, -1, 410, -1, 412, -1,
- 413, -1, 414, -1, 417, -1, 421, -1, 422, -1,
- 424, -1, 423, -1, 425, -1, 428, -1, 429, -1,
- 430, -1, 431, -1, 432, -1, 434, -1, 437, -1,
- 439, -1, 442, -1, 446, -1, 449, -1, 450, -1,
- 455, -1, 456, -1, 457, -1, 458, -1, 459, -1,
- 460, -1, 462, -1, 463, -1, 465, -1, 471, -1,
- 470, -1, 472, -1, 484, -1, 477, -1, 481, -1,
- 486, -1, 488, -1, 490, -1, 492, -1, 493, -1,
- 501, -1, 500, -1, 503, -1, 506, -1, 509, -1,
- 511, -1, 515, -1, 517, -1, 518, -1, 519, -1,
- 520, -1, 522, -1, 521, -1, 525, -1, 526, -1,
- 527, -1, 528, -1, 536, -1, 533, -1, 530, -1,
- 535, -1, 531, -1, 537, -1, 538, -1, 541, -1,
- 542, -1, 553, -1, 554, -1, 555, -1, 544, -1,
- 545, -1, 546, -1, 547, -1, 560, -1, 561, -1,
- 562, -1, 195, -1, 564, -1, 565, -1, 568, -1,
- 567, -1, 574, -1, 577, -1, 581, -1, 582, -1,
- 583, -1, 593, -1, 598, -1, 599, -1, 590, -1,
- 601, -1, 600, -1, 602, -1, 609, -1, 612, -1,
- 614, -1, 617, -1, 597, -1, -1, 475, 1430, 1429,
- 1431, -1, -1, 370, -1, 1432, -1, 1431, 631, 1432,
- -1, -1, 1433, 1438, -1, 1435, -1, 202, -1, 274,
- -1, 472, -1, -1, 364, -1, -1, 202, -1, 274,
- -1, 472, -1, -1, 202, 637, -1, 274, 637, -1,
- 472, 637, -1, 1439, -1, 1435, 1440, -1, 1434, 1441,
- 1297, 1444, -1, 1434, 553, 248, 265, 1442, -1, 636,
- 1424, 1297, 1121, -1, 636, 636, 1437, 1441, 1297, 1444,
- -1, 954, 959, -1, 338, 1297, 1121, -1, 338, 956,
- 961, -1, 390, 1297, 1443, -1, 390, 190, 1425, 1297,
- 1443, -1, 1422, -1, 1422, 637, 1422, -1, 128, 637,
- 1422, -1, 418, 564, -1, 418, 83, -1, 439, 418,
- -1, 470, -1, 540, -1, 390, 629, 540, 630, -1,
- 362, 629, 540, 630, -1, 1121, -1, 128, -1, 363,
- -1, 12, -1, 34, -1, -1, 277, 1447, 1446, 1449,
- -1, 534, -1, 530, -1, 1447, -1, 598, -1, 1450,
- -1, 1449, 631, 1450, -1, 1415, 1219, 1451, -1, 418,
- -1, 611, -1, 611, 88, -1, 285, 611, -1, 418,
- 274, -1, -1, 575, 1453, 1447, -1, 208, 1415, 367,
- 1219, -1, 208, 1417, 68, -1, -1, 208, 1417, 418,
- 1455, 1456, 1221, 1238, -1, 1457, -1, 1422, 1458, -1,
- 183, -1, 348, -1, 183, -1, 348, -1, 402, -1,
- 257, -1, -1, 1460, 1459, 629, 1302, 630, -1, 161,
- -1, 196, -1, 259, -1, 207, -1, 286, -1, 452,
- 686, 1462, -1, 1466, 363, 1465, 1477, 192, 1478, -1,
- 1466, 363, 195, 1477, 192, 1478, -1, 1466, 363, 405,
- 1477, 192, 1478, -1, 12, 1467, 631, 203, 370, 192,
- 1478, -1, 410, 363, 1425, 192, 1478, -1, 203, 686,
- 1464, -1, 1466, 363, 1465, 1477, 551, 1479, 1486, 1487,
- -1, 1466, 363, 195, 1477, 551, 1479, 1486, 1487, -1,
- 1466, 363, 405, 1477, 551, 1479, 1486, 1487, -1, 410,
- 363, 1425, 551, 1479, 1488, -1, -1, 534, -1, 1468,
- -1, 12, 1467, -1, -1, 404, -1, 1469, -1, 1468,
- 631, 1469, -1, -1, 467, 1470, 1483, -1, -1, 237,
- 1471, 1483, -1, -1, 578, 1472, 1483, -1, -1, 426,
- 1473, 1483, -1, 132, -1, 580, -1, 230, -1, 13,
- -1, 103, -1, 145, -1, 171, -1, 434, -1, 481,
- -1, 406, -1, 182, -1, 203, 370, -1, 480, 112,
- -1, 525, -1, 103, 537, 530, -1, 277, 530, -1,
- 442, 485, -1, 442, 66, -1, 103, 598, -1, 480,
- 598, -1, 103, 456, -1, 13, 456, -1, 103, 581,
- -1, 168, -1, 556, -1, 103, 531, -1, -1, 17,
- -1, 1476, 1474, 1475, -1, 1476, -1, 520, 540, -1,
- 249, 540, -1, 64, 540, -1, 624, -1, 1422, 637,
- 624, -1, 624, 637, 624, -1, 1415, -1, 1425, -1,
- 1478, 631, 1425, -1, 1482, -1, 1479, 631, 1482, -1,
- 597, -1, 606, -1, 585, -1, 19, -1, 1425, 223,
- 47, 540, -1, 1425, 223, 47, 390, 540, -1, 1425,
- 223, 1480, 1424, -1, 1425, 223, 1480, 1424, 1481, 1419,
- -1, 1425, -1, -1, 629, 1484, 630, -1, 1484, 631,
- 1485, -1, 1485, -1, 1422, -1, -1, 443, 1475, -1,
- 443, 507, -1, 443, 612, -1, 443, 350, -1, -1,
- 606, 1489, -1, -1, 606, 203, 370, -1, 1489, 1490,
- -1, 1490, -1, 203, 370, -1, 306, 1245, -1, 310,
- 1245, -1, 305, 1245, -1, 311, 1244, -1, -1, 31,
- 1492, 1493, -1, -1, 609, -1, -1, 17, 354, 56,
- -1, 17, 56, -1, -1, 433, -1, 354, 433, -1,
- -1, 461, -1, 84, 1493, 1494, 1495, -1, 454, 1493,
- 1494, 1495, -1, 454, 1493, 551, 1496, 1422, -1, 461,
- 1422, -1, 433, 461, 1422, -1, -1, 1502, -1, -1,
- 572, 1509, 1503, 1100, -1, -1, 1502, -1, 1506, -1,
- -1, 1506, -1, -1, 1507, 1508, -1, 1233, 1237, -1,
- 1239, -1, -1, 141, -1, 12, -1, 467, 1189, -1,
- 629, 1102, 630, -1, 1510, 1505, -1, -1, 1511, 572,
- 1509, 1512, 1510, 1505, -1, 1514, 1511, 1515, -1, -1,
- -1, -1, 1517, -1, 1517, 1518, -1, 1518, -1, 516,
- -1, 215, -1, 141, -1, 504, -1, 499, -1, 500,
- -1, 502, -1, 12, -1, 1524, 1520, -1, 1523, 1521,
- -1, 1525, 1522, 1529, -1, 1529, -1, 1537, -1, 1548,
- -1, 1542, -1, 673, -1, 1529, -1, 1537, -1, 1548,
- -1, 1542, -1, 1541, -1, 673, -1, 1523, -1, 1524,
- -1, -1, 129, 161, 1425, -1, 1526, -1, 1526, 1527,
- -1, 1527, -1, 375, 441, -1, 11, 161, 565, -1,
- 11, 161, 318, -1, 11, 161, 538, -1, -1, 505,
- 466, 129, -1, 505, 466, 243, -1, -1, 1528, 598,
- 1415, 1530, 1531, 19, 1533, -1, -1, 629, 1532, 630,
- -1, 1422, -1, 1532, 631, 1422, -1, -1, 1534, 1535,
- 1536, -1, 467, 1103, -1, 629, 1101, 630, 1504, -1,
- -1, 606, 63, 370, -1, 606, 52, 63, 370, -1,
- 606, 274, 63, 370, -1, -1, -1, -1, 556, 1116,
- 687, 781, 782, 363, 1116, 1538, 1415, 190, 1116, 1539,
- 150, 459, 1540, 731, -1, 10, 1116, 195, 1422, 450,
- 905, 491, 1419, -1, 1116, 195, 1422, 450, 905, 491,
- 1419, -1, -1, -1, -1, -1, -1, 1116, 195, 687,
- 629, 1543, 698, 630, 1544, 450, 1545, 951, 1546, 689,
- 1547, 731, -1, -1, -1, -1, -1, 405, 1116, 687,
- 1549, 629, 1550, 702, 630, 1551, 689, 1552, 731, -1,
- 613, 1555, 1554, 1556, -1, 613, 155, 1554, 1558, -1,
- 613, 400, 1554, -1, 613, 84, 1554, 1557, -1, 613,
- 454, 1554, -1, 613, 422, -1, 1403, -1, 1403, 631,
- 1403, -1, 1403, 631, 1403, 631, 1245, -1, 31, -1,
- 510, -1, -1, 251, -1, 449, -1, -1, 365, 392,
- -1, -1, -1, 526, 1559, 1560, -1, -1, 190, 321,
- -1, 239, 394, 1422, 491, 1419, -1, 239, 491, 1419,
- -1, 571, 394, 1422, -1, 571, 491, 1419, -1, 619,
- -1
+ 1453, 1057, 1278, 1058, -1, -1, 414, -1, 175, -1,
+ 1453, 1278, 1063, -1, -1, 598, 1060, 1278, 1066, -1,
+ -1, 438, 1080, 1062, 1059, -1, -1, 1064, -1, 1065,
+ -1, 1065, 1064, -1, 414, -1, 175, -1, 583, -1,
+ -1, 192, 336, -1, -1, 15, 1080, 1453, 1068, 1278,
+ -1, 35, 1425, -1, 1453, 1278, 1074, -1, -1, 598,
+ 1071, 1278, 1077, -1, -1, 63, 1073, 1070, -1, -1,
+ 1075, -1, 1076, -1, 1076, 1075, -1, 414, -1, 179,
+ -1, 316, -1, 175, -1, 58, -1, 190, 579, -1,
+ -1, 190, 579, -1, -1, 368, 1080, 1453, 1079, 1278,
+ -1, -1, 356, -1, 274, -1, -1, 436, 1453, 1082,
+ 1084, -1, 436, 581, 686, 1083, -1, 1431, 551, 1431,
+ -1, 1083, 631, 1431, 551, 1431, -1, 1085, -1, 1084,
+ 631, 1085, -1, 1421, 551, 1421, -1, -1, 49, 230,
+ 1087, 1088, 244, 1092, -1, 1089, -1, 1091, -1, 1090,
+ -1, 1089, 631, 1090, -1, 1421, 1101, -1, 1421, 1099,
+ 1101, -1, 1428, -1, 128, -1, -1, 273, 230, 241,
+ 49, 1094, 1095, -1, 1098, -1, 1096, -1, 1097, -1,
+ 1096, 631, 1097, -1, 1421, 1101, 1104, -1, 1421, 1099,
+ 1101, 1104, -1, -1, 389, 836, 1100, 629, 1019, 630,
+ -1, -1, 1102, 1103, -1, -1, 977, 629, 1217, 630,
+ -1, -1, 226, 261, -1, 1106, -1, 467, 1109, -1,
+ 629, 1107, 630, 1509, -1, 467, 1111, -1, 629, 1107,
+ 630, -1, 467, 1196, -1, 629, 1108, 630, -1, -1,
+ 1111, 1110, 1506, -1, -1, -1, 1112, 1116, 1120, 1113,
+ 1114, 1119, -1, 1238, 1244, -1, 1267, -1, 1115, -1,
+ 1267, 1115, -1, 1115, 1267, -1, 192, 1178, 1227, 1232,
+ 1229, 1238, 1244, 1258, -1, 192, 146, 1227, 1244, -1,
+ -1, 1117, -1, 1117, 1118, -1, 1118, -1, 1523, -1,
+ 503, -1, 501, -1, -1, 190, 578, -1, 277, 244,
+ 477, 327, -1, 1120, 631, 1121, -1, 1121, -1, 624,
+ -1, 1122, 1415, 1123, -1, 1122, 1127, 1123, 1124, -1,
+ -1, -1, -1, 19, 1428, -1, 19, 1425, -1, 1428,
+ -1, 1425, -1, -1, 629, 630, -1, 629, 1252, 630,
+ -1, -1, 629, 630, -1, 1127, 1131, 1127, -1, 1127,
+ 615, 1127, -1, 1127, 1132, 1127, -1, 352, 1127, -1,
+ 1128, 247, 558, -1, 1128, 247, 1133, 558, -1, 1128,
+ 247, 178, -1, 1128, 247, 1133, 178, -1, 1128, 247,
+ 574, -1, 1128, 247, 1133, 574, -1, 1128, -1, 1128,
+ 247, 357, -1, 1128, 247, 1133, 357, -1, 1128, 162,
+ 1129, -1, 1128, 1135, 1129, -1, 1128, 1135, 1136, 629,
+ 1518, 630, -1, 1129, -1, 1130, 244, 629, 1518, 630,
+ -1, 1130, 1133, 244, 629, 1518, 630, -1, 1130, 244,
+ 629, 1127, 630, -1, 1130, 244, 629, 1127, 631, 1171,
+ 630, -1, 1130, 1133, 244, 629, 1127, 630, -1, 1130,
+ 1133, 244, 629, 1127, 631, 1171, 630, -1, 1130, 32,
+ 1130, 17, 1129, -1, 1130, 1133, 32, 1130, 17, 1129,
+ -1, 1130, 492, 267, 1130, -1, 1130, 267, 1141, 1231,
+ -1, 1130, 1133, 267, 1141, 1231, -1, 1130, 427, 1130,
+ -1, 1130, 1133, 427, 1130, -1, 1130, -1, 1130, 620,
+ 1130, -1, 1130, 621, 1130, -1, 1130, 478, 1130, -1,
+ 1130, 479, 1130, -1, 1130, 623, 1130, -1, 1130, 622,
+ 1130, -1, 1130, 623, 240, 1127, 1221, -1, 1130, 622,
+ 240, 1127, 1221, -1, 1130, 624, 1130, -1, 1130, 625,
+ 1130, -1, 1130, 626, 1130, -1, 1130, 142, 1130, -1,
+ 1130, 330, 1130, -1, 1130, 627, 1130, -1, 1141, -1,
+ 375, -1, 372, -1, 17, -1, 16, -1, 352, -1,
+ 351, -1, 632, -1, 351, -1, 161, -1, 196, -1,
+ 207, -1, 259, -1, 286, -1, 345, -1, 12, -1,
+ 18, -1, -1, 19, 1138, -1, 242, -1, 576, 242,
+ -1, 143, -1, 420, -1, 186, -1, 126, 940, -1,
+ 934, 966, -1, 935, -1, 118, -1, 547, 946, -1,
+ 115, 946, -1, 1127, 631, 1127, 1137, -1, 1139, -1,
+ 1140, 631, 1139, -1, 1417, -1, 1142, -1, 1143, -1,
+ 1146, -1, 1144, -1, 1141, 71, 1430, -1, 1412, -1,
+ 1410, -1, 1158, -1, 1154, -1, 1141, 374, 1141, -1,
+ 623, 1141, -1, 622, 1141, -1, 628, 1141, -1, 1134,
+ 1141, -1, 629, 1518, 630, -1, 629, 1127, 630, -1,
+ 629, 1127, 631, 1171, 630, -1, 459, 629, 1127, 631,
+ 1171, 630, -1, 172, 629, 1518, 630, -1, 633, 1428,
+ 1127, 634, -1, 304, 1172, 9, 629, 1130, 1148, 630,
+ -1, 34, 1141, -1, 54, 629, 1127, 19, 1168, 630,
+ -1, 53, 1174, 1176, 1175, 155, -1, 100, 629, 1127,
+ 631, 1168, 630, -1, 100, 629, 1127, 585, 955, 630,
+ -1, 128, 629, 1417, 630, -1, 589, 629, 1418, 630,
+ -1, 240, 1127, 1221, 623, 1127, -1, 60, 629, 1171,
+ 630, -1, 60, 629, 1171, 585, 955, 630, -1, 107,
+ 1126, -1, 118, 629, 1127, 630, -1, 123, 629, 1127,
+ 630, -1, 221, 629, 1127, 630, -1, 237, 629, 1127,
+ 631, 1127, 631, 1127, 631, 1127, 630, -1, 240, 629,
+ 1127, 631, 1127, 630, -1, 240, 629, 1127, 631, 1127,
+ 631, 1171, 630, -1, 263, 629, 1127, 631, 1127, 630,
+ -1, 324, 629, 1127, 630, -1, 331, 629, 1127, 630,
+ -1, 453, 629, 1127, 631, 1127, 630, -1, 465, 629,
+ 1127, 630, -1, 547, 629, 1127, 630, -1, 544, 629,
+ 1127, 630, -1, 544, 629, 1127, 631, 1127, 630, -1,
+ 557, 629, 1127, 630, -1, 557, 629, 260, 1127, 192,
+ 1127, 630, -1, 557, 629, 552, 1127, 192, 1127, 630,
+ -1, 557, 629, 45, 1127, 192, 1127, 630, -1, 557,
+ 629, 260, 192, 1127, 630, -1, 557, 629, 552, 192,
+ 1127, 630, -1, 557, 629, 45, 192, 1127, 630, -1,
+ 557, 629, 1127, 192, 1127, 630, -1, 581, 629, 630,
+ -1, 617, 629, 1127, 630, -1, 7, 629, 1127, 631,
+ 1127, 630, -1, 7, 629, 1127, 631, 240, 1127, 1221,
+ 630, -1, 106, 1126, -1, 110, 1125, -1, 116, 629,
+ 1127, 631, 240, 1127, 1221, 630, -1, 117, 629, 1127,
+ 631, 240, 1127, 1221, 630, -1, 177, 629, 1221, 192,
+ 1127, 630, -1, 201, 629, 1223, 631, 1127, 630, -1,
+ 353, 1125, -1, 398, 629, 1130, 244, 1127, 630, -1,
+ 519, 629, 1127, 631, 1127, 630, -1, 519, 629, 1127,
+ 631, 240, 1127, 1221, 630, -1, 523, 629, 1127, 631,
+ 1127, 631, 1127, 630, -1, 523, 629, 1127, 631, 1127,
+ 630, -1, 523, 629, 1127, 192, 1127, 190, 1127, 630,
+ -1, 523, 629, 1127, 192, 1127, 630, -1, 529, 1125,
+ -1, 545, 629, 1222, 631, 1127, 631, 1127, 630, -1,
+ 546, 629, 1222, 631, 1127, 631, 1127, 630, -1, 586,
+ 1126, -1, 588, 1125, -1, 587, 1125, -1, 74, 629,
+ 1127, 631, 1140, 630, -1, 76, 629, 1127, 631, 1171,
+ 630, -1, 77, 629, 1127, 631, 1127, 630, -1, 79,
+ 629, 1127, 630, -1, 75, 629, 1140, 630, -1, 78,
+ 629, 1127, 631, 1127, 19, 1168, 630, -1, 21, 629,
+ 1127, 630, -1, 59, 629, 1127, 630, -1, 69, 629,
+ 1171, 630, -1, 72, 629, 1127, 630, -1, 111, 629,
+ 630, -1, 225, 629, 1127, 631, 1127, 631, 1127, 630,
+ -1, 258, 629, 1171, 630, -1, 320, 629, 1127, 630,
+ -1, 330, 629, 1127, 631, 1127, 630, -1, 362, 629,
+ 1127, 630, -1, 390, 629, 1127, 630, -1, 412, 629,
+ 1127, 630, -1, 440, 629, 1127, 631, 1127, 630, -1,
+ 441, 629, 1127, 631, 1127, 631, 1127, 630, -1, 559,
+ 629, 1127, 631, 1127, 630, -1, 602, 629, 1127, 630,
+ -1, 602, 629, 1127, 631, 1127, 630, -1, 1145, -1,
+ 96, 629, 1127, 631, 1127, 630, -1, 199, 629, 1171,
+ 630, -1, 271, 629, 1171, 630, -1, 332, 629, 1171,
+ 630, -1, 333, 629, 1171, 630, -1, 334, 629, 1171,
+ 630, -1, 395, 629, 1127, 631, 1127, 630, -1, 396,
+ 629, 1171, 630, -1, -1, 1424, 629, 1147, 1151, 630,
+ -1, 1428, 637, 1428, 629, 1170, 630, -1, 1149, 1150,
+ -1, 244, 43, 327, -1, -1, 244, 341, 256, 327,
+ -1, -1, 606, 413, 174, -1, -1, 1152, -1, 1153,
+ -1, 1152, 631, 1153, -1, 1122, 1127, 1123, 1124, -1,
+ 28, 629, 1166, 630, -1, 28, 629, 141, 1166, 630,
+ -1, 37, 629, 1166, 630, -1, 38, 629, 1166, 630,
+ -1, 40, 629, 1166, 630, -1, 101, 629, 1226, 624,
+ 630, -1, 101, 629, 1166, 630, -1, -1, -1, 101,
+ 629, 141, 1155, 1171, 1156, 630, -1, 326, 629, 1166,
+ 630, -1, 326, 629, 141, 1166, 630, -1, 309, 629,
+ 1166, 630, -1, 309, 629, 141, 1166, 630, -1, 513,
+ 629, 1166, 630, -1, 594, 629, 1166, 630, -1, 512,
+ 629, 1166, 630, -1, 596, 629, 1166, 630, -1, 524,
+ 629, 1166, 630, -1, 524, 629, 141, 1166, 630, -1,
+ -1, 206, 629, 1161, 1157, 1171, 1163, 1162, 630, -1,
+ -1, 636, 1159, 1160, -1, 1430, 476, 1127, -1, 1430,
+ -1, 636, 1443, 1430, 1000, -1, -1, 141, -1, -1,
+ 469, 1409, -1, -1, -1, 373, 47, 1164, 1165, -1,
+ 1165, 631, 1416, 1242, -1, 1416, 1242, -1, -1, 1226,
+ 1167, 1127, -1, 34, 946, -1, 60, 946, 966, -1,
+ 343, 946, -1, 242, -1, 483, -1, 483, 242, -1,
+ 576, -1, 576, 242, -1, 118, -1, 547, 946, -1,
+ 115, 946, -1, 126, 940, -1, -1, 143, 1169, 947,
+ -1, -1, 1171, -1, 1127, -1, 1171, 631, 1127, -1,
+ 1173, -1, 629, 1173, 630, -1, 1417, -1, 1173, 631,
+ 1417, -1, -1, 1127, -1, -1, 151, 1127, -1, 603,
+ 1127, 543, 1127, -1, 1176, 603, 1127, 543, 1127, -1,
+ 1190, -1, 1181, -1, 1180, -1, 1177, -1, 633, 1428,
+ 1177, 634, -1, 1179, -1, 1180, 631, 1179, -1, 1177,
+ 1189, 1177, -1, 1177, 516, 1190, -1, -1, 1177, 1189,
+ 1177, 363, 1182, 1127, -1, -1, 1177, 516, 1190, 363,
+ 1183, 1127, -1, -1, 1177, 1189, 1177, 585, 1184, 629,
+ 1220, 630, -1, 1177, 341, 251, 1190, -1, -1, 1177,
+ 263, 1206, 251, 1177, 363, 1185, 1127, -1, -1, 1177,
+ 263, 1206, 251, 1190, 1186, 585, 629, 1220, 630, -1,
+ 1177, 341, 263, 1206, 251, 1190, -1, -1, 1177, 453,
+ 1206, 251, 1177, 363, 1187, 1127, -1, -1, 1177, 453,
+ 1206, 251, 1190, 1188, 585, 629, 1220, 630, -1, 1177,
+ 341, 453, 1206, 251, 1190, -1, 251, -1, 234, 251,
+ -1, 104, 251, -1, -1, 1191, 1421, 1225, 1215, -1,
+ 1205, 1204, 1201, -1, 629, 1204, 1192, 630, 1225, -1,
+ 1199, 1510, -1, -1, -1, 1192, 572, 1514, 1193, 1515,
+ 1194, 1510, -1, 1196, -1, -1, -1, 1197, 1521, 1120,
+ 1198, 904, 1119, -1, -1, 1204, 1200, 1180, -1, -1,
+ -1, 1202, 1116, 1120, 1203, 904, -1, -1, 467, -1,
+ -1, 376, -1, -1, 190, 251, -1, 190, 373, 47,
+ -1, 190, 205, 47, -1, 188, -1, 226, -1, -1,
+ 1208, 977, 1207, 1210, 629, 1219, 630, -1, -1, 584,
+ 977, 1207, 1211, 629, 1217, 630, -1, 1209, -1, 1212,
+ 1209, -1, -1, -1, 1214, 1212, -1, -1, 1216, 1213,
+ -1, -1, 1219, -1, 1428, -1, 403, -1, 1218, -1,
+ 1219, 631, 1218, -1, 1428, -1, 1220, 631, 1428, -1,
+ 1222, -1, 119, -1, 120, -1, 121, -1, 122, -1,
+ 218, -1, 219, -1, 220, -1, 322, -1, 323, -1,
+ 464, -1, 616, -1, 123, -1, 602, -1, 221, -1,
+ 324, -1, 331, -1, 412, -1, 465, -1, 320, -1,
+ 617, -1, 118, -1, 547, -1, 115, -1, 544, -1,
+ -1, 19, -1, 161, -1, -1, 1224, 1428, -1, -1,
+ 12, -1, -1, -1, 604, 1228, 1127, -1, -1, -1,
+ 211, 1230, 1127, -1, 166, 1141, -1, -1, -1, 205,
+ 47, 1233, 1234, -1, 1233, 631, 1416, 1242, -1, 1416,
+ 1242, -1, -1, 607, -1, 608, -1, 373, 47, 1236,
+ -1, 1236, 631, 1237, -1, 1237, -1, 1418, 1242, -1,
+ -1, 1239, -1, -1, 373, 47, 1240, 1241, -1, 1241,
+ 631, 1416, 1242, -1, 1416, 1242, -1, -1, 20, -1,
+ 133, -1, -1, 1245, -1, -1, 1245, -1, 268, 1246,
+ -1, 268, 1246, 457, 170, 1248, -1, 268, 457, 170,
+ 1248, -1, 1247, -1, 1247, 631, 1247, -1, 1247, 361,
+ 1247, -1, 1428, -1, 1410, -1, 563, -1, 282, -1,
+ 358, -1, 1247, -1, -1, 268, 1247, -1, 268, 457,
+ 170, -1, 268, 1247, 457, 170, -1, 358, -1, 622,
+ 358, -1, 622, 282, -1, 358, -1, 213, -1, 282,
+ -1, 563, -1, 125, -1, 185, -1, 358, -1, 213,
+ -1, 282, -1, 563, -1, 1255, -1, 358, -1, 563,
+ -1, 282, -1, 125, -1, 185, -1, 358, -1, 563,
+ -1, 213, -1, 282, -1, 1255, -1, 1256, -1, 125,
+ -1, 185, -1, 1251, -1, 128, -1, -1, -1, 405,
+ 1428, 1259, 629, 1260, 630, -1, -1, 1261, -1, 1261,
+ 631, 1262, -1, 1262, -1, 1122, 1127, 1123, -1, -1,
+ 1264, 1265, -1, 1265, 631, 1266, -1, 1266, -1, 636,
+ 1430, -1, 1430, -1, -1, 241, 1268, 1269, -1, -1,
+ -1, 377, 1427, 1270, 957, 1271, 1393, 1396, -1, 147,
+ 1427, -1, 1263, -1, -1, 144, 1273, 1171, -1, -1,
+ 145, 1283, 1453, 1282, 1275, 1278, 1042, -1, -1, 145,
+ 230, 1428, 363, 1421, 1276, -1, 145, 111, 1282, 1428,
+ -1, 145, 195, 1282, 1428, 637, 1428, -1, 145, 195,
+ 1282, 1428, -1, 145, 405, 1282, 687, -1, 145, 581,
+ 686, 1483, -1, -1, 145, 598, 1282, 1277, 1278, 1042,
+ -1, 145, 168, 1282, 687, -1, 145, 556, 1282, 687,
+ -1, 145, 531, 810, 821, 822, -1, 145, 278, 205,
+ 811, 821, 822, -1, 145, 473, 1282, 1430, -1, 1279,
+ -1, 1278, 631, 1279, -1, 1421, -1, 1281, -1, 1280,
+ 631, 1281, -1, 1422, -1, -1, 225, 172, -1, -1,
+ 537, -1, -1, -1, 237, 1285, 1290, 1036, 1292, 1286,
+ 1294, 1310, -1, -1, -1, 441, 1288, 1291, 1292, 1289,
+ 1294, -1, -1, 285, -1, 130, -1, 215, -1, 1319,
+ -1, 130, -1, 241, 1293, -1, 1293, -1, 1279, -1,
+ 1297, -1, 629, 630, 1297, -1, 629, 1296, 630, 1297,
+ -1, -1, 475, 1295, 1301, -1, 1296, 631, 1414, -1,
+ 1414, -1, 589, 1300, -1, 590, 1300, -1, -1, 882,
+ 1298, 1506, -1, -1, 629, 882, 630, 1299, 1509, -1,
+ 1300, 631, 1305, -1, 1305, -1, 1301, 631, 1302, -1,
+ 1302, -1, 1418, 1303, 1309, -1, 161, -1, 476, -1,
+ -1, 1303, -1, -1, 629, 1306, 1307, 630, -1, -1,
+ 1308, -1, 1308, 631, 1309, -1, 1309, -1, 1127, -1,
+ 128, -1, -1, -1, 363, 148, 1311, 254, 578, 1317,
+ -1, -1, -1, 578, 1313, 1319, 1036, 1178, 475, 1315,
+ 1314, 1227, 1238, 1249, -1, 1315, 631, 1316, -1, 1316,
+ -1, 1418, 1303, 1309, -1, 1317, 631, 1318, -1, 1318,
+ -1, 1418, 1303, 1309, -1, -1, 285, -1, -1, 132,
+ 1321, 1329, 1322, -1, -1, 192, 1421, 1323, 1227, 1238,
+ 1249, -1, -1, 1326, 1324, 192, 1178, 1227, -1, -1,
+ 192, 1280, 1325, 585, 1178, 1227, -1, 1327, -1, 1326,
+ 631, 1327, -1, 1428, 1328, -1, 1428, 637, 1428, 1328,
+ -1, -1, 637, 624, -1, -1, 1330, 1329, -1, 414,
+ -1, 285, -1, 226, -1, -1, 559, 1333, 1332, 1279,
+ -1, -1, 534, -1, -1, 1335, -1, 1336, -1, 1335,
+ 631, 1336, -1, 102, -1, 317, -1, 42, 245, -1,
+ 97, 528, -1, 381, 180, -1, 246, -1, 527, -1,
+ 493, -1, 12, -1, -1, 190, 413, 358, -1, -1,
+ 480, 1339, 1340, -1, 112, 1351, -1, 1347, 530, 1346,
+ 1351, -1, 1347, 555, 1346, 1351, -1, 167, 1346, 1351,
+ -1, 534, 511, 1346, 1351, -1, 367, 530, 1346, 1351,
+ -1, 393, -1, 159, 901, 1343, -1, 159, 12, 1343,
+ -1, 1347, 73, 1348, 1421, 1346, 1351, -1, 1344, 279,
+ -1, 485, 217, -1, -1, 35, 167, 1349, 1350, 1341,
+ 1243, -1, -1, 429, 167, 1349, 1350, 1342, 1243, -1,
+ 979, 1348, 1421, 1346, 1227, -1, 1345, 158, -1, 24,
+ -1, 99, -1, 404, -1, 101, 629, 624, 630, 601,
+ -1, 101, 629, 624, 630, 164, -1, 601, 1243, -1,
+ 164, 1243, -1, 409, -1, 408, 1334, 1337, 1243, -1,
+ 1442, 511, 1351, -1, 1347, 407, -1, 1442, 593, 1351,
+ -1, 954, 1351, -1, 72, 1351, -1, 204, -1, 204,
+ 190, 1431, -1, 103, 111, 892, 1428, -1, 103, 534,
+ 1421, -1, 103, 598, 1421, -1, 301, 511, -1, 485,
+ 511, -1, 67, -1, 582, -1, 533, -1, 231, -1,
+ 103, 405, 687, -1, 103, 195, 687, -1, 103, 556,
+ 687, -1, 405, 511, 1351, -1, 195, 511, 1351, -1,
+ 405, 70, 687, -1, 195, 70, 687, -1, 103, 168,
+ 687, -1, 511, -1, 335, -1, 279, -1, 301, -1,
+ 34, -1, -1, 515, -1, -1, 1348, 1428, -1, -1,
+ 193, -1, 192, -1, 244, -1, -1, 244, 1425, -1,
+ -1, 192, 1253, -1, -1, 267, 1425, -1, 604, 1127,
+ -1, -1, 1355, 1421, 1353, 1357, -1, -1, 1355, 1356,
+ 1354, 1105, -1, 133, -1, 134, -1, -1, 175, -1,
+ 388, -1, -1, 1409, -1, 1428, -1, -1, 187, 1080,
+ 1359, 1360, -1, -1, -1, 1453, 1361, 1366, 1362, 1363,
+ -1, 1364, -1, -1, 606, 418, 277, 1367, -1, 1364,
+ 631, 1365, -1, 1365, -1, 163, 279, -1, 159, 279,
+ -1, 197, 279, -1, 486, 279, -1, 34, 279, -1,
+ 428, 279, -1, 413, 49, -1, 217, -1, 404, -1,
+ 279, -1, 511, -1, 485, -1, 67, -1, 582, -1,
+ 533, -1, 231, -1, 301, -1, 135, -1, 446, -1,
+ -1, 1278, -1, -1, 17, 138, 61, -1, -1, 444,
+ 1369, 1370, -1, 1370, 631, 1371, -1, 1371, -1, -1,
+ 485, 1372, 1373, -1, 301, -1, 413, 49, -1, -1,
+ 12, -1, -1, 411, 1375, 1376, -1, 1344, 279, 1377,
+ -1, 551, 1425, -1, 30, 1127, -1, -1, 255, 1379,
+ 1380, 1381, 1382, -1, -1, 209, -1, 490, -1, -1,
+ 90, -1, 413, -1, 1127, -1, 581, 1431, -1, 584,
+ 1428, -1, -1, -1, -1, -1, 273, 1389, 1385, 1391,
+ 1390, 232, 1427, 1386, 1392, 241, 534, 1421, 1387, 957,
+ 1388, 1399, 1393, 1396, 1400, 1402, 1405, -1, 114, -1,
+ 614, -1, -1, 274, -1, -1, 88, -1, 285, -1,
+ -1, 441, -1, 226, -1, -1, 73, 1394, -1, 1394,
+ 1395, -1, 1395, -1, 539, 47, 1409, -1, 371, 154,
+ 47, 1409, -1, 154, 47, 1409, -1, 165, 47, 1409,
+ -1, -1, 270, 1397, -1, 1397, 1398, -1, 1398, -1,
+ 539, 47, 1409, -1, 508, 47, 1409, -1, -1, 457,
+ 223, 47, 1409, -1, -1, 226, 358, 1401, -1, 270,
+ -1, 457, -1, -1, 629, 1403, 630, -1, 629, 630,
+ -1, 1403, 631, 1404, -1, 1404, -1, 1418, -1, 636,
+ 1430, -1, -1, 475, 1406, -1, 1406, 631, 1407, -1,
+ 1407, -1, 1418, 1303, 1122, 1309, 1123, -1, 540, -1,
+ 342, -1, 566, 540, -1, 1408, 1426, -1, 1426, -1,
+ 213, -1, 214, -1, 36, -1, 383, -1, 1412, -1,
+ 623, 1413, -1, 622, 1413, -1, 1408, -1, 1413, -1,
+ 357, -1, 178, -1, 558, -1, 213, -1, 214, -1,
+ 36, -1, 566, 953, -1, 566, 36, -1, 118, 1408,
+ -1, 547, 1408, -1, 544, 1408, -1, 358, -1, 282,
+ -1, 563, -1, 125, -1, 185, -1, 1418, -1, 1415,
+ -1, 1428, 637, 624, -1, 1428, 637, 1428, 637, 624,
+ -1, 1127, -1, 1428, -1, 1419, -1, 1428, -1, 1419,
+ -1, 1428, 637, 1428, -1, 637, 1428, 637, 1428, -1,
+ 1428, 637, 1428, 637, 1428, -1, 1428, -1, 1428, 637,
+ 1428, 637, 1428, -1, 1428, 637, 1428, -1, 637, 1428,
+ -1, 1428, -1, 1428, 637, 1428, -1, 637, 1428, -1,
+ 1428, 1328, -1, 1428, 637, 1428, 1328, -1, 1428, -1,
+ 222, -1, 224, -1, 540, -1, 540, -1, 540, -1,
+ 1424, -1, 1432, -1, 1424, -1, 1433, -1, 1428, -1,
+ 1425, -1, 266, -1, 1430, -1, 1430, 636, 1430, -1,
+ 107, 1126, -1, 1433, -1, 21, -1, 29, -1, 31,
+ -1, 48, -1, 49, -1, 59, -1, 62, -1, 61,
+ -1, 68, -1, 74, -1, 75, -1, 76, -1, 77,
+ -1, 78, -1, 79, -1, 82, -1, 84, -1, 96,
+ -1, 124, -1, 144, -1, 155, -1, 170, -1, 171,
+ -1, 187, -1, 208, -1, 212, -1, 216, -1, 239,
+ -1, 256, -1, 354, -1, 367, -1, 370, -1, 369,
+ -1, 379, -1, 384, -1, 389, -1, 397, -1, 400,
+ -1, 435, -1, 438, -1, 444, -1, 447, -1, 454,
+ -1, 461, -1, 466, -1, 473, -1, 483, -1, 489,
+ -1, 485, -1, 491, -1, 510, -1, 514, -1, 559,
+ -1, 570, -1, 571, -1, 610, -1, 613, -1, 579,
+ -1, 5, -1, 7, -1, 8, -1, 9, -1, 10,
+ -1, 11, -1, 14, -1, 18, -1, 23, -1, 24,
+ -1, 26, -1, 25, -1, 27, -1, 28, -1, 35,
+ -1, 39, -1, 42, -1, 44, -1, 43, -1, 46,
+ -1, 52, -1, 55, -1, 56, -1, 58, -1, 64,
+ -1, 67, -1, 66, -1, 65, -1, 69, -1, 70,
+ -1, 72, -1, 81, -1, 73, -1, 83, -1, 85,
+ -1, 86, -1, 87, -1, 88, -1, 90, -1, 91,
+ -1, 93, -1, 95, -1, 94, -1, 97, -1, 99,
+ -1, 102, -1, 105, -1, 109, -1, 114, -1, 113,
+ -1, 115, -1, 118, -1, 123, -1, 129, -1, 131,
+ -1, 135, -1, 137, -1, 138, -1, 139, -1, 140,
+ -1, 147, -1, 148, -1, 149, -1, 156, -1, 160,
+ -1, 159, -1, 158, -1, 163, -1, 164, -1, 166,
+ -1, 168, -1, 167, -1, 169, -1, 174, -1, 175,
+ -1, 176, -1, 180, -1, 179, -1, 191, -1, 153,
+ -1, 193, -1, 182, -1, 183, -1, 184, -1, 197,
+ -1, 198, -1, 200, -1, 199, -1, 201, -1, 204,
+ -1, 202, -1, 210, -1, 209, -1, 217, -1, 221,
+ -1, 223, -1, 227, -1, 231, -1, 243, -1, 228,
+ -1, 229, -1, 233, -1, 245, -1, 246, -1, 248,
+ -1, 249, -1, 238, -1, 253, -1, 258, -1, 257,
+ -1, 261, -1, 264, -1, 265, -1, 271, -1, 272,
+ -1, 274, -1, 276, -1, 278, -1, 279, -1, 307,
+ -1, 301, -1, 303, -1, 288, -1, 292, -1, 289,
+ -1, 290, -1, 302, -1, 291, -1, 293, -1, 287,
+ -1, 299, -1, 295, -1, 294, -1, 296, -1, 297,
+ -1, 298, -1, 305, -1, 306, -1, 308, -1, 310,
+ -1, 311, -1, 316, -1, 317, -1, 318, -1, 319,
+ -1, 320, -1, 321, -1, 324, -1, 325, -1, 329,
+ -1, 327, -1, 331, -1, 332, -1, 333, -1, 334,
+ -1, 335, -1, 336, -1, 337, -1, 339, -1, 338,
+ -1, 340, -1, 343, -1, 344, -1, 348, -1, 347,
+ -1, 355, -1, 349, -1, 350, -1, 360, -1, 361,
+ -1, 362, -1, 364, -1, 365, -1, 366, -1, 380,
+ -1, 381, -1, 386, -1, 387, -1, 388, -1, 390,
+ -1, 391, -1, 392, -1, 394, -1, 393, -1, 395,
+ -1, 396, -1, 401, -1, 402, -1, 404, -1, 406,
+ -1, 407, -1, 408, -1, 409, -1, 410, -1, 412,
+ -1, 413, -1, 414, -1, 417, -1, 421, -1, 422,
+ -1, 424, -1, 423, -1, 425, -1, 428, -1, 429,
+ -1, 430, -1, 431, -1, 432, -1, 434, -1, 437,
+ -1, 439, -1, 442, -1, 446, -1, 449, -1, 450,
+ -1, 455, -1, 456, -1, 457, -1, 458, -1, 459,
+ -1, 460, -1, 462, -1, 463, -1, 465, -1, 471,
+ -1, 470, -1, 472, -1, 484, -1, 477, -1, 481,
+ -1, 486, -1, 488, -1, 490, -1, 492, -1, 493,
+ -1, 501, -1, 500, -1, 503, -1, 506, -1, 509,
+ -1, 511, -1, 515, -1, 517, -1, 518, -1, 519,
+ -1, 520, -1, 522, -1, 521, -1, 525, -1, 526,
+ -1, 527, -1, 528, -1, 536, -1, 533, -1, 530,
+ -1, 535, -1, 531, -1, 537, -1, 538, -1, 541,
+ -1, 542, -1, 553, -1, 554, -1, 555, -1, 544,
+ -1, 545, -1, 546, -1, 547, -1, 560, -1, 561,
+ -1, 562, -1, 195, -1, 564, -1, 565, -1, 568,
+ -1, 567, -1, 574, -1, 577, -1, 581, -1, 582,
+ -1, 583, -1, 593, -1, 598, -1, 599, -1, 590,
+ -1, 601, -1, 600, -1, 602, -1, 609, -1, 612,
+ -1, 614, -1, 617, -1, 597, -1, -1, 475, 1436,
+ 1435, 1437, -1, -1, 370, -1, 1438, -1, 1437, 631,
+ 1438, -1, -1, 1439, 1444, -1, 1441, -1, 202, -1,
+ 274, -1, 472, -1, -1, 364, -1, -1, 202, -1,
+ 274, -1, 472, -1, -1, 202, 637, -1, 274, 637,
+ -1, 472, 637, -1, 1445, -1, 1441, 1446, -1, 1440,
+ 1447, 1303, 1450, -1, 1440, 553, 248, 265, 1448, -1,
+ 636, 1430, 1303, 1127, -1, 636, 636, 1443, 1447, 1303,
+ 1450, -1, 954, 959, -1, 338, 1303, 1127, -1, 338,
+ 956, 961, -1, 390, 1303, 1449, -1, 390, 190, 1431,
+ 1303, 1449, -1, 1428, -1, 1428, 637, 1428, -1, 128,
+ 637, 1428, -1, 418, 564, -1, 418, 83, -1, 439,
+ 418, -1, 470, -1, 540, -1, 390, 629, 540, 630,
+ -1, 362, 629, 540, 630, -1, 1127, -1, 128, -1,
+ 363, -1, 12, -1, 34, -1, -1, 277, 1453, 1452,
+ 1454, -1, 534, -1, 530, -1, 1455, -1, 1454, 631,
+ 1455, -1, 1421, 1225, 1456, -1, 418, -1, 611, -1,
+ 611, 88, -1, 285, 611, -1, 418, 274, -1, -1,
+ 575, 1458, 1453, -1, 208, 1421, 367, 1225, -1, 208,
+ 1423, 68, -1, -1, 208, 1423, 418, 1460, 1461, 1227,
+ 1244, -1, 1462, -1, 1428, 1463, -1, 183, -1, 348,
+ -1, 183, -1, 348, -1, 402, -1, 257, -1, -1,
+ 1465, 1464, 629, 1308, 630, -1, 161, -1, 196, -1,
+ 259, -1, 207, -1, 286, -1, 452, 686, 1467, -1,
+ 1471, 363, 1470, 1482, 192, 1483, -1, 1471, 363, 195,
+ 1482, 192, 1483, -1, 1471, 363, 405, 1482, 192, 1483,
+ -1, 12, 1472, 631, 203, 370, 192, 1483, -1, 410,
+ 363, 1431, 192, 1483, -1, 203, 686, 1469, -1, 1471,
+ 363, 1470, 1482, 551, 1484, 1491, 1492, -1, 1471, 363,
+ 195, 1482, 551, 1484, 1491, 1492, -1, 1471, 363, 405,
+ 1482, 551, 1484, 1491, 1492, -1, 410, 363, 1431, 551,
+ 1484, 1493, -1, -1, 534, -1, 1473, -1, 12, 1472,
+ -1, -1, 404, -1, 1474, -1, 1473, 631, 1474, -1,
+ -1, 467, 1475, 1488, -1, -1, 237, 1476, 1488, -1,
+ -1, 578, 1477, 1488, -1, -1, 426, 1478, 1488, -1,
+ 132, -1, 580, -1, 230, -1, 13, -1, 103, -1,
+ 145, -1, 171, -1, 434, -1, 481, -1, 406, -1,
+ 182, -1, 203, 370, -1, 480, 112, -1, 525, -1,
+ 103, 537, 530, -1, 277, 530, -1, 442, 485, -1,
+ 442, 66, -1, 103, 598, -1, 480, 598, -1, 103,
+ 456, -1, 13, 456, -1, 103, 581, -1, 168, -1,
+ 556, -1, 103, 531, -1, -1, 17, -1, 1481, 1479,
+ 1480, -1, 1481, -1, 520, 540, -1, 249, 540, -1,
+ 64, 540, -1, 624, -1, 1428, 637, 624, -1, 624,
+ 637, 624, -1, 1421, -1, 1431, -1, 1483, 631, 1431,
+ -1, 1487, -1, 1484, 631, 1487, -1, 597, -1, 606,
+ -1, 585, -1, 19, -1, 1431, 223, 47, 540, -1,
+ 1431, 223, 47, 390, 540, -1, 1431, 223, 1485, 1430,
+ -1, 1431, 223, 1485, 1430, 1486, 1425, -1, 1431, -1,
+ -1, 629, 1489, 630, -1, 1489, 631, 1490, -1, 1490,
+ -1, 1428, -1, -1, 443, 1480, -1, 443, 507, -1,
+ 443, 612, -1, 443, 350, -1, -1, 606, 1494, -1,
+ -1, 606, 203, 370, -1, 1494, 1495, -1, 1495, -1,
+ 203, 370, -1, 306, 1251, -1, 310, 1251, -1, 305,
+ 1251, -1, 311, 1250, -1, -1, 31, 1497, 1498, -1,
+ -1, 609, -1, -1, 17, 354, 56, -1, 17, 56,
+ -1, -1, 433, -1, 354, 433, -1, -1, 461, -1,
+ 84, 1498, 1499, 1500, -1, 454, 1498, 1499, 1500, -1,
+ 454, 1498, 551, 1501, 1428, -1, 461, 1428, -1, 433,
+ 461, 1428, -1, -1, 1507, -1, -1, 572, 1514, 1508,
+ 1106, -1, -1, 1507, -1, 1511, -1, -1, 1511, -1,
+ -1, 1512, 1513, -1, 1239, 1243, -1, 1245, -1, -1,
+ 141, -1, 12, -1, 467, 1195, -1, 629, 1108, 630,
+ -1, 1515, 1510, -1, -1, 1516, 572, 1514, 1517, 1515,
+ 1510, -1, 1519, 1516, 1520, -1, -1, -1, -1, 1522,
+ -1, 1522, 1523, -1, 1523, -1, 516, -1, 215, -1,
+ 141, -1, 504, -1, 499, -1, 500, -1, 502, -1,
+ 12, -1, 1529, 1525, -1, 1528, 1526, -1, 1530, 1527,
+ 1534, -1, 1534, -1, 1542, -1, 1553, -1, 1547, -1,
+ 673, -1, 1534, -1, 1542, -1, 1553, -1, 1547, -1,
+ 1546, -1, 673, -1, 1528, -1, 1529, -1, -1, 129,
+ 161, 1431, -1, 1531, -1, 1531, 1532, -1, 1532, -1,
+ 375, 441, -1, 11, 161, 565, -1, 11, 161, 318,
+ -1, 11, 161, 538, -1, -1, 505, 466, 129, -1,
+ 505, 466, 243, -1, -1, 1533, 598, 1421, 1535, 1536,
+ 19, 1538, -1, -1, 629, 1537, 630, -1, 1428, -1,
+ 1537, 631, 1428, -1, -1, 1539, 1540, 1541, -1, 467,
+ 1109, -1, 629, 1107, 630, 1509, -1, -1, 606, 63,
+ 370, -1, 606, 52, 63, 370, -1, 606, 274, 63,
+ 370, -1, -1, -1, -1, 556, 1122, 687, 781, 782,
+ 363, 1122, 1543, 1421, 190, 1122, 1544, 150, 459, 1545,
+ 731, -1, 10, 1122, 195, 1428, 450, 905, 491, 1425,
+ -1, 1122, 195, 1428, 450, 905, 491, 1425, -1, -1,
+ -1, -1, -1, -1, 1122, 195, 687, 629, 1548, 698,
+ 630, 1549, 450, 1550, 951, 1551, 689, 1552, 731, -1,
+ -1, -1, -1, -1, 405, 1122, 687, 1554, 629, 1555,
+ 702, 630, 1556, 689, 1557, 731, -1, 613, 1560, 1559,
+ 1561, -1, 613, 155, 1559, 1563, -1, 613, 400, 1559,
+ -1, 613, 84, 1559, 1562, -1, 613, 454, 1559, -1,
+ 613, 422, -1, 1409, -1, 1409, 631, 1409, -1, 1409,
+ 631, 1409, 631, 1251, -1, 31, -1, 510, -1, -1,
+ 251, -1, 449, -1, -1, 365, 392, -1, -1, -1,
+ 526, 1564, 1565, -1, -1, 190, 321, -1, 239, 394,
+ 1428, 491, 1425, -1, 239, 491, 1425, -1, 571, 394,
+ 1428, -1, 571, 491, 1425, -1, 619, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
@@ -3600,110 +3602,111 @@ static const yytype_uint16 yyrline[] =
7055, 7056, 7060, 7061, 7065, 7066, 7067, 7071, 7072, 7073,
7077, 7078, 7079, 7080, 7089, 7088, 7097, 7105, 7104, 7112,
7121, 7130, 7131, 7138, 7138, 7144, 7145, 7149, 7150, 7151,
- 7155, 7156, 7172, 7173, 7178, 7177, 7189, 7190, 7191, 7196,
- 7195, 7225, 7226, 7230, 7231, 7235, 7236, 7237, 7238, 7243,
- 7242, 7263, 7272, 7271, 7304, 7305, 7309, 7310, 7314, 7315,
- 7316, 7317, 7318, 7319, 7324, 7323, 7344, 7345, 7346, 7351,
- 7350, 7356, 7363, 7368, 7376, 7377, 7381, 7395, 7394, 7408,
- 7409, 7413, 7414, 7418, 7428, 7438, 7439, 7444, 7443, 7455,
- 7456, 7460, 7461, 7465, 7475, 7486, 7485, 7493, 7493, 7502,
- 7503, 7508, 7509, 7518, 7527, 7528, 7532, 7537, 7542, 7547,
- 7552, 7551, 7571, 7579, 7571, 7586, 7587, 7588, 7589, 7590,
- 7594, 7601, 7608, 7610, 7621, 7622, 7626, 7627, 7655, 7685,
- 7687, 7693, 7703, 7704, 7705, 7719, 7724, 7749, 7755, 7761,
- 7762, 7763, 7764, 7765, 7769, 7770, 7771, 7775, 7776, 7781,
- 7832, 7839, 7882, 7888, 7894, 7900, 7906, 7912, 7918, 7924,
- 7928, 7934, 7940, 7946, 7952, 7958, 7962, 7968, 7977, 7983,
- 7991, 7997, 8007, 8013, 8022, 8032, 8038, 8048, 8054, 8063,
- 8067, 8073, 8079, 8085, 8091, 8097, 8103, 8109, 8115, 8121,
- 8127, 8133, 8139, 8145, 8151, 8155, 8156, 8160, 8161, 8165,
- 8166, 8170, 8171, 8175, 8176, 8177, 8178, 8179, 8180, 8184,
- 8185, 8190, 8196, 8200, 8207, 8214, 8221, 8228, 8235, 8240,
- 8246, 8253, 8260, 8268, 8279, 8301, 8308, 8316, 8317, 8318,
- 8319, 8320, 8321, 8332, 8333, 8334, 8335, 8336, 8342, 8346,
- 8352, 8358, 8364, 8370, 8372, 8379, 8386, 8392, 8394, 8403,
- 8410, 8418, 8424, 8431, 8437, 8451, 8458, 8474, 8480, 8486,
- 8494, 8500, 8506, 8512, 8518, 8532, 8543, 8549, 8555, 8561,
- 8567, 8573, 8579, 8585, 8591, 8597, 8603, 8609, 8615, 8621,
- 8627, 8633, 8639, 8647, 8668, 8675, 8681, 8688, 8695, 8702,
- 8709, 8715, 8721, 8728, 8734, 8741, 8747, 8753, 8759, 8765,
- 8771, 8789, 8795, 8801, 8808, 8815, 8823, 8830, 8837, 8844,
- 8851, 8858, 8875, 8881, 8887, 8893, 8899, 8906, 8912, 8918,
- 8924, 8930, 8936, 8947, 8953, 8959, 8965, 8971, 8982, 8988,
- 9004, 9010, 9017, 9024, 9031, 9038, 9045, 9049, 9069, 9068,
- 9140, 9181, 9183, 9188, 9189, 9193, 9194, 9198, 9199, 9203,
- 9210, 9218, 9245, 9251, 9257, 9263, 9269, 9275, 9284, 9291,
- 9293, 9290, 9300, 9311, 9317, 9323, 9329, 9335, 9341, 9347,
- 9353, 9359, 9366, 9365, 9385, 9384, 9399, 9409, 9417, 9433,
- 9434, 9439, 9444, 9447, 9450, 9449, 9466, 9468, 9474, 9473,
- 9490, 9492, 9494, 9496, 9498, 9500, 9502, 9504, 9506, 9508,
- 9514, 9520, 9523, 9522, 9528, 9529, 9533, 9540, 9548, 9549,
- 9553, 9560, 9568, 9569, 9573, 9574, 9578, 9586, 9597, 9598,
- 9610, 9621, 9622, 9628, 9629, 9649, 9651, 9655, 9653, 9670,
- 9668, 9686, 9684, 9691, 9700, 9698, 9716, 9715, 9725, 9736,
- 9734, 9753, 9752, 9763, 9774, 9775, 9776, 9788, 9788, 9802,
- 9842, 9918, 9929, 9934, 9926, 9953, 9973, 9981, 9973, 9990,
- 9989, 10012, 10029, 10012, 10036, 10040, 10066, 10067, 10072, 10075,
- 10076, 10077, 10081, 10082, 10087, 10086, 10092, 10091, 10099, 10100,
- 10103, 10105, 10105, 10109, 10109, 10114, 10115, 10119, 10121, 10126,
- 10127, 10131, 10142, 10155, 10156, 10157, 10158, 10159, 10160, 10161,
- 10162, 10163, 10164, 10165, 10166, 10170, 10171, 10172, 10173, 10174,
- 10175, 10176, 10177, 10178, 10182, 10183, 10184, 10185, 10188, 10190,
- 10191, 10195, 10196, 10204, 10206, 10210, 10212, 10211, 10225, 10228,
- 10227, 10242, 10248, 10262, 10264, 10268, 10270, 10275, 10276, 10296,
- 10321, 10325, 10326, 10330, 10342, 10344, 10349, 10348, 10383, 10385,
- 10390, 10391, 10392, 10397, 10404, 10408, 10409, 10413, 10417, 10421,
- 10428, 10435, 10442, 10452, 10485, 10489, 10495, 10501, 10510, 10518,
- 10522, 10529, 10530, 10534, 10535, 10536, 10540, 10541, 10542, 10543,
- 10544, 10545, 10549, 10550, 10551, 10552, 10553, 10557, 10558, 10559,
- 10560, 10561, 10565, 10566, 10567, 10568, 10569, 10573, 10578, 10579,
- 10583, 10584, 10587, 10590, 10589, 10620, 10621, 10625, 10626, 10630,
- 10640, 10640, 10650, 10651, 10655, 10674, 10707, 10706, 10719, 10727,
- 10718, 10729, 10741, 10753, 10752, 10770, 10769, 10780, 10780, 10796,
- 10803, 10825, 10845, 10857, 10862, 10861, 10871, 10877, 10884, 10889,
- 10894, 10904, 10905, 10909, 10920, 10921, 10925, 10936, 10937, 10941,
- 10942, 10950, 10958, 10949, 10968, 10975, 10967, 10985, 10993, 10994,
- 11002, 11006, 11007, 11018, 11019, 11023, 11032, 11033, 11034, 11036,
- 11035, 11046, 11047, 11051, 11052, 11054, 11053, 11057, 11056, 11062,
- 11063, 11067, 11068, 11072, 11082, 11083, 11087, 11088, 11093, 11092,
- 11106, 11107, 11111, 11116, 11124, 11125, 11133, 11135, 11135, 11143,
- 11151, 11142, 11173, 11174, 11178, 11186, 11187, 11191, 11201, 11202,
- 11209, 11208, 11224, 11223, 11235, 11234, 11246, 11245, 11259, 11260,
- 11264, 11277, 11293, 11294, 11298, 11299, 11303, 11304, 11305, 11310,
- 11309, 11330, 11332, 11335, 11337, 11340, 11341, 11344, 11348, 11352,
- 11356, 11360, 11364, 11368, 11372, 11376, 11384, 11387, 11397, 11396,
- 11411, 11418, 11426, 11434, 11442, 11450, 11458, 11465, 11467, 11469,
- 11478, 11482, 11487, 11486, 11492, 11491, 11496, 11505, 11512, 11521,
- 11530, 11535, 11537, 11539, 11541, 11543, 11545, 11552, 11560, 11562,
- 11570, 11577, 11584, 11594, 11601, 11607, 11616, 11624, 11628, 11632,
- 11639, 11646, 11653, 11660, 11667, 11674, 11680, 11687, 11694, 11699,
- 11704, 11712, 11714, 11716, 11721, 11722, 11725, 11727, 11731, 11732,
- 11736, 11737, 11741, 11742, 11746, 11747, 11751, 11752, 11755, 11757,
- 11764, 11775, 11774, 11790, 11789, 11799, 11800, 11804, 11805, 11806,
- 11810, 11811, 11812, 11827, 11826, 11839, 11848, 11838, 11850, 11854,
- 11855, 11869, 11870, 11875, 11877, 11879, 11881, 11883, 11885, 11887,
- 11889, 11891, 11893, 11895, 11897, 11902, 11904, 11906, 11908, 11910,
- 11912, 11914, 11919, 11920, 11924, 11925, 11929, 11928, 11938, 11939,
- 11943, 11943, 11945, 11946, 11950, 11951, 11956, 11955, 11966, 11970,
- 11974, 11987, 11986, 12000, 12001, 12002, 12005, 12006, 12007, 12011,
- 12016, 12026, 12038, 12049, 12059, 12069, 12037, 12077, 12078, 12082,
- 12083, 12087, 12088, 12096, 12100, 12101, 12102, 12105, 12107, 12111,
- 12112, 12116, 12121, 12128, 12133, 12140, 12142, 12146, 12147, 12151,
- 12156, 12164, 12165, 12168, 12170, 12178, 12180, 12184, 12185, 12186,
- 12190, 12192, 12197, 12198, 12207, 12208, 12212, 12213, 12217, 12230,
- 12253, 12265, 12276, 12295, 12303, 12315, 12323, 12338, 12358, 12359,
- 12360, 12368, 12369, 12370, 12377, 12383, 12389, 12395, 12401, 12407,
- 12436, 12464, 12465, 12466, 12470, 12480, 12490, 12496, 12505, 12520,
- 12521, 12525, 12534, 12549, 12553, 12599, 12603, 12620, 12624, 12702,
- 12726, 12756, 12757, 12773, 12783, 12787, 12793, 12799, 12809, 12815,
- 12824, 12834, 12835, 12863, 12877, 12891, 12906, 12907, 12917, 12918,
- 12928, 12929, 12930, 12934, 12950, 12971, 12986, 12987, 12988, 12989,
+ 7155, 7156, 7172, 7173, 7178, 7177, 7189, 7190, 7191, 7195,
+ 7196, 7196, 7201, 7200, 7221, 7222, 7226, 7227, 7231, 7232,
+ 7233, 7237, 7238, 7243, 7242, 7263, 7271, 7272, 7272, 7276,
+ 7275, 7301, 7302, 7306, 7307, 7311, 7312, 7313, 7314, 7315,
+ 7316, 7320, 7321, 7326, 7325, 7346, 7347, 7348, 7353, 7352,
+ 7358, 7365, 7370, 7378, 7379, 7383, 7397, 7396, 7409, 7410,
+ 7414, 7415, 7419, 7429, 7439, 7440, 7445, 7444, 7455, 7456,
+ 7460, 7461, 7465, 7475, 7486, 7485, 7493, 7493, 7502, 7503,
+ 7508, 7509, 7518, 7527, 7528, 7532, 7537, 7542, 7547, 7552,
+ 7551, 7571, 7579, 7571, 7586, 7587, 7588, 7589, 7590, 7594,
+ 7601, 7608, 7610, 7621, 7622, 7626, 7627, 7655, 7685, 7687,
+ 7693, 7703, 7704, 7705, 7719, 7724, 7749, 7755, 7761, 7762,
+ 7763, 7764, 7765, 7769, 7770, 7771, 7775, 7776, 7781, 7832,
+ 7839, 7882, 7888, 7894, 7900, 7906, 7912, 7918, 7924, 7928,
+ 7934, 7940, 7946, 7952, 7958, 7962, 7968, 7977, 7983, 7991,
+ 7997, 8007, 8013, 8022, 8032, 8038, 8048, 8054, 8063, 8067,
+ 8073, 8079, 8085, 8091, 8097, 8103, 8109, 8115, 8121, 8127,
+ 8133, 8139, 8145, 8151, 8155, 8156, 8160, 8161, 8165, 8166,
+ 8170, 8171, 8175, 8176, 8177, 8178, 8179, 8180, 8184, 8185,
+ 8190, 8196, 8200, 8207, 8214, 8221, 8228, 8235, 8240, 8246,
+ 8253, 8260, 8268, 8279, 8301, 8308, 8316, 8317, 8318, 8319,
+ 8320, 8321, 8332, 8333, 8334, 8335, 8336, 8342, 8346, 8352,
+ 8358, 8364, 8370, 8372, 8379, 8386, 8392, 8394, 8403, 8410,
+ 8418, 8424, 8431, 8437, 8451, 8458, 8474, 8480, 8486, 8494,
+ 8500, 8506, 8512, 8518, 8532, 8543, 8549, 8555, 8561, 8567,
+ 8573, 8579, 8585, 8591, 8597, 8603, 8609, 8615, 8621, 8627,
+ 8633, 8639, 8647, 8668, 8675, 8681, 8688, 8695, 8702, 8709,
+ 8715, 8721, 8728, 8734, 8741, 8747, 8753, 8759, 8765, 8771,
+ 8789, 8795, 8801, 8808, 8815, 8823, 8830, 8837, 8844, 8851,
+ 8858, 8875, 8881, 8887, 8893, 8899, 8906, 8912, 8918, 8924,
+ 8930, 8936, 8947, 8953, 8959, 8965, 8971, 8982, 8988, 9004,
+ 9010, 9017, 9024, 9031, 9038, 9045, 9049, 9069, 9068, 9140,
+ 9181, 9183, 9188, 9189, 9193, 9194, 9198, 9199, 9203, 9210,
+ 9218, 9245, 9251, 9257, 9263, 9269, 9275, 9284, 9291, 9293,
+ 9290, 9300, 9311, 9317, 9323, 9329, 9335, 9341, 9347, 9353,
+ 9359, 9366, 9365, 9385, 9384, 9399, 9409, 9417, 9433, 9434,
+ 9439, 9444, 9447, 9450, 9449, 9466, 9468, 9474, 9473, 9490,
+ 9492, 9494, 9496, 9498, 9500, 9502, 9504, 9506, 9508, 9514,
+ 9520, 9523, 9522, 9528, 9529, 9533, 9540, 9548, 9549, 9553,
+ 9560, 9568, 9569, 9573, 9574, 9578, 9586, 9597, 9598, 9610,
+ 9621, 9622, 9628, 9629, 9649, 9651, 9655, 9653, 9670, 9668,
+ 9686, 9684, 9691, 9700, 9698, 9716, 9715, 9725, 9736, 9734,
+ 9753, 9752, 9763, 9774, 9775, 9776, 9788, 9788, 9802, 9842,
+ 9918, 9929, 9934, 9926, 9953, 9973, 9981, 9973, 9990, 9989,
+ 10012, 10029, 10012, 10036, 10040, 10066, 10067, 10072, 10075, 10076,
+ 10077, 10081, 10082, 10087, 10086, 10092, 10091, 10099, 10100, 10103,
+ 10105, 10105, 10109, 10109, 10114, 10115, 10119, 10121, 10126, 10127,
+ 10131, 10142, 10155, 10156, 10157, 10158, 10159, 10160, 10161, 10162,
+ 10163, 10164, 10165, 10166, 10170, 10171, 10172, 10173, 10174, 10175,
+ 10176, 10177, 10178, 10182, 10183, 10184, 10185, 10188, 10190, 10191,
+ 10195, 10196, 10204, 10206, 10210, 10212, 10211, 10225, 10228, 10227,
+ 10242, 10248, 10262, 10264, 10268, 10270, 10275, 10276, 10296, 10321,
+ 10325, 10326, 10330, 10342, 10344, 10349, 10348, 10383, 10385, 10390,
+ 10391, 10392, 10397, 10404, 10408, 10409, 10413, 10417, 10421, 10428,
+ 10435, 10442, 10452, 10485, 10489, 10495, 10501, 10510, 10518, 10522,
+ 10529, 10530, 10534, 10535, 10536, 10540, 10541, 10542, 10543, 10544,
+ 10545, 10549, 10550, 10551, 10552, 10553, 10557, 10558, 10559, 10560,
+ 10561, 10565, 10566, 10567, 10568, 10569, 10573, 10578, 10579, 10583,
+ 10584, 10587, 10590, 10589, 10620, 10621, 10625, 10626, 10630, 10640,
+ 10640, 10650, 10651, 10655, 10674, 10707, 10706, 10719, 10727, 10718,
+ 10729, 10741, 10753, 10752, 10770, 10769, 10780, 10780, 10796, 10803,
+ 10825, 10845, 10857, 10862, 10861, 10871, 10877, 10884, 10889, 10894,
+ 10904, 10905, 10909, 10920, 10921, 10925, 10936, 10937, 10941, 10942,
+ 10950, 10958, 10949, 10968, 10975, 10967, 10985, 10993, 10994, 11002,
+ 11006, 11007, 11018, 11019, 11023, 11032, 11033, 11034, 11036, 11035,
+ 11046, 11047, 11051, 11052, 11054, 11053, 11057, 11056, 11062, 11063,
+ 11067, 11068, 11072, 11082, 11083, 11087, 11088, 11093, 11092, 11106,
+ 11107, 11111, 11116, 11124, 11125, 11133, 11135, 11135, 11143, 11151,
+ 11142, 11173, 11174, 11178, 11186, 11187, 11191, 11201, 11202, 11209,
+ 11208, 11224, 11223, 11235, 11234, 11246, 11245, 11259, 11260, 11264,
+ 11277, 11293, 11294, 11298, 11299, 11303, 11304, 11305, 11310, 11309,
+ 11330, 11332, 11335, 11337, 11340, 11341, 11344, 11348, 11352, 11356,
+ 11360, 11364, 11368, 11372, 11376, 11384, 11387, 11397, 11396, 11411,
+ 11418, 11426, 11434, 11442, 11450, 11458, 11465, 11467, 11469, 11478,
+ 11482, 11487, 11486, 11492, 11491, 11496, 11505, 11512, 11521, 11530,
+ 11535, 11537, 11539, 11541, 11543, 11545, 11552, 11560, 11562, 11570,
+ 11577, 11584, 11594, 11601, 11607, 11615, 11623, 11627, 11631, 11638,
+ 11645, 11652, 11659, 11666, 11673, 11679, 11686, 11693, 11698, 11703,
+ 11711, 11713, 11715, 11720, 11721, 11724, 11726, 11730, 11731, 11735,
+ 11736, 11740, 11741, 11745, 11746, 11750, 11751, 11754, 11756, 11763,
+ 11774, 11773, 11789, 11788, 11798, 11799, 11803, 11804, 11805, 11809,
+ 11810, 11811, 11826, 11825, 11838, 11847, 11837, 11849, 11853, 11854,
+ 11868, 11869, 11874, 11876, 11878, 11880, 11882, 11884, 11886, 11888,
+ 11890, 11892, 11894, 11896, 11901, 11903, 11905, 11907, 11909, 11911,
+ 11913, 11918, 11919, 11923, 11924, 11928, 11927, 11937, 11938, 11942,
+ 11942, 11944, 11945, 11949, 11950, 11955, 11954, 11965, 11969, 11973,
+ 11986, 11985, 11999, 12000, 12001, 12004, 12005, 12006, 12010, 12015,
+ 12025, 12037, 12048, 12058, 12068, 12036, 12076, 12077, 12081, 12082,
+ 12086, 12087, 12095, 12099, 12100, 12101, 12104, 12106, 12110, 12111,
+ 12115, 12120, 12127, 12132, 12139, 12141, 12145, 12146, 12150, 12155,
+ 12163, 12164, 12167, 12169, 12177, 12179, 12183, 12184, 12185, 12189,
+ 12191, 12196, 12197, 12206, 12207, 12211, 12212, 12216, 12229, 12252,
+ 12264, 12275, 12294, 12302, 12314, 12322, 12337, 12357, 12358, 12359,
+ 12367, 12368, 12369, 12376, 12382, 12388, 12394, 12400, 12406, 12435,
+ 12463, 12464, 12465, 12469, 12479, 12489, 12495, 12504, 12519, 12520,
+ 12524, 12533, 12548, 12552, 12598, 12602, 12619, 12623, 12701, 12725,
+ 12755, 12756, 12772, 12782, 12786, 12792, 12798, 12808, 12814, 12823,
+ 12833, 12834, 12862, 12876, 12890, 12905, 12906, 12916, 12917, 12927,
+ 12928, 12929, 12933, 12949, 12970, 12985, 12986, 12987, 12988, 12989,
12990, 12991, 12992, 12993, 12994, 12995, 12996, 12997, 12998, 12999,
13000, 13001, 13002, 13003, 13004, 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, 13054, 13055, 13056, 13057, 13058,
+ 13040, 13041, 13042, 13043, 13053, 13054, 13055, 13056, 13057, 13058,
13059, 13060, 13061, 13062, 13063, 13064, 13065, 13066, 13067, 13068,
13069, 13070, 13071, 13072, 13073, 13074, 13075, 13076, 13077, 13078,
13079, 13080, 13081, 13082, 13083, 13084, 13085, 13086, 13087, 13088,
@@ -3732,39 +3735,39 @@ static const yytype_uint16 yyrline[] =
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, 13353, 13352,
- 13367, 13368, 13372, 13373, 13377, 13377, 13457, 13458, 13459, 13460,
- 13464, 13465, 13469, 13470, 13471, 13472, 13476, 13477, 13478, 13479,
- 13483, 13484, 13488, 13529, 13547, 13558, 13570, 13583, 13598, 13617,
- 13643, 13656, 13682, 13725, 13739, 13740, 13741, 13742, 13746, 13747,
- 13756, 13768, 13769, 13770, 13776, 13782, 13794, 13793, 13809, 13810,
- 13814, 13815, 13819, 13820, 13824, 13839, 13840, 13841, 13846, 13847,
- 13852, 13851, 13871, 13883, 13896, 13895, 13929, 13930, 13934, 13935,
- 13939, 13940, 13941, 13942, 13944, 13943, 13956, 13957, 13958, 13959,
- 13960, 13966, 13971, 13977, 13988, 13999, 14003, 14013, 14018, 14025,
- 14037, 14049, 14058, 14060, 14064, 14065, 14072, 14074, 14078, 14079,
- 14084, 14083, 14087, 14086, 14090, 14089, 14093, 14092, 14095, 14096,
- 14097, 14098, 14099, 14100, 14101, 14102, 14103, 14104, 14105, 14106,
- 14107, 14108, 14109, 14110, 14111, 14112, 14113, 14114, 14115, 14116,
- 14117, 14118, 14119, 14120, 14124, 14125, 14129, 14130, 14134, 14144,
- 14154, 14167, 14182, 14195, 14208, 14220, 14225, 14233, 14238, 14245,
- 14245, 14246, 14246, 14249, 14276, 14281, 14287, 14293, 14299, 14303,
- 14307, 14308, 14312, 14339, 14341, 14345, 14349, 14353, 14360, 14361,
- 14365, 14366, 14370, 14371, 14375, 14376, 14382, 14388, 14394, 14404,
- 14403, 14413, 14414, 14419, 14420, 14421, 14426, 14427, 14428, 14432,
- 14433, 14437, 14449, 14458, 14468, 14477, 14491, 14492, 14497, 14496,
- 14512, 14513, 14514, 14518, 14519, 14523, 14523, 14545, 14546, 14550,
- 14551, 14552, 14556, 14560, 14567, 14570, 14568, 14584, 14591, 14612,
- 14636, 14638, 14642, 14643, 14647, 14648, 14656, 14657, 14658, 14659,
- 14665, 14671, 14681, 14683, 14685, 14690, 14691, 14692, 14693, 14694,
- 14698, 14699, 14700, 14701, 14702, 14703, 14713, 14714, 14719, 14732,
- 14745, 14747, 14749, 14754, 14759, 14761, 14763, 14769, 14770, 14772,
- 14778, 14777, 14794, 14795, 14799, 14804, 14812, 14812, 14836, 14837,
- 14842, 14843, 14845, 14847, 14865, 14871, 14876, 14858, 14937, 14954,
- 14978, 15009, 15013, 15022, 15045, 14974, 15108, 15132, 15141, 15148,
- 15107, 15168, 15172, 15176, 15180, 15184, 15188, 15195, 15202, 15209,
- 15219, 15220, 15224, 15225, 15226, 15230, 15231, 15236, 15238, 15237,
- 15243, 15244, 15248, 15255, 15265, 15271, 15282
+ 13339, 13340, 13341, 13342, 13343, 13344, 13345, 13352, 13351, 13366,
+ 13367, 13371, 13372, 13376, 13376, 13456, 13457, 13458, 13459, 13463,
+ 13464, 13468, 13469, 13470, 13471, 13475, 13476, 13477, 13478, 13482,
+ 13483, 13487, 13528, 13546, 13557, 13569, 13582, 13597, 13616, 13642,
+ 13655, 13681, 13724, 13738, 13739, 13740, 13741, 13745, 13746, 13755,
+ 13767, 13768, 13769, 13775, 13781, 13793, 13792, 13808, 13809, 13813,
+ 13814, 13818, 13833, 13834, 13835, 13840, 13841, 13846, 13845, 13865,
+ 13877, 13890, 13889, 13923, 13924, 13928, 13929, 13933, 13934, 13935,
+ 13936, 13938, 13937, 13950, 13951, 13952, 13953, 13954, 13960, 13965,
+ 13971, 13982, 13993, 13997, 14007, 14012, 14019, 14031, 14043, 14052,
+ 14054, 14058, 14059, 14066, 14068, 14072, 14073, 14078, 14077, 14081,
+ 14080, 14084, 14083, 14087, 14086, 14089, 14090, 14091, 14092, 14093,
+ 14094, 14095, 14096, 14097, 14098, 14099, 14100, 14101, 14102, 14103,
+ 14104, 14105, 14106, 14107, 14108, 14109, 14110, 14111, 14112, 14113,
+ 14114, 14118, 14119, 14123, 14124, 14128, 14138, 14148, 14161, 14176,
+ 14189, 14202, 14214, 14219, 14227, 14232, 14239, 14239, 14240, 14240,
+ 14243, 14270, 14275, 14281, 14287, 14293, 14297, 14301, 14302, 14306,
+ 14333, 14335, 14339, 14343, 14347, 14354, 14355, 14359, 14360, 14364,
+ 14365, 14369, 14370, 14376, 14382, 14388, 14398, 14397, 14407, 14408,
+ 14413, 14414, 14415, 14420, 14421, 14422, 14426, 14427, 14431, 14443,
+ 14452, 14462, 14471, 14485, 14486, 14491, 14490, 14506, 14507, 14508,
+ 14512, 14513, 14517, 14517, 14539, 14540, 14544, 14545, 14546, 14550,
+ 14554, 14561, 14564, 14562, 14578, 14585, 14606, 14630, 14632, 14636,
+ 14637, 14641, 14642, 14650, 14651, 14652, 14653, 14659, 14665, 14675,
+ 14677, 14679, 14684, 14685, 14686, 14687, 14688, 14692, 14693, 14694,
+ 14695, 14696, 14697, 14707, 14708, 14713, 14726, 14739, 14741, 14743,
+ 14748, 14753, 14755, 14757, 14763, 14764, 14766, 14772, 14771, 14788,
+ 14789, 14793, 14798, 14806, 14806, 14830, 14831, 14836, 14837, 14839,
+ 14841, 14859, 14865, 14870, 14852, 14931, 14948, 14972, 15003, 15007,
+ 15016, 15039, 14968, 15102, 15126, 15135, 15142, 15101, 15162, 15166,
+ 15170, 15174, 15178, 15182, 15189, 15196, 15203, 15213, 15214, 15218,
+ 15219, 15220, 15224, 15225, 15230, 15232, 15231, 15237, 15238, 15242,
+ 15249, 15259, 15265, 15276
};
#endif
@@ -4011,81 +4014,83 @@ static const char *const yytname[] =
"opt_restrict", "opt_place", "opt_to", "slave", "$@84", "$@85", "start",
"start_transaction_opts", "slave_thread_opts", "$@86",
"slave_thread_opt_list", "slave_thread_opt", "slave_until",
- "slave_until_opts", "checksum", "$@87", "opt_checksum_type", "repair",
- "$@88", "opt_mi_repair_type", "mi_repair_types", "mi_repair_type",
- "analyze", "$@89", "binlog_base64_event", "check", "$@90",
- "opt_mi_check_type", "mi_check_types", "mi_check_type", "optimize",
- "$@91", "opt_no_write_to_binlog", "rename", "$@92", "rename_list",
- "table_to_table_list", "table_to_table", "keycache", "$@93",
- "keycache_list_or_parts", "keycache_list", "assign_to_keycache",
- "assign_to_keycache_parts", "key_cache_name", "preload", "$@94",
- "preload_list_or_parts", "preload_list", "preload_keys",
- "preload_keys_parts", "adm_partition", "$@95", "cache_keys_spec", "$@96",
- "cache_key_list_or_empty", "opt_ignore_leaves", "select", "select_init",
- "select_paren", "select_paren_derived", "select_init2", "$@97",
- "select_part2", "$@98", "$@99", "select_into", "select_from",
- "select_options", "select_option_list", "select_option",
- "select_lock_type", "select_item_list", "select_item", "remember_name",
- "remember_end", "select_alias", "opt_time_precision", "optional_braces",
- "expr", "bool_pri", "predicate", "bit_expr", "or", "and", "not", "not2",
+ "slave_until_opts", "checksum", "$@87", "opt_checksum_type",
+ "repair_table_or_view", "$@88", "repair", "$@89", "opt_mi_repair_type",
+ "mi_repair_types", "mi_repair_type", "opt_view_repair_type", "analyze",
+ "$@90", "binlog_base64_event", "check_view_or_table", "$@91", "check",
+ "$@92", "opt_mi_check_type", "mi_check_types", "mi_check_type",
+ "opt_view_check_type", "optimize", "$@93", "opt_no_write_to_binlog",
+ "rename", "$@94", "rename_list", "table_to_table_list", "table_to_table",
+ "keycache", "$@95", "keycache_list_or_parts", "keycache_list",
+ "assign_to_keycache", "assign_to_keycache_parts", "key_cache_name",
+ "preload", "$@96", "preload_list_or_parts", "preload_list",
+ "preload_keys", "preload_keys_parts", "adm_partition", "$@97",
+ "cache_keys_spec", "$@98", "cache_key_list_or_empty",
+ "opt_ignore_leaves", "select", "select_init", "select_paren",
+ "select_paren_derived", "select_init2", "$@99", "select_part2", "$@100",
+ "$@101", "select_into", "select_from", "select_options",
+ "select_option_list", "select_option", "select_lock_type",
+ "select_item_list", "select_item", "remember_name", "remember_end",
+ "select_alias", "opt_time_precision", "optional_braces", "expr",
+ "bool_pri", "predicate", "bit_expr", "or", "and", "not", "not2",
"comp_op", "all_or_any", "opt_dyncol_type", "dyncol_type",
"dyncall_create_element", "dyncall_create_list", "simple_expr",
"function_call_keyword", "function_call_nonkeyword",
"function_call_conflict", "geometry_function", "function_call_generic",
- "@100", "fulltext_options", "opt_natural_language_mode",
+ "@102", "fulltext_options", "opt_natural_language_mode",
"opt_query_expansion", "opt_udf_expr_list", "udf_expr_list", "udf_expr",
- "sum_expr", "$@101", "$@102", "$@103", "variable", "$@104",
+ "sum_expr", "$@103", "$@104", "$@105", "variable", "$@106",
"variable_aux", "opt_distinct", "opt_gconcat_separator",
- "opt_gorder_clause", "$@105", "gorder_list", "in_sum_expr", "$@106",
- "cast_type", "$@107", "opt_expr_list", "expr_list", "ident_list_arg",
+ "opt_gorder_clause", "$@107", "gorder_list", "in_sum_expr", "$@108",
+ "cast_type", "$@109", "opt_expr_list", "expr_list", "ident_list_arg",
"ident_list", "opt_expr", "opt_else", "when_list", "table_ref",
"join_table_list", "esc_table_ref", "derived_table_list", "join_table",
- "$@108", "$@109", "$@110", "$@111", "$@112", "$@113", "$@114",
- "normal_join", "table_factor", "$@115", "select_derived_union", "$@116",
- "$@117", "select_init2_derived", "select_part2_derived", "$@118",
- "$@119", "select_derived", "$@120", "select_derived2", "$@121", "$@122",
+ "$@110", "$@111", "$@112", "$@113", "$@114", "$@115", "$@116",
+ "normal_join", "table_factor", "$@117", "select_derived_union", "$@118",
+ "$@119", "select_init2_derived", "select_part2_derived", "$@120",
+ "$@121", "select_derived", "$@122", "select_derived2", "$@123", "$@124",
"get_select_lex", "select_derived_init", "opt_outer",
- "index_hint_clause", "index_hint_type", "index_hint_definition", "$@123",
- "$@124", "index_hints_list", "opt_index_hints_list", "$@125",
- "opt_key_definition", "$@126", "opt_key_usage_list", "key_usage_element",
+ "index_hint_clause", "index_hint_type", "index_hint_definition", "$@125",
+ "$@126", "index_hints_list", "opt_index_hints_list", "$@127",
+ "opt_key_definition", "$@128", "opt_key_usage_list", "key_usage_element",
"key_usage_list", "using_list", "interval", "interval_time_stamp",
"date_time_type", "table_alias", "opt_table_alias", "opt_all",
- "where_clause", "$@127", "having_clause", "$@128", "opt_escape",
+ "where_clause", "$@129", "having_clause", "$@130", "opt_escape",
"group_clause", "group_list", "olap_opt", "alter_order_clause",
"alter_order_list", "alter_order_item", "opt_order_clause",
- "order_clause", "$@129", "order_list", "order_dir",
+ "order_clause", "$@131", "order_list", "order_dir",
"opt_limit_clause_init", "opt_limit_clause", "limit_clause",
"limit_options", "limit_option", "limit_rows_option",
"delete_limit_clause", "int_num", "ulong_num", "real_ulong_num",
"ulonglong_num", "real_ulonglong_num", "dec_num_error", "dec_num",
- "choice", "procedure_clause", "$@130", "procedure_list",
- "procedure_list2", "procedure_item", "select_var_list_init", "$@131",
- "select_var_list", "select_var_ident", "into", "$@132",
- "into_destination", "$@133", "$@134", "do", "$@135", "drop", "$@136",
- "$@137", "$@138", "table_list", "table_name", "table_alias_ref_list",
- "table_alias_ref", "if_exists", "opt_temporary", "insert", "$@139",
- "$@140", "replace", "$@141", "$@142", "insert_lock_option",
+ "choice", "procedure_clause", "$@132", "procedure_list",
+ "procedure_list2", "procedure_item", "select_var_list_init", "$@133",
+ "select_var_list", "select_var_ident", "into", "$@134",
+ "into_destination", "$@135", "$@136", "do", "$@137", "drop", "$@138",
+ "$@139", "$@140", "table_list", "table_name", "table_alias_ref_list",
+ "table_alias_ref", "if_exists", "opt_temporary", "insert", "$@141",
+ "$@142", "replace", "$@143", "$@144", "insert_lock_option",
"replace_lock_option", "insert2", "insert_table", "insert_field_spec",
- "$@143", "fields", "insert_values", "$@144", "$@145", "values_list",
+ "$@145", "fields", "insert_values", "$@146", "$@147", "values_list",
"ident_eq_list", "ident_eq_value", "equal", "opt_equal", "no_braces",
- "$@146", "opt_values", "values", "expr_or_default", "opt_insert_update",
- "$@147", "update", "$@148", "$@149", "update_list", "update_elem",
+ "$@148", "opt_values", "values", "expr_or_default", "opt_insert_update",
+ "$@149", "update", "$@150", "$@151", "update_list", "update_elem",
"insert_update_list", "insert_update_elem", "opt_low_priority", "delete",
- "$@150", "single_multi", "$@151", "$@152", "$@153", "table_wild_list",
+ "$@152", "single_multi", "$@153", "$@154", "$@155", "table_wild_list",
"table_wild_one", "opt_wild", "opt_delete_options", "opt_delete_option",
- "truncate", "$@154", "opt_table_sym", "opt_profile_defs", "profile_defs",
- "profile_def", "opt_profile_args", "show", "$@155", "show_param",
- "$@156", "$@157", "show_engine_param", "master_or_binary", "opt_storage",
+ "truncate", "$@156", "opt_table_sym", "opt_profile_defs", "profile_defs",
+ "profile_def", "opt_profile_args", "show", "$@157", "show_param",
+ "$@158", "$@159", "show_engine_param", "master_or_binary", "opt_storage",
"opt_db", "opt_full", "from_or_in", "binlog_in", "binlog_from",
- "wild_and_where", "describe", "$@158", "$@159", "describe_command",
- "opt_extended_describe", "opt_describe_column", "flush", "$@160",
- "flush_options", "$@161", "$@162", "opt_with_read_lock",
+ "wild_and_where", "describe", "$@160", "$@161", "describe_command",
+ "opt_extended_describe", "opt_describe_column", "flush", "$@162",
+ "flush_options", "$@163", "$@164", "opt_with_read_lock",
"flush_options_list", "flush_option", "opt_table_list",
- "optional_flush_tables_arguments", "reset", "$@163", "reset_options",
- "reset_option", "$@164", "slave_reset_options", "purge", "$@165",
- "purge_options", "purge_option", "kill", "$@166", "kill_type",
- "kill_option", "kill_expr", "use", "load", "$@167", "$@168", "$@169",
- "$@170", "data_or_xml", "opt_local", "load_data_lock", "opt_duplicate",
+ "optional_flush_tables_arguments", "reset", "$@165", "reset_options",
+ "reset_option", "$@166", "slave_reset_options", "purge", "$@167",
+ "purge_options", "purge_option", "kill", "$@168", "kill_type",
+ "kill_option", "kill_expr", "use", "load", "$@169", "$@170", "$@171",
+ "$@172", "data_or_xml", "opt_local", "load_data_lock", "opt_duplicate",
"opt_field_term", "field_term_list", "field_term", "opt_line_term",
"line_term_list", "line_term", "opt_xml_rows_identified_by",
"opt_ignore_lines", "lines_or_rows", "opt_field_or_var_spec",
@@ -4097,38 +4102,38 @@ static const char *const yytname[] =
"table_ident", "table_ident_opt_wild", "table_ident_nodb", "IDENT_sys",
"TEXT_STRING_sys", "TEXT_STRING_literal", "TEXT_STRING_filesystem",
"ident", "label_ident", "ident_or_text", "user", "keyword", "keyword_sp",
- "set", "$@171", "opt_option", "option_value_list", "option_type_value",
- "$@172", "option_type", "option_type2", "opt_var_type",
+ "set", "$@173", "opt_option", "option_value_list", "option_type_value",
+ "$@174", "option_type", "option_type2", "opt_var_type",
"opt_var_ident_type", "ext_option_value", "sys_option_value",
"option_value", "internal_variable_name", "isolation_types",
- "text_or_password", "set_expr_or_default", "lock", "$@173",
- "table_or_tables", "table_or_view", "table_lock_list", "table_lock",
- "lock_option", "unlock", "$@174", "handler", "$@175",
- "handler_read_or_scan", "handler_scan_function", "handler_rkey_function",
- "$@176", "handler_rkey_mode", "revoke", "revoke_command", "grant",
+ "text_or_password", "set_expr_or_default", "lock", "$@175",
+ "table_or_tables", "table_lock_list", "table_lock", "lock_option",
+ "unlock", "$@176", "handler", "$@177", "handler_read_or_scan",
+ "handler_scan_function", "handler_rkey_function", "$@178",
+ "handler_rkey_mode", "revoke", "revoke_command", "grant",
"grant_command", "opt_table", "grant_privileges", "opt_privileges",
- "object_privilege_list", "object_privilege", "$@177", "$@178", "$@179",
- "$@180", "opt_and", "require_list", "require_list_element",
+ "object_privilege_list", "object_privilege", "$@179", "$@180", "$@181",
+ "$@182", "opt_and", "require_list", "require_list_element",
"grant_ident", "user_list", "grant_list", "via_or_with", "using_or_as",
"grant_user", "opt_column_list", "column_list", "column_list_id",
"require_clause", "grant_options", "opt_grant_option",
- "grant_option_list", "grant_option", "begin", "$@181", "opt_work",
+ "grant_option_list", "grant_option", "begin", "$@183", "opt_work",
"opt_chain", "opt_release", "opt_savepoint", "commit", "rollback",
- "savepoint", "release", "union_clause", "union_list", "$@182",
- "union_opt", "opt_union_order_or_limit", "union_order_or_limit", "$@183",
+ "savepoint", "release", "union_clause", "union_list", "$@184",
+ "union_opt", "opt_union_order_or_limit", "union_order_or_limit", "$@185",
"order_or_limit", "union_option", "query_specification",
- "query_expression_body", "$@184", "subselect", "subselect_start",
+ "query_expression_body", "$@186", "subselect", "subselect_start",
"subselect_end", "opt_query_expression_options",
"query_expression_option_list", "query_expression_option",
"view_or_trigger_or_sp_or_event", "definer_tail", "no_definer_tail",
"definer_opt", "no_definer", "definer", "view_replace_or_algorithm",
- "view_replace", "view_algorithm", "view_suid", "view_tail", "$@185",
- "view_list_opt", "view_list", "view_select", "$@186", "view_select_aux",
- "view_check_option", "trigger_tail", "$@187", "$@188", "$@189",
- "udf_tail", "sf_tail", "$@190", "$@191", "$@192", "$@193", "$@194",
- "sp_tail", "$@195", "$@196", "$@197", "$@198", "xa", "xid",
+ "view_replace", "view_algorithm", "view_suid", "view_tail", "$@187",
+ "view_list_opt", "view_list", "view_select", "$@188", "view_select_aux",
+ "view_check_option", "trigger_tail", "$@189", "$@190", "$@191",
+ "udf_tail", "sf_tail", "$@192", "$@193", "$@194", "$@195", "$@196",
+ "sp_tail", "$@197", "$@198", "$@199", "$@200", "xa", "xid",
"begin_or_start", "opt_join_or_resume", "opt_one_phase", "opt_suspend",
- "$@199", "opt_migrate", "install", "uninstall", "keep_gcc_happy", 0
+ "$@201", "opt_migrate", "install", "uninstall", "keep_gcc_happy", 0
};
#endif
@@ -4306,171 +4311,172 @@ static const yytype_uint16 yyr1[] =
1040, 1040, 1041, 1041, 1042, 1042, 1042, 1043, 1043, 1043,
1044, 1044, 1044, 1044, 1046, 1045, 1045, 1047, 1045, 1045,
1048, 1049, 1049, 1051, 1050, 1052, 1052, 1053, 1053, 1053,
- 1054, 1054, 1055, 1055, 1057, 1056, 1058, 1058, 1058, 1060,
- 1059, 1061, 1061, 1062, 1062, 1063, 1063, 1063, 1063, 1065,
- 1064, 1066, 1068, 1067, 1069, 1069, 1070, 1070, 1071, 1071,
- 1071, 1071, 1071, 1071, 1073, 1072, 1074, 1074, 1074, 1076,
- 1075, 1075, 1077, 1077, 1078, 1078, 1079, 1081, 1080, 1082,
- 1082, 1083, 1083, 1084, 1085, 1086, 1086, 1088, 1087, 1089,
- 1089, 1090, 1090, 1091, 1092, 1094, 1093, 1096, 1095, 1097,
- 1097, 1098, 1098, 1099, 1100, 1100, 1101, 1101, 1102, 1102,
- 1104, 1103, 1106, 1107, 1105, 1108, 1108, 1108, 1108, 1108,
- 1109, 1109, 1110, 1110, 1111, 1111, 1112, 1112, 1112, 1113,
- 1113, 1113, 1114, 1114, 1114, 1115, 1115, 1116, 1117, 1118,
- 1118, 1118, 1118, 1118, 1119, 1119, 1119, 1120, 1120, 1121,
- 1121, 1121, 1121, 1121, 1121, 1121, 1121, 1121, 1121, 1121,
- 1122, 1122, 1122, 1122, 1122, 1122, 1123, 1123, 1123, 1123,
- 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123,
- 1124, 1124, 1124, 1124, 1124, 1124, 1124, 1124, 1124, 1124,
- 1124, 1124, 1124, 1124, 1124, 1125, 1125, 1126, 1126, 1127,
- 1127, 1128, 1128, 1129, 1129, 1129, 1129, 1129, 1129, 1130,
- 1130, 1131, 1131, 1132, 1132, 1132, 1132, 1132, 1132, 1132,
- 1132, 1132, 1132, 1132, 1133, 1134, 1134, 1135, 1135, 1135,
- 1135, 1135, 1135, 1135, 1135, 1135, 1135, 1135, 1135, 1135,
- 1135, 1135, 1135, 1135, 1135, 1135, 1135, 1135, 1135, 1135,
- 1135, 1135, 1135, 1135, 1135, 1135, 1135, 1136, 1136, 1136,
- 1136, 1136, 1136, 1136, 1136, 1136, 1136, 1136, 1136, 1136,
- 1136, 1136, 1136, 1136, 1136, 1136, 1136, 1136, 1136, 1136,
- 1136, 1136, 1136, 1136, 1137, 1137, 1137, 1137, 1137, 1137,
- 1137, 1137, 1137, 1137, 1137, 1137, 1137, 1137, 1137, 1137,
- 1137, 1137, 1137, 1137, 1137, 1137, 1137, 1137, 1137, 1137,
+ 1054, 1054, 1055, 1055, 1057, 1056, 1058, 1058, 1058, 1059,
+ 1060, 1059, 1062, 1061, 1063, 1063, 1064, 1064, 1065, 1065,
+ 1065, 1066, 1066, 1068, 1067, 1069, 1070, 1071, 1070, 1073,
+ 1072, 1074, 1074, 1075, 1075, 1076, 1076, 1076, 1076, 1076,
+ 1076, 1077, 1077, 1079, 1078, 1080, 1080, 1080, 1082, 1081,
+ 1081, 1083, 1083, 1084, 1084, 1085, 1087, 1086, 1088, 1088,
+ 1089, 1089, 1090, 1091, 1092, 1092, 1094, 1093, 1095, 1095,
+ 1096, 1096, 1097, 1098, 1100, 1099, 1102, 1101, 1103, 1103,
+ 1104, 1104, 1105, 1106, 1106, 1107, 1107, 1108, 1108, 1110,
+ 1109, 1112, 1113, 1111, 1114, 1114, 1114, 1114, 1114, 1115,
+ 1115, 1116, 1116, 1117, 1117, 1118, 1118, 1118, 1119, 1119,
+ 1119, 1120, 1120, 1120, 1121, 1121, 1122, 1123, 1124, 1124,
+ 1124, 1124, 1124, 1125, 1125, 1125, 1126, 1126, 1127, 1127,
+ 1127, 1127, 1127, 1127, 1127, 1127, 1127, 1127, 1127, 1128,
+ 1128, 1128, 1128, 1128, 1128, 1129, 1129, 1129, 1129, 1129,
+ 1129, 1129, 1129, 1129, 1129, 1129, 1129, 1129, 1129, 1130,
+ 1130, 1130, 1130, 1130, 1130, 1130, 1130, 1130, 1130, 1130,
+ 1130, 1130, 1130, 1130, 1131, 1131, 1132, 1132, 1133, 1133,
+ 1134, 1134, 1135, 1135, 1135, 1135, 1135, 1135, 1136, 1136,
1137, 1137, 1138, 1138, 1138, 1138, 1138, 1138, 1138, 1138,
- 1138, 1138, 1138, 1138, 1138, 1138, 1138, 1138, 1138, 1138,
- 1139, 1139, 1139, 1139, 1139, 1139, 1139, 1139, 1141, 1140,
- 1140, 1142, 1142, 1143, 1143, 1144, 1144, 1145, 1145, 1146,
- 1146, 1147, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1149,
- 1150, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148,
- 1148, 1148, 1151, 1148, 1153, 1152, 1154, 1154, 1154, 1155,
- 1155, 1156, 1156, 1157, 1158, 1157, 1159, 1159, 1161, 1160,
- 1162, 1162, 1162, 1162, 1162, 1162, 1162, 1162, 1162, 1162,
- 1162, 1162, 1163, 1162, 1164, 1164, 1165, 1165, 1166, 1166,
- 1167, 1167, 1168, 1168, 1169, 1169, 1170, 1170, 1171, 1171,
- 1172, 1173, 1173, 1174, 1174, 1175, 1175, 1176, 1175, 1177,
- 1175, 1178, 1175, 1175, 1179, 1175, 1180, 1175, 1175, 1181,
- 1175, 1182, 1175, 1175, 1183, 1183, 1183, 1185, 1184, 1184,
- 1184, 1186, 1187, 1188, 1186, 1189, 1191, 1192, 1190, 1194,
- 1193, 1196, 1197, 1195, 1198, 1199, 1200, 1200, 1201, 1201,
- 1201, 1201, 1202, 1202, 1204, 1203, 1205, 1203, 1206, 1206,
- 1207, 1208, 1207, 1210, 1209, 1211, 1211, 1212, 1212, 1213,
- 1213, 1214, 1214, 1215, 1215, 1215, 1215, 1215, 1215, 1215,
- 1215, 1215, 1215, 1215, 1215, 1216, 1216, 1216, 1216, 1216,
- 1216, 1216, 1216, 1216, 1217, 1217, 1217, 1217, 1218, 1218,
- 1218, 1219, 1219, 1220, 1220, 1221, 1222, 1221, 1223, 1224,
- 1223, 1225, 1225, 1226, 1226, 1227, 1227, 1228, 1228, 1228,
- 1229, 1230, 1230, 1231, 1232, 1232, 1234, 1233, 1235, 1235,
- 1236, 1236, 1236, 1237, 1237, 1238, 1238, 1239, 1239, 1239,
- 1240, 1240, 1240, 1241, 1241, 1241, 1241, 1241, 1242, 1243,
- 1243, 1243, 1243, 1244, 1244, 1244, 1245, 1245, 1245, 1245,
- 1245, 1245, 1246, 1246, 1246, 1246, 1246, 1247, 1247, 1247,
- 1247, 1247, 1248, 1248, 1248, 1248, 1248, 1249, 1250, 1250,
- 1251, 1251, 1252, 1253, 1252, 1254, 1254, 1255, 1255, 1256,
- 1258, 1257, 1259, 1259, 1260, 1260, 1262, 1261, 1264, 1265,
- 1263, 1263, 1263, 1267, 1266, 1269, 1268, 1270, 1268, 1268,
- 1268, 1268, 1268, 1268, 1271, 1268, 1268, 1268, 1268, 1268,
- 1268, 1272, 1272, 1273, 1274, 1274, 1275, 1276, 1276, 1277,
- 1277, 1279, 1280, 1278, 1282, 1283, 1281, 1284, 1284, 1284,
- 1284, 1285, 1285, 1286, 1286, 1287, 1288, 1288, 1288, 1289,
- 1288, 1290, 1290, 1291, 1291, 1292, 1291, 1293, 1291, 1294,
- 1294, 1295, 1295, 1296, 1297, 1297, 1298, 1298, 1300, 1299,
- 1301, 1301, 1302, 1302, 1303, 1303, 1304, 1305, 1304, 1307,
- 1308, 1306, 1309, 1309, 1310, 1311, 1311, 1312, 1313, 1313,
- 1315, 1314, 1317, 1316, 1318, 1316, 1319, 1316, 1320, 1320,
- 1321, 1321, 1322, 1322, 1323, 1323, 1324, 1324, 1324, 1326,
- 1325, 1327, 1327, 1328, 1328, 1329, 1329, 1330, 1330, 1330,
- 1330, 1330, 1330, 1330, 1330, 1330, 1331, 1331, 1333, 1332,
- 1334, 1334, 1334, 1334, 1334, 1334, 1334, 1334, 1334, 1334,
- 1334, 1334, 1335, 1334, 1336, 1334, 1334, 1334, 1334, 1334,
- 1334, 1334, 1334, 1334, 1334, 1334, 1334, 1334, 1334, 1334,
- 1334, 1334, 1334, 1334, 1334, 1334, 1334, 1334, 1334, 1334,
- 1334, 1334, 1334, 1334, 1334, 1334, 1334, 1334, 1334, 1334,
- 1334, 1337, 1337, 1337, 1338, 1338, 1339, 1339, 1340, 1340,
- 1341, 1341, 1342, 1342, 1343, 1343, 1344, 1344, 1345, 1345,
- 1345, 1347, 1346, 1348, 1346, 1349, 1349, 1350, 1350, 1350,
- 1351, 1351, 1351, 1353, 1352, 1355, 1356, 1354, 1354, 1357,
- 1357, 1358, 1358, 1359, 1359, 1359, 1359, 1359, 1359, 1359,
- 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359,
- 1359, 1359, 1360, 1360, 1361, 1361, 1363, 1362, 1364, 1364,
- 1366, 1365, 1365, 1365, 1367, 1367, 1369, 1368, 1370, 1371,
- 1371, 1373, 1372, 1374, 1374, 1374, 1375, 1375, 1375, 1376,
- 1376, 1377, 1379, 1380, 1381, 1382, 1378, 1383, 1383, 1384,
- 1384, 1385, 1385, 1385, 1386, 1386, 1386, 1387, 1387, 1388,
- 1388, 1389, 1389, 1389, 1389, 1390, 1390, 1391, 1391, 1392,
- 1392, 1393, 1393, 1394, 1394, 1395, 1395, 1396, 1396, 1396,
- 1397, 1397, 1398, 1398, 1399, 1399, 1400, 1400, 1401, 1402,
- 1402, 1402, 1402, 1403, 1403, 1403, 1403, 1404, 1405, 1405,
- 1405, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406, 1406,
- 1406, 1406, 1406, 1406, 1407, 1407, 1407, 1407, 1407, 1408,
- 1408, 1409, 1409, 1410, 1411, 1411, 1412, 1412, 1413, 1413,
- 1413, 1414, 1414, 1414, 1414, 1415, 1415, 1415, 1416, 1416,
- 1417, 1418, 1418, 1419, 1420, 1421, 1422, 1422, 1423, 1423,
- 1424, 1424, 1424, 1425, 1425, 1425, 1426, 1426, 1426, 1426,
- 1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426,
- 1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426,
- 1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426,
- 1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426,
- 1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426, 1426,
- 1426, 1426, 1426, 1426, 1426, 1427, 1427, 1427, 1427, 1427,
- 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427,
- 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427,
- 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427,
- 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427,
- 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427,
- 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427,
- 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427,
- 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427,
- 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427,
- 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427,
- 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427,
- 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427,
- 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427,
- 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427,
- 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427,
- 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427,
- 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427,
- 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427,
- 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427,
- 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427,
- 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427,
- 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427,
- 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427,
- 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427,
- 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427,
- 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427,
- 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427,
- 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427,
- 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1427, 1429, 1428,
- 1430, 1430, 1431, 1431, 1433, 1432, 1434, 1434, 1434, 1434,
- 1435, 1435, 1436, 1436, 1436, 1436, 1437, 1437, 1437, 1437,
- 1438, 1438, 1439, 1439, 1440, 1440, 1440, 1440, 1440, 1440,
- 1440, 1441, 1441, 1441, 1442, 1442, 1442, 1442, 1443, 1443,
- 1443, 1444, 1444, 1444, 1444, 1444, 1446, 1445, 1447, 1447,
- 1448, 1448, 1449, 1449, 1450, 1451, 1451, 1451, 1451, 1451,
- 1453, 1452, 1454, 1454, 1455, 1454, 1456, 1456, 1457, 1457,
- 1458, 1458, 1458, 1458, 1459, 1458, 1460, 1460, 1460, 1460,
- 1460, 1461, 1462, 1462, 1462, 1462, 1462, 1463, 1464, 1464,
- 1464, 1464, 1465, 1465, 1466, 1466, 1467, 1467, 1468, 1468,
- 1470, 1469, 1471, 1469, 1472, 1469, 1473, 1469, 1469, 1469,
- 1469, 1469, 1469, 1469, 1469, 1469, 1469, 1469, 1469, 1469,
- 1469, 1469, 1469, 1469, 1469, 1469, 1469, 1469, 1469, 1469,
- 1469, 1469, 1469, 1469, 1474, 1474, 1475, 1475, 1476, 1476,
- 1476, 1477, 1477, 1477, 1477, 1478, 1478, 1479, 1479, 1480,
- 1480, 1481, 1481, 1482, 1482, 1482, 1482, 1482, 1483, 1483,
- 1484, 1484, 1485, 1486, 1486, 1486, 1486, 1486, 1487, 1487,
- 1488, 1488, 1489, 1489, 1490, 1490, 1490, 1490, 1490, 1492,
- 1491, 1493, 1493, 1494, 1494, 1494, 1495, 1495, 1495, 1496,
- 1496, 1497, 1498, 1498, 1499, 1500, 1501, 1501, 1503, 1502,
- 1504, 1504, 1504, 1505, 1505, 1507, 1506, 1508, 1508, 1509,
- 1509, 1509, 1510, 1510, 1511, 1512, 1511, 1513, 1514, 1515,
- 1516, 1516, 1517, 1517, 1518, 1518, 1518, 1518, 1518, 1518,
- 1518, 1518, 1519, 1519, 1519, 1520, 1520, 1520, 1520, 1520,
- 1521, 1521, 1521, 1521, 1521, 1521, 1522, 1522, 1523, 1524,
- 1525, 1525, 1525, 1526, 1527, 1527, 1527, 1528, 1528, 1528,
- 1530, 1529, 1531, 1531, 1532, 1532, 1534, 1533, 1535, 1535,
- 1536, 1536, 1536, 1536, 1538, 1539, 1540, 1537, 1541, 1541,
- 1543, 1544, 1545, 1546, 1547, 1542, 1549, 1550, 1551, 1552,
- 1548, 1553, 1553, 1553, 1553, 1553, 1553, 1554, 1554, 1554,
- 1555, 1555, 1556, 1556, 1556, 1557, 1557, 1558, 1559, 1558,
- 1560, 1560, 1561, 1561, 1562, 1562, 1563
+ 1138, 1138, 1138, 1139, 1140, 1140, 1141, 1141, 1141, 1141,
+ 1141, 1141, 1141, 1141, 1141, 1141, 1141, 1141, 1141, 1141,
+ 1141, 1141, 1141, 1141, 1141, 1141, 1141, 1141, 1141, 1141,
+ 1141, 1141, 1141, 1141, 1141, 1141, 1142, 1142, 1142, 1142,
+ 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142,
+ 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142,
+ 1142, 1142, 1142, 1143, 1143, 1143, 1143, 1143, 1143, 1143,
+ 1143, 1143, 1143, 1143, 1143, 1143, 1143, 1143, 1143, 1143,
+ 1143, 1143, 1143, 1143, 1143, 1143, 1143, 1143, 1143, 1143,
+ 1143, 1144, 1144, 1144, 1144, 1144, 1144, 1144, 1144, 1144,
+ 1144, 1144, 1144, 1144, 1144, 1144, 1144, 1144, 1144, 1145,
+ 1145, 1145, 1145, 1145, 1145, 1145, 1145, 1147, 1146, 1146,
+ 1148, 1148, 1149, 1149, 1150, 1150, 1151, 1151, 1152, 1152,
+ 1153, 1154, 1154, 1154, 1154, 1154, 1154, 1154, 1155, 1156,
+ 1154, 1154, 1154, 1154, 1154, 1154, 1154, 1154, 1154, 1154,
+ 1154, 1157, 1154, 1159, 1158, 1160, 1160, 1160, 1161, 1161,
+ 1162, 1162, 1163, 1164, 1163, 1165, 1165, 1167, 1166, 1168,
+ 1168, 1168, 1168, 1168, 1168, 1168, 1168, 1168, 1168, 1168,
+ 1168, 1169, 1168, 1170, 1170, 1171, 1171, 1172, 1172, 1173,
+ 1173, 1174, 1174, 1175, 1175, 1176, 1176, 1177, 1177, 1178,
+ 1179, 1179, 1180, 1180, 1181, 1181, 1182, 1181, 1183, 1181,
+ 1184, 1181, 1181, 1185, 1181, 1186, 1181, 1181, 1187, 1181,
+ 1188, 1181, 1181, 1189, 1189, 1189, 1191, 1190, 1190, 1190,
+ 1192, 1193, 1194, 1192, 1195, 1197, 1198, 1196, 1200, 1199,
+ 1202, 1203, 1201, 1204, 1205, 1206, 1206, 1207, 1207, 1207,
+ 1207, 1208, 1208, 1210, 1209, 1211, 1209, 1212, 1212, 1213,
+ 1214, 1213, 1216, 1215, 1217, 1217, 1218, 1218, 1219, 1219,
+ 1220, 1220, 1221, 1221, 1221, 1221, 1221, 1221, 1221, 1221,
+ 1221, 1221, 1221, 1221, 1222, 1222, 1222, 1222, 1222, 1222,
+ 1222, 1222, 1222, 1223, 1223, 1223, 1223, 1224, 1224, 1224,
+ 1225, 1225, 1226, 1226, 1227, 1228, 1227, 1229, 1230, 1229,
+ 1231, 1231, 1232, 1232, 1233, 1233, 1234, 1234, 1234, 1235,
+ 1236, 1236, 1237, 1238, 1238, 1240, 1239, 1241, 1241, 1242,
+ 1242, 1242, 1243, 1243, 1244, 1244, 1245, 1245, 1245, 1246,
+ 1246, 1246, 1247, 1247, 1247, 1247, 1247, 1248, 1249, 1249,
+ 1249, 1249, 1250, 1250, 1250, 1251, 1251, 1251, 1251, 1251,
+ 1251, 1252, 1252, 1252, 1252, 1252, 1253, 1253, 1253, 1253,
+ 1253, 1254, 1254, 1254, 1254, 1254, 1255, 1256, 1256, 1257,
+ 1257, 1258, 1259, 1258, 1260, 1260, 1261, 1261, 1262, 1264,
+ 1263, 1265, 1265, 1266, 1266, 1268, 1267, 1270, 1271, 1269,
+ 1269, 1269, 1273, 1272, 1275, 1274, 1276, 1274, 1274, 1274,
+ 1274, 1274, 1274, 1277, 1274, 1274, 1274, 1274, 1274, 1274,
+ 1278, 1278, 1279, 1280, 1280, 1281, 1282, 1282, 1283, 1283,
+ 1285, 1286, 1284, 1288, 1289, 1287, 1290, 1290, 1290, 1290,
+ 1291, 1291, 1292, 1292, 1293, 1294, 1294, 1294, 1295, 1294,
+ 1296, 1296, 1297, 1297, 1298, 1297, 1299, 1297, 1300, 1300,
+ 1301, 1301, 1302, 1303, 1303, 1304, 1304, 1306, 1305, 1307,
+ 1307, 1308, 1308, 1309, 1309, 1310, 1311, 1310, 1313, 1314,
+ 1312, 1315, 1315, 1316, 1317, 1317, 1318, 1319, 1319, 1321,
+ 1320, 1323, 1322, 1324, 1322, 1325, 1322, 1326, 1326, 1327,
+ 1327, 1328, 1328, 1329, 1329, 1330, 1330, 1330, 1332, 1331,
+ 1333, 1333, 1334, 1334, 1335, 1335, 1336, 1336, 1336, 1336,
+ 1336, 1336, 1336, 1336, 1336, 1337, 1337, 1339, 1338, 1340,
+ 1340, 1340, 1340, 1340, 1340, 1340, 1340, 1340, 1340, 1340,
+ 1340, 1341, 1340, 1342, 1340, 1340, 1340, 1340, 1340, 1340,
+ 1340, 1340, 1340, 1340, 1340, 1340, 1340, 1340, 1340, 1340,
+ 1340, 1340, 1340, 1340, 1340, 1340, 1340, 1340, 1340, 1340,
+ 1340, 1340, 1340, 1340, 1340, 1340, 1340, 1340, 1340, 1340,
+ 1343, 1343, 1343, 1344, 1344, 1345, 1345, 1346, 1346, 1347,
+ 1347, 1348, 1348, 1349, 1349, 1350, 1350, 1351, 1351, 1351,
+ 1353, 1352, 1354, 1352, 1355, 1355, 1356, 1356, 1356, 1357,
+ 1357, 1357, 1359, 1358, 1361, 1362, 1360, 1360, 1363, 1363,
+ 1364, 1364, 1365, 1365, 1365, 1365, 1365, 1365, 1365, 1365,
+ 1365, 1365, 1365, 1365, 1365, 1365, 1365, 1365, 1365, 1365,
+ 1365, 1366, 1366, 1367, 1367, 1369, 1368, 1370, 1370, 1372,
+ 1371, 1371, 1371, 1373, 1373, 1375, 1374, 1376, 1377, 1377,
+ 1379, 1378, 1380, 1380, 1380, 1381, 1381, 1381, 1382, 1382,
+ 1383, 1385, 1386, 1387, 1388, 1384, 1389, 1389, 1390, 1390,
+ 1391, 1391, 1391, 1392, 1392, 1392, 1393, 1393, 1394, 1394,
+ 1395, 1395, 1395, 1395, 1396, 1396, 1397, 1397, 1398, 1398,
+ 1399, 1399, 1400, 1400, 1401, 1401, 1402, 1402, 1402, 1403,
+ 1403, 1404, 1404, 1405, 1405, 1406, 1406, 1407, 1408, 1408,
+ 1408, 1408, 1409, 1409, 1409, 1409, 1410, 1411, 1411, 1411,
+ 1412, 1412, 1412, 1412, 1412, 1412, 1412, 1412, 1412, 1412,
+ 1412, 1412, 1412, 1413, 1413, 1413, 1413, 1413, 1414, 1414,
+ 1415, 1415, 1416, 1417, 1417, 1418, 1418, 1419, 1419, 1419,
+ 1420, 1420, 1420, 1420, 1421, 1421, 1421, 1422, 1422, 1423,
+ 1424, 1424, 1425, 1426, 1427, 1428, 1428, 1429, 1429, 1430,
+ 1430, 1430, 1431, 1431, 1431, 1432, 1432, 1432, 1432, 1432,
+ 1432, 1432, 1432, 1432, 1432, 1432, 1432, 1432, 1432, 1432,
+ 1432, 1432, 1432, 1432, 1432, 1432, 1432, 1432, 1432, 1432,
+ 1432, 1432, 1432, 1432, 1432, 1432, 1432, 1432, 1432, 1432,
+ 1432, 1432, 1432, 1432, 1432, 1432, 1432, 1432, 1432, 1432,
+ 1432, 1432, 1432, 1432, 1432, 1432, 1432, 1432, 1432, 1432,
+ 1432, 1432, 1432, 1432, 1433, 1433, 1433, 1433, 1433, 1433,
+ 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433,
+ 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433,
+ 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433,
+ 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433,
+ 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433,
+ 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433,
+ 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433,
+ 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433,
+ 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433,
+ 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433,
+ 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433,
+ 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433,
+ 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433,
+ 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433,
+ 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433,
+ 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433,
+ 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433,
+ 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433,
+ 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433,
+ 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433,
+ 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433,
+ 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433,
+ 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433,
+ 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433,
+ 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433,
+ 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433,
+ 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433,
+ 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1433,
+ 1433, 1433, 1433, 1433, 1433, 1433, 1433, 1435, 1434, 1436,
+ 1436, 1437, 1437, 1439, 1438, 1440, 1440, 1440, 1440, 1441,
+ 1441, 1442, 1442, 1442, 1442, 1443, 1443, 1443, 1443, 1444,
+ 1444, 1445, 1445, 1446, 1446, 1446, 1446, 1446, 1446, 1446,
+ 1447, 1447, 1447, 1448, 1448, 1448, 1448, 1449, 1449, 1449,
+ 1450, 1450, 1450, 1450, 1450, 1452, 1451, 1453, 1453, 1454,
+ 1454, 1455, 1456, 1456, 1456, 1456, 1456, 1458, 1457, 1459,
+ 1459, 1460, 1459, 1461, 1461, 1462, 1462, 1463, 1463, 1463,
+ 1463, 1464, 1463, 1465, 1465, 1465, 1465, 1465, 1466, 1467,
+ 1467, 1467, 1467, 1467, 1468, 1469, 1469, 1469, 1469, 1470,
+ 1470, 1471, 1471, 1472, 1472, 1473, 1473, 1475, 1474, 1476,
+ 1474, 1477, 1474, 1478, 1474, 1474, 1474, 1474, 1474, 1474,
+ 1474, 1474, 1474, 1474, 1474, 1474, 1474, 1474, 1474, 1474,
+ 1474, 1474, 1474, 1474, 1474, 1474, 1474, 1474, 1474, 1474,
+ 1474, 1479, 1479, 1480, 1480, 1481, 1481, 1481, 1482, 1482,
+ 1482, 1482, 1483, 1483, 1484, 1484, 1485, 1485, 1486, 1486,
+ 1487, 1487, 1487, 1487, 1487, 1488, 1488, 1489, 1489, 1490,
+ 1491, 1491, 1491, 1491, 1491, 1492, 1492, 1493, 1493, 1494,
+ 1494, 1495, 1495, 1495, 1495, 1495, 1497, 1496, 1498, 1498,
+ 1499, 1499, 1499, 1500, 1500, 1500, 1501, 1501, 1502, 1503,
+ 1503, 1504, 1505, 1506, 1506, 1508, 1507, 1509, 1509, 1509,
+ 1510, 1510, 1512, 1511, 1513, 1513, 1514, 1514, 1514, 1515,
+ 1515, 1516, 1517, 1516, 1518, 1519, 1520, 1521, 1521, 1522,
+ 1522, 1523, 1523, 1523, 1523, 1523, 1523, 1523, 1523, 1524,
+ 1524, 1524, 1525, 1525, 1525, 1525, 1525, 1526, 1526, 1526,
+ 1526, 1526, 1526, 1527, 1527, 1528, 1529, 1530, 1530, 1530,
+ 1531, 1532, 1532, 1532, 1533, 1533, 1533, 1535, 1534, 1536,
+ 1536, 1537, 1537, 1539, 1538, 1540, 1540, 1541, 1541, 1541,
+ 1541, 1543, 1544, 1545, 1542, 1546, 1546, 1548, 1549, 1550,
+ 1551, 1552, 1547, 1554, 1555, 1556, 1557, 1553, 1558, 1558,
+ 1558, 1558, 1558, 1558, 1559, 1559, 1559, 1560, 1560, 1561,
+ 1561, 1561, 1562, 1562, 1563, 1564, 1563, 1565, 1565, 1566,
+ 1566, 1567, 1567, 1568
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
@@ -4575,104 +4581,105 @@ static const yytype_uint8 yyr2[] =
2, 1, 1, 1, 0, 1, 1, 0, 2, 1,
0, 1, 1, 1, 0, 5, 3, 0, 5, 3,
3, 0, 3, 0, 2, 1, 3, 0, 1, 1,
- 0, 2, 1, 3, 0, 5, 0, 1, 1, 0,
- 6, 0, 1, 1, 2, 1, 1, 1, 2, 0,
- 5, 2, 0, 5, 0, 1, 1, 2, 1, 1,
- 1, 1, 1, 2, 0, 5, 0, 1, 1, 0,
- 4, 4, 3, 5, 1, 3, 3, 0, 6, 1,
- 1, 1, 3, 2, 3, 1, 1, 0, 6, 1,
- 1, 1, 3, 3, 4, 0, 6, 0, 2, 0,
- 4, 0, 2, 1, 2, 4, 2, 3, 2, 3,
- 0, 3, 0, 0, 6, 2, 1, 1, 2, 2,
- 8, 4, 0, 1, 2, 1, 1, 1, 1, 0,
- 2, 4, 3, 1, 1, 3, 4, 0, 0, 0,
- 2, 2, 1, 1, 0, 2, 3, 0, 2, 3,
- 3, 3, 2, 3, 4, 3, 4, 3, 4, 1,
- 3, 4, 3, 3, 6, 1, 5, 6, 5, 7,
- 6, 8, 5, 6, 4, 4, 5, 3, 4, 1,
- 3, 3, 3, 3, 3, 3, 5, 5, 3, 3,
- 3, 3, 3, 3, 1, 1, 1, 1, 1, 1,
+ 0, 2, 1, 3, 0, 5, 0, 1, 1, 3,
+ 0, 4, 0, 4, 0, 1, 1, 2, 1, 1,
+ 1, 0, 2, 0, 5, 2, 3, 0, 4, 0,
+ 3, 0, 1, 1, 2, 1, 1, 1, 1, 1,
+ 2, 0, 2, 0, 5, 0, 1, 1, 0, 4,
+ 4, 3, 5, 1, 3, 3, 0, 6, 1, 1,
+ 1, 3, 2, 3, 1, 1, 0, 6, 1, 1,
+ 1, 3, 3, 4, 0, 6, 0, 2, 0, 4,
+ 0, 2, 1, 2, 4, 2, 3, 2, 3, 0,
+ 3, 0, 0, 6, 2, 1, 1, 2, 2, 8,
+ 4, 0, 1, 2, 1, 1, 1, 1, 0, 2,
+ 4, 3, 1, 1, 3, 4, 0, 0, 0, 2,
+ 2, 1, 1, 0, 2, 3, 0, 2, 3, 3,
+ 3, 2, 3, 4, 3, 4, 3, 4, 1, 3,
+ 4, 3, 3, 6, 1, 5, 6, 5, 7, 6,
+ 8, 5, 6, 4, 4, 5, 3, 4, 1, 3,
+ 3, 3, 3, 3, 3, 5, 5, 3, 3, 3,
+ 3, 3, 3, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 0, 2, 1, 2, 1, 1, 1, 2, 2,
- 1, 1, 2, 2, 4, 1, 3, 1, 1, 1,
- 1, 1, 3, 1, 1, 1, 1, 3, 2, 2,
- 2, 2, 3, 3, 5, 6, 4, 4, 7, 2,
- 6, 5, 6, 6, 4, 4, 5, 4, 6, 2,
- 4, 4, 4, 10, 6, 8, 6, 4, 4, 6,
- 4, 4, 4, 6, 4, 7, 7, 7, 6, 6,
- 6, 6, 3, 4, 6, 8, 2, 2, 8, 8,
- 6, 6, 2, 6, 6, 8, 8, 6, 8, 6,
- 2, 8, 8, 2, 2, 2, 6, 6, 6, 4,
- 4, 8, 4, 4, 4, 4, 3, 8, 4, 4,
- 6, 4, 4, 4, 6, 8, 6, 4, 6, 1,
- 6, 4, 4, 4, 4, 4, 6, 4, 0, 5,
- 6, 2, 3, 0, 4, 0, 3, 0, 1, 1,
- 3, 4, 4, 5, 4, 4, 4, 5, 4, 0,
- 0, 7, 4, 5, 4, 5, 4, 4, 4, 4,
- 4, 5, 0, 8, 0, 3, 3, 1, 4, 0,
- 1, 0, 2, 0, 0, 4, 4, 2, 0, 3,
- 2, 3, 2, 1, 1, 2, 1, 2, 1, 2,
- 2, 2, 0, 3, 0, 1, 1, 3, 1, 3,
- 1, 3, 0, 1, 0, 2, 4, 5, 1, 1,
- 1, 1, 4, 1, 3, 3, 3, 0, 6, 0,
- 6, 0, 8, 4, 0, 8, 0, 10, 6, 0,
- 8, 0, 10, 6, 1, 2, 2, 0, 4, 3,
- 5, 2, 0, 0, 7, 1, 0, 0, 6, 0,
- 3, 0, 0, 5, 0, 1, 0, 1, 0, 2,
- 3, 3, 1, 1, 0, 7, 0, 7, 1, 2,
- 0, 0, 2, 0, 2, 0, 1, 1, 1, 1,
- 3, 1, 3, 1, 1, 1, 1, 1, 1, 1,
+ 0, 2, 1, 2, 1, 1, 1, 2, 2, 1,
+ 1, 2, 2, 4, 1, 3, 1, 1, 1, 1,
+ 1, 3, 1, 1, 1, 1, 3, 2, 2, 2,
+ 2, 3, 3, 5, 6, 4, 4, 7, 2, 6,
+ 5, 6, 6, 4, 4, 5, 4, 6, 2, 4,
+ 4, 4, 10, 6, 8, 6, 4, 4, 6, 4,
+ 4, 4, 6, 4, 7, 7, 7, 6, 6, 6,
+ 6, 3, 4, 6, 8, 2, 2, 8, 8, 6,
+ 6, 2, 6, 6, 8, 8, 6, 8, 6, 2,
+ 8, 8, 2, 2, 2, 6, 6, 6, 4, 4,
+ 8, 4, 4, 4, 4, 3, 8, 4, 4, 6,
+ 4, 4, 4, 6, 8, 6, 4, 6, 1, 6,
+ 4, 4, 4, 4, 4, 6, 4, 0, 5, 6,
+ 2, 3, 0, 4, 0, 3, 0, 1, 1, 3,
+ 4, 4, 5, 4, 4, 4, 5, 4, 0, 0,
+ 7, 4, 5, 4, 5, 4, 4, 4, 4, 4,
+ 5, 0, 8, 0, 3, 3, 1, 4, 0, 1,
+ 0, 2, 0, 0, 4, 4, 2, 0, 3, 2,
+ 3, 2, 1, 1, 2, 1, 2, 1, 2, 2,
+ 2, 0, 3, 0, 1, 1, 3, 1, 3, 1,
+ 3, 0, 1, 0, 2, 4, 5, 1, 1, 1,
+ 1, 4, 1, 3, 3, 3, 0, 6, 0, 6,
+ 0, 8, 4, 0, 8, 0, 10, 6, 0, 8,
+ 0, 10, 6, 1, 2, 2, 0, 4, 3, 5,
+ 2, 0, 0, 7, 1, 0, 0, 6, 0, 3,
+ 0, 0, 5, 0, 1, 0, 1, 0, 2, 3,
+ 3, 1, 1, 0, 7, 0, 7, 1, 2, 0,
+ 0, 2, 0, 2, 0, 1, 1, 1, 1, 3,
+ 1, 3, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 0, 1,
- 1, 0, 2, 0, 1, 0, 0, 3, 0, 0,
- 3, 2, 0, 0, 4, 4, 2, 0, 1, 1,
- 3, 3, 1, 2, 0, 1, 0, 4, 4, 2,
- 0, 1, 1, 0, 1, 0, 1, 2, 5, 4,
- 1, 3, 3, 1, 1, 1, 1, 1, 1, 0,
- 2, 3, 4, 1, 2, 2, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 0, 1, 1,
+ 0, 2, 0, 1, 0, 0, 3, 0, 0, 3,
+ 2, 0, 0, 4, 4, 2, 0, 1, 1, 3,
+ 3, 1, 2, 0, 1, 0, 4, 4, 2, 0,
+ 1, 1, 0, 1, 0, 1, 2, 5, 4, 1,
+ 3, 3, 1, 1, 1, 1, 1, 1, 0, 2,
+ 3, 4, 1, 2, 2, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 0, 0, 6, 0, 1, 3, 1, 3,
- 0, 2, 3, 1, 2, 1, 0, 3, 0, 0,
- 7, 2, 1, 0, 3, 0, 7, 0, 6, 4,
- 6, 4, 4, 4, 0, 6, 4, 4, 5, 6,
- 4, 1, 3, 1, 1, 3, 1, 0, 2, 0,
- 1, 0, 0, 8, 0, 0, 6, 0, 1, 1,
- 1, 1, 1, 2, 1, 1, 1, 3, 4, 0,
- 3, 3, 1, 2, 2, 0, 3, 0, 5, 3,
- 1, 3, 1, 3, 1, 1, 0, 1, 0, 4,
- 0, 1, 3, 1, 1, 1, 0, 0, 6, 0,
- 0, 11, 3, 1, 3, 3, 1, 3, 0, 1,
- 0, 4, 0, 6, 0, 5, 0, 6, 1, 3,
- 2, 4, 0, 2, 0, 2, 1, 1, 1, 0,
- 4, 0, 1, 0, 1, 1, 3, 1, 1, 2,
- 2, 2, 1, 1, 1, 1, 0, 3, 0, 3,
- 2, 4, 4, 3, 4, 4, 1, 3, 3, 6,
- 2, 2, 0, 6, 0, 6, 5, 2, 1, 1,
- 1, 5, 5, 2, 2, 1, 4, 3, 2, 3,
- 2, 2, 1, 3, 4, 3, 3, 2, 2, 1,
- 1, 1, 1, 3, 3, 3, 3, 3, 3, 3,
- 3, 1, 1, 1, 1, 1, 0, 1, 0, 2,
- 0, 1, 1, 1, 0, 2, 0, 2, 0, 2,
- 2, 0, 4, 0, 4, 1, 1, 0, 1, 1,
- 0, 1, 1, 0, 4, 0, 0, 5, 1, 0,
- 4, 3, 1, 2, 2, 2, 2, 2, 2, 2,
+ 1, 0, 0, 6, 0, 1, 3, 1, 3, 0,
+ 2, 3, 1, 2, 1, 0, 3, 0, 0, 7,
+ 2, 1, 0, 3, 0, 7, 0, 6, 4, 6,
+ 4, 4, 4, 0, 6, 4, 4, 5, 6, 4,
+ 1, 3, 1, 1, 3, 1, 0, 2, 0, 1,
+ 0, 0, 8, 0, 0, 6, 0, 1, 1, 1,
+ 1, 1, 2, 1, 1, 1, 3, 4, 0, 3,
+ 3, 1, 2, 2, 0, 3, 0, 5, 3, 1,
+ 3, 1, 3, 1, 1, 0, 1, 0, 4, 0,
+ 1, 3, 1, 1, 1, 0, 0, 6, 0, 0,
+ 11, 3, 1, 3, 3, 1, 3, 0, 1, 0,
+ 4, 0, 6, 0, 5, 0, 6, 1, 3, 2,
+ 4, 0, 2, 0, 2, 1, 1, 1, 0, 4,
+ 0, 1, 0, 1, 1, 3, 1, 1, 2, 2,
+ 2, 1, 1, 1, 1, 0, 3, 0, 3, 2,
+ 4, 4, 3, 4, 4, 1, 3, 3, 6, 2,
+ 2, 0, 6, 0, 6, 5, 2, 1, 1, 1,
+ 5, 5, 2, 2, 1, 4, 3, 2, 3, 2,
+ 2, 1, 3, 4, 3, 3, 2, 2, 1, 1,
+ 1, 1, 3, 3, 3, 3, 3, 3, 3, 3,
+ 1, 1, 1, 1, 1, 0, 1, 0, 2, 0,
+ 1, 1, 1, 0, 2, 0, 2, 0, 2, 2,
+ 0, 4, 0, 4, 1, 1, 0, 1, 1, 0,
+ 1, 1, 0, 4, 0, 0, 5, 1, 0, 4,
+ 3, 1, 2, 2, 2, 2, 2, 2, 2, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 0, 1, 0, 3, 0, 3, 3, 1,
- 0, 3, 1, 2, 0, 1, 0, 3, 3, 2,
- 2, 0, 5, 0, 1, 1, 0, 1, 1, 1,
- 2, 2, 0, 0, 0, 0, 21, 1, 1, 0,
- 1, 0, 1, 1, 0, 1, 1, 0, 2, 2,
- 1, 3, 4, 3, 3, 0, 2, 2, 1, 3,
- 3, 0, 4, 0, 3, 1, 1, 0, 3, 2,
- 3, 1, 1, 2, 0, 2, 3, 1, 5, 1,
- 1, 2, 2, 1, 1, 1, 1, 1, 1, 2,
- 2, 1, 1, 1, 1, 1, 1, 1, 1, 2,
- 2, 2, 2, 2, 1, 1, 1, 1, 1, 1,
- 1, 3, 5, 1, 1, 1, 1, 1, 3, 4,
- 5, 1, 5, 3, 2, 1, 3, 2, 2, 4,
+ 1, 0, 1, 0, 3, 0, 3, 3, 1, 0,
+ 3, 1, 2, 0, 1, 0, 3, 3, 2, 2,
+ 0, 5, 0, 1, 1, 0, 1, 1, 1, 2,
+ 2, 0, 0, 0, 0, 21, 1, 1, 0, 1,
+ 0, 1, 1, 0, 1, 1, 0, 2, 2, 1,
+ 3, 4, 3, 3, 0, 2, 2, 1, 3, 3,
+ 0, 4, 0, 3, 1, 1, 0, 3, 2, 3,
+ 1, 1, 2, 0, 2, 3, 1, 5, 1, 1,
+ 2, 2, 1, 1, 1, 1, 1, 1, 2, 2,
+ 1, 1, 1, 1, 1, 1, 1, 1, 2, 2,
+ 2, 2, 2, 1, 1, 1, 1, 1, 1, 1,
+ 3, 5, 1, 1, 1, 1, 1, 3, 4, 5,
+ 1, 5, 3, 2, 1, 3, 2, 2, 4, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 3, 2, 1, 1, 1, 1,
+ 1, 1, 1, 3, 2, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -4707,39 +4714,39 @@ static const yytype_uint8 yyr2[] =
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 0, 4,
- 0, 1, 1, 3, 0, 2, 1, 1, 1, 1,
- 0, 1, 0, 1, 1, 1, 0, 2, 2, 2,
- 1, 2, 4, 5, 4, 6, 2, 3, 3, 3,
- 5, 1, 3, 3, 2, 2, 2, 1, 1, 4,
- 4, 1, 1, 1, 1, 1, 0, 4, 1, 1,
- 1, 1, 1, 3, 3, 1, 1, 2, 2, 2,
- 0, 3, 4, 3, 0, 7, 1, 2, 1, 1,
- 1, 1, 1, 1, 0, 5, 1, 1, 1, 1,
- 1, 3, 6, 6, 6, 7, 5, 3, 8, 8,
- 8, 6, 0, 1, 1, 2, 0, 1, 1, 3,
- 0, 3, 0, 3, 0, 3, 0, 3, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 0, 4, 0,
+ 1, 1, 3, 0, 2, 1, 1, 1, 1, 0,
+ 1, 0, 1, 1, 1, 0, 2, 2, 2, 1,
+ 2, 4, 5, 4, 6, 2, 3, 3, 3, 5,
+ 1, 3, 3, 2, 2, 2, 1, 1, 4, 4,
+ 1, 1, 1, 1, 1, 0, 4, 1, 1, 1,
+ 3, 3, 1, 1, 2, 2, 2, 0, 3, 4,
+ 3, 0, 7, 1, 2, 1, 1, 1, 1, 1,
+ 1, 0, 5, 1, 1, 1, 1, 1, 3, 6,
+ 6, 6, 7, 5, 3, 8, 8, 8, 6, 0,
+ 1, 1, 2, 0, 1, 1, 3, 0, 3, 0,
+ 3, 0, 3, 0, 3, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 2, 2, 1, 3,
+ 2, 2, 2, 2, 2, 2, 2, 2, 1, 1,
+ 2, 0, 1, 3, 1, 2, 2, 2, 1, 3,
+ 3, 1, 1, 3, 1, 3, 1, 1, 1, 1,
+ 4, 5, 4, 6, 1, 0, 3, 3, 1, 1,
+ 0, 2, 2, 2, 2, 0, 2, 0, 3, 2,
+ 1, 2, 2, 2, 2, 2, 0, 3, 0, 1,
+ 0, 3, 2, 0, 1, 2, 0, 1, 4, 4,
+ 5, 2, 3, 0, 1, 0, 4, 0, 1, 1,
+ 0, 1, 0, 2, 2, 1, 0, 1, 1, 2,
+ 3, 2, 0, 6, 3, 0, 0, 0, 1, 2,
1, 1, 1, 1, 1, 1, 1, 1, 1, 2,
- 2, 1, 3, 2, 2, 2, 2, 2, 2, 2,
- 2, 1, 1, 2, 0, 1, 3, 1, 2, 2,
- 2, 1, 3, 3, 1, 1, 3, 1, 3, 1,
- 1, 1, 1, 4, 5, 4, 6, 1, 0, 3,
- 3, 1, 1, 0, 2, 2, 2, 2, 0, 2,
- 0, 3, 2, 1, 2, 2, 2, 2, 2, 0,
- 3, 0, 1, 0, 3, 2, 0, 1, 2, 0,
- 1, 4, 4, 5, 2, 3, 0, 1, 0, 4,
- 0, 1, 1, 0, 1, 0, 2, 2, 1, 0,
- 1, 1, 2, 3, 2, 0, 6, 3, 0, 0,
- 0, 1, 2, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 2, 2, 3, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 0, 3,
- 1, 2, 1, 2, 3, 3, 3, 0, 3, 3,
- 0, 7, 0, 3, 1, 3, 0, 3, 2, 4,
- 0, 3, 4, 4, 0, 0, 0, 16, 8, 7,
- 0, 0, 0, 0, 0, 15, 0, 0, 0, 0,
- 12, 4, 4, 3, 4, 3, 2, 1, 3, 5,
- 1, 1, 0, 1, 1, 0, 2, 0, 0, 3,
- 0, 2, 5, 3, 3, 3, 1
+ 2, 3, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 0, 3, 1, 2, 1,
+ 2, 3, 3, 3, 0, 3, 3, 0, 7, 0,
+ 3, 1, 3, 0, 3, 2, 4, 0, 3, 4,
+ 4, 0, 0, 0, 16, 8, 7, 0, 0, 0,
+ 0, 0, 15, 0, 0, 0, 0, 12, 4, 4,
+ 3, 4, 3, 2, 1, 3, 5, 1, 1, 0,
+ 1, 1, 0, 2, 0, 0, 3, 0, 2, 5,
+ 3, 3, 3, 1
};
/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -4747,1921 +4754,1920 @@ static const yytype_uint8 yyr2[] =
means the default is an error. */
static const yytype_uint16 yydefact[] =
{
- 0, 956, 1026, 2499, 0, 0, 0, 0, 0, 0,
- 2501, 115, 64, 1670, 1785, 1786, 1583, 1609, 2, 0,
- 1026, 165, 0, 76, 1611, 0, 1841, 0, 0, 1026,
- 0, 444, 0, 1836, 0, 0, 1026, 1614, 1826, 239,
- 165, 2501, 0, 1072, 2320, 1708, 0, 0, 0, 0,
- 1691, 0, 2380, 1659, 0, 0, 2636, 0, 0, 3,
+ 0, 956, 1035, 2506, 0, 0, 0, 0, 0, 1019,
+ 2508, 115, 64, 1679, 1794, 1795, 1592, 1618, 2, 0,
+ 1035, 165, 0, 76, 1620, 0, 1850, 0, 0, 1035,
+ 0, 444, 0, 1845, 0, 0, 1035, 1623, 1835, 239,
+ 165, 2508, 0, 1081, 2329, 1717, 0, 0, 0, 0,
+ 1700, 0, 2387, 1668, 0, 0, 2643, 0, 0, 3,
8, 19, 0, 40, 24, 28, 14, 18, 13, 53,
47, 38, 37, 10, 55, 56, 16, 44, 11, 12,
- 15, 36, 43, 32, 39, 51, 1063, 22, 23, 29,
- 45, 60, 20, 57, 54, 21, 1787, 25, 46, 41,
+ 15, 36, 43, 32, 39, 51, 1072, 22, 23, 29,
+ 45, 60, 20, 57, 54, 21, 1796, 25, 46, 41,
33, 61, 34, 52, 35, 59, 27, 48, 26, 9,
17, 49, 50, 42, 62, 30, 58, 31, 0, 890,
- 0, 0, 0, 0, 0, 0, 0, 958, 873, 2566,
- 2567, 2568, 1028, 1027, 0, 2501, 1953, 1011, 1037, 2025,
- 2026, 2027, 2028, 2029, 2030, 2031, 2032, 1967, 2033, 2034,
- 2036, 2035, 2037, 2038, 1968, 1969, 2039, 2040, 2041, 2043,
- 2042, 2044, 1970, 1971, 2045, 2046, 2047, 2048, 1972, 1974,
- 1973, 2049, 2052, 2051, 2050, 1975, 2053, 2054, 2055, 2057,
- 1976, 1977, 1978, 1979, 1980, 1981, 2056, 1982, 2058, 1983,
- 2059, 2060, 2061, 2062, 2063, 2064, 2065, 2067, 2066, 1984,
- 2068, 2069, 2070, 2071, 2072, 2074, 2073, 2075, 2076, 2077,
- 1985, 2078, 2079, 2080, 2081, 2082, 2083, 2084, 1986, 2085,
- 2086, 2087, 2104, 1987, 2088, 2091, 2090, 2089, 2092, 2093,
- 2094, 2096, 2095, 2097, 1988, 1989, 2098, 2099, 2100, 2102,
- 2101, 2106, 2107, 2108, 1990, 2103, 2105, 2296, 2109, 2110,
- 2112, 2111, 2113, 2115, 2114, 1991, 2117, 2116, 1992, 1993,
- 2118, 2119, 1951, 2120, 1952, 2121, 2124, 2125, 2122, 2126,
- 2131, 1994, 2123, 2127, 2128, 2129, 2130, 2132, 1995, 2134,
- 2133, 2135, 2136, 2137, 2138, 2139, 2140, 2141, 2142, 2143,
- 2154, 2147, 2149, 2150, 2152, 2148, 2153, 2157, 2156, 2158,
- 2159, 2160, 2155, 2145, 2151, 2146, 2161, 2162, 2144, 2163,
- 2164, 2165, 2166, 2167, 2168, 2169, 2170, 2171, 2172, 2173,
- 2175, 2174, 2176, 2177, 2178, 2179, 2180, 2181, 2182, 2184,
- 2183, 2185, 2186, 2187, 2189, 2188, 2191, 2192, 1996, 2190,
- 2193, 2194, 2195, 2196, 2197, 2198, 1997, 1999, 1998, 2000,
- 2199, 2200, 2001, 2201, 2202, 2203, 2002, 2204, 2205, 2206,
- 2208, 2207, 2209, 2210, 2003, 2004, 2211, 2212, 2213, 2214,
- 2215, 2216, 2217, 2218, 2219, 2220, 2221, 2222, 2223, 2224,
- 2226, 2225, 2227, 2228, 2229, 2230, 2231, 2232, 2233, 2005,
- 2234, 2006, 2235, 2236, 2007, 2237, 2008, 2238, 2239, 2009,
- 2240, 2241, 2242, 2243, 2244, 2245, 2010, 2246, 2247, 2248,
- 2011, 2250, 2249, 2251, 2012, 2253, 2254, 2013, 2252, 2015,
- 2255, 2256, 2014, 2257, 2016, 2258, 2259, 2261, 2260, 2262,
- 2263, 2264, 2017, 2265, 2018, 2266, 2267, 2268, 2269, 2270,
- 2272, 2271, 2273, 2274, 2275, 2276, 2279, 2281, 2278, 2280,
- 2277, 2282, 2283, 2284, 2285, 2289, 2290, 2291, 2292, 2286,
- 2287, 2288, 2019, 2293, 2294, 2295, 2297, 2298, 2300, 2299,
- 2020, 2021, 2301, 2302, 2024, 2303, 2304, 2305, 2309, 2306,
- 2317, 2307, 2308, 2311, 2310, 2312, 2313, 2022, 2314, 2023,
- 2315, 2316, 184, 1956, 167, 1957, 1966, 0, 2369, 2368,
- 994, 2371, 2370, 1012, 2502, 2503, 540, 819, 0, 0,
- 820, 0, 539, 818, 165, 2568, 120, 0, 536, 537,
- 0, 0, 0, 1684, 0, 1607, 1607, 1607, 0, 0,
- 1607, 1607, 0, 1610, 1607, 165, 1607, 0, 69, 1793,
- 0, 0, 0, 0, 1950, 0, 1617, 0, 0, 1843,
- 1857, 0, 1858, 1852, 2366, 0, 1097, 0, 0, 0,
- 0, 165, 1029, 0, 1668, 0, 229, 238, 240, 241,
- 237, 0, 2503, 2514, 1064, 1070, 1082, 2321, 2318, 1770,
- 241, 983, 983, 983, 981, 983, 1692, 1689, 0, 0,
- 0, 1668, 1851, 2620, 0, 0, 0, 2616, 0, 2621,
- 0, 1072, 0, 0, 1, 5, 0, 0, 2099, 2203,
- 1783, 1781, 1945, 0, 864, 891, 0, 869, 0, 867,
- 1962, 1961, 1960, 0, 880, 879, 877, 0, 405, 0,
- 962, 963, 957, 959, 961, 0, 2577, 871, 1009, 2500,
- 0, 186, 0, 78, 0, 0, 0, 2506, 0, 0,
- 0, 0, 119, 0, 0, 0, 116, 1097, 1097, 2568,
- 2570, 2572, 540, 538, 0, 0, 0, 1688, 1687, 1686,
- 0, 1684, 2026, 1967, 2038, 0, 1918, 0, 0, 0,
- 1372, 0, 1972, 0, 2053, 2055, 1976, 1977, 1978, 1979,
- 1980, 1981, 1984, 0, 0, 1107, 1107, 1104, 0, 0,
- 0, 2076, 2077, 1927, 0, 0, 0, 1914, 1928, 2112,
- 2113, 0, 1916, 1917, 2119, 0, 0, 0, 2133, 0,
- 2138, 1925, 0, 0, 2170, 2172, 0, 0, 2176, 2177,
- 2178, 2179, 1900, 1162, 0, 1104, 1913, 1924, 2195, 1907,
- 2204, 2209, 2210, 0, 2219, 0, 0, 0, 2244, 2248,
- 0, 0, 2269, 0, 0, 1104, 1899, 2289, 2290, 2291,
- 2292, 0, 1915, 2019, 1926, 0, 2303, 1107, 1104, 1104,
- 0, 0, 0, 2312, 2316, 0, 0, 0, 2538, 1161,
- 0, 1334, 0, 1366, 1119, 1125, 1139, 0, 1154, 1188,
- 1189, 1191, 1289, 1190, 1196, 1195, 1584, 1911, 1194, 1193,
- 1912, 1187, 1935, 1956, 1934, 0, 0, 0, 0, 0,
- 0, 0, 0, 1766, 0, 0, 1594, 1607, 71, 0,
- 2416, 2431, 2432, 2428, 2433, 2451, 2434, 2438, 0, 2430,
- 2422, 0, 2437, 0, 2426, 2435, 0, 2420, 0, 2436,
- 2441, 2452, 2424, 2429, 2407, 0, 2414, 2418, 1947, 1478,
- 2383, 2384, 0, 77, 1619, 1620, 1618, 954, 0, 2633,
- 1844, 1845, 1846, 0, 1861, 0, 1024, 0, 0, 454,
- 445, 0, 1765, 1764, 0, 1837, 2515, 0, 0, 999,
- 1622, 1669, 0, 1621, 1832, 0, 1830, 1827, 1829, 230,
- 0, 0, 260, 2416, 0, 2401, 0, 2509, 2506, 2516,
- 2551, 2546, 2545, 2548, 2549, 1088, 2550, 1087, 2547, 2544,
- 1097, 1083, 1085, 1086, 2324, 1728, 0, 753, 0, 1749,
- 1778, 1729, 0, 0, 1778, 0, 1513, 1768, 1771, 0,
- 2333, 1742, 816, 815, 1752, 814, 2334, 1764, 0, 1716,
- 1730, 0, 1693, 1735, 0, 2335, 0, 1767, 1751, 0,
- 1750, 1513, 1778, 0, 1709, 0, 0, 0, 0, 236,
- 977, 987, 979, 974, 0, 980, 976, 0, 2634, 2635,
- 2381, 954, 1906, 1904, 1905, 1954, 2617, 1903, 2625, 2627,
- 2613, 2615, 2622, 1066, 0, 2520, 6, 63, 0, 1790,
- 2575, 2576, 2574, 769, 0, 1107, 1963, 2569, 168, 878,
+ 0, 0, 0, 0, 0, 0, 0, 958, 873, 2573,
+ 2574, 2575, 1037, 1036, 0, 2508, 1962, 1015, 1046, 2034,
+ 2035, 2036, 2037, 2038, 2039, 2040, 2041, 1976, 2042, 2043,
+ 2045, 2044, 2046, 2047, 1977, 1978, 2048, 2049, 2050, 2052,
+ 2051, 2053, 1979, 1980, 2054, 2055, 2056, 2057, 1981, 1983,
+ 1982, 2058, 2061, 2060, 2059, 1984, 2062, 2063, 2064, 2066,
+ 1985, 1986, 1987, 1988, 1989, 1990, 2065, 1991, 2067, 1992,
+ 2068, 2069, 2070, 2071, 2072, 2073, 2074, 2076, 2075, 1993,
+ 2077, 2078, 2079, 2080, 2081, 2083, 2082, 2084, 2085, 2086,
+ 1994, 2087, 2088, 2089, 2090, 2091, 2092, 2093, 1995, 2094,
+ 2095, 2096, 2113, 1996, 2097, 2100, 2099, 2098, 2101, 2102,
+ 2103, 2105, 2104, 2106, 1997, 1998, 2107, 2108, 2109, 2111,
+ 2110, 2115, 2116, 2117, 1999, 2112, 2114, 2305, 2118, 2119,
+ 2121, 2120, 2122, 2124, 2123, 2000, 2126, 2125, 2001, 2002,
+ 2127, 2128, 1960, 2129, 1961, 2130, 2133, 2134, 2131, 2135,
+ 2140, 2003, 2132, 2136, 2137, 2138, 2139, 2141, 2004, 2143,
+ 2142, 2144, 2145, 2146, 2147, 2148, 2149, 2150, 2151, 2152,
+ 2163, 2156, 2158, 2159, 2161, 2157, 2162, 2166, 2165, 2167,
+ 2168, 2169, 2164, 2154, 2160, 2155, 2170, 2171, 2153, 2172,
+ 2173, 2174, 2175, 2176, 2177, 2178, 2179, 2180, 2181, 2182,
+ 2184, 2183, 2185, 2186, 2187, 2188, 2189, 2190, 2191, 2193,
+ 2192, 2194, 2195, 2196, 2198, 2197, 2200, 2201, 2005, 2199,
+ 2202, 2203, 2204, 2205, 2206, 2207, 2006, 2008, 2007, 2009,
+ 2208, 2209, 2010, 2210, 2211, 2212, 2011, 2213, 2214, 2215,
+ 2217, 2216, 2218, 2219, 2012, 2013, 2220, 2221, 2222, 2223,
+ 2224, 2225, 2226, 2227, 2228, 2229, 2230, 2231, 2232, 2233,
+ 2235, 2234, 2236, 2237, 2238, 2239, 2240, 2241, 2242, 2014,
+ 2243, 2015, 2244, 2245, 2016, 2246, 2017, 2247, 2248, 2018,
+ 2249, 2250, 2251, 2252, 2253, 2254, 2019, 2255, 2256, 2257,
+ 2020, 2259, 2258, 2260, 2021, 2262, 2263, 2022, 2261, 2024,
+ 2264, 2265, 2023, 2266, 2025, 2267, 2268, 2270, 2269, 2271,
+ 2272, 2273, 2026, 2274, 2027, 2275, 2276, 2277, 2278, 2279,
+ 2281, 2280, 2282, 2283, 2284, 2285, 2288, 2290, 2287, 2289,
+ 2286, 2291, 2292, 2293, 2294, 2298, 2299, 2300, 2301, 2295,
+ 2296, 2297, 2028, 2302, 2303, 2304, 2306, 2307, 2309, 2308,
+ 2029, 2030, 2310, 2311, 2033, 2312, 2313, 2314, 2318, 2315,
+ 2326, 2316, 2317, 2320, 2319, 2321, 2322, 2031, 2323, 2032,
+ 2324, 2325, 184, 1965, 167, 1966, 1975, 0, 2378, 2377,
+ 994, 0, 2509, 2510, 540, 819, 0, 0, 820, 0,
+ 539, 818, 165, 2575, 120, 0, 536, 537, 0, 0,
+ 0, 1693, 0, 1616, 1616, 1616, 0, 0, 1616, 1616,
+ 0, 1619, 1616, 165, 1616, 0, 69, 1802, 0, 0,
+ 0, 0, 1959, 0, 1626, 0, 0, 1852, 1866, 0,
+ 1867, 1861, 2375, 0, 1106, 0, 0, 0, 0, 165,
+ 1038, 1002, 1677, 0, 229, 238, 240, 241, 237, 0,
+ 2510, 2521, 1073, 1079, 1091, 2330, 2327, 1779, 241, 983,
+ 983, 983, 981, 983, 1701, 1698, 0, 0, 0, 1677,
+ 1860, 2627, 0, 0, 0, 2623, 0, 2628, 0, 1081,
+ 0, 0, 1, 5, 0, 0, 2108, 2212, 1792, 1790,
+ 1954, 0, 864, 891, 0, 869, 0, 867, 1971, 1970,
+ 1969, 0, 880, 879, 877, 0, 405, 0, 962, 963,
+ 957, 959, 961, 0, 2584, 871, 1013, 2507, 0, 186,
+ 0, 78, 0, 1017, 1020, 0, 0, 2513, 0, 0,
+ 0, 0, 119, 0, 0, 0, 116, 1106, 1106, 2575,
+ 2577, 2579, 540, 538, 0, 0, 0, 1697, 1696, 1695,
+ 0, 1693, 2035, 1976, 2047, 0, 1927, 0, 0, 0,
+ 1381, 0, 1981, 0, 2062, 2064, 1985, 1986, 1987, 1988,
+ 1989, 1990, 1993, 0, 0, 1116, 1116, 1113, 0, 0,
+ 0, 2085, 2086, 1936, 0, 0, 0, 1923, 1937, 2121,
+ 2122, 0, 1925, 1926, 2128, 0, 0, 0, 2142, 0,
+ 2147, 1934, 0, 0, 2179, 2181, 0, 0, 2185, 2186,
+ 2187, 2188, 1909, 1171, 0, 1113, 1922, 1933, 2204, 1916,
+ 2213, 2218, 2219, 0, 2228, 0, 0, 0, 2253, 2257,
+ 0, 0, 2278, 0, 0, 1113, 1908, 2298, 2299, 2300,
+ 2301, 0, 1924, 2028, 1935, 0, 2312, 1116, 1113, 1113,
+ 0, 0, 0, 2321, 2325, 0, 0, 0, 2545, 1170,
+ 0, 1343, 0, 1375, 1128, 1134, 1148, 0, 1163, 1197,
+ 1198, 1200, 1298, 1199, 1205, 1204, 1593, 1920, 1203, 1202,
+ 1921, 1196, 1944, 1965, 1943, 0, 0, 0, 0, 0,
+ 0, 0, 0, 1775, 0, 0, 1603, 1616, 71, 0,
+ 2423, 2438, 2439, 2435, 2440, 2458, 2441, 2445, 0, 2437,
+ 2429, 0, 2444, 0, 2433, 2442, 0, 2427, 0, 2443,
+ 2448, 2459, 2431, 2436, 2414, 0, 2421, 2425, 1956, 1487,
+ 2390, 2391, 0, 77, 1628, 1629, 1627, 954, 0, 2640,
+ 1853, 1854, 1855, 0, 1870, 0, 1033, 0, 0, 454,
+ 445, 0, 1774, 1773, 0, 1846, 2522, 0, 0, 0,
+ 1631, 1678, 0, 1630, 1841, 0, 1839, 1836, 1838, 230,
+ 0, 0, 260, 2423, 0, 2408, 0, 2516, 2513, 2523,
+ 2558, 2553, 2552, 2555, 2556, 1097, 2557, 1096, 2554, 2551,
+ 1106, 1092, 1094, 1095, 2333, 1737, 0, 753, 0, 1758,
+ 1787, 1738, 0, 0, 1787, 0, 1522, 1777, 1780, 0,
+ 2342, 1751, 816, 815, 1761, 814, 2343, 1773, 0, 1725,
+ 1739, 0, 1702, 1744, 0, 2344, 0, 1776, 1760, 0,
+ 1759, 1522, 1787, 0, 1718, 0, 0, 0, 0, 236,
+ 977, 987, 979, 974, 0, 980, 976, 0, 2641, 2642,
+ 2388, 954, 1915, 1913, 1914, 1963, 2624, 1912, 2632, 2634,
+ 2620, 2622, 2629, 1075, 0, 2527, 6, 63, 0, 1799,
+ 2582, 2583, 2581, 769, 0, 1116, 1972, 2576, 168, 878,
0, 406, 168, 0, 0, 0, 0, 0, 407, 408,
- 344, 862, 960, 875, 0, 0, 874, 2577, 0, 0,
- 1039, 1041, 1040, 1057, 188, 185, 166, 0, 996, 1601,
- 1603, 1014, 2505, 0, 0, 2507, 2511, 1160, 1159, 0,
- 113, 118, 0, 0, 0, 2477, 117, 2467, 2573, 1097,
- 1097, 1097, 2565, 0, 2553, 2560, 2561, 2564, 2563, 2562,
- 2559, 0, 2552, 2555, 2556, 2558, 2557, 2577, 2571, 0,
- 821, 821, 821, 0, 1671, 1674, 1678, 1682, 1685, 0,
- 0, 1483, 1209, 1483, 1483, 1483, 1373, 0, 0, 0,
+ 344, 862, 960, 875, 0, 0, 874, 2584, 0, 0,
+ 1048, 1050, 1049, 1066, 188, 185, 166, 0, 996, 1610,
+ 1612, 0, 1021, 2512, 0, 0, 2514, 2518, 1169, 1168,
+ 0, 113, 118, 0, 0, 0, 2484, 117, 2474, 2580,
+ 1106, 1106, 1106, 2572, 0, 2560, 2567, 2568, 2571, 2570,
+ 2569, 2566, 0, 2559, 2562, 2563, 2565, 2564, 2584, 2578,
+ 0, 821, 821, 821, 0, 1680, 1683, 1687, 1691, 1694,
+ 0, 0, 1492, 1218, 1492, 1492, 1492, 1382, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 1483, 0, 1246, 1219, 0, 1247, 0, 0, 0,
- 0, 0, 1921, 0, 0, 2538, 0, 0, 0, 1339,
- 0, 0, 0, 2538, 0, 0, 0, 0, 0, 0,
- 1368, 1370, 1934, 1483, 0, 0, 1483, 0, 0, 0,
- 0, 0, 1112, 1252, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1483, 1483, 0, 0, 1483,
- 1260, 0, 1923, 0, 0, 0, 1922, 0, 0, 1920,
- 750, 751, 1901, 1919, 0, 1263, 1265, 1264, 0, 1483,
- 1483, 0, 0, 1199, 1198, 1200, 0, 0, 0, 0,
- 0, 0, 1158, 1157, 1156, 1155, 0, 0, 0, 1163,
- 0, 1164, 1165, 0, 1166, 1167, 1168, 0, 0, 0,
+ 0, 0, 1492, 0, 1255, 1228, 0, 1256, 0, 0,
+ 0, 0, 0, 1930, 0, 0, 2545, 0, 0, 0,
+ 1348, 0, 0, 0, 2545, 0, 0, 0, 0, 0,
+ 0, 1377, 1379, 1943, 1492, 0, 0, 1492, 0, 0,
+ 0, 0, 0, 1121, 1261, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 1492, 1492, 0, 0,
+ 1492, 1269, 0, 1932, 0, 0, 0, 1931, 0, 0,
+ 1929, 750, 751, 1910, 1928, 0, 1272, 1274, 1273, 0,
+ 1492, 1492, 0, 0, 1208, 1207, 1209, 0, 0, 0,
+ 0, 0, 0, 1167, 1166, 1165, 1164, 0, 0, 0,
+ 1172, 0, 1173, 1174, 0, 1175, 1176, 1177, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1201, 0, 0, 0,
- 1902, 1298, 0, 1608, 1589, 1596, 1591, 0, 1766, 1592,
- 1600, 419, 0, 1597, 2465, 1593, 0, 1585, 0, 70,
- 0, 1815, 1820, 0, 0, 0, 1810, 1818, 1812, 1819,
- 1811, 0, 0, 1821, 1814, 0, 1813, 1817, 1816, 1794,
- 1798, 1802, 1795, 2417, 2415, 2449, 2448, 2453, 0, 2450,
- 2446, 2439, 2478, 2443, 0, 2478, 2445, 2444, 2478, 2440,
- 2447, 2478, 2412, 0, 1479, 1480, 0, 2382, 0, 1946,
- 955, 0, 0, 1847, 1848, 0, 1047, 1862, 1863, 1859,
- 1478, 2367, 2372, 0, 640, 1098, 455, 0, 0, 466,
- 0, 0, 66, 67, 0, 1031, 0, 1030, 1034, 0,
- 0, 0, 1625, 1615, 1624, 1833, 1834, 0, 228, 253,
- 248, 256, 250, 252, 251, 257, 258, 259, 254, 249,
- 255, 242, 0, 2415, 0, 2412, 2510, 0, 2512, 2529,
- 1071, 2517, 1094, 1073, 1093, 0, 1084, 2319, 2322, 2330,
- 1774, 752, 0, 0, 1741, 0, 540, 0, 0, 0,
- 0, 0, 0, 1710, 0, 0, 583, 0, 1734, 1514,
- 1772, 1773, 1778, 0, 0, 1778, 0, 1747, 1768, 0,
- 1778, 1705, 0, 0, 1697, 1702, 1698, 0, 1704, 1703,
- 1706, 1694, 1695, 1774, 1721, 1748, 1768, 1733, 1740, 0,
- 1720, 1727, 0, 1738, 1768, 1768, 1778, 1778, 990, 989,
- 988, 984, 985, 990, 0, 1690, 1407, 0, 0, 2614,
- 2628, 2612, 2623, 2624, 2611, 1067, 2521, 1065, 2522, 0,
- 7, 4, 1784, 1782, 1791, 1792, 770, 769, 531, 534,
- 533, 0, 0, 1965, 0, 870, 0, 1766, 868, 0,
- 0, 1766, 355, 1766, 409, 769, 882, 0, 0, 872,
- 1010, 0, 0, 443, 1057, 1043, 1059, 0, 189, 191,
+ 0, 0, 0, 0, 0, 0, 0, 1210, 0, 0,
+ 0, 1911, 1307, 0, 1617, 1598, 1605, 1600, 0, 1775,
+ 1601, 1609, 419, 0, 1606, 2472, 1602, 0, 1594, 0,
+ 70, 0, 1824, 1829, 0, 0, 0, 1819, 1827, 1821,
+ 1828, 1820, 0, 0, 1830, 1823, 0, 1822, 1826, 1825,
+ 1803, 1807, 1811, 1804, 2424, 2422, 2456, 2455, 2460, 0,
+ 2457, 2453, 2446, 2485, 2450, 0, 2485, 2452, 2451, 2485,
+ 2447, 2454, 2485, 2419, 0, 1488, 1489, 0, 2389, 0,
+ 1955, 955, 0, 0, 1856, 1857, 0, 1056, 1871, 1872,
+ 1868, 1487, 2376, 2379, 0, 640, 1107, 455, 0, 0,
+ 466, 0, 0, 66, 67, 0, 1040, 0, 1039, 1043,
+ 0, 1000, 1003, 0, 0, 1634, 1624, 1633, 1842, 1843,
+ 0, 228, 253, 248, 256, 250, 252, 251, 257, 258,
+ 259, 254, 249, 255, 242, 0, 2422, 0, 2419, 2517,
+ 0, 2519, 2536, 1080, 2524, 1103, 1082, 1102, 0, 1093,
+ 2328, 2331, 2339, 1783, 752, 0, 0, 1750, 0, 540,
+ 0, 0, 0, 0, 0, 0, 1719, 0, 0, 583,
+ 0, 1743, 1523, 1781, 1782, 1787, 0, 0, 1787, 0,
+ 1756, 1777, 0, 1787, 1714, 0, 0, 1706, 1711, 1707,
+ 0, 1713, 1712, 1715, 1703, 1704, 1783, 1730, 1757, 1777,
+ 1742, 1749, 0, 1729, 1736, 0, 1747, 1777, 1777, 1787,
+ 1787, 990, 989, 988, 984, 985, 990, 0, 1699, 1416,
+ 0, 0, 2621, 2635, 2619, 2630, 2631, 2618, 1076, 2528,
+ 1074, 2529, 0, 7, 4, 1793, 1791, 1800, 1801, 770,
+ 769, 531, 534, 533, 0, 0, 1974, 0, 870, 0,
+ 1775, 868, 0, 0, 1775, 355, 1775, 409, 769, 882,
+ 0, 0, 872, 1014, 0, 0, 443, 1066, 1052, 1068,
+ 0, 189, 191, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 79, 80,
- 96, 998, 997, 0, 995, 1022, 1021, 1019, 0, 1020,
- 1018, 1013, 1015, 1016, 2504, 2508, 541, 769, 1766, 0,
- 347, 0, 0, 0, 0, 0, 540, 0, 0, 2554,
- 105, 822, 0, 0, 0, 1676, 1604, 1672, 1606, 1945,
- 0, 0, 0, 1680, 0, 0, 1484, 1483, 0, 1348,
- 0, 0, 0, 0, 1374, 0, 0, 0, 0, 0,
- 0, 0, 1185, 0, 0, 0, 0, 0, 0, 0,
- 1319, 0, 1348, 1108, 1558, 1559, 1543, 1544, 1542, 1545,
- 1105, 0, 1546, 1557, 1276, 0, 0, 0, 0, 0,
- 0, 1454, 1455, 1456, 1457, 1465, 1458, 1459, 1460, 1467,
- 1472, 1461, 1462, 1468, 1469, 1470, 1463, 1471, 1466, 1464,
- 1473, 0, 1453, 0, 1476, 1474, 1477, 1475, 0, 1340,
- 1332, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 1483, 0, 0, 0, 1483, 0, 0,
+ 0, 79, 80, 96, 998, 997, 0, 995, 1031, 1029,
+ 1028, 1026, 0, 1027, 1025, 1016, 1022, 1023, 2511, 2515,
+ 541, 769, 1775, 0, 347, 0, 0, 0, 0, 0,
+ 540, 0, 0, 2561, 105, 822, 0, 0, 0, 1685,
+ 1613, 1681, 1615, 1954, 0, 0, 0, 1689, 0, 0,
+ 1493, 1492, 0, 1357, 0, 0, 0, 0, 1383, 0,
+ 0, 0, 0, 0, 0, 0, 1194, 0, 0, 0,
+ 0, 0, 0, 0, 1328, 0, 1357, 1117, 1567, 1568,
+ 1552, 1553, 1551, 1554, 1114, 0, 1555, 1566, 1285, 0,
+ 0, 0, 0, 0, 0, 1463, 1464, 1465, 1466, 1474,
+ 1467, 1468, 1469, 1476, 1481, 1470, 1471, 1477, 1478, 1479,
+ 1472, 1480, 1475, 1473, 1482, 0, 1462, 0, 1485, 1483,
+ 1486, 1484, 0, 1349, 1341, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1492, 0, 0,
+ 0, 1492, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 1483,
+ 0, 0, 0, 1492, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 1251, 0, 1946, 1945, 0, 0,
+ 0, 0, 1212, 0, 1211, 1425, 0, 2530, 2546, 0,
+ 2345, 1344, 1346, 0, 1119, 1118, 1120, 1131, 1124, 1129,
+ 1122, 1126, 0, 1178, 2041, 1132, 0, 0, 1160, 2545,
+ 1501, 1161, 1146, 1151, 1152, 0, 1149, 1150, 0, 1154,
+ 0, 1153, 1157, 1158, 1159, 1162, 0, 0, 0, 0,
+ 1201, 1206, 1376, 1106, 1947, 0, 1596, 419, 422, 421,
+ 1607, 420, 1655, 0, 964, 0, 0, 72, 74, 1816,
+ 1813, 1812, 1814, 1818, 1817, 1815, 0, 1831, 2449, 0,
+ 2430, 0, 2434, 2428, 2432, 0, 0, 2420, 0, 2426,
+ 1491, 2116, 2197, 0, 1494, 2393, 1621, 2639, 2312, 1858,
+ 1851, 0, 1869, 0, 0, 0, 1034, 641, 0, 1106,
+ 453, 452, 451, 450, 0, 468, 448, 456, 68, 0,
+ 0, 1847, 0, 0, 0, 0, 0, 1004, 1632, 0,
+ 1844, 1840, 1837, 0, 0, 0, 0, 0, 0, 0,
+ 2520, 2538, 2537, 2525, 1106, 1513, 1107, 1107, 1943, 2333,
+ 2336, 2337, 2340, 2338, 0, 2335, 2334, 2349, 0, 1785,
+ 1788, 1789, 0, 0, 1769, 1763, 1762, 1754, 1764, 1755,
+ 1772, 1771, 1770, 1727, 1726, 1535, 1536, 2251, 1534, 1526,
+ 1529, 1533, 1532, 1722, 1778, 1768, 1766, 1752, 1787, 1767,
+ 1765, 1708, 1709, 1710, 0, 1522, 0, 1785, 1787, 1777,
+ 0, 1787, 1787, 1746, 1748, 0, 978, 987, 975, 982,
+ 1434, 1433, 0, 1390, 0, 1392, 1389, 1388, 1387, 0,
+ 1433, 2625, 2633, 2637, 0, 1522, 2535, 2533, 532, 1655,
+ 1655, 0, 1973, 0, 0, 0, 0, 0, 0, 0,
+ 169, 178, 0, 0, 353, 354, 1655, 352, 395, 396,
+ 399, 400, 401, 0, 0, 0, 0, 0, 0, 0,
+ 0, 122, 402, 1655, 1655, 349, 375, 376, 379, 380,
+ 381, 382, 383, 345, 0, 350, 952, 952, 0, 1655,
+ 1655, 952, 1655, 0, 0, 1655, 1655, 0, 0, 1655,
+ 0, 0, 952, 0, 1655, 950, 0, 0, 1655, 1655,
+ 1655, 1655, 952, 0, 0, 1655, 1655, 443, 1655, 0,
+ 0, 970, 0, 0, 1655, 0, 0, 1655, 1655, 0,
+ 1655, 898, 949, 544, 565, 566, 863, 897, 899, 911,
+ 439, 0, 928, 951, 0, 0, 884, 886, 2585, 2586,
+ 2587, 1055, 1047, 1054, 1051, 1066, 1064, 1053, 811, 810,
+ 0, 1067, 187, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1242, 0, 1937, 1936, 0, 0, 0, 0, 1203, 0,
- 1202, 1416, 0, 2523, 2539, 0, 2336, 1335, 1337, 0,
- 1110, 1109, 1111, 1122, 1115, 1120, 1113, 1117, 0, 1169,
- 2032, 1123, 0, 0, 1151, 2538, 1492, 1152, 1137, 1142,
- 1143, 0, 1140, 1141, 0, 1145, 0, 1144, 1148, 1149,
- 1150, 1153, 0, 0, 0, 0, 1192, 1197, 1367, 1097,
- 1938, 0, 1587, 419, 422, 421, 1598, 420, 1646, 0,
- 964, 0, 0, 72, 74, 1807, 1804, 1803, 1805, 1809,
- 1808, 1806, 0, 1822, 2442, 0, 2423, 0, 2427, 2421,
- 2425, 0, 0, 2413, 0, 2419, 1482, 2107, 2188, 0,
- 1485, 2386, 1612, 2632, 2303, 1849, 1842, 0, 1860, 0,
- 0, 0, 1025, 641, 0, 1097, 453, 452, 451, 450,
- 0, 468, 448, 456, 68, 0, 0, 1838, 0, 0,
- 0, 0, 1001, 1623, 0, 1835, 1831, 1828, 0, 0,
- 0, 0, 0, 0, 0, 2513, 2531, 2530, 2518, 1097,
- 1504, 1098, 1098, 1934, 2324, 2327, 2328, 2331, 2329, 0,
- 2326, 2325, 2340, 0, 1776, 1779, 1780, 0, 0, 1760,
- 1754, 1753, 1745, 1755, 1746, 1763, 1762, 1761, 1718, 1717,
- 1526, 1527, 2242, 1525, 1517, 1520, 1524, 1523, 1713, 1769,
- 1759, 1757, 1743, 1778, 1758, 1756, 1699, 1700, 1701, 0,
- 1513, 0, 1776, 1778, 1768, 0, 1778, 1778, 1737, 1739,
- 0, 978, 987, 975, 982, 1425, 1424, 0, 1381, 0,
- 1383, 1380, 1379, 1378, 0, 1424, 2618, 2626, 2630, 0,
- 1513, 2528, 2526, 532, 1646, 1646, 0, 1964, 0, 0,
- 0, 0, 0, 0, 0, 169, 178, 0, 0, 353,
- 354, 1646, 352, 395, 396, 399, 400, 401, 0, 0,
- 0, 0, 0, 0, 0, 0, 122, 402, 1646, 1646,
- 349, 375, 376, 379, 380, 381, 382, 383, 345, 0,
- 350, 952, 952, 0, 1646, 1646, 952, 1646, 0, 0,
- 1646, 1646, 0, 0, 1646, 0, 0, 952, 0, 1646,
- 950, 0, 0, 1646, 1646, 1646, 1646, 952, 0, 0,
- 1646, 1646, 443, 1646, 0, 0, 970, 0, 0, 1646,
- 0, 0, 1646, 1646, 0, 1646, 898, 949, 544, 565,
- 566, 863, 897, 899, 911, 439, 0, 928, 951, 0,
- 0, 884, 886, 2578, 2579, 2580, 1046, 1038, 1045, 1042,
- 1057, 1055, 1044, 811, 810, 0, 1058, 187, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 1602, 1023,
- 1017, 114, 769, 1646, 1646, 1646, 1646, 351, 384, 385,
- 388, 389, 390, 391, 394, 392, 393, 0, 0, 1766,
- 0, 2469, 2470, 0, 2468, 0, 2606, 0, 0, 0,
- 167, 542, 0, 0, 823, 0, 0, 0, 0, 0,
- 1485, 0, 1948, 1679, 1407, 1683, 1682, 0, 1272, 0,
- 1312, 0, 1314, 1315, 1316, 0, 0, 0, 0, 0,
- 1273, 0, 1217, 1274, 1275, 0, 0, 1270, 0, 0,
- 0, 0, 1269, 0, 0, 0, 0, 1318, 0, 1106,
- 0, 0, 1220, 1221, 1214, 1206, 0, 1291, 0, 0,
- 1222, 0, 0, 0, 0, 1278, 0, 1292, 1369, 0,
- 1371, 1938, 0, 1324, 1279, 1227, 0, 1322, 0, 1228,
- 1293, 1294, 1295, 1281, 1282, 0, 1297, 0, 1283, 0,
- 0, 0, 0, 1230, 1328, 1326, 0, 0, 0, 0,
- 1330, 1232, 0, 0, 0, 1231, 0, 0, 0, 0,
- 0, 0, 0, 1234, 0, 1215, 1327, 1329, 1287, 0,
- 1243, 0, 2532, 1415, 2540, 1416, 0, 0, 2534, 2524,
- 2529, 2537, 1207, 0, 0, 0, 0, 0, 1939, 1116,
- 1121, 1114, 1118, 2538, 0, 0, 0, 0, 1135, 1134,
- 0, 0, 0, 2538, 1492, 1138, 0, 0, 1308, 1309,
- 1364, 0, 1590, 1588, 1599, 1644, 1645, 1647, 0, 2466,
- 966, 965, 1595, 964, 75, 0, 1801, 1823, 1796, 2482,
- 0, 2481, 0, 2461, 2464, 1945, 0, 0, 0, 2396,
- 2390, 2397, 2399, 2393, 2398, 2400, 2391, 2392, 2387, 2394,
- 1486, 1515, 0, 1850, 1048, 1050, 1051, 1049, 1057, 0,
- 0, 2375, 2376, 2374, 2373, 458, 0, 467, 0, 479,
- 0, 0, 0, 1840, 1839, 0, 1032, 1035, 1036, 1006,
- 0, 1005, 1007, 1000, 1002, 1003, 524, 1629, 0, 0,
- 0, 1635, 1616, 1626, 0, 2076, 2289, 2292, 243, 246,
- 245, 247, 0, 0, 0, 0, 0, 0, 1092, 1407,
- 1576, 1089, 1077, 1515, 1505, 1076, 1099, 1095, 0, 2323,
- 0, 2286, 2351, 0, 0, 0, 0, 0, 2341, 1775,
- 0, 1722, 0, 1744, 0, 0, 0, 0, 1715, 0,
- 1736, 1696, 1724, 1714, 1485, 1768, 1711, 1712, 992, 991,
- 986, 1424, 1407, 0, 0, 1404, 1426, 0, 1426, 1407,
- 1407, 0, 1407, 1478, 1421, 0, 0, 2629, 1506, 2527,
- 0, 0, 866, 172, 175, 173, 0, 174, 0, 0,
- 404, 403, 0, 1766, 397, 126, 125, 127, 128, 1540,
- 1541, 1537, 1538, 1536, 1539, 130, 129, 124, 881, 0,
- 0, 0, 1766, 377, 356, 357, 360, 361, 362, 953,
- 856, 1026, 932, 0, 621, 856, 807, 812, 812, 930,
- 0, 1026, 0, 0, 0, 0, 0, 1026, 0, 0,
- 0, 1646, 0, 943, 893, 0, 0, 0, 0, 0,
- 944, 0, 894, 1646, 0, 0, 0, 0, 0, 1026,
- 0, 0, 0, 441, 0, 1026, 912, 973, 972, 971,
- 0, 1026, 1026, 0, 571, 572, 570, 0, 0, 0,
- 563, 545, 769, 895, 440, 896, 620, 0, 967, 617,
- 623, 1941, 0, 0, 0, 0, 136, 2582, 0, 1445,
- 190, 97, 86, 82, 101, 1550, 1551, 1549, 1547, 1548,
- 102, 84, 85, 89, 88, 90, 91, 92, 87, 93,
- 83, 94, 103, 104, 81, 0, 0, 0, 0, 1766,
- 386, 0, 0, 1646, 346, 363, 364, 367, 368, 369,
- 370, 371, 374, 372, 373, 0, 2473, 2475, 0, 0,
- 340, 339, 0, 131, 2600, 0, 0, 620, 106, 439,
- 543, 546, 849, 851, 850, 837, 836, 107, 109, 111,
- 1605, 1682, 1407, 1504, 1946, 1485, 0, 1681, 0, 0,
- 1313, 1349, 0, 1375, 0, 1211, 724, 724, 724, 1358,
- 709, 1362, 1353, 724, 1354, 724, 1356, 0, 755, 0,
- 754, 0, 1171, 1186, 0, 0, 0, 0, 0, 0,
- 1320, 1317, 0, 0, 0, 0, 1343, 0, 0, 0,
- 1216, 0, 1303, 1325, 1323, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1331, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 1204,
- 1097, 2541, 2543, 1068, 0, 2533, 2535, 2337, 2338, 2339,
- 858, 1336, 0, 1132, 1128, 0, 1126, 1491, 1147, 1146,
- 0, 0, 0, 1136, 1098, 1299, 1097, 0, 1365, 1940,
- 418, 582, 1586, 73, 1799, 2479, 0, 2490, 0, 0,
- 0, 0, 0, 0, 0, 2385, 1516, 1656, 0, 1057,
- 1061, 1955, 1853, 2378, 2379, 2377, 0, 459, 460, 462,
- 1098, 476, 454, 0, 446, 449, 0, 458, 0, 1008,
- 1004, 1082, 0, 1648, 1633, 1640, 1634, 0, 0, 0,
- 1632, 1930, 1929, 1936, 2516, 0, 0, 2406, 0, 0,
- 0, 2519, 1485, 1485, 1570, 0, 0, 1074, 1079, 1075,
- 1078, 0, 1096, 1103, 1102, 1931, 1938, 0, 0, 0,
- 0, 757, 756, 765, 0, 0, 0, 2336, 0, 761,
- 763, 762, 2346, 760, 1777, 1513, 1732, 1731, 1528, 1519,
- 0, 1522, 1521, 1707, 1513, 1726, 1778, 0, 0, 2523,
- 1419, 0, 1406, 1405, 1427, 0, 1407, 1426, 1426, 0,
- 1386, 1385, 1660, 1663, 0, 1384, 1443, 1409, 1082, 2619,
- 2631, 0, 768, 767, 581, 764, 580, 177, 176, 182,
- 183, 1554, 1555, 1552, 1553, 410, 423, 1556, 424, 398,
- 123, 411, 412, 378, 0, 358, 622, 857, 915, 0,
- 0, 0, 812, 616, 856, 821, 813, 856, 856, 0,
- 0, 555, 552, 934, 558, 913, 905, 914, 925, 927,
- 0, 554, 573, 0, 0, 561, 856, 900, 941, 942,
- 964, 549, 0, 592, 593, 591, 567, 574, 550, 551,
- 936, 0, 1500, 1502, 1510, 557, 556, 1561, 1560, 560,
- 0, 553, 0, 947, 920, 0, 589, 587, 584, 586,
- 585, 590, 588, 562, 559, 575, 910, 0, 952, 952,
- 929, 0, 600, 601, 603, 604, 1944, 0, 969, 931,
- 0, 605, 618, 606, 0, 0, 579, 578, 576, 577,
- 0, 146, 0, 0, 883, 0, 139, 137, 148, 0,
- 0, 0, 1448, 0, 1449, 1446, 1447, 0, 98, 100,
- 417, 416, 415, 414, 387, 0, 0, 0, 1766, 365,
- 2474, 2472, 2471, 0, 0, 2607, 343, 341, 342, 0,
- 0, 192, 598, 599, 597, 596, 0, 427, 0, 2002,
- 425, 0, 438, 0, 1864, 769, 547, 0, 0, 0,
- 0, 1485, 1529, 1949, 1675, 0, 1244, 1376, 0, 0,
- 725, 1350, 777, 1360, 0, 1361, 711, 710, 726, 1352,
- 1355, 1359, 1357, 1210, 1218, 1266, 0, 1184, 1267, 1268,
- 0, 1290, 1213, 1212, 0, 0, 0, 1250, 1251, 0,
- 1341, 0, 0, 1224, 0, 1226, 0, 0, 1305, 1280,
- 1296, 1253, 1284, 0, 1229, 1205, 0, 1254, 0, 1259,
- 1257, 0, 1233, 0, 0, 1240, 0, 1238, 0, 1239,
- 0, 1241, 1286, 1288, 1417, 2542, 1069, 0, 0, 1338,
- 1124, 0, 1133, 1130, 0, 1127, 1099, 1310, 1300, 0,
- 1797, 2480, 0, 2411, 2463, 2462, 2483, 2483, 2483, 0,
- 1487, 0, 1613, 1052, 1057, 1061, 0, 1053, 1864, 463,
- 0, 0, 0, 483, 0, 481, 457, 0, 1033, 1097,
- 1630, 1642, 0, 1650, 0, 0, 1627, 1637, 0, 0,
- 0, 1636, 244, 0, 2403, 2404, 2402, 1515, 1493, 0,
- 0, 1582, 0, 1577, 1090, 0, 1101, 1100, 0, 2353,
- 0, 2352, 2364, 2365, 2362, 2363, 2361, 2342, 0, 2348,
- 2347, 0, 0, 0, 2358, 2349, 0, 0, 1723, 1518,
- 1725, 1719, 993, 2529, 1478, 1411, 1407, 1382, 1407, 1393,
- 0, 0, 1407, 1389, 1387, 1391, 0, 1485, 0, 1408,
- 1440, 1097, 1933, 1507, 1510, 359, 917, 0, 856, 808,
- 809, 821, 0, 821, 821, 0, 0, 904, 0, 1014,
+ 0, 0, 0, 1611, 0, 1018, 1030, 1024, 114, 769,
+ 1655, 1655, 1655, 1655, 351, 384, 385, 388, 389, 390,
+ 391, 394, 392, 393, 0, 0, 1775, 0, 2476, 2477,
+ 0, 2475, 0, 2613, 0, 0, 0, 167, 542, 0,
+ 0, 823, 0, 0, 0, 0, 0, 1494, 0, 1957,
+ 1688, 1416, 1692, 1691, 0, 1281, 0, 1321, 0, 1323,
+ 1324, 1325, 0, 0, 0, 0, 0, 1282, 0, 1226,
+ 1283, 1284, 0, 0, 1279, 0, 0, 0, 0, 1278,
+ 0, 0, 0, 0, 1327, 0, 1115, 0, 0, 1229,
+ 1230, 1223, 1215, 0, 1300, 0, 0, 1231, 0, 0,
+ 0, 0, 1287, 0, 1301, 1378, 0, 1380, 1947, 0,
+ 1333, 1288, 1236, 0, 1331, 0, 1237, 1302, 1303, 1304,
+ 1290, 1291, 0, 1306, 0, 1292, 0, 0, 0, 0,
+ 1239, 1337, 1335, 0, 0, 0, 0, 1339, 1241, 0,
+ 0, 0, 1240, 0, 0, 0, 0, 0, 0, 0,
+ 1243, 0, 1224, 1336, 1338, 1296, 0, 1252, 0, 2539,
+ 1424, 2547, 1425, 0, 0, 2541, 2531, 2536, 2544, 1216,
+ 0, 0, 0, 0, 0, 1948, 1125, 1130, 1123, 1127,
+ 2545, 0, 0, 0, 0, 1144, 1143, 0, 0, 0,
+ 2545, 1501, 1147, 0, 0, 1317, 1318, 1373, 0, 1599,
+ 1597, 1608, 1653, 1654, 1656, 0, 2473, 966, 965, 1604,
+ 964, 75, 0, 1810, 1832, 1805, 2489, 0, 2488, 0,
+ 2468, 2471, 1954, 0, 0, 0, 2403, 2397, 2404, 2406,
+ 2400, 2405, 2407, 2398, 2399, 2394, 2401, 1495, 1524, 0,
+ 1859, 1057, 1059, 1060, 1058, 1066, 0, 0, 2382, 2383,
+ 2381, 2380, 458, 0, 467, 0, 479, 0, 0, 0,
+ 1849, 1848, 0, 1041, 1044, 1045, 1011, 1009, 1008, 1010,
+ 999, 1005, 1006, 524, 1638, 0, 0, 0, 1644, 1625,
+ 1635, 0, 2085, 2298, 2301, 243, 246, 245, 247, 0,
+ 0, 0, 0, 0, 0, 1101, 1416, 1585, 1098, 1086,
+ 1524, 1514, 1085, 1108, 1104, 0, 2332, 0, 2295, 2360,
+ 0, 0, 0, 0, 0, 2350, 1784, 0, 1731, 0,
+ 1753, 0, 0, 0, 0, 1724, 0, 1745, 1705, 1733,
+ 1723, 1494, 1777, 1720, 1721, 992, 991, 986, 1433, 1416,
+ 0, 0, 1413, 1435, 0, 1435, 1416, 1416, 0, 1416,
+ 1487, 1430, 0, 0, 2636, 1515, 2534, 0, 0, 866,
+ 172, 175, 173, 0, 174, 0, 0, 404, 403, 0,
+ 1775, 397, 126, 125, 127, 128, 1549, 1550, 1546, 1547,
+ 1545, 1548, 130, 129, 124, 881, 0, 0, 0, 1775,
+ 377, 356, 357, 360, 361, 362, 953, 856, 1035, 932,
+ 0, 621, 856, 807, 812, 812, 930, 0, 1035, 0,
+ 0, 0, 0, 0, 1035, 0, 0, 0, 1655, 0,
+ 943, 893, 0, 0, 0, 0, 0, 944, 0, 894,
+ 1655, 0, 0, 0, 0, 0, 1035, 0, 0, 0,
+ 441, 0, 1035, 912, 973, 972, 971, 0, 1035, 1035,
+ 0, 571, 572, 570, 0, 0, 0, 563, 545, 769,
+ 895, 440, 896, 620, 0, 967, 617, 623, 1950, 0,
+ 0, 0, 0, 136, 2589, 0, 1454, 190, 97, 86,
+ 82, 101, 1559, 1560, 1558, 1556, 1557, 102, 84, 85,
+ 89, 88, 90, 91, 92, 87, 93, 83, 94, 103,
+ 104, 81, 1032, 0, 0, 0, 0, 1775, 386, 0,
+ 0, 1655, 346, 363, 364, 367, 368, 369, 370, 371,
+ 374, 372, 373, 0, 2480, 2482, 0, 0, 340, 339,
+ 0, 131, 2607, 0, 0, 620, 106, 439, 543, 546,
+ 849, 851, 850, 837, 836, 107, 109, 111, 1614, 1691,
+ 1416, 1513, 1955, 1494, 0, 1690, 0, 0, 1322, 1358,
+ 0, 1384, 0, 1220, 724, 724, 724, 1367, 709, 1371,
+ 1362, 724, 1363, 724, 1365, 0, 755, 0, 754, 0,
+ 1180, 1195, 0, 0, 0, 0, 0, 0, 1329, 1326,
+ 0, 0, 0, 0, 1352, 0, 0, 0, 1225, 0,
+ 1312, 1334, 1332, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 1340, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1213, 1106, 2548,
+ 2550, 1077, 0, 2540, 2542, 2346, 2347, 2348, 858, 1345,
+ 0, 1141, 1137, 0, 1135, 1500, 1156, 1155, 0, 0,
+ 0, 1145, 1107, 1308, 1106, 0, 1374, 1949, 418, 582,
+ 1595, 73, 1808, 2486, 0, 2497, 0, 0, 0, 0,
+ 0, 0, 0, 2392, 1525, 1665, 0, 1066, 1070, 1964,
+ 1862, 2385, 2386, 2384, 0, 459, 460, 462, 1107, 476,
+ 454, 0, 446, 449, 0, 458, 0, 0, 1001, 1007,
+ 1091, 0, 1657, 1642, 1649, 1643, 0, 0, 0, 1641,
+ 1939, 1938, 1945, 2523, 0, 0, 2413, 0, 0, 0,
+ 2526, 1494, 1494, 1579, 0, 0, 1083, 1088, 1084, 1087,
+ 0, 1105, 1112, 1111, 1940, 1947, 0, 0, 0, 0,
+ 757, 756, 765, 0, 0, 0, 2345, 0, 761, 763,
+ 762, 2355, 760, 1786, 1522, 1741, 1740, 1537, 1528, 0,
+ 1531, 1530, 1716, 1522, 1735, 1787, 0, 0, 2530, 1428,
+ 0, 1415, 1414, 1436, 0, 1416, 1435, 1435, 0, 1395,
+ 1394, 1669, 1672, 0, 1393, 1452, 1418, 1091, 2626, 2638,
+ 0, 768, 767, 581, 764, 580, 177, 176, 182, 183,
+ 1563, 1564, 1561, 1562, 410, 423, 1565, 424, 398, 123,
+ 411, 412, 378, 0, 358, 622, 857, 915, 0, 0,
+ 0, 812, 616, 856, 821, 813, 856, 856, 0, 0,
+ 555, 552, 934, 558, 913, 905, 914, 925, 927, 0,
+ 554, 573, 0, 0, 561, 856, 900, 941, 942, 964,
+ 549, 0, 592, 593, 591, 567, 574, 550, 551, 936,
+ 0, 1509, 1511, 1519, 557, 556, 1570, 1569, 560, 0,
+ 553, 0, 947, 920, 0, 589, 587, 584, 586, 585,
+ 590, 588, 562, 559, 575, 910, 0, 952, 952, 929,
+ 0, 600, 601, 603, 604, 1953, 0, 969, 931, 0,
+ 605, 618, 606, 0, 0, 579, 578, 576, 577, 0,
+ 146, 0, 0, 883, 0, 139, 137, 148, 0, 0,
+ 0, 1457, 0, 1458, 1455, 1456, 0, 98, 100, 417,
+ 416, 415, 414, 387, 0, 0, 0, 1775, 365, 2481,
+ 2479, 2478, 0, 0, 2614, 343, 341, 342, 0, 0,
+ 192, 598, 599, 597, 596, 0, 427, 0, 2011, 425,
+ 0, 438, 0, 1873, 769, 547, 0, 0, 0, 0,
+ 1494, 1538, 1958, 1684, 0, 1253, 1385, 0, 0, 725,
+ 1359, 777, 1369, 0, 1370, 711, 710, 726, 1361, 1364,
+ 1368, 1366, 1219, 1227, 1275, 0, 1193, 1276, 1277, 0,
+ 1299, 1222, 1221, 0, 0, 0, 1259, 1260, 0, 1350,
+ 0, 0, 1233, 0, 1235, 0, 0, 1314, 1289, 1305,
+ 1262, 1293, 0, 1238, 1214, 0, 1263, 0, 1268, 1266,
+ 0, 1242, 0, 0, 1249, 0, 1247, 0, 1248, 0,
+ 1250, 1295, 1297, 1426, 2549, 1078, 0, 0, 1347, 1133,
+ 0, 1142, 1139, 0, 1136, 1108, 1319, 1309, 0, 1806,
+ 2487, 0, 2418, 2470, 2469, 2490, 2490, 2490, 0, 1496,
+ 0, 1622, 1061, 1066, 1070, 0, 1062, 1873, 463, 0,
+ 0, 0, 483, 0, 481, 457, 0, 1042, 1012, 1106,
+ 1639, 1651, 0, 1659, 0, 0, 1636, 1646, 0, 0,
+ 0, 1645, 244, 0, 2410, 2411, 2409, 1524, 1502, 0,
+ 0, 1591, 0, 1586, 1099, 0, 1110, 1109, 0, 2362,
+ 0, 2361, 2373, 2374, 2371, 2372, 2370, 2351, 0, 2357,
+ 2356, 0, 0, 0, 2367, 2358, 0, 0, 1732, 1527,
+ 1734, 1728, 993, 2536, 1487, 1420, 1416, 1391, 1416, 1402,
+ 0, 0, 1416, 1398, 1396, 1400, 0, 1494, 0, 1417,
+ 1449, 1106, 1942, 1516, 1519, 359, 917, 0, 856, 808,
+ 809, 821, 0, 821, 821, 0, 0, 904, 0, 1021,
0, 909, 765, 568, 940, 939, 569, 0, 902, 0,
- 1511, 1512, 1503, 442, 901, 922, 907, 1822, 933, 620,
+ 1520, 1521, 1512, 442, 901, 922, 907, 1831, 933, 620,
968, 789, 705, 654, 645, 724, 648, 647, 691, 724,
659, 709, 707, 677, 709, 709, 684, 683, 701, 687,
667, 777, 777, 666, 704, 777, 688, 686, 690, 0,
692, 709, 697, 685, 689, 706, 682, 679, 703, 724,
724, 724, 663, 702, 777, 0, 695, 724, 624, 728,
- 665, 777, 784, 0, 0, 724, 726, 1943, 147, 135,
- 0, 0, 885, 887, 0, 0, 888, 2584, 0, 2586,
- 0, 1060, 0, 95, 0, 0, 348, 413, 366, 2476,
- 0, 203, 1097, 0, 0, 193, 195, 196, 0, 0,
- 0, 429, 1866, 1865, 426, 527, 548, 0, 0, 0,
- 1682, 1677, 0, 1673, 0, 1377, 0, 0, 0, 0,
- 771, 782, 780, 774, 0, 778, 779, 1351, 0, 0,
- 727, 1363, 724, 1181, 709, 1175, 1177, 1173, 0, 692,
- 1176, 724, 0, 777, 1180, 1172, 0, 1321, 0, 0,
- 1344, 0, 0, 0, 0, 0, 0, 0, 1208, 0,
- 1301, 0, 0, 0, 0, 0, 0, 1237, 1235, 1236,
- 1515, 2523, 859, 1129, 0, 1311, 0, 0, 0, 2488,
- 2488, 2488, 1655, 1654, 0, 1653, 1657, 1054, 1062, 0,
+ 665, 777, 784, 0, 0, 724, 726, 1952, 147, 135,
+ 0, 0, 885, 887, 0, 0, 888, 2591, 0, 2593,
+ 0, 1069, 0, 95, 0, 0, 348, 413, 366, 2483,
+ 0, 203, 1106, 0, 0, 193, 195, 196, 0, 0,
+ 0, 429, 1875, 1874, 426, 527, 548, 0, 0, 0,
+ 1691, 1686, 0, 1682, 0, 1386, 0, 0, 0, 0,
+ 771, 782, 780, 774, 0, 778, 779, 1360, 0, 0,
+ 727, 1372, 724, 1190, 709, 1184, 1186, 1182, 0, 692,
+ 1185, 724, 0, 777, 1189, 1181, 0, 1330, 0, 0,
+ 1353, 0, 0, 0, 0, 0, 0, 0, 1217, 0,
+ 1310, 0, 0, 0, 0, 0, 0, 1246, 1244, 1245,
+ 1524, 2530, 859, 1138, 0, 1320, 0, 0, 0, 2495,
+ 2495, 2495, 1664, 1663, 0, 1662, 1666, 1063, 1071, 0,
461, 464, 0, 456, 0, 480, 0, 447, 525, 0,
- 0, 0, 1651, 1639, 2520, 1628, 1631, 1938, 2405, 1081,
- 0, 1488, 1581, 1578, 0, 1571, 1573, 1575, 0, 1932,
- 0, 0, 2357, 2343, 766, 0, 0, 0, 0, 2344,
- 1412, 1410, 1420, 0, 1378, 1407, 1407, 0, 1378, 0,
- 0, 0, 1662, 1504, 1664, 1444, 0, 1422, 0, 1509,
+ 0, 0, 1660, 1648, 2527, 1637, 1640, 1947, 2412, 1090,
+ 0, 1497, 1590, 1587, 0, 1580, 1582, 1584, 0, 1941,
+ 0, 0, 2366, 2352, 766, 0, 0, 0, 0, 2353,
+ 1421, 1419, 1429, 0, 1387, 1416, 1416, 0, 1387, 0,
+ 0, 0, 1671, 1513, 1673, 1453, 0, 1431, 0, 1518,
0, 0, 916, 0, 0, 0, 0, 0, 0, 946,
- 0, 967, 906, 926, 948, 937, 1026, 1501, 921, 923,
- 1001, 0, 602, 0, 793, 653, 646, 664, 662, 713,
+ 0, 967, 906, 926, 948, 937, 1035, 1510, 921, 923,
+ 1004, 0, 602, 0, 793, 653, 646, 664, 662, 713,
708, 0, 713, 713, 673, 691, 668, 0, 777, 681,
672, 693, 696, 698, 700, 713, 0, 777, 661, 660,
670, 657, 713, 736, 0, 0, 0, 0, 732, 0,
787, 0, 739, 0, 625, 729, 731, 0, 0, 0,
694, 777, 650, 785, 784, 652, 777, 784, 713, 713,
- 0, 133, 138, 149, 150, 876, 2583, 0, 2581, 0,
- 1056, 1450, 99, 0, 0, 206, 204, 205, 0, 199,
- 201, 196, 2594, 0, 2601, 0, 0, 2599, 428, 431,
- 542, 528, 0, 0, 1510, 854, 0, 0, 2242, 1530,
- 1245, 722, 720, 723, 721, 773, 772, 776, 0, 775,
- 784, 0, 0, 1183, 1178, 693, 1182, 1174, 1179, 1271,
- 1248, 1249, 0, 1342, 1333, 1277, 0, 1225, 1302, 0,
- 0, 1285, 1255, 1258, 1256, 1261, 1262, 1089, 1089, 594,
- 2536, 1131, 1824, 2491, 0, 0, 2487, 2485, 0, 2486,
- 2484, 2454, 0, 2409, 2410, 2408, 2395, 0, 0, 0,
- 1097, 469, 0, 486, 485, 482, 1515, 1641, 1643, 1649,
- 1638, 0, 1489, 1504, 758, 1574, 0, 1091, 2355, 2354,
- 2356, 2350, 0, 0, 0, 0, 1394, 0, 1398, 1403,
- 1399, 0, 1390, 1388, 0, 1529, 1432, 1433, 0, 0,
- 1438, 1442, 1515, 1510, 919, 0, 619, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 945, 1908, 935,
+ 0, 133, 138, 149, 150, 876, 2590, 0, 2588, 0,
+ 1065, 1459, 99, 0, 0, 206, 204, 205, 0, 199,
+ 201, 196, 2601, 0, 2608, 0, 0, 2606, 428, 431,
+ 542, 528, 0, 0, 1519, 854, 0, 0, 2251, 1539,
+ 1254, 722, 720, 723, 721, 773, 772, 776, 0, 775,
+ 784, 0, 0, 1192, 1187, 693, 1191, 1183, 1188, 1280,
+ 1257, 1258, 0, 1351, 1342, 1286, 0, 1234, 1311, 0,
+ 0, 1294, 1264, 1267, 1265, 1270, 1271, 1098, 1098, 594,
+ 2543, 1140, 1833, 2498, 0, 0, 2494, 2492, 0, 2493,
+ 2491, 2461, 0, 2416, 2417, 2415, 2402, 0, 0, 0,
+ 1106, 469, 0, 486, 485, 482, 1524, 1650, 1652, 1658,
+ 1647, 0, 1498, 1513, 758, 1583, 0, 1100, 2364, 2363,
+ 2365, 2359, 0, 0, 0, 0, 1403, 0, 1407, 1412,
+ 1408, 0, 1399, 1397, 0, 1538, 1441, 1442, 0, 0,
+ 1447, 1451, 1524, 1519, 919, 0, 619, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 945, 1917, 935,
967, 903, 0, 908, 564, 0, 792, 0, 797, 717,
718, 719, 674, 714, 716, 0, 676, 644, 669, 699,
- 675, 0, 671, 658, 742, 741, 1107, 734, 749, 629,
+ 675, 0, 671, 658, 742, 741, 1116, 734, 749, 629,
0, 0, 740, 626, 730, 738, 733, 0, 649, 651,
- 655, 656, 642, 643, 1942, 140, 889, 280, 2585, 1072,
- 0, 2590, 121, 2598, 2608, 203, 0, 0, 144, 0,
- 194, 765, 197, 2520, 439, 0, 434, 824, 0, 853,
- 0, 826, 828, 1531, 0, 783, 781, 0, 1345, 1510,
- 0, 1304, 1306, 1418, 595, 0, 1800, 2460, 2459, 2458,
- 2455, 0, 0, 0, 0, 0, 0, 2489, 2493, 1652,
- 0, 0, 0, 477, 0, 0, 511, 526, 1497, 1510,
- 0, 1515, 0, 1579, 1572, 2360, 2359, 2345, 1413, 0,
- 0, 0, 0, 0, 1451, 1661, 1428, 1428, 1439, 1423,
- 1508, 918, 0, 0, 607, 0, 0, 1910, 1909, 938,
+ 655, 656, 642, 643, 1951, 140, 889, 280, 2592, 1081,
+ 0, 2597, 121, 2605, 2615, 203, 0, 0, 144, 0,
+ 194, 765, 197, 2527, 439, 0, 434, 824, 0, 853,
+ 0, 826, 828, 1540, 0, 783, 781, 0, 1354, 1519,
+ 0, 1313, 1315, 1427, 595, 0, 1809, 2467, 2466, 2465,
+ 2462, 0, 0, 0, 0, 0, 0, 2496, 2500, 1661,
+ 0, 0, 0, 477, 0, 0, 511, 526, 1506, 1519,
+ 0, 1524, 0, 1588, 1581, 2369, 2368, 2354, 1422, 0,
+ 0, 0, 0, 0, 1460, 1670, 1437, 1437, 1448, 1432,
+ 1517, 918, 0, 0, 607, 0, 0, 1919, 1918, 938,
0, 790, 0, 794, 795, 796, 0, 788, 715, 0,
- 860, 0, 748, 1107, 737, 0, 746, 745, 743, 744,
+ 860, 0, 748, 1116, 737, 0, 746, 745, 743, 744,
0, 142, 306, 0, 292, 278, 0, 0, 0, 282,
151, 154, 152, 0, 153, 159, 0, 160, 161, 162,
- 163, 164, 155, 304, 305, 158, 156, 157, 0, 1958,
- 0, 1959, 2588, 0, 0, 2587, 170, 200, 0, 0,
- 136, 145, 2602, 747, 432, 1864, 0, 2516, 0, 1646,
- 108, 825, 845, 844, 830, 0, 1510, 0, 0, 110,
- 827, 847, 834, 112, 829, 846, 832, 1532, 712, 0,
- 1347, 1223, 0, 2456, 2494, 2497, 2495, 2496, 1533, 0,
- 2498, 2492, 0, 1854, 1098, 0, 470, 0, 473, 475,
- 489, 0, 1646, 1646, 0, 0, 1646, 1646, 1646, 1646,
- 504, 512, 514, 0, 1498, 1499, 0, 1494, 1496, 1490,
- 1562, 759, 1867, 2523, 1395, 0, 1400, 0, 1392, 0,
- 0, 1436, 1434, 0, 613, 824, 609, 611, 0, 791,
- 0, 0, 777, 0, 777, 735, 1097, 141, 0, 134,
+ 163, 164, 155, 304, 305, 158, 156, 157, 0, 1967,
+ 0, 1968, 2595, 0, 0, 2594, 170, 200, 0, 0,
+ 136, 145, 2609, 747, 432, 1873, 0, 2523, 0, 1655,
+ 108, 825, 845, 844, 830, 0, 1519, 0, 0, 110,
+ 827, 847, 834, 112, 829, 846, 832, 1541, 712, 0,
+ 1356, 1232, 0, 2463, 2501, 2504, 2502, 2503, 1542, 0,
+ 2505, 2499, 0, 1863, 1107, 0, 470, 0, 473, 475,
+ 489, 0, 1655, 1655, 0, 0, 1655, 1655, 1655, 1655,
+ 504, 512, 514, 0, 1507, 1508, 0, 1503, 1505, 1499,
+ 1571, 759, 1876, 2530, 1404, 0, 1409, 0, 1401, 0,
+ 0, 1445, 1443, 0, 613, 824, 609, 611, 0, 791,
+ 0, 0, 777, 0, 777, 735, 1106, 141, 0, 134,
0, 0, 291, 294, 0, 0, 297, 287, 286, 288,
- 0, 281, 280, 280, 334, 285, 331, 330, 323, 2520,
- 0, 0, 0, 2609, 202, 1097, 148, 0, 430, 436,
+ 0, 281, 280, 280, 334, 285, 331, 330, 323, 2527,
+ 0, 0, 0, 2616, 202, 1106, 148, 0, 430, 436,
435, 839, 0, 831, 0, 852, 855, 0, 835, 833,
- 1510, 1825, 1535, 1534, 1658, 1666, 0, 758, 0, 478,
- 471, 0, 0, 487, 0, 0, 1646, 1646, 0, 0,
- 0, 0, 0, 484, 513, 1646, 1510, 0, 1080, 0,
- 1875, 1414, 0, 0, 1452, 0, 1429, 0, 0, 0,
+ 1519, 1834, 1544, 1543, 1667, 1675, 0, 758, 0, 478,
+ 471, 0, 0, 487, 0, 0, 1655, 1655, 0, 0,
+ 0, 0, 0, 484, 513, 1655, 1519, 0, 1089, 0,
+ 1884, 1423, 0, 0, 1461, 0, 1438, 0, 0, 0,
615, 824, 608, 826, 828, 0, 803, 0, 802, 0,
799, 798, 678, 861, 680, 0, 143, 307, 318, 321,
313, 293, 0, 0, 0, 283, 280, 0, 267, 265,
266, 272, 273, 274, 275, 276, 277, 268, 271, 269,
- 270, 280, 0, 211, 0, 0, 2589, 0, 2591, 0,
- 180, 179, 171, 0, 280, 2595, 0, 2603, 2520, 838,
- 843, 842, 840, 841, 848, 1346, 0, 0, 1855, 465,
+ 270, 280, 0, 211, 0, 0, 2596, 0, 2598, 0,
+ 180, 179, 171, 0, 280, 2602, 0, 2610, 2527, 838,
+ 843, 842, 840, 841, 848, 1355, 0, 0, 1864, 465,
477, 474, 497, 490, 493, 0, 523, 517, 0, 0,
- 519, 520, 518, 515, 508, 0, 506, 0, 1495, 1563,
- 0, 0, 0, 0, 1868, 1870, 0, 1580, 1397, 1402,
- 1431, 1430, 1445, 0, 614, 610, 612, 924, 805, 806,
+ 519, 520, 518, 515, 508, 0, 506, 0, 1504, 1572,
+ 0, 0, 0, 0, 1877, 1879, 0, 1589, 1406, 1411,
+ 1440, 1439, 1454, 0, 614, 610, 612, 924, 805, 806,
804, 0, 0, 630, 0, 0, 280, 314, 0, 289,
0, 0, 0, 0, 209, 337, 0, 207, 325, 325,
- 2592, 2593, 181, 2610, 0, 150, 170, 437, 1665, 1667,
- 1881, 472, 497, 0, 495, 0, 491, 488, 492, 521,
+ 2599, 2600, 181, 2617, 0, 150, 170, 437, 1674, 1676,
+ 1890, 472, 497, 0, 495, 0, 491, 488, 492, 521,
522, 0, 505, 0, 516, 0, 0, 0, 0, 0,
- 1869, 0, 0, 1876, 1878, 0, 0, 0, 0, 632,
+ 1878, 0, 0, 1885, 1887, 0, 0, 0, 0, 632,
631, 633, 315, 321, 311, 319, 280, 0, 0, 279,
298, 333, 210, 0, 335, 0, 280, 0, 324, 326,
- 328, 0, 132, 2604, 0, 1867, 494, 0, 502, 498,
- 500, 503, 511, 510, 507, 1097, 1873, 1874, 0, 1871,
- 0, 0, 1877, 1437, 1435, 801, 800, 0, 637, 627,
+ 328, 0, 132, 2611, 0, 1876, 494, 0, 502, 498,
+ 500, 503, 511, 510, 507, 1106, 1882, 1883, 0, 1880,
+ 0, 0, 1886, 1446, 1444, 801, 800, 0, 637, 627,
634, 636, 0, 312, 0, 0, 310, 290, 295, 280,
0, 280, 222, 221, 0, 213, 261, 332, 0, 212,
- 2596, 280, 0, 1875, 496, 0, 0, 509, 0, 0,
- 1566, 1568, 1872, 1880, 1879, 639, 638, 635, 316, 0,
+ 2603, 280, 0, 1884, 496, 0, 0, 509, 0, 0,
+ 1575, 1577, 1881, 1889, 1888, 639, 638, 635, 316, 0,
280, 0, 280, 0, 280, 0, 0, 0, 0, 0,
- 208, 280, 2605, 0, 1883, 501, 499, 1098, 1564, 1097,
+ 208, 280, 2612, 0, 1892, 501, 499, 1107, 1573, 1106,
0, 308, 280, 296, 301, 338, 0, 216, 262, 263,
- 0, 219, 2597, 1882, 0, 1887, 1569, 1567, 280, 280,
+ 0, 219, 2604, 1891, 0, 1896, 1578, 1576, 280, 280,
297, 300, 336, 0, 0, 214, 215, 227, 226, 218,
- 0, 0, 0, 1894, 280, 280, 302, 235, 233, 280,
- 223, 231, 225, 0, 232, 264, 220, 1885, 1886, 1884,
- 1889, 0, 0, 1891, 1892, 0, 1856, 0, 217, 234,
- 1893, 1888, 0, 1895, 1897, 0, 224, 1890, 0, 1097,
- 1896, 0, 1098, 1898
+ 0, 0, 0, 1903, 280, 280, 302, 235, 233, 280,
+ 223, 231, 225, 0, 232, 264, 220, 1894, 1895, 1893,
+ 1898, 0, 0, 1900, 1901, 0, 1865, 0, 217, 234,
+ 1902, 1897, 0, 1904, 1906, 0, 224, 1899, 0, 1106,
+ 1905, 0, 1107, 1907
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
- -1, 58, 606, 1451, 59, 60, 61, 62, 63, 1322,
- 64, 818, 1249, 1753, 1754, 65, 545, 66, 1027, 1508,
- 1509, 2977, 2978, 1510, 67, 2091, 3017, 3018, 3019, 1527,
- 515, 516, 1945, 1946, 1052, 3000, 2964, 3775, 2968, 3891,
- 4029, 3930, 2021, 3316, 3776, 3777, 3900, 540, 2089, 1465,
- 4053, 1925, 4162, 1926, 68, 641, 1025, 1487, 1488, 3334,
- 3335, 3596, 3336, 3588, 3589, 3590, 3591, 4296, 4136, 4237,
- 4297, 4377, 4413, 4419, 4420, 4344, 4429, 4430, 4431, 4417,
- 890, 4432, 69, 568, 569, 892, 1351, 2338, 1352, 70,
- 4345, 4415, 4137, 4138, 4036, 4139, 3903, 4140, 4040, 4141,
- 3906, 4142, 4143, 4144, 4145, 4288, 4146, 4035, 4337, 4133,
- 4134, 4339, 4394, 4411, 4147, 3913, 4030, 4224, 3914, 4031,
- 4283, 4129, 4284, 4332, 4390, 4130, 4225, 4335, 4228, 4148,
- 4154, 4298, 4149, 4155, 4150, 3918, 4047, 4153, 4045, 4152,
- 4341, 4293, 2582, 2999, 624, 625, 652, 2079, 626, 1041,
- 999, 1467, 1958, 1959, 2444, 2445, 2564, 2565, 2566, 1950,
- 1951, 1952, 2067, 2068, 2069, 1932, 1933, 1934, 1471, 1929,
- 1930, 627, 1000, 1010, 1953, 1954, 1955, 2570, 2071, 2072,
- 2073, 2074, 1956, 1746, 1957, 2855, 2588, 3010, 3600, 3793,
- 3344, 3937, 4168, 3011, 3012, 2514, 2920, 2493, 71, 557,
- 870, 1319, 2310, 1320, 2312, 2736, 2737, 2738, 1796, 1797,
- 3671, 1801, 2309, 3833, 4180, 3977, 3978, 2740, 3976, 2744,
- 3134, 3135, 3434, 3673, 3836, 4185, 4082, 4257, 4183, 4253,
- 4184, 4255, 4356, 4309, 4310, 4093, 4195, 4196, 4261, 4312,
- 3990, 3991, 3992, 2331, 2751, 3676, 3602, 2061, 1457, 1458,
- 517, 518, 519, 649, 2589, 2007, 2590, 2591, 2937, 2009,
- 2010, 2710, 1385, 2933, 2906, 3647, 3006, 2941, 2942, 2943,
- 2944, 2945, 4015, 4113, 4114, 4111, 2951, 2873, 2453, 2454,
- 2519, 2954, 3298, 3885, 3553, 4281, 4329, 4330, 4331, 72,
- 867, 3791, 3521, 3536, 3300, 3301, 3302, 3303, 3304, 3305,
- 3306, 3035, 3036, 3742, 3743, 3744, 3030, 3031, 3371, 3554,
- 3555, 3556, 3792, 3757, 1173, 3364, 2792, 2793, 3843, 2801,
- 2802, 2843, 3179, 2844, 1461, 3365, 3366, 3367, 3565, 3557,
- 2953, 3514, 3735, 3738, 3877, 4120, 2455, 2874, 2456, 2877,
- 953, 520, 2457, 2458, 1541, 1542, 3940, 3949, 3953, 3941,
- 3954, 3950, 3942, 3943, 3944, 3956, 3952, 2595, 3603, 3604,
- 2866, 3099, 3879, 73, 1475, 993, 1002, 998, 1017, 636,
- 1476, 2022, 2526, 3575, 614, 2011, 3506, 3229, 3510, 2012,
- 2886, 2013, 3216, 3492, 2014, 3245, 3508, 3732, 2887, 2888,
- 2015, 2016, 2017, 3228, 3237, 3730, 2459, 1301, 126, 127,
- 632, 633, 634, 2262, 2949, 2500, 74, 1433, 1428, 75,
- 965, 960, 961, 1431, 1432, 1891, 2389, 76, 644, 1514,
- 77, 1330, 2323, 2324, 2325, 78, 1018, 79, 80, 645,
- 1521, 1522, 1523, 81, 1313, 134, 82, 878, 1325, 1327,
- 1328, 83, 640, 1019, 1020, 1021, 1022, 2027, 84, 1787,
- 2294, 2295, 2296, 2297, 1484, 2528, 1485, 1486, 2036, 3127,
- 85, 86, 603, 2217, 574, 899, 575, 576, 1830, 2351,
- 3648, 910, 911, 912, 2777, 1363, 1364, 1365, 1793, 2782,
- 1106, 1103, 783, 784, 785, 786, 1197, 1198, 3558, 787,
- 1207, 1712, 3047, 3385, 1572, 1573, 788, 789, 790, 791,
- 792, 793, 1739, 3067, 3068, 3400, 2247, 2248, 2249, 794,
- 2136, 3054, 2149, 795, 1190, 1697, 1630, 3392, 3060, 3632,
- 3808, 1558, 2111, 2627, 3038, 2707, 2211, 1129, 1130, 1087,
- 2118, 1564, 1898, 1899, 1900, 1901, 1902, 3480, 3479, 3481,
- 3849, 3697, 3851, 3701, 2400, 1903, 1904, 2818, 3695, 4003,
- 2212, 2213, 2214, 3410, 2819, 3196, 2837, 2838, 3712, 2391,
- 1905, 2825, 4011, 3709, 3710, 4109, 4108, 3711, 3485, 3486,
- 3209, 3210, 2973, 2974, 2975, 3853, 1621, 1622, 1628, 1296,
- 1297, 1559, 2291, 2724, 3683, 3840, 2238, 3451, 3838, 3997,
- 2018, 2912, 2913, 2353, 2354, 2841, 3213, 3242, 1388, 3649,
- 2726, 1864, 2808, 2809, 3353, 3970, 4418, 1591, 2540, 2856,
- 2857, 1593, 2919, 4098, 4265, 4359, 4360, 4361, 3161, 3162,
- 3455, 3456, 2355, 2774, 3163, 3684, 4002, 87, 524, 88,
- 1751, 2253, 1246, 2267, 1029, 1545, 1546, 806, 537, 89,
- 546, 2292, 90, 564, 1814, 857, 882, 1333, 1334, 2332,
- 2752, 2759, 2333, 2764, 3444, 2754, 3140, 3141, 2257, 2258,
- 2755, 3143, 3441, 3424, 3425, 3122, 3668, 91, 591, 3207,
- 2832, 2833, 4074, 4075, 883, 92, 523, 1074, 2100, 1551,
- 2099, 1075, 1076, 2102, 670, 671, 93, 967, 587, 1410,
- 1411, 1412, 1880, 94, 579, 954, 2805, 2814, 1858, 874,
- 1242, 1392, 957, 1393, 1844, 2371, 1374, 95, 989, 988,
- 96, 610, 1453, 97, 819, 1269, 1763, 2714, 3110, 1270,
- 1271, 2268, 3816, 98, 565, 887, 888, 1336, 1816, 99,
- 559, 875, 1807, 100, 549, 862, 1305, 1786, 101, 102,
- 864, 3128, 4077, 4250, 553, 1789, 1309, 3345, 4100, 4204,
- 4205, 4207, 4273, 4274, 4305, 4405, 4439, 4423, 4442, 4443,
- 4446, 4453, 4454, 797, 976, 798, 3727, 799, 800, 2760,
- 2761, 3214, 801, 2762, 802, 2867, 1030, 1548, 543, 493,
- 621, 977, 2732, 804, 3920, 996, 1045, 495, 496, 103,
- 914, 578, 1367, 1368, 1369, 1839, 1840, 958, 2226, 1841,
- 1842, 2368, 2363, 3463, 3185, 3177, 104, 865, 502, 503,
- 1311, 1312, 2303, 105, 590, 106, 1298, 1780, 1781, 2288,
- 2723, 2289, 107, 895, 108, 844, 1774, 845, 1274, 846,
- 847, 1288, 1282, 1291, 1285, 3821, 3660, 3661, 2276, 1245,
- 1046, 2083, 2993, 1047, 1766, 2270, 2271, 3419, 3663, 3113,
- 3827, 3828, 109, 135, 505, 647, 1036, 1357, 110, 111,
- 112, 113, 1360, 1446, 2347, 1447, 2218, 1448, 1449, 1912,
- 1828, 1693, 1694, 3097, 1187, 1188, 2221, 2680, 2681, 913,
- 656, 1062, 1054, 128, 129, 130, 659, 660, 131, 1015,
- 1016, 2527, 2970, 3318, 3578, 3579, 3781, 3925, 1056, 3787,
- 4244, 4381, 1057, 1058, 3001, 3789, 4057, 4246, 4351, 1059,
- 2579, 3331, 3926, 4164, 114, 978, 600, 1444, 1439, 1441,
- 1908, 2407, 115, 116, 117
+ -1, 58, 604, 1454, 59, 60, 61, 62, 63, 1323,
+ 64, 818, 1250, 1757, 1758, 65, 543, 66, 1027, 1511,
+ 1512, 2986, 2987, 1513, 67, 2098, 3026, 3027, 3028, 1531,
+ 513, 514, 1950, 1951, 1053, 3009, 2973, 3785, 2977, 3901,
+ 4039, 3940, 2026, 3326, 3786, 3787, 3910, 538, 2096, 1468,
+ 4063, 1930, 4172, 1931, 68, 639, 1025, 1490, 1491, 3344,
+ 3345, 3606, 3346, 3598, 3599, 3600, 3601, 4306, 4146, 4247,
+ 4307, 4387, 4423, 4429, 4430, 4354, 4439, 4440, 4441, 4427,
+ 890, 4442, 69, 566, 567, 892, 1354, 2345, 1355, 70,
+ 4355, 4425, 4147, 4148, 4046, 4149, 3913, 4150, 4050, 4151,
+ 3916, 4152, 4153, 4154, 4155, 4298, 4156, 4045, 4347, 4143,
+ 4144, 4349, 4404, 4421, 4157, 3923, 4040, 4234, 3924, 4041,
+ 4293, 4139, 4294, 4342, 4400, 4140, 4235, 4345, 4238, 4158,
+ 4164, 4308, 4159, 4165, 4160, 3928, 4057, 4163, 4055, 4162,
+ 4351, 4303, 2590, 3008, 622, 623, 652, 2086, 624, 1042,
+ 999, 1470, 1963, 1964, 2451, 2452, 2572, 2573, 2574, 1955,
+ 1956, 1957, 2074, 2075, 2076, 1937, 1938, 1939, 1474, 1934,
+ 1935, 625, 1000, 1010, 1958, 1959, 1960, 2578, 2078, 2079,
+ 2080, 2081, 1961, 1750, 1962, 2864, 2596, 3019, 3610, 3803,
+ 3354, 3947, 4178, 3020, 3021, 2521, 2929, 2500, 71, 555,
+ 870, 1320, 2317, 1321, 2319, 2744, 2745, 2746, 1800, 1801,
+ 3681, 1805, 2316, 3843, 4190, 3987, 3988, 2748, 3986, 2752,
+ 3143, 3144, 3444, 3683, 3846, 4195, 4092, 4267, 4193, 4263,
+ 4194, 4265, 4366, 4319, 4320, 4103, 4205, 4206, 4271, 4322,
+ 4000, 4001, 4002, 2338, 2760, 3686, 3612, 2068, 1460, 1461,
+ 515, 516, 517, 649, 2597, 2012, 2598, 2599, 2946, 2014,
+ 2015, 2718, 1388, 2942, 2915, 3657, 3015, 2950, 2951, 2952,
+ 2953, 2954, 4025, 4123, 4124, 4121, 2960, 2882, 2460, 2461,
+ 2526, 2963, 3308, 3895, 3563, 4291, 4339, 4340, 4341, 72,
+ 867, 3801, 3531, 3546, 3310, 3311, 3312, 3313, 3314, 3315,
+ 3316, 3044, 3045, 3752, 3753, 3754, 3039, 3040, 3381, 3564,
+ 3565, 3566, 3802, 3767, 1174, 3374, 2801, 2802, 3853, 2810,
+ 2811, 2852, 3189, 2853, 1464, 3375, 3376, 3377, 3575, 3567,
+ 2962, 3524, 3745, 3748, 3887, 4130, 2462, 2883, 2463, 2886,
+ 953, 518, 2464, 2465, 1545, 1546, 3950, 3959, 3963, 3951,
+ 3964, 3960, 3952, 3953, 3954, 3966, 3962, 2603, 3613, 3614,
+ 2875, 3108, 3889, 73, 1478, 993, 1002, 998, 1017, 634,
+ 1479, 2027, 2533, 3585, 612, 2016, 3516, 3239, 3520, 2017,
+ 2895, 2018, 3226, 3502, 2019, 3255, 3518, 3742, 2896, 2897,
+ 2020, 2021, 2022, 3238, 3247, 3740, 2466, 1302, 126, 127,
+ 630, 631, 632, 2269, 2958, 2507, 74, 1436, 1431, 75,
+ 965, 960, 961, 1434, 1435, 1896, 2396, 76, 642, 1517,
+ 1332, 1816, 77, 879, 2330, 2331, 2332, 2758, 78, 1018,
+ 79, 644, 1031, 80, 501, 1525, 1526, 1527, 2065, 81,
+ 1314, 134, 82, 878, 1326, 1328, 1329, 83, 638, 1019,
+ 1020, 1021, 1022, 2032, 84, 1791, 2301, 2302, 2303, 2304,
+ 1487, 2535, 1488, 1489, 2041, 3136, 85, 86, 601, 2224,
+ 572, 899, 573, 574, 1835, 2358, 3658, 910, 911, 912,
+ 2786, 1366, 1367, 1368, 1797, 2791, 1107, 1104, 783, 784,
+ 785, 786, 1198, 1199, 3568, 787, 1208, 1716, 3056, 3395,
+ 1576, 1577, 788, 789, 790, 791, 792, 793, 1743, 3076,
+ 3077, 3410, 2254, 2255, 2256, 794, 2143, 3063, 2156, 795,
+ 1191, 1701, 1634, 3402, 3069, 3642, 3818, 1562, 2118, 2635,
+ 3047, 2715, 2218, 1130, 1131, 1088, 2125, 1568, 1903, 1904,
+ 1905, 1906, 1907, 3490, 3489, 3491, 3859, 3707, 3861, 3711,
+ 2407, 1908, 1909, 2827, 3705, 4013, 2219, 2220, 2221, 3420,
+ 2828, 3206, 2846, 2847, 3722, 2398, 1910, 2834, 4021, 3719,
+ 3720, 4119, 4118, 3721, 3495, 3496, 3219, 3220, 2982, 2983,
+ 2984, 3863, 1625, 1626, 1632, 1297, 1298, 1563, 2298, 2732,
+ 3693, 3850, 2245, 3461, 3848, 4007, 2023, 2921, 2922, 2360,
+ 2361, 2850, 3223, 3252, 1391, 3659, 2734, 1869, 2817, 2818,
+ 3363, 3980, 4428, 1595, 2547, 2865, 2866, 1597, 2928, 4108,
+ 4275, 4369, 4370, 4371, 3171, 3172, 3465, 3466, 2362, 2783,
+ 3173, 3694, 4012, 87, 522, 88, 1755, 2260, 1247, 2274,
+ 1029, 1549, 1550, 806, 535, 89, 544, 2299, 90, 562,
+ 1819, 857, 882, 1336, 1337, 2339, 2761, 2768, 2340, 2773,
+ 3454, 2763, 3150, 3151, 2264, 2265, 2764, 3153, 3451, 3434,
+ 3435, 3131, 3678, 91, 589, 3217, 2841, 2842, 4084, 4085,
+ 883, 92, 521, 1075, 2107, 1555, 2106, 1076, 1077, 2109,
+ 670, 671, 93, 967, 585, 1413, 1414, 1415, 1885, 94,
+ 577, 954, 2814, 2823, 1863, 874, 1243, 1395, 957, 1396,
+ 1849, 2378, 1377, 95, 989, 988, 96, 608, 1456, 97,
+ 819, 1270, 1767, 2722, 3119, 1271, 1272, 2275, 3826, 98,
+ 563, 887, 888, 1339, 1821, 99, 557, 875, 1811, 100,
+ 547, 862, 1306, 1790, 101, 102, 864, 3137, 4087, 4260,
+ 551, 1793, 1310, 3355, 4110, 4214, 4215, 4217, 4283, 4284,
+ 4315, 4415, 4449, 4433, 4452, 4453, 4456, 4463, 4464, 797,
+ 976, 798, 3737, 799, 800, 2769, 2770, 3224, 801, 2771,
+ 802, 2876, 1030, 1552, 541, 493, 619, 977, 2740, 804,
+ 3930, 996, 1046, 495, 496, 103, 914, 576, 1370, 1371,
+ 1372, 1844, 1845, 958, 2233, 1846, 1847, 2375, 2370, 3473,
+ 3195, 3187, 104, 865, 500, 1312, 1313, 2310, 105, 588,
+ 106, 1299, 1784, 1785, 2295, 2731, 2296, 107, 895, 108,
+ 844, 1778, 845, 1275, 846, 847, 1289, 1283, 1292, 1286,
+ 3831, 3670, 3671, 2283, 1246, 1047, 2090, 3002, 1048, 1770,
+ 2277, 2278, 3429, 3673, 3122, 3837, 3838, 109, 135, 503,
+ 647, 1037, 1360, 110, 111, 112, 113, 1363, 1449, 2354,
+ 1450, 2225, 1451, 1452, 1917, 1833, 1697, 1698, 3106, 1188,
+ 1189, 2228, 2688, 2689, 913, 656, 1063, 1055, 128, 129,
+ 130, 659, 660, 131, 1015, 1016, 2534, 2979, 3328, 3588,
+ 3589, 3791, 3935, 1057, 3797, 4254, 4391, 1058, 1059, 3010,
+ 3799, 4067, 4256, 4361, 1060, 2587, 3341, 3936, 4174, 114,
+ 978, 598, 1447, 1442, 1444, 1913, 2414, 115, 116, 117
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -3833
+#define YYPACT_NINF -3680
static const int yypact[] =
{
- 5687, 2488, 1005, -3833, -134, 182, 48544, 116, -112, 1140,
- 393, 3210, -3833, -3833, -3833, -3833, -3833, 2799, -3833, 48544,
- 1005, -3833, 24688, -3833, -3833, -28, -3833, 113, -112, 1005,
- 384, -3833, 48544, -3833, 574, 1039, 1005, -3833, -3833, 43656,
- -3833, 393, 48544, -3833, 694, -3833, 43656, 1212, -113, 616,
- 580, -26, -3833, -3833, 48544, 2257, -3833, 550, 1223, 1144,
- -3833, -3833, 910, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, 25303, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, 1185, 48544,
- 1253, 48544, 1221, 48544, 41823, 48544, 904, 1104, 1280, -3833,
- -3833, 1342, -3833, -3833, -112, 393, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, 945, -3833, -3833, 953, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, 1530, 1382, -3833, 1456, 41823,
- -3833, 48544, -3833, -3833, -3833, 242, -3833, 1150, -3833, 1157,
- 1503, 1542, 1552, 76, 11562, 1472, 1472, 1472, 48544, 1526,
- 1472, 1472, 48544, -3833, 1472, -3833, 1472, -112, -3833, -3833,
- 4212, 48544, 1341, 170, -120, 41823, 1445, 48544, -134, 758,
- -3833, 1536, -3833, -3833, -3833, -112, -3833, 1745, 1604, 948,
- 48544, -3833, -3833, 1140, 1176, 713, 1220, -3833, -3833, 1337,
- -3833, 4495, 177, -3833, -3833, -3833, 2540, -3833, -3833, 6863,
- 1337, -3833, -3833, -3833, 1219, -3833, -3833, -3833, 48544, -134,
- -112, 1578, -3833, -3833, 186, 186, 186, -3833, 186, -3833,
- 186, -3833, 550, 1197, -3833, -3833, 1235, 48544, 715, 876,
- -3833, -3833, 1248, 863, -3833, 1293, 39379, -3833, 48544, -3833,
- -3833, -3833, -3833, 1527, -3833, -3833, -3833, 2191, -3833, 24688,
- -3833, -3833, -3833, 1104, -3833, 48544, 1395, -3833, -3833, -3833,
- 24688, 1273, 48544, -3833, 24688, 24688, 245, 25, 1013, 48544,
- 48544, 1715, -3833, 1903, 39379, 1509, -3833, 382, -94, 1342,
- 1960, -3833, 1382, -3833, 48544, 48544, 48544, -3833, -3833, -3833,
- 44267, 76, 1339, 1346, 1359, 16626, -3833, 1367, 1371, 1374,
- 11562, 1380, 1388, 1394, 1397, 1399, 1420, 1425, 1459, 1470,
- 1474, 1489, 1491, 1493, 1495, 1508, 1508, 1511, 1532, 1537,
- 1543, 771, 1548, -3833, 1589, 1598, 1605, -3833, -3833, 1627,
- 1636, 1646, -3833, -3833, 1648, 1651, 1657, 12195, 1676, 1681,
- 1686, -3833, 21604, 1689, 1691, 1697, 1701, 1704, 1706, 1716,
- 1719, 1730, -3833, -3833, 11562, 1511, -3833, -3833, 1736, -3833,
- 1740, 1743, 1753, 1760, 1765, 1770, 1778, 1781, 1792, 1795,
- 1811, 1813, 1816, 1819, 1821, 1511, -3833, 1020, 1830, 1833,
- 1111, 1835, -3833, 1838, -3833, 207, 1842, 1508, 1511, 1511,
- 1852, 1862, 1873, 1890, 1901, 16626, 16626, 16626, 11562, -3833,
- 48544, -3833, 48544, 2044, 3073, -3833, 2685, 16626, 895, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, 1465, 1471, -3833, -3833,
- -3833, -3833, -3833, 1907, 1393, 2009, 48544, 48544, 48544, 1853,
- 48544, 48544, 41823, 1747, 48544, 39379, -3833, 1472, 1673, 3743,
- 1904, 1999, 1978, -3833, -3833, -3833, -3833, -3833, 2172, -3833,
- -3833, 2018, -3833, 2182, -3833, -3833, 180, -3833, 91, -3833,
- -3833, -3833, -3833, -3833, -3833, 2188, 1924, -3833, -3833, 146,
- -3833, -3833, 48544, -3833, -3833, -3833, -3833, 2335, 2076, -3833,
- -3833, -3833, 828, 2515, 891, 24688, -3833, 1939, 11562, 1679,
- -3833, -189, -3833, -3833, 2294, -3833, -3833, 39379, 24688, -3833,
- -3833, -3833, 22221, -3833, -3833, 2526, -3833, 1952, -3833, -3833,
- 1471, 3156, -3833, 1904, 2215, -3833, 2229, 2128, 25, 2029,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- 1983, 2540, -3833, -3833, -3833, -3833, 2438, -3833, 2140, -3833,
- 18, -3833, 1993, 1059, 18, 39990, 2371, 193, -3833, 338,
- -3833, 2456, -3833, -3833, -3833, -3833, -3833, 2137, 2125, -3833,
- -3833, 375, 2111, -3833, 2483, -3833, 31, -3833, -3833, 2149,
- -3833, 2371, 18, 193, -3833, 2386, 2520, 618, 829, -3833,
- -3833, -49, -3833, -3833, 2591, -3833, -3833, 24688, -3833, -3833,
- -3833, 2335, -3833, -3833, -3833, -3833, 2055, -3833, 2333, 2179,
- -3833, -3833, 43, -3833, 2102, 688, 2581, -3833, 1026, 35713,
- -3833, -3833, -3833, 2612, 2631, 1508, 2118, -3833, -3833, -3833,
- 2750, -3833, -3833, 2132, 2657, 2657, 2657, 2775, -3833, -3833,
- -3833, -3833, -3833, -3833, 2321, 2192, -3833, 1395, 24688, 2548,
- 2167, -3833, -3833, 2412, 11562, -3833, -3833, 3947, 50, -3833,
- -3833, 179, -3833, 2747, 2373, -3833, -3833, -3833, -3833, 2638,
- -3833, -3833, 2750, 2700, 2657, 2593, 2199, -3833, -3833, -3833,
- -3833, -3833, -3833, 239, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, 1278, -3833, -3833, -3833, -3833, -3833, 1395, -3833, 24688,
- -3833, -3833, -3833, 24688, -3833, 2205, -3833, 2208, -3833, 11562,
- 11562, 939, 2763, 2828, 2828, 2828, 2044, 2247, 11562, 11562,
- 11562, 11562, 11562, 11562, 11562, 11562, 11562, 11562, 11562, 11562,
- 11562, 1054, 2223, -3833, -3833, 1355, -3833, 2234, 11562, 11562,
- 2316, 11562, 1471, 11562, 25918, -3833, 4349, 11562, 376, 2726,
- 11562, 11562, 11562, 11562, 3347, 11562, 11562, 11562, 25918, 2860,
- 2254, -3833, 2249, 1454, 11562, 11562, 1547, 11562, 11562, 11562,
- 11562, 11562, -3833, -3833, 11562, 11562, 11562, 11562, 16626, 11562,
- 11562, 11562, 11562, 11562, 11562, 2828, 2828, 11562, 11562, 1593,
- -3833, 11562, 1471, 1881, 1881, 11562, 1471, 8397, 11562, -3833,
- -3833, -3833, -3833, -3833, 2259, -3833, -3833, -3833, 25918, 2828,
- 2828, 11562, 11562, 2763, 2763, 2763, 223, 2264, 1083, 11562,
- 27148, 2261, -3833, -3833, -3833, -3833, 11562, 11562, 11562, -3833,
- 16626, -3833, -3833, 1661, -3833, -3833, -3833, 12828, 16626, 16626,
- 2267, 16626, 16626, 16626, 16626, 16626, 2633, 16626, 16626, 17259,
- 17892, 16626, 16626, 16626, 16626, 867, 2763, 41823, 16626, 11562,
- -3833, -3833, 48544, -3833, -3833, -3833, 2265, 24688, 1747, -3833,
- -3833, -57, 2742, -3833, -3833, 2273, 24688, -3833, 2270, -3833,
- 2628, -3833, -3833, 2630, 2634, 2651, -3833, -3833, -3833, -3833,
- -3833, 2862, 2652, -3833, -3833, 2653, -3833, -3833, -3833, -3833,
- 2281, -3833, -3833, -3833, -3833, -3833, -3833, -3833, 2387, -3833,
- -3833, -3833, 2304, -3833, 39379, 2304, -3833, -3833, 2304, -3833,
- -3833, 2304, 695, 3825, -3833, -3833, 48544, -3833, 49155, -3833,
- -3833, 22221, -134, -3833, -3833, 13461, -3833, -3833, -3833, 2660,
- 188, 2308, -3833, 24688, -3833, 2044, -3833, 85, 85, 2547,
- 174, 41823, -3833, -3833, 167, 2309, 2392, 2314, -3833, 2396,
- 24688, 24688, -3833, -3833, -3833, -3833, 2938, 713, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, 2320, 2795, 2327, 39379, 813, -3833, 48544, -3833, 1629,
- -3833, -3833, -3833, 2329, -3833, 11562, -3833, 2331, -3833, 1115,
- 2720, -3833, -134, 11562, -3833, 2342, 1382, 48544, 48544, 48544,
- 24688, 48544, 24688, -3833, 10, 10, -3833, 36324, -3833, -3833,
- -3833, -3833, 18, 48544, 48544, 18, 39379, -3833, 193, 48544,
- 18, -3833, 2723, 2446, -3833, -3833, -3833, 2790, -3833, -3833,
- 2785, 2345, -3833, 2720, -3833, -3833, 193, -3833, -3833, 24688,
- -3833, -3833, 193, -3833, 193, 193, 18, 18, 2400, -3833,
- -3833, 2350, -3833, 2400, 2500, -3833, 1222, 186, 2597, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, 94,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, 123, -3833, -3833,
- -3833, 2210, 2853, -3833, 41823, 1909, -88, 21, 1909, 2322,
- -134, 1096, -3833, 1096, -3833, 3396, 2635, 231, 24688, -3833,
- 2370, 44878, 24688, -3833, -3833, -3833, 1007, 2393, 2372, 2044,
- 2861, 2864, 2865, 2867, 2869, 2870, 2871, 2873, 2877, 2887,
- 2891, 2892, 2900, 2909, 2930, 2932, 2934, 2936, 2458, -3833,
- -3833, -3833, -3833, 24688, -3833, -3833, -3833, -3833, 2523, -3833,
- -3833, -3833, -3833, 2702, -3833, -3833, -3833, 153, 1825, 2493,
- 2524, 165, 39379, 2914, 48544, 48544, 1382, 48544, 48544, -3833,
- -3833, -132, 2748, 2752, 2757, 2479, -3833, -3833, -3833, 1055,
- 48544, 2927, 30214, -3833, 358, 414, -3833, 2828, 2491, -3833,
- 2492, 2506, 2508, 11562, 59, 152, 740, 1258, 1316, 1080,
- 407, 439, -3833, 1350, 444, 464, 536, 1102, 560, 176,
- -3833, 2509, 2499, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, 2510, -3833, -3833, -3833, 562, 615, 1139, 1141, 2511,
- 2512, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, 2953, -3833, 1416, -3833, -3833, -3833, -3833, 2518, -3833,
- -3833, 1191, 624, 667, 233, 2527, 1438, 727, 1455, 1499,
- 2517, 25918, 48544, 2828, 2522, 1199, 1216, 2828, 2525, 752,
- 1234, 1518, 1538, 1556, 1241, 1250, 777, 1562, 2505, 1254,
- 834, 881, 893, 905, 1267, 2530, 2531, 927, 198, 2828,
- 2535, 258, 2537, 2539, 1271, 9663, 10296, 10929, 212, 933,
- -3833, 2541, -3833, 2249, 2543, 2544, 299, 1304, -3833, 11562,
- -3833, -3833, 1094, 1281, 2582, 139, 772, -3833, 2677, 48544,
- 2226, 202, -3833, -3833, -3833, -3833, -3833, -3833, 862, -3833,
- 2528, -3833, 2549, 2046, 2552, 11562, 1109, 2552, 2749, 2442,
- 2442, 16626, 2299, 3083, 12195, 1211, 12195, 1211, 2552, 2552,
- 2552, -3833, 16626, 2556, 16626, 16626, -3833, 2763, 2044, 2551,
- 436, 48544, -3833, -57, -3833, -3833, -3833, -3833, 815, 39379,
- 149, 24688, 41823, 2559, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, 4125, 24688, -3833, 48544, -3833, 2636, -3833, -3833,
- -3833, 22836, 22836, -3833, 22836, -3833, -3833, 1017, 1063, 3141,
- 2585, -3833, -3833, -3833, 29601, 2044, -3833, 24688, -3833, 2960,
- 36, 24688, 2370, -3833, 2564, -3833, -3833, -3833, -3833, -3833,
- 2675, 2674, -3833, 3190, -3833, 11562, -134, -3833, 39379, 39379,
- 24688, 24688, 858, -3833, 1650, -3833, -3833, -3833, 3156, 18525,
- 3003, 3015, 22836, 22836, 22836, -3833, -3833, -3833, -3833, -3833,
- 136, 2044, -3833, 2571, -3833, -3833, -3833, -3833, -3833, 45489,
- 265, -3833, -3833, -134, 3017, -3833, 2044, 2587, 48544, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, 3045, -3833, 2761, 513, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, 18, -3833, -3833, -3833, -3833, -3833, 2806,
- 2371, 2111, 3017, 18, 193, 24688, 18, 18, -3833, -3833,
- 1837, -3833, -49, -3833, -3833, -3833, -3833, 48544, 2632, 2751,
- -3833, 2592, -3833, -3833, 24688, -3833, 2599, -3833, 3041, 3189,
- 2371, -3833, -3833, -3833, 815, 815, 2901, -3833, -134, 2741,
- 2743, 2753, 2759, 2762, 2776, -3833, -3833, -134, -134, -3833,
- -3833, 815, -3833, 890, -3833, -3833, -3833, -3833, -134, -134,
- -134, -134, 2729, -134, -134, 1654, -3833, -3833, 815, 815,
- -3833, 353, -3833, -3833, -3833, -3833, -3833, -3833, -3833, 1192,
- -3833, 2355, 3167, 2872, 815, 815, 3167, 815, 2879, 2884,
- 815, 815, 2703, 3116, 815, 3004, 2735, 2928, 3010, 815,
- -3833, 2744, 3137, 815, 815, 815, 815, 3167, 2890, 3229,
- 815, 815, -3833, 815, 2894, 2899, 159, 2904, 2905, 815,
- 183, 48544, 815, 815, 2907, 815, -3833, -3833, 5097, -3833,
- -3833, -3833, -3833, -3833, -3833, 705, 23454, -3833, -3833, 815,
- 218, -3833, 2845, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, 2659, -3833, -3833, 11562, 2661,
- 2729, -134, -134, 806, -134, 2729, -134, -134, -134, -134,
- -134, 2729, 2729, -134, 1252, -134, 2729, 3947, -3833, -3833,
- -3833, -3833, 185, 815, 815, 815, 815, -3833, 2369, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, 41823, 3021, 2088,
- -51, -3833, -3833, 41823, -3833, 48544, -3833, 1401, 48544, 2672,
- -153, 3423, 236, 236, -3833, 24688, 24688, 24688, 48544, 2730,
- 2585, 30214, -3833, -3833, 1222, -3833, 2681, 14094, -3833, 2684,
- -3833, 11562, -3833, -3833, -3833, 1824, 11562, 11562, 3164, 2737,
- -3833, 40601, -3833, -3833, -3833, 11562, 11562, -3833, 11562, 11562,
- 11562, 11562, -3833, 11562, 40601, 2737, 11562, -3833, 2692, -3833,
- 3086, 3088, -3833, -3833, -3833, -3833, 11562, -3833, 11562, 11562,
- -3833, 11562, 11562, 11562, 11562, -3833, 11562, -3833, -3833, 16626,
- -3833, 2696, 2699, -3833, -3833, -3833, 2710, -3833, 11562, -3833,
- -3833, -3833, -3833, -3833, -3833, 11562, -3833, 11562, -3833, 11562,
- 11562, 11562, 11562, -3833, -3833, -3833, 14727, 11562, 11562, 2715,
- -3833, -3833, 11562, 11562, 11562, -3833, 11562, 241, 11562, 1615,
- 11562, 1850, 11562, -3833, 11562, -3833, -3833, -3833, -3833, 11562,
- -3833, 1659, -3833, -3833, 2558, -3833, 1094, 2724, -3833, -3833,
- 1629, -3833, -3833, 2707, 2713, 2716, 41823, 11562, -3833, -3833,
- -3833, -3833, -3833, -3833, 16626, 310, 2727, 16626, -3833, 2749,
- 3347, 3347, 2197, 11562, 1109, 2749, 11562, 2732, 2734, -3833,
- 11562, 48544, -3833, -3833, -3833, -3833, -3833, -3833, 41823, -3833,
- -3833, -3833, -3833, 149, -3833, 2270, -3833, 2370, -3833, -3833,
- 1666, -3833, 39379, 2740, -3833, 2745, 2809, 2810, 2816, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, 2371, 1650, -3833, -3833, 2754, -3833, -3833, 2412, 2838,
- 2768, 3094, 3293, -3833, -3833, 48544, 16626, -3833, 3336, 2755,
- 2765, 3234, 2767, 2044, -3833, 2848, -3833, -3833, -3833, -3833,
- 3065, -3833, -3833, -3833, -3833, 104, -3833, -3833, 2778, 2778,
- 20372, -3833, -3833, -3833, 3244, -64, -64, -64, -3833, -3833,
- -3833, -3833, 3038, 39379, 3218, 3224, 3225, 1026, -3833, 403,
- -3833, 192, 3178, 2371, -3833, 3228, 42434, -3833, 30825, -3833,
- 2784, 3176, 2788, 815, 35102, 908, 27762, 36935, -3833, -3833,
- 806, -3833, 261, -3833, 37546, 3256, 37546, 37546, -3833, 3072,
- -3833, -3833, -3833, -3833, 2585, 193, -3833, -3833, -3833, 2800,
- -3833, -3833, 1123, 3181, 3183, -3833, 3060, 746, 3060, 1123,
- 1123, 25918, 1222, 2010, -3833, 2729, 3118, -3833, -3833, -3833,
- 41212, 38157, -3833, -3833, -3833, -3833, 3327, -3833, 3328, 1381,
- -3833, -3833, 2714, 21, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, 2322,
- 2714, 2714, 1096, -3833, 134, -3833, -3833, -3833, -3833, -3833,
- 26533, 1005, -3833, 204, -3833, 26533, -3833, 1007, 1007, -3833,
- 26533, 1005, 806, 2729, 26533, 2729, 46100, 1005, -134, -134,
- 2284, 815, 2729, -3833, -3833, 3191, 48544, 3192, 26533, 26533,
- -3833, 41823, -3833, 815, 1052, 2729, 806, 806, 26533, 1005,
- 25918, 946, 2666, -3833, -134, 1005, -3833, -3833, -3833, -3833,
- 24688, 1005, 1005, 3048, -3833, -3833, -3833, 2729, 2666, 46100,
- -3833, -3833, 4943, -3833, -3833, -3833, 19757, 48544, 964, 189,
- -3833, 2807, 33269, 809, 313, 2896, 1344, 2814, 2822, 46711,
- 2044, 2729, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -134, 2675, 2714, 2714, 1825,
- -3833, 3085, 3247, 815, -3833, 1268, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, 2915, -3833, 166, 3006, 2832,
- -3833, -3833, 318, -3833, -3833, 1010, 24688, 19142, -3833, 3068,
- -3833, 2945, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, 2825, 1222, 3090, 1335, 2585, 2840, -3833, 12195, 1369,
- -3833, 2044, 11562, 2044, 2003, -3833, 2842, 2842, 2842, -3833,
- 2843, -3833, -3833, 2842, 3235, 2842, 3237, 2854, -3833, 2857,
- -3833, 1724, 2015, -3833, 1755, 1386, 2048, 1418, 2868, 2874,
- 1465, -3833, 11562, 11562, 1451, 1478, -118, 977, 1035, 340,
- -3833, 1482, 2766, -3833, -3833, 1501, 1506, 1580, 1587, 1068,
- 1611, 1761, 12195, 1617, 947, 347, -3833, 1687, 1070, 1075,
- 1698, 11562, 1708, 11562, 1712, 11562, 1732, 1734, 1783, -3833,
- 1983, 2558, -3833, -3833, 2876, -3833, -3833, -3833, -3833, -3833,
- 2855, 2044, 2878, -3833, -3833, 11562, -3833, 895, -3833, -3833,
- 16626, 380, 2882, -3833, 2044, -3833, -3833, 2885, 1465, -3833,
- -3833, -3833, -3833, -3833, 2889, -3833, 48544, 823, 2895, 31436,
- 39379, 39379, 39379, 2880, 11562, -3833, -3833, 3134, 24688, -3833,
- 3275, -3833, -3833, -3833, -3833, -3833, 2886, 2883, -3833, -3833,
- -3833, 2749, 3233, 3129, -3833, -3833, 2675, 48544, 39379, -3833,
- -3833, 2540, 25918, -3833, 2898, -3833, 2898, 1324, 2893, 1771,
- -3833, -3833, -3833, 2903, 2029, 18525, 3330, 2273, 39379, 39379,
- 39379, -3833, 2585, 2585, 935, 2942, 3282, -3833, -3833, -3833,
- -3833, 47322, -3833, -3833, -3833, -3833, 1118, 48544, 3265, 48544,
- 9030, -3833, -3833, 3460, 11562, 39379, 1116, 772, 815, -3833,
- -3833, -3833, -3833, -3833, -3833, 2371, -3833, -3833, -3833, -3833,
- 37546, -3833, -3833, -3833, 2371, -3833, 18, 1837, -181, 1281,
- -3833, 1082, -3833, -3833, -3833, 3281, 1123, 3060, 3060, 3285,
- 3170, -54, 2911, -3833, 815, -3833, -3833, -3833, 2540, -3833,
- -3833, 11562, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, 1192, -3833, -3833, -3833, -3833, 2916,
- 3292, 3294, 1007, -3833, 26533, -3833, -3833, 26533, 26533, 72,
- 46100, -3833, -3833, -3833, -3833, -3833, -3833, 2919, -3833, -3833,
- 2675, -3833, -3833, 38157, -134, -3833, 26533, 2919, -3833, -3833,
- 194, -3833, -134, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, 46100, 2921, -3833, 339, -3833, -3833, -3833, -3833, -3833,
- 1745, -3833, 46100, -3833, -3833, 46100, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, 2929, 2643, 1167,
- -3833, 2926, 2939, -3833, -3833, -3833, -3833, 48544, -3833, -3833,
- 24688, -3833, -3833, -3833, 4563, 48544, -3833, -3833, -3833, -3833,
- 3158, -3833, 11562, 11562, 3194, 48544, 3197, -3833, 3481, 48544,
- 3550, 46100, -3833, 2943, -3833, 2941, -3833, 1796, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, 2946, 48544, 2714, 2088, -3833,
- -3833, -3833, -3833, -134, 1010, -3833, -3833, -3833, -3833, 3211,
- 3214, 48544, -3833, -3833, -3833, -3833, 3087, -3833, 24688, 3533,
- -3833, 3119, -3833, 2955, 259, 4688, -3833, 2954, 2958, 2959,
- 30214, 2585, 3322, -3833, -3833, 3347, -3833, 2044, 11562, 918,
- -3833, -3833, 274, -3833, 980, -3833, -3833, -3833, 2963, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, 2445, -3833, -3833, -3833,
- 2737, -3833, -3833, -3833, 2964, 3347, 3347, -3833, -3833, 3546,
- 3127, 11562, 11562, -3833, 11562, -3833, 199, 2969, 2994, -3833,
- -3833, -3833, -3833, 11562, -3833, -3833, 3347, -3833, 11562, -3833,
- -3833, 11562, -3833, 11562, 11562, -3833, 1878, -3833, 1899, -3833,
- 1920, -3833, -3833, -3833, 2329, -3833, -3833, 1083, 48544, -3833,
- -3833, 1826, -3833, -3833, 11562, -3833, 42434, -3833, -3833, 3184,
- -3833, -3833, 3398, -3833, -3833, -3833, -144, -144, -144, 15360,
- 2044, 3457, -3833, -3833, -3833, 3275, 3345, -3833, 65, -3833,
- 48544, 2977, 703, -3833, 1846, -3833, -3833, 2978, -3833, 1983,
- 2979, -3833, 815, 15360, 2778, 3119, -3833, -3833, 1324, 25918,
- 30825, -3833, -3833, 39379, 2273, 2273, 2273, 2371, 3404, 2838,
- 2838, -3833, 28376, -3833, -3833, 3136, -3833, -3833, 32047, -3833,
- -38, -3833, -3833, 16626, 1589, -3833, 2044, -3833, 41212, -3833,
- 2044, 815, 2985, 2986, -3833, -3833, 47933, 11562, -3833, -3833,
- -3833, -3833, -3833, 1629, 2227, -3833, 1222, -3833, 1123, -3833,
- 3366, 3370, 1123, -3833, -3833, -3833, 25918, 2585, 15360, -3833,
- 88, 1983, 2044, 2991, 339, -3833, -119, 11562, 26533, -3833,
- -3833, -3833, 2987, -3833, -3833, 3495, 3497, -3833, 26533, 2702,
- 48544, -3833, 3460, -3833, -3833, -3833, -3833, 4563, -3833, 25918,
- -3833, -3833, -3833, -3833, -3833, 48544, -3833, 24688, -3833, 19757,
- -3833, 2998, -3833, 2842, 2842, 2842, -3833, -3833, -3833, 2842,
- -3833, 2843, 3230, -3833, 2843, 2843, -3833, -3833, -3833, -3833,
- -3833, 274, 1320, -3833, -3833, 274, -3833, -3833, -3833, 117,
- 938, 2843, -3833, -3833, -3833, -3833, -3833, -3833, -3833, 2842,
- 2842, 2842, -3833, -3833, 274, 2842, -3833, 2842, -3833, 3572,
- -3833, 271, 109, 2842, 2842, 2842, 2963, 2993, -3833, 2044,
- 3347, 3545, -3833, -3833, 3147, -134, 3489, -3833, 1858, -3833,
- 3007, -3833, 46711, -3833, 2729, 2322, -3833, -3833, -3833, -3833,
- 3145, 950, -3833, 3177, 3008, 3013, -3833, -3833, -134, 3011,
- 3016, -3833, -3833, -3833, -3833, 3629, -3833, 48544, 48544, 48544,
- 2681, -3833, 38768, -3833, 1137, 2044, 3020, 3022, 3025, 3027,
- 3617, 175, -3833, 3624, 40601, -3833, -3833, -3833, 1866, 3301,
- -3833, -3833, 2842, -3833, 2843, -3833, -3833, -3833, 3600, -3833,
- -3833, 2842, 3420, 274, -3833, -3833, 3033, -3833, 3034, 3035,
- -3833, 186, 3036, 1926, 1087, 1870, 3341, 3416, -3833, 3260,
- -3833, 1947, 1171, 1957, 1981, 1991, 2005, -3833, -3833, -3833,
- 794, 1281, -3833, -3833, 1876, -3833, 3400, 3305, 766, 3076,
- 3076, 3076, 1589, 2044, 1882, -3833, -3833, -3833, -3833, 3443,
- -3833, -3833, 3056, 3190, 48544, -3833, 3129, -3833, 2329, 25918,
- 15360, 3057, 3058, -3833, 688, -3833, -3833, 3051, 2273, -3833,
- 3644, 3482, -3833, -3833, 41823, 3063, -3833, -3833, 3368, -3833,
- 161, 3278, -3833, -3833, -3833, 1116, 3157, 3159, 815, 2044,
- -3833, -3833, 2592, 2850, 3117, 1123, 1123, 3377, 3128, 11562,
- 11562, 3091, -3833, 3090, -3833, -3833, 437, 2329, 11562, -3833,
- 2675, 3129, -3833, 2028, 3095, 3097, 48544, 3098, 3099, -3833,
- 3561, 964, -3833, -3833, -3833, -3833, 1005, -3833, -3833, 2919,
- 104, 3071, -3833, 48544, 3412, -3833, -3833, -3833, -3833, 1062,
- -3833, 3100, 1062, 1062, -3833, 2140, -3833, 3122, 274, -3833,
- -3833, 3138, -3833, -3833, -3833, 1062, 3102, 274, -3833, -3833,
- -3833, -3833, 1062, -3833, 41823, -134, 2981, 3709, -3833, 3154,
- -3833, 3606, 3483, 3719, -3833, 2731, -3833, 3488, 3386, 815,
- -3833, 274, -3833, -3833, 3711, -3833, 274, 3711, 1062, 1062,
- 48544, -3833, -3833, -3833, -3833, -3833, -3833, 48544, -3833, 1135,
- -3833, -3833, -3833, 1887, -134, -3833, -3833, -3833, 3120, 3121,
- -3833, -3833, -3833, 313, -3833, 48544, 4563, -3833, -3833, -3833,
- 5097, -3833, 1147, 1891, 339, 3124, 1902, 1923, 3579, 3297,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, 40601, -3833,
- 3711, 3393, 3125, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, 11562, -3833, -3833, -3833, 11562, -3833, -3833, 3430,
- 3584, -3833, -3833, -3833, -3833, -3833, -3833, 192, 192, -3833,
- -3833, -3833, 3745, -3833, 3220, 3227, -3833, -3833, 3231, -3833,
- -3833, 129, 2001, -3833, -3833, -3833, -3833, 15360, 3511, 3238,
- -3833, -3833, 3139, 3193, -3833, -3833, 794, -3833, -3833, -3833,
- -3833, 11562, -3833, 3090, 2284, -3833, 28376, -3833, -3833, -3833,
- -3833, -3833, 3143, 3149, 9030, 1083, -3833, 3199, -3833, -3833,
- -3833, 3202, 2044, 2044, 48544, 3322, -3833, -3833, 1007, 1007,
- -3833, 437, 794, 339, -3833, 1927, -3833, 48544, 48544, 1967,
- 48544, 48544, -64, -64, -64, 1252, 1252, -3833, -3833, -3833,
- 964, -3833, 3547, -3833, -3833, 1982, -3833, 940, 3426, -3833,
- -3833, -3833, -3833, 1062, -3833, 186, -3833, -3833, -3833, -3833,
- -3833, 186, -3833, -3833, -3833, -3833, 1508, -3833, -3833, -3833,
- 3437, 3203, -3833, -3833, -3833, -3833, -3833, 33880, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, 3286, -3833, 54654, -3833, -3833,
- 550, 3195, -3833, -3833, -3833, 1723, 48544, 24688, 3194, 3348,
- -3833, 3460, -3833, 688, 3068, 3119, -3833, 854, 48544, -3833,
- 3439, 191, 1483, -3833, 3632, -3833, -3833, 3169, 3173, 339,
- 2034, -3833, -3833, -3833, -3833, 3668, -3833, -3833, -3833, -3833,
- -3833, 362, 3438, 2729, 2729, 2729, -102, 2001, -3833, -3833,
- 3236, 24688, 16626, 3288, 48544, 1475, 2756, -3833, 1467, 339,
- 11562, 2371, 38157, -3833, -3833, -3833, -3833, -3833, -3833, 11562,
- 3186, 11562, 3187, 1997, -3833, -3833, 3628, 3628, -3833, -3833,
- -3833, -3833, 2006, 2023, -3833, 2054, 2059, -3833, -3833, -3833,
- 3200, -3833, 48544, -3833, -3833, -3833, 277, -3833, -3833, 2062,
- -3833, 2064, -3833, 1508, -3833, 3206, -3833, -3833, -3833, -3833,
- 11562, 3651, 3216, 48544, 145, -3833, 55876, 55876, 48544, -3833,
- -3833, -3833, -3833, 6288, -3833, -3833, 608, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, 3789, -3833,
- 3185, -3833, -3833, 3209, 1138, -3833, -3833, -3833, 4563, 3631,
- 1344, -3833, -3833, -3833, -3833, 259, 3215, 2029, -134, 815,
- -3833, 854, -3833, -3833, -3833, 815, 339, 3217, 3456, -3833,
- 191, -3833, -3833, -3833, 1483, -3833, -3833, -3833, -3833, 11562,
- -3833, -3833, 3761, -3833, -3833, -3833, -3833, -3833, -3833, 112,
- -3833, -3833, 25918, -3833, -3833, 2675, -3833, 2073, -3833, -3833,
- -3833, 3299, 815, 815, 3707, 3712, 815, 815, 815, 815,
- 3219, 2756, -3833, 3687, -3833, -3833, 11562, -3833, -3833, 2044,
- 3447, -3833, 3782, 1281, 2044, 48544, 2044, 48544, -3833, 48544,
- 1286, -3833, -3833, 3432, -3833, 854, -3833, -3833, 3129, -3833,
- 1009, 1009, 274, 186, 274, -3833, -3833, 2044, 11562, -3833,
- 11562, 3253, -3833, -3833, 3667, 48544, -3833, -3833, -3833, -3833,
- 11562, -3833, 54654, 54654, -3833, -3833, -3833, -3833, 3829, 688,
- 3798, 3492, 3800, 3499, -3833, -3833, 3481, 4563, -3833, -3833,
- -3833, -3833, 2729, -3833, 34491, -3833, -3833, 1449, -3833, -3833,
- 339, -3833, -3833, -3833, 3240, -3833, 815, 2284, 3239, -3833,
- -3833, 48544, 3243, -3833, -134, -134, 815, 815, 2793, 2793,
- 2675, 41823, 3343, -3833, -3833, 815, 339, 48544, -3833, 963,
- 3597, -3833, 2077, 2095, -3833, 3826, -3833, 3827, 3246, 3248,
- -3833, 854, -3833, 191, 1483, 2097, -3833, 3871, -3833, 172,
- 3516, 3517, -3833, -3833, -3833, 3252, 2044, 2044, -3833, 195,
- -3833, -3833, 3642, 3729, 11562, 2044, 51599, 3250, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, 55265, 11562, -3833, 608, 3789, -3833, 3518, -3833, 3520,
- -3833, -3833, -3833, 3750, 54654, -3833, 3747, -3833, 688, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, 25918, 15360, -3833, -3833,
- 3288, -3833, 3266, -3833, -3833, 635, -3833, -3833, -134, -134,
- -3833, -3833, -3833, -3833, -3833, 2117, -3833, 41823, -3833, -3833,
- 3847, 3849, 3744, 3850, 963, -3833, -103, -3833, -3833, -3833,
- -3833, -3833, 46711, 46711, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, 3321, 3768, -98, 3298, 11562, 54654, -3833, 3749, -3833,
- 3680, 2036, 3625, 3273, -3833, 3272, 2094, 3785, 55876, 55876,
- -3833, -3833, -3833, -3833, 3763, -3833, -3833, -3833, -3833, -3833,
- 3459, -3833, -3833, 2120, -3833, 15993, -3833, -3833, -3833, -3833,
- -3833, 41823, -3833, 3343, -3833, 3291, 186, 186, 3867, 186,
- -3833, 3870, 3874, -103, -3833, 3295, 2122, 1009, 1009, -3833,
- -3833, 230, -3833, 222, -3833, 2044, 52210, 3869, 48544, -3833,
- -3833, -3833, -3833, 11562, -3833, 43045, 52821, 3302, -3833, -3833,
- -3833, 3467, -3833, 3499, 3710, 3782, -3833, 3266, -3833, 3303,
- -3833, 2749, 2756, -3833, -3833, 3300, -3833, -3833, 186, -3833,
- 186, 186, -3833, -3833, -3833, -3833, -3833, -134, 3678, -3833,
- 230, -3833, 11562, -3833, 3781, 3399, -3833, 3308, -3833, 54654,
- 2159, 54654, -3833, -3833, 3733, 3312, 1103, -3833, 3309, -3833,
- -3833, 54654, 3898, 3597, -3833, 15993, 3316, -3833, 11562, 3317,
- 3320, -3833, -3833, -3833, -3833, -3833, -3833, -3833, 2044, 3895,
- 54654, 48544, 49766, 3512, 53432, 3766, 48544, 4563, 3769, 3771,
- -3833, 54654, -3833, 186, 3727, -3833, -3833, 2044, -3833, -3833,
- 3422, -3833, 50377, -3833, 2388, -3833, 3362, -3833, -3833, 3841,
- 2449, -3833, -3833, -3833, 3613, 3344, -3833, -3833, 54654, 54654,
- -3833, -3833, -3833, 32658, 11562, -3833, -3833, -3833, -3833, -3833,
- 1026, 689, 20987, 3501, 50988, 54043, -3833, -3833, -3833, 28990,
- -3833, -3833, -3833, 3787, -3833, 2044, -3833, -3833, -3833, -3833,
- -3833, 41823, 2138, -3833, -3833, 25918, -3833, 32658, -3833, -3833,
- -3833, -3833, 24071, 3349, -3833, 815, -3833, -3833, 25918, -3833,
- -3833, 15360, -3833, -3833
+ 4770, 2447, 1235, -3680, -151, 688, 48509, 658, 1267, -3680,
+ 435, 3137, -3680, -3680, -3680, -3680, -3680, 3434, -3680, 48509,
+ 1235, -3680, 24653, -3680, -3680, -34, -3680, 175, 1267, 1235,
+ 445, -3680, 48509, -3680, 676, 1579, 1235, -3680, -3680, 43621,
+ -3680, 435, 48509, -3680, 799, -3680, 43621, 1322, -130, 802,
+ 786, 1052, -3680, -3680, 48509, 1152, -3680, -144, 1363, 1253,
+ -3680, -3680, 1021, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, 25268, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, 1287, 48509,
+ 1309, 48509, 1281, 48509, 41788, 48509, 961, 100, 1358, -3680,
+ -3680, 1424, -3680, -3680, 1267, 435, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, 929, -3680, -3680, 1022, -3680, -3680,
+ -3680, 1190, -3680, 1611, 1408, -3680, 1483, 41788, -3680, 48509,
+ -3680, -3680, -3680, 1032, -3680, 1172, -3680, 1182, 1503, 1534,
+ 1536, 807, 11527, 1566, 1566, 1566, 48509, 1523, 1566, 1566,
+ 48509, -3680, 1566, -3680, 1566, 1267, -3680, -3680, 3627, 48509,
+ 1450, 147, 566, 41788, 195, 48509, -151, 65, -3680, 1628,
+ -3680, -3680, -3680, 1267, -3680, 1806, 1653, 300, 48509, -3680,
+ -3680, -3680, 1257, 32, 1277, -3680, -3680, 1405, -3680, 3835,
+ 167, -3680, -3680, -3680, 2596, -3680, -3680, 4587, 1405, -3680,
+ -3680, -3680, 1288, -3680, -3680, -3680, 48509, -151, 1267, 1614,
+ -3680, -3680, 248, 248, 248, -3680, 248, -3680, 248, -3680,
+ -144, 1283, -3680, -3680, 1285, 48509, 507, 645, -3680, -3680,
+ 1291, 633, -3680, 1360, 39344, -3680, 48509, -3680, -3680, -3680,
+ -3680, 1568, -3680, -3680, -3680, 1212, -3680, 24653, -3680, -3680,
+ -3680, 100, -3680, 48509, 1436, -3680, -3680, -3680, 24653, 1321,
+ 48509, -3680, 24653, -3680, -3680, 24653, 204, -7, 1567, 48509,
+ 48509, 1763, -3680, 1951, 39344, 1531, -3680, 142, -73, 1424,
+ 1956, -3680, 1408, -3680, 48509, 48509, 48509, -3680, -3680, -3680,
+ 44232, 807, 1349, 1355, 1374, 16591, -3680, 1377, 1381, 1384,
+ 11527, 1389, 1397, 1411, 1417, 1419, 1438, 1444, 1459, 1465,
+ 1472, 1474, 1487, 1496, 1501, 1509, 1509, 1540, 1544, 1552,
+ 1565, 1031, 1570, -3680, 1574, 1586, 1631, -3680, -3680, 1634,
+ 1639, 1643, -3680, -3680, 1648, 1651, 1654, 12160, 1658, 1666,
+ 1682, -3680, 21569, 1688, 1690, 1711, 1713, 1724, 1741, 1755,
+ 1758, 1766, -3680, -3680, 11527, 1540, -3680, -3680, 1770, -3680,
+ 1772, 1775, 1777, 1792, 1803, 1805, 1808, 1813, 1819, 1841,
+ 1849, 1852, 1869, 1871, 1887, 1540, -3680, 1798, 1890, 1914,
+ 1928, 1939, -3680, 1946, -3680, 275, 1958, 1509, 1540, 1540,
+ 1964, 1966, 1998, 2000, 2002, 16591, 16591, 16591, 11527, -3680,
+ 48509, -3680, 48509, 1159, 3166, -3680, 2284, 16591, 202, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, 1331, 1476, -3680, -3680,
+ -3680, -3680, -3680, 2004, 1400, 1993, 48509, 48509, 48509, 1866,
+ 48509, 48509, 41788, 1603, 48509, 39344, -3680, 1566, 1607, 4103,
+ 1836, 1920, 1876, -3680, -3680, -3680, -3680, -3680, 1885, -3680,
+ -3680, 1862, -3680, 2009, -3680, -3680, 405, -3680, 73, -3680,
+ -3680, -3680, -3680, -3680, -3680, 2101, 1859, -3680, -3680, 115,
+ -3680, -3680, 48509, -3680, -3680, -3680, -3680, 2354, 2094, -3680,
+ -3680, -3680, 155, 2557, 231, 24653, -3680, 1987, 11527, 1231,
+ -3680, -199, -3680, -3680, 2364, -3680, -3680, 39344, 24653, 1332,
+ -3680, -3680, 22186, -3680, -3680, 2597, -3680, 2020, -3680, -3680,
+ 1476, 2517, -3680, 1836, 2302, -3680, 2305, 2219, -7, 2132,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ 2065, 2596, -3680, -3680, -3680, -3680, 2533, -3680, 2234, -3680,
+ 16, -3680, 2085, 1173, 16, 39955, 2458, 196, -3680, 343,
+ -3680, 2542, -3680, -3680, -3680, -3680, -3680, 2225, 2204, -3680,
+ -3680, 349, 2562, -3680, 2574, -3680, 91, -3680, -3680, 2232,
+ -3680, 2458, 16, 196, -3680, 2474, 2609, 840, 1012, -3680,
+ -3680, 924, -3680, -3680, 2686, -3680, -3680, 24653, -3680, -3680,
+ -3680, 2354, -3680, -3680, -3680, -3680, 2152, -3680, 2423, 2275,
+ -3680, -3680, 49, -3680, 2182, 919, 2659, -3680, 726, 35678,
+ -3680, -3680, -3680, 2689, 2708, 1509, 2187, -3680, -3680, -3680,
+ 2819, -3680, -3680, 2197, 2715, 2715, 2715, 2823, -3680, -3680,
+ -3680, -3680, -3680, -3680, 2363, 2235, -3680, 1436, 24653, 2586,
+ 2200, -3680, -3680, 2443, 11527, -3680, -3680, 4305, 35, -3680,
+ -3680, 24653, 179, -3680, 2779, 2406, -3680, -3680, -3680, -3680,
+ 2676, -3680, -3680, 2819, 2735, 2715, 2627, 2222, -3680, -3680,
+ -3680, -3680, -3680, -3680, 216, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, 222, -3680, -3680, -3680, -3680, -3680, 1436, -3680,
+ 24653, -3680, -3680, -3680, 24653, -3680, 2224, -3680, 2221, -3680,
+ 11527, 11527, 1299, 2786, 2847, 2847, 2847, 1159, 2257, 11527,
+ 11527, 11527, 11527, 11527, 11527, 11527, 11527, 11527, 11527, 11527,
+ 11527, 11527, 1388, 2231, -3680, -3680, 1352, -3680, 2236, 11527,
+ 11527, 2322, 11527, 1476, 11527, 25883, -3680, 4065, 11527, 379,
+ 2722, 11527, 11527, 11527, 11527, 3270, 11527, 11527, 11527, 25883,
+ 2855, 2242, -3680, 2228, 1406, 11527, 11527, 1526, 11527, 11527,
+ 11527, 11527, 11527, -3680, -3680, 11527, 11527, 11527, 11527, 16591,
+ 11527, 11527, 11527, 11527, 11527, 11527, 2847, 2847, 11527, 11527,
+ 1539, -3680, 11527, 1476, 1786, 1786, 11527, 1476, 8362, 11527,
+ -3680, -3680, -3680, -3680, -3680, 2244, -3680, -3680, -3680, 25883,
+ 2847, 2847, 11527, 11527, 2786, 2786, 2786, 210, 2252, 782,
+ 11527, 27113, 2247, -3680, -3680, -3680, -3680, 11527, 11527, 11527,
+ -3680, 16591, -3680, -3680, 1687, -3680, -3680, -3680, 12793, 16591,
+ 16591, 2256, 16591, 16591, 16591, 16591, 16591, 2620, 16591, 16591,
+ 17224, 17857, 16591, 16591, 16591, 16591, 1008, 2786, 41788, 16591,
+ 11527, -3680, -3680, 48509, -3680, -3680, -3680, 2251, 24653, 1603,
+ -3680, -3680, 556, 2738, -3680, -3680, 2258, 24653, -3680, 2276,
+ -3680, 2615, -3680, -3680, 2622, 2623, 2638, -3680, -3680, -3680,
+ -3680, -3680, 2869, 2640, -3680, -3680, 2643, -3680, -3680, -3680,
+ -3680, 2293, -3680, -3680, -3680, -3680, -3680, -3680, -3680, 2396,
+ -3680, -3680, -3680, 2300, -3680, 39344, 2300, -3680, -3680, 2300,
+ -3680, -3680, 2300, 38, 3747, -3680, -3680, 48509, -3680, 49120,
+ -3680, -3680, 22186, -151, -3680, -3680, 13426, -3680, -3680, -3680,
+ 2657, 211, 2301, -3680, 24653, -3680, 1159, -3680, 149, 149,
+ 2547, 197, 41788, -3680, -3680, 128, 2306, 2385, 2307, -3680,
+ 2389, -3680, -3680, 24653, 24653, -3680, -3680, -3680, -3680, 2929,
+ 32, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, 2311, 2784, 2315, 39344, 41, -3680,
+ 48509, -3680, 1560, -3680, -3680, -3680, 2316, -3680, 11527, -3680,
+ 2323, -3680, 1243, 2711, -3680, -151, 11527, -3680, 2333, 1408,
+ 48509, 48509, 48509, 24653, 48509, 24653, -3680, 15, 15, -3680,
+ 36289, -3680, -3680, -3680, -3680, 16, 48509, 48509, 16, 39344,
+ -3680, 196, 48509, 16, -3680, 2717, 2432, -3680, -3680, -3680,
+ 2783, -3680, -3680, 2775, 2335, -3680, 2711, -3680, -3680, 196,
+ -3680, -3680, 24653, -3680, -3680, 196, -3680, 196, 196, 16,
+ 16, 2390, -3680, -3680, 2338, -3680, 2390, 2482, -3680, 796,
+ 248, 2579, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, 96, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ 97, -3680, -3680, -3680, 1995, 2836, -3680, 41788, 1486, -99,
+ 817, 1486, 2223, -151, 1026, -3680, 1026, -3680, 3516, 2614,
+ 198, 24653, -3680, 2348, 44843, 24653, -3680, -3680, -3680, 962,
+ 2352, 2353, 1159, 2824, 2826, 2827, 2829, 2834, 2835, 2838,
+ 2839, 2840, 2841, 2845, 2846, 2853, 2854, 2856, 2858, 2859,
+ 2860, 2391, -3680, -3680, -3680, -3680, 24653, -3680, 243, -3680,
+ -3680, -3680, 2415, -3680, -3680, -3680, -3680, 1833, -3680, -3680,
+ -3680, 104, 1527, 2417, 2445, 162, 39344, 2821, 48509, 48509,
+ 1408, 48509, 48509, -3680, -3680, 867, 2667, 2668, 2670, 2407,
+ -3680, -3680, -3680, 1194, 48509, 2862, 30179, -3680, 265, 1143,
+ -3680, 2847, 2409, -3680, 2416, 2418, 2420, 11527, 78, 491,
+ 1150, 1169, 1403, 1209, 358, 392, -3680, 1490, 398, 448,
+ 458, 1214, 462, 253, -3680, 2421, 2428, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, 2429, -3680, -3680, -3680, 470,
+ 476, 1255, 1260, 2430, 2431, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, 2866, -3680, 1498, -3680, -3680,
+ -3680, -3680, 2434, -3680, -3680, 1282, 550, 749, 305, 2449,
+ 1512, 819, 1515, 1521, 2437, 25883, 48509, 2847, 2438, 1293,
+ 1306, 2847, 2440, 845, 1314, 1571, 1591, 1595, 1333, 1387,
+ 881, 1612, 3073, 1415, 883, 889, 893, 946, 1421, 2444,
+ 2448, 968, 176, 2847, 2450, 313, 2442, 2454, 1485, 9628,
+ 10261, 10894, 1122, 970, -3680, 2456, -3680, 2228, 2457, 2461,
+ 319, 1489, -3680, 11527, -3680, -3680, 818, 1140, 2516, 156,
+ 888, -3680, 2616, 48509, 2237, 134, -3680, -3680, -3680, -3680,
+ -3680, -3680, 761, -3680, 2465, -3680, 2475, 2070, 2476, 11527,
+ 186, 2476, 2603, 2696, 2696, 16591, 2797, 2714, 12160, 321,
+ 12160, 321, 2476, 2476, 2476, -3680, 16591, 2477, 16591, 16591,
+ -3680, 2786, 1159, 2484, 1074, 48509, -3680, 556, -3680, -3680,
+ -3680, -3680, 74, 39344, 106, 24653, 41788, 2485, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, 5161, 24653, -3680, 48509,
+ -3680, 2567, -3680, -3680, -3680, 22801, 22801, -3680, 22801, -3680,
+ -3680, 208, 281, 3198, 2515, -3680, -3680, -3680, 29566, 1159,
+ -3680, 24653, -3680, 2889, 13, 24653, 2348, -3680, 2494, -3680,
+ -3680, -3680, -3680, -3680, 1382, 2602, -3680, 3118, -3680, 11527,
+ -151, -3680, 39344, 39344, 24653, 24653, 24653, 30, -3680, 1431,
+ -3680, -3680, -3680, 2517, 18490, 2932, 2944, 22801, 22801, 22801,
+ -3680, -3680, -3680, -3680, -3680, 861, 1159, -3680, 2500, -3680,
+ -3680, -3680, -3680, -3680, 45454, 110, -3680, -3680, -151, 2948,
+ -3680, 1159, 2511, 48509, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, 2974, -3680, 2688,
+ 577, -3680, -3680, -3680, -3680, -3680, -3680, -3680, 16, -3680,
+ -3680, -3680, -3680, -3680, 2736, 2458, 2562, 2948, 16, 196,
+ 24653, 16, 16, -3680, -3680, 1559, -3680, 924, -3680, -3680,
+ -3680, -3680, 48509, 2730, 2673, -3680, 2519, -3680, -3680, 24653,
+ -3680, 2521, -3680, 2961, 3108, 2458, -3680, -3680, -3680, 74,
+ 74, 2820, -3680, -151, 2655, 2656, 2660, 2662, 2663, 2698,
+ -3680, -3680, -151, -151, -3680, -3680, 74, -3680, 1667, -3680,
+ -3680, -3680, -3680, -151, -151, -151, -151, 1747, -151, -151,
+ 1663, -3680, -3680, 74, 74, -3680, 2016, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, 882, -3680, 2621, 3082, 2780, 74,
+ 74, 3082, 74, 2781, 2785, 74, 74, 2626, 3036, 74,
+ 2926, 2648, 2351, 2928, 74, -3680, 2650, 3047, 74, 74,
+ 74, 74, 3082, 2796, 3139, 74, 74, -3680, 74, 2798,
+ 2801, 178, 2800, 2802, 74, 971, 48509, 74, 74, 2807,
+ 74, -3680, -3680, 6559, -3680, -3680, -3680, -3680, -3680, -3680,
+ 564, 23419, -3680, -3680, 74, 154, -3680, 2761, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ 2571, -3680, -3680, 11527, 2572, 1747, -151, -151, 1613, -151,
+ 1747, -151, -151, -151, -151, -151, 1747, 1747, -151, 1886,
+ -151, 1747, 4305, -3680, 2624, -3680, -3680, -3680, -3680, 140,
+ 74, 74, 74, 74, -3680, 2303, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, 41788, 2924, 2214, 730, -3680, -3680,
+ 41788, -3680, 48509, -3680, 1054, 48509, 2576, 565, 5637, 855,
+ 855, -3680, 24653, 24653, 24653, 48509, 2628, 2515, 30179, -3680,
+ -3680, 796, -3680, 2569, 14059, -3680, 2577, -3680, 11527, -3680,
+ -3680, -3680, 1188, 11527, 11527, 3053, 2833, -3680, 40566, -3680,
+ -3680, -3680, 11527, 11527, -3680, 11527, 11527, 11527, 11527, -3680,
+ 11527, 40566, 2833, 11527, -3680, 2581, -3680, 2972, 2976, -3680,
+ -3680, -3680, -3680, 11527, -3680, 11527, 11527, -3680, 11527, 11527,
+ 11527, 11527, -3680, 11527, -3680, -3680, 16591, -3680, 2580, 2584,
+ -3680, -3680, -3680, 2588, -3680, 11527, -3680, -3680, -3680, -3680,
+ -3680, -3680, 11527, -3680, 11527, -3680, 11527, 11527, 11527, 11527,
+ -3680, -3680, -3680, 14692, 11527, 11527, 2591, -3680, -3680, 11527,
+ 11527, 11527, -3680, 11527, 1266, 11527, 1835, 11527, 1861, 11527,
+ -3680, 11527, -3680, -3680, -3680, -3680, 11527, -3680, 1673, -3680,
+ -3680, 2287, -3680, 818, 2601, -3680, -3680, 1560, -3680, -3680,
+ 2598, 2599, 2600, 41788, 11527, -3680, -3680, -3680, -3680, -3680,
+ -3680, 16591, 327, 2611, 16591, -3680, 2603, 3270, 3270, 2220,
+ 11527, 186, 2603, 11527, 2617, 2608, -3680, 11527, 48509, -3680,
+ -3680, -3680, -3680, -3680, -3680, 41788, -3680, -3680, -3680, -3680,
+ 106, -3680, 2276, -3680, 2348, -3680, -3680, 1691, -3680, 39344,
+ 2607, -3680, 2613, 2682, 2694, 2703, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, 2458, 1431,
+ -3680, -3680, 2629, -3680, -3680, 2443, 2718, 2651, 2983, 3175,
+ -3680, -3680, 48509, 16591, -3680, 3217, 2637, 2639, 3111, 2644,
+ 1159, -3680, 2726, -3680, -3680, -3680, 42, -3680, -3680, -3680,
+ -3680, -3680, 63, -3680, -3680, 2649, 2649, 20337, -3680, -3680,
+ -3680, 3119, 1262, 1262, 1262, -3680, -3680, -3680, -3680, 2909,
+ 39344, 3089, 3091, 3093, 726, -3680, 372, -3680, 1067, 3051,
+ 2458, -3680, 3096, 42399, -3680, 30790, -3680, 2661, 3046, 2664,
+ 74, 35067, 810, 27727, 36900, -3680, -3680, 1613, -3680, 217,
+ -3680, 37511, 3129, 37511, 37511, -3680, 2942, -3680, -3680, -3680,
+ -3680, 2515, 196, -3680, -3680, -3680, 2675, -3680, -3680, 870,
+ 3057, 3058, -3680, 2936, 1096, 2936, 870, 870, 25883, 796,
+ 2879, -3680, 1747, 2992, -3680, -3680, -3680, 41177, 38122, -3680,
+ -3680, -3680, -3680, 3201, -3680, 3210, 224, -3680, -3680, 2520,
+ 817, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, 2223, 2520, 2520, 1026,
+ -3680, 116, -3680, -3680, -3680, -3680, -3680, 26498, 1235, -3680,
+ 131, -3680, 26498, -3680, 962, 962, -3680, 26498, 1235, 1613,
+ 1747, 26498, 1747, 46065, 1235, -151, -151, 2266, 74, 1747,
+ -3680, -3680, 3075, 48509, 3076, 26498, 26498, -3680, 41788, -3680,
+ 74, 130, 1747, 1613, 1613, 26498, 1235, 25883, 1326, 2233,
+ -3680, -151, 1235, -3680, -3680, -3680, -3680, 24653, 1235, 1235,
+ 3348, -3680, -3680, -3680, 1747, 2233, 46065, -3680, -3680, 6315,
+ -3680, -3680, -3680, 19722, 48509, 987, 188, -3680, 2697, 33234,
+ 27, 917, 2792, 1449, 2720, 2721, 46676, 1159, 1747, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -151, 1382, 2520, 2520, 1527, -3680, 2977,
+ 3142, 74, -3680, 2361, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, 2825, -3680, 146, 2910, 2732, -3680, -3680,
+ 272, -3680, -3680, 932, 24653, 19107, -3680, 2975, -3680, 3243,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, 2729,
+ 796, 2990, 1196, 2515, 2745, -3680, 12160, 1529, -3680, 1159,
+ 11527, 1159, 2091, -3680, 2741, 2741, 2741, -3680, 2743, -3680,
+ -3680, 2741, 3134, 2741, 3135, 2748, -3680, 2749, -3680, 1699,
+ 2066, -3680, 1789, 1542, 2120, 1563, 2753, 2754, 1331, -3680,
+ 11527, 11527, 1594, 1598, -96, 1030, 1040, 345, -3680, 1602,
+ 3521, -3680, -3680, 1604, 1608, 1620, 1626, 1064, 1656, 1793,
+ 12160, 1675, 263, 350, -3680, 1677, 1081, 1087, 1697, 11527,
+ 1705, 11527, 1718, 11527, 1739, 1751, 1759, -3680, 2065, 2287,
+ -3680, -3680, 2755, -3680, -3680, -3680, -3680, -3680, 2750, 1159,
+ 2766, -3680, -3680, 11527, -3680, 202, -3680, -3680, 16591, 439,
+ 2767, -3680, 1159, -3680, -3680, 2768, 1331, -3680, -3680, -3680,
+ -3680, -3680, 2793, -3680, 48509, 858, 2776, 31401, 39344, 39344,
+ 39344, 2772, 11527, -3680, -3680, 3048, 24653, -3680, 3184, -3680,
+ -3680, -3680, -3680, -3680, 2782, 2803, -3680, -3680, -3680, 2603,
+ 3145, 3028, -3680, -3680, 1382, 48509, 39344, 3092, -3680, -3680,
+ 2596, 25883, -3680, 2805, -3680, 2805, 1846, 2799, 1822, -3680,
+ -3680, -3680, 2790, 2132, 18490, 3239, 2258, 39344, 39344, 39344,
+ -3680, 2515, 2515, 152, 2863, 3188, -3680, -3680, -3680, -3680,
+ 47287, -3680, -3680, -3680, -3680, 1080, 48509, 3172, 48509, 8995,
+ -3680, -3680, 3369, 11527, 39344, -50, 888, 74, -3680, -3680,
+ -3680, -3680, -3680, -3680, 2458, -3680, -3680, -3680, -3680, 37511,
+ -3680, -3680, -3680, 2458, -3680, 16, 1559, -209, 1140, -3680,
+ 1229, -3680, -3680, -3680, 3191, 870, 2936, 2936, 3193, 3084,
+ 787, 2817, -3680, 74, -3680, -3680, -3680, 2596, -3680, -3680,
+ 11527, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, 882, -3680, -3680, -3680, -3680, 2831, 3195,
+ 3196, 962, -3680, 26498, -3680, -3680, 26498, 26498, 151, 46065,
+ -3680, -3680, -3680, -3680, -3680, -3680, 2822, -3680, -3680, 1382,
+ -3680, -3680, 38122, -151, -3680, 26498, 2822, -3680, -3680, 193,
+ -3680, -151, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ 46065, 2830, -3680, 317, -3680, -3680, -3680, -3680, -3680, 1806,
+ -3680, 46065, -3680, -3680, 46065, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, 2837, 2945, 1071, -3680,
+ 2842, 2843, -3680, -3680, -3680, -3680, 48509, -3680, -3680, 24653,
+ -3680, -3680, -3680, 6184, 48509, -3680, -3680, -3680, -3680, 3055,
+ -3680, 11527, 11527, 3105, 48509, 3106, -3680, 3372, 48509, 3456,
+ 46065, -3680, 2848, -3680, 2849, -3680, 1829, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, 2850, 48509, 2520, 2214, -3680, -3680,
+ -3680, -3680, -151, 932, -3680, -3680, -3680, -3680, 3123, 3130,
+ 48509, -3680, -3680, -3680, -3680, 2991, -3680, 24653, 3445, -3680,
+ 3027, -3680, 2865, 145, 5754, -3680, 2872, 2873, 2874, 30179,
+ 2515, 3230, -3680, -3680, 3270, -3680, 1159, 11527, 831, -3680,
+ -3680, 297, -3680, 843, -3680, -3680, -3680, 2875, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, 3344, -3680, -3680, -3680, 2833,
+ -3680, -3680, -3680, 2876, 3270, 3270, -3680, -3680, 3458, 3038,
+ 11527, 11527, -3680, 11527, -3680, 871, 2878, 2914, -3680, -3680,
+ -3680, -3680, 11527, -3680, -3680, 3270, -3680, 11527, -3680, -3680,
+ 11527, -3680, 11527, 11527, -3680, 1778, -3680, 1795, -3680, 1799,
+ -3680, -3680, -3680, 2316, -3680, -3680, 782, 48509, -3680, -3680,
+ 1842, -3680, -3680, 11527, -3680, 42399, -3680, -3680, 3098, -3680,
+ -3680, 3318, -3680, -3680, -3680, 548, 548, 548, 15325, 1159,
+ 3375, -3680, -3680, -3680, 3184, 3263, -3680, 64, -3680, 48509,
+ 2895, 1494, -3680, 1857, -3680, -3680, 2896, -3680, -3680, 2065,
+ 2902, -3680, 74, 15325, 2649, 3027, -3680, -3680, 1846, 25883,
+ 30790, -3680, -3680, 39344, 2258, 2258, 2258, 2458, 3329, 2718,
+ 2718, -3680, 28341, -3680, -3680, 3059, -3680, -3680, 32012, -3680,
+ -45, -3680, -3680, 16591, 1574, -3680, 1159, -3680, 41177, -3680,
+ 1159, 74, 2906, 2915, -3680, -3680, 47898, 11527, -3680, -3680,
+ -3680, -3680, -3680, 1560, 837, -3680, 796, -3680, 870, -3680,
+ 3287, 3288, 870, -3680, -3680, -3680, 25883, 2515, 15325, -3680,
+ 293, 2065, 1159, 2916, 317, -3680, 520, 11527, 26498, -3680,
+ -3680, -3680, 2920, -3680, -3680, 3426, 3427, -3680, 26498, 1833,
+ 48509, -3680, 3369, -3680, -3680, -3680, -3680, 6184, -3680, 25883,
+ -3680, -3680, -3680, -3680, -3680, 48509, -3680, 24653, -3680, 19722,
+ -3680, 2927, -3680, 2741, 2741, 2741, -3680, -3680, -3680, 2741,
+ -3680, 2743, 3158, -3680, 2743, 2743, -3680, -3680, -3680, -3680,
+ -3680, 297, 207, -3680, -3680, 297, -3680, -3680, -3680, 129,
+ 1251, 2743, -3680, -3680, -3680, -3680, -3680, -3680, -3680, 2741,
+ 2741, 2741, -3680, -3680, 297, 2741, -3680, 2741, -3680, 2904,
+ -3680, 257, 109, 2741, 2741, 2741, 2875, 2921, -3680, 1159,
+ 3270, 3473, -3680, -3680, 3077, -151, 3417, -3680, 1874, -3680,
+ 2933, -3680, 46676, -3680, 1747, 2223, -3680, -3680, -3680, -3680,
+ 3078, 762, -3680, 3102, 2937, 2935, -3680, -3680, -151, 2940,
+ 2941, -3680, -3680, -3680, -3680, 3553, -3680, 48509, 48509, 48509,
+ 2569, -3680, 38733, -3680, -237, 1159, 2946, 2947, 2950, 2952,
+ 3541, 190, -3680, 3549, 40566, -3680, -3680, -3680, 1877, 3226,
+ -3680, -3680, 2741, -3680, 2743, -3680, -3680, -3680, 3528, -3680,
+ -3680, 2741, 3347, 297, -3680, -3680, 2965, -3680, 2967, 2973,
+ -3680, 248, 2978, 1825, 1110, 1883, 3264, 3349, -3680, 3194,
+ -3680, 1839, 584, 1894, 1971, 1977, 1988, -3680, -3680, -3680,
+ 191, 1140, -3680, -3680, 1895, -3680, 3332, 3241, 717, 3008,
+ 3008, 3008, 1574, 1159, 1916, -3680, -3680, -3680, -3680, 3374,
+ -3680, -3680, 2988, 3118, 48509, -3680, 3028, -3680, 2316, 25883,
+ 15325, 2994, 2987, -3680, 919, -3680, -3680, 2984, 2258, -3680,
+ 3580, 3421, -3680, -3680, 41788, 2997, -3680, -3680, 3307, -3680,
+ 108, 3218, -3680, -3680, -3680, -50, 3095, 3097, 74, 1159,
+ -3680, -3680, 2519, 2278, 3056, 870, 870, 2693, 3061, 11527,
+ 11527, 3009, -3680, 2990, -3680, -3680, 348, 2316, 11527, -3680,
+ 1382, 3028, -3680, 2008, 3014, 3021, 48509, 3022, 3023, -3680,
+ 3435, 987, -3680, -3680, -3680, -3680, 1235, -3680, -3680, 2822,
+ 63, 3026, -3680, 48509, 3353, -3680, -3680, -3680, -3680, 728,
+ -3680, 3029, 728, 728, -3680, 2234, -3680, 3064, 297, -3680,
+ -3680, 3065, -3680, -3680, -3680, 728, 3041, 297, -3680, -3680,
+ -3680, -3680, 728, -3680, 41788, -151, 3501, 3651, -3680, 3099,
+ -3680, 3548, 3424, 3661, -3680, 2646, -3680, 3429, 3324, 74,
+ -3680, 297, -3680, -3680, 3654, -3680, 297, 3654, 728, 728,
+ 48509, -3680, -3680, -3680, -3680, -3680, -3680, 48509, -3680, 898,
+ -3680, -3680, -3680, 1922, -151, -3680, -3680, -3680, 3062, 3054,
+ -3680, -3680, -3680, 917, -3680, 48509, 6184, -3680, -3680, -3680,
+ 6559, -3680, 899, 1925, 317, 3060, 1929, 1931, 3532, 3234,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, 40566, -3680,
+ 3654, 3345, 3074, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, 11527, -3680, -3680, -3680, 11527, -3680, -3680, 3379,
+ 3535, -3680, -3680, -3680, -3680, -3680, -3680, 1067, 1067, -3680,
+ -3680, -3680, 3694, -3680, 3173, 3176, -3680, -3680, 3179, -3680,
+ -3680, 118, 2045, -3680, -3680, -3680, -3680, 15325, 3466, 3189,
+ -3680, -3680, 3103, 3144, -3680, -3680, 191, -3680, -3680, -3680,
+ -3680, 11527, -3680, 2990, 2266, -3680, 28341, -3680, -3680, -3680,
+ -3680, -3680, 3101, 3107, 8995, 782, -3680, 3141, -3680, -3680,
+ -3680, 3143, 1159, 1159, 48509, 3230, -3680, -3680, 962, 962,
+ -3680, 348, 191, 317, -3680, 1934, -3680, 48509, 48509, 1940,
+ 48509, 48509, 1262, 1262, 1262, 1886, 1886, -3680, -3680, -3680,
+ 987, -3680, 3495, -3680, -3680, 1947, -3680, 833, 3376, -3680,
+ -3680, -3680, -3680, 728, -3680, 248, -3680, -3680, -3680, -3680,
+ -3680, 248, -3680, -3680, -3680, -3680, 1509, -3680, -3680, -3680,
+ 3388, 3152, -3680, -3680, -3680, -3680, -3680, 33845, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, 3236, -3680, 54619, -3680, -3680,
+ -144, 3146, -3680, -3680, -3680, 1441, 48509, 24653, 3105, 3299,
+ -3680, 3369, -3680, 919, 2975, 3027, -3680, 1114, 48509, -3680,
+ 3393, 177, 1434, -3680, 3583, -3680, -3680, 3125, 3131, 317,
+ 2058, -3680, -3680, -3680, -3680, 3618, -3680, -3680, -3680, -3680,
+ -3680, 338, 3391, 1747, 1747, 1747, -63, 2045, -3680, -3680,
+ 3185, 24653, 16591, 3245, 48509, 852, 3081, -3680, -211, 317,
+ 11527, 2458, 38122, -3680, -3680, -3680, -3680, -3680, -3680, 11527,
+ 3138, 11527, 3150, 1953, -3680, -3680, 3585, 3585, -3680, -3680,
+ -3680, -3680, 1991, 2018, -3680, 2025, 2032, -3680, -3680, -3680,
+ 3151, -3680, 48509, -3680, -3680, -3680, 295, -3680, -3680, 2048,
+ -3680, 2055, -3680, 1509, -3680, 3153, -3680, -3680, -3680, -3680,
+ 11527, 3614, 3178, 48509, 122, -3680, 55841, 55841, 48509, -3680,
+ -3680, -3680, -3680, 5389, -3680, -3680, 860, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, 3753, -3680,
+ 3147, -3680, -3680, 3156, 1181, -3680, -3680, -3680, 6184, 3599,
+ 1449, -3680, -3680, -3680, -3680, 145, 3164, 2132, -151, 74,
+ -3680, 1114, -3680, -3680, -3680, 74, 317, 3169, 3412, -3680,
+ 177, -3680, -3680, -3680, 1434, -3680, -3680, -3680, -3680, 11527,
+ -3680, -3680, 3742, -3680, -3680, -3680, -3680, -3680, -3680, 77,
+ -3680, -3680, 25883, -3680, -3680, 1382, -3680, 2072, -3680, -3680,
+ -3680, 3262, 74, 74, 3669, 3670, 74, 74, 74, 74,
+ 3182, 3081, -3680, 3649, -3680, -3680, 11527, -3680, -3680, 1159,
+ 3407, -3680, 3740, 1140, 1159, 48509, 1159, 48509, -3680, 48509,
+ 1495, -3680, -3680, 3390, -3680, 1114, -3680, -3680, 3028, -3680,
+ 913, 913, 297, 248, 297, -3680, -3680, 1159, 11527, -3680,
+ 11527, 3211, -3680, -3680, 3625, 48509, -3680, -3680, -3680, -3680,
+ 11527, -3680, 54619, 54619, -3680, -3680, -3680, -3680, 3787, 919,
+ 3756, 3450, 3758, 3571, -3680, -3680, 3372, 6184, -3680, -3680,
+ -3680, -3680, 1747, -3680, 34456, -3680, -3680, 1376, -3680, -3680,
+ 317, -3680, -3680, -3680, 3197, -3680, 74, 2266, 3192, -3680,
+ -3680, 48509, 3200, -3680, -151, -151, 74, 74, 2033, 2033,
+ 1382, 41788, 3302, -3680, -3680, 74, 317, 48509, -3680, 918,
+ 3555, -3680, 2077, 2089, -3680, 3779, -3680, 3784, 3203, 3204,
+ -3680, 1114, -3680, 177, 1434, 2117, -3680, 3831, -3680, 181,
+ 3474, 3477, -3680, -3680, -3680, 3212, 1159, 1159, -3680, 229,
+ -3680, -3680, 3603, 3697, 11527, 1159, 51564, 3214, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, 55230, 11527, -3680, 860, 3753, -3680, 3483, -3680, 3485,
+ -3680, -3680, -3680, 3724, 54619, -3680, 3717, -3680, 919, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, 25883, 15325, -3680, -3680,
+ 3245, -3680, 3237, -3680, -3680, -25, -3680, -3680, -151, -151,
+ -3680, -3680, -3680, -3680, -3680, 2121, -3680, 41788, -3680, -3680,
+ 3816, 3820, 3714, 3822, 918, -3680, -123, -3680, -3680, -3680,
+ -3680, -3680, 46676, 46676, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, 3292, 3739, -76, 3272, 11527, 54619, -3680, 3718, -3680,
+ 3652, 2131, 3594, 3246, -3680, 3242, 2170, 3755, 55841, 55841,
+ -3680, -3680, -3680, -3680, 3733, -3680, -3680, -3680, -3680, -3680,
+ 3431, -3680, -3680, 2126, -3680, 15958, -3680, -3680, -3680, -3680,
+ -3680, 41788, -3680, 3302, -3680, 3261, 248, 248, 3846, 248,
+ -3680, 3847, 3848, -123, -3680, 3271, 2128, 913, 913, -3680,
+ -3680, 206, -3680, 241, -3680, 1159, 52175, 3850, 48509, -3680,
+ -3680, -3680, -3680, 11527, -3680, 43010, 52786, 3273, -3680, -3680,
+ -3680, 3451, -3680, 3571, 3686, 3740, -3680, 3237, -3680, 3280,
+ -3680, 2603, 3081, -3680, -3680, 3282, -3680, -3680, 248, -3680,
+ 248, 248, -3680, -3680, -3680, -3680, -3680, -151, 3659, -3680,
+ 206, -3680, 11527, -3680, 3759, 3373, -3680, 3286, -3680, 54619,
+ 2163, 54619, -3680, -3680, 3711, 3290, 1561, -3680, 3289, -3680,
+ -3680, 54619, 3879, 3555, -3680, 15958, 3297, -3680, 11527, 3298,
+ 3300, -3680, -3680, -3680, -3680, -3680, -3680, -3680, 1159, 3877,
+ 54619, 48509, 49731, 3493, 53397, 3744, 48509, 6184, 3745, 3746,
+ -3680, 54619, -3680, 248, 3713, -3680, -3680, 1159, -3680, -3680,
+ 3397, -3680, 50342, -3680, 2265, -3680, 3336, -3680, -3680, 3814,
+ 1308, -3680, -3680, -3680, 3586, 3314, -3680, -3680, 54619, 54619,
+ -3680, -3680, -3680, 32623, 11527, -3680, -3680, -3680, -3680, -3680,
+ 726, 642, 20952, 3470, 50953, 54008, -3680, -3680, -3680, 28955,
+ -3680, -3680, -3680, 3757, -3680, 1159, -3680, -3680, -3680, -3680,
+ -3680, 41788, 2130, -3680, -3680, 25883, -3680, 32623, -3680, -3680,
+ -3680, -3680, 24036, 3315, -3680, 74, -3680, -3680, 25883, -3680,
+ -3680, 15325, -3680, -3680
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -3833, -3833, -3833, -3833, -3833, 69, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, 1714, -3833, -3833, -3833, -3833, -3833,
- 1925, -3833, 657, -1783, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, 658, 1546, 3329, -3833, 395, -3833, 56, -3833,
- -3833, -3833, -2855, -67, -255, -3833, -3833, 346, 17, 2989,
- -252, -3787, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, 406, 405, -3833, -3833, 213, -3833, -3833, -2740, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -442, -394, 1806,
- -3833, -3833, -3833, 3962, -3833, 3429, -3833, 1245, 2193, -3833,
- -3833, -3833, -294, 235, -3833, 237, -3833, 238, -3833, 240,
- -3833, 243, 244, 246, 247, -3833, 248, -3833, -3833, -397,
- -3833, -3833, -3833, -3833, 249, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -267, -3833, -3833, -111, -3833, -3833, -264, 250,
- -3833, -209, 255, -3833, 256, -3833, -121, -3833, -117, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, 2996, -3833, -3833, -3833, -2213, -3833, -3833, -2335, 2563,
- -3833, -1710, -3833, -3833, -1736, -3833, -3833, -1725, 814, -3833,
- -3833, -97, -344, -3833, -1376, -1863, -1859, -3833, -3833, -3833,
- -1951, -1947, -779, 2296, -1199, -2217, -3833, -3833, -3833, -3833,
- 106, -3833, -3833, -2535, 2027, 2572, -3833, 2565, -3833, -3833,
- 1126, -3833, -3833, 1307, 617, 1306, -3833, 921, 2736, -1257,
- -3833, -3833, -3833, -3833, -3833, -3833, -25, 227, -116, -3833,
- -3289, 625, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3832, -3833, -3833, -3833, -295, -3833, -3833, -200, -3833, -3833,
- -247, -3833, 75, -2270, -3833, -3833, -3833, -3833, 2542, -1309,
- -3833, 3548, -3833, -536, 468, 2063, -2358, -1382, -3833, -927,
- -923, -2434, -3833, -3833, -3833, -3273, 1076, 1485, -3833, 824,
- 2058, -1866, -3833, -3833, -3833, -3833, -3833, 1557, -3833, -3833,
- 849, -3833, 842, -3833, -3833, -3833, -3833, -3833, -249, -3833,
- 57, -2012, -3833, -3833, -3833, -2776, 1038, 816, -3833, -3833,
- -3833, -1058, -2774, -727, -3833, 343, -2469, -2412, 783, -3833,
- -3833, 537, -3702, -3833, -3833, -577, -2046, -2355, 16, -3833,
- -3833, 551, -3060, 916, -3833, -3833, -3833, -3118, -3169, -3833,
- 83, -3833, -3833, -3833, -3833, -2630, -3833, -3833, -1454, -2237,
- -3833, -3833, 4086, 4089, -1033, -2612, -3634, -10, -8, -3833,
- -3833, -3833, 2566, -2120, 163, 155, 160, 2019, -1561, 315,
- -2306, -3833, 360, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, 2099,
- -1127, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -2362, 885,
- -3833, -3833, 1606, -3833, -3833, -3833, -1846, 3146, -3833, -3833,
- -3833, -3833, 3487, -2128, -2577, -3833, -3833, -3833, -3833, -3833,
- -3833, 1348, -3833, -3833, 2224, 2688, -3833, -3833, -3833, -3833,
- -3833, -3833, 612, 1798, -3833, -3833, -3833, -3833, -3833, -3833,
- 896, 2603, -3833, -3833, -3833, -15, -3833, -3833, -3833, -3833,
- 2318, -3833, -3833, -3833, -3833, 2647, -3833, -3833, -3833, -3833,
- -3833, -3833, 1404, -3833, 1836, -3833, -1433, -3833, -3833, 1008,
- -982, 1789, -594, 1921, 359, -3833, 3538, -3833, -3833, -3833,
- -1642, -2386, -3833, 3242, -822, -2490, 2315, -552, -1801, 1040,
- 1170, -678, 4040, -3833, -1145, -1141, -3833, -3833, -647, -3833,
- -3833, -3833, -3833, -3833, 2020, 2024, -653, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, 1444, -3833,
- -3833, -3833, -3833, -1720, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, 1541, -3833, -2027, -3833, -3833, -471, -3833, 3023, -3833,
- -3833, -3833, -2250, -1757, 1756, 959, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -2307, -3833, -3833, -3833, -3833,
- -3833, 1942, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -1701,
- -3833, -1770, 303, -3833, 451, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -48, 841, -47, -2845, -1099, 1665, -3833, -3833,
- -1265, 3064, -2036, -3833, -3833, -3833, 1928, -3833, -3833, -3833,
- -3833, -3833, 928, -2538, 2719, -3833, -3833, -3089, -922, -2241,
- -882, -3833, -1346, 1363, 470, -3833, -1768, -1781, -508, -2470,
- -1093, -3833, 1668, -3833, -3833, -3833, -3833, -220, -3833, -3833,
- -3833, 491, 1827, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -547, -735, -3833, 2080, 2203, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, 2897, 2849, 1893,
- -3833, -3833, -2521, -3833, -3833, 1857, -3833, 748, -1976, -1804,
- 1044, -3833, -3833, 1047, -3122, -3833, -3833, -3833, -3833, -3833,
- -3833, 987, -3833, 19, 3603, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, 2646, -1050, 3526, -3833, -3833, -3833, -3833, -3833,
- -3833, 2319, -3833, -3833, -3833, -3833, -3833, -3833, 2817, 3620,
- -576, -1295, -3833, -601, 2791, 2323, -867, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- 2439, 956, -3833, -3833, -3833, -3833, 2875, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, -3833, 1081, -95, -3833,
- 4, -142, -3833, -60, -3833, -3833, -3833, -3833, -3833, -238,
- -3833, -3833, -243, -673, -969, -1350, 670, -1773, -2005, 1069,
- 2852, -3144, -687, -1163, -1167, -1914, 37, -3833, -3833, 3365,
- 97, 391, -316, -6, -2700, -107, -606, -3833, -2464, -3833,
- -3833, -3833, -3833, 2385, -3833, -3833, -3833, -3833, 1423, -3833,
- -3833, -3833, 1036, -3833, 756, 529, -3833, -3833, 156, 3663,
- -3833, 2436, -3833, -3833, -3833, -3833, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833, -3833, 2902, 3659, 3339, -3833,
- 2947, -3833, -3833, -3833, -3833, -3833, 427, -3833, 607, -2207,
- -1794, -3833, -3833, 2721, 636, -3833, 1545, -270, -545, -3833,
- -3833, 425, -3833, -3833, 1540, 3684, 3360, -3833, -3833, -3833,
- -3833, -3833, -2701, -890, -3833, -3307, -2761, -1669, -3833, -3833,
- -2116, -2935, -3833, -3833, -1021, -3833, -3833, -3833, -3833, -1844,
- -3833, -3833, -3833, 42, 3748, 3751, -3833, -3833, -177, -3833,
- -150, -3833, -3833, -3833, -3833, -3833, -3833, -3833, 3604, -3833,
- -3833, -3833, -3833, 3607, -3833, -3833, -3833, -3833, -3833, 3610,
- -3833, -3833, -3833, -3833, -3833, 1633, -3833, -3833, -3833, -3833,
- -3833, -3833, -3833, -3833, -3833
+ -3680, -3680, -3680, -3680, -3680, 34, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, 1683, -3680, -3680, -3680, -3680, -3680,
+ 1897, -3680, 615, -1792, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, 621, 1511, 3303, -3680, 357, -3680, 22, -3680,
+ -3680, -3680, -2867, -103, -291, -3680, -3680, 270, 17, 2964,
+ -288, -3070, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, 368, 365, -3680, -3680, 183, -3680, -3680, -1287, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -485, -437, 1530,
+ -3680, -3680, -3680, 3935, -3680, 3405, -3680, 1211, 2165, -3680,
+ -3680, -3680, -634, 199, -3680, 209, -3680, 215, -3680, 218,
+ -3680, 220, 221, 223, 225, -3680, 227, -3680, -3680, -431,
+ -3680, -3680, -3680, -3680, 232, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -302, -3680, -3680, -145, -3680, -3680, -298, 233,
+ -3680, -252, 234, -3680, 235, -3680, -161, -3680, -148, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, 2982, -3680, -3680, -3680, -2056, -3680, -3680, -2355, 2550,
+ -3680, -1653, -3680, -3680, -1832, -3680, -3680, -1682, 738, -3680,
+ -3680, -118, 444, -3680, -1385, -1863, -1862, -3680, -3680, -3680,
+ -1981, -1979, -781, 2280, -1184, -2273, -3680, -3680, -3680, -3680,
+ 83, -3680, -3680, -2538, 2010, 2551, -3680, 2548, -3680, -3680,
+ 1106, -3680, -3680, 1286, 597, 1289, -3680, 903, 2724, -1242,
+ -3680, -3680, -3680, -3680, -3680, -3680, -42, 212, -140, -3680,
+ -3341, 600, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3154, -3680, -3680, -3680, -313, -3680, -3680, -218, -3680, -3680,
+ -266, -3680, 61, -2286, -3680, -3680, -3680, -3680, 2532, -1333,
+ -3680, 3554, -3680, -558, 456, 2060, -2401, -1402, -3680, -928,
+ -914, -2450, -3680, -3680, -3680, -3304, 1075, 1479, -3680, 820,
+ 2059, -1886, -3680, -3680, -3680, -3680, -3680, 1556, -3680, -3680,
+ 848, -3680, 834, -3680, -3680, -3680, -3680, -3680, -257, -3680,
+ 51, -2625, -3680, -3680, -3680, -2031, 1034, 808, -3680, -3680,
+ -3680, -614, -2789, -908, -3680, 339, -2519, -2412, 775, -3680,
+ -3680, 528, -3568, -3680, -3680, -572, -2071, -2362, 9, -3680,
+ -3680, 543, -3086, 911, -3680, -3680, -3680, -3065, -1900, -3680,
+ 79, -3680, -3680, -3680, -3680, -3059, -3680, -3680, -1461, -2026,
+ -3680, -3680, 4089, 4092, -1038, -2631, -3679, -17, -15, -3680,
+ -3680, -3680, 2565, -1679, 160, 150, 153, 2015, -620, 308,
+ -2191, -3680, 356, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, 2102,
+ -1507, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -2373, 885,
+ -3680, -3680, 1609, -3680, -3680, -3680, -1838, 3155, -3680, -3680,
+ -3680, -3680, 3496, -2140, -3210, -3680, -3680, -3680, -3680, -3680,
+ -3680, 1416, -3680, -3680, 2238, 2695, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, 609, 1800, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, 894, 2612, -3680, -3680, -3680,
+ -3680, 25, -3680, -3680, -3680, -3680, 2320, -3680, -3680, -3680,
+ -3680, 2653, -3680, -3680, -3680, -3680, -3680, -3680, 1404, -3680,
+ 1831, -3680, -1435, -3680, -3680, 1015, -984, 1796, -592, 1932,
+ 367, -3680, 3558, -3680, -3680, -3680, -1669, -2418, -3680, 3247,
+ -982, -2436, 2325, -537, -1818, 1039, 1124, -689, 3995, -3680,
+ -1146, -1127, -3680, -3680, -647, -3680, -3680, -3680, -3680, -3680,
+ 2026, 2028, -651, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, 1451, -3680, -3680, -3680, -3680, -1725,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, 1735, -3680, -2042,
+ -3680, -3680, -473, -3680, 3034, -3680, -3680, -3680, -2291, -1904,
+ 1757, 958, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -2333, -3680, -3680, -3680, -3680, -3680, 1945, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -1698, -3680, -2174, 301, -3680,
+ 450, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -53, 842,
+ -51, -2264, -1100, 1600, -3680, -3680, -1280, 3080, -2040, -3680,
+ -3680, -3680, 1924, -3680, -3680, -3680, -3680, -3680, 927, -2539,
+ 2725, -3680, -3680, -3092, -907, -2238, -883, -3680, -1348, 1359,
+ 464, -3680, -1908, -1777, -547, -2482, -1095, -3680, 1676, -3680,
+ -3680, -3680, -3680, -207, -3680, -3680, -3680, 494, 1834, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -571,
+ -719, -3680, 2090, 1750, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, 2892, 2864, 1898, -3680, -3680, -2275, -3680,
+ -3680, 1860, -3680, 750, -1994, -1808, 1046, -3680, -3680, 1049,
+ -3165, -3680, -3680, -3680, -3680, -3680, -3680, 988, -3680, 20,
+ 3621, -3680, -3680, -3680, -3680, -3680, -3680, -3680, 2658, -1058,
+ 3542, -3680, -3680, -3680, -3680, -3680, -3680, 2317, -3680, -3680,
+ -3680, -3680, -3680, -3680, 2832, 3638, -575, -1224, -3680, -706,
+ 2806, 2331, -746, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, 2453, 964, -3680, -3680,
+ -3680, -3680, 2883, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, 1088, -91, -3680, 12, -134, -3680, -52,
+ -3680, -3680, -3680, -3680, -3680, -232, -3680, -3680, -236, -691,
+ -986, -1353, 677, -1778, -2009, 1076, 2868, -2583, -693, -1158,
+ -1173, -1890, 59, -3680, -3680, 3343, 10, 481, -390, -6,
+ -2626, -109, -573, -3680, -1752, -3680, -3680, -3680, -3680, 2395,
+ -3680, -3680, -3680, -3680, 1433, -3680, -3680, -3680, 1041, -3680,
+ 765, 538, -3680, -3680, 173, -3680, 2451, -3680, -3680, -3680,
+ -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680,
+ -3680, 2885, 3675, 3354, -3680, 2954, -3680, -3680, -3680, -3680,
+ -3680, 418, -3680, 569, -2236, -1709, -3680, -3680, 2716, -886,
+ -3680, 1532, -345, -624, -3680, -3680, 413, -3680, -3680, 1555,
+ 3681, 3355, -3680, -3680, -3680, -3680, -3680, -2709, -890, -3680,
+ -3331, -2765, -1685, -3680, -3680, -2143, -2947, -3680, -3680, -1041,
+ -3680, -3680, -3680, -3680, -2035, -3680, -3680, -3680, 48, 3741,
+ 3750, -3680, -3680, 563, -3680, -113, -3680, -3680, -3680, -3680,
+ -3680, -3680, -3680, 3597, -3680, -3680, -3680, -3680, 3600, -3680,
+ -3680, -3680, -3680, -3680, 3601, -3680, -3680, -3680, -3680, -3680,
+ 1743, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680, -3680
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
positive, shift that token. If negative, reduce the rule which
number is the opposite. If zero, do what YYDEFACT says.
If YYTABLE_NINF, syntax error. */
-#define YYTABLE_NINF -2578
+#define YYTABLE_NINF -2585
static const yytype_int16 yytable[] =
{
- 494, 1039, 952, 956, 868, 539, 1452, 1658, 984, 1361,
- 997, 1682, 1592, 538, 555, 1681, 544, 623, 1104, 2307,
- 1454, 563, 1082, 492, 2219, 1635, 558, 1553, 1112, 1417,
- 2356, 2357, 2035, 570, 1241, 1131, 573, 1866, 1543, 1544,
- 570, 1865, 1747, 2522, 1389, 1790, 2340, 2901, 592, 2551,
- 2725, 2032, 2957, 796, 3014, 1703, 2846, 1383, 3195, 542,
- 2758, 1799, 1711, 3151, 2603, 3022, 1459, 1713, 1714, 1389,
- 1460, 1717, 1718, 1719, 1720, 2629, 1722, 1723, 1725, 1727,
- 1728, 1729, 1730, 1731, 1162, 1418, 3484, 1166, 2638, 1175,
- 612, 1935, 2830, 2008, 1600, 2452, 2447, 1028, 1031, 2339,
- 2448, 137, 2520, 1873, 2686, 1053, 1061, 2388, 2639, 3312,
- 2410, 2411, 2779, 615, 2897, 494, 2460, 494, 622, 628,
- 2464, 1883, 1183, 1184, 1185, 3489, 1069, 2422, 2571, 1886,
- 1887, 2479, 2572, 611, 1226, 2712, 2767, 3680, 617, 1225,
- 619, 2488, 2821, 3563, 2440, 2441, 3820, 1332, 1913, 2875,
- 2831, 3037, 2070, 3524, 3529, 1192, 1193, 3530, 1794, 1948,
- 2462, 2463, 3411, 2465, 500, 1294, 2468, 2469, 1192, 1193,
- 2472, 2119, 3504, 637, 2435, 2481, 3540, 3531, 2497, 2484,
- 2485, 2486, 2487, 3562, 554, 2991, 2491, 2492, 2352, 2494,
- 3094, 562, 1192, 1193, 646, 2503, 3616, 1805, 2507, 2508,
- 2260, 2510, 3715, 1289, 2404, 3032, 3033, 1294, 2424, 1244,
- 2116, 3039, 2080, 3041, 1192, 1193, 2568, 3225, 1192, 1193,
- 2569, 2878, 972, 2861, 2862, 1511, 4054, 550, 1192, 1193,
- 2989, 2865, 1435, 3016, 917, 918, 3146, 1515, 850, 1192,
- 1193, 2443, 3396, 1169, 3688, 2260, 1286, -1945, 1414, 1192,
- 1193, 1456, 2869, 118, 1931, 3059, 3968, 1192, 1193, 2555,
- 2556, 2557, 2558, 3222, 3370, 3628, 4161, 2869, 1937, 3490,
- 3383, 1326, 2532, 3938, 1192, 1193, -1441, 2542, 732, 2319,
- -865, 1456, 2592, 2548, 2549, 1372, -2457, 2397, 2553, 1855,
- 638, 3342, 3360, 4279, 1442, 3360, 2320, 2585, 1744, 3418,
- 4219, 1032, 667, -1481, 2523, 3361, 1042, 1295, 3361, 3204,
- -529, 1050, 4327, 1456, -1441, 1192, 1193, 1463, 3678, 3362,
- 2498, 2300, 3362, 2504, 917, 918, 1192, 1193, 2349, 2076,
- 917, 918, 2560, 917, 918, 1927, 2962, 4033, 661, 2575,
- 2982, 2983, -530, 551, 3713, 1856, 4226, 2605, 2815, 1295,
- 4254, 136, 1419, 4258, 1516, 4167, 1192, 1193, 1517, 3240,
- 2023, 668, 1387, 1192, 1193, 3139, 547, 1931, 588, 1518,
- 2682, 120, 583, 4226, 1192, 1193, 1744, 2350, 1948, 1034,
- 3460, 4112, 2775, 1429, 1802, 1390, 571, 2790, 2794, 2796,
- 2187, 3193, 1049, 2870, 4072, 3769, 1192, 1193, 3771, 973,
- 974, 3461, 651, 3837, 2202, 4271, 136, 1536, 1394, 4020,
- 3748, 1014, 138, 262, 653, 264, -433, 497, 498, 3752,
- 1170, 1171, 499, 1192, 1193, 2806, 3654, 1599, 1803, 2092,
- 1192, 1193, 3462, 2671, 1537, 813, 4272, 1391, 853, 3859,
- 584, 1131, 1949, 3768, 3939, 1399, 2593, 1321, 3770, 3194,
- 2996, 3806, 3211, 2093, 2301, 1192, 1193, 1430, 1035, 1743,
- 1192, 1193, 1051, 548, 1512, 589, 1238, 1909, 1906, 2776,
- 4073, 1480, 3241, -1481, 2024, 4354, 756, 4214, 2717, 1928,
- 1192, 1193, 2963, 1068, 642, 3342, 3934, 1532, 3809, 2576,
- 669, 1624, 1443, 4034, 1625, 1519, 3527, 1533, 1534, 1535,
- 2505, 4280, 1110, 622, -2577, 628, 3343, 1055, 1063, 1909,
- 3491, 1194, -1766, 1229, 1195, 3799, 4161, 852, 2321, 3199,
- 3969, 1857, 809, 2478, 1194, 1868, 628, 1195, 1871, 4220,
- 1459, 3205, 3370, 1875, 1460, 848, 947, 3839, 3232, 622,
- 3397, 858, 1415, 1745, 1747, 3829, 2879, 3226, 1194, 2772,
- 2883, 1195, 1192, 1193, 876, 2997, 1708, 1935, 1716, 1888,
- 1889, 3154, 3155, 3156, 2899, 2900, 1332, 1911, 3221, 3024,
- 1194, 3223, 3224, 1195, 2910, 1737, 1192, 1193, 1192, 1193,
- 2239, 2447, 968, 2446, 1194, 2448, 1931, 1195, 851, 2384,
- 3234, 2242, 2773, 1520, 2245, 1194, 1332, 2261, 1195, 1033,
- 1459, 987, 2520, 2364, 1460, 1194, -1481, 2871, 1195, 3495,
- 622, 3655, 1001, 1194, 2571, 2950, 1195, 655, 2572, 1567,
- 1568, 1745, 1373, 612, 3860, 3706, 2008, 3445, 2829, 494,
- 1194, 1192, 1193, 1195, 612, 3220, 1026, 2839, 612, 612,
- 1192, 1193, 2261, 1040, 1001, 859, 1623, 2302, 622, 3438,
- 3650, 3215, 1013, 3328, 1636, 2365, 1638, 3346, 1070, 1071,
- 1072, 1949, 2117, 3707, 1077, 1287, 1011, 2894, 1651, 1652,
- 1653, 1194, -1441, 2520, 1195, 4399, 1657, 1023, 1767, 2902,
- 2524, 1513, 1194, 1192, 1193, 1195, 969, 2322, 1936, 1290,
- 2820, 1422, 2070, 817, 2236, 2882, 2594, 2884, 2859, 1750,
- 3343, 1067, 2568, 2567, 2895, 1240, 2569, 1592, 1744, 3532,
- 2499, 866, 1194, 2780, 1795, 1195, 1132, 2907, 1806, 1194,
- 3960, 3487, 1195, 2916, 2918, 3689, 975, 552, 897, 4115,
- 1194, 3933, 2863, 1195, 1937, -2457, 3157, 3158, 3029, 2934,
- 2918, 3340, 4156, 1192, 1193, 3617, 970, 1172, 1821, 2075,
- 3998, 2992, 1194, 1913, 1196, 1195, 1192, 1193, -865, 2987,
- 3848, 2134, 2081, 2979, -2457, 2864, 1792, 1196, 1192, 1193,
- 3327, 2082, 3235, 2222, 1189, 2981, 1191, 2872, 2058, 1194,
- 1513, -1481, 1195, 1812, 3515, 3516, 1194, 1050, -529, 1195,
- 1872, 1196, 3037, 1192, 1193, 3037, 3037, 3948, 4128, -1481,
- 1234, 494, 1236, 4328, 1001, 494, 622, 2135, 494, 622,
- 1513, 1194, 3037, 1196, 1195, 4070, 1194, 1196, 1386, 1195,
- -530, 1885, 3187, 2984, 1235, 4282, 3541, 1196, 1239, 2188,
- 3654, 1243, 3561, 3564, 3566, 3567, 1194, 3095, 1196, 1195,
- 1848, 3363, 2203, 3517, 3363, 3021, 1299, 3518, 1196, 1395,
- 1192, 1193, 4096, 1688, 1689, 4021, 1196, 4065, 3208, 612,
- 654, 4247, 2807, 1688, 2153, 2730, 3560, 1479, 947, 2076,
- 1895, 622, 612, 1196, 2376, 2758, 612, 3537, 3538, 3539,
- 2574, 815, 3658, 3509, 1915, 3542, 1400, 1014, 2191, 2192,
- 1771, 3474, 4042, 3568, -433, 3478, 2998, 1192, 1193, 1732,
- 3029, 2366, 1310, 3106, 4122, 3037, 4124, 877, 1194, 1192,
- 1193, 1195, 3494, 3432, 1196, 1329, 3449, 1539, 1303, 622,
- 1626, 1192, 1193, 1627, 3729, 1196, 3116, 3117, 3118, 2208,
- 2209, 2535, 1194, 3931, 1194, 1195, 3938, 1195, 1051, 3131,
- 2694, 2695, 3299, 1192, 1193, 3705, 3448, 4256, 3473, 1192,
- 1193, 1556, 3477, 1745, 2160, 1196, -2525, 3433, 2380, 4437,
- 3623, 612, 1196, 1192, 1193, 3136, 1227, 860, 1323, 3626,
- 3063, 3064, 2947, 1196, 2223, 1272, 2255, 3080, 3081, 1307,
- -2577, 4175, 872, 1455, 2442, 3351, 2349, 1194, 2409, 2107,
- 1195, 2536, 2340, 1192, 1193, 1196, 1194, 2826, 1389, 1195,
- 2088, 2447, 504, 2876, 2876, 2448, 2378, 4198, 1822, 2827,
- 3103, 3104, 612, 556, 884, 3655, 2383, 601, 2652, 2386,
- 2387, 3708, 1196, 3386, 1866, 1423, 1866, 1866, 1389, 1196,
- 2811, 2812, 1896, 2319, 3192, 560, 1897, 2571, 2125, 1194,
- 2229, 2572, 1195, 3356, 2108, 2339, 2224, 1935, 4043, -1766,
- 2320, 1192, 1193, 2745, 1196, 4249, 2607, 3200, 3201, 1196,
- 4116, -2525, 1387, 612, 577, 2250, 1556, 1549, 2446, 2255,
- 2126, 2429, 2452, 2251, 2915, 2129, 262, 3470, 264, 1196,
- 1557, 2244, 3159, 1698, 1192, 1193, 1192, 1193, 2537, 2693,
- 2816, 1192, 1193, 2479, 1992, 2130, 1192, 1193, 2795, 1194,
- 1772, 585, 1195, 1192, 1193, 3356, 1540, 3939, 1132, 3231,
- 1547, 1733, 1194, 732, 586, 1195, 3656, 4200, 1192, 1193,
- 1736, 1948, 1132, 1931, 1194, 2568, 885, 1195, 4201, 2569,
- 2008, 2430, 2341, 3873, 1734, 1459, 3002, 3078, 2836, 1460,
- 1995, 2698, 2699, 2259, 2377, 3841, 4438, 2948, 1424, 1194,
- 2219, 1196, 1195, 3869, 1936, 1192, 1193, 1192, 1193, 2431,
- 4102, 2960, 4103, 1682, 2538, 2741, 3440, 2131, 3698, 3699,
- 1376, 3483, 1683, 1425, -2388, 1196, 1308, 1196, 2293, 602,
- 1227, 990, -1788, 2070, 622, 3585, 2393, 2246, 1230, 2567,
- 4050, 2133, 4378, 2140, 3586, 1580, 4037, 4038, 886, 2828,
- 3357, 4051, 2315, 2316, 2263, 3465, 1194, 1192, 1193, 1195,
- 2961, 4379, 2692, 4044, 1804, 1192, 1193, 1948, 1823, 2230,
- -2389, 622, 2702, 604, 1937, 3299, 1740, 1377, 2432, 1773,
- 1196, 612, 1192, 1193, 1682, 2903, 4060, 2033, 2834, 1196,
- 612, 1304, 4101, 2306, 2225, 1744, 2141, 2449, 861, 873,
- 1192, 1193, 3003, 1194, 1378, 2151, 1195, 1192, 1193, 3935,
- 1359, 2034, 3357, 2367, 4252, 1194, 1192, 1193, 1195, 1228,
- 1192, 1193, 2321, 3657, 1742, 2237, 3358, 1194, 622, 132,
- 1195, 1338, 1196, 1192, 1193, -2388, 3658, 1192, 1193, 2075,
- 1776, 2256, 1779, 1948, 1735, 612, 3125, 3887, 2152, 1194,
- 2573, 605, 1195, 4151, 2433, 1194, 880, 612, 1195, 2904,
- 607, 756, 3160, 3921, 2520, 622, 2394, 1835, 3620, 1194,
- 1192, 1193, 1195, 1682, 612, 612, 3874, 2914, 3587, 1931,
- 630, -2389, 3796, 2395, 4202, 2520, 2512, 1110, 3368, 4462,
- 1426, 3360, 1196, -1789, -1788, 2396, 613, 1773, 622, 1194,
- 2063, 1825, 1195, 1209, 3361, 1196, 2475, 1917, 2156, 1833,
- 2076, 133, 732, 4117, 1037, 1038, 2574, 1196, 3362, 2539,
- 2120, 494, 494, 494, 612, 494, 612, 703, 3659, 917,
- 3525, 1867, 2936, 2168, 2256, 1192, 1193, 1869, 494, 1836,
- 622, 4121, 1196, 494, 1849, 1850, 1851, 2033, 1853, 1783,
- 1111, 991, 1192, 1193, 1949, 947, 2905, 1194, 2175, 2580,
- 1195, 1870, 4052, 612, 616, 2092, 1874, 1852, 2876, 1854,
- 2231, 2034, 1427, 2397, 3875, 1931, 618, -1766, 992, 3112,
- 3004, 2581, 3921, 3921, 1192, 1193, 2232, 708, 629, 2093,
- 1194, 2322, 1194, 1195, 2563, 1195, 1536, 1194, 635, 1196,
- 1195, 1744, 1194, 732, 1532, 1195, 1884, 4118, 622, 1194,
- 1866, 881, 1195, 1592, 1379, 2179, 1556, 1192, 1193, 1845,
- 631, 120, 612, 1538, 1194, 2028, 612, 1195, 3182, 1837,
- 1584, 3359, 2966, 1228, 4119, 2478, 4286, 4001, 2446, 1513,
- 1745, 4105, 3694, 43, 1192, 1193, 1196, 2967, 1192, 1193,
- 1949, 1931, 4203, 1230, 643, -1789, 3183, 612, 1196, 2434,
- 2849, 1194, 2180, 1194, 1195, 2025, 1195, 1192, 1193, 2030,
- 1196, 2423, 1192, 1193, 2181, 3936, 622, 3005, 494, 494,
- 3533, 2090, 494, 3534, 721, 2398, 2182, 4106, 4299, 4299,
- 1585, 1212, 1196, 3359, 1077, 3739, 2106, 646, 1196, -2525,
- 1691, 2086, 2087, 1230, 3023, 3102, 2979, 1230, 2186, 1556,
- 756, 2215, 1196, 1194, 2204, 3938, 1195, 1947, 1586, 498,
- 2477, 1194, 3805, 499, 1195, 854, 1949, 3079, 3921, 3921,
- -198, 572, 642, 3767, 2697, 1682, 1110, 1838, 1194, 3142,
- 1895, 1195, 1196, 1380, 4171, 1643, 1192, 1193, 2399, 4372,
- 4000, 4374, 3779, 1192, 1193, 1556, 1194, 648, 3061, 1195,
- 737, 947, 2567, 1194, 2326, 1381, 1195, 2064, 4190, 4191,
- 561, -2388, 1194, 1744, 2850, 1195, 1194, 1192, 1193, 1195,
- 4392, 1192, 1193, 1192, 1193, 1132, 2161, 1587, 3740, 1194,
- -1682, 1826, 1195, 1194, 1936, 2264, 1195, 4325, 4326, 1161,
- 1196, 756, -2388, 1592, -2525, 57, 3184, 1382, 2634, 4107,
- 855, 650, 1112, 1162, 1166, 2640, 3062, -2389, 4424, 4425,
- 498, 262, 3921, 264, 499, 639, 1194, 1110, 2646, 1195,
- 3741, 3951, 3955, 1196, 662, 1196, -1682, 3921, 1647, 1895,
- 1196, 2730, 2101, 2228, 512, 1196, 1745, 805, -2389, 3073,
- 3921, 3083, 1196, 1192, 1193, 262, 3084, 264, 849, 3714,
- 2124, 2661, 1692, 1588, 1192, 1193, 3197, 1196, 3636, 3980,
- 3867, 3868, 581, 2216, 1192, 1193, 582, 3728, 1192, 1193,
- 856, 810, 2132, 664, 1669, 2252, 3939, 1244, 501, 3981,
- 1165, 1194, 2219, 622, 1195, 612, 622, 2250, 1192, 1193,
- 1192, 1193, 1896, 3227, 1196, 3168, 1196, 612, 1194, 2269,
- 2154, 1195, 3921, 4264, 3780, 2275, 2275, 3610, 2275, 2142,
- 1827, 2143, 665, 3728, 3921, 3921, 3795, 863, 622, 2708,
- 2075, 612, 666, 947, 3238, 612, 2573, 3606, 3607, 2574,
- 1194, 2326, 869, 1195, 2154, 3244, 871, 1592, 3246, 1192,
- 1193, 3642, 622, 622, 612, 612, 1196, 2673, 2274, 2274,
- 889, 2274, 891, 1132, 1196, 764, 2275, 2275, 2275, 1472,
- 1473, 2150, 3921, 1194, 2298, 964, 1195, 985, 1310, 2164,
- 3951, 1196, 3921, 2362, 3955, 1221, 1222, 1223, 1224, 1704,
- 1192, 1193, 2373, 2121, 3320, 567, 2165, 1329, 2318, 1196,
- 1194, 1896, 567, 1195, 1194, 1897, 1196, 1195, 1530, 2274,
- 2274, 2274, 2804, 881, 2169, 1196, 1192, 1193, 1745, 1196,
- 986, 2173, 994, 1194, 1361, 3921, 1195, 3921, 1194, 612,
- 2174, 1195, 1196, 3188, 2178, 852, 1196, 3921, 2122, 1229,
- 3363, 2392, 3190, 2893, 1192, 1193, 1003, 2183, 612, 2988,
- 1014, 2195, 1024, 2314, 1043, 1143, 3921, 2063, 3921, 1044,
- 3921, 3526, 3296, 2328, 2329, 1192, 1193, 3921, 1589, 1196,
- -1682, 1768, 2385, 1389, 1769, 1160, 3354, 1770, 3921, 3471,
- 962, 963, 1389, 966, 2210, 3719, 1192, 1193, 1176, 1177,
- 2369, 2403, 1192, 1193, 3921, 3921, 2123, 1229, 1316, 3191,
- 1048, 1317, 1194, 3145, 2881, 1195, 3388, 3389, 3585, 1194,
- 3921, 3921, 1195, 1192, 1193, 3921, -1682, 3586, 1079, 4064,
- 2561, 118, 2606, 1192, 1193, 1080, 2577, 3402, 2908, 2909,
- 2127, 2128, 1682, 1194, 1196, 1590, 1195, 1194, 1081, 1194,
- 1195, 1918, 1195, 3951, 3955, 2506, 1083, 1192, 1193, 3026,
- 1084, 1196, 1866, 1085, 1605, 1919, 3609, 1192, 1193, 1088,
- 2521, 975, 1037, 1038, 2630, 2413, 3049, 1089, 1705, 1192,
- 1193, 1192, 1193, 1090, 2420, 2421, 1091, 2630, 1092, 1294,
- 1232, 1192, 1193, 1196, 3046, 2425, 2426, 2427, 2428, 1682,
- 2436, 2437, 2675, 2834, 1192, 1193, 2147, 1229, 3051, 1093,
- 1192, 1193, 1192, 1193, 1094, 3965, 3966, 3967, 1931, 1194,
- 1192, 1193, 1195, 2234, 1192, 1193, 1196, 3050, 2155, 1229,
- 1194, 622, 1682, 1195, 3994, 3995, 2914, 622, 2341, 2578,
- 1194, 3057, 494, 1195, 1194, 2157, 1229, 1195, 1095, 612,
- 612, 612, 2601, 1196, 1318, 2604, 1229, 1196, 3996, 1096,
- 4177, 3587, 1609, 1097, 1194, 2583, 1194, 1195, 3058, 1195,
- 1192, 1193, 3065, 1948, -1481, 622, 1196, 2326, 1098, 2690,
- 1099, 1196, 1100, 1401, 1101, 2327, 1493, 1494, 622, 2158,
- 1641, 3069, 2597, 2598, 2599, 4062, 3070, 1102, 2533, 2534,
- 1105, 2541, 3138, 2543, 2544, 2545, 2546, 2547, 2170, 1229,
- 2550, 2711, 2552, 1402, 2246, 1194, 3862, 3863, 1195, 3865,
- 3866, 1107, 1244, 1244, 1244, 1920, 1108, -1481, 2171, 1229,
- 2063, 1295, 1109, 4078, 2064, 1192, 1193, 1113, 4084, 4085,
- 1744, 1233, 4088, 4089, 4090, 4091, 2172, 1229, 1209, 3181,
- 3497, 3498, 2176, 1229, 4079, 1196, 1194, 1004, -1481, 1195,
- -1481, 1610, 1196, 3519, 3822, 1613, 3522, 3523, 1403, 2573,
- 3071, 3571, 1614, 1404, 2700, -1481, 1237, 3072, 1114, 1706,
- 622, -1481, 1194, 3535, 3101, 1195, 1196, 1115, 979, 980,
- 1196, 981, 1196, 982, 1116, 1707, -1481, 1921, 4294, 2328,
- 2329, 3074, 1192, 1193, -1481, 2709, 1294, 3077, 1005, 2065,
- 1194, -1481, 622, 1195, 3856, 3857, 1117, 2630, 1248, 2798,
- 2803, -1481, 947, 1922, 2563, 1118, 622, 1506, 1507, 917,
- 918, 1194, 1682, -1481, 1195, 1119, 3142, 1120, -1481, 2330,
- 1121, 1914, 4188, 4189, 2438, 2439, 1122, -1481, 593, 2679,
- 1229, 4197, 1194, 1615, 4169, 1195, 2715, 2716, 1194, 2739,
- 3023, 1195, 1196, 2845, 2630, 1125, 3823, 3824, 1273, 4192,
- 1126, 3825, 3826, 1196, 4373, 1127, 3624, 3082, 1133, 1194,
- 1134, 1931, 1195, 1196, 2763, 1923, 1135, 1196, 3085, 1194,
- 1136, -1481, 1195, 1137, 2219, 1138, 1006, 622, 3087, 1209,
- 947, 594, 3089, 917, 918, 1139, 1617, 1196, 1140, 1196,
- 2784, -1481, 2786, 1194, 3045, 2128, 1195, 1405, 622, 1141,
- 622, 622, 3091, 1194, 3092, 1144, 1195, 2612, 1867, 1145,
- 1867, 1867, 1146, -1481, 2711, 1194, 1212, 1194, 1195, 2277,
- 1195, 2278, 1147, -1481, -1481, 3048, 1229, 1194, 1295, 1148,
- 1195, 3075, 1229, 2066, 1149, 1683, 1949, 1592, 1196, 1150,
- 1194, 3148, 3149, 1195, 622, 622, 1194, 1151, 1194, 1195,
- 1152, 1195, 595, 3093, 1924, -1481, 1194, -1481, -620, 1195,
- 1194, 1153, 3633, 1195, 1154, 1745, 3323, 3324, 1406, 2344,
- 2345, 2346, -1481, 1938, 1276, 2449, 2868, 2064, -1481, 1196,
- 1155, 1209, 1156, 1744, 2521, 1157, 2880, 2450, 1158, 2521,
- 1159, 2063, 2890, 2783, 2521, 1275, 3413, 1229, 2521, 1163,
- 2889, -1481, 1164, -1481, 1167, 1196, 1194, 1168, -1481, 1195,
- 2889, 1174, 2521, 2521, 2911, 622, 3435, 3436, -1481, 4459,
- 2922, 1178, 2521, 1618, 1683, -1481, 2924, 2925, 3576, 3577,
- -1481, 1179, 1407, 1196, 612, -1481, 3613, 3621, 1620, 118,
- 3637, 1229, 1180, 2889, -1481, 3258, 3651, 1229, 3407, 1277,
- 2521, 2946, 3666, 3667, 1196, 1278, 2959, 3782, 2439, 1181,
- 1082, 3797, 3798, 2976, 1214, 1215, -1481, 1212, -1766, 3408,
- 1182, 1194, 3801, 3798, 1195, 1196, 1231, 2923, 1939, 4409,
- 4410, 1196, 1281, 1007, -620, 1284, 3028, 1244, 1283, 507,
- 3409, 1292, 900, 3802, 3798, 1293, 3635, 3861, 3436, 1279,
- 3372, 1300, 1196, 3373, 1306, 2891, 2892, 1302, -1481, 1314,
- 900, 3374, 1196, 1324, 2429, 1335, 1280, 3641, 1354, 4290,
- 612, 2521, -1481, 1337, 1209, 2033, 4406, 3643, 3375, 1356,
- -1481, 2921, 1355, 3395, -1481, -1481, 1196, 3864, 3798, 119,
- -1481, 1359, 1931, 947, 1408, 1370, 1196, 1362, 1008, 2034,
- 1009, 3644, 3871, 3872, -1481, 1371, -1481, 120, 1196, 2958,
- 1196, 3645, 1375, 3007, 1560, 1561, 1562, 4008, 4009, 1212,
- 1196, 3376, -1481, 3414, 2430, 3646, 4013, 3798, 1409, 1387,
- -1481, -1481, 1581, 1196, -1481, -1481, 1396, 1209, 1397, 1196,
- 1413, 1196, 2980, 4014, 3798, 1398, -2568, 596, 3716, 1196,
- 1416, 4463, 2431, 1196, 3961, 1420, 1217, 1218, 1219, 1220,
- 1221, 1222, 1223, 1224, 1644, 1214, 1215, 1648, 1421, 597,
- -1481, 901, 1434, 121, 4016, 3798, 1437, 3377, 1745, 4017,
- 3798, 2741, 4022, 4023, 4024, 4023, 1665, 1666, 1438, 901,
- 1670, 1940, -1481, 4080, 4081, 1440, -620, 4208, 4009, 1196,
- 2269, 598, 1941, 1299, 622, 622, 622, 1208, 2064, 1942,
- 1684, 1685, 612, 2449, 1744, 4209, 4009, 4217, 3436, 807,
- 808, 2432, 1445, 811, 812, 2450, 2393, 814, 1450, 816,
- 1456, 2739, 622, -1481, 2451, 1462, 1683, 4262, 4263, 2177,
- 4306, 4307, 4324, 3322, 1464, 902, 1466, 3543, -620, 1132,
- 1515, 1469, 622, 622, 622, 3124, 122, 599, 4451, 4452,
- 1470, 2616, 1212, 902, 1196, 3167, 3880, 1214, 1215, 1474,
- 3592, 3169, 3880, 3171, 3618, 3378, 2630, 1477, 3379, 622,
- 1478, 2429, 1481, 2065, 2917, 3746, 3747, 2617, 1482, -1481,
- 1584, 1483, 3544, 1524, 1867, 1682, 1525, 2433, 3750, 4076,
- 1526, 1943, -1481, 3545, 1529, 3753, 1531, 1217, 1218, 1219,
- 1220, 1221, 1222, 1223, 1224, 3813, 3814, 1209, 1672, 1673,
- 1532, -1481, -620, -1481, 1227, 1212, 1550, 507, 3982, 1584,
- 1556, 3772, 3773, 3452, 3453, 1552, 3983, 3420, 3421, 510,
- 1563, 2430, 2618, 1583, 2429, 2619, 1172, -1481, -1481, 3546,
- 1585, -1481, -1481, 2620, 1594, 3380, 2394, 1629, 2521, 1640,
- 3984, 2521, 2521, 2033, 2889, 3664, 3665, 1516, 3166, 2431,
- 2621, 1517, 1592, 2395, 947, 1641, 1642, 622, 1586, 1680,
- 2521, 1209, 1518, 123, 1690, 2396, 1715, 2034, 1699, 1585,
- 1721, 1748, 1741, 1944, 1749, 2889, 1752, 1755, 1209, 1756,
- 525, 1759, 1762, 1757, 2430, -1766, 2889, 1764, 1584, 2889,
- 1218, 1219, 1220, 1221, 1222, 1223, 1224, 2851, -620, 1210,
- 1758, 1760, 1761, 1765, 1788, 1800, 262, 2066, 264, 1791,
- 1808, 3250, 2431, 1809, 612, 1810, 566, 1811, 2432, 3307,
- 1815, 1818, 1211, 262, 2393, 264, 1819, 1587, 1820, 494,
- 1829, 124, 1834, 3317, 1843, 2889, 1847, 526, 1876, 1745,
- 1878, 1964, 1965, 2397, 1877, 1879, 1881, 1890, 1585, 2622,
- 3326, 1892, 3313, 1214, 1215, -786, 3985, 3251, 1894, 1907,
- 1916, 3233, 3381, -2568, 527, 3337, 2852, 1592, 2020, 3236,
- 2559, 1513, 612, 2038, -769, -769, 2851, 1967, 2449, 1682,
- 3066, 2432, 2434, 4076, 3350, 1212, -769, 676, 1519, 125,
- 1247, 3382, 2039, 2037, 2433, 2040, 2041, 1970, 2042, 528,
- 2043, 2044, 2045, 1588, 2046, 1971, 1037, 1038, 2047, 903,
- 904, 905, 906, 907, 908, 3339, -620, 1361, 2048, 1112,
- 1162, 1166, 2049, 2050, 4123, 3457, 909, 903, 904, 1973,
- 906, 2051, 908, 3986, 1219, 1220, 1221, 1222, 1223, 1224,
- 2052, 2845, 2853, 1456, 909, 2852, 1974, 529, 3882, 1212,
- 2623, 3987, 1037, 1038, 2394, 2398, -2568, 2433, 3548, 2057,
- 3329, 2053, 3412, 2054, 3549, 2055, 1212, 2056, 2109, 3722,
- 2784, 2395, 2059, 2077, 1979, 3988, 703, 3842, 2078, 2085,
- 2098, 2095, 1213, 2396, 4311, 2096, 1520, 2475, 3832, 2104,
- 2097, 2110, 2112, 2138, 2739, 1217, 1218, 1219, 1220, 1221,
- 1222, 1223, 1224, 2926, 3550, 2927, 2113, 510, 2114, 2137,
- 2139, 2144, 2145, 2763, 3447, 2146, 2159, 622, 2399, 2148,
- 2154, 2853, 2163, 2227, 2220, 2167, 622, -1170, 2033, 707,
- 2184, 2185, 2709, 1214, 1215, 2190, 708, 262, 2193, 264,
- 2194, 2205, 622, 2206, 2207, 1982, 2928, 1216, 2233, 1224,
- 2362, -1307, 2034, 1983, 2162, 2243, 3923, 2272, 2166, 2290,
- 2265, 2397, 2299, 2305, 712, 713, 2308, 2929, 1984, -65,
- 1683, 2311, 3551, 2783, 530, 4025, 2342, 2343, 2358, 2370,
- 2189, 1339, 2521, 3696, 4311, 2374, -620, 2372, 2375, 2379,
- 2624, 1340, 2521, 2402, 2889, 1209, 2401, 1214, 1215, 2434,
- 2405, 2406, 2930, 1683, 1199, 1200, 2408, 1341, 1589, 2889,
- 2412, 612, 2419, 2521, 1214, 1215, 2414, 2449, 2415, 1342,
- 1343, 1344, 1985, 2471, 2470, 1682, 2473, 2630, 2416, 4444,
- 3993, 2461, 2480, 721, 2417, 1345, 2474, 2418, 2466, 1201,
- 1986, 947, 531, 2467, 2483, 2482, 2490, 2854, 1682, 2489,
- 1202, 2525, 4455, 2495, 2625, 1682, 2496, 3989, 2529, 4444,
- 2531, 1682, 2434, 2501, 2502, 4455, 2509, 4316, 4317, 2562,
- 4319, 2584, 2279, 2398, 3552, 1217, 1218, 1219, 1220, 1221,
- 1222, 1223, 1224, 2626, 2610, 2602, 2976, 2476, 2606, 2615,
- 1203, 506, 2641, 732, 2280, 1990, 2642, 1991, 2643, 2653,
- 532, 2477, 1204, 2251, 3756, 1993, 533, 2281, 736, 737,
- 2654, 3605, 3605, 3605, 2687, 2666, 1867, 3685, 2282, 4362,
- 2688, 4363, 4364, 2689, 2685, 534, 2854, 2696, 622, 1205,
- 2720, 2721, 2705, 1192, 1193, 2706, 2399, 2722, 2734, 1217,
- 1218, 1219, 1220, 1221, 1222, 1223, 1224, 2718, 2731, 2733,
- 535, 2735, 2719, 2742, 2743, 2728, 1217, 1218, 1219, 1220,
- 1221, 1222, 1223, 1224, 1795, 2746, 2747, 536, 2283, 2748,
- 2284, 2749, 1961, 1999, 507, 2765, 4163, 2753, 2766, 1962,
- 2768, 1963, 3573, 1212, 4403, 3993, 2769, 2770, 1206, 2350,
- 2349, 2787, 1964, 1965, 2788, 2789, 2810, 2285, 3674, 2931,
- 2813, 2817, 2822, 1683, 2823, 3597, 2824, 2845, 4436, 2840,
- -817, 2847, 2848, 2969, 2955, 2896, 2898, 2965, 622, 1964,
- 1965, 2971, 2986, 1966, 2985, 2990, 2994, 1992, 1967, 1968,
- 2000, 2995, 3020, 1909, 2105, 1969, 1601, 1602, 1603, 1604,
- 1605, 3029, 3034, 2932, 868, 1346, 2001, 3040, 1970, 3042,
- 2002, 2393, -769, -769, 3043, 1967, 1971, 3044, 508, 2286,
- 3605, 3731, 3098, 1347, -769, 3109, 1972, 3121, 3052, 2003,
- 3842, 3126, 1316, 4165, 3053, 1970, 3096, 3736, 3100, 3119,
- 1973, 2630, 3105, 1971, 3130, 3108, 3129, 2005, 3133, 3114,
- 3164, 756, 3153, 3147, 1456, 3723, 3165, 1974, 3724, 3144,
- 3170, 3178, 3198, 3203, 1975, 1976, 3202, 1973, 622, 762,
- 3150, 1977, 3206, 2287, 764, 3217, 3218, 765, 3219, 1978,
- 3230, 1456, 3239, -892, 1974, 1979, 3248, 3311, 3247, 3308,
- 3314, 1214, 1215, 3315, 3774, 1606, 1607, 1608, 1609, 3319,
- 3249, 3778, 3322, 3321, 3332, 3325, 3015, 3333, 3338, 3457,
- -443, 1918, 1979, 3347, 1980, 3341, 2326, 3348, 3349, 3337,
- 3352, -628, 3369, 3390, 3387, 1919, 3391, 676, 3543, 3398,
- 3399, 3417, 3416, 3725, 3726, 3426, 3428, 3431, 3437, 3450,
- 3439, 2394, 622, 3458, 3466, 3467, 3496, 3475, 262, 1348,
- 264, 3476, 3488, 3499, 1981, 3500, 1982, 3513, 2395, 3520,
- 3570, 2523, 3572, 3574, 1983, 4160, 3584, 3580, 3594, 3593,
- 2396, 3598, 3755, 3544, 3595, 262, 3599, 264, 3601, 1984,
- 3611, 3615, 3612, 1982, 3545, 3613, 4163, 3614, 3619, 3622,
- 3625, 1983, 3627, 3629, 3630, 3631, 3634, 1610, 3638, 1611,
- 1612, 1613, 3639, 3640, 1349, 3653, 1984, 3652, 1614, 3722,
- 622, 3783, 3662, 509, 3669, 3670, 703, 3679, 3168, 3667,
- 2586, 3681, 1350, 3682, 3686, 3687, 3690, 3692, 3854, 3693,
- 3546, 3734, -1396, 1985, 510, 1219, 1220, 1221, 1222, 1223,
- 1224, 3605, 3605, -1401, 3605, 3605, 3737, 3560, 2397, 1194,
- 3704, 1986, 1195, 3759, 3717, 1987, 3718, 3720, 3721, 3745,
- 1985, 3751, 3760, 3749, 3761, 2630, 3993, 3762, 3763, 707,
- 3700, 511, 3765, 3766, -535, 3563, 708, 512, 1986, 3803,
- 3784, 3807, 3785, 3800, 3804, 1920, 3621, 3811, 3812, 1615,
- 3817, 3889, 3815, 4358, 1988, 3830, 4433, 3818, 3834, 1989,
- 3547, 3819, 3831, 3845, 712, 713, 1990, 1250, 1991, 3846,
- 3928, 612, 3835, 513, 3850, 1992, 1993, 3852, 3870, 3876,
- 3883, 514, 3605, 3884, 262, 3890, 264, 3947, 3932, 3958,
- 4433, 3924, 3957, 1990, 3959, 1991, 3962, 4028, 3964, 3975,
- 1251, 1616, 1617, 1993, 3972, 4005, 4007, 1994, 4010, -309,
- 4046, 4055, 4071, 4048, 3929, 612, -786, 1921, 3979, 4018,
- 2398, 1995, 1996, 1997, 1998, 4026, 622, 4358, 821, 4049,
- 4067, 4083, 4233, 721, 4086, 4059, 4095, 4066, 4092, 4087,
- 1037, 1038, 4097, 1922, 1999, 4099, 4128, 4233, 2950, 4131,
- -327, 4157, 4158, 4159, 3888, 4194, 4019, 4206, 3973, 4179,
- 4243, 4176, 4182, 4210, 4211, 4212, 4218, 4213, 1252, 4221,
- 4222, 1999, 4223, 4229, 4230, 4234, 4242, 4032, 4240, 803,
- 4241, 4245, 4039, 2399, 4266, 4252, 4267, 4269, 4268, 4277,
- 4278, 4282, 1253, 732, 4287, 4289, 1254, 4461, 4292, 4291,
- -2302, 2000, 4295, 4301, 4318, 1923, 4304, 4320, 736, 737,
- 4315, 4321, 4336, 1037, 1038, 4323, 4350, 2001, 822, 3548,
- -1565, 2002, 4366, 4352, 4355, 3549, 4369, 4349, 2000, 4371,
- 1255, 4375, 4370, 4376, 4380, 4383, 4386, 4388, 4391, 1618,
- 2003, 4389, 4395, 4404, 2001, 2004, 4397, 823, 2002, 4400,
- 1256, 4401, 1196, 1619, 1620, 4408, 1683, 4412, 2005, 4414,
- 824, 4421, 4041, 4422, 1257, 3550, 4445, 2003, 4449, 2713,
- 4458, 3582, 2554, 3583, 4193, 2860, 4056, 1060, 3788, 4166,
- 4302, 1468, 4233, 825, 4303, 2005, 826, 3786, 3927, 3854,
- 3790, 3854, 4348, 4104, 1924, 4456, 4416, 827, 580, 959,
- 3152, 2334, 3901, 4426, 3902, 3904, 4333, 3905, 4227, 4334,
- 3907, 3908, 1258, 3909, 3910, 3911, 3912, 3915, 828, 4132,
- 4300, -892, 3916, 3917, 4239, 4061, 1960, 4238, 1528, 2254,
- 803, 4058, 2513, 3551, 1259, 803, 3243, 2006, 2031, 3132,
- 3672, 3430, 2587, 3137, 1798, 829, 4181, 4382, 4173, 3974,
- 4385, 3675, 830, 4314, 4251, 4357, 4094, 663, 3794, 2062,
- 3330, 2511, 3013, 3512, 2518, 3979, 2952, 3501, 4233, 3505,
- 4233, 4367, 803, 4125, 3384, 622, 3878, 4402, 3528, 3569,
- 2711, 4199, 3764, 4178, 3464, 3754, 4110, 521, 4233, 803,
- 522, 756, 831, 4215, 4063, 3723, 4216, 2094, 3724, 4069,
- 4068, 3881, 2596, 3946, 2515, 3503, 2390, 1436, 2940, 762,
- 1012, 1893, 3733, 2750, 764, 3502, 2060, 765, 2317, 2029,
- 4233, 4233, 3123, 3427, 2729, 4448, 2771, 2684, 3922, 983,
- 803, 803, 803, 803, 2348, 3552, 3415, 1260, 2633, 2631,
- 3107, 1639, 803, 1366, 4313, 3472, 1261, 2683, 2835, 1250,
- 4012, 4172, 3858, 3581, 4275, 1582, 4276, 3507, 1910, 4407,
- 1683, 1262, 2703, 3189, 1490, 3855, 2935, 3844, 2600, 2778,
- 1813, 4186, 4187, 3725, 3726, 2727, 2756, 3677, 3443, 1263,
- 3442, 622, 1251, 3482, 971, 4248, 2103, 1078, 1782, 955,
- 2381, 2266, 1859, 3511, 1882, 2382, 2976, 2976, 4270, 3429,
- 4353, 4384, 1817, 4322, 4457, 4460, 3758, 1832, 3446, 2359,
- 3186, 3691, 3468, 3847, 820, 821, 879, 2304, 1264, 1265,
- 896, 832, 1353, 803, 1491, 1492, 1493, 1494, 1495, 1496,
- 1775, 1497, 1498, 1499, 1500, 1501, 1502, 1503, 3963, 1504,
- 1505, 834, 3971, 2084, 1266, 622, 898, 1824, 1358, 835,
- 1252, 3111, 1064, 657, 0, 1065, 658, 836, 1066, 0,
- 0, 0, 0, 498, 0, 0, 1267, 499, 0, 0,
- 0, 0, 4338, 0, 1253, 4259, 4260, 0, 1254, 4346,
- 0, 0, 837, 0, 0, 0, 0, 0, 0, 0,
+ 494, 1040, 956, 1457, 1455, 952, 1686, 1105, 984, 1364,
+ 1113, 1596, 2226, 536, 137, 621, 542, 868, 2363, 2364,
+ 1557, 1685, 1662, 492, 1083, 1639, 556, 2314, 2040, 1132,
+ 2529, 1794, 1242, 568, 1547, 1548, 571, 1871, 2910, 2442,
+ 568, 997, 1870, 1392, 1420, 537, 2347, 2966, 590, 796,
+ 2558, 2767, 2037, 3494, 553, 1707, 2855, 2637, 1751, 3023,
+ 2733, 561, 1715, 3205, 3161, 1462, 1163, 2611, 1392, 1167,
+ 2646, 1028, 3031, 2839, 1032, 1604, 2013, 1803, 1176, 1463,
+ 2459, 540, 1717, 1718, 2694, 1940, 1721, 1722, 1723, 1724,
+ 610, 1726, 1727, 1729, 1731, 1732, 1733, 1734, 1735, 2346,
+ 2647, 2454, 2455, 2395, 1070, 2579, 3322, 2580, 2830, 3046,
+ 2906, 2417, 2418, 613, 2776, 494, 2840, 494, 620, 626,
+ 1054, 1062, 2788, 3690, 1184, 1185, 1186, 1918, 2429, 2467,
+ 2720, 2527, 3499, 2471, 1295, 3830, 1227, 2539, 615, 1226,
+ 617, 1953, 2549, 3573, 2486, 2447, 2448, 2077, 2555, 2556,
+ 1193, 1194, 1050, 2560, 2495, 609, 3514, 2267, 1809, 3421,
+ 3725, 2469, 2470, 1335, 2472, 3000, 2359, 2475, 2476, 917,
+ 918, 2479, 1193, 1194, 2870, 2871, 2488, 1878, 1386, 635,
+ 2491, 2492, 2493, 2494, 646, 1290, 2690, 2498, 2499, 3541,
+ 2501, 3698, 1193, 1194, 2878, 1888, 2510, 2504, 3025, 2514,
+ 2515, 552, 2517, 1891, 1892, 2327, 1421, 2613, 560, 2087,
+ 1514, 3626, 2411, 3041, 3042, 850, 3534, 3539, 2998, 3048,
+ 3540, 3050, 1798, 2576, 2577, 1459, 1193, 1194, 3370, 2123,
+ 1295, 2838, 1459, 1775, 2757, 2262, 1827, 1519, 2327, 3550,
+ 2530, 3371, 1245, 2568, 2267, 1304, 3572, 1422, 1438, 917,
+ 918, 2878, 3103, 3232, -865, 3372, 2431, 1228, 3380, 3948,
+ 1033, -529, 2563, 2564, 2565, 2566, 917, 3535, 1459, 1193,
+ 1194, 2884, -1490, 1228, 860, -2464, 1296, 3068, 3370, 1193,
+ 1194, 1193, 1194, 1375, 972, 3688, 1942, 4266, 4337, 548,
+ 3352, 3371, 2991, 2992, 1860, 3978, 3235, -530, 2307, 3169,
+ 1445, 3739, -433, 2450, 1327, 3372, 1466, 636, 1417, 4229,
+ 569, 1170, 3192, 2912, 4043, 4289, 917, 918, 3370, 1308,
+ 2879, 1193, 1194, 599, 1932, 854, 628, 2028, 3638, 1193,
+ 1194, 3371, 1051, 884, 872, 1193, 1194, 3250, 3309, 2505,
+ 3193, 136, 3149, 1193, 1194, 3372, 4122, 1035, 2083, 1936,
+ 1861, 2824, 2244, 2858, 1520, 581, 917, 918, 1521, 4082,
+ 545, 1193, 1194, 3203, 1390, -2395, 1193, 1194, 2194, 1522,
+ 4064, 3352, 1296, 3470, 1193, 1194, 2799, 2803, 2805, 2969,
+ 4236, 2815, 3847, 2356, 1540, 4281, 2161, 2913, 1393, 136,
+ 1540, 653, 4236, 3620, 3471, 2874, 4004, 4005, 651, 262,
+ 1772, 264, 3664, 1773, 3005, 549, 1774, 1806, 1193, 1194,
+ 855, 1541, 813, 1397, 1193, 1194, 4282, 1542, 3869, 1402,
+ 4006, 3204, 1603, 582, 1954, 3472, 1036, 4030, 2970, 3221,
+ 3949, 2308, 1014, 2064, 853, 4083, 1132, 1322, -2396, 2887,
+ 1394, 2029, 4224, 1776, 2328, 885, 1828, 1483, 2371, 1515,
+ 3251, 1807, 2782, 3087, 1911, 1193, 1194, 546, 1747, 1390,
+ 1518, 973, 974, 1210, 1193, 1194, 629, 2859, 1933, 1914,
+ 4044, 1287, 3944, 3758, 1193, 1194, -2395, 2328, 1193, 1194,
+ 856, -1450, 3762, 1052, 2914, 600, 1193, 1194, 1171, 1172,
+ 3194, 3156, 1193, 1194, 1628, 1523, -1490, 1629, 1446, 4177,
+ 2372, 620, 3209, 626, 2848, 3353, 3778, 1193, 1194, 3006,
+ 2126, 3780, 3839, 1537, 1538, 1539, 1309, 886, 2781, -1450,
+ 809, 2485, 3809, 4290, 626, -2584, 1862, 3380, 1195, 3170,
+ 3879, 1196, 1462, 848, 2880, 1230, 3716, 620, 4230, 858,
+ 3242, 3164, 3165, 3166, 1056, 1064, 1463, 1051, 1195, -2396,
+ 2263, 1196, 876, 1940, 2268, 861, 859, 1712, 1034, 3979,
+ 1229, 1720, 2891, 1751, 2893, 851, 1193, 1194, 1305, 1916,
+ 2725, 2904, 1777, 3033, 3717, 1777, 1229, 2888, 1741, 2453,
+ 968, 2892, 1195, 1335, 2916, 1196, 3353, 3665, 2454, 2455,
+ 2925, 2927, 2579, 1524, 2580, 2908, 2909, 969, 2246, 987,
+ 3505, 873, 1418, 1462, 4262, 2919, 2943, 2927, 620, 2249,
+ 1001, 2013, 2252, 2329, 2959, 1335, 2531, 1463, 1571, 1572,
+ 1376, 610, 3309, 3356, 2309, 1195, 3236, 494, 1196, -1490,
+ 2988, 3870, 610, 2527, 1026, 1195, 610, 1195, 1196, 610,
+ 1196, 2268, 3338, 1041, 1001, 1627, 2329, 1014, 620, 1873,
+ 1013, 1213, 1876, 1640, 3104, 1642, 3660, 1880, 1071, 1072,
+ 1073, 1516, 3210, 3211, 1078, 2391, 1516, 1655, 1656, 1657,
+ 2903, 1291, 3699, 1516, 645, 1661, 1754, 1195, 2243, 1810,
+ 1196, 2124, 2911, 1893, 1894, 1195, 1011, 4125, 1196, 1941,
+ 2077, 1195, 3231, 2789, 1196, 3233, 3234, 1023, 1052, 1195,
+ 2829, 2575, 1196, 1241, 2881, 2527, 3030, 1068, 817, 1596,
+ 2576, 2577, 1771, 3448, 3244, 3943, 1133, 1195, 897, 1890,
+ 1196, 3542, 1195, 3337, -2464, 1196, 866, 3970, 4166, 2506,
+ 1195, 3001, -865, 1196, 3350, 2993, 1918, 1516, 3038, -529,
+ -2584, 3167, 3168, 1796, 3525, 3526, 2373, 2873, 2868, 1197,
+ -1490, 2082, 3046, -2464, 1942, 3046, 3046, 4008, 3858, 2088,
+ 3627, 970, 1817, 2996, 1195, 1193, 1194, 1196, 2089, 3245,
+ 1195, 1197, 3046, 1196, 1190, -530, 1192, 3373, 1799, 4338,
+ -433, 3664, 654, 3958, 1826, 3497, 3551, 2990, 975, 550,
+ 2229, 1197, 3571, 3574, 3576, 3577, 2872, 2063, 3536, 3306,
+ 1235, 494, 1237, 815, 1001, 494, 620, 2195, 494, 620,
+ 1516, 1195, -2395, 3197, 1196, 1173, 1389, 3225, 2816, 4409,
+ 1195, 1853, -1490, 1196, 1236, 1197, 1877, 3373, 1240, 877,
+ 1195, 1244, 4138, 1196, 1195, 1193, 1194, 1196, 2141, 1900,
+ 1692, 1693, 1195, -2395, 4292, 1196, 1300, 4257, 1195, 3218,
+ 3007, 1196, 3570, 3527, 1398, 3230, 1295, 3528, 3668, 610,
+ 1403, 1193, 1194, 1195, 4075, 3046, 1196, 3373, 1197, 2767,
+ 2738, 620, 610, 4031, 1516, 3484, 610, -1450, 1197, 3488,
+ 1197, 1324, 3519, 3455, 2142, -2396, 3038, 3547, 3548, 3549,
+ 1288, 2083, 1920, 3088, 3115, 3552, 2114, 1193, 1194, 1193,
+ 1194, 2600, 2582, 3578, 1482, 1193, 1194, 1953, 3500, 1193,
+ 1194, 1748, 4447, 1425, 3406, 3723, -2396, 3483, 138, 620,
+ 1197, 3487, 1195, 1630, 1311, 1196, 1631, 3458, 1197, 3459,
+ 3140, 3941, 3718, -1954, 1197, 1692, 2160, 1330, 2383, 2236,
+ 2971, -1490, 1197, 2198, 2199, 1222, 1223, 1224, 1225, 2215,
+ 2216, 990, 2167, 1997, 3715, 1543, 3366, 2702, 2703, 497,
+ 1197, 610, 1193, 1194, 4126, 1197, 3665, 4132, 3366, 4134,
+ 3633, 2262, 4131, 1197, -1797, 3072, 3073, 3145, 2387, 3636,
+ 3089, 3090, 2095, 1458, 1193, 1194, 1193, 1194, 4185, 2132,
+ 3361, 3428, 1273, 4171, -1490, 2956, 2347, 3595, 1296, 2000,
+ 2804, 1901, 1392, 2885, 2885, 1902, 3596, 1197, 2416, 2945,
+ 2454, 2455, 610, 1197, 4208, 2593, 2579, 3396, 2580, 3125,
+ 3126, 3127, 4259, 2133, 3393, 610, 3883, -1490, 1871, 2136,
+ 1871, 1871, 1392, 667, 3202, 2820, 2821, 3504, 4264, 2660,
+ 1736, 4268, -1490, 118, 502, 1940, 1193, 1194, -1490, 2346,
+ 1936, 1953, 1333, 2356, 1197, 2615, 1193, 1194, 3011, 3819,
+ 3480, 2459, 2588, 1197, 610, 2601, 2453, 3666, 1553, 3112,
+ 3113, -1490, 4210, 1197, 554, 2753, 661, 1197, -1490, 2137,
+ 1193, 1194, 1702, 4211, 2589, 1197, 2972, 2251, -1490, 2138,
+ 2230, 1197, 668, 2140, 1043, 2701, 3990, 1193, 1194, 4448,
+ -1490, 2147, 2357, 1193, 1194, -1490, 1197, 2148, 3849, 1133,
+ 2486, 2511, -1798, 3367, -1490, 1936, 3991, 2013, 2237, 1740,
+ 2583, 1195, 3241, 1133, 1196, 3367, 1193, 1194, 2404, 1544,
+ 2845, 2348, 2385, 1551, 2576, 2577, -1797, 558, 1193, 1194,
+ 3597, 1462, 2390, 2226, 4052, 2393, 2394, 2706, 2707, 3501,
+ 3214, 2456, 3708, 3709, 3851, 1463, 1749, 1941, 3450, 1193,
+ 1194, 120, 2231, 4364, 1686, 1197, 1193, 1194, 2825, 575,
+ 2957, 991, 1748, 1687, 3012, 1193, 1194, 3493, -1490, 1536,
+ 2266, 2158, 2077, 591, 2270, 620, 2749, -2532, 2575, 3368,
+ 1954, 1195, 2038, 43, 1196, 2519, 3948, 3475, 992, 2700,
+ -1490, 3378, 640, 852, 1193, 1194, 2253, 2161, 2384, 2710,
+ -1490, 3749, 3407, 1808, 3652, 2300, 2039, 1195, 1004, 3884,
+ 1196, 669, 620, 1069, 3667, 1193, 1194, 1744, 4335, 4336,
+ 1193, 1194, 610, 4060, 1914, 1686, 592, 3668, 4070, 2322,
+ 2323, 610, -1490, 4171, 4061, 2326, 1942, 1426, 4111, 1695,
+ 2843, 3537, 1737, 1195, 1239, 1195, 1196, 2784, 1196, 1936,
+ 2482, 1195, 2313, 1900, 1196, 1195, 3945, 4127, 1196, 1005,
+ 2584, 1193, 1194, 2374, -1798, 1738, 1193, 1194, 1231, 620,
+ 4047, 4048, 1193, 1194, 1379, 2222, 2263, 583, 2512, 4212,
+ -1490, 1780, -2532, 1783, 2082, 3897, 610, 1746, 1193, 1194,
+ 4053, 2038, 3134, 3630, 3750, 2581, 4472, 593, 610, 1193,
+ 1194, 1560, -1490, 1787, 2209, 2602, 620, 3885, 1195, 2238,
+ 584, 1196, 1193, 1194, 1686, 2039, 3806, 610, 610, 3669,
+ 1193, 1194, 947, 2400, 1954, 2239, 262, 1900, 264, 2923,
+ 1195, 1380, 1195, 1196, 2785, 1196, 3751, 2835, 2527, 1193,
+ 1194, 620, 3013, -1490, 1830, 57, 1432, 1006, 1922, 2836,
+ 2232, 4128, 1838, 602, 1197, 3789, 2333, 3949, 1381, 2527,
+ 1427, 1341, 3215, 732, 494, 494, 494, 610, 494, 610,
+ 2159, 1748, 3237, 2083, 1872, 1850, 4080, 880, 4129, 2582,
+ 1874, 494, -198, 620, 3369, 1428, 494, 1854, 1855, 1856,
+ 1560, 1858, 1195, 1193, 1194, 1196, 3369, 655, -2532, -1490,
+ 603, 1696, 1195, 3248, 1875, 1196, 610, 1749, 1560, 1879,
+ 2885, 605, -1490, 4106, 3254, 1901, 2988, 3256, 2099, 1902,
+ 1433, 1193, 1194, 2436, 1197, 1739, 1195, 1193, 1194, 1196,
+ 1561, -1490, 1857, -1490, 1859, 1840, 586, 2223, 611, 3014,
+ 2163, 2436, 2100, 1195, 2924, 4062, 1196, 4213, 2679, 1195,
+ 1197, 620, 1196, 2401, 3121, 4054, 1871, -1490, -1490, 1596,
+ 614, -1490, -1490, 3330, 2484, 610, 2175, 1588, 2033, 610,
+ 2402, 1889, 1195, 1952, 3704, 1196, 616, 2485, 2453, 1536,
+ 4011, 1362, 2403, 2437, 1195, 627, 1197, 1196, 1197, 1901,
+ 1317, 1193, 1194, 1318, 1197, 1193, 1194, 1588, 1197, 132,
+ 610, 2437, 2182, -2532, 2186, 1195, 3948, 1841, 1196, 3946,
+ 2187, 2438, 1195, 1429, 2188, 1196, 633, 3790, 3805, 1584,
+ 620, 1195, 494, 494, 1196, 2097, 494, 1589, 1560, 2438,
+ 2030, 947, 881, 587, 2035, 1193, 1194, 1647, 1078, 2837,
+ 2113, 1560, 594, 120, 3032, 2093, 2094, 3815, 1193, 1194,
+ 1195, 1197, 3111, 1196, 1007, 1590, 640, 1589, 1923, 565,
+ 2404, 756, 1831, 641, 595, 3777, 565, 2189, 1382, 1193,
+ 1194, 1195, 1924, 1197, 1196, 1197, 1195, 2975, 1686, 1196,
+ 2439, 133, 4181, 2705, 1231, 1590, 570, 1111, 262, 2193,
+ 264, 2211, 2976, 3152, 732, 1430, 596, 1842, 2439, 2070,
+ 1193, 1194, 2575, 4010, 1193, 1194, 4200, 4201, 1193, 1194,
+ 1193, 1194, 4309, 4309, 1193, 1194, 1749, 1195, 646, 1008,
+ 1196, 1009, 1195, 648, 1591, 1196, 1193, 1194, 1195, 1133,
+ 2168, 1196, 1193, 1194, 1231, 1197, 1319, 2271, 1231, 1941,
+ 4388, 1113, 1163, 1167, 1195, 1197, 262, 1196, 264, 1596,
+ 1112, 3070, 597, 2642, 1591, 1195, 2440, 1651, 1196, 4389,
+ 2648, 3071, 1193, 1194, 3779, 2099, 3595, 3781, 1195, 1197,
+ 1673, 1196, 2405, 2654, 2440, 3596, 1195, 3949, 650, 1196,
+ 637, 1193, 1194, 1193, 1194, 3082, 1197, 2235, 2738, 2100,
+ 4115, 1832, 1197, 2257, 3442, 1195, 662, 1383, 1196, 2257,
+ 1592, 2258, 3092, 1193, 1194, 1843, 2669, 3178, 3093, 510,
+ 498, 1193, 1194, 3724, 499, 1197, 3877, 3878, 810, 1384,
+ 3816, 2620, 3738, 664, 1193, 1194, 2226, 1197, 2542, 2259,
+ 1592, 3646, 1925, 1475, 1476, 2406, 4116, 620, 3443, 610,
+ 620, 4112, 2210, 4113, 2128, 1193, 1194, 4274, 1197, 1195,
+ 1936, 610, 1196, 2276, 665, 1197, 666, 1193, 1194, 2282,
+ 2282, 1385, 2282, 2115, 1197, 1193, 1194, 1245, 3738, -1691,
+ 2127, -1691, 620, 1534, 2716, 610, 2082, 1195, 643, 610,
+ 1196, 805, 2581, 1195, 1193, 1194, 1196, 498, 2543, 2129,
+ 1230, 499, 756, 1197, 1596, 564, 620, 620, 610, 610,
+ 610, 1193, 1194, 2582, 1926, 1193, 1194, 849, 1133, 3597,
+ 2321, 2282, 2282, 2282, 1197, -1691, -1775, -1691, 1111, 1197,
+ 2813, 2108, 579, 2614, 2281, 2281, 580, 2281, 2369, 2131,
+ 1927, 1193, 1194, 3543, 2139, 871, 3544, 2380, 1496, 1497,
+ 2305, 1193, 1194, 869, 1311, 1193, 1194, 1195, 2376, 1144,
+ 1196, 1195, 498, 3207, 1196, 1708, 499, 889, 4117, 863,
+ 1197, 2441, 2436, 1330, 2325, 1197, 2071, 1193, 1194, 1161,
+ 891, 1197, 1748, 1364, 610, 2149, 2281, 2281, 2281, 2441,
+ 2150, 1519, 1177, 1178, 964, 2544, 2399, 1197, 2333, 881,
+ 1936, 1195, 1928, 610, 1196, 2902, 2334, 3198, 1197, 1609,
+ 1193, 1194, 2157, 985, 1195, 1593, 3200, 1196, 1038, 1039,
+ 986, 1197, 2890, 2171, 3481, 3975, 3976, 3977, 852, 1197,
+ 1331, 1392, 2437, 2420, 3364, 1195, 2172, 1003, 1196, 994,
+ 1392, 1014, 2427, 2428, 2176, 1593, 2917, 2918, 1197, 2392,
+ 1024, 2072, 1044, 2432, 2433, 2434, 2435, 1045, 2443, 2444,
+ 2438, 4074, 1230, 2180, 3398, 3399, 1195, 118, 2410, 1196,
+ 1195, 2545, 1049, 1196, 1195, 2569, 1195, 1196, 1080, 1196,
+ 1195, 2585, 1594, 1196, 1081, 3412, 1686, 1193, 1194, 1509,
+ 1510, 1929, 1195, 1193, 1194, 1196, 962, 963, 1195, 966,
+ 2513, 1196, 1197, 1082, 1193, 1194, 1084, 1613, 1520, 1871,
+ 1085, 703, 1521, 1086, 3619, 2528, 975, 2181, 1089, 2638,
+ 2335, 2336, 1748, 1522, 1193, 1194, 1090, 2681, 1195, 2439,
+ 1197, 1196, 2638, 2130, 1230, 3931, 1197, 1233, 1038, 1039,
+ 1091, 1953, 947, 1686, 1709, 2185, 1092, 1195, 1093, 1195,
+ 1196, 2190, 1196, 2683, 917, 918, 2540, 2541, 2843, 2548,
+ 2337, 2550, 2551, 2552, 2553, 2554, 1919, 1094, 2557, 1195,
+ 2559, 708, 1196, 1095, 1193, 1194, 1686, 1195, 620, 3201,
+ 1196, 2348, 1193, 1194, 620, 3055, 2586, 2241, 1096, 494,
+ 1195, 2923, 4187, 1196, 1097, 2073, 610, 610, 610, 2609,
+ 1197, 1098, 2612, 1099, 1197, 2440, 1614, 1193, 1194, 498,
+ 1617, 1195, 2591, 499, 1196, 2202, 1100, 1618, 947, 2217,
+ 2134, 2135, 620, 1195, 2698, 1101, 1196, 1749, 2154, 1230,
+ 1102, 1195, 3961, 3965, 1196, 620, 1193, 1194, 1103, 3059,
+ 732, 4072, 2162, 1230, 1197, 2164, 1230, 1193, 1194, 1523,
+ 1195, 2165, 1645, 1196, 3931, 3931, 2719, 1197, 1588, 3035,
+ 559, 2605, 2606, 2607, 4179, 1234, 4088, 1195, 721, 1106,
+ 1196, 1195, 3058, 1108, 1196, -1775, 2546, 2253, 1197, 1193,
+ 1194, 1109, 947, 3147, 4094, 4095, 1193, 1194, 4098, 4099,
+ 4100, 4101, 1249, 3060, 1110, 3507, 3508, 1195, 1619, 1114,
+ 1196, 2177, 1230, 1115, 1245, 1245, 1245, 1195, 4089, 1197,
+ 1196, 1195, 1210, 1197, 1196, 1116, 2581, 1197, 1589, 1197,
+ 3581, 2178, 1230, 1197, 3066, 2179, 1230, 620, 3067, 1238,
+ 3110, 3191, 3074, 1195, 3078, 1197, 1196, 2708, 3079, 1953,
+ 1274, 1197, 2183, 1230, 737, 1710, 2860, 1524, 3832, 1936,
+ 3080, 1621, 2717, 1193, 1194, 1282, 3081, 3866, 3867, 620,
+ 1117, 1711, 2638, 1118, 2807, 2812, 1195, 1749, 1119, 1196,
+ 732, 1197, 1120, 620, 807, 808, 1686, 1121, 811, 812,
+ 1122, 3961, 814, 1123, 816, 3965, 3083, 1126, 4198, 4199,
+ 1197, 3152, 1197, 2445, 2446, 1127, 2070, 4207, 2430, 900,
+ 3931, 3931, 3032, 2687, 1230, 3086, 2747, 3091, 2854, 2638,
+ 2441, 1128, 1197, 2333, 4304, 2861, 1209, 1134, 4383, 1135,
+ 1197, 2723, 2724, 4202, 1954, 917, 918, 3094, 2226, 3054,
+ 2135, 2772, 1277, 1197, 1943, 3096, 979, 980, 756, 981,
+ 1136, 982, 1137, 1195, 620, 2284, 1196, 2285, 3098, 1195,
+ 3833, 3834, 1196, 1138, 1197, 3835, 3836, 2793, 2436, 2795,
+ 1195, 2926, 1210, 1196, 1111, 620, 1197, 620, 620, 3100,
+ 1139, 1748, 1285, 2792, 1197, 1872, 1276, 1872, 1872, 2719,
+ 1195, 3101, 2400, 1196, 1140, 2070, 1953, 1141, 1622, 3102,
+ 2571, 2862, 1284, 1197, 3931, 1142, 2351, 2352, 2353, 1145,
+ 1213, 1146, 1687, 1624, 1147, 1596, 1148, 1278, 3417, 3931,
+ 1197, 620, 620, 1279, 1197, 3643, 4419, 4420, 2437, 3057,
+ 1230, 1149, 3931, 3084, 1230, 3418, 1210, 1162, 901, 3419,
+ 1195, 2456, 1150, 1196, 1151, 2335, 2336, 1152, 1195, 1944,
+ 1197, 1196, 1153, 2070, 3961, 3965, 2438, 1936, 1154, 764,
+ 1197, 2528, 3158, 3159, 1197, 3645, 2528, 1280, 118, 3333,
+ 3334, 2528, -1775, 1195, 1293, 2528, 1196, 2898, 756, 3651,
+ 1155, 4469, 3423, 1230, 1281, 3155, 1197, 2898, 1156, 2528,
+ 2528, 1157, 620, 2877, 3931, 2900, 2901, 3445, 3446, 2528,
+ 1294, 1687, 1195, 2889, 1111, 1196, 3931, 3931, 1158, 2899,
+ 1159, 610, 902, 1195, 3586, 3587, 1196, 3623, 3631, 1197,
+ 2898, 2930, 2401, 3647, 1230, 2439, 1160, 2528, 2955, 1164,
+ -1775, 2920, 1954, 2968, 3653, 3661, 1230, 2931, 1211, 2402,
+ 2985, 947, 1083, 2933, 2934, 1195, 1936, 2571, 1196, 2967,
+ 2482, 2403, 1195, 1165, 3931, 1196, 3676, 3677, 1215, 1216,
+ 1213, 1212, 3792, 2446, 3931, 3807, 3808, 1166, 119, 3811,
+ 3808, 3812, 3808, 2071, 3871, 3446, 2932, 1248, 1168, 1748,
+ 3874, 3808, 1342, 2989, 1404, 1169, 120, 3881, 3882, 4416,
+ 1301, 2038, 1343, 4018, 4019, 1303, 1197, 1175, 610, 2528,
+ 1245, 2440, 1197, 1179, 1936, 1180, 2863, 3931, 1344, 3931,
+ 3405, 3654, 1945, 1197, 1405, 2039, 1307, 3655, 900, 3931,
+ 1345, 1346, 1347, 1946, 1213, -2575, 1749, 1315, 3656, 2404,
+ 1947, 4023, 3808, 1197, 3756, 3757, 1348, 1181, 3931, 1182,
+ 3931, 1183, 3931, 1232, 3037, 1038, 1039, 3760, 3726, 3931,
+ 3424, 3706, 121, 1325, 3763, 1588, 1338, 2449, 4024, 3808,
+ 3931, 1340, 2071, 3016, 4473, 4026, 3808, 3529, 1748, 1406,
+ 3532, 3533, 4027, 3808, 1407, 1357, 3931, 3931, 1358, 1954,
+ 3782, 3783, 3553, 1197, 4300, 3823, 3824, 3545, 4032, 4033,
+ 1359, 1197, 3931, 3931, -620, 4034, 4033, 3931, 3971, 1365,
+ 1218, 1219, 1220, 1221, 1222, 1223, 1224, 1225, 1215, 1216,
+ 1373, 2456, 4090, 4091, 1362, 1589, 1197, 4218, 4019, 1374,
+ 2071, 1214, 1948, 2457, 1378, 2749, 1748, 3554, 2276, 4219,
+ 4019, 1300, 620, 620, 620, 122, 1390, 2072, 3555, 947,
+ 610, 2405, 1399, 2860, 1401, 1197, 1400, 901, 3616, 3617,
+ 2483, 1416, 262, 1419, 264, 1210, 1197, 4227, 3446, 2747,
+ 620, 4272, 4273, 1423, 2484, 1687, 4316, 4317, 4334, 3332,
+ 4461, 4462, 1215, 1216, 1676, 1677, 4161, 1424, 1133, 3890,
+ 3634, 620, 620, 620, 3556, 3890, 1217, 1437, 1197, 3462,
+ 3463, 3430, 3431, 1440, 3177, 1197, 903, 904, 1441, 906,
+ 3179, 908, 3181, 2638, 2406, 3133, 2441, 2400, 620, 3628,
+ 3176, 1443, 2861, 909, 1949, 3602, 3674, 3675, 1408, 1686,
+ -620, 902, 1448, 1872, 1749, 505, 1453, 1459, 947, 1564,
+ 1565, 1566, 1465, 1467, 4086, 1469, 1472, 1477, 1473, 1480,
+ 1484, 1485, 1486, 1481, 2400, 1528, 1349, 1585, 1210, 1529,
+ 1218, 1219, 1220, 1221, 1222, 1223, 1224, 1225, 1530, 1533,
+ 1535, 2038, 123, 1536, 1350, 1554, 1210, 1228, 1556, 1560,
+ 1567, 1587, 1173, 1633, 1644, 1646, 1598, 2624, 262, 1648,
+ 264, 2073, 1652, 1645, 1684, 2039, 947, 2528, 2862, 1409,
+ 2528, 2528, 1694, 2898, 1703, 1719, 3729, 1725, 1745, 1753,
+ 1596, 1669, 1670, 2625, 1759, 1674, 620, 1752, 1295, 2528,
+ -786, 1760, 1761, 1749, 1218, 1219, 1220, 1221, 1222, 1223,
+ 1224, 1225, 1756, 3243, 2898, 1688, 1689, 1762, 1763, 1764,
+ 124, 3246, 1765, -628, 1766, 2898, 1768, 2401, 2898, 1769,
+ 3553, 1792, 1795, 1213, 2567, 1804, 1813, 1812, 1814, 1210,
+ 1815, 1820, 1823, 1410, 2402, 1824, 1825, 1834, 2626, 4296,
+ 3260, 2627, -2575, 610, 1839, 1848, 2403, 1852, 3317, 2628,
+ 1882, 1749, 1881, 1883, 2401, 1884, 1886, 1895, 494, 1897,
+ 1899, 1912, 3327, 1921, 2898, 3554, 2629, 2025, 125, 1516,
+ 1351, 2402, 2042, -1490, 2043, 2044, 3555, 2045, 2046, 3336,
+ 2047, 3323, 2997, 2403, 2066, 2048, 2049, 1038, 1039, 2050,
+ 2051, 2052, 2053, 3558, 3347, 1596, 2054, 2055, -620, 3559,
+ 2458, 610, 3339, 1686, 2056, 2057, 2092, 2058, 3261, 2059,
+ 2060, 2061, 2062, 3360, -620, 2456, 1213, 2084, 4086, 2085,
+ 2102, 2103, 3556, 2104, 2404, 1352, -1490, 2457, 2105, 2117,
+ 1296, 1113, 1163, 1167, 1213, -2575, 2119, 4133, 2120, 3560,
+ 2121, 2144, 2145, 1353, 2111, 1411, 3710, 1364, 2153, 2146,
+ 2151, 2152, 4382, 3467, 4384, 2155, 2166, -1490, 2170, -1490,
+ 2174, 2404, 2161, 2200, 2191, 2630, 3349, 3892, 2192, 2854,
+ 2197, 1215, 1216, 2863, -1490, 2201, 2212, 2213, 2227, 1412,
+ -1490, 2214, 2234, 4402, -1179, 903, 904, 905, 906, 907,
+ 908, 3422, 3557, 1225, 2240, -1490, 2250, 3872, 3873, 2793,
+ 3875, 3876, 909, -1490, -1316, 508, 2272, 3561, 2279, 2297,
+ -1490, 2306, 3852, 2312, 2315, 2792, 262, 1213, 264, 2318,
+ -1490, 4434, 4435, 2747, -620, 2349, 2350, 2365, 4321, 505,
+ 2377, 2379, -1490, 3842, 2381, 2382, 2405, -1490, 2408, 2386,
+ 2409, 2413, 2412, 2772, 3457, 2415, -1490, 620, -786, 2419,
+ 2421, 2422, 2456, 3992, 2426, 2423, 620, 2424, 2425, 2468,
+ 2473, 3993, 2717, 2478, 2474, 2038, 2631, 2477, 2480, 2481,
+ 2487, 2489, 620, 2405, 2490, 2496, 2497, 2502, 2503, 2508,
+ 2369, 2509, 1215, 1216, -620, 3994, 2516, 2532, 3933, 2039,
+ 2536, 2538, 2570, 2562, 4035, 2592, 2614, 2618, 2623, 2406,
+ 1687, 2649, 2650, 2610, 2661, 1210, 2651, 2258, 2662, 3562,
+ -1490, 2674, 2528, 1218, 1219, 1220, 1221, 1222, 1223, 1224,
+ 1225, 2693, 2528, 2728, 2898, 2695, 2696, 2697, 4321, 2714,
+ -1775, 2704, -1490, 1687, 2726, 2729, 2406, 2713, 504, 2898,
+ 2727, 610, -1490, 2528, 2730, 1038, 1039, 2742, 2739, 1686,
+ 2736, 3558, 2741, 2743, 2750, 2638, 2751, 3559, 1799, 1969,
+ 1970, 4003, 2754, 2755, 4454, 1215, 1216, 2756, 2762, 2775,
+ 2774, 2777, 1686, 2778, -1490, 2779, 1193, 1194, 2356, 1686,
+ 4326, 4327, 2357, 4329, 2797, 1686, 2116, 4465, 2796, 2819,
+ 2822, 2798, -769, -769, 4454, 1972, 2826, 3560, 2831, 2832,
+ 4465, 3995, 2833, 2849, -769, 2856, 2632, 2184, 1220, 1221,
+ 1222, 1223, 1224, 1225, 2857, 1975, 2985, 1200, 1201, 2905,
+ 2907, 505, -1490, 1976, 2964, 3583, 1220, 1221, 1222, 1223,
+ 1224, 1225, 4372, 2974, 4373, 4374, 2994, 2995, -620, 2978,
+ 2980, 3615, 3615, 3615, -1490, 3695, 1872, 1978, 3607, 2286,
+ 3003, 3004, 1202, 1914, 1997, 2999, 3029, -817, 620, 2112,
+ 3038, 1459, 3043, 1203, 1979, 3561, 3049, 3051, 3052, 3053,
+ 2633, 2287, 2169, 3061, 3062, 3105, 2173, 3107, 3996, 1605,
+ 1606, 1607, 1608, 1609, 2288, -1490, 3109, 3114, 3117, 3118,
+ 3123, 3128, 1984, 1213, 3268, 2289, 3997, 4413, 2196, 2634,
+ 3135, 3130, 3138, 1204, 1317, 506, 4173, 3142, 1219, 1220,
+ 1221, 1222, 1223, 1224, 1225, 1205, 4003, 3160, 3148, 3157,
+ 3998, 3163, 3175, 2935, 3139, 2936, 3154, 3180, 3684, 508,
+ 3188, 3174, 3208, 1687, 3212, 2854, 4446, 3213, 3216, 3228,
+ 3229, -1490, 1206, 3240, 3325, 2290, 3318, 2291, 620, 3382,
+ 3227, 3249, 3383, -1490, -1490, 262, 3257, 264, 3321, 3324,
+ 3384, 676, 3258, 1987, 3259, 3329, 2937, 3562, 3331, 3335,
+ 3332, 1988, 3348, -1490, 2292, -1490, 3342, 3385, 1610, 1611,
+ 1612, 1613, -443, 3343, 2333, 3351, 1989, 2938, 3362, 868,
+ 3615, 3357, 3358, 3359, 3379, 3400, 3397, 3401, 3408, -1490,
+ -1490, 1207, 4243, -1490, -1490, 3852, 3426, 3746, -620, 2638,
+ 3409, 3427, 1966, 3436, 3438, 3441, 3447, 4243, 4175, 1967,
+ 3386, 1968, 2939, 3449, 3460, 3476, 3468, 676, 3485, 3486,
+ 4253, 3741, 1969, 1970, 3477, 523, 2293, 3498, 620, 3506,
+ 1990, 1215, 1216, 3732, 3509, 3510, 3523, 3530, 3580, 2530,
+ 703, 3584, 3582, 3590, 3603, 3765, 3605, 3604, 1991, 3594,
+ 3608, 3609, 3611, 1971, 3784, 3625, 3621, 3622, 1972, 1973,
+ 3623, 3788, 3624, 3629, 3632, 1974, 3387, 3467, 3635, 3637,
+ 1614, 3648, 1615, 1616, 1617, 3639, 947, 3640, 1975, 3347,
+ 2294, 1618, 524, 3641, 3793, 3649, 1976, 3650, 3644, 3662,
+ 507, 3663, 3999, 707, 3672, 3679, 1977, 3680, 3677, 3732,
+ 708, 3178, 620, 1995, 3689, 1996, 703, 3691, 3696, 525,
+ 1978, 508, 3692, 1998, 3697, 3702, 3700, 3703, 3714, 820,
+ 821, -1405, 1195, 3727, 1459, 1196, -1410, 1979, 712, 713,
+ 3728, 3730, 3731, 1923, 1980, 1981, 3744, 3747, 3755, 3570,
+ 3759, 1982, 4243, 1210, 526, 3769, 4173, 1924, 509, 1983,
+ 3761, -535, 4358, -892, 510, 1984, 3771, 3770, 3772, 707,
+ 3773, 3776, 1619, 3775, 3388, 3795, 708, 3389, 3573, 3810,
+ 620, 3814, 3794, 1218, 1219, 1220, 1221, 1222, 1223, 1224,
+ 1225, 2004, 3813, 3817, 1985, 3631, 3821, 4170, 3864, 3822,
+ 511, 3825, 527, 3827, 712, 713, 3828, 721, 512, 3829,
+ 3840, 3615, 3615, 3841, 3615, 3615, 3860, 4392, 3862, 2940,
+ 822, 3855, 3844, 3845, 1620, 1621, 3880, 3856, 262, 3886,
+ 264, 3893, 3894, 2638, 1986, 3900, 1987, 4003, 4243, 3942,
+ 4243, 3957, 3934, 3967, 1988, 3968, 3972, 4412, 2005, 823,
+ 821, 3974, 3969, 3982, 3390, 3075, 3985, 4015, 4243, 1989,
+ 4038, 3899, 824, 2941, 2006, 4020, 4443, 732, 2007, 4017,
+ 4028, -309, 4036, 721, 4056, 4058, 4059, 3898, 4368, 4065,
+ 3938, 610, 736, 737, 4069, 825, 4077, 2008, 826, 4076,
+ 4243, 4243, 3615, 4081, 4093, 4458, 4096, 4097, 4105, 827,
+ 4443, 4102, 4107, 4109, 4138, 2010, 2959, 4141, -327, 4167,
+ 4168, 4169, 4189, 1990, 4204, 4216, 4220, 1925, 4186, 4192,
+ 828, 4221, 4222, 4223, -65, 610, 4228, 4231, 3989, 528,
+ 4232, 1991, 4233, 732, 4239, 1992, 620, 893, 821, 4244,
+ 822, 1213, 4240, 4250, 3766, 4251, 3939, 829, 736, 737,
+ 4252, 4255, 4368, 4276, 830, 803, 4262, 4277, 4278, 4279,
+ 4287, 4288, 1622, 4297, 3024, 4292, 4029, 4299, 4301, 823,
+ -2311, 4302, 4305, 4311, 1993, 1197, 1623, 1624, 4314, 1994,
+ 4325, 3391, 824, 4328, 4330, 4331, 1995, 4042, 1996, 1926,
+ 3983, 4333, 4049, 4346, 831, 1997, 1998, 529, 4359, 4362,
+ 4360, 4365, -1574, 4376, 4379, 825, 4380, 4381, 826, 4385,
+ 3392, 4386, 1038, 1039, 4390, 1927, 4393, 4396, 4398, 827,
+ 4401, 4399, 4471, 4405, 4407, 4410, 4411, 1999, 822, 4414,
+ 4418, 4422, 4424, 4432, 4431, 4455, 4468, 4051, 4459, 3592,
+ 828, 2000, 2001, 2002, 2003, 2721, 3593, 2869, 4071, 2561,
+ 3798, 1061, 4066, 4176, 4312, 530, 1471, 823, 4313, 3796,
+ 3800, 531, 4466, 4426, 2004, 756, 1687, 829, 3937, 3733,
+ 824, 578, 3734, 959, 830, 3162, 3911, 1928, 2341, 4436,
+ 532, 4343, 4203, 762, 4237, 4344, 3912, 4310, 764, 1215,
+ 1216, 765, 3914, 825, 4249, 3915, 826, 3917, 3918, 3864,
+ 3919, 3864, 3920, 4114, 3921, 533, 4248, 827, 803, 3922,
+ 3925, 3926, 3927, 803, 831, 1532, 1965, 2261, 4068, 2011,
+ 2520, 2005, 534, 832, 2036, 3253, 3141, 833, 828, 4142,
+ 3682, 756, 3440, 1802, 3146, 3733, 3685, 2006, 3734, 4191,
+ 4261, 2007, 4395, 834, 3984, 4324, 4367, 3735, 3736, 762,
+ 803, 835, 4104, 2069, 764, 829, 3804, 765, 4183, 836,
+ 2008, 663, 830, 2518, 3022, 2009, 1929, 803, 3340, 3522,
+ 2525, 3515, 2961, 4377, 4182, 3989, 3511, 4135, 2010, 3394,
+ 3538, 3579, 3888, 3774, 837, 620, 4188, 3764, 2719, 3474,
+ 519, 4209, 4120, 520, 4196, 4197, 4225, 838, 839, 4226,
+ 2101, 4073, 831, 4078, 4079, 2604, 3956, 3891, 803, 803,
+ 803, 803, 2522, 3735, 3736, 3513, 1439, 1012, 2949, 3743,
+ 803, 1898, 2759, 3512, 2324, 2397, 2737, 1251, 2034, 2067,
+ 3132, 1218, 1219, 1220, 1221, 1222, 1223, 1224, 1225, 3437,
+ 2780, -892, 840, 832, 3425, 2692, 3932, 983, 1369, 2355,
+ 2639, 2641, 4323, 1643, 3482, 3116, 2844, 2691, 4022, 4285,
+ 1252, 3868, 4286, 834, 3591, 2711, 3517, 1915, 3199, 3865,
+ 1687, 835, 1586, 841, 1605, 1606, 1607, 1608, 1609, 836,
+ 3854, 2944, 4417, 2787, 1786, 2608, 2765, 2735, 1818, 3687,
+ 3453, 620, 3452, 2388, 3492, 842, 4258, 843, 4269, 4270,
+ 971, 803, 2110, 1079, 837, 955, 2985, 2985, 2389, 2273,
+ 1864, 3521, 1887, 1822, 4363, 3439, 4280, 838, 839, 4394,
+ 4467, 4332, 4470, 3768, 2366, 3456, 1837, 3478, 1253, 3196,
+ 3701, 832, 3857, 1829, 896, 894, 2311, 1356, 1779, 3973,
+ 3981, 898, 2091, 1361, 657, 1065, 3120, 0, 1066, 1067,
+ 0, 834, 1254, 658, 0, 620, 1255, 0, 0, 835,
+ 0, 0, 840, 0, 0, 0, 0, 836, 0, 0,
+ 0, 0, 0, 1610, 1611, 1612, 1613, 0, 0, 0,
+ 0, 0, 4348, 0, 0, 0, 0, 0, 0, 4356,
+ 1256, 0, 837, 841, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 838, 839, 0, 0, 0,
- 0, 0, 0, 0, 0, 822, 0, 0, 0, 0,
- 0, 0, 1255, 0, 0, 1268, 0, 0, 0, 0,
- 0, 0, 0, 0, 4450, 0, 0, 0, 0, 0,
- 0, 0, 1256, 0, 823, 0, 0, 0, 0, 0,
- 840, 0, 0, 0, 0, 0, 1257, 824, 0, 0,
- 0, 0, 0, 0, 0, 4393, 0, 0, 0, 0,
- 4398, 0, 0, 0, 0, 0, 0, 1506, 1507, 0,
- 825, 841, 0, 826, 0, 0, 0, 0, 0, 803,
- 0, 0, 0, 0, 827, 0, 0, 0, 0, 0,
- 0, 0, 0, 842, 1258, 843, 0, 4434, 0, 0,
- 0, 0, 0, 0, 0, 828, 1683, 0, 0, 0,
- 0, 0, 0, 0, 4365, 0, 1259, 0, 0, 0,
- 0, 0, 0, 0, 0, 622, 0, 0, 0, 1683,
- 0, 4434, 829, 0, 803, 803, 1683, 0, 0, 830,
- 0, 0, 1683, 803, 803, 803, 803, 803, 803, 803,
- 803, 803, 803, 803, 803, 803, 0, 0, 1601, 1602,
- 1603, 1604, 1605, 803, 803, 0, 803, 0, 803, 0,
- 0, 0, 803, 0, 0, 803, 803, 803, 803, 831,
- 803, 803, 803, 0, 0, 0, 0, 0, 0, 803,
- 803, 0, 803, 803, 803, 803, 803, 893, 821, 803,
- 803, 803, 803, 803, 803, 803, 803, 803, 803, 803,
- 0, 0, 803, 803, 0, 0, 803, 0, 0, 1260,
- 803, 0, 803, 803, 0, 0, 0, 0, 1261, 0,
- 0, 0, 0, 0, 0, 0, 803, 803, 0, 0,
- 0, 0, 0, 1262, 803, 0, 0, 0, 0, 0,
- 0, 803, 803, 803, 0, 803, 0, 1606, 1607, 1608,
- 1609, 1263, 803, 803, 803, 0, 803, 803, 803, 803,
- 803, 0, 803, 803, 803, 803, 803, 803, 803, 803,
- 0, 0, 0, 803, 803, 0, 3252, 3253, 822, 0,
- 0, 0, 3254, 0, 3255, 0, 3256, 3257, 0, 0,
- 1264, 1265, 0, 0, 0, 0, 0, 0, 832, 0,
- 0, 0, 833, 3258, 0, 0, 0, 823, 0, 0,
- 0, 0, 0, 0, 0, 0, 1266, 0, 834, 0,
- 824, 0, 0, 0, 0, 0, 835, 0, 0, 0,
- 0, 0, 0, 0, 836, 0, 0, 0, 1267, 0,
- 0, 0, 0, 825, 0, 0, 826, 0, 0, 1610,
- 803, 1611, 1612, 1613, 0, 0, 0, 827, 3259, 837,
- 1614, 3260, 0, 0, 0, 0, 0, 0, 0, 3261,
- 0, 0, 838, 839, 0, 0, 0, 0, 828, 0,
- 0, 0, 0, 0, 0, 0, 3262, 1268, 0, 0,
- 0, 0, 0, 0, 1964, 1965, 0, 0, 0, 0,
- 1086, 0, 0, 3263, 0, 829, 0, 0, 0, 0,
- 803, 0, 830, 0, 0, 0, 0, 840, 803, 0,
- 0, 0, 0, 0, 0, 0, 0, 3264, 0, 3265,
- 1967, 0, 0, 0, 0, 0, 0, 1124, 0, 0,
- 0, 1615, 3266, 3267, 0, 0, 0, 0, 841, 0,
- 1970, 0, 831, 0, 1142, 0, 0, 0, 1971, 0,
+ 1257, 0, 0, 0, 0, 842, 0, 843, 0, 0,
+ 0, 0, 0, 0, 1258, 0, 0, 0, 0, 0,
+ 0, 0, 4460, 0, 0, 0, 0, 4375, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 842, 0, 843, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 1973, 0, 0, 3268, 0, 0, 0, 0,
- 0, 0, 0, 1616, 1617, 0, 1456, 0, 1186, 1974,
+ 840, 0, 0, 0, 0, 0, 0, 803, 0, 0,
+ 0, 0, 0, 0, 0, 4403, 0, 0, 0, 0,
+ 4408, 0, 1259, 0, 0, 1614, 0, 1615, 1616, 1617,
+ 0, 841, 0, 0, 0, 0, 1618, 0, 0, 0,
+ 0, 0, 0, 0, 1260, 0, 0, 0, 0, 0,
+ 0, 0, 0, 842, 0, 843, 0, 4444, 0, 0,
+ 0, 0, 0, 803, 803, 0, 1687, 0, 0, 0,
+ 0, 0, 803, 803, 803, 803, 803, 803, 803, 803,
+ 803, 803, 803, 803, 803, 620, 0, 0, 0, 1687,
+ 0, 4444, 803, 803, 0, 803, 1687, 803, 0, 0,
+ 0, 803, 1687, 0, 803, 803, 803, 803, 0, 803,
+ 803, 803, 0, 0, 0, 0, 0, 1619, 803, 803,
+ 0, 803, 803, 803, 803, 803, 0, 0, 803, 803,
+ 803, 803, 803, 803, 803, 803, 803, 803, 803, 0,
+ 0, 803, 803, 0, 0, 803, 0, 1261, 0, 803,
+ 0, 803, 803, 0, 0, 0, 1262, 0, 0, 0,
+ 0, 0, 0, 0, 0, 803, 803, 0, 0, 1620,
+ 1621, 1263, 1493, 803, 0, 0, 0, 0, 0, 0,
+ 803, 803, 803, 0, 803, 0, 0, 0, 0, 1264,
+ 0, 803, 803, 803, 0, 803, 803, 803, 803, 803,
+ 0, 803, 803, 803, 803, 803, 803, 803, 803, 0,
+ 0, 0, 803, 803, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 1265, 1266,
+ 0, 0, 1494, 1495, 1496, 1497, 1498, 1499, 0, 1500,
+ 1501, 1502, 1503, 1504, 1505, 1506, 0, 1507, 1508, 0,
+ 0, 915, 0, 0, 1267, 0, 0, 0, 0, 0,
+ 0, 872, 916, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 498, 0, 0, 1268, 499, 0, 0,
+ 0, 0, 0, 0, 0, 0, 917, 918, 0, 803,
+ 0, 0, 0, 0, 919, 0, 0, 0, 0, 920,
+ 0, 0, 0, 0, 0, 0, 0, 1622, 0, 0,
+ 0, 0, 0, 0, 0, 1087, 0, 0, 0, 0,
+ 0, 1623, 1624, 0, 0, 1269, 921, 0, 922, 0,
+ 923, 0, 0, 0, 0, 0, 0, 0, 0, 924,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 3269, 0, 0, 0, 0, 0,
- 2019, 0, 0, 3270, 3271, 0, 3272, 1979, 0, 0,
+ 0, 803, 1125, 0, 0, 0, 0, 0, 0, 803,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 1143,
+ 0, 0, 0, 0, 0, 1509, 1510, 0, 0, 0,
+ 0, 0, 0, 0, 0, -1775, 925, 0, 0, 0,
+ 0, 926, 0, 0, 927, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 1187, 0, 0, 0, 0, 0, 0,
+ 928, 0, 929, 1, 0, 2, 0, 0, 0, 930,
+ 0, 931, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 3, 0, 0, 0, 4, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 932, 933, 934, 5,
+ 6, 2024, 0, 0, 0, 0, 0, 7, 0, 0,
+ 0, 0, 8, 9, 0, 0, 0, 0, 0, 935,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 3273, 3274, 3275, 0,
+ 0, 0, 0, 0, 10, 0, 0, 0, 0, 0,
+ 0, 936, 0, 1316, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 11, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 937, 0,
+ 0, 0, 0, 0, 12, 0, 0, 0, 0, 0,
+ 0, 0, 13, 14, 15, 0, 0, 0, 0, 0,
+ 803, 0, 0, 0, 16, 17, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 18, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 3276, 3277, 3278, 0, 0,
- 0, 832, 0, 3279, 0, 894, 3280, 0, 1315, 0,
- 262, 0, 264, 0, 0, 0, 0, 0, 1982, 0,
- 0, 834, 3281, 3282, 0, 0, 1983, 0, 803, 835,
- 0, 0, 0, 0, 0, 0, 0, 836, 0, 0,
- 0, 1984, 0, 0, 0, 0, 0, 0, 0, 2938,
- 0, 1618, 0, 0, 0, 0, 1962, 0, 3283, 3284,
- 0, 0, 837, 0, 0, 1619, 1620, 0, 0, 1964,
- 1965, 0, 0, 0, 0, 838, 839, 0, 0, 0,
- 0, 0, 0, 3285, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1985, 0, 0, 0, 0,
- 1966, 0, 0, 0, 0, 1967, 0, 0, 0, 0,
- 0, 0, 0, 1986, 0, 0, 0, 0, 0, 0,
- 840, 0, 0, 0, 0, 1970, 0, 0, 0, 0,
- 0, 0, 0, 1971, 3286, 0, 0, 0, 3287, 0,
- 803, 803, 803, 1972, 0, 0, 0, 0, 0, 0,
- 3288, 841, 0, 0, 803, 0, 0, 1973, 0, 0,
- 0, 0, 0, 0, 1489, 0, 0, 0, 1990, 0,
- 1991, 1456, 0, 842, 1974, 843, 0, 0, 1993, 0,
- 803, 1975, 0, 0, 0, 0, 803, 0, 2939, 803,
- 0, 803, 0, 0, 0, 0, 1978, 803, 0, 803,
- 803, 0, 1979, 0, 3289, 0, 0, 3290, 0, 0,
- 3291, 3292, 3293, 3294, 0, 0, 0, 0, 0, 1554,
- 1555, 0, 0, 1964, 1965, 0, 0, 0, 1565, 1566,
- 0, 1980, 1569, 1570, 1571, 1574, 1575, 1576, 1577, 1578,
- 1579, 0, 0, 0, 0, 0, 1999, 0, 1595, 1596,
- 0, 1597, 0, 1598, 3295, 3296, -769, -769, 0, 1967,
- 1631, 1632, 1633, 1634, 0, 262, 1637, 264, -769, 0,
- 803, 0, 0, 1982, 1645, 1646, 0, 1649, 1650, 1970,
- 3297, 1983, 0, 0, 1654, 1655, 1656, 1971, 0, 1659,
- 1660, 1661, 1662, 1663, 1664, 0, 1984, 1667, 1668, 0,
- 0, 1671, 0, 2000, 0, 1674, 0, 1678, 1679, 0,
- 0, 1973, 0, 0, 0, 0, 0, 0, 0, 2001,
- 0, 1686, 1687, 2002, 0, 1456, 0, 0, 1974, 1695,
- 0, 0, 0, 0, 0, 0, 1700, 1701, 1702, 0,
- 0, 0, 2003, 0, 0, 0, 0, 0, 0, 0,
- 1985, 0, 0, 0, 0, 0, 1979, 0, 0, 0,
- 2005, 0, 0, 0, 0, 0, 0, 0, 1986, 1738,
- 0, 0, 1987, 0, 0, 0, 0, 0, 0, 0,
+ 0, 19, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 938, 0, 0, 20, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 21, 0, 0, 0, 0, 22, 0,
+ 939, 0, 23, 0, 0, 0, 0, 0, 0, 0,
+ 0, 940, 941, 0, 0, 942, 943, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 24, 0, 25,
+ 0, 0, 0, 0, 0, 0, 944, 0, 0, 1492,
+ 0, 0, 803, 803, 803, 26, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 803, 0, 0, 0,
+ 0, 0, 0, 27, 0, 0, 0, 28, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 945,
+ 0, 0, 803, 0, 0, 0, 0, 0, 803, 0,
+ 0, 803, 946, 803, 0, 1558, 1559, 0, 0, 803,
+ 0, 803, 803, 0, 1569, 1570, 0, 0, 1573, 1574,
+ 1575, 1578, 1579, 1580, 1581, 1582, 1583, 0, -2341, 0,
+ 0, 0, 947, 0, 1599, 1600, 0, 1601, 0, 1602,
+ 0, 0, 0, 0, 0, 0, 1635, 1636, 1637, 1638,
+ 948, 949, 1641, 0, 0, 0, 0, 0, 0, 0,
+ 1649, 1650, 0, 1653, 1654, 0, 0, 0, 29, 0,
+ 1658, 1659, 1660, 0, 0, 1663, 1664, 1665, 1666, 1667,
+ 1668, 0, 803, 1671, 1672, 30, 0, 1675, 0, 31,
+ 0, 1678, 0, 1682, 1683, 0, 0, 0, 0, 950,
+ 32, 0, 0, 0, 0, 0, 0, 1690, 1691, 0,
+ -2341, 33, 0, 0, 0, 1699, 0, 0, 951, 0,
+ 0, 0, 1704, 1705, 1706, 1251, 0, 0, 0, 0,
+ 0, 0, 0, 34, 0, 0, 35, 0, 36, 0,
+ 0, 37, 0, 0, 38, 39, 0, 0, 0, 0,
+ 0, 0, 40, 0, 41, 1742, 0, 0, 1252, 0,
+ 0, 42, 0, 0, 0, 0, 0, 43, 0, 0,
+ 0, 0, 0, 0, 0, 44, 0, 0, 0, 0,
+ 45, 0, 46, 0, 0, 47, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1989, 0, 0, 262,
- 0, 264, 0, 1990, 0, 1991, 0, 1982, 0, 0,
- 0, 0, 0, 1993, 0, 1983, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1785, 0, 0, 0, 0,
- 1984, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 48, 0, 0, 0, 49, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 1253, 0, 0, 0,
+ 0, 1789, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 2019, 0, 0, 0, 0, 0, 1996,
+ 1254, 0, 0, 0, 1255, 0, 0, 0, 0, 50,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 51, 0, 0, 0, 52, 0, 0, 53, 0,
+ 0, 0, 0, 0, 54, 0, 2024, 0, 1256, 0,
+ 0, 0, 0, 1836, 0, 0, 0, 0, 0, 0,
+ 0, 1851, 0, 0, 0, 0, 0, 0, 1257, 0,
+ 0, 0, 0, 55, 0, 0, 803, 0, 0, 56,
+ 0, 0, 1258, 0, 0, 0, 0, 0, 0, 57,
+ 0, 0, 1, 0, 2, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 1999, 0, 803, 1985, 1831, 0, 0, 0, 0,
- 0, 0, 0, 1846, 0, 0, 0, 0, 0, 0,
- 0, 0, 1986, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 4, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 5, 6,
+ 1259, 2024, 0, 0, 0, 0, 7, 0, 0, 0,
+ 0, 8, 9, 0, 0, 0, 0, 803, 0, 0,
+ 0, 803, 1260, 0, 0, 0, 803, 803, 0, 0,
+ 0, 0, 0, 10, 0, 803, 803, 0, 803, 803,
+ 803, 803, 0, 803, 0, 0, 803, 0, 0, 0,
+ 0, 0, 11, 0, 0, 0, 803, 0, 803, 803,
+ 0, 803, 803, 803, 803, 0, 803, 0, 0, 803,
+ 0, 0, 0, 12, 0, 0, 0, 0, 803, 0,
+ 0, 13, 14, 15, 0, 803, 0, 803, 0, 803,
+ 803, 803, 803, 16, 17, 0, 803, 803, 803, 0,
+ 0, 0, 803, 803, 803, 0, 803, 0, 803, 0,
+ 803, 0, 803, 0, 803, 0, 0, 0, 0, 803,
+ 19, 0, 2122, 0, 0, 1261, 0, 0, 0, 0,
+ 0, 0, 0, 0, 1262, 0, 20, 803, 0, 0,
+ 0, 0, 0, 0, 803, 0, 0, 803, 0, 1263,
+ 0, 0, 21, 803, 0, 0, 803, 22, 0, 0,
+ 803, 23, 0, 0, 0, 0, 0, 1264, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 24, 0, 25, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 2019, 0, 2000, 0,
+ 0, 0, 0, 0, 26, 0, 1265, 1266, 0, 0,
+ 0, 0, 0, 0, 0, 0, 803, 0, 0, 0,
+ 0, 0, 27, 1969, 1970, 0, 28, 0, 0, 0,
+ 0, 0, 1267, 0, 2204, 2206, 2208, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 803, 0, 2001, 0, 803, 1990, 2002, 1991,
- 0, 803, 803, 0, 0, 0, 0, 1993, 0, 0,
- 803, 803, 0, 803, 803, 803, 803, 2003, 803, 0,
- 0, 803, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 803, 0, 803, 803, 2005, 803, 803, 803, 803,
- 0, 803, 0, 0, 803, 0, 0, 0, 0, 0,
- 0, 0, 0, 803, 0, 0, 0, 0, 0, 0,
- 803, 0, 803, 0, 803, 803, 803, 803, 0, 0,
- 0, 803, 803, 803, 0, 1999, 0, 803, 803, 803,
- 0, 803, 0, 803, 0, 803, 0, 803, 0, 803,
- 0, 0, 0, 0, 803, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 1268, 0, -769, -769, 0, 1972,
+ 0, 0, 0, 0, 0, 0, 0, 0, -769, 0,
+ 0, 0, 0, 0, 2242, 0, 0, 0, 0, 1975,
+ 0, 0, 0, 2247, 0, 2248, 0, 1976, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 803, 0, 0, 0, 0, 0, 0, 803,
- 0, 0, 803, 2115, 0, 0, 0, 0, 803, 0,
- 0, 803, 2000, 0, 0, 803, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 2001, 0,
- 0, 0, 2002, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 1269, 0, 0, 0, 0, 0, 0,
+ 0, 1978, 0, 0, 0, 0, 0, 29, 0, 0,
+ 0, 0, 0, 0, 0, 1459, 0, 0, 1979, 0,
+ 0, 0, 2867, 0, 30, 0, 0, 0, 31, 0,
+ 1969, 1970, 0, 0, 0, 0, 0, 0, 0, 32,
+ 2867, 2867, 0, 0, 0, 0, 1984, 0, 0, 0,
+ 33, 0, 0, 0, 2320, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 1972, 0, 0, 0,
+ 0, 0, 34, 0, 0, 35, 0, 36, 0, 0,
+ 37, 0, 0, 38, 39, 0, 1975, 0, 0, 0,
+ 0, 40, 0, 41, 1976, 0, 0, 0, 0, 0,
+ 42, 0, 0, 0, 0, 0, 43, 0, 0, 262,
+ 0, 264, 2024, 0, 44, 0, 0, 1987, 1978, 45,
+ 0, 46, 0, 0, 47, 1988, 0, 0, 0, 0,
+ 0, 0, 1459, 0, 0, 1979, 0, 0, 0, 0,
+ 1989, 0, 0, 0, 0, 0, 0, 0, 0, 48,
+ 0, 0, 0, 49, 2594, 0, 0, 0, 2867, 2867,
+ 0, 0, 0, 1984, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 2003, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 2005,
- 0, 803, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 2024, 0, 1990, 0, 0, 0, 50, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 803,
+ 51, 0, 1991, 803, 52, 0, 0, 53, 0, 0,
+ 0, 0, 0, 54, 0, 0, 262, 0, 264, 0,
+ 0, 0, 0, 0, 1987, 0, 0, 0, 0, 0,
+ 0, 0, 1988, 803, 803, 0, 0, 0, 0, 0,
+ 0, 0, 55, 0, 0, 0, 0, 1989, 56, 0,
+ 0, 0, 0, 803, 0, 0, 0, 1995, 57, 1996,
+ 0, 0, 803, 0, 803, 0, 803, 1998, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 2537, 0,
+ 0, 0, 0, 0, 0, 0, 803, 0, 0, 0,
+ 0, 803, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 1990, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 803, 0, 0, 0, 1991,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1, 0, 2, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 2197, 2199, 2201, 3, 0,
- 0, 0, 4, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 5, 6, 0, 0,
- 0, 0, 0, 0, 7, 0, 0, 0, 0, 8,
- 9, 0, 0, 0, 0, 2235, 0, 0, 0, 0,
- 0, 0, 0, 0, 2240, 0, 2241, 0, 0, 0,
- 0, 10, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 2858, 0, 0,
- 11, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 2858, 2858, 0, 0, 0,
- 0, 12, 0, 0, 0, 0, 0, 0, 0, 13,
- 14, 15, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 16, 17, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 18, 2313, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 19, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 20, 0, 0, 2019, 0, 0,
+ 0, 0, 0, 0, 0, 2004, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 2617,
+ 0, 0, 0, 2619, 0, 0, 0, 0, 2621, 2622,
+ 0, 0, 0, 0, 0, 0, 0, 1575, 2640, 0,
+ 1575, 0, 2643, 2644, 1995, 2645, 1996, 0, 0, 0,
+ 0, 0, 803, 0, 1998, 0, 803, 0, 2652, 0,
+ 2653, 0, 2005, 2655, 2656, 2657, 2658, 0, 2659, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 2006, 0,
+ 2663, 0, 2007, 0, 0, 0, 0, 2664, 0, 2665,
+ 0, 2666, 2667, 2668, 0, 0, 0, 0, 2671, 2672,
+ 2673, 2008, 0, 803, 2675, 2676, 2677, 0, 2678, 0,
+ 2680, 0, 2682, 0, 2684, 0, 2685, 0, 0, 2010,
+ 0, 2686, 2004, 0, 0, 0, 0, 3262, 3263, 0,
+ 0, 0, 0, 3264, 0, 3265, 0, 3266, 3267, 2699,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 21, 0, 0, 0, 0, 22, 0, 0, 0, 23,
+ 0, 0, 0, 0, 3268, 2709, 0, 0, 2712, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 2595, 0, 0, 2005,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 2858, 2858, 24, 0, 25, 0, 0, 0,
+ 0, 0, 0, 0, 0, 2006, 0, 0, 0, 2007,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 3269,
+ 0, 0, 3270, 0, 0, 0, 0, 0, 2008, 0,
+ 3271, 0, 0, 0, 803, 803, 0, 0, 0, 0,
+ 0, 2947, 0, 0, 0, 0, 2010, 3272, 1967, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 2867,
+ 0, 1969, 1970, 0, 3273, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 26, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 2019, 0, 0, 0,
- 27, 0, 0, 0, 28, 0, 0, 0, 0, 0,
- 0, 0, 0, 803, 0, 0, 0, 803, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 2024, 3274, 0,
+ 3275, 0, 1971, 0, 0, 0, 0, 1972, 0, 0,
+ 803, 0, 0, 3276, 3277, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1975, 0, 0,
+ 0, 0, 0, 0, 0, 1976, 0, 0, 0, 0,
+ 0, 0, 0, 803, 803, 1977, 803, 0, 0, 0,
+ 0, 0, 0, 0, 0, 803, 3278, 0, 0, 1978,
+ 803, 0, 0, 803, 0, 803, 803, 0, 0, 0,
+ 0, 0, 0, 1459, 0, 0, 1979, 0, 0, 0,
+ 0, 0, 0, 1980, 0, 3279, 803, 0, 0, 0,
+ 2948, 0, 0, 0, 3280, 3281, 0, 3282, 1983, 0,
+ 0, 803, 0, 0, 1984, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 803, 3283, 3284, 3285,
+ 0, 0, 0, 1985, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 3286, 3287, 3288, 0,
+ 0, 0, 0, 0, 3289, 0, 803, 3290, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 262, 0, 264,
+ 803, 0, 0, 3291, 3292, 1987, 0, 0, 0, 0,
+ 0, 0, 0, 1988, 0, 0, 0, 0, 0, 0,
+ 0, 803, 0, 0, 0, 0, 0, 0, 1989, 0,
+ 803, 0, 0, 0, 0, 0, 0, 0, 0, 3293,
+ 3294, 0, 0, 0, 0, 1969, 1970, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 803, 803, 0,
+ 0, 0, 0, 0, 3295, 0, 0, 0, 0, 0,
+ 0, 3034, 0, 0, 0, 3036, 0, 0, -769, -769,
+ 0, 1972, 1990, 0, 0, 0, 0, 0, 0, 0,
+ -769, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 1991, 1975, 0, 0, 1992, 3064, 3065, 0, 0, 1976,
+ 0, 0, 3569, 0, 0, 3296, 0, 0, 0, 3297,
+ 0, 0, 0, 0, 0, 3085, 0, 0, 0, 0,
+ 0, 3298, 0, 1978, 3095, 0, 3097, 0, 3099, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1459, 1994, 0,
+ 1979, 0, 0, 0, 0, 1995, 0, 1996, 0, 0,
+ 0, 0, 0, 0, 0, 1998, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 1984, 0,
+ 0, 0, 0, 0, 0, 3299, 0, 3129, 3300, 0,
+ 0, 3301, 3302, 3303, 3304, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 803, 0, 0,
- 0, 0, 0, 0, 0, 0, 803, 0, 803, 0,
- 803, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 29, 0, 0, 0, 0,
- 803, 0, 0, 0, 0, 803, 0, 0, 0, 0,
- 0, 0, 30, 0, 0, 0, 31, 0, 2530, 0,
- 0, 0, 0, 0, 0, 0, 0, 32, 0, 803,
- 0, 0, 0, 0, 0, 0, 0, 0, 33, 0,
+ 0, 2001, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 2004, 0, 3305, 3306, 0, 0, 0,
+ 0, 262, 0, 264, 0, 0, 0, 0, 0, 1987,
+ 0, 0, 0, 803, 3186, 0, 0, 1988, 3190, 0,
+ 0, 3307, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 1989, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 34, 0, 0, 35, 0, 36, 0, 0, 37, 0,
- 0, 38, 39, 0, 0, 0, 0, 0, 0, 40,
- 0, 41, 0, 0, 0, 0, 0, 2609, 42, 0,
- 0, 2611, 0, 0, 43, 803, 2613, 2614, 0, 803,
- 0, 0, 44, 0, 0, 1571, 2632, 45, 1571, 46,
- 2635, 2636, 47, 2637, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 2644, 0, 2645, 0,
- 0, 2647, 2648, 2649, 2650, 0, 2651, 48, 0, 0,
- 0, 49, 0, 0, 0, 0, 803, 0, 2655, 0,
- 0, 0, 0, 0, 0, 2656, 0, 2657, 0, 2658,
- 2659, 2660, 0, 0, 0, 0, 2663, 2664, 2665, 0,
- 0, 0, 2667, 2668, 2669, 0, 2670, 0, 2672, 0,
- 2674, 0, 2676, 0, 2677, 0, 50, 0, 0, 2678,
- 0, 0, 0, 0, 0, 0, 0, 0, 51, 0,
- 0, 0, 52, 0, 0, 53, 0, 2691, 0, 0,
- 0, 54, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 2701, 0, 0, 2704, 0, 0, 0,
+ 2005, 0, 803, 803, 0, 0, 0, 0, 0, 0,
+ 0, 803, 0, 0, 0, 3222, 2006, 0, 0, 0,
+ 2007, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 1990, 0, 0, 2008,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 55, 1, 0, 2, 0, 0, 56, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 57, 0, 0, 0,
- 0, 0, 0, 4, 0, 0, 0, 803, 803, 0,
- 0, 0, 0, 0, 0, 0, 0, 5, 6, 0,
- 0, 0, 0, 0, 0, 7, 0, 0, 0, 0,
- 8, 9, 2858, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 1991, 0, 0, 2010, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 10, 0, 0, 0, 0, 0, 0, 0,
- 2019, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 11, 0, 803, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 3569, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 12, 0, 0, 0, 0, 0, 0, 0,
- 13, 14, 15, 0, 0, 0, 803, 803, 0, 803,
- 0, 0, 16, 17, 0, 0, 0, 0, 803, 0,
- 0, 0, 0, 803, 0, 0, 803, 0, 803, 803,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 19,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 803,
- 0, 0, 0, 0, 0, 20, 0, 0, 0, 0,
- 0, 0, 0, 0, 803, 0, 0, 0, 0, 0,
- 0, 21, 0, 0, 0, 0, 22, 0, 0, 0,
- 23, 0, 0, 0, 0, 0, 0, 0, 803, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 24, 0, 25, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 803, 0,
- 0, 0, 0, 26, 0, 0, 0, 0, 0, 0,
- 0, 0, 803, 0, 0, 0, 0, 0, 0, 0,
- 0, 27, 0, 0, 0, 28, 0, 0, 0, 0,
- 0, 0, 0, 803, 0, 0, 0, 0, 0, 0,
- 0, 0, 803, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 1995,
+ 0, 1996, 0, 0, 0, 0, 0, 0, 0, 1998,
+ 0, 0, 0, 2024, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 3319, 3320, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 803, 0, 0, 0, 803,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 2004, 0, 0,
+ 803, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 3365, 0, 803, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 803, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 3403, 3404, 0, 0, 0,
+ 0, 0, 0, 0, 2005, 0, 0, 3411, 0, 0,
+ 0, 0, 3413, 0, 0, 3414, 0, 3415, 3416, 0,
+ 2006, 0, 0, 0, 2007, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 3025, 0,
- 0, 0, 3027, 0, 0, 0, 29, 0, 0, 0,
- 0, 0, 0, 0, 3559, 0, 0, 0, 0, 0,
- 0, 0, 0, 30, 0, 0, 0, 31, 0, 0,
- 0, 0, 3055, 3056, 0, 0, 0, 0, 32, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 33,
- 0, 0, 3076, 0, 0, 0, 0, 0, 0, 0,
- 0, 3086, 0, 3088, 0, 3090, 0, 0, 0, 0,
- 0, 34, 0, 0, 35, 0, 36, 0, 0, 37,
- 0, 0, 38, 39, 0, 0, 0, 0, 0, 0,
- 40, 0, 41, 0, 0, 0, 0, 0, 0, 42,
- 0, 0, 0, 0, 0, 43, 0, 0, 0, 0,
- 0, 0, 0, 44, 3120, 0, 0, 0, 45, 0,
- 46, 0, 0, 47, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 2008, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 3433, 0, 0, 0, 0, 0, 0,
+ 3929, 2010, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 3433, 0,
+ 3955, 0, 0, 0, 3955, 3955, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 48, 0,
- 0, 0, 49, 0, 0, 803, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 803, 0, 0, 0, 0,
+ 0, 0, 3479, 803, 0, 0, 0, 0, 0, 0,
+ 0, 0, 803, 0, 803, 0, 0, 0, 0, 0,
+ 0, 0, 0, 3433, 0, 0, 0, 0, 0, 0,
+ 0, 0, 3503, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 3176, 0, 0, 0, 3180, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 803, 803, 0, 50, 0, 0,
- 0, 0, 0, 803, 0, 0, 0, 0, 0, 51,
- 0, 0, 0, 52, 0, 0, 53, 0, 0, 0,
- 0, 0, 54, 0, 0, 0, 0, 0, 0, 0,
- 0, 3212, 0, 0, 0, 0, 0, 915, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 872, 916, 0,
- 0, 55, 0, 0, 0, 0, 0, 56, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 57, 0, 0,
- 3559, 0, 917, 918, 0, 0, 0, 0, 0, 0,
- 919, 0, 0, 0, 0, 920, 0, 0, 0, 0,
+ 0, 0, 0, 803, 0, 0, 0, 0, 0, 3929,
+ 3929, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 921, 0, 922, 2019, 923, 0, 0, 0,
- 0, 0, 0, 0, 0, 924, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 803, 0, 0,
- 0, 803, 3309, 3310, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 3955, 0, 0, 0, 0, 0,
+ 0, 0, 0, 3955, 0, 0, 0, 3955, 0, 0,
+ 0, 0, 803, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, -1766, 925, 0, 0, 0, 0, 926, 0, 0,
- 927, 0, 803, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 803, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 928, 0, 929, 803,
- 0, 0, 0, 0, 0, 930, 0, 931, 3355, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 803,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 932, 933, 934, 0, 0, 0, 0, 0,
- 0, 3393, 3394, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 3401, 0, 935, 0, 0, 3403, 0,
- 0, 3404, 0, 3405, 3406, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 936, 0, 0,
- 0, 0, 3919, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 3423,
- 0, 0, 3945, 0, 937, 0, 3945, 3945, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 3955, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 3423, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 803, 0, 0,
- 0, 0, 0, 0, 0, 803, 0, 0, 0, 0,
- 0, 0, 0, 0, 803, 0, 803, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 3469, 0, 0,
- 938, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 3423, 0,
- 0, 0, 0, 0, 0, 803, 939, 3493, 0, 0,
- 0, 3919, 3919, 0, 0, 0, 0, 940, 941, 0,
- 0, 942, 943, 0, 0, 0, 0, 0, 0, 0,
+ 0, 803, 0, 803, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 803, 0, 3929, 3929, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 944, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 3945, 0, 0, 0,
- 0, 0, 0, 0, 0, 3945, 0, 0, 0, 3945,
- 0, 0, 0, 0, 803, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 945, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 946, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 803, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, -2332, 0, 0, 0, 947, 0,
- 3945, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 803, 0, 803, 948, 949, 0, 0,
- 0, 0, 0, 0, 0, 803, 0, 3919, 3919, 0,
+ 4184, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 3433, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 4174, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 950, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, -2332, 0, 0, 0,
- 0, 0, 0, 0, 951, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 3945, 0, 3945, 3945,
- 3423, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 803,
- 0, 3919, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 3919, 803, 0, 3702,
- 3703, 0, 0, 0, 0, 0, 0, 0, 3212, 3919,
+ 0, 0, 0, 0, 3955, 0, 3955, 3955, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 803, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 3712, 3713, 0, 803, 0, 3929,
+ 0, 0, 0, 3222, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 3929, 803, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 3929, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 803, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 803, 3919, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 3919, 3919, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 803, 3929,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 803, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 3929, 3929, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 803, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 3919, 0, 0, 0, 0, 0, 0, 803, 0,
- 0, 3919, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 3212, 0, 0, 0, 3810, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 3222, 0, 3929,
+ 0, 3820, 0, 0, 0, 0, 803, 0, 0, 3929,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 803, 0, 0,
- 0, 0, 0, 0, 3919, 0, 3919, 3423, 0, 0,
- 0, 0, 0, 0, 0, 0, 3919, 0, 0, 0,
- 803, 3212, 0, 803, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 3176, 3919, 0, 3919, 0, 3919,
- 0, 0, 0, 0, 0, 0, 3919, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 3919, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 3919, 3919, 0, 0, 0, 0, 803,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 3919,
- 3919, 0, 0, 0, 3919, 0, 0, 0, 0, 0,
+ 0, 0, 3433, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 803, 3222, 0, 0, 0,
+ 0, 0, 3929, 0, 3929, 0, 0, 0, 0, 3186,
+ 0, 0, 0, 0, 3929, 0, 0, 0, 803, 0,
+ 0, 803, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 3929, 0, 3929, 0, 3929, 0, 0,
+ 0, 0, 0, 0, 3929, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 3929, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 3929, 3929, 0, 0, 0, 0, 803, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 3929, 3929, 0,
+ 0, 0, 3929, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 803, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 803, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 4009, 0, 0, 0, 0,
+ 0, 0, 0, 0, 4014, 0, 4016, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 3999, 0, 0, 0, 0, 0, 0, 0, 0, 4004,
- 0, 4006, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 4037, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 4027, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 3222, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 3212,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 3222, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 3212, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 4136, 0, 4137, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 4145, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 4126, 0,
- 4127, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 4135, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -6669,357 +6675,40 @@ static const yytype_int16 yytable[] =
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 4241,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 4231, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 4246, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 4236, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 3423, 0, 0,
+ 0, 0, 3433, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 4285, 0, 0, 0, 0,
+ 4295, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 4350, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 4340, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 4378, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 4368, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 4387, 0,
- 0, 0, 139, 0, 672, 141, 142, 143, 144, 0,
- 0, 145, 0, 0, 0, 146, 0, 0, 673, 0,
- 148, 149, 150, 151, 152, 674, 154, 0, 155, 0,
- 0, 675, 156, 676, 677, 678, 157, 679, 0, 158,
- 159, 160, 1675, 161, 0, 162, 163, 0, 0, 164,
- 680, 681, 165, 166, 4435, 167, 682, 683, 169, 170,
- 0, 171, 172, 173, 174, 175, 684, 177, 0, 685,
- 179, 686, 687, 688, 689, 690, 691, 0, 186, 187,
- 188, 189, 190, 191, 192, 193, 0, 194, 195, 0,
- 196, 197, 198, 692, 200, 0, 201, 693, 694, 202,
- 0, 3423, 203, 695, 696, 0, 204, 697, 698, 0,
- 205, 206, 207, 699, 700, 701, 0, 0, 0, 0,
- 702, 210, 703, 0, 0, 704, 211, 0, 212, 0,
- 0, 0, 213, 0, 214, 215, 216, 217, 0, 0,
- 0, 218, 0, 0, 219, 220, 221, 0, 0, 0,
- 222, 0, 223, 224, 0, 225, 226, 227, 0, 0,
- 228, 229, 0, 230, 231, 232, 233, 234, 235, 705,
- 0, 236, 237, 238, 706, 707, 239, 240, 0, 241,
- 242, 243, 708, 0, 244, 0, 0, 0, 245, 0,
- 246, 0, 247, 0, 248, 249, 709, 251, 710, 253,
- 0, 254, 0, 711, 0, 255, 256, 257, 0, 258,
- 712, 713, 0, 259, 260, 0, 0, 0, 714, 262,
- 263, 264, 715, 0, 265, 266, 267, 0, 268, 0,
- 269, 0, 0, 0, 716, 270, 271, 717, 0, 0,
- 272, 0, 273, 274, 0, 275, 276, 0, 0, 0,
- 277, 0, 0, 278, 279, 718, 0, 1676, 281, 0,
- 719, 282, 283, 0, 0, 0, 0, 0, 720, 285,
- 0, 286, 0, 287, 0, 288, 289, 0, 0, 721,
- 0, 0, 0, 0, 290, 291, 292, 293, 294, 295,
- 296, 297, 298, 299, 300, 301, 302, 0, 303, 304,
- 305, 722, 306, 307, 308, 309, 723, 310, 311, 0,
- 0, 0, 0, 312, 313, 314, 315, 724, 317, 0,
- 0, 725, 319, 726, 320, 0, 321, 727, 728, 729,
- 730, 731, 326, 327, 328, 329, 330, 331, 0, 732,
- 332, 333, 0, 0, 334, 335, 336, 337, 733, 734,
- 735, 338, 339, 0, 736, 737, 0, 340, 341, 738,
- 0, 343, 344, 345, 346, 0, 347, 348, 0, 0,
- 0, 0, 0, 0, 0, 0, 349, 350, 351, 0,
- 739, 352, 0, 353, 354, 355, 356, 740, 358, 359,
- 360, 361, 741, 742, 364, 743, 0, 365, 366, 367,
- 0, 368, 0, 369, 370, 371, 372, 373, 0, 744,
- 375, 376, 0, 0, 377, 0, 0, 0, 378, 379,
- 380, 381, 382, 0, 0, 383, 384, 385, 386, 387,
- 0, 388, 389, 0, 390, 391, 392, 745, 746, 393,
- 0, 394, 0, 395, 396, 0, 397, 398, 0, 0,
- 747, 399, 400, 401, 402, 403, 748, 405, 406, 407,
- 408, 0, 749, 410, 0, 0, 0, 411, 412, 413,
- 414, 0, 0, 0, 415, 0, 0, 0, 416, 0,
- 417, 418, 419, 420, 0, 421, 422, 423, 424, 425,
- 426, 0, 0, 0, 0, 0, 0, 427, 428, 0,
- 429, 0, 0, 430, 0, 0, 431, 432, 433, 750,
- 751, 434, 435, 0, 436, 437, 752, 439, 440, 441,
- 753, 754, 442, 443, 444, 445, 755, 446, 447, 0,
- 448, 0, 449, 450, 451, 452, 0, 756, 453, 454,
- 0, 757, 758, 759, 760, 0, 0, 0, 0, 1677,
- 459, 460, 461, 0, 761, 762, 763, 463, 464, 465,
- 764, 466, 467, 765, 468, 469, 0, 470, 471, 0,
- 0, 472, 0, 0, 473, 0, 474, 0, 766, 476,
- 477, 0, 0, 767, 768, 769, 770, 478, 0, 0,
- 479, 771, 0, 772, 480, 481, 482, 483, 484, 773,
- 0, 0, 0, 0, 0, 0, 486, 487, 0, 488,
- 489, 490, 0, 0, 774, 0, 0, 0, 0, 775,
- 776, 0, 0, 0, 0, 777, 778, 0, 0, 779,
- 780, 0, 0, 781, 782, 139, 0, 672, 141, 142,
- 143, 144, 3172, 0, 145, 0, 0, 0, 146, 0,
- 0, 673, 0, 148, 149, 150, 151, 152, 674, 154,
- 0, 155, 0, 0, 3173, 156, 676, 677, 678, 157,
- 679, 0, 158, 159, 160, 0, 161, 0, 162, 163,
- 0, 0, 164, 680, 681, 165, 166, 0, 167, 682,
- 683, 169, 170, 0, 171, 172, 173, 174, 175, 684,
- 177, 0, 685, 179, 686, 687, 688, 689, 690, 691,
- 0, 186, 187, 188, 189, 190, 191, 192, 193, 0,
- 194, 195, 0, 196, 197, 198, 692, 200, 0, 201,
- 693, 694, 202, 0, 0, 203, 695, 696, 0, 204,
- 697, 698, 0, 205, 206, 207, 699, 700, 701, 0,
- 0, 0, 0, 702, 210, 703, 0, 0, 3174, 211,
- 0, 212, 0, 0, 0, 213, 0, 214, 215, 216,
- 217, 0, 0, 0, 218, 0, 0, 219, 220, 221,
- 0, 0, 0, 222, 0, 223, 224, 0, 225, 226,
- 227, 0, 0, 228, 229, 0, 230, 231, 232, 233,
- 234, 235, 705, 0, 236, 237, 238, 706, 707, 239,
- 240, 0, 241, 242, 243, 708, 0, 244, 0, 0,
- 0, 245, 0, 246, 0, 247, 0, 248, 249, 709,
- 251, 710, 253, 0, 254, 0, 711, 0, 255, 256,
- 257, 0, 258, 712, 713, 0, 259, 260, 0, 0,
- 0, 714, 262, 263, 264, 715, 0, 265, 266, 267,
- 0, 268, 0, 269, 0, 0, 0, 716, 270, 271,
- 717, 0, 0, 272, 0, 273, 274, 0, 275, 276,
- 0, 0, 0, 277, 0, 0, 278, 279, 718, 0,
- 0, 281, 0, 719, 282, 283, 0, 0, 0, 0,
- 0, 720, 285, 0, 286, 0, 287, 0, 288, 289,
- 0, 0, 721, 0, 0, 0, 0, 290, 291, 292,
- 293, 294, 295, 296, 297, 298, 299, 300, 301, 302,
- 0, 303, 304, 305, 722, 306, 307, 308, 309, 723,
- 310, 311, 0, 0, 0, 0, 312, 313, 314, 315,
- 724, 317, 0, 0, 725, 319, 726, 320, 0, 321,
- 727, 728, 729, 730, 731, 326, 327, 328, 329, 330,
- 331, 0, 732, 332, 333, 0, 0, 334, 335, 336,
- 337, 733, 734, 735, 338, 339, 0, 736, 737, 0,
- 340, 341, 738, 3175, 343, 344, 345, 346, 0, 347,
- 348, 0, 0, 0, 0, 0, 0, 0, 0, 349,
- 350, 351, 0, 739, 352, 0, 353, 354, 355, 356,
- 740, 358, 359, 360, 361, 741, 742, 364, 743, 0,
- 365, 366, 367, 0, 368, 0, 369, 370, 371, 372,
- 373, 0, 744, 375, 376, 0, 0, 377, 0, 0,
- 0, 378, 379, 380, 381, 382, 0, 0, 383, 384,
- 385, 386, 387, 0, 388, 389, 0, 390, 391, 392,
- 745, 746, 393, 0, 394, 0, 395, 396, 0, 397,
- 398, 0, 0, 747, 399, 400, 401, 402, 403, 748,
- 405, 406, 407, 408, 0, 749, 410, 0, 0, 0,
- 411, 412, 413, 414, 0, 0, 0, 415, 0, 0,
- 0, 416, 0, 417, 418, 419, 420, 0, 421, 422,
- 423, 424, 425, 426, 0, 0, 0, 0, 0, 0,
- 427, 428, 0, 429, 0, 0, 430, 0, 0, 431,
- 432, 433, 750, 751, 434, 435, 0, 436, 437, 752,
- 439, 440, 441, 753, 754, 442, 443, 444, 445, 755,
- 446, 447, 0, 448, 0, 449, 450, 451, 452, 0,
- 756, 453, 454, 0, 757, 758, 759, 760, 0, 0,
- 0, 0, 0, 459, 460, 461, 0, 761, 762, 763,
- 463, 464, 465, 764, 466, 467, 765, 468, 469, 0,
- 470, 471, 0, 0, 472, 0, 0, 473, 0, 474,
- 0, 766, 476, 477, 0, 0, 767, 768, 769, 770,
- 478, 0, 0, 479, 771, 0, 772, 480, 481, 482,
- 483, 484, 773, 0, 0, 0, 0, 0, 0, 486,
- 487, 0, 488, 489, 490, 0, 0, 774, 0, 0,
- 0, 0, 775, 776, 0, 0, 0, 0, 777, 778,
- 0, 0, 779, 780, 0, 0, 781, 782, 139, 0,
- 672, 141, 142, 143, 144, 0, 0, 145, 0, 0,
- 0, 146, 0, 0, 673, 0, 148, 149, 150, 151,
- 152, 674, 154, 0, 155, 0, 0, 675, 156, 676,
- 677, 678, 157, 679, 0, 158, 159, 160, 0, 161,
- 0, 162, 163, 0, 0, 164, 680, 681, 165, 166,
- 0, 167, 682, 683, 169, 170, 0, 171, 172, 173,
- 174, 175, 684, 177, 0, 685, 179, 686, 687, 688,
- 689, 690, 691, 0, 186, 187, 188, 189, 190, 191,
- 192, 193, 0, 194, 195, 0, 196, 197, 198, 692,
- 200, 0, 201, 693, 694, 202, 0, 0, 203, 695,
- 696, 0, 204, 697, 698, 0, 205, 206, 207, 699,
- 700, 701, 0, 0, 0, 0, 702, 210, 703, 0,
- 0, 704, 211, 0, 212, 0, 0, 0, 213, 0,
- 214, 215, 216, 217, 0, 0, 0, 218, 0, 0,
- 219, 220, 221, 0, 0, 0, 222, 0, 223, 224,
- 0, 225, 226, 227, 0, 0, 228, 229, 0, 230,
- 231, 232, 233, 234, 235, 705, 0, 236, 237, 238,
- 706, 707, 239, 240, 0, 241, 242, 243, 708, 0,
- 244, 0, 0, 0, 245, 2196, 246, 0, 247, 0,
- 248, 249, 709, 251, 710, 253, 0, 254, 0, 711,
- 0, 255, 256, 257, 0, 258, 712, 713, 0, 259,
- 260, 0, 0, 0, 714, 262, 263, 264, 715, 0,
- 265, 266, 267, 0, 268, 0, 269, 0, 0, 0,
- 716, 270, 271, 717, 0, 0, 272, 0, 273, 274,
- 0, 275, 276, 0, 0, 0, 277, 0, 0, 278,
- 279, 718, 0, 0, 281, 0, 719, 282, 283, 0,
- 0, 0, 0, 0, 720, 285, 0, 286, 0, 287,
- 0, 288, 289, 0, 0, 721, 0, 0, 0, 0,
- 290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
- 300, 301, 302, 0, 303, 304, 305, 722, 306, 307,
- 308, 309, 723, 310, 311, 0, 0, 0, 0, 312,
- 313, 314, 315, 724, 317, 0, 0, 725, 319, 726,
- 320, 0, 321, 727, 728, 729, 730, 731, 326, 327,
- 328, 329, 330, 331, 0, 732, 332, 333, 0, 0,
- 334, 335, 336, 337, 733, 734, 735, 338, 339, 0,
- 736, 737, 0, 340, 341, 738, 0, 343, 344, 345,
- 346, 0, 347, 348, 0, 0, 0, 0, 0, 0,
- 0, 0, 349, 350, 351, 0, 739, 352, 0, 353,
- 354, 355, 356, 740, 358, 359, 360, 361, 741, 742,
- 364, 743, 0, 365, 366, 367, 0, 368, 0, 369,
- 370, 371, 372, 373, 0, 744, 375, 376, 0, 0,
- 377, 0, 0, 0, 378, 379, 380, 381, 382, 0,
- 0, 383, 384, 385, 386, 387, 0, 388, 389, 0,
- 390, 391, 392, 745, 746, 393, 0, 394, 0, 395,
- 396, 0, 397, 398, 0, 0, 747, 399, 400, 401,
- 402, 403, 748, 405, 406, 407, 408, 0, 749, 410,
- 0, 0, 0, 411, 412, 413, 414, 0, 0, 0,
- 415, 0, 0, 0, 416, 0, 417, 418, 419, 420,
- 0, 421, 422, 423, 424, 425, 426, 0, 0, 0,
- 0, 0, 0, 427, 428, 0, 429, 0, 0, 430,
- 0, 0, 431, 432, 433, 750, 751, 434, 435, 0,
- 436, 437, 752, 439, 440, 441, 753, 754, 442, 443,
- 444, 445, 755, 446, 447, 0, 448, 0, 449, 450,
- 451, 452, 0, 756, 453, 454, 0, 757, 758, 759,
- 760, 0, 0, 0, 0, 0, 459, 460, 461, 0,
- 761, 762, 763, 463, 464, 465, 764, 466, 467, 765,
- 468, 469, 0, 470, 471, 0, 0, 472, 0, 0,
- 473, 0, 474, 0, 766, 476, 477, 0, 0, 767,
- 768, 769, 770, 478, 0, 0, 479, 771, 0, 772,
- 480, 481, 482, 483, 484, 773, 0, 0, 0, 0,
- 0, 0, 486, 487, 0, 488, 489, 490, 0, 0,
- 774, 0, 0, 0, 0, 775, 776, 0, 0, 0,
- 0, 777, 778, 0, 0, 779, 780, 0, 0, 781,
- 782, 139, 0, 672, 141, 142, 143, 144, 0, 0,
- 145, 0, 0, 0, 146, 0, 0, 673, 0, 148,
- 149, 150, 151, 152, 674, 154, 0, 155, 0, 0,
- 675, 156, 676, 677, 678, 157, 679, 0, 158, 159,
- 160, 0, 161, 0, 162, 163, 0, 0, 164, 680,
- 681, 165, 166, 0, 167, 682, 683, 169, 170, 0,
- 171, 172, 173, 174, 175, 684, 177, 0, 685, 179,
- 686, 687, 688, 689, 690, 691, 0, 186, 187, 188,
- 189, 190, 191, 192, 193, 0, 194, 195, 0, 196,
- 197, 198, 692, 200, 0, 201, 693, 694, 202, 0,
- 0, 203, 695, 696, 0, 204, 697, 698, 0, 205,
- 206, 207, 699, 700, 701, 0, 0, 0, 0, 702,
- 210, 703, 0, 0, 704, 211, 0, 212, 0, 0,
- 0, 213, 0, 214, 215, 216, 217, 0, 0, 0,
- 218, 0, 0, 219, 220, 221, 0, 0, 0, 222,
- 0, 223, 224, 0, 225, 226, 227, 0, 0, 228,
- 229, 0, 230, 231, 232, 233, 234, 235, 705, 0,
- 236, 237, 238, 706, 707, 239, 240, 0, 241, 242,
- 243, 708, 0, 244, 0, 0, 0, 245, 2198, 246,
- 0, 247, 0, 248, 249, 709, 251, 710, 253, 0,
- 254, 0, 711, 0, 255, 256, 257, 0, 258, 712,
- 713, 0, 259, 260, 0, 0, 0, 714, 262, 263,
- 264, 715, 0, 265, 266, 267, 0, 268, 0, 269,
- 0, 0, 0, 716, 270, 271, 717, 0, 0, 272,
- 0, 273, 274, 0, 275, 276, 0, 0, 0, 277,
- 0, 0, 278, 279, 718, 0, 0, 281, 0, 719,
- 282, 283, 0, 0, 0, 0, 0, 720, 285, 0,
- 286, 0, 287, 0, 288, 289, 0, 0, 721, 0,
- 0, 0, 0, 290, 291, 292, 293, 294, 295, 296,
- 297, 298, 299, 300, 301, 302, 0, 303, 304, 305,
- 722, 306, 307, 308, 309, 723, 310, 311, 0, 0,
- 0, 0, 312, 313, 314, 315, 724, 317, 0, 0,
- 725, 319, 726, 320, 0, 321, 727, 728, 729, 730,
- 731, 326, 327, 328, 329, 330, 331, 0, 732, 332,
- 333, 0, 0, 334, 335, 336, 337, 733, 734, 735,
- 338, 339, 0, 736, 737, 0, 340, 341, 738, 0,
- 343, 344, 345, 346, 0, 347, 348, 0, 0, 0,
- 0, 0, 0, 0, 0, 349, 350, 351, 0, 739,
- 352, 0, 353, 354, 355, 356, 740, 358, 359, 360,
- 361, 741, 742, 364, 743, 0, 365, 366, 367, 0,
- 368, 0, 369, 370, 371, 372, 373, 0, 744, 375,
- 376, 0, 0, 377, 0, 0, 0, 378, 379, 380,
- 381, 382, 0, 0, 383, 384, 385, 386, 387, 0,
- 388, 389, 0, 390, 391, 392, 745, 746, 393, 0,
- 394, 0, 395, 396, 0, 397, 398, 0, 0, 747,
- 399, 400, 401, 402, 403, 748, 405, 406, 407, 408,
- 0, 749, 410, 0, 0, 0, 411, 412, 413, 414,
- 0, 0, 0, 415, 0, 0, 0, 416, 0, 417,
- 418, 419, 420, 0, 421, 422, 423, 424, 425, 426,
- 0, 0, 0, 0, 0, 0, 427, 428, 0, 429,
- 0, 0, 430, 0, 0, 431, 432, 433, 750, 751,
- 434, 435, 0, 436, 437, 752, 439, 440, 441, 753,
- 754, 442, 443, 444, 445, 755, 446, 447, 0, 448,
- 0, 449, 450, 451, 452, 0, 756, 453, 454, 0,
- 757, 758, 759, 760, 0, 0, 0, 0, 0, 459,
- 460, 461, 0, 761, 762, 763, 463, 464, 465, 764,
- 466, 467, 765, 468, 469, 0, 470, 471, 0, 0,
- 472, 0, 0, 473, 0, 474, 0, 766, 476, 477,
- 0, 0, 767, 768, 769, 770, 478, 0, 0, 479,
- 771, 0, 772, 480, 481, 482, 483, 484, 773, 0,
- 0, 0, 0, 0, 0, 486, 487, 0, 488, 489,
- 490, 0, 0, 774, 0, 0, 0, 0, 775, 776,
- 0, 0, 0, 0, 777, 778, 0, 0, 779, 780,
- 0, 0, 781, 782, 139, 0, 672, 141, 142, 143,
- 144, 0, 0, 145, 0, 0, 0, 146, 0, 0,
- 673, 0, 148, 149, 150, 151, 152, 674, 154, 0,
- 155, 0, 0, 675, 156, 676, 677, 678, 157, 679,
- 0, 158, 159, 160, 0, 161, 0, 162, 163, 0,
- 0, 164, 680, 681, 165, 166, 0, 167, 682, 683,
- 169, 170, 0, 171, 172, 173, 174, 175, 684, 177,
- 0, 685, 179, 686, 687, 688, 689, 690, 691, 0,
- 186, 187, 188, 189, 190, 191, 192, 193, 0, 194,
- 195, 0, 196, 197, 198, 692, 200, 0, 201, 693,
- 694, 202, 0, 0, 203, 695, 696, 0, 204, 697,
- 698, 0, 205, 206, 207, 699, 700, 701, 0, 0,
- 0, 0, 702, 210, 703, 0, 0, 704, 211, 0,
- 212, 0, 0, 0, 213, 0, 214, 215, 216, 217,
- 0, 0, 0, 218, 0, 0, 219, 220, 221, 0,
- 0, 0, 222, 0, 223, 224, 0, 225, 226, 227,
- 0, 0, 228, 229, 0, 230, 231, 232, 233, 234,
- 235, 705, 0, 236, 237, 238, 706, 707, 239, 240,
- 0, 241, 242, 243, 708, 0, 244, 0, 0, 0,
- 245, 2200, 246, 0, 247, 0, 248, 249, 709, 251,
- 710, 253, 0, 254, 0, 711, 0, 255, 256, 257,
- 0, 258, 712, 713, 0, 259, 260, 0, 0, 0,
- 714, 262, 263, 264, 715, 0, 265, 266, 267, 0,
- 268, 0, 269, 0, 0, 0, 716, 270, 271, 717,
- 0, 0, 272, 0, 273, 274, 0, 275, 276, 0,
- 0, 0, 277, 0, 0, 278, 279, 718, 0, 0,
- 281, 0, 719, 282, 283, 0, 0, 0, 0, 0,
- 720, 285, 0, 286, 0, 287, 0, 288, 289, 0,
- 0, 721, 0, 0, 0, 0, 290, 291, 292, 293,
- 294, 295, 296, 297, 298, 299, 300, 301, 302, 0,
- 303, 304, 305, 722, 306, 307, 308, 309, 723, 310,
- 311, 0, 0, 0, 0, 312, 313, 314, 315, 724,
- 317, 0, 0, 725, 319, 726, 320, 0, 321, 727,
- 728, 729, 730, 731, 326, 327, 328, 329, 330, 331,
- 0, 732, 332, 333, 0, 0, 334, 335, 336, 337,
- 733, 734, 735, 338, 339, 0, 736, 737, 0, 340,
- 341, 738, 0, 343, 344, 345, 346, 0, 347, 348,
- 0, 0, 0, 0, 0, 0, 0, 0, 349, 350,
- 351, 0, 739, 352, 0, 353, 354, 355, 356, 740,
- 358, 359, 360, 361, 741, 742, 364, 743, 0, 365,
- 366, 367, 0, 368, 0, 369, 370, 371, 372, 373,
- 0, 744, 375, 376, 0, 0, 377, 0, 0, 0,
- 378, 379, 380, 381, 382, 0, 0, 383, 384, 385,
- 386, 387, 0, 388, 389, 0, 390, 391, 392, 745,
- 746, 393, 0, 394, 0, 395, 396, 0, 397, 398,
- 0, 0, 747, 399, 400, 401, 402, 403, 748, 405,
- 406, 407, 408, 0, 749, 410, 0, 0, 0, 411,
- 412, 413, 414, 0, 0, 0, 415, 0, 0, 0,
- 416, 0, 417, 418, 419, 420, 0, 421, 422, 423,
- 424, 425, 426, 0, 0, 0, 0, 0, 0, 427,
- 428, 0, 429, 0, 0, 430, 0, 0, 431, 432,
- 433, 750, 751, 434, 435, 0, 436, 437, 752, 439,
- 440, 441, 753, 754, 442, 443, 444, 445, 755, 446,
- 447, 0, 448, 0, 449, 450, 451, 452, 0, 756,
- 453, 454, 0, 757, 758, 759, 760, 0, 0, 0,
- 0, 0, 459, 460, 461, 0, 761, 762, 763, 463,
- 464, 465, 764, 466, 467, 765, 468, 469, 0, 470,
- 471, 0, 0, 472, 0, 0, 473, 0, 474, 0,
- 766, 476, 477, 0, 0, 767, 768, 769, 770, 478,
- 0, 0, 479, 771, 0, 772, 480, 481, 482, 483,
- 484, 773, 0, 0, 0, 0, 0, 0, 486, 487,
- 0, 488, 489, 490, 0, 0, 774, 0, 0, 0,
- 0, 775, 776, 0, 0, 0, 0, 777, 778, 0,
- 0, 779, 780, 0, 0, 781, 782, 139, 0, 672,
+ 0, 0, 0, 4397, 0, 0, 0, 139, 0, 672,
141, 142, 143, 144, 0, 0, 145, 0, 0, 0,
146, 0, 0, 673, 0, 148, 149, 150, 151, 152,
674, 154, 0, 155, 0, 0, 675, 156, 676, 677,
- 678, 157, 679, 0, 158, 159, 160, 0, 161, 0,
- 162, 163, 0, 0, 164, 680, 681, 165, 166, 0,
+ 678, 157, 679, 0, 158, 159, 160, 1679, 161, 0,
+ 162, 163, 0, 0, 164, 680, 681, 165, 166, 4445,
167, 682, 683, 169, 170, 0, 171, 172, 173, 174,
175, 684, 177, 0, 685, 179, 686, 687, 688, 689,
690, 691, 0, 186, 187, 188, 189, 190, 191, 192,
193, 0, 194, 195, 0, 196, 197, 198, 692, 200,
- 0, 201, 693, 694, 202, 0, 0, 203, 695, 696,
+ 0, 201, 693, 694, 202, 0, 3433, 203, 695, 696,
0, 204, 697, 698, 0, 205, 206, 207, 699, 700,
701, 0, 0, 0, 0, 702, 210, 703, 0, 0,
704, 211, 0, 212, 0, 0, 0, 213, 0, 214,
@@ -7035,7 +6724,7 @@ static const yytype_int16 yytable[] =
266, 267, 0, 268, 0, 269, 0, 0, 0, 716,
270, 271, 717, 0, 0, 272, 0, 273, 274, 0,
275, 276, 0, 0, 0, 277, 0, 0, 278, 279,
- 718, 0, 0, 281, 0, 719, 282, 283, 0, 0,
+ 718, 0, 1680, 281, 0, 719, 282, 283, 0, 0,
0, 0, 0, 720, 285, 0, 286, 0, 287, 0,
288, 289, 0, 0, 721, 0, 0, 0, 0, 290,
291, 292, 293, 294, 295, 296, 297, 298, 299, 300,
@@ -7064,7 +6753,7 @@ static const yytype_int16 yytable[] =
437, 752, 439, 440, 441, 753, 754, 442, 443, 444,
445, 755, 446, 447, 0, 448, 0, 449, 450, 451,
452, 0, 756, 453, 454, 0, 757, 758, 759, 760,
- 0, 0, 0, 0, 0, 459, 460, 461, 0, 761,
+ 0, 0, 0, 0, 1681, 459, 460, 461, 0, 761,
762, 763, 463, 464, 465, 764, 466, 467, 765, 468,
469, 0, 470, 471, 0, 0, 472, 0, 0, 473,
0, 474, 0, 766, 476, 477, 0, 0, 767, 768,
@@ -7073,9 +6762,9 @@ static const yytype_int16 yytable[] =
0, 486, 487, 0, 488, 489, 490, 0, 0, 774,
0, 0, 0, 0, 775, 776, 0, 0, 0, 0,
777, 778, 0, 0, 779, 780, 0, 0, 781, 782,
- 139, 0, 672, 141, 142, 143, 144, 0, 0, 145,
+ 139, 0, 672, 141, 142, 143, 144, 3182, 0, 145,
0, 0, 0, 146, 0, 0, 673, 0, 148, 149,
- 150, 151, 152, 674, 154, 0, 155, 0, 0, 675,
+ 150, 151, 152, 674, 154, 0, 155, 0, 0, 3183,
156, 676, 677, 678, 157, 679, 0, 158, 159, 160,
0, 161, 0, 162, 163, 0, 0, 164, 680, 681,
165, 166, 0, 167, 682, 683, 169, 170, 0, 171,
@@ -7085,7 +6774,7 @@ static const yytype_int16 yytable[] =
198, 692, 200, 0, 201, 693, 694, 202, 0, 0,
203, 695, 696, 0, 204, 697, 698, 0, 205, 206,
207, 699, 700, 701, 0, 0, 0, 0, 702, 210,
- 703, 0, 0, 704, 211, 0, 212, 0, 0, 0,
+ 703, 0, 0, 3184, 211, 0, 212, 0, 0, 0,
213, 0, 214, 215, 216, 217, 0, 0, 0, 218,
0, 0, 219, 220, 221, 0, 0, 0, 222, 0,
223, 224, 0, 225, 226, 227, 0, 0, 228, 229,
@@ -7108,7 +6797,7 @@ static const yytype_int16 yytable[] =
319, 726, 320, 0, 321, 727, 728, 729, 730, 731,
326, 327, 328, 329, 330, 331, 0, 732, 332, 333,
0, 0, 334, 335, 336, 337, 733, 734, 735, 338,
- 339, 0, 736, 737, 0, 340, 341, 738, 0, 343,
+ 339, 0, 736, 737, 0, 340, 341, 738, 3185, 343,
344, 345, 346, 0, 347, 348, 0, 0, 0, 0,
0, 0, 0, 0, 349, 350, 351, 0, 739, 352,
0, 353, 354, 355, 356, 740, 358, 359, 360, 361,
@@ -7135,9 +6824,9 @@ static const yytype_int16 yytable[] =
0, 772, 480, 481, 482, 483, 484, 773, 0, 0,
0, 0, 0, 0, 486, 487, 0, 488, 489, 490,
0, 0, 774, 0, 0, 0, 0, 775, 776, 0,
- 0, 0, 0, 777, 1123, 0, 0, 779, 780, 0,
+ 0, 0, 0, 777, 778, 0, 0, 779, 780, 0,
0, 781, 782, 139, 0, 672, 141, 142, 143, 144,
- 1709, 0, 145, 0, 0, 0, 1710, 0, 0, 673,
+ 0, 0, 145, 0, 0, 0, 146, 0, 0, 673,
0, 148, 149, 150, 151, 152, 674, 154, 0, 155,
0, 0, 675, 156, 676, 677, 678, 157, 679, 0,
158, 159, 160, 0, 161, 0, 162, 163, 0, 0,
@@ -7155,7 +6844,7 @@ static const yytype_int16 yytable[] =
0, 228, 229, 0, 230, 231, 232, 233, 234, 235,
705, 0, 236, 237, 238, 706, 707, 239, 240, 0,
241, 242, 243, 708, 0, 244, 0, 0, 0, 245,
- 0, 246, 0, 247, 0, 248, 249, 709, 251, 710,
+ 2203, 246, 0, 247, 0, 248, 249, 709, 251, 710,
253, 0, 254, 0, 711, 0, 255, 256, 257, 0,
258, 712, 713, 0, 259, 260, 0, 0, 0, 714,
262, 263, 264, 715, 0, 265, 266, 267, 0, 268,
@@ -7171,7 +6860,7 @@ static const yytype_int16 yytable[] =
0, 0, 725, 319, 726, 320, 0, 321, 727, 728,
729, 730, 731, 326, 327, 328, 329, 330, 331, 0,
732, 332, 333, 0, 0, 334, 335, 336, 337, 733,
- 0, 735, 338, 339, 0, 736, 737, 0, 340, 341,
+ 734, 735, 338, 339, 0, 736, 737, 0, 340, 341,
738, 0, 343, 344, 345, 346, 0, 347, 348, 0,
0, 0, 0, 0, 0, 0, 0, 349, 350, 351,
0, 739, 352, 0, 353, 354, 355, 356, 740, 358,
@@ -7218,7 +6907,7 @@ static const yytype_int16 yytable[] =
226, 227, 0, 0, 228, 229, 0, 230, 231, 232,
233, 234, 235, 705, 0, 236, 237, 238, 706, 707,
239, 240, 0, 241, 242, 243, 708, 0, 244, 0,
- 0, 0, 245, 0, 246, 0, 247, 0, 248, 249,
+ 0, 0, 245, 2205, 246, 0, 247, 0, 248, 249,
709, 251, 710, 253, 0, 254, 0, 711, 0, 255,
256, 257, 0, 258, 712, 713, 0, 259, 260, 0,
0, 0, 714, 262, 263, 264, 715, 0, 265, 266,
@@ -7257,7 +6946,7 @@ static const yytype_int16 yytable[] =
0, 0, 0, 0, 459, 460, 461, 0, 761, 762,
763, 463, 464, 465, 764, 466, 467, 765, 468, 469,
0, 470, 471, 0, 0, 472, 0, 0, 473, 0,
- 474, 0, 1784, 476, 477, 0, 0, 767, 768, 769,
+ 474, 0, 766, 476, 477, 0, 0, 767, 768, 769,
770, 478, 0, 0, 479, 771, 0, 772, 480, 481,
482, 483, 484, 773, 0, 0, 0, 0, 0, 0,
486, 487, 0, 488, 489, 490, 0, 0, 774, 0,
@@ -7281,12 +6970,12 @@ static const yytype_int16 yytable[] =
224, 0, 225, 226, 227, 0, 0, 228, 229, 0,
230, 231, 232, 233, 234, 235, 705, 0, 236, 237,
238, 706, 707, 239, 240, 0, 241, 242, 243, 708,
- 0, 244, 0, 0, 0, 245, 0, 246, 0, 247,
+ 0, 244, 0, 0, 0, 245, 2207, 246, 0, 247,
0, 248, 249, 709, 251, 710, 253, 0, 254, 0,
711, 0, 255, 256, 257, 0, 258, 712, 713, 0,
259, 260, 0, 0, 0, 714, 262, 263, 264, 715,
0, 265, 266, 267, 0, 268, 0, 269, 0, 0,
- 0, 716, 270, 271, 2608, 0, 0, 272, 0, 273,
+ 0, 716, 270, 271, 717, 0, 0, 272, 0, 273,
274, 0, 275, 276, 0, 0, 0, 277, 0, 0,
278, 279, 718, 0, 0, 281, 0, 719, 282, 283,
0, 0, 0, 0, 0, 720, 285, 0, 286, 0,
@@ -7349,7 +7038,7 @@ static const yytype_int16 yytable[] =
0, 254, 0, 711, 0, 255, 256, 257, 0, 258,
712, 713, 0, 259, 260, 0, 0, 0, 714, 262,
263, 264, 715, 0, 265, 266, 267, 0, 268, 0,
- 269, 0, 0, 0, 716, 270, 271, 2662, 0, 0,
+ 269, 0, 0, 0, 716, 270, 271, 717, 0, 0,
272, 0, 273, 274, 0, 275, 276, 0, 0, 0,
277, 0, 0, 278, 279, 718, 0, 0, 281, 0,
719, 282, 283, 0, 0, 0, 0, 0, 720, 285,
@@ -7401,7 +7090,7 @@ static const yytype_int16 yytable[] =
194, 195, 0, 196, 197, 198, 692, 200, 0, 201,
693, 694, 202, 0, 0, 203, 695, 696, 0, 204,
697, 698, 0, 205, 206, 207, 699, 700, 701, 0,
- 0, 0, 0, 702, 210, 703, 0, 0, 3422, 211,
+ 0, 0, 0, 702, 210, 703, 0, 0, 704, 211,
0, 212, 0, 0, 0, 213, 0, 214, 215, 216,
217, 0, 0, 0, 218, 0, 0, 219, 220, 221,
0, 0, 0, 222, 0, 223, 224, 0, 225, 226,
@@ -7451,10 +7140,10 @@ static const yytype_int16 yytable[] =
478, 0, 0, 479, 771, 0, 772, 480, 481, 482,
483, 484, 773, 0, 0, 0, 0, 0, 0, 486,
487, 0, 488, 489, 490, 0, 0, 774, 0, 0,
- 0, 0, 775, 776, 0, 0, 0, 0, 777, 778,
+ 0, 0, 775, 776, 0, 0, 0, 0, 777, 1124,
0, 0, 779, 780, 0, 0, 781, 782, 139, 0,
- 672, 141, 142, 143, 144, 0, 0, 145, 0, 0,
- 0, 146, 0, 0, 673, 0, 148, 149, 150, 151,
+ 672, 141, 142, 143, 144, 1713, 0, 145, 0, 0,
+ 0, 1714, 0, 0, 673, 0, 148, 149, 150, 151,
152, 674, 154, 0, 155, 0, 0, 675, 156, 676,
677, 678, 157, 679, 0, 158, 159, 160, 0, 161,
0, 162, 163, 0, 0, 164, 680, 681, 165, 166,
@@ -7483,7 +7172,7 @@ static const yytype_int16 yytable[] =
0, 288, 289, 0, 0, 721, 0, 0, 0, 0,
290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
300, 301, 302, 0, 303, 304, 305, 722, 306, 307,
- 308, 309, 723, 310, 311, 4308, 0, 0, 0, 312,
+ 308, 309, 723, 310, 311, 0, 0, 0, 0, 312,
313, 314, 315, 724, 317, 0, 0, 725, 319, 726,
320, 0, 321, 727, 728, 729, 730, 731, 326, 327,
328, 329, 330, 331, 0, 732, 332, 333, 0, 0,
@@ -7550,7 +7239,7 @@ static const yytype_int16 yytable[] =
0, 0, 312, 313, 314, 315, 724, 317, 0, 0,
725, 319, 726, 320, 0, 321, 727, 728, 729, 730,
731, 326, 327, 328, 329, 330, 331, 0, 732, 332,
- 333, 0, 0, 334, 335, 336, 337, 733, 0, 735,
+ 333, 0, 0, 334, 335, 336, 337, 733, 734, 735,
338, 339, 0, 736, 737, 0, 340, 341, 738, 0,
343, 344, 345, 346, 0, 347, 348, 0, 0, 0,
0, 0, 0, 0, 0, 349, 350, 351, 0, 739,
@@ -7573,7 +7262,7 @@ static const yytype_int16 yytable[] =
757, 758, 759, 760, 0, 0, 0, 0, 0, 459,
460, 461, 0, 761, 762, 763, 463, 464, 465, 764,
466, 467, 765, 468, 469, 0, 470, 471, 0, 0,
- 472, 0, 0, 473, 0, 474, 0, 766, 476, 477,
+ 472, 0, 0, 473, 0, 474, 0, 1788, 476, 477,
0, 0, 767, 768, 769, 770, 478, 0, 0, 479,
771, 0, 772, 480, 481, 482, 483, 484, 773, 0,
0, 0, 0, 0, 0, 486, 487, 0, 488, 489,
@@ -7602,7 +7291,7 @@ static const yytype_int16 yytable[] =
710, 253, 0, 254, 0, 711, 0, 255, 256, 257,
0, 258, 712, 713, 0, 259, 260, 0, 0, 0,
714, 262, 263, 264, 715, 0, 265, 266, 267, 0,
- 268, 0, 269, 0, 0, 0, 716, 270, 271, 1724,
+ 268, 0, 269, 0, 0, 0, 716, 270, 271, 2616,
0, 0, 272, 0, 273, 274, 0, 275, 276, 0,
0, 0, 277, 0, 0, 278, 279, 718, 0, 0,
281, 0, 719, 282, 283, 0, 0, 0, 0, 0,
@@ -7614,7 +7303,7 @@ static const yytype_int16 yytable[] =
317, 0, 0, 725, 319, 726, 320, 0, 321, 727,
728, 729, 730, 731, 326, 327, 328, 329, 330, 331,
0, 732, 332, 333, 0, 0, 334, 335, 336, 337,
- 733, 0, 735, 338, 339, 0, 736, 737, 0, 340,
+ 733, 734, 735, 338, 339, 0, 736, 737, 0, 340,
341, 738, 0, 343, 344, 345, 346, 0, 347, 348,
0, 0, 0, 0, 0, 0, 0, 0, 349, 350,
351, 0, 739, 352, 0, 353, 354, 355, 356, 740,
@@ -7666,7 +7355,7 @@ static const yytype_int16 yytable[] =
255, 256, 257, 0, 258, 712, 713, 0, 259, 260,
0, 0, 0, 714, 262, 263, 264, 715, 0, 265,
266, 267, 0, 268, 0, 269, 0, 0, 0, 716,
- 270, 271, 1726, 0, 0, 272, 0, 273, 274, 0,
+ 270, 271, 2670, 0, 0, 272, 0, 273, 274, 0,
275, 276, 0, 0, 0, 277, 0, 0, 278, 279,
718, 0, 0, 281, 0, 719, 282, 283, 0, 0,
0, 0, 0, 720, 285, 0, 286, 0, 287, 0,
@@ -7677,7 +7366,7 @@ static const yytype_int16 yytable[] =
314, 315, 724, 317, 0, 0, 725, 319, 726, 320,
0, 321, 727, 728, 729, 730, 731, 326, 327, 328,
329, 330, 331, 0, 732, 332, 333, 0, 0, 334,
- 335, 336, 337, 733, 0, 735, 338, 339, 0, 736,
+ 335, 336, 337, 733, 734, 735, 338, 339, 0, 736,
737, 0, 340, 341, 738, 0, 343, 344, 345, 346,
0, 347, 348, 0, 0, 0, 0, 0, 0, 0,
0, 349, 350, 351, 0, 739, 352, 0, 353, 354,
@@ -7706,138 +7395,393 @@ static const yytype_int16 yytable[] =
0, 486, 487, 0, 488, 489, 490, 0, 0, 774,
0, 0, 0, 0, 775, 776, 0, 0, 0, 0,
777, 778, 0, 0, 779, 780, 0, 0, 781, 782,
- 139, 0, 140, 141, 142, 143, 144, 0, 0, 145,
- 0, 0, 0, 146, 0, 0, 147, 0, 148, 149,
- 150, 151, 152, 153, 154, 0, 155, 0, 0, 0,
- 156, 676, 0, 0, 157, 0, 0, 158, 159, 160,
- 0, 161, 0, 162, 163, 0, 0, 164, 0, 0,
- 165, 166, 0, 167, 168, 0, 169, 170, 0, 171,
- 172, 173, 174, 175, 176, 177, 0, 178, 179, 180,
- 181, 182, 183, 184, 185, 0, 186, 187, 188, 189,
+ 139, 0, 672, 141, 142, 143, 144, 0, 0, 145,
+ 0, 0, 0, 146, 0, 0, 673, 0, 148, 149,
+ 150, 151, 152, 674, 154, 0, 155, 0, 0, 675,
+ 156, 676, 677, 678, 157, 679, 0, 158, 159, 160,
+ 0, 161, 0, 162, 163, 0, 0, 164, 680, 681,
+ 165, 166, 0, 167, 682, 683, 169, 170, 0, 171,
+ 172, 173, 174, 175, 684, 177, 0, 685, 179, 686,
+ 687, 688, 689, 690, 691, 0, 186, 187, 188, 189,
190, 191, 192, 193, 0, 194, 195, 0, 196, 197,
- 198, 199, 200, 0, 201, 0, 0, 202, 0, 0,
- 203, 0, 0, 0, 204, 0, 0, 0, 205, 206,
- 207, 0, 0, 2335, 0, 0, 0, 0, 209, 210,
- 703, 0, 0, 0, 211, 0, 212, 0, 0, 0,
+ 198, 692, 200, 0, 201, 693, 694, 202, 0, 0,
+ 203, 695, 696, 0, 204, 697, 698, 0, 205, 206,
+ 207, 699, 700, 701, 0, 0, 0, 0, 702, 210,
+ 703, 0, 0, 3432, 211, 0, 212, 0, 0, 0,
213, 0, 214, 215, 216, 217, 0, 0, 0, 218,
0, 0, 219, 220, 221, 0, 0, 0, 222, 0,
223, 224, 0, 225, 226, 227, 0, 0, 228, 229,
- 0, 230, 231, 232, 233, 234, 235, 0, 0, 236,
- 237, 238, 0, 707, 239, 240, 0, 241, 242, 243,
+ 0, 230, 231, 232, 233, 234, 235, 705, 0, 236,
+ 237, 238, 706, 707, 239, 240, 0, 241, 242, 243,
708, 0, 244, 0, 0, 0, 245, 0, 246, 0,
- 247, 0, 248, 249, 250, 251, 252, 253, 0, 254,
- 0, 0, 0, 255, 256, 257, 0, 258, 712, 713,
- 0, 259, 260, 0, 0, 0, 261, 262, 263, 264,
- 0, 0, 265, 266, 267, 0, 268, 0, 269, 0,
- 0, 0, 0, 270, 271, 0, 0, 0, 272, 0,
+ 247, 0, 248, 249, 709, 251, 710, 253, 0, 254,
+ 0, 711, 0, 255, 256, 257, 0, 258, 712, 713,
+ 0, 259, 260, 0, 0, 0, 714, 262, 263, 264,
+ 715, 0, 265, 266, 267, 0, 268, 0, 269, 0,
+ 0, 0, 716, 270, 271, 717, 0, 0, 272, 0,
273, 274, 0, 275, 276, 0, 0, 0, 277, 0,
- 0, 278, 279, 280, 0, 0, 281, 0, 0, 282,
- 283, 0, 0, 0, 0, 0, 284, 285, 0, 286,
+ 0, 278, 279, 718, 0, 0, 281, 0, 719, 282,
+ 283, 0, 0, 0, 0, 0, 720, 285, 0, 286,
0, 287, 0, 288, 289, 0, 0, 721, 0, 0,
0, 0, 290, 291, 292, 293, 294, 295, 296, 297,
- 298, 299, 300, 301, 302, 0, 303, 304, 305, 0,
- 306, 307, 308, 309, 0, 310, 311, 0, 0, 0,
- 0, 312, 313, 314, 315, 316, 317, 0, 0, 318,
- 319, 0, 320, 0, 321, 0, 322, 323, 324, 325,
+ 298, 299, 300, 301, 302, 0, 303, 304, 305, 722,
+ 306, 307, 308, 309, 723, 310, 311, 0, 0, 0,
+ 0, 312, 313, 314, 315, 724, 317, 0, 0, 725,
+ 319, 726, 320, 0, 321, 727, 728, 729, 730, 731,
326, 327, 328, 329, 330, 331, 0, 732, 332, 333,
- 0, 0, 334, 335, 336, 337, 0, 0, 0, 338,
- 339, 0, 736, 737, 0, 340, 341, 342, 0, 343,
+ 0, 0, 334, 335, 336, 337, 733, 734, 735, 338,
+ 339, 0, 736, 737, 0, 340, 341, 738, 0, 343,
344, 345, 346, 0, 347, 348, 0, 0, 0, 0,
- 0, 0, 0, 0, 349, 350, 351, 0, 0, 352,
- 0, 353, 354, 355, 356, 357, 358, 359, 360, 361,
- 362, 363, 364, 0, 0, 365, 366, 367, 0, 368,
- 0, 369, 370, 371, 372, 373, 0, 374, 375, 376,
+ 0, 0, 0, 0, 349, 350, 351, 0, 739, 352,
+ 0, 353, 354, 355, 356, 740, 358, 359, 360, 361,
+ 741, 742, 364, 743, 0, 365, 366, 367, 0, 368,
+ 0, 369, 370, 371, 372, 373, 0, 744, 375, 376,
0, 0, 377, 0, 0, 0, 378, 379, 380, 381,
382, 0, 0, 383, 384, 385, 386, 387, 0, 388,
- 389, 0, 390, 391, 392, 0, 0, 393, 0, 394,
- 0, 395, 396, 0, 397, 398, 0, 0, 0, 399,
- 400, 401, 402, 403, 404, 405, 406, 407, 408, 0,
- 409, 410, 0, 0, 0, 411, 412, 413, 414, 0,
+ 389, 0, 390, 391, 392, 745, 746, 393, 0, 394,
+ 0, 395, 396, 0, 397, 398, 0, 0, 747, 399,
+ 400, 401, 402, 403, 748, 405, 406, 407, 408, 0,
+ 749, 410, 0, 0, 0, 411, 412, 413, 414, 0,
0, 0, 415, 0, 0, 0, 416, 0, 417, 418,
419, 420, 0, 421, 422, 423, 424, 425, 426, 0,
0, 0, 0, 0, 0, 427, 428, 0, 429, 0,
- 0, 430, 0, 0, 431, 432, 433, 0, 0, 434,
- 435, 0, 436, 437, 438, 439, 440, 441, 0, 0,
- 442, 443, 444, 445, 0, 446, 447, 0, 448, 0,
- 449, 450, 451, 452, 0, 756, 453, 454, 0, 2336,
- 456, 457, 2337, 0, 0, 0, 0, 0, 459, 460,
- 461, 0, 0, 762, 462, 463, 464, 465, 764, 466,
+ 0, 430, 0, 0, 431, 432, 433, 750, 751, 434,
+ 435, 0, 436, 437, 752, 439, 440, 441, 753, 754,
+ 442, 443, 444, 445, 755, 446, 447, 0, 448, 0,
+ 449, 450, 451, 452, 0, 756, 453, 454, 0, 757,
+ 758, 759, 760, 0, 0, 0, 0, 0, 459, 460,
+ 461, 0, 761, 762, 763, 463, 464, 465, 764, 466,
467, 765, 468, 469, 0, 470, 471, 0, 0, 472,
- 0, 0, 473, 0, 474, 0, 475, 476, 477, 0,
- 0, 0, 0, 0, 0, 478, 0, 0, 479, 0,
- 0, 0, 480, 481, 482, 483, 484, 485, 0, 0,
+ 0, 0, 473, 0, 474, 0, 766, 476, 477, 0,
+ 0, 767, 768, 769, 770, 478, 0, 0, 479, 771,
+ 0, 772, 480, 481, 482, 483, 484, 773, 0, 0,
0, 0, 0, 0, 486, 487, 0, 488, 489, 490,
- 0, 0, 491, 0, 0, 0, 0, 139, 0, 140,
- 141, 142, 143, 144, 0, 0, 145, 0, 0, 0,
- 146, 781, 782, 147, 0, 148, 149, 150, 151, 152,
- 153, 154, 0, 155, 0, 0, 0, 156, 0, 0,
- 0, 157, 0, 0, 158, 159, 160, 0, 161, 0,
- 162, 163, 0, 0, 164, 0, 0, 165, 166, 0,
- 167, 168, 0, 169, 170, 0, 171, 172, 173, 174,
- 175, 176, 177, 0, 178, 179, 180, 181, 182, 183,
- 184, 185, 0, 186, 187, 188, 189, 190, 191, 192,
- 193, 0, 194, 195, 2450, 196, 197, 198, 199, 200,
- 0, 201, 0, 0, 202, 0, 0, 203, 0, 0,
- 0, 204, 0, 0, 0, 205, 206, 207, 0, 0,
- 208, 0, 0, 0, 0, 209, 210, 0, 0, 0,
- 0, 211, 0, 212, 0, 0, 0, 213, 0, 214,
- 215, 216, 217, 0, 0, 0, 218, 0, 0, 219,
- 220, 221, 0, 0, 0, 222, 0, 223, 224, 0,
- 225, 226, 227, 0, 0, 228, 229, 0, 230, 231,
- 232, 233, 234, 235, 0, 0, 236, 237, 238, 0,
- 0, 239, 240, 0, 241, 242, 243, 0, 0, 244,
- 0, 0, 0, 245, 0, 246, 507, 247, 0, 248,
- 249, 250, 251, 252, 253, 0, 254, 0, 0, 0,
- 255, 256, 257, 0, 258, 0, 0, 0, 259, 260,
- 0, 0, 0, 261, 262, 263, 264, 0, 0, 265,
- 266, 267, 2033, 268, 0, 269, 0, 0, 0, 0,
- 270, 271, 0, 0, 0, 272, 0, 273, 274, 0,
- 275, 276, 0, 0, 0, 277, 2034, 0, 278, 279,
- 280, 0, 0, 281, 0, 0, 282, 283, 0, 3008,
- 0, 0, 0, 284, 285, 0, 286, 0, 287, 0,
- 288, 289, 0, 0, 0, 0, 0, 0, 0, 290,
- 291, 292, 293, 294, 295, 296, 297, 298, 299, 300,
- 301, 302, 0, 303, 304, 305, 0, 306, 307, 308,
- 309, 0, 310, 311, 0, 0, 0, 0, 312, 313,
- 314, 315, 316, 317, 0, 0, 318, 319, 0, 320,
- 0, 321, 0, 322, 323, 324, 325, 326, 327, 328,
- 329, 330, 331, 0, 0, 332, 333, 0, 0, 334,
- 335, 336, 337, 0, 0, 0, 338, 339, 0, 0,
- 0, 0, 340, 341, 342, 0, 343, 344, 345, 346,
- 0, 347, 348, 0, 0, 0, 0, 0, 0, 0,
- 0, 349, 350, 351, 0, 0, 352, 0, 353, 354,
- 355, 3009, 357, 358, 359, 360, 361, 362, 363, 364,
- 0, 0, 365, 366, 367, 0, 368, 0, 369, 370,
- 371, 372, 373, 0, 374, 375, 376, 0, 0, 377,
- 0, 0, 0, 378, 379, 380, 381, 382, 0, 0,
- 383, 384, 385, 386, 387, 0, 388, 389, 0, 390,
- 391, 392, 0, 0, 393, 0, 394, 0, 395, 396,
- 0, 397, 398, 0, 0, 0, 399, 400, 401, 402,
- 403, 404, 405, 406, 407, 408, 0, 409, 410, -439,
- 0, 0, 411, 412, 413, 414, 0, 0, 0, 415,
- 0, 0, 0, 416, 0, 417, 418, 419, 420, 0,
- 421, 422, 423, 424, 425, 426, 510, 0, 0, 0,
- 0, 0, 427, 428, 0, 429, 0, 0, 430, 0,
- 0, 431, 432, 433, 0, 0, 434, 435, 0, 436,
- 437, 438, 439, 440, 441, 0, 0, 442, 443, 444,
- 445, 0, 446, 447, 0, 448, 0, 449, 450, 451,
- 452, 0, 0, 453, 454, 0, 455, 456, 457, 458,
- 0, 0, 0, 0, 0, 459, 460, 461, 0, 0,
- 0, 462, 463, 464, 465, 0, 466, 467, 0, 468,
- 469, 0, 470, 471, 0, 0, 472, 0, 0, 473,
- 0, 474, 0, 475, 476, 477, 0, 0, 0, 0,
- 0, 0, 478, 0, 0, 479, 0, 0, 0, 480,
- 481, 482, 483, 484, 485, 0, 0, 0, 0, 0,
- 0, 486, 487, 0, 488, 489, 490, 0, 0, 491,
+ 0, 0, 774, 0, 0, 0, 0, 775, 776, 0,
+ 0, 0, 0, 777, 778, 0, 0, 779, 780, 0,
+ 0, 781, 782, 139, 0, 672, 141, 142, 143, 144,
+ 0, 0, 145, 0, 0, 0, 146, 0, 0, 673,
+ 0, 148, 149, 150, 151, 152, 674, 154, 0, 155,
+ 0, 0, 675, 156, 676, 677, 678, 157, 679, 0,
+ 158, 159, 160, 0, 161, 0, 162, 163, 0, 0,
+ 164, 680, 681, 165, 166, 0, 167, 682, 683, 169,
+ 170, 0, 171, 172, 173, 174, 175, 684, 177, 0,
+ 685, 179, 686, 687, 688, 689, 690, 691, 0, 186,
+ 187, 188, 189, 190, 191, 192, 193, 0, 194, 195,
+ 0, 196, 197, 198, 692, 200, 0, 201, 693, 694,
+ 202, 0, 0, 203, 695, 696, 0, 204, 697, 698,
+ 0, 205, 206, 207, 699, 700, 701, 0, 0, 0,
+ 0, 702, 210, 703, 0, 0, 704, 211, 0, 212,
+ 0, 0, 0, 213, 0, 214, 215, 216, 217, 0,
+ 0, 0, 218, 0, 0, 219, 220, 221, 0, 0,
+ 0, 222, 0, 223, 224, 0, 225, 226, 227, 0,
+ 0, 228, 229, 0, 230, 231, 232, 233, 234, 235,
+ 705, 0, 236, 237, 238, 706, 707, 239, 240, 0,
+ 241, 242, 243, 708, 0, 244, 0, 0, 0, 245,
+ 0, 246, 0, 247, 0, 248, 249, 709, 251, 710,
+ 253, 0, 254, 0, 711, 0, 255, 256, 257, 0,
+ 258, 712, 713, 0, 259, 260, 0, 0, 0, 714,
+ 262, 263, 264, 715, 0, 265, 266, 267, 0, 268,
+ 0, 269, 0, 0, 0, 716, 270, 271, 717, 0,
+ 0, 272, 0, 273, 274, 0, 275, 276, 0, 0,
+ 0, 277, 0, 0, 278, 279, 718, 0, 0, 281,
+ 0, 719, 282, 283, 0, 0, 0, 0, 0, 720,
+ 285, 0, 286, 0, 287, 0, 288, 289, 0, 0,
+ 721, 0, 0, 0, 0, 290, 291, 292, 293, 294,
+ 295, 296, 297, 298, 299, 300, 301, 302, 0, 303,
+ 304, 305, 722, 306, 307, 308, 309, 723, 310, 311,
+ 4318, 0, 0, 0, 312, 313, 314, 315, 724, 317,
+ 0, 0, 725, 319, 726, 320, 0, 321, 727, 728,
+ 729, 730, 731, 326, 327, 328, 329, 330, 331, 0,
+ 732, 332, 333, 0, 0, 334, 335, 336, 337, 733,
+ 0, 735, 338, 339, 0, 736, 737, 0, 340, 341,
+ 738, 0, 343, 344, 345, 346, 0, 347, 348, 0,
+ 0, 0, 0, 0, 0, 0, 0, 349, 350, 351,
+ 0, 739, 352, 0, 353, 354, 355, 356, 740, 358,
+ 359, 360, 361, 741, 742, 364, 743, 0, 365, 366,
+ 367, 0, 368, 0, 369, 370, 371, 372, 373, 0,
+ 744, 375, 376, 0, 0, 377, 0, 0, 0, 378,
+ 379, 380, 381, 382, 0, 0, 383, 384, 385, 386,
+ 387, 0, 388, 389, 0, 390, 391, 392, 745, 746,
+ 393, 0, 394, 0, 395, 396, 0, 397, 398, 0,
+ 0, 747, 399, 400, 401, 402, 403, 748, 405, 406,
+ 407, 408, 0, 749, 410, 0, 0, 0, 411, 412,
+ 413, 414, 0, 0, 0, 415, 0, 0, 0, 416,
+ 0, 417, 418, 419, 420, 0, 421, 422, 423, 424,
+ 425, 426, 0, 0, 0, 0, 0, 0, 427, 428,
+ 0, 429, 0, 0, 430, 0, 0, 431, 432, 433,
+ 750, 751, 434, 435, 0, 436, 437, 752, 439, 440,
+ 441, 753, 754, 442, 443, 444, 445, 755, 446, 447,
+ 0, 448, 0, 449, 450, 451, 452, 0, 756, 453,
+ 454, 0, 757, 758, 759, 760, 0, 0, 0, 0,
+ 0, 459, 460, 461, 0, 761, 762, 763, 463, 464,
+ 465, 764, 466, 467, 765, 468, 469, 0, 470, 471,
+ 0, 0, 472, 0, 0, 473, 0, 474, 0, 766,
+ 476, 477, 0, 0, 767, 768, 769, 770, 478, 0,
+ 0, 479, 771, 0, 772, 480, 481, 482, 483, 484,
+ 773, 0, 0, 0, 0, 0, 0, 486, 487, 0,
+ 488, 489, 490, 0, 0, 774, 0, 0, 0, 0,
+ 775, 776, 0, 0, 0, 0, 777, 778, 0, 0,
+ 779, 780, 0, 0, 781, 782, 139, 0, 672, 141,
+ 142, 143, 144, 0, 0, 145, 0, 0, 0, 146,
+ 0, 0, 673, 0, 148, 149, 150, 151, 152, 674,
+ 154, 0, 155, 0, 0, 675, 156, 676, 677, 678,
+ 157, 679, 0, 158, 159, 160, 0, 161, 0, 162,
+ 163, 0, 0, 164, 680, 681, 165, 166, 0, 167,
+ 682, 683, 169, 170, 0, 171, 172, 173, 174, 175,
+ 684, 177, 0, 685, 179, 686, 687, 688, 689, 690,
+ 691, 0, 186, 187, 188, 189, 190, 191, 192, 193,
+ 0, 194, 195, 0, 196, 197, 198, 692, 200, 0,
+ 201, 693, 694, 202, 0, 0, 203, 695, 696, 0,
+ 204, 697, 698, 0, 205, 206, 207, 699, 700, 701,
+ 0, 0, 0, 0, 702, 210, 703, 0, 0, 704,
+ 211, 0, 212, 0, 0, 0, 213, 0, 214, 215,
+ 216, 217, 0, 0, 0, 218, 0, 0, 219, 220,
+ 221, 0, 0, 0, 222, 0, 223, 224, 0, 225,
+ 226, 227, 0, 0, 228, 229, 0, 230, 231, 232,
+ 233, 234, 235, 705, 0, 236, 237, 238, 706, 707,
+ 239, 240, 0, 241, 242, 243, 708, 0, 244, 0,
+ 0, 0, 245, 0, 246, 0, 247, 0, 248, 249,
+ 709, 251, 710, 253, 0, 254, 0, 711, 0, 255,
+ 256, 257, 0, 258, 712, 713, 0, 259, 260, 0,
+ 0, 0, 714, 262, 263, 264, 715, 0, 265, 266,
+ 267, 0, 268, 0, 269, 0, 0, 0, 716, 270,
+ 271, 717, 0, 0, 272, 0, 273, 274, 0, 275,
+ 276, 0, 0, 0, 277, 0, 0, 278, 279, 718,
+ 0, 0, 281, 0, 719, 282, 283, 0, 0, 0,
+ 0, 0, 720, 285, 0, 286, 0, 287, 0, 288,
+ 289, 0, 0, 721, 0, 0, 0, 0, 290, 291,
+ 292, 293, 294, 295, 296, 297, 298, 299, 300, 301,
+ 302, 0, 303, 304, 305, 722, 306, 307, 308, 309,
+ 723, 310, 311, 0, 0, 0, 0, 312, 313, 314,
+ 315, 724, 317, 0, 0, 725, 319, 726, 320, 0,
+ 321, 727, 728, 729, 730, 731, 326, 327, 328, 329,
+ 330, 331, 0, 732, 332, 333, 0, 0, 334, 335,
+ 336, 337, 733, 0, 735, 338, 339, 0, 736, 737,
+ 0, 340, 341, 738, 0, 343, 344, 345, 346, 0,
+ 347, 348, 0, 0, 0, 0, 0, 0, 0, 0,
+ 349, 350, 351, 0, 739, 352, 0, 353, 354, 355,
+ 356, 740, 358, 359, 360, 361, 741, 742, 364, 743,
+ 0, 365, 366, 367, 0, 368, 0, 369, 370, 371,
+ 372, 373, 0, 744, 375, 376, 0, 0, 377, 0,
+ 0, 0, 378, 379, 380, 381, 382, 0, 0, 383,
+ 384, 385, 386, 387, 0, 388, 389, 0, 390, 391,
+ 392, 745, 746, 393, 0, 394, 0, 395, 396, 0,
+ 397, 398, 0, 0, 747, 399, 400, 401, 402, 403,
+ 748, 405, 406, 407, 408, 0, 749, 410, 0, 0,
+ 0, 411, 412, 413, 414, 0, 0, 0, 415, 0,
+ 0, 0, 416, 0, 417, 418, 419, 420, 0, 421,
+ 422, 423, 424, 425, 426, 0, 0, 0, 0, 0,
+ 0, 427, 428, 0, 429, 0, 0, 430, 0, 0,
+ 431, 432, 433, 750, 751, 434, 435, 0, 436, 437,
+ 752, 439, 440, 441, 753, 754, 442, 443, 444, 445,
+ 755, 446, 447, 0, 448, 0, 449, 450, 451, 452,
+ 0, 756, 453, 454, 0, 757, 758, 759, 760, 0,
+ 0, 0, 0, 0, 459, 460, 461, 0, 761, 762,
+ 763, 463, 464, 465, 764, 466, 467, 765, 468, 469,
+ 0, 470, 471, 0, 0, 472, 0, 0, 473, 0,
+ 474, 0, 766, 476, 477, 0, 0, 767, 768, 769,
+ 770, 478, 0, 0, 479, 771, 0, 772, 480, 481,
+ 482, 483, 484, 773, 0, 0, 0, 0, 0, 0,
+ 486, 487, 0, 488, 489, 490, 0, 0, 774, 0,
+ 0, 0, 0, 775, 776, 0, 0, 0, 0, 777,
+ 778, 0, 0, 779, 780, 0, 0, 781, 782, 139,
+ 0, 672, 141, 142, 143, 144, 0, 0, 145, 0,
+ 0, 0, 146, 0, 0, 673, 0, 148, 149, 150,
+ 151, 152, 674, 154, 0, 155, 0, 0, 675, 156,
+ 676, 677, 678, 157, 679, 0, 158, 159, 160, 0,
+ 161, 0, 162, 163, 0, 0, 164, 680, 681, 165,
+ 166, 0, 167, 682, 683, 169, 170, 0, 171, 172,
+ 173, 174, 175, 684, 177, 0, 685, 179, 686, 687,
+ 688, 689, 690, 691, 0, 186, 187, 188, 189, 190,
+ 191, 192, 193, 0, 194, 195, 0, 196, 197, 198,
+ 692, 200, 0, 201, 693, 694, 202, 0, 0, 203,
+ 695, 696, 0, 204, 697, 698, 0, 205, 206, 207,
+ 699, 700, 701, 0, 0, 0, 0, 702, 210, 703,
+ 0, 0, 704, 211, 0, 212, 0, 0, 0, 213,
+ 0, 214, 215, 216, 217, 0, 0, 0, 218, 0,
+ 0, 219, 220, 221, 0, 0, 0, 222, 0, 223,
+ 224, 0, 225, 226, 227, 0, 0, 228, 229, 0,
+ 230, 231, 232, 233, 234, 235, 705, 0, 236, 237,
+ 238, 706, 707, 239, 240, 0, 241, 242, 243, 708,
+ 0, 244, 0, 0, 0, 245, 0, 246, 0, 247,
+ 0, 248, 249, 709, 251, 710, 253, 0, 254, 0,
+ 711, 0, 255, 256, 257, 0, 258, 712, 713, 0,
+ 259, 260, 0, 0, 0, 714, 262, 263, 264, 715,
+ 0, 265, 266, 267, 0, 268, 0, 269, 0, 0,
+ 0, 716, 270, 271, 1728, 0, 0, 272, 0, 273,
+ 274, 0, 275, 276, 0, 0, 0, 277, 0, 0,
+ 278, 279, 718, 0, 0, 281, 0, 719, 282, 283,
+ 0, 0, 0, 0, 0, 720, 285, 0, 286, 0,
+ 287, 0, 288, 289, 0, 0, 721, 0, 0, 0,
+ 0, 290, 291, 292, 293, 294, 295, 296, 297, 298,
+ 299, 300, 301, 302, 0, 303, 304, 305, 722, 306,
+ 307, 308, 309, 723, 310, 311, 0, 0, 0, 0,
+ 312, 313, 314, 315, 724, 317, 0, 0, 725, 319,
+ 726, 320, 0, 321, 727, 728, 729, 730, 731, 326,
+ 327, 328, 329, 330, 331, 0, 732, 332, 333, 0,
+ 0, 334, 335, 336, 337, 733, 0, 735, 338, 339,
+ 0, 736, 737, 0, 340, 341, 738, 0, 343, 344,
+ 345, 346, 0, 347, 348, 0, 0, 0, 0, 0,
+ 0, 0, 0, 349, 350, 351, 0, 739, 352, 0,
+ 353, 354, 355, 356, 740, 358, 359, 360, 361, 741,
+ 742, 364, 743, 0, 365, 366, 367, 0, 368, 0,
+ 369, 370, 371, 372, 373, 0, 744, 375, 376, 0,
+ 0, 377, 0, 0, 0, 378, 379, 380, 381, 382,
+ 0, 0, 383, 384, 385, 386, 387, 0, 388, 389,
+ 0, 390, 391, 392, 745, 746, 393, 0, 394, 0,
+ 395, 396, 0, 397, 398, 0, 0, 747, 399, 400,
+ 401, 402, 403, 748, 405, 406, 407, 408, 0, 749,
+ 410, 0, 0, 0, 411, 412, 413, 414, 0, 0,
+ 0, 415, 0, 0, 0, 416, 0, 417, 418, 419,
+ 420, 0, 421, 422, 423, 424, 425, 426, 0, 0,
+ 0, 0, 0, 0, 427, 428, 0, 429, 0, 0,
+ 430, 0, 0, 431, 432, 433, 750, 751, 434, 435,
+ 0, 436, 437, 752, 439, 440, 441, 753, 754, 442,
+ 443, 444, 445, 755, 446, 447, 0, 448, 0, 449,
+ 450, 451, 452, 0, 756, 453, 454, 0, 757, 758,
+ 759, 760, 0, 0, 0, 0, 0, 459, 460, 461,
+ 0, 761, 762, 763, 463, 464, 465, 764, 466, 467,
+ 765, 468, 469, 0, 470, 471, 0, 0, 472, 0,
+ 0, 473, 0, 474, 0, 766, 476, 477, 0, 0,
+ 767, 768, 769, 770, 478, 0, 0, 479, 771, 0,
+ 772, 480, 481, 482, 483, 484, 773, 0, 0, 0,
+ 0, 0, 0, 486, 487, 0, 488, 489, 490, 0,
+ 0, 774, 0, 0, 0, 0, 775, 776, 0, 0,
+ 0, 0, 777, 778, 0, 0, 779, 780, 0, 0,
+ 781, 782, 139, 0, 672, 141, 142, 143, 144, 0,
+ 0, 145, 0, 0, 0, 146, 0, 0, 673, 0,
+ 148, 149, 150, 151, 152, 674, 154, 0, 155, 0,
+ 0, 675, 156, 676, 677, 678, 157, 679, 0, 158,
+ 159, 160, 0, 161, 0, 162, 163, 0, 0, 164,
+ 680, 681, 165, 166, 0, 167, 682, 683, 169, 170,
+ 0, 171, 172, 173, 174, 175, 684, 177, 0, 685,
+ 179, 686, 687, 688, 689, 690, 691, 0, 186, 187,
+ 188, 189, 190, 191, 192, 193, 0, 194, 195, 0,
+ 196, 197, 198, 692, 200, 0, 201, 693, 694, 202,
+ 0, 0, 203, 695, 696, 0, 204, 697, 698, 0,
+ 205, 206, 207, 699, 700, 701, 0, 0, 0, 0,
+ 702, 210, 703, 0, 0, 704, 211, 0, 212, 0,
+ 0, 0, 213, 0, 214, 215, 216, 217, 0, 0,
+ 0, 218, 0, 0, 219, 220, 221, 0, 0, 0,
+ 222, 0, 223, 224, 0, 225, 226, 227, 0, 0,
+ 228, 229, 0, 230, 231, 232, 233, 234, 235, 705,
+ 0, 236, 237, 238, 706, 707, 239, 240, 0, 241,
+ 242, 243, 708, 0, 244, 0, 0, 0, 245, 0,
+ 246, 0, 247, 0, 248, 249, 709, 251, 710, 253,
+ 0, 254, 0, 711, 0, 255, 256, 257, 0, 258,
+ 712, 713, 0, 259, 260, 0, 0, 0, 714, 262,
+ 263, 264, 715, 0, 265, 266, 267, 0, 268, 0,
+ 269, 0, 0, 0, 716, 270, 271, 1730, 0, 0,
+ 272, 0, 273, 274, 0, 275, 276, 0, 0, 0,
+ 277, 0, 0, 278, 279, 718, 0, 0, 281, 0,
+ 719, 282, 283, 0, 0, 0, 0, 0, 720, 285,
+ 0, 286, 0, 287, 0, 288, 289, 0, 0, 721,
+ 0, 0, 0, 0, 290, 291, 292, 293, 294, 295,
+ 296, 297, 298, 299, 300, 301, 302, 0, 303, 304,
+ 305, 722, 306, 307, 308, 309, 723, 310, 311, 0,
+ 0, 0, 0, 312, 313, 314, 315, 724, 317, 0,
+ 0, 725, 319, 726, 320, 0, 321, 727, 728, 729,
+ 730, 731, 326, 327, 328, 329, 330, 331, 0, 732,
+ 332, 333, 0, 0, 334, 335, 336, 337, 733, 0,
+ 735, 338, 339, 0, 736, 737, 0, 340, 341, 738,
+ 0, 343, 344, 345, 346, 0, 347, 348, 0, 0,
+ 0, 0, 0, 0, 0, 0, 349, 350, 351, 0,
+ 739, 352, 0, 353, 354, 355, 356, 740, 358, 359,
+ 360, 361, 741, 742, 364, 743, 0, 365, 366, 367,
+ 0, 368, 0, 369, 370, 371, 372, 373, 0, 744,
+ 375, 376, 0, 0, 377, 0, 0, 0, 378, 379,
+ 380, 381, 382, 0, 0, 383, 384, 385, 386, 387,
+ 0, 388, 389, 0, 390, 391, 392, 745, 746, 393,
+ 0, 394, 0, 395, 396, 0, 397, 398, 0, 0,
+ 747, 399, 400, 401, 402, 403, 748, 405, 406, 407,
+ 408, 0, 749, 410, 0, 0, 0, 411, 412, 413,
+ 414, 0, 0, 0, 415, 0, 0, 0, 416, 0,
+ 417, 418, 419, 420, 0, 421, 422, 423, 424, 425,
+ 426, 0, 0, 0, 0, 0, 0, 427, 428, 0,
+ 429, 0, 0, 430, 0, 0, 431, 432, 433, 750,
+ 751, 434, 435, 0, 436, 437, 752, 439, 440, 441,
+ 753, 754, 442, 443, 444, 445, 755, 446, 447, 0,
+ 448, 0, 449, 450, 451, 452, 0, 756, 453, 454,
+ 0, 757, 758, 759, 760, 0, 0, 0, 0, 0,
+ 459, 460, 461, 0, 761, 762, 763, 463, 464, 465,
+ 764, 466, 467, 765, 468, 469, 0, 470, 471, 0,
+ 0, 472, 0, 0, 473, 0, 474, 0, 766, 476,
+ 477, 0, 0, 767, 768, 769, 770, 478, 0, 0,
+ 479, 771, 0, 772, 480, 481, 482, 483, 484, 773,
+ 0, 0, 0, 0, 0, 0, 486, 487, 0, 488,
+ 489, 490, 0, 0, 774, 0, 0, 0, 0, 775,
+ 776, 0, 0, 0, 0, 777, 778, 0, 0, 779,
+ 780, 0, 0, 781, 782, 139, 0, 140, 141, 142,
+ 143, 144, 0, 0, 145, 0, 0, 0, 146, 0,
+ 0, 147, 0, 148, 149, 150, 151, 152, 153, 154,
+ 0, 155, 0, 0, 0, 156, 676, 0, 0, 157,
+ 0, 0, 158, 159, 160, 0, 161, 0, 162, 163,
+ 0, 0, 164, 0, 0, 165, 166, 0, 167, 168,
+ 0, 169, 170, 0, 171, 172, 173, 174, 175, 176,
+ 177, 0, 178, 179, 180, 181, 182, 183, 184, 185,
+ 0, 186, 187, 188, 189, 190, 191, 192, 193, 0,
+ 194, 195, 0, 196, 197, 198, 199, 200, 0, 201,
+ 0, 0, 202, 0, 0, 203, 0, 0, 0, 204,
+ 0, 0, 0, 205, 206, 207, 0, 0, 2342, 0,
+ 0, 0, 0, 209, 210, 703, 0, 0, 0, 211,
+ 0, 212, 0, 0, 0, 213, 0, 214, 215, 216,
+ 217, 0, 0, 0, 218, 0, 0, 219, 220, 221,
+ 0, 0, 0, 222, 0, 223, 224, 0, 225, 226,
+ 227, 0, 0, 228, 229, 0, 230, 231, 232, 233,
+ 234, 235, 0, 0, 236, 237, 238, 0, 707, 239,
+ 240, 0, 241, 242, 243, 708, 0, 244, 0, 0,
+ 0, 245, 0, 246, 0, 247, 0, 248, 249, 250,
+ 251, 252, 253, 0, 254, 0, 0, 0, 255, 256,
+ 257, 0, 258, 712, 713, 0, 259, 260, 0, 0,
+ 0, 261, 262, 263, 264, 0, 0, 265, 266, 267,
+ 0, 268, 0, 269, 0, 0, 0, 0, 270, 271,
+ 0, 0, 0, 272, 0, 273, 274, 0, 275, 276,
+ 0, 0, 0, 277, 0, 0, 278, 279, 280, 0,
+ 0, 281, 0, 0, 282, 283, 0, 0, 0, 0,
+ 0, 284, 285, 0, 286, 0, 287, 0, 288, 289,
+ 0, 0, 721, 0, 0, 0, 0, 290, 291, 292,
+ 293, 294, 295, 296, 297, 298, 299, 300, 301, 302,
+ 0, 303, 304, 305, 0, 306, 307, 308, 309, 0,
+ 310, 311, 0, 0, 0, 0, 312, 313, 314, 315,
+ 316, 317, 0, 0, 318, 319, 0, 320, 0, 321,
+ 0, 322, 323, 324, 325, 326, 327, 328, 329, 330,
+ 331, 0, 732, 332, 333, 0, 0, 334, 335, 336,
+ 337, 0, 0, 0, 338, 339, 0, 736, 737, 0,
+ 340, 341, 342, 0, 343, 344, 345, 346, 0, 347,
+ 348, 0, 0, 0, 0, 0, 0, 0, 0, 349,
+ 350, 351, 0, 0, 352, 0, 353, 354, 355, 356,
+ 357, 358, 359, 360, 361, 362, 363, 364, 0, 0,
+ 365, 366, 367, 0, 368, 0, 369, 370, 371, 372,
+ 373, 0, 374, 375, 376, 0, 0, 377, 0, 0,
+ 0, 378, 379, 380, 381, 382, 0, 0, 383, 384,
+ 385, 386, 387, 0, 388, 389, 0, 390, 391, 392,
+ 0, 0, 393, 0, 394, 0, 395, 396, 0, 397,
+ 398, 0, 0, 0, 399, 400, 401, 402, 403, 404,
+ 405, 406, 407, 408, 0, 409, 410, 0, 0, 0,
+ 411, 412, 413, 414, 0, 0, 0, 415, 0, 0,
+ 0, 416, 0, 417, 418, 419, 420, 0, 421, 422,
+ 423, 424, 425, 426, 0, 0, 0, 0, 0, 0,
+ 427, 428, 0, 429, 0, 0, 430, 0, 0, 431,
+ 432, 433, 0, 0, 434, 435, 0, 436, 437, 438,
+ 439, 440, 441, 0, 0, 442, 443, 444, 445, 0,
+ 446, 447, 0, 448, 0, 449, 450, 451, 452, 0,
+ 756, 453, 454, 0, 2343, 456, 457, 2344, 0, 0,
+ 0, 0, 0, 459, 460, 461, 0, 0, 762, 462,
+ 463, 464, 465, 764, 466, 467, 765, 468, 469, 0,
+ 470, 471, 0, 0, 472, 0, 0, 473, 0, 474,
+ 0, 475, 476, 477, 0, 0, 0, 0, 0, 0,
+ 478, 0, 0, 479, 0, 0, 0, 480, 481, 482,
+ 483, 484, 485, 0, 0, 0, 0, 0, 0, 486,
+ 487, 0, 488, 489, 490, 0, 0, 491, 0, 0,
0, 0, 139, 0, 140, 141, 142, 143, 144, 0,
- 0, 145, 0, 0, 0, 146, 0, 0, 147, 2517,
+ 0, 145, 0, 0, 0, 146, 781, 782, 147, 0,
148, 149, 150, 151, 152, 153, 154, 0, 155, 0,
0, 0, 156, 0, 0, 0, 157, 0, 0, 158,
159, 160, 0, 161, 0, 162, 163, 0, 0, 164,
0, 0, 165, 166, 0, 167, 168, 0, 169, 170,
0, 171, 172, 173, 174, 175, 176, 177, 0, 178,
179, 180, 181, 182, 183, 184, 185, 0, 186, 187,
- 188, 189, 190, 191, 192, 193, 0, 194, 195, 2450,
+ 188, 189, 190, 191, 192, 193, 0, 194, 195, 2457,
196, 197, 198, 199, 200, 0, 201, 0, 0, 202,
0, 0, 203, 0, 0, 0, 204, 0, 0, 0,
205, 206, 207, 0, 0, 208, 0, 0, 0, 0,
@@ -7848,14 +7792,14 @@ static const yytype_int16 yytable[] =
228, 229, 0, 230, 231, 232, 233, 234, 235, 0,
0, 236, 237, 238, 0, 0, 239, 240, 0, 241,
242, 243, 0, 0, 244, 0, 0, 0, 245, 0,
- 246, 507, 247, 0, 248, 249, 250, 251, 252, 253,
+ 246, 505, 247, 0, 248, 249, 250, 251, 252, 253,
0, 254, 0, 0, 0, 255, 256, 257, 0, 258,
0, 0, 0, 259, 260, 0, 0, 0, 261, 262,
- 263, 264, 0, 0, 265, 266, 267, 2033, 268, 0,
+ 263, 264, 0, 0, 265, 266, 267, 2038, 268, 0,
269, 0, 0, 0, 0, 270, 271, 0, 0, 0,
272, 0, 273, 274, 0, 275, 276, 0, 0, 0,
- 277, 2034, 0, 278, 279, 280, 0, 0, 281, 0,
- 0, 282, 283, 0, 0, 0, 0, 0, 284, 285,
+ 277, 2039, 0, 278, 279, 280, 0, 0, 281, 0,
+ 0, 282, 283, 0, 3017, 0, 0, 0, 284, 285,
0, 286, 0, 287, 0, 288, 289, 0, 0, 0,
0, 0, 0, 0, 290, 291, 292, 293, 294, 295,
296, 297, 298, 299, 300, 301, 302, 0, 303, 304,
@@ -7867,7 +7811,7 @@ static const yytype_int16 yytable[] =
0, 338, 339, 0, 0, 0, 0, 340, 341, 342,
0, 343, 344, 345, 346, 0, 347, 348, 0, 0,
0, 0, 0, 0, 0, 0, 349, 350, 351, 0,
- 0, 352, 0, 353, 354, 355, 356, 357, 358, 359,
+ 0, 352, 0, 353, 354, 355, 3018, 357, 358, 359,
360, 361, 362, 363, 364, 0, 0, 365, 366, 367,
0, 368, 0, 369, 370, 371, 372, 373, 0, 374,
375, 376, 0, 0, 377, 0, 0, 0, 378, 379,
@@ -7875,10 +7819,10 @@ static const yytype_int16 yytable[] =
0, 388, 389, 0, 390, 391, 392, 0, 0, 393,
0, 394, 0, 395, 396, 0, 397, 398, 0, 0,
0, 399, 400, 401, 402, 403, 404, 405, 406, 407,
- 408, 0, 409, 410, 0, 0, 0, 411, 412, 413,
+ 408, 0, 409, 410, -439, 0, 0, 411, 412, 413,
414, 0, 0, 0, 415, 0, 0, 0, 416, 0,
417, 418, 419, 420, 0, 421, 422, 423, 424, 425,
- 426, 510, 0, 0, 0, 0, 0, 427, 428, 0,
+ 426, 508, 0, 0, 0, 0, 0, 427, 428, 0,
429, 0, 0, 430, 0, 0, 431, 432, 433, 0,
0, 434, 435, 0, 436, 437, 438, 439, 440, 441,
0, 0, 442, 443, 444, 445, 0, 446, 447, 0,
@@ -7892,14 +7836,14 @@ static const yytype_int16 yytable[] =
0, 0, 0, 0, 0, 0, 486, 487, 0, 488,
489, 490, 0, 0, 491, 0, 0, 139, 0, 140,
141, 142, 143, 144, 0, 0, 145, 0, 0, 0,
- 146, 0, 0, 147, 2517, 148, 149, 150, 151, 152,
+ 146, 0, 0, 147, 2524, 148, 149, 150, 151, 152,
153, 154, 0, 155, 0, 0, 0, 156, 0, 0,
0, 157, 0, 0, 158, 159, 160, 0, 161, 0,
162, 163, 0, 0, 164, 0, 0, 165, 166, 0,
167, 168, 0, 169, 170, 0, 171, 172, 173, 174,
175, 176, 177, 0, 178, 179, 180, 181, 182, 183,
184, 185, 0, 186, 187, 188, 189, 190, 191, 192,
- 193, 0, 194, 195, 0, 196, 197, 198, 199, 200,
+ 193, 0, 194, 195, 2457, 196, 197, 198, 199, 200,
0, 201, 0, 0, 202, 0, 0, 203, 0, 0,
0, 204, 0, 0, 0, 205, 206, 207, 0, 0,
208, 0, 0, 0, 0, 209, 210, 0, 0, 0,
@@ -7909,13 +7853,13 @@ static const yytype_int16 yytable[] =
225, 226, 227, 0, 0, 228, 229, 0, 230, 231,
232, 233, 234, 235, 0, 0, 236, 237, 238, 0,
0, 239, 240, 0, 241, 242, 243, 0, 0, 244,
- 0, 0, 0, 245, 0, 246, 0, 247, 0, 248,
+ 0, 0, 0, 245, 0, 246, 505, 247, 0, 248,
249, 250, 251, 252, 253, 0, 254, 0, 0, 0,
255, 256, 257, 0, 258, 0, 0, 0, 259, 260,
0, 0, 0, 261, 262, 263, 264, 0, 0, 265,
- 266, 267, 0, 268, 0, 269, 0, 0, 0, 0,
+ 266, 267, 2038, 268, 0, 269, 0, 0, 0, 0,
270, 271, 0, 0, 0, 272, 0, 273, 274, 0,
- 275, 276, 0, 0, 0, 277, 0, 0, 278, 279,
+ 275, 276, 0, 0, 0, 277, 2039, 0, 278, 279,
280, 0, 0, 281, 0, 0, 282, 283, 0, 0,
0, 0, 0, 284, 285, 0, 286, 0, 287, 0,
288, 289, 0, 0, 0, 0, 0, 0, 0, 290,
@@ -7936,10 +7880,10 @@ static const yytype_int16 yytable[] =
383, 384, 385, 386, 387, 0, 388, 389, 0, 390,
391, 392, 0, 0, 393, 0, 394, 0, 395, 396,
0, 397, 398, 0, 0, 0, 399, 400, 401, 402,
- 403, 404, 405, 406, 407, 408, 0, 409, 410, 2326,
+ 403, 404, 405, 406, 407, 408, 0, 409, 410, 0,
0, 0, 411, 412, 413, 414, 0, 0, 0, 415,
0, 0, 0, 416, 0, 417, 418, 419, 420, 0,
- 421, 422, 423, 424, 425, 426, 0, 0, 0, 0,
+ 421, 422, 423, 424, 425, 426, 508, 0, 0, 0,
0, 0, 427, 428, 0, 429, 0, 0, 430, 0,
0, 431, 432, 433, 0, 0, 434, 435, 0, 436,
437, 438, 439, 440, 441, 0, 0, 442, 443, 444,
@@ -7953,7 +7897,7 @@ static const yytype_int16 yytable[] =
481, 482, 483, 484, 485, 0, 0, 0, 0, 0,
0, 486, 487, 0, 488, 489, 490, 0, 0, 491,
0, 0, 139, 0, 140, 141, 142, 143, 144, 0,
- 0, 145, 2757, 0, 0, 146, 0, 0, 147, 782,
+ 0, 145, 0, 0, 0, 146, 0, 0, 147, 2524,
148, 149, 150, 151, 152, 153, 154, 0, 155, 0,
0, 0, 156, 0, 0, 0, 157, 0, 0, 158,
159, 160, 0, 161, 0, 162, 163, 0, 0, 164,
@@ -7998,7 +7942,7 @@ static const yytype_int16 yytable[] =
0, 388, 389, 0, 390, 391, 392, 0, 0, 393,
0, 394, 0, 395, 396, 0, 397, 398, 0, 0,
0, 399, 400, 401, 402, 403, 404, 405, 406, 407,
- 408, 0, 409, 410, 0, 0, 0, 411, 412, 413,
+ 408, 0, 409, 410, 2333, 0, 0, 411, 412, 413,
414, 0, 0, 0, 415, 0, 0, 0, 416, 0,
417, 418, 419, 420, 0, 421, 422, 423, 424, 425,
426, 0, 0, 0, 0, 0, 0, 427, 428, 0,
@@ -8013,132 +7957,132 @@ static const yytype_int16 yytable[] =
477, 0, 0, 0, 0, 0, 0, 478, 0, 0,
479, 0, 0, 0, 480, 481, 482, 483, 484, 485,
0, 0, 0, 0, 0, 0, 486, 487, 0, 488,
- 489, 490, 0, 0, 491, 0, 0, 0, 0, 139,
- 0, 140, 141, 142, 143, 144, 0, 4440, 145, 0,
- 0, 0, 146, 4441, 782, 147, 0, 148, 149, 150,
- 151, 152, 153, 154, 0, 155, 0, 0, 0, 156,
- 0, 0, 0, 157, 0, 0, 158, 159, 160, 0,
- 161, 0, 162, 163, 0, 0, 164, 0, 0, 165,
- 166, 0, 167, 168, 0, 169, 170, 0, 171, 172,
- 173, 174, 175, 176, 177, 0, 178, 179, 180, 181,
- 182, 183, 184, 185, 0, 186, 187, 188, 189, 190,
- 191, 192, 193, 0, 194, 195, 0, 196, 197, 198,
- 199, 200, 0, 201, 0, 0, 202, 0, 0, 203,
- 0, 0, 0, 204, 0, 0, 0, 205, 206, 207,
- 0, 0, 208, 0, 0, 0, 0, 209, 210, 0,
- 0, 0, 0, 211, 0, 212, 0, 0, 0, 213,
- 0, 214, 215, 216, 217, 0, 0, 0, 218, 0,
- 0, 219, 220, 221, 0, 0, 0, 222, 0, 223,
- 224, 0, 225, 226, 227, 0, 0, 228, 229, 0,
- 230, 231, 232, 233, 234, 235, 0, 0, 236, 237,
- 238, 0, 0, 239, 240, 0, 241, 242, 243, 0,
- 0, 244, 0, 0, 0, 245, 0, 246, 0, 247,
- 0, 248, 249, 250, 251, 252, 253, 0, 254, 0,
- 0, 0, 255, 256, 257, 0, 258, 0, 0, 0,
- 259, 260, 0, 0, 0, 261, 262, 263, 264, 0,
- 0, 265, 266, 267, 0, 268, 0, 269, 0, 0,
- 0, 0, 270, 271, 0, 0, 0, 272, 0, 273,
- 274, 0, 275, 276, 0, 0, 0, 277, 0, 0,
- 278, 279, 280, 0, 0, 281, 0, 0, 282, 283,
- 0, 0, 0, 0, 0, 284, 285, 0, 286, 0,
- 287, 0, 288, 289, 0, 0, 0, 0, 0, 0,
- 0, 290, 291, 292, 293, 294, 295, 296, 297, 298,
- 299, 300, 301, 302, 0, 303, 304, 305, 0, 306,
- 307, 308, 309, 0, 310, 311, 0, 0, 0, 0,
- 312, 313, 314, 315, 316, 317, 0, 0, 318, 319,
- 0, 320, 0, 321, 0, 322, 323, 324, 325, 326,
- 327, 328, 329, 330, 331, 0, 0, 332, 333, 0,
- 0, 334, 335, 336, 337, 0, 0, 0, 338, 339,
- 0, 0, 0, 0, 340, 341, 342, 0, 343, 344,
- 345, 346, 0, 347, 348, 0, 0, 0, 0, 0,
- 0, 0, 0, 349, 350, 351, 0, 0, 352, 0,
- 353, 354, 355, 356, 357, 358, 359, 360, 361, 362,
- 363, 364, 0, 0, 365, 366, 367, 0, 368, 0,
- 369, 370, 371, 372, 373, 0, 374, 375, 376, 0,
- 0, 377, 0, 0, 0, 378, 379, 380, 381, 382,
- 0, 0, 383, 384, 385, 386, 387, 0, 388, 389,
- 0, 390, 391, 392, 0, 0, 393, 0, 394, 0,
- 395, 396, 0, 397, 398, 0, 0, 0, 399, 400,
- 401, 402, 403, 404, 405, 406, 407, 408, 0, 409,
- 410, 0, 0, 0, 411, 412, 413, 414, 0, 0,
- 0, 415, 0, 0, 0, 416, 0, 417, 418, 419,
- 420, 0, 421, 422, 423, 424, 425, 426, 0, 0,
- 0, 0, 0, 0, 427, 428, 0, 429, 0, 0,
- 430, 0, 0, 431, 432, 433, 0, 0, 434, 435,
- 0, 436, 437, 438, 439, 440, 441, 0, 0, 442,
- 443, 444, 445, 0, 446, 447, 0, 448, 0, 449,
- 450, 451, 452, 0, 0, 453, 454, 0, 455, 456,
- 457, 458, 0, 0, 0, 0, 0, 459, 460, 461,
- 0, 0, 0, 462, 463, 464, 465, 0, 466, 467,
- 0, 468, 469, 0, 470, 471, 0, 0, 472, 0,
- 0, 473, 0, 474, 0, 475, 476, 477, 0, 0,
- 0, 0, 0, 0, 478, 0, 0, 479, 0, 0,
- 0, 480, 481, 482, 483, 484, 485, 0, 0, 0,
- 0, 0, 0, 486, 487, 0, 488, 489, 490, 0,
- 0, 491, 0, 0, 0, 0, 139, 0, 140, 141,
- 142, 143, 144, 1128, 0, 145, 0, 0, 0, 146,
- 0, 782, 147, 0, 148, 149, 150, 151, 152, 153,
- 154, 0, 155, 0, 0, 0, 156, 0, 0, 0,
- 157, 0, 0, 158, 159, 160, 0, 161, 0, 162,
- 163, 0, 0, 164, 0, 0, 165, 166, 0, 167,
- 168, 0, 169, 170, 0, 171, 172, 173, 174, 175,
- 176, 177, 0, 178, 179, 180, 181, 182, 183, 184,
- 185, 0, 186, 187, 188, 189, 190, 191, 192, 193,
- 0, 194, 195, 0, 196, 197, 198, 199, 200, 0,
- 201, 0, 0, 202, 0, 0, 203, 0, 0, 0,
- 204, 0, 0, 0, 205, 206, 207, 0, 0, 208,
- 0, 0, 0, 0, 209, 210, 0, 0, 0, 0,
- 211, 0, 212, 0, 0, 0, 213, 0, 214, 215,
- 216, 217, 0, 0, 0, 218, 0, 0, 219, 220,
- 221, 0, 0, 0, 222, 0, 223, 224, 0, 225,
- 226, 227, 0, 0, 228, 229, 0, 230, 231, 232,
- 233, 234, 235, 0, 0, 236, 237, 238, 0, 0,
- 239, 240, 0, 241, 242, 243, 0, 0, 244, 0,
- 0, 0, 245, 0, 246, 0, 247, 0, 248, 249,
- 250, 251, 252, 253, 0, 254, 0, 0, 0, 255,
- 256, 257, 0, 258, 0, 0, 0, 259, 260, 0,
- 0, 0, 261, 262, 263, 264, 0, 0, 265, 266,
- 267, 0, 268, 0, 269, 0, 0, 0, 0, 270,
- 271, 0, 1331, 0, 272, 0, 273, 274, 0, 275,
- 276, 0, 0, 0, 277, 0, 0, 278, 279, 280,
- 0, 0, 281, 0, 0, 282, 283, 0, 0, 0,
- 0, 0, 284, 285, 0, 286, 0, 287, 0, 288,
- 289, 0, 0, 0, 0, 0, 0, 0, 290, 291,
- 292, 293, 294, 295, 296, 297, 298, 299, 300, 301,
- 302, 0, 303, 304, 305, 0, 306, 307, 308, 309,
- 0, 310, 311, 0, 0, 0, 0, 312, 313, 314,
- 315, 316, 317, 0, 0, 318, 319, 0, 320, 0,
- 321, 0, 322, 323, 324, 325, 326, 327, 328, 329,
- 330, 331, 0, 0, 332, 333, 0, 0, 334, 335,
- 336, 337, 0, 0, 0, 338, 339, 0, 0, 0,
- 0, 340, 341, 342, 0, 343, 344, 345, 346, 0,
- 347, 348, 0, 0, 0, 0, 0, 0, 0, 0,
- 349, 350, 351, 0, 0, 352, 0, 353, 354, 355,
- 356, 357, 358, 359, 360, 361, 362, 363, 364, 0,
- 0, 365, 366, 367, 0, 368, 0, 369, 370, 371,
- 372, 373, 0, 374, 375, 376, 0, 0, 377, 0,
- 0, 0, 378, 379, 380, 381, 382, 0, 0, 383,
- 384, 385, 386, 387, 0, 388, 389, 0, 390, 391,
- 392, 0, 0, 393, 0, 394, 0, 395, 396, 0,
- 397, 398, 0, 0, 0, 399, 400, 401, 402, 403,
- 404, 405, 406, 407, 408, 0, 409, 410, 0, 0,
- 0, 411, 412, 413, 414, 0, 0, 0, 415, 0,
- 0, 0, 416, 0, 417, 418, 419, 420, 0, 421,
- 422, 423, 424, 425, 426, 0, 0, 0, 0, 0,
- 0, 427, 428, 0, 429, 0, 0, 430, 0, 0,
- 431, 432, 433, 0, 0, 434, 435, 0, 436, 437,
- 438, 439, 440, 441, 0, 0, 442, 443, 444, 445,
- 0, 446, 447, 0, 448, 0, 449, 450, 451, 452,
- 0, 0, 453, 454, 0, 455, 456, 457, 458, 0,
- 0, 0, 0, 0, 459, 460, 461, 0, 0, 0,
- 462, 463, 464, 465, 0, 466, 467, 0, 468, 469,
- 0, 470, 471, 0, 0, 472, 0, 0, 473, 0,
- 474, 0, 475, 476, 477, 0, 0, 0, 0, 0,
- 0, 478, 0, 0, 479, 0, 0, 0, 480, 481,
- 482, 483, 484, 485, 0, 0, 0, 0, 0, 0,
- 486, 487, 0, 488, 489, 490, 0, 0, 491, 0,
- 0, 139, 0, 140, 141, 142, 143, 144, 0, 0,
- 145, 0, 0, 0, 146, 0, 0, 147, 541, 148,
+ 489, 490, 0, 0, 491, 0, 0, 139, 0, 140,
+ 141, 142, 143, 144, 0, 0, 145, 2766, 0, 0,
+ 146, 0, 0, 147, 782, 148, 149, 150, 151, 152,
+ 153, 154, 0, 155, 0, 0, 0, 156, 0, 0,
+ 0, 157, 0, 0, 158, 159, 160, 0, 161, 0,
+ 162, 163, 0, 0, 164, 0, 0, 165, 166, 0,
+ 167, 168, 0, 169, 170, 0, 171, 172, 173, 174,
+ 175, 176, 177, 0, 178, 179, 180, 181, 182, 183,
+ 184, 185, 0, 186, 187, 188, 189, 190, 191, 192,
+ 193, 0, 194, 195, 0, 196, 197, 198, 199, 200,
+ 0, 201, 0, 0, 202, 0, 0, 203, 0, 0,
+ 0, 204, 0, 0, 0, 205, 206, 207, 0, 0,
+ 208, 0, 0, 0, 0, 209, 210, 0, 0, 0,
+ 0, 211, 0, 212, 0, 0, 0, 213, 0, 214,
+ 215, 216, 217, 0, 0, 0, 218, 0, 0, 219,
+ 220, 221, 0, 0, 0, 222, 0, 223, 224, 0,
+ 225, 226, 227, 0, 0, 228, 229, 0, 230, 231,
+ 232, 233, 234, 235, 0, 0, 236, 237, 238, 0,
+ 0, 239, 240, 0, 241, 242, 243, 0, 0, 244,
+ 0, 0, 0, 245, 0, 246, 0, 247, 0, 248,
+ 249, 250, 251, 252, 253, 0, 254, 0, 0, 0,
+ 255, 256, 257, 0, 258, 0, 0, 0, 259, 260,
+ 0, 0, 0, 261, 262, 263, 264, 0, 0, 265,
+ 266, 267, 0, 268, 0, 269, 0, 0, 0, 0,
+ 270, 271, 0, 0, 0, 272, 0, 273, 274, 0,
+ 275, 276, 0, 0, 0, 277, 0, 0, 278, 279,
+ 280, 0, 0, 281, 0, 0, 282, 283, 0, 0,
+ 0, 0, 0, 284, 285, 0, 286, 0, 287, 0,
+ 288, 289, 0, 0, 0, 0, 0, 0, 0, 290,
+ 291, 292, 293, 294, 295, 296, 297, 298, 299, 300,
+ 301, 302, 0, 303, 304, 305, 0, 306, 307, 308,
+ 309, 0, 310, 311, 0, 0, 0, 0, 312, 313,
+ 314, 315, 316, 317, 0, 0, 318, 319, 0, 320,
+ 0, 321, 0, 322, 323, 324, 325, 326, 327, 328,
+ 329, 330, 331, 0, 0, 332, 333, 0, 0, 334,
+ 335, 336, 337, 0, 0, 0, 338, 339, 0, 0,
+ 0, 0, 340, 341, 342, 0, 343, 344, 345, 346,
+ 0, 347, 348, 0, 0, 0, 0, 0, 0, 0,
+ 0, 349, 350, 351, 0, 0, 352, 0, 353, 354,
+ 355, 356, 357, 358, 359, 360, 361, 362, 363, 364,
+ 0, 0, 365, 366, 367, 0, 368, 0, 369, 370,
+ 371, 372, 373, 0, 374, 375, 376, 0, 0, 377,
+ 0, 0, 0, 378, 379, 380, 381, 382, 0, 0,
+ 383, 384, 385, 386, 387, 0, 388, 389, 0, 390,
+ 391, 392, 0, 0, 393, 0, 394, 0, 395, 396,
+ 0, 397, 398, 0, 0, 0, 399, 400, 401, 402,
+ 403, 404, 405, 406, 407, 408, 0, 409, 410, 0,
+ 0, 0, 411, 412, 413, 414, 0, 0, 0, 415,
+ 0, 0, 0, 416, 0, 417, 418, 419, 420, 0,
+ 421, 422, 423, 424, 425, 426, 0, 0, 0, 0,
+ 0, 0, 427, 428, 0, 429, 0, 0, 430, 0,
+ 0, 431, 432, 433, 0, 0, 434, 435, 0, 436,
+ 437, 438, 439, 440, 441, 0, 0, 442, 443, 444,
+ 445, 0, 446, 447, 0, 448, 0, 449, 450, 451,
+ 452, 0, 0, 453, 454, 0, 455, 456, 457, 458,
+ 0, 0, 0, 0, 0, 459, 460, 461, 0, 0,
+ 0, 462, 463, 464, 465, 0, 466, 467, 0, 468,
+ 469, 0, 470, 471, 0, 0, 472, 0, 0, 473,
+ 0, 474, 0, 475, 476, 477, 0, 0, 0, 0,
+ 0, 0, 478, 0, 0, 479, 0, 0, 0, 480,
+ 481, 482, 483, 484, 485, 0, 0, 0, 0, 0,
+ 0, 486, 487, 0, 488, 489, 490, 0, 0, 491,
+ 0, 0, 0, 0, 139, 0, 140, 141, 142, 143,
+ 144, 0, 4450, 145, 0, 0, 0, 146, 4451, 782,
+ 147, 0, 148, 149, 150, 151, 152, 153, 154, 0,
+ 155, 0, 0, 0, 156, 0, 0, 0, 157, 0,
+ 0, 158, 159, 160, 0, 161, 0, 162, 163, 0,
+ 0, 164, 0, 0, 165, 166, 0, 167, 168, 0,
+ 169, 170, 0, 171, 172, 173, 174, 175, 176, 177,
+ 0, 178, 179, 180, 181, 182, 183, 184, 185, 0,
+ 186, 187, 188, 189, 190, 191, 192, 193, 0, 194,
+ 195, 0, 196, 197, 198, 199, 200, 0, 201, 0,
+ 0, 202, 0, 0, 203, 0, 0, 0, 204, 0,
+ 0, 0, 205, 206, 207, 0, 0, 208, 0, 0,
+ 0, 0, 209, 210, 0, 0, 0, 0, 211, 0,
+ 212, 0, 0, 0, 213, 0, 214, 215, 216, 217,
+ 0, 0, 0, 218, 0, 0, 219, 220, 221, 0,
+ 0, 0, 222, 0, 223, 224, 0, 225, 226, 227,
+ 0, 0, 228, 229, 0, 230, 231, 232, 233, 234,
+ 235, 0, 0, 236, 237, 238, 0, 0, 239, 240,
+ 0, 241, 242, 243, 0, 0, 244, 0, 0, 0,
+ 245, 0, 246, 0, 247, 0, 248, 249, 250, 251,
+ 252, 253, 0, 254, 0, 0, 0, 255, 256, 257,
+ 0, 258, 0, 0, 0, 259, 260, 0, 0, 0,
+ 261, 262, 263, 264, 0, 0, 265, 266, 267, 0,
+ 268, 0, 269, 0, 0, 0, 0, 270, 271, 0,
+ 0, 0, 272, 0, 273, 274, 0, 275, 276, 0,
+ 0, 0, 277, 0, 0, 278, 279, 280, 0, 0,
+ 281, 0, 0, 282, 283, 0, 0, 0, 0, 0,
+ 284, 285, 0, 286, 0, 287, 0, 288, 289, 0,
+ 0, 0, 0, 0, 0, 0, 290, 291, 292, 293,
+ 294, 295, 296, 297, 298, 299, 300, 301, 302, 0,
+ 303, 304, 305, 0, 306, 307, 308, 309, 0, 310,
+ 311, 0, 0, 0, 0, 312, 313, 314, 315, 316,
+ 317, 0, 0, 318, 319, 0, 320, 0, 321, 0,
+ 322, 323, 324, 325, 326, 327, 328, 329, 330, 331,
+ 0, 0, 332, 333, 0, 0, 334, 335, 336, 337,
+ 0, 0, 0, 338, 339, 0, 0, 0, 0, 340,
+ 341, 342, 0, 343, 344, 345, 346, 0, 347, 348,
+ 0, 0, 0, 0, 0, 0, 0, 0, 349, 350,
+ 351, 0, 0, 352, 0, 353, 354, 355, 356, 357,
+ 358, 359, 360, 361, 362, 363, 364, 0, 0, 365,
+ 366, 367, 0, 368, 0, 369, 370, 371, 372, 373,
+ 0, 374, 375, 376, 0, 0, 377, 0, 0, 0,
+ 378, 379, 380, 381, 382, 0, 0, 383, 384, 385,
+ 386, 387, 0, 388, 389, 0, 390, 391, 392, 0,
+ 0, 393, 0, 394, 0, 395, 396, 0, 397, 398,
+ 0, 0, 0, 399, 400, 401, 402, 403, 404, 405,
+ 406, 407, 408, 0, 409, 410, 0, 0, 0, 411,
+ 412, 413, 414, 0, 0, 0, 415, 0, 0, 0,
+ 416, 0, 417, 418, 419, 420, 0, 421, 422, 423,
+ 424, 425, 426, 0, 0, 0, 0, 0, 0, 427,
+ 428, 0, 429, 0, 0, 430, 0, 0, 431, 432,
+ 433, 0, 0, 434, 435, 0, 436, 437, 438, 439,
+ 440, 441, 0, 0, 442, 443, 444, 445, 0, 446,
+ 447, 0, 448, 0, 449, 450, 451, 452, 0, 0,
+ 453, 454, 0, 455, 456, 457, 458, 0, 0, 0,
+ 0, 0, 459, 460, 461, 0, 0, 0, 462, 463,
+ 464, 465, 0, 466, 467, 0, 468, 469, 0, 470,
+ 471, 0, 0, 472, 0, 0, 473, 0, 474, 0,
+ 475, 476, 477, 0, 0, 0, 0, 0, 0, 478,
+ 0, 0, 479, 0, 0, 0, 480, 481, 482, 483,
+ 484, 485, 0, 0, 0, 0, 0, 0, 486, 487,
+ 0, 488, 489, 490, 0, 0, 491, 0, 0, 0,
+ 0, 139, 0, 140, 141, 142, 143, 144, 1129, 0,
+ 145, 0, 0, 0, 146, 0, 782, 147, 0, 148,
149, 150, 151, 152, 153, 154, 0, 155, 0, 0,
0, 156, 0, 0, 0, 157, 0, 0, 158, 159,
160, 0, 161, 0, 162, 163, 0, 0, 164, 0,
@@ -8160,7 +8104,7 @@ static const yytype_int16 yytable[] =
254, 0, 0, 0, 255, 256, 257, 0, 258, 0,
0, 0, 259, 260, 0, 0, 0, 261, 262, 263,
264, 0, 0, 265, 266, 267, 0, 268, 0, 269,
- 0, 0, 0, 0, 270, 271, 0, 0, 0, 272,
+ 0, 0, 0, 0, 270, 271, 0, 1334, 0, 272,
0, 273, 274, 0, 275, 276, 0, 0, 0, 277,
0, 0, 278, 279, 280, 0, 0, 281, 0, 0,
282, 283, 0, 0, 0, 0, 0, 284, 285, 0,
@@ -8198,71 +8142,9 @@ static const yytype_int16 yytable[] =
0, 0, 0, 0, 0, 0, 478, 0, 0, 479,
0, 0, 0, 480, 481, 482, 483, 484, 485, 0,
0, 0, 0, 0, 0, 486, 487, 0, 488, 489,
- 490, 0, 0, 491, 0, 0, 0, 0, 0, 139,
- 2273, 140, 141, 142, 143, 144, 0, 0, 145, 0,
- 0, 0, 146, 541, 0, 147, 0, 148, 149, 150,
- 151, 152, 153, 154, 0, 155, 0, 0, 0, 156,
- 0, 0, 0, 157, 0, 0, 158, 159, 160, 0,
- 161, 0, 162, 163, 0, 0, 164, 0, 0, 165,
- 166, 0, 167, 168, 0, 169, 170, 0, 171, 172,
- 173, 174, 175, 176, 177, 0, 178, 179, 180, 181,
- 182, 183, 184, 185, 0, 186, 187, 188, 189, 190,
- 191, 192, 193, 0, 194, 195, 0, 196, 197, 198,
- 199, 200, 0, 201, 0, 0, 202, 0, 0, 203,
- 0, 0, 0, 204, 0, 0, 0, 205, 206, 207,
- 0, 0, 208, 0, 0, 0, 0, 209, 210, 0,
- 0, 0, 0, 211, 0, 212, 0, 0, 0, 213,
- 0, 214, 215, 216, 217, 0, 0, 0, 218, 0,
- 0, 219, 220, 221, 0, 0, 0, 222, 0, 223,
- 224, 0, 225, 226, 227, 0, 0, 228, 229, 0,
- 230, 231, 232, 233, 234, 235, 0, 0, 236, 237,
- 238, 0, 0, 239, 240, 0, 241, 242, 243, 0,
- 0, 244, 0, 0, 0, 245, 0, 246, 0, 247,
- 0, 248, 249, 250, 251, 252, 253, 0, 254, 0,
- 0, 0, 255, 256, 257, 0, 258, 0, 0, 0,
- 259, 260, 0, 0, 0, 261, 262, 263, 264, 0,
- 0, 265, 266, 267, 0, 268, 0, 269, 0, 0,
- 0, 0, 270, 271, 0, 0, 0, 272, 0, 273,
- 274, 0, 275, 276, 0, 0, 0, 277, 0, 0,
- 278, 279, 280, 0, 0, 281, 0, 0, 282, 283,
- 0, 0, 0, 0, 0, 284, 285, 0, 286, 0,
- 287, 0, 288, 289, 0, 0, 0, 0, 0, 0,
- 0, 290, 291, 292, 293, 294, 295, 296, 297, 298,
- 299, 300, 301, 302, 0, 303, 304, 305, 0, 306,
- 307, 308, 309, 0, 310, 311, 0, 0, 0, 0,
- 312, 313, 314, 315, 316, 317, 0, 0, 318, 319,
- 0, 320, 0, 321, 0, 322, 323, 324, 325, 326,
- 327, 328, 329, 330, 331, 0, 0, 332, 333, 0,
- 0, 334, 335, 336, 337, 0, 0, 0, 338, 339,
- 0, 0, 0, 0, 340, 341, 342, 0, 343, 344,
- 345, 346, 0, 347, 348, 0, 0, 0, 0, 0,
- 0, 0, 0, 349, 350, 351, 0, 0, 352, 0,
- 353, 354, 355, 356, 357, 358, 359, 360, 361, 362,
- 363, 364, 0, 0, 365, 366, 367, 0, 368, 0,
- 369, 370, 371, 372, 373, 0, 374, 375, 376, 0,
- 0, 377, 0, 0, 0, 378, 379, 380, 381, 382,
- 0, 0, 383, 384, 385, 386, 387, 0, 388, 389,
- 0, 390, 391, 392, 0, 0, 393, 0, 394, 0,
- 395, 396, 0, 397, 398, 0, 0, 0, 399, 400,
- 401, 402, 403, 404, 405, 406, 407, 408, 0, 409,
- 410, 0, 0, 0, 411, 412, 413, 414, 0, 0,
- 0, 415, 0, 0, 0, 416, 0, 417, 418, 419,
- 420, 0, 421, 422, 423, 424, 425, 426, 0, 0,
- 0, 0, 0, 0, 427, 428, 0, 429, 0, 0,
- 430, 0, 0, 431, 432, 433, 0, 0, 434, 435,
- 0, 436, 437, 438, 439, 440, 441, 0, 0, 442,
- 443, 444, 445, 0, 446, 447, 0, 448, 0, 449,
- 450, 451, 452, 0, 0, 453, 454, 0, 455, 456,
- 457, 458, 0, 0, 0, 0, 0, 459, 460, 461,
- 0, 0, 0, 462, 463, 464, 465, 0, 466, 467,
- 0, 468, 469, 0, 470, 471, 0, 0, 472, 0,
- 0, 473, 0, 474, 0, 475, 476, 477, 0, 0,
- 0, 0, 0, 0, 478, 0, 0, 479, 0, 0,
- 0, 480, 481, 482, 483, 484, 485, 0, 0, 0,
- 0, 0, 0, 486, 487, 0, 488, 489, 490, 0,
- 0, 491, 0, 0, 0, 0, 139, 0, 140, 141,
- 142, 143, 144, 2516, 0, 145, 0, 0, 0, 146,
- 0, 2517, 147, 0, 148, 149, 150, 151, 152, 153,
+ 490, 0, 0, 491, 0, 0, 139, 0, 140, 141,
+ 142, 143, 144, 0, 0, 145, 0, 0, 0, 146,
+ 0, 0, 147, 539, 148, 149, 150, 151, 152, 153,
154, 0, 155, 0, 0, 0, 156, 0, 0, 0,
157, 0, 0, 158, 159, 160, 0, 161, 0, 162,
163, 0, 0, 164, 0, 0, 165, 166, 0, 167,
@@ -8322,70 +8204,132 @@ static const yytype_int16 yytable[] =
0, 478, 0, 0, 479, 0, 0, 0, 480, 481,
482, 483, 484, 485, 0, 0, 0, 0, 0, 0,
486, 487, 0, 488, 489, 490, 0, 0, 491, 0,
- 0, 0, 0, 139, 0, 140, 141, 142, 143, 144,
- 0, 0, 145, 0, 0, 0, 146, 4441, 782, 147,
- 0, 148, 149, 150, 151, 152, 153, 154, 0, 155,
- 0, 0, 0, 156, 0, 0, 0, 157, 0, 0,
- 158, 159, 160, 0, 161, 0, 162, 163, 0, 0,
- 164, 0, 0, 165, 166, 0, 167, 168, 0, 169,
- 170, 0, 171, 172, 173, 174, 175, 176, 177, 0,
- 178, 179, 180, 181, 182, 183, 184, 185, 0, 186,
- 187, 188, 189, 190, 191, 192, 193, 0, 194, 195,
- 0, 196, 197, 198, 199, 200, 0, 201, 0, 0,
- 202, 0, 0, 203, 0, 0, 0, 204, 0, 0,
- 0, 205, 206, 207, 0, 0, 208, 0, 0, 0,
- 0, 209, 210, 0, 0, 0, 0, 211, 0, 212,
- 0, 0, 0, 213, 0, 214, 215, 216, 217, 0,
- 0, 0, 218, 0, 0, 219, 220, 221, 0, 0,
- 0, 222, 0, 223, 224, 0, 225, 226, 227, 0,
- 0, 228, 229, 0, 230, 231, 232, 233, 234, 235,
- 0, 0, 236, 237, 238, 0, 0, 239, 240, 0,
- 241, 242, 243, 0, 0, 244, 0, 0, 0, 245,
- 0, 246, 0, 247, 0, 248, 249, 250, 251, 252,
- 253, 0, 254, 0, 0, 0, 255, 256, 257, 0,
- 258, 0, 0, 0, 259, 260, 0, 0, 0, 261,
- 262, 263, 264, 0, 0, 265, 266, 267, 0, 268,
- 0, 269, 0, 0, 0, 0, 270, 271, 0, 0,
- 0, 272, 0, 273, 274, 0, 275, 276, 0, 0,
- 0, 277, 0, 0, 278, 279, 280, 0, 0, 281,
- 0, 0, 282, 283, 0, 0, 0, 0, 0, 284,
- 285, 0, 286, 0, 287, 0, 288, 289, 0, 0,
- 0, 0, 0, 0, 0, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 299, 300, 301, 302, 0, 303,
- 304, 305, 0, 306, 307, 308, 309, 0, 310, 311,
- 0, 0, 0, 0, 312, 313, 314, 315, 316, 317,
- 0, 0, 318, 319, 0, 320, 0, 321, 0, 322,
- 323, 324, 325, 326, 327, 328, 329, 330, 331, 0,
- 0, 332, 333, 0, 0, 334, 335, 336, 337, 0,
- 0, 0, 338, 339, 0, 0, 0, 0, 340, 341,
- 342, 0, 343, 344, 345, 346, 0, 347, 348, 0,
- 0, 0, 0, 0, 0, 0, 0, 349, 350, 351,
- 0, 0, 352, 0, 353, 354, 355, 356, 357, 358,
- 359, 360, 361, 362, 363, 364, 0, 0, 365, 366,
- 367, 0, 368, 0, 369, 370, 371, 372, 373, 0,
- 374, 375, 376, 0, 0, 377, 0, 0, 0, 378,
- 379, 380, 381, 382, 0, 0, 383, 384, 385, 386,
- 387, 0, 388, 389, 0, 390, 391, 392, 0, 0,
- 393, 0, 394, 0, 395, 396, 0, 397, 398, 0,
- 0, 0, 399, 400, 401, 402, 403, 404, 405, 406,
- 407, 408, 0, 409, 410, 0, 0, 0, 411, 412,
- 413, 414, 0, 0, 0, 415, 0, 0, 0, 416,
- 0, 417, 418, 419, 420, 0, 421, 422, 423, 424,
- 425, 426, 0, 0, 0, 0, 0, 0, 427, 428,
- 0, 429, 0, 0, 430, 0, 0, 431, 432, 433,
- 0, 0, 434, 435, 0, 436, 437, 438, 439, 440,
- 441, 0, 0, 442, 443, 444, 445, 0, 446, 447,
- 0, 448, 0, 449, 450, 451, 452, 0, 0, 453,
- 454, 0, 455, 456, 457, 458, 0, 0, 0, 0,
- 0, 459, 460, 461, 0, 0, 0, 462, 463, 464,
- 465, 0, 466, 467, 0, 468, 469, 0, 470, 471,
- 0, 0, 472, 0, 0, 473, 0, 474, 0, 475,
- 476, 477, 0, 0, 0, 0, 0, 0, 478, 0,
- 0, 479, 0, 0, 0, 480, 481, 482, 483, 484,
- 485, 0, 0, 0, 0, 0, 0, 486, 487, 0,
- 488, 489, 490, 0, 0, 491, 0, 0, 139, 0,
+ 0, 0, 0, 0, 139, 2280, 140, 141, 142, 143,
+ 144, 0, 0, 145, 0, 0, 0, 146, 539, 0,
+ 147, 0, 148, 149, 150, 151, 152, 153, 154, 0,
+ 155, 0, 0, 0, 156, 0, 0, 0, 157, 0,
+ 0, 158, 159, 160, 0, 161, 0, 162, 163, 0,
+ 0, 164, 0, 0, 165, 166, 0, 167, 168, 0,
+ 169, 170, 0, 171, 172, 173, 174, 175, 176, 177,
+ 0, 178, 179, 180, 181, 182, 183, 184, 185, 0,
+ 186, 187, 188, 189, 190, 191, 192, 193, 0, 194,
+ 195, 0, 196, 197, 198, 199, 200, 0, 201, 0,
+ 0, 202, 0, 0, 203, 0, 0, 0, 204, 0,
+ 0, 0, 205, 206, 207, 0, 0, 208, 0, 0,
+ 0, 0, 209, 210, 0, 0, 0, 0, 211, 0,
+ 212, 0, 0, 0, 213, 0, 214, 215, 216, 217,
+ 0, 0, 0, 218, 0, 0, 219, 220, 221, 0,
+ 0, 0, 222, 0, 223, 224, 0, 225, 226, 227,
+ 0, 0, 228, 229, 0, 230, 231, 232, 233, 234,
+ 235, 0, 0, 236, 237, 238, 0, 0, 239, 240,
+ 0, 241, 242, 243, 0, 0, 244, 0, 0, 0,
+ 245, 0, 246, 0, 247, 0, 248, 249, 250, 251,
+ 252, 253, 0, 254, 0, 0, 0, 255, 256, 257,
+ 0, 258, 0, 0, 0, 259, 260, 0, 0, 0,
+ 261, 262, 263, 264, 0, 0, 265, 266, 267, 0,
+ 268, 0, 269, 0, 0, 0, 0, 270, 271, 0,
+ 0, 0, 272, 0, 273, 274, 0, 275, 276, 0,
+ 0, 0, 277, 0, 0, 278, 279, 280, 0, 0,
+ 281, 0, 0, 282, 283, 0, 0, 0, 0, 0,
+ 284, 285, 0, 286, 0, 287, 0, 288, 289, 0,
+ 0, 0, 0, 0, 0, 0, 290, 291, 292, 293,
+ 294, 295, 296, 297, 298, 299, 300, 301, 302, 0,
+ 303, 304, 305, 0, 306, 307, 308, 309, 0, 310,
+ 311, 0, 0, 0, 0, 312, 313, 314, 315, 316,
+ 317, 0, 0, 318, 319, 0, 320, 0, 321, 0,
+ 322, 323, 324, 325, 326, 327, 328, 329, 330, 331,
+ 0, 0, 332, 333, 0, 0, 334, 335, 336, 337,
+ 0, 0, 0, 338, 339, 0, 0, 0, 0, 340,
+ 341, 342, 0, 343, 344, 345, 346, 0, 347, 348,
+ 0, 0, 0, 0, 0, 0, 0, 0, 349, 350,
+ 351, 0, 0, 352, 0, 353, 354, 355, 356, 357,
+ 358, 359, 360, 361, 362, 363, 364, 0, 0, 365,
+ 366, 367, 0, 368, 0, 369, 370, 371, 372, 373,
+ 0, 374, 375, 376, 0, 0, 377, 0, 0, 0,
+ 378, 379, 380, 381, 382, 0, 0, 383, 384, 385,
+ 386, 387, 0, 388, 389, 0, 390, 391, 392, 0,
+ 0, 393, 0, 394, 0, 395, 396, 0, 397, 398,
+ 0, 0, 0, 399, 400, 401, 402, 403, 404, 405,
+ 406, 407, 408, 0, 409, 410, 0, 0, 0, 411,
+ 412, 413, 414, 0, 0, 0, 415, 0, 0, 0,
+ 416, 0, 417, 418, 419, 420, 0, 421, 422, 423,
+ 424, 425, 426, 0, 0, 0, 0, 0, 0, 427,
+ 428, 0, 429, 0, 0, 430, 0, 0, 431, 432,
+ 433, 0, 0, 434, 435, 0, 436, 437, 438, 439,
+ 440, 441, 0, 0, 442, 443, 444, 445, 0, 446,
+ 447, 0, 448, 0, 449, 450, 451, 452, 0, 0,
+ 453, 454, 0, 455, 456, 457, 458, 0, 0, 0,
+ 0, 0, 459, 460, 461, 0, 0, 0, 462, 463,
+ 464, 465, 0, 466, 467, 0, 468, 469, 0, 470,
+ 471, 0, 0, 472, 0, 0, 473, 0, 474, 0,
+ 475, 476, 477, 0, 0, 0, 0, 0, 0, 478,
+ 0, 0, 479, 0, 0, 0, 480, 481, 482, 483,
+ 484, 485, 0, 0, 0, 0, 0, 0, 486, 487,
+ 0, 488, 489, 490, 0, 0, 491, 0, 0, 0,
+ 0, 139, 0, 140, 141, 142, 143, 144, 2523, 0,
+ 145, 0, 0, 0, 146, 0, 2524, 147, 0, 148,
+ 149, 150, 151, 152, 153, 154, 0, 155, 0, 0,
+ 0, 156, 0, 0, 0, 157, 0, 0, 158, 159,
+ 160, 0, 161, 0, 162, 163, 0, 0, 164, 0,
+ 0, 165, 166, 0, 167, 168, 0, 169, 170, 0,
+ 171, 172, 173, 174, 175, 176, 177, 0, 178, 179,
+ 180, 181, 182, 183, 184, 185, 0, 186, 187, 188,
+ 189, 190, 191, 192, 193, 0, 194, 195, 0, 196,
+ 197, 198, 199, 200, 0, 201, 0, 0, 202, 0,
+ 0, 203, 0, 0, 0, 204, 0, 0, 0, 205,
+ 206, 207, 0, 0, 208, 0, 0, 0, 0, 209,
+ 210, 0, 0, 0, 0, 211, 0, 212, 0, 0,
+ 0, 213, 0, 214, 215, 216, 217, 0, 0, 0,
+ 218, 0, 0, 219, 220, 221, 0, 0, 0, 222,
+ 0, 223, 224, 0, 225, 226, 227, 0, 0, 228,
+ 229, 0, 230, 231, 232, 233, 234, 235, 0, 0,
+ 236, 237, 238, 0, 0, 239, 240, 0, 241, 242,
+ 243, 0, 0, 244, 0, 0, 0, 245, 0, 246,
+ 0, 247, 0, 248, 249, 250, 251, 252, 253, 0,
+ 254, 0, 0, 0, 255, 256, 257, 0, 258, 0,
+ 0, 0, 259, 260, 0, 0, 0, 261, 262, 263,
+ 264, 0, 0, 265, 266, 267, 0, 268, 0, 269,
+ 0, 0, 0, 0, 270, 271, 0, 0, 0, 272,
+ 0, 273, 274, 0, 275, 276, 0, 0, 0, 277,
+ 0, 0, 278, 279, 280, 0, 0, 281, 0, 0,
+ 282, 283, 0, 0, 0, 0, 0, 284, 285, 0,
+ 286, 0, 287, 0, 288, 289, 0, 0, 0, 0,
+ 0, 0, 0, 290, 291, 292, 293, 294, 295, 296,
+ 297, 298, 299, 300, 301, 302, 0, 303, 304, 305,
+ 0, 306, 307, 308, 309, 0, 310, 311, 0, 0,
+ 0, 0, 312, 313, 314, 315, 316, 317, 0, 0,
+ 318, 319, 0, 320, 0, 321, 0, 322, 323, 324,
+ 325, 326, 327, 328, 329, 330, 331, 0, 0, 332,
+ 333, 0, 0, 334, 335, 336, 337, 0, 0, 0,
+ 338, 339, 0, 0, 0, 0, 340, 341, 342, 0,
+ 343, 344, 345, 346, 0, 347, 348, 0, 0, 0,
+ 0, 0, 0, 0, 0, 349, 350, 351, 0, 0,
+ 352, 0, 353, 354, 355, 356, 357, 358, 359, 360,
+ 361, 362, 363, 364, 0, 0, 365, 366, 367, 0,
+ 368, 0, 369, 370, 371, 372, 373, 0, 374, 375,
+ 376, 0, 0, 377, 0, 0, 0, 378, 379, 380,
+ 381, 382, 0, 0, 383, 384, 385, 386, 387, 0,
+ 388, 389, 0, 390, 391, 392, 0, 0, 393, 0,
+ 394, 0, 395, 396, 0, 397, 398, 0, 0, 0,
+ 399, 400, 401, 402, 403, 404, 405, 406, 407, 408,
+ 0, 409, 410, 0, 0, 0, 411, 412, 413, 414,
+ 0, 0, 0, 415, 0, 0, 0, 416, 0, 417,
+ 418, 419, 420, 0, 421, 422, 423, 424, 425, 426,
+ 0, 0, 0, 0, 0, 0, 427, 428, 0, 429,
+ 0, 0, 430, 0, 0, 431, 432, 433, 0, 0,
+ 434, 435, 0, 436, 437, 438, 439, 440, 441, 0,
+ 0, 442, 443, 444, 445, 0, 446, 447, 0, 448,
+ 0, 449, 450, 451, 452, 0, 0, 453, 454, 0,
+ 455, 456, 457, 458, 0, 0, 0, 0, 0, 459,
+ 460, 461, 0, 0, 0, 462, 463, 464, 465, 0,
+ 466, 467, 0, 468, 469, 0, 470, 471, 0, 0,
+ 472, 0, 0, 473, 0, 474, 0, 475, 476, 477,
+ 0, 0, 0, 0, 0, 0, 478, 0, 0, 479,
+ 0, 0, 0, 480, 481, 482, 483, 484, 485, 0,
+ 0, 0, 0, 0, 0, 486, 487, 0, 488, 489,
+ 490, 0, 0, 491, 0, 0, 0, 0, 139, 0,
140, 141, 142, 143, 144, 0, 0, 145, 0, 0,
- 0, 146, 0, 0, 147, 541, 148, 149, 150, 151,
+ 0, 146, 4451, 782, 147, 0, 148, 149, 150, 151,
152, 153, 154, 0, 155, 0, 0, 0, 156, 0,
0, 0, 157, 0, 0, 158, 159, 160, 0, 161,
0, 162, 163, 0, 0, 164, 0, 0, 165, 166,
@@ -8400,7 +8344,7 @@ static const yytype_int16 yytable[] =
214, 215, 216, 217, 0, 0, 0, 218, 0, 0,
219, 220, 221, 0, 0, 0, 222, 0, 223, 224,
0, 225, 226, 227, 0, 0, 228, 229, 0, 230,
- 231, 232, 233, 234, 235, 0, 0, 236, 608, 238,
+ 231, 232, 233, 234, 235, 0, 0, 236, 237, 238,
0, 0, 239, 240, 0, 241, 242, 243, 0, 0,
244, 0, 0, 0, 245, 0, 246, 0, 247, 0,
248, 249, 250, 251, 252, 253, 0, 254, 0, 0,
@@ -8422,7 +8366,7 @@ static const yytype_int16 yytable[] =
0, 0, 0, 340, 341, 342, 0, 343, 344, 345,
346, 0, 347, 348, 0, 0, 0, 0, 0, 0,
0, 0, 349, 350, 351, 0, 0, 352, 0, 353,
- 354, 609, 356, 357, 358, 359, 360, 361, 362, 363,
+ 354, 355, 356, 357, 358, 359, 360, 361, 362, 363,
364, 0, 0, 365, 366, 367, 0, 368, 0, 369,
370, 371, 372, 373, 0, 374, 375, 376, 0, 0,
377, 0, 0, 0, 378, 379, 380, 381, 382, 0,
@@ -8447,7 +8391,7 @@ static const yytype_int16 yytable[] =
0, 0, 486, 487, 0, 488, 489, 490, 0, 0,
491, 0, 0, 139, 0, 140, 141, 142, 143, 144,
0, 0, 145, 0, 0, 0, 146, 0, 0, 147,
- 541, 148, 149, 150, 151, 152, 153, 154, 0, 155,
+ 539, 148, 149, 150, 151, 152, 153, 154, 0, 155,
0, 0, 0, 156, 0, 0, 0, 157, 0, 0,
158, 159, 160, 0, 161, 0, 162, 163, 0, 0,
164, 0, 0, 165, 166, 0, 167, 168, 0, 169,
@@ -8462,7 +8406,7 @@ static const yytype_int16 yytable[] =
0, 0, 218, 0, 0, 219, 220, 221, 0, 0,
0, 222, 0, 223, 224, 0, 225, 226, 227, 0,
0, 228, 229, 0, 230, 231, 232, 233, 234, 235,
- 0, 0, 236, 237, 238, 0, 0, 239, 240, 0,
+ 0, 0, 236, 606, 238, 0, 0, 239, 240, 0,
241, 242, 243, 0, 0, 244, 0, 0, 0, 245,
0, 246, 0, 247, 0, 248, 249, 250, 251, 252,
253, 0, 254, 0, 0, 0, 255, 256, 257, 0,
@@ -8483,7 +8427,7 @@ static const yytype_int16 yytable[] =
0, 0, 338, 339, 0, 0, 0, 0, 340, 341,
342, 0, 343, 344, 345, 346, 0, 347, 348, 0,
0, 0, 0, 0, 0, 0, 0, 349, 350, 351,
- 0, 0, 352, 0, 353, 354, 355, 356, 357, 358,
+ 0, 0, 352, 0, 353, 354, 607, 356, 357, 358,
359, 360, 361, 362, 363, 364, 0, 0, 365, 366,
367, 0, 368, 0, 369, 370, 371, 372, 373, 0,
374, 375, 376, 0, 0, 377, 0, 0, 0, 378,
@@ -8508,7 +8452,7 @@ static const yytype_int16 yytable[] =
485, 0, 0, 0, 0, 0, 0, 486, 487, 0,
488, 489, 490, 0, 0, 491, 0, 0, 139, 0,
140, 141, 142, 143, 144, 0, 0, 145, 0, 0,
- 0, 146, 0, 0, 147, 782, 148, 149, 150, 151,
+ 0, 146, 0, 0, 147, 539, 148, 149, 150, 151,
152, 153, 154, 0, 155, 0, 0, 0, 156, 0,
0, 0, 157, 0, 0, 158, 159, 160, 0, 161,
0, 162, 163, 0, 0, 164, 0, 0, 165, 166,
@@ -8570,7 +8514,7 @@ static const yytype_int16 yytable[] =
0, 0, 486, 487, 0, 488, 489, 490, 0, 0,
491, 0, 0, 139, 0, 140, 141, 142, 143, 144,
0, 0, 145, 0, 0, 0, 146, 0, 0, 147,
- 2517, 148, 149, 150, 151, 152, 153, 154, 0, 155,
+ 782, 148, 149, 150, 151, 152, 153, 154, 0, 155,
0, 0, 0, 156, 0, 0, 0, 157, 0, 0,
158, 159, 160, 0, 161, 0, 162, 163, 0, 0,
164, 0, 0, 165, 166, 0, 167, 168, 0, 169,
@@ -8594,7 +8538,7 @@ static const yytype_int16 yytable[] =
0, 269, 0, 0, 0, 0, 270, 271, 0, 0,
0, 272, 0, 273, 274, 0, 275, 276, 0, 0,
0, 277, 0, 0, 278, 279, 280, 0, 0, 281,
- 0, 0, 282, 283, 620, 0, 0, 0, 0, 284,
+ 0, 0, 282, 283, 0, 0, 0, 0, 0, 284,
285, 0, 286, 0, 287, 0, 288, 289, 0, 0,
0, 0, 0, 0, 0, 290, 291, 292, 293, 294,
295, 296, 297, 298, 299, 300, 301, 302, 0, 303,
@@ -8621,7 +8565,7 @@ static const yytype_int16 yytable[] =
0, 429, 0, 0, 430, 0, 0, 431, 432, 433,
0, 0, 434, 435, 0, 436, 437, 438, 439, 440,
441, 0, 0, 442, 443, 444, 445, 0, 446, 447,
- 0, 448, 0, 449, 450, 451, 452, 0, 136, 453,
+ 0, 448, 0, 449, 450, 451, 452, 0, 0, 453,
454, 0, 455, 456, 457, 458, 0, 0, 0, 0,
0, 459, 460, 461, 0, 0, 0, 462, 463, 464,
465, 0, 466, 467, 0, 468, 469, 0, 470, 471,
@@ -8629,193 +8573,132 @@ static const yytype_int16 yytable[] =
476, 477, 0, 0, 0, 0, 0, 0, 478, 0,
0, 479, 0, 0, 0, 480, 481, 482, 483, 484,
485, 0, 0, 0, 0, 0, 0, 486, 487, 0,
- 488, 489, 490, 0, 0, 491, 0, 139, 0, 140,
- 141, 142, 143, 144, 0, 0, 145, 0, 0, 0,
- 146, 0, 0, 147, 1696, 148, 149, 150, 151, 152,
- 153, 154, 0, 155, 0, 0, 0, 156, 0, 0,
- 0, 157, 0, 0, 158, 159, 160, 0, 161, 0,
- 162, 163, 0, 0, 164, 0, 0, 165, 166, 0,
- 167, 168, 0, 169, 170, 0, 171, 172, 173, 174,
- 175, 176, 177, 0, 178, 179, 180, 181, 182, 183,
- 184, 185, 0, 186, 187, 188, 189, 190, 191, 192,
- 193, 0, 194, 195, 0, 196, 197, 198, 199, 200,
- 0, 201, 0, 0, 202, 0, 0, 203, 0, 0,
- 0, 204, 0, 0, 0, 205, 206, 207, 0, 0,
- 208, 0, 0, 0, 0, 209, 210, 0, 0, 0,
- 0, 211, 0, 212, 0, 0, 0, 213, 0, 214,
- 215, 216, 217, 0, 0, 0, 218, 0, 0, 219,
- 220, 221, 0, 0, 0, 222, 0, 223, 224, 0,
- 225, 226, 227, 0, 0, 228, 229, 0, 230, 231,
- 232, 233, 234, 235, 0, 0, 236, 237, 238, 0,
- 0, 239, 240, 0, 241, 242, 243, 0, 0, 244,
- 0, 0, 0, 245, 0, 246, 0, 247, 0, 248,
- 249, 250, 251, 252, 253, 0, 254, 0, 0, 0,
- 255, 256, 257, 0, 258, 0, 0, 0, 259, 260,
- 0, 0, 0, 261, 262, 263, 264, 0, 0, 265,
- 266, 267, 0, 268, 0, 269, 0, 0, 0, 0,
- 270, 271, 0, 0, 0, 272, 0, 273, 274, 0,
- 275, 276, 0, 0, 0, 277, 0, 0, 278, 279,
- 280, 0, 0, 281, 0, 0, 282, 283, 620, 0,
- 0, 0, 0, 284, 285, 0, 286, 0, 287, 0,
- 288, 289, 0, 0, 0, 0, 0, 0, 0, 290,
- 291, 292, 293, 294, 295, 296, 297, 298, 299, 300,
- 301, 302, 0, 303, 304, 305, 0, 306, 307, 308,
- 309, 0, 310, 311, 0, 0, 0, 0, 312, 313,
- 314, 315, 316, 317, 0, 0, 318, 319, 0, 320,
- 0, 321, 0, 322, 323, 324, 325, 326, 327, 328,
- 329, 330, 331, 0, 0, 332, 333, 0, 0, 334,
- 335, 336, 337, 0, 0, 0, 338, 339, 0, 0,
- 0, 0, 340, 341, 342, 0, 343, 344, 345, 346,
- 0, 347, 348, 0, 0, 0, 0, 0, 0, 0,
- 0, 349, 350, 351, 0, 0, 352, 0, 353, 354,
- 355, 356, 357, 358, 359, 360, 361, 362, 363, 364,
- 0, 0, 365, 366, 367, 0, 368, 0, 369, 370,
- 371, 372, 373, 0, 374, 375, 376, 0, 0, 377,
- 0, 0, 0, 378, 379, 380, 381, 382, 0, 0,
- 383, 384, 385, 386, 387, 0, 388, 389, 0, 390,
- 391, 392, 0, 0, 393, 0, 394, 0, 395, 396,
- 0, 397, 398, 0, 0, 0, 399, 400, 401, 402,
- 403, 404, 405, 406, 407, 408, 0, 409, 410, 0,
- 0, 0, 411, 412, 413, 414, 0, 0, 0, 415,
- 0, 0, 0, 416, 0, 417, 418, 419, 420, 0,
- 421, 422, 423, 424, 425, 426, 0, 0, 0, 0,
- 0, 0, 427, 428, 0, 429, 0, 0, 430, 0,
- 0, 431, 432, 433, 0, 0, 434, 435, 0, 436,
- 437, 438, 439, 440, 441, 0, 0, 442, 443, 444,
- 445, 0, 446, 447, 0, 448, 0, 449, 450, 451,
- 452, 0, 136, 453, 454, 0, 455, 456, 457, 458,
- 0, 0, 0, 0, 0, 459, 460, 461, 0, 0,
- 0, 462, 463, 464, 465, 0, 466, 467, 0, 468,
- 469, 0, 470, 471, 0, 0, 472, 0, 0, 473,
- 0, 474, 0, 475, 476, 477, 0, 0, 0, 0,
- 0, 0, 478, 0, 0, 479, 0, 0, 0, 480,
- 481, 482, 483, 484, 485, 0, 0, 0, 0, 0,
- 0, 486, 487, 0, 488, 489, 490, 0, 0, 491,
- 0, 139, 0, 140, 141, 142, 143, 144, 0, 0,
- 145, 0, 0, 0, 146, 0, 0, 147, 2797, 148,
- 149, 150, 151, 152, 153, 154, 0, 155, 0, 0,
- 0, 156, 0, 0, 0, 157, 0, 0, 158, 159,
- 160, 0, 161, 0, 162, 163, 0, 0, 164, 0,
- 0, 165, 166, 0, 167, 168, 0, 169, 170, 0,
- 171, 172, 173, 174, 175, 176, 177, 0, 178, 179,
- 180, 181, 182, 183, 184, 185, 0, 186, 187, 188,
- 189, 190, 191, 192, 193, 0, 194, 195, 0, 196,
- 197, 198, 199, 200, 0, 201, 0, 0, 202, 0,
- 0, 203, 0, 0, 0, 204, 0, 0, 0, 205,
- 206, 207, 0, 0, 208, 0, 0, 0, 0, 209,
- 210, 0, 0, 0, 0, 211, 0, 212, 0, 0,
- 0, 213, 0, 214, 215, 216, 217, 0, 0, 0,
- 218, 0, 0, 219, 220, 221, 0, 0, 0, 222,
- 0, 223, 224, 0, 225, 226, 227, 0, 0, 228,
- 229, 0, 230, 231, 232, 233, 234, 235, 0, 0,
- 236, 237, 238, 0, 0, 239, 240, 0, 241, 242,
- 243, 0, 0, 244, 0, 0, 0, 245, 0, 246,
- 0, 247, 0, 248, 249, 250, 251, 252, 253, 0,
- 254, 0, 0, 0, 255, 256, 257, 0, 258, 0,
- 0, 0, 259, 260, 0, 0, 0, 261, 262, 263,
- 264, 0, 0, 265, 266, 267, 0, 268, 0, 269,
- 0, 0, 0, 0, 270, 271, 0, 0, 0, 272,
- 0, 273, 274, 0, 275, 276, 0, 0, 0, 277,
- 0, 0, 278, 279, 280, 0, 0, 281, 0, 0,
- 282, 283, 620, 0, 0, 0, 0, 284, 285, 0,
- 286, 0, 287, 0, 288, 289, 0, 0, 0, 0,
- 0, 0, 0, 290, 291, 292, 293, 294, 295, 296,
- 297, 298, 299, 300, 301, 302, 0, 303, 304, 305,
- 0, 306, 307, 308, 309, 0, 310, 311, 0, 0,
- 0, 0, 312, 313, 314, 315, 316, 317, 0, 0,
- 318, 319, 0, 320, 0, 321, 0, 322, 323, 324,
- 325, 326, 327, 328, 329, 330, 331, 0, 0, 332,
- 333, 0, 0, 334, 335, 336, 337, 0, 0, 0,
- 338, 339, 0, 0, 0, 0, 340, 341, 342, 0,
- 343, 344, 345, 346, 0, 347, 348, 0, 0, 0,
- 0, 0, 0, 0, 0, 349, 350, 351, 0, 0,
- 352, 0, 353, 354, 355, 356, 357, 358, 359, 360,
- 361, 362, 363, 364, 0, 0, 365, 366, 367, 0,
- 368, 0, 369, 370, 371, 372, 373, 0, 374, 375,
- 376, 0, 0, 377, 0, 0, 0, 378, 379, 380,
- 381, 382, 0, 0, 383, 384, 385, 386, 387, 0,
- 388, 389, 0, 390, 391, 392, 0, 0, 393, 0,
- 394, 0, 395, 396, 0, 397, 398, 0, 0, 0,
- 399, 400, 401, 402, 403, 404, 405, 406, 407, 408,
- 0, 409, 410, 0, 0, 0, 411, 412, 413, 414,
- 0, 0, 0, 415, 0, 0, 0, 416, 0, 417,
- 418, 419, 420, 0, 421, 422, 423, 424, 425, 426,
- 0, 0, 0, 0, 0, 0, 427, 428, 0, 429,
- 0, 0, 430, 0, 0, 431, 432, 433, 0, 0,
- 434, 435, 0, 436, 437, 438, 439, 440, 441, 0,
- 0, 442, 443, 444, 445, 0, 446, 447, 0, 448,
- 0, 449, 450, 451, 452, 0, 136, 453, 454, 0,
- 455, 456, 457, 458, 0, 0, 0, 0, 0, 459,
- 460, 461, 0, 0, 0, 462, 463, 464, 465, 0,
- 466, 467, 0, 468, 469, 0, 470, 471, 0, 0,
- 472, 0, 0, 473, 0, 474, 0, 475, 476, 477,
- 0, 0, 0, 0, 0, 0, 478, 0, 0, 479,
- 0, 0, 0, 480, 481, 482, 483, 484, 485, 0,
- 0, 0, 0, 0, 0, 486, 487, 0, 488, 489,
- 490, 0, 0, 491, 0, 139, 0, 140, 141, 142,
- 143, 144, 0, 0, 145, 0, 0, 0, 146, 0,
- 0, 0, 3454, 148, 149, 150, 151, 152, 153, 0,
- 0, -329, 0, 0, 0, 156, 0, 0, 0, 157,
- 0, 0, 158, 159, 160, 0, 161, 0, 0, 0,
- 0, 0, 164, 3892, 0, 165, 166, 0, 167, 0,
- 0, 0, 0, 0, 171, 172, 173, 174, 3893, 176,
- 177, 0, 178, 179, 0, 0, 0, 0, 0, 0,
- 0, 186, 0, 188, 0, 190, 191, 192, 193, 0,
- 194, 195, 0, 196, 197, 198, 0, 200, 0, 201,
- 0, 0, 202, 0, 0, 203, 0, 0, 0, 204,
- 0, 0, 0, 205, 206, 207, 0, 0, 208, 0,
- 0, 0, 0, 209, 0, 0, 0, 0, 0, 211,
- 0, 212, 0, 0, 0, 213, 0, 214, 215, 216,
- 217, 0, 0, 0, 0, 0, 0, 219, 220, 221,
- 0, 0, 0, 222, 0, 0, 224, 0, 225, 226,
- 227, 0, 0, 228, 229, 0, 230, 231, 232, 233,
- 0, 0, 0, 0, 236, 237, 238, 0, 0, 239,
- 240, 3894, 241, 242, 243, 0, 0, 0, 0, 0,
- 0, 245, 0, 246, 0, 247, 0, 248, 249, 250,
- 251, 252, 253, 0, 254, 0, 0, 0, 0, 256,
- 257, 0, 0, 0, 0, 0, 0, 260, 0, 0,
- 0, 261, 262, 263, 264, 3895, 0, 265, 266, 267,
- 0, 268, 0, 269, 0, 0, 0, 0, 270, 0,
- 0, 0, 0, 272, 0, 273, 274, 0, 275, 276,
- 3896, 0, 0, 277, 0, 0, 0, 279, 280, 0,
- 0, 281, 3897, 0, 282, 283, 0, 0, 0, 0,
- 0, 284, 285, 0, 286, 0, 287, 0, 288, 289,
- 0, 0, 0, 0, -284, 0, 0, 290, 291, 292,
- 293, 294, 295, 296, 297, 298, 299, 300, 301, 302,
- 0, 303, 304, 305, 0, 306, 307, 308, 309, 0,
- 310, 311, 0, 0, 0, 0, 312, 313, 314, 315,
- 316, 317, 0, 0, 318, 319, 0, 320, 0, 321,
- 0, 322, 323, 324, 325, 326, 327, 328, 329, 330,
- 331, 0, 0, 332, 333, 0, 0, 334, 335, 336,
- 337, 0, 0, 0, 0, 339, 0, 0, 0, 0,
- 340, 341, 342, 0, 343, 344, 345, 3898, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 350, 351, 0, 0, 0, 0, 353, 354, 355, 0,
- 357, 358, 359, 360, 361, 362, 363, 0, 0, 0,
- 0, 366, 367, 0, 368, 0, 369, 370, 371, 372,
- 373, 0, 374, 375, 376, 0, 0, 377, 0, 0,
- 0, 378, 379, 380, 381, 382, 0, 0, 383, 384,
- 385, 386, 387, 0, 388, 0, 0, 390, 0, 392,
- -284, 0, 393, 0, 0, 0, 395, 0, 0, 397,
- 398, 3899, 0, 0, 0, 400, 401, 402, 403, 404,
- 405, 0, 407, 408, 0, 409, 0, 0, 0, 0,
- 411, 412, 413, 0, 0, 0, 0, 415, 0, 0,
- 0, 416, 0, 0, 418, 0, 420, 0, 421, 0,
- 423, 0, 425, 426, 0, 0, 0, 0, 0, 0,
- 427, 428, 0, 429, 0, 0, 430, 0, 0, 431,
- 0, 433, 0, 0, 0, 435, 0, 436, 437, 438,
- 439, 440, 441, 0, 0, 442, 443, 444, 445, 0,
- 446, 447, 0, 448, 0, 449, 450, 451, 452, 0,
- 0, 453, 454, 0, 455, 456, 457, 458, 0, 0,
- 0, 0, 0, 459, 460, 461, 0, 0, 0, 0,
- 463, 464, 465, 0, 466, 467, 0, 468, 469, 0,
- 0, 0, 0, 0, 472, 0, 0, 473, 0, 0,
- 0, 475, 476, 477, 0, 0, 0, 0, 0, 0,
- 478, 0, 0, 479, 0, 0, 0, 480, 481, 482,
- 483, 484, 485, 0, 0, -284, 0, 0, 0, 486,
- 0, 0, 488, 0, 490, 0, 139, 491, 140, 141,
+ 488, 489, 490, 0, 0, 491, 0, 0, 139, 0,
+ 140, 141, 142, 143, 144, 0, 0, 145, 0, 0,
+ 0, 146, 0, 0, 147, 2524, 148, 149, 150, 151,
+ 152, 153, 154, 0, 155, 0, 0, 0, 156, 0,
+ 0, 0, 157, 0, 0, 158, 159, 160, 0, 161,
+ 0, 162, 163, 0, 0, 164, 0, 0, 165, 166,
+ 0, 167, 168, 0, 169, 170, 0, 171, 172, 173,
+ 174, 175, 176, 177, 0, 178, 179, 180, 181, 182,
+ 183, 184, 185, 0, 186, 187, 188, 189, 190, 191,
+ 192, 193, 0, 194, 195, 0, 196, 197, 198, 199,
+ 200, 0, 201, 0, 0, 202, 0, 0, 203, 0,
+ 0, 0, 204, 0, 0, 0, 205, 206, 207, 0,
+ 0, 208, 0, 0, 0, 0, 209, 210, 0, 0,
+ 0, 0, 211, 0, 212, 0, 0, 0, 213, 0,
+ 214, 215, 216, 217, 0, 0, 0, 218, 0, 0,
+ 219, 220, 221, 0, 0, 0, 222, 0, 223, 224,
+ 0, 225, 226, 227, 0, 0, 228, 229, 0, 230,
+ 231, 232, 233, 234, 235, 0, 0, 236, 237, 238,
+ 0, 0, 239, 240, 0, 241, 242, 243, 0, 0,
+ 244, 0, 0, 0, 245, 0, 246, 0, 247, 0,
+ 248, 249, 250, 251, 252, 253, 0, 254, 0, 0,
+ 0, 255, 256, 257, 0, 258, 0, 0, 0, 259,
+ 260, 0, 0, 0, 261, 262, 263, 264, 0, 0,
+ 265, 266, 267, 0, 268, 0, 269, 0, 0, 0,
+ 0, 270, 271, 0, 0, 0, 272, 0, 273, 274,
+ 0, 275, 276, 0, 0, 0, 277, 0, 0, 278,
+ 279, 280, 0, 0, 281, 0, 0, 282, 283, 618,
+ 0, 0, 0, 0, 284, 285, 0, 286, 0, 287,
+ 0, 288, 289, 0, 0, 0, 0, 0, 0, 0,
+ 290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
+ 300, 301, 302, 0, 303, 304, 305, 0, 306, 307,
+ 308, 309, 0, 310, 311, 0, 0, 0, 0, 312,
+ 313, 314, 315, 316, 317, 0, 0, 318, 319, 0,
+ 320, 0, 321, 0, 322, 323, 324, 325, 326, 327,
+ 328, 329, 330, 331, 0, 0, 332, 333, 0, 0,
+ 334, 335, 336, 337, 0, 0, 0, 338, 339, 0,
+ 0, 0, 0, 340, 341, 342, 0, 343, 344, 345,
+ 346, 0, 347, 348, 0, 0, 0, 0, 0, 0,
+ 0, 0, 349, 350, 351, 0, 0, 352, 0, 353,
+ 354, 355, 356, 357, 358, 359, 360, 361, 362, 363,
+ 364, 0, 0, 365, 366, 367, 0, 368, 0, 369,
+ 370, 371, 372, 373, 0, 374, 375, 376, 0, 0,
+ 377, 0, 0, 0, 378, 379, 380, 381, 382, 0,
+ 0, 383, 384, 385, 386, 387, 0, 388, 389, 0,
+ 390, 391, 392, 0, 0, 393, 0, 394, 0, 395,
+ 396, 0, 397, 398, 0, 0, 0, 399, 400, 401,
+ 402, 403, 404, 405, 406, 407, 408, 0, 409, 410,
+ 0, 0, 0, 411, 412, 413, 414, 0, 0, 0,
+ 415, 0, 0, 0, 416, 0, 417, 418, 419, 420,
+ 0, 421, 422, 423, 424, 425, 426, 0, 0, 0,
+ 0, 0, 0, 427, 428, 0, 429, 0, 0, 430,
+ 0, 0, 431, 432, 433, 0, 0, 434, 435, 0,
+ 436, 437, 438, 439, 440, 441, 0, 0, 442, 443,
+ 444, 445, 0, 446, 447, 0, 448, 0, 449, 450,
+ 451, 452, 0, 136, 453, 454, 0, 455, 456, 457,
+ 458, 0, 0, 0, 0, 0, 459, 460, 461, 0,
+ 0, 0, 462, 463, 464, 465, 0, 466, 467, 0,
+ 468, 469, 0, 470, 471, 0, 0, 472, 0, 0,
+ 473, 0, 474, 0, 475, 476, 477, 0, 0, 0,
+ 0, 0, 0, 478, 0, 0, 479, 0, 0, 0,
+ 480, 481, 482, 483, 484, 485, 0, 0, 0, 0,
+ 0, 0, 486, 487, 0, 488, 489, 490, 0, 0,
+ 491, 0, 139, 0, 140, 141, 142, 143, 144, 0,
+ 0, 145, 0, 0, 0, 146, 0, 0, 147, 1700,
+ 148, 149, 150, 151, 152, 153, 154, 0, 155, 0,
+ 0, 0, 156, 0, 0, 0, 157, 0, 0, 158,
+ 159, 160, 0, 161, 0, 162, 163, 0, 0, 164,
+ 0, 0, 165, 166, 0, 167, 168, 0, 169, 170,
+ 0, 171, 172, 173, 174, 175, 176, 177, 0, 178,
+ 179, 180, 181, 182, 183, 184, 185, 0, 186, 187,
+ 188, 189, 190, 191, 192, 193, 0, 194, 195, 0,
+ 196, 197, 198, 199, 200, 0, 201, 0, 0, 202,
+ 0, 0, 203, 0, 0, 0, 204, 0, 0, 0,
+ 205, 206, 207, 0, 0, 208, 0, 0, 0, 0,
+ 209, 210, 0, 0, 0, 0, 211, 0, 212, 0,
+ 0, 0, 213, 0, 214, 215, 216, 217, 0, 0,
+ 0, 218, 0, 0, 219, 220, 221, 0, 0, 0,
+ 222, 0, 223, 224, 0, 225, 226, 227, 0, 0,
+ 228, 229, 0, 230, 231, 232, 233, 234, 235, 0,
+ 0, 236, 237, 238, 0, 0, 239, 240, 0, 241,
+ 242, 243, 0, 0, 244, 0, 0, 0, 245, 0,
+ 246, 0, 247, 0, 248, 249, 250, 251, 252, 253,
+ 0, 254, 0, 0, 0, 255, 256, 257, 0, 258,
+ 0, 0, 0, 259, 260, 0, 0, 0, 261, 262,
+ 263, 264, 0, 0, 265, 266, 267, 0, 268, 0,
+ 269, 0, 0, 0, 0, 270, 271, 0, 0, 0,
+ 272, 0, 273, 274, 0, 275, 276, 0, 0, 0,
+ 277, 0, 0, 278, 279, 280, 0, 0, 281, 0,
+ 0, 282, 283, 618, 0, 0, 0, 0, 284, 285,
+ 0, 286, 0, 287, 0, 288, 289, 0, 0, 0,
+ 0, 0, 0, 0, 290, 291, 292, 293, 294, 295,
+ 296, 297, 298, 299, 300, 301, 302, 0, 303, 304,
+ 305, 0, 306, 307, 308, 309, 0, 310, 311, 0,
+ 0, 0, 0, 312, 313, 314, 315, 316, 317, 0,
+ 0, 318, 319, 0, 320, 0, 321, 0, 322, 323,
+ 324, 325, 326, 327, 328, 329, 330, 331, 0, 0,
+ 332, 333, 0, 0, 334, 335, 336, 337, 0, 0,
+ 0, 338, 339, 0, 0, 0, 0, 340, 341, 342,
+ 0, 343, 344, 345, 346, 0, 347, 348, 0, 0,
+ 0, 0, 0, 0, 0, 0, 349, 350, 351, 0,
+ 0, 352, 0, 353, 354, 355, 356, 357, 358, 359,
+ 360, 361, 362, 363, 364, 0, 0, 365, 366, 367,
+ 0, 368, 0, 369, 370, 371, 372, 373, 0, 374,
+ 375, 376, 0, 0, 377, 0, 0, 0, 378, 379,
+ 380, 381, 382, 0, 0, 383, 384, 385, 386, 387,
+ 0, 388, 389, 0, 390, 391, 392, 0, 0, 393,
+ 0, 394, 0, 395, 396, 0, 397, 398, 0, 0,
+ 0, 399, 400, 401, 402, 403, 404, 405, 406, 407,
+ 408, 0, 409, 410, 0, 0, 0, 411, 412, 413,
+ 414, 0, 0, 0, 415, 0, 0, 0, 416, 0,
+ 417, 418, 419, 420, 0, 421, 422, 423, 424, 425,
+ 426, 0, 0, 0, 0, 0, 0, 427, 428, 0,
+ 429, 0, 0, 430, 0, 0, 431, 432, 433, 0,
+ 0, 434, 435, 0, 436, 437, 438, 439, 440, 441,
+ 0, 0, 442, 443, 444, 445, 0, 446, 447, 0,
+ 448, 0, 449, 450, 451, 452, 0, 136, 453, 454,
+ 0, 455, 456, 457, 458, 0, 0, 0, 0, 0,
+ 459, 460, 461, 0, 0, 0, 462, 463, 464, 465,
+ 0, 466, 467, 0, 468, 469, 0, 470, 471, 0,
+ 0, 472, 0, 0, 473, 0, 474, 0, 475, 476,
+ 477, 0, 0, 0, 0, 0, 0, 478, 0, 0,
+ 479, 0, 0, 0, 480, 481, 482, 483, 484, 485,
+ 0, 0, 0, 0, 0, 0, 486, 487, 0, 488,
+ 489, 490, 0, 0, 491, 0, 139, 0, 140, 141,
142, 143, 144, 0, 0, 145, 0, 0, 0, 146,
- 0, 4447, 147, 0, 148, 149, 150, 151, 152, 153,
+ 0, 0, 147, 2806, 148, 149, 150, 151, 152, 153,
154, 0, 155, 0, 0, 0, 156, 0, 0, 0,
157, 0, 0, 158, 159, 160, 0, 161, 0, 162,
163, 0, 0, 164, 0, 0, 165, 166, 0, 167,
@@ -8823,7 +8706,7 @@ static const yytype_int16 yytable[] =
176, 177, 0, 178, 179, 180, 181, 182, 183, 184,
185, 0, 186, 187, 188, 189, 190, 191, 192, 193,
0, 194, 195, 0, 196, 197, 198, 199, 200, 0,
- 201, 0, 0, 202, 0, 0, 203, 0, 995, 0,
+ 201, 0, 0, 202, 0, 0, 203, 0, 0, 0,
204, 0, 0, 0, 205, 206, 207, 0, 0, 208,
0, 0, 0, 0, 209, 210, 0, 0, 0, 0,
211, 0, 212, 0, 0, 0, 213, 0, 214, 215,
@@ -8839,7 +8722,7 @@ static const yytype_int16 yytable[] =
267, 0, 268, 0, 269, 0, 0, 0, 0, 270,
271, 0, 0, 0, 272, 0, 273, 274, 0, 275,
276, 0, 0, 0, 277, 0, 0, 278, 279, 280,
- 0, 0, 281, 0, 0, 282, 283, 620, 0, 0,
+ 0, 0, 281, 0, 0, 282, 283, 618, 0, 0,
0, 0, 284, 285, 0, 286, 0, 287, 0, 288,
289, 0, 0, 0, 0, 0, 0, 0, 290, 291,
292, 293, 294, 295, 296, 297, 298, 299, 300, 301,
@@ -8874,131 +8757,70 @@ static const yytype_int16 yytable[] =
474, 0, 475, 476, 477, 0, 0, 0, 0, 0,
0, 478, 0, 0, 479, 0, 0, 0, 480, 481,
482, 483, 484, 485, 0, 0, 0, 0, 0, 0,
- 486, 487, 0, 488, 489, 490, 0, 0, 491, 139,
- 0, 140, 141, 142, 143, 144, 0, 0, 145, 0,
- 1174, 0, 146, 0, 0, 147, 0, 148, 149, 150,
- 151, 152, 153, 154, 0, 155, 0, 0, 0, 156,
- 0, 0, 0, 157, 0, 0, 158, 159, 160, 0,
- 161, 0, 162, 163, 0, 0, 164, 0, 0, 165,
- 166, 0, 167, 168, 0, 169, 170, 0, 171, 172,
- 173, 174, 175, 176, 177, 0, 178, 179, 180, 181,
- 182, 183, 184, 185, 0, 186, 187, 188, 189, 190,
- 191, 192, 193, 0, 194, 195, 0, 196, 197, 198,
- 199, 200, 0, 201, 0, 0, 202, 0, 0, 203,
- 0, 0, 0, 204, 0, 0, 0, 205, 206, 207,
- 0, 0, 208, 0, 0, 0, 0, 209, 210, 0,
- 0, 0, 0, 211, 0, 212, 0, 0, 0, 213,
- 0, 214, 215, 216, 217, 0, 0, 0, 218, 0,
- 0, 219, 220, 221, 0, 0, 0, 222, 0, 223,
- 224, 0, 225, 226, 227, 0, 0, 228, 229, 0,
- 230, 231, 232, 233, 234, 235, 0, 0, 236, 237,
- 238, 0, 0, 239, 240, 0, 241, 242, 243, 0,
- 0, 244, 0, 0, 0, 245, 0, 246, 0, 247,
- 0, 248, 249, 250, 251, 252, 253, 0, 254, 0,
- 0, 0, 255, 256, 257, 0, 258, 0, 0, 0,
- 259, 260, 0, 0, 0, 261, 262, 263, 264, 0,
- 0, 265, 266, 267, 0, 268, 0, 269, 0, 0,
- 0, 0, 270, 271, 0, 0, 0, 272, 0, 273,
- 274, 0, 275, 276, 0, 0, 0, 277, 0, 0,
- 278, 279, 280, 0, 0, 281, 0, 0, 282, 283,
- 0, 0, 0, 0, 0, 284, 285, 0, 286, 0,
- 287, 0, 288, 289, 0, 0, 0, 0, 0, 0,
- 0, 290, 291, 292, 293, 294, 295, 296, 297, 298,
- 299, 300, 301, 302, 0, 303, 304, 305, 0, 306,
- 307, 308, 309, 0, 310, 311, 0, 0, 0, 0,
- 312, 313, 314, 315, 316, 317, 0, 0, 318, 319,
- 0, 320, 0, 321, 0, 322, 323, 324, 325, 326,
- 327, 328, 329, 330, 331, 0, 0, 332, 333, 0,
- 0, 334, 335, 336, 337, 0, 0, 0, 338, 339,
- 0, 0, 0, 0, 340, 341, 342, 0, 343, 344,
- 345, 346, 0, 347, 348, 0, 0, 0, 0, 0,
- 0, 0, 0, 349, 350, 351, 0, 0, 352, 0,
- 353, 354, 355, 356, 357, 358, 359, 360, 361, 362,
- 363, 364, 0, 0, 365, 366, 367, 0, 368, 0,
- 369, 370, 371, 372, 373, 0, 374, 375, 376, 0,
- 0, 377, 0, 0, 0, 378, 379, 380, 381, 382,
- 0, 0, 383, 384, 385, 386, 387, 0, 388, 389,
- 0, 390, 391, 392, 0, 0, 393, 0, 394, 0,
- 395, 396, 0, 397, 398, 0, 0, 0, 399, 400,
- 401, 402, 403, 404, 405, 406, 407, 408, 0, 409,
- 410, 0, 0, 0, 411, 412, 413, 414, 0, 0,
- 0, 415, 0, 0, 0, 416, 0, 417, 418, 419,
- 420, 0, 421, 422, 423, 424, 425, 426, 0, 0,
- 0, 0, 0, 0, 427, 428, 0, 429, 0, 0,
- 430, 0, 0, 431, 432, 433, 0, 0, 434, 435,
- 0, 436, 437, 438, 439, 440, 441, 0, 0, 442,
- 443, 444, 445, 0, 446, 447, 0, 448, 0, 449,
- 450, 451, 452, 0, 0, 453, 454, 0, 455, 456,
- 457, 458, 0, 0, 0, 0, 0, 459, 460, 461,
- 0, 0, 0, 462, 463, 464, 465, 0, 466, 467,
- 0, 468, 469, 0, 470, 471, 0, 0, 472, 0,
- 0, 473, 0, 474, 0, 475, 476, 477, 0, 0,
- 0, 0, 0, 0, 478, 0, 0, 479, 0, 0,
- 0, 480, 481, 482, 483, 484, 485, 0, 0, 0,
- 0, 0, 0, 486, 487, 0, 488, 489, 490, 0,
- 139, 491, 140, 141, 142, 143, 144, 0, 2105, 145,
- 0, 0, 0, 146, 0, 0, 147, 0, 148, 149,
- 150, 151, 152, 153, 154, 0, 155, 0, 0, 0,
+ 486, 487, 0, 488, 489, 490, 0, 0, 491, 0,
+ 139, 0, 140, 141, 142, 143, 144, 0, 0, 145,
+ 0, 0, 0, 146, 0, 0, 0, 3464, 148, 149,
+ 150, 151, 152, 153, 0, 0, -329, 0, 0, 0,
156, 0, 0, 0, 157, 0, 0, 158, 159, 160,
- 0, 161, 0, 162, 163, 0, 0, 164, 0, 0,
- 165, 166, 0, 167, 168, 0, 169, 170, 0, 171,
- 172, 173, 174, 175, 176, 177, 0, 178, 179, 180,
- 181, 182, 183, 184, 185, 0, 186, 187, 188, 189,
+ 0, 161, 0, 0, 0, 0, 0, 164, 3902, 0,
+ 165, 166, 0, 167, 0, 0, 0, 0, 0, 171,
+ 172, 173, 174, 3903, 176, 177, 0, 178, 179, 0,
+ 0, 0, 0, 0, 0, 0, 186, 0, 188, 0,
190, 191, 192, 193, 0, 194, 195, 0, 196, 197,
- 198, 199, 200, 0, 201, 0, 0, 202, 0, 0,
+ 198, 0, 200, 0, 201, 0, 0, 202, 0, 0,
203, 0, 0, 0, 204, 0, 0, 0, 205, 206,
- 207, 0, 0, 208, 0, 0, 0, 0, 209, 210,
+ 207, 0, 0, 208, 0, 0, 0, 0, 209, 0,
0, 0, 0, 0, 211, 0, 212, 0, 0, 0,
- 213, 0, 214, 215, 216, 217, 0, 0, 0, 218,
+ 213, 0, 214, 215, 216, 217, 0, 0, 0, 0,
0, 0, 219, 220, 221, 0, 0, 0, 222, 0,
- 223, 224, 0, 225, 226, 227, 0, 0, 228, 229,
- 0, 230, 231, 232, 233, 234, 235, 0, 0, 236,
- 237, 238, 0, 0, 239, 240, 0, 241, 242, 243,
- 0, 0, 244, 0, 0, 0, 245, 0, 246, 0,
+ 0, 224, 0, 225, 226, 227, 0, 0, 228, 229,
+ 0, 230, 231, 232, 233, 0, 0, 0, 0, 236,
+ 237, 238, 0, 0, 239, 240, 3904, 241, 242, 243,
+ 0, 0, 0, 0, 0, 0, 245, 0, 246, 0,
247, 0, 248, 249, 250, 251, 252, 253, 0, 254,
- 0, 0, 0, 255, 256, 257, 0, 258, 0, 0,
- 0, 259, 260, 0, 0, 0, 261, 262, 263, 264,
- 0, 0, 265, 266, 267, 0, 268, 0, 269, 0,
- 0, 0, 0, 270, 271, 0, 0, 0, 272, 0,
- 273, 274, 0, 275, 276, 0, 0, 0, 277, 0,
- 0, 278, 279, 280, 0, 0, 281, 0, 0, 282,
+ 0, 0, 0, 0, 256, 257, 0, 0, 0, 0,
+ 0, 0, 260, 0, 0, 0, 261, 262, 263, 264,
+ 3905, 0, 265, 266, 267, 0, 268, 0, 269, 0,
+ 0, 0, 0, 270, 0, 0, 0, 0, 272, 0,
+ 273, 274, 0, 275, 276, 3906, 0, 0, 277, 0,
+ 0, 0, 279, 280, 0, 0, 281, 3907, 0, 282,
283, 0, 0, 0, 0, 0, 284, 285, 0, 286,
- 0, 287, 0, 288, 289, 0, 0, 0, 0, 0,
+ 0, 287, 0, 288, 289, 0, 0, 0, 0, -284,
0, 0, 290, 291, 292, 293, 294, 295, 296, 297,
298, 299, 300, 301, 302, 0, 303, 304, 305, 0,
306, 307, 308, 309, 0, 310, 311, 0, 0, 0,
0, 312, 313, 314, 315, 316, 317, 0, 0, 318,
319, 0, 320, 0, 321, 0, 322, 323, 324, 325,
326, 327, 328, 329, 330, 331, 0, 0, 332, 333,
- 0, 0, 334, 335, 336, 337, 0, 0, 0, 338,
+ 0, 0, 334, 335, 336, 337, 0, 0, 0, 0,
339, 0, 0, 0, 0, 340, 341, 342, 0, 343,
- 344, 345, 346, 0, 347, 348, 0, 0, 0, 0,
- 0, 0, 0, 0, 349, 350, 351, 0, 0, 352,
- 0, 353, 354, 355, 356, 357, 358, 359, 360, 361,
- 362, 363, 364, 0, 0, 365, 366, 367, 0, 368,
+ 344, 345, 3908, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 350, 351, 0, 0, 0,
+ 0, 353, 354, 355, 0, 357, 358, 359, 360, 361,
+ 362, 363, 0, 0, 0, 0, 366, 367, 0, 368,
0, 369, 370, 371, 372, 373, 0, 374, 375, 376,
0, 0, 377, 0, 0, 0, 378, 379, 380, 381,
382, 0, 0, 383, 384, 385, 386, 387, 0, 388,
- 389, 0, 390, 391, 392, 0, 0, 393, 0, 394,
- 0, 395, 396, 0, 397, 398, 0, 0, 0, 399,
- 400, 401, 402, 403, 404, 405, 406, 407, 408, 0,
- 409, 410, 0, 0, 0, 411, 412, 413, 414, 0,
- 0, 0, 415, 0, 0, 0, 416, 0, 417, 418,
- 419, 420, 0, 421, 422, 423, 424, 425, 426, 0,
+ 0, 0, 390, 0, 392, -284, 0, 393, 0, 0,
+ 0, 395, 0, 0, 397, 398, 3909, 0, 0, 0,
+ 400, 401, 402, 403, 404, 405, 0, 407, 408, 0,
+ 409, 0, 0, 0, 0, 411, 412, 413, 0, 0,
+ 0, 0, 415, 0, 0, 0, 416, 0, 0, 418,
+ 0, 420, 0, 421, 0, 423, 0, 425, 426, 0,
0, 0, 0, 0, 0, 427, 428, 0, 429, 0,
- 0, 430, 0, 0, 431, 432, 433, 0, 0, 434,
+ 0, 430, 0, 0, 431, 0, 433, 0, 0, 0,
435, 0, 436, 437, 438, 439, 440, 441, 0, 0,
442, 443, 444, 445, 0, 446, 447, 0, 448, 0,
449, 450, 451, 452, 0, 0, 453, 454, 0, 455,
456, 457, 458, 0, 0, 0, 0, 0, 459, 460,
- 461, 0, 0, 0, 462, 463, 464, 465, 0, 466,
- 467, 0, 468, 469, 0, 470, 471, 0, 0, 472,
- 0, 0, 473, 0, 474, 0, 475, 476, 477, 0,
+ 461, 0, 0, 0, 0, 463, 464, 465, 0, 466,
+ 467, 0, 468, 469, 0, 0, 0, 0, 0, 472,
+ 0, 0, 473, 0, 0, 0, 475, 476, 477, 0,
0, 0, 0, 0, 0, 478, 0, 0, 479, 0,
0, 0, 480, 481, 482, 483, 484, 485, 0, 0,
- 0, 0, 0, 0, 486, 487, 0, 488, 489, 490,
- 0, 139, 491, 140, 141, 142, 143, 144, 0, 2785,
- 145, 0, 0, 0, 146, 0, 0, 147, 0, 148,
+ -284, 0, 0, 0, 486, 0, 0, 488, 0, 490,
+ 0, 139, 491, 140, 141, 142, 143, 144, 0, 0,
+ 145, 0, 0, 0, 146, 0, 4457, 147, 0, 148,
149, 150, 151, 152, 153, 154, 0, 155, 0, 0,
0, 156, 0, 0, 0, 157, 0, 0, 158, 159,
160, 0, 161, 0, 162, 163, 0, 0, 164, 0,
@@ -9007,7 +8829,7 @@ static const yytype_int16 yytable[] =
180, 181, 182, 183, 184, 185, 0, 186, 187, 188,
189, 190, 191, 192, 193, 0, 194, 195, 0, 196,
197, 198, 199, 200, 0, 201, 0, 0, 202, 0,
- 0, 203, 0, 0, 0, 204, 0, 0, 0, 205,
+ 0, 203, 0, 995, 0, 204, 0, 0, 0, 205,
206, 207, 0, 0, 208, 0, 0, 0, 0, 209,
210, 0, 0, 0, 0, 211, 0, 212, 0, 0,
0, 213, 0, 214, 215, 216, 217, 0, 0, 0,
@@ -9023,7 +8845,7 @@ static const yytype_int16 yytable[] =
0, 0, 0, 0, 270, 271, 0, 0, 0, 272,
0, 273, 274, 0, 275, 276, 0, 0, 0, 277,
0, 0, 278, 279, 280, 0, 0, 281, 0, 0,
- 282, 283, 0, 0, 0, 0, 0, 284, 285, 0,
+ 282, 283, 618, 0, 0, 0, 0, 284, 285, 0,
286, 0, 287, 0, 288, 289, 0, 0, 0, 0,
0, 0, 0, 290, 291, 292, 293, 294, 295, 296,
297, 298, 299, 300, 301, 302, 0, 303, 304, 305,
@@ -9050,7 +8872,7 @@ static const yytype_int16 yytable[] =
0, 0, 430, 0, 0, 431, 432, 433, 0, 0,
434, 435, 0, 436, 437, 438, 439, 440, 441, 0,
0, 442, 443, 444, 445, 0, 446, 447, 0, 448,
- 0, 449, 450, 451, 452, 0, 0, 453, 454, 0,
+ 0, 449, 450, 451, 452, 0, 136, 453, 454, 0,
455, 456, 457, 458, 0, 0, 0, 0, 0, 459,
460, 461, 0, 0, 0, 462, 463, 464, 465, 0,
466, 467, 0, 468, 469, 0, 470, 471, 0, 0,
@@ -9058,130 +8880,8 @@ static const yytype_int16 yytable[] =
0, 0, 0, 0, 0, 0, 478, 0, 0, 479,
0, 0, 0, 480, 481, 482, 483, 484, 485, 0,
0, 0, 0, 0, 0, 486, 487, 0, 488, 489,
- 490, 0, 139, 491, 140, 141, 142, 143, 144, 0,
- 3115, 145, 0, 0, 0, 146, 0, 0, 147, 0,
- 148, 149, 150, 151, 152, 153, 154, 0, 155, 0,
- 0, 0, 156, 0, 0, 0, 157, 0, 0, 158,
- 159, 160, 0, 161, 0, 162, 163, 0, 0, 164,
- 0, 0, 165, 166, 0, 167, 168, 0, 169, 170,
- 0, 171, 172, 173, 174, 175, 176, 177, 0, 178,
- 179, 180, 181, 182, 183, 184, 185, 0, 186, 187,
- 188, 189, 190, 191, 192, 193, 0, 194, 195, 0,
- 196, 197, 198, 199, 200, 0, 201, 0, 0, 202,
- 0, 0, 203, 0, 0, 0, 204, 0, 0, 0,
- 205, 206, 207, 0, 0, 208, 0, 0, 0, 0,
- 209, 210, 0, 0, 0, 0, 211, 0, 212, 0,
- 0, 0, 213, 0, 214, 215, 216, 217, 0, 0,
- 0, 218, 0, 0, 219, 220, 221, 0, 0, 0,
- 222, 0, 223, 224, 0, 225, 226, 227, 0, 0,
- 228, 229, 0, 230, 231, 232, 233, 234, 235, 0,
- 0, 236, 237, 238, 0, 0, 239, 240, 0, 241,
- 242, 243, 0, 0, 244, 0, 0, 0, 245, 0,
- 246, 0, 247, 0, 248, 249, 250, 251, 252, 253,
- 0, 254, 0, 0, 0, 255, 256, 257, 0, 258,
- 0, 0, 0, 259, 260, 0, 0, 0, 261, 262,
- 263, 264, 0, 0, 265, 266, 267, 0, 268, 0,
- 269, 0, 0, 0, 0, 270, 271, 0, 0, 0,
- 272, 0, 273, 274, 0, 275, 276, 0, 0, 0,
- 277, 0, 0, 278, 279, 280, 0, 0, 281, 0,
- 0, 282, 283, 0, 0, 0, 0, 0, 284, 285,
- 0, 286, 0, 287, 0, 288, 289, 0, 0, 0,
- 0, 0, 0, 0, 290, 291, 292, 293, 294, 295,
- 296, 297, 298, 299, 300, 301, 302, 0, 303, 304,
- 305, 0, 306, 307, 308, 309, 0, 310, 311, 0,
- 0, 0, 0, 312, 313, 314, 315, 316, 317, 0,
- 0, 318, 319, 0, 320, 0, 321, 0, 322, 323,
- 324, 325, 326, 327, 328, 329, 330, 331, 0, 0,
- 332, 333, 0, 0, 334, 335, 336, 337, 0, 0,
- 0, 338, 339, 0, 0, 0, 0, 340, 341, 342,
- 0, 343, 344, 345, 346, 0, 347, 348, 0, 0,
- 0, 0, 0, 0, 0, 0, 349, 350, 351, 0,
- 0, 352, 0, 353, 354, 355, 356, 357, 358, 359,
- 360, 361, 362, 363, 364, 0, 0, 365, 366, 367,
- 0, 368, 0, 369, 370, 371, 372, 373, 0, 374,
- 375, 376, 0, 0, 377, 0, 0, 0, 378, 379,
- 380, 381, 382, 0, 0, 383, 384, 385, 386, 387,
- 0, 388, 389, 0, 390, 391, 392, 0, 0, 393,
- 0, 394, 0, 395, 396, 0, 397, 398, 0, 0,
- 0, 399, 400, 401, 402, 403, 404, 405, 406, 407,
- 408, 0, 409, 410, 0, 0, 0, 411, 412, 413,
- 414, 0, 0, 0, 415, 0, 0, 0, 416, 0,
- 417, 418, 419, 420, 0, 421, 422, 423, 424, 425,
- 426, 0, 0, 0, 0, 0, 0, 427, 428, 0,
- 429, 0, 0, 430, 0, 0, 431, 432, 433, 0,
- 0, 434, 435, 0, 436, 437, 438, 439, 440, 441,
- 0, 0, 442, 443, 444, 445, 0, 446, 447, 0,
- 448, 0, 449, 450, 451, 452, 0, 0, 453, 454,
- 0, 455, 456, 457, 458, 0, 0, 0, 0, 0,
- 459, 460, 461, 0, 0, 0, 462, 463, 464, 465,
- 0, 466, 467, 0, 468, 469, 0, 470, 471, 0,
- 0, 472, 0, 0, 473, 0, 474, 0, 475, 476,
- 477, 0, 0, 0, 0, 0, 0, 478, 0, 0,
- 479, 0, 0, 0, 480, 481, 482, 483, 484, 485,
- 0, 0, 0, 0, 0, 0, 486, 487, 0, 488,
- 489, 490, 0, 139, 491, 140, 141, 142, 143, 144,
- 0, 3459, 145, 0, 0, 0, 146, 0, 0, 147,
- 0, 148, 149, 150, 151, 152, 153, 154, 0, 155,
- 0, 0, 0, 156, 0, 0, 0, 157, 0, 0,
- 158, 159, 160, 0, 161, 0, 162, 163, 0, 0,
- 164, 0, 0, 165, 166, 0, 167, 168, 0, 169,
- 170, 0, 171, 172, 173, 174, 175, 176, 177, 0,
- 178, 179, 180, 181, 182, 183, 184, 185, 0, 186,
- 187, 188, 189, 190, 191, 192, 193, 0, 194, 195,
- 0, 196, 197, 198, 199, 200, 0, 201, 0, 0,
- 202, 0, 0, 203, 0, 0, 0, 204, 0, 0,
- 0, 205, 206, 207, 0, 0, 208, 0, 0, 0,
- 0, 209, 210, 2429, 0, 0, 0, 211, 0, 212,
- 0, 0, 0, 213, 0, 214, 215, 216, 217, 0,
- 0, 0, 218, 0, 0, 219, 220, 221, 0, 0,
- 0, 222, 0, 223, 224, 0, 225, 226, 227, 0,
- 0, 228, 229, 0, 230, 231, 232, 233, 234, 235,
- 0, 0, 236, 237, 238, 0, 0, 239, 240, 0,
- 241, 242, 243, 2430, 0, 244, 0, 0, 0, 245,
- 0, 246, 0, 247, 0, 248, 249, 250, 251, 252,
- 253, 0, 254, 0, 0, 0, 255, 256, 257, 0,
- 258, 2431, 0, 0, 259, 260, 0, 0, 0, 261,
- 262, 263, 264, 0, 0, 265, 266, 267, 0, 268,
- 0, 269, 0, 0, 0, 0, 270, 271, 0, 0,
- 0, 272, 0, 273, 274, 0, 275, 276, 0, 0,
- 0, 277, 0, 0, 278, 279, 280, 0, 0, 281,
- 0, 0, 282, 283, 0, 0, 0, 0, 0, 284,
- 285, 0, 286, 0, 287, 0, 288, 289, 0, 0,
- 2432, 0, 0, 0, 0, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 299, 300, 301, 302, 0, 303,
- 304, 305, 0, 306, 307, 308, 309, 0, 310, 311,
- 0, 0, 0, 0, 312, 313, 314, 315, 316, 317,
- 0, 0, 318, 319, 0, 320, 0, 321, 0, 322,
- 323, 324, 325, 326, 327, 328, 329, 330, 331, 0,
- 0, 332, 333, 0, 0, 334, 335, 336, 337, 1037,
- 1038, 0, 338, 339, 0, 0, 2433, 0, 340, 341,
- 342, 0, 343, 344, 345, 346, 0, 347, 348, 0,
- 0, 0, 0, 0, 0, 0, 0, 349, 350, 351,
- 0, 0, 352, 0, 353, 354, 355, 356, 357, 358,
- 359, 360, 361, 362, 363, 364, 0, 0, 365, 366,
- 367, 0, 368, 0, 369, 370, 371, 372, 373, 0,
- 374, 375, 376, 0, 0, 377, 0, 0, 0, 378,
- 379, 380, 381, 382, 0, 0, 383, 384, 385, 386,
- 387, 0, 388, 389, 0, 390, 391, 392, 0, 0,
- 393, 0, 394, 0, 395, 396, 0, 397, 398, 0,
- 0, 0, 399, 400, 401, 402, 403, 404, 405, 406,
- 407, 408, 0, 409, 410, 0, 0, 0, 411, 412,
- 413, 414, 0, 0, 0, 415, 0, 0, 0, 416,
- 0, 417, 418, 419, 420, 0, 421, 422, 423, 424,
- 425, 426, 0, 0, 4427, 566, 4428, 0, 427, 428,
- 0, 429, 0, 0, 430, 0, 0, 431, 432, 433,
- 0, 0, 434, 435, 0, 436, 437, 438, 439, 440,
- 441, 0, 0, 442, 443, 444, 445, 0, 446, 447,
- 0, 448, 0, 449, 450, 451, 452, 0, 0, 453,
- 454, 0, 455, 456, 457, 458, 0, 0, 0, 0,
- 0, 459, 460, 461, 0, 0, 0, 462, 463, 464,
- 465, 2434, 466, 467, 0, 468, 469, 0, 470, 471,
- 0, 0, 472, 0, 0, 473, 0, 474, 0, 475,
- 476, 477, 0, 0, 0, 0, 0, 0, 478, 0,
- 0, 479, 0, 0, 0, 480, 481, 482, 483, 484,
- 485, 0, 0, 0, 0, 0, 0, 486, 487, 0,
- 488, 489, 490, 0, 139, 491, 140, 141, 142, 143,
- 144, 0, 0, 145, 0, 0, 0, 146, 0, 0,
+ 490, 0, 0, 491, 139, 0, 140, 141, 142, 143,
+ 144, 0, 0, 145, 0, 1175, 0, 146, 0, 0,
147, 0, 148, 149, 150, 151, 152, 153, 154, 0,
155, 0, 0, 0, 156, 0, 0, 0, 157, 0,
0, 158, 159, 160, 0, 161, 0, 162, 163, 0,
@@ -9192,30 +8892,30 @@ static const yytype_int16 yytable[] =
195, 0, 196, 197, 198, 199, 200, 0, 201, 0,
0, 202, 0, 0, 203, 0, 0, 0, 204, 0,
0, 0, 205, 206, 207, 0, 0, 208, 0, 0,
- 0, 0, 209, 210, 1584, 0, 0, 2956, 211, 0,
+ 0, 0, 209, 210, 0, 0, 0, 0, 211, 0,
212, 0, 0, 0, 213, 0, 214, 215, 216, 217,
0, 0, 0, 218, 0, 0, 219, 220, 221, 0,
0, 0, 222, 0, 223, 224, 0, 225, 226, 227,
0, 0, 228, 229, 0, 230, 231, 232, 233, 234,
235, 0, 0, 236, 237, 238, 0, 0, 239, 240,
- 0, 241, 242, 243, 1585, 0, 244, 0, 0, 0,
+ 0, 241, 242, 243, 0, 0, 244, 0, 0, 0,
245, 0, 246, 0, 247, 0, 248, 249, 250, 251,
252, 253, 0, 254, 0, 0, 0, 255, 256, 257,
- 0, 258, 2851, 0, 0, 259, 260, 0, 0, 0,
+ 0, 258, 0, 0, 0, 259, 260, 0, 0, 0,
261, 262, 263, 264, 0, 0, 265, 266, 267, 0,
268, 0, 269, 0, 0, 0, 0, 270, 271, 0,
0, 0, 272, 0, 273, 274, 0, 275, 276, 0,
0, 0, 277, 0, 0, 278, 279, 280, 0, 0,
281, 0, 0, 282, 283, 0, 0, 0, 0, 0,
284, 285, 0, 286, 0, 287, 0, 288, 289, 0,
- 0, 2852, 0, 0, 0, 0, 290, 291, 292, 293,
+ 0, 0, 0, 0, 0, 0, 290, 291, 292, 293,
294, 295, 296, 297, 298, 299, 300, 301, 302, 0,
303, 304, 305, 0, 306, 307, 308, 309, 0, 310,
311, 0, 0, 0, 0, 312, 313, 314, 315, 316,
317, 0, 0, 318, 319, 0, 320, 0, 321, 0,
322, 323, 324, 325, 326, 327, 328, 329, 330, 331,
0, 0, 332, 333, 0, 0, 334, 335, 336, 337,
- 0, 0, 0, 338, 339, 0, 0, 2853, 0, 340,
+ 0, 0, 0, 338, 339, 0, 0, 0, 0, 340,
341, 342, 0, 343, 344, 345, 346, 0, 347, 348,
0, 0, 0, 0, 0, 0, 0, 0, 349, 350,
351, 0, 0, 352, 0, 353, 354, 355, 356, 357,
@@ -9233,16 +8933,16 @@ static const yytype_int16 yytable[] =
428, 0, 429, 0, 0, 430, 0, 0, 431, 432,
433, 0, 0, 434, 435, 0, 436, 437, 438, 439,
440, 441, 0, 0, 442, 443, 444, 445, 0, 446,
- 447, 0, 448, 0, 449, 450, 451, 452, 0, 136,
+ 447, 0, 448, 0, 449, 450, 451, 452, 0, 0,
453, 454, 0, 455, 456, 457, 458, 0, 0, 0,
0, 0, 459, 460, 461, 0, 0, 0, 462, 463,
- 464, 465, 2854, 466, 467, 0, 468, 469, 0, 470,
+ 464, 465, 0, 466, 467, 0, 468, 469, 0, 470,
471, 0, 0, 472, 0, 0, 473, 0, 474, 0,
475, 476, 477, 0, 0, 0, 0, 0, 0, 478,
0, 0, 479, 0, 0, 0, 480, 481, 482, 483,
484, 485, 0, 0, 0, 0, 0, 0, 486, 487,
0, 488, 489, 490, 0, 139, 491, 140, 141, 142,
- 143, 144, 0, 0, 145, 0, 0, 0, 146, 0,
+ 143, 144, 0, 2112, 145, 0, 0, 0, 146, 0,
0, 147, 0, 148, 149, 150, 151, 152, 153, 154,
0, 155, 0, 0, 0, 156, 0, 0, 0, 157,
0, 0, 158, 159, 160, 0, 161, 0, 162, 163,
@@ -9253,30 +8953,30 @@ static const yytype_int16 yytable[] =
194, 195, 0, 196, 197, 198, 199, 200, 0, 201,
0, 0, 202, 0, 0, 203, 0, 0, 0, 204,
0, 0, 0, 205, 206, 207, 0, 0, 208, 0,
- 0, 0, 0, 209, 210, 1584, 0, 0, 3886, 211,
+ 0, 0, 0, 209, 210, 0, 0, 0, 0, 211,
0, 212, 0, 0, 0, 213, 0, 214, 215, 216,
217, 0, 0, 0, 218, 0, 0, 219, 220, 221,
0, 0, 0, 222, 0, 223, 224, 0, 225, 226,
227, 0, 0, 228, 229, 0, 230, 231, 232, 233,
234, 235, 0, 0, 236, 237, 238, 0, 0, 239,
- 240, 0, 241, 242, 243, 1585, 0, 244, 0, 0,
+ 240, 0, 241, 242, 243, 0, 0, 244, 0, 0,
0, 245, 0, 246, 0, 247, 0, 248, 249, 250,
251, 252, 253, 0, 254, 0, 0, 0, 255, 256,
- 257, 0, 258, 2851, 0, 0, 259, 260, 0, 0,
+ 257, 0, 258, 0, 0, 0, 259, 260, 0, 0,
0, 261, 262, 263, 264, 0, 0, 265, 266, 267,
0, 268, 0, 269, 0, 0, 0, 0, 270, 271,
0, 0, 0, 272, 0, 273, 274, 0, 275, 276,
0, 0, 0, 277, 0, 0, 278, 279, 280, 0,
0, 281, 0, 0, 282, 283, 0, 0, 0, 0,
0, 284, 285, 0, 286, 0, 287, 0, 288, 289,
- 0, 0, 2852, 0, 0, 0, 0, 290, 291, 292,
+ 0, 0, 0, 0, 0, 0, 0, 290, 291, 292,
293, 294, 295, 296, 297, 298, 299, 300, 301, 302,
0, 303, 304, 305, 0, 306, 307, 308, 309, 0,
310, 311, 0, 0, 0, 0, 312, 313, 314, 315,
316, 317, 0, 0, 318, 319, 0, 320, 0, 321,
0, 322, 323, 324, 325, 326, 327, 328, 329, 330,
331, 0, 0, 332, 333, 0, 0, 334, 335, 336,
- 337, 0, 0, 0, 338, 339, 0, 0, 2853, 0,
+ 337, 0, 0, 0, 338, 339, 0, 0, 0, 0,
340, 341, 342, 0, 343, 344, 345, 346, 0, 347,
348, 0, 0, 0, 0, 0, 0, 0, 0, 349,
350, 351, 0, 0, 352, 0, 353, 354, 355, 356,
@@ -9295,15 +8995,15 @@ static const yytype_int16 yytable[] =
432, 433, 0, 0, 434, 435, 0, 436, 437, 438,
439, 440, 441, 0, 0, 442, 443, 444, 445, 0,
446, 447, 0, 448, 0, 449, 450, 451, 452, 0,
- 136, 453, 454, 0, 455, 456, 457, 458, 0, 0,
+ 0, 453, 454, 0, 455, 456, 457, 458, 0, 0,
0, 0, 0, 459, 460, 461, 0, 0, 0, 462,
- 463, 464, 465, 2854, 466, 467, 0, 468, 469, 0,
+ 463, 464, 465, 0, 466, 467, 0, 468, 469, 0,
470, 471, 0, 0, 472, 0, 0, 473, 0, 474,
0, 475, 476, 477, 0, 0, 0, 0, 0, 0,
478, 0, 0, 479, 0, 0, 0, 480, 481, 482,
483, 484, 485, 0, 0, 0, 0, 0, 0, 486,
487, 0, 488, 489, 490, 0, 139, 491, 140, 141,
- 142, 143, 144, 0, 0, 145, 0, 0, 0, 146,
+ 142, 143, 144, 0, 2794, 145, 0, 0, 0, 146,
0, 0, 147, 0, 148, 149, 150, 151, 152, 153,
154, 0, 155, 0, 0, 0, 156, 0, 0, 0,
157, 0, 0, 158, 159, 160, 0, 161, 0, 162,
@@ -9314,30 +9014,30 @@ static const yytype_int16 yytable[] =
0, 194, 195, 0, 196, 197, 198, 199, 200, 0,
201, 0, 0, 202, 0, 0, 203, 0, 0, 0,
204, 0, 0, 0, 205, 206, 207, 0, 0, 208,
- 0, 0, 0, 0, 209, 210, 1584, 0, 0, 4170,
+ 0, 0, 0, 0, 209, 210, 0, 0, 0, 0,
211, 0, 212, 0, 0, 0, 213, 0, 214, 215,
216, 217, 0, 0, 0, 218, 0, 0, 219, 220,
221, 0, 0, 0, 222, 0, 223, 224, 0, 225,
226, 227, 0, 0, 228, 229, 0, 230, 231, 232,
233, 234, 235, 0, 0, 236, 237, 238, 0, 0,
- 239, 240, 0, 241, 242, 243, 1585, 0, 244, 0,
+ 239, 240, 0, 241, 242, 243, 0, 0, 244, 0,
0, 0, 245, 0, 246, 0, 247, 0, 248, 249,
250, 251, 252, 253, 0, 254, 0, 0, 0, 255,
- 256, 257, 0, 258, 2851, 0, 0, 259, 260, 0,
+ 256, 257, 0, 258, 0, 0, 0, 259, 260, 0,
0, 0, 261, 262, 263, 264, 0, 0, 265, 266,
267, 0, 268, 0, 269, 0, 0, 0, 0, 270,
271, 0, 0, 0, 272, 0, 273, 274, 0, 275,
276, 0, 0, 0, 277, 0, 0, 278, 279, 280,
0, 0, 281, 0, 0, 282, 283, 0, 0, 0,
0, 0, 284, 285, 0, 286, 0, 287, 0, 288,
- 289, 0, 0, 2852, 0, 0, 0, 0, 290, 291,
+ 289, 0, 0, 0, 0, 0, 0, 0, 290, 291,
292, 293, 294, 295, 296, 297, 298, 299, 300, 301,
302, 0, 303, 304, 305, 0, 306, 307, 308, 309,
0, 310, 311, 0, 0, 0, 0, 312, 313, 314,
315, 316, 317, 0, 0, 318, 319, 0, 320, 0,
321, 0, 322, 323, 324, 325, 326, 327, 328, 329,
330, 331, 0, 0, 332, 333, 0, 0, 334, 335,
- 336, 337, 0, 0, 0, 338, 339, 0, 0, 2853,
+ 336, 337, 0, 0, 0, 338, 339, 0, 0, 0,
0, 340, 341, 342, 0, 343, 344, 345, 346, 0,
347, 348, 0, 0, 0, 0, 0, 0, 0, 0,
349, 350, 351, 0, 0, 352, 0, 353, 354, 355,
@@ -9356,17 +9056,17 @@ static const yytype_int16 yytable[] =
431, 432, 433, 0, 0, 434, 435, 0, 436, 437,
438, 439, 440, 441, 0, 0, 442, 443, 444, 445,
0, 446, 447, 0, 448, 0, 449, 450, 451, 452,
- 0, 136, 453, 454, 0, 455, 456, 457, 458, 0,
+ 0, 0, 453, 454, 0, 455, 456, 457, 458, 0,
0, 0, 0, 0, 459, 460, 461, 0, 0, 0,
- 462, 463, 464, 465, 2854, 466, 467, 0, 468, 469,
+ 462, 463, 464, 465, 0, 466, 467, 0, 468, 469,
0, 470, 471, 0, 0, 472, 0, 0, 473, 0,
474, 0, 475, 476, 477, 0, 0, 0, 0, 0,
0, 478, 0, 0, 479, 0, 0, 0, 480, 481,
482, 483, 484, 485, 0, 0, 0, 0, 0, 0,
486, 487, 0, 488, 489, 490, 0, 139, 491, 140,
- 141, 142, 143, 144, 0, 0, 145, 0, 0, 0,
+ 141, 142, 143, 144, 0, 3124, 145, 0, 0, 0,
146, 0, 0, 147, 0, 148, 149, 150, 151, 152,
- 153, 154, 0, 155, 0, 0, 2628, 156, 0, 0,
+ 153, 154, 0, 155, 0, 0, 0, 156, 0, 0,
0, 157, 0, 0, 158, 159, 160, 0, 161, 0,
162, 163, 0, 0, 164, 0, 0, 165, 166, 0,
167, 168, 0, 169, 170, 0, 171, 172, 173, 174,
@@ -9376,10 +9076,10 @@ static const yytype_int16 yytable[] =
0, 201, 0, 0, 202, 0, 0, 203, 0, 0,
0, 204, 0, 0, 0, 205, 206, 207, 0, 0,
208, 0, 0, 0, 0, 209, 210, 0, 0, 0,
- 2791, 211, 0, 212, 0, 0, 0, 213, 0, 214,
+ 0, 211, 0, 212, 0, 0, 0, 213, 0, 214,
215, 216, 217, 0, 0, 0, 218, 0, 0, 219,
220, 221, 0, 0, 0, 222, 0, 223, 224, 0,
- 225, 226, 227, 2255, 0, 228, 229, 0, 230, 231,
+ 225, 226, 227, 0, 0, 228, 229, 0, 230, 231,
232, 233, 234, 235, 0, 0, 236, 237, 238, 0,
0, 239, 240, 0, 241, 242, 243, 0, 0, 244,
0, 0, 0, 245, 0, 246, 0, 247, 0, 248,
@@ -9389,7 +9089,7 @@ static const yytype_int16 yytable[] =
266, 267, 0, 268, 0, 269, 0, 0, 0, 0,
270, 271, 0, 0, 0, 272, 0, 273, 274, 0,
275, 276, 0, 0, 0, 277, 0, 0, 278, 279,
- 280, 0, 0, 281, 0, 0, 282, 283, 620, 0,
+ 280, 0, 0, 281, 0, 0, 282, 283, 0, 0,
0, 0, 0, 284, 285, 0, 286, 0, 287, 0,
288, 289, 0, 0, 0, 0, 0, 0, 0, 290,
291, 292, 293, 294, 295, 296, 297, 298, 299, 300,
@@ -9410,14 +9110,14 @@ static const yytype_int16 yytable[] =
391, 392, 0, 0, 393, 0, 394, 0, 395, 396,
0, 397, 398, 0, 0, 0, 399, 400, 401, 402,
403, 404, 405, 406, 407, 408, 0, 409, 410, 0,
- 0, 0, 411, 412, 413, 414, 0, 0, 2256, 415,
+ 0, 0, 411, 412, 413, 414, 0, 0, 0, 415,
0, 0, 0, 416, 0, 417, 418, 419, 420, 0,
421, 422, 423, 424, 425, 426, 0, 0, 0, 0,
0, 0, 427, 428, 0, 429, 0, 0, 430, 0,
0, 431, 432, 433, 0, 0, 434, 435, 0, 436,
437, 438, 439, 440, 441, 0, 0, 442, 443, 444,
445, 0, 446, 447, 0, 448, 0, 449, 450, 451,
- 452, 0, 136, 453, 454, 0, 455, 456, 457, 458,
+ 452, 0, 0, 453, 454, 0, 455, 456, 457, 458,
0, 0, 0, 0, 0, 459, 460, 461, 0, 0,
0, 462, 463, 464, 465, 0, 466, 467, 0, 468,
469, 0, 470, 471, 0, 0, 472, 0, 0, 473,
@@ -9425,9 +9125,9 @@ static const yytype_int16 yytable[] =
0, 0, 478, 0, 0, 479, 0, 0, 0, 480,
481, 482, 483, 484, 485, 0, 0, 0, 0, 0,
0, 486, 487, 0, 488, 489, 490, 0, 139, 491,
- 140, 141, 142, 143, 144, 0, 0, 145, 0, 0,
+ 140, 141, 142, 143, 144, 0, 3469, 145, 0, 0,
0, 146, 0, 0, 147, 0, 148, 149, 150, 151,
- 152, 153, 154, 0, 155, 0, 0, 0, 156, 972,
+ 152, 153, 154, 0, 155, 0, 0, 0, 156, 0,
0, 0, 157, 0, 0, 158, 159, 160, 0, 161,
0, 162, 163, 0, 0, 164, 0, 0, 165, 166,
0, 167, 168, 0, 169, 170, 0, 171, 172, 173,
@@ -9436,31 +9136,31 @@ static const yytype_int16 yytable[] =
192, 193, 0, 194, 195, 0, 196, 197, 198, 199,
200, 0, 201, 0, 0, 202, 0, 0, 203, 0,
0, 0, 204, 0, 0, 0, 205, 206, 207, 0,
- 0, 208, 0, 0, 0, 0, 209, 210, 0, 0,
+ 0, 208, 0, 0, 0, 0, 209, 210, 2436, 0,
0, 0, 211, 0, 212, 0, 0, 0, 213, 0,
214, 215, 216, 217, 0, 0, 0, 218, 0, 0,
219, 220, 221, 0, 0, 0, 222, 0, 223, 224,
0, 225, 226, 227, 0, 0, 228, 229, 0, 230,
231, 232, 233, 234, 235, 0, 0, 236, 237, 238,
- 0, 0, 239, 240, 0, 241, 242, 243, 0, 0,
+ 0, 0, 239, 240, 0, 241, 242, 243, 2437, 0,
244, 0, 0, 0, 245, 0, 246, 0, 247, 0,
248, 249, 250, 251, 252, 253, 0, 254, 0, 0,
- 0, 255, 256, 257, 0, 258, 973, 974, 0, 259,
+ 0, 255, 256, 257, 0, 258, 2438, 0, 0, 259,
260, 0, 0, 0, 261, 262, 263, 264, 0, 0,
265, 266, 267, 0, 268, 0, 269, 0, 0, 0,
0, 270, 271, 0, 0, 0, 272, 0, 273, 274,
0, 275, 276, 0, 0, 0, 277, 0, 0, 278,
279, 280, 0, 0, 281, 0, 0, 282, 283, 0,
0, 0, 0, 0, 284, 285, 0, 286, 0, 287,
- 0, 288, 289, 0, 0, 0, 0, 0, 0, 0,
+ 0, 288, 289, 0, 0, 2439, 0, 0, 0, 0,
290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
300, 301, 302, 0, 303, 304, 305, 0, 306, 307,
308, 309, 0, 310, 311, 0, 0, 0, 0, 312,
313, 314, 315, 316, 317, 0, 0, 318, 319, 0,
320, 0, 321, 0, 322, 323, 324, 325, 326, 327,
328, 329, 330, 331, 0, 0, 332, 333, 0, 0,
- 334, 335, 336, 337, 0, 0, 0, 338, 339, 0,
- 0, 0, 0, 340, 341, 342, 0, 343, 344, 345,
+ 334, 335, 336, 337, 1038, 1039, 0, 338, 339, 0,
+ 0, 2440, 0, 340, 341, 342, 0, 343, 344, 345,
346, 0, 347, 348, 0, 0, 0, 0, 0, 0,
0, 0, 349, 350, 351, 0, 0, 352, 0, 353,
354, 355, 356, 357, 358, 359, 360, 361, 362, 363,
@@ -9473,14 +9173,14 @@ static const yytype_int16 yytable[] =
402, 403, 404, 405, 406, 407, 408, 0, 409, 410,
0, 0, 0, 411, 412, 413, 414, 0, 0, 0,
415, 0, 0, 0, 416, 0, 417, 418, 419, 420,
- 0, 421, 422, 423, 424, 425, 426, 0, 0, 0,
- 0, 0, 0, 427, 428, 0, 429, 0, 0, 430,
+ 0, 421, 422, 423, 424, 425, 426, 0, 0, 4437,
+ 564, 4438, 0, 427, 428, 0, 429, 0, 0, 430,
0, 0, 431, 432, 433, 0, 0, 434, 435, 0,
436, 437, 438, 439, 440, 441, 0, 0, 442, 443,
444, 445, 0, 446, 447, 0, 448, 0, 449, 450,
- 451, 452, 0, 975, 453, 454, 0, 455, 456, 457,
+ 451, 452, 0, 0, 453, 454, 0, 455, 456, 457,
458, 0, 0, 0, 0, 0, 459, 460, 461, 0,
- 0, 0, 462, 463, 464, 465, 0, 466, 467, 0,
+ 0, 0, 462, 463, 464, 465, 2441, 466, 467, 0,
468, 469, 0, 470, 471, 0, 0, 472, 0, 0,
473, 0, 474, 0, 475, 476, 477, 0, 0, 0,
0, 0, 0, 478, 0, 0, 479, 0, 0, 0,
@@ -9497,23 +9197,23 @@ static const yytype_int16 yytable[] =
191, 192, 193, 0, 194, 195, 0, 196, 197, 198,
199, 200, 0, 201, 0, 0, 202, 0, 0, 203,
0, 0, 0, 204, 0, 0, 0, 205, 206, 207,
- 0, 0, 208, 0, 0, 0, 0, 209, 210, 0,
- 0, 0, 0, 211, 0, 212, 0, 0, 0, 213,
+ 0, 0, 208, 0, 0, 0, 0, 209, 210, 1588,
+ 0, 0, 2965, 211, 0, 212, 0, 0, 0, 213,
0, 214, 215, 216, 217, 0, 0, 0, 218, 0,
0, 219, 220, 221, 0, 0, 0, 222, 0, 223,
224, 0, 225, 226, 227, 0, 0, 228, 229, 0,
230, 231, 232, 233, 234, 235, 0, 0, 236, 237,
- 238, 0, 0, 239, 240, 0, 241, 242, 243, 0,
+ 238, 0, 0, 239, 240, 0, 241, 242, 243, 1589,
0, 244, 0, 0, 0, 245, 0, 246, 0, 247,
0, 248, 249, 250, 251, 252, 253, 0, 254, 0,
- 0, 0, 255, 256, 257, 0, 258, 0, 0, 0,
+ 0, 0, 255, 256, 257, 0, 258, 2860, 0, 0,
259, 260, 0, 0, 0, 261, 262, 263, 264, 0,
0, 265, 266, 267, 0, 268, 0, 269, 0, 0,
0, 0, 270, 271, 0, 0, 0, 272, 0, 273,
274, 0, 275, 276, 0, 0, 0, 277, 0, 0,
278, 279, 280, 0, 0, 281, 0, 0, 282, 283,
0, 0, 0, 0, 0, 284, 285, 0, 286, 0,
- 287, 0, 288, 289, 0, 0, 1860, 0, 0, 0,
+ 287, 0, 288, 289, 0, 0, 2861, 0, 0, 0,
0, 290, 291, 292, 293, 294, 295, 296, 297, 298,
299, 300, 301, 302, 0, 303, 304, 305, 0, 306,
307, 308, 309, 0, 310, 311, 0, 0, 0, 0,
@@ -9521,9 +9221,9 @@ static const yytype_int16 yytable[] =
0, 320, 0, 321, 0, 322, 323, 324, 325, 326,
327, 328, 329, 330, 331, 0, 0, 332, 333, 0,
0, 334, 335, 336, 337, 0, 0, 0, 338, 339,
- 0, 0, 1861, 0, 340, 341, 342, 0, 343, 344,
+ 0, 0, 2862, 0, 340, 341, 342, 0, 343, 344,
345, 346, 0, 347, 348, 0, 0, 0, 0, 0,
- 0, 0, 0, 349, 350, 351, 0, 739, 352, 0,
+ 0, 0, 0, 349, 350, 351, 0, 0, 352, 0,
353, 354, 355, 356, 357, 358, 359, 360, 361, 362,
363, 364, 0, 0, 365, 366, 367, 0, 368, 0,
369, 370, 371, 372, 373, 0, 374, 375, 376, 0,
@@ -9531,7 +9231,7 @@ static const yytype_int16 yytable[] =
0, 0, 383, 384, 385, 386, 387, 0, 388, 389,
0, 390, 391, 392, 0, 0, 393, 0, 394, 0,
395, 396, 0, 397, 398, 0, 0, 0, 399, 400,
- 401, 1862, 403, 404, 405, 406, 407, 408, 0, 409,
+ 401, 402, 403, 404, 405, 406, 407, 408, 0, 409,
410, 0, 0, 0, 411, 412, 413, 414, 0, 0,
0, 415, 0, 0, 0, 416, 0, 417, 418, 419,
420, 0, 421, 422, 423, 424, 425, 426, 0, 0,
@@ -9539,9 +9239,9 @@ static const yytype_int16 yytable[] =
430, 0, 0, 431, 432, 433, 0, 0, 434, 435,
0, 436, 437, 438, 439, 440, 441, 0, 0, 442,
443, 444, 445, 0, 446, 447, 0, 448, 0, 449,
- 450, 451, 452, 0, 0, 453, 454, 0, 455, 456,
+ 450, 451, 452, 0, 136, 453, 454, 0, 455, 456,
457, 458, 0, 0, 0, 0, 0, 459, 460, 461,
- 0, 0, 0, 462, 463, 464, 465, 1863, 466, 467,
+ 0, 0, 0, 462, 463, 464, 465, 2863, 466, 467,
0, 468, 469, 0, 470, 471, 0, 0, 472, 0,
0, 473, 0, 474, 0, 475, 476, 477, 0, 0,
0, 0, 0, 0, 478, 0, 0, 479, 0, 0,
@@ -9549,7 +9249,7 @@ static const yytype_int16 yytable[] =
0, 0, 0, 486, 487, 0, 488, 489, 490, 0,
139, 491, 140, 141, 142, 143, 144, 0, 0, 145,
0, 0, 0, 146, 0, 0, 147, 0, 148, 149,
- 150, 151, 152, 153, 154, 0, 155, 0, 0, 2799,
+ 150, 151, 152, 153, 154, 0, 155, 0, 0, 0,
156, 0, 0, 0, 157, 0, 0, 158, 159, 160,
0, 161, 0, 162, 163, 0, 0, 164, 0, 0,
165, 166, 0, 167, 168, 0, 169, 170, 0, 171,
@@ -9559,22 +9259,22 @@ static const yytype_int16 yytable[] =
198, 199, 200, 0, 201, 0, 0, 202, 0, 0,
203, 0, 0, 0, 204, 0, 0, 0, 205, 206,
207, 0, 0, 208, 0, 0, 0, 0, 209, 210,
- 0, 0, 0, 2800, 211, 0, 212, 0, 0, 0,
+ 1588, 0, 0, 3896, 211, 0, 212, 0, 0, 0,
213, 0, 214, 215, 216, 217, 0, 0, 0, 218,
0, 0, 219, 220, 221, 0, 0, 0, 222, 0,
223, 224, 0, 225, 226, 227, 0, 0, 228, 229,
0, 230, 231, 232, 233, 234, 235, 0, 0, 236,
237, 238, 0, 0, 239, 240, 0, 241, 242, 243,
- 0, 0, 244, 0, 0, 0, 245, 0, 246, 0,
+ 1589, 0, 244, 0, 0, 0, 245, 0, 246, 0,
247, 0, 248, 249, 250, 251, 252, 253, 0, 254,
- 0, 0, 0, 255, 256, 257, 0, 258, 0, 0,
+ 0, 0, 0, 255, 256, 257, 0, 258, 2860, 0,
0, 259, 260, 0, 0, 0, 261, 262, 263, 264,
0, 0, 265, 266, 267, 0, 268, 0, 269, 0,
0, 0, 0, 270, 271, 0, 0, 0, 272, 0,
273, 274, 0, 275, 276, 0, 0, 0, 277, 0,
0, 278, 279, 280, 0, 0, 281, 0, 0, 282,
- 283, 620, 0, 0, 0, 0, 284, 285, 0, 286,
- 0, 287, 0, 288, 289, 0, 0, 0, 0, 0,
+ 283, 0, 0, 0, 0, 0, 284, 285, 0, 286,
+ 0, 287, 0, 288, 289, 0, 0, 2861, 0, 0,
0, 0, 290, 291, 292, 293, 294, 295, 296, 297,
298, 299, 300, 301, 302, 0, 303, 304, 305, 0,
306, 307, 308, 309, 0, 310, 311, 0, 0, 0,
@@ -9582,7 +9282,7 @@ static const yytype_int16 yytable[] =
319, 0, 320, 0, 321, 0, 322, 323, 324, 325,
326, 327, 328, 329, 330, 331, 0, 0, 332, 333,
0, 0, 334, 335, 336, 337, 0, 0, 0, 338,
- 339, 0, 0, 0, 0, 340, 341, 342, 0, 343,
+ 339, 0, 0, 2862, 0, 340, 341, 342, 0, 343,
344, 345, 346, 0, 347, 348, 0, 0, 0, 0,
0, 0, 0, 0, 349, 350, 351, 0, 0, 352,
0, 353, 354, 355, 356, 357, 358, 359, 360, 361,
@@ -9602,7 +9302,7 @@ static const yytype_int16 yytable[] =
442, 443, 444, 445, 0, 446, 447, 0, 448, 0,
449, 450, 451, 452, 0, 136, 453, 454, 0, 455,
456, 457, 458, 0, 0, 0, 0, 0, 459, 460,
- 461, 0, 0, 0, 462, 463, 464, 465, 0, 466,
+ 461, 0, 0, 0, 462, 463, 464, 465, 2863, 466,
467, 0, 468, 469, 0, 470, 471, 0, 0, 472,
0, 0, 473, 0, 474, 0, 475, 476, 477, 0,
0, 0, 0, 0, 0, 478, 0, 0, 479, 0,
@@ -9620,22 +9320,22 @@ static const yytype_int16 yytable[] =
197, 198, 199, 200, 0, 201, 0, 0, 202, 0,
0, 203, 0, 0, 0, 204, 0, 0, 0, 205,
206, 207, 0, 0, 208, 0, 0, 0, 0, 209,
- 210, 0, 0, 0, 0, 211, 0, 212, 0, 0,
+ 210, 1588, 0, 0, 4180, 211, 0, 212, 0, 0,
0, 213, 0, 214, 215, 216, 217, 0, 0, 0,
218, 0, 0, 219, 220, 221, 0, 0, 0, 222,
0, 223, 224, 0, 225, 226, 227, 0, 0, 228,
229, 0, 230, 231, 232, 233, 234, 235, 0, 0,
236, 237, 238, 0, 0, 239, 240, 0, 241, 242,
- 243, 0, 0, 244, 0, 0, 0, 245, 0, 246,
+ 243, 1589, 0, 244, 0, 0, 0, 245, 0, 246,
0, 247, 0, 248, 249, 250, 251, 252, 253, 0,
- 254, 0, 0, 0, 255, 256, 257, 0, 258, 0,
+ 254, 0, 0, 0, 255, 256, 257, 0, 258, 2860,
0, 0, 259, 260, 0, 0, 0, 261, 262, 263,
264, 0, 0, 265, 266, 267, 0, 268, 0, 269,
0, 0, 0, 0, 270, 271, 0, 0, 0, 272,
0, 273, 274, 0, 275, 276, 0, 0, 0, 277,
0, 0, 278, 279, 280, 0, 0, 281, 0, 0,
282, 283, 0, 0, 0, 0, 0, 284, 285, 0,
- 286, 0, 287, 0, 288, 289, 0, 0, 1860, 0,
+ 286, 0, 287, 0, 288, 289, 0, 0, 2861, 0,
0, 0, 0, 290, 291, 292, 293, 294, 295, 296,
297, 298, 299, 300, 301, 302, 0, 303, 304, 305,
0, 306, 307, 308, 309, 0, 310, 311, 0, 0,
@@ -9643,9 +9343,9 @@ static const yytype_int16 yytable[] =
318, 319, 0, 320, 0, 321, 0, 322, 323, 324,
325, 326, 327, 328, 329, 330, 331, 0, 0, 332,
333, 0, 0, 334, 335, 336, 337, 0, 0, 0,
- 338, 339, 0, 0, 1861, 0, 340, 341, 342, 0,
+ 338, 339, 0, 0, 2862, 0, 340, 341, 342, 0,
343, 344, 345, 346, 0, 347, 348, 0, 0, 0,
- 0, 0, 0, 0, 0, 349, 350, 351, 0, 739,
+ 0, 0, 0, 0, 0, 349, 350, 351, 0, 0,
352, 0, 353, 354, 355, 356, 357, 358, 359, 360,
361, 362, 363, 364, 0, 0, 365, 366, 367, 0,
368, 0, 369, 370, 371, 372, 373, 0, 374, 375,
@@ -9661,9 +9361,9 @@ static const yytype_int16 yytable[] =
0, 0, 430, 0, 0, 431, 432, 433, 0, 0,
434, 435, 0, 436, 437, 438, 439, 440, 441, 0,
0, 442, 443, 444, 445, 0, 446, 447, 0, 448,
- 0, 449, 450, 451, 452, 0, 0, 453, 454, 0,
+ 0, 449, 450, 451, 452, 0, 136, 453, 454, 0,
455, 456, 457, 458, 0, 0, 0, 0, 0, 459,
- 460, 461, 0, 0, 0, 462, 463, 464, 465, 1863,
+ 460, 461, 0, 0, 0, 462, 463, 464, 465, 2863,
466, 467, 0, 468, 469, 0, 470, 471, 0, 0,
472, 0, 0, 473, 0, 474, 0, 475, 476, 477,
0, 0, 0, 0, 0, 0, 478, 0, 0, 479,
@@ -9672,7 +9372,7 @@ static const yytype_int16 yytable[] =
490, 0, 139, 491, 140, 141, 142, 143, 144, 0,
0, 145, 0, 0, 0, 146, 0, 0, 147, 0,
148, 149, 150, 151, 152, 153, 154, 0, 155, 0,
- 0, 2628, 156, 0, 0, 0, 157, 0, 0, 158,
+ 0, 2636, 156, 0, 0, 0, 157, 0, 0, 158,
159, 160, 0, 161, 0, 162, 163, 0, 0, 164,
0, 0, 165, 166, 0, 167, 168, 0, 169, 170,
0, 171, 172, 173, 174, 175, 176, 177, 0, 178,
@@ -9681,10 +9381,10 @@ static const yytype_int16 yytable[] =
196, 197, 198, 199, 200, 0, 201, 0, 0, 202,
0, 0, 203, 0, 0, 0, 204, 0, 0, 0,
205, 206, 207, 0, 0, 208, 0, 0, 0, 0,
- 209, 210, 0, 0, 0, 2791, 211, 0, 212, 0,
+ 209, 210, 0, 0, 0, 2800, 211, 0, 212, 0,
0, 0, 213, 0, 214, 215, 216, 217, 0, 0,
0, 218, 0, 0, 219, 220, 221, 0, 0, 0,
- 222, 0, 223, 224, 0, 225, 226, 227, 0, 0,
+ 222, 0, 223, 224, 0, 225, 226, 227, 2262, 0,
228, 229, 0, 230, 231, 232, 233, 234, 235, 0,
0, 236, 237, 238, 0, 0, 239, 240, 0, 241,
242, 243, 0, 0, 244, 0, 0, 0, 245, 0,
@@ -9695,7 +9395,7 @@ static const yytype_int16 yytable[] =
269, 0, 0, 0, 0, 270, 271, 0, 0, 0,
272, 0, 273, 274, 0, 275, 276, 0, 0, 0,
277, 0, 0, 278, 279, 280, 0, 0, 281, 0,
- 0, 282, 283, 620, 0, 0, 0, 0, 284, 285,
+ 0, 282, 283, 618, 0, 0, 0, 0, 284, 285,
0, 286, 0, 287, 0, 288, 289, 0, 0, 0,
0, 0, 0, 0, 290, 291, 292, 293, 294, 295,
296, 297, 298, 299, 300, 301, 302, 0, 303, 304,
@@ -9716,7 +9416,7 @@ static const yytype_int16 yytable[] =
0, 394, 0, 395, 396, 0, 397, 398, 0, 0,
0, 399, 400, 401, 402, 403, 404, 405, 406, 407,
408, 0, 409, 410, 0, 0, 0, 411, 412, 413,
- 414, 0, 0, 0, 415, 0, 0, 0, 416, 0,
+ 414, 0, 0, 2263, 415, 0, 0, 0, 416, 0,
417, 418, 419, 420, 0, 421, 422, 423, 424, 425,
426, 0, 0, 0, 0, 0, 0, 427, 428, 0,
429, 0, 0, 430, 0, 0, 431, 432, 433, 0,
@@ -9733,7 +9433,7 @@ static const yytype_int16 yytable[] =
489, 490, 0, 139, 491, 140, 141, 142, 143, 144,
0, 0, 145, 0, 0, 0, 146, 0, 0, 147,
0, 148, 149, 150, 151, 152, 153, 154, 0, 155,
- 0, 0, 0, 156, 0, 0, 0, 157, 0, 0,
+ 0, 0, 0, 156, 972, 0, 0, 157, 0, 0,
158, 159, 160, 0, 161, 0, 162, 163, 0, 0,
164, 0, 0, 165, 166, 0, 167, 168, 0, 169,
170, 0, 171, 172, 173, 174, 175, 176, 177, 0,
@@ -9751,31 +9451,31 @@ static const yytype_int16 yytable[] =
241, 242, 243, 0, 0, 244, 0, 0, 0, 245,
0, 246, 0, 247, 0, 248, 249, 250, 251, 252,
253, 0, 254, 0, 0, 0, 255, 256, 257, 0,
- 258, 0, 0, 0, 259, 260, 0, 0, 0, 261,
+ 258, 973, 974, 0, 259, 260, 0, 0, 0, 261,
262, 263, 264, 0, 0, 265, 266, 267, 0, 268,
0, 269, 0, 0, 0, 0, 270, 271, 0, 0,
0, 272, 0, 273, 274, 0, 275, 276, 0, 0,
0, 277, 0, 0, 278, 279, 280, 0, 0, 281,
0, 0, 282, 283, 0, 0, 0, 0, 0, 284,
285, 0, 286, 0, 287, 0, 288, 289, 0, 0,
- 1860, 0, 0, 0, 0, 290, 291, 292, 293, 294,
+ 0, 0, 0, 0, 0, 290, 291, 292, 293, 294,
295, 296, 297, 298, 299, 300, 301, 302, 0, 303,
304, 305, 0, 306, 307, 308, 309, 0, 310, 311,
0, 0, 0, 0, 312, 313, 314, 315, 316, 317,
0, 0, 318, 319, 0, 320, 0, 321, 0, 322,
323, 324, 325, 326, 327, 328, 329, 330, 331, 0,
0, 332, 333, 0, 0, 334, 335, 336, 337, 0,
- 0, 0, 338, 339, 0, 0, 1861, 0, 340, 341,
+ 0, 0, 338, 339, 0, 0, 0, 0, 340, 341,
342, 0, 343, 344, 345, 346, 0, 347, 348, 0,
0, 0, 0, 0, 0, 0, 0, 349, 350, 351,
- 0, 739, 352, 0, 353, 354, 355, 356, 357, 358,
+ 0, 0, 352, 0, 353, 354, 355, 356, 357, 358,
359, 360, 361, 362, 363, 364, 0, 0, 365, 366,
367, 0, 368, 0, 369, 370, 371, 372, 373, 0,
374, 375, 376, 0, 0, 377, 0, 0, 0, 378,
379, 380, 381, 382, 0, 0, 383, 384, 385, 386,
387, 0, 388, 389, 0, 390, 391, 392, 0, 0,
393, 0, 394, 0, 395, 396, 0, 397, 398, 0,
- 0, 0, 399, 400, 401, 3608, 403, 404, 405, 406,
+ 0, 0, 399, 400, 401, 402, 403, 404, 405, 406,
407, 408, 0, 409, 410, 0, 0, 0, 411, 412,
413, 414, 0, 0, 0, 415, 0, 0, 0, 416,
0, 417, 418, 419, 420, 0, 421, 422, 423, 424,
@@ -9783,10 +9483,10 @@ static const yytype_int16 yytable[] =
0, 429, 0, 0, 430, 0, 0, 431, 432, 433,
0, 0, 434, 435, 0, 436, 437, 438, 439, 440,
441, 0, 0, 442, 443, 444, 445, 0, 446, 447,
- 0, 448, 0, 449, 450, 451, 452, 0, 0, 453,
+ 0, 448, 0, 449, 450, 451, 452, 0, 975, 453,
454, 0, 455, 456, 457, 458, 0, 0, 0, 0,
0, 459, 460, 461, 0, 0, 0, 462, 463, 464,
- 465, 1863, 466, 467, 0, 468, 469, 0, 470, 471,
+ 465, 0, 466, 467, 0, 468, 469, 0, 470, 471,
0, 0, 472, 0, 0, 473, 0, 474, 0, 475,
476, 477, 0, 0, 0, 0, 0, 0, 478, 0,
0, 479, 0, 0, 0, 480, 481, 482, 483, 484,
@@ -9801,7 +9501,7 @@ static const yytype_int16 yytable[] =
0, 178, 179, 180, 181, 182, 183, 184, 185, 0,
186, 187, 188, 189, 190, 191, 192, 193, 0, 194,
195, 0, 196, 197, 198, 199, 200, 0, 201, 0,
- 0, 202, 0, 0, 203, 0, 995, 0, 204, 0,
+ 0, 202, 0, 0, 203, 0, 0, 0, 204, 0,
0, 0, 205, 206, 207, 0, 0, 208, 0, 0,
0, 0, 209, 210, 0, 0, 0, 0, 211, 0,
212, 0, 0, 0, 213, 0, 214, 215, 216, 217,
@@ -9817,26 +9517,26 @@ static const yytype_int16 yytable[] =
268, 0, 269, 0, 0, 0, 0, 270, 271, 0,
0, 0, 272, 0, 273, 274, 0, 275, 276, 0,
0, 0, 277, 0, 0, 278, 279, 280, 0, 0,
- 281, 0, 0, 282, 283, 620, 0, 0, 0, 0,
+ 281, 0, 0, 282, 283, 0, 0, 0, 0, 0,
284, 285, 0, 286, 0, 287, 0, 288, 289, 0,
- 0, 0, 0, 0, 0, 0, 290, 291, 292, 293,
+ 0, 1865, 0, 0, 0, 0, 290, 291, 292, 293,
294, 295, 296, 297, 298, 299, 300, 301, 302, 0,
303, 304, 305, 0, 306, 307, 308, 309, 0, 310,
311, 0, 0, 0, 0, 312, 313, 314, 315, 316,
317, 0, 0, 318, 319, 0, 320, 0, 321, 0,
322, 323, 324, 325, 326, 327, 328, 329, 330, 331,
0, 0, 332, 333, 0, 0, 334, 335, 336, 337,
- 0, 0, 0, 338, 339, 0, 0, 0, 0, 340,
+ 0, 0, 0, 338, 339, 0, 0, 1866, 0, 340,
341, 342, 0, 343, 344, 345, 346, 0, 347, 348,
0, 0, 0, 0, 0, 0, 0, 0, 349, 350,
- 351, 0, 0, 352, 0, 353, 354, 355, 356, 357,
+ 351, 0, 739, 352, 0, 353, 354, 355, 356, 357,
358, 359, 360, 361, 362, 363, 364, 0, 0, 365,
366, 367, 0, 368, 0, 369, 370, 371, 372, 373,
0, 374, 375, 376, 0, 0, 377, 0, 0, 0,
378, 379, 380, 381, 382, 0, 0, 383, 384, 385,
386, 387, 0, 388, 389, 0, 390, 391, 392, 0,
0, 393, 0, 394, 0, 395, 396, 0, 397, 398,
- 0, 0, 0, 399, 400, 401, 402, 403, 404, 405,
+ 0, 0, 0, 399, 400, 401, 1867, 403, 404, 405,
406, 407, 408, 0, 409, 410, 0, 0, 0, 411,
412, 413, 414, 0, 0, 0, 415, 0, 0, 0,
416, 0, 417, 418, 419, 420, 0, 421, 422, 423,
@@ -9844,18 +9544,18 @@ static const yytype_int16 yytable[] =
428, 0, 429, 0, 0, 430, 0, 0, 431, 432,
433, 0, 0, 434, 435, 0, 436, 437, 438, 439,
440, 441, 0, 0, 442, 443, 444, 445, 0, 446,
- 447, 0, 448, 0, 449, 450, 451, 452, 0, 136,
+ 447, 0, 448, 0, 449, 450, 451, 452, 0, 0,
453, 454, 0, 455, 456, 457, 458, 0, 0, 0,
0, 0, 459, 460, 461, 0, 0, 0, 462, 463,
- 464, 465, 0, 466, 467, 0, 468, 469, 0, 470,
+ 464, 465, 1868, 466, 467, 0, 468, 469, 0, 470,
471, 0, 0, 472, 0, 0, 473, 0, 474, 0,
475, 476, 477, 0, 0, 0, 0, 0, 0, 478,
0, 0, 479, 0, 0, 0, 480, 481, 482, 483,
484, 485, 0, 0, 0, 0, 0, 0, 486, 487,
0, 488, 489, 490, 0, 139, 491, 140, 141, 142,
- 143, 144, 1384, 0, 145, 0, 0, 0, 146, 0,
+ 143, 144, 0, 0, 145, 0, 0, 0, 146, 0,
0, 147, 0, 148, 149, 150, 151, 152, 153, 154,
- 0, 155, 0, 0, 0, 156, 0, 0, 0, 157,
+ 0, 155, 0, 0, 2808, 156, 0, 0, 0, 157,
0, 0, 158, 159, 160, 0, 161, 0, 162, 163,
0, 0, 164, 0, 0, 165, 166, 0, 167, 168,
0, 169, 170, 0, 171, 172, 173, 174, 175, 176,
@@ -9864,7 +9564,7 @@ static const yytype_int16 yytable[] =
194, 195, 0, 196, 197, 198, 199, 200, 0, 201,
0, 0, 202, 0, 0, 203, 0, 0, 0, 204,
0, 0, 0, 205, 206, 207, 0, 0, 208, 0,
- 0, 0, 0, 209, 210, 0, 0, 0, 0, 211,
+ 0, 0, 0, 209, 210, 0, 0, 0, 2809, 211,
0, 212, 0, 0, 0, 213, 0, 214, 215, 216,
217, 0, 0, 0, 218, 0, 0, 219, 220, 221,
0, 0, 0, 222, 0, 223, 224, 0, 225, 226,
@@ -9878,7 +9578,7 @@ static const yytype_int16 yytable[] =
0, 268, 0, 269, 0, 0, 0, 0, 270, 271,
0, 0, 0, 272, 0, 273, 274, 0, 275, 276,
0, 0, 0, 277, 0, 0, 278, 279, 280, 0,
- 0, 281, 0, 0, 282, 283, 620, 0, 0, 0,
+ 0, 281, 0, 0, 282, 283, 618, 0, 0, 0,
0, 284, 285, 0, 286, 0, 287, 0, 288, 289,
0, 0, 0, 0, 0, 0, 0, 290, 291, 292,
293, 294, 295, 296, 297, 298, 299, 300, 301, 302,
@@ -9916,7 +9616,7 @@ static const yytype_int16 yytable[] =
487, 0, 488, 489, 490, 0, 139, 491, 140, 141,
142, 143, 144, 0, 0, 145, 0, 0, 0, 146,
0, 0, 147, 0, 148, 149, 150, 151, 152, 153,
- 154, 0, 155, 0, 0, 2628, 156, 0, 0, 0,
+ 154, 0, 155, 0, 0, 0, 156, 0, 0, 0,
157, 0, 0, 158, 159, 160, 0, 161, 0, 162,
163, 0, 0, 164, 0, 0, 165, 166, 0, 167,
168, 0, 169, 170, 0, 171, 172, 173, 174, 175,
@@ -9939,19 +9639,19 @@ static const yytype_int16 yytable[] =
267, 0, 268, 0, 269, 0, 0, 0, 0, 270,
271, 0, 0, 0, 272, 0, 273, 274, 0, 275,
276, 0, 0, 0, 277, 0, 0, 278, 279, 280,
- 0, 0, 281, 0, 0, 282, 283, 620, 0, 0,
+ 0, 0, 281, 0, 0, 282, 283, 0, 0, 0,
0, 0, 284, 285, 0, 286, 0, 287, 0, 288,
- 289, 0, 0, 0, 0, 0, 0, 0, 290, 291,
+ 289, 0, 0, 1865, 0, 0, 0, 0, 290, 291,
292, 293, 294, 295, 296, 297, 298, 299, 300, 301,
302, 0, 303, 304, 305, 0, 306, 307, 308, 309,
0, 310, 311, 0, 0, 0, 0, 312, 313, 314,
315, 316, 317, 0, 0, 318, 319, 0, 320, 0,
321, 0, 322, 323, 324, 325, 326, 327, 328, 329,
330, 331, 0, 0, 332, 333, 0, 0, 334, 335,
- 336, 337, 0, 0, 0, 338, 339, 0, 0, 0,
+ 336, 337, 0, 0, 0, 338, 339, 0, 0, 1866,
0, 340, 341, 342, 0, 343, 344, 345, 346, 0,
347, 348, 0, 0, 0, 0, 0, 0, 0, 0,
- 349, 350, 351, 0, 0, 352, 0, 353, 354, 355,
+ 349, 350, 351, 0, 739, 352, 0, 353, 354, 355,
356, 357, 358, 359, 360, 361, 362, 363, 364, 0,
0, 365, 366, 367, 0, 368, 0, 369, 370, 371,
372, 373, 0, 374, 375, 376, 0, 0, 377, 0,
@@ -9967,9 +9667,9 @@ static const yytype_int16 yytable[] =
431, 432, 433, 0, 0, 434, 435, 0, 436, 437,
438, 439, 440, 441, 0, 0, 442, 443, 444, 445,
0, 446, 447, 0, 448, 0, 449, 450, 451, 452,
- 0, 136, 453, 454, 0, 455, 456, 457, 458, 0,
+ 0, 0, 453, 454, 0, 455, 456, 457, 458, 0,
0, 0, 0, 0, 459, 460, 461, 0, 0, 0,
- 462, 463, 464, 465, 0, 466, 467, 0, 468, 469,
+ 462, 463, 464, 465, 1868, 466, 467, 0, 468, 469,
0, 470, 471, 0, 0, 472, 0, 0, 473, 0,
474, 0, 475, 476, 477, 0, 0, 0, 0, 0,
0, 478, 0, 0, 479, 0, 0, 0, 480, 481,
@@ -9977,7 +9677,7 @@ static const yytype_int16 yytable[] =
486, 487, 0, 488, 489, 490, 0, 139, 491, 140,
141, 142, 143, 144, 0, 0, 145, 0, 0, 0,
146, 0, 0, 147, 0, 148, 149, 150, 151, 152,
- 153, 154, 0, 155, 0, 0, 0, 156, 0, 0,
+ 153, 154, 0, 155, 0, 0, 2636, 156, 0, 0,
0, 157, 0, 0, 158, 159, 160, 0, 161, 0,
162, 163, 0, 0, 164, 0, 0, 165, 166, 0,
167, 168, 0, 169, 170, 0, 171, 172, 173, 174,
@@ -9987,7 +9687,7 @@ static const yytype_int16 yytable[] =
0, 201, 0, 0, 202, 0, 0, 203, 0, 0,
0, 204, 0, 0, 0, 205, 206, 207, 0, 0,
208, 0, 0, 0, 0, 209, 210, 0, 0, 0,
- 2842, 211, 0, 212, 0, 0, 0, 213, 0, 214,
+ 2800, 211, 0, 212, 0, 0, 0, 213, 0, 214,
215, 216, 217, 0, 0, 0, 218, 0, 0, 219,
220, 221, 0, 0, 0, 222, 0, 223, 224, 0,
225, 226, 227, 0, 0, 228, 229, 0, 230, 231,
@@ -10000,7 +9700,7 @@ static const yytype_int16 yytable[] =
266, 267, 0, 268, 0, 269, 0, 0, 0, 0,
270, 271, 0, 0, 0, 272, 0, 273, 274, 0,
275, 276, 0, 0, 0, 277, 0, 0, 278, 279,
- 280, 0, 0, 281, 0, 0, 282, 283, 620, 0,
+ 280, 0, 0, 281, 0, 0, 282, 283, 618, 0,
0, 0, 0, 284, 285, 0, 286, 0, 287, 0,
288, 289, 0, 0, 0, 0, 0, 0, 0, 290,
291, 292, 293, 294, 295, 296, 297, 298, 299, 300,
@@ -10061,9 +9761,9 @@ static const yytype_int16 yytable[] =
265, 266, 267, 0, 268, 0, 269, 0, 0, 0,
0, 270, 271, 0, 0, 0, 272, 0, 273, 274,
0, 275, 276, 0, 0, 0, 277, 0, 0, 278,
- 279, 280, 0, 0, 281, 0, 0, 282, 283, 620,
+ 279, 280, 0, 0, 281, 0, 0, 282, 283, 0,
0, 0, 0, 0, 284, 285, 0, 286, 0, 287,
- 0, 288, 289, 0, 0, 0, 0, 0, 0, 0,
+ 0, 288, 289, 0, 0, 1865, 0, 0, 0, 0,
290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
300, 301, 302, 0, 303, 304, 305, 0, 306, 307,
308, 309, 0, 310, 311, 0, 0, 0, 0, 312,
@@ -10071,9 +9771,9 @@ static const yytype_int16 yytable[] =
320, 0, 321, 0, 322, 323, 324, 325, 326, 327,
328, 329, 330, 331, 0, 0, 332, 333, 0, 0,
334, 335, 336, 337, 0, 0, 0, 338, 339, 0,
- 0, 0, 0, 340, 341, 342, 0, 343, 344, 345,
+ 0, 1866, 0, 340, 341, 342, 0, 343, 344, 345,
346, 0, 347, 348, 0, 0, 0, 0, 0, 0,
- 0, 0, 349, 350, 351, 0, 0, 352, 0, 353,
+ 0, 0, 349, 350, 351, 0, 739, 352, 0, 353,
354, 355, 356, 357, 358, 359, 360, 361, 362, 363,
364, 0, 0, 365, 366, 367, 0, 368, 0, 369,
370, 371, 372, 373, 0, 374, 375, 376, 0, 0,
@@ -10081,7 +9781,7 @@ static const yytype_int16 yytable[] =
0, 383, 384, 385, 386, 387, 0, 388, 389, 0,
390, 391, 392, 0, 0, 393, 0, 394, 0, 395,
396, 0, 397, 398, 0, 0, 0, 399, 400, 401,
- 402, 403, 404, 405, 406, 407, 408, 0, 409, 410,
+ 3618, 403, 404, 405, 406, 407, 408, 0, 409, 410,
0, 0, 0, 411, 412, 413, 414, 0, 0, 0,
415, 0, 0, 0, 416, 0, 417, 418, 419, 420,
0, 421, 422, 423, 424, 425, 426, 0, 0, 0,
@@ -10089,16 +9789,16 @@ static const yytype_int16 yytable[] =
0, 0, 431, 432, 433, 0, 0, 434, 435, 0,
436, 437, 438, 439, 440, 441, 0, 0, 442, 443,
444, 445, 0, 446, 447, 0, 448, 0, 449, 450,
- 451, 452, 0, 136, 453, 454, 0, 455, 456, 457,
+ 451, 452, 0, 0, 453, 454, 0, 455, 456, 457,
458, 0, 0, 0, 0, 0, 459, 460, 461, 0,
- 0, 0, 462, 463, 464, 465, 0, 466, 467, 0,
+ 0, 0, 462, 463, 464, 465, 1868, 466, 467, 0,
468, 469, 0, 470, 471, 0, 0, 472, 0, 0,
473, 0, 474, 0, 475, 476, 477, 0, 0, 0,
0, 0, 0, 478, 0, 0, 479, 0, 0, 0,
480, 481, 482, 483, 484, 485, 0, 0, 0, 0,
0, 0, 486, 487, 0, 488, 489, 490, 0, 139,
491, 140, 141, 142, 143, 144, 0, 0, 145, 0,
- 0, 0, 146, 2781, 0, 147, 0, 148, 149, 150,
+ 0, 0, 146, 0, 0, 147, 0, 148, 149, 150,
151, 152, 153, 154, 0, 155, 0, 0, 0, 156,
0, 0, 0, 157, 0, 0, 158, 159, 160, 0,
161, 0, 162, 163, 0, 0, 164, 0, 0, 165,
@@ -10107,7 +9807,7 @@ static const yytype_int16 yytable[] =
182, 183, 184, 185, 0, 186, 187, 188, 189, 190,
191, 192, 193, 0, 194, 195, 0, 196, 197, 198,
199, 200, 0, 201, 0, 0, 202, 0, 0, 203,
- 0, 0, 0, 204, 0, 0, 0, 205, 206, 207,
+ 0, 995, 0, 204, 0, 0, 0, 205, 206, 207,
0, 0, 208, 0, 0, 0, 0, 209, 210, 0,
0, 0, 0, 211, 0, 212, 0, 0, 0, 213,
0, 214, 215, 216, 217, 0, 0, 0, 218, 0,
@@ -10123,7 +9823,7 @@ static const yytype_int16 yytable[] =
0, 0, 270, 271, 0, 0, 0, 272, 0, 273,
274, 0, 275, 276, 0, 0, 0, 277, 0, 0,
278, 279, 280, 0, 0, 281, 0, 0, 282, 283,
- 0, 0, 0, 0, 0, 284, 285, 0, 286, 0,
+ 618, 0, 0, 0, 0, 284, 285, 0, 286, 0,
287, 0, 288, 289, 0, 0, 0, 0, 0, 0,
0, 290, 291, 292, 293, 294, 295, 296, 297, 298,
299, 300, 301, 302, 0, 303, 304, 305, 0, 306,
@@ -10158,7 +9858,7 @@ static const yytype_int16 yytable[] =
0, 0, 0, 0, 478, 0, 0, 479, 0, 0,
0, 480, 481, 482, 483, 484, 485, 0, 0, 0,
0, 0, 0, 486, 487, 0, 488, 489, 490, 0,
- 139, 491, 140, 141, 142, 143, 144, 0, 0, 145,
+ 139, 491, 140, 141, 142, 143, 144, 1387, 0, 145,
0, 0, 0, 146, 0, 0, 147, 0, 148, 149,
150, 151, 152, 153, 154, 0, 155, 0, 0, 0,
156, 0, 0, 0, 157, 0, 0, 158, 159, 160,
@@ -10167,14 +9867,14 @@ static const yytype_int16 yytable[] =
172, 173, 174, 175, 176, 177, 0, 178, 179, 180,
181, 182, 183, 184, 185, 0, 186, 187, 188, 189,
190, 191, 192, 193, 0, 194, 195, 0, 196, 197,
- 198, 199, 200, 4342, 201, 0, 0, 202, 0, 0,
+ 198, 199, 200, 0, 201, 0, 0, 202, 0, 0,
203, 0, 0, 0, 204, 0, 0, 0, 205, 206,
207, 0, 0, 208, 0, 0, 0, 0, 209, 210,
0, 0, 0, 0, 211, 0, 212, 0, 0, 0,
213, 0, 214, 215, 216, 217, 0, 0, 0, 218,
0, 0, 219, 220, 221, 0, 0, 0, 222, 0,
223, 224, 0, 225, 226, 227, 0, 0, 228, 229,
- 0, 230, 231, 232, 233, 234, 235, 0, 4343, 236,
+ 0, 230, 231, 232, 233, 234, 235, 0, 0, 236,
237, 238, 0, 0, 239, 240, 0, 241, 242, 243,
0, 0, 244, 0, 0, 0, 245, 0, 246, 0,
247, 0, 248, 249, 250, 251, 252, 253, 0, 254,
@@ -10184,7 +9884,7 @@ static const yytype_int16 yytable[] =
0, 0, 0, 270, 271, 0, 0, 0, 272, 0,
273, 274, 0, 275, 276, 0, 0, 0, 277, 0,
0, 278, 279, 280, 0, 0, 281, 0, 0, 282,
- 283, 0, 0, 0, 0, 0, 284, 285, 0, 286,
+ 283, 618, 0, 0, 0, 0, 284, 285, 0, 286,
0, 287, 0, 288, 289, 0, 0, 0, 0, 0,
0, 0, 290, 291, 292, 293, 294, 295, 296, 297,
298, 299, 300, 301, 302, 0, 303, 304, 305, 0,
@@ -10211,7 +9911,7 @@ static const yytype_int16 yytable[] =
0, 430, 0, 0, 431, 432, 433, 0, 0, 434,
435, 0, 436, 437, 438, 439, 440, 441, 0, 0,
442, 443, 444, 445, 0, 446, 447, 0, 448, 0,
- 449, 450, 451, 452, 0, 0, 453, 454, 0, 455,
+ 449, 450, 451, 452, 0, 136, 453, 454, 0, 455,
456, 457, 458, 0, 0, 0, 0, 0, 459, 460,
461, 0, 0, 0, 462, 463, 464, 465, 0, 466,
467, 0, 468, 469, 0, 470, 471, 0, 0, 472,
@@ -10222,7 +9922,7 @@ static const yytype_int16 yytable[] =
0, 139, 491, 140, 141, 142, 143, 144, 0, 0,
145, 0, 0, 0, 146, 0, 0, 147, 0, 148,
149, 150, 151, 152, 153, 154, 0, 155, 0, 0,
- 0, 156, 0, 0, 0, 157, 0, 0, 158, 159,
+ 2636, 156, 0, 0, 0, 157, 0, 0, 158, 159,
160, 0, 161, 0, 162, 163, 0, 0, 164, 0,
0, 165, 166, 0, 167, 168, 0, 169, 170, 0,
171, 172, 173, 174, 175, 176, 177, 0, 178, 179,
@@ -10245,7 +9945,7 @@ static const yytype_int16 yytable[] =
0, 0, 0, 0, 270, 271, 0, 0, 0, 272,
0, 273, 274, 0, 275, 276, 0, 0, 0, 277,
0, 0, 278, 279, 280, 0, 0, 281, 0, 0,
- 282, 283, 0, 0, 0, 0, 0, 284, 285, 0,
+ 282, 283, 618, 0, 0, 0, 0, 284, 285, 0,
286, 0, 287, 0, 288, 289, 0, 0, 0, 0,
0, 0, 0, 290, 291, 292, 293, 294, 295, 296,
297, 298, 299, 300, 301, 302, 0, 303, 304, 305,
@@ -10268,11 +9968,11 @@ static const yytype_int16 yytable[] =
0, 409, 410, 0, 0, 0, 411, 412, 413, 414,
0, 0, 0, 415, 0, 0, 0, 416, 0, 417,
418, 419, 420, 0, 421, 422, 423, 424, 425, 426,
- 0, 0, 0, 566, 0, 0, 427, 428, 0, 429,
+ 0, 0, 0, 0, 0, 0, 427, 428, 0, 429,
0, 0, 430, 0, 0, 431, 432, 433, 0, 0,
434, 435, 0, 436, 437, 438, 439, 440, 441, 0,
0, 442, 443, 444, 445, 0, 446, 447, 0, 448,
- 0, 449, 450, 451, 452, 0, 0, 453, 454, 0,
+ 0, 449, 450, 451, 452, 0, 136, 453, 454, 0,
455, 456, 457, 458, 0, 0, 0, 0, 0, 459,
460, 461, 0, 0, 0, 462, 463, 464, 465, 0,
466, 467, 0, 468, 469, 0, 470, 471, 0, 0,
@@ -10292,13 +9992,13 @@ static const yytype_int16 yytable[] =
196, 197, 198, 199, 200, 0, 201, 0, 0, 202,
0, 0, 203, 0, 0, 0, 204, 0, 0, 0,
205, 206, 207, 0, 0, 208, 0, 0, 0, 0,
- 209, 210, 0, 0, 0, 0, 211, 0, 212, 0,
+ 209, 210, 0, 0, 0, 2851, 211, 0, 212, 0,
0, 0, 213, 0, 214, 215, 216, 217, 0, 0,
0, 218, 0, 0, 219, 220, 221, 0, 0, 0,
222, 0, 223, 224, 0, 225, 226, 227, 0, 0,
228, 229, 0, 230, 231, 232, 233, 234, 235, 0,
0, 236, 237, 238, 0, 0, 239, 240, 0, 241,
- 242, 243, 0, 0, 244, 0, 0, 0, 245, 1073,
+ 242, 243, 0, 0, 244, 0, 0, 0, 245, 0,
246, 0, 247, 0, 248, 249, 250, 251, 252, 253,
0, 254, 0, 0, 0, 255, 256, 257, 0, 258,
0, 0, 0, 259, 260, 0, 0, 0, 261, 262,
@@ -10306,7 +10006,7 @@ static const yytype_int16 yytable[] =
269, 0, 0, 0, 0, 270, 271, 0, 0, 0,
272, 0, 273, 274, 0, 275, 276, 0, 0, 0,
277, 0, 0, 278, 279, 280, 0, 0, 281, 0,
- 0, 282, 283, 0, 0, 0, 0, 0, 284, 285,
+ 0, 282, 283, 618, 0, 0, 0, 0, 284, 285,
0, 286, 0, 287, 0, 288, 289, 0, 0, 0,
0, 0, 0, 0, 290, 291, 292, 293, 294, 295,
296, 297, 298, 299, 300, 301, 302, 0, 303, 304,
@@ -10333,7 +10033,7 @@ static const yytype_int16 yytable[] =
429, 0, 0, 430, 0, 0, 431, 432, 433, 0,
0, 434, 435, 0, 436, 437, 438, 439, 440, 441,
0, 0, 442, 443, 444, 445, 0, 446, 447, 0,
- 448, 0, 449, 450, 451, 452, 0, 0, 453, 454,
+ 448, 0, 449, 450, 451, 452, 0, 136, 453, 454,
0, 455, 456, 457, 458, 0, 0, 0, 0, 0,
459, 460, 461, 0, 0, 0, 462, 463, 464, 465,
0, 466, 467, 0, 468, 469, 0, 470, 471, 0,
@@ -10353,7 +10053,7 @@ static const yytype_int16 yytable[] =
0, 196, 197, 198, 199, 200, 0, 201, 0, 0,
202, 0, 0, 203, 0, 0, 0, 204, 0, 0,
0, 205, 206, 207, 0, 0, 208, 0, 0, 0,
- 0, 209, 210, 0, 0, 0, 2026, 211, 0, 212,
+ 0, 209, 210, 0, 0, 0, 0, 211, 0, 212,
0, 0, 0, 213, 0, 214, 215, 216, 217, 0,
0, 0, 218, 0, 0, 219, 220, 221, 0, 0,
0, 222, 0, 223, 224, 0, 225, 226, 227, 0,
@@ -10367,7 +10067,7 @@ static const yytype_int16 yytable[] =
0, 269, 0, 0, 0, 0, 270, 271, 0, 0,
0, 272, 0, 273, 274, 0, 275, 276, 0, 0,
0, 277, 0, 0, 278, 279, 280, 0, 0, 281,
- 0, 0, 282, 283, 0, 0, 0, 0, 0, 284,
+ 0, 0, 282, 283, 618, 0, 0, 0, 0, 284,
285, 0, 286, 0, 287, 0, 288, 289, 0, 0,
0, 0, 0, 0, 0, 290, 291, 292, 293, 294,
295, 296, 297, 298, 299, 300, 301, 302, 0, 303,
@@ -10394,7 +10094,7 @@ static const yytype_int16 yytable[] =
0, 429, 0, 0, 430, 0, 0, 431, 432, 433,
0, 0, 434, 435, 0, 436, 437, 438, 439, 440,
441, 0, 0, 442, 443, 444, 445, 0, 446, 447,
- 0, 448, 0, 449, 450, 451, 452, 0, 0, 453,
+ 0, 448, 0, 449, 450, 451, 452, 0, 136, 453,
454, 0, 455, 456, 457, 458, 0, 0, 0, 0,
0, 459, 460, 461, 0, 0, 0, 462, 463, 464,
465, 0, 466, 467, 0, 468, 469, 0, 470, 471,
@@ -10403,7 +10103,7 @@ static const yytype_int16 yytable[] =
0, 479, 0, 0, 0, 480, 481, 482, 483, 484,
485, 0, 0, 0, 0, 0, 0, 486, 487, 0,
488, 489, 490, 0, 139, 491, 140, 141, 142, 143,
- 144, 0, 0, 145, 0, 0, 0, 146, 0, 0,
+ 144, 0, 0, 145, 0, 0, 0, 146, 2790, 0,
147, 0, 148, 149, 150, 151, 152, 153, 154, 0,
155, 0, 0, 0, 156, 0, 0, 0, 157, 0,
0, 158, 159, 160, 0, 161, 0, 162, 163, 0,
@@ -10414,7 +10114,7 @@ static const yytype_int16 yytable[] =
195, 0, 196, 197, 198, 199, 200, 0, 201, 0,
0, 202, 0, 0, 203, 0, 0, 0, 204, 0,
0, 0, 205, 206, 207, 0, 0, 208, 0, 0,
- 0, 0, 209, 210, 0, 0, 0, 2360, 211, 0,
+ 0, 0, 209, 210, 0, 0, 0, 0, 211, 0,
212, 0, 0, 0, 213, 0, 214, 215, 216, 217,
0, 0, 0, 218, 0, 0, 219, 220, 221, 0,
0, 0, 222, 0, 223, 224, 0, 225, 226, 227,
@@ -10455,16 +10155,16 @@ static const yytype_int16 yytable[] =
428, 0, 429, 0, 0, 430, 0, 0, 431, 432,
433, 0, 0, 434, 435, 0, 436, 437, 438, 439,
440, 441, 0, 0, 442, 443, 444, 445, 0, 446,
- 447, 0, 448, 0, 449, 450, 451, 452, 0, 0,
+ 447, 0, 448, 0, 449, 450, 451, 452, 0, 136,
453, 454, 0, 455, 456, 457, 458, 0, 0, 0,
- 0, 0, 2361, 460, 461, 0, 0, 0, 462, 463,
+ 0, 0, 459, 460, 461, 0, 0, 0, 462, 463,
464, 465, 0, 466, 467, 0, 468, 469, 0, 470,
471, 0, 0, 472, 0, 0, 473, 0, 474, 0,
475, 476, 477, 0, 0, 0, 0, 0, 0, 478,
0, 0, 479, 0, 0, 0, 480, 481, 482, 483,
484, 485, 0, 0, 0, 0, 0, 0, 486, 487,
0, 488, 489, 490, 0, 139, 491, 140, 141, 142,
- 143, 144, 2885, 0, 145, 0, 0, 0, 146, 0,
+ 143, 144, 0, 0, 145, 0, 0, 0, 146, 0,
0, 147, 0, 148, 149, 150, 151, 152, 153, 154,
0, 155, 0, 0, 0, 156, 0, 0, 0, 157,
0, 0, 158, 159, 160, 0, 161, 0, 162, 163,
@@ -10472,7 +10172,7 @@ static const yytype_int16 yytable[] =
0, 169, 170, 0, 171, 172, 173, 174, 175, 176,
177, 0, 178, 179, 180, 181, 182, 183, 184, 185,
0, 186, 187, 188, 189, 190, 191, 192, 193, 0,
- 194, 195, 0, 196, 197, 198, 199, 200, 0, 201,
+ 194, 195, 0, 196, 197, 198, 199, 200, 4352, 201,
0, 0, 202, 0, 0, 203, 0, 0, 0, 204,
0, 0, 0, 205, 206, 207, 0, 0, 208, 0,
0, 0, 0, 209, 210, 0, 0, 0, 0, 211,
@@ -10480,7 +10180,7 @@ static const yytype_int16 yytable[] =
217, 0, 0, 0, 218, 0, 0, 219, 220, 221,
0, 0, 0, 222, 0, 223, 224, 0, 225, 226,
227, 0, 0, 228, 229, 0, 230, 231, 232, 233,
- 234, 235, 0, 0, 236, 237, 238, 0, 0, 239,
+ 234, 235, 0, 4353, 236, 237, 238, 0, 0, 239,
240, 0, 241, 242, 243, 0, 0, 244, 0, 0,
0, 245, 0, 246, 0, 247, 0, 248, 249, 250,
251, 252, 253, 0, 254, 0, 0, 0, 255, 256,
@@ -10564,7 +10264,7 @@ static const yytype_int16 yytable[] =
347, 348, 0, 0, 0, 0, 0, 0, 0, 0,
349, 350, 351, 0, 0, 352, 0, 353, 354, 355,
356, 357, 358, 359, 360, 361, 362, 363, 364, 0,
- 0, 365, 366, 367, 2972, 368, 0, 369, 370, 371,
+ 0, 365, 366, 367, 0, 368, 0, 369, 370, 371,
372, 373, 0, 374, 375, 376, 0, 0, 377, 0,
0, 0, 378, 379, 380, 381, 382, 0, 0, 383,
384, 385, 386, 387, 0, 388, 389, 0, 390, 391,
@@ -10573,7 +10273,7 @@ static const yytype_int16 yytable[] =
404, 405, 406, 407, 408, 0, 409, 410, 0, 0,
0, 411, 412, 413, 414, 0, 0, 0, 415, 0,
0, 0, 416, 0, 417, 418, 419, 420, 0, 421,
- 422, 423, 424, 425, 426, 0, 0, 0, 0, 0,
+ 422, 423, 424, 425, 426, 0, 0, 0, 564, 0,
0, 427, 428, 0, 429, 0, 0, 430, 0, 0,
431, 432, 433, 0, 0, 434, 435, 0, 436, 437,
438, 439, 440, 441, 0, 0, 442, 443, 444, 445,
@@ -10604,7 +10304,7 @@ static const yytype_int16 yytable[] =
225, 226, 227, 0, 0, 228, 229, 0, 230, 231,
232, 233, 234, 235, 0, 0, 236, 237, 238, 0,
0, 239, 240, 0, 241, 242, 243, 0, 0, 244,
- 0, 0, 0, 245, 0, 246, 0, 247, 0, 248,
+ 0, 0, 0, 245, 1074, 246, 0, 247, 0, 248,
249, 250, 251, 252, 253, 0, 254, 0, 0, 0,
255, 256, 257, 0, 258, 0, 0, 0, 259, 260,
0, 0, 0, 261, 262, 263, 264, 0, 0, 265,
@@ -10639,7 +10339,7 @@ static const yytype_int16 yytable[] =
0, 431, 432, 433, 0, 0, 434, 435, 0, 436,
437, 438, 439, 440, 441, 0, 0, 442, 443, 444,
445, 0, 446, 447, 0, 448, 0, 449, 450, 451,
- 452, 0, 136, 453, 454, 0, 455, 456, 457, 458,
+ 452, 0, 0, 453, 454, 0, 455, 456, 457, 458,
0, 0, 0, 0, 0, 459, 460, 461, 0, 0,
0, 462, 463, 464, 465, 0, 466, 467, 0, 468,
469, 0, 470, 471, 0, 0, 472, 0, 0, 473,
@@ -10659,7 +10359,7 @@ static const yytype_int16 yytable[] =
200, 0, 201, 0, 0, 202, 0, 0, 203, 0,
0, 0, 204, 0, 0, 0, 205, 206, 207, 0,
0, 208, 0, 0, 0, 0, 209, 210, 0, 0,
- 0, 2360, 211, 0, 212, 0, 0, 0, 213, 0,
+ 0, 2031, 211, 0, 212, 0, 0, 0, 213, 0,
214, 215, 216, 217, 0, 0, 0, 218, 0, 0,
219, 220, 221, 0, 0, 0, 222, 0, 223, 224,
0, 225, 226, 227, 0, 0, 228, 229, 0, 230,
@@ -10720,7 +10420,7 @@ static const yytype_int16 yytable[] =
199, 200, 0, 201, 0, 0, 202, 0, 0, 203,
0, 0, 0, 204, 0, 0, 0, 205, 206, 207,
0, 0, 208, 0, 0, 0, 0, 209, 210, 0,
- 0, 0, 0, 211, 0, 212, 0, 0, 0, 213,
+ 0, 0, 2367, 211, 0, 212, 0, 0, 0, 213,
0, 214, 215, 216, 217, 0, 0, 0, 218, 0,
0, 219, 220, 221, 0, 0, 0, 222, 0, 223,
224, 0, 225, 226, 227, 0, 0, 228, 229, 0,
@@ -10762,14 +10462,14 @@ static const yytype_int16 yytable[] =
0, 436, 437, 438, 439, 440, 441, 0, 0, 442,
443, 444, 445, 0, 446, 447, 0, 448, 0, 449,
450, 451, 452, 0, 0, 453, 454, 0, 455, 456,
- 457, 458, 0, 0, 0, 0, 0, 459, 460, 461,
+ 457, 458, 0, 0, 0, 0, 0, 2368, 460, 461,
0, 0, 0, 462, 463, 464, 465, 0, 466, 467,
0, 468, 469, 0, 470, 471, 0, 0, 472, 0,
0, 473, 0, 474, 0, 475, 476, 477, 0, 0,
0, 0, 0, 0, 478, 0, 0, 479, 0, 0,
0, 480, 481, 482, 483, 484, 485, 0, 0, 0,
0, 0, 0, 486, 487, 0, 488, 489, 490, 0,
- 139, 491, 140, 141, 142, 143, 144, 0, 0, 145,
+ 139, 491, 140, 141, 142, 143, 144, 2894, 0, 145,
0, 0, 0, 146, 0, 0, 147, 0, 148, 149,
150, 151, 152, 153, 154, 0, 155, 0, 0, 0,
156, 0, 0, 0, 157, 0, 0, 158, 159, 160,
@@ -10786,7 +10486,7 @@ static const yytype_int16 yytable[] =
0, 0, 219, 220, 221, 0, 0, 0, 222, 0,
223, 224, 0, 225, 226, 227, 0, 0, 228, 229,
0, 230, 231, 232, 233, 234, 235, 0, 0, 236,
- 237, 238, 0, 0, 239, 240, 0, 241, 1777, 243,
+ 237, 238, 0, 0, 239, 240, 0, 241, 242, 243,
0, 0, 244, 0, 0, 0, 245, 0, 246, 0,
247, 0, 248, 249, 250, 251, 252, 253, 0, 254,
0, 0, 0, 255, 256, 257, 0, 258, 0, 0,
@@ -10803,7 +10503,7 @@ static const yytype_int16 yytable[] =
0, 312, 313, 314, 315, 316, 317, 0, 0, 318,
319, 0, 320, 0, 321, 0, 322, 323, 324, 325,
326, 327, 328, 329, 330, 331, 0, 0, 332, 333,
- 0, 0, 334, 1778, 336, 337, 0, 0, 0, 338,
+ 0, 0, 334, 335, 336, 337, 0, 0, 0, 338,
339, 0, 0, 0, 0, 340, 341, 342, 0, 343,
344, 345, 346, 0, 347, 348, 0, 0, 0, 0,
0, 0, 0, 0, 349, 350, 351, 0, 0, 352,
@@ -10831,317 +10531,317 @@ static const yytype_int16 yytable[] =
0, 0, 480, 481, 482, 483, 484, 485, 0, 0,
0, 0, 0, 0, 486, 487, 0, 488, 489, 490,
0, 139, 491, 140, 141, 142, 143, 144, 0, 0,
- 145, 0, 0, 0, 146, 0, 0, 0, 0, 148,
- 149, 150, 151, 152, 153, 0, 0, -329, 0, 0,
+ 145, 0, 0, 0, 146, 0, 0, 147, 0, 148,
+ 149, 150, 151, 152, 153, 154, 0, 155, 0, 0,
0, 156, 0, 0, 0, 157, 0, 0, 158, 159,
- 160, 0, 161, 0, 0, 0, 0, 0, 164, 3892,
- 0, 165, 166, 0, 167, 0, 0, 0, 0, 0,
- 171, 172, 173, 174, 3893, 176, 177, 0, 178, 179,
- 0, 0, 0, 0, 0, 0, 0, 186, 0, 188,
- 0, 190, 191, 192, 193, 0, 194, 195, 0, 196,
- 197, 198, 0, 200, 0, 201, 0, 0, 202, 0,
+ 160, 0, 161, 0, 162, 163, 0, 0, 164, 0,
+ 0, 165, 166, 0, 167, 168, 0, 169, 170, 0,
+ 171, 172, 173, 174, 175, 176, 177, 0, 178, 179,
+ 180, 181, 182, 183, 184, 185, 0, 186, 187, 188,
+ 189, 190, 191, 192, 193, 0, 194, 195, 0, 196,
+ 197, 198, 199, 200, 0, 201, 0, 0, 202, 0,
0, 203, 0, 0, 0, 204, 0, 0, 0, 205,
206, 207, 0, 0, 208, 0, 0, 0, 0, 209,
- 0, 0, 0, 0, 0, 211, 0, 212, 0, 0,
+ 210, 0, 0, 0, 0, 211, 0, 212, 0, 0,
0, 213, 0, 214, 215, 216, 217, 0, 0, 0,
- 0, 0, 0, 219, 220, 221, 0, -299, -299, 222,
- 0, -299, 224, 0, 225, 226, 227, 0, 0, 228,
- 229, 0, 230, 231, 232, 233, 0, 0, 0, 0,
- 236, 237, 238, 0, 0, 239, 240, 3894, 241, 242,
- 243, 0, 0, 0, 0, 0, 0, 245, 0, 246,
+ 218, 0, 0, 219, 220, 221, 0, 0, 0, 222,
+ 0, 223, 224, 0, 225, 226, 227, 0, 0, 228,
+ 229, 0, 230, 231, 232, 233, 234, 235, 0, 0,
+ 236, 237, 238, 0, 0, 239, 240, 0, 241, 242,
+ 243, 0, 0, 244, 0, 0, 0, 245, 0, 246,
0, 247, 0, 248, 249, 250, 251, 252, 253, 0,
- 254, 0, 0, 0, 0, 256, 257, 0, 0, 0,
- 0, 0, 0, 260, 0, 0, 0, 261, 262, 263,
- 264, 3895, 0, 265, 266, 267, 0, 268, 0, 269,
- 0, 0, 0, 0, 270, 0, 0, 0, 0, 272,
- 0, 273, 274, 0, 275, 276, 3896, 0, 0, 277,
- 0, 0, 0, 279, 280, 0, 0, 281, 3897, 0,
+ 254, 0, 0, 0, 255, 256, 257, 0, 258, 0,
+ 0, 0, 259, 260, 0, 0, 0, 261, 262, 263,
+ 264, 0, 0, 265, 266, 267, 0, 268, 0, 269,
+ 0, 0, 0, 0, 270, 271, 0, 0, 0, 272,
+ 0, 273, 274, 0, 275, 276, 0, 0, 0, 277,
+ 0, 0, 278, 279, 280, 0, 0, 281, 0, 0,
282, 283, 0, 0, 0, 0, 0, 284, 285, 0,
286, 0, 287, 0, 288, 289, 0, 0, 0, 0,
- -284, 0, 0, 290, 291, 292, 293, 294, 295, 296,
+ 0, 0, 0, 290, 291, 292, 293, 294, 295, 296,
297, 298, 299, 300, 301, 302, 0, 303, 304, 305,
0, 306, 307, 308, 309, 0, 310, 311, 0, 0,
0, 0, 312, 313, 314, 315, 316, 317, 0, 0,
318, 319, 0, 320, 0, 321, 0, 322, 323, 324,
325, 326, 327, 328, 329, 330, 331, 0, 0, 332,
333, 0, 0, 334, 335, 336, 337, 0, 0, 0,
- 0, 339, 0, 0, 0, 0, 340, 341, 342, 0,
- 343, 344, 345, 3898, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 350, 351, 0, 0,
- 0, 0, 353, 354, 355, 0, 357, 358, 359, 360,
- 361, 362, 363, 0, 0, 0, 0, 366, 367, 0,
+ 338, 339, 0, 0, 0, 0, 340, 341, 342, 0,
+ 343, 344, 345, 346, 0, 347, 348, 0, 0, 0,
+ 0, 0, 0, 0, 0, 349, 350, 351, 0, 0,
+ 352, 0, 353, 354, 355, 356, 357, 358, 359, 360,
+ 361, 362, 363, 364, 0, 0, 365, 366, 367, 2981,
368, 0, 369, 370, 371, 372, 373, 0, 374, 375,
376, 0, 0, 377, 0, 0, 0, 378, 379, 380,
381, 382, 0, 0, 383, 384, 385, 386, 387, 0,
- 388, 0, 0, 390, 0, 392, -284, 0, 393, 0,
- 0, 0, 395, 0, 0, 397, 398, 3899, 0, 0,
- 0, 400, 401, 402, 403, 404, 405, 0, 407, 408,
- 0, 409, 0, 0, 0, 0, 411, 412, 413, 0,
- 0, 0, 0, 415, 0, 0, 0, 416, 0, 0,
- 418, 0, 420, 0, 421, 0, 423, 0, 425, 426,
+ 388, 389, 0, 390, 391, 392, 0, 0, 393, 0,
+ 394, 0, 395, 396, 0, 397, 398, 0, 0, 0,
+ 399, 400, 401, 402, 403, 404, 405, 406, 407, 408,
+ 0, 409, 410, 0, 0, 0, 411, 412, 413, 414,
+ 0, 0, 0, 415, 0, 0, 0, 416, 0, 417,
+ 418, 419, 420, 0, 421, 422, 423, 424, 425, 426,
0, 0, 0, 0, 0, 0, 427, 428, 0, 429,
- 0, 0, 430, 0, 0, 431, 0, 433, 0, 0,
- 0, 435, 0, 436, 437, 438, 439, 440, 441, 0,
+ 0, 0, 430, 0, 0, 431, 432, 433, 0, 0,
+ 434, 435, 0, 436, 437, 438, 439, 440, 441, 0,
0, 442, 443, 444, 445, 0, 446, 447, 0, 448,
0, 449, 450, 451, 452, 0, 0, 453, 454, 0,
455, 456, 457, 458, 0, 0, 0, 0, 0, 459,
- 460, 461, 0, 0, 0, 0, 463, 464, 465, 0,
- 466, 467, 0, 468, 469, 0, 0, 0, 0, 0,
- 472, 0, 0, 473, 0, 0, 0, 475, 476, 477,
+ 460, 461, 0, 0, 0, 462, 463, 464, 465, 0,
+ 466, 467, 0, 468, 469, 0, 470, 471, 0, 0,
+ 472, 0, 0, 473, 0, 474, 0, 475, 476, 477,
0, 0, 0, 0, 0, 0, 478, 0, 0, 479,
0, 0, 0, 480, 481, 482, 483, 484, 485, 0,
- 0, -284, 0, 0, 0, 486, 0, 0, 488, 0,
+ 0, 0, 0, 0, 0, 486, 487, 0, 488, 489,
490, 0, 139, 491, 140, 141, 142, 143, 144, 0,
- 0, 145, 0, 0, 0, 146, 0, 0, 0, 0,
- 148, 149, 150, 151, 152, 153, 0, 0, -329, 0,
+ 0, 145, 0, 0, 0, 146, 0, 0, 147, 0,
+ 148, 149, 150, 151, 152, 153, 154, 0, 155, 0,
0, 0, 156, 0, 0, 0, 157, 0, 0, 158,
- 159, 160, 0, 161, 0, 0, 0, 0, 0, 164,
- 3892, 0, 165, 166, 0, 167, 0, 0, 0, 0,
- 0, 171, 172, 173, 174, 3893, 176, 177, 0, 178,
- 179, 0, 0, 0, 0, 0, 0, 0, 186, 0,
- 188, 0, 190, 191, 192, 193, 0, 194, 195, 0,
- 196, 197, 198, 0, 200, 0, 201, 0, 0, 202,
+ 159, 160, 0, 161, 0, 162, 163, 0, 0, 164,
+ 0, 0, 165, 166, 0, 167, 168, 0, 169, 170,
+ 0, 171, 172, 173, 174, 175, 176, 177, 0, 178,
+ 179, 180, 181, 182, 183, 184, 185, 0, 186, 187,
+ 188, 189, 190, 191, 192, 193, 0, 194, 195, 0,
+ 196, 197, 198, 199, 200, 0, 201, 0, 0, 202,
0, 0, 203, 0, 0, 0, 204, 0, 0, 0,
205, 206, 207, 0, 0, 208, 0, 0, 0, 0,
- 209, 0, 0, 0, 0, 0, 211, 0, 212, 0,
+ 209, 210, 0, 0, 0, 0, 211, 0, 212, 0,
0, 0, 213, 0, 214, 215, 216, 217, 0, 0,
- 0, 0, 0, 0, 219, 220, 221, 0, -320, 0,
- 222, 0, -320, 224, 0, 225, 226, 227, 0, 0,
- 228, 229, 0, 230, 231, 232, 233, 0, 0, 0,
- 0, 236, 237, 238, 0, 0, 239, 240, 3894, 241,
- 242, 243, 0, 0, 0, 0, 0, 0, 245, 0,
+ 0, 218, 0, 0, 219, 220, 221, 0, 0, 0,
+ 222, 0, 223, 224, 0, 225, 226, 227, 0, 0,
+ 228, 229, 0, 230, 231, 232, 233, 234, 235, 0,
+ 0, 236, 237, 238, 0, 0, 239, 240, 0, 241,
+ 242, 243, 0, 0, 244, 0, 0, 0, 245, 0,
246, 0, 247, 0, 248, 249, 250, 251, 252, 253,
- 0, 254, 0, 0, 0, 0, 256, 257, 0, 0,
- 0, 0, 0, 0, 260, 0, 0, 0, 261, 262,
- 263, 264, 3895, 0, 265, 266, 267, 0, 268, 0,
- 269, 0, 0, 0, 0, 270, 0, 0, 0, 0,
- 272, 0, 273, 274, 0, 275, 276, 3896, 0, 0,
- 277, 0, 0, 0, 279, 280, 0, 0, 281, 3897,
+ 0, 254, 0, 0, 0, 255, 256, 257, 0, 258,
+ 0, 0, 0, 259, 260, 0, 0, 0, 261, 262,
+ 263, 264, 0, 0, 265, 266, 267, 0, 268, 0,
+ 269, 0, 0, 0, 0, 270, 271, 0, 0, 0,
+ 272, 0, 273, 274, 0, 275, 276, 0, 0, 0,
+ 277, 0, 0, 278, 279, 280, 0, 0, 281, 0,
0, 282, 283, 0, 0, 0, 0, 0, 284, 285,
0, 286, 0, 287, 0, 288, 289, 0, 0, 0,
- 0, -284, 0, 0, 290, 291, 292, 293, 294, 295,
+ 0, 0, 0, 0, 290, 291, 292, 293, 294, 295,
296, 297, 298, 299, 300, 301, 302, 0, 303, 304,
305, 0, 306, 307, 308, 309, 0, 310, 311, 0,
0, 0, 0, 312, 313, 314, 315, 316, 317, 0,
0, 318, 319, 0, 320, 0, 321, 0, 322, 323,
324, 325, 326, 327, 328, 329, 330, 331, 0, 0,
332, 333, 0, 0, 334, 335, 336, 337, 0, 0,
- 0, 0, 339, 0, 0, 0, 0, 340, 341, 342,
- 0, 343, 344, 345, 3898, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 350, 351, 0,
- 0, 0, 0, 353, 354, 355, 0, 357, 358, 359,
- 360, 361, 362, 363, 0, 0, 0, 0, 366, 367,
+ 0, 338, 339, 0, 0, 0, 0, 340, 341, 342,
+ 0, 343, 344, 345, 346, 0, 347, 348, 0, 0,
+ 0, 0, 0, 0, 0, 0, 349, 350, 351, 0,
+ 0, 352, 0, 353, 354, 355, 356, 357, 358, 359,
+ 360, 361, 362, 363, 364, 0, 0, 365, 366, 367,
0, 368, 0, 369, 370, 371, 372, 373, 0, 374,
375, 376, 0, 0, 377, 0, 0, 0, 378, 379,
380, 381, 382, 0, 0, 383, 384, 385, 386, 387,
- 0, 388, 0, 0, 390, 0, 392, -284, 0, 393,
- 0, 0, 0, 395, 0, 0, 397, 398, 3899, 0,
- 0, 0, 400, 401, 402, 403, 404, 405, 0, 407,
- 408, 0, 409, 0, 0, 0, 0, 411, 412, 413,
- 0, 0, 0, 0, 415, 0, 0, 0, 416, 0,
- 0, 418, 0, 420, 0, 421, 0, 423, 0, 425,
+ 0, 388, 389, 0, 390, 391, 392, 0, 0, 393,
+ 0, 394, 0, 395, 396, 0, 397, 398, 0, 0,
+ 0, 399, 400, 401, 402, 403, 404, 405, 406, 407,
+ 408, 0, 409, 410, 0, 0, 0, 411, 412, 413,
+ 414, 0, 0, 0, 415, 0, 0, 0, 416, 0,
+ 417, 418, 419, 420, 0, 421, 422, 423, 424, 425,
426, 0, 0, 0, 0, 0, 0, 427, 428, 0,
- 429, 0, 0, 430, 0, 0, 431, 0, 433, 0,
- 0, 0, 435, 0, 436, 437, 438, 439, 440, 441,
+ 429, 0, 0, 430, 0, 0, 431, 432, 433, 0,
+ 0, 434, 435, 0, 436, 437, 438, 439, 440, 441,
0, 0, 442, 443, 444, 445, 0, 446, 447, 0,
- 448, 0, 449, 450, 451, 452, 0, 0, 453, 454,
+ 448, 0, 449, 450, 451, 452, 0, 136, 453, 454,
0, 455, 456, 457, 458, 0, 0, 0, 0, 0,
- 459, 460, 461, 0, 0, 0, 0, 463, 464, 465,
- 0, 466, 467, 0, 468, 469, 0, 0, 0, 0,
- 0, 472, 0, 0, 473, 0, 0, 0, 475, 476,
+ 459, 460, 461, 0, 0, 0, 462, 463, 464, 465,
+ 0, 466, 467, 0, 468, 469, 0, 470, 471, 0,
+ 0, 472, 0, 0, 473, 0, 474, 0, 475, 476,
477, 0, 0, 0, 0, 0, 0, 478, 0, 0,
479, 0, 0, 0, 480, 481, 482, 483, 484, 485,
- -320, 0, -284, 0, 0, 0, 486, 0, 0, 488,
- 0, 490, 0, 139, 491, 140, 141, 142, 143, 144,
- 0, 0, 145, 0, 0, 0, 146, 0, 0, 0,
- 0, 148, 149, 150, 151, 152, 153, 0, 0, -329,
+ 0, 0, 0, 0, 0, 0, 486, 487, 0, 488,
+ 489, 490, 0, 139, 491, 140, 141, 142, 143, 144,
+ 0, 0, 145, 0, 0, 0, 146, 0, 0, 147,
+ 0, 148, 149, 150, 151, 152, 153, 154, 0, 155,
0, 0, 0, 156, 0, 0, 0, 157, 0, 0,
- 158, 159, 160, 0, 161, 0, 0, 0, 0, 0,
- 164, 3892, 0, 165, 166, 0, 167, 0, 0, 0,
- 0, 0, 171, 172, 173, 174, 3893, 176, 177, 0,
- 178, 179, 0, 0, 0, 0, 0, 0, 0, 186,
- 0, 188, 0, 190, 191, 192, 193, 0, 194, 195,
- 0, 196, 197, 198, 0, 200, 0, 201, 0, 0,
+ 158, 159, 160, 0, 161, 0, 162, 163, 0, 0,
+ 164, 0, 0, 165, 166, 0, 167, 168, 0, 169,
+ 170, 0, 171, 172, 173, 174, 175, 176, 177, 0,
+ 178, 179, 180, 181, 182, 183, 184, 185, 0, 186,
+ 187, 188, 189, 190, 191, 192, 193, 0, 194, 195,
+ 0, 196, 197, 198, 199, 200, 0, 201, 0, 0,
202, 0, 0, 203, 0, 0, 0, 204, 0, 0,
0, 205, 206, 207, 0, 0, 208, 0, 0, 0,
- 0, 209, 0, 0, 0, 0, 0, 211, 0, 212,
+ 0, 209, 210, 0, 0, 0, 2367, 211, 0, 212,
0, 0, 0, 213, 0, 214, 215, 216, 217, 0,
- 0, 0, 0, 0, 0, 219, 220, 221, 0, -317,
- 0, 222, 0, -317, 224, 0, 225, 226, 227, 0,
- 0, 228, 229, 0, 230, 231, 232, 233, 0, 0,
- 0, 0, 236, 237, 238, 0, 0, 239, 240, 3894,
- 241, 242, 243, 0, 0, 0, 0, 0, 0, 245,
+ 0, 0, 218, 0, 0, 219, 220, 221, 0, 0,
+ 0, 222, 0, 223, 224, 0, 225, 226, 227, 0,
+ 0, 228, 229, 0, 230, 231, 232, 233, 234, 235,
+ 0, 0, 236, 237, 238, 0, 0, 239, 240, 0,
+ 241, 242, 243, 0, 0, 244, 0, 0, 0, 245,
0, 246, 0, 247, 0, 248, 249, 250, 251, 252,
- 253, 0, 254, 0, 0, 0, 0, 256, 257, 0,
- 0, 0, 0, 0, 0, 260, 0, 0, 0, 261,
- 262, 263, 264, 3895, 0, 265, 266, 267, 0, 268,
- 0, 269, 0, 0, 0, 0, 270, 0, 0, 0,
- 0, 272, 0, 273, 274, 0, 275, 276, 3896, 0,
- 0, 277, 0, 0, 0, 279, 280, 0, 0, 281,
- 3897, 0, 282, 283, 0, 0, 0, 0, 0, 284,
+ 253, 0, 254, 0, 0, 0, 255, 256, 257, 0,
+ 258, 0, 0, 0, 259, 260, 0, 0, 0, 261,
+ 262, 263, 264, 0, 0, 265, 266, 267, 0, 268,
+ 0, 269, 0, 0, 0, 0, 270, 271, 0, 0,
+ 0, 272, 0, 273, 274, 0, 275, 276, 0, 0,
+ 0, 277, 0, 0, 278, 279, 280, 0, 0, 281,
+ 0, 0, 282, 283, 0, 0, 0, 0, 0, 284,
285, 0, 286, 0, 287, 0, 288, 289, 0, 0,
- 0, 0, -284, 0, 0, 290, 291, 292, 293, 294,
+ 0, 0, 0, 0, 0, 290, 291, 292, 293, 294,
295, 296, 297, 298, 299, 300, 301, 302, 0, 303,
304, 305, 0, 306, 307, 308, 309, 0, 310, 311,
0, 0, 0, 0, 312, 313, 314, 315, 316, 317,
0, 0, 318, 319, 0, 320, 0, 321, 0, 322,
323, 324, 325, 326, 327, 328, 329, 330, 331, 0,
0, 332, 333, 0, 0, 334, 335, 336, 337, 0,
- 0, 0, 0, 339, 0, 0, 0, 0, 340, 341,
- 342, 0, 343, 344, 345, 3898, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 350, 351,
- 0, 0, 0, 0, 353, 354, 355, 0, 357, 358,
- 359, 360, 361, 362, 363, 0, 0, 0, 0, 366,
+ 0, 0, 338, 339, 0, 0, 0, 0, 340, 341,
+ 342, 0, 343, 344, 345, 346, 0, 347, 348, 0,
+ 0, 0, 0, 0, 0, 0, 0, 349, 350, 351,
+ 0, 0, 352, 0, 353, 354, 355, 356, 357, 358,
+ 359, 360, 361, 362, 363, 364, 0, 0, 365, 366,
367, 0, 368, 0, 369, 370, 371, 372, 373, 0,
374, 375, 376, 0, 0, 377, 0, 0, 0, 378,
379, 380, 381, 382, 0, 0, 383, 384, 385, 386,
- 387, 0, 388, 0, 0, 390, 0, 392, -284, 0,
- 393, 0, 0, 0, 395, 0, 0, 397, 398, 3899,
- 0, 0, 0, 400, 401, 402, 403, 404, 405, 0,
- 407, 408, 0, 409, 0, 0, 0, 0, 411, 412,
- 413, 0, 0, 0, 0, 415, 0, 0, 0, 416,
- 0, 0, 418, 0, 420, 0, 421, 0, 423, 0,
+ 387, 0, 388, 389, 0, 390, 391, 392, 0, 0,
+ 393, 0, 394, 0, 395, 396, 0, 397, 398, 0,
+ 0, 0, 399, 400, 401, 402, 403, 404, 405, 406,
+ 407, 408, 0, 409, 410, 0, 0, 0, 411, 412,
+ 413, 414, 0, 0, 0, 415, 0, 0, 0, 416,
+ 0, 417, 418, 419, 420, 0, 421, 422, 423, 424,
425, 426, 0, 0, 0, 0, 0, 0, 427, 428,
- 0, 429, 0, 0, 430, 0, 0, 431, 0, 433,
- 0, 0, 0, 435, 0, 436, 437, 438, 439, 440,
+ 0, 429, 0, 0, 430, 0, 0, 431, 432, 433,
+ 0, 0, 434, 435, 0, 436, 437, 438, 439, 440,
441, 0, 0, 442, 443, 444, 445, 0, 446, 447,
0, 448, 0, 449, 450, 451, 452, 0, 0, 453,
454, 0, 455, 456, 457, 458, 0, 0, 0, 0,
- 0, 459, 460, 461, 0, 0, 0, 0, 463, 464,
- 465, 0, 466, 467, 0, 468, 469, 0, 0, 0,
- 0, 0, 472, 0, 0, 473, 0, 0, 0, 475,
+ 0, 459, 460, 461, 0, 0, 0, 462, 463, 464,
+ 465, 0, 466, 467, 0, 468, 469, 0, 470, 471,
+ 0, 0, 472, 0, 0, 473, 0, 474, 0, 475,
476, 477, 0, 0, 0, 0, 0, 0, 478, 0,
0, 479, 0, 0, 0, 480, 481, 482, 483, 484,
- 485, -317, 0, -284, 0, 0, 0, 486, 0, 0,
- 488, 0, 490, 0, 139, 491, 140, 141, 142, 143,
+ 485, 0, 0, 0, 0, 0, 0, 486, 487, 0,
+ 488, 489, 490, 0, 139, 491, 140, 141, 142, 143,
144, 0, 0, 145, 0, 0, 0, 146, 0, 0,
- 0, 0, 148, 149, 150, 151, 152, 153, 0, 0,
- -329, 0, 0, 0, 156, 0, 0, 0, 157, 0,
- 0, 158, 159, 160, 0, 161, 0, 0, 0, 0,
- 0, 164, 3892, 0, 165, 166, 0, 167, 0, 0,
- 0, 0, 0, 171, 172, 173, 174, 3893, 176, 177,
- 0, 178, 179, 0, 0, 0, 0, 0, 0, 0,
- 186, 0, 188, 0, 190, 191, 192, 193, 0, 194,
- 195, 0, 196, 197, 198, 0, 200, 0, 201, 0,
+ 147, 0, 148, 149, 150, 151, 152, 153, 154, 0,
+ 155, 0, 0, 0, 156, 0, 0, 0, 157, 0,
+ 0, 158, 159, 160, 0, 161, 0, 162, 163, 0,
+ 0, 164, 0, 0, 165, 166, 0, 167, 168, 0,
+ 169, 170, 0, 171, 172, 173, 174, 175, 176, 177,
+ 0, 178, 179, 180, 181, 182, 183, 184, 185, 0,
+ 186, 187, 188, 189, 190, 191, 192, 193, 0, 194,
+ 195, 0, 196, 197, 198, 199, 200, 0, 201, 0,
0, 202, 0, 0, 203, 0, 0, 0, 204, 0,
0, 0, 205, 206, 207, 0, 0, 208, 0, 0,
- 0, 0, 209, 0, 0, 0, 0, 0, 211, 0,
+ 0, 0, 209, 210, 0, 0, 0, 0, 211, 0,
212, 0, 0, 0, 213, 0, 214, 215, 216, 217,
- 0, 0, 0, 0, 0, 0, 219, 220, 221, 0,
- 0, 0, 222, 0, 4232, 224, 0, 225, 226, 227,
- 0, 0, 228, 229, 0, 230, 231, 232, 233, 0,
- 0, 0, 0, 236, 237, 238, 0, 0, 239, 240,
- 3894, 241, 242, 243, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 218, 0, 0, 219, 220, 221, 0,
+ 0, 0, 222, 0, 223, 224, 0, 225, 226, 227,
+ 0, 0, 228, 229, 0, 230, 231, 232, 233, 234,
+ 235, 0, 0, 236, 237, 238, 0, 0, 239, 240,
+ 0, 241, 242, 243, 0, 0, 244, 0, 0, 0,
245, 0, 246, 0, 247, 0, 248, 249, 250, 251,
- 252, 253, 0, 254, 0, 0, 0, 0, 256, 257,
- 0, 0, 0, 0, 0, 0, 260, 0, 0, 0,
- 261, 262, 263, 264, 3895, 0, 265, 266, 267, 0,
- 268, 0, 269, 0, 0, 0, 0, 270, 0, 0,
- 0, 0, 272, 0, 273, 274, 0, 275, 276, 3896,
- 0, 0, 277, 0, 0, 0, 279, 280, 0, 0,
- 281, 3897, 0, 282, 283, 0, 0, 0, 0, 0,
+ 252, 253, 0, 254, 0, 0, 0, 255, 256, 257,
+ 0, 258, 0, 0, 0, 259, 260, 0, 0, 0,
+ 261, 262, 263, 264, 0, 0, 265, 266, 267, 0,
+ 268, 0, 269, 0, 0, 0, 0, 270, 271, 0,
+ 0, 0, 272, 0, 273, 274, 0, 275, 276, 0,
+ 0, 0, 277, 0, 0, 278, 279, 280, 0, 0,
+ 281, 0, 0, 282, 283, 0, 0, 0, 0, 0,
284, 285, 0, 286, 0, 287, 0, 288, 289, 0,
- 0, 0, 0, -284, 0, 0, 290, 291, 292, 293,
+ 0, 0, 0, 0, 0, 0, 290, 291, 292, 293,
294, 295, 296, 297, 298, 299, 300, 301, 302, 0,
303, 304, 305, 0, 306, 307, 308, 309, 0, 310,
311, 0, 0, 0, 0, 312, 313, 314, 315, 316,
317, 0, 0, 318, 319, 0, 320, 0, 321, 0,
322, 323, 324, 325, 326, 327, 328, 329, 330, 331,
0, 0, 332, 333, 0, 0, 334, 335, 336, 337,
- 0, 0, 0, 0, 339, 0, 0, 0, 0, 340,
- 341, 342, 0, 343, 344, 345, 3898, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 350,
- 351, 0, 0, 0, 0, 353, 354, 355, 0, 357,
- 358, 359, 360, 361, 362, 363, 0, 0, 0, 0,
+ 0, 0, 0, 338, 339, 0, 0, 0, 0, 340,
+ 341, 342, 0, 343, 344, 345, 346, 0, 347, 348,
+ 0, 0, 0, 0, 0, 0, 0, 0, 349, 350,
+ 351, 0, 0, 352, 0, 353, 354, 355, 356, 357,
+ 358, 359, 360, 361, 362, 363, 364, 0, 0, 365,
366, 367, 0, 368, 0, 369, 370, 371, 372, 373,
0, 374, 375, 376, 0, 0, 377, 0, 0, 0,
378, 379, 380, 381, 382, 0, 0, 383, 384, 385,
- 386, 387, 0, 388, 0, 0, 390, 0, 392, -284,
- 0, 393, 0, 0, 0, 395, 0, 0, 397, 398,
- 3899, 0, 0, 0, 400, 401, 402, 403, 404, 405,
- 0, 407, 408, 0, 409, 0, 0, 0, 0, 411,
- 412, 413, 0, 0, 0, 0, 415, 0, 0, 0,
- 416, 0, 0, 418, 0, 420, 0, 421, 0, 423,
- 0, 425, 426, 0, 0, 0, 0, 0, 0, 427,
- 428, 0, 429, 0, 0, 430, 0, 0, 431, 0,
- 433, 0, 0, 0, 435, 0, 436, 437, 438, 439,
+ 386, 387, 0, 388, 389, 0, 390, 391, 392, 0,
+ 0, 393, 0, 394, 0, 395, 396, 0, 397, 398,
+ 0, 0, 0, 399, 400, 401, 402, 403, 404, 405,
+ 406, 407, 408, 0, 409, 410, 0, 0, 0, 411,
+ 412, 413, 414, 0, 0, 0, 415, 0, 0, 0,
+ 416, 0, 417, 418, 419, 420, 0, 421, 422, 423,
+ 424, 425, 426, 0, 0, 0, 0, 0, 0, 427,
+ 428, 0, 429, 0, 0, 430, 0, 0, 431, 432,
+ 433, 0, 0, 434, 435, 0, 436, 437, 438, 439,
440, 441, 0, 0, 442, 443, 444, 445, 0, 446,
447, 0, 448, 0, 449, 450, 451, 452, 0, 0,
453, 454, 0, 455, 456, 457, 458, 0, 0, 0,
- 0, 0, 459, 460, 461, 0, 0, 0, 0, 463,
- 464, 465, 0, 466, 467, 0, 468, 469, 0, 0,
- 0, 0, 0, 472, 0, 0, 473, 0, 0, 0,
+ 0, 0, 459, 460, 461, 0, 0, 0, 462, 463,
+ 464, 465, 0, 466, 467, 0, 468, 469, 0, 470,
+ 471, 0, 0, 472, 0, 0, 473, 0, 474, 0,
475, 476, 477, 0, 0, 0, 0, 0, 0, 478,
0, 0, 479, 0, 0, 0, 480, 481, 482, 483,
- 484, 485, 0, 0, -284, 0, 0, 0, 486, 0,
- 0, 488, 0, 490, 0, 139, 491, 140, 141, 142,
+ 484, 485, 0, 0, 0, 0, 0, 0, 486, 487,
+ 0, 488, 489, 490, 0, 139, 491, 140, 141, 142,
143, 144, 0, 0, 145, 0, 0, 0, 146, 0,
- 0, 0, 0, 148, 149, 150, 151, 152, 153, 0,
- 0, -329, 0, 0, 0, 156, 0, 0, 0, 157,
- 0, 0, 158, 159, 160, 0, 161, 0, 0, 0,
- 0, 0, 164, 3892, 0, 165, 166, 0, 167, 0,
- 0, 0, 0, 0, 171, 172, 173, 174, 3893, 176,
- 177, 0, 178, 179, 0, 0, 0, 0, 0, 0,
- 0, 186, 0, 188, 0, 190, 191, 192, 193, 0,
- 194, 195, 0, 196, 197, 198, 0, 200, 0, 201,
+ 0, 147, 0, 148, 149, 150, 151, 152, 153, 154,
+ 0, 155, 0, 0, 0, 156, 0, 0, 0, 157,
+ 0, 0, 158, 159, 160, 0, 161, 0, 162, 163,
+ 0, 0, 164, 0, 0, 165, 166, 0, 167, 168,
+ 0, 169, 170, 0, 171, 172, 173, 174, 175, 176,
+ 177, 0, 178, 179, 180, 181, 182, 183, 184, 185,
+ 0, 186, 187, 188, 189, 190, 191, 192, 193, 0,
+ 194, 195, 0, 196, 197, 198, 199, 200, 0, 201,
0, 0, 202, 0, 0, 203, 0, 0, 0, 204,
0, 0, 0, 205, 206, 207, 0, 0, 208, 0,
- 0, 0, 0, 209, 0, 0, 0, 0, 0, 211,
+ 0, 0, 0, 209, 210, 0, 0, 0, 0, 211,
0, 212, 0, 0, 0, 213, 0, 214, 215, 216,
- 217, 0, 0, 0, 0, 0, 0, 219, 220, 221,
- 0, 0, 0, 222, 0, -322, 224, 0, 225, 226,
+ 217, 0, 0, 0, 218, 0, 0, 219, 220, 221,
+ 0, 0, 0, 222, 0, 223, 224, 0, 225, 226,
227, 0, 0, 228, 229, 0, 230, 231, 232, 233,
- 0, 0, 0, 0, 236, 237, 238, 0, 0, 239,
- 240, 3894, 241, 242, 243, 0, 0, 0, 0, 0,
+ 234, 235, 0, 0, 236, 237, 238, 0, 0, 239,
+ 240, 0, 241, 1781, 243, 0, 0, 244, 0, 0,
0, 245, 0, 246, 0, 247, 0, 248, 249, 250,
- 251, 252, 253, 0, 254, 0, 0, 0, 0, 256,
- 257, 0, 0, 0, 0, 0, 0, 260, 0, 0,
- 0, 261, 262, 263, 264, 3895, 0, 265, 266, 267,
- 0, 268, 0, 269, 0, 0, 0, 0, 270, 0,
+ 251, 252, 253, 0, 254, 0, 0, 0, 255, 256,
+ 257, 0, 258, 0, 0, 0, 259, 260, 0, 0,
+ 0, 261, 262, 263, 264, 0, 0, 265, 266, 267,
+ 0, 268, 0, 269, 0, 0, 0, 0, 270, 271,
0, 0, 0, 272, 0, 273, 274, 0, 275, 276,
- 3896, 0, 0, 277, 0, 0, 0, 279, 280, 0,
- 0, 281, 3897, 0, 282, 283, 0, 0, 0, 0,
+ 0, 0, 0, 277, 0, 0, 278, 279, 280, 0,
+ 0, 281, 0, 0, 282, 283, 0, 0, 0, 0,
0, 284, 285, 0, 286, 0, 287, 0, 288, 289,
- 0, 0, 0, 0, -284, 0, 0, 290, 291, 292,
+ 0, 0, 0, 0, 0, 0, 0, 290, 291, 292,
293, 294, 295, 296, 297, 298, 299, 300, 301, 302,
0, 303, 304, 305, 0, 306, 307, 308, 309, 0,
310, 311, 0, 0, 0, 0, 312, 313, 314, 315,
316, 317, 0, 0, 318, 319, 0, 320, 0, 321,
0, 322, 323, 324, 325, 326, 327, 328, 329, 330,
- 331, 0, 0, 332, 333, 0, 0, 334, 335, 336,
- 337, 0, 0, 0, 0, 339, 0, 0, 0, 0,
- 340, 341, 342, 0, 343, 344, 345, 3898, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 350, 351, 0, 0, 0, 0, 353, 354, 355, 0,
- 357, 358, 359, 360, 361, 362, 363, 0, 0, 0,
- 0, 366, 367, 0, 368, 0, 369, 370, 371, 372,
+ 331, 0, 0, 332, 333, 0, 0, 334, 1782, 336,
+ 337, 0, 0, 0, 338, 339, 0, 0, 0, 0,
+ 340, 341, 342, 0, 343, 344, 345, 346, 0, 347,
+ 348, 0, 0, 0, 0, 0, 0, 0, 0, 349,
+ 350, 351, 0, 0, 352, 0, 353, 354, 355, 356,
+ 357, 358, 359, 360, 361, 362, 363, 364, 0, 0,
+ 365, 366, 367, 0, 368, 0, 369, 370, 371, 372,
373, 0, 374, 375, 376, 0, 0, 377, 0, 0,
0, 378, 379, 380, 381, 382, 0, 0, 383, 384,
- 385, 386, 387, 0, 388, 0, 0, 390, 0, 392,
- -284, 0, 393, 0, 0, 0, 395, 0, 0, 397,
- 398, 3899, 0, 0, 0, 400, 401, 402, 403, 404,
- 405, 0, 407, 408, 0, 409, 0, 0, 0, 0,
- 411, 412, 413, 0, 0, 0, 0, 415, 0, 0,
- 0, 416, 0, 0, 418, 0, 420, 0, 421, 0,
- 423, 0, 425, 426, 0, 0, 0, 0, 0, 0,
+ 385, 386, 387, 0, 388, 389, 0, 390, 391, 392,
+ 0, 0, 393, 0, 394, 0, 395, 396, 0, 397,
+ 398, 0, 0, 0, 399, 400, 401, 402, 403, 404,
+ 405, 406, 407, 408, 0, 409, 410, 0, 0, 0,
+ 411, 412, 413, 414, 0, 0, 0, 415, 0, 0,
+ 0, 416, 0, 417, 418, 419, 420, 0, 421, 422,
+ 423, 424, 425, 426, 0, 0, 0, 0, 0, 0,
427, 428, 0, 429, 0, 0, 430, 0, 0, 431,
- 0, 433, 0, 0, 0, 435, 0, 436, 437, 438,
+ 432, 433, 0, 0, 434, 435, 0, 436, 437, 438,
439, 440, 441, 0, 0, 442, 443, 444, 445, 0,
446, 447, 0, 448, 0, 449, 450, 451, 452, 0,
0, 453, 454, 0, 455, 456, 457, 458, 0, 0,
- 0, 0, 0, 459, 460, 461, 0, 0, 0, 0,
+ 0, 0, 0, 459, 460, 461, 0, 0, 0, 462,
463, 464, 465, 0, 466, 467, 0, 468, 469, 0,
- 0, 0, 0, 0, 472, 0, 0, 473, 0, 0,
+ 470, 471, 0, 0, 472, 0, 0, 473, 0, 474,
0, 475, 476, 477, 0, 0, 0, 0, 0, 0,
478, 0, 0, 479, 0, 0, 0, 480, 481, 482,
- 483, 484, 485, 0, 0, -284, 0, 0, 0, 486,
- 0, 0, 488, 0, 490, 0, 139, 491, 140, 141,
+ 483, 484, 485, 0, 0, 0, 0, 0, 0, 486,
+ 487, 0, 488, 489, 490, 0, 139, 491, 140, 141,
142, 143, 144, 0, 0, 145, 0, 0, 0, 146,
0, 0, 0, 0, 148, 149, 150, 151, 152, 153,
0, 0, -329, 0, 0, 0, 156, 0, 0, 0,
157, 0, 0, 158, 159, 160, 0, 161, 0, 0,
- 0, 0, 0, 164, 3892, 0, 165, 166, 0, 167,
- 0, 0, 0, 0, 0, 171, 172, 173, 174, 3893,
+ 0, 0, 0, 164, 3902, 0, 165, 166, 0, 167,
+ 0, 0, 0, 0, 0, 171, 172, 173, 174, 3903,
176, 177, 0, 178, 179, 0, 0, 0, 0, 0,
0, 0, 186, 0, 188, 0, 190, 191, 192, 193,
0, 194, 195, 0, 196, 197, 198, 0, 200, 0,
@@ -11150,18 +10850,18 @@ static const yytype_int16 yytable[] =
0, 0, 0, 0, 209, 0, 0, 0, 0, 0,
211, 0, 212, 0, 0, 0, 213, 0, 214, 215,
216, 217, 0, 0, 0, 0, 0, 0, 219, 220,
- 221, 0, 0, 0, 222, 0, 4347, 224, 0, 225,
+ 221, 0, -299, -299, 222, 0, -299, 224, 0, 225,
226, 227, 0, 0, 228, 229, 0, 230, 231, 232,
233, 0, 0, 0, 0, 236, 237, 238, 0, 0,
- 239, 240, 3894, 241, 242, 243, 0, 0, 0, 0,
+ 239, 240, 3904, 241, 242, 243, 0, 0, 0, 0,
0, 0, 245, 0, 246, 0, 247, 0, 248, 249,
250, 251, 252, 253, 0, 254, 0, 0, 0, 0,
256, 257, 0, 0, 0, 0, 0, 0, 260, 0,
- 0, 0, 261, 262, 263, 264, 3895, 0, 265, 266,
+ 0, 0, 261, 262, 263, 264, 3905, 0, 265, 266,
267, 0, 268, 0, 269, 0, 0, 0, 0, 270,
0, 0, 0, 0, 272, 0, 273, 274, 0, 275,
- 276, 3896, 0, 0, 277, 0, 0, 0, 279, 280,
- 0, 0, 281, 3897, 0, 282, 283, 0, 0, 0,
+ 276, 3906, 0, 0, 277, 0, 0, 0, 279, 280,
+ 0, 0, 281, 3907, 0, 282, 283, 0, 0, 0,
0, 0, 284, 285, 0, 286, 0, 287, 0, 288,
289, 0, 0, 0, 0, -284, 0, 0, 290, 291,
292, 293, 294, 295, 296, 297, 298, 299, 300, 301,
@@ -11171,7 +10871,7 @@ static const yytype_int16 yytable[] =
321, 0, 322, 323, 324, 325, 326, 327, 328, 329,
330, 331, 0, 0, 332, 333, 0, 0, 334, 335,
336, 337, 0, 0, 0, 0, 339, 0, 0, 0,
- 0, 340, 341, 342, 0, 343, 344, 345, 3898, 0,
+ 0, 340, 341, 342, 0, 343, 344, 345, 3908, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 350, 351, 0, 0, 0, 0, 353, 354, 355,
0, 357, 358, 359, 360, 361, 362, 363, 0, 0,
@@ -11180,7 +10880,7 @@ static const yytype_int16 yytable[] =
0, 0, 378, 379, 380, 381, 382, 0, 0, 383,
384, 385, 386, 387, 0, 388, 0, 0, 390, 0,
392, -284, 0, 393, 0, 0, 0, 395, 0, 0,
- 397, 398, 3899, 0, 0, 0, 400, 401, 402, 403,
+ 397, 398, 3909, 0, 0, 0, 400, 401, 402, 403,
404, 405, 0, 407, 408, 0, 409, 0, 0, 0,
0, 411, 412, 413, 0, 0, 0, 0, 415, 0,
0, 0, 416, 0, 0, 418, 0, 420, 0, 421,
@@ -11201,9 +10901,9 @@ static const yytype_int16 yytable[] =
146, 0, 0, 0, 0, 148, 149, 150, 151, 152,
153, 0, 0, -329, 0, 0, 0, 156, 0, 0,
0, 157, 0, 0, 158, 159, 160, 0, 161, 0,
- 0, 0, 0, 0, 164, 3892, 0, 165, 166, 0,
+ 0, 0, 0, 0, 164, 3902, 0, 165, 166, 0,
167, 0, 0, 0, 0, 0, 171, 172, 173, 174,
- 3893, 176, 177, 0, 178, 179, 0, 0, 0, 0,
+ 3903, 176, 177, 0, 178, 179, 0, 0, 0, 0,
0, 0, 0, 186, 0, 188, 0, 190, 191, 192,
193, 0, 194, 195, 0, 196, 197, 198, 0, 200,
0, 201, 0, 0, 202, 0, 0, 203, 0, 0,
@@ -11211,18 +10911,18 @@ static const yytype_int16 yytable[] =
208, 0, 0, 0, 0, 209, 0, 0, 0, 0,
0, 211, 0, 212, 0, 0, 0, 213, 0, 214,
215, 216, 217, 0, 0, 0, 0, 0, 0, 219,
- 220, 221, 0, 0, 0, 222, 0, 4396, 224, 0,
+ 220, 221, 0, -320, 0, 222, 0, -320, 224, 0,
225, 226, 227, 0, 0, 228, 229, 0, 230, 231,
232, 233, 0, 0, 0, 0, 236, 237, 238, 0,
- 0, 239, 240, 3894, 241, 242, 243, 0, 0, 0,
+ 0, 239, 240, 3904, 241, 242, 243, 0, 0, 0,
0, 0, 0, 245, 0, 246, 0, 247, 0, 248,
249, 250, 251, 252, 253, 0, 254, 0, 0, 0,
0, 256, 257, 0, 0, 0, 0, 0, 0, 260,
- 0, 0, 0, 261, 262, 263, 264, 3895, 0, 265,
+ 0, 0, 0, 261, 262, 263, 264, 3905, 0, 265,
266, 267, 0, 268, 0, 269, 0, 0, 0, 0,
270, 0, 0, 0, 0, 272, 0, 273, 274, 0,
- 275, 276, 3896, 0, 0, 277, 0, 0, 0, 279,
- 280, 0, 0, 281, 3897, 0, 282, 283, 0, 0,
+ 275, 276, 3906, 0, 0, 277, 0, 0, 0, 279,
+ 280, 0, 0, 281, 3907, 0, 282, 283, 0, 0,
0, 0, 0, 284, 285, 0, 286, 0, 287, 0,
288, 289, 0, 0, 0, 0, -284, 0, 0, 290,
291, 292, 293, 294, 295, 296, 297, 298, 299, 300,
@@ -11232,7 +10932,7 @@ static const yytype_int16 yytable[] =
0, 321, 0, 322, 323, 324, 325, 326, 327, 328,
329, 330, 331, 0, 0, 332, 333, 0, 0, 334,
335, 336, 337, 0, 0, 0, 0, 339, 0, 0,
- 0, 0, 340, 341, 342, 0, 343, 344, 345, 3898,
+ 0, 0, 340, 341, 342, 0, 343, 344, 345, 3908,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 350, 351, 0, 0, 0, 0, 353, 354,
355, 0, 357, 358, 359, 360, 361, 362, 363, 0,
@@ -11241,7 +10941,7 @@ static const yytype_int16 yytable[] =
0, 0, 0, 378, 379, 380, 381, 382, 0, 0,
383, 384, 385, 386, 387, 0, 388, 0, 0, 390,
0, 392, -284, 0, 393, 0, 0, 0, 395, 0,
- 0, 397, 398, 3899, 0, 0, 0, 400, 401, 402,
+ 0, 397, 398, 3909, 0, 0, 0, 400, 401, 402,
403, 404, 405, 0, 407, 408, 0, 409, 0, 0,
0, 0, 411, 412, 413, 0, 0, 0, 0, 415,
0, 0, 0, 416, 0, 0, 418, 0, 420, 0,
@@ -11256,15 +10956,15 @@ static const yytype_int16 yytable[] =
469, 0, 0, 0, 0, 0, 472, 0, 0, 473,
0, 0, 0, 475, 476, 477, 0, 0, 0, 0,
0, 0, 478, 0, 0, 479, 0, 0, 0, 480,
- 481, 482, 483, 484, 485, 0, 0, -284, 0, 0,
+ 481, 482, 483, 484, 485, -320, 0, -284, 0, 0,
0, 486, 0, 0, 488, 0, 490, 0, 139, 491,
140, 141, 142, 143, 144, 0, 0, 145, 0, 0,
0, 146, 0, 0, 0, 0, 148, 149, 150, 151,
152, 153, 0, 0, -329, 0, 0, 0, 156, 0,
0, 0, 157, 0, 0, 158, 159, 160, 0, 161,
- 0, 0, 0, 0, 0, 164, 3892, 0, 165, 166,
+ 0, 0, 0, 0, 0, 164, 3902, 0, 165, 166,
0, 167, 0, 0, 0, 0, 0, 171, 172, 173,
- 174, 3893, 176, 177, 0, 178, 179, 0, 0, 0,
+ 174, 3903, 176, 177, 0, 178, 179, 0, 0, 0,
0, 0, 0, 0, 186, 0, 188, 0, 190, 191,
192, 193, 0, 194, 195, 0, 196, 197, 198, 0,
200, 0, 201, 0, 0, 202, 0, 0, 203, 0,
@@ -11272,18 +10972,18 @@ static const yytype_int16 yytable[] =
0, 208, 0, 0, 0, 0, 209, 0, 0, 0,
0, 0, 211, 0, 212, 0, 0, 0, 213, 0,
214, 215, 216, 217, 0, 0, 0, 0, 0, 0,
- 219, 220, 221, 0, 0, 0, 222, 0, -303, 224,
+ 219, 220, 221, 0, -317, 0, 222, 0, -317, 224,
0, 225, 226, 227, 0, 0, 228, 229, 0, 230,
231, 232, 233, 0, 0, 0, 0, 236, 237, 238,
- 0, 0, 239, 240, 3894, 241, 242, 243, 0, 0,
+ 0, 0, 239, 240, 3904, 241, 242, 243, 0, 0,
0, 0, 0, 0, 245, 0, 246, 0, 247, 0,
248, 249, 250, 251, 252, 253, 0, 254, 0, 0,
0, 0, 256, 257, 0, 0, 0, 0, 0, 0,
- 260, 0, 0, 0, 261, 262, 263, 264, 3895, 0,
+ 260, 0, 0, 0, 261, 262, 263, 264, 3905, 0,
265, 266, 267, 0, 268, 0, 269, 0, 0, 0,
0, 270, 0, 0, 0, 0, 272, 0, 273, 274,
- 0, 275, 276, 3896, 0, 0, 277, 0, 0, 0,
- 279, 280, 0, 0, 281, 3897, 0, 282, 283, 0,
+ 0, 275, 276, 3906, 0, 0, 277, 0, 0, 0,
+ 279, 280, 0, 0, 281, 3907, 0, 282, 283, 0,
0, 0, 0, 0, 284, 285, 0, 286, 0, 287,
0, 288, 289, 0, 0, 0, 0, -284, 0, 0,
290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
@@ -11294,7 +10994,7 @@ static const yytype_int16 yytable[] =
328, 329, 330, 331, 0, 0, 332, 333, 0, 0,
334, 335, 336, 337, 0, 0, 0, 0, 339, 0,
0, 0, 0, 340, 341, 342, 0, 343, 344, 345,
- 3898, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 3908, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 350, 351, 0, 0, 0, 0, 353,
354, 355, 0, 357, 358, 359, 360, 361, 362, 363,
0, 0, 0, 0, 366, 367, 0, 368, 0, 369,
@@ -11302,7 +11002,7 @@ static const yytype_int16 yytable[] =
377, 0, 0, 0, 378, 379, 380, 381, 382, 0,
0, 383, 384, 385, 386, 387, 0, 388, 0, 0,
390, 0, 392, -284, 0, 393, 0, 0, 0, 395,
- 0, 0, 397, 398, 3899, 0, 0, 0, 400, 401,
+ 0, 0, 397, 398, 3909, 0, 0, 0, 400, 401,
402, 403, 404, 405, 0, 407, 408, 0, 409, 0,
0, 0, 0, 411, 412, 413, 0, 0, 0, 0,
415, 0, 0, 0, 416, 0, 0, 418, 0, 420,
@@ -11317,15 +11017,15 @@ static const yytype_int16 yytable[] =
468, 469, 0, 0, 0, 0, 0, 472, 0, 0,
473, 0, 0, 0, 475, 476, 477, 0, 0, 0,
0, 0, 0, 478, 0, 0, 479, 0, 0, 0,
- 480, 481, 482, 483, 484, 485, 0, 0, -284, 0,
+ 480, 481, 482, 483, 484, 485, -317, 0, -284, 0,
0, 0, 486, 0, 0, 488, 0, 490, 0, 139,
491, 140, 141, 142, 143, 144, 0, 0, 145, 0,
0, 0, 146, 0, 0, 0, 0, 148, 149, 150,
151, 152, 153, 0, 0, -329, 0, 0, 0, 156,
0, 0, 0, 157, 0, 0, 158, 159, 160, 0,
- 161, 0, 0, 0, 0, 0, 164, 3892, 0, 165,
+ 161, 0, 0, 0, 0, 0, 164, 3902, 0, 165,
166, 0, 167, 0, 0, 0, 0, 0, 171, 172,
- 173, 174, 3893, 176, 177, 0, 178, 179, 0, 0,
+ 173, 174, 3903, 176, 177, 0, 178, 179, 0, 0,
0, 0, 0, 0, 0, 186, 0, 188, 0, 190,
191, 192, 193, 0, 194, 195, 0, 196, 197, 198,
0, 200, 0, 201, 0, 0, 202, 0, 0, 203,
@@ -11333,18 +11033,18 @@ static const yytype_int16 yytable[] =
0, 0, 208, 0, 0, 0, 0, 209, 0, 0,
0, 0, 0, 211, 0, 212, 0, 0, 0, 213,
0, 214, 215, 216, 217, 0, 0, 0, 0, 0,
- 0, 219, 220, 221, 0, 0, 0, 222, 0, 0,
+ 0, 219, 220, 221, 0, 0, 0, 222, 0, 4242,
224, 0, 225, 226, 227, 0, 0, 228, 229, 0,
230, 231, 232, 233, 0, 0, 0, 0, 236, 237,
- 238, 0, 0, 239, 240, 3894, 241, 242, 243, 0,
+ 238, 0, 0, 239, 240, 3904, 241, 242, 243, 0,
0, 0, 0, 0, 0, 245, 0, 246, 0, 247,
0, 248, 249, 250, 251, 252, 253, 0, 254, 0,
0, 0, 0, 256, 257, 0, 0, 0, 0, 0,
- 0, 260, 0, 0, 0, 261, 262, 263, 264, 3895,
+ 0, 260, 0, 0, 0, 261, 262, 263, 264, 3905,
0, 265, 266, 267, 0, 268, 0, 269, 0, 0,
0, 0, 270, 0, 0, 0, 0, 272, 0, 273,
- 274, 0, 275, 276, 3896, 0, 0, 277, 0, 0,
- 0, 279, 280, 0, 0, 281, 3897, 0, 282, 283,
+ 274, 0, 275, 276, 3906, 0, 0, 277, 0, 0,
+ 0, 279, 280, 0, 0, 281, 3907, 0, 282, 283,
0, 0, 0, 0, 0, 284, 285, 0, 286, 0,
287, 0, 288, 289, 0, 0, 0, 0, -284, 0,
0, 290, 291, 292, 293, 294, 295, 296, 297, 298,
@@ -11355,7 +11055,7 @@ static const yytype_int16 yytable[] =
327, 328, 329, 330, 331, 0, 0, 332, 333, 0,
0, 334, 335, 336, 337, 0, 0, 0, 0, 339,
0, 0, 0, 0, 340, 341, 342, 0, 343, 344,
- 345, 3898, 0, 0, 0, 0, 0, 0, 0, 0,
+ 345, 3908, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 350, 351, 0, 0, 0, 0,
353, 354, 355, 0, 357, 358, 359, 360, 361, 362,
363, 0, 0, 0, 0, 366, 367, 0, 368, 0,
@@ -11363,7 +11063,7 @@ static const yytype_int16 yytable[] =
0, 377, 0, 0, 0, 378, 379, 380, 381, 382,
0, 0, 383, 384, 385, 386, 387, 0, 388, 0,
0, 390, 0, 392, -284, 0, 393, 0, 0, 0,
- 395, 0, 0, 397, 398, 3899, 0, 0, 0, 400,
+ 395, 0, 0, 397, 398, 3909, 0, 0, 0, 400,
401, 402, 403, 404, 405, 0, 407, 408, 0, 409,
0, 0, 0, 0, 411, 412, 413, 0, 0, 0,
0, 415, 0, 0, 0, 416, 0, 0, 418, 0,
@@ -11384,9 +11084,9 @@ static const yytype_int16 yytable[] =
0, 0, 0, 146, 0, 0, 0, 0, 148, 149,
150, 151, 152, 153, 0, 0, -329, 0, 0, 0,
156, 0, 0, 0, 157, 0, 0, 158, 159, 160,
- 0, 161, 0, 0, 0, 0, 0, 164, 3892, 0,
+ 0, 161, 0, 0, 0, 0, 0, 164, 3902, 0,
165, 166, 0, 167, 0, 0, 0, 0, 0, 171,
- 172, 173, 174, 3893, 176, 177, 0, 178, 179, 0,
+ 172, 173, 174, 3903, 176, 177, 0, 178, 179, 0,
0, 0, 0, 0, 0, 0, 186, 0, 188, 0,
190, 191, 192, 193, 0, 194, 195, 0, 196, 197,
198, 0, 200, 0, 201, 0, 0, 202, 0, 0,
@@ -11395,17 +11095,17 @@ static const yytype_int16 yytable[] =
0, 0, 0, 0, 211, 0, 212, 0, 0, 0,
213, 0, 214, 215, 216, 217, 0, 0, 0, 0,
0, 0, 219, 220, 221, 0, 0, 0, 222, 0,
- 0, 224, 0, 225, 226, 227, 0, 0, 228, 229,
+ -322, 224, 0, 225, 226, 227, 0, 0, 228, 229,
0, 230, 231, 232, 233, 0, 0, 0, 0, 236,
- 237, 238, 0, 0, 239, 240, 3894, 241, 242, 243,
+ 237, 238, 0, 0, 239, 240, 3904, 241, 242, 243,
0, 0, 0, 0, 0, 0, 245, 0, 246, 0,
247, 0, 248, 249, 250, 251, 252, 253, 0, 254,
0, 0, 0, 0, 256, 257, 0, 0, 0, 0,
0, 0, 260, 0, 0, 0, 261, 262, 263, 264,
- 3895, 0, 265, 266, 267, 0, 268, 0, 269, 0,
+ 3905, 0, 265, 266, 267, 0, 268, 0, 269, 0,
0, 0, 0, 270, 0, 0, 0, 0, 272, 0,
- 273, 274, 0, 275, 276, 3896, 0, 0, 277, 0,
- 0, 0, 279, 280, 0, 0, 281, 3897, 0, 282,
+ 273, 274, 0, 275, 276, 3906, 0, 0, 277, 0,
+ 0, 0, 279, 280, 0, 0, 281, 3907, 0, 282,
283, 0, 0, 0, 0, 0, 284, 285, 0, 286,
0, 287, 0, 288, 289, 0, 0, 0, 0, -284,
0, 0, 290, 291, 292, 293, 294, 295, 296, 297,
@@ -11416,7 +11116,7 @@ static const yytype_int16 yytable[] =
326, 327, 328, 329, 330, 331, 0, 0, 332, 333,
0, 0, 334, 335, 336, 337, 0, 0, 0, 0,
339, 0, 0, 0, 0, 340, 341, 342, 0, 343,
- 344, 345, 3898, 0, 0, 0, 0, 0, 0, 0,
+ 344, 345, 3908, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 350, 351, 0, 0, 0,
0, 353, 354, 355, 0, 357, 358, 359, 360, 361,
362, 363, 0, 0, 0, 0, 366, 367, 0, 368,
@@ -11424,7 +11124,7 @@ static const yytype_int16 yytable[] =
0, 0, 377, 0, 0, 0, 378, 379, 380, 381,
382, 0, 0, 383, 384, 385, 386, 387, 0, 388,
0, 0, 390, 0, 392, -284, 0, 393, 0, 0,
- 0, 395, 0, 0, 397, 398, 3899, 0, 0, 0,
+ 0, 395, 0, 0, 397, 398, 3909, 0, 0, 0,
400, 401, 402, 403, 404, 405, 0, 407, 408, 0,
409, 0, 0, 0, 0, 411, 412, 413, 0, 0,
0, 0, 415, 0, 0, 0, 416, 0, 0, 418,
@@ -11437,17 +11137,17 @@ static const yytype_int16 yytable[] =
456, 457, 458, 0, 0, 0, 0, 0, 459, 460,
461, 0, 0, 0, 0, 463, 464, 465, 0, 466,
467, 0, 468, 469, 0, 0, 0, 0, 0, 472,
- 0, 0, 4235, 0, 0, 0, 475, 476, 477, 0,
+ 0, 0, 473, 0, 0, 0, 475, 476, 477, 0,
0, 0, 0, 0, 0, 478, 0, 0, 479, 0,
0, 0, 480, 481, 482, 483, 484, 485, 0, 0,
-284, 0, 0, 0, 486, 0, 0, 488, 0, 490,
0, 139, 491, 140, 141, 142, 143, 144, 0, 0,
145, 0, 0, 0, 146, 0, 0, 0, 0, 148,
- 149, 150, 151, 152, 153, 0, 0, 0, 0, 0,
+ 149, 150, 151, 152, 153, 0, 0, -329, 0, 0,
0, 156, 0, 0, 0, 157, 0, 0, 158, 159,
- 160, 0, 161, 0, 0, 0, 0, 0, 164, 0,
+ 160, 0, 161, 0, 0, 0, 0, 0, 164, 3902,
0, 165, 166, 0, 167, 0, 0, 0, 0, 0,
- 171, 172, 173, 174, 0, 176, 177, 0, 178, 179,
+ 171, 172, 173, 174, 3903, 176, 177, 0, 178, 179,
0, 0, 0, 0, 0, 0, 0, 186, 0, 188,
0, 190, 191, 192, 193, 0, 194, 195, 0, 196,
197, 198, 0, 200, 0, 201, 0, 0, 202, 0,
@@ -11456,20 +11156,20 @@ static const yytype_int16 yytable[] =
0, 0, 0, 0, 0, 211, 0, 212, 0, 0,
0, 213, 0, 214, 215, 216, 217, 0, 0, 0,
0, 0, 0, 219, 220, 221, 0, 0, 0, 222,
- 0, 0, 224, 0, 225, 226, 227, 0, 0, 228,
+ 0, 4357, 224, 0, 225, 226, 227, 0, 0, 228,
229, 0, 230, 231, 232, 233, 0, 0, 0, 0,
- 236, 237, 238, 0, 0, 239, 240, 0, 241, 242,
+ 236, 237, 238, 0, 0, 239, 240, 3904, 241, 242,
243, 0, 0, 0, 0, 0, 0, 245, 0, 246,
0, 247, 0, 248, 249, 250, 251, 252, 253, 0,
254, 0, 0, 0, 0, 256, 257, 0, 0, 0,
0, 0, 0, 260, 0, 0, 0, 261, 262, 263,
- 264, 0, 0, 265, 266, 267, 0, 268, 0, 269,
+ 264, 3905, 0, 265, 266, 267, 0, 268, 0, 269,
0, 0, 0, 0, 270, 0, 0, 0, 0, 272,
- 0, 273, 274, 0, 275, 276, 0, 0, 0, 277,
- 0, 0, 0, 279, 280, 0, 0, 281, 0, 0,
+ 0, 273, 274, 0, 275, 276, 3906, 0, 0, 277,
+ 0, 0, 0, 279, 280, 0, 0, 281, 3907, 0,
282, 283, 0, 0, 0, 0, 0, 284, 285, 0,
286, 0, 287, 0, 288, 289, 0, 0, 0, 0,
- 0, 0, 0, 290, 291, 292, 293, 294, 295, 296,
+ -284, 0, 0, 290, 291, 292, 293, 294, 295, 296,
297, 298, 299, 300, 301, 302, 0, 303, 304, 305,
0, 306, 307, 308, 309, 0, 310, 311, 0, 0,
0, 0, 312, 313, 314, 315, 316, 317, 0, 0,
@@ -11477,15 +11177,15 @@ static const yytype_int16 yytable[] =
325, 326, 327, 328, 329, 330, 331, 0, 0, 332,
333, 0, 0, 334, 335, 336, 337, 0, 0, 0,
0, 339, 0, 0, 0, 0, 340, 341, 342, 0,
- 343, 344, 345, 0, 0, 0, 0, 0, 0, 0,
+ 343, 344, 345, 3908, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 350, 351, 0, 0,
0, 0, 353, 354, 355, 0, 357, 358, 359, 360,
361, 362, 363, 0, 0, 0, 0, 366, 367, 0,
368, 0, 369, 370, 371, 372, 373, 0, 374, 375,
376, 0, 0, 377, 0, 0, 0, 378, 379, 380,
381, 382, 0, 0, 383, 384, 385, 386, 387, 0,
- 388, 0, 0, 390, 0, 392, 0, 0, 393, 0,
- 0, 0, 395, 0, 0, 397, 398, 0, 0, 0,
+ 388, 0, 0, 390, 0, 392, -284, 0, 393, 0,
+ 0, 0, 395, 0, 0, 397, 398, 3909, 0, 0,
0, 400, 401, 402, 403, 404, 405, 0, 407, 408,
0, 409, 0, 0, 0, 0, 411, 412, 413, 0,
0, 0, 0, 415, 0, 0, 0, 416, 0, 0,
@@ -11501,821 +11201,1123 @@ static const yytype_int16 yytable[] =
472, 0, 0, 473, 0, 0, 0, 475, 476, 477,
0, 0, 0, 0, 0, 0, 478, 0, 0, 479,
0, 0, 0, 480, 481, 482, 483, 484, 485, 0,
- 0, 0, 0, 0, 0, 486, 0, 0, 488, 0,
- 490, 0, 0, 491
+ 0, -284, 0, 0, 0, 486, 0, 0, 488, 0,
+ 490, 0, 139, 491, 140, 141, 142, 143, 144, 0,
+ 0, 145, 0, 0, 0, 146, 0, 0, 0, 0,
+ 148, 149, 150, 151, 152, 153, 0, 0, -329, 0,
+ 0, 0, 156, 0, 0, 0, 157, 0, 0, 158,
+ 159, 160, 0, 161, 0, 0, 0, 0, 0, 164,
+ 3902, 0, 165, 166, 0, 167, 0, 0, 0, 0,
+ 0, 171, 172, 173, 174, 3903, 176, 177, 0, 178,
+ 179, 0, 0, 0, 0, 0, 0, 0, 186, 0,
+ 188, 0, 190, 191, 192, 193, 0, 194, 195, 0,
+ 196, 197, 198, 0, 200, 0, 201, 0, 0, 202,
+ 0, 0, 203, 0, 0, 0, 204, 0, 0, 0,
+ 205, 206, 207, 0, 0, 208, 0, 0, 0, 0,
+ 209, 0, 0, 0, 0, 0, 211, 0, 212, 0,
+ 0, 0, 213, 0, 214, 215, 216, 217, 0, 0,
+ 0, 0, 0, 0, 219, 220, 221, 0, 0, 0,
+ 222, 0, 4406, 224, 0, 225, 226, 227, 0, 0,
+ 228, 229, 0, 230, 231, 232, 233, 0, 0, 0,
+ 0, 236, 237, 238, 0, 0, 239, 240, 3904, 241,
+ 242, 243, 0, 0, 0, 0, 0, 0, 245, 0,
+ 246, 0, 247, 0, 248, 249, 250, 251, 252, 253,
+ 0, 254, 0, 0, 0, 0, 256, 257, 0, 0,
+ 0, 0, 0, 0, 260, 0, 0, 0, 261, 262,
+ 263, 264, 3905, 0, 265, 266, 267, 0, 268, 0,
+ 269, 0, 0, 0, 0, 270, 0, 0, 0, 0,
+ 272, 0, 273, 274, 0, 275, 276, 3906, 0, 0,
+ 277, 0, 0, 0, 279, 280, 0, 0, 281, 3907,
+ 0, 282, 283, 0, 0, 0, 0, 0, 284, 285,
+ 0, 286, 0, 287, 0, 288, 289, 0, 0, 0,
+ 0, -284, 0, 0, 290, 291, 292, 293, 294, 295,
+ 296, 297, 298, 299, 300, 301, 302, 0, 303, 304,
+ 305, 0, 306, 307, 308, 309, 0, 310, 311, 0,
+ 0, 0, 0, 312, 313, 314, 315, 316, 317, 0,
+ 0, 318, 319, 0, 320, 0, 321, 0, 322, 323,
+ 324, 325, 326, 327, 328, 329, 330, 331, 0, 0,
+ 332, 333, 0, 0, 334, 335, 336, 337, 0, 0,
+ 0, 0, 339, 0, 0, 0, 0, 340, 341, 342,
+ 0, 343, 344, 345, 3908, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 350, 351, 0,
+ 0, 0, 0, 353, 354, 355, 0, 357, 358, 359,
+ 360, 361, 362, 363, 0, 0, 0, 0, 366, 367,
+ 0, 368, 0, 369, 370, 371, 372, 373, 0, 374,
+ 375, 376, 0, 0, 377, 0, 0, 0, 378, 379,
+ 380, 381, 382, 0, 0, 383, 384, 385, 386, 387,
+ 0, 388, 0, 0, 390, 0, 392, -284, 0, 393,
+ 0, 0, 0, 395, 0, 0, 397, 398, 3909, 0,
+ 0, 0, 400, 401, 402, 403, 404, 405, 0, 407,
+ 408, 0, 409, 0, 0, 0, 0, 411, 412, 413,
+ 0, 0, 0, 0, 415, 0, 0, 0, 416, 0,
+ 0, 418, 0, 420, 0, 421, 0, 423, 0, 425,
+ 426, 0, 0, 0, 0, 0, 0, 427, 428, 0,
+ 429, 0, 0, 430, 0, 0, 431, 0, 433, 0,
+ 0, 0, 435, 0, 436, 437, 438, 439, 440, 441,
+ 0, 0, 442, 443, 444, 445, 0, 446, 447, 0,
+ 448, 0, 449, 450, 451, 452, 0, 0, 453, 454,
+ 0, 455, 456, 457, 458, 0, 0, 0, 0, 0,
+ 459, 460, 461, 0, 0, 0, 0, 463, 464, 465,
+ 0, 466, 467, 0, 468, 469, 0, 0, 0, 0,
+ 0, 472, 0, 0, 473, 0, 0, 0, 475, 476,
+ 477, 0, 0, 0, 0, 0, 0, 478, 0, 0,
+ 479, 0, 0, 0, 480, 481, 482, 483, 484, 485,
+ 0, 0, -284, 0, 0, 0, 486, 0, 0, 488,
+ 0, 490, 0, 139, 491, 140, 141, 142, 143, 144,
+ 0, 0, 145, 0, 0, 0, 146, 0, 0, 0,
+ 0, 148, 149, 150, 151, 152, 153, 0, 0, -329,
+ 0, 0, 0, 156, 0, 0, 0, 157, 0, 0,
+ 158, 159, 160, 0, 161, 0, 0, 0, 0, 0,
+ 164, 3902, 0, 165, 166, 0, 167, 0, 0, 0,
+ 0, 0, 171, 172, 173, 174, 3903, 176, 177, 0,
+ 178, 179, 0, 0, 0, 0, 0, 0, 0, 186,
+ 0, 188, 0, 190, 191, 192, 193, 0, 194, 195,
+ 0, 196, 197, 198, 0, 200, 0, 201, 0, 0,
+ 202, 0, 0, 203, 0, 0, 0, 204, 0, 0,
+ 0, 205, 206, 207, 0, 0, 208, 0, 0, 0,
+ 0, 209, 0, 0, 0, 0, 0, 211, 0, 212,
+ 0, 0, 0, 213, 0, 214, 215, 216, 217, 0,
+ 0, 0, 0, 0, 0, 219, 220, 221, 0, 0,
+ 0, 222, 0, -303, 224, 0, 225, 226, 227, 0,
+ 0, 228, 229, 0, 230, 231, 232, 233, 0, 0,
+ 0, 0, 236, 237, 238, 0, 0, 239, 240, 3904,
+ 241, 242, 243, 0, 0, 0, 0, 0, 0, 245,
+ 0, 246, 0, 247, 0, 248, 249, 250, 251, 252,
+ 253, 0, 254, 0, 0, 0, 0, 256, 257, 0,
+ 0, 0, 0, 0, 0, 260, 0, 0, 0, 261,
+ 262, 263, 264, 3905, 0, 265, 266, 267, 0, 268,
+ 0, 269, 0, 0, 0, 0, 270, 0, 0, 0,
+ 0, 272, 0, 273, 274, 0, 275, 276, 3906, 0,
+ 0, 277, 0, 0, 0, 279, 280, 0, 0, 281,
+ 3907, 0, 282, 283, 0, 0, 0, 0, 0, 284,
+ 285, 0, 286, 0, 287, 0, 288, 289, 0, 0,
+ 0, 0, -284, 0, 0, 290, 291, 292, 293, 294,
+ 295, 296, 297, 298, 299, 300, 301, 302, 0, 303,
+ 304, 305, 0, 306, 307, 308, 309, 0, 310, 311,
+ 0, 0, 0, 0, 312, 313, 314, 315, 316, 317,
+ 0, 0, 318, 319, 0, 320, 0, 321, 0, 322,
+ 323, 324, 325, 326, 327, 328, 329, 330, 331, 0,
+ 0, 332, 333, 0, 0, 334, 335, 336, 337, 0,
+ 0, 0, 0, 339, 0, 0, 0, 0, 340, 341,
+ 342, 0, 343, 344, 345, 3908, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 350, 351,
+ 0, 0, 0, 0, 353, 354, 355, 0, 357, 358,
+ 359, 360, 361, 362, 363, 0, 0, 0, 0, 366,
+ 367, 0, 368, 0, 369, 370, 371, 372, 373, 0,
+ 374, 375, 376, 0, 0, 377, 0, 0, 0, 378,
+ 379, 380, 381, 382, 0, 0, 383, 384, 385, 386,
+ 387, 0, 388, 0, 0, 390, 0, 392, -284, 0,
+ 393, 0, 0, 0, 395, 0, 0, 397, 398, 3909,
+ 0, 0, 0, 400, 401, 402, 403, 404, 405, 0,
+ 407, 408, 0, 409, 0, 0, 0, 0, 411, 412,
+ 413, 0, 0, 0, 0, 415, 0, 0, 0, 416,
+ 0, 0, 418, 0, 420, 0, 421, 0, 423, 0,
+ 425, 426, 0, 0, 0, 0, 0, 0, 427, 428,
+ 0, 429, 0, 0, 430, 0, 0, 431, 0, 433,
+ 0, 0, 0, 435, 0, 436, 437, 438, 439, 440,
+ 441, 0, 0, 442, 443, 444, 445, 0, 446, 447,
+ 0, 448, 0, 449, 450, 451, 452, 0, 0, 453,
+ 454, 0, 455, 456, 457, 458, 0, 0, 0, 0,
+ 0, 459, 460, 461, 0, 0, 0, 0, 463, 464,
+ 465, 0, 466, 467, 0, 468, 469, 0, 0, 0,
+ 0, 0, 472, 0, 0, 473, 0, 0, 0, 475,
+ 476, 477, 0, 0, 0, 0, 0, 0, 478, 0,
+ 0, 479, 0, 0, 0, 480, 481, 482, 483, 484,
+ 485, 0, 0, -284, 0, 0, 0, 486, 0, 0,
+ 488, 0, 490, 0, 139, 491, 140, 141, 142, 143,
+ 144, 0, 0, 145, 0, 0, 0, 146, 0, 0,
+ 0, 0, 148, 149, 150, 151, 152, 153, 0, 0,
+ -329, 0, 0, 0, 156, 0, 0, 0, 157, 0,
+ 0, 158, 159, 160, 0, 161, 0, 0, 0, 0,
+ 0, 164, 3902, 0, 165, 166, 0, 167, 0, 0,
+ 0, 0, 0, 171, 172, 173, 174, 3903, 176, 177,
+ 0, 178, 179, 0, 0, 0, 0, 0, 0, 0,
+ 186, 0, 188, 0, 190, 191, 192, 193, 0, 194,
+ 195, 0, 196, 197, 198, 0, 200, 0, 201, 0,
+ 0, 202, 0, 0, 203, 0, 0, 0, 204, 0,
+ 0, 0, 205, 206, 207, 0, 0, 208, 0, 0,
+ 0, 0, 209, 0, 0, 0, 0, 0, 211, 0,
+ 212, 0, 0, 0, 213, 0, 214, 215, 216, 217,
+ 0, 0, 0, 0, 0, 0, 219, 220, 221, 0,
+ 0, 0, 222, 0, 0, 224, 0, 225, 226, 227,
+ 0, 0, 228, 229, 0, 230, 231, 232, 233, 0,
+ 0, 0, 0, 236, 237, 238, 0, 0, 239, 240,
+ 3904, 241, 242, 243, 0, 0, 0, 0, 0, 0,
+ 245, 0, 246, 0, 247, 0, 248, 249, 250, 251,
+ 252, 253, 0, 254, 0, 0, 0, 0, 256, 257,
+ 0, 0, 0, 0, 0, 0, 260, 0, 0, 0,
+ 261, 262, 263, 264, 3905, 0, 265, 266, 267, 0,
+ 268, 0, 269, 0, 0, 0, 0, 270, 0, 0,
+ 0, 0, 272, 0, 273, 274, 0, 275, 276, 3906,
+ 0, 0, 277, 0, 0, 0, 279, 280, 0, 0,
+ 281, 3907, 0, 282, 283, 0, 0, 0, 0, 0,
+ 284, 285, 0, 286, 0, 287, 0, 288, 289, 0,
+ 0, 0, 0, -284, 0, 0, 290, 291, 292, 293,
+ 294, 295, 296, 297, 298, 299, 300, 301, 302, 0,
+ 303, 304, 305, 0, 306, 307, 308, 309, 0, 310,
+ 311, 0, 0, 0, 0, 312, 313, 314, 315, 316,
+ 317, 0, 0, 318, 319, 0, 320, 0, 321, 0,
+ 322, 323, 324, 325, 326, 327, 328, 329, 330, 331,
+ 0, 0, 332, 333, 0, 0, 334, 335, 336, 337,
+ 0, 0, 0, 0, 339, 0, 0, 0, 0, 340,
+ 341, 342, 0, 343, 344, 345, 3908, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 350,
+ 351, 0, 0, 0, 0, 353, 354, 355, 0, 357,
+ 358, 359, 360, 361, 362, 363, 0, 0, 0, 0,
+ 366, 367, 0, 368, 0, 369, 370, 371, 372, 373,
+ 0, 374, 375, 376, 0, 0, 377, 0, 0, 0,
+ 378, 379, 380, 381, 382, 0, 0, 383, 384, 385,
+ 386, 387, 0, 388, 0, 0, 390, 0, 392, -284,
+ 0, 393, 0, 0, 0, 395, 0, 0, 397, 398,
+ 3909, 0, 0, 0, 400, 401, 402, 403, 404, 405,
+ 0, 407, 408, 0, 409, 0, 0, 0, 0, 411,
+ 412, 413, 0, 0, 0, 0, 415, 0, 0, 0,
+ 416, 0, 0, 418, 0, 420, 0, 421, 0, 423,
+ 0, 425, 426, 0, 0, 0, 0, 0, 0, 427,
+ 428, 0, 429, 0, 0, 430, 0, 0, 431, 0,
+ 433, 0, 0, 0, 435, 0, 436, 437, 438, 439,
+ 440, 441, 0, 0, 442, 443, 444, 445, 0, 446,
+ 447, 0, 448, 0, 449, 450, 451, 452, 0, 0,
+ 453, 454, 0, 455, 456, 457, 458, 0, 0, 0,
+ 0, 0, 459, 460, 461, 0, 0, 0, 0, 463,
+ 464, 465, 0, 466, 467, 0, 468, 469, 0, 0,
+ 0, 0, 0, 472, 0, 0, 473, 0, 0, 0,
+ 475, 476, 477, 0, 0, 0, 0, 0, 0, 478,
+ 0, 0, 479, 0, 0, 0, 480, 481, 482, 483,
+ 484, 485, 0, 0, -284, 0, 0, 0, 486, 0,
+ 0, 488, 0, 490, 0, 139, 491, 140, 141, 142,
+ 143, 144, 0, 0, 145, 0, 0, 0, 146, 0,
+ 0, 0, 0, 148, 149, 150, 151, 152, 153, 0,
+ 0, -329, 0, 0, 0, 156, 0, 0, 0, 157,
+ 0, 0, 158, 159, 160, 0, 161, 0, 0, 0,
+ 0, 0, 164, 3902, 0, 165, 166, 0, 167, 0,
+ 0, 0, 0, 0, 171, 172, 173, 174, 3903, 176,
+ 177, 0, 178, 179, 0, 0, 0, 0, 0, 0,
+ 0, 186, 0, 188, 0, 190, 191, 192, 193, 0,
+ 194, 195, 0, 196, 197, 198, 0, 200, 0, 201,
+ 0, 0, 202, 0, 0, 203, 0, 0, 0, 204,
+ 0, 0, 0, 205, 206, 207, 0, 0, 208, 0,
+ 0, 0, 0, 209, 0, 0, 0, 0, 0, 211,
+ 0, 212, 0, 0, 0, 213, 0, 214, 215, 216,
+ 217, 0, 0, 0, 0, 0, 0, 219, 220, 221,
+ 0, 0, 0, 222, 0, 0, 224, 0, 225, 226,
+ 227, 0, 0, 228, 229, 0, 230, 231, 232, 233,
+ 0, 0, 0, 0, 236, 237, 238, 0, 0, 239,
+ 240, 3904, 241, 242, 243, 0, 0, 0, 0, 0,
+ 0, 245, 0, 246, 0, 247, 0, 248, 249, 250,
+ 251, 252, 253, 0, 254, 0, 0, 0, 0, 256,
+ 257, 0, 0, 0, 0, 0, 0, 260, 0, 0,
+ 0, 261, 262, 263, 264, 3905, 0, 265, 266, 267,
+ 0, 268, 0, 269, 0, 0, 0, 0, 270, 0,
+ 0, 0, 0, 272, 0, 273, 274, 0, 275, 276,
+ 3906, 0, 0, 277, 0, 0, 0, 279, 280, 0,
+ 0, 281, 3907, 0, 282, 283, 0, 0, 0, 0,
+ 0, 284, 285, 0, 286, 0, 287, 0, 288, 289,
+ 0, 0, 0, 0, -284, 0, 0, 290, 291, 292,
+ 293, 294, 295, 296, 297, 298, 299, 300, 301, 302,
+ 0, 303, 304, 305, 0, 306, 307, 308, 309, 0,
+ 310, 311, 0, 0, 0, 0, 312, 313, 314, 315,
+ 316, 317, 0, 0, 318, 319, 0, 320, 0, 321,
+ 0, 322, 323, 324, 325, 326, 327, 328, 329, 330,
+ 331, 0, 0, 332, 333, 0, 0, 334, 335, 336,
+ 337, 0, 0, 0, 0, 339, 0, 0, 0, 0,
+ 340, 341, 342, 0, 343, 344, 345, 3908, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 350, 351, 0, 0, 0, 0, 353, 354, 355, 0,
+ 357, 358, 359, 360, 361, 362, 363, 0, 0, 0,
+ 0, 366, 367, 0, 368, 0, 369, 370, 371, 372,
+ 373, 0, 374, 375, 376, 0, 0, 377, 0, 0,
+ 0, 378, 379, 380, 381, 382, 0, 0, 383, 384,
+ 385, 386, 387, 0, 388, 0, 0, 390, 0, 392,
+ -284, 0, 393, 0, 0, 0, 395, 0, 0, 397,
+ 398, 3909, 0, 0, 0, 400, 401, 402, 403, 404,
+ 405, 0, 407, 408, 0, 409, 0, 0, 0, 0,
+ 411, 412, 413, 0, 0, 0, 0, 415, 0, 0,
+ 0, 416, 0, 0, 418, 0, 420, 0, 421, 0,
+ 423, 0, 425, 426, 0, 0, 0, 0, 0, 0,
+ 427, 428, 0, 429, 0, 0, 430, 0, 0, 431,
+ 0, 433, 0, 0, 0, 435, 0, 436, 437, 438,
+ 439, 440, 441, 0, 0, 442, 443, 444, 445, 0,
+ 446, 447, 0, 448, 0, 449, 450, 451, 452, 0,
+ 0, 453, 454, 0, 455, 456, 457, 458, 0, 0,
+ 0, 0, 0, 459, 460, 461, 0, 0, 0, 0,
+ 463, 464, 465, 0, 466, 467, 0, 468, 469, 0,
+ 0, 0, 0, 0, 472, 0, 0, 4245, 0, 0,
+ 0, 475, 476, 477, 0, 0, 0, 0, 0, 0,
+ 478, 0, 0, 479, 0, 0, 0, 480, 481, 482,
+ 483, 484, 485, 0, 0, -284, 0, 0, 0, 486,
+ 0, 0, 488, 0, 490, 0, 139, 491, 140, 141,
+ 142, 143, 144, 0, 0, 145, 0, 0, 0, 146,
+ 0, 0, 0, 0, 148, 149, 150, 151, 152, 153,
+ 0, 0, 0, 0, 0, 0, 156, 0, 0, 0,
+ 157, 0, 0, 158, 159, 160, 0, 161, 0, 0,
+ 0, 0, 0, 164, 0, 0, 165, 166, 0, 167,
+ 0, 0, 0, 0, 0, 171, 172, 173, 174, 0,
+ 176, 177, 0, 178, 179, 0, 0, 0, 0, 0,
+ 0, 0, 186, 0, 188, 0, 190, 191, 192, 193,
+ 0, 194, 195, 0, 196, 197, 198, 0, 200, 0,
+ 201, 0, 0, 202, 0, 0, 203, 0, 0, 0,
+ 204, 0, 0, 0, 205, 206, 207, 0, 0, 208,
+ 0, 0, 0, 0, 209, 0, 0, 0, 0, 0,
+ 211, 0, 212, 0, 0, 0, 213, 0, 214, 215,
+ 216, 217, 0, 0, 0, 0, 0, 0, 219, 220,
+ 221, 0, 0, 0, 222, 0, 0, 224, 0, 225,
+ 226, 227, 0, 0, 228, 229, 0, 230, 231, 232,
+ 233, 0, 0, 0, 0, 236, 237, 238, 0, 0,
+ 239, 240, 0, 241, 242, 243, 0, 0, 0, 0,
+ 0, 0, 245, 0, 246, 0, 247, 0, 248, 249,
+ 250, 251, 252, 253, 0, 254, 0, 0, 0, 0,
+ 256, 257, 0, 0, 0, 0, 0, 0, 260, 0,
+ 0, 0, 261, 262, 263, 264, 0, 0, 265, 266,
+ 267, 0, 268, 0, 269, 0, 0, 0, 0, 270,
+ 0, 0, 0, 0, 272, 0, 273, 274, 0, 275,
+ 276, 0, 0, 0, 277, 0, 0, 0, 279, 280,
+ 0, 0, 281, 0, 0, 282, 283, 0, 0, 0,
+ 0, 0, 284, 285, 0, 286, 0, 287, 0, 288,
+ 289, 0, 0, 0, 0, 0, 0, 0, 290, 291,
+ 292, 293, 294, 295, 296, 297, 298, 299, 300, 301,
+ 302, 0, 303, 304, 305, 0, 306, 307, 308, 309,
+ 0, 310, 311, 0, 0, 0, 0, 312, 313, 314,
+ 315, 316, 317, 0, 0, 318, 319, 0, 320, 0,
+ 321, 0, 322, 323, 324, 325, 326, 327, 328, 329,
+ 330, 331, 0, 0, 332, 333, 0, 0, 334, 335,
+ 336, 337, 0, 0, 0, 0, 339, 0, 0, 0,
+ 0, 340, 341, 342, 0, 343, 344, 345, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 350, 351, 0, 0, 0, 0, 353, 354, 355,
+ 0, 357, 358, 359, 360, 361, 362, 363, 0, 0,
+ 0, 0, 366, 367, 0, 368, 0, 369, 370, 371,
+ 372, 373, 0, 374, 375, 376, 0, 0, 377, 0,
+ 0, 0, 378, 379, 380, 381, 382, 0, 0, 383,
+ 384, 385, 386, 387, 0, 388, 0, 0, 390, 0,
+ 392, 0, 0, 393, 0, 0, 0, 395, 0, 0,
+ 397, 398, 0, 0, 0, 0, 400, 401, 402, 403,
+ 404, 405, 0, 407, 408, 0, 409, 0, 0, 0,
+ 0, 411, 412, 413, 0, 0, 0, 0, 415, 0,
+ 0, 0, 416, 0, 0, 418, 0, 420, 0, 421,
+ 0, 423, 0, 425, 426, 0, 0, 0, 0, 0,
+ 0, 427, 428, 0, 429, 0, 0, 430, 0, 0,
+ 431, 0, 433, 0, 0, 0, 435, 0, 436, 437,
+ 438, 439, 440, 441, 0, 0, 442, 443, 444, 445,
+ 0, 446, 447, 0, 448, 0, 449, 450, 451, 452,
+ 0, 0, 453, 454, 0, 455, 456, 457, 458, 0,
+ 0, 0, 0, 0, 459, 460, 461, 0, 0, 0,
+ 0, 463, 464, 465, 0, 466, 467, 0, 468, 469,
+ 0, 0, 0, 0, 0, 472, 0, 0, 473, 0,
+ 0, 0, 475, 476, 477, 0, 0, 0, 0, 0,
+ 0, 478, 0, 0, 479, 0, 0, 0, 480, 481,
+ 482, 483, 484, 485, 0, 0, 0, 0, 0, 0,
+ 486, 0, 0, 488, 0, 490, 0, 0, 491
};
static const yytype_int16 yycheck[] =
{
- 6, 648, 579, 579, 556, 20, 988, 1148, 602, 899,
- 616, 1178, 1105, 19, 29, 1178, 22, 124, 696, 1800,
- 989, 36, 675, 6, 1693, 1124, 32, 1077, 701, 951,
- 1831, 1832, 1486, 39, 813, 722, 42, 1387, 1071, 1072,
- 46, 1387, 1241, 2019, 926, 1310, 1819, 2481, 54, 2054,
- 2291, 1484, 2522, 524, 2589, 1200, 2411, 924, 2819, 22,
- 2330, 1318, 1207, 2764, 2100, 2603, 993, 1208, 1209, 951,
- 993, 1212, 1213, 1214, 1215, 2121, 1217, 1218, 1219, 1220,
- 1221, 1222, 1223, 1224, 757, 952, 3208, 760, 2134, 767,
- 96, 1467, 2399, 1475, 1115, 1961, 1959, 644, 645, 1819,
- 1959, 4, 2016, 1398, 2220, 657, 658, 1890, 2135, 2964,
- 1914, 1915, 2353, 119, 2476, 121, 1962, 123, 124, 125,
- 1966, 1416, 775, 776, 777, 3214, 662, 1931, 2079, 1424,
- 1425, 1977, 2079, 96, 787, 2263, 2343, 3444, 121, 786,
- 123, 1987, 2392, 34, 1948, 1949, 17, 882, 1457, 2455,
- 2400, 2620, 1528, 3271, 3272, 16, 17, 3275, 73, 25,
- 1964, 1965, 3097, 1967, 8, 19, 1970, 1971, 16, 17,
- 1974, 19, 3232, 131, 1942, 1979, 3294, 60, 19, 1983,
- 1984, 1985, 1986, 3301, 28, 19, 1990, 1991, 1830, 1993,
- 2680, 35, 16, 17, 17, 1999, 21, 30, 2002, 2003,
- 51, 2005, 3491, 112, 1905, 2617, 2618, 19, 1933, 815,
- 151, 2623, 47, 2625, 16, 17, 2079, 145, 16, 17,
- 2079, 2458, 36, 2440, 2441, 175, 3928, 114, 16, 17,
- 2565, 2444, 967, 2591, 59, 60, 2757, 58, 68, 16,
- 17, 1951, 43, 36, 83, 51, 66, 367, 217, 16,
- 17, 128, 63, 11, 233, 373, 358, 16, 17, 2063,
- 2064, 2065, 2066, 2875, 3038, 3383, 4053, 63, 1467, 388,
- 3046, 877, 2040, 82, 16, 17, 188, 2045, 342, 175,
- 157, 128, 46, 2051, 2052, 267, 157, 341, 2056, 279,
- 134, 226, 21, 391, 251, 21, 192, 450, 355, 443,
- 128, 56, 226, 157, 86, 34, 650, 161, 34, 363,
- 157, 405, 82, 128, 226, 16, 17, 995, 3440, 48,
- 161, 285, 48, 140, 59, 60, 16, 17, 192, 1528,
- 59, 60, 2068, 59, 60, 423, 23, 192, 515, 390,
- 2557, 2558, 157, 230, 3488, 335, 151, 2104, 2384, 161,
- 4182, 540, 953, 4185, 175, 4057, 16, 17, 179, 20,
- 129, 285, 268, 16, 17, 2751, 394, 233, 394, 190,
- 2214, 129, 485, 151, 16, 17, 355, 241, 25, 354,
- 418, 4015, 190, 432, 210, 192, 40, 2363, 2364, 2365,
- 192, 572, 10, 189, 282, 3564, 16, 17, 3567, 213,
- 214, 439, 509, 3676, 192, 508, 540, 168, 70, 132,
- 3528, 505, 230, 222, 511, 224, 157, 301, 530, 3537,
- 213, 214, 534, 16, 17, 164, 64, 1114, 254, 561,
- 16, 17, 470, 192, 195, 532, 539, 244, 545, 3712,
- 553, 1128, 308, 3561, 253, 70, 210, 636, 3566, 630,
- 132, 3620, 2838, 585, 418, 16, 17, 506, 433, 1238,
- 16, 17, 556, 491, 414, 491, 810, 373, 1437, 277,
- 358, 1018, 133, 285, 243, 4307, 540, 4111, 2272, 567,
- 16, 17, 169, 660, 637, 226, 3793, 631, 3632, 540,
- 414, 115, 449, 348, 118, 316, 3272, 1049, 1050, 1051,
- 317, 599, 566, 509, 598, 511, 441, 657, 658, 373,
- 629, 372, 159, 631, 375, 3604, 4303, 637, 414, 2826,
- 622, 511, 528, 1977, 372, 1392, 532, 375, 1395, 357,
- 1457, 585, 3306, 1400, 1457, 541, 515, 3681, 2893, 545,
- 341, 547, 511, 600, 1743, 3667, 2460, 475, 372, 146,
- 2464, 375, 16, 17, 560, 237, 1203, 1933, 1211, 1426,
- 1427, 2768, 2769, 2770, 2478, 2479, 1301, 1449, 2874, 2605,
- 372, 2877, 2878, 375, 2488, 1228, 16, 17, 16, 17,
- 1721, 2444, 588, 1959, 372, 2444, 233, 375, 418, 1884,
- 2896, 1732, 2349, 414, 1735, 372, 1331, 448, 375, 354,
- 1527, 607, 2516, 338, 1527, 372, 418, 403, 375, 3221,
- 616, 249, 618, 372, 2565, 426, 375, 375, 2565, 1090,
- 1091, 600, 604, 629, 3713, 188, 2008, 3148, 2398, 635,
- 372, 16, 17, 375, 640, 2872, 642, 2405, 644, 645,
- 16, 17, 448, 649, 650, 548, 1117, 611, 654, 3139,
- 3411, 2864, 635, 2988, 1125, 390, 1127, 3015, 664, 665,
- 666, 308, 603, 226, 670, 485, 629, 2471, 1139, 1140,
- 1141, 372, 584, 2587, 375, 4377, 1147, 640, 1284, 2483,
- 462, 631, 372, 16, 17, 375, 589, 583, 1467, 598,
- 2391, 73, 2068, 537, 1715, 2463, 460, 2465, 2423, 1246,
- 441, 659, 2565, 2079, 2472, 812, 2565, 1800, 355, 592,
- 551, 555, 372, 2355, 629, 375, 722, 2485, 551, 372,
- 3809, 3211, 375, 2491, 2492, 564, 540, 614, 551, 4018,
- 372, 3791, 2442, 375, 1933, 606, 2772, 2773, 629, 2507,
- 2508, 3011, 4049, 16, 17, 570, 590, 540, 1354, 1528,
- 3839, 585, 372, 2062, 615, 375, 16, 17, 635, 2563,
- 3695, 585, 597, 2531, 635, 631, 1313, 615, 16, 17,
- 2987, 606, 2900, 634, 780, 2556, 782, 573, 1513, 372,
- 631, 635, 375, 1330, 3253, 3254, 372, 405, 635, 375,
- 1396, 615, 3261, 16, 17, 3264, 3265, 606, 603, 611,
- 806, 807, 808, 573, 810, 811, 812, 631, 814, 815,
- 631, 372, 3281, 615, 375, 3959, 372, 615, 925, 375,
- 635, 1422, 2798, 2559, 807, 603, 3295, 615, 811, 631,
- 64, 814, 3301, 3302, 3303, 3304, 372, 2681, 615, 375,
- 1376, 570, 630, 3255, 570, 2602, 852, 3259, 615, 511,
- 16, 17, 3996, 630, 631, 578, 615, 3946, 2834, 865,
- 514, 4168, 601, 630, 631, 2298, 595, 1017, 515, 2068,
- 467, 877, 878, 615, 361, 3145, 882, 3289, 3290, 3291,
- 2079, 535, 520, 3245, 1461, 3297, 511, 505, 630, 631,
- 195, 3198, 284, 3305, 635, 3202, 578, 16, 17, 32,
- 629, 636, 865, 2704, 4022, 3374, 4024, 561, 372, 16,
- 17, 375, 3218, 210, 615, 878, 3157, 1067, 90, 925,
- 544, 16, 17, 547, 3501, 615, 2720, 2721, 2722, 630,
- 631, 125, 372, 3788, 372, 375, 82, 375, 556, 2740,
- 630, 631, 2954, 16, 17, 3483, 3153, 312, 3198, 16,
- 17, 12, 3202, 600, 1641, 615, 268, 254, 1880, 270,
- 3372, 967, 615, 16, 17, 2746, 71, 209, 871, 3381,
- 630, 631, 8, 615, 202, 819, 161, 630, 631, 88,
- 598, 4070, 34, 989, 631, 3021, 192, 372, 1910, 631,
- 375, 185, 2765, 16, 17, 615, 372, 251, 1880, 375,
- 1536, 2864, 609, 2457, 2458, 2864, 1873, 4096, 195, 263,
- 630, 631, 1018, 629, 301, 249, 1883, 467, 2159, 1886,
- 1887, 584, 615, 3050, 2374, 407, 2376, 2377, 1910, 615,
- 2376, 2377, 629, 175, 2817, 461, 633, 2988, 631, 372,
- 178, 2988, 375, 125, 630, 2765, 274, 2423, 440, 159,
- 192, 16, 17, 2310, 615, 4177, 2106, 2827, 2828, 615,
- 51, 373, 268, 1069, 370, 629, 12, 1073, 2444, 161,
- 631, 125, 2938, 637, 128, 631, 222, 3193, 224, 615,
- 141, 1734, 147, 1190, 16, 17, 16, 17, 282, 2234,
- 2385, 16, 17, 2939, 389, 631, 16, 17, 190, 372,
- 405, 485, 375, 16, 17, 125, 1069, 253, 1114, 2890,
- 1073, 244, 372, 342, 534, 375, 350, 154, 16, 17,
- 1227, 25, 1128, 233, 372, 2988, 413, 375, 165, 2988,
- 2512, 185, 1819, 193, 267, 2062, 126, 190, 2403, 2062,
- 435, 2240, 2241, 1749, 631, 3683, 457, 183, 530, 372,
- 2819, 615, 375, 3730, 1933, 16, 17, 16, 17, 213,
- 4005, 352, 4007, 2330, 358, 2306, 3142, 631, 3475, 3476,
- 111, 3207, 1178, 555, 157, 615, 285, 615, 1784, 629,
- 71, 318, 467, 2559, 1190, 235, 104, 1739, 797, 2565,
- 52, 631, 89, 631, 244, 141, 3896, 3897, 485, 453,
- 282, 63, 1808, 1809, 1751, 3181, 372, 16, 17, 375,
- 401, 108, 2233, 605, 1321, 16, 17, 25, 405, 357,
- 157, 1227, 2243, 0, 2423, 3237, 1232, 168, 282, 534,
- 615, 1237, 16, 17, 2401, 183, 3937, 230, 2401, 615,
- 1246, 413, 4003, 1795, 472, 355, 631, 80, 490, 301,
- 16, 17, 242, 372, 195, 631, 375, 16, 17, 3794,
- 572, 254, 282, 1840, 629, 372, 16, 17, 375, 374,
- 16, 17, 414, 507, 1237, 166, 358, 372, 1284, 274,
- 375, 890, 615, 16, 17, 268, 520, 16, 17, 2068,
- 1296, 476, 1298, 25, 427, 1301, 2729, 3767, 631, 372,
- 2079, 157, 375, 4043, 358, 372, 130, 1313, 375, 257,
- 400, 540, 377, 3777, 3228, 1321, 234, 202, 3364, 372,
- 16, 17, 375, 2490, 1330, 1331, 386, 2490, 378, 233,
- 226, 268, 3602, 251, 371, 3249, 631, 566, 358, 4461,
- 511, 21, 615, 467, 629, 263, 161, 534, 1354, 372,
- 82, 1357, 375, 142, 34, 615, 189, 1464, 631, 1365,
- 2559, 356, 342, 354, 351, 352, 2565, 615, 48, 563,
- 630, 1377, 1378, 1379, 1380, 1381, 1382, 125, 612, 59,
- 60, 1387, 2509, 631, 476, 16, 17, 1393, 1394, 274,
- 1396, 4021, 615, 1399, 1377, 1378, 1379, 230, 1381, 1302,
- 629, 538, 16, 17, 308, 515, 354, 372, 631, 8,
- 375, 1394, 274, 1419, 161, 561, 1399, 1380, 2872, 1382,
- 558, 254, 593, 341, 484, 233, 205, 159, 565, 606,
- 420, 30, 3896, 3897, 16, 17, 574, 185, 534, 585,
- 372, 583, 372, 375, 176, 375, 168, 372, 168, 615,
- 375, 355, 372, 342, 631, 375, 1419, 448, 1464, 372,
- 2810, 285, 375, 2556, 405, 631, 12, 16, 17, 1372,
- 366, 129, 1478, 195, 372, 1481, 1482, 375, 362, 364,
- 125, 563, 138, 374, 475, 2939, 4226, 3842, 2864, 631,
- 600, 205, 3468, 467, 16, 17, 615, 153, 16, 17,
- 308, 233, 539, 1112, 551, 629, 390, 1513, 615, 563,
- 129, 372, 631, 372, 375, 1478, 375, 16, 17, 1482,
- 615, 631, 16, 17, 631, 3795, 1532, 517, 1534, 1535,
- 592, 1537, 1538, 595, 282, 453, 631, 251, 4238, 4239,
- 185, 330, 615, 563, 1550, 483, 1552, 17, 615, 268,
- 467, 1534, 1535, 1162, 2604, 2700, 3324, 1166, 631, 12,
- 540, 467, 615, 372, 631, 82, 375, 1470, 213, 530,
- 403, 372, 3618, 534, 375, 130, 308, 630, 4042, 4043,
- 630, 41, 637, 3559, 2237, 2752, 566, 472, 372, 2752,
- 467, 375, 615, 534, 4064, 141, 16, 17, 516, 4339,
- 3841, 4341, 467, 16, 17, 12, 372, 225, 631, 375,
- 358, 515, 2988, 372, 467, 556, 375, 349, 4088, 4089,
- 581, 604, 372, 355, 243, 375, 372, 16, 17, 375,
- 4370, 16, 17, 16, 17, 1641, 1642, 282, 576, 372,
- 585, 12, 375, 372, 2423, 1752, 375, 4277, 4278, 629,
- 615, 540, 635, 2746, 373, 629, 540, 598, 2129, 373,
- 215, 205, 2335, 2336, 2337, 2136, 631, 604, 4408, 4409,
- 530, 222, 4136, 224, 534, 135, 372, 566, 2149, 375,
- 618, 3801, 3802, 615, 534, 615, 631, 4151, 141, 467,
- 615, 3124, 637, 1699, 537, 615, 600, 225, 635, 631,
- 4164, 631, 615, 16, 17, 222, 631, 224, 367, 3490,
- 630, 2182, 629, 358, 16, 17, 634, 615, 631, 244,
- 3725, 3726, 510, 629, 16, 17, 514, 3500, 16, 17,
- 285, 205, 630, 230, 141, 1741, 253, 2343, 598, 264,
- 629, 372, 3411, 1749, 375, 1751, 1752, 629, 16, 17,
- 16, 17, 629, 2880, 615, 637, 615, 1763, 372, 1765,
- 623, 375, 4226, 4197, 629, 1771, 1772, 630, 1774, 630,
- 141, 630, 230, 3546, 4238, 4239, 629, 241, 1784, 2250,
- 2559, 1787, 230, 515, 2911, 1791, 2565, 3348, 3349, 2988,
- 372, 467, 47, 375, 623, 2922, 192, 2890, 2925, 16,
- 17, 630, 1808, 1809, 1810, 1811, 615, 192, 1771, 1772,
- 590, 1774, 475, 1819, 615, 563, 1822, 1823, 1824, 1005,
- 1006, 630, 4286, 372, 1787, 606, 375, 630, 1791, 630,
- 3950, 615, 4296, 1839, 3954, 624, 625, 626, 627, 178,
- 16, 17, 1848, 585, 2971, 39, 630, 1810, 1811, 615,
- 372, 629, 46, 375, 372, 633, 615, 375, 1044, 1822,
- 1823, 1824, 2370, 285, 630, 615, 16, 17, 600, 615,
- 635, 630, 579, 372, 2764, 4339, 375, 4341, 372, 1885,
- 630, 375, 615, 2805, 630, 637, 615, 4351, 630, 631,
- 570, 1897, 2814, 2470, 16, 17, 369, 630, 1904, 631,
- 505, 630, 629, 1806, 189, 735, 4370, 82, 4372, 6,
- 4374, 591, 592, 589, 590, 16, 17, 4381, 563, 615,
- 585, 1285, 1885, 2805, 1288, 755, 3025, 1291, 4392, 3194,
- 582, 583, 2814, 585, 630, 3496, 16, 17, 768, 769,
- 1843, 1904, 16, 17, 4408, 4409, 630, 631, 269, 2816,
- 441, 272, 372, 629, 2462, 375, 3055, 3056, 235, 372,
- 4424, 4425, 375, 16, 17, 4429, 631, 244, 629, 3945,
- 2077, 11, 637, 16, 17, 629, 2083, 3076, 2486, 2487,
- 630, 631, 3149, 372, 615, 630, 375, 372, 629, 372,
- 375, 82, 375, 4113, 4114, 2001, 629, 16, 17, 630,
- 629, 615, 3352, 629, 123, 96, 3352, 16, 17, 629,
- 2016, 540, 351, 352, 2121, 1918, 630, 629, 357, 16,
- 17, 16, 17, 629, 1927, 1928, 629, 2134, 629, 19,
- 637, 16, 17, 615, 19, 1938, 1939, 1940, 1941, 3206,
- 1943, 1944, 192, 3206, 16, 17, 630, 631, 630, 629,
- 16, 17, 16, 17, 629, 3823, 3824, 3825, 233, 372,
- 16, 17, 375, 17, 16, 17, 615, 19, 630, 631,
- 372, 2077, 3239, 375, 607, 608, 3239, 2083, 2765, 2085,
- 372, 630, 2088, 375, 372, 630, 631, 375, 629, 2095,
- 2096, 2097, 2098, 615, 415, 2101, 631, 615, 631, 629,
- 4076, 378, 221, 629, 372, 2088, 372, 375, 630, 375,
- 16, 17, 630, 25, 104, 2121, 615, 467, 629, 2226,
- 629, 615, 629, 12, 629, 475, 289, 290, 2134, 630,
- 631, 630, 2095, 2096, 2097, 3939, 630, 629, 2041, 2042,
- 629, 2044, 2748, 2046, 2047, 2048, 2049, 2050, 630, 631,
- 2053, 2258, 2055, 42, 2706, 372, 3717, 3718, 375, 3720,
- 3721, 629, 2768, 2769, 2770, 256, 629, 157, 630, 631,
- 82, 161, 629, 3974, 349, 16, 17, 629, 3982, 3983,
- 355, 172, 3986, 3987, 3988, 3989, 630, 631, 142, 2795,
- 3223, 3224, 630, 631, 3975, 615, 372, 6, 188, 375,
- 190, 320, 615, 3261, 203, 324, 3264, 3265, 97, 2988,
- 630, 3310, 331, 102, 17, 205, 363, 630, 629, 558,
- 2226, 211, 372, 3281, 2695, 375, 615, 629, 595, 596,
- 615, 598, 615, 600, 629, 574, 226, 328, 144, 589,
- 590, 630, 16, 17, 234, 2251, 19, 630, 57, 424,
- 372, 241, 2258, 375, 3708, 3709, 629, 2364, 585, 2366,
- 2367, 251, 515, 354, 176, 629, 2272, 430, 431, 59,
- 60, 372, 3439, 263, 375, 629, 3439, 629, 268, 629,
- 629, 71, 4086, 4087, 630, 631, 629, 277, 31, 630,
- 631, 4095, 372, 412, 4062, 375, 630, 631, 372, 2305,
- 3350, 375, 615, 2410, 2411, 629, 305, 306, 404, 4090,
- 629, 310, 311, 615, 155, 629, 3374, 630, 629, 372,
- 629, 233, 375, 615, 2330, 416, 629, 615, 630, 372,
- 629, 104, 375, 629, 4003, 629, 145, 2343, 630, 142,
- 515, 84, 630, 59, 60, 629, 465, 615, 629, 615,
- 2356, 341, 2358, 372, 630, 631, 375, 246, 2364, 629,
- 2366, 2367, 630, 372, 630, 629, 375, 543, 2374, 629,
- 2376, 2377, 629, 363, 2481, 372, 330, 372, 375, 1772,
- 375, 1774, 629, 373, 157, 630, 631, 372, 161, 629,
- 375, 630, 631, 568, 629, 2401, 308, 3490, 615, 629,
- 372, 630, 631, 375, 2410, 2411, 372, 629, 372, 375,
- 629, 375, 155, 630, 505, 405, 372, 190, 63, 375,
- 372, 629, 3391, 375, 629, 600, 630, 631, 317, 1822,
- 1823, 1824, 205, 111, 456, 80, 2451, 349, 211, 615,
- 629, 142, 629, 355, 2450, 629, 2461, 92, 629, 2455,
- 629, 82, 2467, 2356, 2460, 456, 630, 631, 2464, 629,
- 2466, 234, 629, 453, 629, 615, 372, 629, 241, 375,
- 2476, 629, 2478, 2479, 2489, 2481, 630, 631, 251, 4455,
- 2495, 629, 2488, 602, 2490, 475, 2501, 2502, 630, 631,
- 263, 629, 381, 615, 2500, 268, 630, 631, 617, 11,
- 630, 631, 629, 2509, 277, 60, 630, 631, 630, 531,
- 2516, 2517, 630, 631, 615, 537, 2522, 630, 631, 629,
- 3173, 630, 631, 2529, 478, 479, 516, 330, 159, 630,
- 629, 372, 630, 631, 375, 615, 629, 2500, 216, 151,
- 152, 615, 370, 352, 189, 363, 543, 3153, 530, 194,
- 630, 363, 12, 630, 631, 631, 630, 630, 631, 581,
- 115, 226, 615, 118, 49, 2468, 2469, 491, 341, 630,
- 12, 126, 615, 279, 125, 49, 598, 630, 363, 543,
- 2586, 2587, 572, 631, 142, 230, 4387, 630, 143, 461,
- 363, 2494, 363, 3064, 584, 585, 615, 630, 631, 111,
- 373, 572, 233, 515, 493, 167, 615, 624, 417, 254,
- 419, 630, 630, 631, 604, 475, 606, 129, 615, 2522,
- 615, 630, 629, 2586, 1083, 1084, 1085, 630, 631, 330,
- 615, 186, 405, 3104, 185, 630, 630, 631, 527, 268,
- 630, 631, 1101, 615, 634, 635, 190, 142, 511, 615,
- 167, 615, 2555, 630, 631, 530, 168, 400, 630, 615,
- 511, 4462, 213, 615, 630, 279, 620, 621, 622, 623,
- 624, 625, 626, 627, 1133, 478, 479, 1136, 158, 422,
- 453, 141, 91, 195, 630, 631, 631, 242, 600, 630,
- 631, 3832, 630, 631, 630, 631, 1155, 1156, 365, 141,
- 1159, 379, 475, 630, 631, 526, 63, 630, 631, 615,
- 2716, 454, 390, 2719, 2720, 2721, 2722, 32, 349, 397,
- 1179, 1180, 2728, 80, 355, 630, 631, 630, 631, 526,
- 527, 282, 630, 530, 531, 92, 104, 534, 157, 536,
- 128, 2747, 2748, 516, 389, 114, 2752, 630, 631, 244,
- 630, 631, 630, 631, 636, 215, 6, 26, 403, 2765,
- 58, 629, 2768, 2769, 2770, 2728, 278, 510, 630, 631,
- 113, 34, 330, 215, 615, 2781, 3745, 478, 479, 4,
- 3332, 2787, 3751, 2789, 3361, 340, 2893, 466, 343, 2795,
- 598, 125, 244, 424, 128, 3522, 3523, 60, 631, 572,
- 125, 389, 71, 56, 2810, 3972, 433, 358, 3535, 3972,
- 172, 489, 585, 82, 114, 3542, 223, 620, 621, 622,
- 623, 624, 625, 626, 627, 3647, 3648, 142, 1163, 1164,
- 631, 604, 189, 606, 71, 330, 631, 194, 82, 125,
- 12, 3568, 3569, 3159, 3160, 637, 90, 3117, 3118, 494,
- 603, 185, 115, 630, 125, 118, 540, 630, 631, 128,
- 185, 634, 635, 126, 630, 420, 234, 141, 2874, 9,
- 114, 2877, 2878, 230, 2880, 3420, 3421, 175, 2781, 213,
- 143, 179, 3975, 251, 515, 631, 637, 2893, 213, 630,
- 2896, 142, 190, 405, 630, 263, 629, 254, 637, 185,
- 267, 159, 637, 581, 631, 2911, 636, 279, 142, 279,
- 111, 49, 631, 279, 185, 159, 2922, 530, 125, 2925,
- 621, 622, 623, 624, 625, 626, 627, 213, 573, 244,
- 279, 279, 279, 629, 274, 388, 222, 568, 224, 631,
- 631, 2947, 213, 551, 2950, 631, 497, 551, 282, 2955,
- 12, 631, 267, 222, 104, 224, 161, 282, 631, 2965,
- 631, 473, 631, 2969, 244, 2971, 624, 168, 245, 600,
- 180, 26, 27, 341, 528, 190, 631, 577, 185, 242,
- 2986, 631, 2965, 478, 479, 254, 230, 2950, 488, 392,
- 137, 2894, 547, 505, 195, 3001, 282, 4090, 363, 2902,
- 631, 631, 3008, 631, 59, 60, 213, 62, 80, 4176,
- 244, 282, 563, 4176, 3020, 330, 71, 36, 316, 531,
- 817, 576, 161, 630, 358, 161, 161, 82, 161, 230,
- 161, 161, 161, 358, 161, 90, 351, 352, 161, 499,
- 500, 501, 502, 503, 504, 3008, 403, 3937, 161, 3722,
- 3723, 3724, 161, 161, 4023, 3162, 516, 499, 500, 114,
- 502, 161, 504, 307, 622, 623, 624, 625, 626, 627,
- 161, 3178, 358, 128, 516, 282, 131, 278, 3756, 330,
- 343, 325, 351, 352, 234, 453, 598, 358, 357, 631,
- 2993, 161, 3098, 161, 363, 161, 330, 161, 1557, 118,
- 3106, 251, 579, 610, 159, 349, 125, 3684, 584, 195,
- 631, 363, 427, 263, 4255, 363, 414, 189, 3670, 192,
- 363, 630, 630, 624, 3130, 620, 621, 622, 623, 624,
- 625, 626, 627, 85, 403, 87, 630, 494, 630, 630,
- 630, 630, 630, 3149, 3150, 192, 629, 3153, 516, 631,
- 623, 358, 630, 476, 572, 630, 3162, 629, 230, 178,
- 630, 630, 3168, 478, 479, 630, 185, 222, 631, 224,
- 631, 630, 3178, 630, 630, 230, 128, 492, 629, 627,
- 3186, 630, 254, 238, 1643, 629, 3780, 551, 1647, 604,
- 631, 341, 232, 629, 213, 214, 522, 149, 253, 400,
- 3206, 11, 471, 3106, 405, 3883, 203, 192, 637, 192,
- 1669, 55, 3218, 363, 4355, 170, 573, 630, 457, 413,
- 483, 65, 3228, 631, 3230, 142, 475, 478, 479, 563,
- 631, 190, 184, 3239, 161, 162, 47, 81, 563, 3245,
- 339, 3247, 466, 3249, 478, 479, 505, 80, 505, 93,
- 94, 95, 307, 137, 551, 4422, 252, 3364, 505, 4422,
- 3836, 389, 252, 282, 505, 109, 531, 505, 389, 196,
- 325, 515, 473, 389, 137, 531, 47, 563, 4445, 389,
- 207, 436, 4445, 389, 547, 4452, 387, 531, 629, 4452,
- 629, 4458, 563, 389, 389, 4458, 389, 4266, 4267, 278,
- 4269, 629, 161, 453, 573, 620, 621, 622, 623, 624,
- 625, 626, 627, 576, 630, 585, 3322, 389, 637, 155,
- 247, 111, 630, 342, 183, 380, 240, 382, 240, 630,
- 531, 403, 259, 637, 353, 390, 537, 196, 357, 358,
- 630, 3347, 3348, 3349, 637, 630, 3352, 3454, 207, 4318,
- 637, 4320, 4321, 637, 630, 556, 563, 630, 3364, 286,
- 551, 551, 630, 16, 17, 631, 516, 551, 274, 620,
- 621, 622, 623, 624, 625, 626, 627, 637, 540, 611,
- 581, 88, 637, 47, 629, 631, 620, 621, 622, 623,
- 624, 625, 626, 627, 629, 161, 629, 598, 257, 551,
- 259, 336, 6, 458, 194, 161, 4053, 629, 370, 13,
- 192, 15, 3315, 330, 4383, 3991, 192, 192, 345, 241,
- 192, 637, 26, 27, 248, 637, 170, 286, 3434, 381,
- 358, 631, 251, 3439, 251, 3338, 376, 3544, 4420, 321,
- 230, 114, 114, 629, 637, 254, 254, 551, 3454, 26,
- 27, 629, 205, 57, 369, 540, 450, 389, 62, 63,
- 515, 629, 637, 373, 624, 69, 119, 120, 121, 122,
- 123, 629, 629, 425, 4026, 319, 531, 242, 82, 242,
- 535, 104, 59, 60, 630, 62, 90, 630, 278, 348,
- 3496, 3506, 637, 337, 71, 606, 100, 363, 630, 554,
- 4077, 226, 269, 4055, 630, 82, 630, 3513, 630, 629,
- 114, 3618, 630, 90, 631, 630, 630, 572, 389, 624,
- 578, 540, 192, 630, 128, 544, 244, 131, 547, 631,
- 265, 71, 251, 363, 138, 139, 251, 114, 3544, 558,
- 637, 145, 631, 402, 563, 629, 254, 566, 254, 153,
- 631, 128, 631, 157, 131, 159, 630, 363, 629, 401,
- 363, 478, 479, 82, 3570, 218, 219, 220, 221, 19,
- 631, 3577, 631, 630, 363, 629, 631, 363, 491, 3686,
- 47, 82, 159, 629, 188, 630, 467, 629, 629, 3595,
- 268, 19, 629, 47, 630, 96, 469, 36, 26, 630,
- 606, 203, 418, 622, 623, 148, 261, 630, 630, 205,
- 631, 234, 3618, 477, 629, 629, 629, 251, 222, 463,
- 224, 251, 631, 128, 228, 128, 230, 629, 251, 399,
- 637, 86, 485, 144, 238, 136, 491, 630, 630, 462,
- 263, 630, 3545, 71, 631, 222, 630, 224, 19, 253,
- 630, 34, 630, 230, 82, 630, 4303, 630, 34, 358,
- 60, 238, 242, 630, 630, 630, 630, 320, 327, 322,
- 323, 324, 256, 413, 518, 370, 253, 277, 331, 118,
- 3686, 3584, 606, 473, 241, 629, 125, 630, 637, 631,
- 267, 47, 536, 211, 631, 327, 418, 540, 3704, 540,
- 128, 630, 585, 307, 494, 622, 623, 624, 625, 626,
- 627, 3717, 3718, 585, 3720, 3721, 304, 595, 341, 372,
- 629, 325, 375, 14, 629, 329, 629, 629, 629, 629,
- 307, 629, 578, 595, 128, 3842, 4312, 254, 19, 178,
- 363, 531, 254, 357, 534, 34, 185, 537, 325, 170,
- 630, 358, 631, 629, 457, 256, 631, 327, 174, 412,
- 540, 3767, 17, 4315, 368, 254, 4413, 540, 629, 373,
- 198, 540, 534, 630, 213, 214, 380, 34, 382, 630,
- 3786, 3787, 589, 573, 585, 389, 390, 585, 241, 363,
- 353, 581, 3798, 590, 222, 509, 224, 358, 450, 630,
- 4447, 606, 170, 380, 631, 382, 138, 156, 370, 521,
- 67, 464, 465, 390, 578, 629, 629, 421, 190, 603,
- 31, 190, 61, 638, 3787, 3831, 254, 328, 3834, 629,
- 453, 435, 436, 437, 438, 629, 3842, 4389, 13, 630,
- 384, 542, 4136, 282, 137, 630, 159, 630, 629, 137,
- 351, 352, 405, 354, 458, 73, 603, 4151, 426, 192,
- 31, 63, 370, 63, 3767, 522, 3872, 270, 3831, 630,
- 4164, 631, 629, 47, 47, 629, 5, 629, 135, 363,
- 363, 458, 630, 241, 155, 635, 136, 3893, 370, 524,
- 370, 144, 3898, 516, 47, 629, 47, 47, 154, 578,
- 132, 603, 159, 342, 155, 225, 163, 4459, 635, 284,
- 638, 515, 127, 150, 47, 416, 457, 47, 357, 358,
- 629, 47, 53, 351, 352, 630, 459, 531, 103, 357,
- 630, 535, 254, 223, 631, 363, 155, 635, 515, 631,
- 197, 208, 543, 631, 635, 47, 630, 630, 53, 602,
- 554, 631, 440, 226, 531, 559, 190, 132, 535, 190,
- 217, 190, 615, 616, 617, 543, 3972, 605, 572, 128,
- 145, 358, 3903, 629, 231, 403, 475, 554, 191, 2265,
- 631, 3324, 2057, 3325, 4091, 2439, 3930, 658, 3593, 4056,
- 4245, 1002, 4286, 168, 4246, 572, 171, 3591, 3785, 4005,
- 3595, 4007, 4296, 4009, 505, 4447, 4400, 182, 46, 580,
- 2765, 1818, 3777, 4410, 3777, 3777, 4283, 3777, 4129, 4283,
- 3777, 3777, 279, 3777, 3777, 3777, 3777, 3777, 203, 4035,
- 4239, 635, 3777, 3777, 4155, 3938, 1473, 4154, 1042, 1743,
- 675, 3935, 2015, 471, 301, 680, 2920, 1475, 1483, 2742,
- 3433, 3130, 629, 2747, 1318, 230, 4081, 4351, 4064, 3832,
- 4355, 3436, 237, 4263, 4180, 4312, 3991, 519, 3600, 1527,
- 2994, 2008, 2587, 3249, 2016, 4081, 2519, 3228, 4372, 3237,
- 4374, 4330, 717, 4026, 3046, 4091, 3743, 4381, 3272, 3306,
- 4197, 4097, 3555, 4077, 3178, 3544, 4013, 11, 4392, 734,
- 11, 540, 277, 4113, 3941, 544, 4114, 1541, 547, 3954,
- 3950, 3751, 2093, 3798, 2015, 3230, 1892, 971, 2512, 558,
- 633, 1433, 3510, 2325, 563, 3229, 1523, 566, 1810, 1482,
- 4424, 4425, 2728, 3125, 2298, 4429, 2347, 2216, 3779, 601,
- 775, 776, 777, 778, 1829, 573, 3106, 404, 2128, 2125,
- 2706, 1128, 787, 911, 4261, 3196, 413, 2215, 2402, 34,
- 3857, 4064, 3711, 3322, 4212, 1101, 4213, 3239, 1449, 4389,
- 4176, 428, 2244, 2810, 227, 3705, 2508, 3686, 2098, 2352,
- 1331, 4084, 4085, 622, 623, 2292, 2329, 3439, 3144, 446,
- 3143, 4197, 67, 3206, 591, 4176, 1550, 671, 1301, 579,
- 1881, 1762, 1385, 3247, 1413, 1882, 4212, 4213, 4204, 3128,
- 4305, 4353, 1337, 4273, 4452, 4458, 3546, 1365, 3149, 1834,
- 2797, 3465, 3186, 3694, 12, 13, 563, 1791, 485, 486,
- 571, 406, 893, 868, 287, 288, 289, 290, 291, 292,
- 1293, 294, 295, 296, 297, 298, 299, 300, 3821, 302,
- 303, 426, 3827, 1532, 511, 4261, 572, 1355, 898, 434,
- 135, 2716, 658, 515, -1, 658, 515, 442, 658, -1,
- -1, -1, -1, 530, -1, -1, 533, 534, -1, -1,
- -1, -1, 4288, -1, 159, 4188, 4189, -1, 163, 4295,
- -1, -1, 467, -1, -1, -1, -1, -1, -1, -1,
+ 6, 648, 577, 989, 988, 577, 1179, 696, 600, 899,
+ 701, 1106, 1697, 19, 4, 124, 22, 554, 1836, 1837,
+ 1078, 1179, 1149, 6, 675, 1125, 32, 1804, 1489, 722,
+ 2024, 1311, 813, 39, 1072, 1073, 42, 1390, 2488, 1947,
+ 46, 614, 1390, 926, 951, 20, 1824, 2529, 54, 522,
+ 2059, 2337, 1487, 3218, 29, 1201, 2418, 2128, 1242, 2597,
+ 2298, 36, 1208, 2828, 2773, 993, 757, 2107, 951, 760,
+ 2141, 642, 2611, 2406, 645, 1116, 1478, 1319, 767, 993,
+ 1966, 22, 1209, 1210, 2227, 1470, 1213, 1214, 1215, 1216,
+ 96, 1218, 1219, 1220, 1221, 1222, 1223, 1224, 1225, 1824,
+ 2142, 1964, 1964, 1895, 662, 2086, 2973, 2086, 2399, 2628,
+ 2483, 1919, 1920, 119, 2350, 121, 2407, 123, 124, 125,
+ 657, 658, 2360, 3454, 775, 776, 777, 1460, 1936, 1967,
+ 2270, 2021, 3224, 1971, 19, 17, 787, 2045, 121, 786,
+ 123, 25, 2050, 34, 1982, 1953, 1954, 1532, 2056, 2057,
+ 16, 17, 10, 2061, 1992, 96, 3242, 51, 30, 3106,
+ 3501, 1969, 1970, 882, 1972, 19, 1835, 1975, 1976, 59,
+ 60, 1979, 16, 17, 2447, 2448, 1984, 1401, 924, 131,
+ 1988, 1989, 1990, 1991, 17, 112, 2221, 1995, 1996, 60,
+ 1998, 83, 16, 17, 63, 1419, 2004, 19, 2599, 2007,
+ 2008, 28, 2010, 1427, 1428, 175, 952, 2111, 35, 47,
+ 175, 21, 1910, 2625, 2626, 68, 3281, 3282, 2573, 2631,
+ 3285, 2633, 73, 2086, 2086, 128, 16, 17, 21, 151,
+ 19, 2405, 128, 195, 192, 161, 195, 58, 175, 3304,
+ 86, 34, 815, 2075, 51, 90, 3311, 953, 967, 59,
+ 60, 63, 2688, 2884, 157, 48, 1938, 71, 3047, 82,
+ 56, 157, 2070, 2071, 2072, 2073, 59, 60, 128, 16,
+ 17, 2462, 157, 71, 209, 157, 161, 373, 21, 16,
+ 17, 16, 17, 267, 36, 3450, 1470, 312, 82, 114,
+ 226, 34, 2565, 2566, 279, 358, 145, 157, 285, 147,
+ 251, 3511, 157, 1956, 877, 48, 995, 134, 217, 128,
+ 40, 36, 362, 183, 192, 391, 59, 60, 21, 88,
+ 189, 16, 17, 467, 423, 130, 226, 129, 3393, 16,
+ 17, 34, 405, 301, 34, 16, 17, 20, 2963, 161,
+ 390, 540, 2760, 16, 17, 48, 4025, 354, 1532, 233,
+ 335, 2391, 166, 129, 175, 485, 59, 60, 179, 282,
+ 394, 16, 17, 572, 268, 157, 16, 17, 192, 190,
+ 3938, 226, 161, 418, 16, 17, 2370, 2371, 2372, 352,
+ 151, 164, 3686, 192, 168, 508, 623, 257, 192, 540,
+ 168, 509, 151, 630, 439, 2451, 607, 608, 507, 222,
+ 1286, 224, 64, 1289, 132, 230, 1292, 210, 16, 17,
+ 215, 195, 530, 70, 16, 17, 539, 195, 3722, 70,
+ 631, 630, 1115, 553, 308, 470, 433, 132, 401, 2847,
+ 253, 418, 505, 190, 543, 358, 1129, 636, 157, 2465,
+ 244, 243, 4121, 405, 414, 413, 405, 1018, 338, 414,
+ 133, 254, 2356, 190, 1440, 16, 17, 491, 1239, 268,
+ 1031, 213, 214, 142, 16, 17, 366, 243, 567, 373,
+ 348, 66, 3803, 3538, 16, 17, 268, 414, 16, 17,
+ 285, 188, 3547, 556, 354, 629, 16, 17, 213, 214,
+ 540, 2766, 16, 17, 115, 316, 285, 118, 449, 4067,
+ 390, 507, 2835, 509, 2412, 441, 3571, 16, 17, 237,
+ 19, 3576, 3677, 1050, 1051, 1052, 285, 485, 146, 226,
+ 526, 1982, 3614, 599, 530, 598, 511, 3316, 372, 377,
+ 3740, 375, 1460, 539, 403, 631, 188, 543, 357, 545,
+ 2902, 2777, 2778, 2779, 657, 658, 1460, 405, 372, 268,
+ 476, 375, 558, 1938, 448, 490, 546, 1204, 354, 622,
+ 374, 1212, 2470, 1747, 2472, 418, 16, 17, 413, 1452,
+ 2279, 2479, 534, 2613, 226, 534, 374, 2467, 1229, 1964,
+ 586, 2471, 372, 1302, 2492, 375, 441, 249, 2451, 2451,
+ 2498, 2499, 2573, 414, 2573, 2485, 2486, 587, 1725, 605,
+ 3231, 301, 511, 1531, 629, 2495, 2514, 2515, 614, 1736,
+ 616, 2013, 1739, 583, 426, 1334, 462, 1531, 1091, 1092,
+ 604, 627, 3247, 3024, 611, 372, 475, 633, 375, 418,
+ 2538, 3723, 638, 2523, 640, 372, 642, 372, 375, 645,
+ 375, 448, 2997, 649, 650, 1118, 583, 505, 654, 1395,
+ 633, 330, 1398, 1126, 2689, 1128, 3421, 1403, 664, 665,
+ 666, 631, 2836, 2837, 670, 1889, 631, 1140, 1141, 1142,
+ 2478, 598, 564, 631, 501, 1148, 1247, 372, 1719, 551,
+ 375, 603, 2490, 1429, 1430, 372, 627, 4028, 375, 1470,
+ 2075, 372, 2883, 2362, 375, 2886, 2887, 638, 556, 372,
+ 2398, 2086, 375, 812, 573, 2595, 2610, 659, 535, 1804,
+ 2573, 2573, 1285, 3149, 2905, 3801, 722, 372, 551, 1425,
+ 375, 592, 372, 2996, 606, 375, 553, 3819, 4059, 551,
+ 372, 585, 635, 375, 3020, 2567, 2069, 631, 629, 635,
+ 598, 2781, 2782, 1314, 3263, 3264, 636, 631, 2430, 615,
+ 635, 1532, 3271, 635, 1938, 3274, 3275, 3849, 3705, 597,
+ 570, 588, 1333, 2571, 372, 16, 17, 375, 606, 2909,
+ 372, 615, 3291, 375, 780, 635, 782, 570, 629, 573,
+ 635, 64, 512, 606, 1357, 3221, 3305, 2564, 540, 614,
+ 634, 615, 3311, 3312, 3313, 3314, 2449, 1516, 591, 592,
+ 806, 807, 808, 533, 810, 811, 812, 631, 814, 815,
+ 631, 372, 604, 2807, 375, 540, 925, 2873, 601, 4387,
+ 372, 1379, 611, 375, 807, 615, 1399, 570, 811, 559,
+ 372, 814, 603, 375, 372, 16, 17, 375, 585, 467,
+ 630, 631, 372, 635, 603, 375, 852, 4178, 372, 2843,
+ 578, 375, 595, 3265, 511, 2881, 19, 3269, 520, 865,
+ 511, 16, 17, 372, 3956, 3384, 375, 570, 615, 3155,
+ 2305, 877, 878, 578, 631, 3208, 882, 584, 615, 3212,
+ 615, 871, 3255, 3158, 631, 604, 629, 3299, 3300, 3301,
+ 485, 2075, 1464, 630, 2712, 3307, 631, 16, 17, 16,
+ 17, 46, 2086, 3315, 1017, 16, 17, 25, 388, 16,
+ 17, 355, 270, 73, 43, 3498, 635, 3208, 230, 925,
+ 615, 3212, 372, 544, 865, 375, 547, 3163, 615, 3167,
+ 2748, 3798, 584, 367, 615, 630, 631, 878, 361, 178,
+ 23, 104, 615, 630, 631, 624, 625, 626, 627, 630,
+ 631, 318, 1645, 389, 3493, 1068, 125, 630, 631, 301,
+ 615, 967, 16, 17, 51, 615, 249, 4032, 125, 4034,
+ 3382, 161, 4031, 615, 467, 630, 631, 2754, 1885, 3391,
+ 630, 631, 1540, 989, 16, 17, 16, 17, 4080, 631,
+ 3030, 443, 819, 4063, 157, 8, 2774, 235, 161, 435,
+ 190, 629, 1885, 2464, 2465, 633, 244, 615, 1915, 2516,
+ 2873, 2873, 1018, 615, 4106, 450, 2997, 3059, 2997, 2728,
+ 2729, 2730, 4187, 631, 3055, 1031, 193, 190, 2381, 631,
+ 2383, 2384, 1915, 226, 2826, 2383, 2384, 3228, 4192, 2166,
+ 32, 4195, 205, 11, 609, 2430, 16, 17, 211, 2774,
+ 233, 25, 879, 192, 615, 2113, 16, 17, 126, 3642,
+ 3203, 2947, 8, 615, 1070, 210, 2451, 350, 1074, 630,
+ 631, 234, 154, 615, 629, 2317, 513, 615, 241, 631,
+ 16, 17, 1191, 165, 30, 615, 169, 1738, 251, 631,
+ 202, 615, 285, 631, 650, 2241, 244, 16, 17, 457,
+ 263, 631, 241, 16, 17, 268, 615, 631, 3691, 1115,
+ 2948, 140, 467, 282, 277, 233, 264, 2519, 357, 1228,
+ 390, 372, 2899, 1129, 375, 282, 16, 17, 341, 1070,
+ 2410, 1824, 1878, 1074, 2997, 2997, 629, 461, 16, 17,
+ 378, 2069, 1888, 2828, 284, 1891, 1892, 2247, 2248, 629,
+ 363, 80, 3485, 3486, 3693, 2069, 600, 1938, 3152, 16,
+ 17, 129, 274, 4317, 2337, 615, 16, 17, 2392, 370,
+ 183, 538, 355, 1179, 242, 16, 17, 3217, 341, 631,
+ 1753, 631, 2567, 31, 1755, 1191, 2313, 268, 2573, 358,
+ 308, 372, 230, 467, 375, 631, 82, 3191, 565, 2240,
+ 363, 358, 637, 637, 16, 17, 1743, 623, 631, 2250,
+ 373, 483, 341, 1322, 630, 1788, 254, 372, 6, 386,
+ 375, 414, 1228, 660, 507, 16, 17, 1233, 4287, 4288,
+ 16, 17, 1238, 52, 373, 2408, 84, 520, 3947, 1812,
+ 1813, 1247, 405, 4313, 63, 1816, 2430, 407, 4013, 467,
+ 2408, 3282, 244, 372, 810, 372, 375, 190, 375, 233,
+ 189, 372, 1799, 467, 375, 372, 3804, 354, 375, 57,
+ 540, 16, 17, 1845, 629, 267, 16, 17, 797, 1285,
+ 3906, 3907, 16, 17, 111, 467, 476, 485, 317, 371,
+ 453, 1297, 373, 1299, 2075, 3777, 1302, 1238, 16, 17,
+ 440, 230, 2737, 3374, 576, 2086, 4471, 155, 1314, 16,
+ 17, 12, 475, 1303, 192, 460, 1322, 484, 372, 558,
+ 534, 375, 16, 17, 2497, 254, 3612, 1333, 1334, 612,
+ 16, 17, 515, 104, 308, 574, 222, 467, 224, 2497,
+ 372, 168, 372, 375, 277, 375, 618, 251, 3238, 16,
+ 17, 1357, 420, 516, 1360, 629, 432, 145, 1467, 263,
+ 472, 448, 1368, 0, 615, 467, 467, 253, 195, 3259,
+ 530, 890, 585, 342, 1380, 1381, 1382, 1383, 1384, 1385,
+ 631, 355, 2889, 2567, 1390, 1375, 3969, 130, 475, 2573,
+ 1396, 1397, 630, 1399, 563, 555, 1402, 1380, 1381, 1382,
+ 12, 1384, 372, 16, 17, 375, 563, 375, 268, 572,
+ 157, 629, 372, 2920, 1397, 375, 1422, 600, 12, 1402,
+ 2881, 400, 585, 4006, 2931, 629, 3334, 2934, 561, 633,
+ 506, 16, 17, 125, 615, 427, 372, 16, 17, 375,
+ 141, 604, 1383, 606, 1385, 202, 394, 629, 161, 517,
+ 631, 125, 585, 372, 128, 274, 375, 539, 192, 372,
+ 615, 1467, 375, 234, 606, 605, 2819, 630, 631, 2564,
+ 161, 634, 635, 2980, 403, 1481, 631, 125, 1484, 1485,
+ 251, 1422, 372, 1473, 3478, 375, 205, 2948, 2873, 631,
+ 3852, 572, 263, 185, 372, 534, 615, 375, 615, 629,
+ 269, 16, 17, 272, 615, 16, 17, 125, 615, 274,
+ 1516, 185, 631, 373, 631, 372, 82, 274, 375, 3805,
+ 631, 213, 372, 511, 631, 375, 168, 629, 629, 141,
+ 1536, 372, 1538, 1539, 375, 1541, 1542, 185, 12, 213,
+ 1481, 515, 285, 491, 1485, 16, 17, 141, 1554, 453,
+ 1556, 12, 400, 129, 2612, 1538, 1539, 3628, 16, 17,
+ 372, 615, 2708, 375, 352, 213, 637, 185, 82, 39,
+ 341, 540, 12, 551, 422, 3569, 46, 631, 405, 16,
+ 17, 372, 96, 615, 375, 615, 372, 138, 2761, 375,
+ 282, 356, 4074, 2244, 1113, 213, 41, 566, 222, 631,
+ 224, 631, 153, 2761, 342, 593, 454, 364, 282, 82,
+ 16, 17, 2997, 3851, 16, 17, 4098, 4099, 16, 17,
+ 16, 17, 4248, 4249, 16, 17, 600, 372, 17, 417,
+ 375, 419, 372, 225, 282, 375, 16, 17, 372, 1645,
+ 1646, 375, 16, 17, 1163, 615, 415, 1756, 1167, 2430,
+ 89, 2342, 2343, 2344, 372, 615, 222, 375, 224, 2754,
+ 629, 631, 510, 2136, 282, 372, 358, 141, 375, 108,
+ 2143, 631, 16, 17, 3574, 561, 235, 3577, 372, 615,
+ 141, 375, 453, 2156, 358, 244, 372, 253, 205, 375,
+ 135, 16, 17, 16, 17, 631, 615, 1703, 3133, 585,
+ 205, 141, 615, 629, 210, 372, 534, 534, 375, 629,
+ 358, 637, 631, 16, 17, 472, 2189, 637, 631, 537,
+ 530, 16, 17, 3500, 534, 615, 3735, 3736, 205, 556,
+ 3630, 543, 3510, 230, 16, 17, 3421, 615, 125, 1745,
+ 358, 631, 256, 1005, 1006, 516, 251, 1753, 254, 1755,
+ 1756, 4015, 630, 4017, 585, 16, 17, 4207, 615, 372,
+ 233, 1767, 375, 1769, 230, 615, 230, 16, 17, 1775,
+ 1776, 598, 1778, 630, 615, 16, 17, 2350, 3556, 585,
+ 630, 585, 1788, 1045, 2257, 1791, 2567, 372, 598, 1795,
+ 375, 225, 2573, 372, 16, 17, 375, 530, 185, 630,
+ 631, 534, 540, 615, 2899, 497, 1812, 1813, 1814, 1815,
+ 1816, 16, 17, 2997, 328, 16, 17, 367, 1824, 378,
+ 1810, 1827, 1828, 1829, 615, 631, 159, 631, 566, 615,
+ 2377, 637, 510, 637, 1775, 1776, 514, 1778, 1844, 630,
+ 354, 16, 17, 592, 630, 192, 595, 1853, 289, 290,
+ 1791, 16, 17, 47, 1795, 16, 17, 372, 1848, 735,
+ 375, 372, 530, 634, 375, 178, 534, 590, 373, 241,
+ 615, 563, 125, 1814, 1815, 615, 349, 16, 17, 755,
+ 475, 615, 355, 2773, 1890, 630, 1827, 1828, 1829, 563,
+ 630, 58, 768, 769, 606, 282, 1902, 615, 467, 285,
+ 233, 372, 416, 1909, 375, 2477, 475, 2814, 615, 123,
+ 16, 17, 630, 630, 372, 563, 2823, 375, 351, 352,
+ 635, 615, 2469, 630, 3204, 3833, 3834, 3835, 637, 615,
+ 598, 2814, 185, 1923, 3034, 372, 630, 369, 375, 579,
+ 2823, 505, 1932, 1933, 630, 563, 2493, 2494, 615, 1890,
+ 629, 424, 189, 1943, 1944, 1945, 1946, 6, 1948, 1949,
+ 213, 3955, 631, 630, 3064, 3065, 372, 11, 1909, 375,
+ 372, 358, 441, 375, 372, 2084, 372, 375, 629, 375,
+ 372, 2090, 630, 375, 629, 3085, 3159, 16, 17, 430,
+ 431, 505, 372, 16, 17, 375, 580, 581, 372, 583,
+ 2006, 375, 615, 629, 16, 17, 629, 221, 175, 3362,
+ 629, 125, 179, 629, 3362, 2021, 540, 630, 629, 2128,
+ 589, 590, 355, 190, 16, 17, 629, 192, 372, 282,
+ 615, 375, 2141, 630, 631, 3787, 615, 637, 351, 352,
+ 629, 25, 515, 3216, 357, 630, 629, 372, 629, 372,
+ 375, 630, 375, 192, 59, 60, 2046, 2047, 3216, 2049,
+ 629, 2051, 2052, 2053, 2054, 2055, 71, 629, 2058, 372,
+ 2060, 185, 375, 629, 16, 17, 3249, 372, 2084, 2825,
+ 375, 2774, 16, 17, 2090, 19, 2092, 17, 629, 2095,
+ 372, 3249, 4086, 375, 629, 568, 2102, 2103, 2104, 2105,
+ 615, 629, 2108, 629, 615, 358, 320, 16, 17, 530,
+ 324, 372, 2095, 534, 375, 630, 629, 331, 515, 630,
+ 630, 631, 2128, 372, 2233, 629, 375, 600, 630, 631,
+ 629, 372, 3811, 3812, 375, 2141, 16, 17, 629, 19,
+ 342, 3949, 630, 631, 615, 630, 631, 16, 17, 316,
+ 372, 630, 631, 375, 3906, 3907, 2265, 615, 125, 630,
+ 581, 2102, 2103, 2104, 4072, 172, 3984, 372, 282, 629,
+ 375, 372, 630, 629, 375, 159, 563, 2714, 615, 16,
+ 17, 629, 515, 2756, 3992, 3993, 16, 17, 3996, 3997,
+ 3998, 3999, 585, 630, 629, 3233, 3234, 372, 412, 629,
+ 375, 630, 631, 629, 2777, 2778, 2779, 372, 3985, 615,
+ 375, 372, 142, 615, 375, 629, 2997, 615, 185, 615,
+ 3320, 630, 631, 615, 630, 630, 631, 2233, 630, 363,
+ 2703, 2804, 630, 372, 630, 615, 375, 17, 630, 25,
+ 404, 615, 630, 631, 358, 558, 213, 414, 203, 233,
+ 630, 465, 2258, 16, 17, 370, 630, 3718, 3719, 2265,
+ 629, 574, 2371, 629, 2373, 2374, 372, 600, 629, 375,
+ 342, 615, 629, 2279, 524, 525, 3449, 629, 528, 529,
+ 629, 3960, 532, 629, 534, 3964, 630, 629, 4096, 4097,
+ 615, 3449, 615, 630, 631, 629, 82, 4105, 631, 12,
+ 4052, 4053, 3360, 630, 631, 630, 2312, 630, 2417, 2418,
+ 563, 629, 615, 467, 144, 282, 32, 629, 155, 629,
+ 615, 630, 631, 4100, 308, 59, 60, 630, 4013, 630,
+ 631, 2337, 456, 615, 111, 630, 593, 594, 540, 596,
+ 629, 598, 629, 372, 2350, 1776, 375, 1778, 630, 372,
+ 305, 306, 375, 629, 615, 310, 311, 2363, 125, 2365,
+ 372, 128, 142, 375, 566, 2371, 615, 2373, 2374, 630,
+ 629, 355, 363, 2363, 615, 2381, 456, 2383, 2384, 2488,
+ 372, 630, 104, 375, 629, 82, 25, 629, 602, 630,
+ 176, 358, 530, 615, 4146, 629, 1827, 1828, 1829, 629,
+ 330, 629, 2408, 617, 629, 3500, 629, 531, 630, 4161,
+ 615, 2417, 2418, 537, 615, 3401, 151, 152, 185, 630,
+ 631, 629, 4174, 630, 631, 630, 142, 629, 141, 630,
+ 372, 80, 629, 375, 629, 589, 590, 629, 372, 216,
+ 615, 375, 629, 82, 4123, 4124, 213, 233, 629, 563,
+ 615, 2457, 630, 631, 615, 630, 2462, 581, 11, 630,
+ 631, 2467, 159, 372, 363, 2471, 375, 2473, 540, 630,
+ 629, 4465, 630, 631, 598, 629, 615, 2483, 629, 2485,
+ 2486, 629, 2488, 2458, 4236, 2475, 2476, 630, 631, 2495,
+ 631, 2497, 372, 2468, 566, 375, 4248, 4249, 629, 2474,
+ 629, 2507, 215, 372, 630, 631, 375, 630, 631, 615,
+ 2516, 2501, 234, 630, 631, 282, 629, 2523, 2524, 629,
+ 159, 2496, 308, 2529, 630, 630, 631, 2502, 244, 251,
+ 2536, 515, 3183, 2508, 2509, 372, 233, 176, 375, 2529,
+ 189, 263, 372, 629, 4296, 375, 630, 631, 478, 479,
+ 330, 267, 630, 631, 4306, 630, 631, 629, 111, 630,
+ 631, 630, 631, 349, 630, 631, 2507, 817, 629, 355,
+ 630, 631, 55, 2563, 12, 629, 129, 630, 631, 4397,
+ 226, 230, 65, 630, 631, 491, 615, 629, 2594, 2595,
+ 3163, 358, 615, 629, 233, 629, 563, 4349, 81, 4351,
+ 3073, 630, 379, 615, 42, 254, 49, 630, 12, 4361,
+ 93, 94, 95, 390, 330, 168, 600, 630, 630, 341,
+ 397, 630, 631, 615, 3532, 3533, 109, 629, 4380, 629,
+ 4382, 629, 4384, 629, 543, 351, 352, 3545, 630, 4391,
+ 3113, 363, 195, 279, 3552, 125, 49, 631, 630, 631,
+ 4402, 631, 349, 2594, 4472, 630, 631, 3271, 355, 97,
+ 3274, 3275, 630, 631, 102, 363, 4418, 4419, 363, 308,
+ 3578, 3579, 26, 615, 543, 3657, 3658, 3291, 630, 631,
+ 461, 615, 4434, 4435, 63, 630, 631, 4439, 630, 624,
+ 620, 621, 622, 623, 624, 625, 626, 627, 478, 479,
+ 167, 80, 630, 631, 572, 185, 615, 630, 631, 475,
+ 349, 427, 489, 92, 629, 3842, 355, 71, 2724, 630,
+ 631, 2727, 2728, 2729, 2730, 278, 268, 424, 82, 515,
+ 2736, 453, 190, 213, 530, 615, 511, 141, 3358, 3359,
+ 389, 167, 222, 511, 224, 142, 615, 630, 631, 2755,
+ 2756, 630, 631, 279, 403, 2761, 630, 631, 630, 631,
+ 630, 631, 478, 479, 1164, 1165, 4053, 158, 2774, 3755,
+ 3384, 2777, 2778, 2779, 128, 3761, 492, 91, 615, 3169,
+ 3170, 3126, 3127, 631, 2790, 615, 499, 500, 365, 502,
+ 2796, 504, 2798, 2902, 516, 2736, 563, 104, 2804, 3371,
+ 2790, 526, 282, 516, 581, 3342, 3430, 3431, 246, 3982,
+ 189, 215, 630, 2819, 600, 194, 157, 128, 515, 1084,
+ 1085, 1086, 114, 636, 3982, 6, 629, 4, 113, 466,
+ 244, 631, 389, 598, 104, 56, 319, 1102, 142, 433,
+ 620, 621, 622, 623, 624, 625, 626, 627, 172, 114,
+ 223, 230, 405, 631, 337, 631, 142, 71, 637, 12,
+ 603, 630, 540, 141, 9, 637, 630, 34, 222, 1134,
+ 224, 568, 1137, 631, 630, 254, 515, 2883, 358, 317,
+ 2886, 2887, 630, 2889, 637, 629, 3506, 267, 637, 631,
+ 3985, 1156, 1157, 60, 279, 1160, 2902, 159, 19, 2905,
+ 254, 279, 279, 600, 620, 621, 622, 623, 624, 625,
+ 626, 627, 636, 2903, 2920, 1180, 1181, 279, 49, 279,
+ 473, 2911, 279, 19, 631, 2931, 530, 234, 2934, 629,
+ 26, 274, 631, 330, 631, 388, 551, 631, 631, 142,
+ 551, 12, 631, 381, 251, 161, 631, 631, 115, 4236,
+ 2956, 118, 505, 2959, 631, 244, 263, 624, 2964, 126,
+ 528, 600, 245, 180, 234, 190, 631, 577, 2974, 631,
+ 488, 392, 2978, 137, 2980, 71, 143, 363, 531, 631,
+ 463, 251, 630, 104, 631, 161, 82, 161, 161, 2995,
+ 161, 2974, 631, 263, 579, 161, 161, 351, 352, 161,
+ 161, 161, 161, 357, 3010, 4100, 161, 161, 63, 363,
+ 389, 3017, 3002, 4186, 161, 161, 195, 161, 2959, 161,
+ 161, 161, 631, 3029, 403, 80, 330, 610, 4186, 584,
+ 363, 363, 128, 363, 341, 518, 157, 92, 631, 630,
+ 161, 3732, 3733, 3734, 330, 598, 630, 4033, 630, 403,
+ 630, 630, 624, 536, 192, 493, 363, 3947, 192, 630,
+ 630, 630, 4349, 3172, 4351, 631, 629, 188, 630, 190,
+ 630, 341, 623, 631, 630, 242, 3017, 3766, 630, 3188,
+ 630, 478, 479, 563, 205, 631, 630, 630, 572, 527,
+ 211, 630, 476, 4380, 629, 499, 500, 501, 502, 503,
+ 504, 3107, 198, 627, 629, 226, 629, 3727, 3728, 3115,
+ 3730, 3731, 516, 234, 630, 494, 631, 471, 551, 604,
+ 241, 232, 3694, 629, 522, 3115, 222, 330, 224, 11,
+ 251, 4418, 4419, 3139, 189, 203, 192, 637, 4265, 194,
+ 192, 630, 263, 3680, 170, 457, 453, 268, 475, 413,
+ 631, 190, 631, 3159, 3160, 47, 277, 3163, 254, 339,
+ 505, 505, 80, 82, 466, 505, 3172, 505, 505, 389,
+ 389, 90, 3178, 137, 389, 230, 343, 551, 252, 531,
+ 252, 531, 3188, 453, 137, 389, 47, 389, 387, 389,
+ 3196, 389, 478, 479, 573, 114, 389, 436, 3790, 254,
+ 629, 629, 278, 579, 3893, 629, 637, 630, 155, 516,
+ 3216, 630, 240, 585, 630, 142, 240, 637, 630, 573,
+ 341, 630, 3228, 620, 621, 622, 623, 624, 625, 626,
+ 627, 630, 3238, 551, 3240, 637, 637, 637, 4365, 631,
+ 159, 630, 363, 3249, 637, 551, 516, 630, 111, 3255,
+ 637, 3257, 373, 3259, 551, 351, 352, 274, 540, 4432,
+ 631, 357, 611, 88, 47, 3374, 629, 363, 629, 26,
+ 27, 3846, 161, 629, 4432, 478, 479, 551, 629, 370,
+ 161, 192, 4455, 192, 405, 192, 16, 17, 192, 4462,
+ 4276, 4277, 241, 4279, 248, 4468, 1561, 4455, 637, 170,
+ 358, 637, 59, 60, 4462, 62, 631, 403, 251, 251,
+ 4468, 230, 376, 321, 71, 114, 483, 244, 622, 623,
+ 624, 625, 626, 627, 114, 82, 3332, 161, 162, 254,
+ 254, 194, 453, 90, 637, 3325, 622, 623, 624, 625,
+ 626, 627, 4328, 551, 4330, 4331, 369, 205, 403, 629,
+ 629, 3357, 3358, 3359, 475, 3464, 3362, 114, 3348, 161,
+ 450, 629, 196, 373, 389, 540, 637, 230, 3374, 624,
+ 629, 128, 629, 207, 131, 471, 242, 242, 630, 630,
+ 547, 183, 1647, 630, 630, 630, 1651, 637, 307, 119,
+ 120, 121, 122, 123, 196, 516, 630, 630, 630, 606,
+ 624, 629, 159, 330, 60, 207, 325, 4393, 1673, 576,
+ 226, 363, 630, 247, 269, 278, 4063, 389, 621, 622,
+ 623, 624, 625, 626, 627, 259, 4001, 637, 336, 630,
+ 349, 192, 244, 85, 631, 87, 631, 265, 3444, 494,
+ 71, 578, 251, 3449, 251, 3554, 4430, 363, 631, 254,
+ 254, 572, 286, 631, 82, 257, 401, 259, 3464, 115,
+ 629, 631, 118, 584, 585, 222, 629, 224, 363, 363,
+ 126, 36, 630, 230, 631, 19, 128, 573, 630, 629,
+ 631, 238, 491, 604, 286, 606, 363, 143, 218, 219,
+ 220, 221, 47, 363, 467, 630, 253, 149, 268, 4036,
+ 3506, 629, 629, 629, 629, 47, 630, 469, 630, 630,
+ 631, 345, 4146, 634, 635, 4087, 418, 3523, 573, 3628,
+ 606, 203, 6, 148, 261, 630, 630, 4161, 4065, 13,
+ 186, 15, 184, 631, 205, 629, 477, 36, 251, 251,
+ 4174, 3516, 26, 27, 629, 111, 348, 631, 3554, 629,
+ 307, 478, 479, 118, 128, 128, 629, 399, 637, 86,
+ 125, 144, 485, 630, 462, 3555, 631, 630, 325, 491,
+ 630, 630, 19, 57, 3580, 34, 630, 630, 62, 63,
+ 630, 3587, 630, 34, 358, 69, 242, 3696, 60, 242,
+ 320, 327, 322, 323, 324, 630, 515, 630, 82, 3605,
+ 402, 331, 168, 630, 3594, 256, 90, 413, 630, 277,
+ 473, 370, 531, 178, 606, 241, 100, 629, 631, 118,
+ 185, 637, 3628, 380, 630, 382, 125, 47, 631, 195,
+ 114, 494, 211, 390, 327, 540, 418, 540, 629, 12,
+ 13, 585, 372, 629, 128, 375, 585, 131, 213, 214,
+ 629, 629, 629, 82, 138, 139, 630, 304, 629, 595,
+ 595, 145, 4296, 142, 230, 14, 4313, 96, 531, 153,
+ 629, 534, 4306, 157, 537, 159, 128, 578, 254, 178,
+ 19, 357, 412, 254, 340, 631, 185, 343, 34, 629,
+ 3696, 457, 630, 620, 621, 622, 623, 624, 625, 626,
+ 627, 458, 170, 358, 188, 631, 327, 136, 3714, 174,
+ 573, 17, 278, 540, 213, 214, 540, 282, 581, 540,
+ 254, 3727, 3728, 534, 3730, 3731, 585, 4361, 585, 381,
+ 103, 630, 629, 589, 464, 465, 241, 630, 222, 363,
+ 224, 353, 590, 3852, 228, 509, 230, 4322, 4382, 450,
+ 4384, 358, 606, 170, 238, 630, 138, 4391, 515, 132,
+ 13, 370, 631, 578, 420, 244, 521, 629, 4402, 253,
+ 156, 3777, 145, 425, 531, 190, 4423, 342, 535, 629,
+ 629, 603, 629, 282, 31, 638, 630, 3777, 4325, 190,
+ 3796, 3797, 357, 358, 630, 168, 384, 554, 171, 630,
+ 4434, 4435, 3808, 61, 542, 4439, 137, 137, 159, 182,
+ 4457, 629, 405, 73, 603, 572, 426, 192, 31, 63,
+ 370, 63, 630, 307, 522, 270, 47, 256, 631, 629,
+ 203, 47, 629, 629, 400, 3841, 5, 363, 3844, 405,
+ 363, 325, 630, 342, 241, 329, 3852, 12, 13, 635,
+ 103, 330, 155, 370, 353, 370, 3797, 230, 357, 358,
+ 136, 144, 4399, 47, 237, 522, 629, 47, 154, 47,
+ 578, 132, 602, 155, 631, 603, 3882, 225, 284, 132,
+ 638, 635, 127, 150, 368, 615, 616, 617, 457, 373,
+ 629, 547, 145, 47, 47, 47, 380, 3903, 382, 328,
+ 3841, 630, 3908, 53, 277, 389, 390, 473, 635, 223,
+ 459, 631, 630, 254, 155, 168, 543, 631, 171, 208,
+ 576, 631, 351, 352, 635, 354, 47, 630, 630, 182,
+ 53, 631, 4469, 440, 190, 190, 190, 421, 103, 226,
+ 543, 605, 128, 629, 358, 475, 631, 3913, 191, 3334,
+ 203, 435, 436, 437, 438, 2272, 3335, 2446, 3948, 2062,
+ 3603, 658, 3940, 4066, 4255, 531, 1002, 132, 4256, 3601,
+ 3605, 537, 4457, 4410, 458, 540, 3982, 230, 3795, 544,
+ 145, 46, 547, 578, 237, 2774, 3787, 416, 1823, 4420,
+ 556, 4293, 4101, 558, 4139, 4293, 3787, 4249, 563, 478,
+ 479, 566, 3787, 168, 4165, 3787, 171, 3787, 3787, 4015,
+ 3787, 4017, 3787, 4019, 3787, 581, 4164, 182, 675, 3787,
+ 3787, 3787, 3787, 680, 277, 1043, 1476, 1747, 3945, 1478,
+ 2020, 515, 598, 406, 1486, 2929, 2750, 410, 203, 4045,
+ 3443, 540, 3139, 1319, 2755, 544, 3446, 531, 547, 4091,
+ 4190, 535, 4365, 426, 3842, 4273, 4322, 622, 623, 558,
+ 717, 434, 4001, 1531, 563, 230, 3610, 566, 4074, 442,
+ 554, 517, 237, 2013, 2595, 559, 505, 734, 3003, 3259,
+ 2021, 3247, 2526, 4340, 4074, 4091, 3238, 4036, 572, 3055,
+ 3282, 3316, 3753, 3565, 467, 4101, 4087, 3554, 4207, 3188,
+ 11, 4107, 4023, 11, 4094, 4095, 4123, 480, 481, 4124,
+ 1545, 3951, 277, 3960, 3964, 2100, 3808, 3761, 775, 776,
+ 777, 778, 2020, 622, 623, 3240, 971, 631, 2519, 3520,
+ 787, 1436, 2332, 3239, 1814, 1897, 2305, 34, 1485, 1527,
+ 2736, 620, 621, 622, 623, 624, 625, 626, 627, 3134,
+ 2354, 635, 525, 406, 3115, 2223, 3789, 599, 911, 1834,
+ 2132, 2135, 4271, 1129, 3206, 2714, 2409, 2222, 3867, 4222,
+ 67, 3721, 4223, 426, 3332, 2251, 3249, 1452, 2819, 3715,
+ 4186, 434, 1102, 556, 119, 120, 121, 122, 123, 442,
+ 3696, 2515, 4399, 2359, 1302, 2105, 2336, 2299, 1334, 3449,
+ 3154, 4207, 3153, 1886, 3216, 578, 4186, 580, 4198, 4199,
+ 589, 868, 1554, 671, 467, 577, 4222, 4223, 1887, 1766,
+ 1388, 3257, 1416, 1340, 4315, 3137, 4214, 480, 481, 4363,
+ 4462, 4283, 4468, 3556, 1839, 3159, 1368, 3196, 135, 2806,
+ 3475, 406, 3704, 1358, 569, 410, 1795, 893, 1294, 3831,
+ 3837, 570, 1536, 898, 513, 658, 2724, -1, 658, 658,
+ -1, 426, 159, 513, -1, 4271, 163, -1, -1, 434,
+ -1, -1, 525, -1, -1, -1, -1, 442, -1, -1,
+ -1, -1, -1, 218, 219, 220, 221, -1, -1, -1,
+ -1, -1, 4298, -1, -1, -1, -1, -1, -1, 4305,
+ 197, -1, 467, 556, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, 480, 481, -1, -1, -1,
- -1, -1, -1, -1, -1, 103, -1, -1, -1, -1,
- -1, -1, 197, -1, -1, 582, -1, -1, -1, -1,
- -1, -1, -1, -1, 4441, -1, -1, -1, -1, -1,
- -1, -1, 217, -1, 132, -1, -1, -1, -1, -1,
- 525, -1, -1, -1, -1, -1, 231, 145, -1, -1,
- -1, -1, -1, -1, -1, 4371, -1, -1, -1, -1,
- 4376, -1, -1, -1, -1, -1, -1, 430, 431, -1,
- 168, 556, -1, 171, -1, -1, -1, -1, -1, 1024,
- -1, -1, -1, -1, 182, -1, -1, -1, -1, -1,
- -1, -1, -1, 578, 279, 580, -1, 4413, -1, -1,
- -1, -1, -1, -1, -1, 203, 4422, -1, -1, -1,
- -1, -1, -1, -1, 4327, -1, 301, -1, -1, -1,
- -1, -1, -1, -1, -1, 4441, -1, -1, -1, 4445,
- -1, 4447, 230, -1, 1079, 1080, 4452, -1, -1, 237,
- -1, -1, 4458, 1088, 1089, 1090, 1091, 1092, 1093, 1094,
- 1095, 1096, 1097, 1098, 1099, 1100, -1, -1, 119, 120,
- 121, 122, 123, 1108, 1109, -1, 1111, -1, 1113, -1,
- -1, -1, 1117, -1, -1, 1120, 1121, 1122, 1123, 277,
- 1125, 1126, 1127, -1, -1, -1, -1, -1, -1, 1134,
- 1135, -1, 1137, 1138, 1139, 1140, 1141, 12, 13, 1144,
- 1145, 1146, 1147, 1148, 1149, 1150, 1151, 1152, 1153, 1154,
- -1, -1, 1157, 1158, -1, -1, 1161, -1, -1, 404,
- 1165, -1, 1167, 1168, -1, -1, -1, -1, 413, -1,
- -1, -1, -1, -1, -1, -1, 1181, 1182, -1, -1,
- -1, -1, -1, 428, 1189, -1, -1, -1, -1, -1,
- -1, 1196, 1197, 1198, -1, 1200, -1, 218, 219, 220,
- 221, 446, 1207, 1208, 1209, -1, 1211, 1212, 1213, 1214,
- 1215, -1, 1217, 1218, 1219, 1220, 1221, 1222, 1223, 1224,
- -1, -1, -1, 1228, 1229, -1, 33, 34, 103, -1,
- -1, -1, 39, -1, 41, -1, 43, 44, -1, -1,
- 485, 486, -1, -1, -1, -1, -1, -1, 406, -1,
- -1, -1, 410, 60, -1, -1, -1, 132, -1, -1,
- -1, -1, -1, -1, -1, -1, 511, -1, 426, -1,
- 145, -1, -1, -1, -1, -1, 434, -1, -1, -1,
- -1, -1, -1, -1, 442, -1, -1, -1, 533, -1,
- -1, -1, -1, 168, -1, -1, 171, -1, -1, 320,
- 1305, 322, 323, 324, -1, -1, -1, 182, 115, 467,
- 331, 118, -1, -1, -1, -1, -1, -1, -1, 126,
- -1, -1, 480, 481, -1, -1, -1, -1, 203, -1,
- -1, -1, -1, -1, -1, -1, 143, 582, -1, -1,
- -1, -1, -1, -1, 26, 27, -1, -1, -1, -1,
- 680, -1, -1, 160, -1, 230, -1, -1, -1, -1,
- 1365, -1, 237, -1, -1, -1, -1, 525, 1373, -1,
- -1, -1, -1, -1, -1, -1, -1, 184, -1, 186,
- 62, -1, -1, -1, -1, -1, -1, 717, -1, -1,
- -1, 412, 199, 200, -1, -1, -1, -1, 556, -1,
- 82, -1, 277, -1, 734, -1, -1, -1, 90, -1,
+ 217, -1, -1, -1, -1, 578, -1, 580, -1, -1,
+ -1, -1, -1, -1, 231, -1, -1, -1, -1, -1,
+ -1, -1, 4451, -1, -1, -1, -1, 4337, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 578, -1, 580, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 114, -1, -1, 242, -1, -1, -1, -1,
- -1, -1, -1, 464, 465, -1, 128, -1, 778, 131,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 271, -1, -1, -1, -1, -1,
- 1475, -1, -1, 280, 281, -1, 283, 159, -1, -1,
+ 525, -1, -1, -1, -1, -1, -1, 1024, -1, -1,
+ -1, -1, -1, -1, -1, 4381, -1, -1, -1, -1,
+ 4386, -1, 279, -1, -1, 320, -1, 322, 323, 324,
+ -1, 556, -1, -1, -1, -1, 331, -1, -1, -1,
+ -1, -1, -1, -1, 301, -1, -1, -1, -1, -1,
+ -1, -1, -1, 578, -1, 580, -1, 4423, -1, -1,
+ -1, -1, -1, 1080, 1081, -1, 4432, -1, -1, -1,
+ -1, -1, 1089, 1090, 1091, 1092, 1093, 1094, 1095, 1096,
+ 1097, 1098, 1099, 1100, 1101, 4451, -1, -1, -1, 4455,
+ -1, 4457, 1109, 1110, -1, 1112, 4462, 1114, -1, -1,
+ -1, 1118, 4468, -1, 1121, 1122, 1123, 1124, -1, 1126,
+ 1127, 1128, -1, -1, -1, -1, -1, 412, 1135, 1136,
+ -1, 1138, 1139, 1140, 1141, 1142, -1, -1, 1145, 1146,
+ 1147, 1148, 1149, 1150, 1151, 1152, 1153, 1154, 1155, -1,
+ -1, 1158, 1159, -1, -1, 1162, -1, 404, -1, 1166,
+ -1, 1168, 1169, -1, -1, -1, 413, -1, -1, -1,
+ -1, -1, -1, -1, -1, 1182, 1183, -1, -1, 464,
+ 465, 428, 227, 1190, -1, -1, -1, -1, -1, -1,
+ 1197, 1198, 1199, -1, 1201, -1, -1, -1, -1, 446,
+ -1, 1208, 1209, 1210, -1, 1212, 1213, 1214, 1215, 1216,
+ -1, 1218, 1219, 1220, 1221, 1222, 1223, 1224, 1225, -1,
+ -1, -1, 1229, 1230, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 485, 486,
+ -1, -1, 287, 288, 289, 290, 291, 292, -1, 294,
+ 295, 296, 297, 298, 299, 300, -1, 302, 303, -1,
+ -1, 24, -1, -1, 511, -1, -1, -1, -1, -1,
+ -1, 34, 35, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 530, -1, -1, 533, 534, -1, -1,
+ -1, -1, -1, -1, -1, -1, 59, 60, -1, 1306,
+ -1, -1, -1, -1, 67, -1, -1, -1, -1, 72,
+ -1, -1, -1, -1, -1, -1, -1, 602, -1, -1,
+ -1, -1, -1, -1, -1, 680, -1, -1, -1, -1,
+ -1, 616, 617, -1, -1, 582, 99, -1, 101, -1,
+ 103, -1, -1, -1, -1, -1, -1, -1, -1, 112,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 1368, 717, -1, -1, -1, -1, -1, -1, 1376,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 734,
+ -1, -1, -1, -1, -1, 430, 431, -1, -1, -1,
+ -1, -1, -1, -1, -1, 158, 159, -1, -1, -1,
+ -1, 164, -1, -1, 167, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 313, 314, 315, -1,
+ -1, -1, -1, 778, -1, -1, -1, -1, -1, -1,
+ 193, -1, 195, 13, -1, 15, -1, -1, -1, 202,
+ -1, 204, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 31, -1, -1, -1, 35, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 229, 230, 231, 49,
+ 50, 1478, -1, -1, -1, -1, -1, 57, -1, -1,
+ -1, -1, 62, 63, -1, -1, -1, -1, -1, 252,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 332, 333, 334, -1, -1,
- -1, 406, -1, 340, -1, 410, 343, -1, 868, -1,
- 222, -1, 224, -1, -1, -1, -1, -1, 230, -1,
- -1, 426, 359, 360, -1, -1, 238, -1, 1563, 434,
- -1, -1, -1, -1, -1, -1, -1, 442, -1, -1,
- -1, 253, -1, -1, -1, -1, -1, -1, -1, 6,
- -1, 602, -1, -1, -1, -1, 13, -1, 395, 396,
- -1, -1, 467, -1, -1, 616, 617, -1, -1, 26,
- 27, -1, -1, -1, -1, 480, 481, -1, -1, -1,
- -1, -1, -1, 420, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 307, -1, -1, -1, -1,
- 57, -1, -1, -1, -1, 62, -1, -1, -1, -1,
- -1, -1, -1, 325, -1, -1, -1, -1, -1, -1,
- 525, -1, -1, -1, -1, 82, -1, -1, -1, -1,
- -1, -1, -1, 90, 471, -1, -1, -1, 475, -1,
- 1675, 1676, 1677, 100, -1, -1, -1, -1, -1, -1,
- 487, 556, -1, -1, 1689, -1, -1, 114, -1, -1,
- -1, -1, -1, -1, 1024, -1, -1, -1, 380, -1,
- 382, 128, -1, 578, 131, 580, -1, -1, 390, -1,
- 1715, 138, -1, -1, -1, -1, 1721, -1, 145, 1724,
- -1, 1726, -1, -1, -1, -1, 153, 1732, -1, 1734,
- 1735, -1, 159, -1, 541, -1, -1, 544, -1, -1,
- 547, 548, 549, 550, -1, -1, -1, -1, -1, 1079,
- 1080, -1, -1, 26, 27, -1, -1, -1, 1088, 1089,
- -1, 188, 1092, 1093, 1094, 1095, 1096, 1097, 1098, 1099,
- 1100, -1, -1, -1, -1, -1, 458, -1, 1108, 1109,
- -1, 1111, -1, 1113, 591, 592, 59, 60, -1, 62,
- 1120, 1121, 1122, 1123, -1, 222, 1126, 224, 71, -1,
- 1805, -1, -1, 230, 1134, 1135, -1, 1137, 1138, 82,
- 617, 238, -1, -1, 1144, 1145, 1146, 90, -1, 1149,
- 1150, 1151, 1152, 1153, 1154, -1, 253, 1157, 1158, -1,
- -1, 1161, -1, 515, -1, 1165, -1, 1167, 1168, -1,
- -1, 114, -1, -1, -1, -1, -1, -1, -1, 531,
- -1, 1181, 1182, 535, -1, 128, -1, -1, 131, 1189,
- -1, -1, -1, -1, -1, -1, 1196, 1197, 1198, -1,
- -1, -1, 554, -1, -1, -1, -1, -1, -1, -1,
- 307, -1, -1, -1, -1, -1, 159, -1, -1, -1,
- 572, -1, -1, -1, -1, -1, -1, -1, 325, 1229,
- -1, -1, 329, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 84, -1, -1, -1, -1, -1,
+ -1, 274, -1, 868, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 103, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 301, -1,
+ -1, -1, -1, -1, 124, -1, -1, -1, -1, -1,
+ -1, -1, 132, 133, 134, -1, -1, -1, -1, -1,
+ 1567, -1, -1, -1, 144, 145, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 157, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 171, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 367, -1, -1, 187, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 203, -1, -1, -1, -1, 208, -1,
+ 393, -1, 212, -1, -1, -1, -1, -1, -1, -1,
+ -1, 404, 405, -1, -1, 408, 409, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 237, -1, 239,
+ -1, -1, -1, -1, -1, -1, 429, -1, -1, 1024,
+ -1, -1, 1679, 1680, 1681, 255, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 1693, -1, -1, -1,
+ -1, -1, -1, 273, -1, -1, -1, 277, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 472,
+ -1, -1, 1719, -1, -1, -1, -1, -1, 1725, -1,
+ -1, 1728, 485, 1730, -1, 1080, 1081, -1, -1, 1736,
+ -1, 1738, 1739, -1, 1089, 1090, -1, -1, 1093, 1094,
+ 1095, 1096, 1097, 1098, 1099, 1100, 1101, -1, 511, -1,
+ -1, -1, 515, -1, 1109, 1110, -1, 1112, -1, 1114,
+ -1, -1, -1, -1, -1, -1, 1121, 1122, 1123, 1124,
+ 533, 534, 1127, -1, -1, -1, -1, -1, -1, -1,
+ 1135, 1136, -1, 1138, 1139, -1, -1, -1, 368, -1,
+ 1145, 1146, 1147, -1, -1, 1150, 1151, 1152, 1153, 1154,
+ 1155, -1, 1809, 1158, 1159, 385, -1, 1162, -1, 389,
+ -1, 1166, -1, 1168, 1169, -1, -1, -1, -1, 582,
+ 400, -1, -1, -1, -1, -1, -1, 1182, 1183, -1,
+ 593, 411, -1, -1, -1, 1190, -1, -1, 601, -1,
+ -1, -1, 1197, 1198, 1199, 34, -1, -1, -1, -1,
+ -1, -1, -1, 433, -1, -1, 436, -1, 438, -1,
+ -1, 441, -1, -1, 444, 445, -1, -1, -1, -1,
+ -1, -1, 452, -1, 454, 1230, -1, -1, 67, -1,
+ -1, 461, -1, -1, -1, -1, -1, 467, -1, -1,
+ -1, -1, -1, -1, -1, 475, -1, -1, -1, -1,
+ 480, -1, 482, -1, -1, 485, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 373, -1, -1, 222,
- -1, 224, -1, 380, -1, 382, -1, 230, -1, -1,
- -1, -1, -1, 390, -1, 238, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 1305, -1, -1, -1, -1,
- 253, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 2008, -1, -1, -1, -1, -1, 436,
+ 510, -1, -1, -1, 514, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 135, -1, -1, -1,
+ -1, 1306, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 159, -1, -1, -1, 163, -1, -1, -1, -1, 559,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 458, -1, 2038, 307, 1365, -1, -1, -1, -1,
- -1, -1, -1, 1373, -1, -1, -1, -1, -1, -1,
- -1, -1, 325, -1, -1, -1, -1, -1, -1, -1,
+ -1, 571, -1, -1, -1, 575, -1, -1, 578, -1,
+ -1, -1, -1, -1, 584, -1, 2013, -1, 197, -1,
+ -1, -1, -1, 1368, -1, -1, -1, -1, -1, -1,
+ -1, 1376, -1, -1, -1, -1, -1, -1, 217, -1,
+ -1, -1, -1, 613, -1, -1, 2043, -1, -1, 619,
+ -1, -1, 231, -1, -1, -1, -1, -1, -1, 629,
+ -1, -1, 13, -1, 15, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 35, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 49, 50,
+ 279, 2098, -1, -1, -1, -1, 57, -1, -1, -1,
+ -1, 62, 63, -1, -1, -1, -1, 2114, -1, -1,
+ -1, 2118, 301, -1, -1, -1, 2123, 2124, -1, -1,
+ -1, -1, -1, 84, -1, 2132, 2133, -1, 2135, 2136,
+ 2137, 2138, -1, 2140, -1, -1, 2143, -1, -1, -1,
+ -1, -1, 103, -1, -1, -1, 2153, -1, 2155, 2156,
+ -1, 2158, 2159, 2160, 2161, -1, 2163, -1, -1, 2166,
+ -1, -1, -1, 124, -1, -1, -1, -1, 2175, -1,
+ -1, 132, 133, 134, -1, 2182, -1, 2184, -1, 2186,
+ 2187, 2188, 2189, 144, 145, -1, 2193, 2194, 2195, -1,
+ -1, -1, 2199, 2200, 2201, -1, 2203, -1, 2205, -1,
+ 2207, -1, 2209, -1, 2211, -1, -1, -1, -1, 2216,
+ 171, -1, 1567, -1, -1, 404, -1, -1, -1, -1,
+ -1, -1, -1, -1, 413, -1, 187, 2234, -1, -1,
+ -1, -1, -1, -1, 2241, -1, -1, 2244, -1, 428,
+ -1, -1, 203, 2250, -1, -1, 2253, 208, -1, -1,
+ 2257, 212, -1, -1, -1, -1, -1, 446, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 2091, -1, 515, -1,
+ -1, -1, -1, -1, -1, -1, 237, -1, 239, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 2107, -1, 531, -1, 2111, 380, 535, 382,
- -1, 2116, 2117, -1, -1, -1, -1, 390, -1, -1,
- 2125, 2126, -1, 2128, 2129, 2130, 2131, 554, 2133, -1,
- -1, 2136, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 2146, -1, 2148, 2149, 572, 2151, 2152, 2153, 2154,
- -1, 2156, -1, -1, 2159, -1, -1, -1, -1, -1,
- -1, -1, -1, 2168, -1, -1, -1, -1, -1, -1,
- 2175, -1, 2177, -1, 2179, 2180, 2181, 2182, -1, -1,
- -1, 2186, 2187, 2188, -1, 458, -1, 2192, 2193, 2194,
- -1, 2196, -1, 2198, -1, 2200, -1, 2202, -1, 2204,
- -1, -1, -1, -1, 2209, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 255, -1, 485, 486, -1, -1,
+ -1, -1, -1, -1, -1, -1, 2313, -1, -1, -1,
+ -1, -1, 273, 26, 27, -1, 277, -1, -1, -1,
+ -1, -1, 511, -1, 1679, 1680, 1681, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 2227, -1, -1, -1, -1, -1, -1, 2234,
- -1, -1, 2237, 1563, -1, -1, -1, -1, 2243, -1,
- -1, 2246, 515, -1, -1, 2250, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 531, -1,
- -1, -1, 535, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 533, -1, 59, 60, -1, 62,
+ -1, -1, -1, -1, -1, -1, -1, -1, 71, -1,
+ -1, -1, -1, -1, 1719, -1, -1, -1, -1, 82,
+ -1, -1, -1, 1728, -1, 1730, -1, 90, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 554, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 572,
- -1, 2306, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 582, -1, -1, -1, -1, -1, -1,
+ -1, 114, -1, -1, -1, -1, -1, 368, -1, -1,
+ -1, -1, -1, -1, -1, 128, -1, -1, 131, -1,
+ -1, -1, 2429, -1, 385, -1, -1, -1, 389, -1,
+ 26, 27, -1, -1, -1, -1, -1, -1, -1, 400,
+ 2447, 2448, -1, -1, -1, -1, 159, -1, -1, -1,
+ 411, -1, -1, -1, 1809, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 62, -1, -1, -1,
+ -1, -1, 433, -1, -1, 436, -1, 438, -1, -1,
+ 441, -1, -1, 444, 445, -1, 82, -1, -1, -1,
+ -1, 452, -1, 454, 90, -1, -1, -1, -1, -1,
+ 461, -1, -1, -1, -1, -1, 467, -1, -1, 222,
+ -1, 224, 2519, -1, 475, -1, -1, 230, 114, 480,
+ -1, 482, -1, -1, 485, 238, -1, -1, -1, -1,
+ -1, -1, 128, -1, -1, 131, -1, -1, -1, -1,
+ 253, -1, -1, -1, -1, -1, -1, -1, -1, 510,
+ -1, -1, -1, 514, 267, -1, -1, -1, 2565, 2566,
+ -1, -1, -1, 159, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 13, -1, 15, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 1675, 1676, 1677, 31, -1,
- -1, -1, 35, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 49, 50, -1, -1,
- -1, -1, -1, -1, 57, -1, -1, -1, -1, 62,
- 63, -1, -1, -1, -1, 1715, -1, -1, -1, -1,
- -1, -1, -1, -1, 1724, -1, 1726, -1, -1, -1,
- -1, 84, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 2422, -1, -1,
- 103, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 2440, 2441, -1, -1, -1,
- -1, 124, -1, -1, -1, -1, -1, -1, -1, 132,
- 133, 134, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 144, 145, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 157, 1805, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 171, -1,
+ -1, -1, 2599, -1, 307, -1, -1, -1, 559, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 2616,
+ 571, -1, 325, 2620, 575, -1, -1, 578, -1, -1,
+ -1, -1, -1, 584, -1, -1, 222, -1, 224, -1,
+ -1, -1, -1, -1, 230, -1, -1, -1, -1, -1,
+ -1, -1, 238, 2650, 2651, -1, -1, -1, -1, -1,
+ -1, -1, 613, -1, -1, -1, -1, 253, 619, -1,
+ -1, -1, -1, 2670, -1, -1, -1, 380, 629, 382,
+ -1, -1, 2679, -1, 2681, -1, 2683, 390, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 2043, -1,
+ -1, -1, -1, -1, -1, -1, 2703, -1, -1, -1,
+ -1, 2708, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 307, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 2732, -1, -1, -1, 325,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 187, -1, -1, 2512, -1, -1,
+ -1, -1, -1, -1, -1, 458, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 2114,
+ -1, -1, -1, 2118, -1, -1, -1, -1, 2123, 2124,
+ -1, -1, -1, -1, -1, -1, -1, 2132, 2133, -1,
+ 2135, -1, 2137, 2138, 380, 2140, 382, -1, -1, -1,
+ -1, -1, 2799, -1, 390, -1, 2803, -1, 2153, -1,
+ 2155, -1, 515, 2158, 2159, 2160, 2161, -1, 2163, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 531, -1,
+ 2175, -1, 535, -1, -1, -1, -1, 2182, -1, 2184,
+ -1, 2186, 2187, 2188, -1, -1, -1, -1, 2193, 2194,
+ 2195, 554, -1, 2850, 2199, 2200, 2201, -1, 2203, -1,
+ 2205, -1, 2207, -1, 2209, -1, 2211, -1, -1, 572,
+ -1, 2216, 458, -1, -1, -1, -1, 33, 34, -1,
+ -1, -1, -1, 39, -1, 41, -1, 43, 44, 2234,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 203, -1, -1, -1, -1, 208, -1, -1, -1, 212,
+ -1, -1, -1, -1, 60, 2250, -1, -1, 2253, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 629, -1, -1, 515,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 2557, 2558, 237, -1, 239, -1, -1, -1,
+ -1, -1, -1, -1, -1, 531, -1, -1, -1, 535,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 115,
+ -1, -1, 118, -1, -1, -1, -1, -1, 554, -1,
+ 126, -1, -1, -1, 2971, 2972, -1, -1, -1, -1,
+ -1, 6, -1, -1, -1, -1, 572, 143, 13, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 2996,
+ -1, 26, 27, -1, 160, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 255, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 2591, -1, -1, -1,
- 273, -1, -1, -1, 277, -1, -1, -1, -1, -1,
- -1, -1, -1, 2608, -1, -1, -1, 2612, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 3024, 184, -1,
+ 186, -1, 57, -1, -1, -1, -1, 62, -1, -1,
+ 3037, -1, -1, 199, 200, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 82, -1, -1,
+ -1, -1, -1, -1, -1, 90, -1, -1, -1, -1,
+ -1, -1, -1, 3070, 3071, 100, 3073, -1, -1, -1,
+ -1, -1, -1, -1, -1, 3082, 242, -1, -1, 114,
+ 3087, -1, -1, 3090, -1, 3092, 3093, -1, -1, -1,
+ -1, -1, -1, 128, -1, -1, 131, -1, -1, -1,
+ -1, -1, -1, 138, -1, 271, 3113, -1, -1, -1,
+ 145, -1, -1, -1, 280, 281, -1, 283, 153, -1,
+ -1, 3128, -1, -1, 159, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 3153, 313, 314, 315,
+ -1, -1, -1, 188, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 332, 333, 334, -1,
+ -1, -1, -1, -1, 340, -1, 3183, 343, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 222, -1, 224,
+ 3197, -1, -1, 359, 360, 230, -1, -1, -1, -1,
+ -1, -1, -1, 238, -1, -1, -1, -1, -1, -1,
+ -1, 3218, -1, -1, -1, -1, -1, -1, 253, -1,
+ 3227, -1, -1, -1, -1, -1, -1, -1, -1, 395,
+ 396, -1, -1, -1, -1, 26, 27, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 2642, 2643, -1,
+ -1, -1, -1, -1, 420, -1, -1, -1, -1, -1,
+ -1, 2616, -1, -1, -1, 2620, -1, -1, 59, 60,
+ -1, 62, 307, -1, -1, -1, -1, -1, -1, -1,
+ 71, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 325, 82, -1, -1, 329, 2650, 2651, -1, -1, 90,
+ -1, -1, 3309, -1, -1, 471, -1, -1, -1, 475,
+ -1, -1, -1, -1, -1, 2670, -1, -1, -1, -1,
+ -1, 487, -1, 114, 2679, -1, 2681, -1, 2683, -1,
+ -1, -1, -1, -1, -1, -1, -1, 128, 373, -1,
+ 131, -1, -1, -1, -1, 380, -1, 382, -1, -1,
+ -1, -1, -1, -1, -1, 390, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 159, -1,
+ -1, -1, -1, -1, -1, 541, -1, 2732, 544, -1,
+ -1, 547, 548, 549, 550, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 2662, -1, -1,
- -1, -1, -1, -1, -1, -1, 2671, -1, 2673, -1,
- 2675, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 368, -1, -1, -1, -1,
- 2695, -1, -1, -1, -1, 2700, -1, -1, -1, -1,
- -1, -1, 385, -1, -1, -1, 389, -1, 2038, -1,
- -1, -1, -1, -1, -1, -1, -1, 400, -1, 2724,
- -1, -1, -1, -1, -1, -1, -1, -1, 411, -1,
+ -1, 436, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 458, -1, 591, 592, -1, -1, -1,
+ -1, 222, -1, 224, -1, -1, -1, -1, -1, 230,
+ -1, -1, -1, 3450, 2799, -1, -1, 238, 2803, -1,
+ -1, 617, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 253, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 433, -1, -1, 436, -1, 438, -1, -1, 441, -1,
- -1, 444, 445, -1, -1, -1, -1, -1, -1, 452,
- -1, 454, -1, -1, -1, -1, -1, 2107, 461, -1,
- -1, 2111, -1, -1, 467, 2790, 2116, 2117, -1, 2794,
- -1, -1, 475, -1, -1, 2125, 2126, 480, 2128, 482,
- 2130, 2131, 485, 2133, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 2146, -1, 2148, -1,
- -1, 2151, 2152, 2153, 2154, -1, 2156, 510, -1, -1,
- -1, 514, -1, -1, -1, -1, 2841, -1, 2168, -1,
- -1, -1, -1, -1, -1, 2175, -1, 2177, -1, 2179,
- 2180, 2181, -1, -1, -1, -1, 2186, 2187, 2188, -1,
- -1, -1, 2192, 2193, 2194, -1, 2196, -1, 2198, -1,
- 2200, -1, 2202, -1, 2204, -1, 559, -1, -1, 2209,
- -1, -1, -1, -1, -1, -1, -1, -1, 571, -1,
- -1, -1, 575, -1, -1, 578, -1, 2227, -1, -1,
- -1, 584, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 2243, -1, -1, 2246, -1, -1, -1,
+ 515, -1, 3489, 3490, -1, -1, -1, -1, -1, -1,
+ -1, 3498, -1, -1, -1, 2850, 531, -1, -1, -1,
+ 535, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 307, -1, -1, 554,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 613, 13, -1, 15, -1, -1, 619, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 629, -1, -1, -1,
- -1, -1, -1, 35, -1, -1, -1, 2962, 2963, -1,
- -1, -1, -1, -1, -1, -1, -1, 49, 50, -1,
- -1, -1, -1, -1, -1, 57, -1, -1, -1, -1,
- 62, 63, 2987, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 325, -1, -1, 572, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 84, -1, -1, -1, -1, -1, -1, -1,
- 3015, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 103, -1, 3028, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 3565, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 124, -1, -1, -1, -1, -1, -1, -1,
- 132, 133, 134, -1, -1, -1, 3061, 3062, -1, 3064,
- -1, -1, 144, 145, -1, -1, -1, -1, 3073, -1,
- -1, -1, -1, 3078, -1, -1, 3081, -1, 3083, 3084,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 171,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 3104,
- -1, -1, -1, -1, -1, 187, -1, -1, -1, -1,
- -1, -1, -1, -1, 3119, -1, -1, -1, -1, -1,
- -1, 203, -1, -1, -1, -1, 208, -1, -1, -1,
- 212, -1, -1, -1, -1, -1, -1, -1, 3143, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 237, -1, 239, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 3173, -1,
- -1, -1, -1, 255, -1, -1, -1, -1, -1, -1,
- -1, -1, 3187, -1, -1, -1, -1, -1, -1, -1,
- -1, 273, -1, -1, -1, 277, -1, -1, -1, -1,
- -1, -1, -1, 3208, -1, -1, -1, -1, -1, -1,
- -1, -1, 3217, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 380,
+ -1, 382, -1, -1, -1, -1, -1, -1, -1, 390,
+ -1, -1, -1, 3610, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 2971, 2972, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 3642, -1, -1, -1, 3646,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 458, -1, -1,
+ 3677, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 3037, -1, 3691, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 3704, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 3070, 3071, -1, -1, -1,
+ -1, -1, -1, -1, 515, -1, -1, 3082, -1, -1,
+ -1, -1, 3087, -1, -1, 3090, -1, 3092, 3093, -1,
+ 531, -1, -1, -1, 535, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 2608, -1,
- -1, -1, 2612, -1, -1, -1, 368, -1, -1, -1,
- -1, -1, -1, -1, 3299, -1, -1, -1, -1, -1,
- -1, -1, -1, 385, -1, -1, -1, 389, -1, -1,
- -1, -1, 2642, 2643, -1, -1, -1, -1, 400, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 411,
- -1, -1, 2662, -1, -1, -1, -1, -1, -1, -1,
- -1, 2671, -1, 2673, -1, 2675, -1, -1, -1, -1,
- -1, 433, -1, -1, 436, -1, 438, -1, -1, 441,
- -1, -1, 444, 445, -1, -1, -1, -1, -1, -1,
- 452, -1, 454, -1, -1, -1, -1, -1, -1, 461,
- -1, -1, -1, -1, -1, 467, -1, -1, -1, -1,
- -1, -1, -1, 475, 2724, -1, -1, -1, 480, -1,
- 482, -1, -1, 485, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 554, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 3128, -1, -1, -1, -1, -1, -1,
+ 3787, 572, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 3153, -1,
+ 3807, -1, -1, -1, 3811, 3812, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 510, -1,
- -1, -1, 514, -1, -1, 3440, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 3842, -1, -1, -1, -1,
+ -1, -1, 3197, 3850, -1, -1, -1, -1, -1, -1,
+ -1, -1, 3859, -1, 3861, -1, -1, -1, -1, -1,
+ -1, -1, -1, 3218, -1, -1, -1, -1, -1, -1,
+ -1, -1, 3227, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 2790, -1, -1, -1, 2794, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 3479, 3480, -1, 559, -1, -1,
- -1, -1, -1, 3488, -1, -1, -1, -1, -1, 571,
- -1, -1, -1, 575, -1, -1, 578, -1, -1, -1,
- -1, -1, 584, -1, -1, -1, -1, -1, -1, -1,
- -1, 2841, -1, -1, -1, -1, -1, 24, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 34, 35, -1,
- -1, 613, -1, -1, -1, -1, -1, 619, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 629, -1, -1,
- 3555, -1, 59, 60, -1, -1, -1, -1, -1, -1,
- 67, -1, -1, -1, -1, 72, -1, -1, -1, -1,
+ -1, -1, -1, 3900, -1, -1, -1, -1, -1, 3906,
+ 3907, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 99, -1, 101, 3600, 103, -1, -1, -1,
- -1, -1, -1, -1, -1, 112, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 3632, -1, -1,
- -1, 3636, 2962, 2963, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 3951, -1, -1, -1, -1, -1,
+ -1, -1, -1, 3960, -1, -1, -1, 3964, -1, -1,
+ -1, -1, 3969, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 158, 159, -1, -1, -1, -1, 164, -1, -1,
- 167, -1, 3667, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 3681, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 193, -1, 195, 3694,
- -1, -1, -1, -1, -1, 202, -1, 204, 3028, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 4006,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 229, 230, 231, -1, -1, -1, -1, -1,
- -1, 3061, 3062, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 3073, -1, 252, -1, -1, 3078, -1,
- -1, 3081, -1, 3083, 3084, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 274, -1, -1,
- -1, -1, 3777, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 3119,
- -1, -1, 3797, -1, 301, -1, 3801, 3802, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 4025, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 3143, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 3832, -1, -1,
- -1, -1, -1, -1, -1, 3840, -1, -1, -1, -1,
- -1, -1, -1, -1, 3849, -1, 3851, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 3187, -1, -1,
- 367, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 3208, -1,
- -1, -1, -1, -1, -1, 3890, 393, 3217, -1, -1,
- -1, 3896, 3897, -1, -1, -1, -1, 404, 405, -1,
- -1, 408, 409, -1, -1, -1, -1, -1, -1, -1,
+ -1, 4038, -1, 4040, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 4050, -1, 4052, 4053, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 429, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 3941, -1, -1, -1,
- -1, -1, -1, -1, -1, 3950, -1, -1, -1, 3954,
- -1, -1, -1, -1, 3959, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 472, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 485, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 3996, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 511, -1, -1, -1, 515, -1,
- 4015, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 4028, -1, 4030, 533, 534, -1, -1,
- -1, -1, -1, -1, -1, 4040, -1, 4042, 4043, -1,
+ 4077, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 3450, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 4067, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 582, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 593, -1, -1, -1,
- -1, -1, -1, -1, 601, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 4111, -1, 4113, 4114,
- 3440, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 4134,
- -1, 4136, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 4151, 4152, -1, 3479,
- 3480, -1, -1, -1, -1, -1, -1, -1, 3488, 4164,
+ -1, -1, -1, -1, 4121, -1, 4123, 4124, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 4177, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 3489, 3490, -1, 4144, -1, 4146,
+ -1, -1, -1, 3498, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 4161, 4162, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 4174, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 4187, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 4225, 4226, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 4238, 4239, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 4235, 4236,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 4255, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 4248, 4249, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 4265, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 4286, -1, -1, -1, -1, -1, -1, 4293, -1,
- -1, 4296, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 3632, -1, -1, -1, 3636, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 3642, -1, 4296,
+ -1, 3646, -1, -1, -1, -1, 4303, -1, -1, 4306,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 4332, -1, -1,
- -1, -1, -1, -1, 4339, -1, 4341, 3667, -1, -1,
- -1, -1, -1, -1, -1, -1, 4351, -1, -1, -1,
- 4355, 3681, -1, 4358, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 3694, 4370, -1, 4372, -1, 4374,
- -1, -1, -1, -1, -1, -1, 4381, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 4392, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 4408, 4409, -1, -1, -1, -1, 4414,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 4424,
- 4425, -1, -1, -1, 4429, -1, -1, -1, -1, -1,
+ -1, -1, 3677, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 4342, 3691, -1, -1, -1,
+ -1, -1, 4349, -1, 4351, -1, -1, -1, -1, 3704,
+ -1, -1, -1, -1, 4361, -1, -1, -1, 4365, -1,
+ -1, 4368, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 4380, -1, 4382, -1, 4384, -1, -1,
+ -1, -1, -1, -1, 4391, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 4402, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 4418, 4419, -1, -1, -1, -1, 4424, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 4434, 4435, -1,
+ -1, -1, 4439, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 4461, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 4471, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 3850, -1, -1, -1, -1,
+ -1, -1, -1, -1, 3859, -1, 3861, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 3840, -1, -1, -1, -1, -1, -1, -1, -1, 3849,
- -1, 3851, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 3900, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 3890, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 3969, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 3959,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 4006, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 3996, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 4038, -1, 4040, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 4050, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 4028, -1,
- 4030, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 4040, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -12323,357 +12325,40 @@ static const yytype_int16 yycheck[] =
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 4144,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 4134, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 4162, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 4152, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 4177, -1, -1,
+ -1, -1, 4187, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 4225, -1, -1, -1, -1,
+ 4235, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 4303, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 4293, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 4342, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 4332, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 4358, -1,
- -1, -1, 5, -1, 7, 8, 9, 10, 11, -1,
- -1, 14, -1, -1, -1, 18, -1, -1, 21, -1,
- 23, 24, 25, 26, 27, 28, 29, -1, 31, -1,
- -1, 34, 35, 36, 37, 38, 39, 40, -1, 42,
- 43, 44, 45, 46, -1, 48, 49, -1, -1, 52,
- 53, 54, 55, 56, 4414, 58, 59, 60, 61, 62,
- -1, 64, 65, 66, 67, 68, 69, 70, -1, 72,
- 73, 74, 75, 76, 77, 78, 79, -1, 81, 82,
- 83, 84, 85, 86, 87, 88, -1, 90, 91, -1,
- 93, 94, 95, 96, 97, -1, 99, 100, 101, 102,
- -1, 4461, 105, 106, 107, -1, 109, 110, 111, -1,
- 113, 114, 115, 116, 117, 118, -1, -1, -1, -1,
- 123, 124, 125, -1, -1, 128, 129, -1, 131, -1,
- -1, -1, 135, -1, 137, 138, 139, 140, -1, -1,
- -1, 144, -1, -1, 147, 148, 149, -1, -1, -1,
- 153, -1, 155, 156, -1, 158, 159, 160, -1, -1,
- 163, 164, -1, 166, 167, 168, 169, 170, 171, 172,
- -1, 174, 175, 176, 177, 178, 179, 180, -1, 182,
- 183, 184, 185, -1, 187, -1, -1, -1, 191, -1,
- 193, -1, 195, -1, 197, 198, 199, 200, 201, 202,
- -1, 204, -1, 206, -1, 208, 209, 210, -1, 212,
- 213, 214, -1, 216, 217, -1, -1, -1, 221, 222,
- 223, 224, 225, -1, 227, 228, 229, -1, 231, -1,
- 233, -1, -1, -1, 237, 238, 239, 240, -1, -1,
- 243, -1, 245, 246, -1, 248, 249, -1, -1, -1,
- 253, -1, -1, 256, 257, 258, -1, 260, 261, -1,
- 263, 264, 265, -1, -1, -1, -1, -1, 271, 272,
- -1, 274, -1, 276, -1, 278, 279, -1, -1, 282,
- -1, -1, -1, -1, 287, 288, 289, 290, 291, 292,
- 293, 294, 295, 296, 297, 298, 299, -1, 301, 302,
- 303, 304, 305, 306, 307, 308, 309, 310, 311, -1,
- -1, -1, -1, 316, 317, 318, 319, 320, 321, -1,
- -1, 324, 325, 326, 327, -1, 329, 330, 331, 332,
- 333, 334, 335, 336, 337, 338, 339, 340, -1, 342,
- 343, 344, -1, -1, 347, 348, 349, 350, 351, 352,
- 353, 354, 355, -1, 357, 358, -1, 360, 361, 362,
- -1, 364, 365, 366, 367, -1, 369, 370, -1, -1,
- -1, -1, -1, -1, -1, -1, 379, 380, 381, -1,
- 383, 384, -1, 386, 387, 388, 389, 390, 391, 392,
- 393, 394, 395, 396, 397, 398, -1, 400, 401, 402,
- -1, 404, -1, 406, 407, 408, 409, 410, -1, 412,
- 413, 414, -1, -1, 417, -1, -1, -1, 421, 422,
- 423, 424, 425, -1, -1, 428, 429, 430, 431, 432,
- -1, 434, 435, -1, 437, 438, 439, 440, 441, 442,
- -1, 444, -1, 446, 447, -1, 449, 450, -1, -1,
- 453, 454, 455, 456, 457, 458, 459, 460, 461, 462,
- 463, -1, 465, 466, -1, -1, -1, 470, 471, 472,
- 473, -1, -1, -1, 477, -1, -1, -1, 481, -1,
- 483, 484, 485, 486, -1, 488, 489, 490, 491, 492,
- 493, -1, -1, -1, -1, -1, -1, 500, 501, -1,
- 503, -1, -1, 506, -1, -1, 509, 510, 511, 512,
- 513, 514, 515, -1, 517, 518, 519, 520, 521, 522,
- 523, 524, 525, 526, 527, 528, 529, 530, 531, -1,
- 533, -1, 535, 536, 537, 538, -1, 540, 541, 542,
- -1, 544, 545, 546, 547, -1, -1, -1, -1, 552,
- 553, 554, 555, -1, 557, 558, 559, 560, 561, 562,
- 563, 564, 565, 566, 567, 568, -1, 570, 571, -1,
- -1, 574, -1, -1, 577, -1, 579, -1, 581, 582,
- 583, -1, -1, 586, 587, 588, 589, 590, -1, -1,
- 593, 594, -1, 596, 597, 598, 599, 600, 601, 602,
- -1, -1, -1, -1, -1, -1, 609, 610, -1, 612,
- 613, 614, -1, -1, 617, -1, -1, -1, -1, 622,
- 623, -1, -1, -1, -1, 628, 629, -1, -1, 632,
- 633, -1, -1, 636, 637, 5, -1, 7, 8, 9,
- 10, 11, 12, -1, 14, -1, -1, -1, 18, -1,
- -1, 21, -1, 23, 24, 25, 26, 27, 28, 29,
- -1, 31, -1, -1, 34, 35, 36, 37, 38, 39,
- 40, -1, 42, 43, 44, -1, 46, -1, 48, 49,
- -1, -1, 52, 53, 54, 55, 56, -1, 58, 59,
- 60, 61, 62, -1, 64, 65, 66, 67, 68, 69,
- 70, -1, 72, 73, 74, 75, 76, 77, 78, 79,
- -1, 81, 82, 83, 84, 85, 86, 87, 88, -1,
- 90, 91, -1, 93, 94, 95, 96, 97, -1, 99,
- 100, 101, 102, -1, -1, 105, 106, 107, -1, 109,
- 110, 111, -1, 113, 114, 115, 116, 117, 118, -1,
- -1, -1, -1, 123, 124, 125, -1, -1, 128, 129,
- -1, 131, -1, -1, -1, 135, -1, 137, 138, 139,
- 140, -1, -1, -1, 144, -1, -1, 147, 148, 149,
- -1, -1, -1, 153, -1, 155, 156, -1, 158, 159,
- 160, -1, -1, 163, 164, -1, 166, 167, 168, 169,
- 170, 171, 172, -1, 174, 175, 176, 177, 178, 179,
- 180, -1, 182, 183, 184, 185, -1, 187, -1, -1,
- -1, 191, -1, 193, -1, 195, -1, 197, 198, 199,
- 200, 201, 202, -1, 204, -1, 206, -1, 208, 209,
- 210, -1, 212, 213, 214, -1, 216, 217, -1, -1,
- -1, 221, 222, 223, 224, 225, -1, 227, 228, 229,
- -1, 231, -1, 233, -1, -1, -1, 237, 238, 239,
- 240, -1, -1, 243, -1, 245, 246, -1, 248, 249,
- -1, -1, -1, 253, -1, -1, 256, 257, 258, -1,
- -1, 261, -1, 263, 264, 265, -1, -1, -1, -1,
- -1, 271, 272, -1, 274, -1, 276, -1, 278, 279,
- -1, -1, 282, -1, -1, -1, -1, 287, 288, 289,
- 290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
- -1, 301, 302, 303, 304, 305, 306, 307, 308, 309,
- 310, 311, -1, -1, -1, -1, 316, 317, 318, 319,
- 320, 321, -1, -1, 324, 325, 326, 327, -1, 329,
- 330, 331, 332, 333, 334, 335, 336, 337, 338, 339,
- 340, -1, 342, 343, 344, -1, -1, 347, 348, 349,
- 350, 351, 352, 353, 354, 355, -1, 357, 358, -1,
- 360, 361, 362, 363, 364, 365, 366, 367, -1, 369,
- 370, -1, -1, -1, -1, -1, -1, -1, -1, 379,
- 380, 381, -1, 383, 384, -1, 386, 387, 388, 389,
- 390, 391, 392, 393, 394, 395, 396, 397, 398, -1,
- 400, 401, 402, -1, 404, -1, 406, 407, 408, 409,
- 410, -1, 412, 413, 414, -1, -1, 417, -1, -1,
- -1, 421, 422, 423, 424, 425, -1, -1, 428, 429,
- 430, 431, 432, -1, 434, 435, -1, 437, 438, 439,
- 440, 441, 442, -1, 444, -1, 446, 447, -1, 449,
- 450, -1, -1, 453, 454, 455, 456, 457, 458, 459,
- 460, 461, 462, 463, -1, 465, 466, -1, -1, -1,
- 470, 471, 472, 473, -1, -1, -1, 477, -1, -1,
- -1, 481, -1, 483, 484, 485, 486, -1, 488, 489,
- 490, 491, 492, 493, -1, -1, -1, -1, -1, -1,
- 500, 501, -1, 503, -1, -1, 506, -1, -1, 509,
- 510, 511, 512, 513, 514, 515, -1, 517, 518, 519,
- 520, 521, 522, 523, 524, 525, 526, 527, 528, 529,
- 530, 531, -1, 533, -1, 535, 536, 537, 538, -1,
- 540, 541, 542, -1, 544, 545, 546, 547, -1, -1,
- -1, -1, -1, 553, 554, 555, -1, 557, 558, 559,
- 560, 561, 562, 563, 564, 565, 566, 567, 568, -1,
- 570, 571, -1, -1, 574, -1, -1, 577, -1, 579,
- -1, 581, 582, 583, -1, -1, 586, 587, 588, 589,
- 590, -1, -1, 593, 594, -1, 596, 597, 598, 599,
- 600, 601, 602, -1, -1, -1, -1, -1, -1, 609,
- 610, -1, 612, 613, 614, -1, -1, 617, -1, -1,
- -1, -1, 622, 623, -1, -1, -1, -1, 628, 629,
- -1, -1, 632, 633, -1, -1, 636, 637, 5, -1,
- 7, 8, 9, 10, 11, -1, -1, 14, -1, -1,
- -1, 18, -1, -1, 21, -1, 23, 24, 25, 26,
- 27, 28, 29, -1, 31, -1, -1, 34, 35, 36,
- 37, 38, 39, 40, -1, 42, 43, 44, -1, 46,
- -1, 48, 49, -1, -1, 52, 53, 54, 55, 56,
- -1, 58, 59, 60, 61, 62, -1, 64, 65, 66,
- 67, 68, 69, 70, -1, 72, 73, 74, 75, 76,
- 77, 78, 79, -1, 81, 82, 83, 84, 85, 86,
- 87, 88, -1, 90, 91, -1, 93, 94, 95, 96,
- 97, -1, 99, 100, 101, 102, -1, -1, 105, 106,
- 107, -1, 109, 110, 111, -1, 113, 114, 115, 116,
- 117, 118, -1, -1, -1, -1, 123, 124, 125, -1,
- -1, 128, 129, -1, 131, -1, -1, -1, 135, -1,
- 137, 138, 139, 140, -1, -1, -1, 144, -1, -1,
- 147, 148, 149, -1, -1, -1, 153, -1, 155, 156,
- -1, 158, 159, 160, -1, -1, 163, 164, -1, 166,
- 167, 168, 169, 170, 171, 172, -1, 174, 175, 176,
- 177, 178, 179, 180, -1, 182, 183, 184, 185, -1,
- 187, -1, -1, -1, 191, 192, 193, -1, 195, -1,
- 197, 198, 199, 200, 201, 202, -1, 204, -1, 206,
- -1, 208, 209, 210, -1, 212, 213, 214, -1, 216,
- 217, -1, -1, -1, 221, 222, 223, 224, 225, -1,
- 227, 228, 229, -1, 231, -1, 233, -1, -1, -1,
- 237, 238, 239, 240, -1, -1, 243, -1, 245, 246,
- -1, 248, 249, -1, -1, -1, 253, -1, -1, 256,
- 257, 258, -1, -1, 261, -1, 263, 264, 265, -1,
- -1, -1, -1, -1, 271, 272, -1, 274, -1, 276,
- -1, 278, 279, -1, -1, 282, -1, -1, -1, -1,
- 287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
- 297, 298, 299, -1, 301, 302, 303, 304, 305, 306,
- 307, 308, 309, 310, 311, -1, -1, -1, -1, 316,
- 317, 318, 319, 320, 321, -1, -1, 324, 325, 326,
- 327, -1, 329, 330, 331, 332, 333, 334, 335, 336,
- 337, 338, 339, 340, -1, 342, 343, 344, -1, -1,
- 347, 348, 349, 350, 351, 352, 353, 354, 355, -1,
- 357, 358, -1, 360, 361, 362, -1, 364, 365, 366,
- 367, -1, 369, 370, -1, -1, -1, -1, -1, -1,
- -1, -1, 379, 380, 381, -1, 383, 384, -1, 386,
- 387, 388, 389, 390, 391, 392, 393, 394, 395, 396,
- 397, 398, -1, 400, 401, 402, -1, 404, -1, 406,
- 407, 408, 409, 410, -1, 412, 413, 414, -1, -1,
- 417, -1, -1, -1, 421, 422, 423, 424, 425, -1,
- -1, 428, 429, 430, 431, 432, -1, 434, 435, -1,
- 437, 438, 439, 440, 441, 442, -1, 444, -1, 446,
- 447, -1, 449, 450, -1, -1, 453, 454, 455, 456,
- 457, 458, 459, 460, 461, 462, 463, -1, 465, 466,
- -1, -1, -1, 470, 471, 472, 473, -1, -1, -1,
- 477, -1, -1, -1, 481, -1, 483, 484, 485, 486,
- -1, 488, 489, 490, 491, 492, 493, -1, -1, -1,
- -1, -1, -1, 500, 501, -1, 503, -1, -1, 506,
- -1, -1, 509, 510, 511, 512, 513, 514, 515, -1,
- 517, 518, 519, 520, 521, 522, 523, 524, 525, 526,
- 527, 528, 529, 530, 531, -1, 533, -1, 535, 536,
- 537, 538, -1, 540, 541, 542, -1, 544, 545, 546,
- 547, -1, -1, -1, -1, -1, 553, 554, 555, -1,
- 557, 558, 559, 560, 561, 562, 563, 564, 565, 566,
- 567, 568, -1, 570, 571, -1, -1, 574, -1, -1,
- 577, -1, 579, -1, 581, 582, 583, -1, -1, 586,
- 587, 588, 589, 590, -1, -1, 593, 594, -1, 596,
- 597, 598, 599, 600, 601, 602, -1, -1, -1, -1,
- -1, -1, 609, 610, -1, 612, 613, 614, -1, -1,
- 617, -1, -1, -1, -1, 622, 623, -1, -1, -1,
- -1, 628, 629, -1, -1, 632, 633, -1, -1, 636,
- 637, 5, -1, 7, 8, 9, 10, 11, -1, -1,
- 14, -1, -1, -1, 18, -1, -1, 21, -1, 23,
- 24, 25, 26, 27, 28, 29, -1, 31, -1, -1,
- 34, 35, 36, 37, 38, 39, 40, -1, 42, 43,
- 44, -1, 46, -1, 48, 49, -1, -1, 52, 53,
- 54, 55, 56, -1, 58, 59, 60, 61, 62, -1,
- 64, 65, 66, 67, 68, 69, 70, -1, 72, 73,
- 74, 75, 76, 77, 78, 79, -1, 81, 82, 83,
- 84, 85, 86, 87, 88, -1, 90, 91, -1, 93,
- 94, 95, 96, 97, -1, 99, 100, 101, 102, -1,
- -1, 105, 106, 107, -1, 109, 110, 111, -1, 113,
- 114, 115, 116, 117, 118, -1, -1, -1, -1, 123,
- 124, 125, -1, -1, 128, 129, -1, 131, -1, -1,
- -1, 135, -1, 137, 138, 139, 140, -1, -1, -1,
- 144, -1, -1, 147, 148, 149, -1, -1, -1, 153,
- -1, 155, 156, -1, 158, 159, 160, -1, -1, 163,
- 164, -1, 166, 167, 168, 169, 170, 171, 172, -1,
- 174, 175, 176, 177, 178, 179, 180, -1, 182, 183,
- 184, 185, -1, 187, -1, -1, -1, 191, 192, 193,
- -1, 195, -1, 197, 198, 199, 200, 201, 202, -1,
- 204, -1, 206, -1, 208, 209, 210, -1, 212, 213,
- 214, -1, 216, 217, -1, -1, -1, 221, 222, 223,
- 224, 225, -1, 227, 228, 229, -1, 231, -1, 233,
- -1, -1, -1, 237, 238, 239, 240, -1, -1, 243,
- -1, 245, 246, -1, 248, 249, -1, -1, -1, 253,
- -1, -1, 256, 257, 258, -1, -1, 261, -1, 263,
- 264, 265, -1, -1, -1, -1, -1, 271, 272, -1,
- 274, -1, 276, -1, 278, 279, -1, -1, 282, -1,
- -1, -1, -1, 287, 288, 289, 290, 291, 292, 293,
- 294, 295, 296, 297, 298, 299, -1, 301, 302, 303,
- 304, 305, 306, 307, 308, 309, 310, 311, -1, -1,
- -1, -1, 316, 317, 318, 319, 320, 321, -1, -1,
- 324, 325, 326, 327, -1, 329, 330, 331, 332, 333,
- 334, 335, 336, 337, 338, 339, 340, -1, 342, 343,
- 344, -1, -1, 347, 348, 349, 350, 351, 352, 353,
- 354, 355, -1, 357, 358, -1, 360, 361, 362, -1,
- 364, 365, 366, 367, -1, 369, 370, -1, -1, -1,
- -1, -1, -1, -1, -1, 379, 380, 381, -1, 383,
- 384, -1, 386, 387, 388, 389, 390, 391, 392, 393,
- 394, 395, 396, 397, 398, -1, 400, 401, 402, -1,
- 404, -1, 406, 407, 408, 409, 410, -1, 412, 413,
- 414, -1, -1, 417, -1, -1, -1, 421, 422, 423,
- 424, 425, -1, -1, 428, 429, 430, 431, 432, -1,
- 434, 435, -1, 437, 438, 439, 440, 441, 442, -1,
- 444, -1, 446, 447, -1, 449, 450, -1, -1, 453,
- 454, 455, 456, 457, 458, 459, 460, 461, 462, 463,
- -1, 465, 466, -1, -1, -1, 470, 471, 472, 473,
- -1, -1, -1, 477, -1, -1, -1, 481, -1, 483,
- 484, 485, 486, -1, 488, 489, 490, 491, 492, 493,
- -1, -1, -1, -1, -1, -1, 500, 501, -1, 503,
- -1, -1, 506, -1, -1, 509, 510, 511, 512, 513,
- 514, 515, -1, 517, 518, 519, 520, 521, 522, 523,
- 524, 525, 526, 527, 528, 529, 530, 531, -1, 533,
- -1, 535, 536, 537, 538, -1, 540, 541, 542, -1,
- 544, 545, 546, 547, -1, -1, -1, -1, -1, 553,
- 554, 555, -1, 557, 558, 559, 560, 561, 562, 563,
- 564, 565, 566, 567, 568, -1, 570, 571, -1, -1,
- 574, -1, -1, 577, -1, 579, -1, 581, 582, 583,
- -1, -1, 586, 587, 588, 589, 590, -1, -1, 593,
- 594, -1, 596, 597, 598, 599, 600, 601, 602, -1,
- -1, -1, -1, -1, -1, 609, 610, -1, 612, 613,
- 614, -1, -1, 617, -1, -1, -1, -1, 622, 623,
- -1, -1, -1, -1, 628, 629, -1, -1, 632, 633,
- -1, -1, 636, 637, 5, -1, 7, 8, 9, 10,
- 11, -1, -1, 14, -1, -1, -1, 18, -1, -1,
- 21, -1, 23, 24, 25, 26, 27, 28, 29, -1,
- 31, -1, -1, 34, 35, 36, 37, 38, 39, 40,
- -1, 42, 43, 44, -1, 46, -1, 48, 49, -1,
- -1, 52, 53, 54, 55, 56, -1, 58, 59, 60,
- 61, 62, -1, 64, 65, 66, 67, 68, 69, 70,
- -1, 72, 73, 74, 75, 76, 77, 78, 79, -1,
- 81, 82, 83, 84, 85, 86, 87, 88, -1, 90,
- 91, -1, 93, 94, 95, 96, 97, -1, 99, 100,
- 101, 102, -1, -1, 105, 106, 107, -1, 109, 110,
- 111, -1, 113, 114, 115, 116, 117, 118, -1, -1,
- -1, -1, 123, 124, 125, -1, -1, 128, 129, -1,
- 131, -1, -1, -1, 135, -1, 137, 138, 139, 140,
- -1, -1, -1, 144, -1, -1, 147, 148, 149, -1,
- -1, -1, 153, -1, 155, 156, -1, 158, 159, 160,
- -1, -1, 163, 164, -1, 166, 167, 168, 169, 170,
- 171, 172, -1, 174, 175, 176, 177, 178, 179, 180,
- -1, 182, 183, 184, 185, -1, 187, -1, -1, -1,
- 191, 192, 193, -1, 195, -1, 197, 198, 199, 200,
- 201, 202, -1, 204, -1, 206, -1, 208, 209, 210,
- -1, 212, 213, 214, -1, 216, 217, -1, -1, -1,
- 221, 222, 223, 224, 225, -1, 227, 228, 229, -1,
- 231, -1, 233, -1, -1, -1, 237, 238, 239, 240,
- -1, -1, 243, -1, 245, 246, -1, 248, 249, -1,
- -1, -1, 253, -1, -1, 256, 257, 258, -1, -1,
- 261, -1, 263, 264, 265, -1, -1, -1, -1, -1,
- 271, 272, -1, 274, -1, 276, -1, 278, 279, -1,
- -1, 282, -1, -1, -1, -1, 287, 288, 289, 290,
- 291, 292, 293, 294, 295, 296, 297, 298, 299, -1,
- 301, 302, 303, 304, 305, 306, 307, 308, 309, 310,
- 311, -1, -1, -1, -1, 316, 317, 318, 319, 320,
- 321, -1, -1, 324, 325, 326, 327, -1, 329, 330,
- 331, 332, 333, 334, 335, 336, 337, 338, 339, 340,
- -1, 342, 343, 344, -1, -1, 347, 348, 349, 350,
- 351, 352, 353, 354, 355, -1, 357, 358, -1, 360,
- 361, 362, -1, 364, 365, 366, 367, -1, 369, 370,
- -1, -1, -1, -1, -1, -1, -1, -1, 379, 380,
- 381, -1, 383, 384, -1, 386, 387, 388, 389, 390,
- 391, 392, 393, 394, 395, 396, 397, 398, -1, 400,
- 401, 402, -1, 404, -1, 406, 407, 408, 409, 410,
- -1, 412, 413, 414, -1, -1, 417, -1, -1, -1,
- 421, 422, 423, 424, 425, -1, -1, 428, 429, 430,
- 431, 432, -1, 434, 435, -1, 437, 438, 439, 440,
- 441, 442, -1, 444, -1, 446, 447, -1, 449, 450,
- -1, -1, 453, 454, 455, 456, 457, 458, 459, 460,
- 461, 462, 463, -1, 465, 466, -1, -1, -1, 470,
- 471, 472, 473, -1, -1, -1, 477, -1, -1, -1,
- 481, -1, 483, 484, 485, 486, -1, 488, 489, 490,
- 491, 492, 493, -1, -1, -1, -1, -1, -1, 500,
- 501, -1, 503, -1, -1, 506, -1, -1, 509, 510,
- 511, 512, 513, 514, 515, -1, 517, 518, 519, 520,
- 521, 522, 523, 524, 525, 526, 527, 528, 529, 530,
- 531, -1, 533, -1, 535, 536, 537, 538, -1, 540,
- 541, 542, -1, 544, 545, 546, 547, -1, -1, -1,
- -1, -1, 553, 554, 555, -1, 557, 558, 559, 560,
- 561, 562, 563, 564, 565, 566, 567, 568, -1, 570,
- 571, -1, -1, 574, -1, -1, 577, -1, 579, -1,
- 581, 582, 583, -1, -1, 586, 587, 588, 589, 590,
- -1, -1, 593, 594, -1, 596, 597, 598, 599, 600,
- 601, 602, -1, -1, -1, -1, -1, -1, 609, 610,
- -1, 612, 613, 614, -1, -1, 617, -1, -1, -1,
- -1, 622, 623, -1, -1, -1, -1, 628, 629, -1,
- -1, 632, 633, -1, -1, 636, 637, 5, -1, 7,
+ -1, -1, -1, 4368, -1, -1, -1, 5, -1, 7,
8, 9, 10, 11, -1, -1, 14, -1, -1, -1,
18, -1, -1, 21, -1, 23, 24, 25, 26, 27,
28, 29, -1, 31, -1, -1, 34, 35, 36, 37,
- 38, 39, 40, -1, 42, 43, 44, -1, 46, -1,
- 48, 49, -1, -1, 52, 53, 54, 55, 56, -1,
+ 38, 39, 40, -1, 42, 43, 44, 45, 46, -1,
+ 48, 49, -1, -1, 52, 53, 54, 55, 56, 4424,
58, 59, 60, 61, 62, -1, 64, 65, 66, 67,
68, 69, 70, -1, 72, 73, 74, 75, 76, 77,
78, 79, -1, 81, 82, 83, 84, 85, 86, 87,
88, -1, 90, 91, -1, 93, 94, 95, 96, 97,
- -1, 99, 100, 101, 102, -1, -1, 105, 106, 107,
+ -1, 99, 100, 101, 102, -1, 4471, 105, 106, 107,
-1, 109, 110, 111, -1, 113, 114, 115, 116, 117,
118, -1, -1, -1, -1, 123, 124, 125, -1, -1,
128, 129, -1, 131, -1, -1, -1, 135, -1, 137,
@@ -12689,7 +12374,7 @@ static const yytype_int16 yycheck[] =
228, 229, -1, 231, -1, 233, -1, -1, -1, 237,
238, 239, 240, -1, -1, 243, -1, 245, 246, -1,
248, 249, -1, -1, -1, 253, -1, -1, 256, 257,
- 258, -1, -1, 261, -1, 263, 264, 265, -1, -1,
+ 258, -1, 260, 261, -1, 263, 264, 265, -1, -1,
-1, -1, -1, 271, 272, -1, 274, -1, 276, -1,
278, 279, -1, -1, 282, -1, -1, -1, -1, 287,
288, 289, 290, 291, 292, 293, 294, 295, 296, 297,
@@ -12718,7 +12403,7 @@ static const yytype_int16 yycheck[] =
518, 519, 520, 521, 522, 523, 524, 525, 526, 527,
528, 529, 530, 531, -1, 533, -1, 535, 536, 537,
538, -1, 540, 541, 542, -1, 544, 545, 546, 547,
- -1, -1, -1, -1, -1, 553, 554, 555, -1, 557,
+ -1, -1, -1, -1, 552, 553, 554, 555, -1, 557,
558, 559, 560, 561, 562, 563, 564, 565, 566, 567,
568, -1, 570, 571, -1, -1, 574, -1, -1, 577,
-1, 579, -1, 581, 582, 583, -1, -1, 586, 587,
@@ -12727,7 +12412,7 @@ static const yytype_int16 yycheck[] =
-1, 609, 610, -1, 612, 613, 614, -1, -1, 617,
-1, -1, -1, -1, 622, 623, -1, -1, -1, -1,
628, 629, -1, -1, 632, 633, -1, -1, 636, 637,
- 5, -1, 7, 8, 9, 10, 11, -1, -1, 14,
+ 5, -1, 7, 8, 9, 10, 11, 12, -1, 14,
-1, -1, -1, 18, -1, -1, 21, -1, 23, 24,
25, 26, 27, 28, 29, -1, 31, -1, -1, 34,
35, 36, 37, 38, 39, 40, -1, 42, 43, 44,
@@ -12762,7 +12447,7 @@ static const yytype_int16 yycheck[] =
325, 326, 327, -1, 329, 330, 331, 332, 333, 334,
335, 336, 337, 338, 339, 340, -1, 342, 343, 344,
-1, -1, 347, 348, 349, 350, 351, 352, 353, 354,
- 355, -1, 357, 358, -1, 360, 361, 362, -1, 364,
+ 355, -1, 357, 358, -1, 360, 361, 362, 363, 364,
365, 366, 367, -1, 369, 370, -1, -1, -1, -1,
-1, -1, -1, -1, 379, 380, 381, -1, 383, 384,
-1, 386, 387, 388, 389, 390, 391, 392, 393, 394,
@@ -12791,7 +12476,7 @@ static const yytype_int16 yycheck[] =
-1, -1, 617, -1, -1, -1, -1, 622, 623, -1,
-1, -1, -1, 628, 629, -1, -1, 632, 633, -1,
-1, 636, 637, 5, -1, 7, 8, 9, 10, 11,
- 12, -1, 14, -1, -1, -1, 18, -1, -1, 21,
+ -1, -1, 14, -1, -1, -1, 18, -1, -1, 21,
-1, 23, 24, 25, 26, 27, 28, 29, -1, 31,
-1, -1, 34, 35, 36, 37, 38, 39, 40, -1,
42, 43, 44, -1, 46, -1, 48, 49, -1, -1,
@@ -12809,7 +12494,7 @@ static const yytype_int16 yycheck[] =
-1, 163, 164, -1, 166, 167, 168, 169, 170, 171,
172, -1, 174, 175, 176, 177, 178, 179, 180, -1,
182, 183, 184, 185, -1, 187, -1, -1, -1, 191,
- -1, 193, -1, 195, -1, 197, 198, 199, 200, 201,
+ 192, 193, -1, 195, -1, 197, 198, 199, 200, 201,
202, -1, 204, -1, 206, -1, 208, 209, 210, -1,
212, 213, 214, -1, 216, 217, -1, -1, -1, 221,
222, 223, 224, 225, -1, 227, 228, 229, -1, 231,
@@ -12825,7 +12510,7 @@ static const yytype_int16 yycheck[] =
-1, -1, 324, 325, 326, 327, -1, 329, 330, 331,
332, 333, 334, 335, 336, 337, 338, 339, 340, -1,
342, 343, 344, -1, -1, 347, 348, 349, 350, 351,
- -1, 353, 354, 355, -1, 357, 358, -1, 360, 361,
+ 352, 353, 354, 355, -1, 357, 358, -1, 360, 361,
362, -1, 364, 365, 366, 367, -1, 369, 370, -1,
-1, -1, -1, -1, -1, -1, -1, 379, 380, 381,
-1, 383, 384, -1, 386, 387, 388, 389, 390, 391,
@@ -12872,7 +12557,7 @@ static const yytype_int16 yycheck[] =
159, 160, -1, -1, 163, 164, -1, 166, 167, 168,
169, 170, 171, 172, -1, 174, 175, 176, 177, 178,
179, 180, -1, 182, 183, 184, 185, -1, 187, -1,
- -1, -1, 191, -1, 193, -1, 195, -1, 197, 198,
+ -1, -1, 191, 192, 193, -1, 195, -1, 197, 198,
199, 200, 201, 202, -1, 204, -1, 206, -1, 208,
209, 210, -1, 212, 213, 214, -1, 216, 217, -1,
-1, -1, 221, 222, 223, 224, 225, -1, 227, 228,
@@ -12935,7 +12620,7 @@ static const yytype_int16 yycheck[] =
156, -1, 158, 159, 160, -1, -1, 163, 164, -1,
166, 167, 168, 169, 170, 171, 172, -1, 174, 175,
176, 177, 178, 179, 180, -1, 182, 183, 184, 185,
- -1, 187, -1, -1, -1, 191, -1, 193, -1, 195,
+ -1, 187, -1, -1, -1, 191, 192, 193, -1, 195,
-1, 197, 198, 199, 200, 201, 202, -1, 204, -1,
206, -1, 208, 209, 210, -1, 212, 213, 214, -1,
216, 217, -1, -1, -1, 221, 222, 223, 224, 225,
@@ -13107,7 +12792,7 @@ static const yytype_int16 yycheck[] =
610, -1, 612, 613, 614, -1, -1, 617, -1, -1,
-1, -1, 622, 623, -1, -1, -1, -1, 628, 629,
-1, -1, 632, 633, -1, -1, 636, 637, 5, -1,
- 7, 8, 9, 10, 11, -1, -1, 14, -1, -1,
+ 7, 8, 9, 10, 11, 12, -1, 14, -1, -1,
-1, 18, -1, -1, 21, -1, 23, 24, 25, 26,
27, 28, 29, -1, 31, -1, -1, 34, 35, 36,
37, 38, 39, 40, -1, 42, 43, 44, -1, 46,
@@ -13137,7 +12822,7 @@ static const yytype_int16 yycheck[] =
-1, 278, 279, -1, -1, 282, -1, -1, -1, -1,
287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
297, 298, 299, -1, 301, 302, 303, 304, 305, 306,
- 307, 308, 309, 310, 311, 312, -1, -1, -1, 316,
+ 307, 308, 309, 310, 311, -1, -1, -1, -1, 316,
317, 318, 319, 320, 321, -1, -1, 324, 325, 326,
327, -1, 329, 330, 331, 332, 333, 334, 335, 336,
337, 338, 339, 340, -1, 342, 343, 344, -1, -1,
@@ -13204,7 +12889,7 @@ static const yytype_int16 yycheck[] =
-1, -1, 316, 317, 318, 319, 320, 321, -1, -1,
324, 325, 326, 327, -1, 329, 330, 331, 332, 333,
334, 335, 336, 337, 338, 339, 340, -1, 342, 343,
- 344, -1, -1, 347, 348, 349, 350, 351, -1, 353,
+ 344, -1, -1, 347, 348, 349, 350, 351, 352, 353,
354, 355, -1, 357, 358, -1, 360, 361, 362, -1,
364, 365, 366, 367, -1, 369, 370, -1, -1, -1,
-1, -1, -1, -1, -1, 379, 380, 381, -1, 383,
@@ -13268,7 +12953,7 @@ static const yytype_int16 yycheck[] =
321, -1, -1, 324, 325, 326, 327, -1, 329, 330,
331, 332, 333, 334, 335, 336, 337, 338, 339, 340,
-1, 342, 343, 344, -1, -1, 347, 348, 349, 350,
- 351, -1, 353, 354, 355, -1, 357, 358, -1, 360,
+ 351, 352, 353, 354, 355, -1, 357, 358, -1, 360,
361, 362, -1, 364, 365, 366, 367, -1, 369, 370,
-1, -1, -1, -1, -1, -1, -1, -1, 379, 380,
381, -1, 383, 384, -1, 386, 387, 388, 389, 390,
@@ -13331,7 +13016,7 @@ static const yytype_int16 yycheck[] =
318, 319, 320, 321, -1, -1, 324, 325, 326, 327,
-1, 329, 330, 331, 332, 333, 334, 335, 336, 337,
338, 339, 340, -1, 342, 343, 344, -1, -1, 347,
- 348, 349, 350, 351, -1, 353, 354, 355, -1, 357,
+ 348, 349, 350, 351, 352, 353, 354, 355, -1, 357,
358, -1, 360, 361, 362, -1, 364, 365, 366, 367,
-1, 369, 370, -1, -1, -1, -1, -1, -1, -1,
-1, 379, 380, 381, -1, 383, 384, -1, 386, 387,
@@ -13362,129 +13047,384 @@ static const yytype_int16 yycheck[] =
628, 629, -1, -1, 632, 633, -1, -1, 636, 637,
5, -1, 7, 8, 9, 10, 11, -1, -1, 14,
-1, -1, -1, 18, -1, -1, 21, -1, 23, 24,
- 25, 26, 27, 28, 29, -1, 31, -1, -1, -1,
- 35, 36, -1, -1, 39, -1, -1, 42, 43, 44,
- -1, 46, -1, 48, 49, -1, -1, 52, -1, -1,
- 55, 56, -1, 58, 59, -1, 61, 62, -1, 64,
+ 25, 26, 27, 28, 29, -1, 31, -1, -1, 34,
+ 35, 36, 37, 38, 39, 40, -1, 42, 43, 44,
+ -1, 46, -1, 48, 49, -1, -1, 52, 53, 54,
+ 55, 56, -1, 58, 59, 60, 61, 62, -1, 64,
65, 66, 67, 68, 69, 70, -1, 72, 73, 74,
75, 76, 77, 78, 79, -1, 81, 82, 83, 84,
85, 86, 87, 88, -1, 90, 91, -1, 93, 94,
- 95, 96, 97, -1, 99, -1, -1, 102, -1, -1,
- 105, -1, -1, -1, 109, -1, -1, -1, 113, 114,
- 115, -1, -1, 118, -1, -1, -1, -1, 123, 124,
- 125, -1, -1, -1, 129, -1, 131, -1, -1, -1,
+ 95, 96, 97, -1, 99, 100, 101, 102, -1, -1,
+ 105, 106, 107, -1, 109, 110, 111, -1, 113, 114,
+ 115, 116, 117, 118, -1, -1, -1, -1, 123, 124,
+ 125, -1, -1, 128, 129, -1, 131, -1, -1, -1,
135, -1, 137, 138, 139, 140, -1, -1, -1, 144,
-1, -1, 147, 148, 149, -1, -1, -1, 153, -1,
155, 156, -1, 158, 159, 160, -1, -1, 163, 164,
- -1, 166, 167, 168, 169, 170, 171, -1, -1, 174,
- 175, 176, -1, 178, 179, 180, -1, 182, 183, 184,
+ -1, 166, 167, 168, 169, 170, 171, 172, -1, 174,
+ 175, 176, 177, 178, 179, 180, -1, 182, 183, 184,
185, -1, 187, -1, -1, -1, 191, -1, 193, -1,
195, -1, 197, 198, 199, 200, 201, 202, -1, 204,
- -1, -1, -1, 208, 209, 210, -1, 212, 213, 214,
+ -1, 206, -1, 208, 209, 210, -1, 212, 213, 214,
-1, 216, 217, -1, -1, -1, 221, 222, 223, 224,
- -1, -1, 227, 228, 229, -1, 231, -1, 233, -1,
- -1, -1, -1, 238, 239, -1, -1, -1, 243, -1,
+ 225, -1, 227, 228, 229, -1, 231, -1, 233, -1,
+ -1, -1, 237, 238, 239, 240, -1, -1, 243, -1,
245, 246, -1, 248, 249, -1, -1, -1, 253, -1,
- -1, 256, 257, 258, -1, -1, 261, -1, -1, 264,
+ -1, 256, 257, 258, -1, -1, 261, -1, 263, 264,
265, -1, -1, -1, -1, -1, 271, 272, -1, 274,
-1, 276, -1, 278, 279, -1, -1, 282, -1, -1,
-1, -1, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 299, -1, 301, 302, 303, -1,
- 305, 306, 307, 308, -1, 310, 311, -1, -1, -1,
+ 295, 296, 297, 298, 299, -1, 301, 302, 303, 304,
+ 305, 306, 307, 308, 309, 310, 311, -1, -1, -1,
-1, 316, 317, 318, 319, 320, 321, -1, -1, 324,
- 325, -1, 327, -1, 329, -1, 331, 332, 333, 334,
+ 325, 326, 327, -1, 329, 330, 331, 332, 333, 334,
335, 336, 337, 338, 339, 340, -1, 342, 343, 344,
- -1, -1, 347, 348, 349, 350, -1, -1, -1, 354,
+ -1, -1, 347, 348, 349, 350, 351, 352, 353, 354,
355, -1, 357, 358, -1, 360, 361, 362, -1, 364,
365, 366, 367, -1, 369, 370, -1, -1, -1, -1,
- -1, -1, -1, -1, 379, 380, 381, -1, -1, 384,
+ -1, -1, -1, -1, 379, 380, 381, -1, 383, 384,
-1, 386, 387, 388, 389, 390, 391, 392, 393, 394,
- 395, 396, 397, -1, -1, 400, 401, 402, -1, 404,
+ 395, 396, 397, 398, -1, 400, 401, 402, -1, 404,
-1, 406, 407, 408, 409, 410, -1, 412, 413, 414,
-1, -1, 417, -1, -1, -1, 421, 422, 423, 424,
425, -1, -1, 428, 429, 430, 431, 432, -1, 434,
- 435, -1, 437, 438, 439, -1, -1, 442, -1, 444,
- -1, 446, 447, -1, 449, 450, -1, -1, -1, 454,
+ 435, -1, 437, 438, 439, 440, 441, 442, -1, 444,
+ -1, 446, 447, -1, 449, 450, -1, -1, 453, 454,
455, 456, 457, 458, 459, 460, 461, 462, 463, -1,
465, 466, -1, -1, -1, 470, 471, 472, 473, -1,
-1, -1, 477, -1, -1, -1, 481, -1, 483, 484,
485, 486, -1, 488, 489, 490, 491, 492, 493, -1,
-1, -1, -1, -1, -1, 500, 501, -1, 503, -1,
- -1, 506, -1, -1, 509, 510, 511, -1, -1, 514,
- 515, -1, 517, 518, 519, 520, 521, 522, -1, -1,
- 525, 526, 527, 528, -1, 530, 531, -1, 533, -1,
+ -1, 506, -1, -1, 509, 510, 511, 512, 513, 514,
+ 515, -1, 517, 518, 519, 520, 521, 522, 523, 524,
+ 525, 526, 527, 528, 529, 530, 531, -1, 533, -1,
535, 536, 537, 538, -1, 540, 541, 542, -1, 544,
545, 546, 547, -1, -1, -1, -1, -1, 553, 554,
- 555, -1, -1, 558, 559, 560, 561, 562, 563, 564,
+ 555, -1, 557, 558, 559, 560, 561, 562, 563, 564,
565, 566, 567, 568, -1, 570, 571, -1, -1, 574,
-1, -1, 577, -1, 579, -1, 581, 582, 583, -1,
- -1, -1, -1, -1, -1, 590, -1, -1, 593, -1,
- -1, -1, 597, 598, 599, 600, 601, 602, -1, -1,
+ -1, 586, 587, 588, 589, 590, -1, -1, 593, 594,
+ -1, 596, 597, 598, 599, 600, 601, 602, -1, -1,
-1, -1, -1, -1, 609, 610, -1, 612, 613, 614,
- -1, -1, 617, -1, -1, -1, -1, 5, -1, 7,
- 8, 9, 10, 11, -1, -1, 14, -1, -1, -1,
- 18, 636, 637, 21, -1, 23, 24, 25, 26, 27,
- 28, 29, -1, 31, -1, -1, -1, 35, -1, -1,
- -1, 39, -1, -1, 42, 43, 44, -1, 46, -1,
- 48, 49, -1, -1, 52, -1, -1, 55, 56, -1,
- 58, 59, -1, 61, 62, -1, 64, 65, 66, 67,
- 68, 69, 70, -1, 72, 73, 74, 75, 76, 77,
- 78, 79, -1, 81, 82, 83, 84, 85, 86, 87,
- 88, -1, 90, 91, 92, 93, 94, 95, 96, 97,
- -1, 99, -1, -1, 102, -1, -1, 105, -1, -1,
- -1, 109, -1, -1, -1, 113, 114, 115, -1, -1,
- 118, -1, -1, -1, -1, 123, 124, -1, -1, -1,
- -1, 129, -1, 131, -1, -1, -1, 135, -1, 137,
- 138, 139, 140, -1, -1, -1, 144, -1, -1, 147,
- 148, 149, -1, -1, -1, 153, -1, 155, 156, -1,
- 158, 159, 160, -1, -1, 163, 164, -1, 166, 167,
- 168, 169, 170, 171, -1, -1, 174, 175, 176, -1,
- -1, 179, 180, -1, 182, 183, 184, -1, -1, 187,
- -1, -1, -1, 191, -1, 193, 194, 195, -1, 197,
- 198, 199, 200, 201, 202, -1, 204, -1, -1, -1,
- 208, 209, 210, -1, 212, -1, -1, -1, 216, 217,
- -1, -1, -1, 221, 222, 223, 224, -1, -1, 227,
- 228, 229, 230, 231, -1, 233, -1, -1, -1, -1,
- 238, 239, -1, -1, -1, 243, -1, 245, 246, -1,
- 248, 249, -1, -1, -1, 253, 254, -1, 256, 257,
- 258, -1, -1, 261, -1, -1, 264, 265, -1, 267,
- -1, -1, -1, 271, 272, -1, 274, -1, 276, -1,
- 278, 279, -1, -1, -1, -1, -1, -1, -1, 287,
- 288, 289, 290, 291, 292, 293, 294, 295, 296, 297,
- 298, 299, -1, 301, 302, 303, -1, 305, 306, 307,
- 308, -1, 310, 311, -1, -1, -1, -1, 316, 317,
- 318, 319, 320, 321, -1, -1, 324, 325, -1, 327,
- -1, 329, -1, 331, 332, 333, 334, 335, 336, 337,
- 338, 339, 340, -1, -1, 343, 344, -1, -1, 347,
- 348, 349, 350, -1, -1, -1, 354, 355, -1, -1,
- -1, -1, 360, 361, 362, -1, 364, 365, 366, 367,
- -1, 369, 370, -1, -1, -1, -1, -1, -1, -1,
- -1, 379, 380, 381, -1, -1, 384, -1, 386, 387,
- 388, 389, 390, 391, 392, 393, 394, 395, 396, 397,
- -1, -1, 400, 401, 402, -1, 404, -1, 406, 407,
- 408, 409, 410, -1, 412, 413, 414, -1, -1, 417,
- -1, -1, -1, 421, 422, 423, 424, 425, -1, -1,
- 428, 429, 430, 431, 432, -1, 434, 435, -1, 437,
- 438, 439, -1, -1, 442, -1, 444, -1, 446, 447,
- -1, 449, 450, -1, -1, -1, 454, 455, 456, 457,
- 458, 459, 460, 461, 462, 463, -1, 465, 466, 467,
- -1, -1, 470, 471, 472, 473, -1, -1, -1, 477,
- -1, -1, -1, 481, -1, 483, 484, 485, 486, -1,
- 488, 489, 490, 491, 492, 493, 494, -1, -1, -1,
- -1, -1, 500, 501, -1, 503, -1, -1, 506, -1,
- -1, 509, 510, 511, -1, -1, 514, 515, -1, 517,
- 518, 519, 520, 521, 522, -1, -1, 525, 526, 527,
- 528, -1, 530, 531, -1, 533, -1, 535, 536, 537,
- 538, -1, -1, 541, 542, -1, 544, 545, 546, 547,
- -1, -1, -1, -1, -1, 553, 554, 555, -1, -1,
- -1, 559, 560, 561, 562, -1, 564, 565, -1, 567,
- 568, -1, 570, 571, -1, -1, 574, -1, -1, 577,
- -1, 579, -1, 581, 582, 583, -1, -1, -1, -1,
- -1, -1, 590, -1, -1, 593, -1, -1, -1, 597,
- 598, 599, 600, 601, 602, -1, -1, -1, -1, -1,
- -1, 609, 610, -1, 612, 613, 614, -1, -1, 617,
+ -1, -1, 617, -1, -1, -1, -1, 622, 623, -1,
+ -1, -1, -1, 628, 629, -1, -1, 632, 633, -1,
+ -1, 636, 637, 5, -1, 7, 8, 9, 10, 11,
+ -1, -1, 14, -1, -1, -1, 18, -1, -1, 21,
+ -1, 23, 24, 25, 26, 27, 28, 29, -1, 31,
+ -1, -1, 34, 35, 36, 37, 38, 39, 40, -1,
+ 42, 43, 44, -1, 46, -1, 48, 49, -1, -1,
+ 52, 53, 54, 55, 56, -1, 58, 59, 60, 61,
+ 62, -1, 64, 65, 66, 67, 68, 69, 70, -1,
+ 72, 73, 74, 75, 76, 77, 78, 79, -1, 81,
+ 82, 83, 84, 85, 86, 87, 88, -1, 90, 91,
+ -1, 93, 94, 95, 96, 97, -1, 99, 100, 101,
+ 102, -1, -1, 105, 106, 107, -1, 109, 110, 111,
+ -1, 113, 114, 115, 116, 117, 118, -1, -1, -1,
+ -1, 123, 124, 125, -1, -1, 128, 129, -1, 131,
+ -1, -1, -1, 135, -1, 137, 138, 139, 140, -1,
+ -1, -1, 144, -1, -1, 147, 148, 149, -1, -1,
+ -1, 153, -1, 155, 156, -1, 158, 159, 160, -1,
+ -1, 163, 164, -1, 166, 167, 168, 169, 170, 171,
+ 172, -1, 174, 175, 176, 177, 178, 179, 180, -1,
+ 182, 183, 184, 185, -1, 187, -1, -1, -1, 191,
+ -1, 193, -1, 195, -1, 197, 198, 199, 200, 201,
+ 202, -1, 204, -1, 206, -1, 208, 209, 210, -1,
+ 212, 213, 214, -1, 216, 217, -1, -1, -1, 221,
+ 222, 223, 224, 225, -1, 227, 228, 229, -1, 231,
+ -1, 233, -1, -1, -1, 237, 238, 239, 240, -1,
+ -1, 243, -1, 245, 246, -1, 248, 249, -1, -1,
+ -1, 253, -1, -1, 256, 257, 258, -1, -1, 261,
+ -1, 263, 264, 265, -1, -1, -1, -1, -1, 271,
+ 272, -1, 274, -1, 276, -1, 278, 279, -1, -1,
+ 282, -1, -1, -1, -1, 287, 288, 289, 290, 291,
+ 292, 293, 294, 295, 296, 297, 298, 299, -1, 301,
+ 302, 303, 304, 305, 306, 307, 308, 309, 310, 311,
+ 312, -1, -1, -1, 316, 317, 318, 319, 320, 321,
+ -1, -1, 324, 325, 326, 327, -1, 329, 330, 331,
+ 332, 333, 334, 335, 336, 337, 338, 339, 340, -1,
+ 342, 343, 344, -1, -1, 347, 348, 349, 350, 351,
+ -1, 353, 354, 355, -1, 357, 358, -1, 360, 361,
+ 362, -1, 364, 365, 366, 367, -1, 369, 370, -1,
+ -1, -1, -1, -1, -1, -1, -1, 379, 380, 381,
+ -1, 383, 384, -1, 386, 387, 388, 389, 390, 391,
+ 392, 393, 394, 395, 396, 397, 398, -1, 400, 401,
+ 402, -1, 404, -1, 406, 407, 408, 409, 410, -1,
+ 412, 413, 414, -1, -1, 417, -1, -1, -1, 421,
+ 422, 423, 424, 425, -1, -1, 428, 429, 430, 431,
+ 432, -1, 434, 435, -1, 437, 438, 439, 440, 441,
+ 442, -1, 444, -1, 446, 447, -1, 449, 450, -1,
+ -1, 453, 454, 455, 456, 457, 458, 459, 460, 461,
+ 462, 463, -1, 465, 466, -1, -1, -1, 470, 471,
+ 472, 473, -1, -1, -1, 477, -1, -1, -1, 481,
+ -1, 483, 484, 485, 486, -1, 488, 489, 490, 491,
+ 492, 493, -1, -1, -1, -1, -1, -1, 500, 501,
+ -1, 503, -1, -1, 506, -1, -1, 509, 510, 511,
+ 512, 513, 514, 515, -1, 517, 518, 519, 520, 521,
+ 522, 523, 524, 525, 526, 527, 528, 529, 530, 531,
+ -1, 533, -1, 535, 536, 537, 538, -1, 540, 541,
+ 542, -1, 544, 545, 546, 547, -1, -1, -1, -1,
+ -1, 553, 554, 555, -1, 557, 558, 559, 560, 561,
+ 562, 563, 564, 565, 566, 567, 568, -1, 570, 571,
+ -1, -1, 574, -1, -1, 577, -1, 579, -1, 581,
+ 582, 583, -1, -1, 586, 587, 588, 589, 590, -1,
+ -1, 593, 594, -1, 596, 597, 598, 599, 600, 601,
+ 602, -1, -1, -1, -1, -1, -1, 609, 610, -1,
+ 612, 613, 614, -1, -1, 617, -1, -1, -1, -1,
+ 622, 623, -1, -1, -1, -1, 628, 629, -1, -1,
+ 632, 633, -1, -1, 636, 637, 5, -1, 7, 8,
+ 9, 10, 11, -1, -1, 14, -1, -1, -1, 18,
+ -1, -1, 21, -1, 23, 24, 25, 26, 27, 28,
+ 29, -1, 31, -1, -1, 34, 35, 36, 37, 38,
+ 39, 40, -1, 42, 43, 44, -1, 46, -1, 48,
+ 49, -1, -1, 52, 53, 54, 55, 56, -1, 58,
+ 59, 60, 61, 62, -1, 64, 65, 66, 67, 68,
+ 69, 70, -1, 72, 73, 74, 75, 76, 77, 78,
+ 79, -1, 81, 82, 83, 84, 85, 86, 87, 88,
+ -1, 90, 91, -1, 93, 94, 95, 96, 97, -1,
+ 99, 100, 101, 102, -1, -1, 105, 106, 107, -1,
+ 109, 110, 111, -1, 113, 114, 115, 116, 117, 118,
+ -1, -1, -1, -1, 123, 124, 125, -1, -1, 128,
+ 129, -1, 131, -1, -1, -1, 135, -1, 137, 138,
+ 139, 140, -1, -1, -1, 144, -1, -1, 147, 148,
+ 149, -1, -1, -1, 153, -1, 155, 156, -1, 158,
+ 159, 160, -1, -1, 163, 164, -1, 166, 167, 168,
+ 169, 170, 171, 172, -1, 174, 175, 176, 177, 178,
+ 179, 180, -1, 182, 183, 184, 185, -1, 187, -1,
+ -1, -1, 191, -1, 193, -1, 195, -1, 197, 198,
+ 199, 200, 201, 202, -1, 204, -1, 206, -1, 208,
+ 209, 210, -1, 212, 213, 214, -1, 216, 217, -1,
+ -1, -1, 221, 222, 223, 224, 225, -1, 227, 228,
+ 229, -1, 231, -1, 233, -1, -1, -1, 237, 238,
+ 239, 240, -1, -1, 243, -1, 245, 246, -1, 248,
+ 249, -1, -1, -1, 253, -1, -1, 256, 257, 258,
+ -1, -1, 261, -1, 263, 264, 265, -1, -1, -1,
+ -1, -1, 271, 272, -1, 274, -1, 276, -1, 278,
+ 279, -1, -1, 282, -1, -1, -1, -1, 287, 288,
+ 289, 290, 291, 292, 293, 294, 295, 296, 297, 298,
+ 299, -1, 301, 302, 303, 304, 305, 306, 307, 308,
+ 309, 310, 311, -1, -1, -1, -1, 316, 317, 318,
+ 319, 320, 321, -1, -1, 324, 325, 326, 327, -1,
+ 329, 330, 331, 332, 333, 334, 335, 336, 337, 338,
+ 339, 340, -1, 342, 343, 344, -1, -1, 347, 348,
+ 349, 350, 351, -1, 353, 354, 355, -1, 357, 358,
+ -1, 360, 361, 362, -1, 364, 365, 366, 367, -1,
+ 369, 370, -1, -1, -1, -1, -1, -1, -1, -1,
+ 379, 380, 381, -1, 383, 384, -1, 386, 387, 388,
+ 389, 390, 391, 392, 393, 394, 395, 396, 397, 398,
+ -1, 400, 401, 402, -1, 404, -1, 406, 407, 408,
+ 409, 410, -1, 412, 413, 414, -1, -1, 417, -1,
+ -1, -1, 421, 422, 423, 424, 425, -1, -1, 428,
+ 429, 430, 431, 432, -1, 434, 435, -1, 437, 438,
+ 439, 440, 441, 442, -1, 444, -1, 446, 447, -1,
+ 449, 450, -1, -1, 453, 454, 455, 456, 457, 458,
+ 459, 460, 461, 462, 463, -1, 465, 466, -1, -1,
+ -1, 470, 471, 472, 473, -1, -1, -1, 477, -1,
+ -1, -1, 481, -1, 483, 484, 485, 486, -1, 488,
+ 489, 490, 491, 492, 493, -1, -1, -1, -1, -1,
+ -1, 500, 501, -1, 503, -1, -1, 506, -1, -1,
+ 509, 510, 511, 512, 513, 514, 515, -1, 517, 518,
+ 519, 520, 521, 522, 523, 524, 525, 526, 527, 528,
+ 529, 530, 531, -1, 533, -1, 535, 536, 537, 538,
+ -1, 540, 541, 542, -1, 544, 545, 546, 547, -1,
+ -1, -1, -1, -1, 553, 554, 555, -1, 557, 558,
+ 559, 560, 561, 562, 563, 564, 565, 566, 567, 568,
+ -1, 570, 571, -1, -1, 574, -1, -1, 577, -1,
+ 579, -1, 581, 582, 583, -1, -1, 586, 587, 588,
+ 589, 590, -1, -1, 593, 594, -1, 596, 597, 598,
+ 599, 600, 601, 602, -1, -1, -1, -1, -1, -1,
+ 609, 610, -1, 612, 613, 614, -1, -1, 617, -1,
+ -1, -1, -1, 622, 623, -1, -1, -1, -1, 628,
+ 629, -1, -1, 632, 633, -1, -1, 636, 637, 5,
+ -1, 7, 8, 9, 10, 11, -1, -1, 14, -1,
+ -1, -1, 18, -1, -1, 21, -1, 23, 24, 25,
+ 26, 27, 28, 29, -1, 31, -1, -1, 34, 35,
+ 36, 37, 38, 39, 40, -1, 42, 43, 44, -1,
+ 46, -1, 48, 49, -1, -1, 52, 53, 54, 55,
+ 56, -1, 58, 59, 60, 61, 62, -1, 64, 65,
+ 66, 67, 68, 69, 70, -1, 72, 73, 74, 75,
+ 76, 77, 78, 79, -1, 81, 82, 83, 84, 85,
+ 86, 87, 88, -1, 90, 91, -1, 93, 94, 95,
+ 96, 97, -1, 99, 100, 101, 102, -1, -1, 105,
+ 106, 107, -1, 109, 110, 111, -1, 113, 114, 115,
+ 116, 117, 118, -1, -1, -1, -1, 123, 124, 125,
+ -1, -1, 128, 129, -1, 131, -1, -1, -1, 135,
+ -1, 137, 138, 139, 140, -1, -1, -1, 144, -1,
+ -1, 147, 148, 149, -1, -1, -1, 153, -1, 155,
+ 156, -1, 158, 159, 160, -1, -1, 163, 164, -1,
+ 166, 167, 168, 169, 170, 171, 172, -1, 174, 175,
+ 176, 177, 178, 179, 180, -1, 182, 183, 184, 185,
+ -1, 187, -1, -1, -1, 191, -1, 193, -1, 195,
+ -1, 197, 198, 199, 200, 201, 202, -1, 204, -1,
+ 206, -1, 208, 209, 210, -1, 212, 213, 214, -1,
+ 216, 217, -1, -1, -1, 221, 222, 223, 224, 225,
+ -1, 227, 228, 229, -1, 231, -1, 233, -1, -1,
+ -1, 237, 238, 239, 240, -1, -1, 243, -1, 245,
+ 246, -1, 248, 249, -1, -1, -1, 253, -1, -1,
+ 256, 257, 258, -1, -1, 261, -1, 263, 264, 265,
+ -1, -1, -1, -1, -1, 271, 272, -1, 274, -1,
+ 276, -1, 278, 279, -1, -1, 282, -1, -1, -1,
+ -1, 287, 288, 289, 290, 291, 292, 293, 294, 295,
+ 296, 297, 298, 299, -1, 301, 302, 303, 304, 305,
+ 306, 307, 308, 309, 310, 311, -1, -1, -1, -1,
+ 316, 317, 318, 319, 320, 321, -1, -1, 324, 325,
+ 326, 327, -1, 329, 330, 331, 332, 333, 334, 335,
+ 336, 337, 338, 339, 340, -1, 342, 343, 344, -1,
+ -1, 347, 348, 349, 350, 351, -1, 353, 354, 355,
+ -1, 357, 358, -1, 360, 361, 362, -1, 364, 365,
+ 366, 367, -1, 369, 370, -1, -1, -1, -1, -1,
+ -1, -1, -1, 379, 380, 381, -1, 383, 384, -1,
+ 386, 387, 388, 389, 390, 391, 392, 393, 394, 395,
+ 396, 397, 398, -1, 400, 401, 402, -1, 404, -1,
+ 406, 407, 408, 409, 410, -1, 412, 413, 414, -1,
+ -1, 417, -1, -1, -1, 421, 422, 423, 424, 425,
+ -1, -1, 428, 429, 430, 431, 432, -1, 434, 435,
+ -1, 437, 438, 439, 440, 441, 442, -1, 444, -1,
+ 446, 447, -1, 449, 450, -1, -1, 453, 454, 455,
+ 456, 457, 458, 459, 460, 461, 462, 463, -1, 465,
+ 466, -1, -1, -1, 470, 471, 472, 473, -1, -1,
+ -1, 477, -1, -1, -1, 481, -1, 483, 484, 485,
+ 486, -1, 488, 489, 490, 491, 492, 493, -1, -1,
+ -1, -1, -1, -1, 500, 501, -1, 503, -1, -1,
+ 506, -1, -1, 509, 510, 511, 512, 513, 514, 515,
+ -1, 517, 518, 519, 520, 521, 522, 523, 524, 525,
+ 526, 527, 528, 529, 530, 531, -1, 533, -1, 535,
+ 536, 537, 538, -1, 540, 541, 542, -1, 544, 545,
+ 546, 547, -1, -1, -1, -1, -1, 553, 554, 555,
+ -1, 557, 558, 559, 560, 561, 562, 563, 564, 565,
+ 566, 567, 568, -1, 570, 571, -1, -1, 574, -1,
+ -1, 577, -1, 579, -1, 581, 582, 583, -1, -1,
+ 586, 587, 588, 589, 590, -1, -1, 593, 594, -1,
+ 596, 597, 598, 599, 600, 601, 602, -1, -1, -1,
+ -1, -1, -1, 609, 610, -1, 612, 613, 614, -1,
+ -1, 617, -1, -1, -1, -1, 622, 623, -1, -1,
+ -1, -1, 628, 629, -1, -1, 632, 633, -1, -1,
+ 636, 637, 5, -1, 7, 8, 9, 10, 11, -1,
+ -1, 14, -1, -1, -1, 18, -1, -1, 21, -1,
+ 23, 24, 25, 26, 27, 28, 29, -1, 31, -1,
+ -1, 34, 35, 36, 37, 38, 39, 40, -1, 42,
+ 43, 44, -1, 46, -1, 48, 49, -1, -1, 52,
+ 53, 54, 55, 56, -1, 58, 59, 60, 61, 62,
+ -1, 64, 65, 66, 67, 68, 69, 70, -1, 72,
+ 73, 74, 75, 76, 77, 78, 79, -1, 81, 82,
+ 83, 84, 85, 86, 87, 88, -1, 90, 91, -1,
+ 93, 94, 95, 96, 97, -1, 99, 100, 101, 102,
+ -1, -1, 105, 106, 107, -1, 109, 110, 111, -1,
+ 113, 114, 115, 116, 117, 118, -1, -1, -1, -1,
+ 123, 124, 125, -1, -1, 128, 129, -1, 131, -1,
+ -1, -1, 135, -1, 137, 138, 139, 140, -1, -1,
+ -1, 144, -1, -1, 147, 148, 149, -1, -1, -1,
+ 153, -1, 155, 156, -1, 158, 159, 160, -1, -1,
+ 163, 164, -1, 166, 167, 168, 169, 170, 171, 172,
+ -1, 174, 175, 176, 177, 178, 179, 180, -1, 182,
+ 183, 184, 185, -1, 187, -1, -1, -1, 191, -1,
+ 193, -1, 195, -1, 197, 198, 199, 200, 201, 202,
+ -1, 204, -1, 206, -1, 208, 209, 210, -1, 212,
+ 213, 214, -1, 216, 217, -1, -1, -1, 221, 222,
+ 223, 224, 225, -1, 227, 228, 229, -1, 231, -1,
+ 233, -1, -1, -1, 237, 238, 239, 240, -1, -1,
+ 243, -1, 245, 246, -1, 248, 249, -1, -1, -1,
+ 253, -1, -1, 256, 257, 258, -1, -1, 261, -1,
+ 263, 264, 265, -1, -1, -1, -1, -1, 271, 272,
+ -1, 274, -1, 276, -1, 278, 279, -1, -1, 282,
+ -1, -1, -1, -1, 287, 288, 289, 290, 291, 292,
+ 293, 294, 295, 296, 297, 298, 299, -1, 301, 302,
+ 303, 304, 305, 306, 307, 308, 309, 310, 311, -1,
+ -1, -1, -1, 316, 317, 318, 319, 320, 321, -1,
+ -1, 324, 325, 326, 327, -1, 329, 330, 331, 332,
+ 333, 334, 335, 336, 337, 338, 339, 340, -1, 342,
+ 343, 344, -1, -1, 347, 348, 349, 350, 351, -1,
+ 353, 354, 355, -1, 357, 358, -1, 360, 361, 362,
+ -1, 364, 365, 366, 367, -1, 369, 370, -1, -1,
+ -1, -1, -1, -1, -1, -1, 379, 380, 381, -1,
+ 383, 384, -1, 386, 387, 388, 389, 390, 391, 392,
+ 393, 394, 395, 396, 397, 398, -1, 400, 401, 402,
+ -1, 404, -1, 406, 407, 408, 409, 410, -1, 412,
+ 413, 414, -1, -1, 417, -1, -1, -1, 421, 422,
+ 423, 424, 425, -1, -1, 428, 429, 430, 431, 432,
+ -1, 434, 435, -1, 437, 438, 439, 440, 441, 442,
+ -1, 444, -1, 446, 447, -1, 449, 450, -1, -1,
+ 453, 454, 455, 456, 457, 458, 459, 460, 461, 462,
+ 463, -1, 465, 466, -1, -1, -1, 470, 471, 472,
+ 473, -1, -1, -1, 477, -1, -1, -1, 481, -1,
+ 483, 484, 485, 486, -1, 488, 489, 490, 491, 492,
+ 493, -1, -1, -1, -1, -1, -1, 500, 501, -1,
+ 503, -1, -1, 506, -1, -1, 509, 510, 511, 512,
+ 513, 514, 515, -1, 517, 518, 519, 520, 521, 522,
+ 523, 524, 525, 526, 527, 528, 529, 530, 531, -1,
+ 533, -1, 535, 536, 537, 538, -1, 540, 541, 542,
+ -1, 544, 545, 546, 547, -1, -1, -1, -1, -1,
+ 553, 554, 555, -1, 557, 558, 559, 560, 561, 562,
+ 563, 564, 565, 566, 567, 568, -1, 570, 571, -1,
+ -1, 574, -1, -1, 577, -1, 579, -1, 581, 582,
+ 583, -1, -1, 586, 587, 588, 589, 590, -1, -1,
+ 593, 594, -1, 596, 597, 598, 599, 600, 601, 602,
+ -1, -1, -1, -1, -1, -1, 609, 610, -1, 612,
+ 613, 614, -1, -1, 617, -1, -1, -1, -1, 622,
+ 623, -1, -1, -1, -1, 628, 629, -1, -1, 632,
+ 633, -1, -1, 636, 637, 5, -1, 7, 8, 9,
+ 10, 11, -1, -1, 14, -1, -1, -1, 18, -1,
+ -1, 21, -1, 23, 24, 25, 26, 27, 28, 29,
+ -1, 31, -1, -1, -1, 35, 36, -1, -1, 39,
+ -1, -1, 42, 43, 44, -1, 46, -1, 48, 49,
+ -1, -1, 52, -1, -1, 55, 56, -1, 58, 59,
+ -1, 61, 62, -1, 64, 65, 66, 67, 68, 69,
+ 70, -1, 72, 73, 74, 75, 76, 77, 78, 79,
+ -1, 81, 82, 83, 84, 85, 86, 87, 88, -1,
+ 90, 91, -1, 93, 94, 95, 96, 97, -1, 99,
+ -1, -1, 102, -1, -1, 105, -1, -1, -1, 109,
+ -1, -1, -1, 113, 114, 115, -1, -1, 118, -1,
+ -1, -1, -1, 123, 124, 125, -1, -1, -1, 129,
+ -1, 131, -1, -1, -1, 135, -1, 137, 138, 139,
+ 140, -1, -1, -1, 144, -1, -1, 147, 148, 149,
+ -1, -1, -1, 153, -1, 155, 156, -1, 158, 159,
+ 160, -1, -1, 163, 164, -1, 166, 167, 168, 169,
+ 170, 171, -1, -1, 174, 175, 176, -1, 178, 179,
+ 180, -1, 182, 183, 184, 185, -1, 187, -1, -1,
+ -1, 191, -1, 193, -1, 195, -1, 197, 198, 199,
+ 200, 201, 202, -1, 204, -1, -1, -1, 208, 209,
+ 210, -1, 212, 213, 214, -1, 216, 217, -1, -1,
+ -1, 221, 222, 223, 224, -1, -1, 227, 228, 229,
+ -1, 231, -1, 233, -1, -1, -1, -1, 238, 239,
+ -1, -1, -1, 243, -1, 245, 246, -1, 248, 249,
+ -1, -1, -1, 253, -1, -1, 256, 257, 258, -1,
+ -1, 261, -1, -1, 264, 265, -1, -1, -1, -1,
+ -1, 271, 272, -1, 274, -1, 276, -1, 278, 279,
+ -1, -1, 282, -1, -1, -1, -1, 287, 288, 289,
+ 290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
+ -1, 301, 302, 303, -1, 305, 306, 307, 308, -1,
+ 310, 311, -1, -1, -1, -1, 316, 317, 318, 319,
+ 320, 321, -1, -1, 324, 325, -1, 327, -1, 329,
+ -1, 331, 332, 333, 334, 335, 336, 337, 338, 339,
+ 340, -1, 342, 343, 344, -1, -1, 347, 348, 349,
+ 350, -1, -1, -1, 354, 355, -1, 357, 358, -1,
+ 360, 361, 362, -1, 364, 365, 366, 367, -1, 369,
+ 370, -1, -1, -1, -1, -1, -1, -1, -1, 379,
+ 380, 381, -1, -1, 384, -1, 386, 387, 388, 389,
+ 390, 391, 392, 393, 394, 395, 396, 397, -1, -1,
+ 400, 401, 402, -1, 404, -1, 406, 407, 408, 409,
+ 410, -1, 412, 413, 414, -1, -1, 417, -1, -1,
+ -1, 421, 422, 423, 424, 425, -1, -1, 428, 429,
+ 430, 431, 432, -1, 434, 435, -1, 437, 438, 439,
+ -1, -1, 442, -1, 444, -1, 446, 447, -1, 449,
+ 450, -1, -1, -1, 454, 455, 456, 457, 458, 459,
+ 460, 461, 462, 463, -1, 465, 466, -1, -1, -1,
+ 470, 471, 472, 473, -1, -1, -1, 477, -1, -1,
+ -1, 481, -1, 483, 484, 485, 486, -1, 488, 489,
+ 490, 491, 492, 493, -1, -1, -1, -1, -1, -1,
+ 500, 501, -1, 503, -1, -1, 506, -1, -1, 509,
+ 510, 511, -1, -1, 514, 515, -1, 517, 518, 519,
+ 520, 521, 522, -1, -1, 525, 526, 527, 528, -1,
+ 530, 531, -1, 533, -1, 535, 536, 537, 538, -1,
+ 540, 541, 542, -1, 544, 545, 546, 547, -1, -1,
+ -1, -1, -1, 553, 554, 555, -1, -1, 558, 559,
+ 560, 561, 562, 563, 564, 565, 566, 567, 568, -1,
+ 570, 571, -1, -1, 574, -1, -1, 577, -1, 579,
+ -1, 581, 582, 583, -1, -1, -1, -1, -1, -1,
+ 590, -1, -1, 593, -1, -1, -1, 597, 598, 599,
+ 600, 601, 602, -1, -1, -1, -1, -1, -1, 609,
+ 610, -1, 612, 613, 614, -1, -1, 617, -1, -1,
-1, -1, 5, -1, 7, 8, 9, 10, 11, -1,
- -1, 14, -1, -1, -1, 18, -1, -1, 21, 637,
+ -1, 14, -1, -1, -1, 18, 636, 637, 21, -1,
23, 24, 25, 26, 27, 28, 29, -1, 31, -1,
-1, -1, 35, -1, -1, -1, 39, -1, -1, 42,
43, 44, -1, 46, -1, 48, 49, -1, -1, 52,
@@ -13509,7 +13449,7 @@ static const yytype_int16 yycheck[] =
233, -1, -1, -1, -1, 238, 239, -1, -1, -1,
243, -1, 245, 246, -1, 248, 249, -1, -1, -1,
253, 254, -1, 256, 257, 258, -1, -1, 261, -1,
- -1, 264, 265, -1, -1, -1, -1, -1, 271, 272,
+ -1, 264, 265, -1, 267, -1, -1, -1, 271, 272,
-1, 274, -1, 276, -1, 278, 279, -1, -1, -1,
-1, -1, -1, -1, 287, 288, 289, 290, 291, 292,
293, 294, 295, 296, 297, 298, 299, -1, 301, 302,
@@ -13529,7 +13469,7 @@ static const yytype_int16 yycheck[] =
-1, 434, 435, -1, 437, 438, 439, -1, -1, 442,
-1, 444, -1, 446, 447, -1, 449, 450, -1, -1,
-1, 454, 455, 456, 457, 458, 459, 460, 461, 462,
- 463, -1, 465, 466, -1, -1, -1, 470, 471, 472,
+ 463, -1, 465, 466, 467, -1, -1, 470, 471, 472,
473, -1, -1, -1, 477, -1, -1, -1, 481, -1,
483, 484, 485, 486, -1, 488, 489, 490, 491, 492,
493, 494, -1, -1, -1, -1, -1, 500, 501, -1,
@@ -13553,7 +13493,7 @@ static const yytype_int16 yycheck[] =
58, 59, -1, 61, 62, -1, 64, 65, 66, 67,
68, 69, 70, -1, 72, 73, 74, 75, 76, 77,
78, 79, -1, 81, 82, 83, 84, 85, 86, 87,
- 88, -1, 90, 91, -1, 93, 94, 95, 96, 97,
+ 88, -1, 90, 91, 92, 93, 94, 95, 96, 97,
-1, 99, -1, -1, 102, -1, -1, 105, -1, -1,
-1, 109, -1, -1, -1, 113, 114, 115, -1, -1,
118, -1, -1, -1, -1, 123, 124, -1, -1, -1,
@@ -13563,13 +13503,13 @@ static const yytype_int16 yycheck[] =
158, 159, 160, -1, -1, 163, 164, -1, 166, 167,
168, 169, 170, 171, -1, -1, 174, 175, 176, -1,
-1, 179, 180, -1, 182, 183, 184, -1, -1, 187,
- -1, -1, -1, 191, -1, 193, -1, 195, -1, 197,
+ -1, -1, -1, 191, -1, 193, 194, 195, -1, 197,
198, 199, 200, 201, 202, -1, 204, -1, -1, -1,
208, 209, 210, -1, 212, -1, -1, -1, 216, 217,
-1, -1, -1, 221, 222, 223, 224, -1, -1, 227,
- 228, 229, -1, 231, -1, 233, -1, -1, -1, -1,
+ 228, 229, 230, 231, -1, 233, -1, -1, -1, -1,
238, 239, -1, -1, -1, 243, -1, 245, 246, -1,
- 248, 249, -1, -1, -1, 253, -1, -1, 256, 257,
+ 248, 249, -1, -1, -1, 253, 254, -1, 256, 257,
258, -1, -1, 261, -1, -1, 264, 265, -1, -1,
-1, -1, -1, 271, 272, -1, 274, -1, 276, -1,
278, 279, -1, -1, -1, -1, -1, -1, -1, 287,
@@ -13590,10 +13530,10 @@ static const yytype_int16 yycheck[] =
428, 429, 430, 431, 432, -1, 434, 435, -1, 437,
438, 439, -1, -1, 442, -1, 444, -1, 446, 447,
-1, 449, 450, -1, -1, -1, 454, 455, 456, 457,
- 458, 459, 460, 461, 462, 463, -1, 465, 466, 467,
+ 458, 459, 460, 461, 462, 463, -1, 465, 466, -1,
-1, -1, 470, 471, 472, 473, -1, -1, -1, 477,
-1, -1, -1, 481, -1, 483, 484, 485, 486, -1,
- 488, 489, 490, 491, 492, 493, -1, -1, -1, -1,
+ 488, 489, 490, 491, 492, 493, 494, -1, -1, -1,
-1, -1, 500, 501, -1, 503, -1, -1, 506, -1,
-1, 509, 510, 511, -1, -1, 514, 515, -1, 517,
518, 519, 520, 521, 522, -1, -1, 525, 526, 527,
@@ -13607,7 +13547,7 @@ static const yytype_int16 yycheck[] =
598, 599, 600, 601, 602, -1, -1, -1, -1, -1,
-1, 609, 610, -1, 612, 613, 614, -1, -1, 617,
-1, -1, 5, -1, 7, 8, 9, 10, 11, -1,
- -1, 14, 630, -1, -1, 18, -1, -1, 21, 637,
+ -1, 14, -1, -1, -1, 18, -1, -1, 21, 637,
23, 24, 25, 26, 27, 28, 29, -1, 31, -1,
-1, -1, 35, -1, -1, -1, 39, -1, -1, 42,
43, 44, -1, 46, -1, 48, 49, -1, -1, 52,
@@ -13652,7 +13592,7 @@ static const yytype_int16 yycheck[] =
-1, 434, 435, -1, 437, 438, 439, -1, -1, 442,
-1, 444, -1, 446, 447, -1, 449, 450, -1, -1,
-1, 454, 455, 456, 457, 458, 459, 460, 461, 462,
- 463, -1, 465, 466, -1, -1, -1, 470, 471, 472,
+ 463, -1, 465, 466, 467, -1, -1, 470, 471, 472,
473, -1, -1, -1, 477, -1, -1, -1, 481, -1,
483, 484, 485, 486, -1, 488, 489, 490, 491, 492,
493, -1, -1, -1, -1, -1, -1, 500, 501, -1,
@@ -13663,136 +13603,136 @@ static const yytype_int16 yycheck[] =
-1, 544, 545, 546, 547, -1, -1, -1, -1, -1,
553, 554, 555, -1, -1, -1, 559, 560, 561, 562,
-1, 564, 565, -1, 567, 568, -1, 570, 571, -1,
- -1, 574, -1, -1, 577, -1, 579, -1, 581, 582,
- 583, -1, -1, -1, -1, -1, -1, 590, -1, -1,
- 593, -1, -1, -1, 597, 598, 599, 600, 601, 602,
- -1, -1, -1, -1, -1, -1, 609, 610, -1, 612,
- 613, 614, -1, -1, 617, -1, -1, -1, -1, 5,
- -1, 7, 8, 9, 10, 11, -1, 630, 14, -1,
- -1, -1, 18, 636, 637, 21, -1, 23, 24, 25,
- 26, 27, 28, 29, -1, 31, -1, -1, -1, 35,
- -1, -1, -1, 39, -1, -1, 42, 43, 44, -1,
- 46, -1, 48, 49, -1, -1, 52, -1, -1, 55,
- 56, -1, 58, 59, -1, 61, 62, -1, 64, 65,
- 66, 67, 68, 69, 70, -1, 72, 73, 74, 75,
- 76, 77, 78, 79, -1, 81, 82, 83, 84, 85,
- 86, 87, 88, -1, 90, 91, -1, 93, 94, 95,
- 96, 97, -1, 99, -1, -1, 102, -1, -1, 105,
- -1, -1, -1, 109, -1, -1, -1, 113, 114, 115,
- -1, -1, 118, -1, -1, -1, -1, 123, 124, -1,
- -1, -1, -1, 129, -1, 131, -1, -1, -1, 135,
- -1, 137, 138, 139, 140, -1, -1, -1, 144, -1,
- -1, 147, 148, 149, -1, -1, -1, 153, -1, 155,
- 156, -1, 158, 159, 160, -1, -1, 163, 164, -1,
- 166, 167, 168, 169, 170, 171, -1, -1, 174, 175,
- 176, -1, -1, 179, 180, -1, 182, 183, 184, -1,
- -1, 187, -1, -1, -1, 191, -1, 193, -1, 195,
- -1, 197, 198, 199, 200, 201, 202, -1, 204, -1,
- -1, -1, 208, 209, 210, -1, 212, -1, -1, -1,
- 216, 217, -1, -1, -1, 221, 222, 223, 224, -1,
- -1, 227, 228, 229, -1, 231, -1, 233, -1, -1,
- -1, -1, 238, 239, -1, -1, -1, 243, -1, 245,
- 246, -1, 248, 249, -1, -1, -1, 253, -1, -1,
- 256, 257, 258, -1, -1, 261, -1, -1, 264, 265,
- -1, -1, -1, -1, -1, 271, 272, -1, 274, -1,
- 276, -1, 278, 279, -1, -1, -1, -1, -1, -1,
- -1, 287, 288, 289, 290, 291, 292, 293, 294, 295,
- 296, 297, 298, 299, -1, 301, 302, 303, -1, 305,
- 306, 307, 308, -1, 310, 311, -1, -1, -1, -1,
- 316, 317, 318, 319, 320, 321, -1, -1, 324, 325,
- -1, 327, -1, 329, -1, 331, 332, 333, 334, 335,
- 336, 337, 338, 339, 340, -1, -1, 343, 344, -1,
- -1, 347, 348, 349, 350, -1, -1, -1, 354, 355,
- -1, -1, -1, -1, 360, 361, 362, -1, 364, 365,
- 366, 367, -1, 369, 370, -1, -1, -1, -1, -1,
- -1, -1, -1, 379, 380, 381, -1, -1, 384, -1,
- 386, 387, 388, 389, 390, 391, 392, 393, 394, 395,
- 396, 397, -1, -1, 400, 401, 402, -1, 404, -1,
- 406, 407, 408, 409, 410, -1, 412, 413, 414, -1,
- -1, 417, -1, -1, -1, 421, 422, 423, 424, 425,
- -1, -1, 428, 429, 430, 431, 432, -1, 434, 435,
- -1, 437, 438, 439, -1, -1, 442, -1, 444, -1,
- 446, 447, -1, 449, 450, -1, -1, -1, 454, 455,
- 456, 457, 458, 459, 460, 461, 462, 463, -1, 465,
- 466, -1, -1, -1, 470, 471, 472, 473, -1, -1,
- -1, 477, -1, -1, -1, 481, -1, 483, 484, 485,
- 486, -1, 488, 489, 490, 491, 492, 493, -1, -1,
- -1, -1, -1, -1, 500, 501, -1, 503, -1, -1,
- 506, -1, -1, 509, 510, 511, -1, -1, 514, 515,
- -1, 517, 518, 519, 520, 521, 522, -1, -1, 525,
- 526, 527, 528, -1, 530, 531, -1, 533, -1, 535,
- 536, 537, 538, -1, -1, 541, 542, -1, 544, 545,
- 546, 547, -1, -1, -1, -1, -1, 553, 554, 555,
- -1, -1, -1, 559, 560, 561, 562, -1, 564, 565,
- -1, 567, 568, -1, 570, 571, -1, -1, 574, -1,
- -1, 577, -1, 579, -1, 581, 582, 583, -1, -1,
- -1, -1, -1, -1, 590, -1, -1, 593, -1, -1,
- -1, 597, 598, 599, 600, 601, 602, -1, -1, -1,
- -1, -1, -1, 609, 610, -1, 612, 613, 614, -1,
- -1, 617, -1, -1, -1, -1, 5, -1, 7, 8,
- 9, 10, 11, 629, -1, 14, -1, -1, -1, 18,
- -1, 637, 21, -1, 23, 24, 25, 26, 27, 28,
- 29, -1, 31, -1, -1, -1, 35, -1, -1, -1,
- 39, -1, -1, 42, 43, 44, -1, 46, -1, 48,
- 49, -1, -1, 52, -1, -1, 55, 56, -1, 58,
- 59, -1, 61, 62, -1, 64, 65, 66, 67, 68,
- 69, 70, -1, 72, 73, 74, 75, 76, 77, 78,
- 79, -1, 81, 82, 83, 84, 85, 86, 87, 88,
- -1, 90, 91, -1, 93, 94, 95, 96, 97, -1,
- 99, -1, -1, 102, -1, -1, 105, -1, -1, -1,
- 109, -1, -1, -1, 113, 114, 115, -1, -1, 118,
- -1, -1, -1, -1, 123, 124, -1, -1, -1, -1,
- 129, -1, 131, -1, -1, -1, 135, -1, 137, 138,
- 139, 140, -1, -1, -1, 144, -1, -1, 147, 148,
- 149, -1, -1, -1, 153, -1, 155, 156, -1, 158,
- 159, 160, -1, -1, 163, 164, -1, 166, 167, 168,
- 169, 170, 171, -1, -1, 174, 175, 176, -1, -1,
- 179, 180, -1, 182, 183, 184, -1, -1, 187, -1,
- -1, -1, 191, -1, 193, -1, 195, -1, 197, 198,
- 199, 200, 201, 202, -1, 204, -1, -1, -1, 208,
- 209, 210, -1, 212, -1, -1, -1, 216, 217, -1,
- -1, -1, 221, 222, 223, 224, -1, -1, 227, 228,
- 229, -1, 231, -1, 233, -1, -1, -1, -1, 238,
- 239, -1, 241, -1, 243, -1, 245, 246, -1, 248,
- 249, -1, -1, -1, 253, -1, -1, 256, 257, 258,
- -1, -1, 261, -1, -1, 264, 265, -1, -1, -1,
- -1, -1, 271, 272, -1, 274, -1, 276, -1, 278,
- 279, -1, -1, -1, -1, -1, -1, -1, 287, 288,
- 289, 290, 291, 292, 293, 294, 295, 296, 297, 298,
- 299, -1, 301, 302, 303, -1, 305, 306, 307, 308,
- -1, 310, 311, -1, -1, -1, -1, 316, 317, 318,
- 319, 320, 321, -1, -1, 324, 325, -1, 327, -1,
- 329, -1, 331, 332, 333, 334, 335, 336, 337, 338,
- 339, 340, -1, -1, 343, 344, -1, -1, 347, 348,
- 349, 350, -1, -1, -1, 354, 355, -1, -1, -1,
- -1, 360, 361, 362, -1, 364, 365, 366, 367, -1,
- 369, 370, -1, -1, -1, -1, -1, -1, -1, -1,
- 379, 380, 381, -1, -1, 384, -1, 386, 387, 388,
- 389, 390, 391, 392, 393, 394, 395, 396, 397, -1,
- -1, 400, 401, 402, -1, 404, -1, 406, 407, 408,
- 409, 410, -1, 412, 413, 414, -1, -1, 417, -1,
- -1, -1, 421, 422, 423, 424, 425, -1, -1, 428,
- 429, 430, 431, 432, -1, 434, 435, -1, 437, 438,
- 439, -1, -1, 442, -1, 444, -1, 446, 447, -1,
- 449, 450, -1, -1, -1, 454, 455, 456, 457, 458,
- 459, 460, 461, 462, 463, -1, 465, 466, -1, -1,
- -1, 470, 471, 472, 473, -1, -1, -1, 477, -1,
- -1, -1, 481, -1, 483, 484, 485, 486, -1, 488,
- 489, 490, 491, 492, 493, -1, -1, -1, -1, -1,
- -1, 500, 501, -1, 503, -1, -1, 506, -1, -1,
- 509, 510, 511, -1, -1, 514, 515, -1, 517, 518,
- 519, 520, 521, 522, -1, -1, 525, 526, 527, 528,
- -1, 530, 531, -1, 533, -1, 535, 536, 537, 538,
- -1, -1, 541, 542, -1, 544, 545, 546, 547, -1,
- -1, -1, -1, -1, 553, 554, 555, -1, -1, -1,
- 559, 560, 561, 562, -1, 564, 565, -1, 567, 568,
- -1, 570, 571, -1, -1, 574, -1, -1, 577, -1,
- 579, -1, 581, 582, 583, -1, -1, -1, -1, -1,
- -1, 590, -1, -1, 593, -1, -1, -1, 597, 598,
- 599, 600, 601, 602, -1, -1, -1, -1, -1, -1,
- 609, 610, -1, 612, 613, 614, -1, -1, 617, -1,
- -1, 5, -1, 7, 8, 9, 10, 11, -1, -1,
- 14, -1, -1, -1, 18, -1, -1, 21, 637, 23,
+ -1, 574, -1, -1, 577, -1, 579, -1, 581, 582,
+ 583, -1, -1, -1, -1, -1, -1, 590, -1, -1,
+ 593, -1, -1, -1, 597, 598, 599, 600, 601, 602,
+ -1, -1, -1, -1, -1, -1, 609, 610, -1, 612,
+ 613, 614, -1, -1, 617, -1, -1, 5, -1, 7,
+ 8, 9, 10, 11, -1, -1, 14, 630, -1, -1,
+ 18, -1, -1, 21, 637, 23, 24, 25, 26, 27,
+ 28, 29, -1, 31, -1, -1, -1, 35, -1, -1,
+ -1, 39, -1, -1, 42, 43, 44, -1, 46, -1,
+ 48, 49, -1, -1, 52, -1, -1, 55, 56, -1,
+ 58, 59, -1, 61, 62, -1, 64, 65, 66, 67,
+ 68, 69, 70, -1, 72, 73, 74, 75, 76, 77,
+ 78, 79, -1, 81, 82, 83, 84, 85, 86, 87,
+ 88, -1, 90, 91, -1, 93, 94, 95, 96, 97,
+ -1, 99, -1, -1, 102, -1, -1, 105, -1, -1,
+ -1, 109, -1, -1, -1, 113, 114, 115, -1, -1,
+ 118, -1, -1, -1, -1, 123, 124, -1, -1, -1,
+ -1, 129, -1, 131, -1, -1, -1, 135, -1, 137,
+ 138, 139, 140, -1, -1, -1, 144, -1, -1, 147,
+ 148, 149, -1, -1, -1, 153, -1, 155, 156, -1,
+ 158, 159, 160, -1, -1, 163, 164, -1, 166, 167,
+ 168, 169, 170, 171, -1, -1, 174, 175, 176, -1,
+ -1, 179, 180, -1, 182, 183, 184, -1, -1, 187,
+ -1, -1, -1, 191, -1, 193, -1, 195, -1, 197,
+ 198, 199, 200, 201, 202, -1, 204, -1, -1, -1,
+ 208, 209, 210, -1, 212, -1, -1, -1, 216, 217,
+ -1, -1, -1, 221, 222, 223, 224, -1, -1, 227,
+ 228, 229, -1, 231, -1, 233, -1, -1, -1, -1,
+ 238, 239, -1, -1, -1, 243, -1, 245, 246, -1,
+ 248, 249, -1, -1, -1, 253, -1, -1, 256, 257,
+ 258, -1, -1, 261, -1, -1, 264, 265, -1, -1,
+ -1, -1, -1, 271, 272, -1, 274, -1, 276, -1,
+ 278, 279, -1, -1, -1, -1, -1, -1, -1, 287,
+ 288, 289, 290, 291, 292, 293, 294, 295, 296, 297,
+ 298, 299, -1, 301, 302, 303, -1, 305, 306, 307,
+ 308, -1, 310, 311, -1, -1, -1, -1, 316, 317,
+ 318, 319, 320, 321, -1, -1, 324, 325, -1, 327,
+ -1, 329, -1, 331, 332, 333, 334, 335, 336, 337,
+ 338, 339, 340, -1, -1, 343, 344, -1, -1, 347,
+ 348, 349, 350, -1, -1, -1, 354, 355, -1, -1,
+ -1, -1, 360, 361, 362, -1, 364, 365, 366, 367,
+ -1, 369, 370, -1, -1, -1, -1, -1, -1, -1,
+ -1, 379, 380, 381, -1, -1, 384, -1, 386, 387,
+ 388, 389, 390, 391, 392, 393, 394, 395, 396, 397,
+ -1, -1, 400, 401, 402, -1, 404, -1, 406, 407,
+ 408, 409, 410, -1, 412, 413, 414, -1, -1, 417,
+ -1, -1, -1, 421, 422, 423, 424, 425, -1, -1,
+ 428, 429, 430, 431, 432, -1, 434, 435, -1, 437,
+ 438, 439, -1, -1, 442, -1, 444, -1, 446, 447,
+ -1, 449, 450, -1, -1, -1, 454, 455, 456, 457,
+ 458, 459, 460, 461, 462, 463, -1, 465, 466, -1,
+ -1, -1, 470, 471, 472, 473, -1, -1, -1, 477,
+ -1, -1, -1, 481, -1, 483, 484, 485, 486, -1,
+ 488, 489, 490, 491, 492, 493, -1, -1, -1, -1,
+ -1, -1, 500, 501, -1, 503, -1, -1, 506, -1,
+ -1, 509, 510, 511, -1, -1, 514, 515, -1, 517,
+ 518, 519, 520, 521, 522, -1, -1, 525, 526, 527,
+ 528, -1, 530, 531, -1, 533, -1, 535, 536, 537,
+ 538, -1, -1, 541, 542, -1, 544, 545, 546, 547,
+ -1, -1, -1, -1, -1, 553, 554, 555, -1, -1,
+ -1, 559, 560, 561, 562, -1, 564, 565, -1, 567,
+ 568, -1, 570, 571, -1, -1, 574, -1, -1, 577,
+ -1, 579, -1, 581, 582, 583, -1, -1, -1, -1,
+ -1, -1, 590, -1, -1, 593, -1, -1, -1, 597,
+ 598, 599, 600, 601, 602, -1, -1, -1, -1, -1,
+ -1, 609, 610, -1, 612, 613, 614, -1, -1, 617,
+ -1, -1, -1, -1, 5, -1, 7, 8, 9, 10,
+ 11, -1, 630, 14, -1, -1, -1, 18, 636, 637,
+ 21, -1, 23, 24, 25, 26, 27, 28, 29, -1,
+ 31, -1, -1, -1, 35, -1, -1, -1, 39, -1,
+ -1, 42, 43, 44, -1, 46, -1, 48, 49, -1,
+ -1, 52, -1, -1, 55, 56, -1, 58, 59, -1,
+ 61, 62, -1, 64, 65, 66, 67, 68, 69, 70,
+ -1, 72, 73, 74, 75, 76, 77, 78, 79, -1,
+ 81, 82, 83, 84, 85, 86, 87, 88, -1, 90,
+ 91, -1, 93, 94, 95, 96, 97, -1, 99, -1,
+ -1, 102, -1, -1, 105, -1, -1, -1, 109, -1,
+ -1, -1, 113, 114, 115, -1, -1, 118, -1, -1,
+ -1, -1, 123, 124, -1, -1, -1, -1, 129, -1,
+ 131, -1, -1, -1, 135, -1, 137, 138, 139, 140,
+ -1, -1, -1, 144, -1, -1, 147, 148, 149, -1,
+ -1, -1, 153, -1, 155, 156, -1, 158, 159, 160,
+ -1, -1, 163, 164, -1, 166, 167, 168, 169, 170,
+ 171, -1, -1, 174, 175, 176, -1, -1, 179, 180,
+ -1, 182, 183, 184, -1, -1, 187, -1, -1, -1,
+ 191, -1, 193, -1, 195, -1, 197, 198, 199, 200,
+ 201, 202, -1, 204, -1, -1, -1, 208, 209, 210,
+ -1, 212, -1, -1, -1, 216, 217, -1, -1, -1,
+ 221, 222, 223, 224, -1, -1, 227, 228, 229, -1,
+ 231, -1, 233, -1, -1, -1, -1, 238, 239, -1,
+ -1, -1, 243, -1, 245, 246, -1, 248, 249, -1,
+ -1, -1, 253, -1, -1, 256, 257, 258, -1, -1,
+ 261, -1, -1, 264, 265, -1, -1, -1, -1, -1,
+ 271, 272, -1, 274, -1, 276, -1, 278, 279, -1,
+ -1, -1, -1, -1, -1, -1, 287, 288, 289, 290,
+ 291, 292, 293, 294, 295, 296, 297, 298, 299, -1,
+ 301, 302, 303, -1, 305, 306, 307, 308, -1, 310,
+ 311, -1, -1, -1, -1, 316, 317, 318, 319, 320,
+ 321, -1, -1, 324, 325, -1, 327, -1, 329, -1,
+ 331, 332, 333, 334, 335, 336, 337, 338, 339, 340,
+ -1, -1, 343, 344, -1, -1, 347, 348, 349, 350,
+ -1, -1, -1, 354, 355, -1, -1, -1, -1, 360,
+ 361, 362, -1, 364, 365, 366, 367, -1, 369, 370,
+ -1, -1, -1, -1, -1, -1, -1, -1, 379, 380,
+ 381, -1, -1, 384, -1, 386, 387, 388, 389, 390,
+ 391, 392, 393, 394, 395, 396, 397, -1, -1, 400,
+ 401, 402, -1, 404, -1, 406, 407, 408, 409, 410,
+ -1, 412, 413, 414, -1, -1, 417, -1, -1, -1,
+ 421, 422, 423, 424, 425, -1, -1, 428, 429, 430,
+ 431, 432, -1, 434, 435, -1, 437, 438, 439, -1,
+ -1, 442, -1, 444, -1, 446, 447, -1, 449, 450,
+ -1, -1, -1, 454, 455, 456, 457, 458, 459, 460,
+ 461, 462, 463, -1, 465, 466, -1, -1, -1, 470,
+ 471, 472, 473, -1, -1, -1, 477, -1, -1, -1,
+ 481, -1, 483, 484, 485, 486, -1, 488, 489, 490,
+ 491, 492, 493, -1, -1, -1, -1, -1, -1, 500,
+ 501, -1, 503, -1, -1, 506, -1, -1, 509, 510,
+ 511, -1, -1, 514, 515, -1, 517, 518, 519, 520,
+ 521, 522, -1, -1, 525, 526, 527, 528, -1, 530,
+ 531, -1, 533, -1, 535, 536, 537, 538, -1, -1,
+ 541, 542, -1, 544, 545, 546, 547, -1, -1, -1,
+ -1, -1, 553, 554, 555, -1, -1, -1, 559, 560,
+ 561, 562, -1, 564, 565, -1, 567, 568, -1, 570,
+ 571, -1, -1, 574, -1, -1, 577, -1, 579, -1,
+ 581, 582, 583, -1, -1, -1, -1, -1, -1, 590,
+ -1, -1, 593, -1, -1, -1, 597, 598, 599, 600,
+ 601, 602, -1, -1, -1, -1, -1, -1, 609, 610,
+ -1, 612, 613, 614, -1, -1, 617, -1, -1, -1,
+ -1, 5, -1, 7, 8, 9, 10, 11, 629, -1,
+ 14, -1, -1, -1, 18, -1, 637, 21, -1, 23,
24, 25, 26, 27, 28, 29, -1, 31, -1, -1,
-1, 35, -1, -1, -1, 39, -1, -1, 42, 43,
44, -1, 46, -1, 48, 49, -1, -1, 52, -1,
@@ -13814,7 +13754,7 @@ static const yytype_int16 yycheck[] =
204, -1, -1, -1, 208, 209, 210, -1, 212, -1,
-1, -1, 216, 217, -1, -1, -1, 221, 222, 223,
224, -1, -1, 227, 228, 229, -1, 231, -1, 233,
- -1, -1, -1, -1, 238, 239, -1, -1, -1, 243,
+ -1, -1, -1, -1, 238, 239, -1, 241, -1, 243,
-1, 245, 246, -1, 248, 249, -1, -1, -1, 253,
-1, -1, 256, 257, 258, -1, -1, 261, -1, -1,
264, 265, -1, -1, -1, -1, -1, 271, 272, -1,
@@ -13852,71 +13792,9 @@ static const yytype_int16 yycheck[] =
-1, -1, -1, -1, -1, -1, 590, -1, -1, 593,
-1, -1, -1, 597, 598, 599, 600, 601, 602, -1,
-1, -1, -1, -1, -1, 609, 610, -1, 612, 613,
- 614, -1, -1, 617, -1, -1, -1, -1, -1, 5,
- 624, 7, 8, 9, 10, 11, -1, -1, 14, -1,
- -1, -1, 18, 637, -1, 21, -1, 23, 24, 25,
- 26, 27, 28, 29, -1, 31, -1, -1, -1, 35,
- -1, -1, -1, 39, -1, -1, 42, 43, 44, -1,
- 46, -1, 48, 49, -1, -1, 52, -1, -1, 55,
- 56, -1, 58, 59, -1, 61, 62, -1, 64, 65,
- 66, 67, 68, 69, 70, -1, 72, 73, 74, 75,
- 76, 77, 78, 79, -1, 81, 82, 83, 84, 85,
- 86, 87, 88, -1, 90, 91, -1, 93, 94, 95,
- 96, 97, -1, 99, -1, -1, 102, -1, -1, 105,
- -1, -1, -1, 109, -1, -1, -1, 113, 114, 115,
- -1, -1, 118, -1, -1, -1, -1, 123, 124, -1,
- -1, -1, -1, 129, -1, 131, -1, -1, -1, 135,
- -1, 137, 138, 139, 140, -1, -1, -1, 144, -1,
- -1, 147, 148, 149, -1, -1, -1, 153, -1, 155,
- 156, -1, 158, 159, 160, -1, -1, 163, 164, -1,
- 166, 167, 168, 169, 170, 171, -1, -1, 174, 175,
- 176, -1, -1, 179, 180, -1, 182, 183, 184, -1,
- -1, 187, -1, -1, -1, 191, -1, 193, -1, 195,
- -1, 197, 198, 199, 200, 201, 202, -1, 204, -1,
- -1, -1, 208, 209, 210, -1, 212, -1, -1, -1,
- 216, 217, -1, -1, -1, 221, 222, 223, 224, -1,
- -1, 227, 228, 229, -1, 231, -1, 233, -1, -1,
- -1, -1, 238, 239, -1, -1, -1, 243, -1, 245,
- 246, -1, 248, 249, -1, -1, -1, 253, -1, -1,
- 256, 257, 258, -1, -1, 261, -1, -1, 264, 265,
- -1, -1, -1, -1, -1, 271, 272, -1, 274, -1,
- 276, -1, 278, 279, -1, -1, -1, -1, -1, -1,
- -1, 287, 288, 289, 290, 291, 292, 293, 294, 295,
- 296, 297, 298, 299, -1, 301, 302, 303, -1, 305,
- 306, 307, 308, -1, 310, 311, -1, -1, -1, -1,
- 316, 317, 318, 319, 320, 321, -1, -1, 324, 325,
- -1, 327, -1, 329, -1, 331, 332, 333, 334, 335,
- 336, 337, 338, 339, 340, -1, -1, 343, 344, -1,
- -1, 347, 348, 349, 350, -1, -1, -1, 354, 355,
- -1, -1, -1, -1, 360, 361, 362, -1, 364, 365,
- 366, 367, -1, 369, 370, -1, -1, -1, -1, -1,
- -1, -1, -1, 379, 380, 381, -1, -1, 384, -1,
- 386, 387, 388, 389, 390, 391, 392, 393, 394, 395,
- 396, 397, -1, -1, 400, 401, 402, -1, 404, -1,
- 406, 407, 408, 409, 410, -1, 412, 413, 414, -1,
- -1, 417, -1, -1, -1, 421, 422, 423, 424, 425,
- -1, -1, 428, 429, 430, 431, 432, -1, 434, 435,
- -1, 437, 438, 439, -1, -1, 442, -1, 444, -1,
- 446, 447, -1, 449, 450, -1, -1, -1, 454, 455,
- 456, 457, 458, 459, 460, 461, 462, 463, -1, 465,
- 466, -1, -1, -1, 470, 471, 472, 473, -1, -1,
- -1, 477, -1, -1, -1, 481, -1, 483, 484, 485,
- 486, -1, 488, 489, 490, 491, 492, 493, -1, -1,
- -1, -1, -1, -1, 500, 501, -1, 503, -1, -1,
- 506, -1, -1, 509, 510, 511, -1, -1, 514, 515,
- -1, 517, 518, 519, 520, 521, 522, -1, -1, 525,
- 526, 527, 528, -1, 530, 531, -1, 533, -1, 535,
- 536, 537, 538, -1, -1, 541, 542, -1, 544, 545,
- 546, 547, -1, -1, -1, -1, -1, 553, 554, 555,
- -1, -1, -1, 559, 560, 561, 562, -1, 564, 565,
- -1, 567, 568, -1, 570, 571, -1, -1, 574, -1,
- -1, 577, -1, 579, -1, 581, 582, 583, -1, -1,
- -1, -1, -1, -1, 590, -1, -1, 593, -1, -1,
- -1, 597, 598, 599, 600, 601, 602, -1, -1, -1,
- -1, -1, -1, 609, 610, -1, 612, 613, 614, -1,
- -1, 617, -1, -1, -1, -1, 5, -1, 7, 8,
- 9, 10, 11, 629, -1, 14, -1, -1, -1, 18,
- -1, 637, 21, -1, 23, 24, 25, 26, 27, 28,
+ 614, -1, -1, 617, -1, -1, 5, -1, 7, 8,
+ 9, 10, 11, -1, -1, 14, -1, -1, -1, 18,
+ -1, -1, 21, 637, 23, 24, 25, 26, 27, 28,
29, -1, 31, -1, -1, -1, 35, -1, -1, -1,
39, -1, -1, 42, 43, 44, -1, 46, -1, 48,
49, -1, -1, 52, -1, -1, 55, 56, -1, 58,
@@ -13976,70 +13854,132 @@ static const yytype_int16 yycheck[] =
-1, 590, -1, -1, 593, -1, -1, -1, 597, 598,
599, 600, 601, 602, -1, -1, -1, -1, -1, -1,
609, 610, -1, 612, 613, 614, -1, -1, 617, -1,
- -1, -1, -1, 5, -1, 7, 8, 9, 10, 11,
- -1, -1, 14, -1, -1, -1, 18, 636, 637, 21,
- -1, 23, 24, 25, 26, 27, 28, 29, -1, 31,
- -1, -1, -1, 35, -1, -1, -1, 39, -1, -1,
- 42, 43, 44, -1, 46, -1, 48, 49, -1, -1,
- 52, -1, -1, 55, 56, -1, 58, 59, -1, 61,
- 62, -1, 64, 65, 66, 67, 68, 69, 70, -1,
- 72, 73, 74, 75, 76, 77, 78, 79, -1, 81,
- 82, 83, 84, 85, 86, 87, 88, -1, 90, 91,
- -1, 93, 94, 95, 96, 97, -1, 99, -1, -1,
- 102, -1, -1, 105, -1, -1, -1, 109, -1, -1,
- -1, 113, 114, 115, -1, -1, 118, -1, -1, -1,
- -1, 123, 124, -1, -1, -1, -1, 129, -1, 131,
- -1, -1, -1, 135, -1, 137, 138, 139, 140, -1,
- -1, -1, 144, -1, -1, 147, 148, 149, -1, -1,
- -1, 153, -1, 155, 156, -1, 158, 159, 160, -1,
- -1, 163, 164, -1, 166, 167, 168, 169, 170, 171,
- -1, -1, 174, 175, 176, -1, -1, 179, 180, -1,
- 182, 183, 184, -1, -1, 187, -1, -1, -1, 191,
- -1, 193, -1, 195, -1, 197, 198, 199, 200, 201,
- 202, -1, 204, -1, -1, -1, 208, 209, 210, -1,
- 212, -1, -1, -1, 216, 217, -1, -1, -1, 221,
- 222, 223, 224, -1, -1, 227, 228, 229, -1, 231,
- -1, 233, -1, -1, -1, -1, 238, 239, -1, -1,
- -1, 243, -1, 245, 246, -1, 248, 249, -1, -1,
- -1, 253, -1, -1, 256, 257, 258, -1, -1, 261,
- -1, -1, 264, 265, -1, -1, -1, -1, -1, 271,
- 272, -1, 274, -1, 276, -1, 278, 279, -1, -1,
- -1, -1, -1, -1, -1, 287, 288, 289, 290, 291,
- 292, 293, 294, 295, 296, 297, 298, 299, -1, 301,
- 302, 303, -1, 305, 306, 307, 308, -1, 310, 311,
- -1, -1, -1, -1, 316, 317, 318, 319, 320, 321,
- -1, -1, 324, 325, -1, 327, -1, 329, -1, 331,
- 332, 333, 334, 335, 336, 337, 338, 339, 340, -1,
- -1, 343, 344, -1, -1, 347, 348, 349, 350, -1,
- -1, -1, 354, 355, -1, -1, -1, -1, 360, 361,
- 362, -1, 364, 365, 366, 367, -1, 369, 370, -1,
- -1, -1, -1, -1, -1, -1, -1, 379, 380, 381,
- -1, -1, 384, -1, 386, 387, 388, 389, 390, 391,
- 392, 393, 394, 395, 396, 397, -1, -1, 400, 401,
- 402, -1, 404, -1, 406, 407, 408, 409, 410, -1,
- 412, 413, 414, -1, -1, 417, -1, -1, -1, 421,
- 422, 423, 424, 425, -1, -1, 428, 429, 430, 431,
- 432, -1, 434, 435, -1, 437, 438, 439, -1, -1,
- 442, -1, 444, -1, 446, 447, -1, 449, 450, -1,
- -1, -1, 454, 455, 456, 457, 458, 459, 460, 461,
- 462, 463, -1, 465, 466, -1, -1, -1, 470, 471,
- 472, 473, -1, -1, -1, 477, -1, -1, -1, 481,
- -1, 483, 484, 485, 486, -1, 488, 489, 490, 491,
- 492, 493, -1, -1, -1, -1, -1, -1, 500, 501,
- -1, 503, -1, -1, 506, -1, -1, 509, 510, 511,
- -1, -1, 514, 515, -1, 517, 518, 519, 520, 521,
- 522, -1, -1, 525, 526, 527, 528, -1, 530, 531,
- -1, 533, -1, 535, 536, 537, 538, -1, -1, 541,
- 542, -1, 544, 545, 546, 547, -1, -1, -1, -1,
- -1, 553, 554, 555, -1, -1, -1, 559, 560, 561,
- 562, -1, 564, 565, -1, 567, 568, -1, 570, 571,
- -1, -1, 574, -1, -1, 577, -1, 579, -1, 581,
- 582, 583, -1, -1, -1, -1, -1, -1, 590, -1,
- -1, 593, -1, -1, -1, 597, 598, 599, 600, 601,
- 602, -1, -1, -1, -1, -1, -1, 609, 610, -1,
- 612, 613, 614, -1, -1, 617, -1, -1, 5, -1,
+ -1, -1, -1, -1, 5, 624, 7, 8, 9, 10,
+ 11, -1, -1, 14, -1, -1, -1, 18, 637, -1,
+ 21, -1, 23, 24, 25, 26, 27, 28, 29, -1,
+ 31, -1, -1, -1, 35, -1, -1, -1, 39, -1,
+ -1, 42, 43, 44, -1, 46, -1, 48, 49, -1,
+ -1, 52, -1, -1, 55, 56, -1, 58, 59, -1,
+ 61, 62, -1, 64, 65, 66, 67, 68, 69, 70,
+ -1, 72, 73, 74, 75, 76, 77, 78, 79, -1,
+ 81, 82, 83, 84, 85, 86, 87, 88, -1, 90,
+ 91, -1, 93, 94, 95, 96, 97, -1, 99, -1,
+ -1, 102, -1, -1, 105, -1, -1, -1, 109, -1,
+ -1, -1, 113, 114, 115, -1, -1, 118, -1, -1,
+ -1, -1, 123, 124, -1, -1, -1, -1, 129, -1,
+ 131, -1, -1, -1, 135, -1, 137, 138, 139, 140,
+ -1, -1, -1, 144, -1, -1, 147, 148, 149, -1,
+ -1, -1, 153, -1, 155, 156, -1, 158, 159, 160,
+ -1, -1, 163, 164, -1, 166, 167, 168, 169, 170,
+ 171, -1, -1, 174, 175, 176, -1, -1, 179, 180,
+ -1, 182, 183, 184, -1, -1, 187, -1, -1, -1,
+ 191, -1, 193, -1, 195, -1, 197, 198, 199, 200,
+ 201, 202, -1, 204, -1, -1, -1, 208, 209, 210,
+ -1, 212, -1, -1, -1, 216, 217, -1, -1, -1,
+ 221, 222, 223, 224, -1, -1, 227, 228, 229, -1,
+ 231, -1, 233, -1, -1, -1, -1, 238, 239, -1,
+ -1, -1, 243, -1, 245, 246, -1, 248, 249, -1,
+ -1, -1, 253, -1, -1, 256, 257, 258, -1, -1,
+ 261, -1, -1, 264, 265, -1, -1, -1, -1, -1,
+ 271, 272, -1, 274, -1, 276, -1, 278, 279, -1,
+ -1, -1, -1, -1, -1, -1, 287, 288, 289, 290,
+ 291, 292, 293, 294, 295, 296, 297, 298, 299, -1,
+ 301, 302, 303, -1, 305, 306, 307, 308, -1, 310,
+ 311, -1, -1, -1, -1, 316, 317, 318, 319, 320,
+ 321, -1, -1, 324, 325, -1, 327, -1, 329, -1,
+ 331, 332, 333, 334, 335, 336, 337, 338, 339, 340,
+ -1, -1, 343, 344, -1, -1, 347, 348, 349, 350,
+ -1, -1, -1, 354, 355, -1, -1, -1, -1, 360,
+ 361, 362, -1, 364, 365, 366, 367, -1, 369, 370,
+ -1, -1, -1, -1, -1, -1, -1, -1, 379, 380,
+ 381, -1, -1, 384, -1, 386, 387, 388, 389, 390,
+ 391, 392, 393, 394, 395, 396, 397, -1, -1, 400,
+ 401, 402, -1, 404, -1, 406, 407, 408, 409, 410,
+ -1, 412, 413, 414, -1, -1, 417, -1, -1, -1,
+ 421, 422, 423, 424, 425, -1, -1, 428, 429, 430,
+ 431, 432, -1, 434, 435, -1, 437, 438, 439, -1,
+ -1, 442, -1, 444, -1, 446, 447, -1, 449, 450,
+ -1, -1, -1, 454, 455, 456, 457, 458, 459, 460,
+ 461, 462, 463, -1, 465, 466, -1, -1, -1, 470,
+ 471, 472, 473, -1, -1, -1, 477, -1, -1, -1,
+ 481, -1, 483, 484, 485, 486, -1, 488, 489, 490,
+ 491, 492, 493, -1, -1, -1, -1, -1, -1, 500,
+ 501, -1, 503, -1, -1, 506, -1, -1, 509, 510,
+ 511, -1, -1, 514, 515, -1, 517, 518, 519, 520,
+ 521, 522, -1, -1, 525, 526, 527, 528, -1, 530,
+ 531, -1, 533, -1, 535, 536, 537, 538, -1, -1,
+ 541, 542, -1, 544, 545, 546, 547, -1, -1, -1,
+ -1, -1, 553, 554, 555, -1, -1, -1, 559, 560,
+ 561, 562, -1, 564, 565, -1, 567, 568, -1, 570,
+ 571, -1, -1, 574, -1, -1, 577, -1, 579, -1,
+ 581, 582, 583, -1, -1, -1, -1, -1, -1, 590,
+ -1, -1, 593, -1, -1, -1, 597, 598, 599, 600,
+ 601, 602, -1, -1, -1, -1, -1, -1, 609, 610,
+ -1, 612, 613, 614, -1, -1, 617, -1, -1, -1,
+ -1, 5, -1, 7, 8, 9, 10, 11, 629, -1,
+ 14, -1, -1, -1, 18, -1, 637, 21, -1, 23,
+ 24, 25, 26, 27, 28, 29, -1, 31, -1, -1,
+ -1, 35, -1, -1, -1, 39, -1, -1, 42, 43,
+ 44, -1, 46, -1, 48, 49, -1, -1, 52, -1,
+ -1, 55, 56, -1, 58, 59, -1, 61, 62, -1,
+ 64, 65, 66, 67, 68, 69, 70, -1, 72, 73,
+ 74, 75, 76, 77, 78, 79, -1, 81, 82, 83,
+ 84, 85, 86, 87, 88, -1, 90, 91, -1, 93,
+ 94, 95, 96, 97, -1, 99, -1, -1, 102, -1,
+ -1, 105, -1, -1, -1, 109, -1, -1, -1, 113,
+ 114, 115, -1, -1, 118, -1, -1, -1, -1, 123,
+ 124, -1, -1, -1, -1, 129, -1, 131, -1, -1,
+ -1, 135, -1, 137, 138, 139, 140, -1, -1, -1,
+ 144, -1, -1, 147, 148, 149, -1, -1, -1, 153,
+ -1, 155, 156, -1, 158, 159, 160, -1, -1, 163,
+ 164, -1, 166, 167, 168, 169, 170, 171, -1, -1,
+ 174, 175, 176, -1, -1, 179, 180, -1, 182, 183,
+ 184, -1, -1, 187, -1, -1, -1, 191, -1, 193,
+ -1, 195, -1, 197, 198, 199, 200, 201, 202, -1,
+ 204, -1, -1, -1, 208, 209, 210, -1, 212, -1,
+ -1, -1, 216, 217, -1, -1, -1, 221, 222, 223,
+ 224, -1, -1, 227, 228, 229, -1, 231, -1, 233,
+ -1, -1, -1, -1, 238, 239, -1, -1, -1, 243,
+ -1, 245, 246, -1, 248, 249, -1, -1, -1, 253,
+ -1, -1, 256, 257, 258, -1, -1, 261, -1, -1,
+ 264, 265, -1, -1, -1, -1, -1, 271, 272, -1,
+ 274, -1, 276, -1, 278, 279, -1, -1, -1, -1,
+ -1, -1, -1, 287, 288, 289, 290, 291, 292, 293,
+ 294, 295, 296, 297, 298, 299, -1, 301, 302, 303,
+ -1, 305, 306, 307, 308, -1, 310, 311, -1, -1,
+ -1, -1, 316, 317, 318, 319, 320, 321, -1, -1,
+ 324, 325, -1, 327, -1, 329, -1, 331, 332, 333,
+ 334, 335, 336, 337, 338, 339, 340, -1, -1, 343,
+ 344, -1, -1, 347, 348, 349, 350, -1, -1, -1,
+ 354, 355, -1, -1, -1, -1, 360, 361, 362, -1,
+ 364, 365, 366, 367, -1, 369, 370, -1, -1, -1,
+ -1, -1, -1, -1, -1, 379, 380, 381, -1, -1,
+ 384, -1, 386, 387, 388, 389, 390, 391, 392, 393,
+ 394, 395, 396, 397, -1, -1, 400, 401, 402, -1,
+ 404, -1, 406, 407, 408, 409, 410, -1, 412, 413,
+ 414, -1, -1, 417, -1, -1, -1, 421, 422, 423,
+ 424, 425, -1, -1, 428, 429, 430, 431, 432, -1,
+ 434, 435, -1, 437, 438, 439, -1, -1, 442, -1,
+ 444, -1, 446, 447, -1, 449, 450, -1, -1, -1,
+ 454, 455, 456, 457, 458, 459, 460, 461, 462, 463,
+ -1, 465, 466, -1, -1, -1, 470, 471, 472, 473,
+ -1, -1, -1, 477, -1, -1, -1, 481, -1, 483,
+ 484, 485, 486, -1, 488, 489, 490, 491, 492, 493,
+ -1, -1, -1, -1, -1, -1, 500, 501, -1, 503,
+ -1, -1, 506, -1, -1, 509, 510, 511, -1, -1,
+ 514, 515, -1, 517, 518, 519, 520, 521, 522, -1,
+ -1, 525, 526, 527, 528, -1, 530, 531, -1, 533,
+ -1, 535, 536, 537, 538, -1, -1, 541, 542, -1,
+ 544, 545, 546, 547, -1, -1, -1, -1, -1, 553,
+ 554, 555, -1, -1, -1, 559, 560, 561, 562, -1,
+ 564, 565, -1, 567, 568, -1, 570, 571, -1, -1,
+ 574, -1, -1, 577, -1, 579, -1, 581, 582, 583,
+ -1, -1, -1, -1, -1, -1, 590, -1, -1, 593,
+ -1, -1, -1, 597, 598, 599, 600, 601, 602, -1,
+ -1, -1, -1, -1, -1, 609, 610, -1, 612, 613,
+ 614, -1, -1, 617, -1, -1, -1, -1, 5, -1,
7, 8, 9, 10, 11, -1, -1, 14, -1, -1,
- -1, 18, -1, -1, 21, 637, 23, 24, 25, 26,
+ -1, 18, 636, 637, 21, -1, 23, 24, 25, 26,
27, 28, 29, -1, 31, -1, -1, -1, 35, -1,
-1, -1, 39, -1, -1, 42, 43, 44, -1, 46,
-1, 48, 49, -1, -1, 52, -1, -1, 55, 56,
@@ -14248,7 +14188,7 @@ static const yytype_int16 yycheck[] =
-1, 233, -1, -1, -1, -1, 238, 239, -1, -1,
-1, 243, -1, 245, 246, -1, 248, 249, -1, -1,
-1, 253, -1, -1, 256, 257, 258, -1, -1, 261,
- -1, -1, 264, 265, 266, -1, -1, -1, -1, 271,
+ -1, -1, 264, 265, -1, -1, -1, -1, -1, 271,
272, -1, 274, -1, 276, -1, 278, 279, -1, -1,
-1, -1, -1, -1, -1, 287, 288, 289, 290, 291,
292, 293, 294, 295, 296, 297, 298, 299, -1, 301,
@@ -14275,7 +14215,7 @@ static const yytype_int16 yycheck[] =
-1, 503, -1, -1, 506, -1, -1, 509, 510, 511,
-1, -1, 514, 515, -1, 517, 518, 519, 520, 521,
522, -1, -1, 525, 526, 527, 528, -1, 530, 531,
- -1, 533, -1, 535, 536, 537, 538, -1, 540, 541,
+ -1, 533, -1, 535, 536, 537, 538, -1, -1, 541,
542, -1, 544, 545, 546, 547, -1, -1, -1, -1,
-1, 553, 554, 555, -1, -1, -1, 559, 560, 561,
562, -1, 564, 565, -1, 567, 568, -1, 570, 571,
@@ -14283,70 +14223,254 @@ static const yytype_int16 yycheck[] =
582, 583, -1, -1, -1, -1, -1, -1, 590, -1,
-1, 593, -1, -1, -1, 597, 598, 599, 600, 601,
602, -1, -1, -1, -1, -1, -1, 609, 610, -1,
- 612, 613, 614, -1, -1, 617, -1, 5, -1, 7,
- 8, 9, 10, 11, -1, -1, 14, -1, -1, -1,
- 18, -1, -1, 21, 636, 23, 24, 25, 26, 27,
- 28, 29, -1, 31, -1, -1, -1, 35, -1, -1,
- -1, 39, -1, -1, 42, 43, 44, -1, 46, -1,
- 48, 49, -1, -1, 52, -1, -1, 55, 56, -1,
- 58, 59, -1, 61, 62, -1, 64, 65, 66, 67,
- 68, 69, 70, -1, 72, 73, 74, 75, 76, 77,
- 78, 79, -1, 81, 82, 83, 84, 85, 86, 87,
- 88, -1, 90, 91, -1, 93, 94, 95, 96, 97,
- -1, 99, -1, -1, 102, -1, -1, 105, -1, -1,
- -1, 109, -1, -1, -1, 113, 114, 115, -1, -1,
- 118, -1, -1, -1, -1, 123, 124, -1, -1, -1,
- -1, 129, -1, 131, -1, -1, -1, 135, -1, 137,
- 138, 139, 140, -1, -1, -1, 144, -1, -1, 147,
- 148, 149, -1, -1, -1, 153, -1, 155, 156, -1,
- 158, 159, 160, -1, -1, 163, 164, -1, 166, 167,
- 168, 169, 170, 171, -1, -1, 174, 175, 176, -1,
- -1, 179, 180, -1, 182, 183, 184, -1, -1, 187,
- -1, -1, -1, 191, -1, 193, -1, 195, -1, 197,
- 198, 199, 200, 201, 202, -1, 204, -1, -1, -1,
- 208, 209, 210, -1, 212, -1, -1, -1, 216, 217,
- -1, -1, -1, 221, 222, 223, 224, -1, -1, 227,
- 228, 229, -1, 231, -1, 233, -1, -1, -1, -1,
- 238, 239, -1, -1, -1, 243, -1, 245, 246, -1,
- 248, 249, -1, -1, -1, 253, -1, -1, 256, 257,
- 258, -1, -1, 261, -1, -1, 264, 265, 266, -1,
- -1, -1, -1, 271, 272, -1, 274, -1, 276, -1,
- 278, 279, -1, -1, -1, -1, -1, -1, -1, 287,
- 288, 289, 290, 291, 292, 293, 294, 295, 296, 297,
- 298, 299, -1, 301, 302, 303, -1, 305, 306, 307,
- 308, -1, 310, 311, -1, -1, -1, -1, 316, 317,
- 318, 319, 320, 321, -1, -1, 324, 325, -1, 327,
- -1, 329, -1, 331, 332, 333, 334, 335, 336, 337,
- 338, 339, 340, -1, -1, 343, 344, -1, -1, 347,
- 348, 349, 350, -1, -1, -1, 354, 355, -1, -1,
- -1, -1, 360, 361, 362, -1, 364, 365, 366, 367,
- -1, 369, 370, -1, -1, -1, -1, -1, -1, -1,
- -1, 379, 380, 381, -1, -1, 384, -1, 386, 387,
- 388, 389, 390, 391, 392, 393, 394, 395, 396, 397,
- -1, -1, 400, 401, 402, -1, 404, -1, 406, 407,
- 408, 409, 410, -1, 412, 413, 414, -1, -1, 417,
- -1, -1, -1, 421, 422, 423, 424, 425, -1, -1,
- 428, 429, 430, 431, 432, -1, 434, 435, -1, 437,
- 438, 439, -1, -1, 442, -1, 444, -1, 446, 447,
- -1, 449, 450, -1, -1, -1, 454, 455, 456, 457,
- 458, 459, 460, 461, 462, 463, -1, 465, 466, -1,
- -1, -1, 470, 471, 472, 473, -1, -1, -1, 477,
- -1, -1, -1, 481, -1, 483, 484, 485, 486, -1,
- 488, 489, 490, 491, 492, 493, -1, -1, -1, -1,
- -1, -1, 500, 501, -1, 503, -1, -1, 506, -1,
- -1, 509, 510, 511, -1, -1, 514, 515, -1, 517,
- 518, 519, 520, 521, 522, -1, -1, 525, 526, 527,
- 528, -1, 530, 531, -1, 533, -1, 535, 536, 537,
- 538, -1, 540, 541, 542, -1, 544, 545, 546, 547,
- -1, -1, -1, -1, -1, 553, 554, 555, -1, -1,
- -1, 559, 560, 561, 562, -1, 564, 565, -1, 567,
- 568, -1, 570, 571, -1, -1, 574, -1, -1, 577,
- -1, 579, -1, 581, 582, 583, -1, -1, -1, -1,
- -1, -1, 590, -1, -1, 593, -1, -1, -1, 597,
- 598, 599, 600, 601, 602, -1, -1, -1, -1, -1,
- -1, 609, 610, -1, 612, 613, 614, -1, -1, 617,
- -1, 5, -1, 7, 8, 9, 10, 11, -1, -1,
- 14, -1, -1, -1, 18, -1, -1, 21, 636, 23,
+ 612, 613, 614, -1, -1, 617, -1, -1, 5, -1,
+ 7, 8, 9, 10, 11, -1, -1, 14, -1, -1,
+ -1, 18, -1, -1, 21, 637, 23, 24, 25, 26,
+ 27, 28, 29, -1, 31, -1, -1, -1, 35, -1,
+ -1, -1, 39, -1, -1, 42, 43, 44, -1, 46,
+ -1, 48, 49, -1, -1, 52, -1, -1, 55, 56,
+ -1, 58, 59, -1, 61, 62, -1, 64, 65, 66,
+ 67, 68, 69, 70, -1, 72, 73, 74, 75, 76,
+ 77, 78, 79, -1, 81, 82, 83, 84, 85, 86,
+ 87, 88, -1, 90, 91, -1, 93, 94, 95, 96,
+ 97, -1, 99, -1, -1, 102, -1, -1, 105, -1,
+ -1, -1, 109, -1, -1, -1, 113, 114, 115, -1,
+ -1, 118, -1, -1, -1, -1, 123, 124, -1, -1,
+ -1, -1, 129, -1, 131, -1, -1, -1, 135, -1,
+ 137, 138, 139, 140, -1, -1, -1, 144, -1, -1,
+ 147, 148, 149, -1, -1, -1, 153, -1, 155, 156,
+ -1, 158, 159, 160, -1, -1, 163, 164, -1, 166,
+ 167, 168, 169, 170, 171, -1, -1, 174, 175, 176,
+ -1, -1, 179, 180, -1, 182, 183, 184, -1, -1,
+ 187, -1, -1, -1, 191, -1, 193, -1, 195, -1,
+ 197, 198, 199, 200, 201, 202, -1, 204, -1, -1,
+ -1, 208, 209, 210, -1, 212, -1, -1, -1, 216,
+ 217, -1, -1, -1, 221, 222, 223, 224, -1, -1,
+ 227, 228, 229, -1, 231, -1, 233, -1, -1, -1,
+ -1, 238, 239, -1, -1, -1, 243, -1, 245, 246,
+ -1, 248, 249, -1, -1, -1, 253, -1, -1, 256,
+ 257, 258, -1, -1, 261, -1, -1, 264, 265, 266,
+ -1, -1, -1, -1, 271, 272, -1, 274, -1, 276,
+ -1, 278, 279, -1, -1, -1, -1, -1, -1, -1,
+ 287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
+ 297, 298, 299, -1, 301, 302, 303, -1, 305, 306,
+ 307, 308, -1, 310, 311, -1, -1, -1, -1, 316,
+ 317, 318, 319, 320, 321, -1, -1, 324, 325, -1,
+ 327, -1, 329, -1, 331, 332, 333, 334, 335, 336,
+ 337, 338, 339, 340, -1, -1, 343, 344, -1, -1,
+ 347, 348, 349, 350, -1, -1, -1, 354, 355, -1,
+ -1, -1, -1, 360, 361, 362, -1, 364, 365, 366,
+ 367, -1, 369, 370, -1, -1, -1, -1, -1, -1,
+ -1, -1, 379, 380, 381, -1, -1, 384, -1, 386,
+ 387, 388, 389, 390, 391, 392, 393, 394, 395, 396,
+ 397, -1, -1, 400, 401, 402, -1, 404, -1, 406,
+ 407, 408, 409, 410, -1, 412, 413, 414, -1, -1,
+ 417, -1, -1, -1, 421, 422, 423, 424, 425, -1,
+ -1, 428, 429, 430, 431, 432, -1, 434, 435, -1,
+ 437, 438, 439, -1, -1, 442, -1, 444, -1, 446,
+ 447, -1, 449, 450, -1, -1, -1, 454, 455, 456,
+ 457, 458, 459, 460, 461, 462, 463, -1, 465, 466,
+ -1, -1, -1, 470, 471, 472, 473, -1, -1, -1,
+ 477, -1, -1, -1, 481, -1, 483, 484, 485, 486,
+ -1, 488, 489, 490, 491, 492, 493, -1, -1, -1,
+ -1, -1, -1, 500, 501, -1, 503, -1, -1, 506,
+ -1, -1, 509, 510, 511, -1, -1, 514, 515, -1,
+ 517, 518, 519, 520, 521, 522, -1, -1, 525, 526,
+ 527, 528, -1, 530, 531, -1, 533, -1, 535, 536,
+ 537, 538, -1, 540, 541, 542, -1, 544, 545, 546,
+ 547, -1, -1, -1, -1, -1, 553, 554, 555, -1,
+ -1, -1, 559, 560, 561, 562, -1, 564, 565, -1,
+ 567, 568, -1, 570, 571, -1, -1, 574, -1, -1,
+ 577, -1, 579, -1, 581, 582, 583, -1, -1, -1,
+ -1, -1, -1, 590, -1, -1, 593, -1, -1, -1,
+ 597, 598, 599, 600, 601, 602, -1, -1, -1, -1,
+ -1, -1, 609, 610, -1, 612, 613, 614, -1, -1,
+ 617, -1, 5, -1, 7, 8, 9, 10, 11, -1,
+ -1, 14, -1, -1, -1, 18, -1, -1, 21, 636,
+ 23, 24, 25, 26, 27, 28, 29, -1, 31, -1,
+ -1, -1, 35, -1, -1, -1, 39, -1, -1, 42,
+ 43, 44, -1, 46, -1, 48, 49, -1, -1, 52,
+ -1, -1, 55, 56, -1, 58, 59, -1, 61, 62,
+ -1, 64, 65, 66, 67, 68, 69, 70, -1, 72,
+ 73, 74, 75, 76, 77, 78, 79, -1, 81, 82,
+ 83, 84, 85, 86, 87, 88, -1, 90, 91, -1,
+ 93, 94, 95, 96, 97, -1, 99, -1, -1, 102,
+ -1, -1, 105, -1, -1, -1, 109, -1, -1, -1,
+ 113, 114, 115, -1, -1, 118, -1, -1, -1, -1,
+ 123, 124, -1, -1, -1, -1, 129, -1, 131, -1,
+ -1, -1, 135, -1, 137, 138, 139, 140, -1, -1,
+ -1, 144, -1, -1, 147, 148, 149, -1, -1, -1,
+ 153, -1, 155, 156, -1, 158, 159, 160, -1, -1,
+ 163, 164, -1, 166, 167, 168, 169, 170, 171, -1,
+ -1, 174, 175, 176, -1, -1, 179, 180, -1, 182,
+ 183, 184, -1, -1, 187, -1, -1, -1, 191, -1,
+ 193, -1, 195, -1, 197, 198, 199, 200, 201, 202,
+ -1, 204, -1, -1, -1, 208, 209, 210, -1, 212,
+ -1, -1, -1, 216, 217, -1, -1, -1, 221, 222,
+ 223, 224, -1, -1, 227, 228, 229, -1, 231, -1,
+ 233, -1, -1, -1, -1, 238, 239, -1, -1, -1,
+ 243, -1, 245, 246, -1, 248, 249, -1, -1, -1,
+ 253, -1, -1, 256, 257, 258, -1, -1, 261, -1,
+ -1, 264, 265, 266, -1, -1, -1, -1, 271, 272,
+ -1, 274, -1, 276, -1, 278, 279, -1, -1, -1,
+ -1, -1, -1, -1, 287, 288, 289, 290, 291, 292,
+ 293, 294, 295, 296, 297, 298, 299, -1, 301, 302,
+ 303, -1, 305, 306, 307, 308, -1, 310, 311, -1,
+ -1, -1, -1, 316, 317, 318, 319, 320, 321, -1,
+ -1, 324, 325, -1, 327, -1, 329, -1, 331, 332,
+ 333, 334, 335, 336, 337, 338, 339, 340, -1, -1,
+ 343, 344, -1, -1, 347, 348, 349, 350, -1, -1,
+ -1, 354, 355, -1, -1, -1, -1, 360, 361, 362,
+ -1, 364, 365, 366, 367, -1, 369, 370, -1, -1,
+ -1, -1, -1, -1, -1, -1, 379, 380, 381, -1,
+ -1, 384, -1, 386, 387, 388, 389, 390, 391, 392,
+ 393, 394, 395, 396, 397, -1, -1, 400, 401, 402,
+ -1, 404, -1, 406, 407, 408, 409, 410, -1, 412,
+ 413, 414, -1, -1, 417, -1, -1, -1, 421, 422,
+ 423, 424, 425, -1, -1, 428, 429, 430, 431, 432,
+ -1, 434, 435, -1, 437, 438, 439, -1, -1, 442,
+ -1, 444, -1, 446, 447, -1, 449, 450, -1, -1,
+ -1, 454, 455, 456, 457, 458, 459, 460, 461, 462,
+ 463, -1, 465, 466, -1, -1, -1, 470, 471, 472,
+ 473, -1, -1, -1, 477, -1, -1, -1, 481, -1,
+ 483, 484, 485, 486, -1, 488, 489, 490, 491, 492,
+ 493, -1, -1, -1, -1, -1, -1, 500, 501, -1,
+ 503, -1, -1, 506, -1, -1, 509, 510, 511, -1,
+ -1, 514, 515, -1, 517, 518, 519, 520, 521, 522,
+ -1, -1, 525, 526, 527, 528, -1, 530, 531, -1,
+ 533, -1, 535, 536, 537, 538, -1, 540, 541, 542,
+ -1, 544, 545, 546, 547, -1, -1, -1, -1, -1,
+ 553, 554, 555, -1, -1, -1, 559, 560, 561, 562,
+ -1, 564, 565, -1, 567, 568, -1, 570, 571, -1,
+ -1, 574, -1, -1, 577, -1, 579, -1, 581, 582,
+ 583, -1, -1, -1, -1, -1, -1, 590, -1, -1,
+ 593, -1, -1, -1, 597, 598, 599, 600, 601, 602,
+ -1, -1, -1, -1, -1, -1, 609, 610, -1, 612,
+ 613, 614, -1, -1, 617, -1, 5, -1, 7, 8,
+ 9, 10, 11, -1, -1, 14, -1, -1, -1, 18,
+ -1, -1, 21, 636, 23, 24, 25, 26, 27, 28,
+ 29, -1, 31, -1, -1, -1, 35, -1, -1, -1,
+ 39, -1, -1, 42, 43, 44, -1, 46, -1, 48,
+ 49, -1, -1, 52, -1, -1, 55, 56, -1, 58,
+ 59, -1, 61, 62, -1, 64, 65, 66, 67, 68,
+ 69, 70, -1, 72, 73, 74, 75, 76, 77, 78,
+ 79, -1, 81, 82, 83, 84, 85, 86, 87, 88,
+ -1, 90, 91, -1, 93, 94, 95, 96, 97, -1,
+ 99, -1, -1, 102, -1, -1, 105, -1, -1, -1,
+ 109, -1, -1, -1, 113, 114, 115, -1, -1, 118,
+ -1, -1, -1, -1, 123, 124, -1, -1, -1, -1,
+ 129, -1, 131, -1, -1, -1, 135, -1, 137, 138,
+ 139, 140, -1, -1, -1, 144, -1, -1, 147, 148,
+ 149, -1, -1, -1, 153, -1, 155, 156, -1, 158,
+ 159, 160, -1, -1, 163, 164, -1, 166, 167, 168,
+ 169, 170, 171, -1, -1, 174, 175, 176, -1, -1,
+ 179, 180, -1, 182, 183, 184, -1, -1, 187, -1,
+ -1, -1, 191, -1, 193, -1, 195, -1, 197, 198,
+ 199, 200, 201, 202, -1, 204, -1, -1, -1, 208,
+ 209, 210, -1, 212, -1, -1, -1, 216, 217, -1,
+ -1, -1, 221, 222, 223, 224, -1, -1, 227, 228,
+ 229, -1, 231, -1, 233, -1, -1, -1, -1, 238,
+ 239, -1, -1, -1, 243, -1, 245, 246, -1, 248,
+ 249, -1, -1, -1, 253, -1, -1, 256, 257, 258,
+ -1, -1, 261, -1, -1, 264, 265, 266, -1, -1,
+ -1, -1, 271, 272, -1, 274, -1, 276, -1, 278,
+ 279, -1, -1, -1, -1, -1, -1, -1, 287, 288,
+ 289, 290, 291, 292, 293, 294, 295, 296, 297, 298,
+ 299, -1, 301, 302, 303, -1, 305, 306, 307, 308,
+ -1, 310, 311, -1, -1, -1, -1, 316, 317, 318,
+ 319, 320, 321, -1, -1, 324, 325, -1, 327, -1,
+ 329, -1, 331, 332, 333, 334, 335, 336, 337, 338,
+ 339, 340, -1, -1, 343, 344, -1, -1, 347, 348,
+ 349, 350, -1, -1, -1, 354, 355, -1, -1, -1,
+ -1, 360, 361, 362, -1, 364, 365, 366, 367, -1,
+ 369, 370, -1, -1, -1, -1, -1, -1, -1, -1,
+ 379, 380, 381, -1, -1, 384, -1, 386, 387, 388,
+ 389, 390, 391, 392, 393, 394, 395, 396, 397, -1,
+ -1, 400, 401, 402, -1, 404, -1, 406, 407, 408,
+ 409, 410, -1, 412, 413, 414, -1, -1, 417, -1,
+ -1, -1, 421, 422, 423, 424, 425, -1, -1, 428,
+ 429, 430, 431, 432, -1, 434, 435, -1, 437, 438,
+ 439, -1, -1, 442, -1, 444, -1, 446, 447, -1,
+ 449, 450, -1, -1, -1, 454, 455, 456, 457, 458,
+ 459, 460, 461, 462, 463, -1, 465, 466, -1, -1,
+ -1, 470, 471, 472, 473, -1, -1, -1, 477, -1,
+ -1, -1, 481, -1, 483, 484, 485, 486, -1, 488,
+ 489, 490, 491, 492, 493, -1, -1, -1, -1, -1,
+ -1, 500, 501, -1, 503, -1, -1, 506, -1, -1,
+ 509, 510, 511, -1, -1, 514, 515, -1, 517, 518,
+ 519, 520, 521, 522, -1, -1, 525, 526, 527, 528,
+ -1, 530, 531, -1, 533, -1, 535, 536, 537, 538,
+ -1, 540, 541, 542, -1, 544, 545, 546, 547, -1,
+ -1, -1, -1, -1, 553, 554, 555, -1, -1, -1,
+ 559, 560, 561, 562, -1, 564, 565, -1, 567, 568,
+ -1, 570, 571, -1, -1, 574, -1, -1, 577, -1,
+ 579, -1, 581, 582, 583, -1, -1, -1, -1, -1,
+ -1, 590, -1, -1, 593, -1, -1, -1, 597, 598,
+ 599, 600, 601, 602, -1, -1, -1, -1, -1, -1,
+ 609, 610, -1, 612, 613, 614, -1, -1, 617, -1,
+ 5, -1, 7, 8, 9, 10, 11, -1, -1, 14,
+ -1, -1, -1, 18, -1, -1, -1, 636, 23, 24,
+ 25, 26, 27, 28, -1, -1, 31, -1, -1, -1,
+ 35, -1, -1, -1, 39, -1, -1, 42, 43, 44,
+ -1, 46, -1, -1, -1, -1, -1, 52, 53, -1,
+ 55, 56, -1, 58, -1, -1, -1, -1, -1, 64,
+ 65, 66, 67, 68, 69, 70, -1, 72, 73, -1,
+ -1, -1, -1, -1, -1, -1, 81, -1, 83, -1,
+ 85, 86, 87, 88, -1, 90, 91, -1, 93, 94,
+ 95, -1, 97, -1, 99, -1, -1, 102, -1, -1,
+ 105, -1, -1, -1, 109, -1, -1, -1, 113, 114,
+ 115, -1, -1, 118, -1, -1, -1, -1, 123, -1,
+ -1, -1, -1, -1, 129, -1, 131, -1, -1, -1,
+ 135, -1, 137, 138, 139, 140, -1, -1, -1, -1,
+ -1, -1, 147, 148, 149, -1, -1, -1, 153, -1,
+ -1, 156, -1, 158, 159, 160, -1, -1, 163, 164,
+ -1, 166, 167, 168, 169, -1, -1, -1, -1, 174,
+ 175, 176, -1, -1, 179, 180, 181, 182, 183, 184,
+ -1, -1, -1, -1, -1, -1, 191, -1, 193, -1,
+ 195, -1, 197, 198, 199, 200, 201, 202, -1, 204,
+ -1, -1, -1, -1, 209, 210, -1, -1, -1, -1,
+ -1, -1, 217, -1, -1, -1, 221, 222, 223, 224,
+ 225, -1, 227, 228, 229, -1, 231, -1, 233, -1,
+ -1, -1, -1, 238, -1, -1, -1, -1, 243, -1,
+ 245, 246, -1, 248, 249, 250, -1, -1, 253, -1,
+ -1, -1, 257, 258, -1, -1, 261, 262, -1, 264,
+ 265, -1, -1, -1, -1, -1, 271, 272, -1, 274,
+ -1, 276, -1, 278, 279, -1, -1, -1, -1, 284,
+ -1, -1, 287, 288, 289, 290, 291, 292, 293, 294,
+ 295, 296, 297, 298, 299, -1, 301, 302, 303, -1,
+ 305, 306, 307, 308, -1, 310, 311, -1, -1, -1,
+ -1, 316, 317, 318, 319, 320, 321, -1, -1, 324,
+ 325, -1, 327, -1, 329, -1, 331, 332, 333, 334,
+ 335, 336, 337, 338, 339, 340, -1, -1, 343, 344,
+ -1, -1, 347, 348, 349, 350, -1, -1, -1, -1,
+ 355, -1, -1, -1, -1, 360, 361, 362, -1, 364,
+ 365, 366, 367, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 380, 381, -1, -1, -1,
+ -1, 386, 387, 388, -1, 390, 391, 392, 393, 394,
+ 395, 396, -1, -1, -1, -1, 401, 402, -1, 404,
+ -1, 406, 407, 408, 409, 410, -1, 412, 413, 414,
+ -1, -1, 417, -1, -1, -1, 421, 422, 423, 424,
+ 425, -1, -1, 428, 429, 430, 431, 432, -1, 434,
+ -1, -1, 437, -1, 439, 440, -1, 442, -1, -1,
+ -1, 446, -1, -1, 449, 450, 451, -1, -1, -1,
+ 455, 456, 457, 458, 459, 460, -1, 462, 463, -1,
+ 465, -1, -1, -1, -1, 470, 471, 472, -1, -1,
+ -1, -1, 477, -1, -1, -1, 481, -1, -1, 484,
+ -1, 486, -1, 488, -1, 490, -1, 492, 493, -1,
+ -1, -1, -1, -1, -1, 500, 501, -1, 503, -1,
+ -1, 506, -1, -1, 509, -1, 511, -1, -1, -1,
+ 515, -1, 517, 518, 519, 520, 521, 522, -1, -1,
+ 525, 526, 527, 528, -1, 530, 531, -1, 533, -1,
+ 535, 536, 537, 538, -1, -1, 541, 542, -1, 544,
+ 545, 546, 547, -1, -1, -1, -1, -1, 553, 554,
+ 555, -1, -1, -1, -1, 560, 561, 562, -1, 564,
+ 565, -1, 567, 568, -1, -1, -1, -1, -1, 574,
+ -1, -1, 577, -1, -1, -1, 581, 582, 583, -1,
+ -1, -1, -1, -1, -1, 590, -1, -1, 593, -1,
+ -1, -1, 597, 598, 599, 600, 601, 602, -1, -1,
+ 605, -1, -1, -1, 609, -1, -1, 612, -1, 614,
+ -1, 5, 617, 7, 8, 9, 10, 11, -1, -1,
+ 14, -1, -1, -1, 18, -1, 631, 21, -1, 23,
24, 25, 26, 27, 28, 29, -1, 31, -1, -1,
-1, 35, -1, -1, -1, 39, -1, -1, 42, 43,
44, -1, 46, -1, 48, 49, -1, -1, 52, -1,
@@ -14355,7 +14479,7 @@ static const yytype_int16 yycheck[] =
74, 75, 76, 77, 78, 79, -1, 81, 82, 83,
84, 85, 86, 87, 88, -1, 90, 91, -1, 93,
94, 95, 96, 97, -1, 99, -1, -1, 102, -1,
- -1, 105, -1, -1, -1, 109, -1, -1, -1, 113,
+ -1, 105, -1, 107, -1, 109, -1, -1, -1, 113,
114, 115, -1, -1, 118, -1, -1, -1, -1, 123,
124, -1, -1, -1, -1, 129, -1, 131, -1, -1,
-1, 135, -1, 137, 138, 139, 140, -1, -1, -1,
@@ -14406,70 +14530,131 @@ static const yytype_int16 yycheck[] =
-1, -1, -1, -1, -1, -1, 590, -1, -1, 593,
-1, -1, -1, 597, 598, 599, 600, 601, 602, -1,
-1, -1, -1, -1, -1, 609, 610, -1, 612, 613,
- 614, -1, -1, 617, -1, 5, -1, 7, 8, 9,
- 10, 11, -1, -1, 14, -1, -1, -1, 18, -1,
- -1, -1, 636, 23, 24, 25, 26, 27, 28, -1,
+ 614, -1, -1, 617, 5, -1, 7, 8, 9, 10,
+ 11, -1, -1, 14, -1, 629, -1, 18, -1, -1,
+ 21, -1, 23, 24, 25, 26, 27, 28, 29, -1,
+ 31, -1, -1, -1, 35, -1, -1, -1, 39, -1,
+ -1, 42, 43, 44, -1, 46, -1, 48, 49, -1,
+ -1, 52, -1, -1, 55, 56, -1, 58, 59, -1,
+ 61, 62, -1, 64, 65, 66, 67, 68, 69, 70,
+ -1, 72, 73, 74, 75, 76, 77, 78, 79, -1,
+ 81, 82, 83, 84, 85, 86, 87, 88, -1, 90,
+ 91, -1, 93, 94, 95, 96, 97, -1, 99, -1,
+ -1, 102, -1, -1, 105, -1, -1, -1, 109, -1,
+ -1, -1, 113, 114, 115, -1, -1, 118, -1, -1,
+ -1, -1, 123, 124, -1, -1, -1, -1, 129, -1,
+ 131, -1, -1, -1, 135, -1, 137, 138, 139, 140,
+ -1, -1, -1, 144, -1, -1, 147, 148, 149, -1,
+ -1, -1, 153, -1, 155, 156, -1, 158, 159, 160,
+ -1, -1, 163, 164, -1, 166, 167, 168, 169, 170,
+ 171, -1, -1, 174, 175, 176, -1, -1, 179, 180,
+ -1, 182, 183, 184, -1, -1, 187, -1, -1, -1,
+ 191, -1, 193, -1, 195, -1, 197, 198, 199, 200,
+ 201, 202, -1, 204, -1, -1, -1, 208, 209, 210,
+ -1, 212, -1, -1, -1, 216, 217, -1, -1, -1,
+ 221, 222, 223, 224, -1, -1, 227, 228, 229, -1,
+ 231, -1, 233, -1, -1, -1, -1, 238, 239, -1,
+ -1, -1, 243, -1, 245, 246, -1, 248, 249, -1,
+ -1, -1, 253, -1, -1, 256, 257, 258, -1, -1,
+ 261, -1, -1, 264, 265, -1, -1, -1, -1, -1,
+ 271, 272, -1, 274, -1, 276, -1, 278, 279, -1,
+ -1, -1, -1, -1, -1, -1, 287, 288, 289, 290,
+ 291, 292, 293, 294, 295, 296, 297, 298, 299, -1,
+ 301, 302, 303, -1, 305, 306, 307, 308, -1, 310,
+ 311, -1, -1, -1, -1, 316, 317, 318, 319, 320,
+ 321, -1, -1, 324, 325, -1, 327, -1, 329, -1,
+ 331, 332, 333, 334, 335, 336, 337, 338, 339, 340,
+ -1, -1, 343, 344, -1, -1, 347, 348, 349, 350,
+ -1, -1, -1, 354, 355, -1, -1, -1, -1, 360,
+ 361, 362, -1, 364, 365, 366, 367, -1, 369, 370,
+ -1, -1, -1, -1, -1, -1, -1, -1, 379, 380,
+ 381, -1, -1, 384, -1, 386, 387, 388, 389, 390,
+ 391, 392, 393, 394, 395, 396, 397, -1, -1, 400,
+ 401, 402, -1, 404, -1, 406, 407, 408, 409, 410,
+ -1, 412, 413, 414, -1, -1, 417, -1, -1, -1,
+ 421, 422, 423, 424, 425, -1, -1, 428, 429, 430,
+ 431, 432, -1, 434, 435, -1, 437, 438, 439, -1,
+ -1, 442, -1, 444, -1, 446, 447, -1, 449, 450,
+ -1, -1, -1, 454, 455, 456, 457, 458, 459, 460,
+ 461, 462, 463, -1, 465, 466, -1, -1, -1, 470,
+ 471, 472, 473, -1, -1, -1, 477, -1, -1, -1,
+ 481, -1, 483, 484, 485, 486, -1, 488, 489, 490,
+ 491, 492, 493, -1, -1, -1, -1, -1, -1, 500,
+ 501, -1, 503, -1, -1, 506, -1, -1, 509, 510,
+ 511, -1, -1, 514, 515, -1, 517, 518, 519, 520,
+ 521, 522, -1, -1, 525, 526, 527, 528, -1, 530,
+ 531, -1, 533, -1, 535, 536, 537, 538, -1, -1,
+ 541, 542, -1, 544, 545, 546, 547, -1, -1, -1,
+ -1, -1, 553, 554, 555, -1, -1, -1, 559, 560,
+ 561, 562, -1, 564, 565, -1, 567, 568, -1, 570,
+ 571, -1, -1, 574, -1, -1, 577, -1, 579, -1,
+ 581, 582, 583, -1, -1, -1, -1, -1, -1, 590,
+ -1, -1, 593, -1, -1, -1, 597, 598, 599, 600,
+ 601, 602, -1, -1, -1, -1, -1, -1, 609, 610,
+ -1, 612, 613, 614, -1, 5, 617, 7, 8, 9,
+ 10, 11, -1, 624, 14, -1, -1, -1, 18, -1,
+ -1, 21, -1, 23, 24, 25, 26, 27, 28, 29,
-1, 31, -1, -1, -1, 35, -1, -1, -1, 39,
- -1, -1, 42, 43, 44, -1, 46, -1, -1, -1,
- -1, -1, 52, 53, -1, 55, 56, -1, 58, -1,
- -1, -1, -1, -1, 64, 65, 66, 67, 68, 69,
- 70, -1, 72, 73, -1, -1, -1, -1, -1, -1,
- -1, 81, -1, 83, -1, 85, 86, 87, 88, -1,
- 90, 91, -1, 93, 94, 95, -1, 97, -1, 99,
+ -1, -1, 42, 43, 44, -1, 46, -1, 48, 49,
+ -1, -1, 52, -1, -1, 55, 56, -1, 58, 59,
+ -1, 61, 62, -1, 64, 65, 66, 67, 68, 69,
+ 70, -1, 72, 73, 74, 75, 76, 77, 78, 79,
+ -1, 81, 82, 83, 84, 85, 86, 87, 88, -1,
+ 90, 91, -1, 93, 94, 95, 96, 97, -1, 99,
-1, -1, 102, -1, -1, 105, -1, -1, -1, 109,
-1, -1, -1, 113, 114, 115, -1, -1, 118, -1,
- -1, -1, -1, 123, -1, -1, -1, -1, -1, 129,
+ -1, -1, -1, 123, 124, -1, -1, -1, -1, 129,
-1, 131, -1, -1, -1, 135, -1, 137, 138, 139,
- 140, -1, -1, -1, -1, -1, -1, 147, 148, 149,
- -1, -1, -1, 153, -1, -1, 156, -1, 158, 159,
+ 140, -1, -1, -1, 144, -1, -1, 147, 148, 149,
+ -1, -1, -1, 153, -1, 155, 156, -1, 158, 159,
160, -1, -1, 163, 164, -1, 166, 167, 168, 169,
- -1, -1, -1, -1, 174, 175, 176, -1, -1, 179,
- 180, 181, 182, 183, 184, -1, -1, -1, -1, -1,
+ 170, 171, -1, -1, 174, 175, 176, -1, -1, 179,
+ 180, -1, 182, 183, 184, -1, -1, 187, -1, -1,
-1, 191, -1, 193, -1, 195, -1, 197, 198, 199,
- 200, 201, 202, -1, 204, -1, -1, -1, -1, 209,
- 210, -1, -1, -1, -1, -1, -1, 217, -1, -1,
- -1, 221, 222, 223, 224, 225, -1, 227, 228, 229,
- -1, 231, -1, 233, -1, -1, -1, -1, 238, -1,
+ 200, 201, 202, -1, 204, -1, -1, -1, 208, 209,
+ 210, -1, 212, -1, -1, -1, 216, 217, -1, -1,
+ -1, 221, 222, 223, 224, -1, -1, 227, 228, 229,
+ -1, 231, -1, 233, -1, -1, -1, -1, 238, 239,
-1, -1, -1, 243, -1, 245, 246, -1, 248, 249,
- 250, -1, -1, 253, -1, -1, -1, 257, 258, -1,
- -1, 261, 262, -1, 264, 265, -1, -1, -1, -1,
+ -1, -1, -1, 253, -1, -1, 256, 257, 258, -1,
+ -1, 261, -1, -1, 264, 265, -1, -1, -1, -1,
-1, 271, 272, -1, 274, -1, 276, -1, 278, 279,
- -1, -1, -1, -1, 284, -1, -1, 287, 288, 289,
+ -1, -1, -1, -1, -1, -1, -1, 287, 288, 289,
290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
-1, 301, 302, 303, -1, 305, 306, 307, 308, -1,
310, 311, -1, -1, -1, -1, 316, 317, 318, 319,
320, 321, -1, -1, 324, 325, -1, 327, -1, 329,
-1, 331, 332, 333, 334, 335, 336, 337, 338, 339,
340, -1, -1, 343, 344, -1, -1, 347, 348, 349,
- 350, -1, -1, -1, -1, 355, -1, -1, -1, -1,
- 360, 361, 362, -1, 364, 365, 366, 367, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 380, 381, -1, -1, -1, -1, 386, 387, 388, -1,
- 390, 391, 392, 393, 394, 395, 396, -1, -1, -1,
- -1, 401, 402, -1, 404, -1, 406, 407, 408, 409,
+ 350, -1, -1, -1, 354, 355, -1, -1, -1, -1,
+ 360, 361, 362, -1, 364, 365, 366, 367, -1, 369,
+ 370, -1, -1, -1, -1, -1, -1, -1, -1, 379,
+ 380, 381, -1, -1, 384, -1, 386, 387, 388, 389,
+ 390, 391, 392, 393, 394, 395, 396, 397, -1, -1,
+ 400, 401, 402, -1, 404, -1, 406, 407, 408, 409,
410, -1, 412, 413, 414, -1, -1, 417, -1, -1,
-1, 421, 422, 423, 424, 425, -1, -1, 428, 429,
- 430, 431, 432, -1, 434, -1, -1, 437, -1, 439,
- 440, -1, 442, -1, -1, -1, 446, -1, -1, 449,
- 450, 451, -1, -1, -1, 455, 456, 457, 458, 459,
- 460, -1, 462, 463, -1, 465, -1, -1, -1, -1,
- 470, 471, 472, -1, -1, -1, -1, 477, -1, -1,
- -1, 481, -1, -1, 484, -1, 486, -1, 488, -1,
- 490, -1, 492, 493, -1, -1, -1, -1, -1, -1,
+ 430, 431, 432, -1, 434, 435, -1, 437, 438, 439,
+ -1, -1, 442, -1, 444, -1, 446, 447, -1, 449,
+ 450, -1, -1, -1, 454, 455, 456, 457, 458, 459,
+ 460, 461, 462, 463, -1, 465, 466, -1, -1, -1,
+ 470, 471, 472, 473, -1, -1, -1, 477, -1, -1,
+ -1, 481, -1, 483, 484, 485, 486, -1, 488, 489,
+ 490, 491, 492, 493, -1, -1, -1, -1, -1, -1,
500, 501, -1, 503, -1, -1, 506, -1, -1, 509,
- -1, 511, -1, -1, -1, 515, -1, 517, 518, 519,
+ 510, 511, -1, -1, 514, 515, -1, 517, 518, 519,
520, 521, 522, -1, -1, 525, 526, 527, 528, -1,
530, 531, -1, 533, -1, 535, 536, 537, 538, -1,
-1, 541, 542, -1, 544, 545, 546, 547, -1, -1,
- -1, -1, -1, 553, 554, 555, -1, -1, -1, -1,
+ -1, -1, -1, 553, 554, 555, -1, -1, -1, 559,
560, 561, 562, -1, 564, 565, -1, 567, 568, -1,
- -1, -1, -1, -1, 574, -1, -1, 577, -1, -1,
+ 570, 571, -1, -1, 574, -1, -1, 577, -1, 579,
-1, 581, 582, 583, -1, -1, -1, -1, -1, -1,
590, -1, -1, 593, -1, -1, -1, 597, 598, 599,
- 600, 601, 602, -1, -1, 605, -1, -1, -1, 609,
- -1, -1, 612, -1, 614, -1, 5, 617, 7, 8,
- 9, 10, 11, -1, -1, 14, -1, -1, -1, 18,
- -1, 631, 21, -1, 23, 24, 25, 26, 27, 28,
+ 600, 601, 602, -1, -1, -1, -1, -1, -1, 609,
+ 610, -1, 612, 613, 614, -1, 5, 617, 7, 8,
+ 9, 10, 11, -1, 624, 14, -1, -1, -1, 18,
+ -1, -1, 21, -1, 23, 24, 25, 26, 27, 28,
29, -1, 31, -1, -1, -1, 35, -1, -1, -1,
39, -1, -1, 42, 43, 44, -1, 46, -1, 48,
49, -1, -1, 52, -1, -1, 55, 56, -1, 58,
@@ -14477,7 +14662,7 @@ static const yytype_int16 yycheck[] =
69, 70, -1, 72, 73, 74, 75, 76, 77, 78,
79, -1, 81, 82, 83, 84, 85, 86, 87, 88,
-1, 90, 91, -1, 93, 94, 95, 96, 97, -1,
- 99, -1, -1, 102, -1, -1, 105, -1, 107, -1,
+ 99, -1, -1, 102, -1, -1, 105, -1, -1, -1,
109, -1, -1, -1, 113, 114, 115, -1, -1, 118,
-1, -1, -1, -1, 123, 124, -1, -1, -1, -1,
129, -1, 131, -1, -1, -1, 135, -1, 137, 138,
@@ -14493,7 +14678,7 @@ static const yytype_int16 yycheck[] =
229, -1, 231, -1, 233, -1, -1, -1, -1, 238,
239, -1, -1, -1, 243, -1, 245, 246, -1, 248,
249, -1, -1, -1, 253, -1, -1, 256, 257, 258,
- -1, -1, 261, -1, -1, 264, 265, 266, -1, -1,
+ -1, -1, 261, -1, -1, 264, 265, -1, -1, -1,
-1, -1, 271, 272, -1, 274, -1, 276, -1, 278,
279, -1, -1, -1, -1, -1, -1, -1, 287, 288,
289, 290, 291, 292, 293, 294, 295, 296, 297, 298,
@@ -14521,16 +14706,138 @@ static const yytype_int16 yycheck[] =
509, 510, 511, -1, -1, 514, 515, -1, 517, 518,
519, 520, 521, 522, -1, -1, 525, 526, 527, 528,
-1, 530, 531, -1, 533, -1, 535, 536, 537, 538,
- -1, 540, 541, 542, -1, 544, 545, 546, 547, -1,
+ -1, -1, 541, 542, -1, 544, 545, 546, 547, -1,
-1, -1, -1, -1, 553, 554, 555, -1, -1, -1,
559, 560, 561, 562, -1, 564, 565, -1, 567, 568,
-1, 570, 571, -1, -1, 574, -1, -1, 577, -1,
579, -1, 581, 582, 583, -1, -1, -1, -1, -1,
-1, 590, -1, -1, 593, -1, -1, -1, 597, 598,
599, 600, 601, 602, -1, -1, -1, -1, -1, -1,
- 609, 610, -1, 612, 613, 614, -1, -1, 617, 5,
- -1, 7, 8, 9, 10, 11, -1, -1, 14, -1,
- 629, -1, 18, -1, -1, 21, -1, 23, 24, 25,
+ 609, 610, -1, 612, 613, 614, -1, 5, 617, 7,
+ 8, 9, 10, 11, -1, 624, 14, -1, -1, -1,
+ 18, -1, -1, 21, -1, 23, 24, 25, 26, 27,
+ 28, 29, -1, 31, -1, -1, -1, 35, -1, -1,
+ -1, 39, -1, -1, 42, 43, 44, -1, 46, -1,
+ 48, 49, -1, -1, 52, -1, -1, 55, 56, -1,
+ 58, 59, -1, 61, 62, -1, 64, 65, 66, 67,
+ 68, 69, 70, -1, 72, 73, 74, 75, 76, 77,
+ 78, 79, -1, 81, 82, 83, 84, 85, 86, 87,
+ 88, -1, 90, 91, -1, 93, 94, 95, 96, 97,
+ -1, 99, -1, -1, 102, -1, -1, 105, -1, -1,
+ -1, 109, -1, -1, -1, 113, 114, 115, -1, -1,
+ 118, -1, -1, -1, -1, 123, 124, -1, -1, -1,
+ -1, 129, -1, 131, -1, -1, -1, 135, -1, 137,
+ 138, 139, 140, -1, -1, -1, 144, -1, -1, 147,
+ 148, 149, -1, -1, -1, 153, -1, 155, 156, -1,
+ 158, 159, 160, -1, -1, 163, 164, -1, 166, 167,
+ 168, 169, 170, 171, -1, -1, 174, 175, 176, -1,
+ -1, 179, 180, -1, 182, 183, 184, -1, -1, 187,
+ -1, -1, -1, 191, -1, 193, -1, 195, -1, 197,
+ 198, 199, 200, 201, 202, -1, 204, -1, -1, -1,
+ 208, 209, 210, -1, 212, -1, -1, -1, 216, 217,
+ -1, -1, -1, 221, 222, 223, 224, -1, -1, 227,
+ 228, 229, -1, 231, -1, 233, -1, -1, -1, -1,
+ 238, 239, -1, -1, -1, 243, -1, 245, 246, -1,
+ 248, 249, -1, -1, -1, 253, -1, -1, 256, 257,
+ 258, -1, -1, 261, -1, -1, 264, 265, -1, -1,
+ -1, -1, -1, 271, 272, -1, 274, -1, 276, -1,
+ 278, 279, -1, -1, -1, -1, -1, -1, -1, 287,
+ 288, 289, 290, 291, 292, 293, 294, 295, 296, 297,
+ 298, 299, -1, 301, 302, 303, -1, 305, 306, 307,
+ 308, -1, 310, 311, -1, -1, -1, -1, 316, 317,
+ 318, 319, 320, 321, -1, -1, 324, 325, -1, 327,
+ -1, 329, -1, 331, 332, 333, 334, 335, 336, 337,
+ 338, 339, 340, -1, -1, 343, 344, -1, -1, 347,
+ 348, 349, 350, -1, -1, -1, 354, 355, -1, -1,
+ -1, -1, 360, 361, 362, -1, 364, 365, 366, 367,
+ -1, 369, 370, -1, -1, -1, -1, -1, -1, -1,
+ -1, 379, 380, 381, -1, -1, 384, -1, 386, 387,
+ 388, 389, 390, 391, 392, 393, 394, 395, 396, 397,
+ -1, -1, 400, 401, 402, -1, 404, -1, 406, 407,
+ 408, 409, 410, -1, 412, 413, 414, -1, -1, 417,
+ -1, -1, -1, 421, 422, 423, 424, 425, -1, -1,
+ 428, 429, 430, 431, 432, -1, 434, 435, -1, 437,
+ 438, 439, -1, -1, 442, -1, 444, -1, 446, 447,
+ -1, 449, 450, -1, -1, -1, 454, 455, 456, 457,
+ 458, 459, 460, 461, 462, 463, -1, 465, 466, -1,
+ -1, -1, 470, 471, 472, 473, -1, -1, -1, 477,
+ -1, -1, -1, 481, -1, 483, 484, 485, 486, -1,
+ 488, 489, 490, 491, 492, 493, -1, -1, -1, -1,
+ -1, -1, 500, 501, -1, 503, -1, -1, 506, -1,
+ -1, 509, 510, 511, -1, -1, 514, 515, -1, 517,
+ 518, 519, 520, 521, 522, -1, -1, 525, 526, 527,
+ 528, -1, 530, 531, -1, 533, -1, 535, 536, 537,
+ 538, -1, -1, 541, 542, -1, 544, 545, 546, 547,
+ -1, -1, -1, -1, -1, 553, 554, 555, -1, -1,
+ -1, 559, 560, 561, 562, -1, 564, 565, -1, 567,
+ 568, -1, 570, 571, -1, -1, 574, -1, -1, 577,
+ -1, 579, -1, 581, 582, 583, -1, -1, -1, -1,
+ -1, -1, 590, -1, -1, 593, -1, -1, -1, 597,
+ 598, 599, 600, 601, 602, -1, -1, -1, -1, -1,
+ -1, 609, 610, -1, 612, 613, 614, -1, 5, 617,
+ 7, 8, 9, 10, 11, -1, 624, 14, -1, -1,
+ -1, 18, -1, -1, 21, -1, 23, 24, 25, 26,
+ 27, 28, 29, -1, 31, -1, -1, -1, 35, -1,
+ -1, -1, 39, -1, -1, 42, 43, 44, -1, 46,
+ -1, 48, 49, -1, -1, 52, -1, -1, 55, 56,
+ -1, 58, 59, -1, 61, 62, -1, 64, 65, 66,
+ 67, 68, 69, 70, -1, 72, 73, 74, 75, 76,
+ 77, 78, 79, -1, 81, 82, 83, 84, 85, 86,
+ 87, 88, -1, 90, 91, -1, 93, 94, 95, 96,
+ 97, -1, 99, -1, -1, 102, -1, -1, 105, -1,
+ -1, -1, 109, -1, -1, -1, 113, 114, 115, -1,
+ -1, 118, -1, -1, -1, -1, 123, 124, 125, -1,
+ -1, -1, 129, -1, 131, -1, -1, -1, 135, -1,
+ 137, 138, 139, 140, -1, -1, -1, 144, -1, -1,
+ 147, 148, 149, -1, -1, -1, 153, -1, 155, 156,
+ -1, 158, 159, 160, -1, -1, 163, 164, -1, 166,
+ 167, 168, 169, 170, 171, -1, -1, 174, 175, 176,
+ -1, -1, 179, 180, -1, 182, 183, 184, 185, -1,
+ 187, -1, -1, -1, 191, -1, 193, -1, 195, -1,
+ 197, 198, 199, 200, 201, 202, -1, 204, -1, -1,
+ -1, 208, 209, 210, -1, 212, 213, -1, -1, 216,
+ 217, -1, -1, -1, 221, 222, 223, 224, -1, -1,
+ 227, 228, 229, -1, 231, -1, 233, -1, -1, -1,
+ -1, 238, 239, -1, -1, -1, 243, -1, 245, 246,
+ -1, 248, 249, -1, -1, -1, 253, -1, -1, 256,
+ 257, 258, -1, -1, 261, -1, -1, 264, 265, -1,
+ -1, -1, -1, -1, 271, 272, -1, 274, -1, 276,
+ -1, 278, 279, -1, -1, 282, -1, -1, -1, -1,
+ 287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
+ 297, 298, 299, -1, 301, 302, 303, -1, 305, 306,
+ 307, 308, -1, 310, 311, -1, -1, -1, -1, 316,
+ 317, 318, 319, 320, 321, -1, -1, 324, 325, -1,
+ 327, -1, 329, -1, 331, 332, 333, 334, 335, 336,
+ 337, 338, 339, 340, -1, -1, 343, 344, -1, -1,
+ 347, 348, 349, 350, 351, 352, -1, 354, 355, -1,
+ -1, 358, -1, 360, 361, 362, -1, 364, 365, 366,
+ 367, -1, 369, 370, -1, -1, -1, -1, -1, -1,
+ -1, -1, 379, 380, 381, -1, -1, 384, -1, 386,
+ 387, 388, 389, 390, 391, 392, 393, 394, 395, 396,
+ 397, -1, -1, 400, 401, 402, -1, 404, -1, 406,
+ 407, 408, 409, 410, -1, 412, 413, 414, -1, -1,
+ 417, -1, -1, -1, 421, 422, 423, 424, 425, -1,
+ -1, 428, 429, 430, 431, 432, -1, 434, 435, -1,
+ 437, 438, 439, -1, -1, 442, -1, 444, -1, 446,
+ 447, -1, 449, 450, -1, -1, -1, 454, 455, 456,
+ 457, 458, 459, 460, 461, 462, 463, -1, 465, 466,
+ -1, -1, -1, 470, 471, 472, 473, -1, -1, -1,
+ 477, -1, -1, -1, 481, -1, 483, 484, 485, 486,
+ -1, 488, 489, 490, 491, 492, 493, -1, -1, 496,
+ 497, 498, -1, 500, 501, -1, 503, -1, -1, 506,
+ -1, -1, 509, 510, 511, -1, -1, 514, 515, -1,
+ 517, 518, 519, 520, 521, 522, -1, -1, 525, 526,
+ 527, 528, -1, 530, 531, -1, 533, -1, 535, 536,
+ 537, 538, -1, -1, 541, 542, -1, 544, 545, 546,
+ 547, -1, -1, -1, -1, -1, 553, 554, 555, -1,
+ -1, -1, 559, 560, 561, 562, 563, 564, 565, -1,
+ 567, 568, -1, 570, 571, -1, -1, 574, -1, -1,
+ 577, -1, 579, -1, 581, 582, 583, -1, -1, -1,
+ -1, -1, -1, 590, -1, -1, 593, -1, -1, -1,
+ 597, 598, 599, 600, 601, 602, -1, -1, -1, -1,
+ -1, -1, 609, 610, -1, 612, 613, 614, -1, 5,
+ 617, 7, 8, 9, 10, 11, -1, -1, 14, -1,
+ -1, -1, 18, -1, -1, 21, -1, 23, 24, 25,
26, 27, 28, 29, -1, 31, -1, -1, -1, 35,
-1, -1, -1, 39, -1, -1, 42, 43, 44, -1,
46, -1, 48, 49, -1, -1, 52, -1, -1, 55,
@@ -14540,23 +14847,23 @@ static const yytype_int16 yycheck[] =
86, 87, 88, -1, 90, 91, -1, 93, 94, 95,
96, 97, -1, 99, -1, -1, 102, -1, -1, 105,
-1, -1, -1, 109, -1, -1, -1, 113, 114, 115,
- -1, -1, 118, -1, -1, -1, -1, 123, 124, -1,
- -1, -1, -1, 129, -1, 131, -1, -1, -1, 135,
+ -1, -1, 118, -1, -1, -1, -1, 123, 124, 125,
+ -1, -1, 128, 129, -1, 131, -1, -1, -1, 135,
-1, 137, 138, 139, 140, -1, -1, -1, 144, -1,
-1, 147, 148, 149, -1, -1, -1, 153, -1, 155,
156, -1, 158, 159, 160, -1, -1, 163, 164, -1,
166, 167, 168, 169, 170, 171, -1, -1, 174, 175,
- 176, -1, -1, 179, 180, -1, 182, 183, 184, -1,
+ 176, -1, -1, 179, 180, -1, 182, 183, 184, 185,
-1, 187, -1, -1, -1, 191, -1, 193, -1, 195,
-1, 197, 198, 199, 200, 201, 202, -1, 204, -1,
- -1, -1, 208, 209, 210, -1, 212, -1, -1, -1,
+ -1, -1, 208, 209, 210, -1, 212, 213, -1, -1,
216, 217, -1, -1, -1, 221, 222, 223, 224, -1,
-1, 227, 228, 229, -1, 231, -1, 233, -1, -1,
-1, -1, 238, 239, -1, -1, -1, 243, -1, 245,
246, -1, 248, 249, -1, -1, -1, 253, -1, -1,
256, 257, 258, -1, -1, 261, -1, -1, 264, 265,
-1, -1, -1, -1, -1, 271, 272, -1, 274, -1,
- 276, -1, 278, 279, -1, -1, -1, -1, -1, -1,
+ 276, -1, 278, 279, -1, -1, 282, -1, -1, -1,
-1, 287, 288, 289, 290, 291, 292, 293, 294, 295,
296, 297, 298, 299, -1, 301, 302, 303, -1, 305,
306, 307, 308, -1, 310, 311, -1, -1, -1, -1,
@@ -14564,7 +14871,7 @@ static const yytype_int16 yycheck[] =
-1, 327, -1, 329, -1, 331, 332, 333, 334, 335,
336, 337, 338, 339, 340, -1, -1, 343, 344, -1,
-1, 347, 348, 349, 350, -1, -1, -1, 354, 355,
- -1, -1, -1, -1, 360, 361, 362, -1, 364, 365,
+ -1, -1, 358, -1, 360, 361, 362, -1, 364, 365,
366, 367, -1, 369, 370, -1, -1, -1, -1, -1,
-1, -1, -1, 379, 380, 381, -1, -1, 384, -1,
386, 387, 388, 389, 390, 391, 392, 393, 394, 395,
@@ -14582,15 +14889,15 @@ static const yytype_int16 yycheck[] =
506, -1, -1, 509, 510, 511, -1, -1, 514, 515,
-1, 517, 518, 519, 520, 521, 522, -1, -1, 525,
526, 527, 528, -1, 530, 531, -1, 533, -1, 535,
- 536, 537, 538, -1, -1, 541, 542, -1, 544, 545,
+ 536, 537, 538, -1, 540, 541, 542, -1, 544, 545,
546, 547, -1, -1, -1, -1, -1, 553, 554, 555,
- -1, -1, -1, 559, 560, 561, 562, -1, 564, 565,
+ -1, -1, -1, 559, 560, 561, 562, 563, 564, 565,
-1, 567, 568, -1, 570, 571, -1, -1, 574, -1,
-1, 577, -1, 579, -1, 581, 582, 583, -1, -1,
-1, -1, -1, -1, 590, -1, -1, 593, -1, -1,
-1, 597, 598, 599, 600, 601, 602, -1, -1, -1,
-1, -1, -1, 609, 610, -1, 612, 613, 614, -1,
- 5, 617, 7, 8, 9, 10, 11, -1, 624, 14,
+ 5, 617, 7, 8, 9, 10, 11, -1, -1, 14,
-1, -1, -1, 18, -1, -1, 21, -1, 23, 24,
25, 26, 27, 28, 29, -1, 31, -1, -1, -1,
35, -1, -1, -1, 39, -1, -1, 42, 43, 44,
@@ -14602,22 +14909,22 @@ static const yytype_int16 yycheck[] =
95, 96, 97, -1, 99, -1, -1, 102, -1, -1,
105, -1, -1, -1, 109, -1, -1, -1, 113, 114,
115, -1, -1, 118, -1, -1, -1, -1, 123, 124,
- -1, -1, -1, -1, 129, -1, 131, -1, -1, -1,
+ 125, -1, -1, 128, 129, -1, 131, -1, -1, -1,
135, -1, 137, 138, 139, 140, -1, -1, -1, 144,
-1, -1, 147, 148, 149, -1, -1, -1, 153, -1,
155, 156, -1, 158, 159, 160, -1, -1, 163, 164,
-1, 166, 167, 168, 169, 170, 171, -1, -1, 174,
175, 176, -1, -1, 179, 180, -1, 182, 183, 184,
- -1, -1, 187, -1, -1, -1, 191, -1, 193, -1,
+ 185, -1, 187, -1, -1, -1, 191, -1, 193, -1,
195, -1, 197, 198, 199, 200, 201, 202, -1, 204,
- -1, -1, -1, 208, 209, 210, -1, 212, -1, -1,
+ -1, -1, -1, 208, 209, 210, -1, 212, 213, -1,
-1, 216, 217, -1, -1, -1, 221, 222, 223, 224,
-1, -1, 227, 228, 229, -1, 231, -1, 233, -1,
-1, -1, -1, 238, 239, -1, -1, -1, 243, -1,
245, 246, -1, 248, 249, -1, -1, -1, 253, -1,
-1, 256, 257, 258, -1, -1, 261, -1, -1, 264,
265, -1, -1, -1, -1, -1, 271, 272, -1, 274,
- -1, 276, -1, 278, 279, -1, -1, -1, -1, -1,
+ -1, 276, -1, 278, 279, -1, -1, 282, -1, -1,
-1, -1, 287, 288, 289, 290, 291, 292, 293, 294,
295, 296, 297, 298, 299, -1, 301, 302, 303, -1,
305, 306, 307, 308, -1, 310, 311, -1, -1, -1,
@@ -14625,7 +14932,7 @@ static const yytype_int16 yycheck[] =
325, -1, 327, -1, 329, -1, 331, 332, 333, 334,
335, 336, 337, 338, 339, 340, -1, -1, 343, 344,
-1, -1, 347, 348, 349, 350, -1, -1, -1, 354,
- 355, -1, -1, -1, -1, 360, 361, 362, -1, 364,
+ 355, -1, -1, 358, -1, 360, 361, 362, -1, 364,
365, 366, 367, -1, 369, 370, -1, -1, -1, -1,
-1, -1, -1, -1, 379, 380, 381, -1, -1, 384,
-1, 386, 387, 388, 389, 390, 391, 392, 393, 394,
@@ -14643,15 +14950,15 @@ static const yytype_int16 yycheck[] =
-1, 506, -1, -1, 509, 510, 511, -1, -1, 514,
515, -1, 517, 518, 519, 520, 521, 522, -1, -1,
525, 526, 527, 528, -1, 530, 531, -1, 533, -1,
- 535, 536, 537, 538, -1, -1, 541, 542, -1, 544,
+ 535, 536, 537, 538, -1, 540, 541, 542, -1, 544,
545, 546, 547, -1, -1, -1, -1, -1, 553, 554,
- 555, -1, -1, -1, 559, 560, 561, 562, -1, 564,
+ 555, -1, -1, -1, 559, 560, 561, 562, 563, 564,
565, -1, 567, 568, -1, 570, 571, -1, -1, 574,
-1, -1, 577, -1, 579, -1, 581, 582, 583, -1,
-1, -1, -1, -1, -1, 590, -1, -1, 593, -1,
-1, -1, 597, 598, 599, 600, 601, 602, -1, -1,
-1, -1, -1, -1, 609, 610, -1, 612, 613, 614,
- -1, 5, 617, 7, 8, 9, 10, 11, -1, 624,
+ -1, 5, 617, 7, 8, 9, 10, 11, -1, -1,
14, -1, -1, -1, 18, -1, -1, 21, -1, 23,
24, 25, 26, 27, 28, 29, -1, 31, -1, -1,
-1, 35, -1, -1, -1, 39, -1, -1, 42, 43,
@@ -14663,22 +14970,22 @@ static const yytype_int16 yycheck[] =
94, 95, 96, 97, -1, 99, -1, -1, 102, -1,
-1, 105, -1, -1, -1, 109, -1, -1, -1, 113,
114, 115, -1, -1, 118, -1, -1, -1, -1, 123,
- 124, -1, -1, -1, -1, 129, -1, 131, -1, -1,
+ 124, 125, -1, -1, 128, 129, -1, 131, -1, -1,
-1, 135, -1, 137, 138, 139, 140, -1, -1, -1,
144, -1, -1, 147, 148, 149, -1, -1, -1, 153,
-1, 155, 156, -1, 158, 159, 160, -1, -1, 163,
164, -1, 166, 167, 168, 169, 170, 171, -1, -1,
174, 175, 176, -1, -1, 179, 180, -1, 182, 183,
- 184, -1, -1, 187, -1, -1, -1, 191, -1, 193,
+ 184, 185, -1, 187, -1, -1, -1, 191, -1, 193,
-1, 195, -1, 197, 198, 199, 200, 201, 202, -1,
- 204, -1, -1, -1, 208, 209, 210, -1, 212, -1,
+ 204, -1, -1, -1, 208, 209, 210, -1, 212, 213,
-1, -1, 216, 217, -1, -1, -1, 221, 222, 223,
224, -1, -1, 227, 228, 229, -1, 231, -1, 233,
-1, -1, -1, -1, 238, 239, -1, -1, -1, 243,
-1, 245, 246, -1, 248, 249, -1, -1, -1, 253,
-1, -1, 256, 257, 258, -1, -1, 261, -1, -1,
264, 265, -1, -1, -1, -1, -1, 271, 272, -1,
- 274, -1, 276, -1, 278, 279, -1, -1, -1, -1,
+ 274, -1, 276, -1, 278, 279, -1, -1, 282, -1,
-1, -1, -1, 287, 288, 289, 290, 291, 292, 293,
294, 295, 296, 297, 298, 299, -1, 301, 302, 303,
-1, 305, 306, 307, 308, -1, 310, 311, -1, -1,
@@ -14686,7 +14993,7 @@ static const yytype_int16 yycheck[] =
324, 325, -1, 327, -1, 329, -1, 331, 332, 333,
334, 335, 336, 337, 338, 339, 340, -1, -1, 343,
344, -1, -1, 347, 348, 349, 350, -1, -1, -1,
- 354, 355, -1, -1, -1, -1, 360, 361, 362, -1,
+ 354, 355, -1, -1, 358, -1, 360, 361, 362, -1,
364, 365, 366, 367, -1, 369, 370, -1, -1, -1,
-1, -1, -1, -1, -1, 379, 380, 381, -1, -1,
384, -1, 386, 387, 388, 389, 390, 391, 392, 393,
@@ -14704,18 +15011,18 @@ static const yytype_int16 yycheck[] =
-1, -1, 506, -1, -1, 509, 510, 511, -1, -1,
514, 515, -1, 517, 518, 519, 520, 521, 522, -1,
-1, 525, 526, 527, 528, -1, 530, 531, -1, 533,
- -1, 535, 536, 537, 538, -1, -1, 541, 542, -1,
+ -1, 535, 536, 537, 538, -1, 540, 541, 542, -1,
544, 545, 546, 547, -1, -1, -1, -1, -1, 553,
- 554, 555, -1, -1, -1, 559, 560, 561, 562, -1,
+ 554, 555, -1, -1, -1, 559, 560, 561, 562, 563,
564, 565, -1, 567, 568, -1, 570, 571, -1, -1,
574, -1, -1, 577, -1, 579, -1, 581, 582, 583,
-1, -1, -1, -1, -1, -1, 590, -1, -1, 593,
-1, -1, -1, 597, 598, 599, 600, 601, 602, -1,
-1, -1, -1, -1, -1, 609, 610, -1, 612, 613,
614, -1, 5, 617, 7, 8, 9, 10, 11, -1,
- 624, 14, -1, -1, -1, 18, -1, -1, 21, -1,
+ -1, 14, -1, -1, -1, 18, -1, -1, 21, -1,
23, 24, 25, 26, 27, 28, 29, -1, 31, -1,
- -1, -1, 35, -1, -1, -1, 39, -1, -1, 42,
+ -1, 34, 35, -1, -1, -1, 39, -1, -1, 42,
43, 44, -1, 46, -1, 48, 49, -1, -1, 52,
-1, -1, 55, 56, -1, 58, 59, -1, 61, 62,
-1, 64, 65, 66, 67, 68, 69, 70, -1, 72,
@@ -14724,10 +15031,10 @@ static const yytype_int16 yycheck[] =
93, 94, 95, 96, 97, -1, 99, -1, -1, 102,
-1, -1, 105, -1, -1, -1, 109, -1, -1, -1,
113, 114, 115, -1, -1, 118, -1, -1, -1, -1,
- 123, 124, -1, -1, -1, -1, 129, -1, 131, -1,
+ 123, 124, -1, -1, -1, 128, 129, -1, 131, -1,
-1, -1, 135, -1, 137, 138, 139, 140, -1, -1,
-1, 144, -1, -1, 147, 148, 149, -1, -1, -1,
- 153, -1, 155, 156, -1, 158, 159, 160, -1, -1,
+ 153, -1, 155, 156, -1, 158, 159, 160, 161, -1,
163, 164, -1, 166, 167, 168, 169, 170, 171, -1,
-1, 174, 175, 176, -1, -1, 179, 180, -1, 182,
183, 184, -1, -1, 187, -1, -1, -1, 191, -1,
@@ -14738,7 +15045,7 @@ static const yytype_int16 yycheck[] =
233, -1, -1, -1, -1, 238, 239, -1, -1, -1,
243, -1, 245, 246, -1, 248, 249, -1, -1, -1,
253, -1, -1, 256, 257, 258, -1, -1, 261, -1,
- -1, 264, 265, -1, -1, -1, -1, -1, 271, 272,
+ -1, 264, 265, 266, -1, -1, -1, -1, 271, 272,
-1, 274, -1, 276, -1, 278, 279, -1, -1, -1,
-1, -1, -1, -1, 287, 288, 289, 290, 291, 292,
293, 294, 295, 296, 297, 298, 299, -1, 301, 302,
@@ -14759,13 +15066,13 @@ static const yytype_int16 yycheck[] =
-1, 444, -1, 446, 447, -1, 449, 450, -1, -1,
-1, 454, 455, 456, 457, 458, 459, 460, 461, 462,
463, -1, 465, 466, -1, -1, -1, 470, 471, 472,
- 473, -1, -1, -1, 477, -1, -1, -1, 481, -1,
+ 473, -1, -1, 476, 477, -1, -1, -1, 481, -1,
483, 484, 485, 486, -1, 488, 489, 490, 491, 492,
493, -1, -1, -1, -1, -1, -1, 500, 501, -1,
503, -1, -1, 506, -1, -1, 509, 510, 511, -1,
-1, 514, 515, -1, 517, 518, 519, 520, 521, 522,
-1, -1, 525, 526, 527, 528, -1, 530, 531, -1,
- 533, -1, 535, 536, 537, 538, -1, -1, 541, 542,
+ 533, -1, 535, 536, 537, 538, -1, 540, 541, 542,
-1, 544, 545, 546, 547, -1, -1, -1, -1, -1,
553, 554, 555, -1, -1, -1, 559, 560, 561, 562,
-1, 564, 565, -1, 567, 568, -1, 570, 571, -1,
@@ -14774,9 +15081,9 @@ static const yytype_int16 yycheck[] =
593, -1, -1, -1, 597, 598, 599, 600, 601, 602,
-1, -1, -1, -1, -1, -1, 609, 610, -1, 612,
613, 614, -1, 5, 617, 7, 8, 9, 10, 11,
- -1, 624, 14, -1, -1, -1, 18, -1, -1, 21,
+ -1, -1, 14, -1, -1, -1, 18, -1, -1, 21,
-1, 23, 24, 25, 26, 27, 28, 29, -1, 31,
- -1, -1, -1, 35, -1, -1, -1, 39, -1, -1,
+ -1, -1, -1, 35, 36, -1, -1, 39, -1, -1,
42, 43, 44, -1, 46, -1, 48, 49, -1, -1,
52, -1, -1, 55, 56, -1, 58, 59, -1, 61,
62, -1, 64, 65, 66, 67, 68, 69, 70, -1,
@@ -14785,30 +15092,30 @@ static const yytype_int16 yycheck[] =
-1, 93, 94, 95, 96, 97, -1, 99, -1, -1,
102, -1, -1, 105, -1, -1, -1, 109, -1, -1,
-1, 113, 114, 115, -1, -1, 118, -1, -1, -1,
- -1, 123, 124, 125, -1, -1, -1, 129, -1, 131,
+ -1, 123, 124, -1, -1, -1, -1, 129, -1, 131,
-1, -1, -1, 135, -1, 137, 138, 139, 140, -1,
-1, -1, 144, -1, -1, 147, 148, 149, -1, -1,
-1, 153, -1, 155, 156, -1, 158, 159, 160, -1,
-1, 163, 164, -1, 166, 167, 168, 169, 170, 171,
-1, -1, 174, 175, 176, -1, -1, 179, 180, -1,
- 182, 183, 184, 185, -1, 187, -1, -1, -1, 191,
+ 182, 183, 184, -1, -1, 187, -1, -1, -1, 191,
-1, 193, -1, 195, -1, 197, 198, 199, 200, 201,
202, -1, 204, -1, -1, -1, 208, 209, 210, -1,
- 212, 213, -1, -1, 216, 217, -1, -1, -1, 221,
+ 212, 213, 214, -1, 216, 217, -1, -1, -1, 221,
222, 223, 224, -1, -1, 227, 228, 229, -1, 231,
-1, 233, -1, -1, -1, -1, 238, 239, -1, -1,
-1, 243, -1, 245, 246, -1, 248, 249, -1, -1,
-1, 253, -1, -1, 256, 257, 258, -1, -1, 261,
-1, -1, 264, 265, -1, -1, -1, -1, -1, 271,
272, -1, 274, -1, 276, -1, 278, 279, -1, -1,
- 282, -1, -1, -1, -1, 287, 288, 289, 290, 291,
+ -1, -1, -1, -1, -1, 287, 288, 289, 290, 291,
292, 293, 294, 295, 296, 297, 298, 299, -1, 301,
302, 303, -1, 305, 306, 307, 308, -1, 310, 311,
-1, -1, -1, -1, 316, 317, 318, 319, 320, 321,
-1, -1, 324, 325, -1, 327, -1, 329, -1, 331,
332, 333, 334, 335, 336, 337, 338, 339, 340, -1,
- -1, 343, 344, -1, -1, 347, 348, 349, 350, 351,
- 352, -1, 354, 355, -1, -1, 358, -1, 360, 361,
+ -1, 343, 344, -1, -1, 347, 348, 349, 350, -1,
+ -1, -1, 354, 355, -1, -1, -1, -1, 360, 361,
362, -1, 364, 365, 366, 367, -1, 369, 370, -1,
-1, -1, -1, -1, -1, -1, -1, 379, 380, 381,
-1, -1, 384, -1, 386, 387, 388, 389, 390, 391,
@@ -14822,14 +15129,14 @@ static const yytype_int16 yycheck[] =
462, 463, -1, 465, 466, -1, -1, -1, 470, 471,
472, 473, -1, -1, -1, 477, -1, -1, -1, 481,
-1, 483, 484, 485, 486, -1, 488, 489, 490, 491,
- 492, 493, -1, -1, 496, 497, 498, -1, 500, 501,
+ 492, 493, -1, -1, -1, -1, -1, -1, 500, 501,
-1, 503, -1, -1, 506, -1, -1, 509, 510, 511,
-1, -1, 514, 515, -1, 517, 518, 519, 520, 521,
522, -1, -1, 525, 526, 527, 528, -1, 530, 531,
- -1, 533, -1, 535, 536, 537, 538, -1, -1, 541,
+ -1, 533, -1, 535, 536, 537, 538, -1, 540, 541,
542, -1, 544, 545, 546, 547, -1, -1, -1, -1,
-1, 553, 554, 555, -1, -1, -1, 559, 560, 561,
- 562, 563, 564, 565, -1, 567, 568, -1, 570, 571,
+ 562, -1, 564, 565, -1, 567, 568, -1, 570, 571,
-1, -1, 574, -1, -1, 577, -1, 579, -1, 581,
582, 583, -1, -1, -1, -1, -1, -1, 590, -1,
-1, 593, -1, -1, -1, 597, 598, 599, 600, 601,
@@ -14846,16 +15153,16 @@ static const yytype_int16 yycheck[] =
91, -1, 93, 94, 95, 96, 97, -1, 99, -1,
-1, 102, -1, -1, 105, -1, -1, -1, 109, -1,
-1, -1, 113, 114, 115, -1, -1, 118, -1, -1,
- -1, -1, 123, 124, 125, -1, -1, 128, 129, -1,
+ -1, -1, 123, 124, -1, -1, -1, -1, 129, -1,
131, -1, -1, -1, 135, -1, 137, 138, 139, 140,
-1, -1, -1, 144, -1, -1, 147, 148, 149, -1,
-1, -1, 153, -1, 155, 156, -1, 158, 159, 160,
-1, -1, 163, 164, -1, 166, 167, 168, 169, 170,
171, -1, -1, 174, 175, 176, -1, -1, 179, 180,
- -1, 182, 183, 184, 185, -1, 187, -1, -1, -1,
+ -1, 182, 183, 184, -1, -1, 187, -1, -1, -1,
191, -1, 193, -1, 195, -1, 197, 198, 199, 200,
201, 202, -1, 204, -1, -1, -1, 208, 209, 210,
- -1, 212, 213, -1, -1, 216, 217, -1, -1, -1,
+ -1, 212, -1, -1, -1, 216, 217, -1, -1, -1,
221, 222, 223, 224, -1, -1, 227, 228, 229, -1,
231, -1, 233, -1, -1, -1, -1, 238, 239, -1,
-1, -1, 243, -1, 245, 246, -1, 248, 249, -1,
@@ -14872,7 +15179,7 @@ static const yytype_int16 yycheck[] =
-1, -1, -1, 354, 355, -1, -1, 358, -1, 360,
361, 362, -1, 364, 365, 366, 367, -1, 369, 370,
-1, -1, -1, -1, -1, -1, -1, -1, 379, 380,
- 381, -1, -1, 384, -1, 386, 387, 388, 389, 390,
+ 381, -1, 383, 384, -1, 386, 387, 388, 389, 390,
391, 392, 393, 394, 395, 396, 397, -1, -1, 400,
401, 402, -1, 404, -1, 406, 407, 408, 409, 410,
-1, 412, 413, 414, -1, -1, 417, -1, -1, -1,
@@ -14887,7 +15194,7 @@ static const yytype_int16 yycheck[] =
501, -1, 503, -1, -1, 506, -1, -1, 509, 510,
511, -1, -1, 514, 515, -1, 517, 518, 519, 520,
521, 522, -1, -1, 525, 526, 527, 528, -1, 530,
- 531, -1, 533, -1, 535, 536, 537, 538, -1, 540,
+ 531, -1, 533, -1, 535, 536, 537, 538, -1, -1,
541, 542, -1, 544, 545, 546, 547, -1, -1, -1,
-1, -1, 553, 554, 555, -1, -1, -1, 559, 560,
561, 562, 563, 564, 565, -1, 567, 568, -1, 570,
@@ -14898,7 +15205,7 @@ static const yytype_int16 yycheck[] =
-1, 612, 613, 614, -1, 5, 617, 7, 8, 9,
10, 11, -1, -1, 14, -1, -1, -1, 18, -1,
-1, 21, -1, 23, 24, 25, 26, 27, 28, 29,
- -1, 31, -1, -1, -1, 35, -1, -1, -1, 39,
+ -1, 31, -1, -1, 34, 35, -1, -1, -1, 39,
-1, -1, 42, 43, 44, -1, 46, -1, 48, 49,
-1, -1, 52, -1, -1, 55, 56, -1, 58, 59,
-1, 61, 62, -1, 64, 65, 66, 67, 68, 69,
@@ -14907,30 +15214,30 @@ static const yytype_int16 yycheck[] =
90, 91, -1, 93, 94, 95, 96, 97, -1, 99,
-1, -1, 102, -1, -1, 105, -1, -1, -1, 109,
-1, -1, -1, 113, 114, 115, -1, -1, 118, -1,
- -1, -1, -1, 123, 124, 125, -1, -1, 128, 129,
+ -1, -1, -1, 123, 124, -1, -1, -1, 128, 129,
-1, 131, -1, -1, -1, 135, -1, 137, 138, 139,
140, -1, -1, -1, 144, -1, -1, 147, 148, 149,
-1, -1, -1, 153, -1, 155, 156, -1, 158, 159,
160, -1, -1, 163, 164, -1, 166, 167, 168, 169,
170, 171, -1, -1, 174, 175, 176, -1, -1, 179,
- 180, -1, 182, 183, 184, 185, -1, 187, -1, -1,
+ 180, -1, 182, 183, 184, -1, -1, 187, -1, -1,
-1, 191, -1, 193, -1, 195, -1, 197, 198, 199,
200, 201, 202, -1, 204, -1, -1, -1, 208, 209,
- 210, -1, 212, 213, -1, -1, 216, 217, -1, -1,
+ 210, -1, 212, -1, -1, -1, 216, 217, -1, -1,
-1, 221, 222, 223, 224, -1, -1, 227, 228, 229,
-1, 231, -1, 233, -1, -1, -1, -1, 238, 239,
-1, -1, -1, 243, -1, 245, 246, -1, 248, 249,
-1, -1, -1, 253, -1, -1, 256, 257, 258, -1,
- -1, 261, -1, -1, 264, 265, -1, -1, -1, -1,
+ -1, 261, -1, -1, 264, 265, 266, -1, -1, -1,
-1, 271, 272, -1, 274, -1, 276, -1, 278, 279,
- -1, -1, 282, -1, -1, -1, -1, 287, 288, 289,
+ -1, -1, -1, -1, -1, -1, -1, 287, 288, 289,
290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
-1, 301, 302, 303, -1, 305, 306, 307, 308, -1,
310, 311, -1, -1, -1, -1, 316, 317, 318, 319,
320, 321, -1, -1, 324, 325, -1, 327, -1, 329,
-1, 331, 332, 333, 334, 335, 336, 337, 338, 339,
340, -1, -1, 343, 344, -1, -1, 347, 348, 349,
- 350, -1, -1, -1, 354, 355, -1, -1, 358, -1,
+ 350, -1, -1, -1, 354, 355, -1, -1, -1, -1,
360, 361, 362, -1, 364, 365, 366, 367, -1, 369,
370, -1, -1, -1, -1, -1, -1, -1, -1, 379,
380, 381, -1, -1, 384, -1, 386, 387, 388, 389,
@@ -14951,7 +15258,7 @@ static const yytype_int16 yycheck[] =
530, 531, -1, 533, -1, 535, 536, 537, 538, -1,
540, 541, 542, -1, 544, 545, 546, 547, -1, -1,
-1, -1, -1, 553, 554, 555, -1, -1, -1, 559,
- 560, 561, 562, 563, 564, 565, -1, 567, 568, -1,
+ 560, 561, 562, -1, 564, 565, -1, 567, 568, -1,
570, 571, -1, -1, 574, -1, -1, 577, -1, 579,
-1, 581, 582, 583, -1, -1, -1, -1, -1, -1,
590, -1, -1, 593, -1, -1, -1, 597, 598, 599,
@@ -14968,16 +15275,16 @@ static const yytype_int16 yycheck[] =
-1, 90, 91, -1, 93, 94, 95, 96, 97, -1,
99, -1, -1, 102, -1, -1, 105, -1, -1, -1,
109, -1, -1, -1, 113, 114, 115, -1, -1, 118,
- -1, -1, -1, -1, 123, 124, 125, -1, -1, 128,
+ -1, -1, -1, -1, 123, 124, -1, -1, -1, -1,
129, -1, 131, -1, -1, -1, 135, -1, 137, 138,
139, 140, -1, -1, -1, 144, -1, -1, 147, 148,
149, -1, -1, -1, 153, -1, 155, 156, -1, 158,
159, 160, -1, -1, 163, 164, -1, 166, 167, 168,
169, 170, 171, -1, -1, 174, 175, 176, -1, -1,
- 179, 180, -1, 182, 183, 184, 185, -1, 187, -1,
+ 179, 180, -1, 182, 183, 184, -1, -1, 187, -1,
-1, -1, 191, -1, 193, -1, 195, -1, 197, 198,
199, 200, 201, 202, -1, 204, -1, -1, -1, 208,
- 209, 210, -1, 212, 213, -1, -1, 216, 217, -1,
+ 209, 210, -1, 212, -1, -1, -1, 216, 217, -1,
-1, -1, 221, 222, 223, 224, -1, -1, 227, 228,
229, -1, 231, -1, 233, -1, -1, -1, -1, 238,
239, -1, -1, -1, 243, -1, 245, 246, -1, 248,
@@ -14994,7 +15301,7 @@ static const yytype_int16 yycheck[] =
349, 350, -1, -1, -1, 354, 355, -1, -1, 358,
-1, 360, 361, 362, -1, 364, 365, 366, 367, -1,
369, 370, -1, -1, -1, -1, -1, -1, -1, -1,
- 379, 380, 381, -1, -1, 384, -1, 386, 387, 388,
+ 379, 380, 381, -1, 383, 384, -1, 386, 387, 388,
389, 390, 391, 392, 393, 394, 395, 396, 397, -1,
-1, 400, 401, 402, -1, 404, -1, 406, 407, 408,
409, 410, -1, 412, 413, 414, -1, -1, 417, -1,
@@ -15010,7 +15317,7 @@ static const yytype_int16 yycheck[] =
509, 510, 511, -1, -1, 514, 515, -1, 517, 518,
519, 520, 521, 522, -1, -1, 525, 526, 527, 528,
-1, 530, 531, -1, 533, -1, 535, 536, 537, 538,
- -1, 540, 541, 542, -1, 544, 545, 546, 547, -1,
+ -1, -1, 541, 542, -1, 544, 545, 546, 547, -1,
-1, -1, -1, -1, 553, 554, 555, -1, -1, -1,
559, 560, 561, 562, 563, 564, 565, -1, 567, 568,
-1, 570, 571, -1, -1, 574, -1, -1, 577, -1,
@@ -15033,7 +15340,7 @@ static const yytype_int16 yycheck[] =
128, 129, -1, 131, -1, -1, -1, 135, -1, 137,
138, 139, 140, -1, -1, -1, 144, -1, -1, 147,
148, 149, -1, -1, -1, 153, -1, 155, 156, -1,
- 158, 159, 160, 161, -1, 163, 164, -1, 166, 167,
+ 158, 159, 160, -1, -1, 163, 164, -1, 166, 167,
168, 169, 170, 171, -1, -1, 174, 175, 176, -1,
-1, 179, 180, -1, 182, 183, 184, -1, -1, 187,
-1, -1, -1, 191, -1, 193, -1, 195, -1, 197,
@@ -15064,7 +15371,7 @@ static const yytype_int16 yycheck[] =
438, 439, -1, -1, 442, -1, 444, -1, 446, 447,
-1, 449, 450, -1, -1, -1, 454, 455, 456, 457,
458, 459, 460, 461, 462, 463, -1, 465, 466, -1,
- -1, -1, 470, 471, 472, 473, -1, -1, 476, 477,
+ -1, -1, 470, 471, 472, 473, -1, -1, -1, 477,
-1, -1, -1, 481, -1, 483, 484, 485, 486, -1,
488, 489, 490, 491, 492, 493, -1, -1, -1, -1,
-1, -1, 500, 501, -1, 503, -1, -1, 506, -1,
@@ -15081,7 +15388,7 @@ static const yytype_int16 yycheck[] =
-1, 609, 610, -1, 612, 613, 614, -1, 5, 617,
7, 8, 9, 10, 11, -1, -1, 14, -1, -1,
-1, 18, -1, -1, 21, -1, 23, 24, 25, 26,
- 27, 28, 29, -1, 31, -1, -1, -1, 35, 36,
+ 27, 28, 29, -1, 31, -1, -1, -1, 35, -1,
-1, -1, 39, -1, -1, 42, 43, 44, -1, 46,
-1, 48, 49, -1, -1, 52, -1, -1, 55, 56,
-1, 58, 59, -1, 61, 62, -1, 64, 65, 66,
@@ -15099,14 +15406,14 @@ static const yytype_int16 yycheck[] =
-1, -1, 179, 180, -1, 182, 183, 184, -1, -1,
187, -1, -1, -1, 191, -1, 193, -1, 195, -1,
197, 198, 199, 200, 201, 202, -1, 204, -1, -1,
- -1, 208, 209, 210, -1, 212, 213, 214, -1, 216,
+ -1, 208, 209, 210, -1, 212, -1, -1, -1, 216,
217, -1, -1, -1, 221, 222, 223, 224, -1, -1,
227, 228, 229, -1, 231, -1, 233, -1, -1, -1,
-1, 238, 239, -1, -1, -1, 243, -1, 245, 246,
-1, 248, 249, -1, -1, -1, 253, -1, -1, 256,
257, 258, -1, -1, 261, -1, -1, 264, 265, -1,
-1, -1, -1, -1, 271, 272, -1, 274, -1, 276,
- -1, 278, 279, -1, -1, -1, -1, -1, -1, -1,
+ -1, 278, 279, -1, -1, 282, -1, -1, -1, -1,
287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
297, 298, 299, -1, 301, 302, 303, -1, 305, 306,
307, 308, -1, 310, 311, -1, -1, -1, -1, 316,
@@ -15114,9 +15421,9 @@ static const yytype_int16 yycheck[] =
327, -1, 329, -1, 331, 332, 333, 334, 335, 336,
337, 338, 339, 340, -1, -1, 343, 344, -1, -1,
347, 348, 349, 350, -1, -1, -1, 354, 355, -1,
- -1, -1, -1, 360, 361, 362, -1, 364, 365, 366,
+ -1, 358, -1, 360, 361, 362, -1, 364, 365, 366,
367, -1, 369, 370, -1, -1, -1, -1, -1, -1,
- -1, -1, 379, 380, 381, -1, -1, 384, -1, 386,
+ -1, -1, 379, 380, 381, -1, 383, 384, -1, 386,
387, 388, 389, 390, 391, 392, 393, 394, 395, 396,
397, -1, -1, 400, 401, 402, -1, 404, -1, 406,
407, 408, 409, 410, -1, 412, 413, 414, -1, -1,
@@ -15132,9 +15439,9 @@ static const yytype_int16 yycheck[] =
-1, -1, 509, 510, 511, -1, -1, 514, 515, -1,
517, 518, 519, 520, 521, 522, -1, -1, 525, 526,
527, 528, -1, 530, 531, -1, 533, -1, 535, 536,
- 537, 538, -1, 540, 541, 542, -1, 544, 545, 546,
+ 537, 538, -1, -1, 541, 542, -1, 544, 545, 546,
547, -1, -1, -1, -1, -1, 553, 554, 555, -1,
- -1, -1, 559, 560, 561, 562, -1, 564, 565, -1,
+ -1, -1, 559, 560, 561, 562, 563, 564, 565, -1,
567, 568, -1, 570, 571, -1, -1, 574, -1, -1,
577, -1, 579, -1, 581, 582, 583, -1, -1, -1,
-1, -1, -1, 590, -1, -1, 593, -1, -1, -1,
@@ -15150,7 +15457,7 @@ static const yytype_int16 yycheck[] =
76, 77, 78, 79, -1, 81, 82, 83, 84, 85,
86, 87, 88, -1, 90, 91, -1, 93, 94, 95,
96, 97, -1, 99, -1, -1, 102, -1, -1, 105,
- -1, -1, -1, 109, -1, -1, -1, 113, 114, 115,
+ -1, 107, -1, 109, -1, -1, -1, 113, 114, 115,
-1, -1, 118, -1, -1, -1, -1, 123, 124, -1,
-1, -1, -1, 129, -1, 131, -1, -1, -1, 135,
-1, 137, 138, 139, 140, -1, -1, -1, 144, -1,
@@ -15166,8 +15473,8 @@ static const yytype_int16 yycheck[] =
-1, -1, 238, 239, -1, -1, -1, 243, -1, 245,
246, -1, 248, 249, -1, -1, -1, 253, -1, -1,
256, 257, 258, -1, -1, 261, -1, -1, 264, 265,
- -1, -1, -1, -1, -1, 271, 272, -1, 274, -1,
- 276, -1, 278, 279, -1, -1, 282, -1, -1, -1,
+ 266, -1, -1, -1, -1, 271, 272, -1, 274, -1,
+ 276, -1, 278, 279, -1, -1, -1, -1, -1, -1,
-1, 287, 288, 289, 290, 291, 292, 293, 294, 295,
296, 297, 298, 299, -1, 301, 302, 303, -1, 305,
306, 307, 308, -1, 310, 311, -1, -1, -1, -1,
@@ -15175,9 +15482,9 @@ static const yytype_int16 yycheck[] =
-1, 327, -1, 329, -1, 331, 332, 333, 334, 335,
336, 337, 338, 339, 340, -1, -1, 343, 344, -1,
-1, 347, 348, 349, 350, -1, -1, -1, 354, 355,
- -1, -1, 358, -1, 360, 361, 362, -1, 364, 365,
+ -1, -1, -1, -1, 360, 361, 362, -1, 364, 365,
366, 367, -1, 369, 370, -1, -1, -1, -1, -1,
- -1, -1, -1, 379, 380, 381, -1, 383, 384, -1,
+ -1, -1, -1, 379, 380, 381, -1, -1, 384, -1,
386, 387, 388, 389, 390, 391, 392, 393, 394, 395,
396, 397, -1, -1, 400, 401, 402, -1, 404, -1,
406, 407, 408, 409, 410, -1, 412, 413, 414, -1,
@@ -15193,17 +15500,17 @@ static const yytype_int16 yycheck[] =
506, -1, -1, 509, 510, 511, -1, -1, 514, 515,
-1, 517, 518, 519, 520, 521, 522, -1, -1, 525,
526, 527, 528, -1, 530, 531, -1, 533, -1, 535,
- 536, 537, 538, -1, -1, 541, 542, -1, 544, 545,
+ 536, 537, 538, -1, 540, 541, 542, -1, 544, 545,
546, 547, -1, -1, -1, -1, -1, 553, 554, 555,
- -1, -1, -1, 559, 560, 561, 562, 563, 564, 565,
+ -1, -1, -1, 559, 560, 561, 562, -1, 564, 565,
-1, 567, 568, -1, 570, 571, -1, -1, 574, -1,
-1, 577, -1, 579, -1, 581, 582, 583, -1, -1,
-1, -1, -1, -1, 590, -1, -1, 593, -1, -1,
-1, 597, 598, 599, 600, 601, 602, -1, -1, -1,
-1, -1, -1, 609, 610, -1, 612, 613, 614, -1,
- 5, 617, 7, 8, 9, 10, 11, -1, -1, 14,
+ 5, 617, 7, 8, 9, 10, 11, 12, -1, 14,
-1, -1, -1, 18, -1, -1, 21, -1, 23, 24,
- 25, 26, 27, 28, 29, -1, 31, -1, -1, 34,
+ 25, 26, 27, 28, 29, -1, 31, -1, -1, -1,
35, -1, -1, -1, 39, -1, -1, 42, 43, 44,
-1, 46, -1, 48, 49, -1, -1, 52, -1, -1,
55, 56, -1, 58, 59, -1, 61, 62, -1, 64,
@@ -15213,7 +15520,7 @@ static const yytype_int16 yycheck[] =
95, 96, 97, -1, 99, -1, -1, 102, -1, -1,
105, -1, -1, -1, 109, -1, -1, -1, 113, 114,
115, -1, -1, 118, -1, -1, -1, -1, 123, 124,
- -1, -1, -1, 128, 129, -1, 131, -1, -1, -1,
+ -1, -1, -1, -1, 129, -1, 131, -1, -1, -1,
135, -1, 137, 138, 139, 140, -1, -1, -1, 144,
-1, -1, 147, 148, 149, -1, -1, -1, 153, -1,
155, 156, -1, 158, 159, 160, -1, -1, 163, 164,
@@ -15265,7 +15572,7 @@ static const yytype_int16 yycheck[] =
-1, 5, 617, 7, 8, 9, 10, 11, -1, -1,
14, -1, -1, -1, 18, -1, -1, 21, -1, 23,
24, 25, 26, 27, 28, 29, -1, 31, -1, -1,
- -1, 35, -1, -1, -1, 39, -1, -1, 42, 43,
+ 34, 35, -1, -1, -1, 39, -1, -1, 42, 43,
44, -1, 46, -1, 48, 49, -1, -1, 52, -1,
-1, 55, 56, -1, 58, 59, -1, 61, 62, -1,
64, 65, 66, 67, 68, 69, 70, -1, 72, 73,
@@ -15288,8 +15595,8 @@ static const yytype_int16 yycheck[] =
-1, -1, -1, -1, 238, 239, -1, -1, -1, 243,
-1, 245, 246, -1, 248, 249, -1, -1, -1, 253,
-1, -1, 256, 257, 258, -1, -1, 261, -1, -1,
- 264, 265, -1, -1, -1, -1, -1, 271, 272, -1,
- 274, -1, 276, -1, 278, 279, -1, -1, 282, -1,
+ 264, 265, 266, -1, -1, -1, -1, 271, 272, -1,
+ 274, -1, 276, -1, 278, 279, -1, -1, -1, -1,
-1, -1, -1, 287, 288, 289, 290, 291, 292, 293,
294, 295, 296, 297, 298, 299, -1, 301, 302, 303,
-1, 305, 306, 307, 308, -1, 310, 311, -1, -1,
@@ -15297,9 +15604,9 @@ static const yytype_int16 yycheck[] =
324, 325, -1, 327, -1, 329, -1, 331, 332, 333,
334, 335, 336, 337, 338, 339, 340, -1, -1, 343,
344, -1, -1, 347, 348, 349, 350, -1, -1, -1,
- 354, 355, -1, -1, 358, -1, 360, 361, 362, -1,
+ 354, 355, -1, -1, -1, -1, 360, 361, 362, -1,
364, 365, 366, 367, -1, 369, 370, -1, -1, -1,
- -1, -1, -1, -1, -1, 379, 380, 381, -1, 383,
+ -1, -1, -1, -1, -1, 379, 380, 381, -1, -1,
384, -1, 386, 387, 388, 389, 390, 391, 392, 393,
394, 395, 396, 397, -1, -1, 400, 401, 402, -1,
404, -1, 406, 407, 408, 409, 410, -1, 412, 413,
@@ -15315,9 +15622,9 @@ static const yytype_int16 yycheck[] =
-1, -1, 506, -1, -1, 509, 510, 511, -1, -1,
514, 515, -1, 517, 518, 519, 520, 521, 522, -1,
-1, 525, 526, 527, 528, -1, 530, 531, -1, 533,
- -1, 535, 536, 537, 538, -1, -1, 541, 542, -1,
+ -1, 535, 536, 537, 538, -1, 540, 541, 542, -1,
544, 545, 546, 547, -1, -1, -1, -1, -1, 553,
- 554, 555, -1, -1, -1, 559, 560, 561, 562, 563,
+ 554, 555, -1, -1, -1, 559, 560, 561, 562, -1,
564, 565, -1, 567, 568, -1, 570, 571, -1, -1,
574, -1, -1, 577, -1, 579, -1, 581, 582, 583,
-1, -1, -1, -1, -1, -1, 590, -1, -1, 593,
@@ -15326,7 +15633,7 @@ static const yytype_int16 yycheck[] =
614, -1, 5, 617, 7, 8, 9, 10, 11, -1,
-1, 14, -1, -1, -1, 18, -1, -1, 21, -1,
23, 24, 25, 26, 27, 28, 29, -1, 31, -1,
- -1, 34, 35, -1, -1, -1, 39, -1, -1, 42,
+ -1, -1, 35, -1, -1, -1, 39, -1, -1, 42,
43, 44, -1, 46, -1, 48, 49, -1, -1, 52,
-1, -1, 55, 56, -1, 58, 59, -1, 61, 62,
-1, 64, 65, 66, 67, 68, 69, 70, -1, 72,
@@ -15410,19 +15717,19 @@ static const yytype_int16 yycheck[] =
-1, 233, -1, -1, -1, -1, 238, 239, -1, -1,
-1, 243, -1, 245, 246, -1, 248, 249, -1, -1,
-1, 253, -1, -1, 256, 257, 258, -1, -1, 261,
- -1, -1, 264, 265, -1, -1, -1, -1, -1, 271,
+ -1, -1, 264, 265, 266, -1, -1, -1, -1, 271,
272, -1, 274, -1, 276, -1, 278, 279, -1, -1,
- 282, -1, -1, -1, -1, 287, 288, 289, 290, 291,
+ -1, -1, -1, -1, -1, 287, 288, 289, 290, 291,
292, 293, 294, 295, 296, 297, 298, 299, -1, 301,
302, 303, -1, 305, 306, 307, 308, -1, 310, 311,
-1, -1, -1, -1, 316, 317, 318, 319, 320, 321,
-1, -1, 324, 325, -1, 327, -1, 329, -1, 331,
332, 333, 334, 335, 336, 337, 338, 339, 340, -1,
-1, 343, 344, -1, -1, 347, 348, 349, 350, -1,
- -1, -1, 354, 355, -1, -1, 358, -1, 360, 361,
+ -1, -1, 354, 355, -1, -1, -1, -1, 360, 361,
362, -1, 364, 365, 366, 367, -1, 369, 370, -1,
-1, -1, -1, -1, -1, -1, -1, 379, 380, 381,
- -1, 383, 384, -1, 386, 387, 388, 389, 390, 391,
+ -1, -1, 384, -1, 386, 387, 388, 389, 390, 391,
392, 393, 394, 395, 396, 397, -1, -1, 400, 401,
402, -1, 404, -1, 406, 407, 408, 409, 410, -1,
412, 413, 414, -1, -1, 417, -1, -1, -1, 421,
@@ -15437,16 +15744,16 @@ static const yytype_int16 yycheck[] =
-1, 503, -1, -1, 506, -1, -1, 509, 510, 511,
-1, -1, 514, 515, -1, 517, 518, 519, 520, 521,
522, -1, -1, 525, 526, 527, 528, -1, 530, 531,
- -1, 533, -1, 535, 536, 537, 538, -1, -1, 541,
+ -1, 533, -1, 535, 536, 537, 538, -1, 540, 541,
542, -1, 544, 545, 546, 547, -1, -1, -1, -1,
-1, 553, 554, 555, -1, -1, -1, 559, 560, 561,
- 562, 563, 564, 565, -1, 567, 568, -1, 570, 571,
+ 562, -1, 564, 565, -1, 567, 568, -1, 570, 571,
-1, -1, 574, -1, -1, 577, -1, 579, -1, 581,
582, 583, -1, -1, -1, -1, -1, -1, 590, -1,
-1, 593, -1, -1, -1, 597, 598, 599, 600, 601,
602, -1, -1, -1, -1, -1, -1, 609, 610, -1,
612, 613, 614, -1, 5, 617, 7, 8, 9, 10,
- 11, -1, -1, 14, -1, -1, -1, 18, -1, -1,
+ 11, -1, -1, 14, -1, -1, -1, 18, 19, -1,
21, -1, 23, 24, 25, 26, 27, 28, 29, -1,
31, -1, -1, -1, 35, -1, -1, -1, 39, -1,
-1, 42, 43, 44, -1, 46, -1, 48, 49, -1,
@@ -15455,7 +15762,7 @@ static const yytype_int16 yycheck[] =
-1, 72, 73, 74, 75, 76, 77, 78, 79, -1,
81, 82, 83, 84, 85, 86, 87, 88, -1, 90,
91, -1, 93, 94, 95, 96, 97, -1, 99, -1,
- -1, 102, -1, -1, 105, -1, 107, -1, 109, -1,
+ -1, 102, -1, -1, 105, -1, -1, -1, 109, -1,
-1, -1, 113, 114, 115, -1, -1, 118, -1, -1,
-1, -1, 123, 124, -1, -1, -1, -1, 129, -1,
131, -1, -1, -1, 135, -1, 137, 138, 139, 140,
@@ -15471,7 +15778,7 @@ static const yytype_int16 yycheck[] =
231, -1, 233, -1, -1, -1, -1, 238, 239, -1,
-1, -1, 243, -1, 245, 246, -1, 248, 249, -1,
-1, -1, 253, -1, -1, 256, 257, 258, -1, -1,
- 261, -1, -1, 264, 265, 266, -1, -1, -1, -1,
+ 261, -1, -1, 264, 265, -1, -1, -1, -1, -1,
271, 272, -1, 274, -1, 276, -1, 278, 279, -1,
-1, -1, -1, -1, -1, -1, 287, 288, 289, 290,
291, 292, 293, 294, 295, 296, 297, 298, 299, -1,
@@ -15507,7 +15814,7 @@ static const yytype_int16 yycheck[] =
-1, -1, 593, -1, -1, -1, 597, 598, 599, 600,
601, 602, -1, -1, -1, -1, -1, -1, 609, 610,
-1, 612, 613, 614, -1, 5, 617, 7, 8, 9,
- 10, 11, 12, -1, 14, -1, -1, -1, 18, -1,
+ 10, 11, -1, -1, 14, -1, -1, -1, 18, -1,
-1, 21, -1, 23, 24, 25, 26, 27, 28, 29,
-1, 31, -1, -1, -1, 35, -1, -1, -1, 39,
-1, -1, 42, 43, 44, -1, 46, -1, 48, 49,
@@ -15515,7 +15822,7 @@ static const yytype_int16 yycheck[] =
-1, 61, 62, -1, 64, 65, 66, 67, 68, 69,
70, -1, 72, 73, 74, 75, 76, 77, 78, 79,
-1, 81, 82, 83, 84, 85, 86, 87, 88, -1,
- 90, 91, -1, 93, 94, 95, 96, 97, -1, 99,
+ 90, 91, -1, 93, 94, 95, 96, 97, 98, 99,
-1, -1, 102, -1, -1, 105, -1, -1, -1, 109,
-1, -1, -1, 113, 114, 115, -1, -1, 118, -1,
-1, -1, -1, 123, 124, -1, -1, -1, -1, 129,
@@ -15523,7 +15830,7 @@ static const yytype_int16 yycheck[] =
140, -1, -1, -1, 144, -1, -1, 147, 148, 149,
-1, -1, -1, 153, -1, 155, 156, -1, 158, 159,
160, -1, -1, 163, 164, -1, 166, 167, 168, 169,
- 170, 171, -1, -1, 174, 175, 176, -1, -1, 179,
+ 170, 171, -1, 173, 174, 175, 176, -1, -1, 179,
180, -1, 182, 183, 184, -1, -1, 187, -1, -1,
-1, 191, -1, 193, -1, 195, -1, 197, 198, 199,
200, 201, 202, -1, 204, -1, -1, -1, 208, 209,
@@ -15532,7 +15839,7 @@ static const yytype_int16 yycheck[] =
-1, 231, -1, 233, -1, -1, -1, -1, 238, 239,
-1, -1, -1, 243, -1, 245, 246, -1, 248, 249,
-1, -1, -1, 253, -1, -1, 256, 257, 258, -1,
- -1, 261, -1, -1, 264, 265, 266, -1, -1, -1,
+ -1, 261, -1, -1, 264, 265, -1, -1, -1, -1,
-1, 271, 272, -1, 274, -1, 276, -1, 278, 279,
-1, -1, -1, -1, -1, -1, -1, 287, 288, 289,
290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
@@ -15560,7 +15867,7 @@ static const yytype_int16 yycheck[] =
510, 511, -1, -1, 514, 515, -1, 517, 518, 519,
520, 521, 522, -1, -1, 525, 526, 527, 528, -1,
530, 531, -1, 533, -1, 535, 536, 537, 538, -1,
- 540, 541, 542, -1, 544, 545, 546, 547, -1, -1,
+ -1, 541, 542, -1, 544, 545, 546, 547, -1, -1,
-1, -1, -1, 553, 554, 555, -1, -1, -1, 559,
560, 561, 562, -1, 564, 565, -1, 567, 568, -1,
570, 571, -1, -1, 574, -1, -1, 577, -1, 579,
@@ -15570,7 +15877,7 @@ static const yytype_int16 yycheck[] =
610, -1, 612, 613, 614, -1, 5, 617, 7, 8,
9, 10, 11, -1, -1, 14, -1, -1, -1, 18,
-1, -1, 21, -1, 23, 24, 25, 26, 27, 28,
- 29, -1, 31, -1, -1, 34, 35, -1, -1, -1,
+ 29, -1, 31, -1, -1, -1, 35, -1, -1, -1,
39, -1, -1, 42, 43, 44, -1, 46, -1, 48,
49, -1, -1, 52, -1, -1, 55, 56, -1, 58,
59, -1, 61, 62, -1, 64, 65, 66, 67, 68,
@@ -15593,7 +15900,7 @@ static const yytype_int16 yycheck[] =
229, -1, 231, -1, 233, -1, -1, -1, -1, 238,
239, -1, -1, -1, 243, -1, 245, 246, -1, 248,
249, -1, -1, -1, 253, -1, -1, 256, 257, 258,
- -1, -1, 261, -1, -1, 264, 265, 266, -1, -1,
+ -1, -1, 261, -1, -1, 264, 265, -1, -1, -1,
-1, -1, 271, 272, -1, 274, -1, 276, -1, 278,
279, -1, -1, -1, -1, -1, -1, -1, 287, 288,
289, 290, 291, 292, 293, 294, 295, 296, 297, 298,
@@ -15616,12 +15923,12 @@ static const yytype_int16 yycheck[] =
459, 460, 461, 462, 463, -1, 465, 466, -1, -1,
-1, 470, 471, 472, 473, -1, -1, -1, 477, -1,
-1, -1, 481, -1, 483, 484, 485, 486, -1, 488,
- 489, 490, 491, 492, 493, -1, -1, -1, -1, -1,
+ 489, 490, 491, 492, 493, -1, -1, -1, 497, -1,
-1, 500, 501, -1, 503, -1, -1, 506, -1, -1,
509, 510, 511, -1, -1, 514, 515, -1, 517, 518,
519, 520, 521, 522, -1, -1, 525, 526, 527, 528,
-1, 530, 531, -1, 533, -1, 535, 536, 537, 538,
- -1, 540, 541, 542, -1, 544, 545, 546, 547, -1,
+ -1, -1, 541, 542, -1, 544, 545, 546, 547, -1,
-1, -1, -1, -1, 553, 554, 555, -1, -1, -1,
559, 560, 561, 562, -1, 564, 565, -1, 567, 568,
-1, 570, 571, -1, -1, 574, -1, -1, 577, -1,
@@ -15641,20 +15948,20 @@ static const yytype_int16 yycheck[] =
-1, 99, -1, -1, 102, -1, -1, 105, -1, -1,
-1, 109, -1, -1, -1, 113, 114, 115, -1, -1,
118, -1, -1, -1, -1, 123, 124, -1, -1, -1,
- 128, 129, -1, 131, -1, -1, -1, 135, -1, 137,
+ -1, 129, -1, 131, -1, -1, -1, 135, -1, 137,
138, 139, 140, -1, -1, -1, 144, -1, -1, 147,
148, 149, -1, -1, -1, 153, -1, 155, 156, -1,
158, 159, 160, -1, -1, 163, 164, -1, 166, 167,
168, 169, 170, 171, -1, -1, 174, 175, 176, -1,
-1, 179, 180, -1, 182, 183, 184, -1, -1, 187,
- -1, -1, -1, 191, -1, 193, -1, 195, -1, 197,
+ -1, -1, -1, 191, 192, 193, -1, 195, -1, 197,
198, 199, 200, 201, 202, -1, 204, -1, -1, -1,
208, 209, 210, -1, 212, -1, -1, -1, 216, 217,
-1, -1, -1, 221, 222, 223, 224, -1, -1, 227,
228, 229, -1, 231, -1, 233, -1, -1, -1, -1,
238, 239, -1, -1, -1, 243, -1, 245, 246, -1,
248, 249, -1, -1, -1, 253, -1, -1, 256, 257,
- 258, -1, -1, 261, -1, -1, 264, 265, 266, -1,
+ 258, -1, -1, 261, -1, -1, 264, 265, -1, -1,
-1, -1, -1, 271, 272, -1, 274, -1, 276, -1,
278, 279, -1, -1, -1, -1, -1, -1, -1, 287,
288, 289, 290, 291, 292, 293, 294, 295, 296, 297,
@@ -15682,7 +15989,7 @@ static const yytype_int16 yycheck[] =
-1, 509, 510, 511, -1, -1, 514, 515, -1, 517,
518, 519, 520, 521, 522, -1, -1, 525, 526, 527,
528, -1, 530, 531, -1, 533, -1, 535, 536, 537,
- 538, -1, 540, 541, 542, -1, 544, 545, 546, 547,
+ 538, -1, -1, 541, 542, -1, 544, 545, 546, 547,
-1, -1, -1, -1, -1, 553, 554, 555, -1, -1,
-1, 559, 560, 561, 562, -1, 564, 565, -1, 567,
568, -1, 570, 571, -1, -1, 574, -1, -1, 577,
@@ -15702,7 +16009,7 @@ static const yytype_int16 yycheck[] =
97, -1, 99, -1, -1, 102, -1, -1, 105, -1,
-1, -1, 109, -1, -1, -1, 113, 114, 115, -1,
-1, 118, -1, -1, -1, -1, 123, 124, -1, -1,
- -1, -1, 129, -1, 131, -1, -1, -1, 135, -1,
+ -1, 128, 129, -1, 131, -1, -1, -1, 135, -1,
137, 138, 139, 140, -1, -1, -1, 144, -1, -1,
147, 148, 149, -1, -1, -1, 153, -1, 155, 156,
-1, 158, 159, 160, -1, -1, 163, 164, -1, 166,
@@ -15715,7 +16022,7 @@ static const yytype_int16 yycheck[] =
227, 228, 229, -1, 231, -1, 233, -1, -1, -1,
-1, 238, 239, -1, -1, -1, 243, -1, 245, 246,
-1, 248, 249, -1, -1, -1, 253, -1, -1, 256,
- 257, 258, -1, -1, 261, -1, -1, 264, 265, 266,
+ 257, 258, -1, -1, 261, -1, -1, 264, 265, -1,
-1, -1, -1, -1, 271, 272, -1, 274, -1, 276,
-1, 278, 279, -1, -1, -1, -1, -1, -1, -1,
287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
@@ -15743,7 +16050,7 @@ static const yytype_int16 yycheck[] =
-1, -1, 509, 510, 511, -1, -1, 514, 515, -1,
517, 518, 519, 520, 521, 522, -1, -1, 525, 526,
527, 528, -1, 530, 531, -1, 533, -1, 535, 536,
- 537, 538, -1, 540, 541, 542, -1, 544, 545, 546,
+ 537, 538, -1, -1, 541, 542, -1, 544, 545, 546,
547, -1, -1, -1, -1, -1, 553, 554, 555, -1,
-1, -1, 559, 560, 561, 562, -1, 564, 565, -1,
567, 568, -1, 570, 571, -1, -1, 574, -1, -1,
@@ -15752,7 +16059,7 @@ static const yytype_int16 yycheck[] =
597, 598, 599, 600, 601, 602, -1, -1, -1, -1,
-1, -1, 609, 610, -1, 612, 613, 614, -1, 5,
617, 7, 8, 9, 10, 11, -1, -1, 14, -1,
- -1, -1, 18, 19, -1, 21, -1, 23, 24, 25,
+ -1, -1, 18, -1, -1, 21, -1, 23, 24, 25,
26, 27, 28, 29, -1, 31, -1, -1, -1, 35,
-1, -1, -1, 39, -1, -1, 42, 43, 44, -1,
46, -1, 48, 49, -1, -1, 52, -1, -1, 55,
@@ -15763,7 +16070,7 @@ static const yytype_int16 yycheck[] =
96, 97, -1, 99, -1, -1, 102, -1, -1, 105,
-1, -1, -1, 109, -1, -1, -1, 113, 114, 115,
-1, -1, 118, -1, -1, -1, -1, 123, 124, -1,
- -1, -1, -1, 129, -1, 131, -1, -1, -1, 135,
+ -1, -1, 128, 129, -1, 131, -1, -1, -1, 135,
-1, 137, 138, 139, 140, -1, -1, -1, 144, -1,
-1, 147, 148, 149, -1, -1, -1, 153, -1, 155,
156, -1, 158, 159, 160, -1, -1, 163, 164, -1,
@@ -15804,7 +16111,7 @@ static const yytype_int16 yycheck[] =
506, -1, -1, 509, 510, 511, -1, -1, 514, 515,
-1, 517, 518, 519, 520, 521, 522, -1, -1, 525,
526, 527, 528, -1, 530, 531, -1, 533, -1, 535,
- 536, 537, 538, -1, 540, 541, 542, -1, 544, 545,
+ 536, 537, 538, -1, -1, 541, 542, -1, 544, 545,
546, 547, -1, -1, -1, -1, -1, 553, 554, 555,
-1, -1, -1, 559, 560, 561, 562, -1, 564, 565,
-1, 567, 568, -1, 570, 571, -1, -1, 574, -1,
@@ -15812,7 +16119,7 @@ static const yytype_int16 yycheck[] =
-1, -1, -1, -1, 590, -1, -1, 593, -1, -1,
-1, 597, 598, 599, 600, 601, 602, -1, -1, -1,
-1, -1, -1, 609, 610, -1, 612, 613, 614, -1,
- 5, 617, 7, 8, 9, 10, 11, -1, -1, 14,
+ 5, 617, 7, 8, 9, 10, 11, 12, -1, 14,
-1, -1, -1, 18, -1, -1, 21, -1, 23, 24,
25, 26, 27, 28, 29, -1, 31, -1, -1, -1,
35, -1, -1, -1, 39, -1, -1, 42, 43, 44,
@@ -15821,14 +16128,14 @@ static const yytype_int16 yycheck[] =
65, 66, 67, 68, 69, 70, -1, 72, 73, 74,
75, 76, 77, 78, 79, -1, 81, 82, 83, 84,
85, 86, 87, 88, -1, 90, 91, -1, 93, 94,
- 95, 96, 97, 98, 99, -1, -1, 102, -1, -1,
+ 95, 96, 97, -1, 99, -1, -1, 102, -1, -1,
105, -1, -1, -1, 109, -1, -1, -1, 113, 114,
115, -1, -1, 118, -1, -1, -1, -1, 123, 124,
-1, -1, -1, -1, 129, -1, 131, -1, -1, -1,
135, -1, 137, 138, 139, 140, -1, -1, -1, 144,
-1, -1, 147, 148, 149, -1, -1, -1, 153, -1,
155, 156, -1, 158, 159, 160, -1, -1, 163, 164,
- -1, 166, 167, 168, 169, 170, 171, -1, 173, 174,
+ -1, 166, 167, 168, 169, 170, 171, -1, -1, 174,
175, 176, -1, -1, 179, 180, -1, 182, 183, 184,
-1, -1, 187, -1, -1, -1, 191, -1, 193, -1,
195, -1, 197, 198, 199, 200, 201, 202, -1, 204,
@@ -15912,7 +16219,7 @@ static const yytype_int16 yycheck[] =
364, 365, 366, 367, -1, 369, 370, -1, -1, -1,
-1, -1, -1, -1, -1, 379, 380, 381, -1, -1,
384, -1, 386, 387, 388, 389, 390, 391, 392, 393,
- 394, 395, 396, 397, -1, -1, 400, 401, 402, -1,
+ 394, 395, 396, 397, -1, -1, 400, 401, 402, 403,
404, -1, 406, 407, 408, 409, 410, -1, 412, 413,
414, -1, -1, 417, -1, -1, -1, 421, 422, 423,
424, 425, -1, -1, 428, 429, 430, 431, 432, -1,
@@ -15922,7 +16229,7 @@ static const yytype_int16 yycheck[] =
-1, 465, 466, -1, -1, -1, 470, 471, 472, 473,
-1, -1, -1, 477, -1, -1, -1, 481, -1, 483,
484, 485, 486, -1, 488, 489, 490, 491, 492, 493,
- -1, -1, -1, 497, -1, -1, 500, 501, -1, 503,
+ -1, -1, -1, -1, -1, -1, 500, 501, -1, 503,
-1, -1, 506, -1, -1, 509, 510, 511, -1, -1,
514, 515, -1, 517, 518, 519, 520, 521, 522, -1,
-1, 525, 526, 527, 528, -1, 530, 531, -1, 533,
@@ -15952,7 +16259,7 @@ static const yytype_int16 yycheck[] =
153, -1, 155, 156, -1, 158, 159, 160, -1, -1,
163, 164, -1, 166, 167, 168, 169, 170, 171, -1,
-1, 174, 175, 176, -1, -1, 179, 180, -1, 182,
- 183, 184, -1, -1, 187, -1, -1, -1, 191, 192,
+ 183, 184, -1, -1, 187, -1, -1, -1, 191, -1,
193, -1, 195, -1, 197, 198, 199, 200, 201, 202,
-1, 204, -1, -1, -1, 208, 209, 210, -1, 212,
-1, -1, -1, 216, 217, -1, -1, -1, 221, 222,
@@ -15987,7 +16294,7 @@ static const yytype_int16 yycheck[] =
503, -1, -1, 506, -1, -1, 509, 510, 511, -1,
-1, 514, 515, -1, 517, 518, 519, 520, 521, 522,
-1, -1, 525, 526, 527, 528, -1, 530, 531, -1,
- 533, -1, 535, 536, 537, 538, -1, -1, 541, 542,
+ 533, -1, 535, 536, 537, 538, -1, 540, 541, 542,
-1, 544, 545, 546, 547, -1, -1, -1, -1, -1,
553, 554, 555, -1, -1, -1, 559, 560, 561, 562,
-1, 564, 565, -1, 567, 568, -1, 570, 571, -1,
@@ -16068,7 +16375,7 @@ static const yytype_int16 yycheck[] =
91, -1, 93, 94, 95, 96, 97, -1, 99, -1,
-1, 102, -1, -1, 105, -1, -1, -1, 109, -1,
-1, -1, 113, 114, 115, -1, -1, 118, -1, -1,
- -1, -1, 123, 124, -1, -1, -1, 128, 129, -1,
+ -1, -1, 123, 124, -1, -1, -1, -1, 129, -1,
131, -1, -1, -1, 135, -1, 137, 138, 139, 140,
-1, -1, -1, 144, -1, -1, 147, 148, 149, -1,
-1, -1, 153, -1, 155, 156, -1, 158, 159, 160,
@@ -16118,7 +16425,7 @@ static const yytype_int16 yycheck[] =
-1, -1, 593, -1, -1, -1, 597, 598, 599, 600,
601, 602, -1, -1, -1, -1, -1, -1, 609, 610,
-1, 612, 613, 614, -1, 5, 617, 7, 8, 9,
- 10, 11, 12, -1, 14, -1, -1, -1, 18, -1,
+ 10, 11, -1, -1, 14, -1, -1, -1, 18, -1,
-1, 21, -1, 23, 24, 25, 26, 27, 28, 29,
-1, 31, -1, -1, -1, 35, -1, -1, -1, 39,
-1, -1, 42, 43, 44, -1, 46, -1, 48, 49,
@@ -16180,310 +16487,310 @@ static const yytype_int16 yycheck[] =
600, 601, 602, -1, -1, -1, -1, -1, -1, 609,
610, -1, 612, 613, 614, -1, 5, 617, 7, 8,
9, 10, 11, -1, -1, 14, -1, -1, -1, 18,
- -1, -1, 21, -1, 23, 24, 25, 26, 27, 28,
- 29, -1, 31, -1, -1, -1, 35, -1, -1, -1,
- 39, -1, -1, 42, 43, 44, -1, 46, -1, 48,
- 49, -1, -1, 52, -1, -1, 55, 56, -1, 58,
- 59, -1, 61, 62, -1, 64, 65, 66, 67, 68,
- 69, 70, -1, 72, 73, 74, 75, 76, 77, 78,
- 79, -1, 81, 82, 83, 84, 85, 86, 87, 88,
- -1, 90, 91, -1, 93, 94, 95, 96, 97, -1,
+ -1, -1, -1, -1, 23, 24, 25, 26, 27, 28,
+ -1, -1, 31, -1, -1, -1, 35, -1, -1, -1,
+ 39, -1, -1, 42, 43, 44, -1, 46, -1, -1,
+ -1, -1, -1, 52, 53, -1, 55, 56, -1, 58,
+ -1, -1, -1, -1, -1, 64, 65, 66, 67, 68,
+ 69, 70, -1, 72, 73, -1, -1, -1, -1, -1,
+ -1, -1, 81, -1, 83, -1, 85, 86, 87, 88,
+ -1, 90, 91, -1, 93, 94, 95, -1, 97, -1,
99, -1, -1, 102, -1, -1, 105, -1, -1, -1,
109, -1, -1, -1, 113, 114, 115, -1, -1, 118,
- -1, -1, -1, -1, 123, 124, -1, -1, -1, -1,
+ -1, -1, -1, -1, 123, -1, -1, -1, -1, -1,
129, -1, 131, -1, -1, -1, 135, -1, 137, 138,
- 139, 140, -1, -1, -1, 144, -1, -1, 147, 148,
- 149, -1, -1, -1, 153, -1, 155, 156, -1, 158,
+ 139, 140, -1, -1, -1, -1, -1, -1, 147, 148,
+ 149, -1, 151, 152, 153, -1, 155, 156, -1, 158,
159, 160, -1, -1, 163, 164, -1, 166, 167, 168,
- 169, 170, 171, -1, -1, 174, 175, 176, -1, -1,
- 179, 180, -1, 182, 183, 184, -1, -1, 187, -1,
+ 169, -1, -1, -1, -1, 174, 175, 176, -1, -1,
+ 179, 180, 181, 182, 183, 184, -1, -1, -1, -1,
-1, -1, 191, -1, 193, -1, 195, -1, 197, 198,
- 199, 200, 201, 202, -1, 204, -1, -1, -1, 208,
- 209, 210, -1, 212, -1, -1, -1, 216, 217, -1,
- -1, -1, 221, 222, 223, 224, -1, -1, 227, 228,
+ 199, 200, 201, 202, -1, 204, -1, -1, -1, -1,
+ 209, 210, -1, -1, -1, -1, -1, -1, 217, -1,
+ -1, -1, 221, 222, 223, 224, 225, -1, 227, 228,
229, -1, 231, -1, 233, -1, -1, -1, -1, 238,
- 239, -1, -1, -1, 243, -1, 245, 246, -1, 248,
- 249, -1, -1, -1, 253, -1, -1, 256, 257, 258,
- -1, -1, 261, -1, -1, 264, 265, -1, -1, -1,
+ -1, -1, -1, -1, 243, -1, 245, 246, -1, 248,
+ 249, 250, -1, -1, 253, -1, -1, -1, 257, 258,
+ -1, -1, 261, 262, -1, 264, 265, -1, -1, -1,
-1, -1, 271, 272, -1, 274, -1, 276, -1, 278,
- 279, -1, -1, -1, -1, -1, -1, -1, 287, 288,
+ 279, -1, -1, -1, -1, 284, -1, -1, 287, 288,
289, 290, 291, 292, 293, 294, 295, 296, 297, 298,
299, -1, 301, 302, 303, -1, 305, 306, 307, 308,
-1, 310, 311, -1, -1, -1, -1, 316, 317, 318,
319, 320, 321, -1, -1, 324, 325, -1, 327, -1,
329, -1, 331, 332, 333, 334, 335, 336, 337, 338,
339, 340, -1, -1, 343, 344, -1, -1, 347, 348,
- 349, 350, -1, -1, -1, 354, 355, -1, -1, -1,
+ 349, 350, -1, -1, -1, -1, 355, -1, -1, -1,
-1, 360, 361, 362, -1, 364, 365, 366, 367, -1,
- 369, 370, -1, -1, -1, -1, -1, -1, -1, -1,
- 379, 380, 381, -1, -1, 384, -1, 386, 387, 388,
- 389, 390, 391, 392, 393, 394, 395, 396, 397, -1,
- -1, 400, 401, 402, 403, 404, -1, 406, 407, 408,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 380, 381, -1, -1, -1, -1, 386, 387, 388,
+ -1, 390, 391, 392, 393, 394, 395, 396, -1, -1,
+ -1, -1, 401, 402, -1, 404, -1, 406, 407, 408,
409, 410, -1, 412, 413, 414, -1, -1, 417, -1,
-1, -1, 421, 422, 423, 424, 425, -1, -1, 428,
- 429, 430, 431, 432, -1, 434, 435, -1, 437, 438,
- 439, -1, -1, 442, -1, 444, -1, 446, 447, -1,
- 449, 450, -1, -1, -1, 454, 455, 456, 457, 458,
- 459, 460, 461, 462, 463, -1, 465, 466, -1, -1,
- -1, 470, 471, 472, 473, -1, -1, -1, 477, -1,
- -1, -1, 481, -1, 483, 484, 485, 486, -1, 488,
- 489, 490, 491, 492, 493, -1, -1, -1, -1, -1,
+ 429, 430, 431, 432, -1, 434, -1, -1, 437, -1,
+ 439, 440, -1, 442, -1, -1, -1, 446, -1, -1,
+ 449, 450, 451, -1, -1, -1, 455, 456, 457, 458,
+ 459, 460, -1, 462, 463, -1, 465, -1, -1, -1,
+ -1, 470, 471, 472, -1, -1, -1, -1, 477, -1,
+ -1, -1, 481, -1, -1, 484, -1, 486, -1, 488,
+ -1, 490, -1, 492, 493, -1, -1, -1, -1, -1,
-1, 500, 501, -1, 503, -1, -1, 506, -1, -1,
- 509, 510, 511, -1, -1, 514, 515, -1, 517, 518,
+ 509, -1, 511, -1, -1, -1, 515, -1, 517, 518,
519, 520, 521, 522, -1, -1, 525, 526, 527, 528,
-1, 530, 531, -1, 533, -1, 535, 536, 537, 538,
-1, -1, 541, 542, -1, 544, 545, 546, 547, -1,
-1, -1, -1, -1, 553, 554, 555, -1, -1, -1,
- 559, 560, 561, 562, -1, 564, 565, -1, 567, 568,
- -1, 570, 571, -1, -1, 574, -1, -1, 577, -1,
- 579, -1, 581, 582, 583, -1, -1, -1, -1, -1,
+ -1, 560, 561, 562, -1, 564, 565, -1, 567, 568,
+ -1, -1, -1, -1, -1, 574, -1, -1, 577, -1,
+ -1, -1, 581, 582, 583, -1, -1, -1, -1, -1,
-1, 590, -1, -1, 593, -1, -1, -1, 597, 598,
- 599, 600, 601, 602, -1, -1, -1, -1, -1, -1,
- 609, 610, -1, 612, 613, 614, -1, 5, 617, 7,
+ 599, 600, 601, 602, -1, -1, 605, -1, -1, -1,
+ 609, -1, -1, 612, -1, 614, -1, 5, 617, 7,
8, 9, 10, 11, -1, -1, 14, -1, -1, -1,
- 18, -1, -1, 21, -1, 23, 24, 25, 26, 27,
- 28, 29, -1, 31, -1, -1, -1, 35, -1, -1,
+ 18, -1, -1, -1, -1, 23, 24, 25, 26, 27,
+ 28, -1, -1, 31, -1, -1, -1, 35, -1, -1,
-1, 39, -1, -1, 42, 43, 44, -1, 46, -1,
- 48, 49, -1, -1, 52, -1, -1, 55, 56, -1,
- 58, 59, -1, 61, 62, -1, 64, 65, 66, 67,
- 68, 69, 70, -1, 72, 73, 74, 75, 76, 77,
- 78, 79, -1, 81, 82, 83, 84, 85, 86, 87,
- 88, -1, 90, 91, -1, 93, 94, 95, 96, 97,
+ -1, -1, -1, -1, 52, 53, -1, 55, 56, -1,
+ 58, -1, -1, -1, -1, -1, 64, 65, 66, 67,
+ 68, 69, 70, -1, 72, 73, -1, -1, -1, -1,
+ -1, -1, -1, 81, -1, 83, -1, 85, 86, 87,
+ 88, -1, 90, 91, -1, 93, 94, 95, -1, 97,
-1, 99, -1, -1, 102, -1, -1, 105, -1, -1,
-1, 109, -1, -1, -1, 113, 114, 115, -1, -1,
- 118, -1, -1, -1, -1, 123, 124, -1, -1, -1,
+ 118, -1, -1, -1, -1, 123, -1, -1, -1, -1,
-1, 129, -1, 131, -1, -1, -1, 135, -1, 137,
- 138, 139, 140, -1, -1, -1, 144, -1, -1, 147,
- 148, 149, -1, -1, -1, 153, -1, 155, 156, -1,
+ 138, 139, 140, -1, -1, -1, -1, -1, -1, 147,
+ 148, 149, -1, 151, -1, 153, -1, 155, 156, -1,
158, 159, 160, -1, -1, 163, 164, -1, 166, 167,
- 168, 169, 170, 171, -1, -1, 174, 175, 176, -1,
- -1, 179, 180, -1, 182, 183, 184, -1, -1, 187,
+ 168, 169, -1, -1, -1, -1, 174, 175, 176, -1,
+ -1, 179, 180, 181, 182, 183, 184, -1, -1, -1,
-1, -1, -1, 191, -1, 193, -1, 195, -1, 197,
198, 199, 200, 201, 202, -1, 204, -1, -1, -1,
- 208, 209, 210, -1, 212, -1, -1, -1, 216, 217,
- -1, -1, -1, 221, 222, 223, 224, -1, -1, 227,
+ -1, 209, 210, -1, -1, -1, -1, -1, -1, 217,
+ -1, -1, -1, 221, 222, 223, 224, 225, -1, 227,
228, 229, -1, 231, -1, 233, -1, -1, -1, -1,
- 238, 239, -1, -1, -1, 243, -1, 245, 246, -1,
- 248, 249, -1, -1, -1, 253, -1, -1, 256, 257,
- 258, -1, -1, 261, -1, -1, 264, 265, -1, -1,
+ 238, -1, -1, -1, -1, 243, -1, 245, 246, -1,
+ 248, 249, 250, -1, -1, 253, -1, -1, -1, 257,
+ 258, -1, -1, 261, 262, -1, 264, 265, -1, -1,
-1, -1, -1, 271, 272, -1, 274, -1, 276, -1,
- 278, 279, -1, -1, -1, -1, -1, -1, -1, 287,
+ 278, 279, -1, -1, -1, -1, 284, -1, -1, 287,
288, 289, 290, 291, 292, 293, 294, 295, 296, 297,
298, 299, -1, 301, 302, 303, -1, 305, 306, 307,
308, -1, 310, 311, -1, -1, -1, -1, 316, 317,
318, 319, 320, 321, -1, -1, 324, 325, -1, 327,
-1, 329, -1, 331, 332, 333, 334, 335, 336, 337,
338, 339, 340, -1, -1, 343, 344, -1, -1, 347,
- 348, 349, 350, -1, -1, -1, 354, 355, -1, -1,
+ 348, 349, 350, -1, -1, -1, -1, 355, -1, -1,
-1, -1, 360, 361, 362, -1, 364, 365, 366, 367,
- -1, 369, 370, -1, -1, -1, -1, -1, -1, -1,
- -1, 379, 380, 381, -1, -1, 384, -1, 386, 387,
- 388, 389, 390, 391, 392, 393, 394, 395, 396, 397,
- -1, -1, 400, 401, 402, -1, 404, -1, 406, 407,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 380, 381, -1, -1, -1, -1, 386, 387,
+ 388, -1, 390, 391, 392, 393, 394, 395, 396, -1,
+ -1, -1, -1, 401, 402, -1, 404, -1, 406, 407,
408, 409, 410, -1, 412, 413, 414, -1, -1, 417,
-1, -1, -1, 421, 422, 423, 424, 425, -1, -1,
- 428, 429, 430, 431, 432, -1, 434, 435, -1, 437,
- 438, 439, -1, -1, 442, -1, 444, -1, 446, 447,
- -1, 449, 450, -1, -1, -1, 454, 455, 456, 457,
- 458, 459, 460, 461, 462, 463, -1, 465, 466, -1,
- -1, -1, 470, 471, 472, 473, -1, -1, -1, 477,
- -1, -1, -1, 481, -1, 483, 484, 485, 486, -1,
- 488, 489, 490, 491, 492, 493, -1, -1, -1, -1,
+ 428, 429, 430, 431, 432, -1, 434, -1, -1, 437,
+ -1, 439, 440, -1, 442, -1, -1, -1, 446, -1,
+ -1, 449, 450, 451, -1, -1, -1, 455, 456, 457,
+ 458, 459, 460, -1, 462, 463, -1, 465, -1, -1,
+ -1, -1, 470, 471, 472, -1, -1, -1, -1, 477,
+ -1, -1, -1, 481, -1, -1, 484, -1, 486, -1,
+ 488, -1, 490, -1, 492, 493, -1, -1, -1, -1,
-1, -1, 500, 501, -1, 503, -1, -1, 506, -1,
- -1, 509, 510, 511, -1, -1, 514, 515, -1, 517,
+ -1, 509, -1, 511, -1, -1, -1, 515, -1, 517,
518, 519, 520, 521, 522, -1, -1, 525, 526, 527,
528, -1, 530, 531, -1, 533, -1, 535, 536, 537,
- 538, -1, 540, 541, 542, -1, 544, 545, 546, 547,
+ 538, -1, -1, 541, 542, -1, 544, 545, 546, 547,
-1, -1, -1, -1, -1, 553, 554, 555, -1, -1,
- -1, 559, 560, 561, 562, -1, 564, 565, -1, 567,
- 568, -1, 570, 571, -1, -1, 574, -1, -1, 577,
- -1, 579, -1, 581, 582, 583, -1, -1, -1, -1,
+ -1, -1, 560, 561, 562, -1, 564, 565, -1, 567,
+ 568, -1, -1, -1, -1, -1, 574, -1, -1, 577,
+ -1, -1, -1, 581, 582, 583, -1, -1, -1, -1,
-1, -1, 590, -1, -1, 593, -1, -1, -1, 597,
- 598, 599, 600, 601, 602, -1, -1, -1, -1, -1,
- -1, 609, 610, -1, 612, 613, 614, -1, 5, 617,
+ 598, 599, 600, 601, 602, 603, -1, 605, -1, -1,
+ -1, 609, -1, -1, 612, -1, 614, -1, 5, 617,
7, 8, 9, 10, 11, -1, -1, 14, -1, -1,
- -1, 18, -1, -1, 21, -1, 23, 24, 25, 26,
- 27, 28, 29, -1, 31, -1, -1, -1, 35, -1,
+ -1, 18, -1, -1, -1, -1, 23, 24, 25, 26,
+ 27, 28, -1, -1, 31, -1, -1, -1, 35, -1,
-1, -1, 39, -1, -1, 42, 43, 44, -1, 46,
- -1, 48, 49, -1, -1, 52, -1, -1, 55, 56,
- -1, 58, 59, -1, 61, 62, -1, 64, 65, 66,
- 67, 68, 69, 70, -1, 72, 73, 74, 75, 76,
- 77, 78, 79, -1, 81, 82, 83, 84, 85, 86,
- 87, 88, -1, 90, 91, -1, 93, 94, 95, 96,
+ -1, -1, -1, -1, -1, 52, 53, -1, 55, 56,
+ -1, 58, -1, -1, -1, -1, -1, 64, 65, 66,
+ 67, 68, 69, 70, -1, 72, 73, -1, -1, -1,
+ -1, -1, -1, -1, 81, -1, 83, -1, 85, 86,
+ 87, 88, -1, 90, 91, -1, 93, 94, 95, -1,
97, -1, 99, -1, -1, 102, -1, -1, 105, -1,
-1, -1, 109, -1, -1, -1, 113, 114, 115, -1,
- -1, 118, -1, -1, -1, -1, 123, 124, -1, -1,
- -1, 128, 129, -1, 131, -1, -1, -1, 135, -1,
- 137, 138, 139, 140, -1, -1, -1, 144, -1, -1,
- 147, 148, 149, -1, -1, -1, 153, -1, 155, 156,
+ -1, 118, -1, -1, -1, -1, 123, -1, -1, -1,
+ -1, -1, 129, -1, 131, -1, -1, -1, 135, -1,
+ 137, 138, 139, 140, -1, -1, -1, -1, -1, -1,
+ 147, 148, 149, -1, 151, -1, 153, -1, 155, 156,
-1, 158, 159, 160, -1, -1, 163, 164, -1, 166,
- 167, 168, 169, 170, 171, -1, -1, 174, 175, 176,
- -1, -1, 179, 180, -1, 182, 183, 184, -1, -1,
- 187, -1, -1, -1, 191, -1, 193, -1, 195, -1,
+ 167, 168, 169, -1, -1, -1, -1, 174, 175, 176,
+ -1, -1, 179, 180, 181, 182, 183, 184, -1, -1,
+ -1, -1, -1, -1, 191, -1, 193, -1, 195, -1,
197, 198, 199, 200, 201, 202, -1, 204, -1, -1,
- -1, 208, 209, 210, -1, 212, -1, -1, -1, 216,
- 217, -1, -1, -1, 221, 222, 223, 224, -1, -1,
+ -1, -1, 209, 210, -1, -1, -1, -1, -1, -1,
+ 217, -1, -1, -1, 221, 222, 223, 224, 225, -1,
227, 228, 229, -1, 231, -1, 233, -1, -1, -1,
- -1, 238, 239, -1, -1, -1, 243, -1, 245, 246,
- -1, 248, 249, -1, -1, -1, 253, -1, -1, 256,
- 257, 258, -1, -1, 261, -1, -1, 264, 265, -1,
+ -1, 238, -1, -1, -1, -1, 243, -1, 245, 246,
+ -1, 248, 249, 250, -1, -1, 253, -1, -1, -1,
+ 257, 258, -1, -1, 261, 262, -1, 264, 265, -1,
-1, -1, -1, -1, 271, 272, -1, 274, -1, 276,
- -1, 278, 279, -1, -1, -1, -1, -1, -1, -1,
+ -1, 278, 279, -1, -1, -1, -1, 284, -1, -1,
287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
297, 298, 299, -1, 301, 302, 303, -1, 305, 306,
307, 308, -1, 310, 311, -1, -1, -1, -1, 316,
317, 318, 319, 320, 321, -1, -1, 324, 325, -1,
327, -1, 329, -1, 331, 332, 333, 334, 335, 336,
337, 338, 339, 340, -1, -1, 343, 344, -1, -1,
- 347, 348, 349, 350, -1, -1, -1, 354, 355, -1,
+ 347, 348, 349, 350, -1, -1, -1, -1, 355, -1,
-1, -1, -1, 360, 361, 362, -1, 364, 365, 366,
- 367, -1, 369, 370, -1, -1, -1, -1, -1, -1,
- -1, -1, 379, 380, 381, -1, -1, 384, -1, 386,
- 387, 388, 389, 390, 391, 392, 393, 394, 395, 396,
- 397, -1, -1, 400, 401, 402, -1, 404, -1, 406,
+ 367, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 380, 381, -1, -1, -1, -1, 386,
+ 387, 388, -1, 390, 391, 392, 393, 394, 395, 396,
+ -1, -1, -1, -1, 401, 402, -1, 404, -1, 406,
407, 408, 409, 410, -1, 412, 413, 414, -1, -1,
417, -1, -1, -1, 421, 422, 423, 424, 425, -1,
- -1, 428, 429, 430, 431, 432, -1, 434, 435, -1,
- 437, 438, 439, -1, -1, 442, -1, 444, -1, 446,
- 447, -1, 449, 450, -1, -1, -1, 454, 455, 456,
- 457, 458, 459, 460, 461, 462, 463, -1, 465, 466,
- -1, -1, -1, 470, 471, 472, 473, -1, -1, -1,
- 477, -1, -1, -1, 481, -1, 483, 484, 485, 486,
- -1, 488, 489, 490, 491, 492, 493, -1, -1, -1,
+ -1, 428, 429, 430, 431, 432, -1, 434, -1, -1,
+ 437, -1, 439, 440, -1, 442, -1, -1, -1, 446,
+ -1, -1, 449, 450, 451, -1, -1, -1, 455, 456,
+ 457, 458, 459, 460, -1, 462, 463, -1, 465, -1,
+ -1, -1, -1, 470, 471, 472, -1, -1, -1, -1,
+ 477, -1, -1, -1, 481, -1, -1, 484, -1, 486,
+ -1, 488, -1, 490, -1, 492, 493, -1, -1, -1,
-1, -1, -1, 500, 501, -1, 503, -1, -1, 506,
- -1, -1, 509, 510, 511, -1, -1, 514, 515, -1,
+ -1, -1, 509, -1, 511, -1, -1, -1, 515, -1,
517, 518, 519, 520, 521, 522, -1, -1, 525, 526,
527, 528, -1, 530, 531, -1, 533, -1, 535, 536,
537, 538, -1, -1, 541, 542, -1, 544, 545, 546,
547, -1, -1, -1, -1, -1, 553, 554, 555, -1,
- -1, -1, 559, 560, 561, 562, -1, 564, 565, -1,
- 567, 568, -1, 570, 571, -1, -1, 574, -1, -1,
- 577, -1, 579, -1, 581, 582, 583, -1, -1, -1,
+ -1, -1, -1, 560, 561, 562, -1, 564, 565, -1,
+ 567, 568, -1, -1, -1, -1, -1, 574, -1, -1,
+ 577, -1, -1, -1, 581, 582, 583, -1, -1, -1,
-1, -1, -1, 590, -1, -1, 593, -1, -1, -1,
- 597, 598, 599, 600, 601, 602, -1, -1, -1, -1,
- -1, -1, 609, 610, -1, 612, 613, 614, -1, 5,
+ 597, 598, 599, 600, 601, 602, 603, -1, 605, -1,
+ -1, -1, 609, -1, -1, 612, -1, 614, -1, 5,
617, 7, 8, 9, 10, 11, -1, -1, 14, -1,
- -1, -1, 18, -1, -1, 21, -1, 23, 24, 25,
- 26, 27, 28, 29, -1, 31, -1, -1, -1, 35,
+ -1, -1, 18, -1, -1, -1, -1, 23, 24, 25,
+ 26, 27, 28, -1, -1, 31, -1, -1, -1, 35,
-1, -1, -1, 39, -1, -1, 42, 43, 44, -1,
- 46, -1, 48, 49, -1, -1, 52, -1, -1, 55,
- 56, -1, 58, 59, -1, 61, 62, -1, 64, 65,
- 66, 67, 68, 69, 70, -1, 72, 73, 74, 75,
- 76, 77, 78, 79, -1, 81, 82, 83, 84, 85,
+ 46, -1, -1, -1, -1, -1, 52, 53, -1, 55,
+ 56, -1, 58, -1, -1, -1, -1, -1, 64, 65,
+ 66, 67, 68, 69, 70, -1, 72, 73, -1, -1,
+ -1, -1, -1, -1, -1, 81, -1, 83, -1, 85,
86, 87, 88, -1, 90, 91, -1, 93, 94, 95,
- 96, 97, -1, 99, -1, -1, 102, -1, -1, 105,
+ -1, 97, -1, 99, -1, -1, 102, -1, -1, 105,
-1, -1, -1, 109, -1, -1, -1, 113, 114, 115,
- -1, -1, 118, -1, -1, -1, -1, 123, 124, -1,
+ -1, -1, 118, -1, -1, -1, -1, 123, -1, -1,
-1, -1, -1, 129, -1, 131, -1, -1, -1, 135,
- -1, 137, 138, 139, 140, -1, -1, -1, 144, -1,
+ -1, 137, 138, 139, 140, -1, -1, -1, -1, -1,
-1, 147, 148, 149, -1, -1, -1, 153, -1, 155,
156, -1, 158, 159, 160, -1, -1, 163, 164, -1,
- 166, 167, 168, 169, 170, 171, -1, -1, 174, 175,
- 176, -1, -1, 179, 180, -1, 182, 183, 184, -1,
- -1, 187, -1, -1, -1, 191, -1, 193, -1, 195,
+ 166, 167, 168, 169, -1, -1, -1, -1, 174, 175,
+ 176, -1, -1, 179, 180, 181, 182, 183, 184, -1,
+ -1, -1, -1, -1, -1, 191, -1, 193, -1, 195,
-1, 197, 198, 199, 200, 201, 202, -1, 204, -1,
- -1, -1, 208, 209, 210, -1, 212, -1, -1, -1,
- 216, 217, -1, -1, -1, 221, 222, 223, 224, -1,
+ -1, -1, -1, 209, 210, -1, -1, -1, -1, -1,
+ -1, 217, -1, -1, -1, 221, 222, 223, 224, 225,
-1, 227, 228, 229, -1, 231, -1, 233, -1, -1,
- -1, -1, 238, 239, -1, -1, -1, 243, -1, 245,
- 246, -1, 248, 249, -1, -1, -1, 253, -1, -1,
- 256, 257, 258, -1, -1, 261, -1, -1, 264, 265,
+ -1, -1, 238, -1, -1, -1, -1, 243, -1, 245,
+ 246, -1, 248, 249, 250, -1, -1, 253, -1, -1,
+ -1, 257, 258, -1, -1, 261, 262, -1, 264, 265,
-1, -1, -1, -1, -1, 271, 272, -1, 274, -1,
- 276, -1, 278, 279, -1, -1, -1, -1, -1, -1,
+ 276, -1, 278, 279, -1, -1, -1, -1, 284, -1,
-1, 287, 288, 289, 290, 291, 292, 293, 294, 295,
296, 297, 298, 299, -1, 301, 302, 303, -1, 305,
306, 307, 308, -1, 310, 311, -1, -1, -1, -1,
316, 317, 318, 319, 320, 321, -1, -1, 324, 325,
-1, 327, -1, 329, -1, 331, 332, 333, 334, 335,
336, 337, 338, 339, 340, -1, -1, 343, 344, -1,
- -1, 347, 348, 349, 350, -1, -1, -1, 354, 355,
+ -1, 347, 348, 349, 350, -1, -1, -1, -1, 355,
-1, -1, -1, -1, 360, 361, 362, -1, 364, 365,
- 366, 367, -1, 369, 370, -1, -1, -1, -1, -1,
- -1, -1, -1, 379, 380, 381, -1, -1, 384, -1,
- 386, 387, 388, 389, 390, 391, 392, 393, 394, 395,
- 396, 397, -1, -1, 400, 401, 402, -1, 404, -1,
+ 366, 367, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 380, 381, -1, -1, -1, -1,
+ 386, 387, 388, -1, 390, 391, 392, 393, 394, 395,
+ 396, -1, -1, -1, -1, 401, 402, -1, 404, -1,
406, 407, 408, 409, 410, -1, 412, 413, 414, -1,
-1, 417, -1, -1, -1, 421, 422, 423, 424, 425,
- -1, -1, 428, 429, 430, 431, 432, -1, 434, 435,
- -1, 437, 438, 439, -1, -1, 442, -1, 444, -1,
- 446, 447, -1, 449, 450, -1, -1, -1, 454, 455,
- 456, 457, 458, 459, 460, 461, 462, 463, -1, 465,
- 466, -1, -1, -1, 470, 471, 472, 473, -1, -1,
- -1, 477, -1, -1, -1, 481, -1, 483, 484, 485,
- 486, -1, 488, 489, 490, 491, 492, 493, -1, -1,
+ -1, -1, 428, 429, 430, 431, 432, -1, 434, -1,
+ -1, 437, -1, 439, 440, -1, 442, -1, -1, -1,
+ 446, -1, -1, 449, 450, 451, -1, -1, -1, 455,
+ 456, 457, 458, 459, 460, -1, 462, 463, -1, 465,
+ -1, -1, -1, -1, 470, 471, 472, -1, -1, -1,
+ -1, 477, -1, -1, -1, 481, -1, -1, 484, -1,
+ 486, -1, 488, -1, 490, -1, 492, 493, -1, -1,
-1, -1, -1, -1, 500, 501, -1, 503, -1, -1,
- 506, -1, -1, 509, 510, 511, -1, -1, 514, 515,
+ 506, -1, -1, 509, -1, 511, -1, -1, -1, 515,
-1, 517, 518, 519, 520, 521, 522, -1, -1, 525,
526, 527, 528, -1, 530, 531, -1, 533, -1, 535,
536, 537, 538, -1, -1, 541, 542, -1, 544, 545,
546, 547, -1, -1, -1, -1, -1, 553, 554, 555,
- -1, -1, -1, 559, 560, 561, 562, -1, 564, 565,
- -1, 567, 568, -1, 570, 571, -1, -1, 574, -1,
- -1, 577, -1, 579, -1, 581, 582, 583, -1, -1,
+ -1, -1, -1, -1, 560, 561, 562, -1, 564, 565,
+ -1, 567, 568, -1, -1, -1, -1, -1, 574, -1,
+ -1, 577, -1, -1, -1, 581, 582, 583, -1, -1,
-1, -1, -1, -1, 590, -1, -1, 593, -1, -1,
- -1, 597, 598, 599, 600, 601, 602, -1, -1, -1,
- -1, -1, -1, 609, 610, -1, 612, 613, 614, -1,
+ -1, 597, 598, 599, 600, 601, 602, -1, -1, 605,
+ -1, -1, -1, 609, -1, -1, 612, -1, 614, -1,
5, 617, 7, 8, 9, 10, 11, -1, -1, 14,
- -1, -1, -1, 18, -1, -1, 21, -1, 23, 24,
- 25, 26, 27, 28, 29, -1, 31, -1, -1, -1,
+ -1, -1, -1, 18, -1, -1, -1, -1, 23, 24,
+ 25, 26, 27, 28, -1, -1, 31, -1, -1, -1,
35, -1, -1, -1, 39, -1, -1, 42, 43, 44,
- -1, 46, -1, 48, 49, -1, -1, 52, -1, -1,
- 55, 56, -1, 58, 59, -1, 61, 62, -1, 64,
- 65, 66, 67, 68, 69, 70, -1, 72, 73, 74,
- 75, 76, 77, 78, 79, -1, 81, 82, 83, 84,
+ -1, 46, -1, -1, -1, -1, -1, 52, 53, -1,
+ 55, 56, -1, 58, -1, -1, -1, -1, -1, 64,
+ 65, 66, 67, 68, 69, 70, -1, 72, 73, -1,
+ -1, -1, -1, -1, -1, -1, 81, -1, 83, -1,
85, 86, 87, 88, -1, 90, 91, -1, 93, 94,
- 95, 96, 97, -1, 99, -1, -1, 102, -1, -1,
+ 95, -1, 97, -1, 99, -1, -1, 102, -1, -1,
105, -1, -1, -1, 109, -1, -1, -1, 113, 114,
- 115, -1, -1, 118, -1, -1, -1, -1, 123, 124,
+ 115, -1, -1, 118, -1, -1, -1, -1, 123, -1,
-1, -1, -1, -1, 129, -1, 131, -1, -1, -1,
- 135, -1, 137, 138, 139, 140, -1, -1, -1, 144,
+ 135, -1, 137, 138, 139, 140, -1, -1, -1, -1,
-1, -1, 147, 148, 149, -1, -1, -1, 153, -1,
155, 156, -1, 158, 159, 160, -1, -1, 163, 164,
- -1, 166, 167, 168, 169, 170, 171, -1, -1, 174,
- 175, 176, -1, -1, 179, 180, -1, 182, 183, 184,
- -1, -1, 187, -1, -1, -1, 191, -1, 193, -1,
+ -1, 166, 167, 168, 169, -1, -1, -1, -1, 174,
+ 175, 176, -1, -1, 179, 180, 181, 182, 183, 184,
+ -1, -1, -1, -1, -1, -1, 191, -1, 193, -1,
195, -1, 197, 198, 199, 200, 201, 202, -1, 204,
- -1, -1, -1, 208, 209, 210, -1, 212, -1, -1,
- -1, 216, 217, -1, -1, -1, 221, 222, 223, 224,
- -1, -1, 227, 228, 229, -1, 231, -1, 233, -1,
- -1, -1, -1, 238, 239, -1, -1, -1, 243, -1,
- 245, 246, -1, 248, 249, -1, -1, -1, 253, -1,
- -1, 256, 257, 258, -1, -1, 261, -1, -1, 264,
+ -1, -1, -1, -1, 209, 210, -1, -1, -1, -1,
+ -1, -1, 217, -1, -1, -1, 221, 222, 223, 224,
+ 225, -1, 227, 228, 229, -1, 231, -1, 233, -1,
+ -1, -1, -1, 238, -1, -1, -1, -1, 243, -1,
+ 245, 246, -1, 248, 249, 250, -1, -1, 253, -1,
+ -1, -1, 257, 258, -1, -1, 261, 262, -1, 264,
265, -1, -1, -1, -1, -1, 271, 272, -1, 274,
- -1, 276, -1, 278, 279, -1, -1, -1, -1, -1,
+ -1, 276, -1, 278, 279, -1, -1, -1, -1, 284,
-1, -1, 287, 288, 289, 290, 291, 292, 293, 294,
295, 296, 297, 298, 299, -1, 301, 302, 303, -1,
305, 306, 307, 308, -1, 310, 311, -1, -1, -1,
-1, 316, 317, 318, 319, 320, 321, -1, -1, 324,
325, -1, 327, -1, 329, -1, 331, 332, 333, 334,
335, 336, 337, 338, 339, 340, -1, -1, 343, 344,
- -1, -1, 347, 348, 349, 350, -1, -1, -1, 354,
+ -1, -1, 347, 348, 349, 350, -1, -1, -1, -1,
355, -1, -1, -1, -1, 360, 361, 362, -1, 364,
- 365, 366, 367, -1, 369, 370, -1, -1, -1, -1,
- -1, -1, -1, -1, 379, 380, 381, -1, -1, 384,
- -1, 386, 387, 388, 389, 390, 391, 392, 393, 394,
- 395, 396, 397, -1, -1, 400, 401, 402, -1, 404,
+ 365, 366, 367, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 380, 381, -1, -1, -1,
+ -1, 386, 387, 388, -1, 390, 391, 392, 393, 394,
+ 395, 396, -1, -1, -1, -1, 401, 402, -1, 404,
-1, 406, 407, 408, 409, 410, -1, 412, 413, 414,
-1, -1, 417, -1, -1, -1, 421, 422, 423, 424,
425, -1, -1, 428, 429, 430, 431, 432, -1, 434,
- 435, -1, 437, 438, 439, -1, -1, 442, -1, 444,
- -1, 446, 447, -1, 449, 450, -1, -1, -1, 454,
- 455, 456, 457, 458, 459, 460, 461, 462, 463, -1,
- 465, 466, -1, -1, -1, 470, 471, 472, 473, -1,
- -1, -1, 477, -1, -1, -1, 481, -1, 483, 484,
- 485, 486, -1, 488, 489, 490, 491, 492, 493, -1,
+ -1, -1, 437, -1, 439, 440, -1, 442, -1, -1,
+ -1, 446, -1, -1, 449, 450, 451, -1, -1, -1,
+ 455, 456, 457, 458, 459, 460, -1, 462, 463, -1,
+ 465, -1, -1, -1, -1, 470, 471, 472, -1, -1,
+ -1, -1, 477, -1, -1, -1, 481, -1, -1, 484,
+ -1, 486, -1, 488, -1, 490, -1, 492, 493, -1,
-1, -1, -1, -1, -1, 500, 501, -1, 503, -1,
- -1, 506, -1, -1, 509, 510, 511, -1, -1, 514,
+ -1, 506, -1, -1, 509, -1, 511, -1, -1, -1,
515, -1, 517, 518, 519, 520, 521, 522, -1, -1,
525, 526, 527, 528, -1, 530, 531, -1, 533, -1,
535, 536, 537, 538, -1, -1, 541, 542, -1, 544,
545, 546, 547, -1, -1, -1, -1, -1, 553, 554,
- 555, -1, -1, -1, 559, 560, 561, 562, -1, 564,
- 565, -1, 567, 568, -1, 570, 571, -1, -1, 574,
- -1, -1, 577, -1, 579, -1, 581, 582, 583, -1,
+ 555, -1, -1, -1, -1, 560, 561, 562, -1, 564,
+ 565, -1, 567, 568, -1, -1, -1, -1, -1, 574,
+ -1, -1, 577, -1, -1, -1, 581, 582, 583, -1,
-1, -1, -1, -1, -1, 590, -1, -1, 593, -1,
-1, -1, 597, 598, 599, 600, 601, 602, -1, -1,
- -1, -1, -1, -1, 609, 610, -1, 612, 613, 614,
+ 605, -1, -1, -1, 609, -1, -1, 612, -1, 614,
-1, 5, 617, 7, 8, 9, 10, 11, -1, -1,
14, -1, -1, -1, 18, -1, -1, -1, -1, 23,
24, 25, 26, 27, 28, -1, -1, 31, -1, -1,
@@ -16498,7 +16805,7 @@ static const yytype_int16 yycheck[] =
114, 115, -1, -1, 118, -1, -1, -1, -1, 123,
-1, -1, -1, -1, -1, 129, -1, 131, -1, -1,
-1, 135, -1, 137, 138, 139, 140, -1, -1, -1,
- -1, -1, -1, 147, 148, 149, -1, 151, 152, 153,
+ -1, -1, -1, 147, 148, 149, -1, -1, -1, 153,
-1, 155, 156, -1, 158, 159, 160, -1, -1, 163,
164, -1, 166, 167, 168, 169, -1, -1, -1, -1,
174, 175, 176, -1, -1, 179, 180, 181, 182, 183,
@@ -16559,7 +16866,7 @@ static const yytype_int16 yycheck[] =
113, 114, 115, -1, -1, 118, -1, -1, -1, -1,
123, -1, -1, -1, -1, -1, 129, -1, 131, -1,
-1, -1, 135, -1, 137, 138, 139, 140, -1, -1,
- -1, -1, -1, -1, 147, 148, 149, -1, 151, -1,
+ -1, -1, -1, -1, 147, 148, 149, -1, -1, -1,
153, -1, 155, 156, -1, 158, 159, 160, -1, -1,
163, 164, -1, 166, 167, 168, 169, -1, -1, -1,
-1, 174, 175, 176, -1, -1, 179, 180, 181, 182,
@@ -16605,7 +16912,7 @@ static const yytype_int16 yycheck[] =
-1, 574, -1, -1, 577, -1, -1, -1, 581, 582,
583, -1, -1, -1, -1, -1, -1, 590, -1, -1,
593, -1, -1, -1, 597, 598, 599, 600, 601, 602,
- 603, -1, 605, -1, -1, -1, 609, -1, -1, 612,
+ -1, -1, 605, -1, -1, -1, 609, -1, -1, 612,
-1, 614, -1, 5, 617, 7, 8, 9, 10, 11,
-1, -1, 14, -1, -1, -1, 18, -1, -1, -1,
-1, 23, 24, 25, 26, 27, 28, -1, -1, 31,
@@ -16620,7 +16927,7 @@ static const yytype_int16 yycheck[] =
-1, 113, 114, 115, -1, -1, 118, -1, -1, -1,
-1, 123, -1, -1, -1, -1, -1, 129, -1, 131,
-1, -1, -1, 135, -1, 137, 138, 139, 140, -1,
- -1, -1, -1, -1, -1, 147, 148, 149, -1, 151,
+ -1, -1, -1, -1, -1, 147, 148, 149, -1, -1,
-1, 153, -1, 155, 156, -1, 158, 159, 160, -1,
-1, 163, 164, -1, 166, 167, 168, 169, -1, -1,
-1, -1, 174, 175, 176, -1, -1, 179, 180, 181,
@@ -16666,7 +16973,7 @@ static const yytype_int16 yycheck[] =
-1, -1, 574, -1, -1, 577, -1, -1, -1, 581,
582, 583, -1, -1, -1, -1, -1, -1, 590, -1,
-1, 593, -1, -1, -1, 597, 598, 599, 600, 601,
- 602, 603, -1, 605, -1, -1, -1, 609, -1, -1,
+ 602, -1, -1, 605, -1, -1, -1, 609, -1, -1,
612, -1, 614, -1, 5, 617, 7, 8, 9, 10,
11, -1, -1, 14, -1, -1, -1, 18, -1, -1,
-1, -1, 23, 24, 25, 26, 27, 28, -1, -1,
@@ -16682,7 +16989,7 @@ static const yytype_int16 yycheck[] =
-1, -1, 123, -1, -1, -1, -1, -1, 129, -1,
131, -1, -1, -1, 135, -1, 137, 138, 139, 140,
-1, -1, -1, -1, -1, -1, 147, 148, 149, -1,
- -1, -1, 153, -1, 155, 156, -1, 158, 159, 160,
+ -1, -1, 153, -1, -1, 156, -1, 158, 159, 160,
-1, -1, 163, 164, -1, 166, 167, 168, 169, -1,
-1, -1, -1, 174, 175, 176, -1, -1, 179, 180,
181, 182, 183, 184, -1, -1, -1, -1, -1, -1,
@@ -16743,7 +17050,7 @@ static const yytype_int16 yycheck[] =
-1, -1, -1, 123, -1, -1, -1, -1, -1, 129,
-1, 131, -1, -1, -1, 135, -1, 137, 138, 139,
140, -1, -1, -1, -1, -1, -1, 147, 148, 149,
- -1, -1, -1, 153, -1, 155, 156, -1, 158, 159,
+ -1, -1, -1, 153, -1, -1, 156, -1, 158, 159,
160, -1, -1, 163, 164, -1, 166, 167, 168, 169,
-1, -1, -1, -1, 174, 175, 176, -1, -1, 179,
180, 181, 182, 183, 184, -1, -1, -1, -1, -1,
@@ -16792,10 +17099,10 @@ static const yytype_int16 yycheck[] =
-1, -1, 612, -1, 614, -1, 5, 617, 7, 8,
9, 10, 11, -1, -1, 14, -1, -1, -1, 18,
-1, -1, -1, -1, 23, 24, 25, 26, 27, 28,
- -1, -1, 31, -1, -1, -1, 35, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 35, -1, -1, -1,
39, -1, -1, 42, 43, 44, -1, 46, -1, -1,
- -1, -1, -1, 52, 53, -1, 55, 56, -1, 58,
- -1, -1, -1, -1, -1, 64, 65, 66, 67, 68,
+ -1, -1, -1, 52, -1, -1, 55, 56, -1, 58,
+ -1, -1, -1, -1, -1, 64, 65, 66, 67, -1,
69, 70, -1, 72, 73, -1, -1, -1, -1, -1,
-1, -1, 81, -1, 83, -1, 85, 86, 87, 88,
-1, 90, 91, -1, 93, 94, 95, -1, 97, -1,
@@ -16804,20 +17111,20 @@ static const yytype_int16 yycheck[] =
-1, -1, -1, -1, 123, -1, -1, -1, -1, -1,
129, -1, 131, -1, -1, -1, 135, -1, 137, 138,
139, 140, -1, -1, -1, -1, -1, -1, 147, 148,
- 149, -1, -1, -1, 153, -1, 155, 156, -1, 158,
+ 149, -1, -1, -1, 153, -1, -1, 156, -1, 158,
159, 160, -1, -1, 163, 164, -1, 166, 167, 168,
169, -1, -1, -1, -1, 174, 175, 176, -1, -1,
- 179, 180, 181, 182, 183, 184, -1, -1, -1, -1,
+ 179, 180, -1, 182, 183, 184, -1, -1, -1, -1,
-1, -1, 191, -1, 193, -1, 195, -1, 197, 198,
199, 200, 201, 202, -1, 204, -1, -1, -1, -1,
209, 210, -1, -1, -1, -1, -1, -1, 217, -1,
- -1, -1, 221, 222, 223, 224, 225, -1, 227, 228,
+ -1, -1, 221, 222, 223, 224, -1, -1, 227, 228,
229, -1, 231, -1, 233, -1, -1, -1, -1, 238,
-1, -1, -1, -1, 243, -1, 245, 246, -1, 248,
- 249, 250, -1, -1, 253, -1, -1, -1, 257, 258,
- -1, -1, 261, 262, -1, 264, 265, -1, -1, -1,
+ 249, -1, -1, -1, 253, -1, -1, -1, 257, 258,
+ -1, -1, 261, -1, -1, 264, 265, -1, -1, -1,
-1, -1, 271, 272, -1, 274, -1, 276, -1, 278,
- 279, -1, -1, -1, -1, 284, -1, -1, 287, 288,
+ 279, -1, -1, -1, -1, -1, -1, -1, 287, 288,
289, 290, 291, 292, 293, 294, 295, 296, 297, 298,
299, -1, 301, 302, 303, -1, 305, 306, 307, 308,
-1, 310, 311, -1, -1, -1, -1, 316, 317, 318,
@@ -16825,7 +17132,7 @@ static const yytype_int16 yycheck[] =
329, -1, 331, 332, 333, 334, 335, 336, 337, 338,
339, 340, -1, -1, 343, 344, -1, -1, 347, 348,
349, 350, -1, -1, -1, -1, 355, -1, -1, -1,
- -1, 360, 361, 362, -1, 364, 365, 366, 367, -1,
+ -1, 360, 361, 362, -1, 364, 365, 366, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, 380, 381, -1, -1, -1, -1, 386, 387, 388,
-1, 390, 391, 392, 393, 394, 395, 396, -1, -1,
@@ -16833,8 +17140,8 @@ static const yytype_int16 yycheck[] =
409, 410, -1, 412, 413, 414, -1, -1, 417, -1,
-1, -1, 421, 422, 423, 424, 425, -1, -1, 428,
429, 430, 431, 432, -1, 434, -1, -1, 437, -1,
- 439, 440, -1, 442, -1, -1, -1, 446, -1, -1,
- 449, 450, 451, -1, -1, -1, 455, 456, 457, 458,
+ 439, -1, -1, 442, -1, -1, -1, 446, -1, -1,
+ 449, 450, -1, -1, -1, -1, 455, 456, 457, 458,
459, 460, -1, 462, 463, -1, 465, -1, -1, -1,
-1, 470, 471, 472, -1, -1, -1, -1, 477, -1,
-1, -1, 481, -1, -1, 484, -1, 486, -1, 488,
@@ -16849,314 +17156,8 @@ static const yytype_int16 yycheck[] =
-1, -1, -1, -1, -1, 574, -1, -1, 577, -1,
-1, -1, 581, 582, 583, -1, -1, -1, -1, -1,
-1, 590, -1, -1, 593, -1, -1, -1, 597, 598,
- 599, 600, 601, 602, -1, -1, 605, -1, -1, -1,
- 609, -1, -1, 612, -1, 614, -1, 5, 617, 7,
- 8, 9, 10, 11, -1, -1, 14, -1, -1, -1,
- 18, -1, -1, -1, -1, 23, 24, 25, 26, 27,
- 28, -1, -1, 31, -1, -1, -1, 35, -1, -1,
- -1, 39, -1, -1, 42, 43, 44, -1, 46, -1,
- -1, -1, -1, -1, 52, 53, -1, 55, 56, -1,
- 58, -1, -1, -1, -1, -1, 64, 65, 66, 67,
- 68, 69, 70, -1, 72, 73, -1, -1, -1, -1,
- -1, -1, -1, 81, -1, 83, -1, 85, 86, 87,
- 88, -1, 90, 91, -1, 93, 94, 95, -1, 97,
- -1, 99, -1, -1, 102, -1, -1, 105, -1, -1,
- -1, 109, -1, -1, -1, 113, 114, 115, -1, -1,
- 118, -1, -1, -1, -1, 123, -1, -1, -1, -1,
- -1, 129, -1, 131, -1, -1, -1, 135, -1, 137,
- 138, 139, 140, -1, -1, -1, -1, -1, -1, 147,
- 148, 149, -1, -1, -1, 153, -1, 155, 156, -1,
- 158, 159, 160, -1, -1, 163, 164, -1, 166, 167,
- 168, 169, -1, -1, -1, -1, 174, 175, 176, -1,
- -1, 179, 180, 181, 182, 183, 184, -1, -1, -1,
- -1, -1, -1, 191, -1, 193, -1, 195, -1, 197,
- 198, 199, 200, 201, 202, -1, 204, -1, -1, -1,
- -1, 209, 210, -1, -1, -1, -1, -1, -1, 217,
- -1, -1, -1, 221, 222, 223, 224, 225, -1, 227,
- 228, 229, -1, 231, -1, 233, -1, -1, -1, -1,
- 238, -1, -1, -1, -1, 243, -1, 245, 246, -1,
- 248, 249, 250, -1, -1, 253, -1, -1, -1, 257,
- 258, -1, -1, 261, 262, -1, 264, 265, -1, -1,
- -1, -1, -1, 271, 272, -1, 274, -1, 276, -1,
- 278, 279, -1, -1, -1, -1, 284, -1, -1, 287,
- 288, 289, 290, 291, 292, 293, 294, 295, 296, 297,
- 298, 299, -1, 301, 302, 303, -1, 305, 306, 307,
- 308, -1, 310, 311, -1, -1, -1, -1, 316, 317,
- 318, 319, 320, 321, -1, -1, 324, 325, -1, 327,
- -1, 329, -1, 331, 332, 333, 334, 335, 336, 337,
- 338, 339, 340, -1, -1, 343, 344, -1, -1, 347,
- 348, 349, 350, -1, -1, -1, -1, 355, -1, -1,
- -1, -1, 360, 361, 362, -1, 364, 365, 366, 367,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 380, 381, -1, -1, -1, -1, 386, 387,
- 388, -1, 390, 391, 392, 393, 394, 395, 396, -1,
- -1, -1, -1, 401, 402, -1, 404, -1, 406, 407,
- 408, 409, 410, -1, 412, 413, 414, -1, -1, 417,
- -1, -1, -1, 421, 422, 423, 424, 425, -1, -1,
- 428, 429, 430, 431, 432, -1, 434, -1, -1, 437,
- -1, 439, 440, -1, 442, -1, -1, -1, 446, -1,
- -1, 449, 450, 451, -1, -1, -1, 455, 456, 457,
- 458, 459, 460, -1, 462, 463, -1, 465, -1, -1,
- -1, -1, 470, 471, 472, -1, -1, -1, -1, 477,
- -1, -1, -1, 481, -1, -1, 484, -1, 486, -1,
- 488, -1, 490, -1, 492, 493, -1, -1, -1, -1,
- -1, -1, 500, 501, -1, 503, -1, -1, 506, -1,
- -1, 509, -1, 511, -1, -1, -1, 515, -1, 517,
- 518, 519, 520, 521, 522, -1, -1, 525, 526, 527,
- 528, -1, 530, 531, -1, 533, -1, 535, 536, 537,
- 538, -1, -1, 541, 542, -1, 544, 545, 546, 547,
- -1, -1, -1, -1, -1, 553, 554, 555, -1, -1,
- -1, -1, 560, 561, 562, -1, 564, 565, -1, 567,
- 568, -1, -1, -1, -1, -1, 574, -1, -1, 577,
- -1, -1, -1, 581, 582, 583, -1, -1, -1, -1,
- -1, -1, 590, -1, -1, 593, -1, -1, -1, 597,
- 598, 599, 600, 601, 602, -1, -1, 605, -1, -1,
- -1, 609, -1, -1, 612, -1, 614, -1, 5, 617,
- 7, 8, 9, 10, 11, -1, -1, 14, -1, -1,
- -1, 18, -1, -1, -1, -1, 23, 24, 25, 26,
- 27, 28, -1, -1, 31, -1, -1, -1, 35, -1,
- -1, -1, 39, -1, -1, 42, 43, 44, -1, 46,
- -1, -1, -1, -1, -1, 52, 53, -1, 55, 56,
- -1, 58, -1, -1, -1, -1, -1, 64, 65, 66,
- 67, 68, 69, 70, -1, 72, 73, -1, -1, -1,
- -1, -1, -1, -1, 81, -1, 83, -1, 85, 86,
- 87, 88, -1, 90, 91, -1, 93, 94, 95, -1,
- 97, -1, 99, -1, -1, 102, -1, -1, 105, -1,
- -1, -1, 109, -1, -1, -1, 113, 114, 115, -1,
- -1, 118, -1, -1, -1, -1, 123, -1, -1, -1,
- -1, -1, 129, -1, 131, -1, -1, -1, 135, -1,
- 137, 138, 139, 140, -1, -1, -1, -1, -1, -1,
- 147, 148, 149, -1, -1, -1, 153, -1, 155, 156,
- -1, 158, 159, 160, -1, -1, 163, 164, -1, 166,
- 167, 168, 169, -1, -1, -1, -1, 174, 175, 176,
- -1, -1, 179, 180, 181, 182, 183, 184, -1, -1,
- -1, -1, -1, -1, 191, -1, 193, -1, 195, -1,
- 197, 198, 199, 200, 201, 202, -1, 204, -1, -1,
- -1, -1, 209, 210, -1, -1, -1, -1, -1, -1,
- 217, -1, -1, -1, 221, 222, 223, 224, 225, -1,
- 227, 228, 229, -1, 231, -1, 233, -1, -1, -1,
- -1, 238, -1, -1, -1, -1, 243, -1, 245, 246,
- -1, 248, 249, 250, -1, -1, 253, -1, -1, -1,
- 257, 258, -1, -1, 261, 262, -1, 264, 265, -1,
- -1, -1, -1, -1, 271, 272, -1, 274, -1, 276,
- -1, 278, 279, -1, -1, -1, -1, 284, -1, -1,
- 287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
- 297, 298, 299, -1, 301, 302, 303, -1, 305, 306,
- 307, 308, -1, 310, 311, -1, -1, -1, -1, 316,
- 317, 318, 319, 320, 321, -1, -1, 324, 325, -1,
- 327, -1, 329, -1, 331, 332, 333, 334, 335, 336,
- 337, 338, 339, 340, -1, -1, 343, 344, -1, -1,
- 347, 348, 349, 350, -1, -1, -1, -1, 355, -1,
- -1, -1, -1, 360, 361, 362, -1, 364, 365, 366,
- 367, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 380, 381, -1, -1, -1, -1, 386,
- 387, 388, -1, 390, 391, 392, 393, 394, 395, 396,
- -1, -1, -1, -1, 401, 402, -1, 404, -1, 406,
- 407, 408, 409, 410, -1, 412, 413, 414, -1, -1,
- 417, -1, -1, -1, 421, 422, 423, 424, 425, -1,
- -1, 428, 429, 430, 431, 432, -1, 434, -1, -1,
- 437, -1, 439, 440, -1, 442, -1, -1, -1, 446,
- -1, -1, 449, 450, 451, -1, -1, -1, 455, 456,
- 457, 458, 459, 460, -1, 462, 463, -1, 465, -1,
- -1, -1, -1, 470, 471, 472, -1, -1, -1, -1,
- 477, -1, -1, -1, 481, -1, -1, 484, -1, 486,
- -1, 488, -1, 490, -1, 492, 493, -1, -1, -1,
- -1, -1, -1, 500, 501, -1, 503, -1, -1, 506,
- -1, -1, 509, -1, 511, -1, -1, -1, 515, -1,
- 517, 518, 519, 520, 521, 522, -1, -1, 525, 526,
- 527, 528, -1, 530, 531, -1, 533, -1, 535, 536,
- 537, 538, -1, -1, 541, 542, -1, 544, 545, 546,
- 547, -1, -1, -1, -1, -1, 553, 554, 555, -1,
- -1, -1, -1, 560, 561, 562, -1, 564, 565, -1,
- 567, 568, -1, -1, -1, -1, -1, 574, -1, -1,
- 577, -1, -1, -1, 581, 582, 583, -1, -1, -1,
- -1, -1, -1, 590, -1, -1, 593, -1, -1, -1,
- 597, 598, 599, 600, 601, 602, -1, -1, 605, -1,
- -1, -1, 609, -1, -1, 612, -1, 614, -1, 5,
- 617, 7, 8, 9, 10, 11, -1, -1, 14, -1,
- -1, -1, 18, -1, -1, -1, -1, 23, 24, 25,
- 26, 27, 28, -1, -1, 31, -1, -1, -1, 35,
- -1, -1, -1, 39, -1, -1, 42, 43, 44, -1,
- 46, -1, -1, -1, -1, -1, 52, 53, -1, 55,
- 56, -1, 58, -1, -1, -1, -1, -1, 64, 65,
- 66, 67, 68, 69, 70, -1, 72, 73, -1, -1,
- -1, -1, -1, -1, -1, 81, -1, 83, -1, 85,
- 86, 87, 88, -1, 90, 91, -1, 93, 94, 95,
- -1, 97, -1, 99, -1, -1, 102, -1, -1, 105,
- -1, -1, -1, 109, -1, -1, -1, 113, 114, 115,
- -1, -1, 118, -1, -1, -1, -1, 123, -1, -1,
- -1, -1, -1, 129, -1, 131, -1, -1, -1, 135,
- -1, 137, 138, 139, 140, -1, -1, -1, -1, -1,
- -1, 147, 148, 149, -1, -1, -1, 153, -1, -1,
- 156, -1, 158, 159, 160, -1, -1, 163, 164, -1,
- 166, 167, 168, 169, -1, -1, -1, -1, 174, 175,
- 176, -1, -1, 179, 180, 181, 182, 183, 184, -1,
- -1, -1, -1, -1, -1, 191, -1, 193, -1, 195,
- -1, 197, 198, 199, 200, 201, 202, -1, 204, -1,
- -1, -1, -1, 209, 210, -1, -1, -1, -1, -1,
- -1, 217, -1, -1, -1, 221, 222, 223, 224, 225,
- -1, 227, 228, 229, -1, 231, -1, 233, -1, -1,
- -1, -1, 238, -1, -1, -1, -1, 243, -1, 245,
- 246, -1, 248, 249, 250, -1, -1, 253, -1, -1,
- -1, 257, 258, -1, -1, 261, 262, -1, 264, 265,
- -1, -1, -1, -1, -1, 271, 272, -1, 274, -1,
- 276, -1, 278, 279, -1, -1, -1, -1, 284, -1,
- -1, 287, 288, 289, 290, 291, 292, 293, 294, 295,
- 296, 297, 298, 299, -1, 301, 302, 303, -1, 305,
- 306, 307, 308, -1, 310, 311, -1, -1, -1, -1,
- 316, 317, 318, 319, 320, 321, -1, -1, 324, 325,
- -1, 327, -1, 329, -1, 331, 332, 333, 334, 335,
- 336, 337, 338, 339, 340, -1, -1, 343, 344, -1,
- -1, 347, 348, 349, 350, -1, -1, -1, -1, 355,
- -1, -1, -1, -1, 360, 361, 362, -1, 364, 365,
- 366, 367, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 380, 381, -1, -1, -1, -1,
- 386, 387, 388, -1, 390, 391, 392, 393, 394, 395,
- 396, -1, -1, -1, -1, 401, 402, -1, 404, -1,
- 406, 407, 408, 409, 410, -1, 412, 413, 414, -1,
- -1, 417, -1, -1, -1, 421, 422, 423, 424, 425,
- -1, -1, 428, 429, 430, 431, 432, -1, 434, -1,
- -1, 437, -1, 439, 440, -1, 442, -1, -1, -1,
- 446, -1, -1, 449, 450, 451, -1, -1, -1, 455,
- 456, 457, 458, 459, 460, -1, 462, 463, -1, 465,
- -1, -1, -1, -1, 470, 471, 472, -1, -1, -1,
- -1, 477, -1, -1, -1, 481, -1, -1, 484, -1,
- 486, -1, 488, -1, 490, -1, 492, 493, -1, -1,
- -1, -1, -1, -1, 500, 501, -1, 503, -1, -1,
- 506, -1, -1, 509, -1, 511, -1, -1, -1, 515,
- -1, 517, 518, 519, 520, 521, 522, -1, -1, 525,
- 526, 527, 528, -1, 530, 531, -1, 533, -1, 535,
- 536, 537, 538, -1, -1, 541, 542, -1, 544, 545,
- 546, 547, -1, -1, -1, -1, -1, 553, 554, 555,
- -1, -1, -1, -1, 560, 561, 562, -1, 564, 565,
- -1, 567, 568, -1, -1, -1, -1, -1, 574, -1,
- -1, 577, -1, -1, -1, 581, 582, 583, -1, -1,
- -1, -1, -1, -1, 590, -1, -1, 593, -1, -1,
- -1, 597, 598, 599, 600, 601, 602, -1, -1, 605,
- -1, -1, -1, 609, -1, -1, 612, -1, 614, -1,
- 5, 617, 7, 8, 9, 10, 11, -1, -1, 14,
- -1, -1, -1, 18, -1, -1, -1, -1, 23, 24,
- 25, 26, 27, 28, -1, -1, 31, -1, -1, -1,
- 35, -1, -1, -1, 39, -1, -1, 42, 43, 44,
- -1, 46, -1, -1, -1, -1, -1, 52, 53, -1,
- 55, 56, -1, 58, -1, -1, -1, -1, -1, 64,
- 65, 66, 67, 68, 69, 70, -1, 72, 73, -1,
- -1, -1, -1, -1, -1, -1, 81, -1, 83, -1,
- 85, 86, 87, 88, -1, 90, 91, -1, 93, 94,
- 95, -1, 97, -1, 99, -1, -1, 102, -1, -1,
- 105, -1, -1, -1, 109, -1, -1, -1, 113, 114,
- 115, -1, -1, 118, -1, -1, -1, -1, 123, -1,
- -1, -1, -1, -1, 129, -1, 131, -1, -1, -1,
- 135, -1, 137, 138, 139, 140, -1, -1, -1, -1,
- -1, -1, 147, 148, 149, -1, -1, -1, 153, -1,
- -1, 156, -1, 158, 159, 160, -1, -1, 163, 164,
- -1, 166, 167, 168, 169, -1, -1, -1, -1, 174,
- 175, 176, -1, -1, 179, 180, 181, 182, 183, 184,
- -1, -1, -1, -1, -1, -1, 191, -1, 193, -1,
- 195, -1, 197, 198, 199, 200, 201, 202, -1, 204,
- -1, -1, -1, -1, 209, 210, -1, -1, -1, -1,
- -1, -1, 217, -1, -1, -1, 221, 222, 223, 224,
- 225, -1, 227, 228, 229, -1, 231, -1, 233, -1,
- -1, -1, -1, 238, -1, -1, -1, -1, 243, -1,
- 245, 246, -1, 248, 249, 250, -1, -1, 253, -1,
- -1, -1, 257, 258, -1, -1, 261, 262, -1, 264,
- 265, -1, -1, -1, -1, -1, 271, 272, -1, 274,
- -1, 276, -1, 278, 279, -1, -1, -1, -1, 284,
- -1, -1, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 299, -1, 301, 302, 303, -1,
- 305, 306, 307, 308, -1, 310, 311, -1, -1, -1,
- -1, 316, 317, 318, 319, 320, 321, -1, -1, 324,
- 325, -1, 327, -1, 329, -1, 331, 332, 333, 334,
- 335, 336, 337, 338, 339, 340, -1, -1, 343, 344,
- -1, -1, 347, 348, 349, 350, -1, -1, -1, -1,
- 355, -1, -1, -1, -1, 360, 361, 362, -1, 364,
- 365, 366, 367, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 380, 381, -1, -1, -1,
- -1, 386, 387, 388, -1, 390, 391, 392, 393, 394,
- 395, 396, -1, -1, -1, -1, 401, 402, -1, 404,
- -1, 406, 407, 408, 409, 410, -1, 412, 413, 414,
- -1, -1, 417, -1, -1, -1, 421, 422, 423, 424,
- 425, -1, -1, 428, 429, 430, 431, 432, -1, 434,
- -1, -1, 437, -1, 439, 440, -1, 442, -1, -1,
- -1, 446, -1, -1, 449, 450, 451, -1, -1, -1,
- 455, 456, 457, 458, 459, 460, -1, 462, 463, -1,
- 465, -1, -1, -1, -1, 470, 471, 472, -1, -1,
- -1, -1, 477, -1, -1, -1, 481, -1, -1, 484,
- -1, 486, -1, 488, -1, 490, -1, 492, 493, -1,
- -1, -1, -1, -1, -1, 500, 501, -1, 503, -1,
- -1, 506, -1, -1, 509, -1, 511, -1, -1, -1,
- 515, -1, 517, 518, 519, 520, 521, 522, -1, -1,
- 525, 526, 527, 528, -1, 530, 531, -1, 533, -1,
- 535, 536, 537, 538, -1, -1, 541, 542, -1, 544,
- 545, 546, 547, -1, -1, -1, -1, -1, 553, 554,
- 555, -1, -1, -1, -1, 560, 561, 562, -1, 564,
- 565, -1, 567, 568, -1, -1, -1, -1, -1, 574,
- -1, -1, 577, -1, -1, -1, 581, 582, 583, -1,
- -1, -1, -1, -1, -1, 590, -1, -1, 593, -1,
- -1, -1, 597, 598, 599, 600, 601, 602, -1, -1,
- 605, -1, -1, -1, 609, -1, -1, 612, -1, 614,
- -1, 5, 617, 7, 8, 9, 10, 11, -1, -1,
- 14, -1, -1, -1, 18, -1, -1, -1, -1, 23,
- 24, 25, 26, 27, 28, -1, -1, -1, -1, -1,
- -1, 35, -1, -1, -1, 39, -1, -1, 42, 43,
- 44, -1, 46, -1, -1, -1, -1, -1, 52, -1,
- -1, 55, 56, -1, 58, -1, -1, -1, -1, -1,
- 64, 65, 66, 67, -1, 69, 70, -1, 72, 73,
- -1, -1, -1, -1, -1, -1, -1, 81, -1, 83,
- -1, 85, 86, 87, 88, -1, 90, 91, -1, 93,
- 94, 95, -1, 97, -1, 99, -1, -1, 102, -1,
- -1, 105, -1, -1, -1, 109, -1, -1, -1, 113,
- 114, 115, -1, -1, 118, -1, -1, -1, -1, 123,
- -1, -1, -1, -1, -1, 129, -1, 131, -1, -1,
- -1, 135, -1, 137, 138, 139, 140, -1, -1, -1,
- -1, -1, -1, 147, 148, 149, -1, -1, -1, 153,
- -1, -1, 156, -1, 158, 159, 160, -1, -1, 163,
- 164, -1, 166, 167, 168, 169, -1, -1, -1, -1,
- 174, 175, 176, -1, -1, 179, 180, -1, 182, 183,
- 184, -1, -1, -1, -1, -1, -1, 191, -1, 193,
- -1, 195, -1, 197, 198, 199, 200, 201, 202, -1,
- 204, -1, -1, -1, -1, 209, 210, -1, -1, -1,
- -1, -1, -1, 217, -1, -1, -1, 221, 222, 223,
- 224, -1, -1, 227, 228, 229, -1, 231, -1, 233,
- -1, -1, -1, -1, 238, -1, -1, -1, -1, 243,
- -1, 245, 246, -1, 248, 249, -1, -1, -1, 253,
- -1, -1, -1, 257, 258, -1, -1, 261, -1, -1,
- 264, 265, -1, -1, -1, -1, -1, 271, 272, -1,
- 274, -1, 276, -1, 278, 279, -1, -1, -1, -1,
- -1, -1, -1, 287, 288, 289, 290, 291, 292, 293,
- 294, 295, 296, 297, 298, 299, -1, 301, 302, 303,
- -1, 305, 306, 307, 308, -1, 310, 311, -1, -1,
- -1, -1, 316, 317, 318, 319, 320, 321, -1, -1,
- 324, 325, -1, 327, -1, 329, -1, 331, 332, 333,
- 334, 335, 336, 337, 338, 339, 340, -1, -1, 343,
- 344, -1, -1, 347, 348, 349, 350, -1, -1, -1,
- -1, 355, -1, -1, -1, -1, 360, 361, 362, -1,
- 364, 365, 366, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 380, 381, -1, -1,
- -1, -1, 386, 387, 388, -1, 390, 391, 392, 393,
- 394, 395, 396, -1, -1, -1, -1, 401, 402, -1,
- 404, -1, 406, 407, 408, 409, 410, -1, 412, 413,
- 414, -1, -1, 417, -1, -1, -1, 421, 422, 423,
- 424, 425, -1, -1, 428, 429, 430, 431, 432, -1,
- 434, -1, -1, 437, -1, 439, -1, -1, 442, -1,
- -1, -1, 446, -1, -1, 449, 450, -1, -1, -1,
- -1, 455, 456, 457, 458, 459, 460, -1, 462, 463,
- -1, 465, -1, -1, -1, -1, 470, 471, 472, -1,
- -1, -1, -1, 477, -1, -1, -1, 481, -1, -1,
- 484, -1, 486, -1, 488, -1, 490, -1, 492, 493,
- -1, -1, -1, -1, -1, -1, 500, 501, -1, 503,
- -1, -1, 506, -1, -1, 509, -1, 511, -1, -1,
- -1, 515, -1, 517, 518, 519, 520, 521, 522, -1,
- -1, 525, 526, 527, 528, -1, 530, 531, -1, 533,
- -1, 535, 536, 537, 538, -1, -1, 541, 542, -1,
- 544, 545, 546, 547, -1, -1, -1, -1, -1, 553,
- 554, 555, -1, -1, -1, -1, 560, 561, 562, -1,
- 564, 565, -1, 567, 568, -1, -1, -1, -1, -1,
- 574, -1, -1, 577, -1, -1, -1, 581, 582, 583,
- -1, -1, -1, -1, -1, -1, 590, -1, -1, 593,
- -1, -1, -1, 597, 598, 599, 600, 601, 602, -1,
- -1, -1, -1, -1, -1, 609, -1, -1, 612, -1,
- 614, -1, -1, 617
+ 599, 600, 601, 602, -1, -1, -1, -1, -1, -1,
+ 609, -1, -1, 612, -1, 614, -1, -1, 617
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -17170,13 +17171,13 @@ static const yytype_uint16 yystos[] =
452, 454, 461, 467, 475, 480, 482, 485, 510, 514,
559, 571, 575, 578, 584, 613, 619, 629, 640, 643,
644, 645, 646, 647, 649, 654, 656, 663, 693, 721,
- 728, 837, 928, 1002, 1045, 1048, 1056, 1059, 1064, 1066,
- 1067, 1072, 1075, 1080, 1087, 1099, 1100, 1266, 1268, 1278,
- 1281, 1306, 1314, 1325, 1332, 1346, 1349, 1352, 1362, 1368,
- 1372, 1377, 1378, 1428, 1445, 1452, 1454, 1461, 1463, 1491,
- 1497, 1498, 1499, 1500, 1553, 1561, 1562, 1563, 11, 111,
- 129, 195, 278, 405, 473, 531, 1037, 1038, 1522, 1523,
- 1524, 1527, 274, 356, 1074, 1492, 540, 1419, 230, 5,
+ 728, 837, 928, 1002, 1045, 1048, 1056, 1061, 1067, 1069,
+ 1072, 1078, 1081, 1086, 1093, 1105, 1106, 1272, 1274, 1284,
+ 1287, 1312, 1320, 1331, 1338, 1352, 1355, 1358, 1368, 1374,
+ 1378, 1383, 1384, 1434, 1451, 1457, 1459, 1466, 1468, 1496,
+ 1502, 1503, 1504, 1505, 1558, 1566, 1567, 1568, 11, 111,
+ 129, 195, 278, 405, 473, 531, 1037, 1038, 1527, 1528,
+ 1529, 1532, 274, 356, 1080, 1497, 540, 1425, 230, 5,
7, 8, 9, 10, 11, 14, 18, 21, 23, 24,
25, 26, 27, 28, 29, 31, 35, 39, 42, 43,
44, 46, 48, 49, 52, 55, 56, 58, 59, 61,
@@ -17212,25 +17213,25 @@ static const yytype_uint16 yystos[] =
554, 555, 559, 560, 561, 562, 564, 565, 567, 568,
570, 571, 574, 577, 579, 581, 582, 583, 590, 593,
597, 598, 599, 600, 601, 602, 609, 610, 612, 613,
- 614, 617, 687, 1418, 1422, 1426, 1427, 301, 530, 534,
- 1447, 598, 1447, 1448, 609, 1493, 111, 194, 278, 473,
- 494, 531, 537, 573, 581, 669, 670, 889, 890, 891,
- 980, 981, 982, 1315, 1267, 111, 168, 195, 230, 278,
- 405, 473, 531, 537, 556, 581, 598, 1277, 1422, 1074,
- 686, 637, 1415, 1417, 1422, 655, 1279, 394, 491, 1373,
- 114, 230, 614, 1383, 1447, 1074, 629, 838, 1422, 1369,
- 461, 581, 1447, 1074, 1282, 1363, 497, 718, 722, 723,
- 1422, 686, 1493, 1422, 1103, 1105, 1106, 370, 1430, 1333,
- 722, 510, 514, 485, 553, 485, 534, 1327, 394, 491,
- 1453, 1307, 1422, 31, 84, 155, 400, 422, 454, 510,
- 1555, 467, 629, 1101, 0, 157, 641, 400, 175, 388,
- 1350, 1415, 1422, 161, 1013, 1422, 161, 687, 205, 687,
- 266, 1419, 1422, 1424, 783, 784, 787, 810, 1422, 534,
- 226, 366, 1039, 1040, 1041, 168, 1008, 1522, 1447, 1493,
- 1081, 694, 637, 551, 1057, 1068, 17, 1494, 225, 892,
- 205, 1424, 785, 810, 686, 375, 1519, 1523, 1524, 1525,
- 1526, 1527, 534, 890, 230, 230, 230, 226, 285, 414,
- 1323, 1324, 7, 21, 28, 34, 36, 37, 38, 40,
+ 614, 617, 687, 1424, 1428, 1432, 1433, 301, 530, 534,
+ 1453, 1073, 609, 1498, 111, 194, 278, 473, 494, 531,
+ 537, 573, 581, 669, 670, 889, 890, 891, 980, 981,
+ 982, 1321, 1273, 111, 168, 195, 230, 278, 405, 473,
+ 531, 537, 556, 581, 598, 1283, 1428, 1080, 686, 637,
+ 1421, 1423, 1428, 655, 1285, 394, 491, 1379, 114, 230,
+ 614, 1389, 1453, 1080, 629, 838, 1428, 1375, 461, 581,
+ 1453, 1080, 1288, 1369, 497, 718, 722, 723, 1428, 686,
+ 1498, 1428, 1109, 1111, 1112, 370, 1436, 1339, 722, 510,
+ 514, 485, 553, 485, 534, 1333, 394, 491, 1458, 1313,
+ 1428, 31, 84, 155, 400, 422, 454, 510, 1560, 467,
+ 629, 1107, 0, 157, 641, 400, 175, 388, 1356, 1421,
+ 1428, 161, 1013, 1428, 161, 687, 205, 687, 266, 1425,
+ 1428, 1430, 783, 784, 787, 810, 1428, 534, 226, 366,
+ 1039, 1040, 1041, 168, 1008, 1527, 1453, 1498, 1087, 694,
+ 637, 551, 1057, 598, 1070, 1453, 17, 1499, 225, 892,
+ 205, 1430, 785, 810, 686, 375, 1524, 1528, 1529, 1530,
+ 1531, 1532, 534, 890, 230, 230, 230, 226, 285, 414,
+ 1329, 1330, 7, 21, 28, 34, 36, 37, 38, 40,
53, 54, 59, 60, 69, 72, 74, 75, 76, 77,
78, 79, 96, 100, 101, 106, 107, 110, 111, 116,
117, 118, 123, 125, 128, 172, 177, 178, 185, 199,
@@ -17241,375 +17242,376 @@ static const yytype_uint16 yystos[] =
512, 513, 519, 523, 524, 529, 540, 544, 545, 546,
547, 557, 558, 559, 563, 566, 581, 586, 587, 588,
589, 594, 596, 602, 617, 622, 623, 628, 629, 632,
- 633, 636, 637, 1121, 1122, 1123, 1124, 1128, 1135, 1136,
- 1137, 1138, 1139, 1140, 1148, 1152, 1165, 1402, 1404, 1406,
- 1407, 1411, 1413, 1418, 1422, 225, 1276, 1276, 1276, 1422,
- 205, 1276, 1276, 810, 1276, 686, 1276, 1447, 650, 1353,
+ 633, 636, 637, 1127, 1128, 1129, 1130, 1134, 1141, 1142,
+ 1143, 1144, 1145, 1146, 1154, 1158, 1171, 1408, 1410, 1412,
+ 1413, 1417, 1419, 1424, 1428, 225, 1282, 1282, 1282, 1428,
+ 205, 1282, 1282, 810, 1282, 686, 1282, 1453, 650, 1359,
12, 13, 103, 132, 145, 168, 171, 182, 203, 230,
237, 277, 406, 410, 426, 434, 442, 467, 480, 481,
- 525, 556, 578, 580, 1464, 1466, 1468, 1469, 1422, 367,
- 68, 418, 637, 1424, 130, 215, 285, 1284, 1422, 1419,
- 209, 490, 1374, 241, 1379, 1446, 1447, 929, 1116, 47,
- 839, 192, 34, 301, 1338, 1370, 1422, 686, 1076, 1448,
- 130, 285, 1285, 1313, 301, 413, 485, 1364, 1365, 590,
- 719, 475, 724, 12, 410, 1462, 1466, 551, 1494, 1104,
+ 525, 556, 578, 580, 1469, 1471, 1473, 1474, 1428, 367,
+ 68, 418, 637, 1430, 130, 215, 285, 1290, 1428, 1425,
+ 209, 490, 1380, 241, 1385, 1452, 1453, 929, 1122, 47,
+ 839, 192, 34, 301, 1344, 1376, 1428, 686, 1082, 1062,
+ 130, 285, 1291, 1319, 301, 413, 485, 1370, 1371, 590,
+ 719, 475, 724, 12, 410, 1467, 1471, 551, 1499, 1110,
12, 141, 215, 499, 500, 501, 502, 503, 504, 516,
- 1110, 1111, 1112, 1518, 1429, 24, 35, 59, 60, 67,
+ 1116, 1117, 1118, 1523, 1435, 24, 35, 59, 60, 67,
72, 99, 101, 103, 112, 159, 164, 167, 193, 195,
202, 204, 229, 230, 231, 252, 274, 301, 367, 393,
404, 405, 408, 409, 429, 472, 485, 515, 533, 534,
- 582, 601, 954, 979, 1334, 1338, 1339, 1341, 1436, 724,
- 1050, 1051, 1050, 1050, 606, 1049, 1050, 1326, 1422, 1419,
- 1447, 1313, 36, 213, 214, 540, 1403, 1420, 1554, 1554,
- 1554, 1554, 1554, 1105, 1101, 630, 635, 1422, 1348, 1347,
- 318, 538, 565, 1004, 579, 107, 1424, 1425, 1006, 789,
- 811, 1422, 1005, 369, 6, 57, 145, 352, 417, 419,
- 812, 1415, 1041, 687, 505, 1528, 1529, 1007, 1065, 1082,
- 1083, 1084, 1085, 1415, 629, 695, 1422, 657, 1272, 1273,
- 1415, 1272, 56, 354, 354, 433, 1495, 351, 352, 1127,
- 1422, 788, 811, 189, 6, 1425, 1479, 1482, 441, 10,
- 405, 556, 673, 1116, 1521, 1529, 1537, 1541, 1542, 1548,
- 673, 1116, 1520, 1529, 1537, 1542, 1548, 1522, 1527, 892,
- 1422, 1422, 1422, 192, 1316, 1320, 1321, 1422, 1323, 629,
- 629, 629, 1135, 629, 629, 629, 1121, 1168, 629, 629,
+ 582, 601, 954, 979, 1340, 1344, 1345, 1347, 1442, 724,
+ 1050, 1051, 1050, 1050, 606, 1049, 1050, 1332, 1428, 1425,
+ 1453, 1319, 36, 213, 214, 540, 1409, 1426, 1559, 1559,
+ 1559, 1559, 1559, 1111, 1107, 630, 635, 1428, 1354, 1353,
+ 318, 538, 565, 1004, 579, 107, 1430, 1431, 1006, 789,
+ 811, 1428, 1005, 369, 6, 57, 145, 352, 417, 419,
+ 812, 1421, 1041, 687, 505, 1533, 1534, 1007, 1068, 1088,
+ 1089, 1090, 1091, 1421, 629, 695, 1428, 657, 1278, 1279,
+ 1421, 1071, 1278, 56, 354, 354, 433, 1500, 351, 352,
+ 1133, 1428, 788, 811, 189, 6, 1431, 1484, 1487, 441,
+ 10, 405, 556, 673, 1122, 1526, 1534, 1542, 1546, 1547,
+ 1553, 673, 1122, 1525, 1534, 1542, 1547, 1553, 1527, 1532,
+ 892, 1428, 1428, 1428, 192, 1322, 1326, 1327, 1428, 1329,
+ 629, 629, 629, 1141, 629, 629, 629, 1127, 1174, 629,
629, 629, 629, 629, 629, 629, 629, 629, 629, 629,
- 629, 629, 629, 1120, 1120, 629, 1119, 629, 629, 629,
- 566, 629, 1402, 629, 629, 629, 629, 629, 629, 629,
- 629, 629, 629, 629, 1121, 629, 629, 629, 629, 1166,
- 1167, 1411, 1422, 629, 629, 629, 629, 629, 629, 629,
- 629, 629, 1121, 1119, 629, 629, 629, 629, 629, 629,
+ 629, 629, 629, 629, 1126, 1126, 629, 1125, 629, 629,
+ 629, 566, 629, 1408, 629, 629, 629, 629, 629, 629,
+ 629, 629, 629, 629, 629, 1127, 629, 629, 629, 629,
+ 1172, 1173, 1417, 1428, 629, 629, 629, 629, 629, 629,
+ 629, 629, 629, 1127, 1125, 629, 629, 629, 629, 629,
629, 629, 629, 629, 629, 629, 629, 629, 629, 629,
- 1119, 629, 1402, 629, 629, 629, 1402, 629, 629, 36,
- 213, 214, 540, 953, 629, 1120, 1119, 1119, 629, 629,
- 629, 629, 629, 1135, 1135, 1135, 1121, 1513, 1514, 1422,
- 1153, 1422, 16, 17, 372, 375, 615, 1125, 1126, 161,
- 162, 196, 207, 247, 259, 286, 345, 1129, 32, 142,
- 244, 267, 330, 427, 478, 479, 492, 620, 621, 622,
- 623, 624, 625, 626, 627, 1127, 1135, 71, 374, 631,
- 1420, 629, 637, 172, 1422, 687, 1422, 363, 811, 687,
- 1424, 821, 1339, 687, 1425, 1478, 1271, 1276, 585, 651,
- 34, 67, 135, 159, 163, 197, 217, 231, 279, 301,
- 404, 413, 428, 446, 485, 486, 511, 533, 582, 1354,
- 1358, 1359, 1447, 404, 1467, 456, 456, 531, 537, 581,
- 598, 370, 1471, 530, 363, 1473, 66, 485, 1470, 112,
- 598, 1472, 363, 631, 19, 161, 1218, 1219, 1455, 1422,
- 226, 1036, 491, 90, 413, 1375, 49, 88, 285, 1385,
- 1415, 1449, 1450, 1073, 630, 1121, 269, 272, 415, 840,
- 842, 636, 648, 1419, 279, 1077, 1425, 1078, 1079, 1415,
- 1060, 241, 1273, 1286, 1287, 49, 1366, 631, 1420, 55,
- 65, 81, 93, 94, 95, 109, 319, 337, 463, 518,
- 536, 725, 727, 1467, 363, 363, 461, 1496, 1495, 572,
- 1501, 1502, 624, 1114, 1115, 1116, 1112, 1431, 1432, 1433,
- 167, 475, 267, 604, 1345, 629, 111, 168, 195, 405,
- 534, 556, 598, 1345, 12, 901, 1424, 268, 1237, 1239,
- 192, 244, 1340, 1342, 70, 511, 190, 511, 530, 70,
- 511, 12, 42, 97, 102, 246, 317, 381, 493, 527,
- 1328, 1329, 1330, 167, 217, 511, 511, 1237, 1345, 1342,
- 279, 158, 73, 407, 530, 555, 511, 593, 1047, 432,
- 506, 1052, 1053, 1046, 91, 1273, 1036, 631, 365, 1557,
- 526, 1558, 251, 449, 1556, 630, 1502, 1504, 1506, 1507,
- 157, 642, 1099, 1351, 1403, 1422, 128, 887, 888, 898,
- 899, 963, 114, 1120, 636, 688, 6, 790, 688, 629,
- 113, 807, 807, 807, 4, 1003, 1009, 466, 598, 1529,
- 1272, 244, 631, 389, 1093, 1095, 1096, 696, 697, 1121,
- 227, 287, 288, 289, 290, 291, 292, 294, 295, 296,
- 297, 298, 299, 300, 302, 303, 430, 431, 658, 659,
- 662, 175, 414, 631, 1058, 58, 175, 179, 190, 316,
- 414, 1069, 1070, 1071, 56, 433, 172, 668, 790, 114,
- 807, 223, 631, 1116, 1116, 1116, 168, 195, 195, 1529,
- 1415, 983, 984, 983, 983, 1274, 1275, 1415, 1416, 1422,
- 631, 1318, 637, 1322, 1121, 1121, 12, 141, 1160, 1220,
- 1160, 1160, 1160, 603, 1170, 1121, 1121, 1165, 1165, 1121,
- 1121, 1121, 1133, 1134, 1121, 1121, 1121, 1121, 1121, 1121,
- 141, 1160, 1220, 630, 125, 185, 213, 282, 358, 563,
- 630, 1246, 1249, 1250, 630, 1121, 1121, 1121, 1121, 1411,
- 1513, 119, 120, 121, 122, 123, 218, 219, 220, 221,
- 320, 322, 323, 324, 331, 412, 464, 465, 602, 616,
- 617, 1215, 1216, 1165, 115, 118, 544, 547, 1217, 141,
- 1155, 1121, 1121, 1121, 1121, 1215, 1165, 1121, 1165, 1167,
- 9, 631, 637, 141, 1160, 1121, 1121, 141, 1160, 1121,
- 1121, 1165, 1165, 1165, 1121, 1121, 1121, 1165, 1124, 1121,
- 1121, 1121, 1121, 1121, 1121, 1160, 1160, 1121, 1121, 141,
- 1160, 1121, 1216, 1216, 1121, 45, 260, 552, 1121, 1121,
- 630, 1412, 1413, 1422, 1160, 1160, 1121, 1121, 630, 631,
- 630, 467, 629, 1510, 1511, 1121, 636, 1154, 1424, 637,
- 1121, 1121, 1121, 1123, 178, 357, 558, 574, 1127, 12,
- 18, 1123, 1130, 1124, 1124, 629, 1135, 1124, 1124, 1124,
- 1124, 267, 1124, 1124, 240, 1124, 240, 1124, 1124, 1124,
- 1124, 1124, 32, 244, 267, 427, 1424, 1135, 1121, 1141,
- 1422, 637, 1415, 821, 355, 600, 822, 823, 159, 631,
- 1272, 1269, 636, 652, 653, 279, 279, 279, 279, 49,
- 279, 279, 631, 1355, 530, 629, 1483, 1425, 1483, 1483,
- 1483, 195, 405, 534, 1465, 1469, 1422, 183, 348, 1422,
- 1456, 1457, 1286, 1419, 581, 1121, 1376, 1088, 274, 1384,
- 1219, 631, 1272, 1117, 73, 629, 847, 848, 847, 848,
- 388, 850, 210, 254, 1424, 30, 551, 1371, 631, 551,
- 631, 551, 1272, 1287, 1283, 12, 1367, 1365, 631, 161,
- 631, 1425, 195, 405, 1465, 1422, 12, 141, 1509, 631,
- 1107, 1121, 1409, 1422, 631, 202, 274, 364, 472, 1434,
- 1435, 1438, 1439, 244, 1343, 1419, 1121, 624, 892, 687,
- 687, 687, 1415, 687, 1415, 279, 335, 511, 1337, 1337,
- 282, 358, 457, 563, 1240, 1241, 1404, 1422, 1345, 1422,
- 687, 1345, 1425, 1340, 687, 1345, 245, 528, 180, 190,
- 1331, 631, 1343, 1340, 1415, 1342, 1340, 1340, 1345, 1345,
- 577, 1054, 631, 1054, 488, 467, 629, 633, 1171, 1172,
- 1173, 1174, 1175, 1184, 1185, 1199, 1403, 392, 1559, 373,
- 1233, 1239, 1508, 888, 71, 954, 137, 1424, 82, 96,
- 256, 328, 354, 416, 505, 690, 692, 423, 567, 808,
- 809, 233, 804, 805, 806, 813, 821, 823, 111, 216,
- 379, 390, 397, 489, 581, 671, 672, 1419, 25, 308,
- 798, 799, 800, 813, 814, 815, 821, 823, 791, 792,
- 798, 6, 13, 15, 26, 27, 57, 62, 63, 69,
- 82, 90, 100, 114, 131, 138, 139, 145, 153, 159,
- 188, 228, 230, 238, 253, 307, 325, 329, 368, 373,
- 380, 382, 389, 390, 421, 435, 436, 437, 438, 458,
- 515, 531, 535, 554, 559, 572, 834, 894, 896, 898,
- 899, 1014, 1018, 1020, 1023, 1029, 1030, 1031, 1229, 1418,
- 363, 681, 1010, 129, 243, 1415, 128, 1086, 1422, 1084,
- 1415, 836, 1095, 230, 254, 977, 1097, 630, 631, 161,
+ 629, 1125, 629, 1408, 629, 629, 629, 1408, 629, 629,
+ 36, 213, 214, 540, 953, 629, 1126, 1125, 1125, 629,
+ 629, 629, 629, 629, 1141, 1141, 1141, 1127, 1518, 1519,
+ 1428, 1159, 1428, 16, 17, 372, 375, 615, 1131, 1132,
+ 161, 162, 196, 207, 247, 259, 286, 345, 1135, 32,
+ 142, 244, 267, 330, 427, 478, 479, 492, 620, 621,
+ 622, 623, 624, 625, 626, 627, 1133, 1141, 71, 374,
+ 631, 1426, 629, 637, 172, 1428, 687, 1428, 363, 811,
+ 687, 1430, 821, 1345, 687, 1431, 1483, 1277, 1282, 585,
+ 651, 34, 67, 135, 159, 163, 197, 217, 231, 279,
+ 301, 404, 413, 428, 446, 485, 486, 511, 533, 582,
+ 1360, 1364, 1365, 1453, 404, 1472, 456, 456, 531, 537,
+ 581, 598, 370, 1476, 530, 363, 1478, 66, 485, 1475,
+ 112, 598, 1477, 363, 631, 19, 161, 1224, 1225, 1460,
+ 1428, 226, 1036, 491, 90, 413, 1381, 49, 88, 285,
+ 1391, 1421, 1454, 1455, 1079, 630, 1127, 269, 272, 415,
+ 840, 842, 636, 648, 1425, 279, 1083, 1431, 1084, 1085,
+ 1421, 598, 1059, 1453, 241, 1279, 1292, 1293, 49, 1372,
+ 631, 1426, 55, 65, 81, 93, 94, 95, 109, 319,
+ 337, 463, 518, 536, 725, 727, 1472, 363, 363, 461,
+ 1501, 1500, 572, 1506, 1507, 624, 1120, 1121, 1122, 1118,
+ 1437, 1438, 1439, 167, 475, 267, 604, 1351, 629, 111,
+ 168, 195, 405, 534, 556, 598, 1351, 12, 901, 1430,
+ 268, 1243, 1245, 192, 244, 1346, 1348, 70, 511, 190,
+ 511, 530, 70, 511, 12, 42, 97, 102, 246, 317,
+ 381, 493, 527, 1334, 1335, 1336, 167, 217, 511, 511,
+ 1243, 1351, 1348, 279, 158, 73, 407, 530, 555, 511,
+ 593, 1047, 432, 506, 1052, 1053, 1046, 91, 1279, 1036,
+ 631, 365, 1562, 526, 1563, 251, 449, 1561, 630, 1507,
+ 1509, 1511, 1512, 157, 642, 1105, 1357, 1409, 1428, 128,
+ 887, 888, 898, 899, 963, 114, 1126, 636, 688, 6,
+ 790, 688, 629, 113, 807, 807, 807, 4, 1003, 1009,
+ 466, 598, 1534, 1278, 244, 631, 389, 1099, 1101, 1102,
+ 696, 697, 1127, 227, 287, 288, 289, 290, 291, 292,
+ 294, 295, 296, 297, 298, 299, 300, 302, 303, 430,
+ 431, 658, 659, 662, 175, 414, 631, 1058, 1278, 58,
+ 175, 179, 190, 316, 414, 1074, 1075, 1076, 56, 433,
+ 172, 668, 790, 114, 807, 223, 631, 1122, 1122, 1122,
+ 168, 195, 195, 1534, 1421, 983, 984, 983, 983, 1280,
+ 1281, 1421, 1422, 1428, 631, 1324, 637, 1328, 1127, 1127,
+ 12, 141, 1166, 1226, 1166, 1166, 1166, 603, 1176, 1127,
+ 1127, 1171, 1171, 1127, 1127, 1127, 1139, 1140, 1127, 1127,
+ 1127, 1127, 1127, 1127, 141, 1166, 1226, 630, 125, 185,
+ 213, 282, 358, 563, 630, 1252, 1255, 1256, 630, 1127,
+ 1127, 1127, 1127, 1417, 1518, 119, 120, 121, 122, 123,
+ 218, 219, 220, 221, 320, 322, 323, 324, 331, 412,
+ 464, 465, 602, 616, 617, 1221, 1222, 1171, 115, 118,
+ 544, 547, 1223, 141, 1161, 1127, 1127, 1127, 1127, 1221,
+ 1171, 1127, 1171, 1173, 9, 631, 637, 141, 1166, 1127,
+ 1127, 141, 1166, 1127, 1127, 1171, 1171, 1171, 1127, 1127,
+ 1127, 1171, 1130, 1127, 1127, 1127, 1127, 1127, 1127, 1166,
+ 1166, 1127, 1127, 141, 1166, 1127, 1222, 1222, 1127, 45,
+ 260, 552, 1127, 1127, 630, 1418, 1419, 1428, 1166, 1166,
+ 1127, 1127, 630, 631, 630, 467, 629, 1515, 1516, 1127,
+ 636, 1160, 1430, 637, 1127, 1127, 1127, 1129, 178, 357,
+ 558, 574, 1133, 12, 18, 1129, 1136, 1130, 1130, 629,
+ 1141, 1130, 1130, 1130, 1130, 267, 1130, 1130, 240, 1130,
+ 240, 1130, 1130, 1130, 1130, 1130, 32, 244, 267, 427,
+ 1430, 1141, 1127, 1147, 1428, 637, 1421, 821, 355, 600,
+ 822, 823, 159, 631, 1278, 1275, 636, 652, 653, 279,
+ 279, 279, 279, 49, 279, 279, 631, 1361, 530, 629,
+ 1488, 1431, 1488, 1488, 1488, 195, 405, 534, 1470, 1474,
+ 1428, 183, 348, 1428, 1461, 1462, 1292, 1425, 581, 1127,
+ 1382, 1094, 274, 1390, 1225, 631, 1278, 1123, 73, 629,
+ 847, 848, 847, 848, 388, 850, 210, 254, 1430, 30,
+ 551, 1377, 631, 551, 631, 551, 1060, 1278, 1293, 1289,
+ 12, 1373, 1371, 631, 161, 631, 1431, 195, 405, 1470,
+ 1428, 12, 141, 1514, 631, 1113, 1127, 1415, 1428, 631,
+ 202, 274, 364, 472, 1440, 1441, 1444, 1445, 244, 1349,
+ 1425, 1127, 624, 892, 687, 687, 687, 1421, 687, 1421,
+ 279, 335, 511, 1343, 1343, 282, 358, 457, 563, 1246,
+ 1247, 1410, 1428, 1351, 1428, 687, 1351, 1431, 1346, 687,
+ 1351, 245, 528, 180, 190, 1337, 631, 1349, 1346, 1421,
+ 1348, 1346, 1346, 1351, 1351, 577, 1054, 631, 1054, 488,
+ 467, 629, 633, 1177, 1178, 1179, 1180, 1181, 1190, 1191,
+ 1205, 1409, 392, 1564, 373, 1239, 1245, 1513, 888, 71,
+ 954, 137, 1430, 82, 96, 256, 328, 354, 416, 505,
+ 690, 692, 423, 567, 808, 809, 233, 804, 805, 806,
+ 813, 821, 823, 111, 216, 379, 390, 397, 489, 581,
+ 671, 672, 1425, 25, 308, 798, 799, 800, 813, 814,
+ 815, 821, 823, 791, 792, 798, 6, 13, 15, 26,
+ 27, 57, 62, 63, 69, 82, 90, 100, 114, 131,
+ 138, 139, 145, 153, 159, 188, 228, 230, 238, 253,
+ 307, 325, 329, 368, 373, 380, 382, 389, 390, 421,
+ 435, 436, 437, 438, 458, 515, 531, 535, 554, 559,
+ 572, 834, 894, 896, 898, 899, 1014, 1018, 1020, 1023,
+ 1029, 1030, 1031, 1235, 1424, 363, 681, 1010, 129, 243,
+ 1421, 128, 1092, 1428, 1090, 1421, 836, 1101, 230, 254,
+ 977, 1103, 630, 631, 161, 161, 161, 161, 161, 161,
161, 161, 161, 161, 161, 161, 161, 161, 161, 161,
- 161, 161, 161, 161, 161, 161, 161, 631, 1273, 579,
- 1070, 886, 887, 82, 349, 424, 568, 801, 802, 803,
- 813, 817, 818, 819, 820, 821, 823, 610, 584, 786,
- 47, 597, 606, 1480, 1482, 195, 687, 687, 892, 687,
- 1422, 664, 561, 585, 991, 363, 363, 363, 631, 1319,
- 1317, 637, 1322, 1321, 192, 624, 1422, 631, 630, 1160,
- 630, 1161, 630, 630, 630, 1121, 151, 603, 1169, 19,
- 630, 585, 630, 630, 630, 631, 631, 630, 631, 631,
- 631, 631, 630, 631, 585, 631, 1149, 630, 624, 630,
- 631, 631, 630, 630, 630, 630, 192, 630, 631, 1151,
- 630, 631, 631, 631, 623, 630, 631, 630, 630, 629,
- 1411, 1422, 1160, 630, 630, 630, 1160, 630, 631, 630,
- 630, 630, 630, 630, 630, 631, 630, 244, 630, 631,
- 631, 631, 631, 630, 630, 630, 631, 192, 631, 1160,
- 630, 630, 631, 631, 631, 630, 192, 1121, 192, 1121,
- 192, 1121, 192, 630, 631, 630, 630, 630, 630, 631,
- 630, 1165, 1189, 1190, 1191, 467, 629, 1102, 1505, 1506,
- 572, 1515, 634, 202, 274, 472, 1437, 476, 1422, 178,
- 357, 558, 574, 629, 17, 1121, 1513, 166, 1225, 1124,
- 1121, 1121, 1124, 629, 1135, 1124, 1116, 1145, 1146, 1147,
- 629, 637, 1422, 1270, 822, 161, 476, 1297, 1298, 1425,
- 51, 448, 1042, 1272, 1424, 631, 1359, 1272, 1360, 1422,
- 1484, 1485, 551, 624, 1415, 1422, 1477, 1477, 1477, 161,
- 183, 196, 207, 257, 259, 286, 348, 402, 1458, 1460,
- 604, 1221, 1280, 1425, 1089, 1090, 1091, 1092, 1415, 232,
- 285, 418, 611, 1451, 1450, 629, 1116, 1246, 522, 851,
- 841, 11, 843, 1121, 1419, 1425, 1425, 1079, 1415, 175,
- 192, 414, 583, 1061, 1062, 1063, 467, 475, 589, 590,
- 629, 882, 1288, 1291, 727, 118, 544, 547, 726, 1152,
- 1406, 1411, 203, 192, 1477, 1477, 1477, 1503, 1115, 192,
- 241, 1108, 1109, 1232, 1233, 1261, 1117, 1117, 637, 1432,
- 128, 553, 1422, 1441, 338, 390, 636, 954, 1440, 1419,
- 192, 1344, 630, 1422, 170, 457, 361, 631, 1345, 413,
- 1237, 1330, 1344, 1345, 1340, 1415, 1345, 1345, 662, 1055,
- 1053, 1198, 1422, 104, 234, 251, 263, 341, 453, 516,
- 1183, 475, 631, 1415, 1198, 631, 190, 1560, 47, 1237,
- 1298, 1298, 339, 1419, 505, 505, 505, 505, 505, 466,
- 1419, 1419, 1298, 631, 806, 1419, 1419, 1419, 1419, 125,
- 185, 213, 282, 358, 563, 1245, 1419, 1419, 630, 631,
- 1298, 1298, 631, 800, 793, 794, 813, 814, 815, 80,
- 92, 389, 910, 917, 918, 975, 977, 981, 982, 1035,
- 1035, 389, 1298, 1298, 1035, 1298, 389, 389, 1298, 1298,
- 551, 137, 1298, 252, 531, 189, 389, 403, 977, 1035,
- 252, 1298, 531, 137, 1298, 1298, 1298, 1298, 1035, 389,
- 47, 1298, 1298, 836, 1298, 389, 387, 19, 161, 551,
- 1044, 389, 389, 1298, 140, 317, 1422, 1298, 1298, 389,
- 1298, 894, 631, 833, 834, 1018, 629, 637, 909, 919,
- 1414, 1422, 1297, 86, 462, 436, 1011, 1530, 1094, 629,
- 1121, 629, 1245, 1419, 1419, 125, 185, 282, 358, 563,
- 1247, 1419, 1245, 1419, 1419, 1419, 1419, 1419, 1245, 1245,
- 1419, 1407, 1419, 1245, 659, 1298, 1298, 1298, 1298, 631,
- 803, 1424, 278, 176, 795, 796, 797, 813, 814, 815,
- 816, 819, 820, 821, 823, 390, 540, 1424, 1422, 1549,
- 8, 30, 781, 687, 629, 450, 267, 629, 825, 893,
- 895, 896, 46, 210, 460, 996, 996, 1415, 1415, 1415,
- 1275, 1422, 585, 1221, 1422, 1172, 637, 1322, 240, 1121,
- 630, 1121, 543, 1121, 1121, 155, 34, 60, 115, 118,
- 126, 143, 242, 343, 483, 547, 576, 1162, 34, 955,
- 1424, 1134, 1121, 1133, 1165, 1121, 1121, 1121, 955, 1162,
- 1165, 630, 240, 240, 1121, 1121, 1165, 1121, 1121, 1121,
- 1121, 1121, 1124, 630, 630, 1121, 1121, 1121, 1121, 1121,
- 1121, 1165, 240, 1121, 1121, 1121, 630, 1121, 1121, 1121,
- 1121, 192, 1121, 192, 1121, 192, 1121, 1121, 1121, 630,
- 1516, 1517, 1518, 1190, 1102, 630, 1509, 637, 637, 637,
- 1424, 1121, 1513, 1123, 630, 631, 630, 1135, 1215, 1215,
- 17, 1121, 1513, 1225, 1121, 630, 631, 1164, 1165, 1422,
- 900, 1424, 1042, 653, 1356, 630, 631, 1479, 637, 637,
- 551, 551, 551, 1459, 1222, 1238, 1239, 1288, 631, 1093,
- 1095, 540, 1421, 611, 274, 88, 844, 845, 846, 1422,
- 856, 1124, 47, 629, 858, 848, 161, 629, 551, 336,
- 1062, 883, 1289, 629, 1294, 1299, 1294, 630, 882, 1290,
- 1408, 1409, 1412, 1422, 1292, 161, 370, 1478, 192, 192,
- 192, 1100, 146, 1172, 1262, 190, 277, 1113, 1261, 1238,
- 1109, 19, 1118, 1419, 1422, 624, 1422, 637, 248, 637,
- 1297, 128, 955, 956, 1297, 190, 1297, 636, 1424, 34,
- 128, 958, 959, 1424, 1247, 1335, 164, 601, 1241, 1242,
- 170, 1241, 1241, 358, 1336, 1221, 1340, 631, 1186, 1193,
- 1198, 1171, 251, 251, 376, 1200, 251, 263, 453, 1200,
- 1184, 1171, 1309, 1310, 1412, 1173, 1219, 1195, 1196, 1245,
- 321, 1234, 128, 960, 962, 1424, 956, 114, 114, 129,
- 243, 213, 282, 358, 563, 824, 1248, 1249, 1418, 806,
- 672, 824, 824, 800, 631, 794, 999, 1414, 1074, 63,
- 189, 403, 573, 916, 976, 999, 977, 978, 978, 1414,
- 1074, 1247, 1245, 1414, 1245, 12, 1019, 1027, 1028, 1422,
- 1074, 1419, 1419, 954, 1298, 1245, 254, 1027, 254, 1414,
- 1414, 900, 1298, 183, 257, 354, 903, 1245, 1247, 1247,
- 1414, 1074, 1230, 1231, 1412, 128, 1245, 128, 1245, 1251,
- 835, 1419, 1074, 1415, 1074, 1074, 85, 87, 128, 149,
- 184, 381, 425, 902, 1245, 1251, 1019, 897, 6, 145,
- 1031, 906, 907, 908, 909, 910, 1422, 8, 183, 1043,
- 426, 915, 916, 969, 920, 637, 128, 1248, 1419, 1422,
- 352, 401, 23, 169, 675, 551, 138, 153, 677, 629,
- 1531, 629, 403, 1211, 1212, 1213, 1422, 660, 661, 1245,
- 1419, 1246, 824, 824, 803, 369, 205, 1298, 631, 797,
- 540, 19, 585, 1481, 450, 629, 132, 237, 578, 782,
- 674, 1543, 126, 242, 420, 517, 905, 1415, 267, 389,
- 826, 832, 833, 906, 832, 631, 895, 665, 666, 667,
- 637, 1172, 1232, 1322, 1221, 1121, 630, 1121, 543, 629,
- 945, 946, 946, 946, 629, 940, 941, 945, 1163, 946,
- 242, 946, 242, 630, 630, 630, 19, 1131, 630, 630,
- 19, 630, 630, 630, 1150, 1121, 1121, 630, 630, 373,
- 1157, 631, 631, 630, 631, 630, 244, 1142, 1143, 630,
- 630, 630, 630, 631, 630, 630, 1121, 630, 190, 630,
- 630, 631, 630, 631, 631, 630, 1121, 630, 1121, 630,
- 1121, 630, 630, 630, 1114, 1518, 630, 1512, 637, 1000,
- 630, 1165, 1123, 630, 631, 630, 1117, 1147, 630, 606,
- 1357, 1485, 606, 1488, 624, 624, 1479, 1479, 1479, 629,
- 1121, 363, 1304, 1091, 1415, 1095, 226, 1098, 1380, 630,
- 631, 1117, 842, 389, 859, 860, 1246, 844, 1425, 1110,
- 1295, 1296, 1412, 1300, 631, 629, 1291, 630, 630, 631,
- 637, 1501, 726, 192, 1478, 1478, 1478, 1221, 1221, 147,
- 377, 1257, 1258, 1263, 578, 244, 1419, 1422, 637, 1422,
- 265, 1422, 12, 34, 128, 363, 1121, 1444, 71, 961,
- 1121, 1425, 362, 390, 540, 1443, 1437, 1297, 1237, 1242,
- 1237, 1345, 662, 572, 630, 1505, 1194, 634, 251, 1184,
- 1200, 1200, 251, 363, 363, 585, 631, 1308, 1297, 1209,
- 1210, 1110, 1121, 1235, 1410, 794, 1021, 629, 254, 254,
+ 161, 161, 631, 1279, 190, 1077, 579, 1075, 886, 887,
+ 82, 349, 424, 568, 801, 802, 803, 813, 817, 818,
+ 819, 820, 821, 823, 610, 584, 786, 47, 597, 606,
+ 1485, 1487, 195, 687, 687, 892, 687, 1428, 664, 561,
+ 585, 991, 363, 363, 363, 631, 1325, 1323, 637, 1328,
+ 1327, 192, 624, 1428, 631, 630, 1166, 630, 1167, 630,
+ 630, 630, 1127, 151, 603, 1175, 19, 630, 585, 630,
+ 630, 630, 631, 631, 630, 631, 631, 631, 631, 630,
+ 631, 585, 631, 1155, 630, 624, 630, 631, 631, 630,
+ 630, 630, 630, 192, 630, 631, 1157, 630, 631, 631,
+ 631, 623, 630, 631, 630, 630, 629, 1417, 1428, 1166,
+ 630, 630, 630, 1166, 630, 631, 630, 630, 630, 630,
+ 630, 630, 631, 630, 244, 630, 631, 631, 631, 631,
+ 630, 630, 630, 631, 192, 631, 1166, 630, 630, 631,
+ 631, 631, 630, 192, 1127, 192, 1127, 192, 1127, 192,
+ 630, 631, 630, 630, 630, 630, 631, 630, 1171, 1195,
+ 1196, 1197, 467, 629, 1108, 1510, 1511, 572, 1520, 634,
+ 202, 274, 472, 1443, 476, 1428, 178, 357, 558, 574,
+ 629, 17, 1127, 1518, 166, 1231, 1130, 1127, 1127, 1130,
+ 629, 1141, 1130, 1122, 1151, 1152, 1153, 629, 637, 1428,
+ 1276, 822, 161, 476, 1303, 1304, 1431, 51, 448, 1042,
+ 1278, 1430, 631, 1365, 1278, 1366, 1428, 1489, 1490, 551,
+ 624, 1421, 1428, 1482, 1482, 1482, 161, 183, 196, 207,
+ 257, 259, 286, 348, 402, 1463, 1465, 604, 1227, 1286,
+ 1431, 1095, 1096, 1097, 1098, 1421, 232, 285, 418, 611,
+ 1456, 1455, 629, 1122, 1252, 522, 851, 841, 11, 843,
+ 1127, 1425, 1431, 1431, 1085, 1421, 1278, 175, 414, 583,
+ 1063, 1064, 1065, 467, 475, 589, 590, 629, 882, 1294,
+ 1297, 727, 118, 544, 547, 726, 1158, 1412, 1417, 203,
+ 192, 1482, 1482, 1482, 1508, 1121, 192, 241, 1114, 1115,
+ 1238, 1239, 1267, 1123, 1123, 637, 1438, 128, 553, 1428,
+ 1447, 338, 390, 636, 954, 1446, 1425, 192, 1350, 630,
+ 1428, 170, 457, 361, 631, 1351, 413, 1243, 1336, 1350,
+ 1351, 1346, 1421, 1351, 1351, 662, 1055, 1053, 1204, 1428,
+ 104, 234, 251, 263, 341, 453, 516, 1189, 475, 631,
+ 1421, 1204, 631, 190, 1565, 47, 1243, 1304, 1304, 339,
+ 1425, 505, 505, 505, 505, 505, 466, 1425, 1425, 1304,
+ 631, 806, 1425, 1425, 1425, 1425, 125, 185, 213, 282,
+ 358, 563, 1251, 1425, 1425, 630, 631, 1304, 1304, 631,
+ 800, 793, 794, 813, 814, 815, 80, 92, 389, 910,
+ 917, 918, 975, 977, 981, 982, 1035, 1035, 389, 1304,
+ 1304, 1035, 1304, 389, 389, 1304, 1304, 551, 137, 1304,
+ 252, 531, 189, 389, 403, 977, 1035, 252, 1304, 531,
+ 137, 1304, 1304, 1304, 1304, 1035, 389, 47, 1304, 1304,
+ 836, 1304, 389, 387, 19, 161, 551, 1044, 389, 389,
+ 1304, 140, 317, 1428, 1304, 1304, 389, 1304, 894, 631,
+ 833, 834, 1018, 629, 637, 909, 919, 1420, 1428, 1303,
+ 86, 462, 436, 1011, 1535, 1100, 629, 1127, 629, 1251,
+ 1425, 1425, 125, 185, 282, 358, 563, 1253, 1425, 1251,
+ 1425, 1425, 1425, 1425, 1425, 1251, 1251, 1425, 1413, 1425,
+ 1251, 659, 579, 1304, 1304, 1304, 1304, 631, 803, 1430,
+ 278, 176, 795, 796, 797, 813, 814, 815, 816, 819,
+ 820, 821, 823, 390, 540, 1430, 1428, 1554, 8, 30,
+ 781, 687, 629, 450, 267, 629, 825, 893, 895, 896,
+ 46, 210, 460, 996, 996, 1421, 1421, 1421, 1281, 1428,
+ 585, 1227, 1428, 1178, 637, 1328, 240, 1127, 630, 1127,
+ 543, 1127, 1127, 155, 34, 60, 115, 118, 126, 143,
+ 242, 343, 483, 547, 576, 1168, 34, 955, 1430, 1140,
+ 1127, 1139, 1171, 1127, 1127, 1127, 955, 1168, 1171, 630,
+ 240, 240, 1127, 1127, 1171, 1127, 1127, 1127, 1127, 1127,
+ 1130, 630, 630, 1127, 1127, 1127, 1127, 1127, 1127, 1171,
+ 240, 1127, 1127, 1127, 630, 1127, 1127, 1127, 1127, 192,
+ 1127, 192, 1127, 192, 1127, 1127, 1127, 630, 1521, 1522,
+ 1523, 1196, 1108, 630, 1514, 637, 637, 637, 1430, 1127,
+ 1518, 1129, 630, 631, 630, 1141, 1221, 1221, 17, 1127,
+ 1518, 1231, 1127, 630, 631, 1170, 1171, 1428, 900, 1430,
+ 1042, 653, 1362, 630, 631, 1484, 637, 637, 551, 551,
+ 551, 1464, 1228, 1244, 1245, 1294, 631, 1099, 1101, 540,
+ 1427, 611, 274, 88, 844, 845, 846, 1428, 856, 1130,
+ 47, 629, 858, 848, 161, 629, 551, 192, 1066, 1064,
+ 883, 1295, 629, 1300, 1305, 1300, 630, 882, 1296, 1414,
+ 1415, 1418, 1428, 1298, 161, 370, 1483, 192, 192, 192,
+ 1106, 146, 1178, 1268, 190, 277, 1119, 1267, 1244, 1115,
+ 19, 1124, 1425, 1428, 624, 1428, 637, 248, 637, 1303,
+ 128, 955, 956, 1303, 190, 1303, 636, 1430, 34, 128,
+ 958, 959, 1430, 1253, 1341, 164, 601, 1247, 1248, 170,
+ 1247, 1247, 358, 1342, 1227, 1346, 631, 1192, 1199, 1204,
+ 1177, 251, 251, 376, 1206, 251, 263, 453, 1206, 1190,
+ 1177, 1315, 1316, 1418, 1179, 1225, 1201, 1202, 1251, 321,
+ 1240, 128, 960, 962, 1430, 956, 114, 114, 129, 243,
+ 213, 282, 358, 563, 824, 1254, 1255, 1424, 806, 672,
+ 824, 824, 800, 631, 794, 999, 1420, 1080, 63, 189,
+ 403, 573, 916, 976, 999, 977, 978, 978, 1420, 1080,
+ 1253, 1251, 1420, 1251, 12, 1019, 1027, 1028, 1428, 1080,
+ 1425, 1425, 954, 1304, 1251, 254, 1027, 254, 1420, 1420,
+ 900, 1304, 183, 257, 354, 903, 1251, 1253, 1253, 1420,
+ 1080, 1236, 1237, 1418, 128, 1251, 128, 1251, 1257, 835,
+ 1425, 1080, 1421, 1080, 1080, 85, 87, 128, 149, 184,
+ 381, 425, 902, 1251, 1257, 1019, 897, 6, 145, 1031,
+ 906, 907, 908, 909, 910, 1428, 8, 183, 1043, 426,
+ 915, 916, 969, 920, 637, 128, 1254, 1425, 1428, 352,
+ 401, 23, 169, 675, 551, 138, 153, 677, 629, 1536,
+ 629, 403, 1217, 1218, 1219, 1428, 660, 661, 1251, 1425,
+ 1252, 824, 824, 803, 369, 205, 1304, 631, 797, 540,
+ 19, 585, 1486, 450, 629, 132, 237, 578, 782, 674,
+ 1548, 126, 242, 420, 517, 905, 1421, 267, 389, 826,
+ 832, 833, 906, 832, 631, 895, 665, 666, 667, 637,
+ 1178, 1238, 1328, 1227, 1127, 630, 1127, 543, 629, 945,
+ 946, 946, 946, 629, 940, 941, 945, 1169, 946, 242,
+ 946, 242, 630, 630, 630, 19, 1137, 630, 630, 19,
+ 630, 630, 630, 1156, 1127, 1127, 630, 630, 373, 1163,
+ 631, 631, 630, 631, 630, 244, 1148, 1149, 630, 630,
+ 630, 630, 631, 630, 630, 1127, 630, 190, 630, 630,
+ 631, 630, 631, 631, 630, 1127, 630, 1127, 630, 1127,
+ 630, 630, 630, 1120, 1523, 630, 1517, 637, 1000, 630,
+ 1171, 1129, 630, 631, 630, 1123, 1153, 630, 606, 1363,
+ 1490, 606, 1493, 624, 624, 1484, 1484, 1484, 629, 1127,
+ 363, 1310, 1097, 1421, 1101, 226, 1104, 1386, 630, 631,
+ 1123, 842, 389, 859, 860, 1252, 844, 1431, 336, 1116,
+ 1301, 1302, 1418, 1306, 631, 629, 1297, 630, 630, 631,
+ 637, 1506, 726, 192, 1483, 1483, 1483, 1227, 1227, 147,
+ 377, 1263, 1264, 1269, 578, 244, 1425, 1428, 637, 1428,
+ 265, 1428, 12, 34, 128, 363, 1127, 1450, 71, 961,
+ 1127, 1431, 362, 390, 540, 1449, 1443, 1303, 1243, 1248,
+ 1243, 1351, 662, 572, 630, 1510, 1200, 634, 251, 1190,
+ 1206, 1206, 251, 363, 363, 585, 631, 1314, 1303, 1215,
+ 1216, 1116, 1127, 1241, 1416, 794, 1021, 629, 254, 254,
978, 999, 984, 999, 999, 145, 475, 1019, 1032, 1016,
- 631, 1246, 956, 1419, 999, 1042, 1419, 1033, 1019, 631,
- 20, 133, 1236, 839, 1019, 1024, 1019, 629, 630, 631,
- 1422, 1415, 33, 34, 39, 41, 43, 44, 60, 115,
+ 631, 1252, 956, 1425, 999, 1042, 1425, 1033, 1019, 631,
+ 20, 133, 1242, 839, 1019, 1024, 1019, 629, 630, 631,
+ 1428, 1421, 33, 34, 39, 41, 43, 44, 60, 115,
118, 126, 143, 160, 184, 186, 199, 200, 242, 271,
280, 281, 283, 313, 314, 315, 332, 333, 334, 340,
343, 359, 360, 395, 396, 420, 471, 475, 487, 541,
544, 547, 548, 549, 550, 591, 592, 617, 921, 930,
- 933, 934, 935, 936, 937, 938, 939, 1422, 401, 1121,
- 1121, 363, 681, 687, 363, 82, 682, 1422, 1532, 19,
- 1019, 630, 631, 630, 631, 629, 1422, 824, 797, 1419,
- 905, 1550, 363, 363, 698, 699, 701, 1422, 491, 1415,
- 882, 630, 226, 441, 829, 1386, 895, 629, 629, 629,
- 1422, 1221, 268, 1243, 1215, 1121, 125, 282, 358, 563,
+ 933, 934, 935, 936, 937, 938, 939, 1428, 401, 1127,
+ 1127, 363, 681, 687, 363, 82, 682, 1428, 1537, 19,
+ 1019, 630, 631, 630, 631, 629, 1428, 824, 797, 1425,
+ 905, 1555, 363, 363, 698, 699, 701, 1428, 491, 1421,
+ 882, 630, 226, 441, 829, 1392, 895, 629, 629, 629,
+ 1428, 1227, 268, 1249, 1221, 1127, 125, 282, 358, 563,
21, 34, 48, 570, 954, 964, 965, 966, 358, 629,
941, 947, 115, 118, 126, 143, 186, 242, 340, 343,
- 420, 547, 576, 934, 935, 1132, 1162, 630, 1215, 1215,
- 47, 469, 1156, 1121, 1121, 1165, 43, 341, 630, 606,
- 1144, 1121, 1215, 1121, 1121, 1121, 1121, 630, 630, 630,
- 1192, 1510, 1422, 630, 1165, 1118, 418, 203, 443, 1486,
- 1486, 1486, 128, 1121, 1302, 1303, 148, 1098, 261, 1386,
- 846, 630, 210, 254, 861, 630, 631, 630, 1114, 631,
- 1297, 1301, 1302, 1299, 1293, 1291, 1408, 1422, 1478, 1238,
- 205, 1226, 1421, 1421, 636, 1259, 1260, 1424, 477, 624,
- 418, 439, 470, 1442, 962, 1297, 629, 629, 1441, 1121,
- 1509, 1219, 1174, 1171, 1184, 251, 251, 1171, 1184, 1177,
- 1176, 1178, 1310, 1221, 1303, 1207, 1208, 1114, 631, 1236,
- 388, 629, 1022, 1121, 999, 984, 629, 983, 983, 128,
- 128, 919, 1069, 1028, 961, 921, 1015, 1231, 1025, 1027,
- 1017, 1360, 908, 629, 970, 945, 945, 946, 946, 940,
+ 420, 547, 576, 934, 935, 1138, 1168, 630, 1221, 1221,
+ 47, 469, 1162, 1127, 1127, 1171, 43, 341, 630, 606,
+ 1150, 1127, 1221, 1127, 1127, 1127, 1127, 630, 630, 630,
+ 1198, 1515, 1428, 630, 1171, 1124, 418, 203, 443, 1491,
+ 1491, 1491, 128, 1127, 1308, 1309, 148, 1104, 261, 1392,
+ 846, 630, 210, 254, 861, 630, 631, 630, 1120, 631,
+ 1303, 1307, 1308, 1305, 1299, 1297, 1414, 1428, 1483, 1244,
+ 205, 1232, 1427, 1427, 636, 1265, 1266, 1430, 477, 624,
+ 418, 439, 470, 1448, 962, 1303, 629, 629, 1447, 1127,
+ 1514, 1225, 1180, 1177, 1190, 251, 251, 1177, 1190, 1183,
+ 1182, 1184, 1316, 1227, 1309, 1213, 1214, 1120, 631, 1242,
+ 388, 629, 1022, 1127, 999, 984, 629, 983, 983, 128,
+ 128, 919, 1074, 1028, 961, 921, 1015, 1237, 1025, 1027,
+ 1017, 1366, 908, 629, 970, 945, 945, 946, 946, 940,
399, 931, 940, 940, 966, 60, 591, 934, 936, 966,
966, 60, 592, 592, 595, 940, 932, 946, 946, 946,
966, 945, 946, 26, 71, 82, 128, 198, 357, 363,
- 403, 471, 573, 923, 948, 949, 950, 968, 1127, 1418,
+ 403, 471, 573, 923, 948, 949, 950, 968, 1133, 1424,
595, 945, 966, 34, 945, 967, 945, 945, 946, 947,
- 637, 1215, 485, 1419, 144, 1012, 630, 631, 1533, 1534,
- 630, 1212, 661, 671, 491, 235, 244, 378, 702, 703,
- 704, 705, 1116, 462, 630, 631, 700, 1419, 630, 630,
- 827, 19, 885, 997, 998, 1422, 997, 997, 457, 1241,
+ 637, 1221, 485, 1425, 144, 1012, 630, 631, 1538, 1539,
+ 630, 1218, 661, 671, 491, 235, 244, 378, 702, 703,
+ 704, 705, 1122, 462, 630, 631, 700, 1425, 630, 630,
+ 827, 19, 885, 997, 998, 1428, 997, 997, 457, 1247,
630, 630, 630, 630, 630, 34, 21, 570, 954, 34,
955, 631, 358, 946, 940, 60, 946, 242, 966, 630,
- 630, 630, 1158, 1403, 630, 630, 631, 630, 327, 256,
- 413, 630, 630, 630, 630, 630, 630, 904, 1109, 1238,
- 1505, 630, 277, 370, 64, 249, 350, 507, 520, 612,
- 1475, 1476, 606, 1487, 1487, 1487, 630, 631, 1305, 241,
- 629, 849, 843, 862, 1422, 860, 884, 1296, 1303, 630,
- 1504, 47, 211, 1223, 1264, 1424, 631, 327, 83, 564,
- 418, 1443, 540, 540, 1297, 1187, 363, 1180, 1184, 1184,
- 363, 1182, 1121, 1121, 629, 1232, 188, 226, 584, 1202,
- 1203, 1206, 1197, 1410, 1246, 859, 630, 629, 629, 997,
- 629, 629, 118, 544, 547, 622, 623, 1405, 1406, 1043,
- 1034, 1074, 1026, 1061, 630, 971, 1422, 304, 972, 483,
+ 630, 630, 1164, 1409, 630, 630, 631, 630, 327, 256,
+ 413, 630, 630, 630, 630, 630, 630, 904, 1115, 1244,
+ 1510, 630, 277, 370, 64, 249, 350, 507, 520, 612,
+ 1480, 1481, 606, 1492, 1492, 1492, 630, 631, 1311, 241,
+ 629, 849, 843, 862, 1428, 860, 884, 1302, 1309, 630,
+ 1509, 47, 211, 1229, 1270, 1430, 631, 327, 83, 564,
+ 418, 1449, 540, 540, 1303, 1193, 363, 1186, 1190, 1190,
+ 363, 1188, 1127, 1127, 629, 1238, 188, 226, 584, 1208,
+ 1209, 1212, 1203, 1416, 1252, 859, 630, 629, 629, 997,
+ 629, 629, 118, 544, 547, 622, 623, 1411, 1412, 1043,
+ 1034, 1080, 1026, 1063, 630, 971, 1428, 304, 972, 483,
576, 618, 942, 943, 944, 629, 942, 942, 966, 595,
- 942, 629, 966, 942, 960, 1419, 353, 952, 1405, 14,
- 578, 128, 254, 19, 950, 254, 357, 1297, 966, 967,
- 966, 967, 942, 942, 1422, 676, 683, 684, 1422, 467,
- 629, 1535, 630, 1419, 630, 631, 700, 1538, 675, 1544,
- 701, 930, 951, 828, 893, 629, 882, 630, 631, 1236,
- 629, 630, 630, 170, 457, 955, 967, 358, 1159, 1410,
- 1121, 327, 174, 1113, 1113, 17, 1361, 540, 540, 540,
- 17, 1474, 203, 305, 306, 310, 311, 1489, 1490, 1303,
- 254, 534, 1116, 852, 629, 589, 863, 904, 1227, 1410,
- 1224, 1232, 954, 957, 1260, 630, 630, 1444, 1510, 1179,
- 585, 1181, 585, 1214, 1422, 1243, 977, 977, 1203, 904,
- 1236, 630, 997, 997, 630, 997, 997, 1407, 1407, 1043,
+ 942, 629, 966, 942, 960, 1425, 353, 952, 1411, 14,
+ 578, 128, 254, 19, 950, 254, 357, 1303, 966, 967,
+ 966, 967, 942, 942, 1428, 676, 683, 684, 1428, 467,
+ 629, 1540, 630, 1425, 630, 631, 700, 1543, 675, 1549,
+ 701, 930, 951, 828, 893, 629, 882, 630, 631, 1242,
+ 629, 630, 630, 170, 457, 955, 967, 358, 1165, 1416,
+ 1127, 327, 174, 1119, 1119, 17, 1367, 540, 540, 540,
+ 17, 1479, 203, 305, 306, 310, 311, 1494, 1495, 1309,
+ 254, 534, 1122, 852, 629, 589, 863, 904, 1233, 1416,
+ 1230, 1238, 954, 957, 1266, 630, 630, 1450, 1515, 1185,
+ 585, 1187, 585, 1220, 1428, 1249, 977, 977, 1209, 904,
+ 1242, 630, 997, 997, 630, 997, 997, 1413, 1413, 1043,
241, 630, 631, 193, 386, 484, 363, 973, 944, 1001,
- 1403, 1001, 1120, 353, 590, 922, 128, 1248, 1419, 1422,
+ 1409, 1001, 1126, 353, 590, 922, 128, 1254, 1425, 1428,
509, 678, 53, 68, 181, 225, 250, 262, 367, 451,
685, 732, 734, 735, 736, 738, 739, 740, 741, 742,
- 743, 745, 753, 754, 757, 768, 771, 773, 774, 1418,
- 1423, 1427, 1103, 1101, 606, 1536, 1551, 704, 1422, 1415,
- 680, 681, 450, 961, 1504, 832, 882, 830, 82, 253,
- 985, 988, 991, 992, 993, 1418, 998, 358, 606, 986,
+ 743, 745, 753, 754, 757, 768, 771, 773, 774, 1424,
+ 1429, 1433, 1109, 1107, 606, 1541, 1556, 704, 1428, 1421,
+ 680, 681, 450, 961, 1509, 832, 882, 830, 82, 253,
+ 985, 988, 991, 992, 993, 1424, 998, 358, 606, 986,
990, 992, 995, 987, 989, 992, 994, 170, 630, 631,
- 1236, 630, 138, 1475, 370, 1245, 1245, 1245, 358, 622,
- 1244, 1490, 578, 1415, 856, 521, 857, 854, 855, 1422,
+ 1242, 630, 138, 1480, 370, 1251, 1251, 1251, 358, 622,
+ 1250, 1495, 578, 1421, 856, 521, 857, 854, 855, 1428,
244, 264, 82, 90, 114, 230, 307, 325, 349, 531,
- 879, 880, 881, 1339, 607, 608, 631, 1228, 1236, 1121,
- 1238, 956, 1265, 1188, 1121, 629, 1121, 629, 630, 631,
- 190, 1201, 1201, 630, 630, 911, 630, 630, 629, 1422,
- 132, 578, 630, 631, 630, 1120, 629, 1121, 156, 679,
- 755, 758, 1422, 192, 348, 746, 733, 1423, 1423, 1422,
+ 879, 880, 881, 1345, 607, 608, 631, 1234, 1242, 1127,
+ 1244, 956, 1271, 1194, 1127, 629, 1127, 629, 630, 631,
+ 190, 1207, 1207, 630, 630, 911, 630, 630, 629, 1428,
+ 132, 578, 630, 631, 630, 1126, 629, 1127, 156, 679,
+ 755, 758, 1428, 192, 348, 746, 733, 1429, 1429, 1428,
737, 644, 284, 440, 605, 777, 31, 775, 638, 630,
- 52, 63, 274, 689, 951, 190, 677, 1545, 829, 630,
- 1501, 1419, 1298, 993, 1297, 1236, 630, 384, 995, 994,
- 1410, 61, 282, 358, 1311, 1312, 1412, 1381, 1117, 1246,
- 630, 631, 865, 542, 1298, 1298, 137, 137, 1298, 1298,
- 1298, 1298, 629, 874, 881, 159, 1410, 405, 1252, 73,
- 1387, 1505, 1214, 1214, 1422, 205, 251, 373, 1205, 1204,
+ 52, 63, 274, 689, 951, 190, 677, 1550, 829, 630,
+ 1506, 1425, 1304, 993, 1303, 1242, 630, 384, 995, 994,
+ 1416, 61, 282, 358, 1317, 1318, 1418, 1387, 1123, 1252,
+ 630, 631, 865, 542, 1304, 1304, 137, 137, 1304, 1304,
+ 1304, 1304, 629, 874, 881, 159, 1416, 405, 1258, 73,
+ 1393, 1510, 1220, 1220, 1428, 205, 251, 373, 1211, 1210,
969, 914, 985, 912, 913, 859, 51, 354, 448, 475,
- 974, 974, 966, 1403, 966, 929, 1121, 1121, 603, 760,
- 764, 192, 1422, 748, 749, 1121, 707, 731, 732, 734,
+ 974, 974, 966, 1409, 966, 929, 1127, 1127, 603, 760,
+ 764, 192, 1428, 748, 749, 1127, 707, 731, 732, 734,
736, 738, 740, 741, 742, 743, 745, 753, 768, 771,
- 773, 707, 778, 776, 769, 772, 1504, 63, 370, 63,
- 136, 690, 691, 1127, 1552, 1116, 682, 951, 831, 1245,
- 128, 1248, 1419, 1422, 1418, 1236, 631, 1297, 957, 630,
- 853, 855, 629, 867, 869, 864, 1419, 1419, 1298, 1298,
- 1248, 1248, 1246, 1424, 522, 875, 876, 1298, 1236, 1422,
- 154, 165, 371, 539, 1388, 1389, 270, 1390, 630, 630,
+ 773, 707, 778, 776, 769, 772, 1509, 63, 370, 63,
+ 136, 690, 691, 1133, 1557, 1122, 682, 951, 831, 1251,
+ 128, 1254, 1425, 1428, 1424, 1242, 631, 1303, 957, 630,
+ 853, 855, 629, 867, 869, 864, 1425, 1425, 1304, 1304,
+ 1254, 1254, 1252, 1430, 522, 875, 876, 1304, 1242, 1428,
+ 154, 165, 371, 539, 1394, 1395, 270, 1396, 630, 630,
47, 47, 629, 629, 985, 986, 987, 630, 5, 128,
357, 363, 363, 630, 756, 765, 151, 764, 767, 241,
- 155, 1121, 155, 731, 635, 577, 1121, 708, 777, 775,
- 370, 370, 136, 731, 1539, 144, 1546, 1504, 1312, 1303,
- 1382, 857, 629, 868, 869, 870, 312, 866, 869, 1419,
- 1419, 877, 630, 631, 900, 1253, 47, 47, 154, 47,
- 1389, 508, 539, 1391, 1392, 1211, 1213, 578, 132, 391,
- 599, 924, 603, 759, 761, 1121, 707, 155, 744, 225,
- 543, 284, 635, 780, 144, 127, 706, 709, 770, 1423,
- 770, 150, 683, 689, 457, 1393, 630, 631, 312, 872,
- 873, 1124, 878, 1424, 876, 629, 1403, 1403, 47, 1403,
- 47, 47, 1392, 630, 630, 974, 974, 82, 573, 925,
- 926, 927, 762, 761, 767, 766, 53, 747, 1422, 750,
- 1121, 779, 98, 173, 714, 729, 1422, 155, 731, 635,
- 459, 1547, 223, 1387, 869, 631, 871, 879, 1116, 1254,
- 1255, 1256, 1403, 1403, 1403, 1419, 254, 927, 1121, 155,
+ 155, 1127, 155, 731, 635, 577, 1127, 708, 777, 775,
+ 370, 370, 136, 731, 1544, 144, 1551, 1509, 1318, 1309,
+ 1388, 857, 629, 868, 869, 870, 312, 866, 869, 1425,
+ 1425, 877, 630, 631, 900, 1259, 47, 47, 154, 47,
+ 1395, 508, 539, 1397, 1398, 1217, 1219, 578, 132, 391,
+ 599, 924, 603, 759, 761, 1127, 707, 155, 744, 225,
+ 543, 284, 635, 780, 144, 127, 706, 709, 770, 1429,
+ 770, 150, 683, 689, 457, 1399, 630, 631, 312, 872,
+ 873, 1130, 878, 1430, 876, 629, 1409, 1409, 47, 1409,
+ 47, 47, 1398, 630, 630, 974, 974, 82, 573, 925,
+ 926, 927, 762, 761, 767, 766, 53, 747, 1428, 750,
+ 1127, 779, 98, 173, 714, 729, 1428, 155, 731, 635,
+ 459, 1552, 223, 1393, 869, 631, 871, 879, 1122, 1260,
+ 1261, 1262, 1409, 1409, 1409, 1425, 254, 927, 1127, 155,
543, 631, 707, 155, 707, 208, 631, 710, 89, 108,
- 635, 1540, 731, 47, 1390, 873, 630, 1121, 630, 631,
- 763, 53, 707, 1422, 751, 440, 155, 190, 1422, 951,
- 190, 190, 731, 1403, 226, 1394, 1117, 1256, 543, 151,
- 152, 752, 605, 711, 128, 730, 717, 718, 1245, 712,
- 713, 358, 629, 1396, 707, 707, 748, 496, 498, 715,
- 716, 717, 720, 1127, 1422, 1121, 1099, 270, 457, 1395,
- 630, 636, 1397, 1398, 1412, 475, 1399, 631, 731, 191,
- 1424, 630, 631, 1400, 1401, 1412, 716, 1398, 631, 1297,
- 1401, 1116, 1303, 1117
+ 635, 1545, 731, 47, 1396, 873, 630, 1127, 630, 631,
+ 763, 53, 707, 1428, 751, 440, 155, 190, 1428, 951,
+ 190, 190, 731, 1409, 226, 1400, 1123, 1262, 543, 151,
+ 152, 752, 605, 711, 128, 730, 717, 718, 1251, 712,
+ 713, 358, 629, 1402, 707, 707, 748, 496, 498, 715,
+ 716, 717, 720, 1133, 1428, 1127, 1105, 270, 457, 1401,
+ 630, 636, 1403, 1404, 1418, 475, 1405, 631, 731, 191,
+ 1430, 630, 631, 1406, 1407, 1418, 716, 1404, 631, 1303,
+ 1407, 1122, 1309, 1123
};
#define yyerrok (yyerrstatus = 0)
@@ -25437,7 +25439,7 @@ yyreduce:
my_error(ER_SP_BADSTATEMENT, MYF(0), "ALTER VIEW");
MYSQL_YYABORT;
}
- lex->create_view_algorithm= DTYPE_ALGORITHM_UNDEFINED;
+ lex->create_view_algorithm= VIEW_ALGORITHM_INHERIT;
lex->create_view_mode= VIEW_ALTER;
}
break;
@@ -26466,14 +26468,21 @@ yyreduce:
{ Lex->check_opt.flags= T_EXTEND; }
break;
- case 999:
+ case 1000:
/* Line 1455 of yacc.c */
#line 7196 "/home/buildbot/git/sql/sql_yacc.yy"
+ { Lex->only_view= TRUE; }
+ break;
+
+ case 1002:
+
+/* Line 1455 of yacc.c */
+#line 7201 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command = SQLCOM_REPAIR;
- lex->no_write_to_binlog= (yyvsp[(2) - (3)].num);
+ lex->no_write_to_binlog= (yyvsp[(2) - (2)].num);
lex->check_opt.init();
lex->alter_info.reset();
/* Will be overriden during execution. */
@@ -26481,21 +26490,12 @@ yyreduce:
}
break;
- case 1000:
+ case 1003:
/* Line 1455 of yacc.c */
-#line 7206 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 7211 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX* lex= thd->lex;
- if ((lex->only_view &&
- ((lex->check_opt.flags & (T_QUICK | T_EXTEND)) ||
- (lex->check_opt.sql_flags & TT_USEFRM))) ||
- (!lex->only_view &&
- (lex->check_opt.sql_flags & TT_FROM_MYSQL)))
- {
- my_parse_error(ER(ER_SYNTAX_ERROR));
- MYSQL_YYABORT;
- }
DBUG_ASSERT(!lex->m_stmt);
lex->m_stmt= new (thd->mem_root) Repair_table_statement(lex);
if (lex->m_stmt == NULL)
@@ -26503,63 +26503,70 @@ yyreduce:
}
break;
- case 1001:
+ case 1004:
/* Line 1455 of yacc.c */
-#line 7225 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 7221 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->check_opt.flags = T_MEDIUM; }
break;
- case 1002:
+ case 1005:
/* Line 1455 of yacc.c */
-#line 7226 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 7222 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1003:
+ case 1006:
/* Line 1455 of yacc.c */
-#line 7230 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 7226 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1004:
+ case 1007:
/* Line 1455 of yacc.c */
-#line 7231 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 7227 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1005:
+ case 1008:
/* Line 1455 of yacc.c */
-#line 7235 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 7231 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->check_opt.flags|= T_QUICK; }
break;
- case 1006:
+ case 1009:
/* Line 1455 of yacc.c */
-#line 7236 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 7232 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->check_opt.flags|= T_EXTEND; }
break;
- case 1007:
+ case 1010:
/* Line 1455 of yacc.c */
-#line 7237 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 7233 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->check_opt.sql_flags|= TT_USEFRM; }
break;
- case 1008:
+ case 1011:
+
+/* Line 1455 of yacc.c */
+#line 7237 "/home/buildbot/git/sql/sql_yacc.yy"
+ { }
+ break;
+
+ case 1012:
/* Line 1455 of yacc.c */
#line 7238 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->check_opt.sql_flags|= TT_FROM_MYSQL; }
break;
- case 1009:
+ case 1013:
/* Line 1455 of yacc.c */
#line 7243 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -26574,7 +26581,7 @@ yyreduce:
}
break;
- case 1010:
+ case 1014:
/* Line 1455 of yacc.c */
#line 7253 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -26587,7 +26594,7 @@ yyreduce:
}
break;
- case 1011:
+ case 1015:
/* Line 1455 of yacc.c */
#line 7264 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -26597,18 +26604,20 @@ yyreduce:
}
break;
- case 1012:
+ case 1017:
/* Line 1455 of yacc.c */
#line 7272 "/home/buildbot/git/sql/sql_yacc.yy"
+ { Lex->only_view= TRUE; }
+ break;
+
+ case 1019:
+
+/* Line 1455 of yacc.c */
+#line 7276 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex=Lex;
- if (lex->sphead)
- {
- my_error(ER_SP_BADSTATEMENT, MYF(0), "CHECK");
- MYSQL_YYABORT;
- }
lex->sql_command = SQLCOM_CHECK;
lex->check_opt.init();
lex->alter_info.reset();
@@ -26617,17 +26626,15 @@ yyreduce:
}
break;
- case 1013:
+ case 1020:
/* Line 1455 of yacc.c */
-#line 7287 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 7286 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX* lex= thd->lex;
- if (lex->only_view &&
- (lex->check_opt.flags & (T_QUICK | T_FAST | T_EXTEND |
- T_CHECK_ONLY_CHANGED)))
+ if (lex->sphead)
{
- my_parse_error(ER(ER_SYNTAX_ERROR));
+ my_error(ER_SP_BADSTATEMENT, MYF(0), "CHECK");
MYSQL_YYABORT;
}
DBUG_ASSERT(!lex->m_stmt);
@@ -26637,80 +26644,94 @@ yyreduce:
}
break;
- case 1014:
+ case 1021:
/* Line 1455 of yacc.c */
-#line 7304 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 7301 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->check_opt.flags = T_MEDIUM; }
break;
- case 1015:
+ case 1022:
/* Line 1455 of yacc.c */
-#line 7305 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 7302 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1016:
+ case 1023:
/* Line 1455 of yacc.c */
-#line 7309 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 7306 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1017:
+ case 1024:
/* Line 1455 of yacc.c */
-#line 7310 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 7307 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1018:
+ case 1025:
/* Line 1455 of yacc.c */
-#line 7314 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 7311 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->check_opt.flags|= T_QUICK; }
break;
- case 1019:
+ case 1026:
/* Line 1455 of yacc.c */
-#line 7315 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 7312 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->check_opt.flags|= T_FAST; }
break;
- case 1020:
+ case 1027:
/* Line 1455 of yacc.c */
-#line 7316 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 7313 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->check_opt.flags|= T_MEDIUM; }
break;
- case 1021:
+ case 1028:
/* Line 1455 of yacc.c */
-#line 7317 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 7314 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->check_opt.flags|= T_EXTEND; }
break;
- case 1022:
+ case 1029:
/* Line 1455 of yacc.c */
-#line 7318 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 7315 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->check_opt.flags|= T_CHECK_ONLY_CHANGED; }
break;
- case 1023:
+ case 1030:
/* Line 1455 of yacc.c */
-#line 7319 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 7316 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->check_opt.sql_flags|= TT_FOR_UPGRADE; }
break;
- case 1024:
+ case 1031:
+
+/* Line 1455 of yacc.c */
+#line 7320 "/home/buildbot/git/sql/sql_yacc.yy"
+ { }
+ break;
+
+ case 1032:
/* Line 1455 of yacc.c */
-#line 7324 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 7321 "/home/buildbot/git/sql/sql_yacc.yy"
+ { Lex->check_opt.sql_flags|= TT_FOR_UPGRADE; }
+ break;
+
+ case 1033:
+
+/* Line 1455 of yacc.c */
+#line 7326 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command = SQLCOM_OPTIMIZE;
@@ -26722,10 +26743,10 @@ yyreduce:
}
break;
- case 1025:
+ case 1034:
/* Line 1455 of yacc.c */
-#line 7334 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 7336 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX* lex= thd->lex;
DBUG_ASSERT(!lex->m_stmt);
@@ -26735,76 +26756,76 @@ yyreduce:
}
break;
- case 1026:
+ case 1035:
/* Line 1455 of yacc.c */
-#line 7344 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 7346 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)= 0; }
break;
- case 1027:
+ case 1036:
/* Line 1455 of yacc.c */
-#line 7345 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 7347 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)= 1; }
break;
- case 1028:
+ case 1037:
/* Line 1455 of yacc.c */
-#line 7346 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 7348 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)= 1; }
break;
- case 1029:
+ case 1038:
/* Line 1455 of yacc.c */
-#line 7351 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 7353 "/home/buildbot/git/sql/sql_yacc.yy"
{
Lex->sql_command= SQLCOM_RENAME_TABLE;
}
break;
- case 1030:
+ case 1039:
/* Line 1455 of yacc.c */
-#line 7355 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 7357 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1031:
+ case 1040:
/* Line 1455 of yacc.c */
-#line 7357 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 7359 "/home/buildbot/git/sql/sql_yacc.yy"
{
Lex->sql_command = SQLCOM_RENAME_USER;
}
break;
- case 1032:
+ case 1041:
/* Line 1455 of yacc.c */
-#line 7364 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 7366 "/home/buildbot/git/sql/sql_yacc.yy"
{
if (Lex->users_list.push_back((yyvsp[(1) - (3)].lex_user)) || Lex->users_list.push_back((yyvsp[(3) - (3)].lex_user)))
MYSQL_YYABORT;
}
break;
- case 1033:
+ case 1042:
/* Line 1455 of yacc.c */
-#line 7369 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 7371 "/home/buildbot/git/sql/sql_yacc.yy"
{
if (Lex->users_list.push_back((yyvsp[(3) - (5)].lex_user)) || Lex->users_list.push_back((yyvsp[(5) - (5)].lex_user)))
MYSQL_YYABORT;
}
break;
- case 1036:
+ case 1045:
/* Line 1455 of yacc.c */
-#line 7382 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 7384 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex=Lex;
SELECT_LEX *sl= lex->current_select;
@@ -26816,31 +26837,30 @@ yyreduce:
}
break;
- case 1037:
+ case 1046:
/* Line 1455 of yacc.c */
-#line 7395 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 7397 "/home/buildbot/git/sql/sql_yacc.yy"
{
Lex->alter_info.reset();
}
break;
- case 1038:
+ case 1047:
/* Line 1455 of yacc.c */
-#line 7399 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 7401 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_ASSIGN_TO_KEYCACHE;
lex->ident= (yyvsp[(6) - (6)].lex_str);
- lex->only_view= FALSE;
}
break;
- case 1043:
+ case 1052:
/* Line 1455 of yacc.c */
-#line 7419 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 7420 "/home/buildbot/git/sql/sql_yacc.yy"
{
if (!Select->add_table_to_list(thd, (yyvsp[(1) - (2)].table), NULL, 0, TL_READ,
MDL_SHARED_READ,
@@ -26849,10 +26869,10 @@ yyreduce:
}
break;
- case 1044:
+ case 1053:
/* Line 1455 of yacc.c */
-#line 7429 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 7430 "/home/buildbot/git/sql/sql_yacc.yy"
{
if (!Select->add_table_to_list(thd, (yyvsp[(1) - (3)].table), NULL, 0, TL_READ,
MDL_SHARED_READ,
@@ -26861,40 +26881,39 @@ yyreduce:
}
break;
- case 1045:
+ case 1054:
/* Line 1455 of yacc.c */
-#line 7438 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 7439 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.lex_str)= (yyvsp[(1) - (1)].lex_str); }
break;
- case 1046:
+ case 1055:
/* Line 1455 of yacc.c */
-#line 7439 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 7440 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.lex_str) = default_key_cache_base; }
break;
- case 1047:
+ case 1056:
/* Line 1455 of yacc.c */
-#line 7444 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 7445 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command=SQLCOM_PRELOAD_KEYS;
lex->alter_info.reset();
- lex->only_view= FALSE;
}
break;
- case 1048:
+ case 1057:
/* Line 1455 of yacc.c */
#line 7451 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1053:
+ case 1062:
/* Line 1455 of yacc.c */
#line 7466 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -26906,7 +26925,7 @@ yyreduce:
}
break;
- case 1054:
+ case 1063:
/* Line 1455 of yacc.c */
#line 7476 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -26918,7 +26937,7 @@ yyreduce:
}
break;
- case 1055:
+ case 1064:
/* Line 1455 of yacc.c */
#line 7486 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -26927,7 +26946,7 @@ yyreduce:
}
break;
- case 1057:
+ case 1066:
/* Line 1455 of yacc.c */
#line 7493 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -26938,28 +26957,28 @@ yyreduce:
}
break;
- case 1059:
+ case 1068:
/* Line 1455 of yacc.c */
#line 7502 "/home/buildbot/git/sql/sql_yacc.yy"
{ }
break;
- case 1061:
+ case 1070:
/* Line 1455 of yacc.c */
#line 7508 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)= 0; }
break;
- case 1062:
+ case 1071:
/* Line 1455 of yacc.c */
#line 7509 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)= TL_OPTION_IGNORE_LEAVES; }
break;
- case 1063:
+ case 1072:
/* Line 1455 of yacc.c */
#line 7519 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -26969,7 +26988,7 @@ yyreduce:
}
break;
- case 1066:
+ case 1075:
/* Line 1455 of yacc.c */
#line 7533 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -26979,7 +26998,7 @@ yyreduce:
}
break;
- case 1068:
+ case 1077:
/* Line 1455 of yacc.c */
#line 7543 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -26989,7 +27008,7 @@ yyreduce:
}
break;
- case 1070:
+ case 1079:
/* Line 1455 of yacc.c */
#line 7552 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27010,7 +27029,7 @@ yyreduce:
}
break;
- case 1072:
+ case 1081:
/* Line 1455 of yacc.c */
#line 7571 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27023,7 +27042,7 @@ yyreduce:
}
break;
- case 1073:
+ case 1082:
/* Line 1455 of yacc.c */
#line 7579 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27032,14 +27051,14 @@ yyreduce:
}
break;
- case 1075:
+ case 1084:
/* Line 1455 of yacc.c */
#line 7586 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1080:
+ case 1089:
/* Line 1455 of yacc.c */
#line 7596 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27050,7 +27069,7 @@ yyreduce:
}
break;
- case 1083:
+ case 1092:
/* Line 1455 of yacc.c */
#line 7611 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27063,7 +27082,7 @@ yyreduce:
}
break;
- case 1087:
+ case 1096:
/* Line 1455 of yacc.c */
#line 7628 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27096,7 +27115,7 @@ yyreduce:
}
break;
- case 1088:
+ case 1097:
/* Line 1455 of yacc.c */
#line 7656 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27129,7 +27148,7 @@ yyreduce:
}
break;
- case 1090:
+ case 1099:
/* Line 1455 of yacc.c */
#line 7688 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27140,7 +27159,7 @@ yyreduce:
}
break;
- case 1091:
+ case 1100:
/* Line 1455 of yacc.c */
#line 7694 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27152,7 +27171,7 @@ yyreduce:
}
break;
- case 1094:
+ case 1103:
/* Line 1455 of yacc.c */
#line 7706 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27168,7 +27187,7 @@ yyreduce:
}
break;
- case 1095:
+ case 1104:
/* Line 1455 of yacc.c */
#line 7720 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27178,7 +27197,7 @@ yyreduce:
}
break;
- case 1096:
+ case 1105:
/* Line 1455 of yacc.c */
#line 7725 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27205,7 +27224,7 @@ yyreduce:
}
break;
- case 1097:
+ case 1106:
/* Line 1455 of yacc.c */
#line 7749 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27214,7 +27233,7 @@ yyreduce:
}
break;
- case 1098:
+ case 1107:
/* Line 1455 of yacc.c */
#line 7755 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27223,77 +27242,77 @@ yyreduce:
}
break;
- case 1099:
+ case 1108:
/* Line 1455 of yacc.c */
#line 7761 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.lex_str)=null_lex_str;}
break;
- case 1100:
+ case 1109:
/* Line 1455 of yacc.c */
#line 7762 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.lex_str)=(yyvsp[(2) - (2)].lex_str); }
break;
- case 1101:
+ case 1110:
/* Line 1455 of yacc.c */
#line 7763 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.lex_str)=(yyvsp[(2) - (2)].lex_str); }
break;
- case 1102:
+ case 1111:
/* Line 1455 of yacc.c */
#line 7764 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str); }
break;
- case 1103:
+ case 1112:
/* Line 1455 of yacc.c */
#line 7765 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str); }
break;
- case 1104:
+ case 1113:
/* Line 1455 of yacc.c */
#line 7769 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)= 0; }
break;
- case 1105:
+ case 1114:
/* Line 1455 of yacc.c */
#line 7770 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)= 0; }
break;
- case 1106:
+ case 1115:
/* Line 1455 of yacc.c */
#line 7771 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)= (yyvsp[(2) - (3)].ulong_num); }
break;
- case 1107:
+ case 1116:
/* Line 1455 of yacc.c */
#line 7775 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1108:
+ case 1117:
/* Line 1455 of yacc.c */
#line 7776 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1109:
+ case 1118:
/* Line 1455 of yacc.c */
#line 7782 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27349,7 +27368,7 @@ yyreduce:
}
break;
- case 1110:
+ case 1119:
/* Line 1455 of yacc.c */
#line 7833 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27361,7 +27380,7 @@ yyreduce:
}
break;
- case 1111:
+ case 1120:
/* Line 1455 of yacc.c */
#line 7840 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27409,7 +27428,7 @@ yyreduce:
}
break;
- case 1112:
+ case 1121:
/* Line 1455 of yacc.c */
#line 7883 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27420,7 +27439,7 @@ yyreduce:
}
break;
- case 1113:
+ case 1122:
/* Line 1455 of yacc.c */
#line 7889 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27431,7 +27450,7 @@ yyreduce:
}
break;
- case 1114:
+ case 1123:
/* Line 1455 of yacc.c */
#line 7895 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27442,7 +27461,7 @@ yyreduce:
}
break;
- case 1115:
+ case 1124:
/* Line 1455 of yacc.c */
#line 7901 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27453,7 +27472,7 @@ yyreduce:
}
break;
- case 1116:
+ case 1125:
/* Line 1455 of yacc.c */
#line 7907 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27464,7 +27483,7 @@ yyreduce:
}
break;
- case 1117:
+ case 1126:
/* Line 1455 of yacc.c */
#line 7913 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27475,7 +27494,7 @@ yyreduce:
}
break;
- case 1118:
+ case 1127:
/* Line 1455 of yacc.c */
#line 7919 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27486,7 +27505,7 @@ yyreduce:
}
break;
- case 1120:
+ case 1129:
/* Line 1455 of yacc.c */
#line 7929 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27497,7 +27516,7 @@ yyreduce:
}
break;
- case 1121:
+ case 1130:
/* Line 1455 of yacc.c */
#line 7935 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27508,7 +27527,7 @@ yyreduce:
}
break;
- case 1122:
+ case 1131:
/* Line 1455 of yacc.c */
#line 7941 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27519,7 +27538,7 @@ yyreduce:
}
break;
- case 1123:
+ case 1132:
/* Line 1455 of yacc.c */
#line 7947 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27530,7 +27549,7 @@ yyreduce:
}
break;
- case 1124:
+ case 1133:
/* Line 1455 of yacc.c */
#line 7953 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27541,7 +27560,7 @@ yyreduce:
}
break;
- case 1126:
+ case 1135:
/* Line 1455 of yacc.c */
#line 7963 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27552,7 +27571,7 @@ yyreduce:
}
break;
- case 1127:
+ case 1136:
/* Line 1455 of yacc.c */
#line 7969 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27566,7 +27585,7 @@ yyreduce:
}
break;
- case 1128:
+ case 1137:
/* Line 1455 of yacc.c */
#line 7978 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27577,7 +27596,7 @@ yyreduce:
}
break;
- case 1129:
+ case 1138:
/* Line 1455 of yacc.c */
#line 7984 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27590,7 +27609,7 @@ yyreduce:
}
break;
- case 1130:
+ case 1139:
/* Line 1455 of yacc.c */
#line 7992 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27601,7 +27620,7 @@ yyreduce:
}
break;
- case 1131:
+ case 1140:
/* Line 1455 of yacc.c */
#line 7998 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27616,7 +27635,7 @@ yyreduce:
}
break;
- case 1132:
+ case 1141:
/* Line 1455 of yacc.c */
#line 8008 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27627,7 +27646,7 @@ yyreduce:
}
break;
- case 1133:
+ case 1142:
/* Line 1455 of yacc.c */
#line 8014 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27641,7 +27660,7 @@ yyreduce:
}
break;
- case 1134:
+ case 1143:
/* Line 1455 of yacc.c */
#line 8023 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27656,7 +27675,7 @@ yyreduce:
}
break;
- case 1135:
+ case 1144:
/* Line 1455 of yacc.c */
#line 8033 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27667,7 +27686,7 @@ yyreduce:
}
break;
- case 1136:
+ case 1145:
/* Line 1455 of yacc.c */
#line 8039 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27682,7 +27701,7 @@ yyreduce:
}
break;
- case 1137:
+ case 1146:
/* Line 1455 of yacc.c */
#line 8049 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27693,7 +27712,7 @@ yyreduce:
}
break;
- case 1138:
+ case 1147:
/* Line 1455 of yacc.c */
#line 8055 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27707,7 +27726,7 @@ yyreduce:
}
break;
- case 1140:
+ case 1149:
/* Line 1455 of yacc.c */
#line 8068 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27718,7 +27737,7 @@ yyreduce:
}
break;
- case 1141:
+ case 1150:
/* Line 1455 of yacc.c */
#line 8074 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27729,7 +27748,7 @@ yyreduce:
}
break;
- case 1142:
+ case 1151:
/* Line 1455 of yacc.c */
#line 8080 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27740,7 +27759,7 @@ yyreduce:
}
break;
- case 1143:
+ case 1152:
/* Line 1455 of yacc.c */
#line 8086 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27751,7 +27770,7 @@ yyreduce:
}
break;
- case 1144:
+ case 1153:
/* Line 1455 of yacc.c */
#line 8092 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27762,7 +27781,7 @@ yyreduce:
}
break;
- case 1145:
+ case 1154:
/* Line 1455 of yacc.c */
#line 8098 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27773,7 +27792,7 @@ yyreduce:
}
break;
- case 1146:
+ case 1155:
/* Line 1455 of yacc.c */
#line 8104 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27784,7 +27803,7 @@ yyreduce:
}
break;
- case 1147:
+ case 1156:
/* Line 1455 of yacc.c */
#line 8110 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27795,7 +27814,7 @@ yyreduce:
}
break;
- case 1148:
+ case 1157:
/* Line 1455 of yacc.c */
#line 8116 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27806,7 +27825,7 @@ yyreduce:
}
break;
- case 1149:
+ case 1158:
/* Line 1455 of yacc.c */
#line 8122 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27817,7 +27836,7 @@ yyreduce:
}
break;
- case 1150:
+ case 1159:
/* Line 1455 of yacc.c */
#line 8128 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27828,7 +27847,7 @@ yyreduce:
}
break;
- case 1151:
+ case 1160:
/* Line 1455 of yacc.c */
#line 8134 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27839,7 +27858,7 @@ yyreduce:
}
break;
- case 1152:
+ case 1161:
/* Line 1455 of yacc.c */
#line 8140 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27850,7 +27869,7 @@ yyreduce:
}
break;
- case 1153:
+ case 1162:
/* Line 1455 of yacc.c */
#line 8146 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27861,63 +27880,63 @@ yyreduce:
}
break;
- case 1163:
+ case 1172:
/* Line 1455 of yacc.c */
#line 8175 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.boolfunc2creator) = &comp_eq_creator; }
break;
- case 1164:
+ case 1173:
/* Line 1455 of yacc.c */
#line 8176 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.boolfunc2creator) = &comp_ge_creator; }
break;
- case 1165:
+ case 1174:
/* Line 1455 of yacc.c */
#line 8177 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.boolfunc2creator) = &comp_gt_creator; }
break;
- case 1166:
+ case 1175:
/* Line 1455 of yacc.c */
#line 8178 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.boolfunc2creator) = &comp_le_creator; }
break;
- case 1167:
+ case 1176:
/* Line 1455 of yacc.c */
#line 8179 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.boolfunc2creator) = &comp_lt_creator; }
break;
- case 1168:
+ case 1177:
/* Line 1455 of yacc.c */
#line 8180 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.boolfunc2creator) = &comp_ne_creator; }
break;
- case 1169:
+ case 1178:
/* Line 1455 of yacc.c */
#line 8184 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num) = 1; }
break;
- case 1170:
+ case 1179:
/* Line 1455 of yacc.c */
#line 8185 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num) = 0; }
break;
- case 1171:
+ case 1180:
/* Line 1455 of yacc.c */
#line 8190 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27929,14 +27948,14 @@ yyreduce:
}
break;
- case 1172:
+ case 1181:
/* Line 1455 of yacc.c */
#line 8196 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)= (yyvsp[(2) - (2)].num); }
break;
- case 1173:
+ case 1182:
/* Line 1455 of yacc.c */
#line 8201 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27948,7 +27967,7 @@ yyreduce:
}
break;
- case 1174:
+ case 1183:
/* Line 1455 of yacc.c */
#line 8208 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27960,7 +27979,7 @@ yyreduce:
}
break;
- case 1175:
+ case 1184:
/* Line 1455 of yacc.c */
#line 8215 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27972,7 +27991,7 @@ yyreduce:
}
break;
- case 1176:
+ case 1185:
/* Line 1455 of yacc.c */
#line 8222 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27984,7 +28003,7 @@ yyreduce:
}
break;
- case 1177:
+ case 1186:
/* Line 1455 of yacc.c */
#line 8229 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -27996,7 +28015,7 @@ yyreduce:
}
break;
- case 1178:
+ case 1187:
/* Line 1455 of yacc.c */
#line 8236 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28006,7 +28025,7 @@ yyreduce:
}
break;
- case 1179:
+ case 1188:
/* Line 1455 of yacc.c */
#line 8241 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28017,7 +28036,7 @@ yyreduce:
}
break;
- case 1180:
+ case 1189:
/* Line 1455 of yacc.c */
#line 8247 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28029,7 +28048,7 @@ yyreduce:
}
break;
- case 1181:
+ case 1190:
/* Line 1455 of yacc.c */
#line 8254 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28041,7 +28060,7 @@ yyreduce:
}
break;
- case 1182:
+ case 1191:
/* Line 1455 of yacc.c */
#line 8261 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28054,7 +28073,7 @@ yyreduce:
}
break;
- case 1183:
+ case 1192:
/* Line 1455 of yacc.c */
#line 8269 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28067,7 +28086,7 @@ yyreduce:
}
break;
- case 1184:
+ case 1193:
/* Line 1455 of yacc.c */
#line 8280 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28092,7 +28111,7 @@ yyreduce:
}
break;
- case 1185:
+ case 1194:
/* Line 1455 of yacc.c */
#line 8302 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28104,7 +28123,7 @@ yyreduce:
}
break;
- case 1186:
+ case 1195:
/* Line 1455 of yacc.c */
#line 8309 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28114,7 +28133,7 @@ yyreduce:
}
break;
- case 1192:
+ case 1201:
/* Line 1455 of yacc.c */
#line 8322 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28130,7 +28149,7 @@ yyreduce:
}
break;
- case 1197:
+ case 1206:
/* Line 1455 of yacc.c */
#line 8337 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28141,7 +28160,7 @@ yyreduce:
}
break;
- case 1198:
+ case 1207:
/* Line 1455 of yacc.c */
#line 8343 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28150,7 +28169,7 @@ yyreduce:
}
break;
- case 1199:
+ case 1208:
/* Line 1455 of yacc.c */
#line 8347 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28161,7 +28180,7 @@ yyreduce:
}
break;
- case 1200:
+ case 1209:
/* Line 1455 of yacc.c */
#line 8353 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28172,7 +28191,7 @@ yyreduce:
}
break;
- case 1201:
+ case 1210:
/* Line 1455 of yacc.c */
#line 8359 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28183,7 +28202,7 @@ yyreduce:
}
break;
- case 1202:
+ case 1211:
/* Line 1455 of yacc.c */
#line 8365 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28194,14 +28213,14 @@ yyreduce:
}
break;
- case 1203:
+ case 1212:
/* Line 1455 of yacc.c */
#line 8371 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.item)= (yyvsp[(2) - (3)].item); }
break;
- case 1204:
+ case 1213:
/* Line 1455 of yacc.c */
#line 8373 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28213,7 +28232,7 @@ yyreduce:
}
break;
- case 1205:
+ case 1214:
/* Line 1455 of yacc.c */
#line 8380 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28225,7 +28244,7 @@ yyreduce:
}
break;
- case 1206:
+ case 1215:
/* Line 1455 of yacc.c */
#line 8387 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28236,14 +28255,14 @@ yyreduce:
}
break;
- case 1207:
+ case 1216:
/* Line 1455 of yacc.c */
#line 8393 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.item)= (yyvsp[(3) - (4)].item); }
break;
- case 1208:
+ case 1217:
/* Line 1455 of yacc.c */
#line 8395 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28257,7 +28276,7 @@ yyreduce:
}
break;
- case 1209:
+ case 1218:
/* Line 1455 of yacc.c */
#line 8404 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28269,7 +28288,7 @@ yyreduce:
}
break;
- case 1210:
+ case 1219:
/* Line 1455 of yacc.c */
#line 8411 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28282,7 +28301,7 @@ yyreduce:
}
break;
- case 1211:
+ case 1220:
/* Line 1455 of yacc.c */
#line 8419 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28293,7 +28312,7 @@ yyreduce:
}
break;
- case 1212:
+ case 1221:
/* Line 1455 of yacc.c */
#line 8425 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28305,7 +28324,7 @@ yyreduce:
}
break;
- case 1213:
+ case 1222:
/* Line 1455 of yacc.c */
#line 8432 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28316,7 +28335,7 @@ yyreduce:
}
break;
- case 1214:
+ case 1223:
/* Line 1455 of yacc.c */
#line 8438 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28335,7 +28354,7 @@ yyreduce:
}
break;
- case 1215:
+ case 1224:
/* Line 1455 of yacc.c */
#line 8452 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28347,7 +28366,7 @@ yyreduce:
}
break;
- case 1216:
+ case 1225:
/* Line 1455 of yacc.c */
#line 8460 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28358,7 +28377,7 @@ yyreduce:
}
break;
- case 1217:
+ case 1226:
/* Line 1455 of yacc.c */
#line 8475 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28369,7 +28388,7 @@ yyreduce:
}
break;
- case 1218:
+ case 1227:
/* Line 1455 of yacc.c */
#line 8481 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28380,7 +28399,7 @@ yyreduce:
}
break;
- case 1219:
+ case 1228:
/* Line 1455 of yacc.c */
#line 8487 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28393,7 +28412,7 @@ yyreduce:
}
break;
- case 1220:
+ case 1229:
/* Line 1455 of yacc.c */
#line 8495 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28404,7 +28423,7 @@ yyreduce:
}
break;
- case 1221:
+ case 1230:
/* Line 1455 of yacc.c */
#line 8501 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28415,7 +28434,7 @@ yyreduce:
}
break;
- case 1222:
+ case 1231:
/* Line 1455 of yacc.c */
#line 8507 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28426,7 +28445,7 @@ yyreduce:
}
break;
- case 1223:
+ case 1232:
/* Line 1455 of yacc.c */
#line 8513 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28437,7 +28456,7 @@ yyreduce:
}
break;
- case 1224:
+ case 1233:
/* Line 1455 of yacc.c */
#line 8519 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28456,7 +28475,7 @@ yyreduce:
}
break;
- case 1225:
+ case 1234:
/* Line 1455 of yacc.c */
#line 8533 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28472,7 +28491,7 @@ yyreduce:
}
break;
- case 1226:
+ case 1235:
/* Line 1455 of yacc.c */
#line 8544 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28483,7 +28502,7 @@ yyreduce:
}
break;
- case 1227:
+ case 1236:
/* Line 1455 of yacc.c */
#line 8550 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28494,7 +28513,7 @@ yyreduce:
}
break;
- case 1228:
+ case 1237:
/* Line 1455 of yacc.c */
#line 8556 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28505,7 +28524,7 @@ yyreduce:
}
break;
- case 1229:
+ case 1238:
/* Line 1455 of yacc.c */
#line 8562 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28516,7 +28535,7 @@ yyreduce:
}
break;
- case 1230:
+ case 1239:
/* Line 1455 of yacc.c */
#line 8568 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28527,7 +28546,7 @@ yyreduce:
}
break;
- case 1231:
+ case 1240:
/* Line 1455 of yacc.c */
#line 8574 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28538,7 +28557,7 @@ yyreduce:
}
break;
- case 1232:
+ case 1241:
/* Line 1455 of yacc.c */
#line 8580 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28549,7 +28568,7 @@ yyreduce:
}
break;
- case 1233:
+ case 1242:
/* Line 1455 of yacc.c */
#line 8586 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28560,7 +28579,7 @@ yyreduce:
}
break;
- case 1234:
+ case 1243:
/* Line 1455 of yacc.c */
#line 8592 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28571,7 +28590,7 @@ yyreduce:
}
break;
- case 1235:
+ case 1244:
/* Line 1455 of yacc.c */
#line 8598 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28582,7 +28601,7 @@ yyreduce:
}
break;
- case 1236:
+ case 1245:
/* Line 1455 of yacc.c */
#line 8604 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28593,7 +28612,7 @@ yyreduce:
}
break;
- case 1237:
+ case 1246:
/* Line 1455 of yacc.c */
#line 8610 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28604,7 +28623,7 @@ yyreduce:
}
break;
- case 1238:
+ case 1247:
/* Line 1455 of yacc.c */
#line 8616 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28615,7 +28634,7 @@ yyreduce:
}
break;
- case 1239:
+ case 1248:
/* Line 1455 of yacc.c */
#line 8622 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28626,7 +28645,7 @@ yyreduce:
}
break;
- case 1240:
+ case 1249:
/* Line 1455 of yacc.c */
#line 8628 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28637,7 +28656,7 @@ yyreduce:
}
break;
- case 1241:
+ case 1250:
/* Line 1455 of yacc.c */
#line 8634 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28648,7 +28667,7 @@ yyreduce:
}
break;
- case 1242:
+ case 1251:
/* Line 1455 of yacc.c */
#line 8640 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28661,7 +28680,7 @@ yyreduce:
}
break;
- case 1243:
+ case 1252:
/* Line 1455 of yacc.c */
#line 8648 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28672,7 +28691,7 @@ yyreduce:
}
break;
- case 1244:
+ case 1253:
/* Line 1455 of yacc.c */
#line 8669 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28684,7 +28703,7 @@ yyreduce:
}
break;
- case 1245:
+ case 1254:
/* Line 1455 of yacc.c */
#line 8676 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28695,7 +28714,7 @@ yyreduce:
}
break;
- case 1246:
+ case 1255:
/* Line 1455 of yacc.c */
#line 8682 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28707,7 +28726,7 @@ yyreduce:
}
break;
- case 1247:
+ case 1256:
/* Line 1455 of yacc.c */
#line 8689 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28719,7 +28738,7 @@ yyreduce:
}
break;
- case 1248:
+ case 1257:
/* Line 1455 of yacc.c */
#line 8697 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28730,7 +28749,7 @@ yyreduce:
}
break;
- case 1249:
+ case 1258:
/* Line 1455 of yacc.c */
#line 8704 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28741,7 +28760,7 @@ yyreduce:
}
break;
- case 1250:
+ case 1259:
/* Line 1455 of yacc.c */
#line 8710 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28752,7 +28771,7 @@ yyreduce:
}
break;
- case 1251:
+ case 1260:
/* Line 1455 of yacc.c */
#line 8716 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28763,7 +28782,7 @@ yyreduce:
}
break;
- case 1252:
+ case 1261:
/* Line 1455 of yacc.c */
#line 8722 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28775,7 +28794,7 @@ yyreduce:
}
break;
- case 1253:
+ case 1262:
/* Line 1455 of yacc.c */
#line 8729 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28786,7 +28805,7 @@ yyreduce:
}
break;
- case 1254:
+ case 1263:
/* Line 1455 of yacc.c */
#line 8735 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28798,7 +28817,7 @@ yyreduce:
}
break;
- case 1255:
+ case 1264:
/* Line 1455 of yacc.c */
#line 8742 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28809,7 +28828,7 @@ yyreduce:
}
break;
- case 1256:
+ case 1265:
/* Line 1455 of yacc.c */
#line 8748 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28820,7 +28839,7 @@ yyreduce:
}
break;
- case 1257:
+ case 1266:
/* Line 1455 of yacc.c */
#line 8754 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28831,7 +28850,7 @@ yyreduce:
}
break;
- case 1258:
+ case 1267:
/* Line 1455 of yacc.c */
#line 8760 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28842,7 +28861,7 @@ yyreduce:
}
break;
- case 1259:
+ case 1268:
/* Line 1455 of yacc.c */
#line 8766 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28853,7 +28872,7 @@ yyreduce:
}
break;
- case 1260:
+ case 1269:
/* Line 1455 of yacc.c */
#line 8772 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28876,7 +28895,7 @@ yyreduce:
}
break;
- case 1261:
+ case 1270:
/* Line 1455 of yacc.c */
#line 8790 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28887,7 +28906,7 @@ yyreduce:
}
break;
- case 1262:
+ case 1271:
/* Line 1455 of yacc.c */
#line 8796 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28898,7 +28917,7 @@ yyreduce:
}
break;
- case 1263:
+ case 1272:
/* Line 1455 of yacc.c */
#line 8802 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28910,7 +28929,7 @@ yyreduce:
}
break;
- case 1264:
+ case 1273:
/* Line 1455 of yacc.c */
#line 8809 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28922,7 +28941,7 @@ yyreduce:
}
break;
- case 1265:
+ case 1274:
/* Line 1455 of yacc.c */
#line 8816 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28934,7 +28953,7 @@ yyreduce:
}
break;
- case 1266:
+ case 1275:
/* Line 1455 of yacc.c */
#line 8824 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28945,7 +28964,7 @@ yyreduce:
}
break;
- case 1267:
+ case 1276:
/* Line 1455 of yacc.c */
#line 8831 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28956,7 +28975,7 @@ yyreduce:
}
break;
- case 1268:
+ case 1277:
/* Line 1455 of yacc.c */
#line 8838 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28967,7 +28986,7 @@ yyreduce:
}
break;
- case 1269:
+ case 1278:
/* Line 1455 of yacc.c */
#line 8845 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28978,7 +28997,7 @@ yyreduce:
}
break;
- case 1270:
+ case 1279:
/* Line 1455 of yacc.c */
#line 8852 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -28989,7 +29008,7 @@ yyreduce:
}
break;
- case 1271:
+ case 1280:
/* Line 1455 of yacc.c */
#line 8859 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29003,7 +29022,7 @@ yyreduce:
}
break;
- case 1272:
+ case 1281:
/* Line 1455 of yacc.c */
#line 8876 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29014,7 +29033,7 @@ yyreduce:
}
break;
- case 1273:
+ case 1282:
/* Line 1455 of yacc.c */
#line 8882 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29025,7 +29044,7 @@ yyreduce:
}
break;
- case 1274:
+ case 1283:
/* Line 1455 of yacc.c */
#line 8888 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29036,7 +29055,7 @@ yyreduce:
}
break;
- case 1275:
+ case 1284:
/* Line 1455 of yacc.c */
#line 8894 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29047,7 +29066,7 @@ yyreduce:
}
break;
- case 1276:
+ case 1285:
/* Line 1455 of yacc.c */
#line 8900 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29059,7 +29078,7 @@ yyreduce:
}
break;
- case 1277:
+ case 1286:
/* Line 1455 of yacc.c */
#line 8907 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29070,7 +29089,7 @@ yyreduce:
}
break;
- case 1278:
+ case 1287:
/* Line 1455 of yacc.c */
#line 8913 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29081,7 +29100,7 @@ yyreduce:
}
break;
- case 1279:
+ case 1288:
/* Line 1455 of yacc.c */
#line 8919 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29092,7 +29111,7 @@ yyreduce:
}
break;
- case 1280:
+ case 1289:
/* Line 1455 of yacc.c */
#line 8925 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29103,7 +29122,7 @@ yyreduce:
}
break;
- case 1281:
+ case 1290:
/* Line 1455 of yacc.c */
#line 8931 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29114,7 +29133,7 @@ yyreduce:
}
break;
- case 1282:
+ case 1291:
/* Line 1455 of yacc.c */
#line 8937 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29130,7 +29149,7 @@ yyreduce:
}
break;
- case 1283:
+ case 1292:
/* Line 1455 of yacc.c */
#line 8948 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29141,7 +29160,7 @@ yyreduce:
}
break;
- case 1284:
+ case 1293:
/* Line 1455 of yacc.c */
#line 8954 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29152,7 +29171,7 @@ yyreduce:
}
break;
- case 1285:
+ case 1294:
/* Line 1455 of yacc.c */
#line 8960 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29163,7 +29182,7 @@ yyreduce:
}
break;
- case 1286:
+ case 1295:
/* Line 1455 of yacc.c */
#line 8966 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29174,7 +29193,7 @@ yyreduce:
}
break;
- case 1287:
+ case 1296:
/* Line 1455 of yacc.c */
#line 8972 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29190,7 +29209,7 @@ yyreduce:
}
break;
- case 1288:
+ case 1297:
/* Line 1455 of yacc.c */
#line 8983 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29201,7 +29220,7 @@ yyreduce:
}
break;
- case 1289:
+ case 1298:
/* Line 1455 of yacc.c */
#line 8989 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29219,7 +29238,7 @@ yyreduce:
}
break;
- case 1290:
+ case 1299:
/* Line 1455 of yacc.c */
#line 9005 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29230,7 +29249,7 @@ yyreduce:
}
break;
- case 1291:
+ case 1300:
/* Line 1455 of yacc.c */
#line 9011 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29242,7 +29261,7 @@ yyreduce:
}
break;
- case 1292:
+ case 1301:
/* Line 1455 of yacc.c */
#line 9018 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29254,7 +29273,7 @@ yyreduce:
}
break;
- case 1293:
+ case 1302:
/* Line 1455 of yacc.c */
#line 9025 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29266,7 +29285,7 @@ yyreduce:
}
break;
- case 1294:
+ case 1303:
/* Line 1455 of yacc.c */
#line 9032 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29278,7 +29297,7 @@ yyreduce:
}
break;
- case 1295:
+ case 1304:
/* Line 1455 of yacc.c */
#line 9039 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29290,7 +29309,7 @@ yyreduce:
}
break;
- case 1296:
+ case 1305:
/* Line 1455 of yacc.c */
#line 9046 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29299,7 +29318,7 @@ yyreduce:
}
break;
- case 1297:
+ case 1306:
/* Line 1455 of yacc.c */
#line 9050 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29311,7 +29330,7 @@ yyreduce:
}
break;
- case 1298:
+ case 1307:
/* Line 1455 of yacc.c */
#line 9069 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29335,7 +29354,7 @@ yyreduce:
}
break;
- case 1299:
+ case 1308:
/* Line 1455 of yacc.c */
#line 9088 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29393,7 +29412,7 @@ yyreduce:
}
break;
- case 1300:
+ case 1309:
/* Line 1455 of yacc.c */
#line 9141 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29436,63 +29455,63 @@ yyreduce:
}
break;
- case 1301:
+ case 1310:
/* Line 1455 of yacc.c */
#line 9182 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)= (yyvsp[(1) - (2)].num) | (yyvsp[(2) - (2)].num); }
break;
- case 1302:
+ case 1311:
/* Line 1455 of yacc.c */
#line 9184 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)= FT_BOOL; }
break;
- case 1303:
+ case 1312:
/* Line 1455 of yacc.c */
#line 9188 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)= FT_NL; }
break;
- case 1304:
+ case 1313:
/* Line 1455 of yacc.c */
#line 9189 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)= FT_NL; }
break;
- case 1305:
+ case 1314:
/* Line 1455 of yacc.c */
#line 9193 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)= 0; }
break;
- case 1306:
+ case 1315:
/* Line 1455 of yacc.c */
#line 9194 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)= FT_EXPAND; }
break;
- case 1307:
+ case 1316:
/* Line 1455 of yacc.c */
#line 9198 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.item_list)= NULL; }
break;
- case 1308:
+ case 1317:
/* Line 1455 of yacc.c */
#line 9199 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.item_list)= (yyvsp[(1) - (1)].item_list); }
break;
- case 1309:
+ case 1318:
/* Line 1455 of yacc.c */
#line 9204 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29504,7 +29523,7 @@ yyreduce:
}
break;
- case 1310:
+ case 1319:
/* Line 1455 of yacc.c */
#line 9211 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29514,7 +29533,7 @@ yyreduce:
}
break;
- case 1311:
+ case 1320:
/* Line 1455 of yacc.c */
#line 9219 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29543,7 +29562,7 @@ yyreduce:
}
break;
- case 1312:
+ case 1321:
/* Line 1455 of yacc.c */
#line 9246 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29554,7 +29573,7 @@ yyreduce:
}
break;
- case 1313:
+ case 1322:
/* Line 1455 of yacc.c */
#line 9252 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29565,7 +29584,7 @@ yyreduce:
}
break;
- case 1314:
+ case 1323:
/* Line 1455 of yacc.c */
#line 9258 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29576,7 +29595,7 @@ yyreduce:
}
break;
- case 1315:
+ case 1324:
/* Line 1455 of yacc.c */
#line 9264 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29587,7 +29606,7 @@ yyreduce:
}
break;
- case 1316:
+ case 1325:
/* Line 1455 of yacc.c */
#line 9270 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29598,7 +29617,7 @@ yyreduce:
}
break;
- case 1317:
+ case 1326:
/* Line 1455 of yacc.c */
#line 9276 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29612,7 +29631,7 @@ yyreduce:
}
break;
- case 1318:
+ case 1327:
/* Line 1455 of yacc.c */
#line 9285 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29623,21 +29642,21 @@ yyreduce:
}
break;
- case 1319:
+ case 1328:
/* Line 1455 of yacc.c */
#line 9291 "/home/buildbot/git/sql/sql_yacc.yy"
{ Select->in_sum_expr++; }
break;
- case 1320:
+ case 1329:
/* Line 1455 of yacc.c */
#line 9293 "/home/buildbot/git/sql/sql_yacc.yy"
{ Select->in_sum_expr--; }
break;
- case 1321:
+ case 1330:
/* Line 1455 of yacc.c */
#line 9295 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29648,7 +29667,7 @@ yyreduce:
}
break;
- case 1322:
+ case 1331:
/* Line 1455 of yacc.c */
#line 9301 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29659,7 +29678,7 @@ yyreduce:
}
break;
- case 1323:
+ case 1332:
/* Line 1455 of yacc.c */
#line 9312 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29670,7 +29689,7 @@ yyreduce:
}
break;
- case 1324:
+ case 1333:
/* Line 1455 of yacc.c */
#line 9318 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29681,7 +29700,7 @@ yyreduce:
}
break;
- case 1325:
+ case 1334:
/* Line 1455 of yacc.c */
#line 9324 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29692,7 +29711,7 @@ yyreduce:
}
break;
- case 1326:
+ case 1335:
/* Line 1455 of yacc.c */
#line 9330 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29703,7 +29722,7 @@ yyreduce:
}
break;
- case 1327:
+ case 1336:
/* Line 1455 of yacc.c */
#line 9336 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29714,7 +29733,7 @@ yyreduce:
}
break;
- case 1328:
+ case 1337:
/* Line 1455 of yacc.c */
#line 9342 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29725,7 +29744,7 @@ yyreduce:
}
break;
- case 1329:
+ case 1338:
/* Line 1455 of yacc.c */
#line 9348 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29736,7 +29755,7 @@ yyreduce:
}
break;
- case 1330:
+ case 1339:
/* Line 1455 of yacc.c */
#line 9354 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29747,7 +29766,7 @@ yyreduce:
}
break;
- case 1331:
+ case 1340:
/* Line 1455 of yacc.c */
#line 9360 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29758,14 +29777,14 @@ yyreduce:
}
break;
- case 1332:
+ case 1341:
/* Line 1455 of yacc.c */
#line 9366 "/home/buildbot/git/sql/sql_yacc.yy"
{ Select->in_sum_expr++; }
break;
- case 1333:
+ case 1342:
/* Line 1455 of yacc.c */
#line 9370 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29782,7 +29801,7 @@ yyreduce:
}
break;
- case 1334:
+ case 1343:
/* Line 1455 of yacc.c */
#line 9385 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29795,7 +29814,7 @@ yyreduce:
}
break;
- case 1335:
+ case 1344:
/* Line 1455 of yacc.c */
#line 9393 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29804,7 +29823,7 @@ yyreduce:
}
break;
- case 1336:
+ case 1345:
/* Line 1455 of yacc.c */
#line 9400 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29819,7 +29838,7 @@ yyreduce:
}
break;
- case 1337:
+ case 1346:
/* Line 1455 of yacc.c */
#line 9410 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29832,7 +29851,7 @@ yyreduce:
}
break;
- case 1338:
+ case 1347:
/* Line 1455 of yacc.c */
#line 9418 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29850,21 +29869,21 @@ yyreduce:
}
break;
- case 1339:
+ case 1348:
/* Line 1455 of yacc.c */
#line 9433 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num) = 0; }
break;
- case 1340:
+ case 1349:
/* Line 1455 of yacc.c */
#line 9434 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num) = 1; }
break;
- case 1341:
+ case 1350:
/* Line 1455 of yacc.c */
#line 9439 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29875,14 +29894,14 @@ yyreduce:
}
break;
- case 1342:
+ case 1351:
/* Line 1455 of yacc.c */
#line 9444 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.string) = (yyvsp[(2) - (2)].string); }
break;
- case 1344:
+ case 1353:
/* Line 1455 of yacc.c */
#line 9450 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29900,21 +29919,21 @@ yyreduce:
}
break;
- case 1346:
+ case 1355:
/* Line 1455 of yacc.c */
#line 9467 "/home/buildbot/git/sql/sql_yacc.yy"
{ if (add_gorder_to_list(thd, (yyvsp[(3) - (4)].item),(bool) (yyvsp[(4) - (4)].num))) MYSQL_YYABORT; }
break;
- case 1347:
+ case 1356:
/* Line 1455 of yacc.c */
#line 9469 "/home/buildbot/git/sql/sql_yacc.yy"
{ if (add_gorder_to_list(thd, (yyvsp[(1) - (2)].item),(bool) (yyvsp[(2) - (2)].num))) MYSQL_YYABORT; }
break;
- case 1348:
+ case 1357:
/* Line 1455 of yacc.c */
#line 9474 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29928,7 +29947,7 @@ yyreduce:
}
break;
- case 1349:
+ case 1358:
/* Line 1455 of yacc.c */
#line 9483 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -29938,70 +29957,70 @@ yyreduce:
}
break;
- case 1350:
+ case 1359:
/* Line 1455 of yacc.c */
#line 9491 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.cast_type)=ITEM_CAST_CHAR; Lex->charset= &my_charset_bin; Lex->dec= 0; }
break;
- case 1351:
+ case 1360:
/* Line 1455 of yacc.c */
#line 9493 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.cast_type)=ITEM_CAST_CHAR; Lex->dec= 0; }
break;
- case 1352:
+ case 1361:
/* Line 1455 of yacc.c */
#line 9495 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.cast_type)=ITEM_CAST_CHAR; Lex->charset= national_charset_info; Lex->dec=0; }
break;
- case 1353:
+ case 1362:
/* Line 1455 of yacc.c */
#line 9497 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.cast_type)=ITEM_CAST_SIGNED_INT; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; }
break;
- case 1354:
+ case 1363:
/* Line 1455 of yacc.c */
#line 9499 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.cast_type)=ITEM_CAST_SIGNED_INT; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; }
break;
- case 1355:
+ case 1364:
/* Line 1455 of yacc.c */
#line 9501 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.cast_type)=ITEM_CAST_SIGNED_INT; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; }
break;
- case 1356:
+ case 1365:
/* Line 1455 of yacc.c */
#line 9503 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.cast_type)=ITEM_CAST_UNSIGNED_INT; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; }
break;
- case 1357:
+ case 1366:
/* Line 1455 of yacc.c */
#line 9505 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.cast_type)=ITEM_CAST_UNSIGNED_INT; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; }
break;
- case 1358:
+ case 1367:
/* Line 1455 of yacc.c */
#line 9507 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.cast_type)=ITEM_CAST_DATE; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; }
break;
- case 1359:
+ case 1368:
/* Line 1455 of yacc.c */
#line 9509 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30012,7 +30031,7 @@ yyreduce:
}
break;
- case 1360:
+ case 1369:
/* Line 1455 of yacc.c */
#line 9515 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30023,42 +30042,42 @@ yyreduce:
}
break;
- case 1361:
+ case 1370:
/* Line 1455 of yacc.c */
#line 9521 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.cast_type)=ITEM_CAST_DECIMAL; Lex->charset= NULL; }
break;
- case 1362:
+ case 1371:
/* Line 1455 of yacc.c */
#line 9523 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->charset= NULL; Lex->length= Lex->dec= 0;}
break;
- case 1363:
+ case 1372:
/* Line 1455 of yacc.c */
#line 9525 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.cast_type)=ITEM_CAST_DOUBLE; }
break;
- case 1364:
+ case 1373:
/* Line 1455 of yacc.c */
#line 9528 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.item_list)= NULL; }
break;
- case 1365:
+ case 1374:
/* Line 1455 of yacc.c */
#line 9529 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.item_list)= (yyvsp[(1) - (1)].item_list);}
break;
- case 1366:
+ case 1375:
/* Line 1455 of yacc.c */
#line 9534 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30070,7 +30089,7 @@ yyreduce:
}
break;
- case 1367:
+ case 1376:
/* Line 1455 of yacc.c */
#line 9541 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30080,21 +30099,21 @@ yyreduce:
}
break;
- case 1368:
+ case 1377:
/* Line 1455 of yacc.c */
#line 9548 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.item_list)= (yyvsp[(1) - (1)].item_list); }
break;
- case 1369:
+ case 1378:
/* Line 1455 of yacc.c */
#line 9549 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.item_list)= (yyvsp[(2) - (3)].item_list); }
break;
- case 1370:
+ case 1379:
/* Line 1455 of yacc.c */
#line 9554 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30106,7 +30125,7 @@ yyreduce:
}
break;
- case 1371:
+ case 1380:
/* Line 1455 of yacc.c */
#line 9561 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30116,35 +30135,35 @@ yyreduce:
}
break;
- case 1372:
+ case 1381:
/* Line 1455 of yacc.c */
#line 9568 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.item)= NULL; }
break;
- case 1373:
+ case 1382:
/* Line 1455 of yacc.c */
#line 9569 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.item)= (yyvsp[(1) - (1)].item); }
break;
- case 1374:
+ case 1383:
/* Line 1455 of yacc.c */
#line 9573 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.item)= NULL; }
break;
- case 1375:
+ case 1384:
/* Line 1455 of yacc.c */
#line 9574 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.item)= (yyvsp[(2) - (2)].item); }
break;
- case 1376:
+ case 1385:
/* Line 1455 of yacc.c */
#line 9579 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30157,7 +30176,7 @@ yyreduce:
}
break;
- case 1377:
+ case 1386:
/* Line 1455 of yacc.c */
#line 9587 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30168,14 +30187,14 @@ yyreduce:
}
break;
- case 1378:
+ case 1387:
/* Line 1455 of yacc.c */
#line 9597 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.table_list)=(yyvsp[(1) - (1)].table_list); }
break;
- case 1379:
+ case 1388:
/* Line 1455 of yacc.c */
#line 9599 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30189,35 +30208,35 @@ yyreduce:
}
break;
- case 1380:
+ case 1389:
/* Line 1455 of yacc.c */
#line 9610 "/home/buildbot/git/sql/sql_yacc.yy"
{ MYSQL_YYABORT_UNLESS((yyval.table_list)=(yyvsp[(1) - (1)].table_list)); }
break;
- case 1381:
+ case 1390:
/* Line 1455 of yacc.c */
#line 9621 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.table_list)=(yyvsp[(1) - (1)].table_list); }
break;
- case 1382:
+ case 1391:
/* Line 1455 of yacc.c */
#line 9622 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.table_list)=(yyvsp[(3) - (4)].table_list); }
break;
- case 1383:
+ case 1392:
/* Line 1455 of yacc.c */
#line 9628 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.table_list)=(yyvsp[(1) - (1)].table_list); }
break;
- case 1384:
+ case 1393:
/* Line 1455 of yacc.c */
#line 9630 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30226,21 +30245,21 @@ yyreduce:
}
break;
- case 1385:
+ case 1394:
/* Line 1455 of yacc.c */
#line 9650 "/home/buildbot/git/sql/sql_yacc.yy"
{ MYSQL_YYABORT_UNLESS((yyvsp[(1) - (3)].table_list) && ((yyval.table_list)=(yyvsp[(3) - (3)].table_list))); }
break;
- case 1386:
+ case 1395:
/* Line 1455 of yacc.c */
#line 9652 "/home/buildbot/git/sql/sql_yacc.yy"
{ MYSQL_YYABORT_UNLESS((yyvsp[(1) - (3)].table_list) && ((yyval.table_list)=(yyvsp[(3) - (3)].table_list))); (yyvsp[(3) - (3)].table_list)->straight=1; }
break;
- case 1387:
+ case 1396:
/* Line 1455 of yacc.c */
#line 9655 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30253,7 +30272,7 @@ yyreduce:
}
break;
- case 1388:
+ case 1397:
/* Line 1455 of yacc.c */
#line 9663 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30264,7 +30283,7 @@ yyreduce:
}
break;
- case 1389:
+ case 1398:
/* Line 1455 of yacc.c */
#line 9670 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30277,7 +30296,7 @@ yyreduce:
}
break;
- case 1390:
+ case 1399:
/* Line 1455 of yacc.c */
#line 9678 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30289,7 +30308,7 @@ yyreduce:
}
break;
- case 1391:
+ case 1400:
/* Line 1455 of yacc.c */
#line 9686 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30298,14 +30317,14 @@ yyreduce:
}
break;
- case 1392:
+ case 1401:
/* Line 1455 of yacc.c */
#line 9690 "/home/buildbot/git/sql/sql_yacc.yy"
{ add_join_natural((yyvsp[(1) - (8)].table_list),(yyvsp[(3) - (8)].table_list),(yyvsp[(7) - (8)].string_list),Select); (yyval.table_list)=(yyvsp[(3) - (8)].table_list); }
break;
- case 1393:
+ case 1402:
/* Line 1455 of yacc.c */
#line 9692 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30315,7 +30334,7 @@ yyreduce:
}
break;
- case 1394:
+ case 1403:
/* Line 1455 of yacc.c */
#line 9700 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30328,7 +30347,7 @@ yyreduce:
}
break;
- case 1395:
+ case 1404:
/* Line 1455 of yacc.c */
#line 9708 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30341,7 +30360,7 @@ yyreduce:
}
break;
- case 1396:
+ case 1405:
/* Line 1455 of yacc.c */
#line 9716 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30350,7 +30369,7 @@ yyreduce:
}
break;
- case 1397:
+ case 1406:
/* Line 1455 of yacc.c */
#line 9720 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30361,7 +30380,7 @@ yyreduce:
}
break;
- case 1398:
+ case 1407:
/* Line 1455 of yacc.c */
#line 9726 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30373,7 +30392,7 @@ yyreduce:
}
break;
- case 1399:
+ case 1408:
/* Line 1455 of yacc.c */
#line 9736 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30386,7 +30405,7 @@ yyreduce:
}
break;
- case 1400:
+ case 1409:
/* Line 1455 of yacc.c */
#line 9744 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30400,7 +30419,7 @@ yyreduce:
}
break;
- case 1401:
+ case 1410:
/* Line 1455 of yacc.c */
#line 9753 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30409,7 +30428,7 @@ yyreduce:
}
break;
- case 1402:
+ case 1411:
/* Line 1455 of yacc.c */
#line 9757 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30421,7 +30440,7 @@ yyreduce:
}
break;
- case 1403:
+ case 1412:
/* Line 1455 of yacc.c */
#line 9764 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30434,28 +30453,28 @@ yyreduce:
}
break;
- case 1404:
+ case 1413:
/* Line 1455 of yacc.c */
#line 9774 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1405:
+ case 1414:
/* Line 1455 of yacc.c */
#line 9775 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1406:
+ case 1415:
/* Line 1455 of yacc.c */
#line 9776 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1407:
+ case 1416:
/* Line 1455 of yacc.c */
#line 9788 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30465,7 +30484,7 @@ yyreduce:
}
break;
- case 1408:
+ case 1417:
/* Line 1455 of yacc.c */
#line 9793 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30480,7 +30499,7 @@ yyreduce:
}
break;
- case 1409:
+ case 1418:
/* Line 1455 of yacc.c */
#line 9803 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30507,7 +30526,7 @@ yyreduce:
}
break;
- case 1410:
+ case 1419:
/* Line 1455 of yacc.c */
#line 9843 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30566,7 +30585,7 @@ yyreduce:
}
break;
- case 1411:
+ case 1420:
/* Line 1455 of yacc.c */
#line 9919 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30579,7 +30598,7 @@ yyreduce:
}
break;
- case 1412:
+ case 1421:
/* Line 1455 of yacc.c */
#line 9929 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30589,7 +30608,7 @@ yyreduce:
}
break;
- case 1413:
+ case 1422:
/* Line 1455 of yacc.c */
#line 9934 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30602,7 +30621,7 @@ yyreduce:
}
break;
- case 1414:
+ case 1423:
/* Line 1455 of yacc.c */
#line 9942 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30615,7 +30634,7 @@ yyreduce:
}
break;
- case 1415:
+ case 1424:
/* Line 1455 of yacc.c */
#line 9954 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30636,7 +30655,7 @@ yyreduce:
}
break;
- case 1416:
+ case 1425:
/* Line 1455 of yacc.c */
#line 9973 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30649,7 +30668,7 @@ yyreduce:
}
break;
- case 1417:
+ case 1426:
/* Line 1455 of yacc.c */
#line 9981 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30658,7 +30677,7 @@ yyreduce:
}
break;
- case 1419:
+ case 1428:
/* Line 1455 of yacc.c */
#line 9990 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30669,7 +30688,7 @@ yyreduce:
}
break;
- case 1420:
+ case 1429:
/* Line 1455 of yacc.c */
#line 9996 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30688,7 +30707,7 @@ yyreduce:
}
break;
- case 1421:
+ case 1430:
/* Line 1455 of yacc.c */
#line 10012 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30710,7 +30729,7 @@ yyreduce:
}
break;
- case 1422:
+ case 1431:
/* Line 1455 of yacc.c */
#line 10029 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30719,14 +30738,14 @@ yyreduce:
}
break;
- case 1424:
+ case 1433:
/* Line 1455 of yacc.c */
#line 10036 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.select_lex)= Select; }
break;
- case 1425:
+ case 1434:
/* Line 1455 of yacc.c */
#line 10041 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30754,21 +30773,21 @@ yyreduce:
}
break;
- case 1426:
+ case 1435:
/* Line 1455 of yacc.c */
#line 10066 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1427:
+ case 1436:
/* Line 1455 of yacc.c */
#line 10067 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1428:
+ case 1437:
/* Line 1455 of yacc.c */
#line 10072 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30777,42 +30796,42 @@ yyreduce:
}
break;
- case 1429:
+ case 1438:
/* Line 1455 of yacc.c */
#line 10075 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)= INDEX_HINT_MASK_JOIN; }
break;
- case 1430:
+ case 1439:
/* Line 1455 of yacc.c */
#line 10076 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)= INDEX_HINT_MASK_ORDER; }
break;
- case 1431:
+ case 1440:
/* Line 1455 of yacc.c */
#line 10077 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)= INDEX_HINT_MASK_GROUP; }
break;
- case 1432:
+ case 1441:
/* Line 1455 of yacc.c */
#line 10081 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.index_hint)= INDEX_HINT_FORCE; }
break;
- case 1433:
+ case 1442:
/* Line 1455 of yacc.c */
#line 10082 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.index_hint)= INDEX_HINT_IGNORE; }
break;
- case 1434:
+ case 1443:
/* Line 1455 of yacc.c */
#line 10087 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30821,7 +30840,7 @@ yyreduce:
}
break;
- case 1436:
+ case 1445:
/* Line 1455 of yacc.c */
#line 10092 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30830,49 +30849,49 @@ yyreduce:
}
break;
- case 1441:
+ case 1450:
/* Line 1455 of yacc.c */
#line 10105 "/home/buildbot/git/sql/sql_yacc.yy"
{ Select->alloc_index_hints(thd); }
break;
- case 1443:
+ case 1452:
/* Line 1455 of yacc.c */
#line 10109 "/home/buildbot/git/sql/sql_yacc.yy"
{ Select->clear_index_hints(); }
break;
- case 1445:
+ case 1454:
/* Line 1455 of yacc.c */
#line 10114 "/home/buildbot/git/sql/sql_yacc.yy"
{ Select->add_index_hint(thd, NULL, 0); }
break;
- case 1446:
+ case 1455:
/* Line 1455 of yacc.c */
#line 10115 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1447:
+ case 1456:
/* Line 1455 of yacc.c */
#line 10120 "/home/buildbot/git/sql/sql_yacc.yy"
{ Select->add_index_hint(thd, (yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length); }
break;
- case 1448:
+ case 1457:
/* Line 1455 of yacc.c */
#line 10122 "/home/buildbot/git/sql/sql_yacc.yy"
{ Select->add_index_hint(thd, (char *)"PRIMARY", 7); }
break;
- case 1451:
+ case 1460:
/* Line 1455 of yacc.c */
#line 10132 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30888,7 +30907,7 @@ yyreduce:
}
break;
- case 1452:
+ case 1461:
/* Line 1455 of yacc.c */
#line 10143 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -30903,189 +30922,189 @@ yyreduce:
}
break;
- case 1453:
+ case 1462:
/* Line 1455 of yacc.c */
#line 10155 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1454:
+ case 1463:
/* Line 1455 of yacc.c */
#line 10156 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.interval)=INTERVAL_DAY_HOUR; }
break;
- case 1455:
+ case 1464:
/* Line 1455 of yacc.c */
#line 10157 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.interval)=INTERVAL_DAY_MICROSECOND; }
break;
- case 1456:
+ case 1465:
/* Line 1455 of yacc.c */
#line 10158 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.interval)=INTERVAL_DAY_MINUTE; }
break;
- case 1457:
+ case 1466:
/* Line 1455 of yacc.c */
#line 10159 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.interval)=INTERVAL_DAY_SECOND; }
break;
- case 1458:
+ case 1467:
/* Line 1455 of yacc.c */
#line 10160 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.interval)=INTERVAL_HOUR_MICROSECOND; }
break;
- case 1459:
+ case 1468:
/* Line 1455 of yacc.c */
#line 10161 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.interval)=INTERVAL_HOUR_MINUTE; }
break;
- case 1460:
+ case 1469:
/* Line 1455 of yacc.c */
#line 10162 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.interval)=INTERVAL_HOUR_SECOND; }
break;
- case 1461:
+ case 1470:
/* Line 1455 of yacc.c */
#line 10163 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.interval)=INTERVAL_MINUTE_MICROSECOND; }
break;
- case 1462:
+ case 1471:
/* Line 1455 of yacc.c */
#line 10164 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.interval)=INTERVAL_MINUTE_SECOND; }
break;
- case 1463:
+ case 1472:
/* Line 1455 of yacc.c */
#line 10165 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.interval)=INTERVAL_SECOND_MICROSECOND; }
break;
- case 1464:
+ case 1473:
/* Line 1455 of yacc.c */
#line 10166 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.interval)=INTERVAL_YEAR_MONTH; }
break;
- case 1465:
+ case 1474:
/* Line 1455 of yacc.c */
#line 10170 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.interval_time_st)=INTERVAL_DAY; }
break;
- case 1466:
+ case 1475:
/* Line 1455 of yacc.c */
#line 10171 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.interval_time_st)=INTERVAL_WEEK; }
break;
- case 1467:
+ case 1476:
/* Line 1455 of yacc.c */
#line 10172 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.interval_time_st)=INTERVAL_HOUR; }
break;
- case 1468:
+ case 1477:
/* Line 1455 of yacc.c */
#line 10173 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.interval_time_st)=INTERVAL_MINUTE; }
break;
- case 1469:
+ case 1478:
/* Line 1455 of yacc.c */
#line 10174 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.interval_time_st)=INTERVAL_MONTH; }
break;
- case 1470:
+ case 1479:
/* Line 1455 of yacc.c */
#line 10175 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.interval_time_st)=INTERVAL_QUARTER; }
break;
- case 1471:
+ case 1480:
/* Line 1455 of yacc.c */
#line 10176 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.interval_time_st)=INTERVAL_SECOND; }
break;
- case 1472:
+ case 1481:
/* Line 1455 of yacc.c */
#line 10177 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.interval_time_st)=INTERVAL_MICROSECOND; }
break;
- case 1473:
+ case 1482:
/* Line 1455 of yacc.c */
#line 10178 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.interval_time_st)=INTERVAL_YEAR; }
break;
- case 1474:
+ case 1483:
/* Line 1455 of yacc.c */
#line 10182 "/home/buildbot/git/sql/sql_yacc.yy"
{(yyval.date_time_type)=MYSQL_TIMESTAMP_DATE;}
break;
- case 1475:
+ case 1484:
/* Line 1455 of yacc.c */
#line 10183 "/home/buildbot/git/sql/sql_yacc.yy"
{(yyval.date_time_type)=MYSQL_TIMESTAMP_TIME;}
break;
- case 1476:
+ case 1485:
/* Line 1455 of yacc.c */
#line 10184 "/home/buildbot/git/sql/sql_yacc.yy"
{(yyval.date_time_type)=MYSQL_TIMESTAMP_DATETIME;}
break;
- case 1477:
+ case 1486:
/* Line 1455 of yacc.c */
#line 10185 "/home/buildbot/git/sql/sql_yacc.yy"
{(yyval.date_time_type)=MYSQL_TIMESTAMP_DATETIME;}
break;
- case 1481:
+ case 1490:
/* Line 1455 of yacc.c */
#line 10195 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.lex_str_ptr)=0; }
break;
- case 1482:
+ case 1491:
/* Line 1455 of yacc.c */
#line 10197 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -31096,14 +31115,14 @@ yyreduce:
}
break;
- case 1485:
+ case 1494:
/* Line 1455 of yacc.c */
#line 10210 "/home/buildbot/git/sql/sql_yacc.yy"
{ Select->where= 0; }
break;
- case 1486:
+ case 1495:
/* Line 1455 of yacc.c */
#line 10212 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -31112,7 +31131,7 @@ yyreduce:
}
break;
- case 1487:
+ case 1496:
/* Line 1455 of yacc.c */
#line 10216 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -31125,7 +31144,7 @@ yyreduce:
}
break;
- case 1489:
+ case 1498:
/* Line 1455 of yacc.c */
#line 10228 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -31134,7 +31153,7 @@ yyreduce:
}
break;
- case 1490:
+ case 1499:
/* Line 1455 of yacc.c */
#line 10232 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -31147,7 +31166,7 @@ yyreduce:
}
break;
- case 1491:
+ case 1500:
/* Line 1455 of yacc.c */
#line 10243 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -31157,7 +31176,7 @@ yyreduce:
}
break;
- case 1492:
+ case 1501:
/* Line 1455 of yacc.c */
#line 10248 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -31171,28 +31190,28 @@ yyreduce:
}
break;
- case 1495:
+ case 1504:
/* Line 1455 of yacc.c */
#line 10269 "/home/buildbot/git/sql/sql_yacc.yy"
{ if (add_group_to_list(thd, (yyvsp[(3) - (4)].item),(bool) (yyvsp[(4) - (4)].num))) MYSQL_YYABORT; }
break;
- case 1496:
+ case 1505:
/* Line 1455 of yacc.c */
#line 10271 "/home/buildbot/git/sql/sql_yacc.yy"
{ if (add_group_to_list(thd, (yyvsp[(1) - (2)].item),(bool) (yyvsp[(2) - (2)].num))) MYSQL_YYABORT; }
break;
- case 1497:
+ case 1506:
/* Line 1455 of yacc.c */
#line 10275 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1498:
+ case 1507:
/* Line 1455 of yacc.c */
#line 10277 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -31217,7 +31236,7 @@ yyreduce:
}
break;
- case 1499:
+ case 1508:
/* Line 1455 of yacc.c */
#line 10297 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -31240,7 +31259,7 @@ yyreduce:
}
break;
- case 1503:
+ case 1512:
/* Line 1455 of yacc.c */
#line 10331 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -31251,7 +31270,7 @@ yyreduce:
}
break;
- case 1506:
+ case 1515:
/* Line 1455 of yacc.c */
#line 10349 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -31287,42 +31306,42 @@ yyreduce:
}
break;
- case 1508:
+ case 1517:
/* Line 1455 of yacc.c */
#line 10384 "/home/buildbot/git/sql/sql_yacc.yy"
{ if (add_order_to_list(thd, (yyvsp[(3) - (4)].item),(bool) (yyvsp[(4) - (4)].num))) MYSQL_YYABORT; }
break;
- case 1509:
+ case 1518:
/* Line 1455 of yacc.c */
#line 10386 "/home/buildbot/git/sql/sql_yacc.yy"
{ if (add_order_to_list(thd, (yyvsp[(1) - (2)].item),(bool) (yyvsp[(2) - (2)].num))) MYSQL_YYABORT; }
break;
- case 1510:
+ case 1519:
/* Line 1455 of yacc.c */
#line 10390 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num) = 1; }
break;
- case 1511:
+ case 1520:
/* Line 1455 of yacc.c */
#line 10391 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num) =1; }
break;
- case 1512:
+ case 1521:
/* Line 1455 of yacc.c */
#line 10392 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num) =0; }
break;
- case 1513:
+ case 1522:
/* Line 1455 of yacc.c */
#line 10397 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -31335,28 +31354,28 @@ yyreduce:
}
break;
- case 1514:
+ case 1523:
/* Line 1455 of yacc.c */
#line 10404 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1515:
+ case 1524:
/* Line 1455 of yacc.c */
#line 10408 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1516:
+ case 1525:
/* Line 1455 of yacc.c */
#line 10409 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1517:
+ case 1526:
/* Line 1455 of yacc.c */
#line 10414 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -31365,7 +31384,7 @@ yyreduce:
}
break;
- case 1518:
+ case 1527:
/* Line 1455 of yacc.c */
#line 10418 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -31374,7 +31393,7 @@ yyreduce:
}
break;
- case 1519:
+ case 1528:
/* Line 1455 of yacc.c */
#line 10422 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -31383,7 +31402,7 @@ yyreduce:
}
break;
- case 1520:
+ case 1529:
/* Line 1455 of yacc.c */
#line 10429 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -31395,7 +31414,7 @@ yyreduce:
}
break;
- case 1521:
+ case 1530:
/* Line 1455 of yacc.c */
#line 10436 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -31407,7 +31426,7 @@ yyreduce:
}
break;
- case 1522:
+ case 1531:
/* Line 1455 of yacc.c */
#line 10443 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -31419,7 +31438,7 @@ yyreduce:
}
break;
- case 1523:
+ case 1532:
/* Line 1455 of yacc.c */
#line 10453 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -31457,7 +31476,7 @@ yyreduce:
}
break;
- case 1524:
+ case 1533:
/* Line 1455 of yacc.c */
#line 10486 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -31466,7 +31485,7 @@ yyreduce:
}
break;
- case 1525:
+ case 1534:
/* Line 1455 of yacc.c */
#line 10490 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -31477,7 +31496,7 @@ yyreduce:
}
break;
- case 1526:
+ case 1535:
/* Line 1455 of yacc.c */
#line 10496 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -31488,7 +31507,7 @@ yyreduce:
}
break;
- case 1527:
+ case 1536:
/* Line 1455 of yacc.c */
#line 10502 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -31499,7 +31518,7 @@ yyreduce:
}
break;
- case 1528:
+ case 1537:
/* Line 1455 of yacc.c */
#line 10511 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -31509,7 +31528,7 @@ yyreduce:
}
break;
- case 1529:
+ case 1538:
/* Line 1455 of yacc.c */
#line 10518 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -31519,7 +31538,7 @@ yyreduce:
}
break;
- case 1530:
+ case 1539:
/* Line 1455 of yacc.c */
#line 10523 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -31531,210 +31550,210 @@ yyreduce:
}
break;
- case 1531:
+ case 1540:
/* Line 1455 of yacc.c */
#line 10529 "/home/buildbot/git/sql/sql_yacc.yy"
{ my_parse_error(ER(ER_SYNTAX_ERROR)); MYSQL_YYABORT; }
break;
- case 1532:
+ case 1541:
/* Line 1455 of yacc.c */
#line 10530 "/home/buildbot/git/sql/sql_yacc.yy"
{ my_parse_error(ER(ER_SYNTAX_ERROR)); MYSQL_YYABORT; }
break;
- case 1533:
+ case 1542:
/* Line 1455 of yacc.c */
#line 10534 "/home/buildbot/git/sql/sql_yacc.yy"
{ int error; (yyval.num)= (int) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
break;
- case 1534:
+ case 1543:
/* Line 1455 of yacc.c */
#line 10535 "/home/buildbot/git/sql/sql_yacc.yy"
{ int error; (yyval.num)= -(int) my_strtoll10((yyvsp[(2) - (2)].lex_str).str, (char**) 0, &error); }
break;
- case 1535:
+ case 1544:
/* Line 1455 of yacc.c */
#line 10536 "/home/buildbot/git/sql/sql_yacc.yy"
{ int error; (yyval.num)= -(int) my_strtoll10((yyvsp[(2) - (2)].lex_str).str, (char**) 0, &error); }
break;
- case 1536:
+ case 1545:
/* Line 1455 of yacc.c */
#line 10540 "/home/buildbot/git/sql/sql_yacc.yy"
{ int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
break;
- case 1537:
+ case 1546:
/* Line 1455 of yacc.c */
#line 10541 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.ulong_num)= (ulong) strtol((yyvsp[(1) - (1)].lex_str).str, (char**) 0, 16); }
break;
- case 1538:
+ case 1547:
/* Line 1455 of yacc.c */
#line 10542 "/home/buildbot/git/sql/sql_yacc.yy"
{ int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
break;
- case 1539:
+ case 1548:
/* Line 1455 of yacc.c */
#line 10543 "/home/buildbot/git/sql/sql_yacc.yy"
{ int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
break;
- case 1540:
+ case 1549:
/* Line 1455 of yacc.c */
#line 10544 "/home/buildbot/git/sql/sql_yacc.yy"
{ int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
break;
- case 1541:
+ case 1550:
/* Line 1455 of yacc.c */
#line 10545 "/home/buildbot/git/sql/sql_yacc.yy"
{ int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
break;
- case 1542:
+ case 1551:
/* Line 1455 of yacc.c */
#line 10549 "/home/buildbot/git/sql/sql_yacc.yy"
{ int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
break;
- case 1543:
+ case 1552:
/* Line 1455 of yacc.c */
#line 10550 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.ulong_num)= (ulong) strtol((yyvsp[(1) - (1)].lex_str).str, (char**) 0, 16); }
break;
- case 1544:
+ case 1553:
/* Line 1455 of yacc.c */
#line 10551 "/home/buildbot/git/sql/sql_yacc.yy"
{ int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
break;
- case 1545:
+ case 1554:
/* Line 1455 of yacc.c */
#line 10552 "/home/buildbot/git/sql/sql_yacc.yy"
{ int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
break;
- case 1546:
+ case 1555:
/* Line 1455 of yacc.c */
#line 10553 "/home/buildbot/git/sql/sql_yacc.yy"
{ MYSQL_YYABORT; }
break;
- case 1547:
+ case 1556:
/* Line 1455 of yacc.c */
#line 10557 "/home/buildbot/git/sql/sql_yacc.yy"
{ int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
break;
- case 1548:
+ case 1557:
/* Line 1455 of yacc.c */
#line 10558 "/home/buildbot/git/sql/sql_yacc.yy"
{ int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
break;
- case 1549:
+ case 1558:
/* Line 1455 of yacc.c */
#line 10559 "/home/buildbot/git/sql/sql_yacc.yy"
{ int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
break;
- case 1550:
+ case 1559:
/* Line 1455 of yacc.c */
#line 10560 "/home/buildbot/git/sql/sql_yacc.yy"
{ int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
break;
- case 1551:
+ case 1560:
/* Line 1455 of yacc.c */
#line 10561 "/home/buildbot/git/sql/sql_yacc.yy"
{ int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
break;
- case 1552:
+ case 1561:
/* Line 1455 of yacc.c */
#line 10565 "/home/buildbot/git/sql/sql_yacc.yy"
{ int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
break;
- case 1553:
+ case 1562:
/* Line 1455 of yacc.c */
#line 10566 "/home/buildbot/git/sql/sql_yacc.yy"
{ int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
break;
- case 1554:
+ case 1563:
/* Line 1455 of yacc.c */
#line 10567 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.ulonglong_number)= strtoull((yyvsp[(1) - (1)].lex_str).str, (char**) 0, 16); }
break;
- case 1555:
+ case 1564:
/* Line 1455 of yacc.c */
#line 10568 "/home/buildbot/git/sql/sql_yacc.yy"
{ int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
break;
- case 1556:
+ case 1565:
/* Line 1455 of yacc.c */
#line 10569 "/home/buildbot/git/sql/sql_yacc.yy"
{ MYSQL_YYABORT; }
break;
- case 1557:
+ case 1566:
/* Line 1455 of yacc.c */
#line 10574 "/home/buildbot/git/sql/sql_yacc.yy"
{ my_parse_error(ER(ER_ONLY_INTEGERS_ALLOWED)); }
break;
- case 1560:
+ case 1569:
/* Line 1455 of yacc.c */
#line 10583 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.choice)= (yyvsp[(1) - (1)].ulong_num) != 0 ? HA_CHOICE_YES : HA_CHOICE_NO; }
break;
- case 1561:
+ case 1570:
/* Line 1455 of yacc.c */
#line 10584 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.choice)= HA_CHOICE_UNDEF; }
break;
- case 1563:
+ case 1572:
/* Line 1455 of yacc.c */
#line 10590 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -31766,21 +31785,21 @@ yyreduce:
}
break;
- case 1565:
+ case 1574:
/* Line 1455 of yacc.c */
#line 10620 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1566:
+ case 1575:
/* Line 1455 of yacc.c */
#line 10621 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1569:
+ case 1578:
/* Line 1455 of yacc.c */
#line 10631 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -31792,7 +31811,7 @@ yyreduce:
}
break;
- case 1570:
+ case 1579:
/* Line 1455 of yacc.c */
#line 10640 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -31803,21 +31822,21 @@ yyreduce:
}
break;
- case 1571:
+ case 1580:
/* Line 1455 of yacc.c */
#line 10646 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1573:
+ case 1582:
/* Line 1455 of yacc.c */
#line 10651 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1574:
+ case 1583:
/* Line 1455 of yacc.c */
#line 10656 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -31841,7 +31860,7 @@ yyreduce:
}
break;
- case 1575:
+ case 1584:
/* Line 1455 of yacc.c */
#line 10675 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -31875,7 +31894,7 @@ yyreduce:
}
break;
- case 1576:
+ case 1585:
/* Line 1455 of yacc.c */
#line 10707 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -31888,7 +31907,7 @@ yyreduce:
}
break;
- case 1578:
+ case 1587:
/* Line 1455 of yacc.c */
#line 10719 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -31901,14 +31920,14 @@ yyreduce:
}
break;
- case 1579:
+ case 1588:
/* Line 1455 of yacc.c */
#line 10727 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->exchange->cs= (yyvsp[(4) - (4)].charset); }
break;
- case 1581:
+ case 1590:
/* Line 1455 of yacc.c */
#line 10730 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -31925,7 +31944,7 @@ yyreduce:
}
break;
- case 1582:
+ case 1591:
/* Line 1455 of yacc.c */
#line 10742 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -31934,7 +31953,7 @@ yyreduce:
}
break;
- case 1583:
+ case 1592:
/* Line 1455 of yacc.c */
#line 10753 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -31945,7 +31964,7 @@ yyreduce:
}
break;
- case 1584:
+ case 1593:
/* Line 1455 of yacc.c */
#line 10759 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -31954,7 +31973,7 @@ yyreduce:
}
break;
- case 1585:
+ case 1594:
/* Line 1455 of yacc.c */
#line 10770 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -31968,21 +31987,21 @@ yyreduce:
}
break;
- case 1586:
+ case 1595:
/* Line 1455 of yacc.c */
#line 10779 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1587:
+ case 1596:
/* Line 1455 of yacc.c */
#line 10780 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1588:
+ case 1597:
/* Line 1455 of yacc.c */
#line 10781 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32003,7 +32022,7 @@ yyreduce:
}
break;
- case 1589:
+ case 1598:
/* Line 1455 of yacc.c */
#line 10797 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32015,7 +32034,7 @@ yyreduce:
}
break;
- case 1590:
+ case 1599:
/* Line 1455 of yacc.c */
#line 10804 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32042,7 +32061,7 @@ yyreduce:
}
break;
- case 1591:
+ case 1600:
/* Line 1455 of yacc.c */
#line 10826 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32067,7 +32086,7 @@ yyreduce:
}
break;
- case 1592:
+ case 1601:
/* Line 1455 of yacc.c */
#line 10846 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32084,7 +32103,7 @@ yyreduce:
}
break;
- case 1593:
+ case 1602:
/* Line 1455 of yacc.c */
#line 10858 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32093,7 +32112,7 @@ yyreduce:
}
break;
- case 1594:
+ case 1603:
/* Line 1455 of yacc.c */
#line 10862 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32106,14 +32125,14 @@ yyreduce:
}
break;
- case 1595:
+ case 1604:
/* Line 1455 of yacc.c */
#line 10870 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1596:
+ case 1605:
/* Line 1455 of yacc.c */
#line 10872 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32124,7 +32143,7 @@ yyreduce:
}
break;
- case 1597:
+ case 1606:
/* Line 1455 of yacc.c */
#line 10878 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32136,7 +32155,7 @@ yyreduce:
}
break;
- case 1598:
+ case 1607:
/* Line 1455 of yacc.c */
#line 10885 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32146,7 +32165,7 @@ yyreduce:
}
break;
- case 1599:
+ case 1608:
/* Line 1455 of yacc.c */
#line 10890 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32156,7 +32175,7 @@ yyreduce:
}
break;
- case 1600:
+ case 1609:
/* Line 1455 of yacc.c */
#line 10895 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32168,7 +32187,7 @@ yyreduce:
}
break;
- case 1603:
+ case 1612:
/* Line 1455 of yacc.c */
#line 10910 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32181,7 +32200,7 @@ yyreduce:
}
break;
- case 1606:
+ case 1615:
/* Line 1455 of yacc.c */
#line 10926 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32194,35 +32213,35 @@ yyreduce:
}
break;
- case 1607:
+ case 1616:
/* Line 1455 of yacc.c */
#line 10936 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)= 0; }
break;
- case 1608:
+ case 1617:
/* Line 1455 of yacc.c */
#line 10937 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)= 1; }
break;
- case 1609:
+ case 1618:
/* Line 1455 of yacc.c */
#line 10941 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)= 0; }
break;
- case 1610:
+ case 1619:
/* Line 1455 of yacc.c */
#line 10942 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)= 1; }
break;
- case 1611:
+ case 1620:
/* Line 1455 of yacc.c */
#line 10950 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32234,7 +32253,7 @@ yyreduce:
}
break;
- case 1612:
+ case 1621:
/* Line 1455 of yacc.c */
#line 10958 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32244,14 +32263,14 @@ yyreduce:
}
break;
- case 1613:
+ case 1622:
/* Line 1455 of yacc.c */
#line 10963 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1614:
+ case 1623:
/* Line 1455 of yacc.c */
#line 10968 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32263,7 +32282,7 @@ yyreduce:
}
break;
- case 1615:
+ case 1624:
/* Line 1455 of yacc.c */
#line 10975 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32273,14 +32292,14 @@ yyreduce:
}
break;
- case 1616:
+ case 1625:
/* Line 1455 of yacc.c */
#line 10980 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1617:
+ case 1626:
/* Line 1455 of yacc.c */
#line 10985 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32294,14 +32313,14 @@ yyreduce:
}
break;
- case 1618:
+ case 1627:
/* Line 1455 of yacc.c */
#line 10993 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.lock_type)= TL_WRITE_LOW_PRIORITY; }
break;
- case 1619:
+ case 1628:
/* Line 1455 of yacc.c */
#line 10995 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32314,21 +32333,21 @@ yyreduce:
}
break;
- case 1620:
+ case 1629:
/* Line 1455 of yacc.c */
#line 11002 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.lock_type)= TL_WRITE; }
break;
- case 1621:
+ case 1630:
/* Line 1455 of yacc.c */
#line 11006 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.lock_type)= (yyvsp[(1) - (1)].lock_type); }
break;
- case 1622:
+ case 1631:
/* Line 1455 of yacc.c */
#line 11008 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32341,21 +32360,21 @@ yyreduce:
}
break;
- case 1623:
+ case 1632:
/* Line 1455 of yacc.c */
#line 11018 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1624:
+ case 1633:
/* Line 1455 of yacc.c */
#line 11019 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1625:
+ case 1634:
/* Line 1455 of yacc.c */
#line 11024 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32367,28 +32386,28 @@ yyreduce:
}
break;
- case 1626:
+ case 1635:
/* Line 1455 of yacc.c */
#line 11032 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1627:
+ case 1636:
/* Line 1455 of yacc.c */
#line 11033 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1628:
+ case 1637:
/* Line 1455 of yacc.c */
#line 11034 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1629:
+ case 1638:
/* Line 1455 of yacc.c */
#line 11036 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32400,63 +32419,63 @@ yyreduce:
}
break;
- case 1631:
+ case 1640:
/* Line 1455 of yacc.c */
#line 11046 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->field_list.push_back((yyvsp[(3) - (3)].item)); }
break;
- case 1632:
+ case 1641:
/* Line 1455 of yacc.c */
#line 11047 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->field_list.push_back((yyvsp[(1) - (1)].item)); }
break;
- case 1633:
+ case 1642:
/* Line 1455 of yacc.c */
#line 11051 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1634:
+ case 1643:
/* Line 1455 of yacc.c */
#line 11052 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1635:
+ case 1644:
/* Line 1455 of yacc.c */
#line 11054 "/home/buildbot/git/sql/sql_yacc.yy"
{ Select->set_braces(0);}
break;
- case 1636:
+ case 1645:
/* Line 1455 of yacc.c */
#line 11055 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1637:
+ case 1646:
/* Line 1455 of yacc.c */
#line 11057 "/home/buildbot/git/sql/sql_yacc.yy"
{ Select->set_braces(1);}
break;
- case 1638:
+ case 1647:
/* Line 1455 of yacc.c */
#line 11058 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1643:
+ case 1652:
/* Line 1455 of yacc.c */
#line 11073 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32468,35 +32487,35 @@ yyreduce:
}
break;
- case 1644:
+ case 1653:
/* Line 1455 of yacc.c */
#line 11082 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1645:
+ case 1654:
/* Line 1455 of yacc.c */
#line 11083 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1646:
+ case 1655:
/* Line 1455 of yacc.c */
#line 11087 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1647:
+ case 1656:
/* Line 1455 of yacc.c */
#line 11088 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1648:
+ case 1657:
/* Line 1455 of yacc.c */
#line 11093 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32506,7 +32525,7 @@ yyreduce:
}
break;
- case 1649:
+ case 1658:
/* Line 1455 of yacc.c */
#line 11098 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32517,14 +32536,14 @@ yyreduce:
}
break;
- case 1650:
+ case 1659:
/* Line 1455 of yacc.c */
#line 11106 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1652:
+ case 1661:
/* Line 1455 of yacc.c */
#line 11112 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32534,7 +32553,7 @@ yyreduce:
}
break;
- case 1653:
+ case 1662:
/* Line 1455 of yacc.c */
#line 11117 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32544,14 +32563,14 @@ yyreduce:
}
break;
- case 1654:
+ case 1663:
/* Line 1455 of yacc.c */
#line 11124 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.item)= (yyvsp[(1) - (1)].item);}
break;
- case 1655:
+ case 1664:
/* Line 1455 of yacc.c */
#line 11126 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32562,14 +32581,14 @@ yyreduce:
}
break;
- case 1657:
+ case 1666:
/* Line 1455 of yacc.c */
#line 11135 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->duplicates= DUP_UPDATE; }
break;
- case 1659:
+ case 1668:
/* Line 1455 of yacc.c */
#line 11143 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32581,7 +32600,7 @@ yyreduce:
}
break;
- case 1660:
+ case 1669:
/* Line 1455 of yacc.c */
#line 11151 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32605,14 +32624,14 @@ yyreduce:
}
break;
- case 1661:
+ case 1670:
/* Line 1455 of yacc.c */
#line 11169 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1664:
+ case 1673:
/* Line 1455 of yacc.c */
#line 11179 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32622,7 +32641,7 @@ yyreduce:
}
break;
- case 1667:
+ case 1676:
/* Line 1455 of yacc.c */
#line 11192 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32634,21 +32653,21 @@ yyreduce:
}
break;
- case 1668:
+ case 1677:
/* Line 1455 of yacc.c */
#line 11201 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.lock_type)= TL_WRITE_DEFAULT; }
break;
- case 1669:
+ case 1678:
/* Line 1455 of yacc.c */
#line 11202 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.lock_type)= TL_WRITE_LOW_PRIORITY; }
break;
- case 1670:
+ case 1679:
/* Line 1455 of yacc.c */
#line 11209 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32664,7 +32683,7 @@ yyreduce:
}
break;
- case 1672:
+ case 1681:
/* Line 1455 of yacc.c */
#line 11224 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32678,14 +32697,14 @@ yyreduce:
}
break;
- case 1673:
+ case 1682:
/* Line 1455 of yacc.c */
#line 11233 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1674:
+ case 1683:
/* Line 1455 of yacc.c */
#line 11235 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32696,7 +32715,7 @@ yyreduce:
}
break;
- case 1675:
+ case 1684:
/* Line 1455 of yacc.c */
#line 11241 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32706,7 +32725,7 @@ yyreduce:
}
break;
- case 1676:
+ case 1685:
/* Line 1455 of yacc.c */
#line 11246 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32717,7 +32736,7 @@ yyreduce:
}
break;
- case 1677:
+ case 1686:
/* Line 1455 of yacc.c */
#line 11252 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32727,7 +32746,7 @@ yyreduce:
}
break;
- case 1680:
+ case 1689:
/* Line 1455 of yacc.c */
#line 11265 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32745,7 +32764,7 @@ yyreduce:
}
break;
- case 1681:
+ case 1690:
/* Line 1455 of yacc.c */
#line 11278 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32763,56 +32782,56 @@ yyreduce:
}
break;
- case 1682:
+ case 1691:
/* Line 1455 of yacc.c */
#line 11293 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1683:
+ case 1692:
/* Line 1455 of yacc.c */
#line 11294 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1684:
+ case 1693:
/* Line 1455 of yacc.c */
#line 11298 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1685:
+ case 1694:
/* Line 1455 of yacc.c */
#line 11299 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1686:
+ case 1695:
/* Line 1455 of yacc.c */
#line 11303 "/home/buildbot/git/sql/sql_yacc.yy"
{ Select->options|= OPTION_QUICK; }
break;
- case 1687:
+ case 1696:
/* Line 1455 of yacc.c */
#line 11304 "/home/buildbot/git/sql/sql_yacc.yy"
{ YYPS->m_lock_type= TL_WRITE_LOW_PRIORITY; }
break;
- case 1688:
+ case 1697:
/* Line 1455 of yacc.c */
#line 11305 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->ignore= 1; }
break;
- case 1689:
+ case 1698:
/* Line 1455 of yacc.c */
#line 11310 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32828,7 +32847,7 @@ yyreduce:
}
break;
- case 1690:
+ case 1699:
/* Line 1455 of yacc.c */
#line 11321 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32841,7 +32860,7 @@ yyreduce:
}
break;
- case 1697:
+ case 1706:
/* Line 1455 of yacc.c */
#line 11345 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32850,7 +32869,7 @@ yyreduce:
}
break;
- case 1698:
+ case 1707:
/* Line 1455 of yacc.c */
#line 11349 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32859,7 +32878,7 @@ yyreduce:
}
break;
- case 1699:
+ case 1708:
/* Line 1455 of yacc.c */
#line 11353 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32868,7 +32887,7 @@ yyreduce:
}
break;
- case 1700:
+ case 1709:
/* Line 1455 of yacc.c */
#line 11357 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32877,7 +32896,7 @@ yyreduce:
}
break;
- case 1701:
+ case 1710:
/* Line 1455 of yacc.c */
#line 11361 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32886,7 +32905,7 @@ yyreduce:
}
break;
- case 1702:
+ case 1711:
/* Line 1455 of yacc.c */
#line 11365 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32895,7 +32914,7 @@ yyreduce:
}
break;
- case 1703:
+ case 1712:
/* Line 1455 of yacc.c */
#line 11369 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32904,7 +32923,7 @@ yyreduce:
}
break;
- case 1704:
+ case 1713:
/* Line 1455 of yacc.c */
#line 11373 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32913,7 +32932,7 @@ yyreduce:
}
break;
- case 1705:
+ case 1714:
/* Line 1455 of yacc.c */
#line 11377 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32922,7 +32941,7 @@ yyreduce:
}
break;
- case 1706:
+ case 1715:
/* Line 1455 of yacc.c */
#line 11384 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32931,7 +32950,7 @@ yyreduce:
}
break;
- case 1707:
+ case 1716:
/* Line 1455 of yacc.c */
#line 11388 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32940,7 +32959,7 @@ yyreduce:
}
break;
- case 1708:
+ case 1717:
/* Line 1455 of yacc.c */
#line 11397 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32953,7 +32972,7 @@ yyreduce:
}
break;
- case 1709:
+ case 1718:
/* Line 1455 of yacc.c */
#line 11405 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32962,7 +32981,7 @@ yyreduce:
}
break;
- case 1710:
+ case 1719:
/* Line 1455 of yacc.c */
#line 11412 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32974,7 +32993,7 @@ yyreduce:
}
break;
- case 1711:
+ case 1720:
/* Line 1455 of yacc.c */
#line 11419 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -32987,7 +33006,7 @@ yyreduce:
}
break;
- case 1712:
+ case 1721:
/* Line 1455 of yacc.c */
#line 11427 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -33000,7 +33019,7 @@ yyreduce:
}
break;
- case 1713:
+ case 1722:
/* Line 1455 of yacc.c */
#line 11435 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -33013,7 +33032,7 @@ yyreduce:
}
break;
- case 1714:
+ case 1723:
/* Line 1455 of yacc.c */
#line 11443 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -33026,7 +33045,7 @@ yyreduce:
}
break;
- case 1715:
+ case 1724:
/* Line 1455 of yacc.c */
#line 11451 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -33039,7 +33058,7 @@ yyreduce:
}
break;
- case 1716:
+ case 1725:
/* Line 1455 of yacc.c */
#line 11459 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -33051,21 +33070,21 @@ yyreduce:
}
break;
- case 1717:
+ case 1726:
/* Line 1455 of yacc.c */
#line 11466 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->create_info.db_type= (yyvsp[(2) - (3)].db_type); }
break;
- case 1718:
+ case 1727:
/* Line 1455 of yacc.c */
#line 11468 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->create_info.db_type= NULL; }
break;
- case 1719:
+ case 1728:
/* Line 1455 of yacc.c */
#line 11470 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -33079,7 +33098,7 @@ yyreduce:
}
break;
- case 1720:
+ case 1729:
/* Line 1455 of yacc.c */
#line 11479 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -33088,7 +33107,7 @@ yyreduce:
}
break;
- case 1721:
+ case 1730:
/* Line 1455 of yacc.c */
#line 11483 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -33097,7 +33116,7 @@ yyreduce:
}
break;
- case 1722:
+ case 1731:
/* Line 1455 of yacc.c */
#line 11487 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -33107,7 +33126,7 @@ yyreduce:
}
break;
- case 1724:
+ case 1733:
/* Line 1455 of yacc.c */
#line 11492 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -33117,7 +33136,7 @@ yyreduce:
}
break;
- case 1726:
+ case 1735:
/* Line 1455 of yacc.c */
#line 11497 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -33131,7 +33150,7 @@ yyreduce:
}
break;
- case 1727:
+ case 1736:
/* Line 1455 of yacc.c */
#line 11506 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -33143,7 +33162,7 @@ yyreduce:
}
break;
- case 1728:
+ case 1737:
/* Line 1455 of yacc.c */
#line 11513 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -33157,7 +33176,7 @@ yyreduce:
}
break;
- case 1729:
+ case 1738:
/* Line 1455 of yacc.c */
#line 11522 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -33171,7 +33190,7 @@ yyreduce:
}
break;
- case 1730:
+ case 1739:
/* Line 1455 of yacc.c */
#line 11531 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -33181,42 +33200,42 @@ yyreduce:
}
break;
- case 1731:
+ case 1740:
/* Line 1455 of yacc.c */
#line 11536 "/home/buildbot/git/sql/sql_yacc.yy"
{ (void) create_select_for_variable("warning_count"); }
break;
- case 1732:
+ case 1741:
/* Line 1455 of yacc.c */
#line 11538 "/home/buildbot/git/sql/sql_yacc.yy"
{ (void) create_select_for_variable("error_count"); }
break;
- case 1733:
+ case 1742:
/* Line 1455 of yacc.c */
#line 11540 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->sql_command = SQLCOM_SHOW_WARNS;}
break;
- case 1734:
+ case 1743:
/* Line 1455 of yacc.c */
#line 11542 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->sql_command = SQLCOM_SHOW_ERRORS;}
break;
- case 1735:
+ case 1744:
/* Line 1455 of yacc.c */
#line 11544 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->sql_command = SQLCOM_SHOW_PROFILES; }
break;
- case 1736:
+ case 1745:
/* Line 1455 of yacc.c */
#line 11546 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -33228,7 +33247,7 @@ yyreduce:
}
break;
- case 1737:
+ case 1746:
/* Line 1455 of yacc.c */
#line 11553 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -33241,14 +33260,14 @@ yyreduce:
}
break;
- case 1738:
+ case 1747:
/* Line 1455 of yacc.c */
#line 11561 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->sql_command= SQLCOM_SHOW_PROCESSLIST;}
break;
- case 1739:
+ case 1748:
/* Line 1455 of yacc.c */
#line 11563 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -33261,7 +33280,7 @@ yyreduce:
}
break;
- case 1740:
+ case 1749:
/* Line 1455 of yacc.c */
#line 11571 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -33273,7 +33292,7 @@ yyreduce:
}
break;
- case 1741:
+ case 1750:
/* Line 1455 of yacc.c */
#line 11578 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -33285,7 +33304,7 @@ yyreduce:
}
break;
- case 1742:
+ case 1751:
/* Line 1455 of yacc.c */
#line 11585 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -33300,7 +33319,7 @@ yyreduce:
}
break;
- case 1743:
+ case 1752:
/* Line 1455 of yacc.c */
#line 11595 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -33312,7 +33331,7 @@ yyreduce:
}
break;
- case 1744:
+ case 1753:
/* Line 1455 of yacc.c */
#line 11602 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -33323,7 +33342,7 @@ yyreduce:
}
break;
- case 1745:
+ case 1754:
/* Line 1455 of yacc.c */
#line 11608 "/home/buildbot/git/sql/sql_yacc.yy"
@@ -33332,15 +33351,14 @@ yyreduce:
lex->sql_command = SQLCOM_SHOW_CREATE;
if (!lex->select_lex.add_table_to_list(thd, (yyvsp[(3) - (3)].table), NULL,0))
MYSQL_YYABORT;
- lex->only_view= 0;
lex->create_info.storage_media= HA_SM_DEFAULT;
}
break;
- case 1746:
+ case 1755:
/* Line 1455 of yacc.c */
-#line 11617 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11616 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
lex->sql_command = SQLCOM_SHOW_CREATE;
@@ -33350,28 +33368,28 @@ yyreduce:
}
break;
- case 1747:
+ case 1756:
/* Line 1455 of yacc.c */
-#line 11625 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11624 "/home/buildbot/git/sql/sql_yacc.yy"
{
Lex->sql_command = SQLCOM_SHOW_MASTER_STAT;
}
break;
- case 1748:
+ case 1757:
/* Line 1455 of yacc.c */
-#line 11629 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11628 "/home/buildbot/git/sql/sql_yacc.yy"
{
Lex->sql_command = SQLCOM_SHOW_SLAVE_STAT;
}
break;
- case 1749:
+ case 1758:
/* Line 1455 of yacc.c */
-#line 11633 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11632 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SHOW_CLIENT_STATS;
@@ -33380,10 +33398,10 @@ yyreduce:
}
break;
- case 1750:
+ case 1759:
/* Line 1455 of yacc.c */
-#line 11640 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11639 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SHOW_USER_STATS;
@@ -33392,10 +33410,10 @@ yyreduce:
}
break;
- case 1751:
+ case 1760:
/* Line 1455 of yacc.c */
-#line 11647 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11646 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SHOW_TABLE_STATS;
@@ -33404,10 +33422,10 @@ yyreduce:
}
break;
- case 1752:
+ case 1761:
/* Line 1455 of yacc.c */
-#line 11654 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11653 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SHOW_INDEX_STATS;
@@ -33416,10 +33434,10 @@ yyreduce:
}
break;
- case 1753:
+ case 1762:
/* Line 1455 of yacc.c */
-#line 11661 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11660 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
@@ -33428,10 +33446,10 @@ yyreduce:
}
break;
- case 1754:
+ case 1763:
/* Line 1455 of yacc.c */
-#line 11668 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11667 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
@@ -33440,10 +33458,10 @@ yyreduce:
}
break;
- case 1755:
+ case 1764:
/* Line 1455 of yacc.c */
-#line 11675 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11674 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SHOW_CREATE_TRIGGER;
@@ -33451,10 +33469,10 @@ yyreduce:
}
break;
- case 1756:
+ case 1765:
/* Line 1455 of yacc.c */
-#line 11681 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11680 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SHOW_STATUS_PROC;
@@ -33463,10 +33481,10 @@ yyreduce:
}
break;
- case 1757:
+ case 1766:
/* Line 1455 of yacc.c */
-#line 11688 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11687 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_SHOW_STATUS_FUNC;
@@ -33475,117 +33493,117 @@ yyreduce:
}
break;
- case 1758:
+ case 1767:
/* Line 1455 of yacc.c */
-#line 11695 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11694 "/home/buildbot/git/sql/sql_yacc.yy"
{
Lex->sql_command= SQLCOM_SHOW_PROC_CODE;
Lex->spname= (yyvsp[(3) - (3)].spname);
}
break;
- case 1759:
+ case 1768:
/* Line 1455 of yacc.c */
-#line 11700 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11699 "/home/buildbot/git/sql/sql_yacc.yy"
{
Lex->sql_command= SQLCOM_SHOW_FUNC_CODE;
Lex->spname= (yyvsp[(3) - (3)].spname);
}
break;
- case 1760:
+ case 1769:
/* Line 1455 of yacc.c */
-#line 11705 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11704 "/home/buildbot/git/sql/sql_yacc.yy"
{
Lex->spname= (yyvsp[(3) - (3)].spname);
Lex->sql_command = SQLCOM_SHOW_CREATE_EVENT;
}
break;
- case 1761:
+ case 1770:
/* Line 1455 of yacc.c */
-#line 11713 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11712 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->sql_command= SQLCOM_SHOW_ENGINE_STATUS; }
break;
- case 1762:
+ case 1771:
/* Line 1455 of yacc.c */
-#line 11715 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11714 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->sql_command= SQLCOM_SHOW_ENGINE_MUTEX; }
break;
- case 1763:
+ case 1772:
/* Line 1455 of yacc.c */
-#line 11717 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11716 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->sql_command= SQLCOM_SHOW_ENGINE_LOGS; }
break;
- case 1768:
+ case 1777:
/* Line 1455 of yacc.c */
-#line 11731 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11730 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.simple_string)= 0; }
break;
- case 1769:
+ case 1778:
/* Line 1455 of yacc.c */
-#line 11732 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11731 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.simple_string)= (yyvsp[(2) - (2)].lex_str).str; }
break;
- case 1770:
+ case 1779:
/* Line 1455 of yacc.c */
-#line 11736 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11735 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->verbose=0; }
break;
- case 1771:
+ case 1780:
/* Line 1455 of yacc.c */
-#line 11737 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11736 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->verbose=1; }
break;
- case 1774:
+ case 1783:
/* Line 1455 of yacc.c */
-#line 11746 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11745 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->mi.log_file_name = 0; }
break;
- case 1775:
+ case 1784:
/* Line 1455 of yacc.c */
-#line 11747 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11746 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->mi.log_file_name = (yyvsp[(2) - (2)].lex_str).str; }
break;
- case 1776:
+ case 1785:
/* Line 1455 of yacc.c */
-#line 11751 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11750 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->mi.pos = 4; /* skip magic number */ }
break;
- case 1777:
+ case 1786:
/* Line 1455 of yacc.c */
-#line 11752 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11751 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->mi.pos = (yyvsp[(2) - (2)].ulonglong_number); }
break;
- case 1779:
+ case 1788:
/* Line 1455 of yacc.c */
-#line 11758 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11757 "/home/buildbot/git/sql/sql_yacc.yy"
{
Lex->wild= new (thd->mem_root) String((yyvsp[(2) - (2)].lex_str).str, (yyvsp[(2) - (2)].lex_str).length,
system_charset_info);
@@ -33594,10 +33612,10 @@ yyreduce:
}
break;
- case 1780:
+ case 1789:
/* Line 1455 of yacc.c */
-#line 11765 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11764 "/home/buildbot/git/sql/sql_yacc.yy"
{
Select->where= normalize_cond((yyvsp[(2) - (2)].item));
if ((yyvsp[(2) - (2)].item))
@@ -33605,10 +33623,10 @@ yyreduce:
}
break;
- case 1781:
+ case 1790:
/* Line 1455 of yacc.c */
-#line 11775 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11774 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
mysql_init_select(lex);
@@ -33621,71 +33639,71 @@ yyreduce:
}
break;
- case 1782:
+ case 1791:
/* Line 1455 of yacc.c */
-#line 11786 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11785 "/home/buildbot/git/sql/sql_yacc.yy"
{
Select->parsing_place= NO_MATTER;
}
break;
- case 1783:
+ case 1792:
/* Line 1455 of yacc.c */
-#line 11790 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11789 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->describe|= DESCRIBE_NORMAL; }
break;
- case 1784:
+ case 1793:
/* Line 1455 of yacc.c */
-#line 11792 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11791 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex=Lex;
lex->select_lex.options|= SELECT_DESCRIBE;
}
break;
- case 1787:
+ case 1796:
/* Line 1455 of yacc.c */
-#line 11804 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11803 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1788:
+ case 1797:
/* Line 1455 of yacc.c */
-#line 11805 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11804 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->describe|= DESCRIBE_EXTENDED; }
break;
- case 1789:
+ case 1798:
/* Line 1455 of yacc.c */
-#line 11806 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11805 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->describe|= DESCRIBE_PARTITIONS; }
break;
- case 1790:
+ case 1799:
/* Line 1455 of yacc.c */
-#line 11810 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11809 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1791:
+ case 1800:
/* Line 1455 of yacc.c */
-#line 11811 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11810 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->wild= (yyvsp[(1) - (1)].string); }
break;
- case 1792:
+ case 1801:
/* Line 1455 of yacc.c */
-#line 11813 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11812 "/home/buildbot/git/sql/sql_yacc.yy"
{
Lex->wild= new (thd->mem_root) String((const char*) (yyvsp[(1) - (1)].lex_str).str,
(yyvsp[(1) - (1)].lex_str).length,
@@ -33695,10 +33713,10 @@ yyreduce:
}
break;
- case 1793:
+ case 1802:
/* Line 1455 of yacc.c */
-#line 11827 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11826 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_FLUSH;
@@ -33707,17 +33725,17 @@ yyreduce:
}
break;
- case 1794:
+ case 1803:
/* Line 1455 of yacc.c */
-#line 11834 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11833 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1795:
+ case 1804:
/* Line 1455 of yacc.c */
-#line 11839 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11838 "/home/buildbot/git/sql/sql_yacc.yy"
{
Lex->type|= REFRESH_TABLES;
/*
@@ -33729,31 +33747,31 @@ yyreduce:
}
break;
- case 1796:
+ case 1805:
/* Line 1455 of yacc.c */
-#line 11848 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11847 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1797:
+ case 1806:
/* Line 1455 of yacc.c */
-#line 11849 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11848 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1799:
+ case 1808:
/* Line 1455 of yacc.c */
-#line 11854 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11853 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1800:
+ case 1809:
/* Line 1455 of yacc.c */
-#line 11856 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11855 "/home/buildbot/git/sql/sql_yacc.yy"
{
TABLE_LIST *tables= Lex->query_tables;
Lex->type|= REFRESH_READ_LOCK | (yyvsp[(4) - (4)].num);
@@ -33766,240 +33784,240 @@ yyreduce:
}
break;
- case 1802:
+ case 1811:
/* Line 1455 of yacc.c */
-#line 11871 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11870 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1803:
+ case 1812:
/* Line 1455 of yacc.c */
-#line 11876 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11875 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->type|= REFRESH_ERROR_LOG; }
break;
- case 1804:
+ case 1813:
/* Line 1455 of yacc.c */
-#line 11878 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11877 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->type|= REFRESH_ENGINE_LOG; }
break;
- case 1805:
+ case 1814:
/* Line 1455 of yacc.c */
-#line 11880 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11879 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->type|= REFRESH_GENERAL_LOG; }
break;
- case 1806:
+ case 1815:
/* Line 1455 of yacc.c */
-#line 11882 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11881 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->type|= REFRESH_SLOW_LOG; }
break;
- case 1807:
+ case 1816:
/* Line 1455 of yacc.c */
-#line 11884 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11883 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->type|= REFRESH_BINARY_LOG; }
break;
- case 1808:
+ case 1817:
/* Line 1455 of yacc.c */
-#line 11886 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11885 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->type|= REFRESH_RELAY_LOG; }
break;
- case 1809:
+ case 1818:
/* Line 1455 of yacc.c */
-#line 11888 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11887 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->type|= REFRESH_QUERY_CACHE_FREE; }
break;
- case 1810:
+ case 1819:
/* Line 1455 of yacc.c */
-#line 11890 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11889 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->type|= REFRESH_HOSTS; }
break;
- case 1811:
+ case 1820:
/* Line 1455 of yacc.c */
-#line 11892 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11891 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->type|= REFRESH_GRANT; }
break;
- case 1812:
+ case 1821:
/* Line 1455 of yacc.c */
-#line 11894 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11893 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->type|= REFRESH_LOG; }
break;
- case 1813:
+ case 1822:
/* Line 1455 of yacc.c */
-#line 11896 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11895 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->type|= REFRESH_STATUS; }
break;
- case 1814:
+ case 1823:
/* Line 1455 of yacc.c */
-#line 11898 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11897 "/home/buildbot/git/sql/sql_yacc.yy"
{
Lex->type|= REFRESH_SLAVE;
Lex->reset_slave_info.all= false;
}
break;
- case 1815:
+ case 1824:
/* Line 1455 of yacc.c */
-#line 11903 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11902 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->type|= REFRESH_CLIENT_STATS; }
break;
- case 1816:
+ case 1825:
/* Line 1455 of yacc.c */
-#line 11905 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11904 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->type|= REFRESH_USER_STATS; }
break;
- case 1817:
+ case 1826:
/* Line 1455 of yacc.c */
-#line 11907 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11906 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->type|= REFRESH_TABLE_STATS; }
break;
- case 1818:
+ case 1827:
/* Line 1455 of yacc.c */
-#line 11909 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11908 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->type|= REFRESH_INDEX_STATS; }
break;
- case 1819:
+ case 1828:
/* Line 1455 of yacc.c */
-#line 11911 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11910 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->type|= REFRESH_MASTER; }
break;
- case 1820:
+ case 1829:
/* Line 1455 of yacc.c */
-#line 11913 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11912 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->type|= REFRESH_DES_KEY_FILE; }
break;
- case 1821:
+ case 1830:
/* Line 1455 of yacc.c */
-#line 11915 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11914 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->type|= REFRESH_USER_RESOURCES; }
break;
- case 1822:
+ case 1831:
/* Line 1455 of yacc.c */
-#line 11919 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11918 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1823:
+ case 1832:
/* Line 1455 of yacc.c */
-#line 11920 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11919 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1824:
+ case 1833:
/* Line 1455 of yacc.c */
-#line 11924 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11923 "/home/buildbot/git/sql/sql_yacc.yy"
{(yyval.num)= 0;}
break;
- case 1825:
+ case 1834:
/* Line 1455 of yacc.c */
-#line 11925 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11924 "/home/buildbot/git/sql/sql_yacc.yy"
{(yyval.num)= REFRESH_CHECKPOINT; }
break;
- case 1826:
+ case 1835:
/* Line 1455 of yacc.c */
-#line 11929 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11928 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_RESET; lex->type=0;
}
break;
- case 1827:
+ case 1836:
/* Line 1455 of yacc.c */
-#line 11934 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11933 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1830:
+ case 1839:
/* Line 1455 of yacc.c */
-#line 11943 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11942 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->type|= REFRESH_SLAVE; }
break;
- case 1831:
+ case 1840:
/* Line 1455 of yacc.c */
-#line 11944 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11943 "/home/buildbot/git/sql/sql_yacc.yy"
{ }
break;
- case 1832:
+ case 1841:
/* Line 1455 of yacc.c */
-#line 11945 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11944 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->type|= REFRESH_MASTER; }
break;
- case 1833:
+ case 1842:
/* Line 1455 of yacc.c */
-#line 11946 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11945 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->type|= REFRESH_QUERY_CACHE;}
break;
- case 1834:
+ case 1843:
/* Line 1455 of yacc.c */
-#line 11950 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11949 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->reset_slave_info.all= false; }
break;
- case 1835:
+ case 1844:
/* Line 1455 of yacc.c */
-#line 11951 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11950 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->reset_slave_info.all= true; }
break;
- case 1836:
+ case 1845:
/* Line 1455 of yacc.c */
-#line 11956 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11955 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex=Lex;
lex->type=0;
@@ -34007,26 +34025,26 @@ yyreduce:
}
break;
- case 1837:
+ case 1846:
/* Line 1455 of yacc.c */
-#line 11962 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11961 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1839:
+ case 1848:
/* Line 1455 of yacc.c */
-#line 11971 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11970 "/home/buildbot/git/sql/sql_yacc.yy"
{
Lex->to_log = (yyvsp[(2) - (2)].lex_str).str;
}
break;
- case 1840:
+ case 1849:
/* Line 1455 of yacc.c */
-#line 11975 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11974 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
lex->value_list.empty();
@@ -34035,10 +34053,10 @@ yyreduce:
}
break;
- case 1841:
+ case 1850:
/* Line 1455 of yacc.c */
-#line 11987 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11986 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex=Lex;
lex->value_list.empty();
@@ -34047,81 +34065,81 @@ yyreduce:
}
break;
- case 1842:
+ case 1851:
/* Line 1455 of yacc.c */
-#line 11994 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11993 "/home/buildbot/git/sql/sql_yacc.yy"
{
Lex->kill_signal= (killed_state) ((yyvsp[(3) - (5)].num) | (yyvsp[(4) - (5)].num));
}
break;
- case 1843:
+ case 1852:
/* Line 1455 of yacc.c */
-#line 12000 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 11999 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)= (int) KILL_HARD_BIT; }
break;
- case 1844:
+ case 1853:
/* Line 1455 of yacc.c */
-#line 12001 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12000 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)= (int) KILL_HARD_BIT; }
break;
- case 1845:
+ case 1854:
/* Line 1455 of yacc.c */
-#line 12002 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12001 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)= 0; }
break;
- case 1846:
+ case 1855:
/* Line 1455 of yacc.c */
-#line 12005 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12004 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)= (int) KILL_CONNECTION; }
break;
- case 1847:
+ case 1856:
/* Line 1455 of yacc.c */
-#line 12006 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12005 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)= (int) KILL_CONNECTION; }
break;
- case 1848:
+ case 1857:
/* Line 1455 of yacc.c */
-#line 12007 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12006 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)= (int) KILL_QUERY; }
break;
- case 1849:
+ case 1858:
/* Line 1455 of yacc.c */
-#line 12012 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12011 "/home/buildbot/git/sql/sql_yacc.yy"
{
Lex->value_list.push_front((yyval.item));
Lex->kill_type= KILL_TYPE_ID;
}
break;
- case 1850:
+ case 1859:
/* Line 1455 of yacc.c */
-#line 12017 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12016 "/home/buildbot/git/sql/sql_yacc.yy"
{
Lex->users_list.push_back((yyvsp[(2) - (2)].lex_user));
Lex->kill_type= KILL_TYPE_USER;
}
break;
- case 1851:
+ case 1860:
/* Line 1455 of yacc.c */
-#line 12027 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12026 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command=SQLCOM_CHANGE_DB;
@@ -34129,10 +34147,10 @@ yyreduce:
}
break;
- case 1852:
+ case 1861:
/* Line 1455 of yacc.c */
-#line 12038 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12037 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= thd->lex;
@@ -34145,10 +34163,10 @@ yyreduce:
}
break;
- case 1853:
+ case 1862:
/* Line 1455 of yacc.c */
-#line 12049 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12048 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_LOAD;
@@ -34160,10 +34178,10 @@ yyreduce:
}
break;
- case 1854:
+ case 1863:
/* Line 1455 of yacc.c */
-#line 12059 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12058 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex=Lex;
if (!Select->add_table_to_list(thd, (yyvsp[(12) - (12)].table), NULL, TL_OPTION_UPDATING,
@@ -34175,59 +34193,59 @@ yyreduce:
}
break;
- case 1855:
+ case 1864:
/* Line 1455 of yacc.c */
-#line 12069 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12068 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->exchange->cs= (yyvsp[(14) - (14)].charset); }
break;
- case 1856:
+ case 1865:
/* Line 1455 of yacc.c */
-#line 12073 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12072 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1857:
+ case 1866:
/* Line 1455 of yacc.c */
-#line 12077 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12076 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.filetype)= FILETYPE_CSV; }
break;
- case 1858:
+ case 1867:
/* Line 1455 of yacc.c */
-#line 12078 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12077 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.filetype)= FILETYPE_XML; }
break;
- case 1859:
+ case 1868:
/* Line 1455 of yacc.c */
-#line 12082 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12081 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)=0;}
break;
- case 1860:
+ case 1869:
/* Line 1455 of yacc.c */
-#line 12083 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12082 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)=1;}
break;
- case 1861:
+ case 1870:
/* Line 1455 of yacc.c */
-#line 12087 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12086 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.lock_type)= TL_WRITE_DEFAULT; }
break;
- case 1862:
+ case 1871:
/* Line 1455 of yacc.c */
-#line 12089 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12088 "/home/buildbot/git/sql/sql_yacc.yy"
{
/*
Ignore this option in SP to avoid problem with query cache and
@@ -34237,48 +34255,48 @@ yyreduce:
}
break;
- case 1863:
+ case 1872:
/* Line 1455 of yacc.c */
-#line 12096 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12095 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.lock_type)= TL_WRITE_LOW_PRIORITY; }
break;
- case 1864:
+ case 1873:
/* Line 1455 of yacc.c */
-#line 12100 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12099 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->duplicates=DUP_ERROR; }
break;
- case 1865:
+ case 1874:
/* Line 1455 of yacc.c */
-#line 12101 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12100 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->duplicates=DUP_REPLACE; }
break;
- case 1866:
+ case 1875:
/* Line 1455 of yacc.c */
-#line 12102 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12101 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->ignore= 1; }
break;
- case 1871:
+ case 1880:
/* Line 1455 of yacc.c */
-#line 12117 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12116 "/home/buildbot/git/sql/sql_yacc.yy"
{
DBUG_ASSERT(Lex->exchange != 0);
Lex->exchange->field_term= (yyvsp[(3) - (3)].string);
}
break;
- case 1872:
+ case 1881:
/* Line 1455 of yacc.c */
-#line 12122 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12121 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
DBUG_ASSERT(lex->exchange != 0);
@@ -34287,130 +34305,130 @@ yyreduce:
}
break;
- case 1873:
+ case 1882:
/* Line 1455 of yacc.c */
-#line 12129 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12128 "/home/buildbot/git/sql/sql_yacc.yy"
{
DBUG_ASSERT(Lex->exchange != 0);
Lex->exchange->enclosed= (yyvsp[(3) - (3)].string);
}
break;
- case 1874:
+ case 1883:
/* Line 1455 of yacc.c */
-#line 12134 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12133 "/home/buildbot/git/sql/sql_yacc.yy"
{
DBUG_ASSERT(Lex->exchange != 0);
Lex->exchange->escaped= (yyvsp[(3) - (3)].string);
}
break;
- case 1879:
+ case 1888:
/* Line 1455 of yacc.c */
-#line 12152 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12151 "/home/buildbot/git/sql/sql_yacc.yy"
{
DBUG_ASSERT(Lex->exchange != 0);
Lex->exchange->line_term= (yyvsp[(3) - (3)].string);
}
break;
- case 1880:
+ case 1889:
/* Line 1455 of yacc.c */
-#line 12157 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12156 "/home/buildbot/git/sql/sql_yacc.yy"
{
DBUG_ASSERT(Lex->exchange != 0);
Lex->exchange->line_start= (yyvsp[(3) - (3)].string);
}
break;
- case 1881:
+ case 1890:
/* Line 1455 of yacc.c */
-#line 12164 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12163 "/home/buildbot/git/sql/sql_yacc.yy"
{ }
break;
- case 1882:
+ case 1891:
/* Line 1455 of yacc.c */
-#line 12166 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12165 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->exchange->line_term = (yyvsp[(4) - (4)].string); }
break;
- case 1884:
+ case 1893:
/* Line 1455 of yacc.c */
-#line 12171 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12170 "/home/buildbot/git/sql/sql_yacc.yy"
{
DBUG_ASSERT(Lex->exchange != 0);
Lex->exchange->skip_lines= atol((yyvsp[(2) - (3)].lex_str).str);
}
break;
- case 1885:
+ case 1894:
/* Line 1455 of yacc.c */
-#line 12178 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12177 "/home/buildbot/git/sql/sql_yacc.yy"
{ }
break;
- case 1886:
+ case 1895:
/* Line 1455 of yacc.c */
-#line 12180 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12179 "/home/buildbot/git/sql/sql_yacc.yy"
{ }
break;
- case 1887:
+ case 1896:
/* Line 1455 of yacc.c */
-#line 12184 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12183 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1888:
+ case 1897:
/* Line 1455 of yacc.c */
-#line 12185 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12184 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1889:
+ case 1898:
/* Line 1455 of yacc.c */
-#line 12186 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12185 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1890:
+ case 1899:
/* Line 1455 of yacc.c */
-#line 12191 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12190 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->field_list.push_back((yyvsp[(3) - (3)].item)); }
break;
- case 1891:
+ case 1900:
/* Line 1455 of yacc.c */
-#line 12193 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12192 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->field_list.push_back((yyvsp[(1) - (1)].item)); }
break;
- case 1892:
+ case 1901:
/* Line 1455 of yacc.c */
-#line 12197 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12196 "/home/buildbot/git/sql/sql_yacc.yy"
{(yyval.item)= (yyvsp[(1) - (1)].item);}
break;
- case 1893:
+ case 1902:
/* Line 1455 of yacc.c */
-#line 12199 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12198 "/home/buildbot/git/sql/sql_yacc.yy"
{
(yyval.item)= new (thd->mem_root) Item_user_var_as_out_param((yyvsp[(2) - (2)].lex_str));
if ((yyval.item) == NULL)
@@ -34418,24 +34436,24 @@ yyreduce:
}
break;
- case 1894:
+ case 1903:
/* Line 1455 of yacc.c */
-#line 12207 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12206 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1895:
+ case 1904:
/* Line 1455 of yacc.c */
-#line 12208 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12207 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1898:
+ case 1907:
/* Line 1455 of yacc.c */
-#line 12218 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12217 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
if (lex->update_list.push_back((yyvsp[(1) - (5)].item)) ||
@@ -34445,10 +34463,10 @@ yyreduce:
}
break;
- case 1899:
+ case 1908:
/* Line 1455 of yacc.c */
-#line 12231 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12230 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX_STRING tmp;
CHARSET_INFO *cs_con= thd->variables.collation_connection;
@@ -34473,10 +34491,10 @@ yyreduce:
}
break;
- case 1900:
+ case 1909:
/* Line 1455 of yacc.c */
-#line 12254 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12253 "/home/buildbot/git/sql/sql_yacc.yy"
{
uint repertoire= Lex->text_string_is_7bit ?
MY_REPERTOIRE_ASCII : MY_REPERTOIRE_UNICODE30;
@@ -34490,10 +34508,10 @@ yyreduce:
}
break;
- case 1901:
+ case 1910:
/* Line 1455 of yacc.c */
-#line 12266 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12265 "/home/buildbot/git/sql/sql_yacc.yy"
{
Item_string *str= new (thd->mem_root) Item_string((yyvsp[(2) - (2)].lex_str).str,
(yyvsp[(2) - (2)].lex_str).length, (yyvsp[(1) - (2)].charset));
@@ -34506,10 +34524,10 @@ yyreduce:
}
break;
- case 1902:
+ case 1911:
/* Line 1455 of yacc.c */
-#line 12277 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12276 "/home/buildbot/git/sql/sql_yacc.yy"
{
Item_string* item= (Item_string*) (yyvsp[(1) - (2)].item);
item->append((yyvsp[(2) - (2)].lex_str).str, (yyvsp[(2) - (2)].lex_str).length);
@@ -34527,10 +34545,10 @@ yyreduce:
}
break;
- case 1903:
+ case 1912:
/* Line 1455 of yacc.c */
-#line 12296 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12295 "/home/buildbot/git/sql/sql_yacc.yy"
{
(yyval.string)= new (thd->mem_root) String((yyvsp[(1) - (1)].lex_str).str,
(yyvsp[(1) - (1)].lex_str).length,
@@ -34540,10 +34558,10 @@ yyreduce:
}
break;
- case 1904:
+ case 1913:
/* Line 1455 of yacc.c */
-#line 12304 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12303 "/home/buildbot/git/sql/sql_yacc.yy"
{
Item *tmp= new (thd->mem_root) Item_hex_hybrid((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length);
if (tmp == NULL)
@@ -34557,10 +34575,10 @@ yyreduce:
}
break;
- case 1905:
+ case 1914:
/* Line 1455 of yacc.c */
-#line 12316 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12315 "/home/buildbot/git/sql/sql_yacc.yy"
{
Item *tmp= new (thd->mem_root) Item_hex_string((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length);
if (tmp == NULL)
@@ -34570,10 +34588,10 @@ yyreduce:
}
break;
- case 1906:
+ case 1915:
/* Line 1455 of yacc.c */
-#line 12324 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12323 "/home/buildbot/git/sql/sql_yacc.yy"
{
Item *tmp= new (thd->mem_root) Item_bin_string((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length);
if (tmp == NULL)
@@ -34587,10 +34605,10 @@ yyreduce:
}
break;
- case 1907:
+ case 1916:
/* Line 1455 of yacc.c */
-#line 12339 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12338 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= thd->lex;
Lex_input_stream *lip= YYLIP;
@@ -34609,48 +34627,48 @@ yyreduce:
}
break;
- case 1908:
+ case 1917:
/* Line 1455 of yacc.c */
-#line 12358 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12357 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.item) = (yyvsp[(1) - (1)].item); }
break;
- case 1909:
+ case 1918:
/* Line 1455 of yacc.c */
-#line 12359 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12358 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.item) = (yyvsp[(2) - (2)].item_num); }
break;
- case 1910:
+ case 1919:
/* Line 1455 of yacc.c */
-#line 12361 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12360 "/home/buildbot/git/sql/sql_yacc.yy"
{
(yyvsp[(2) - (2)].item_num)->max_length++;
(yyval.item)= (yyvsp[(2) - (2)].item_num)->neg();
}
break;
- case 1911:
+ case 1920:
/* Line 1455 of yacc.c */
-#line 12368 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12367 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.item) = (yyvsp[(1) - (1)].item); }
break;
- case 1912:
+ case 1921:
/* Line 1455 of yacc.c */
-#line 12369 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12368 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.item) = (yyvsp[(1) - (1)].item_num); }
break;
- case 1913:
+ case 1922:
/* Line 1455 of yacc.c */
-#line 12371 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12370 "/home/buildbot/git/sql/sql_yacc.yy"
{
(yyval.item) = new (thd->mem_root) Item_null();
if ((yyval.item) == NULL)
@@ -34659,10 +34677,10 @@ yyreduce:
}
break;
- case 1914:
+ case 1923:
/* Line 1455 of yacc.c */
-#line 12378 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12377 "/home/buildbot/git/sql/sql_yacc.yy"
{
(yyval.item)= new (thd->mem_root) Item_int((char*) "FALSE",0,1);
if ((yyval.item) == NULL)
@@ -34670,10 +34688,10 @@ yyreduce:
}
break;
- case 1915:
+ case 1924:
/* Line 1455 of yacc.c */
-#line 12384 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12383 "/home/buildbot/git/sql/sql_yacc.yy"
{
(yyval.item)= new (thd->mem_root) Item_int((char*) "TRUE",1,1);
if ((yyval.item) == NULL)
@@ -34681,10 +34699,10 @@ yyreduce:
}
break;
- case 1916:
+ case 1925:
/* Line 1455 of yacc.c */
-#line 12390 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12389 "/home/buildbot/git/sql/sql_yacc.yy"
{
(yyval.item) = new (thd->mem_root) Item_hex_hybrid((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length);
if ((yyval.item) == NULL)
@@ -34692,10 +34710,10 @@ yyreduce:
}
break;
- case 1917:
+ case 1926:
/* Line 1455 of yacc.c */
-#line 12396 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12395 "/home/buildbot/git/sql/sql_yacc.yy"
{
(yyval.item) = new (thd->mem_root) Item_hex_string((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length);
if ((yyval.item) == NULL)
@@ -34703,10 +34721,10 @@ yyreduce:
}
break;
- case 1918:
+ case 1927:
/* Line 1455 of yacc.c */
-#line 12402 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12401 "/home/buildbot/git/sql/sql_yacc.yy"
{
(yyval.item)= new (thd->mem_root) Item_bin_string((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length);
if ((yyval.item) == NULL)
@@ -34714,10 +34732,10 @@ yyreduce:
}
break;
- case 1919:
+ case 1928:
/* Line 1455 of yacc.c */
-#line 12408 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12407 "/home/buildbot/git/sql/sql_yacc.yy"
{
Item *tmp= new (thd->mem_root) Item_hex_string((yyvsp[(2) - (2)].lex_str).str, (yyvsp[(2) - (2)].lex_str).length);
if (tmp == NULL)
@@ -34748,10 +34766,10 @@ yyreduce:
}
break;
- case 1920:
+ case 1929:
/* Line 1455 of yacc.c */
-#line 12437 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12436 "/home/buildbot/git/sql/sql_yacc.yy"
{
Item *tmp= new (thd->mem_root) Item_bin_string((yyvsp[(2) - (2)].lex_str).str, (yyvsp[(2) - (2)].lex_str).length);
if (tmp == NULL)
@@ -34781,31 +34799,31 @@ yyreduce:
}
break;
- case 1921:
+ case 1930:
/* Line 1455 of yacc.c */
-#line 12464 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12463 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.item) = (yyvsp[(2) - (2)].item); }
break;
- case 1922:
+ case 1931:
/* Line 1455 of yacc.c */
-#line 12465 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12464 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.item) = (yyvsp[(2) - (2)].item); }
break;
- case 1923:
+ case 1932:
/* Line 1455 of yacc.c */
-#line 12466 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12465 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.item) = (yyvsp[(2) - (2)].item); }
break;
- case 1924:
+ case 1933:
/* Line 1455 of yacc.c */
-#line 12471 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12470 "/home/buildbot/git/sql/sql_yacc.yy"
{
int error;
(yyval.item_num)= new (thd->mem_root)
@@ -34817,10 +34835,10 @@ yyreduce:
}
break;
- case 1925:
+ case 1934:
/* Line 1455 of yacc.c */
-#line 12481 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12480 "/home/buildbot/git/sql/sql_yacc.yy"
{
int error;
(yyval.item_num)= new (thd->mem_root)
@@ -34832,10 +34850,10 @@ yyreduce:
}
break;
- case 1926:
+ case 1935:
/* Line 1455 of yacc.c */
-#line 12491 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12490 "/home/buildbot/git/sql/sql_yacc.yy"
{
(yyval.item_num)= new (thd->mem_root) Item_uint((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length);
if ((yyval.item_num) == NULL)
@@ -34843,10 +34861,10 @@ yyreduce:
}
break;
- case 1927:
+ case 1936:
/* Line 1455 of yacc.c */
-#line 12497 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12496 "/home/buildbot/git/sql/sql_yacc.yy"
{
(yyval.item_num)= new (thd->mem_root) Item_decimal((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length,
thd->charset());
@@ -34857,10 +34875,10 @@ yyreduce:
}
break;
- case 1928:
+ case 1937:
/* Line 1455 of yacc.c */
-#line 12506 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12505 "/home/buildbot/git/sql/sql_yacc.yy"
{
(yyval.item_num)= new (thd->mem_root) Item_float((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length);
if (((yyval.item_num) == NULL) || (thd->is_error()))
@@ -34870,24 +34888,24 @@ yyreduce:
}
break;
- case 1929:
+ case 1938:
/* Line 1455 of yacc.c */
-#line 12520 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12519 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.item)=(yyvsp[(1) - (1)].item); }
break;
- case 1930:
+ case 1939:
/* Line 1455 of yacc.c */
-#line 12521 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12520 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.item)=(yyvsp[(1) - (1)].item); }
break;
- case 1931:
+ case 1940:
/* Line 1455 of yacc.c */
-#line 12526 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12525 "/home/buildbot/git/sql/sql_yacc.yy"
{
SELECT_LEX *sel= Select;
(yyval.item)= new (thd->mem_root) Item_field(Lex->current_context(),
@@ -34898,10 +34916,10 @@ yyreduce:
}
break;
- case 1932:
+ case 1941:
/* Line 1455 of yacc.c */
-#line 12535 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12534 "/home/buildbot/git/sql/sql_yacc.yy"
{
SELECT_LEX *sel= Select;
const char* schema= thd->client_capabilities & CLIENT_NO_SCHEMA ?
@@ -34915,17 +34933,17 @@ yyreduce:
}
break;
- case 1933:
+ case 1942:
/* Line 1455 of yacc.c */
-#line 12549 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12548 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.item)=(yyvsp[(1) - (1)].item); }
break;
- case 1934:
+ case 1943:
/* Line 1455 of yacc.c */
-#line 12554 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12553 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= thd->lex;
Lex_input_stream *lip= YYLIP;
@@ -34973,17 +34991,17 @@ yyreduce:
}
break;
- case 1935:
+ case 1944:
/* Line 1455 of yacc.c */
-#line 12599 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12598 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.item)= (yyvsp[(1) - (1)].item); }
break;
- case 1936:
+ case 1945:
/* Line 1455 of yacc.c */
-#line 12604 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12603 "/home/buildbot/git/sql/sql_yacc.yy"
{
SELECT_LEX *sel=Select;
if ((sel->parsing_place != IN_HAVING) ||
@@ -35002,17 +35020,17 @@ yyreduce:
}
break;
- case 1937:
+ case 1946:
/* Line 1455 of yacc.c */
-#line 12620 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12619 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.item)= (yyvsp[(1) - (1)].item); }
break;
- case 1938:
+ case 1947:
/* Line 1455 of yacc.c */
-#line 12625 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12624 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= thd->lex;
@@ -35092,10 +35110,10 @@ yyreduce:
}
break;
- case 1939:
+ case 1948:
/* Line 1455 of yacc.c */
-#line 12703 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12702 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= thd->lex;
SELECT_LEX *sel= lex->current_select;
@@ -35121,10 +35139,10 @@ yyreduce:
}
break;
- case 1940:
+ case 1949:
/* Line 1455 of yacc.c */
-#line 12727 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12726 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= thd->lex;
SELECT_LEX *sel= lex->current_select;
@@ -35153,17 +35171,17 @@ yyreduce:
}
break;
- case 1941:
+ case 1950:
/* Line 1455 of yacc.c */
-#line 12756 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12755 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str);}
break;
- case 1942:
+ case 1951:
/* Line 1455 of yacc.c */
-#line 12758 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12757 "/home/buildbot/git/sql/sql_yacc.yy"
{
TABLE_LIST *table= Select->table_list.first;
if (my_strcasecmp(table_alias_charset, (yyvsp[(1) - (5)].lex_str).str, table->db))
@@ -35181,10 +35199,10 @@ yyreduce:
}
break;
- case 1943:
+ case 1952:
/* Line 1455 of yacc.c */
-#line 12774 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12773 "/home/buildbot/git/sql/sql_yacc.yy"
{
TABLE_LIST *table= Select->table_list.first;
if (my_strcasecmp(table_alias_charset, (yyvsp[(1) - (3)].lex_str).str, table->alias))
@@ -35196,17 +35214,17 @@ yyreduce:
}
break;
- case 1944:
+ case 1953:
/* Line 1455 of yacc.c */
-#line 12783 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12782 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.lex_str)=(yyvsp[(2) - (2)].lex_str);}
break;
- case 1945:
+ case 1954:
/* Line 1455 of yacc.c */
-#line 12788 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12787 "/home/buildbot/git/sql/sql_yacc.yy"
{
(yyval.table)= new Table_ident((yyvsp[(1) - (1)].lex_str));
if ((yyval.table) == NULL)
@@ -35214,10 +35232,10 @@ yyreduce:
}
break;
- case 1946:
+ case 1955:
/* Line 1455 of yacc.c */
-#line 12794 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12793 "/home/buildbot/git/sql/sql_yacc.yy"
{
(yyval.table)= new Table_ident(thd, (yyvsp[(1) - (3)].lex_str),(yyvsp[(3) - (3)].lex_str),0);
if ((yyval.table) == NULL)
@@ -35225,10 +35243,10 @@ yyreduce:
}
break;
- case 1947:
+ case 1956:
/* Line 1455 of yacc.c */
-#line 12800 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12799 "/home/buildbot/git/sql/sql_yacc.yy"
{
/* For Delphi */
(yyval.table)= new Table_ident((yyvsp[(2) - (2)].lex_str));
@@ -35237,10 +35255,10 @@ yyreduce:
}
break;
- case 1948:
+ case 1957:
/* Line 1455 of yacc.c */
-#line 12810 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12809 "/home/buildbot/git/sql/sql_yacc.yy"
{
(yyval.table)= new Table_ident((yyvsp[(1) - (2)].lex_str));
if ((yyval.table) == NULL)
@@ -35248,10 +35266,10 @@ yyreduce:
}
break;
- case 1949:
+ case 1958:
/* Line 1455 of yacc.c */
-#line 12816 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12815 "/home/buildbot/git/sql/sql_yacc.yy"
{
(yyval.table)= new Table_ident(thd, (yyvsp[(1) - (4)].lex_str),(yyvsp[(3) - (4)].lex_str),0);
if ((yyval.table) == NULL)
@@ -35259,10 +35277,10 @@ yyreduce:
}
break;
- case 1950:
+ case 1959:
/* Line 1455 of yacc.c */
-#line 12825 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12824 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX_STRING db={(char*) any_db,3};
(yyval.table)= new Table_ident(thd, db,(yyvsp[(1) - (1)].lex_str),0);
@@ -35271,17 +35289,17 @@ yyreduce:
}
break;
- case 1951:
+ case 1960:
/* Line 1455 of yacc.c */
-#line 12834 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12833 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.lex_str)= (yyvsp[(1) - (1)].lex_str); }
break;
- case 1952:
+ case 1961:
/* Line 1455 of yacc.c */
-#line 12836 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12835 "/home/buildbot/git/sql/sql_yacc.yy"
{
if (thd->charset_is_system_charset)
{
@@ -35308,10 +35326,10 @@ yyreduce:
}
break;
- case 1953:
+ case 1962:
/* Line 1455 of yacc.c */
-#line 12864 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12863 "/home/buildbot/git/sql/sql_yacc.yy"
{
if (thd->charset_is_system_charset)
(yyval.lex_str)= (yyvsp[(1) - (1)].lex_str);
@@ -35324,10 +35342,10 @@ yyreduce:
}
break;
- case 1954:
+ case 1963:
/* Line 1455 of yacc.c */
-#line 12878 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12877 "/home/buildbot/git/sql/sql_yacc.yy"
{
if (thd->charset_is_collation_connection)
(yyval.lex_str)= (yyvsp[(1) - (1)].lex_str);
@@ -35340,10 +35358,10 @@ yyreduce:
}
break;
- case 1955:
+ case 1964:
/* Line 1455 of yacc.c */
-#line 12892 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12891 "/home/buildbot/git/sql/sql_yacc.yy"
{
if (thd->charset_is_character_set_filesystem)
(yyval.lex_str)= (yyvsp[(1) - (1)].lex_str);
@@ -35357,17 +35375,17 @@ yyreduce:
}
break;
- case 1956:
+ case 1965:
/* Line 1455 of yacc.c */
-#line 12906 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12905 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str); }
break;
- case 1957:
+ case 1966:
/* Line 1455 of yacc.c */
-#line 12908 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12907 "/home/buildbot/git/sql/sql_yacc.yy"
{
(yyval.lex_str).str= thd->strmake((yyvsp[(1) - (1)].symbol).str, (yyvsp[(1) - (1)].symbol).length);
if ((yyval.lex_str).str == NULL)
@@ -35376,17 +35394,17 @@ yyreduce:
}
break;
- case 1958:
+ case 1967:
/* Line 1455 of yacc.c */
-#line 12917 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12916 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str); }
break;
- case 1959:
+ case 1968:
/* Line 1455 of yacc.c */
-#line 12919 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12918 "/home/buildbot/git/sql/sql_yacc.yy"
{
(yyval.lex_str).str= thd->strmake((yyvsp[(1) - (1)].symbol).str, (yyvsp[(1) - (1)].symbol).length);
if ((yyval.lex_str).str == NULL)
@@ -35395,31 +35413,31 @@ yyreduce:
}
break;
- case 1960:
+ case 1969:
/* Line 1455 of yacc.c */
-#line 12928 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12927 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str);}
break;
- case 1961:
+ case 1970:
/* Line 1455 of yacc.c */
-#line 12929 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12928 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str);}
break;
- case 1962:
+ case 1971:
/* Line 1455 of yacc.c */
-#line 12930 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12929 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str);}
break;
- case 1963:
+ case 1972:
/* Line 1455 of yacc.c */
-#line 12935 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12934 "/home/buildbot/git/sql/sql_yacc.yy"
{
if (!((yyval.lex_user)=(LEX_USER*) thd->alloc(sizeof(st_lex_user))))
MYSQL_YYABORT;
@@ -35437,10 +35455,10 @@ yyreduce:
}
break;
- case 1964:
+ case 1973:
/* Line 1455 of yacc.c */
-#line 12951 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12950 "/home/buildbot/git/sql/sql_yacc.yy"
{
if (!((yyval.lex_user)=(LEX_USER*) thd->alloc(sizeof(st_lex_user))))
MYSQL_YYABORT;
@@ -35463,10 +35481,10 @@ yyreduce:
}
break;
- case 1965:
+ case 1974:
/* Line 1455 of yacc.c */
-#line 12972 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 12971 "/home/buildbot/git/sql/sql_yacc.yy"
{
if (!((yyval.lex_user)=(LEX_USER*) thd->alloc(sizeof(st_lex_user))))
MYSQL_YYABORT;
@@ -35479,2474 +35497,2474 @@ yyreduce:
}
break;
- case 1966:
+ case 1975:
+
+/* Line 1455 of yacc.c */
+#line 12985 "/home/buildbot/git/sql/sql_yacc.yy"
+ {}
+ break;
+
+ case 1976:
/* Line 1455 of yacc.c */
#line 12986 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1967:
+ case 1977:
/* Line 1455 of yacc.c */
#line 12987 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1968:
+ case 1978:
/* Line 1455 of yacc.c */
#line 12988 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1969:
+ case 1979:
/* Line 1455 of yacc.c */
#line 12989 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1970:
+ case 1980:
/* Line 1455 of yacc.c */
#line 12990 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1971:
+ case 1981:
/* Line 1455 of yacc.c */
#line 12991 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1972:
+ case 1982:
/* Line 1455 of yacc.c */
#line 12992 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1973:
+ case 1983:
/* Line 1455 of yacc.c */
#line 12993 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1974:
+ case 1984:
/* Line 1455 of yacc.c */
#line 12994 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1975:
+ case 1985:
/* Line 1455 of yacc.c */
#line 12995 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1976:
+ case 1986:
/* Line 1455 of yacc.c */
#line 12996 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1977:
+ case 1987:
/* Line 1455 of yacc.c */
#line 12997 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1978:
+ case 1988:
/* Line 1455 of yacc.c */
#line 12998 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1979:
+ case 1989:
/* Line 1455 of yacc.c */
#line 12999 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1980:
+ case 1990:
/* Line 1455 of yacc.c */
#line 13000 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1981:
+ case 1991:
/* Line 1455 of yacc.c */
#line 13001 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1982:
+ case 1992:
/* Line 1455 of yacc.c */
#line 13002 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1983:
+ case 1993:
/* Line 1455 of yacc.c */
#line 13003 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1984:
+ case 1994:
/* Line 1455 of yacc.c */
#line 13004 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1985:
+ case 1995:
/* Line 1455 of yacc.c */
#line 13005 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1986:
+ case 1996:
/* Line 1455 of yacc.c */
#line 13006 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1987:
+ case 1997:
/* Line 1455 of yacc.c */
#line 13007 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1988:
+ case 1998:
/* Line 1455 of yacc.c */
#line 13008 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1989:
+ case 1999:
/* Line 1455 of yacc.c */
#line 13009 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1990:
+ case 2000:
/* Line 1455 of yacc.c */
#line 13010 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1991:
+ case 2001:
/* Line 1455 of yacc.c */
#line 13011 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1992:
+ case 2002:
/* Line 1455 of yacc.c */
#line 13012 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1993:
+ case 2003:
/* Line 1455 of yacc.c */
#line 13013 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1994:
+ case 2004:
/* Line 1455 of yacc.c */
#line 13014 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1995:
+ case 2005:
/* Line 1455 of yacc.c */
#line 13015 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1996:
+ case 2006:
/* Line 1455 of yacc.c */
#line 13016 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1997:
+ case 2007:
/* Line 1455 of yacc.c */
#line 13017 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1998:
+ case 2008:
/* Line 1455 of yacc.c */
#line 13018 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 1999:
+ case 2009:
/* Line 1455 of yacc.c */
#line 13019 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2000:
+ case 2010:
/* Line 1455 of yacc.c */
#line 13020 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2001:
+ case 2011:
/* Line 1455 of yacc.c */
#line 13021 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2002:
+ case 2012:
/* Line 1455 of yacc.c */
#line 13022 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2003:
+ case 2013:
/* Line 1455 of yacc.c */
#line 13023 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2004:
+ case 2014:
/* Line 1455 of yacc.c */
#line 13024 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2005:
+ case 2015:
/* Line 1455 of yacc.c */
#line 13025 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2006:
+ case 2016:
/* Line 1455 of yacc.c */
#line 13026 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2007:
+ case 2017:
/* Line 1455 of yacc.c */
#line 13027 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2008:
+ case 2018:
/* Line 1455 of yacc.c */
#line 13028 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2009:
+ case 2019:
/* Line 1455 of yacc.c */
#line 13029 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2010:
+ case 2020:
/* Line 1455 of yacc.c */
#line 13030 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2011:
+ case 2021:
/* Line 1455 of yacc.c */
#line 13031 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2012:
+ case 2022:
/* Line 1455 of yacc.c */
#line 13032 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2013:
+ case 2023:
/* Line 1455 of yacc.c */
#line 13033 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2014:
+ case 2024:
/* Line 1455 of yacc.c */
#line 13034 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2015:
+ case 2025:
/* Line 1455 of yacc.c */
#line 13035 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2016:
+ case 2026:
/* Line 1455 of yacc.c */
#line 13036 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2017:
+ case 2027:
/* Line 1455 of yacc.c */
#line 13037 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2018:
+ case 2028:
/* Line 1455 of yacc.c */
#line 13038 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2019:
+ case 2029:
/* Line 1455 of yacc.c */
#line 13039 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2020:
+ case 2030:
/* Line 1455 of yacc.c */
#line 13040 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2021:
+ case 2031:
/* Line 1455 of yacc.c */
#line 13041 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2022:
+ case 2032:
/* Line 1455 of yacc.c */
#line 13042 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2023:
+ case 2033:
/* Line 1455 of yacc.c */
#line 13043 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2024:
+ case 2034:
/* Line 1455 of yacc.c */
-#line 13044 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13053 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2025:
+ case 2035:
/* Line 1455 of yacc.c */
#line 13054 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2026:
+ case 2036:
/* Line 1455 of yacc.c */
#line 13055 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2027:
+ case 2037:
/* Line 1455 of yacc.c */
#line 13056 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2028:
+ case 2038:
/* Line 1455 of yacc.c */
#line 13057 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2029:
+ case 2039:
/* Line 1455 of yacc.c */
#line 13058 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2030:
+ case 2040:
/* Line 1455 of yacc.c */
#line 13059 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2031:
+ case 2041:
/* Line 1455 of yacc.c */
#line 13060 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2032:
+ case 2042:
/* Line 1455 of yacc.c */
#line 13061 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2033:
+ case 2043:
/* Line 1455 of yacc.c */
#line 13062 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2034:
+ case 2044:
/* Line 1455 of yacc.c */
#line 13063 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2035:
+ case 2045:
/* Line 1455 of yacc.c */
#line 13064 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2036:
+ case 2046:
/* Line 1455 of yacc.c */
#line 13065 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2037:
+ case 2047:
/* Line 1455 of yacc.c */
#line 13066 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2038:
+ case 2048:
/* Line 1455 of yacc.c */
#line 13067 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2039:
+ case 2049:
/* Line 1455 of yacc.c */
#line 13068 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2040:
+ case 2050:
/* Line 1455 of yacc.c */
#line 13069 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2041:
+ case 2051:
/* Line 1455 of yacc.c */
#line 13070 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2042:
+ case 2052:
/* Line 1455 of yacc.c */
#line 13071 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2043:
+ case 2053:
/* Line 1455 of yacc.c */
#line 13072 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2044:
+ case 2054:
/* Line 1455 of yacc.c */
#line 13073 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2045:
+ case 2055:
/* Line 1455 of yacc.c */
#line 13074 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2046:
+ case 2056:
/* Line 1455 of yacc.c */
#line 13075 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2047:
+ case 2057:
/* Line 1455 of yacc.c */
#line 13076 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2048:
+ case 2058:
/* Line 1455 of yacc.c */
#line 13077 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2049:
+ case 2059:
/* Line 1455 of yacc.c */
#line 13078 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2050:
+ case 2060:
/* Line 1455 of yacc.c */
#line 13079 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2051:
+ case 2061:
/* Line 1455 of yacc.c */
#line 13080 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2052:
+ case 2062:
/* Line 1455 of yacc.c */
#line 13081 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2053:
+ case 2063:
/* Line 1455 of yacc.c */
#line 13082 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2054:
+ case 2064:
/* Line 1455 of yacc.c */
#line 13083 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2055:
+ case 2065:
/* Line 1455 of yacc.c */
#line 13084 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2056:
+ case 2066:
/* Line 1455 of yacc.c */
#line 13085 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2057:
+ case 2067:
/* Line 1455 of yacc.c */
#line 13086 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2058:
+ case 2068:
/* Line 1455 of yacc.c */
#line 13087 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2059:
+ case 2069:
/* Line 1455 of yacc.c */
#line 13088 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2060:
+ case 2070:
/* Line 1455 of yacc.c */
#line 13089 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2061:
+ case 2071:
/* Line 1455 of yacc.c */
#line 13090 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2062:
+ case 2072:
/* Line 1455 of yacc.c */
#line 13091 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2063:
+ case 2073:
/* Line 1455 of yacc.c */
#line 13092 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2064:
+ case 2074:
/* Line 1455 of yacc.c */
#line 13093 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2065:
+ case 2075:
/* Line 1455 of yacc.c */
#line 13094 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2066:
+ case 2076:
/* Line 1455 of yacc.c */
#line 13095 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2067:
+ case 2077:
/* Line 1455 of yacc.c */
#line 13096 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2068:
+ case 2078:
/* Line 1455 of yacc.c */
#line 13097 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2069:
+ case 2079:
/* Line 1455 of yacc.c */
#line 13098 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2070:
+ case 2080:
/* Line 1455 of yacc.c */
#line 13099 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2071:
+ case 2081:
/* Line 1455 of yacc.c */
#line 13100 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2072:
+ case 2082:
/* Line 1455 of yacc.c */
#line 13101 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2073:
+ case 2083:
/* Line 1455 of yacc.c */
#line 13102 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2074:
+ case 2084:
/* Line 1455 of yacc.c */
#line 13103 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2075:
+ case 2085:
/* Line 1455 of yacc.c */
#line 13104 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2076:
+ case 2086:
/* Line 1455 of yacc.c */
#line 13105 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2077:
+ case 2087:
/* Line 1455 of yacc.c */
#line 13106 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2078:
+ case 2088:
/* Line 1455 of yacc.c */
#line 13107 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2079:
+ case 2089:
/* Line 1455 of yacc.c */
#line 13108 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2080:
+ case 2090:
/* Line 1455 of yacc.c */
#line 13109 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2081:
+ case 2091:
/* Line 1455 of yacc.c */
#line 13110 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2082:
+ case 2092:
/* Line 1455 of yacc.c */
#line 13111 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2083:
+ case 2093:
/* Line 1455 of yacc.c */
#line 13112 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2084:
+ case 2094:
/* Line 1455 of yacc.c */
#line 13113 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2085:
+ case 2095:
/* Line 1455 of yacc.c */
#line 13114 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2086:
+ case 2096:
/* Line 1455 of yacc.c */
#line 13115 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2087:
+ case 2097:
/* Line 1455 of yacc.c */
#line 13116 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2088:
+ case 2098:
/* Line 1455 of yacc.c */
#line 13117 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2089:
+ case 2099:
/* Line 1455 of yacc.c */
#line 13118 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2090:
+ case 2100:
/* Line 1455 of yacc.c */
#line 13119 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2091:
+ case 2101:
/* Line 1455 of yacc.c */
#line 13120 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2092:
+ case 2102:
/* Line 1455 of yacc.c */
#line 13121 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2093:
+ case 2103:
/* Line 1455 of yacc.c */
#line 13122 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2094:
+ case 2104:
/* Line 1455 of yacc.c */
#line 13123 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2095:
+ case 2105:
/* Line 1455 of yacc.c */
#line 13124 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2096:
+ case 2106:
/* Line 1455 of yacc.c */
#line 13125 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2097:
+ case 2107:
/* Line 1455 of yacc.c */
#line 13126 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2098:
+ case 2108:
/* Line 1455 of yacc.c */
#line 13127 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2099:
+ case 2109:
/* Line 1455 of yacc.c */
#line 13128 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2100:
+ case 2110:
/* Line 1455 of yacc.c */
#line 13129 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2101:
+ case 2111:
/* Line 1455 of yacc.c */
#line 13130 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2102:
+ case 2112:
/* Line 1455 of yacc.c */
#line 13131 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2103:
+ case 2113:
/* Line 1455 of yacc.c */
#line 13132 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2104:
+ case 2114:
/* Line 1455 of yacc.c */
#line 13133 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2105:
+ case 2115:
/* Line 1455 of yacc.c */
#line 13134 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2106:
+ case 2116:
/* Line 1455 of yacc.c */
#line 13135 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2107:
+ case 2117:
/* Line 1455 of yacc.c */
#line 13136 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2108:
+ case 2118:
/* Line 1455 of yacc.c */
#line 13137 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2109:
+ case 2119:
/* Line 1455 of yacc.c */
#line 13138 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2110:
+ case 2120:
/* Line 1455 of yacc.c */
#line 13139 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2111:
+ case 2121:
/* Line 1455 of yacc.c */
#line 13140 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2112:
+ case 2122:
/* Line 1455 of yacc.c */
#line 13141 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2113:
+ case 2123:
/* Line 1455 of yacc.c */
#line 13142 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2114:
+ case 2124:
/* Line 1455 of yacc.c */
#line 13143 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2115:
+ case 2125:
/* Line 1455 of yacc.c */
#line 13144 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2116:
+ case 2126:
/* Line 1455 of yacc.c */
#line 13145 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2117:
+ case 2127:
/* Line 1455 of yacc.c */
#line 13146 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2118:
+ case 2128:
/* Line 1455 of yacc.c */
#line 13147 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2119:
+ case 2129:
/* Line 1455 of yacc.c */
#line 13148 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2120:
+ case 2130:
/* Line 1455 of yacc.c */
#line 13149 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2121:
+ case 2131:
/* Line 1455 of yacc.c */
#line 13150 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2122:
+ case 2132:
/* Line 1455 of yacc.c */
#line 13151 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2123:
+ case 2133:
/* Line 1455 of yacc.c */
#line 13152 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2124:
+ case 2134:
/* Line 1455 of yacc.c */
#line 13153 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2125:
+ case 2135:
/* Line 1455 of yacc.c */
#line 13154 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2126:
+ case 2136:
/* Line 1455 of yacc.c */
#line 13155 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2127:
+ case 2137:
/* Line 1455 of yacc.c */
#line 13156 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2128:
+ case 2138:
/* Line 1455 of yacc.c */
#line 13157 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2129:
+ case 2139:
/* Line 1455 of yacc.c */
#line 13158 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2130:
+ case 2140:
/* Line 1455 of yacc.c */
#line 13159 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2131:
+ case 2141:
/* Line 1455 of yacc.c */
#line 13160 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2132:
+ case 2142:
/* Line 1455 of yacc.c */
#line 13161 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2133:
+ case 2143:
/* Line 1455 of yacc.c */
#line 13162 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2134:
+ case 2144:
/* Line 1455 of yacc.c */
#line 13163 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2135:
+ case 2145:
/* Line 1455 of yacc.c */
#line 13164 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2136:
+ case 2146:
/* Line 1455 of yacc.c */
#line 13165 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2137:
+ case 2147:
/* Line 1455 of yacc.c */
#line 13166 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2138:
+ case 2148:
/* Line 1455 of yacc.c */
#line 13167 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2139:
+ case 2149:
/* Line 1455 of yacc.c */
#line 13168 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2140:
+ case 2150:
/* Line 1455 of yacc.c */
#line 13169 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2141:
+ case 2151:
/* Line 1455 of yacc.c */
#line 13170 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2142:
+ case 2152:
/* Line 1455 of yacc.c */
#line 13171 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2143:
+ case 2153:
/* Line 1455 of yacc.c */
#line 13172 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2144:
+ case 2154:
/* Line 1455 of yacc.c */
#line 13173 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2145:
+ case 2155:
/* Line 1455 of yacc.c */
#line 13174 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2146:
+ case 2156:
/* Line 1455 of yacc.c */
#line 13175 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2147:
+ case 2157:
/* Line 1455 of yacc.c */
#line 13176 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2148:
+ case 2158:
/* Line 1455 of yacc.c */
#line 13177 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2149:
+ case 2159:
/* Line 1455 of yacc.c */
#line 13178 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2150:
+ case 2160:
/* Line 1455 of yacc.c */
#line 13179 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2151:
+ case 2161:
/* Line 1455 of yacc.c */
#line 13180 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2152:
+ case 2162:
/* Line 1455 of yacc.c */
#line 13181 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2153:
+ case 2163:
/* Line 1455 of yacc.c */
#line 13182 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2154:
+ case 2164:
/* Line 1455 of yacc.c */
#line 13183 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2155:
+ case 2165:
/* Line 1455 of yacc.c */
#line 13184 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2156:
+ case 2166:
/* Line 1455 of yacc.c */
#line 13185 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2157:
+ case 2167:
/* Line 1455 of yacc.c */
#line 13186 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2158:
+ case 2168:
/* Line 1455 of yacc.c */
#line 13187 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2159:
+ case 2169:
/* Line 1455 of yacc.c */
#line 13188 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2160:
+ case 2170:
/* Line 1455 of yacc.c */
#line 13189 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2161:
+ case 2171:
/* Line 1455 of yacc.c */
#line 13190 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2162:
+ case 2172:
/* Line 1455 of yacc.c */
#line 13191 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2163:
+ case 2173:
/* Line 1455 of yacc.c */
#line 13192 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2164:
+ case 2174:
/* Line 1455 of yacc.c */
#line 13193 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2165:
+ case 2175:
/* Line 1455 of yacc.c */
#line 13194 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2166:
+ case 2176:
/* Line 1455 of yacc.c */
#line 13195 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2167:
+ case 2177:
/* Line 1455 of yacc.c */
#line 13196 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2168:
+ case 2178:
/* Line 1455 of yacc.c */
#line 13197 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2169:
+ case 2179:
/* Line 1455 of yacc.c */
#line 13198 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2170:
+ case 2180:
/* Line 1455 of yacc.c */
#line 13199 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2171:
+ case 2181:
/* Line 1455 of yacc.c */
#line 13200 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2172:
+ case 2182:
/* Line 1455 of yacc.c */
#line 13201 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2173:
+ case 2183:
/* Line 1455 of yacc.c */
#line 13202 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2174:
+ case 2184:
/* Line 1455 of yacc.c */
#line 13203 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2175:
+ case 2185:
/* Line 1455 of yacc.c */
#line 13204 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2176:
+ case 2186:
/* Line 1455 of yacc.c */
#line 13205 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2177:
+ case 2187:
/* Line 1455 of yacc.c */
#line 13206 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2178:
+ case 2188:
/* Line 1455 of yacc.c */
#line 13207 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2179:
+ case 2189:
/* Line 1455 of yacc.c */
#line 13208 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2180:
+ case 2190:
/* Line 1455 of yacc.c */
#line 13209 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2181:
+ case 2191:
/* Line 1455 of yacc.c */
#line 13210 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2182:
+ case 2192:
/* Line 1455 of yacc.c */
#line 13211 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2183:
+ case 2193:
/* Line 1455 of yacc.c */
#line 13212 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2184:
+ case 2194:
/* Line 1455 of yacc.c */
#line 13213 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2185:
+ case 2195:
/* Line 1455 of yacc.c */
#line 13214 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2186:
+ case 2196:
/* Line 1455 of yacc.c */
#line 13215 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2187:
+ case 2197:
/* Line 1455 of yacc.c */
#line 13216 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2188:
+ case 2198:
/* Line 1455 of yacc.c */
#line 13217 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2189:
+ case 2199:
/* Line 1455 of yacc.c */
#line 13218 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2190:
+ case 2200:
/* Line 1455 of yacc.c */
#line 13219 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2191:
+ case 2201:
/* Line 1455 of yacc.c */
#line 13220 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2192:
+ case 2202:
/* Line 1455 of yacc.c */
#line 13221 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2193:
+ case 2203:
/* Line 1455 of yacc.c */
#line 13222 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2194:
+ case 2204:
/* Line 1455 of yacc.c */
#line 13223 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2195:
+ case 2205:
/* Line 1455 of yacc.c */
#line 13224 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2196:
+ case 2206:
/* Line 1455 of yacc.c */
#line 13225 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2197:
+ case 2207:
/* Line 1455 of yacc.c */
#line 13226 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2198:
+ case 2208:
/* Line 1455 of yacc.c */
#line 13227 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2199:
+ case 2209:
/* Line 1455 of yacc.c */
#line 13228 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2200:
+ case 2210:
/* Line 1455 of yacc.c */
#line 13229 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2201:
+ case 2211:
/* Line 1455 of yacc.c */
#line 13230 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2202:
+ case 2212:
/* Line 1455 of yacc.c */
#line 13231 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2203:
+ case 2213:
/* Line 1455 of yacc.c */
#line 13232 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2204:
+ case 2214:
/* Line 1455 of yacc.c */
#line 13233 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2205:
+ case 2215:
/* Line 1455 of yacc.c */
#line 13234 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2206:
+ case 2216:
/* Line 1455 of yacc.c */
#line 13235 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2207:
+ case 2217:
/* Line 1455 of yacc.c */
#line 13236 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2208:
+ case 2218:
/* Line 1455 of yacc.c */
#line 13237 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2209:
+ case 2219:
/* Line 1455 of yacc.c */
#line 13238 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2210:
+ case 2220:
/* Line 1455 of yacc.c */
#line 13239 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2211:
+ case 2221:
/* Line 1455 of yacc.c */
#line 13240 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2212:
+ case 2222:
/* Line 1455 of yacc.c */
#line 13241 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2213:
+ case 2223:
/* Line 1455 of yacc.c */
#line 13242 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2214:
+ case 2224:
/* Line 1455 of yacc.c */
#line 13243 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2215:
+ case 2225:
/* Line 1455 of yacc.c */
#line 13244 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2216:
+ case 2226:
/* Line 1455 of yacc.c */
#line 13245 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2217:
+ case 2227:
/* Line 1455 of yacc.c */
#line 13246 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2218:
+ case 2228:
/* Line 1455 of yacc.c */
#line 13247 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2219:
+ case 2229:
/* Line 1455 of yacc.c */
#line 13248 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2220:
+ case 2230:
/* Line 1455 of yacc.c */
#line 13249 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2221:
+ case 2231:
/* Line 1455 of yacc.c */
#line 13250 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2222:
+ case 2232:
/* Line 1455 of yacc.c */
#line 13251 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2223:
+ case 2233:
/* Line 1455 of yacc.c */
#line 13252 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2224:
+ case 2234:
/* Line 1455 of yacc.c */
#line 13253 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2225:
+ case 2235:
/* Line 1455 of yacc.c */
#line 13254 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2226:
+ case 2236:
/* Line 1455 of yacc.c */
#line 13255 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2227:
+ case 2237:
/* Line 1455 of yacc.c */
#line 13256 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2228:
+ case 2238:
/* Line 1455 of yacc.c */
#line 13257 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2229:
+ case 2239:
/* Line 1455 of yacc.c */
#line 13258 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2230:
+ case 2240:
/* Line 1455 of yacc.c */
#line 13259 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2231:
+ case 2241:
/* Line 1455 of yacc.c */
#line 13260 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2232:
+ case 2242:
/* Line 1455 of yacc.c */
#line 13261 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2233:
+ case 2243:
/* Line 1455 of yacc.c */
#line 13262 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2234:
+ case 2244:
/* Line 1455 of yacc.c */
#line 13263 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2235:
+ case 2245:
/* Line 1455 of yacc.c */
#line 13264 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2236:
+ case 2246:
/* Line 1455 of yacc.c */
#line 13265 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2237:
+ case 2247:
/* Line 1455 of yacc.c */
#line 13266 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2238:
+ case 2248:
/* Line 1455 of yacc.c */
#line 13267 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2239:
+ case 2249:
/* Line 1455 of yacc.c */
#line 13268 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2240:
+ case 2250:
/* Line 1455 of yacc.c */
#line 13269 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2241:
+ case 2251:
/* Line 1455 of yacc.c */
#line 13270 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2242:
+ case 2252:
/* Line 1455 of yacc.c */
#line 13271 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2243:
+ case 2253:
/* Line 1455 of yacc.c */
#line 13272 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2244:
+ case 2254:
/* Line 1455 of yacc.c */
#line 13273 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2245:
+ case 2255:
/* Line 1455 of yacc.c */
#line 13274 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2246:
+ case 2256:
/* Line 1455 of yacc.c */
#line 13275 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2247:
+ case 2257:
/* Line 1455 of yacc.c */
#line 13276 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2248:
+ case 2258:
/* Line 1455 of yacc.c */
#line 13277 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2249:
+ case 2259:
/* Line 1455 of yacc.c */
#line 13278 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2250:
+ case 2260:
/* Line 1455 of yacc.c */
#line 13279 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2251:
+ case 2261:
/* Line 1455 of yacc.c */
#line 13280 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2252:
+ case 2262:
/* Line 1455 of yacc.c */
#line 13281 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2253:
+ case 2263:
/* Line 1455 of yacc.c */
#line 13282 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2254:
+ case 2264:
/* Line 1455 of yacc.c */
#line 13283 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2255:
+ case 2265:
/* Line 1455 of yacc.c */
#line 13284 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2256:
+ case 2266:
/* Line 1455 of yacc.c */
#line 13285 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2257:
+ case 2267:
/* Line 1455 of yacc.c */
#line 13286 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2258:
+ case 2268:
/* Line 1455 of yacc.c */
#line 13287 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2259:
+ case 2269:
/* Line 1455 of yacc.c */
#line 13288 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2260:
+ case 2270:
/* Line 1455 of yacc.c */
#line 13289 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2261:
+ case 2271:
/* Line 1455 of yacc.c */
#line 13290 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2262:
+ case 2272:
/* Line 1455 of yacc.c */
#line 13291 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2263:
+ case 2273:
/* Line 1455 of yacc.c */
#line 13292 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2264:
+ case 2274:
/* Line 1455 of yacc.c */
#line 13293 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2265:
+ case 2275:
/* Line 1455 of yacc.c */
#line 13294 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2266:
+ case 2276:
/* Line 1455 of yacc.c */
#line 13295 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2267:
+ case 2277:
/* Line 1455 of yacc.c */
#line 13296 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2268:
+ case 2278:
/* Line 1455 of yacc.c */
#line 13297 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2269:
+ case 2279:
/* Line 1455 of yacc.c */
#line 13298 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2270:
+ case 2280:
/* Line 1455 of yacc.c */
#line 13299 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2271:
+ case 2281:
/* Line 1455 of yacc.c */
#line 13300 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2272:
+ case 2282:
/* Line 1455 of yacc.c */
#line 13301 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2273:
+ case 2283:
/* Line 1455 of yacc.c */
#line 13302 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2274:
+ case 2284:
/* Line 1455 of yacc.c */
#line 13303 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2275:
+ case 2285:
/* Line 1455 of yacc.c */
#line 13304 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2276:
+ case 2286:
/* Line 1455 of yacc.c */
#line 13305 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2277:
+ case 2287:
/* Line 1455 of yacc.c */
#line 13306 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2278:
+ case 2288:
/* Line 1455 of yacc.c */
#line 13307 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2279:
+ case 2289:
/* Line 1455 of yacc.c */
#line 13308 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2280:
+ case 2290:
/* Line 1455 of yacc.c */
#line 13309 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2281:
+ case 2291:
/* Line 1455 of yacc.c */
#line 13310 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2282:
+ case 2292:
/* Line 1455 of yacc.c */
#line 13311 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2283:
+ case 2293:
/* Line 1455 of yacc.c */
#line 13312 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2284:
+ case 2294:
/* Line 1455 of yacc.c */
#line 13313 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2285:
+ case 2295:
/* Line 1455 of yacc.c */
#line 13314 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2286:
+ case 2296:
/* Line 1455 of yacc.c */
#line 13315 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2287:
+ case 2297:
/* Line 1455 of yacc.c */
#line 13316 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2288:
+ case 2298:
/* Line 1455 of yacc.c */
#line 13317 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2289:
+ case 2299:
/* Line 1455 of yacc.c */
#line 13318 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2290:
+ case 2300:
/* Line 1455 of yacc.c */
#line 13319 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2291:
+ case 2301:
/* Line 1455 of yacc.c */
#line 13320 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2292:
+ case 2302:
/* Line 1455 of yacc.c */
#line 13321 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2293:
+ case 2303:
/* Line 1455 of yacc.c */
#line 13322 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2294:
+ case 2304:
/* Line 1455 of yacc.c */
#line 13323 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2295:
+ case 2305:
/* Line 1455 of yacc.c */
#line 13324 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2296:
+ case 2306:
/* Line 1455 of yacc.c */
#line 13325 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2297:
+ case 2307:
/* Line 1455 of yacc.c */
#line 13326 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2298:
+ case 2308:
/* Line 1455 of yacc.c */
#line 13327 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2299:
+ case 2309:
/* Line 1455 of yacc.c */
#line 13328 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2300:
+ case 2310:
/* Line 1455 of yacc.c */
#line 13329 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2301:
+ case 2311:
/* Line 1455 of yacc.c */
#line 13330 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2302:
+ case 2312:
/* Line 1455 of yacc.c */
#line 13331 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2303:
+ case 2313:
/* Line 1455 of yacc.c */
#line 13332 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2304:
+ case 2314:
/* Line 1455 of yacc.c */
#line 13333 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2305:
+ case 2315:
/* Line 1455 of yacc.c */
#line 13334 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2306:
+ case 2316:
/* Line 1455 of yacc.c */
#line 13335 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2307:
+ case 2317:
/* Line 1455 of yacc.c */
#line 13336 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2308:
+ case 2318:
/* Line 1455 of yacc.c */
#line 13337 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2309:
+ case 2319:
/* Line 1455 of yacc.c */
#line 13338 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2310:
+ case 2320:
/* Line 1455 of yacc.c */
#line 13339 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2311:
+ case 2321:
/* Line 1455 of yacc.c */
#line 13340 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2312:
+ case 2322:
/* Line 1455 of yacc.c */
#line 13341 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2313:
+ case 2323:
/* Line 1455 of yacc.c */
#line 13342 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2314:
+ case 2324:
/* Line 1455 of yacc.c */
#line 13343 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2315:
+ case 2325:
/* Line 1455 of yacc.c */
#line 13344 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2316:
+ case 2326:
/* Line 1455 of yacc.c */
#line 13345 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2317:
-
-/* Line 1455 of yacc.c */
-#line 13346 "/home/buildbot/git/sql/sql_yacc.yy"
- {}
- break;
-
- case 2318:
+ case 2327:
/* Line 1455 of yacc.c */
-#line 13353 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13352 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_SET_OPTION;
@@ -37958,31 +37976,31 @@ yyreduce:
}
break;
- case 2319:
+ case 2328:
/* Line 1455 of yacc.c */
-#line 13363 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13362 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2320:
+ case 2329:
/* Line 1455 of yacc.c */
-#line 13367 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13366 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2321:
+ case 2330:
/* Line 1455 of yacc.c */
-#line 13368 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13367 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2324:
+ case 2333:
/* Line 1455 of yacc.c */
-#line 13377 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13376 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= thd->lex;
Lex_input_stream *lip= YYLIP;
@@ -38014,10 +38032,10 @@ yyreduce:
}
break;
- case 2325:
+ case 2334:
/* Line 1455 of yacc.c */
-#line 13407 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13406 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= thd->lex;
Lex_input_stream *lip= YYLIP;
@@ -38067,108 +38085,108 @@ yyreduce:
}
break;
- case 2326:
+ case 2335:
/* Line 1455 of yacc.c */
-#line 13457 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13456 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2327:
+ case 2336:
/* Line 1455 of yacc.c */
-#line 13458 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13457 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.var_type)=OPT_GLOBAL; }
break;
- case 2328:
+ case 2337:
/* Line 1455 of yacc.c */
-#line 13459 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13458 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.var_type)=OPT_SESSION; }
break;
- case 2329:
+ case 2338:
/* Line 1455 of yacc.c */
-#line 13460 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13459 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.var_type)=OPT_SESSION; }
break;
- case 2330:
+ case 2339:
/* Line 1455 of yacc.c */
-#line 13464 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13463 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)= OPT_DEFAULT; }
break;
- case 2331:
+ case 2340:
/* Line 1455 of yacc.c */
-#line 13465 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13464 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->one_shot_set= 1; (yyval.num)= OPT_SESSION; }
break;
- case 2332:
+ case 2341:
/* Line 1455 of yacc.c */
-#line 13469 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13468 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.var_type)=OPT_SESSION; }
break;
- case 2333:
+ case 2342:
/* Line 1455 of yacc.c */
-#line 13470 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13469 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.var_type)=OPT_GLOBAL; }
break;
- case 2334:
+ case 2343:
/* Line 1455 of yacc.c */
-#line 13471 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13470 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.var_type)=OPT_SESSION; }
break;
- case 2335:
+ case 2344:
/* Line 1455 of yacc.c */
-#line 13472 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13471 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.var_type)=OPT_SESSION; }
break;
- case 2336:
+ case 2345:
/* Line 1455 of yacc.c */
-#line 13476 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13475 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.var_type)=OPT_DEFAULT; }
break;
- case 2337:
+ case 2346:
/* Line 1455 of yacc.c */
-#line 13477 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13476 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.var_type)=OPT_GLOBAL; }
break;
- case 2338:
+ case 2347:
/* Line 1455 of yacc.c */
-#line 13478 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13477 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.var_type)=OPT_SESSION; }
break;
- case 2339:
+ case 2348:
/* Line 1455 of yacc.c */
-#line 13479 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13478 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.var_type)=OPT_SESSION; }
break;
- case 2342:
+ case 2351:
/* Line 1455 of yacc.c */
-#line 13489 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13488 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
LEX_STRING *name= &(yyvsp[(2) - (4)].variable).base_name;
@@ -38211,10 +38229,10 @@ yyreduce:
}
break;
- case 2343:
+ case 2352:
/* Line 1455 of yacc.c */
-#line 13530 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13529 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex=Lex;
lex->option_type= (yyvsp[(1) - (5)].var_type);
@@ -38231,10 +38249,10 @@ yyreduce:
}
break;
- case 2344:
+ case 2353:
/* Line 1455 of yacc.c */
-#line 13548 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13547 "/home/buildbot/git/sql/sql_yacc.yy"
{
Item_func_set_user_var *item;
item= new (thd->mem_root) Item_func_set_user_var((yyvsp[(2) - (4)].lex_str), (yyvsp[(4) - (4)].item));
@@ -38247,10 +38265,10 @@ yyreduce:
}
break;
- case 2345:
+ case 2354:
/* Line 1455 of yacc.c */
-#line 13559 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13558 "/home/buildbot/git/sql/sql_yacc.yy"
{
struct sys_var_with_base tmp= (yyvsp[(4) - (6)].variable);
/* Lookup if necessary: must be a system variable. */
@@ -38264,10 +38282,10 @@ yyreduce:
}
break;
- case 2346:
+ case 2355:
/* Line 1455 of yacc.c */
-#line 13571 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13570 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= thd->lex;
CHARSET_INFO *cs2;
@@ -38282,10 +38300,10 @@ yyreduce:
}
break;
- case 2347:
+ case 2356:
/* Line 1455 of yacc.c */
-#line 13584 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13583 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
sp_pcontext *spc= lex->spcont;
@@ -38302,10 +38320,10 @@ yyreduce:
}
break;
- case 2348:
+ case 2357:
/* Line 1455 of yacc.c */
-#line 13599 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13598 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
CHARSET_INFO *cs2;
@@ -38326,10 +38344,10 @@ yyreduce:
}
break;
- case 2349:
+ case 2358:
/* Line 1455 of yacc.c */
-#line 13618 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13617 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= thd->lex;
LEX_USER *user;
@@ -38357,10 +38375,10 @@ yyreduce:
}
break;
- case 2350:
+ case 2359:
/* Line 1455 of yacc.c */
-#line 13644 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13643 "/home/buildbot/git/sql/sql_yacc.yy"
{
set_var_password *var= new set_var_password((yyvsp[(3) - (5)].lex_user),(yyvsp[(5) - (5)].simple_string));
if (var == NULL)
@@ -38372,10 +38390,10 @@ yyreduce:
}
break;
- case 2351:
+ case 2360:
/* Line 1455 of yacc.c */
-#line 13657 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13656 "/home/buildbot/git/sql/sql_yacc.yy"
{
sp_pcontext *spc= thd->lex->spcont;
sp_variable_t *spv;
@@ -38403,10 +38421,10 @@ yyreduce:
}
break;
- case 2352:
+ case 2361:
/* Line 1455 of yacc.c */
-#line 13683 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13682 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
if (check_reserved_words(&(yyvsp[(1) - (3)].lex_str)))
@@ -38451,10 +38469,10 @@ yyreduce:
}
break;
- case 2353:
+ case 2362:
/* Line 1455 of yacc.c */
-#line 13726 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13725 "/home/buildbot/git/sql/sql_yacc.yy"
{
sys_var *tmp=find_sys_var(thd, (yyvsp[(3) - (3)].lex_str).str, (yyvsp[(3) - (3)].lex_str).length);
if (!tmp)
@@ -38467,45 +38485,45 @@ yyreduce:
}
break;
- case 2354:
+ case 2363:
/* Line 1455 of yacc.c */
-#line 13739 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13738 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.tx_isolation)= ISO_READ_UNCOMMITTED; }
break;
- case 2355:
+ case 2364:
/* Line 1455 of yacc.c */
-#line 13740 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13739 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.tx_isolation)= ISO_READ_COMMITTED; }
break;
- case 2356:
+ case 2365:
/* Line 1455 of yacc.c */
-#line 13741 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13740 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.tx_isolation)= ISO_REPEATABLE_READ; }
break;
- case 2357:
+ case 2366:
/* Line 1455 of yacc.c */
-#line 13742 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13741 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.tx_isolation)= ISO_SERIALIZABLE; }
break;
- case 2358:
+ case 2367:
/* Line 1455 of yacc.c */
-#line 13746 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13745 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.simple_string)=(yyvsp[(1) - (1)].lex_str).str;}
break;
- case 2359:
+ case 2368:
/* Line 1455 of yacc.c */
-#line 13748 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13747 "/home/buildbot/git/sql/sql_yacc.yy"
{
(yyval.simple_string)= (yyvsp[(3) - (4)].lex_str).length ? thd->variables.old_passwords ?
Item_func_old_password::alloc(thd, (yyvsp[(3) - (4)].lex_str).str, (yyvsp[(3) - (4)].lex_str).length) :
@@ -38516,10 +38534,10 @@ yyreduce:
}
break;
- case 2360:
+ case 2369:
/* Line 1455 of yacc.c */
-#line 13757 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13756 "/home/buildbot/git/sql/sql_yacc.yy"
{
(yyval.simple_string)= (yyvsp[(3) - (4)].lex_str).length ? Item_func_old_password::alloc(thd, (yyvsp[(3) - (4)].lex_str).str,
(yyvsp[(3) - (4)].lex_str).length) :
@@ -38529,24 +38547,24 @@ yyreduce:
}
break;
- case 2361:
+ case 2370:
/* Line 1455 of yacc.c */
-#line 13768 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13767 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.item)=(yyvsp[(1) - (1)].item); }
break;
- case 2362:
+ case 2371:
/* Line 1455 of yacc.c */
-#line 13769 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13768 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.item)=0; }
break;
- case 2363:
+ case 2372:
/* Line 1455 of yacc.c */
-#line 13771 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13770 "/home/buildbot/git/sql/sql_yacc.yy"
{
(yyval.item)=new (thd->mem_root) Item_string("ON", 2, system_charset_info);
if ((yyval.item) == NULL)
@@ -38554,10 +38572,10 @@ yyreduce:
}
break;
- case 2364:
+ case 2373:
/* Line 1455 of yacc.c */
-#line 13777 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13776 "/home/buildbot/git/sql/sql_yacc.yy"
{
(yyval.item)=new (thd->mem_root) Item_string("ALL", 3, system_charset_info);
if ((yyval.item) == NULL)
@@ -38565,10 +38583,10 @@ yyreduce:
}
break;
- case 2365:
+ case 2374:
/* Line 1455 of yacc.c */
-#line 13783 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13782 "/home/buildbot/git/sql/sql_yacc.yy"
{
(yyval.item)=new (thd->mem_root) Item_string("binary", 6, system_charset_info);
if ((yyval.item) == NULL)
@@ -38576,10 +38594,10 @@ yyreduce:
}
break;
- case 2366:
+ case 2375:
/* Line 1455 of yacc.c */
-#line 13794 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13793 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
@@ -38592,38 +38610,31 @@ yyreduce:
}
break;
- case 2367:
+ case 2376:
/* Line 1455 of yacc.c */
-#line 13805 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13804 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2368:
-
-/* Line 1455 of yacc.c */
-#line 13809 "/home/buildbot/git/sql/sql_yacc.yy"
- { Lex->only_view= FALSE; }
- break;
-
- case 2369:
+ case 2377:
/* Line 1455 of yacc.c */
-#line 13810 "/home/buildbot/git/sql/sql_yacc.yy"
- { Lex->only_view= FALSE; }
+#line 13808 "/home/buildbot/git/sql/sql_yacc.yy"
+ { }
break;
- case 2371:
+ case 2378:
/* Line 1455 of yacc.c */
-#line 13815 "/home/buildbot/git/sql/sql_yacc.yy"
- { Lex->only_view= TRUE; }
+#line 13809 "/home/buildbot/git/sql/sql_yacc.yy"
+ { }
break;
- case 2374:
+ case 2381:
/* Line 1455 of yacc.c */
-#line 13825 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13819 "/home/buildbot/git/sql/sql_yacc.yy"
{
thr_lock_type lock_type= (thr_lock_type) (yyvsp[(3) - (3)].num);
bool lock_for_write= (lock_type >= TL_WRITE_ALLOW_WRITE);
@@ -38637,47 +38648,47 @@ yyreduce:
}
break;
- case 2375:
+ case 2382:
/* Line 1455 of yacc.c */
-#line 13839 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13833 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)= TL_READ_NO_INSERT; }
break;
- case 2376:
+ case 2383:
/* Line 1455 of yacc.c */
-#line 13840 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13834 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)= TL_WRITE_DEFAULT; }
break;
- case 2377:
+ case 2384:
/* Line 1455 of yacc.c */
-#line 13842 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13836 "/home/buildbot/git/sql/sql_yacc.yy"
{
(yyval.num)= (Lex->sphead ? TL_WRITE_DEFAULT : TL_WRITE_CONCURRENT_INSERT);
}
break;
- case 2378:
+ case 2385:
/* Line 1455 of yacc.c */
-#line 13846 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13840 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)= TL_WRITE_LOW_PRIORITY; }
break;
- case 2379:
+ case 2386:
/* Line 1455 of yacc.c */
-#line 13847 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13841 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)= TL_READ; }
break;
- case 2380:
+ case 2387:
/* Line 1455 of yacc.c */
-#line 13852 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13846 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
@@ -38690,17 +38701,17 @@ yyreduce:
}
break;
- case 2381:
+ case 2388:
/* Line 1455 of yacc.c */
-#line 13863 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13857 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2382:
+ case 2389:
/* Line 1455 of yacc.c */
-#line 13872 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13866 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
if (lex->sphead)
@@ -38714,10 +38725,10 @@ yyreduce:
}
break;
- case 2383:
+ case 2390:
/* Line 1455 of yacc.c */
-#line 13884 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13878 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
if (lex->sphead)
@@ -38731,10 +38742,10 @@ yyreduce:
}
break;
- case 2384:
+ case 2391:
/* Line 1455 of yacc.c */
-#line 13896 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13890 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex=Lex;
if (lex->sphead)
@@ -38756,10 +38767,10 @@ yyreduce:
}
break;
- case 2385:
+ case 2392:
/* Line 1455 of yacc.c */
-#line 13916 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13910 "/home/buildbot/git/sql/sql_yacc.yy"
{
Lex->expr_allows_subselect= TRUE;
/* Stored functions are not supported for HANDLER READ. */
@@ -38772,66 +38783,66 @@ yyreduce:
}
break;
- case 2386:
+ case 2393:
/* Line 1455 of yacc.c */
-#line 13929 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13923 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->ident= null_lex_str; }
break;
- case 2387:
+ case 2394:
/* Line 1455 of yacc.c */
-#line 13930 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13924 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->ident= (yyvsp[(1) - (2)].lex_str); }
break;
- case 2388:
+ case 2395:
/* Line 1455 of yacc.c */
-#line 13934 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13928 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->ha_read_mode = RFIRST; }
break;
- case 2389:
+ case 2396:
/* Line 1455 of yacc.c */
-#line 13935 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13929 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->ha_read_mode = RNEXT; }
break;
- case 2390:
+ case 2397:
/* Line 1455 of yacc.c */
-#line 13939 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13933 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->ha_read_mode = RFIRST; }
break;
- case 2391:
+ case 2398:
/* Line 1455 of yacc.c */
-#line 13940 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13934 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->ha_read_mode = RNEXT; }
break;
- case 2392:
+ case 2399:
/* Line 1455 of yacc.c */
-#line 13941 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13935 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->ha_read_mode = RPREV; }
break;
- case 2393:
+ case 2400:
/* Line 1455 of yacc.c */
-#line 13942 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13936 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->ha_read_mode = RLAST; }
break;
- case 2394:
+ case 2401:
/* Line 1455 of yacc.c */
-#line 13944 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13938 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex=Lex;
lex->ha_read_mode = RKEY;
@@ -38841,59 +38852,59 @@ yyreduce:
}
break;
- case 2395:
+ case 2402:
/* Line 1455 of yacc.c */
-#line 13952 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13946 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2396:
+ case 2403:
/* Line 1455 of yacc.c */
-#line 13956 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13950 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.ha_rkey_mode)=HA_READ_KEY_EXACT; }
break;
- case 2397:
+ case 2404:
/* Line 1455 of yacc.c */
-#line 13957 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13951 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.ha_rkey_mode)=HA_READ_KEY_OR_NEXT; }
break;
- case 2398:
+ case 2405:
/* Line 1455 of yacc.c */
-#line 13958 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13952 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.ha_rkey_mode)=HA_READ_KEY_OR_PREV; }
break;
- case 2399:
+ case 2406:
/* Line 1455 of yacc.c */
-#line 13959 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13953 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.ha_rkey_mode)=HA_READ_AFTER_KEY; }
break;
- case 2400:
+ case 2407:
/* Line 1455 of yacc.c */
-#line 13960 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13954 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.ha_rkey_mode)=HA_READ_BEFORE_KEY; }
break;
- case 2401:
+ case 2408:
/* Line 1455 of yacc.c */
-#line 13967 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13961 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2402:
+ case 2409:
/* Line 1455 of yacc.c */
-#line 13972 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13966 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_REVOKE;
@@ -38901,10 +38912,10 @@ yyreduce:
}
break;
- case 2403:
+ case 2410:
/* Line 1455 of yacc.c */
-#line 13978 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13972 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
if (lex->columns.elements)
@@ -38917,10 +38928,10 @@ yyreduce:
}
break;
- case 2404:
+ case 2411:
/* Line 1455 of yacc.c */
-#line 13989 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13983 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
if (lex->columns.elements)
@@ -38933,19 +38944,19 @@ yyreduce:
}
break;
- case 2405:
+ case 2412:
/* Line 1455 of yacc.c */
-#line 14000 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13994 "/home/buildbot/git/sql/sql_yacc.yy"
{
Lex->sql_command = SQLCOM_REVOKE_ALL;
}
break;
- case 2406:
+ case 2413:
/* Line 1455 of yacc.c */
-#line 14004 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 13998 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
lex->users_list.push_front ((yyvsp[(3) - (5)].lex_user));
@@ -38954,17 +38965,17 @@ yyreduce:
}
break;
- case 2407:
+ case 2414:
/* Line 1455 of yacc.c */
-#line 14014 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14008 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2408:
+ case 2415:
/* Line 1455 of yacc.c */
-#line 14020 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14014 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_GRANT;
@@ -38972,10 +38983,10 @@ yyreduce:
}
break;
- case 2409:
+ case 2416:
/* Line 1455 of yacc.c */
-#line 14027 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14021 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
if (lex->columns.elements)
@@ -38988,10 +38999,10 @@ yyreduce:
}
break;
- case 2410:
+ case 2417:
/* Line 1455 of yacc.c */
-#line 14039 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14033 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
if (lex->columns.elements)
@@ -39004,10 +39015,10 @@ yyreduce:
}
break;
- case 2411:
+ case 2418:
/* Line 1455 of yacc.c */
-#line 14050 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14044 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
lex->users_list.push_front ((yyvsp[(3) - (6)].lex_user));
@@ -39016,279 +39027,279 @@ yyreduce:
}
break;
- case 2414:
+ case 2421:
/* Line 1455 of yacc.c */
-#line 14064 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14058 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2415:
+ case 2422:
/* Line 1455 of yacc.c */
-#line 14066 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14060 "/home/buildbot/git/sql/sql_yacc.yy"
{
Lex->all_privileges= 1;
Lex->grant= GLOBAL_ACLS;
}
break;
- case 2420:
+ case 2427:
/* Line 1455 of yacc.c */
-#line 14084 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14078 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->which_columns = SELECT_ACL;}
break;
- case 2421:
+ case 2428:
/* Line 1455 of yacc.c */
-#line 14085 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14079 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2422:
+ case 2429:
/* Line 1455 of yacc.c */
-#line 14087 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14081 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->which_columns = INSERT_ACL;}
break;
- case 2423:
+ case 2430:
/* Line 1455 of yacc.c */
-#line 14088 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14082 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2424:
+ case 2431:
/* Line 1455 of yacc.c */
-#line 14090 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14084 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->which_columns = UPDATE_ACL; }
break;
- case 2425:
+ case 2432:
/* Line 1455 of yacc.c */
-#line 14091 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14085 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2426:
+ case 2433:
/* Line 1455 of yacc.c */
-#line 14093 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14087 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->which_columns = REFERENCES_ACL;}
break;
- case 2427:
+ case 2434:
/* Line 1455 of yacc.c */
-#line 14094 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14088 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2428:
+ case 2435:
/* Line 1455 of yacc.c */
-#line 14095 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14089 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->grant |= DELETE_ACL;}
break;
- case 2429:
+ case 2436:
/* Line 1455 of yacc.c */
-#line 14096 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14090 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2430:
+ case 2437:
/* Line 1455 of yacc.c */
-#line 14097 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14091 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->grant |= INDEX_ACL;}
break;
- case 2431:
+ case 2438:
/* Line 1455 of yacc.c */
-#line 14098 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14092 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->grant |= ALTER_ACL;}
break;
- case 2432:
+ case 2439:
/* Line 1455 of yacc.c */
-#line 14099 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14093 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->grant |= CREATE_ACL;}
break;
- case 2433:
+ case 2440:
/* Line 1455 of yacc.c */
-#line 14100 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14094 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->grant |= DROP_ACL;}
break;
- case 2434:
+ case 2441:
/* Line 1455 of yacc.c */
-#line 14101 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14095 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->grant |= EXECUTE_ACL;}
break;
- case 2435:
+ case 2442:
/* Line 1455 of yacc.c */
-#line 14102 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14096 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->grant |= RELOAD_ACL;}
break;
- case 2436:
+ case 2443:
/* Line 1455 of yacc.c */
-#line 14103 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14097 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->grant |= SHUTDOWN_ACL;}
break;
- case 2437:
+ case 2444:
/* Line 1455 of yacc.c */
-#line 14104 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14098 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->grant |= PROCESS_ACL;}
break;
- case 2438:
+ case 2445:
/* Line 1455 of yacc.c */
-#line 14105 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14099 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->grant |= FILE_ACL;}
break;
- case 2439:
+ case 2446:
/* Line 1455 of yacc.c */
-#line 14106 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14100 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->grant |= GRANT_ACL;}
break;
- case 2440:
+ case 2447:
/* Line 1455 of yacc.c */
-#line 14107 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14101 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->grant |= SHOW_DB_ACL;}
break;
- case 2441:
+ case 2448:
/* Line 1455 of yacc.c */
-#line 14108 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14102 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->grant |= SUPER_ACL;}
break;
- case 2442:
+ case 2449:
/* Line 1455 of yacc.c */
-#line 14109 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14103 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->grant |= CREATE_TMP_ACL;}
break;
- case 2443:
+ case 2450:
/* Line 1455 of yacc.c */
-#line 14110 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14104 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->grant |= LOCK_TABLES_ACL; }
break;
- case 2444:
+ case 2451:
/* Line 1455 of yacc.c */
-#line 14111 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14105 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->grant |= REPL_SLAVE_ACL; }
break;
- case 2445:
+ case 2452:
/* Line 1455 of yacc.c */
-#line 14112 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14106 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->grant |= REPL_CLIENT_ACL; }
break;
- case 2446:
+ case 2453:
/* Line 1455 of yacc.c */
-#line 14113 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14107 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->grant |= CREATE_VIEW_ACL; }
break;
- case 2447:
+ case 2454:
/* Line 1455 of yacc.c */
-#line 14114 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14108 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->grant |= SHOW_VIEW_ACL; }
break;
- case 2448:
+ case 2455:
/* Line 1455 of yacc.c */
-#line 14115 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14109 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->grant |= CREATE_PROC_ACL; }
break;
- case 2449:
+ case 2456:
/* Line 1455 of yacc.c */
-#line 14116 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14110 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->grant |= ALTER_PROC_ACL; }
break;
- case 2450:
+ case 2457:
/* Line 1455 of yacc.c */
-#line 14117 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14111 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->grant |= CREATE_USER_ACL; }
break;
- case 2451:
+ case 2458:
/* Line 1455 of yacc.c */
-#line 14118 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14112 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->grant |= EVENT_ACL;}
break;
- case 2452:
+ case 2459:
/* Line 1455 of yacc.c */
-#line 14119 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14113 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->grant |= TRIGGER_ACL; }
break;
- case 2453:
+ case 2460:
/* Line 1455 of yacc.c */
-#line 14120 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14114 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->grant |= CREATE_TABLESPACE_ACL; }
break;
- case 2454:
+ case 2461:
/* Line 1455 of yacc.c */
-#line 14124 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14118 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2455:
+ case 2462:
/* Line 1455 of yacc.c */
-#line 14125 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14119 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2458:
+ case 2465:
/* Line 1455 of yacc.c */
-#line 14135 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14129 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex=Lex;
if (lex->x509_subject)
@@ -39300,10 +39311,10 @@ yyreduce:
}
break;
- case 2459:
+ case 2466:
/* Line 1455 of yacc.c */
-#line 14145 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14139 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex=Lex;
if (lex->x509_issuer)
@@ -39315,10 +39326,10 @@ yyreduce:
}
break;
- case 2460:
+ case 2467:
/* Line 1455 of yacc.c */
-#line 14155 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14149 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex=Lex;
if (lex->ssl_cipher)
@@ -39330,10 +39341,10 @@ yyreduce:
}
break;
- case 2461:
+ case 2468:
/* Line 1455 of yacc.c */
-#line 14168 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14162 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
size_t dummy;
@@ -39350,10 +39361,10 @@ yyreduce:
}
break;
- case 2462:
+ case 2469:
/* Line 1455 of yacc.c */
-#line 14183 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14177 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
lex->current_select->db = (yyvsp[(1) - (3)].lex_str).str;
@@ -39368,10 +39379,10 @@ yyreduce:
}
break;
- case 2463:
+ case 2470:
/* Line 1455 of yacc.c */
-#line 14196 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14190 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
lex->current_select->db = NULL;
@@ -39386,10 +39397,10 @@ yyreduce:
}
break;
- case 2464:
+ case 2471:
/* Line 1455 of yacc.c */
-#line 14209 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14203 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex=Lex;
if (!lex->current_select->add_table_to_list(lex->thd, (yyvsp[(1) - (1)].table),NULL,
@@ -39400,50 +39411,50 @@ yyreduce:
}
break;
- case 2465:
+ case 2472:
/* Line 1455 of yacc.c */
-#line 14221 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14215 "/home/buildbot/git/sql/sql_yacc.yy"
{
if (Lex->users_list.push_back((yyvsp[(1) - (1)].lex_user)))
MYSQL_YYABORT;
}
break;
- case 2466:
+ case 2473:
/* Line 1455 of yacc.c */
-#line 14226 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14220 "/home/buildbot/git/sql/sql_yacc.yy"
{
if (Lex->users_list.push_back((yyvsp[(3) - (3)].lex_user)))
MYSQL_YYABORT;
}
break;
- case 2467:
+ case 2474:
/* Line 1455 of yacc.c */
-#line 14234 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14228 "/home/buildbot/git/sql/sql_yacc.yy"
{
if (Lex->users_list.push_back((yyvsp[(1) - (1)].lex_user)))
MYSQL_YYABORT;
}
break;
- case 2468:
+ case 2475:
/* Line 1455 of yacc.c */
-#line 14239 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14233 "/home/buildbot/git/sql/sql_yacc.yy"
{
if (Lex->users_list.push_back((yyvsp[(3) - (3)].lex_user)))
MYSQL_YYABORT;
}
break;
- case 2473:
+ case 2480:
/* Line 1455 of yacc.c */
-#line 14250 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14244 "/home/buildbot/git/sql/sql_yacc.yy"
{
(yyval.lex_user)=(yyvsp[(1) - (4)].lex_user); (yyvsp[(1) - (4)].lex_user)->password=(yyvsp[(4) - (4)].lex_str);
if ((yyvsp[(4) - (4)].lex_str).length)
@@ -39472,20 +39483,20 @@ yyreduce:
}
break;
- case 2474:
+ case 2481:
/* Line 1455 of yacc.c */
-#line 14277 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14271 "/home/buildbot/git/sql/sql_yacc.yy"
{
(yyval.lex_user)= (yyvsp[(1) - (5)].lex_user);
(yyvsp[(1) - (5)].lex_user)->password= (yyvsp[(5) - (5)].lex_str);
}
break;
- case 2475:
+ case 2482:
/* Line 1455 of yacc.c */
-#line 14282 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14276 "/home/buildbot/git/sql/sql_yacc.yy"
{
(yyval.lex_user)= (yyvsp[(1) - (4)].lex_user);
(yyvsp[(1) - (4)].lex_user)->plugin= (yyvsp[(4) - (4)].lex_str);
@@ -39493,10 +39504,10 @@ yyreduce:
}
break;
- case 2476:
+ case 2483:
/* Line 1455 of yacc.c */
-#line 14288 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14282 "/home/buildbot/git/sql/sql_yacc.yy"
{
(yyval.lex_user)= (yyvsp[(1) - (6)].lex_user);
(yyvsp[(1) - (6)].lex_user)->plugin= (yyvsp[(4) - (6)].lex_str);
@@ -39504,27 +39515,27 @@ yyreduce:
}
break;
- case 2477:
+ case 2484:
/* Line 1455 of yacc.c */
-#line 14294 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14288 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.lex_user)= (yyvsp[(1) - (1)].lex_user); (yyvsp[(1) - (1)].lex_user)->password= null_lex_str; }
break;
- case 2478:
+ case 2485:
/* Line 1455 of yacc.c */
-#line 14299 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14293 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex=Lex;
lex->grant |= lex->which_columns;
}
break;
- case 2482:
+ case 2489:
/* Line 1455 of yacc.c */
-#line 14313 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14307 "/home/buildbot/git/sql/sql_yacc.yy"
{
String *new_str = new (thd->mem_root) String((const char*) (yyvsp[(1) - (1)].lex_str).str,(yyvsp[(1) - (1)].lex_str).length,system_charset_info);
if (new_str == NULL)
@@ -39551,88 +39562,88 @@ yyreduce:
}
break;
- case 2484:
+ case 2491:
/* Line 1455 of yacc.c */
-#line 14342 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14336 "/home/buildbot/git/sql/sql_yacc.yy"
{
Lex->ssl_type=SSL_TYPE_SPECIFIED;
}
break;
- case 2485:
+ case 2492:
/* Line 1455 of yacc.c */
-#line 14346 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14340 "/home/buildbot/git/sql/sql_yacc.yy"
{
Lex->ssl_type=SSL_TYPE_ANY;
}
break;
- case 2486:
+ case 2493:
/* Line 1455 of yacc.c */
-#line 14350 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14344 "/home/buildbot/git/sql/sql_yacc.yy"
{
Lex->ssl_type=SSL_TYPE_X509;
}
break;
- case 2487:
+ case 2494:
/* Line 1455 of yacc.c */
-#line 14354 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14348 "/home/buildbot/git/sql/sql_yacc.yy"
{
Lex->ssl_type=SSL_TYPE_NONE;
}
break;
- case 2488:
+ case 2495:
/* Line 1455 of yacc.c */
-#line 14360 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14354 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2490:
+ case 2497:
/* Line 1455 of yacc.c */
-#line 14365 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14359 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2491:
+ case 2498:
/* Line 1455 of yacc.c */
-#line 14366 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14360 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->grant |= GRANT_ACL;}
break;
- case 2492:
+ case 2499:
/* Line 1455 of yacc.c */
-#line 14370 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14364 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2493:
+ case 2500:
/* Line 1455 of yacc.c */
-#line 14371 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14365 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2494:
+ case 2501:
/* Line 1455 of yacc.c */
-#line 14375 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14369 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->grant |= GRANT_ACL;}
break;
- case 2495:
+ case 2502:
/* Line 1455 of yacc.c */
-#line 14377 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14371 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex=Lex;
lex->mqh.questions=(yyvsp[(2) - (2)].ulong_num);
@@ -39640,10 +39651,10 @@ yyreduce:
}
break;
- case 2496:
+ case 2503:
/* Line 1455 of yacc.c */
-#line 14383 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14377 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex=Lex;
lex->mqh.updates=(yyvsp[(2) - (2)].ulong_num);
@@ -39651,10 +39662,10 @@ yyreduce:
}
break;
- case 2497:
+ case 2504:
/* Line 1455 of yacc.c */
-#line 14389 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14383 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex=Lex;
lex->mqh.conn_per_hour= (yyvsp[(2) - (2)].ulong_num);
@@ -39662,10 +39673,10 @@ yyreduce:
}
break;
- case 2498:
+ case 2505:
/* Line 1455 of yacc.c */
-#line 14395 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14389 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex=Lex;
lex->mqh.user_conn= (yyvsp[(2) - (2)].num);
@@ -39673,10 +39684,10 @@ yyreduce:
}
break;
- case 2499:
+ case 2506:
/* Line 1455 of yacc.c */
-#line 14404 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14398 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command = SQLCOM_BEGIN;
@@ -39684,87 +39695,87 @@ yyreduce:
}
break;
- case 2500:
+ case 2507:
/* Line 1455 of yacc.c */
-#line 14409 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14403 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2501:
+ case 2508:
/* Line 1455 of yacc.c */
-#line 14413 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14407 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2502:
+ case 2509:
/* Line 1455 of yacc.c */
-#line 14414 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14408 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2503:
+ case 2510:
/* Line 1455 of yacc.c */
-#line 14419 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14413 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.m_yes_no_unk)= TVL_UNKNOWN; }
break;
- case 2504:
+ case 2511:
/* Line 1455 of yacc.c */
-#line 14420 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14414 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.m_yes_no_unk)= TVL_NO; }
break;
- case 2505:
+ case 2512:
/* Line 1455 of yacc.c */
-#line 14421 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14415 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.m_yes_no_unk)= TVL_YES; }
break;
- case 2506:
+ case 2513:
/* Line 1455 of yacc.c */
-#line 14426 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14420 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.m_yes_no_unk)= TVL_UNKNOWN; }
break;
- case 2507:
+ case 2514:
/* Line 1455 of yacc.c */
-#line 14427 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14421 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.m_yes_no_unk)= TVL_YES; }
break;
- case 2508:
+ case 2515:
/* Line 1455 of yacc.c */
-#line 14428 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14422 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.m_yes_no_unk)= TVL_NO; }
break;
- case 2509:
+ case 2516:
/* Line 1455 of yacc.c */
-#line 14432 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14426 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2510:
+ case 2517:
/* Line 1455 of yacc.c */
-#line 14433 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14427 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2511:
+ case 2518:
/* Line 1455 of yacc.c */
-#line 14438 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14432 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_COMMIT;
@@ -39775,10 +39786,10 @@ yyreduce:
}
break;
- case 2512:
+ case 2519:
/* Line 1455 of yacc.c */
-#line 14450 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14444 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_ROLLBACK;
@@ -39789,10 +39800,10 @@ yyreduce:
}
break;
- case 2513:
+ case 2520:
/* Line 1455 of yacc.c */
-#line 14460 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14454 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_ROLLBACK_TO_SAVEPOINT;
@@ -39800,10 +39811,10 @@ yyreduce:
}
break;
- case 2514:
+ case 2521:
/* Line 1455 of yacc.c */
-#line 14469 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14463 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_SAVEPOINT;
@@ -39811,10 +39822,10 @@ yyreduce:
}
break;
- case 2515:
+ case 2522:
/* Line 1455 of yacc.c */
-#line 14478 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14472 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_RELEASE_SAVEPOINT;
@@ -39822,27 +39833,27 @@ yyreduce:
}
break;
- case 2516:
+ case 2523:
/* Line 1455 of yacc.c */
-#line 14491 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14485 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2518:
+ case 2525:
/* Line 1455 of yacc.c */
-#line 14497 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14491 "/home/buildbot/git/sql/sql_yacc.yy"
{
if (add_select_to_union_list(Lex, (bool)(yyvsp[(2) - (2)].num), TRUE))
MYSQL_YYABORT;
}
break;
- case 2519:
+ case 2526:
/* Line 1455 of yacc.c */
-#line 14502 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14496 "/home/buildbot/git/sql/sql_yacc.yy"
{
/*
Remove from the name resolution context stack the context of the
@@ -39852,45 +39863,45 @@ yyreduce:
}
break;
- case 2520:
+ case 2527:
/* Line 1455 of yacc.c */
-#line 14512 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14506 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)= 0; }
break;
- case 2521:
+ case 2528:
/* Line 1455 of yacc.c */
-#line 14513 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14507 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)= 1; }
break;
- case 2522:
+ case 2529:
/* Line 1455 of yacc.c */
-#line 14514 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14508 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)= 1; }
break;
- case 2523:
+ case 2530:
/* Line 1455 of yacc.c */
-#line 14518 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14512 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.is_not_empty)= false; }
break;
- case 2524:
+ case 2531:
/* Line 1455 of yacc.c */
-#line 14519 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14513 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.is_not_empty)= true; }
break;
- case 2525:
+ case 2532:
/* Line 1455 of yacc.c */
-#line 14523 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14517 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= thd->lex;
DBUG_ASSERT(lex->current_select->linkage != GLOBAL_OPTIONS_TYPE);
@@ -39907,88 +39918,88 @@ yyreduce:
}
break;
- case 2526:
+ case 2533:
/* Line 1455 of yacc.c */
-#line 14538 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14532 "/home/buildbot/git/sql/sql_yacc.yy"
{
thd->lex->current_select->no_table_names_allowed= 0;
thd->where= "";
}
break;
- case 2529:
+ case 2536:
/* Line 1455 of yacc.c */
-#line 14550 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14544 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)=1; }
break;
- case 2530:
+ case 2537:
/* Line 1455 of yacc.c */
-#line 14551 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14545 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)=1; }
break;
- case 2531:
+ case 2538:
/* Line 1455 of yacc.c */
-#line 14552 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14546 "/home/buildbot/git/sql/sql_yacc.yy"
{ (yyval.num)=0; }
break;
- case 2532:
+ case 2539:
/* Line 1455 of yacc.c */
-#line 14557 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14551 "/home/buildbot/git/sql/sql_yacc.yy"
{
(yyval.select_lex)= Lex->current_select->master_unit()->first_select();
}
break;
- case 2533:
+ case 2540:
/* Line 1455 of yacc.c */
-#line 14561 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14555 "/home/buildbot/git/sql/sql_yacc.yy"
{
(yyval.select_lex)= Lex->current_select->master_unit()->first_select();
}
break;
- case 2535:
+ case 2542:
/* Line 1455 of yacc.c */
-#line 14570 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14564 "/home/buildbot/git/sql/sql_yacc.yy"
{
if (add_select_to_union_list(Lex, (bool)(yyvsp[(3) - (3)].num), FALSE))
MYSQL_YYABORT;
}
break;
- case 2536:
+ case 2543:
/* Line 1455 of yacc.c */
-#line 14576 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14570 "/home/buildbot/git/sql/sql_yacc.yy"
{
Lex->pop_context();
(yyval.select_lex)= (yyvsp[(1) - (6)].select_lex);
}
break;
- case 2537:
+ case 2544:
/* Line 1455 of yacc.c */
-#line 14585 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14579 "/home/buildbot/git/sql/sql_yacc.yy"
{
(yyval.select_lex)= (yyvsp[(2) - (3)].select_lex);
}
break;
- case 2538:
+ case 2545:
/* Line 1455 of yacc.c */
-#line 14591 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14585 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex=Lex;
if (!lex->expr_allows_subselect ||
@@ -40009,10 +40020,10 @@ yyreduce:
}
break;
- case 2539:
+ case 2546:
/* Line 1455 of yacc.c */
-#line 14612 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14606 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex=Lex;
@@ -40037,17 +40048,17 @@ yyreduce:
}
break;
- case 2544:
+ case 2551:
/* Line 1455 of yacc.c */
-#line 14647 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14641 "/home/buildbot/git/sql/sql_yacc.yy"
{ Select->options|= SELECT_STRAIGHT_JOIN; }
break;
- case 2545:
+ case 2552:
/* Line 1455 of yacc.c */
-#line 14649 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14643 "/home/buildbot/git/sql/sql_yacc.yy"
{
if (check_simple_select())
MYSQL_YYABORT;
@@ -40057,31 +40068,31 @@ yyreduce:
}
break;
- case 2546:
+ case 2553:
/* Line 1455 of yacc.c */
-#line 14656 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14650 "/home/buildbot/git/sql/sql_yacc.yy"
{ Select->options|= SELECT_DISTINCT; }
break;
- case 2547:
+ case 2554:
/* Line 1455 of yacc.c */
-#line 14657 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14651 "/home/buildbot/git/sql/sql_yacc.yy"
{ Select->options|= SELECT_SMALL_RESULT; }
break;
- case 2548:
+ case 2555:
/* Line 1455 of yacc.c */
-#line 14658 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14652 "/home/buildbot/git/sql/sql_yacc.yy"
{ Select->options|= SELECT_BIG_RESULT; }
break;
- case 2549:
+ case 2556:
/* Line 1455 of yacc.c */
-#line 14660 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14654 "/home/buildbot/git/sql/sql_yacc.yy"
{
if (check_simple_select())
MYSQL_YYABORT;
@@ -40089,10 +40100,10 @@ yyreduce:
}
break;
- case 2550:
+ case 2557:
/* Line 1455 of yacc.c */
-#line 14666 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14660 "/home/buildbot/git/sql/sql_yacc.yy"
{
if (check_simple_select())
MYSQL_YYABORT;
@@ -40100,38 +40111,38 @@ yyreduce:
}
break;
- case 2551:
+ case 2558:
/* Line 1455 of yacc.c */
-#line 14671 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14665 "/home/buildbot/git/sql/sql_yacc.yy"
{ Select->options|= SELECT_ALL; }
break;
- case 2552:
+ case 2559:
/* Line 1455 of yacc.c */
-#line 14682 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14676 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2553:
+ case 2560:
/* Line 1455 of yacc.c */
-#line 14684 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14678 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2554:
+ case 2561:
/* Line 1455 of yacc.c */
-#line 14686 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14680 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2568:
+ case 2575:
/* Line 1455 of yacc.c */
-#line 14719 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14713 "/home/buildbot/git/sql/sql_yacc.yy"
{
/*
We have to distinguish missing DEFINER-clause from case when
@@ -40144,89 +40155,89 @@ yyreduce:
}
break;
- case 2569:
+ case 2576:
/* Line 1455 of yacc.c */
-#line 14733 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14727 "/home/buildbot/git/sql/sql_yacc.yy"
{
thd->lex->definer= get_current_user(thd, (yyvsp[(3) - (3)].lex_user));
}
break;
- case 2570:
+ case 2577:
/* Line 1455 of yacc.c */
-#line 14746 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14740 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2571:
+ case 2578:
/* Line 1455 of yacc.c */
-#line 14748 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14742 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2572:
+ case 2579:
/* Line 1455 of yacc.c */
-#line 14750 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14744 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2573:
+ case 2580:
/* Line 1455 of yacc.c */
-#line 14755 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14749 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->create_view_mode= VIEW_CREATE_OR_REPLACE; }
break;
- case 2574:
+ case 2581:
/* Line 1455 of yacc.c */
-#line 14760 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14754 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->create_view_algorithm= DTYPE_ALGORITHM_UNDEFINED; }
break;
- case 2575:
+ case 2582:
/* Line 1455 of yacc.c */
-#line 14762 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14756 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->create_view_algorithm= VIEW_ALGORITHM_MERGE; }
break;
- case 2576:
+ case 2583:
/* Line 1455 of yacc.c */
-#line 14764 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14758 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->create_view_algorithm= VIEW_ALGORITHM_TMPTABLE; }
break;
- case 2577:
+ case 2584:
/* Line 1455 of yacc.c */
-#line 14769 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14763 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->create_view_suid= VIEW_SUID_DEFAULT; }
break;
- case 2578:
+ case 2585:
/* Line 1455 of yacc.c */
-#line 14771 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14765 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->create_view_suid= VIEW_SUID_DEFINER; }
break;
- case 2579:
+ case 2586:
/* Line 1455 of yacc.c */
-#line 14773 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14767 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->create_view_suid= VIEW_SUID_INVOKER; }
break;
- case 2580:
+ case 2587:
/* Line 1455 of yacc.c */
-#line 14778 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14772 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= thd->lex;
lex->sql_command= SQLCOM_CREATE_VIEW;
@@ -40240,37 +40251,37 @@ yyreduce:
}
break;
- case 2582:
+ case 2589:
/* Line 1455 of yacc.c */
-#line 14794 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14788 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2584:
+ case 2591:
/* Line 1455 of yacc.c */
-#line 14800 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14794 "/home/buildbot/git/sql/sql_yacc.yy"
{
Lex->view_list.push_back((LEX_STRING*)
sql_memdup(&(yyvsp[(1) - (1)].lex_str), sizeof(LEX_STRING)));
}
break;
- case 2585:
+ case 2592:
/* Line 1455 of yacc.c */
-#line 14805 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14799 "/home/buildbot/git/sql/sql_yacc.yy"
{
Lex->view_list.push_back((LEX_STRING*)
sql_memdup(&(yyvsp[(3) - (3)].lex_str), sizeof(LEX_STRING)));
}
break;
- case 2586:
+ case 2593:
/* Line 1455 of yacc.c */
-#line 14812 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14806 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
lex->parsing_options.allows_variable= FALSE;
@@ -40281,10 +40292,10 @@ yyreduce:
}
break;
- case 2587:
+ case 2594:
/* Line 1455 of yacc.c */
-#line 14821 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14815 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
uint len= YYLIP->get_cpp_ptr() - lex->create_view_select.str;
@@ -40299,56 +40310,56 @@ yyreduce:
}
break;
- case 2590:
+ case 2597:
/* Line 1455 of yacc.c */
-#line 14842 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14836 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->create_view_check= VIEW_CHECK_NONE; }
break;
- case 2591:
+ case 2598:
/* Line 1455 of yacc.c */
-#line 14844 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14838 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->create_view_check= VIEW_CHECK_CASCADED; }
break;
- case 2592:
+ case 2599:
/* Line 1455 of yacc.c */
-#line 14846 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14840 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->create_view_check= VIEW_CHECK_CASCADED; }
break;
- case 2593:
+ case 2600:
/* Line 1455 of yacc.c */
-#line 14848 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14842 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->create_view_check= VIEW_CHECK_LOCAL; }
break;
- case 2594:
+ case 2601:
/* Line 1455 of yacc.c */
-#line 14865 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14859 "/home/buildbot/git/sql/sql_yacc.yy"
{ /* $8 */
Lex->raw_trg_on_table_name_begin= YYLIP->get_tok_start();
}
break;
- case 2595:
+ case 2602:
/* Line 1455 of yacc.c */
-#line 14871 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14865 "/home/buildbot/git/sql/sql_yacc.yy"
{ /* $12 */
Lex->raw_trg_on_table_name_end= YYLIP->get_tok_start();
}
break;
- case 2596:
+ case 2603:
/* Line 1455 of yacc.c */
-#line 14876 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14870 "/home/buildbot/git/sql/sql_yacc.yy"
{ /* $15 */
LEX *lex= thd->lex;
Lex_input_stream *lip= YYLIP;
@@ -40379,10 +40390,10 @@ yyreduce:
}
break;
- case 2597:
+ case 2604:
/* Line 1455 of yacc.c */
-#line 14905 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14899 "/home/buildbot/git/sql/sql_yacc.yy"
{ /* $17 */
LEX *lex= Lex;
sp_head *sp= lex->sphead;
@@ -40408,10 +40419,10 @@ yyreduce:
}
break;
- case 2598:
+ case 2605:
/* Line 1455 of yacc.c */
-#line 14939 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14933 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= thd->lex;
if (is_native_function(thd, & (yyvsp[(4) - (8)].lex_str)))
@@ -40429,10 +40440,10 @@ yyreduce:
}
break;
- case 2599:
+ case 2606:
/* Line 1455 of yacc.c */
-#line 14956 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14950 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= thd->lex;
if (is_native_function(thd, & (yyvsp[(3) - (7)].lex_str)))
@@ -40450,10 +40461,10 @@ yyreduce:
}
break;
- case 2600:
+ case 2607:
/* Line 1455 of yacc.c */
-#line 14978 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 14972 "/home/buildbot/git/sql/sql_yacc.yy"
{ /* $5 */
LEX *lex= thd->lex;
Lex_input_stream *lip= YYLIP;
@@ -40485,19 +40496,19 @@ yyreduce:
}
break;
- case 2601:
+ case 2608:
/* Line 1455 of yacc.c */
-#line 15009 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 15003 "/home/buildbot/git/sql/sql_yacc.yy"
{ /* $8 */
Lex->sphead->m_param_end= YYLIP->get_cpp_tok_start();
}
break;
- case 2602:
+ case 2609:
/* Line 1455 of yacc.c */
-#line 15013 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 15007 "/home/buildbot/git/sql/sql_yacc.yy"
{ /* $10 */
LEX *lex= Lex;
lex->charset= NULL;
@@ -40508,10 +40519,10 @@ yyreduce:
}
break;
- case 2603:
+ case 2610:
/* Line 1455 of yacc.c */
-#line 15022 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 15016 "/home/buildbot/git/sql/sql_yacc.yy"
{ /* $12 */
LEX *lex= Lex;
sp_head *sp= lex->sphead;
@@ -40536,10 +40547,10 @@ yyreduce:
}
break;
- case 2604:
+ case 2611:
/* Line 1455 of yacc.c */
-#line 15045 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 15039 "/home/buildbot/git/sql/sql_yacc.yy"
{ /* $14 */
LEX *lex= thd->lex;
Lex_input_stream *lip= YYLIP;
@@ -40549,10 +40560,10 @@ yyreduce:
}
break;
- case 2605:
+ case 2612:
/* Line 1455 of yacc.c */
-#line 15053 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 15047 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= thd->lex;
sp_head *sp= lex->sphead;
@@ -40606,10 +40617,10 @@ yyreduce:
}
break;
- case 2606:
+ case 2613:
/* Line 1455 of yacc.c */
-#line 15108 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 15102 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
sp_head *sp;
@@ -40635,10 +40646,10 @@ yyreduce:
}
break;
- case 2607:
+ case 2614:
/* Line 1455 of yacc.c */
-#line 15132 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 15126 "/home/buildbot/git/sql/sql_yacc.yy"
{
const char* tmp_param_begin;
@@ -40648,10 +40659,10 @@ yyreduce:
}
break;
- case 2608:
+ case 2615:
/* Line 1455 of yacc.c */
-#line 15141 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 15135 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= thd->lex;
@@ -40660,10 +40671,10 @@ yyreduce:
}
break;
- case 2609:
+ case 2616:
/* Line 1455 of yacc.c */
-#line 15148 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 15142 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= thd->lex;
@@ -40672,10 +40683,10 @@ yyreduce:
}
break;
- case 2610:
+ case 2617:
/* Line 1455 of yacc.c */
-#line 15155 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 15149 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
sp_head *sp= lex->sphead;
@@ -40686,64 +40697,64 @@ yyreduce:
}
break;
- case 2611:
+ case 2618:
/* Line 1455 of yacc.c */
-#line 15169 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 15163 "/home/buildbot/git/sql/sql_yacc.yy"
{
Lex->sql_command = SQLCOM_XA_START;
}
break;
- case 2612:
+ case 2619:
/* Line 1455 of yacc.c */
-#line 15173 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 15167 "/home/buildbot/git/sql/sql_yacc.yy"
{
Lex->sql_command = SQLCOM_XA_END;
}
break;
- case 2613:
+ case 2620:
/* Line 1455 of yacc.c */
-#line 15177 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 15171 "/home/buildbot/git/sql/sql_yacc.yy"
{
Lex->sql_command = SQLCOM_XA_PREPARE;
}
break;
- case 2614:
+ case 2621:
/* Line 1455 of yacc.c */
-#line 15181 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 15175 "/home/buildbot/git/sql/sql_yacc.yy"
{
Lex->sql_command = SQLCOM_XA_COMMIT;
}
break;
- case 2615:
+ case 2622:
/* Line 1455 of yacc.c */
-#line 15185 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 15179 "/home/buildbot/git/sql/sql_yacc.yy"
{
Lex->sql_command = SQLCOM_XA_ROLLBACK;
}
break;
- case 2616:
+ case 2623:
/* Line 1455 of yacc.c */
-#line 15189 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 15183 "/home/buildbot/git/sql/sql_yacc.yy"
{
Lex->sql_command = SQLCOM_XA_RECOVER;
}
break;
- case 2617:
+ case 2624:
/* Line 1455 of yacc.c */
-#line 15196 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 15190 "/home/buildbot/git/sql/sql_yacc.yy"
{
MYSQL_YYABORT_UNLESS((yyvsp[(1) - (1)].string)->length() <= MAXGTRIDSIZE);
if (!(Lex->xid=(XID *)thd->alloc(sizeof(XID))))
@@ -40752,10 +40763,10 @@ yyreduce:
}
break;
- case 2618:
+ case 2625:
/* Line 1455 of yacc.c */
-#line 15203 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 15197 "/home/buildbot/git/sql/sql_yacc.yy"
{
MYSQL_YYABORT_UNLESS((yyvsp[(1) - (3)].string)->length() <= MAXGTRIDSIZE && (yyvsp[(3) - (3)].string)->length() <= MAXBQUALSIZE);
if (!(Lex->xid=(XID *)thd->alloc(sizeof(XID))))
@@ -40764,10 +40775,10 @@ yyreduce:
}
break;
- case 2619:
+ case 2626:
/* Line 1455 of yacc.c */
-#line 15210 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 15204 "/home/buildbot/git/sql/sql_yacc.yy"
{
MYSQL_YYABORT_UNLESS((yyvsp[(1) - (5)].string)->length() <= MAXGTRIDSIZE && (yyvsp[(3) - (5)].string)->length() <= MAXBQUALSIZE);
if (!(Lex->xid=(XID *)thd->alloc(sizeof(XID))))
@@ -40776,87 +40787,87 @@ yyreduce:
}
break;
- case 2620:
+ case 2627:
/* Line 1455 of yacc.c */
-#line 15219 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 15213 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2621:
+ case 2628:
/* Line 1455 of yacc.c */
-#line 15220 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 15214 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2622:
+ case 2629:
/* Line 1455 of yacc.c */
-#line 15224 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 15218 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->xa_opt=XA_NONE; }
break;
- case 2623:
+ case 2630:
/* Line 1455 of yacc.c */
-#line 15225 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 15219 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->xa_opt=XA_JOIN; }
break;
- case 2624:
+ case 2631:
/* Line 1455 of yacc.c */
-#line 15226 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 15220 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->xa_opt=XA_RESUME; }
break;
- case 2625:
+ case 2632:
/* Line 1455 of yacc.c */
-#line 15230 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 15224 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->xa_opt=XA_NONE; }
break;
- case 2626:
+ case 2633:
/* Line 1455 of yacc.c */
-#line 15231 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 15225 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->xa_opt=XA_ONE_PHASE; }
break;
- case 2627:
+ case 2634:
/* Line 1455 of yacc.c */
-#line 15236 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 15230 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->xa_opt=XA_NONE; }
break;
- case 2628:
+ case 2635:
/* Line 1455 of yacc.c */
-#line 15238 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 15232 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->xa_opt=XA_SUSPEND; }
break;
- case 2630:
+ case 2637:
/* Line 1455 of yacc.c */
-#line 15243 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 15237 "/home/buildbot/git/sql/sql_yacc.yy"
{}
break;
- case 2631:
+ case 2638:
/* Line 1455 of yacc.c */
-#line 15244 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 15238 "/home/buildbot/git/sql/sql_yacc.yy"
{ Lex->xa_opt=XA_FOR_MIGRATE; }
break;
- case 2632:
+ case 2639:
/* Line 1455 of yacc.c */
-#line 15249 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 15243 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_INSTALL_PLUGIN;
@@ -40865,10 +40876,10 @@ yyreduce:
}
break;
- case 2633:
+ case 2640:
/* Line 1455 of yacc.c */
-#line 15256 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 15250 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_INSTALL_PLUGIN;
@@ -40877,10 +40888,10 @@ yyreduce:
}
break;
- case 2634:
+ case 2641:
/* Line 1455 of yacc.c */
-#line 15266 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 15260 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_UNINSTALL_PLUGIN;
@@ -40888,10 +40899,10 @@ yyreduce:
}
break;
- case 2635:
+ case 2642:
/* Line 1455 of yacc.c */
-#line 15272 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 15266 "/home/buildbot/git/sql/sql_yacc.yy"
{
LEX *lex= Lex;
lex->sql_command= SQLCOM_UNINSTALL_PLUGIN;
@@ -40900,10 +40911,10 @@ yyreduce:
}
break;
- case 2636:
+ case 2643:
/* Line 1455 of yacc.c */
-#line 15283 "/home/buildbot/git/sql/sql_yacc.yy"
+#line 15277 "/home/buildbot/git/sql/sql_yacc.yy"
{
YYERROR;
}
@@ -40912,7 +40923,7 @@ yyreduce:
/* Line 1455 of yacc.c */
-#line 40916 "/home/buildbot/git/mkdist/sql/sql_yacc.cc"
+#line 40927 "/home/buildbot/git/mkdist/sql/sql_yacc.cc"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index cc16101..ec246ae 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -6552,7 +6552,7 @@ alter:
my_error(ER_SP_BADSTATEMENT, MYF(0), "ALTER VIEW");
MYSQL_YYABORT;
}
- lex->create_view_algorithm= DTYPE_ALGORITHM_UNDEFINED;
+ lex->create_view_algorithm= VIEW_ALGORITHM_INHERIT;
lex->create_view_mode= VIEW_ALTER;
}
view_tail
@@ -7191,8 +7191,13 @@ opt_checksum_type:
| EXTENDED_SYM { Lex->check_opt.flags= T_EXTEND; }
;
+repair_table_or_view:
+ table_or_tables table_list opt_mi_repair_type
+ | VIEW_SYM { Lex->only_view= TRUE; } table_list opt_view_repair_type
+ ;
+
repair:
- REPAIR opt_no_write_to_binlog table_or_view
+ REPAIR opt_no_write_to_binlog
{
LEX *lex=Lex;
lex->sql_command = SQLCOM_REPAIR;
@@ -7202,18 +7207,9 @@ repair:
/* Will be overriden during execution. */
YYPS->m_lock_type= TL_UNLOCK;
}
- table_list opt_mi_repair_type
+ repair_table_or_view
{
LEX* lex= thd->lex;
- if ((lex->only_view &&
- ((lex->check_opt.flags & (T_QUICK | T_EXTEND)) ||
- (lex->check_opt.sql_flags & TT_USEFRM))) ||
- (!lex->only_view &&
- (lex->check_opt.sql_flags & TT_FROM_MYSQL)))
- {
- my_parse_error(ER(ER_SYNTAX_ERROR));
- MYSQL_YYABORT;
- }
DBUG_ASSERT(!lex->m_stmt);
lex->m_stmt= new (thd->mem_root) Repair_table_statement(lex);
if (lex->m_stmt == NULL)
@@ -7235,6 +7231,10 @@ mi_repair_type:
QUICK { Lex->check_opt.flags|= T_QUICK; }
| EXTENDED_SYM { Lex->check_opt.flags|= T_EXTEND; }
| USE_FRM { Lex->check_opt.sql_flags|= TT_USEFRM; }
+ ;
+
+opt_view_repair_type:
+ /* empty */ { }
| FROM MYSQL_SYM { Lex->check_opt.sql_flags|= TT_FROM_MYSQL; }
;
@@ -7267,30 +7267,27 @@ binlog_base64_event:
}
;
-check:
- CHECK_SYM table_or_view
+check_view_or_table:
+ table_or_tables table_list opt_mi_check_type
+ | VIEW_SYM { Lex->only_view= TRUE; } table_list opt_view_check_type
+ ;
+
+check: CHECK_SYM
{
LEX *lex=Lex;
- if (lex->sphead)
- {
- my_error(ER_SP_BADSTATEMENT, MYF(0), "CHECK");
- MYSQL_YYABORT;
- }
lex->sql_command = SQLCOM_CHECK;
lex->check_opt.init();
lex->alter_info.reset();
/* Will be overriden during execution. */
YYPS->m_lock_type= TL_UNLOCK;
}
- table_list opt_mi_check_type
+ check_view_or_table
{
LEX* lex= thd->lex;
- if (lex->only_view &&
- (lex->check_opt.flags & (T_QUICK | T_FAST | T_EXTEND |
- T_CHECK_ONLY_CHANGED)))
+ if (lex->sphead)
{
- my_parse_error(ER(ER_SYNTAX_ERROR));
+ my_error(ER_SP_BADSTATEMENT, MYF(0), "CHECK");
MYSQL_YYABORT;
}
DBUG_ASSERT(!lex->m_stmt);
@@ -7319,6 +7316,11 @@ mi_check_type:
| FOR_SYM UPGRADE_SYM { Lex->check_opt.sql_flags|= TT_FOR_UPGRADE; }
;
+opt_view_check_type:
+ /* empty */ { }
+ | FOR_SYM UPGRADE_SYM { Lex->check_opt.sql_flags|= TT_FOR_UPGRADE; }
+ ;
+
optimize:
OPTIMIZE opt_no_write_to_binlog table_or_tables
{
@@ -7400,7 +7402,6 @@ keycache:
LEX *lex=Lex;
lex->sql_command= SQLCOM_ASSIGN_TO_KEYCACHE;
lex->ident= $6;
- lex->only_view= FALSE;
}
;
@@ -7445,7 +7446,6 @@ preload:
LEX *lex=Lex;
lex->sql_command=SQLCOM_PRELOAD_KEYS;
lex->alter_info.reset();
- lex->only_view= FALSE;
}
preload_list_or_parts
{}
@@ -11610,7 +11610,6 @@ show_param:
lex->sql_command = SQLCOM_SHOW_CREATE;
if (!lex->select_lex.add_table_to_list(thd, $3, NULL,0))
MYSQL_YYABORT;
- lex->only_view= 0;
lex->create_info.storage_media= HA_SM_DEFAULT;
}
| CREATE VIEW_SYM table_ident
@@ -13806,13 +13805,8 @@ lock:
;
table_or_tables:
- TABLE_SYM { Lex->only_view= FALSE; }
- | TABLES { Lex->only_view= FALSE; }
- ;
-
-table_or_view:
- table_or_tables
- | VIEW_SYM { Lex->only_view= TRUE; }
+ TABLE_SYM { }
+ | TABLES { }
;
table_lock_list:
diff --git a/sql/table.h b/sql/table.h
index 8324454..17fdd4a 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -1446,6 +1446,8 @@ typedef struct st_schema_table
#define DT_PHASES_MATERIALIZE (DT_COMMON | DT_MATERIALIZE)
#define VIEW_ALGORITHM_UNDEFINED 0
+/* Special value for ALTER VIEW: inherit original algorithm. */
+#define VIEW_ALGORITHM_INHERIT DTYPE_VIEW
#define VIEW_ALGORITHM_MERGE (DTYPE_VIEW | DTYPE_MERGE)
#define VIEW_ALGORITHM_TMPTABLE (DTYPE_VIEW | DTYPE_MATERIALIZE)
diff --git a/sql/tztime.cc b/sql/tztime.cc
index da23d6f..0796115 100644
--- a/sql/tztime.cc
+++ b/sql/tztime.cc
@@ -2521,7 +2521,8 @@ scan_tz_dir(char * name_end, uint symlink_recursion_level, uint verbose)
for (i= 0; i < cur_dir->number_off_files; i++)
{
- if (cur_dir->dir_entry[i].name[0] != '.')
+ if (cur_dir->dir_entry[i].name[0] != '.' &&
+ strcmp(cur_dir->dir_entry[i].name, "Factory"))
{
name_end_tmp= strmake(name_end, cur_dir->dir_entry[i].name,
FN_REFLEN - (name_end - fullname));
diff --git a/sql/winservice.h b/sql/winservice.h
index fca7b12..c3e2bfe 100644
--- a/sql/winservice.h
+++ b/sql/winservice.h
@@ -1,40 +1,40 @@
-/*
- Copyright (c) 2011, 2012, Monty Program 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
- the Free Software Foundation; version 2 of the License.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-
-/*
- Extract properties of a windows service binary path
-*/
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <windows.h>
-typedef struct mysqld_service_properties_st
-{
- char mysqld_exe[MAX_PATH];
- char inifile[MAX_PATH];
- char datadir[MAX_PATH];
- int version_major;
- int version_minor;
- int version_patch;
-} mysqld_service_properties;
-
-extern int get_mysql_service_properties(const wchar_t *bin_path,
- mysqld_service_properties *props);
-
-#ifdef __cplusplus
-}
-#endif
+/*
+ Copyright (c) 2011, 2012, Monty Program 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
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+
+/*
+ Extract properties of a windows service binary path
+*/
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <windows.h>
+typedef struct mysqld_service_properties_st
+{
+ char mysqld_exe[MAX_PATH];
+ char inifile[MAX_PATH];
+ char datadir[MAX_PATH];
+ int version_major;
+ int version_minor;
+ int version_patch;
+} mysqld_service_properties;
+
+extern int get_mysql_service_properties(const wchar_t *bin_path,
+ mysqld_service_properties *props);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/storage/federatedx/CMakeLists.txt b/storage/federatedx/CMakeLists.txt
index 24d6458..67b6c1c 100644
--- a/storage/federatedx/CMakeLists.txt
+++ b/storage/federatedx/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(FEDERATEDX_PLUGIN_STATIC "federatedx")
-SET(FEDERATEDX_PLUGIN_DYNAMIC "ha_federatedx")
-SET(FEDERATEDX_SOURCES ha_federatedx.cc federatedx_txn.cc federatedx_io.cc federatedx_io_null.cc federatedx_io_mysql.cc)
-MYSQL_ADD_PLUGIN(federatedx ${FEDERATEDX_SOURCES} STORAGE_ENGINE)
+SET(FEDERATEDX_PLUGIN_STATIC "federatedx")
+SET(FEDERATEDX_PLUGIN_DYNAMIC "ha_federatedx")
+SET(FEDERATEDX_SOURCES ha_federatedx.cc federatedx_txn.cc federatedx_io.cc federatedx_io_null.cc federatedx_io_mysql.cc)
+MYSQL_ADD_PLUGIN(federatedx ${FEDERATEDX_SOURCES} STORAGE_ENGINE)
diff --git a/storage/federatedx/README.windows b/storage/federatedx/README.windows
index 3f1f2a3..74de15c 100644
--- a/storage/federatedx/README.windows
+++ b/storage/federatedx/README.windows
@@ -1,23 +1,23 @@
-The following files are changed in order to build a new engine on Windows:
-
-- Update win\configure.js with
-case "WITH_FEDERATEDX_STORAGE_ENGINE":
-to make sure it will pass WITH_FEDERATEDX_STORAGE_ENGINE in.
-
-- Update CMakeFiles.txt under mysql root:
- IF(WITH_FEDERATEDX_STORAGE_ENGINE)
- ADD_DEFINITIONS(-D WITH_FEDERATEDX_STORAGE_ENGINE)
- SET (mysql_plugin_defs
- "${mysql_plugin_defs},builtin_skeleton_plugin")
- ENDIF(WITH_FEDERATEDX_STORAGE_ENGINE)
-
- and,
-
- IF(WITH_FEDERATEDX_STORAGE_ENGINE)
- ADD_SUBDIRECTORY(storage/skeleton/src)
- ENDIF(WITH_FEDERATEDX_STORAGE_ENGINE)
-
- - Update CMakeFiles.txt under sql:
- IF(WITH_FEDERATEDX_STORAGE_ENGINE)
- TARGET_LINK_LIBRARIES(mysqld skeleton)
- ENDIF(WITH_FEDERATEDX_STORAGE_ENGINE)
+The following files are changed in order to build a new engine on Windows:
+
+- Update win\configure.js with
+case "WITH_FEDERATEDX_STORAGE_ENGINE":
+to make sure it will pass WITH_FEDERATEDX_STORAGE_ENGINE in.
+
+- Update CMakeFiles.txt under mysql root:
+ IF(WITH_FEDERATEDX_STORAGE_ENGINE)
+ ADD_DEFINITIONS(-D WITH_FEDERATEDX_STORAGE_ENGINE)
+ SET (mysql_plugin_defs
+ "${mysql_plugin_defs},builtin_skeleton_plugin")
+ ENDIF(WITH_FEDERATEDX_STORAGE_ENGINE)
+
+ and,
+
+ IF(WITH_FEDERATEDX_STORAGE_ENGINE)
+ ADD_SUBDIRECTORY(storage/skeleton/src)
+ ENDIF(WITH_FEDERATEDX_STORAGE_ENGINE)
+
+ - Update CMakeFiles.txt under sql:
+ IF(WITH_FEDERATEDX_STORAGE_ENGINE)
+ TARGET_LINK_LIBRARIES(mysqld skeleton)
+ ENDIF(WITH_FEDERATEDX_STORAGE_ENGINE)
diff --git a/storage/innobase/CMakeLists.txt b/storage/innobase/CMakeLists.txt
index e6a6556..861f2a9 100644
--- a/storage/innobase/CMakeLists.txt
+++ b/storage/innobase/CMakeLists.txt
@@ -144,6 +144,8 @@ IF(HAVE_IB_ATOMIC_PTHREAD_T_GCC)
ADD_DEFINITIONS(-DHAVE_IB_ATOMIC_PTHREAD_T_GCC=1)
ENDIF()
+CHECK_C_SOURCE_COMPILES("struct t1{ int a; char *b; }; struct t1 c= { .a=1, .b=0 }; main() { }" HAVE_C99_INITIALIZERS)
+
ENDIF(NOT MSVC)
# Solaris atomics
diff --git a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c
index b6bfcc3..4963f1c 100644
--- a/storage/innobase/buf/buf0buf.c
+++ b/storage/innobase/buf/buf0buf.c
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 1995, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2015, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2008, Google Inc.
Portions of this file contain modifications contributed and copyrighted by
@@ -1528,6 +1528,9 @@ buf_pool_watch_set(
return(NULL);
}
+ /* The maximum number of purge threads should never exceed
+ BUF_POOL_WATCH_SIZE. So there is no way for purge thread
+ instance to hold a watch when setting another watch. */
for (i = 0; i < BUF_POOL_WATCH_SIZE; i++) {
bpage = &buf_pool->watch[i];
diff --git a/storage/innobase/dict/dict0dict.c b/storage/innobase/dict/dict0dict.c
index 49d0612..cbb17fc 100644
--- a/storage/innobase/dict/dict0dict.c
+++ b/storage/innobase/dict/dict0dict.c
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 1996, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2015, Oracle and/or its affiliates. All Rights Reserved.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index a7854af..7c17f20 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 2000, 2014, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2000, 2015, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2008, 2009 Google Inc.
Copyright (c) 2009, Percona Inc.
@@ -93,7 +93,6 @@ extern "C" {
#include "ibuf0ibuf.h"
enum_tx_isolation thd_get_trx_isolation(const THD* thd);
-
}
#include "ha_innodb.h"
@@ -6299,6 +6298,11 @@ ha_innobase::general_fetch(
DBUG_ENTER("general_fetch");
+ /* If transaction is not startted do not continue, instead return a error code. */
+ if(!(prebuilt->sql_stat_start || (prebuilt->trx && prebuilt->trx->conc_state == 1))) {
+ DBUG_RETURN(HA_ERR_END_OF_FILE);
+ }
+
ut_a(prebuilt->trx == thd_to_trx(user_thd));
innodb_srv_conc_enter_innodb(prebuilt->trx);
@@ -8026,6 +8030,13 @@ ha_innobase::estimate_rows_upper_bound(void)
estimate = 2 * local_data_file_length /
dict_index_calc_min_rec_len(index);
+ /* Set num_rows less than MERGEBUFF to simulate the case where we do
+ not have enough space to merge the externally sorted file blocks. */
+ DBUG_EXECUTE_IF("set_num_rows_lt_MERGEBUFF",
+ estimate = 2;
+ DBUG_SET("-d,set_num_rows_lt_MERGEBUFF");
+ );
+
prebuilt->trx->op_info = (char*)"";
DBUG_RETURN((ha_rows) estimate);
@@ -8280,17 +8291,6 @@ ha_innobase::info_low(
prebuilt->trx->op_info = "returning various info to MySQL";
}
- my_snprintf(path, sizeof(path), "%s/%s%s",
- mysql_data_home, ib_table->name, reg_ext);
-
- unpack_filename(path,path);
-
- /* Note that we do not know the access time of the table,
- nor the CHECK TABLE time, nor the UPDATE or INSERT time. */
-
- if (os_file_get_status(path,&stat_info)) {
- stats.create_time = (ulong) stat_info.ctime;
- }
}
if (flag & HA_STATUS_VARIABLE) {
@@ -8535,6 +8535,20 @@ ha_innobase::info_low(
}
dict_table_stats_unlock(ib_table, RW_S_LATCH);
+
+ my_snprintf(path, sizeof(path), "%s/%s%s",
+ mysql_data_home,
+ table->s->normalized_path.str,
+ reg_ext);
+
+ unpack_filename(path,path);
+
+ /* Note that we do not know the access time of the table,
+ nor the CHECK TABLE time, nor the UPDATE or INSERT time. */
+
+ if (os_file_get_status(path,&stat_info)) {
+ stats.create_time = (ulong) stat_info.ctime;
+ }
}
if (srv_force_recovery >= SRV_FORCE_NO_IBUF_MERGE) {
diff --git a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
index 9fec09d..afe9c56 100644
--- a/storage/innobase/handler/i_s.cc
+++ b/storage/innobase/handler/i_s.cc
@@ -157,8 +157,12 @@ do { \
} \
} while (0)
-#if !defined __STRICT_ANSI__ && defined __GNUC__ && (__GNUC__) > 2 && !defined __INTEL_COMPILER
+#if !defined __STRICT_ANSI__ && defined __GNUC__ && (__GNUC__) > 2 && !defined __INTEL_COMPILER && !defined __clang__
+#ifdef HAVE_C99_INITIALIZERS
+#define STRUCT_FLD(name, value) .name = value
+#else
#define STRUCT_FLD(name, value) name: value
+#endif /* HAVE_C99_INITIALIZERS */
#else
#define STRUCT_FLD(name, value) value
#endif
diff --git a/storage/innobase/include/os0sync.h b/storage/innobase/include/os0sync.h
index 6f090c4..7fd1fde 100644
--- a/storage/innobase/include/os0sync.h
+++ b/storage/innobase/include/os0sync.h
@@ -324,7 +324,7 @@ amount of increment. */
/**********************************************************//**
Returns the old value of *ptr, atomically sets *ptr to new_val */
-#ifdef __powerpc__
+#if defined(__powerpc__) || defined(__aarch64__)
/*
os_atomic_test_and_set_byte_release() should imply a release barrier before
setting, and a full barrier after. But __sync_lock_test_and_set() is only
diff --git a/storage/innobase/srv/srv0start.c b/storage/innobase/srv/srv0start.c
index ffe18c4..b9fd52a 100644
--- a/storage/innobase/srv/srv0start.c
+++ b/storage/innobase/srv/srv0start.c
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2008, Google Inc.
Copyright (c) 2009, Percona Inc.
@@ -2240,9 +2240,9 @@ innobase_shutdown_for_mysql(void)
ibuf_close();
log_shutdown();
- lock_sys_close();
trx_sys_file_format_close();
trx_sys_close();
+ lock_sys_close();
mutex_free(&srv_monitor_file_mutex);
mutex_free(&srv_dict_tmpfile_mutex);
diff --git a/storage/innobase/sync/sync0arr.c b/storage/innobase/sync/sync0arr.c
index 5c4ba20..62d35cc 100644
--- a/storage/innobase/sync/sync0arr.c
+++ b/storage/innobase/sync/sync0arr.c
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 1995, 2011, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2015, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2008, Google Inc.
Copyright (c) 2013, 2014, MariaDB Corporation. All Rights Reserved.
@@ -1078,8 +1078,9 @@ sync_array_output_info(
os_thread_id_t r;
fprintf(file,
- "OS WAIT ARRAY INFO: reservation count %ld, signal count %ld\n",
- (long) arr->res_count, (long) arr->sg_count);
+ "OS WAIT ARRAY INFO: reservation count " ULINTPF
+ ", signal count " ULINTPF "\n",
+ arr->res_count, arr->sg_count);
i = 0;
count = 0;
diff --git a/storage/maria/ma_check.c b/storage/maria/ma_check.c
index 3be4465..ecdc512 100644
--- a/storage/maria/ma_check.c
+++ b/storage/maria/ma_check.c
@@ -3119,10 +3119,8 @@ int maria_sort_index(HA_CHECK *param, register MARIA_HA *info, char *name)
for (key= 0,keyinfo= &share->keyinfo[0]; key < share->base.keys ;
key++,keyinfo++)
{
- if (! maria_is_key_active(share->state.key_map, key))
- continue;
-
- if (share->state.key_root[key] != HA_OFFSET_ERROR)
+ if (maria_is_key_active(share->state.key_map, key) &&
+ share->state.key_root[key] != HA_OFFSET_ERROR)
{
index_pos[key]=param->new_file_pos; /* Write first block here */
if (sort_one_index(param,info,keyinfo,share->state.key_root[key],
diff --git a/storage/maria/ma_test_force_start.pl b/storage/maria/ma_test_force_start.pl
index 8148b2f..8e56d6e 100755
--- a/storage/maria/ma_test_force_start.pl
+++ b/storage/maria/ma_test_force_start.pl
@@ -43,7 +43,7 @@ my $error_log_name= "./var/log/master.err";
my @cmd_output;
my $whatever; # garbage data
$ENV{MTR_VERSION} = 1; # MTR2 does not have --start-and-exit
-my $base_server_cmd= "perl mysql-test-run.pl --mysqld=--aria-force-start-after-recovery-failures=$force_after --suite=maria maria.maria-recover ";
+my $base_server_cmd= "perl mysql-test-run.pl --mysqld=--aria-force-start-after-recovery-failures=$force_after --suite=maria maria.maria-recover ";
if ($^O =~ /^mswin/i)
{
print <<EOF;
diff --git a/storage/myisam/mi_check.c b/storage/myisam/mi_check.c
index 73558ce..ff9ea4b 100644
--- a/storage/myisam/mi_check.c
+++ b/storage/myisam/mi_check.c
@@ -1944,10 +1944,8 @@ int mi_sort_index(HA_CHECK *param, register MI_INFO *info, char * name)
for (key= 0,keyinfo= &share->keyinfo[0]; key < share->base.keys ;
key++,keyinfo++)
{
- if (! mi_is_key_active(info->s->state.key_map, key))
- continue;
-
- if (share->state.key_root[key] != HA_OFFSET_ERROR)
+ if (mi_is_key_active(info->s->state.key_map, key) &&
+ share->state.key_root[key] != HA_OFFSET_ERROR)
{
index_pos[key]=param->new_file_pos; /* Write first block here */
if (sort_one_index(param,info,keyinfo,share->state.key_root[key],
diff --git a/storage/myisam/rt_split.c b/storage/myisam/rt_split.c
index 9ab0bd9..be61734 100644
--- a/storage/myisam/rt_split.c
+++ b/storage/myisam/rt_split.c
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2002, 2010, Oracle and/or its affiliates
+ Copyright (c) 2002, 2015, 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
@@ -69,6 +69,10 @@ static double mbr_join_square(const double *a, const double *b, int n_dim)
b += 2;
}while (a != end);
+ /* Check for infinity or NaN */
+ if (my_isinf(square) || isnan(square))
+ square = DBL_MAX;
+
return square;
}
@@ -103,6 +107,9 @@ static void pick_seeds(SplitStruct *node, int n_entries,
double max_d = -DBL_MAX;
double d;
+ *seed_a = node;
+ *seed_b = node + 1;
+
for (cur1 = node; cur1 < lim1; ++cur1)
{
for (cur2=cur1 + 1; cur2 < lim2; ++cur2)
diff --git a/storage/tokudb/CMakeLists.txt b/storage/tokudb/CMakeLists.txt
index e8667c1..2052d44 100644
--- a/storage/tokudb/CMakeLists.txt
+++ b/storage/tokudb/CMakeLists.txt
@@ -25,7 +25,7 @@ IF (HAVE_WVLA)
ENDIF()
############################################
-SET(TOKUDB_VERSION "tokudb-7.5.6")
+SET(TOKUDB_VERSION "tokudb-7.5.7")
SET(TOKUDB_DEB_FILES "usr/lib/mysql/plugin/ha_tokudb.so\netc/mysql/conf.d/tokudb.cnf\nusr/bin/tokuftdump\nusr/share/doc/mariadb-server-5.5/README-TOKUDB\nusr/share/doc/mariadb-server-5.5/README.md" PARENT_SCOPE)
SET(USE_BDB OFF CACHE BOOL "")
MARK_AS_ADVANCED(BUILDNAME)
diff --git a/storage/tokudb/ft-index/buildheader/make_tdb.cc b/storage/tokudb/ft-index/buildheader/make_tdb.cc
index 3f9a721..5370664 100644
--- a/storage/tokudb/ft-index/buildheader/make_tdb.cc
+++ b/storage/tokudb/ft-index/buildheader/make_tdb.cc
@@ -587,6 +587,7 @@ static void print_db_txn_struct (void) {
"uint64_t (*get_client_id)(DB_TXN *)",
"bool (*is_prepared)(DB_TXN *)",
"DB_TXN *(*get_child)(DB_TXN *)",
+ "uint64_t (*get_start_time)(DB_TXN *)",
NULL};
sort_and_dump_fields("db_txn", false, extra);
}
@@ -786,7 +787,7 @@ int main (int argc, char *const argv[] __attribute__((__unused__))) {
printf("typedef void (*lock_timeout_callback)(DB *db, uint64_t requesting_txnid, const DBT *left_key, const DBT *right_key, uint64_t blocking_txnid);\n");
printf("typedef int (*iterate_row_locks_callback)(DB **db, DBT *left_key, DBT *right_key, void *extra);\n");
- printf("typedef int (*iterate_transactions_callback)(uint64_t txnid, uint64_t client_id, iterate_row_locks_callback cb, void *locks_extra, void *extra);\n");
+ printf("typedef int (*iterate_transactions_callback)(DB_TXN *dbtxn, iterate_row_locks_callback cb, void *locks_extra, void *extra);\n");
printf("typedef int (*iterate_requests_callback)(DB *db, uint64_t requesting_txnid, const DBT *left_key, const DBT *right_key, uint64_t blocking_txnid, uint64_t start_time, void *extra);\n");
print_db_env_struct();
print_db_key_range_struct();
diff --git a/storage/tokudb/ft-index/ft/ft-verify.cc b/storage/tokudb/ft-index/ft/ft-verify.cc
index d9606f3..0a85136 100644
--- a/storage/tokudb/ft-index/ft/ft-verify.cc
+++ b/storage/tokudb/ft-index/ft/ft-verify.cc
@@ -160,10 +160,14 @@ get_ith_key_dbt (BASEMENTNODE bn, int i) {
#define VERIFY_ASSERTION(predicate, i, string) ({ \
if(!(predicate)) { \
- (void) verbose; \
- if (true) { \
- fprintf(stderr, "%s:%d: Looking at child %d of block %" PRId64 ": %s\n", __FILE__, __LINE__, i, blocknum.b, string); \
- } \
+ fprintf(stderr, "%s:%d: Looking at child %d of block %" PRId64 ": %s\n", __FILE__, __LINE__, i, blocknum.b, string); \
+ result = TOKUDB_NEEDS_REPAIR; \
+ if (!keep_going_on_failure) goto done; \
+ }})
+
+#define VERIFY_ASSERTION_BASEMENT(predicate, bn, entry, string) ({ \
+ if(!(predicate)) { \
+ fprintf(stderr, "%s:%d: Looking at block %" PRId64 " bn %d entry %d: %s\n", __FILE__, __LINE__, blocknum.b, bn, entry, string); \
result = TOKUDB_NEEDS_REPAIR; \
if (!keep_going_on_failure) goto done; \
}})
@@ -201,7 +205,6 @@ struct verify_message_tree_extra {
int verify_message_tree(const int32_t &offset, const uint32_t UU(idx), struct verify_message_tree_extra *const e) __attribute__((nonnull(3)));
int verify_message_tree(const int32_t &offset, const uint32_t UU(idx), struct verify_message_tree_extra *const e)
{
- int verbose = e->verbose;
BLOCKNUM blocknum = e->blocknum;
int keep_going_on_failure = e->keep_going_on_failure;
int result = 0;
@@ -236,7 +239,6 @@ int error_on_iter(const int32_t &UU(offset), const uint32_t UU(idx), void *UU(e)
int verify_marked_messages(const int32_t &offset, const uint32_t UU(idx), struct verify_message_tree_extra *const e) __attribute__((nonnull(3)));
int verify_marked_messages(const int32_t &offset, const uint32_t UU(idx), struct verify_message_tree_extra *const e)
{
- int verbose = e->verbose;
BLOCKNUM blocknum = e->blocknum;
int keep_going_on_failure = e->keep_going_on_failure;
int result = 0;
@@ -462,16 +464,16 @@ toku_verify_ftnode_internal(FT_HANDLE ft_handle,
DBT kdbt = get_ith_key_dbt(bn, j);
if (curr_less_pivot) {
int compare = compare_pairs(ft_handle, curr_less_pivot, &kdbt);
- VERIFY_ASSERTION(compare < 0, j, "The leafentry is >= the lower-bound pivot");
+ VERIFY_ASSERTION_BASEMENT(compare < 0, i, j, "The leafentry is >= the lower-bound pivot");
}
if (curr_geq_pivot) {
int compare = compare_pairs(ft_handle, curr_geq_pivot, &kdbt);
- VERIFY_ASSERTION(compare >= 0, j, "The leafentry is < the upper-bound pivot");
+ VERIFY_ASSERTION_BASEMENT(compare >= 0, i, j, "The leafentry is < the upper-bound pivot");
}
if (0 < j) {
DBT prev_key_dbt = get_ith_key_dbt(bn, j-1);
int compare = compare_pairs(ft_handle, &prev_key_dbt, &kdbt);
- VERIFY_ASSERTION(compare < 0, j, "Adjacent leafentries are out of order");
+ VERIFY_ASSERTION_BASEMENT(compare < 0, i, j, "Adjacent leafentries are out of order");
}
}
}
diff --git a/storage/tokudb/ft-index/ft/logger/recover.cc b/storage/tokudb/ft-index/ft/logger/recover.cc
index cae7397..6804852 100644
--- a/storage/tokudb/ft-index/ft/logger/recover.cc
+++ b/storage/tokudb/ft-index/ft/logger/recover.cc
@@ -111,7 +111,8 @@ int tokuft_recovery_trace = 0; // turn on recovery tracing, d
#endif
// time in seconds between recovery progress reports
-#define TOKUDB_RECOVERY_PROGRESS_TIME 15
+#define TOKUFT_RECOVERY_PROGRESS_TIME 15
+time_t tokuft_recovery_progress_time = TOKUFT_RECOVERY_PROGRESS_TIME;
enum ss {
BACKWARD_NEWER_CHECKPOINT_END = 1,
@@ -325,14 +326,12 @@ static int recover_env_init (RECOVER_ENV renv,
}
static void recover_env_cleanup (RECOVER_ENV renv) {
- int r;
-
invariant_zero(renv->fmap.filenums->size());
file_map_destroy(&renv->fmap);
if (renv->destroy_logger_at_end) {
toku_logger_close_rollback(renv->logger);
- r = toku_logger_close(&renv->logger);
+ int r = toku_logger_close(&renv->logger);
assert(r == 0);
} else {
toku_logger_write_log_files(renv->logger, true);
@@ -749,6 +748,36 @@ static int toku_recover_backward_xbegin (struct logtype_xbegin *UU(l), RECOVER_E
return 0;
}
+struct toku_txn_progress_extra {
+ time_t tlast;
+ LSN lsn;
+ const char *type;
+ TXNID_PAIR xid;
+ uint64_t last_total;
+};
+
+static void toku_recover_txn_progress(TOKU_TXN_PROGRESS txn_progress, void *extra) {
+ toku_txn_progress_extra *txn_progress_extra = static_cast<toku_txn_progress_extra *>(extra);
+ if (txn_progress_extra->last_total == 0)
+ txn_progress_extra->last_total = txn_progress->entries_total;
+ else
+ assert(txn_progress_extra->last_total == txn_progress->entries_total);
+ time_t tnow = time(NULL);
+ if (tnow - txn_progress_extra->tlast >= tokuft_recovery_progress_time) {
+ txn_progress_extra->tlast = tnow;
+ fprintf(stderr, "%.24s TokuFT ", ctime(&tnow));
+ if (txn_progress_extra->lsn.lsn != 0)
+ fprintf(stderr, "lsn %" PRIu64 " ", txn_progress_extra->lsn.lsn);
+ fprintf(stderr, "%s xid %" PRIu64 ":%" PRIu64 " ",
+ txn_progress_extra->type, txn_progress_extra->xid.parent_id64, txn_progress_extra->xid.child_id64);
+ fprintf(stderr, "%" PRIu64 "/%" PRIu64 " ",
+ txn_progress->entries_processed, txn_progress->entries_total);
+ if (txn_progress->entries_total > 0)
+ fprintf(stderr, "%.0f%% ", ((double) txn_progress->entries_processed / (double) txn_progress->entries_total) * 100.0);
+ fprintf(stderr, "\n");
+ }
+}
+
static int toku_recover_xcommit (struct logtype_xcommit *l, RECOVER_ENV renv) {
// find the transaction by transaction id
TOKUTXN txn = NULL;
@@ -756,8 +785,8 @@ static int toku_recover_xcommit (struct logtype_xcommit *l, RECOVER_ENV renv) {
assert(txn!=NULL);
// commit the transaction
- int r = toku_txn_commit_with_lsn(txn, true, l->lsn,
- NULL, NULL);
+ toku_txn_progress_extra extra = { time(NULL), l->lsn, "commit", l->xid };
+ int r = toku_txn_commit_with_lsn(txn, true, l->lsn, toku_recover_txn_progress, &extra);
assert(r == 0);
// close the transaction
@@ -799,7 +828,8 @@ static int toku_recover_xabort (struct logtype_xabort *l, RECOVER_ENV renv) {
assert(txn!=NULL);
// abort the transaction
- r = toku_txn_abort_with_lsn(txn, l->lsn, NULL, NULL);
+ toku_txn_progress_extra extra = { time(NULL), l->lsn, "abort", l->xid };
+ r = toku_txn_abort_with_lsn(txn, l->lsn, toku_recover_txn_progress, &extra);
assert(r == 0);
// close the transaction
@@ -1301,7 +1331,6 @@ static int is_txn_unprepared(TOKUTXN txn, void* extra) {
return 0;
}
-
static int find_an_unprepared_txn (RECOVER_ENV renv, TOKUTXN *txnp) {
TOKUTXN txn = nullptr;
int r = toku_txn_manager_iter_over_live_root_txns(
@@ -1326,6 +1355,7 @@ static int call_prepare_txn_callback_iter(TOKUTXN txn, void* extra) {
}
static void recover_abort_live_txn(TOKUTXN txn) {
+ fprintf(stderr, "%s %" PRIu64 "\n", __FUNCTION__, txn->txnid.parent_id64);
// recursively abort all children first
if (txn->child != NULL) {
recover_abort_live_txn(txn->child);
@@ -1333,7 +1363,8 @@ static void recover_abort_live_txn(TOKUTXN txn) {
// sanity check that the recursive call successfully NULLs out txn->child
invariant(txn->child == NULL);
// abort the transaction
- int r = toku_txn_abort_txn(txn, NULL, NULL);
+ toku_txn_progress_extra extra = { time(NULL), ZERO_LSN, "abort live", txn->txnid };
+ int r = toku_txn_abort_txn(txn, toku_recover_txn_progress, &extra);
assert(r == 0);
// close the transaction
@@ -1451,9 +1482,10 @@ static int do_recovery(RECOVER_ENV renv, const char *env_dir, const char *log_di
// trace progress
if ((i % 1000) == 0) {
tnow = time(NULL);
- if (tnow - tlast >= TOKUDB_RECOVERY_PROGRESS_TIME) {
+ if (tnow - tlast >= tokuft_recovery_progress_time) {
thislsn = toku_log_entry_get_lsn(le);
- fprintf(stderr, "%.24s TokuFT recovery scanning backward from %" PRIu64 " at %" PRIu64 " (%s)\n", ctime(&tnow), lastlsn.lsn, thislsn.lsn, recover_state(renv));
+ fprintf(stderr, "%.24s TokuFT recovery scanning backward from %" PRIu64 " at %" PRIu64 " (%s)\n",
+ ctime(&tnow), lastlsn.lsn, thislsn.lsn, recover_state(renv));
tlast = tnow;
}
}
@@ -1482,16 +1514,18 @@ static int do_recovery(RECOVER_ENV renv, const char *env_dir, const char *log_di
assert(le);
thislsn = toku_log_entry_get_lsn(le);
tnow = time(NULL);
- fprintf(stderr, "%.24s TokuFT recovery starts scanning forward to %" PRIu64 " from %" PRIu64 " left %" PRIu64 " (%s)\n", ctime(&tnow), lastlsn.lsn, thislsn.lsn, lastlsn.lsn - thislsn.lsn, recover_state(renv));
+ fprintf(stderr, "%.24s TokuFT recovery starts scanning forward to %" PRIu64 " from %" PRIu64 " left %" PRIu64 " (%s)\n",
+ ctime(&tnow), lastlsn.lsn, thislsn.lsn, lastlsn.lsn - thislsn.lsn, recover_state(renv));
for (unsigned i=0; 1; i++) {
// trace progress
if ((i % 1000) == 0) {
tnow = time(NULL);
- if (tnow - tlast >= TOKUDB_RECOVERY_PROGRESS_TIME) {
+ if (tnow - tlast >= tokuft_recovery_progress_time) {
thislsn = toku_log_entry_get_lsn(le);
- fprintf(stderr, "%.24s TokuFT recovery scanning forward to %" PRIu64 " at %" PRIu64 " left %" PRIu64 " (%s)\n", ctime(&tnow), lastlsn.lsn, thislsn.lsn, lastlsn.lsn - thislsn.lsn, recover_state(renv));
+ fprintf(stderr, "%.24s TokuFT recovery scanning forward to %" PRIu64 " at %" PRIu64 " left %" PRIu64 " (%s)\n",
+ ctime(&tnow), lastlsn.lsn, thislsn.lsn, lastlsn.lsn - thislsn.lsn, recover_state(renv));
tlast = tnow;
}
}
diff --git a/storage/tokudb/ft-index/ft/txn/txn.cc b/storage/tokudb/ft-index/ft/txn/txn.cc
index 18d5a6b..922c955 100644
--- a/storage/tokudb/ft-index/ft/txn/txn.cc
+++ b/storage/tokudb/ft-index/ft/txn/txn.cc
@@ -344,6 +344,7 @@ static txn_child_manager tcm;
.state = TOKUTXN_LIVE,
.num_pin = 0,
.client_id = 0,
+ .start_time = time(NULL),
};
TOKUTXN result = NULL;
@@ -787,6 +788,10 @@ void toku_txn_set_client_id(TOKUTXN txn, uint64_t client_id) {
txn->client_id = client_id;
}
+time_t toku_txn_get_start_time(struct tokutxn *txn) {
+ return txn->start_time;
+}
+
int toku_txn_reads_txnid(TXNID txnid, TOKUTXN txn) {
int r = 0;
TXNID oldest_live_in_snapshot = toku_get_oldest_in_live_root_txn_list(txn);
diff --git a/storage/tokudb/ft-index/ft/txn/txn.h b/storage/tokudb/ft-index/ft/txn/txn.h
index 6381b5a..4f2778b 100644
--- a/storage/tokudb/ft-index/ft/txn/txn.h
+++ b/storage/tokudb/ft-index/ft/txn/txn.h
@@ -253,6 +253,7 @@ struct tokutxn {
uint32_t num_pin; // number of threads (all hot indexes) that want this
// txn to not transition to commit or abort
uint64_t client_id;
+ time_t start_time;
};
typedef struct tokutxn *TOKUTXN;
@@ -368,6 +369,8 @@ bool toku_txn_has_spilled_rollback(struct tokutxn *txn);
uint64_t toku_txn_get_client_id(struct tokutxn *txn);
void toku_txn_set_client_id(struct tokutxn *txn, uint64_t client_id);
+time_t toku_txn_get_start_time(struct tokutxn *txn);
+
//
// This function is used by the leafentry iterators.
// returns TOKUDB_ACCEPT if live transaction context is allowed to read a value
diff --git a/storage/tokudb/ft-index/src/tests/test_iterate_live_transactions.cc b/storage/tokudb/ft-index/src/tests/test_iterate_live_transactions.cc
index dd00dde..c104c5c 100644
--- a/storage/tokudb/ft-index/src/tests/test_iterate_live_transactions.cc
+++ b/storage/tokudb/ft-index/src/tests/test_iterate_live_transactions.cc
@@ -104,9 +104,11 @@ struct iterate_extra {
bool visited_txn[3];
};
-static int iterate_callback(uint64_t txnid, uint64_t client_id,
+static int iterate_callback(DB_TXN *txn,
iterate_row_locks_callback iterate_locks,
void *locks_extra, void *extra) {
+ uint64_t txnid = txn->id64(txn);
+ uint64_t client_id = txn->get_client_id(txn);
iterate_extra *info = reinterpret_cast<iterate_extra *>(extra);
DB *db;
DBT left_key, right_key;
diff --git a/storage/tokudb/ft-index/src/tests/test_stress0.cc b/storage/tokudb/ft-index/src/tests/test_stress0.cc
index 5dbca08..26192d8 100644
--- a/storage/tokudb/ft-index/src/tests/test_stress0.cc
+++ b/storage/tokudb/ft-index/src/tests/test_stress0.cc
@@ -140,9 +140,11 @@ static int UU() iterate_pending_lock_requests_op(DB_TXN *UU(txn), ARG arg, void
return r;
}
-static int iterate_txns(uint64_t txnid, uint64_t client_id,
+static int iterate_txns(DB_TXN *txn,
iterate_row_locks_callback iterate_locks,
void *locks_extra, void *extra) {
+ uint64_t txnid = txn->id64(txn);
+ uint64_t client_id = txn->get_client_id(txn);
invariant_null(extra);
invariant(txnid > 0);
invariant(client_id == 0);
diff --git a/storage/tokudb/ft-index/src/ydb.cc b/storage/tokudb/ft-index/src/ydb.cc
index 85445a6..ab15a44 100644
--- a/storage/tokudb/ft-index/src/ydb.cc
+++ b/storage/tokudb/ft-index/src/ydb.cc
@@ -2492,24 +2492,21 @@ struct iter_txns_callback_extra {
};
static int iter_txns_callback(TOKUTXN txn, void *extra) {
+ int r = 0;
iter_txns_callback_extra *info =
reinterpret_cast<iter_txns_callback_extra *>(extra);
-
DB_TXN *dbtxn = toku_txn_get_container_db_txn(txn);
invariant_notnull(dbtxn);
+ if (db_txn_struct_i(dbtxn)->tokutxn == txn) { // make sure that the dbtxn is fully initialized
+ toku_mutex_lock(&db_txn_struct_i(dbtxn)->txn_mutex);
+ toku_pthread_rwlock_rdlock(&info->env->i->open_dbs_rwlock);
- toku_mutex_lock(&db_txn_struct_i(dbtxn)->txn_mutex);
- toku_pthread_rwlock_rdlock(&info->env->i->open_dbs_rwlock);
-
- iter_txn_row_locks_callback_extra e(info->env, &db_txn_struct_i(dbtxn)->lt_map);
- const int r = info->callback(toku_txn_get_txnid(txn).parent_id64,
- toku_txn_get_client_id(txn),
- iter_txn_row_locks_callback,
- &e,
- info->extra);
+ iter_txn_row_locks_callback_extra e(info->env, &db_txn_struct_i(dbtxn)->lt_map);
+ r = info->callback(dbtxn, iter_txn_row_locks_callback, &e, info->extra);
- toku_pthread_rwlock_rdunlock(&info->env->i->open_dbs_rwlock);
- toku_mutex_unlock(&db_txn_struct_i(dbtxn)->txn_mutex);
+ toku_pthread_rwlock_rdunlock(&info->env->i->open_dbs_rwlock);
+ toku_mutex_unlock(&db_txn_struct_i(dbtxn)->txn_mutex);
+ }
return r;
}
diff --git a/storage/tokudb/ft-index/src/ydb_txn.cc b/storage/tokudb/ft-index/src/ydb_txn.cc
index 8290384..885c6b7 100644
--- a/storage/tokudb/ft-index/src/ydb_txn.cc
+++ b/storage/tokudb/ft-index/src/ydb_txn.cc
@@ -433,6 +433,11 @@ static DB_TXN *toku_txn_get_child(DB_TXN *txn) {
return db_txn_struct_i(txn)->child;
}
+static uint64_t toku_txn_get_start_time(DB_TXN *txn) {
+ TOKUTXN ttxn = db_txn_struct_i(txn)->tokutxn;
+ return toku_txn_get_start_time(ttxn);
+}
+
static inline void txn_func_init(DB_TXN *txn) {
#define STXN(name) txn->name = locked_txn_ ## name
STXN(abort);
@@ -451,6 +456,7 @@ static inline void txn_func_init(DB_TXN *txn) {
txn->id64 = toku_txn_id64;
txn->is_prepared = toku_txn_is_prepared;
txn->get_child = toku_txn_get_child;
+ txn->get_start_time = toku_txn_get_start_time;
}
//
diff --git a/storage/tokudb/ft-index/tools/CMakeLists.txt b/storage/tokudb/ft-index/tools/CMakeLists.txt
index 71c44df..f745517 100644
--- a/storage/tokudb/ft-index/tools/CMakeLists.txt
+++ b/storage/tokudb/ft-index/tools/CMakeLists.txt
@@ -1,6 +1,6 @@
set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS _GNU_SOURCE DONT_DEPRECATE_ERRNO)
-set(tools tokudb_dump tokuftdump tdb_logprint tdb-recover ftverify ba_replay)
+set(tools tokudb_dump tokuftdump tokuft_logprint tdb-recover ftverify ba_replay)
foreach(tool ${tools})
add_executable(${tool} ${tool}.cc)
add_dependencies(${tool} install_tdb_h)
@@ -12,9 +12,6 @@ endforeach(tool)
# link in math.h library just for this tool.
target_link_libraries(ftverify m)
-install(
- TARGETS tokuftdump
- DESTINATION ${INSTALL_BINDIR}
- COMPONENT Server
- )
+install(TARGETS tokuftdump DESTINATION ${INSTALL_BINDIR} COMPONENT Server)
+install(TARGETS tokuft_logprint DESTINATION ${INSTALL_BINDIR} COMPONENT Server)
diff --git a/storage/tokudb/ft-index/tools/tdb_logprint.cc b/storage/tokudb/ft-index/tools/tokuft_logprint.cc
similarity index 99%
copy from storage/tokudb/ft-index/tools/tdb_logprint.cc
copy to storage/tokudb/ft-index/tools/tokuft_logprint.cc
index 15a2863..1dd7581 100644
--- a/storage/tokudb/ft-index/tools/tdb_logprint.cc
+++ b/storage/tokudb/ft-index/tools/tokuft_logprint.cc
@@ -91,8 +91,6 @@ PATENT RIGHTS GRANT:
/* Dump the log from stdin to stdout. */
-#include <config.h>
-
#include "ft/log_header.h"
#include "ft/logger/logger.h"
diff --git a/storage/tokudb/ft-index/tools/tokuftdump.cc b/storage/tokudb/ft-index/tools/tokuftdump.cc
index d680a3d..14c3c31 100644
--- a/storage/tokudb/ft-index/tools/tokuftdump.cc
+++ b/storage/tokudb/ft-index/tools/tokuftdump.cc
@@ -250,6 +250,8 @@ static int64_t getRootNode(FT ft) {
}
static int print_le(const void* key, const uint32_t keylen, const LEAFENTRY &le, const uint32_t idx UU(), void *const ai UU()) {
+ unsigned int *le_index = (unsigned int *) ai;
+ printf("%u: ", *le_index); *le_index += 1;
print_klpair(stdout, key, keylen, le);
printf("\n");
return 0;
@@ -539,7 +541,8 @@ ok:
printf(" n_bytes_in_buffer= %" PRIu64 "", BLB_DATA(n, i)->get_disk_size());
printf(" items_in_buffer=%u\n", BLB_DATA(n, i)->num_klpairs());
if (do_dump_data) {
- BLB_DATA(n, i)->iterate<void, print_le>(NULL);
+ unsigned int le_index = 0;
+ BLB_DATA(n, i)->iterate<void, print_le>(&le_index);
}
}
}
@@ -938,6 +941,7 @@ static void run_iteractive_loop(int fd, FT ft, CACHEFILE cf) {
} else if (strcmp(fields[0], "header") == 0) {
toku_ft_free(ft);
open_header(fd, &ft, cf);
+ dump_header(ft);
} else if (strcmp(fields[0], "rn") == 0||strcmp(fields[0], "rootNode")==0||strcmp(fields[0], "rootnode") == 0) {
printf("Root node :%d\n",root);
} else if (strcmp(fields[0], "block") == 0 && nfields == 2) {
diff --git a/storage/tokudb/ft-index/util/scoped_malloc.cc b/storage/tokudb/ft-index/util/scoped_malloc.cc
index 551bd94..15d4fb3 100644
--- a/storage/tokudb/ft-index/util/scoped_malloc.cc
+++ b/storage/tokudb/ft-index/util/scoped_malloc.cc
@@ -145,6 +145,9 @@ namespace toku {
}
void destroy() {
+#if TOKU_SCOPED_MALLOC_DEBUG
+ printf("%s %p %p\n", __FUNCTION__, this, m_stack);
+#endif
if (m_stack != NULL) {
toku_free(m_stack);
m_stack = NULL;
@@ -167,13 +170,17 @@ namespace toku {
static void destroy_and_deregister(void *key) {
invariant_notnull(key);
tl_stack *st = reinterpret_cast<tl_stack *>(key);
- st->destroy();
+ size_t n = 0;
toku_mutex_lock(&global_stack_set_mutex);
- invariant_notnull(global_stack_set);
- size_t n = global_stack_set->erase(st);
- invariant(n == 1);
+ if (global_stack_set) {
+ n = global_stack_set->erase(st);
+ }
toku_mutex_unlock(&global_stack_set_mutex);
+
+ if (n == 1) {
+ st->destroy(); // destroy the stack if this function erased it from the set. otherwise, somebody else destroyed it.
+ }
}
// Allocate 'size' bytes and return a pointer to the first byte
@@ -244,6 +251,11 @@ void toku_scoped_malloc_init(void) {
}
void toku_scoped_malloc_destroy(void) {
+ toku_scoped_malloc_destroy_key();
+ toku_scoped_malloc_destroy_set();
+}
+
+void toku_scoped_malloc_destroy_set(void) {
toku_mutex_lock(&toku::global_stack_set_mutex);
invariant_notnull(toku::global_stack_set);
// Destroy any tl_stacks that were registered as thread locals but did not
@@ -254,10 +266,11 @@ void toku_scoped_malloc_destroy(void) {
(*i)->destroy();
}
delete toku::global_stack_set;
+ toku::global_stack_set = nullptr;
toku_mutex_unlock(&toku::global_stack_set_mutex);
+}
- // We're deregistering the destructor key here. When this thread exits,
- // the tl_stack destructor won't get called, so we need to do that first.
+void toku_scoped_malloc_destroy_key(void) {
int r = pthread_key_delete(toku::tl_stack_destroy_pthread_key);
invariant_zero(r);
}
diff --git a/storage/tokudb/ft-index/util/scoped_malloc.h b/storage/tokudb/ft-index/util/scoped_malloc.h
index dbd919d..0233b0f 100644
--- a/storage/tokudb/ft-index/util/scoped_malloc.h
+++ b/storage/tokudb/ft-index/util/scoped_malloc.h
@@ -151,3 +151,7 @@ void toku_scoped_malloc_init(void);
void toku_scoped_malloc_destroy(void);
+void toku_scoped_malloc_destroy_set(void);
+
+void toku_scoped_malloc_destroy_key(void);
+
diff --git a/storage/tokudb/ha_tokudb.cc b/storage/tokudb/ha_tokudb.cc
index 1f72e51..b4e2c1a 100644
--- a/storage/tokudb/ha_tokudb.cc
+++ b/storage/tokudb/ha_tokudb.cc
@@ -6207,6 +6207,12 @@ int ha_tokudb::external_lock(THD * thd, int lock_type) {
if (error) { goto cleanup; }
thd_set_ha_data(thd, tokudb_hton, trx);
}
+
+ if (tokudb_debug & TOKUDB_DEBUG_TXN) {
+ TOKUDB_HANDLER_TRACE("trx %p %p %p %p %u %u", trx->all, trx->stmt, trx->sp_level, trx->sub_sp_level,
+ trx->tokudb_lock_count, trx->create_lock_count);
+ }
+
if (trx->all == NULL) {
trx->sp_level = NULL;
}
@@ -6215,22 +6221,16 @@ int ha_tokudb::external_lock(THD * thd, int lock_type) {
if (lock_type == F_WRLCK) {
use_write_locks = true;
}
- if (!trx->tokudb_lock_count++) {
- if (trx->stmt) {
- if (tokudb_debug & TOKUDB_DEBUG_TXN) {
- TOKUDB_HANDLER_TRACE("stmt already set %p %p %p %p", trx->all, trx->stmt, trx->sp_level, trx->sub_sp_level);
- }
- } else {
- assert(trx->stmt == 0);
- transaction = NULL; // Safety
- error = create_txn(thd, trx);
- if (error) {
- trx->tokudb_lock_count--; // We didn't get the lock
- goto cleanup;
- }
+ if (!trx->stmt) {
+ transaction = NULL; // Safety
+ error = create_txn(thd, trx);
+ if (error) {
+ goto cleanup;
}
+ trx->create_lock_count = trx->tokudb_lock_count;
}
transaction = trx->sub_sp_level;
+ trx->tokudb_lock_count++;
}
else {
tokudb_pthread_mutex_lock(&share->mutex);
@@ -6245,21 +6245,24 @@ int ha_tokudb::external_lock(THD * thd, int lock_type) {
added_rows = 0;
deleted_rows = 0;
share->rows_from_locked_table = 0;
- if (trx->tokudb_lock_count > 0 && !--trx->tokudb_lock_count) {
- if (trx->stmt) {
- /*
- F_UNLCK is done without a transaction commit / rollback.
- This happens if the thread didn't update any rows
- We must in this case commit the work to keep the row locks
- */
- DBUG_PRINT("trans", ("commiting non-updating transaction"));
- reset_stmt_progress(&trx->stmt_progress);
- commit_txn(trx->stmt, 0);
- trx->stmt = NULL;
- trx->sub_sp_level = NULL;
+ if (trx->tokudb_lock_count > 0) {
+ if (--trx->tokudb_lock_count <= trx->create_lock_count) {
+ trx->create_lock_count = 0;
+ if (trx->stmt) {
+ /*
+ F_UNLCK is done without a transaction commit / rollback.
+ This happens if the thread didn't update any rows
+ We must in this case commit the work to keep the row locks
+ */
+ DBUG_PRINT("trans", ("commiting non-updating transaction"));
+ reset_stmt_progress(&trx->stmt_progress);
+ commit_txn(trx->stmt, 0);
+ trx->stmt = NULL;
+ trx->sub_sp_level = NULL;
+ }
}
+ transaction = NULL;
}
- transaction = NULL;
}
cleanup:
if (tokudb_debug & TOKUDB_DEBUG_LOCK)
@@ -6274,8 +6277,9 @@ cleanup:
*/
int ha_tokudb::start_stmt(THD * thd, thr_lock_type lock_type) {
TOKUDB_HANDLER_DBUG_ENTER("cmd %d lock %d %s", thd_sql_command(thd), lock_type, share->table_name);
- if (0)
+ if (tokudb_debug & TOKUDB_DEBUG_LOCK) {
TOKUDB_HANDLER_TRACE("q %s", thd->query());
+ }
int error = 0;
tokudb_trx_data *trx = (tokudb_trx_data *) thd_get_ha_data(thd, tokudb_hton);
@@ -6285,6 +6289,11 @@ int ha_tokudb::start_stmt(THD * thd, thr_lock_type lock_type) {
thd_set_ha_data(thd, tokudb_hton, trx);
}
+ if (tokudb_debug & TOKUDB_DEBUG_TXN) {
+ TOKUDB_HANDLER_TRACE("trx %p %p %p %p %u %u", trx->all, trx->stmt, trx->sp_level, trx->sub_sp_level,
+ trx->tokudb_lock_count, trx->create_lock_count);
+ }
+
/*
note that trx->stmt may have been already initialized as start_stmt()
is called for *each table* not for each storage engine,
@@ -6295,9 +6304,7 @@ int ha_tokudb::start_stmt(THD * thd, thr_lock_type lock_type) {
if (error) {
goto cleanup;
}
- if (tokudb_debug & TOKUDB_DEBUG_TXN) {
- TOKUDB_HANDLER_TRACE("%p %p %p %p %u", trx->all, trx->stmt, trx->sp_level, trx->sub_sp_level, trx->tokudb_lock_count);
- }
+ trx->create_lock_count = trx->tokudb_lock_count;
}
else {
if (tokudb_debug & TOKUDB_DEBUG_TXN) {
diff --git a/storage/tokudb/ha_tokudb_admin.cc b/storage/tokudb/ha_tokudb_admin.cc
index b109cd1..42205c6 100644
--- a/storage/tokudb/ha_tokudb_admin.cc
+++ b/storage/tokudb/ha_tokudb_admin.cc
@@ -121,9 +121,10 @@ static int analyze_progress(void *v_extra, uint64_t rows) {
progress_time = (float) (t_now - t_start) / (float) t_limit;
char *write_status_msg = extra->write_status_msg;
TABLE_SHARE *table_share = extra->table_share;
- sprintf(write_status_msg, "%s.%s.%s %u of %u %.lf%% rows %.lf%% time",
- table_share->db.str, table_share->table_name.str, extra->key_name,
- extra->key_i, table_share->keys, progress_rows * 100.0, progress_time * 100.0);
+ sprintf(write_status_msg, "%.*s.%.*s.%s %u of %u %.lf%% rows %.lf%% time",
+ (int) table_share->db.length, table_share->db.str,
+ (int) table_share->table_name.length, table_share->table_name.str,
+ extra->key_name, extra->key_i, table_share->keys, progress_rows * 100.0, progress_time * 100.0);
thd_proc_info(thd, write_status_msg);
return 0;
}
@@ -338,8 +339,10 @@ static int ha_tokudb_check_progress(void *extra, float progress) {
static void ha_tokudb_check_info(THD *thd, TABLE *table, const char *msg) {
if (thd->vio_ok()) {
- char tablename[256];
- snprintf(tablename, sizeof tablename, "%s.%s", table->s->db.str, table->s->table_name.str);
+ char tablename[table->s->db.length + 1 + table->s->table_name.length + 1];
+ snprintf(tablename, sizeof tablename, "%.*s.%.*s",
+ (int) table->s->db.length, table->s->db.str,
+ (int) table->s->table_name.length, table->s->table_name.str);
thd->protocol->prepare_for_resend();
thd->protocol->store(tablename, strlen(tablename), system_charset_info);
thd->protocol->store("check", 5, system_charset_info);
@@ -388,6 +391,11 @@ int ha_tokudb::check(THD *thd, HA_CHECK_OPT *check_opt) {
}
struct check_context check_context = { thd };
r = db->verify_with_progress(db, ha_tokudb_check_progress, &check_context, (tokudb_debug & TOKUDB_DEBUG_CHECK) != 0, keep_going);
+ if (r != 0) {
+ char msg[32 + strlen(kname)];
+ sprintf(msg, "Corrupt %s", kname);
+ ha_tokudb_check_info(thd, table, msg);
+ }
snprintf(write_status_msg, sizeof write_status_msg, "%s key=%s %u result=%d", share->table_name, kname, i, r);
thd_proc_info(thd, write_status_msg);
if (tokudb_debug & TOKUDB_DEBUG_CHECK) {
diff --git a/storage/tokudb/ha_tokudb_alter_56.cc b/storage/tokudb/ha_tokudb_alter_56.cc
index cae5044..213b584 100644
--- a/storage/tokudb/ha_tokudb_alter_56.cc
+++ b/storage/tokudb/ha_tokudb_alter_56.cc
@@ -784,13 +784,16 @@ bool ha_tokudb::commit_inplace_alter_table(TABLE *altered_table, Alter_inplace_i
assert(trx->tokudb_lock_count > 0);
// for partitioned tables, we use a single transaction to do all of the partition changes. the tokudb_lock_count
// is a reference count for each of the handlers to the same transaction. obviously, we want to only abort once.
- if (!--trx->tokudb_lock_count) {
- abort_txn(ctx->alter_txn);
- ctx->alter_txn = NULL;
- trx->stmt = NULL;
- trx->sub_sp_level = NULL;
+ if (trx->tokudb_lock_count > 0) {
+ if (--trx->tokudb_lock_count <= trx->create_lock_count) {
+ trx->create_lock_count = 0;
+ abort_txn(ctx->alter_txn);
+ ctx->alter_txn = NULL;
+ trx->stmt = NULL;
+ trx->sub_sp_level = NULL;
+ }
+ transaction = NULL;
}
- transaction = NULL;
if (ctx->add_index_changed) {
restore_add_index(table, ha_alter_info->index_add_count, ctx->incremented_num_DBs, ctx->modified_DBs);
diff --git a/storage/tokudb/hatoku_defines.h b/storage/tokudb/hatoku_defines.h
index 1889b48..862c8f3 100644
--- a/storage/tokudb/hatoku_defines.h
+++ b/storage/tokudb/hatoku_defines.h
@@ -355,6 +355,7 @@ typedef struct st_tokudb_trx_data {
DB_TXN *sp_level;
DB_TXN *sub_sp_level;
uint tokudb_lock_count;
+ uint create_lock_count;
tokudb_stmt_progress stmt_progress;
bool checkpoint_lock_taken;
LIST *handlers;
diff --git a/storage/tokudb/hatoku_hton.cc b/storage/tokudb/hatoku_hton.cc
index c268780..6c6794b 100644
--- a/storage/tokudb/hatoku_hton.cc
+++ b/storage/tokudb/hatoku_hton.cc
@@ -1724,6 +1724,8 @@ static int tokudb_fractal_tree_info(TABLE *table, THD *thd) {
error = tmp_cursor->c_get(tmp_cursor, &curr_key, &curr_val, DB_NEXT);
if (!error) {
error = tokudb_report_fractal_tree_info_for_db(&curr_key, &curr_val, table, thd);
+ if (error)
+ error = 0; // ignore read uncommitted errors
}
if (!error && thd_killed(thd))
error = ER_QUERY_INTERRUPTED;
@@ -2002,7 +2004,9 @@ struct tokudb_search_txn_extra {
uint64_t match_client_id;
};
-static int tokudb_search_txn_callback(uint64_t txn_id, uint64_t client_id, iterate_row_locks_callback iterate_locks, void *locks_extra, void *extra) {
+static int tokudb_search_txn_callback(DB_TXN *txn, iterate_row_locks_callback iterate_locks, void *locks_extra, void *extra) {
+ uint64_t txn_id = txn->id64(txn);
+ uint64_t client_id = txn->get_client_id(txn);
struct tokudb_search_txn_extra *e = reinterpret_cast<struct tokudb_search_txn_extra *>(extra);
if (e->match_txn_id == txn_id) {
e->match_found = true;
@@ -2134,6 +2138,7 @@ static struct st_mysql_information_schema tokudb_trx_information_schema = { MYSQ
static ST_FIELD_INFO tokudb_trx_field_info[] = {
{"trx_id", 0, MYSQL_TYPE_LONGLONG, 0, 0, NULL, SKIP_OPEN_TABLE },
{"trx_mysql_thread_id", 0, MYSQL_TYPE_LONGLONG, 0, 0, NULL, SKIP_OPEN_TABLE },
+ {"trx_time", 0, MYSQL_TYPE_LONGLONG, 0, 0, NULL, SKIP_OPEN_TABLE },
{NULL, 0, MYSQL_TYPE_NULL, 0, 0, NULL, SKIP_OPEN_TABLE}
};
@@ -2142,12 +2147,17 @@ struct tokudb_trx_extra {
TABLE *table;
};
-static int tokudb_trx_callback(uint64_t txn_id, uint64_t client_id, iterate_row_locks_callback iterate_locks, void *locks_extra, void *extra) {
+static int tokudb_trx_callback(DB_TXN *txn, iterate_row_locks_callback iterate_locks, void *locks_extra, void *extra) {
+ uint64_t txn_id = txn->id64(txn);
+ uint64_t client_id = txn->get_client_id(txn);
+ uint64_t start_time = txn->get_start_time(txn);
struct tokudb_trx_extra *e = reinterpret_cast<struct tokudb_trx_extra *>(extra);
THD *thd = e->thd;
TABLE *table = e->table;
table->field[0]->store(txn_id, false);
table->field[1]->store(client_id, false);
+ uint64_t tnow = (uint64_t) time(NULL);
+ table->field[2]->store(tnow >= start_time ? tnow - start_time : 0, false);
int error = schema_table_store_record(thd, table);
if (!error && thd_killed(thd))
error = ER_QUERY_INTERRUPTED;
@@ -2295,7 +2305,9 @@ struct tokudb_locks_extra {
TABLE *table;
};
-static int tokudb_locks_callback(uint64_t txn_id, uint64_t client_id, iterate_row_locks_callback iterate_locks, void *locks_extra, void *extra) {
+static int tokudb_locks_callback(DB_TXN *txn, iterate_row_locks_callback iterate_locks, void *locks_extra, void *extra) {
+ uint64_t txn_id = txn->id64(txn);
+ uint64_t client_id = txn->get_client_id(txn);
struct tokudb_locks_extra *e = reinterpret_cast<struct tokudb_locks_extra *>(extra);
THD *thd = e->thd;
TABLE *table = e->table;
diff --git a/storage/tokudb/mysql-test/tokudb/r/i_s_tokudb_lock_waits_released.result b/storage/tokudb/mysql-test/tokudb/r/i_s_tokudb_lock_waits_released.result
index 018900c..190581e 100644
--- a/storage/tokudb/mysql-test/tokudb/r/i_s_tokudb_lock_waits_released.result
+++ b/storage/tokudb/mysql-test/tokudb/r/i_s_tokudb_lock_waits_released.result
@@ -2,7 +2,7 @@ set default_storage_engine='tokudb';
set tokudb_prelock_empty=false;
drop table if exists t;
create table t (id int primary key);
-select * from information_schema.tokudb_trx;
+select trx_id,trx_mysql_thread_id from information_schema.tokudb_trx;
trx_id trx_mysql_thread_id
select * from information_schema.tokudb_locks;
locks_trx_id locks_mysql_thread_id locks_dname locks_key_left locks_key_right locks_table_schema locks_table_name locks_table_dictionary_name
@@ -19,7 +19,7 @@ TRX_ID MYSQL_ID ./test/t-main 0001000000 0001000000 test t main
select * from information_schema.tokudb_lock_waits;
requesting_trx_id blocking_trx_id lock_waits_dname lock_waits_key_left lock_waits_key_right lock_waits_start_time lock_waits_table_schema lock_waits_table_name lock_waits_table_dictionary_name
REQUEST_TRX_ID BLOCK_TRX_ID ./test/t-main 0001000000 0001000000 LOCK_WAITS_START_TIME test t main
-select * from information_schema.tokudb_trx;
+select trx_id,trx_mysql_thread_id from information_schema.tokudb_trx;
trx_id trx_mysql_thread_id
TRX_ID MYSQL_ID
TRX_ID MYSQL_ID
@@ -31,7 +31,7 @@ select * from information_schema.tokudb_lock_waits;
requesting_trx_id blocking_trx_id lock_waits_dname lock_waits_key_left lock_waits_key_right lock_waits_start_time lock_waits_table_schema lock_waits_table_name lock_waits_table_dictionary_name
ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
commit;
-select * from information_schema.tokudb_trx;
+select trx_id,trx_mysql_thread_id from information_schema.tokudb_trx;
trx_id trx_mysql_thread_id
select * from information_schema.tokudb_locks;
locks_trx_id locks_mysql_thread_id locks_dname locks_key_left locks_key_right locks_table_schema locks_table_name locks_table_dictionary_name
@@ -48,7 +48,7 @@ TRX_ID MYSQL_ID ./test/t-main 0001000000 0001000000 test t main
select * from information_schema.tokudb_lock_waits;
requesting_trx_id blocking_trx_id lock_waits_dname lock_waits_key_left lock_waits_key_right lock_waits_start_time lock_waits_table_schema lock_waits_table_name lock_waits_table_dictionary_name
REQUEST_TRX_ID BLOCK_TRX_ID ./test/t-main 0001000000 0001000000 LOCK_WAITS_START_TIME test t main
-select * from information_schema.tokudb_trx;
+select trx_id,trx_mysql_thread_id from information_schema.tokudb_trx;
trx_id trx_mysql_thread_id
TRX_ID MYSQL_ID
TRX_ID MYSQL_ID
@@ -59,7 +59,7 @@ TRX_ID MYSQL_ID ./test/t-main 0001000000 0001000000 test t main
select * from information_schema.tokudb_lock_waits;
requesting_trx_id blocking_trx_id lock_waits_dname lock_waits_key_left lock_waits_key_right lock_waits_start_time lock_waits_table_schema lock_waits_table_name lock_waits_table_dictionary_name
commit;
-select * from information_schema.tokudb_trx;
+select trx_id,trx_mysql_thread_id from information_schema.tokudb_trx;
trx_id trx_mysql_thread_id
select * from information_schema.tokudb_locks;
locks_trx_id locks_mysql_thread_id locks_dname locks_key_left locks_key_right locks_table_schema locks_table_name locks_table_dictionary_name
diff --git a/storage/tokudb/mysql-test/tokudb/r/i_s_tokudb_lock_waits_timeout.result b/storage/tokudb/mysql-test/tokudb/r/i_s_tokudb_lock_waits_timeout.result
index b9fca50..13cdad7 100644
--- a/storage/tokudb/mysql-test/tokudb/r/i_s_tokudb_lock_waits_timeout.result
+++ b/storage/tokudb/mysql-test/tokudb/r/i_s_tokudb_lock_waits_timeout.result
@@ -2,7 +2,7 @@ set default_storage_engine='tokudb';
set tokudb_prelock_empty=false;
drop table if exists t;
create table t (id int primary key);
-select * from information_schema.tokudb_trx;
+select trx_id,trx_mysql_thread_id from information_schema.tokudb_trx;
trx_id trx_mysql_thread_id
select * from information_schema.tokudb_locks;
locks_trx_id locks_mysql_thread_id locks_dname locks_key_left locks_key_right locks_table_schema locks_table_name locks_table_dictionary_name
@@ -19,7 +19,7 @@ TRX_ID MYSQL_ID ./test/t-main 0001000000 0001000000 test t main
select * from information_schema.tokudb_lock_waits;
requesting_trx_id blocking_trx_id lock_waits_dname lock_waits_key_left lock_waits_key_right lock_waits_start_time lock_waits_table_schema lock_waits_table_name lock_waits_table_dictionary_name
REQUEST_TRX_ID BLOCK_TRX_ID ./test/t-main 0001000000 0001000000 LOCK_WAITS_START_TIME test t main
-select * from information_schema.tokudb_trx;
+select trx_id,trx_mysql_thread_id from information_schema.tokudb_trx;
trx_id trx_mysql_thread_id
TRX_ID MYSQL_ID
TRX_ID MYSQL_ID
@@ -30,7 +30,7 @@ select * from information_schema.tokudb_lock_waits;
requesting_trx_id blocking_trx_id lock_waits_dname lock_waits_key_left lock_waits_key_right lock_waits_start_time lock_waits_table_schema lock_waits_table_name lock_waits_table_dictionary_name
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
commit;
-select * from information_schema.tokudb_trx;
+select trx_id,trx_mysql_thread_id from information_schema.tokudb_trx;
trx_id trx_mysql_thread_id
select * from information_schema.tokudb_locks;
locks_trx_id locks_mysql_thread_id locks_dname locks_key_left locks_key_right locks_table_schema locks_table_name locks_table_dictionary_name
diff --git a/storage/tokudb/mysql-test/tokudb/r/i_s_tokudb_trx.result b/storage/tokudb/mysql-test/tokudb/r/i_s_tokudb_trx.result
index e4c1adc..63e4816 100644
--- a/storage/tokudb/mysql-test/tokudb/r/i_s_tokudb_trx.result
+++ b/storage/tokudb/mysql-test/tokudb/r/i_s_tokudb_trx.result
@@ -1,23 +1,23 @@
set default_storage_engine='tokudb';
set tokudb_prelock_empty=false;
drop table if exists t;
-select * from information_schema.tokudb_trx;
+select trx_id,trx_mysql_thread_id from information_schema.tokudb_trx;
trx_id trx_mysql_thread_id
set autocommit=0;
create table t (id int primary key);
insert into t values (1);
-select * from information_schema.tokudb_trx;
+select trx_id,trx_mysql_thread_id from information_schema.tokudb_trx;
trx_id trx_mysql_thread_id
TXN_ID_DEFAULT CLIENT_ID_DEFAULT
commit;
-select * from information_schema.tokudb_trx;
+select trx_id,trx_mysql_thread_id from information_schema.tokudb_trx;
trx_id trx_mysql_thread_id
set autocommit=0;
insert into t values (2);
-select * from information_schema.tokudb_trx;
+select trx_id,trx_mysql_thread_id from information_schema.tokudb_trx;
trx_id trx_mysql_thread_id
TXN_ID_A CLIENT_ID_A
commit;
-select * from information_schema.tokudb_trx;
+select trx_id,trx_mysql_thread_id from information_schema.tokudb_trx;
trx_id trx_mysql_thread_id
drop table t;
diff --git a/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_lock_waits_released.test b/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_lock_waits_released.test
index c4f9cce..0f71200 100644
--- a/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_lock_waits_released.test
+++ b/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_lock_waits_released.test
@@ -13,7 +13,7 @@ create table t (id int primary key);
# verify that txn_a insert (1) blocks txn_b insert (1) and txn_b gets a duplicate key error
# should be empty
-select * from information_schema.tokudb_trx;
+select trx_id,trx_mysql_thread_id from information_schema.tokudb_trx;
select * from information_schema.tokudb_locks;
select * from information_schema.tokudb_lock_waits;
@@ -43,7 +43,7 @@ select * from information_schema.tokudb_lock_waits;
# should find the presence of two transactions
replace_column 1 TRX_ID 2 MYSQL_ID;
-select * from information_schema.tokudb_trx;
+select trx_id,trx_mysql_thread_id from information_schema.tokudb_trx;
connection conn_a;
commit;
@@ -66,7 +66,7 @@ disconnect conn_b;
# verify that the lock on the 2nd transaction has been released
# should be be empty
-select * from information_schema.tokudb_trx;
+select trx_id,trx_mysql_thread_id from information_schema.tokudb_trx;
select * from information_schema.tokudb_locks;
select * from information_schema.tokudb_lock_waits;
@@ -96,7 +96,7 @@ select * from information_schema.tokudb_lock_waits;
# should find the presence of two transactions
replace_column 1 TRX_ID 2 MYSQL_ID;
-select * from information_schema.tokudb_trx;
+select trx_id,trx_mysql_thread_id from information_schema.tokudb_trx;
connection conn_a;
commit;
@@ -116,7 +116,7 @@ disconnect conn_b;
# verify that the lock on the 2nd transaction has been released
# should be be empty
-select * from information_schema.tokudb_trx;
+select trx_id,trx_mysql_thread_id from information_schema.tokudb_trx;
select * from information_schema.tokudb_locks;
select * from information_schema.tokudb_lock_waits;
diff --git a/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_lock_waits_timeout.test b/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_lock_waits_timeout.test
index 75929fa..3011443 100644
--- a/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_lock_waits_timeout.test
+++ b/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_lock_waits_timeout.test
@@ -10,7 +10,7 @@ enable_warnings;
create table t (id int primary key);
# should be empty
-select * from information_schema.tokudb_trx;
+select trx_id,trx_mysql_thread_id from information_schema.tokudb_trx;
select * from information_schema.tokudb_locks;
select * from information_schema.tokudb_lock_waits;
@@ -40,7 +40,7 @@ select * from information_schema.tokudb_lock_waits;
# should find the presence of two transactions
replace_column 1 TRX_ID 2 MYSQL_ID;
-select * from information_schema.tokudb_trx;
+select trx_id,trx_mysql_thread_id from information_schema.tokudb_trx;
connection conn_a;
sleep 5; # sleep longer than the lock timer to force a lock timeout on txn_b
@@ -61,7 +61,7 @@ disconnect conn_a;
disconnect conn_b;
# should be be empty
-select * from information_schema.tokudb_trx;
+select trx_id,trx_mysql_thread_id from information_schema.tokudb_trx;
select * from information_schema.tokudb_locks;
select * from information_schema.tokudb_lock_waits;
diff --git a/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_trx.test b/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_trx.test
index b1d5c7e..d3c2636 100644
--- a/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_trx.test
+++ b/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_trx.test
@@ -8,7 +8,7 @@ drop table if exists t;
enable_warnings;
# should be empty
-select * from information_schema.tokudb_trx;
+select trx_id,trx_mysql_thread_id from information_schema.tokudb_trx;
# should have my txn
let $default_id=`select connection_id()`;
@@ -16,11 +16,11 @@ set autocommit=0;
create table t (id int primary key);
insert into t values (1);
replace_column 1 TXN_ID_DEFAULT 2 CLIENT_ID_DEFAULT;
-eval select * from information_schema.tokudb_trx;
+eval select trx_id,trx_mysql_thread_id from information_schema.tokudb_trx;
# should be empty
commit;
-select * from information_schema.tokudb_trx;
+select trx_id,trx_mysql_thread_id from information_schema.tokudb_trx;
connect(conn_a,localhost,root,,);
let a_id=`select connection_id()`;
@@ -29,13 +29,13 @@ insert into t values (2);
connection default;
replace_column 1 TXN_ID_A 2 CLIENT_ID_A;
-eval select * from information_schema.tokudb_trx;
+eval select trx_id,trx_mysql_thread_id from information_schema.tokudb_trx;
connection conn_a;
commit;
connection default;
# should be empty
-select * from information_schema.tokudb_trx;
+select trx_id,trx_mysql_thread_id from information_schema.tokudb_trx;
disconnect conn_a;
diff --git a/storage/tokudb/mysql-test/tokudb_bugs/r/tokudb718.result b/storage/tokudb/mysql-test/tokudb_bugs/r/tokudb718.result
index 8814f8a..0cf75d4 100644
--- a/storage/tokudb/mysql-test/tokudb_bugs/r/tokudb718.result
+++ b/storage/tokudb/mysql-test/tokudb_bugs/r/tokudb718.result
@@ -3,7 +3,8 @@ drop table if exists t;
create table t (id int primary key);
begin;
insert into t values (1),(2);
-select * from information_schema.tokudb_fractal_tree_info;
-ERROR HY000: Got error -30994 from storage engine
+select dictionary_name from information_schema.tokudb_fractal_tree_info;
+dictionary_name
+./test/t-status
commit;
drop table t;
diff --git a/storage/tokudb/mysql-test/tokudb_bugs/t/tokudb718.test b/storage/tokudb/mysql-test/tokudb_bugs/t/tokudb718.test
index 415bb7a..735a88a 100644
--- a/storage/tokudb/mysql-test/tokudb_bugs/t/tokudb718.test
+++ b/storage/tokudb/mysql-test/tokudb_bugs/t/tokudb718.test
@@ -7,7 +7,6 @@ enable_warnings;
create table t (id int primary key);
begin;
insert into t values (1),(2);
---error 1030
-select * from information_schema.tokudb_fractal_tree_info;
+select dictionary_name from information_schema.tokudb_fractal_tree_info;
commit;
drop table t;
diff --git a/storage/xtradb/CMakeLists.txt b/storage/xtradb/CMakeLists.txt
index 1c3bf76..2f8e424 100644
--- a/storage/xtradb/CMakeLists.txt
+++ b/storage/xtradb/CMakeLists.txt
@@ -180,6 +180,8 @@ IF(HAVE_IB_ATOMIC_PTHREAD_T_GCC)
ADD_DEFINITIONS(-DHAVE_IB_ATOMIC_PTHREAD_T_GCC=1)
ENDIF()
+CHECK_C_SOURCE_COMPILES("struct t1{ int a; char *b; }; struct t1 c= { .a=1, .b=0 }; main() { }" HAVE_C99_INITIALIZERS)
+
ENDIF(NOT MSVC)
# Solaris atomics
diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc
index ac883e9..5034e7e 100644
--- a/storage/xtradb/handler/ha_innodb.cc
+++ b/storage/xtradb/handler/ha_innodb.cc
@@ -102,7 +102,6 @@ extern "C" {
#include "ibuf0ibuf.h"
enum_tx_isolation thd_get_trx_isolation(const THD* thd);
-
}
#include "ha_innodb.h"
@@ -7327,6 +7326,11 @@ ha_innobase::general_fetch(
DBUG_ENTER("general_fetch");
+ /* If transaction is not startted do not continue, instead return a error code. */
+ if(!(prebuilt->sql_stat_start || (prebuilt->trx && prebuilt->trx->state == 1))) {
+ DBUG_RETURN(HA_ERR_END_OF_FILE);
+ }
+
if (UNIV_UNLIKELY(share->ib_table->is_corrupt &&
srv_pass_corrupt_table <= 1)) {
DBUG_RETURN(HA_ERR_CRASHED);
diff --git a/storage/xtradb/handler/i_s.cc b/storage/xtradb/handler/i_s.cc
index 01e4022..bba0dad 100644
--- a/storage/xtradb/handler/i_s.cc
+++ b/storage/xtradb/handler/i_s.cc
@@ -178,9 +178,12 @@ do { \
} \
} while (0)
-#if !defined __STRICT_ANSI__ && defined __GNUC__ && (__GNUC__) > 2 && \
- !defined __INTEL_COMPILER && !defined __clang__
+#if !defined __STRICT_ANSI__ && defined __GNUC__ && (__GNUC__) > 2 && !defined __INTEL_COMPILER && !defined __clang__
+#ifdef HAVE_C99_INITIALIZERS
+#define STRUCT_FLD(name, value) .name = value
+#else
#define STRUCT_FLD(name, value) name: value
+#endif /* HAVE_C99_INITIALIZERS */
#else
#define STRUCT_FLD(name, value) value
#endif
diff --git a/storage/xtradb/include/os0sync.h b/storage/xtradb/include/os0sync.h
index ab7e8ba..d9f2407 100644
--- a/storage/xtradb/include/os0sync.h
+++ b/storage/xtradb/include/os0sync.h
@@ -331,7 +331,7 @@ amount of increment. */
/**********************************************************//**
Returns the old value of *ptr, atomically sets *ptr to new_val */
-#ifdef __powerpc__
+#if defined(__powerpc__) || defined(__aarch64__)
/*
os_atomic_test_and_set_byte_release() should imply a release barrier before
setting, and a full barrier after. But __sync_lock_test_and_set() is only
diff --git a/storage/xtradb/include/univ.i b/storage/xtradb/include/univ.i
index a377911..c31a0f2 100644
--- a/storage/xtradb/include/univ.i
+++ b/storage/xtradb/include/univ.i
@@ -64,10 +64,10 @@ 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 37.1
+#define PERCONA_INNODB_VERSION 37.2
#endif
-#define INNODB_VERSION_STR "5.5.42-MariaDB-" IB_TO_STR(PERCONA_INNODB_VERSION)
+#define INNODB_VERSION_STR "5.5.43-MariaDB-" IB_TO_STR(PERCONA_INNODB_VERSION)
#define REFMAN "http://dev.mysql.com/doc/refman/" \
IB_TO_STR(MYSQL_MAJOR_VERSION) "." \
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index e45573a..aaeed44 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -1,4 +1,4 @@
-# Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -427,7 +427,7 @@ Obsoletes: MySQL-embedded-pro
Obsoletes: MySQL-embedded-classic MySQL-embedded-community MySQL-embedded-enterprise
Obsoletes: MySQL-embedded-advanced-gpl MySQL-embedded-enterprise-gpl
Provides: mysql-embedded = %{version}-%{release}
-Provides: mysql-emdedded%{?_isa} = %{version}-%{release}
+Provides: mysql-embedded%{?_isa} = %{version}-%{release}
%description -n MySQL-embedded%{product_suffix}
This package contains the MySQL server as an embedded library.
diff --git a/storage/tokudb/ft-index/tools/tdb_logprint.cc b/util/tests/sm-basic.cc
similarity index 77%
copy from storage/tokudb/ft-index/tools/tdb_logprint.cc
copy to util/tests/sm-basic.cc
index 15a2863..5df6429 100644
--- a/storage/tokudb/ft-index/tools/tdb_logprint.cc
+++ b/util/tests/sm-basic.cc
@@ -86,43 +86,42 @@ PATENT RIGHTS GRANT:
under this License.
*/
-#ident "Copyright (c) 2007-2013 Tokutek Inc. All rights reserved."
-#ident "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it."
-
-/* Dump the log from stdin to stdout. */
-
-#include <config.h>
-
-#include "ft/log_header.h"
-#include "ft/logger/logger.h"
-
-static void newmain (int count) {
- int i;
- uint32_t version;
- int r = toku_read_and_print_logmagic(stdin, &version);
- for (i=0; i!=count; i++) {
- r = toku_logprint_one_record(stdout, stdin);
- if (r==EOF) break;
- if (r!=0) {
- fflush(stdout);
- fprintf(stderr, "Problem in log err=%d\n", r);
- exit(1);
- }
+// test that basic scoped malloc works with a thread
+
+#ident "Copyright (c) 2015 Tokutek Inc. All rights reserved."
+#include <toku_portability.h>
+#include <toku_assert.h>
+#include <toku_pthread.h>
+#include <util/scoped_malloc.h>
+
+static void sm_test(void) {
+ toku::scoped_malloc a(1);
+ {
+ toku::scoped_malloc b(2);
+ {
+ toku::scoped_malloc c(3);
+ }
}
}
-int main (int argc, char *const argv[]) {
- int count=-1;
- while (argc>1) {
- if (strcmp(argv[1], "--oldcode")==0) {
- fprintf(stderr,"Old code no longer works.\n");
- exit(1);
- } else {
- count = atoi(argv[1]);
- }
- argc--; argv++;
- }
- newmain(count);
- return 0;
+static void *sm_test_f(void *arg) {
+ sm_test();
+ return arg;
}
+int main(void) {
+ toku_scoped_malloc_init();
+
+ // run the test
+ toku_pthread_t tid;
+ int r;
+ r = toku_pthread_create(&tid, NULL, sm_test_f, NULL);
+ assert_zero(r);
+ void *ret;
+ r = toku_pthread_join(tid, &ret);
+ assert_zero(r);
+
+ toku_scoped_malloc_destroy();
+
+ return 0;
+}
diff --git a/storage/tokudb/ft-index/tools/tdb_logprint.cc b/util/tests/sm-crash-double-free.cc
similarity index 77%
rename from storage/tokudb/ft-index/tools/tdb_logprint.cc
rename to util/tests/sm-crash-double-free.cc
index 15a2863..653d414 100644
--- a/storage/tokudb/ft-index/tools/tdb_logprint.cc
+++ b/util/tests/sm-crash-double-free.cc
@@ -86,43 +86,43 @@ PATENT RIGHTS GRANT:
under this License.
*/
-#ident "Copyright (c) 2007-2013 Tokutek Inc. All rights reserved."
-#ident "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it."
-
-/* Dump the log from stdin to stdout. */
-
-#include <config.h>
-
-#include "ft/log_header.h"
-#include "ft/logger/logger.h"
-
-static void newmain (int count) {
- int i;
- uint32_t version;
- int r = toku_read_and_print_logmagic(stdin, &version);
- for (i=0; i!=count; i++) {
- r = toku_logprint_one_record(stdout, stdin);
- if (r==EOF) break;
- if (r!=0) {
- fflush(stdout);
- fprintf(stderr, "Problem in log err=%d\n", r);
- exit(1);
- }
- }
+// force a race between the scoped malloc global destructor and a thread variable destructor
+
+#ident "Copyright (c) 2015 Tokutek Inc. All rights reserved."
+#define TOKU_SCOPED_MALLOC_DEBUG 1
+#include <toku_portability.h>
+#include <toku_assert.h>
+#include <toku_pthread.h>
+#include <toku_race_tools.h>
+#include <util/scoped_malloc.h>
+
+volatile int state = 0;
+
+static void sm_test(void) {
+ toku::scoped_malloc a(1);
}
-int main (int argc, char *const argv[]) {
- int count=-1;
- while (argc>1) {
- if (strcmp(argv[1], "--oldcode")==0) {
- fprintf(stderr,"Old code no longer works.\n");
- exit(1);
- } else {
- count = atoi(argv[1]);
- }
- argc--; argv++;
- }
- newmain(count);
- return 0;
+static void *sm_test_f(void *arg) {
+ sm_test();
+ state = 1;
+ while (state != 2) sleep(1);
+ return arg;
}
+int main(void) {
+ TOKU_VALGRIND_HG_DISABLE_CHECKING(&state, sizeof state);
+ state = 0;
+ toku_scoped_malloc_init();
+ toku_pthread_t tid;
+ int r;
+ r = toku_pthread_create(&tid, NULL, sm_test_f, NULL);
+ assert_zero(r);
+ void *ret;
+ while (state != 1) sleep(1);
+ toku_scoped_malloc_destroy_set();
+ state = 2;
+ r = toku_pthread_join(tid, &ret);
+ assert_zero(r);
+ toku_scoped_malloc_destroy_key();
+ return 0;
+}
diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c
index 41c1dbb..78916f8 100644
--- a/vio/viosslfactories.c
+++ b/vio/viosslfactories.c
@@ -21,33 +21,33 @@
static my_bool ssl_algorithms_added = FALSE;
static my_bool ssl_error_strings_loaded= FALSE;
-static unsigned char dh512_p[]=
-{
- 0xDA,0x58,0x3C,0x16,0xD9,0x85,0x22,0x89,0xD0,0xE4,0xAF,0x75,
- 0x6F,0x4C,0xCA,0x92,0xDD,0x4B,0xE5,0x33,0xB8,0x04,0xFB,0x0F,
- 0xED,0x94,0xEF,0x9C,0x8A,0x44,0x03,0xED,0x57,0x46,0x50,0xD3,
- 0x69,0x99,0xDB,0x29,0xD7,0x76,0x27,0x6B,0xA2,0xD3,0xD4,0x12,
- 0xE2,0x18,0xF4,0xDD,0x1E,0x08,0x4C,0xF6,0xD8,0x00,0x3E,0x7C,
- 0x47,0x74,0xE8,0x33,
-};
-
-static unsigned char dh512_g[]={
- 0x02,
-};
-
-static DH *get_dh512(void)
+/* the function below was generated with "openssl dhparam -2 -C 1024" */
+static
+DH *get_dh1024()
{
+ static unsigned char dh1024_p[]={
+ 0xEC,0x46,0x7E,0xF9,0x4E,0x10,0x29,0xDC,0x44,0x97,0x71,0xFD,
+ 0x71,0xC6,0x9F,0x0D,0xD1,0x09,0xF6,0x58,0x6F,0xAD,0xCA,0xF4,
+ 0x37,0xD5,0xC3,0xBD,0xC3,0x9A,0x51,0x66,0x2C,0x58,0xBD,0x02,
+ 0xBD,0xBA,0xBA,0xFC,0xE7,0x0E,0x5A,0xE5,0x97,0x81,0xC3,0xF3,
+ 0x28,0x2D,0xAD,0x00,0x91,0xEF,0xF8,0xF0,0x5D,0xE9,0xE7,0x18,
+ 0xE2,0xAD,0xC4,0x70,0xC5,0x3C,0x12,0x8A,0x80,0x6A,0x9F,0x3B,
+ 0x00,0xA2,0x8F,0xA9,0x26,0xB0,0x0E,0x7F,0xED,0xF6,0xC2,0x03,
+ 0x81,0xB5,0xC5,0x41,0xD0,0x00,0x2B,0x21,0xD4,0x4B,0x74,0xA6,
+ 0xD7,0x1A,0x0E,0x82,0xC8,0xEE,0xD4,0xB1,0x6F,0xB4,0x79,0x01,
+ 0x8A,0xF1,0x12,0xD7,0x3C,0xFD,0xCB,0x9B,0xAE,0x1C,0xA9,0x0F,
+ 0x3D,0x0F,0xF8,0xD6,0x7D,0xDE,0xD6,0x0B,
+ };
+ static unsigned char dh1024_g[]={
+ 0x02,
+ };
DH *dh;
- if ((dh=DH_new()))
- {
- dh->p=BN_bin2bn(dh512_p,sizeof(dh512_p),NULL);
- dh->g=BN_bin2bn(dh512_g,sizeof(dh512_g),NULL);
- if (! dh->p || ! dh->g)
- {
- DH_free(dh);
- dh=0;
- }
- }
+
+ if ((dh=DH_new()) == NULL) return(NULL);
+ dh->p=BN_bin2bn(dh1024_p,sizeof(dh1024_p),NULL);
+ dh->g=BN_bin2bn(dh1024_g,sizeof(dh1024_g),NULL);
+ if ((dh->p == NULL) || (dh->g == NULL))
+ { DH_free(dh); return(NULL); }
return(dh);
}
@@ -259,7 +259,7 @@ new_VioSSLFd(const char *key_file, const char *cert_file,
}
/* DH stuff */
- dh=get_dh512();
+ dh=get_dh1024();
SSL_CTX_set_tmp_dh(ssl_fd->ssl_context, dh);
DH_free(dh);
diff --git a/win/packaging/COPYING.rtf b/win/packaging/COPYING.rtf
index de1f0bb..9370fbc 100644
--- a/win/packaging/COPYING.rtf
+++ b/win/packaging/COPYING.rtf
@@ -1,61 +1,61 @@
-{\rtf1\ansi\ansicpg1252\deff0\deflang1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Arial;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\fswiss\fcharset0 Arial;}}
-{\stylesheet{ Normal;}{\s1 heading 1;}{\s2 heading 2;}}
-\viewkind4\uc1\pard\s2\sb100\sa100\b\f0\fs24 GNU GENERAL PUBLIC LICENSE\par
-\pard\sb100\sa100\b0\fs20 Version 2, June 1991 \par
-\pard Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.\fs24 \par
-\pard\s2\sb100\sa100\b Preamble\par
-\pard\sb100\sa100\b0\fs20 The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered [...]
-When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. \par
-To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. \par
-For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. \par
-We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. \par
-Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. \par
-Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. \par
-The precise terms and conditions for copying, distribution and modification follow.\fs24 \par
-\pard\s2\sb100\sa100\b TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\par
-\pard\sb100\sa100\b0\fs20 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translate [...]
-Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. \par
-1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. \par
-You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. \par
-2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: \par
-\pard\fi-360\li720\sb100\sa100\tx720\f1\'b7\tab\f0 a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. \par
-\pard\fi-360\li720\sb100\sa100\f1\'b7\tab\f0 b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. \par
-\f1\'b7\tab\f0 c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Prog [...]
-\pard These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, w [...]
-\pard\sb100\sa100 Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. \par
-In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. \par
-3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: \par
-\pard\fi-360\li720\sb100\sa100\tx720\f1\'b7\tab\f0 a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, \par
-\pard\fi-360\li720\sb100\sa100\f1\'b7\tab\f0 b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, \par
-\f1\'b7\tab\f0 c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) \par
-\pard The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the ma [...]
-\pard\sb100\sa100 If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. \par
-4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. \par
-5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works ba [...]
-6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. \par
-7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not dist [...]
-If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. \par
-It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/dono [...]
-This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. \par
-8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. \par
-9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. \par
-Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. \par
-10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. \par
-NO WARRANTY \par
-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. [...]
-12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO [...]
-\pard\s2\sb100\sa100\b\fs24 END OF TERMS AND CONDITIONS \par
-How to Apply These Terms to Your New Programs\fs20\par
-\pard\sb100\sa100\b0 If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. \par
-To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. \par
-\pard one line to give the program's name and an idea of what it does. Copyright (C) yyyy name of author This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or F [...]
-\pard\sb100\sa100 Also add information on how to contact you by electronic and paper mail. \par
-If the program is interactive, make it output a short notice like this when it starts in an interactive mode: \par
-\pard Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. \par
-\pard\sb100\sa100 The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c' ; they could even be mouse-clicks or menu items--whatever suits your program. \par
-You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: \par
-\pard Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker. signature of Ty Coon , 1 April 1989 Ty Coon, President of Vice \par
-\pard\sb100\sa100 This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License.\par
-\pard\f2\par
-}
-
+{\rtf1\ansi\ansicpg1252\deff0\deflang1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Arial;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\fswiss\fcharset0 Arial;}}
+{\stylesheet{ Normal;}{\s1 heading 1;}{\s2 heading 2;}}
+\viewkind4\uc1\pard\s2\sb100\sa100\b\f0\fs24 GNU GENERAL PUBLIC LICENSE\par
+\pard\sb100\sa100\b0\fs20 Version 2, June 1991 \par
+\pard Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.\fs24 \par
+\pard\s2\sb100\sa100\b Preamble\par
+\pard\sb100\sa100\b0\fs20 The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered [...]
+When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. \par
+To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. \par
+For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. \par
+We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. \par
+Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. \par
+Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. \par
+The precise terms and conditions for copying, distribution and modification follow.\fs24 \par
+\pard\s2\sb100\sa100\b TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\par
+\pard\sb100\sa100\b0\fs20 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translate [...]
+Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. \par
+1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. \par
+You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. \par
+2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: \par
+\pard\fi-360\li720\sb100\sa100\tx720\f1\'b7\tab\f0 a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. \par
+\pard\fi-360\li720\sb100\sa100\f1\'b7\tab\f0 b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. \par
+\f1\'b7\tab\f0 c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Prog [...]
+\pard These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, w [...]
+\pard\sb100\sa100 Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. \par
+In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. \par
+3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: \par
+\pard\fi-360\li720\sb100\sa100\tx720\f1\'b7\tab\f0 a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, \par
+\pard\fi-360\li720\sb100\sa100\f1\'b7\tab\f0 b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, \par
+\f1\'b7\tab\f0 c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) \par
+\pard The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the ma [...]
+\pard\sb100\sa100 If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. \par
+4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. \par
+5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works ba [...]
+6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. \par
+7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not dist [...]
+If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. \par
+It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/dono [...]
+This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. \par
+8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. \par
+9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. \par
+Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. \par
+10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. \par
+NO WARRANTY \par
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. [...]
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO [...]
+\pard\s2\sb100\sa100\b\fs24 END OF TERMS AND CONDITIONS \par
+How to Apply These Terms to Your New Programs\fs20\par
+\pard\sb100\sa100\b0 If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. \par
+To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. \par
+\pard one line to give the program's name and an idea of what it does. Copyright (C) yyyy name of author This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or F [...]
+\pard\sb100\sa100 Also add information on how to contact you by electronic and paper mail. \par
+If the program is interactive, make it output a short notice like this when it starts in an interactive mode: \par
+\pard Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. \par
+\pard\sb100\sa100 The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c' ; they could even be mouse-clicks or menu items--whatever suits your program. \par
+You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: \par
+\pard Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker. signature of Ty Coon , 1 April 1989 Ty Coon, President of Vice \par
+\pard\sb100\sa100 This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License.\par
+\pard\f2\par
+}
+
diff --git a/win/packaging/CPackWixConfig.cmake b/win/packaging/CPackWixConfig.cmake
index 356d6ef..3371112 100644
--- a/win/packaging/CPackWixConfig.cmake
+++ b/win/packaging/CPackWixConfig.cmake
@@ -1,115 +1,115 @@
-
-IF(ESSENTIALS)
- SET(CPACK_COMPONENTS_USED "Server;Client")
- SET(CPACK_WIX_UI "MyWixUI_Mondo")
- IF(CMAKE_SIZEOF_VOID_P MATCHES 8)
- SET(CPACK_PACKAGE_FILE_NAME "mariadb-essential-${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}-winx64")
- ELSE()
- SET(CPACK_PACKAGE_FILE_NAME "mariadb-essential-${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}-win32")
- ENDIF()
-ELSE()
- SET(CPACK_COMPONENTS_USED
- "Server;Client;Development;SharedLibraries;Embedded;Documentation;IniFiles;Readme;Debuginfo;Common")
-ENDIF()
-
-SET( WIX_FEATURE_MySQLServer_EXTRA_FEATURES "DBInstance;SharedClientServerComponents")
-# Some components like Embedded are optional
-# We will build MSI without embedded if it was not selected for build
-#(need to modify CPACK_COMPONENTS_ALL for that)
-SET(CPACK_ALL)
-FOREACH(comp1 ${CPACK_COMPONENTS_USED})
- SET(found)
- FOREACH(comp2 ${CPACK_COMPONENTS_ALL})
- IF(comp1 STREQUAL comp2)
- SET(found 1)
- BREAK()
- ENDIF()
- ENDFOREACH()
- IF(found)
- SET(CPACK_ALL ${CPACK_ALL} ${comp1})
- ENDIF()
-ENDFOREACH()
-SET(CPACK_COMPONENTS_ALL ${CPACK_ALL})
-
-# Always install (hidden), includes Readme files
-SET(CPACK_COMPONENT_GROUP_ALWAYSINSTALL_HIDDEN 1)
-SET(CPACK_COMPONENT_README_GROUP "AlwaysInstall")
-SET(CPACK_COMPONENT_COMMON_GROUP "AlwaysInstall")
-
-# Feature MySQL Server
-SET(CPACK_COMPONENT_GROUP_MYSQLSERVER_DISPLAY_NAME "MariaDB Server")
-SET(CPACK_COMPONENT_GROUP_MYSQLSERVER_EXPANDED "1")
-SET(CPACK_COMPONENT_GROUP_MYSQLSERVER_DESCRIPTION "Install server")
- # Subfeature "Server" (hidden)
- SET(CPACK_COMPONENT_SERVER_GROUP "MySQLServer")
- SET(CPACK_COMPONENT_SERVER_HIDDEN 1)
- # Subfeature "Client"
- SET(CPACK_COMPONENT_CLIENT_GROUP "MySQLServer")
- SET(CPACK_COMPONENT_CLIENT_DISPLAY_NAME "Client Programs")
- SET(CPACK_COMPONENT_CLIENT_DESCRIPTION
- "Various helpful (commandline) tools including the mysql command line client" )
- # Subfeature "Debug binaries"
- SET(CPACK_COMPONENT_DEBUGBINARIES_GROUP "MySQLServer")
- SET(CPACK_COMPONENT_DEBUGBINARIES_DISPLAY_NAME "Debug binaries")
- SET(CPACK_COMPONENT_DEBUGBINARIES_DESCRIPTION
- "Debug/trace versions of executables and libraries" )
- #SET(CPACK_COMPONENT_DEBUGBINARIES_WIX_LEVEL 2)
-
-
- #Subfeature "Data Files"
- SET(CPACK_COMPONENT_DATAFILES_GROUP "MySQLServer")
- SET(CPACK_COMPONENT_DATAFILES_DISPLAY_NAME "Server data files")
- SET(CPACK_COMPONENT_DATAFILES_DESCRIPTION "Server data files" )
- SET(CPACK_COMPONENT_DATAFILES_HIDDEN 1)
-
-
-#Feature "Devel"
-SET(CPACK_COMPONENT_GROUP_DEVEL_DISPLAY_NAME "Development Components")
-SET(CPACK_COMPONENT_GROUP_DEVEL_DESCRIPTION "Installs C/C++ header files and libraries")
- #Subfeature "Development"
- SET(CPACK_COMPONENT_DEVELOPMENT_GROUP "Devel")
- SET(CPACK_COMPONENT_DEVELOPMENT_HIDDEN 1)
-
- #Subfeature "Shared libraries"
- SET(CPACK_COMPONENT_SHAREDLIBRARIES_GROUP "Devel")
- SET(CPACK_COMPONENT_SHAREDLIBRARIES_DISPLAY_NAME "Client C API library (shared)")
- SET(CPACK_COMPONENT_SHAREDLIBRARIES_DESCRIPTION "Installs shared client library")
-
- #Subfeature "Embedded"
- SET(CPACK_COMPONENT_EMBEDDED_GROUP "Devel")
- SET(CPACK_COMPONENT_EMBEDDED_DISPLAY_NAME "Embedded server library")
- SET(CPACK_COMPONENT_EMBEDDED_DESCRIPTION "Installs embedded server library")
- SET(CPACK_COMPONENT_EMBEDDED_WIX_LEVEL 2)
-
-#Feature Debug Symbols
-SET(CPACK_COMPONENT_GROUP_DEBUGSYMBOLS_DISPLAY_NAME "Debug Symbols")
-SET(CPACK_COMPONENT_GROUP_DEBUGSYMBOLS_DESCRIPTION "Installs Debug Symbols")
-SET(CPACK_COMPONENT_DEBUGSYMBOLS_WIX_LEVEL 2)
- SET(CPACK_COMPONENT_DEBUGINFO_GROUP "DebugSymbols")
- SET(CPACK_COMPONENT_DEBUGINFO_HIDDEN 1)
-
-#Feature Documentation
-SET(CPACK_COMPONENT_DOCUMENTATION_DISPLAY_NAME "Documentation")
-SET(CPACK_COMPONENT_DOCUMENTATION_DESCRIPTION "Installs documentation")
-SET(CPACK_COMPONENT_DOCUMENTATION_WIX_LEVEL 2)
-
-#Feature tests
-SET(CPACK_COMPONENT_TEST_DISPLAY_NAME "Tests")
-SET(CPACK_COMPONENT_TEST_DESCRIPTION "Installs unittests (requires Perl to run)")
-SET(CPACK_COMPONENT_TEST_WIX_LEVEL 2)
-
-
-#Feature Misc (hidden, installs only if everything is installed)
-SET(CPACK_COMPONENT_GROUP_MISC_HIDDEN 1)
-SET(CPACK_COMPONENT_GROUP_MISC_WIX_LEVEL 100)
- SET(CPACK_COMPONENT_INIFILES_GROUP "Misc")
- SET(CPACK_COMPONENT_SERVER_SCRIPTS_GROUP "Misc")
-
-#Add Firewall exception for mysqld.exe
-SET(bin.mysqld.exe.FILE_EXTRA "
- <FirewallException Id='firewallexception.mysqld.exe' Name='[ProductName]' Scope='any'
- IgnoreFailure='yes' xmlns='http://schemas.microsoft.com/wix/FirewallExtension'
- />
- "
-)
-
+
+IF(ESSENTIALS)
+ SET(CPACK_COMPONENTS_USED "Server;Client")
+ SET(CPACK_WIX_UI "MyWixUI_Mondo")
+ IF(CMAKE_SIZEOF_VOID_P MATCHES 8)
+ SET(CPACK_PACKAGE_FILE_NAME "mariadb-essential-${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}-winx64")
+ ELSE()
+ SET(CPACK_PACKAGE_FILE_NAME "mariadb-essential-${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}-win32")
+ ENDIF()
+ELSE()
+ SET(CPACK_COMPONENTS_USED
+ "Server;Client;Development;SharedLibraries;Embedded;Documentation;IniFiles;Readme;Debuginfo;Common")
+ENDIF()
+
+SET( WIX_FEATURE_MySQLServer_EXTRA_FEATURES "DBInstance;SharedClientServerComponents")
+# Some components like Embedded are optional
+# We will build MSI without embedded if it was not selected for build
+#(need to modify CPACK_COMPONENTS_ALL for that)
+SET(CPACK_ALL)
+FOREACH(comp1 ${CPACK_COMPONENTS_USED})
+ SET(found)
+ FOREACH(comp2 ${CPACK_COMPONENTS_ALL})
+ IF(comp1 STREQUAL comp2)
+ SET(found 1)
+ BREAK()
+ ENDIF()
+ ENDFOREACH()
+ IF(found)
+ SET(CPACK_ALL ${CPACK_ALL} ${comp1})
+ ENDIF()
+ENDFOREACH()
+SET(CPACK_COMPONENTS_ALL ${CPACK_ALL})
+
+# Always install (hidden), includes Readme files
+SET(CPACK_COMPONENT_GROUP_ALWAYSINSTALL_HIDDEN 1)
+SET(CPACK_COMPONENT_README_GROUP "AlwaysInstall")
+SET(CPACK_COMPONENT_COMMON_GROUP "AlwaysInstall")
+
+# Feature MySQL Server
+SET(CPACK_COMPONENT_GROUP_MYSQLSERVER_DISPLAY_NAME "MariaDB Server")
+SET(CPACK_COMPONENT_GROUP_MYSQLSERVER_EXPANDED "1")
+SET(CPACK_COMPONENT_GROUP_MYSQLSERVER_DESCRIPTION "Install server")
+ # Subfeature "Server" (hidden)
+ SET(CPACK_COMPONENT_SERVER_GROUP "MySQLServer")
+ SET(CPACK_COMPONENT_SERVER_HIDDEN 1)
+ # Subfeature "Client"
+ SET(CPACK_COMPONENT_CLIENT_GROUP "MySQLServer")
+ SET(CPACK_COMPONENT_CLIENT_DISPLAY_NAME "Client Programs")
+ SET(CPACK_COMPONENT_CLIENT_DESCRIPTION
+ "Various helpful (commandline) tools including the mysql command line client" )
+ # Subfeature "Debug binaries"
+ SET(CPACK_COMPONENT_DEBUGBINARIES_GROUP "MySQLServer")
+ SET(CPACK_COMPONENT_DEBUGBINARIES_DISPLAY_NAME "Debug binaries")
+ SET(CPACK_COMPONENT_DEBUGBINARIES_DESCRIPTION
+ "Debug/trace versions of executables and libraries" )
+ #SET(CPACK_COMPONENT_DEBUGBINARIES_WIX_LEVEL 2)
+
+
+ #Subfeature "Data Files"
+ SET(CPACK_COMPONENT_DATAFILES_GROUP "MySQLServer")
+ SET(CPACK_COMPONENT_DATAFILES_DISPLAY_NAME "Server data files")
+ SET(CPACK_COMPONENT_DATAFILES_DESCRIPTION "Server data files" )
+ SET(CPACK_COMPONENT_DATAFILES_HIDDEN 1)
+
+
+#Feature "Devel"
+SET(CPACK_COMPONENT_GROUP_DEVEL_DISPLAY_NAME "Development Components")
+SET(CPACK_COMPONENT_GROUP_DEVEL_DESCRIPTION "Installs C/C++ header files and libraries")
+ #Subfeature "Development"
+ SET(CPACK_COMPONENT_DEVELOPMENT_GROUP "Devel")
+ SET(CPACK_COMPONENT_DEVELOPMENT_HIDDEN 1)
+
+ #Subfeature "Shared libraries"
+ SET(CPACK_COMPONENT_SHAREDLIBRARIES_GROUP "Devel")
+ SET(CPACK_COMPONENT_SHAREDLIBRARIES_DISPLAY_NAME "Client C API library (shared)")
+ SET(CPACK_COMPONENT_SHAREDLIBRARIES_DESCRIPTION "Installs shared client library")
+
+ #Subfeature "Embedded"
+ SET(CPACK_COMPONENT_EMBEDDED_GROUP "Devel")
+ SET(CPACK_COMPONENT_EMBEDDED_DISPLAY_NAME "Embedded server library")
+ SET(CPACK_COMPONENT_EMBEDDED_DESCRIPTION "Installs embedded server library")
+ SET(CPACK_COMPONENT_EMBEDDED_WIX_LEVEL 2)
+
+#Feature Debug Symbols
+SET(CPACK_COMPONENT_GROUP_DEBUGSYMBOLS_DISPLAY_NAME "Debug Symbols")
+SET(CPACK_COMPONENT_GROUP_DEBUGSYMBOLS_DESCRIPTION "Installs Debug Symbols")
+SET(CPACK_COMPONENT_DEBUGSYMBOLS_WIX_LEVEL 2)
+ SET(CPACK_COMPONENT_DEBUGINFO_GROUP "DebugSymbols")
+ SET(CPACK_COMPONENT_DEBUGINFO_HIDDEN 1)
+
+#Feature Documentation
+SET(CPACK_COMPONENT_DOCUMENTATION_DISPLAY_NAME "Documentation")
+SET(CPACK_COMPONENT_DOCUMENTATION_DESCRIPTION "Installs documentation")
+SET(CPACK_COMPONENT_DOCUMENTATION_WIX_LEVEL 2)
+
+#Feature tests
+SET(CPACK_COMPONENT_TEST_DISPLAY_NAME "Tests")
+SET(CPACK_COMPONENT_TEST_DESCRIPTION "Installs unittests (requires Perl to run)")
+SET(CPACK_COMPONENT_TEST_WIX_LEVEL 2)
+
+
+#Feature Misc (hidden, installs only if everything is installed)
+SET(CPACK_COMPONENT_GROUP_MISC_HIDDEN 1)
+SET(CPACK_COMPONENT_GROUP_MISC_WIX_LEVEL 100)
+ SET(CPACK_COMPONENT_INIFILES_GROUP "Misc")
+ SET(CPACK_COMPONENT_SERVER_SCRIPTS_GROUP "Misc")
+
+#Add Firewall exception for mysqld.exe
+SET(bin.mysqld.exe.FILE_EXTRA "
+ <FirewallException Id='firewallexception.mysqld.exe' Name='[ProductName]' Scope='any'
+ IgnoreFailure='yes' xmlns='http://schemas.microsoft.com/wix/FirewallExtension'
+ />
+ "
+)
+
diff --git a/win/packaging/ca/CustomAction.cpp b/win/packaging/ca/CustomAction.cpp
index 67a17c2..17bfca1 100644
--- a/win/packaging/ca/CustomAction.cpp
+++ b/win/packaging/ca/CustomAction.cpp
@@ -104,48 +104,48 @@ static void EscapeCommandLine(const wchar_t *in, wchar_t *out, size_t buflen)
}
pos= 0;
- for(int i = 0 ; ; i++)
- {
- size_t n_backslashes = 0;
- wchar_t c;
- while (in[i] == L'\\')
- {
- i++;
- n_backslashes++;
- }
-
- c= in[i];
- if (c == 0)
- {
- /*
- Escape all backslashes, but let the terminating double quotation mark
- that caller adds be interpreted as a metacharacter.
- */
- for(size_t j= 0; j < 2*n_backslashes;j++)
- {
- out[pos++]=L'\\';
- }
- break;
- }
- else if (c == L'"')
- {
- /*
- Escape all backslashes and the following double quotation mark.
- */
- for(size_t j= 0; j < 2*n_backslashes + 1; j++)
- {
- out[pos++]=L'\\';
- }
- out[pos++]= L'"';
- }
- else
- {
- /* Backslashes aren't special here. */
- for (size_t j=0; j < n_backslashes; j++)
- out[pos++] = L'\\';
-
- out[pos++]= c;
- }
+ for(int i = 0 ; ; i++)
+ {
+ size_t n_backslashes = 0;
+ wchar_t c;
+ while (in[i] == L'\\')
+ {
+ i++;
+ n_backslashes++;
+ }
+
+ c= in[i];
+ if (c == 0)
+ {
+ /*
+ Escape all backslashes, but let the terminating double quotation mark
+ that caller adds be interpreted as a metacharacter.
+ */
+ for(size_t j= 0; j < 2*n_backslashes;j++)
+ {
+ out[pos++]=L'\\';
+ }
+ break;
+ }
+ else if (c == L'"')
+ {
+ /*
+ Escape all backslashes and the following double quotation mark.
+ */
+ for(size_t j= 0; j < 2*n_backslashes + 1; j++)
+ {
+ out[pos++]=L'\\';
+ }
+ out[pos++]= L'"';
+ }
+ else
+ {
+ /* Backslashes aren't special here. */
+ for (size_t j=0; j < n_backslashes; j++)
+ out[pos++] = L'\\';
+
+ out[pos++]= c;
+ }
}
out[pos++]= 0;
}
diff --git a/win/packaging/custom_ui.wxs b/win/packaging/custom_ui.wxs
index 8a87fb4..70fa3ba 100644
--- a/win/packaging/custom_ui.wxs
+++ b/win/packaging/custom_ui.wxs
@@ -1,183 +1,183 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <Fragment>
- <Property Id="PortTemplate" Value="####" />
- <Property Id="PORT" Value="3306"></Property>
- <Property Id="MSIRESTARTMANAGERCONTROL" Value="Disable"/>
- <Property Id="CREATEDBINSTANCE"><![CDATA[&DBInstance=3 AND NOT !DBInstance=3]]></Property>
- <UI>
- <Dialog Id="DatabaseCreationDlg" Width="370" Height="270" Title="[ProductName] Setup" NoMinimize="yes">
- <Control Id="ServiceNameLabel" Type="Text" X="20" Y="73" Width="70" Height="15" TabSkip="no" Text="Service Name:" />
- <Control Id="ServiceName" Type="Edit" X="90" Y="73" Width="120" Height="15" Property="SERVICENAME" Text="{20}" />
-
- <Control Id="RootPasswordLabel" Type="Text" X="20" Y="90" Width="120" Height="15" TabSkip="no" Text="&Root password:" />
- <Control Id="RootPassword" Type="Edit" X="20" Y="105" Width="120" Height="18" Property="ROOT_PASSWORD" Password="yes" Text="{20}" />
-
- <Control Id="RootPasswordConfirmLabel" Type="Text" X="150" Y="90" Width="150" Height="15" TabSkip="no" Text="&Confirm Root password:" />
- <Control Id="RootPasswordConfirm" Type="Edit" X="150" Y="105" Width="120" Height="18" Property="ROOT_PASSWORD_CONFIRM" Password="yes" Text="{20}" />
- <Control Id="BannerLine0" Type="Line" X="0" Y="128" Width="370" Height="0" />
-
- <Control Id="PortLabel" Type="Text" X="20" Y="137" Width="40" Height="15" TabSkip="no" Text="TCP port:" />
-
- <Control Id="Port" Type="MaskedEdit" X="60" Y="136" Width="30" Height="15" Property="PORT" Text="[PortTemplate]"/>
- <!--<Control Id="FirewallExceptionCheckBox" Type="CheckBox" X="150" Y="136" Height="15" Property="FIREWALL_EXCEPTION" Width="200" CheckBoxValue="1"
- Text="Create Firewall exception for this port"/>-->
-
- <Control Id="BannerLine2" Type="Line" X="0" Y="155" Width="370" Height="0" />
-
- <Control Id="FolderLabel" Type="Text" X="20" Y="181" Width="100" Height="15" TabSkip="no" Text="Database location:" />
- <Control Id="Folder" Type="PathEdit" X="20" Y="204" Width="200" Height="18" Property="DATABASELOCATION" Indirect="no" />
-
- <!-- Navigation buttons-->
- <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&Back">
- <Publish Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
- </Control>
- <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="&Next">
- <!--
- <Publish Event="ValidateProductID" Value="0">1</Publish>
- <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg">CostingComplete = 1</Publish>
- -->
- <!--<Publish Event="NewDialog" Value="SetupTypeDlg">ProductID</Publish>-->
- </Control>
- <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="Cancel">
- <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
- </Control>
- <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="WixUI_Bmp_Banner" />
- <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes">
- <Text>Create default [ProductName] instance</Text>
- </Control>
- <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
- <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
- <Text>{\WixUI_Font_Title}Default instance properties</Text>
- </Control>
- <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
- </Dialog>
-
- <Dialog Id="ConfirmDataCleanupDlg" Width="370" Height="270" Title="[ProductName] Setup" NoMinimize="yes">
- <Control Id="ServiceRemoveText" Type="Text" X="20" Y="73" Width="300" Height="15" TabSkip="no">
- <Text>Service '[SERVICENAME]' will be removed</Text>
- </Control>
- <Control Id="CleanupDataCheckBox" Type="CheckBox" X="20" Y="100" Height="15" Property="CLEANUP_DATA" Width="15" CheckBoxValue="0"/>
- <Control Id="RemoveDataText" Type="Text" X="37" Y="101" Width="300" Height="200" TabSkip="no">
- <Text>Remove default database directory '[DATABASELOCATION]'</Text>
- </Control>
-
- <!-- Navigation buttons-->
- <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&Back">
- <Publish Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
- </Control>
- <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="&Next">
- <Publish Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
- </Control>
- <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="Cancel">
- <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
- </Control>
- <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="WixUI_Bmp_Banner" />
- <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes">
- <Text>Remove default [ProductName] database</Text>
- </Control>
- <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
- <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
- <Text>{\WixUI_Font_Title}Default instance properties</Text>
- </Control>
- <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
- </Dialog>
- </UI>
- <UI Id="MyWixUI_Mondo">
- <UIRef Id="WixUI_FeatureTree" />
- <UIRef Id="WixUI_ErrorProgressText" />
- <DialogRef Id="DatabaseCreationDlg" />
- <Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="DatabaseCreationDlg" Order="999"><![CDATA[&DBInstance=3 AND NOT !DBInstance=3]]></Publish>
- <Publish Dialog="DatabaseCreationDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="3">1</Publish>
- <Publish Dialog="DatabaseCreationDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="3">1</Publish>
- <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="DatabaseCreationDlg" Order="3" ><![CDATA[&DBInstance=3 AND NOT !DBInstance=3]]></Publish>
- <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="ConfirmDataCleanupDlg" Order="3" ><![CDATA[(&DBInstance=2) AND (!DBInstance=3)]]></Publish>
- <Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="ConfirmDataCleanupDlg" Order="999"><![CDATA[(&DBInstance=2) AND (!DBInstance=3)]]></Publish>
- <Publish Dialog="ConfirmDataCleanupDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg">WixUI_InstallMode = "Change"</Publish>
- <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="ConfirmDataCleanupDlg" Order="999">!DBInstance=3</Publish>
- <Publish Dialog="ConfirmDataCleanupDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg">WixUI_InstallMode = "Remove"</Publish>
- </UI>
-
- <DirectoryRef Id='TARGETDIR'>
- <Directory Id="CommonAppDataFolder">
- <Directory Id="DatabasesRoot" Name="MariaDB">
- <Directory Id="DATABASELOCATION" Name="MariaDB Server 5.1">
- </Directory>
- </Directory>
- </Directory>
- </DirectoryRef>
-
- <Feature Id='DBInstance'
- Title='Database instance'
- Description='Install database instance'
- ConfigurableDirectory='DATABASELOCATION'
- AllowAdvertise='no'
- Level='1'>
- <Component Id="C.datadir" Guid="*" Directory="DATABASELOCATION">
- <RegistryValue Root='HKLM'
- Key='SOFTWARE\[Manufacturer]\[ProductName]'
- Name='DatabaseLocation' Value='[DATABASELOCATION]' Type='string' KeyPath='yes'/>
- <CreateFolder />
- </Component>
- <Component Id="C.service" Guid="*" Directory="DATABASELOCATION">
- <Condition>SERVICENAME</Condition>
- <RegistryValue Root='HKLM'
- Key='SOFTWARE\[Manufacturer]\[ProductName]'
- Name='ServiceName' Value='[SERVICENAME]' Type='string' KeyPath='yes'/>
- <ServiceControl Id='DBInstanceServiceStop' Name='[SERVICENAME]' Stop='uninstall' Wait='yes'></ServiceControl>
- <ServiceControl Id='DBInstanceServiceStart' Name='[SERVICENAME]' Start='install' Wait='no'></ServiceControl>
- <ServiceControl Id='DBInstanceServiceRemove' Name='[SERVICENAME]' Remove='uninstall' Wait='yes'></ServiceControl>
- </Component>
- </Feature>
-
- <CustomAction Id="QtExecDeferredExampleWithProperty_Cmd" Property="QtExecDeferredExampleWithProperty"
- Value=""[#F.bin.mysql_install_db.exe]" "--service=[SERVICENAME]" "--password=[ROOT_PASSWORD]" "--datadir=[DATABASELOCATION]""
- Execute="immediate"/>
- <CustomAction Id="QtExecDeferredExampleWithProperty" BinaryKey="WixCA" DllEntry="CAQuietExec"
- Execute="deferred" Return="check" Impersonate="no"/>
-
- <UI>
- <ProgressText Action="QtExecDeferredExampleWithProperty">Running mysql_install_db.exe</ProgressText>
- </UI>
-
- <!-- Use Wix toolset "remember property" pattern to store properties between major upgrades etc -->
- <InstallExecuteSequence>
- <Custom Action="QtExecDeferredExampleWithProperty_Cmd" After="CostFinalize"><![CDATA[&DBInstance=3 AND NOT !DBInstance=3]]></Custom>
- <Custom Action="QtExecDeferredExampleWithProperty" After="InstallFiles"><![CDATA[&DBInstance=3 AND NOT !DBInstance=3]]></Custom>
- </InstallExecuteSequence>
-
- <Property Id='SERVICENAME'>
- <RegistrySearch Id='ServiceNameProperty' Root='HKLM'
- Key='SOFTWARE\[Manufacturer]\[ProductName]'
- Name='ServiceName' Type='raw' />
- </Property>
- <SetProperty After='AppSearch' Id="SERVICENAME" Value="MariaDB_51"><![CDATA[NOT SERVICENAME]]></SetProperty>
- <Property Id="DATABASELOCATION">
- <RegistrySearch Id='DatabaseLocationProperty' Root='HKLM'
- Key='SOFTWARE\[Manufacturer]\[ProductName]'
- Name='´DatabaseLocation' Type='raw' />
- </Property>
- <SetProperty After='AppSearch' Id="DATABASELOCATION" Value="[CommonAppDataFolder]\MariaDB\[ProductName]"><![CDATA[NOT DATABASELOCATION]]></SetProperty>
- <CustomAction Id='SaveCmdLineValue_SERVICENAME' Property='CMDLINE_SERVICENAME'
- Value='[SERVICENAME]' Execute='firstSequence' />
- <CustomAction Id='SetFromCmdLineValue_SERVICENAME' Property='SERVICENAME' Value='[CMDLINE_SERVICENAME]' Execute='firstSequence' />
- <CustomAction Id='SaveCmdLineValue_DATABASELOCATION' Property='CMDLINE_DATABASELOCATION'
- Value='[DATABASELOCATION]' Execute='firstSequence' />
- <CustomAction Id='SetFromCmdLineValue_DATABASELOCATION' Property='DATABASELOCATION' Value='[CMDLINE_DATABASELOCATION]' Execute='firstSequence' />
-
- <InstallUISequence>
- <Custom Action='SaveCmdLineValue_SERVICENAME' Before='AppSearch' />
- <Custom Action='SetFromCmdLineValue_SERVICENAME' After='AppSearch'>CMDLINE_SERVICENAME</Custom>
- <Custom Action='SaveCmdLineValue_DATABASELOCATION' Before='AppSearch' />
- <Custom Action='SetFromCmdLineValue_DATABASELOCATION' After='AppSearch'>CMDLINE_DATABASELOCATION</Custom>
- </InstallUISequence>
- <InstallExecuteSequence>
- <Custom Action='SaveCmdLineValue_SERVICENAME' Before='AppSearch' />
- <Custom Action='SetFromCmdLineValue_SERVICENAME' After='AppSearch'>CMDLINE_SERVICENAME</Custom>
- <Custom Action='SaveCmdLineValue_DATABASELOCATION' Before='AppSearch' />
- <Custom Action='SetFromCmdLineValue_DATABASELOCATION' After='AppSearch'>CMDLINE_DATABASELOCATION</Custom>
- </InstallExecuteSequence>
- </Fragment>
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <Fragment>
+ <Property Id="PortTemplate" Value="####" />
+ <Property Id="PORT" Value="3306"></Property>
+ <Property Id="MSIRESTARTMANAGERCONTROL" Value="Disable"/>
+ <Property Id="CREATEDBINSTANCE"><![CDATA[&DBInstance=3 AND NOT !DBInstance=3]]></Property>
+ <UI>
+ <Dialog Id="DatabaseCreationDlg" Width="370" Height="270" Title="[ProductName] Setup" NoMinimize="yes">
+ <Control Id="ServiceNameLabel" Type="Text" X="20" Y="73" Width="70" Height="15" TabSkip="no" Text="Service Name:" />
+ <Control Id="ServiceName" Type="Edit" X="90" Y="73" Width="120" Height="15" Property="SERVICENAME" Text="{20}" />
+
+ <Control Id="RootPasswordLabel" Type="Text" X="20" Y="90" Width="120" Height="15" TabSkip="no" Text="&Root password:" />
+ <Control Id="RootPassword" Type="Edit" X="20" Y="105" Width="120" Height="18" Property="ROOT_PASSWORD" Password="yes" Text="{20}" />
+
+ <Control Id="RootPasswordConfirmLabel" Type="Text" X="150" Y="90" Width="150" Height="15" TabSkip="no" Text="&Confirm Root password:" />
+ <Control Id="RootPasswordConfirm" Type="Edit" X="150" Y="105" Width="120" Height="18" Property="ROOT_PASSWORD_CONFIRM" Password="yes" Text="{20}" />
+ <Control Id="BannerLine0" Type="Line" X="0" Y="128" Width="370" Height="0" />
+
+ <Control Id="PortLabel" Type="Text" X="20" Y="137" Width="40" Height="15" TabSkip="no" Text="TCP port:" />
+
+ <Control Id="Port" Type="MaskedEdit" X="60" Y="136" Width="30" Height="15" Property="PORT" Text="[PortTemplate]"/>
+ <!--<Control Id="FirewallExceptionCheckBox" Type="CheckBox" X="150" Y="136" Height="15" Property="FIREWALL_EXCEPTION" Width="200" CheckBoxValue="1"
+ Text="Create Firewall exception for this port"/>-->
+
+ <Control Id="BannerLine2" Type="Line" X="0" Y="155" Width="370" Height="0" />
+
+ <Control Id="FolderLabel" Type="Text" X="20" Y="181" Width="100" Height="15" TabSkip="no" Text="Database location:" />
+ <Control Id="Folder" Type="PathEdit" X="20" Y="204" Width="200" Height="18" Property="DATABASELOCATION" Indirect="no" />
+
+ <!-- Navigation buttons-->
+ <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&Back">
+ <Publish Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
+ </Control>
+ <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="&Next">
+ <!--
+ <Publish Event="ValidateProductID" Value="0">1</Publish>
+ <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg">CostingComplete = 1</Publish>
+ -->
+ <!--<Publish Event="NewDialog" Value="SetupTypeDlg">ProductID</Publish>-->
+ </Control>
+ <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="Cancel">
+ <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+ </Control>
+ <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="WixUI_Bmp_Banner" />
+ <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes">
+ <Text>Create default [ProductName] instance</Text>
+ </Control>
+ <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+ <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
+ <Text>{\WixUI_Font_Title}Default instance properties</Text>
+ </Control>
+ <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
+ </Dialog>
+
+ <Dialog Id="ConfirmDataCleanupDlg" Width="370" Height="270" Title="[ProductName] Setup" NoMinimize="yes">
+ <Control Id="ServiceRemoveText" Type="Text" X="20" Y="73" Width="300" Height="15" TabSkip="no">
+ <Text>Service '[SERVICENAME]' will be removed</Text>
+ </Control>
+ <Control Id="CleanupDataCheckBox" Type="CheckBox" X="20" Y="100" Height="15" Property="CLEANUP_DATA" Width="15" CheckBoxValue="0"/>
+ <Control Id="RemoveDataText" Type="Text" X="37" Y="101" Width="300" Height="200" TabSkip="no">
+ <Text>Remove default database directory '[DATABASELOCATION]'</Text>
+ </Control>
+
+ <!-- Navigation buttons-->
+ <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&Back">
+ <Publish Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
+ </Control>
+ <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="&Next">
+ <Publish Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+ </Control>
+ <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="Cancel">
+ <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+ </Control>
+ <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="WixUI_Bmp_Banner" />
+ <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes">
+ <Text>Remove default [ProductName] database</Text>
+ </Control>
+ <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+ <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
+ <Text>{\WixUI_Font_Title}Default instance properties</Text>
+ </Control>
+ <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
+ </Dialog>
+ </UI>
+ <UI Id="MyWixUI_Mondo">
+ <UIRef Id="WixUI_FeatureTree" />
+ <UIRef Id="WixUI_ErrorProgressText" />
+ <DialogRef Id="DatabaseCreationDlg" />
+ <Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="DatabaseCreationDlg" Order="999"><![CDATA[&DBInstance=3 AND NOT !DBInstance=3]]></Publish>
+ <Publish Dialog="DatabaseCreationDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="3">1</Publish>
+ <Publish Dialog="DatabaseCreationDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="3">1</Publish>
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="DatabaseCreationDlg" Order="3" ><![CDATA[&DBInstance=3 AND NOT !DBInstance=3]]></Publish>
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="ConfirmDataCleanupDlg" Order="3" ><![CDATA[(&DBInstance=2) AND (!DBInstance=3)]]></Publish>
+ <Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="ConfirmDataCleanupDlg" Order="999"><![CDATA[(&DBInstance=2) AND (!DBInstance=3)]]></Publish>
+ <Publish Dialog="ConfirmDataCleanupDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg">WixUI_InstallMode = "Change"</Publish>
+ <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="ConfirmDataCleanupDlg" Order="999">!DBInstance=3</Publish>
+ <Publish Dialog="ConfirmDataCleanupDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg">WixUI_InstallMode = "Remove"</Publish>
+ </UI>
+
+ <DirectoryRef Id='TARGETDIR'>
+ <Directory Id="CommonAppDataFolder">
+ <Directory Id="DatabasesRoot" Name="MariaDB">
+ <Directory Id="DATABASELOCATION" Name="MariaDB Server 5.1">
+ </Directory>
+ </Directory>
+ </Directory>
+ </DirectoryRef>
+
+ <Feature Id='DBInstance'
+ Title='Database instance'
+ Description='Install database instance'
+ ConfigurableDirectory='DATABASELOCATION'
+ AllowAdvertise='no'
+ Level='1'>
+ <Component Id="C.datadir" Guid="*" Directory="DATABASELOCATION">
+ <RegistryValue Root='HKLM'
+ Key='SOFTWARE\[Manufacturer]\[ProductName]'
+ Name='DatabaseLocation' Value='[DATABASELOCATION]' Type='string' KeyPath='yes'/>
+ <CreateFolder />
+ </Component>
+ <Component Id="C.service" Guid="*" Directory="DATABASELOCATION">
+ <Condition>SERVICENAME</Condition>
+ <RegistryValue Root='HKLM'
+ Key='SOFTWARE\[Manufacturer]\[ProductName]'
+ Name='ServiceName' Value='[SERVICENAME]' Type='string' KeyPath='yes'/>
+ <ServiceControl Id='DBInstanceServiceStop' Name='[SERVICENAME]' Stop='uninstall' Wait='yes'></ServiceControl>
+ <ServiceControl Id='DBInstanceServiceStart' Name='[SERVICENAME]' Start='install' Wait='no'></ServiceControl>
+ <ServiceControl Id='DBInstanceServiceRemove' Name='[SERVICENAME]' Remove='uninstall' Wait='yes'></ServiceControl>
+ </Component>
+ </Feature>
+
+ <CustomAction Id="QtExecDeferredExampleWithProperty_Cmd" Property="QtExecDeferredExampleWithProperty"
+ Value=""[#F.bin.mysql_install_db.exe]" "--service=[SERVICENAME]" "--password=[ROOT_PASSWORD]" "--datadir=[DATABASELOCATION]""
+ Execute="immediate"/>
+ <CustomAction Id="QtExecDeferredExampleWithProperty" BinaryKey="WixCA" DllEntry="CAQuietExec"
+ Execute="deferred" Return="check" Impersonate="no"/>
+
+ <UI>
+ <ProgressText Action="QtExecDeferredExampleWithProperty">Running mysql_install_db.exe</ProgressText>
+ </UI>
+
+ <!-- Use Wix toolset "remember property" pattern to store properties between major upgrades etc -->
+ <InstallExecuteSequence>
+ <Custom Action="QtExecDeferredExampleWithProperty_Cmd" After="CostFinalize"><![CDATA[&DBInstance=3 AND NOT !DBInstance=3]]></Custom>
+ <Custom Action="QtExecDeferredExampleWithProperty" After="InstallFiles"><![CDATA[&DBInstance=3 AND NOT !DBInstance=3]]></Custom>
+ </InstallExecuteSequence>
+
+ <Property Id='SERVICENAME'>
+ <RegistrySearch Id='ServiceNameProperty' Root='HKLM'
+ Key='SOFTWARE\[Manufacturer]\[ProductName]'
+ Name='ServiceName' Type='raw' />
+ </Property>
+ <SetProperty After='AppSearch' Id="SERVICENAME" Value="MariaDB_51"><![CDATA[NOT SERVICENAME]]></SetProperty>
+ <Property Id="DATABASELOCATION">
+ <RegistrySearch Id='DatabaseLocationProperty' Root='HKLM'
+ Key='SOFTWARE\[Manufacturer]\[ProductName]'
+ Name='´DatabaseLocation' Type='raw' />
+ </Property>
+ <SetProperty After='AppSearch' Id="DATABASELOCATION" Value="[CommonAppDataFolder]\MariaDB\[ProductName]"><![CDATA[NOT DATABASELOCATION]]></SetProperty>
+ <CustomAction Id='SaveCmdLineValue_SERVICENAME' Property='CMDLINE_SERVICENAME'
+ Value='[SERVICENAME]' Execute='firstSequence' />
+ <CustomAction Id='SetFromCmdLineValue_SERVICENAME' Property='SERVICENAME' Value='[CMDLINE_SERVICENAME]' Execute='firstSequence' />
+ <CustomAction Id='SaveCmdLineValue_DATABASELOCATION' Property='CMDLINE_DATABASELOCATION'
+ Value='[DATABASELOCATION]' Execute='firstSequence' />
+ <CustomAction Id='SetFromCmdLineValue_DATABASELOCATION' Property='DATABASELOCATION' Value='[CMDLINE_DATABASELOCATION]' Execute='firstSequence' />
+
+ <InstallUISequence>
+ <Custom Action='SaveCmdLineValue_SERVICENAME' Before='AppSearch' />
+ <Custom Action='SetFromCmdLineValue_SERVICENAME' After='AppSearch'>CMDLINE_SERVICENAME</Custom>
+ <Custom Action='SaveCmdLineValue_DATABASELOCATION' Before='AppSearch' />
+ <Custom Action='SetFromCmdLineValue_DATABASELOCATION' After='AppSearch'>CMDLINE_DATABASELOCATION</Custom>
+ </InstallUISequence>
+ <InstallExecuteSequence>
+ <Custom Action='SaveCmdLineValue_SERVICENAME' Before='AppSearch' />
+ <Custom Action='SetFromCmdLineValue_SERVICENAME' After='AppSearch'>CMDLINE_SERVICENAME</Custom>
+ <Custom Action='SaveCmdLineValue_DATABASELOCATION' Before='AppSearch' />
+ <Custom Action='SetFromCmdLineValue_DATABASELOCATION' After='AppSearch'>CMDLINE_DATABASELOCATION</Custom>
+ </InstallExecuteSequence>
+ </Fragment>
</Wix>
\ No newline at end of file
diff --git a/win/packaging/extra.wxs.in b/win/packaging/extra.wxs.in
index da4ac6a..48d15cb 100644
--- a/win/packaging/extra.wxs.in
+++ b/win/packaging/extra.wxs.in
@@ -1,913 +1,913 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
- <Fragment>
- <!--
- Check, if upgrade wizard was built
- It currently requires MFC, which is not in SDK
- neither in express edítions of VS.
- -->
- <?ifndef HaveUpgradeWizard ?>
- <?define HaveUpgradeWizard="1"?>
- <?endif?>
-
- <!-- If Innodb is compiled in, enable "optimize for transactions" checkbox -->
- <?ifndef HaveInnodb ?>
- <?define HaveInnodb="0"?>
- <?endif?>
-
- <Property Id="PortTemplate" Value="#####" />
- <?if $(var.HaveInnodb) = "1" ?>
- <Property Id="BufferPoolSizeTemplate" Value="#######" />
- <?endif?>
- <!--
- Installation parameters that can be passed via msiexec command line
- For "booleans" (like skip networking), just providing any value means property set to "yes".
- -->
- <!-- instalation directory (default under program files)-->
- <!--- (defined elsewhere) <Property Id="INSTALLDIR" Secure="yes" /> -->
-
- <!-- Database data directory (default under INSTALLDIR\data) -->
- <!--- (defined elsewhere) <Property Id="DATADIR" Secure="yes"/> -->
-
- <!-- Service name of database instanced (default MySQL in GUI, nothing with command line) -->
- <!-- (defined elsewhere) <Property Id="SERVICENAME" Secure="yes" /> -->
-
- <!-- Root password -->
- <Property Id="PASSWORD" Hidden="yes" Secure="yes" />
- <Property Id="ESCAPEDPASSWORD" Hidden="yes" Secure="yes" />
- <!-- Database port -->
- <Property Id="PORT" Value="3306" Secure="yes"/>
- <!-- Whether to allow remote access for root user -->
- <Property Id="ALLOWREMOTEROOTACCESS" Secure="yes" />
- <!-- Skip networking. This will switch configuration to use named pipe-->
- <Property Id="SKIPNETWORKING" Secure="yes"/>
- <!-- Whether to keep default (unauthenticated) user. Default is no-->
- <Property Id="DEFAULTUSER" Secure="yes"/>
- <!-- Set server character set to UTF8 -->
- <Property Id="UTF8" Secure="yes"/>
- <!-- Whether to data on uninstall (default yes, after asking user consent) -->
- <Property Id="CLEANUPDATA" Secure="yes" Value="1"/>
- <!-- Force per machine installation -->
- <Property Id="ALLUSERS" Secure="yes" Value="1"/>
- <!-- Disable advertised shortcuts weirdness -->
- <Property Id="DISABLEADVTSHORTCUTS" Secure="yes" Value="1"/>
-
- <!-- Activate feedback plugin-->
- <Property Id="FEEDBACK" Secure="yes"/>
-
- <?if $(var.HaveInnodb) = "1" ?>
- <!-- Quick configuration : set default storage engine to innodb, use strict sql_mode -->
- <Property Id="STDCONFIG" Secure="yes" Value="1"/>
- <?endif?>
- <!-- Innodb Buffer pool size in MB-->
- <Property Id="BUFFERPOOLSIZE" Secure="yes"/>
-
-
- <CustomAction Id="LaunchUrl" BinaryKey="WixCA" DllEntry="WixShellExec" Execute="immediate" Return="check" Impersonate="yes" />
-
-
- <!--
- User interface dialogs
- -->
- <WixVariable Id='WixUIBannerBmp' Value='@CMAKE_CURRENT_SOURCE_DIR@\WixUIBannerBmp.jpg' />
- <WixVariable Id='WixUIDialogBmp' Value='@CMAKE_CURRENT_SOURCE_DIR@\WixUIDialogBmp.jpg' />
- <UI>
-
- <!-- Dialog on uninstall of the database -->
- <Dialog Id="ConfirmDataCleanupDlg" Width="370" Height="270" Title="[ProductName] Setup" NoMinimize="yes">
-
- <!--<Control Id="CleanupDataCheckBox" Type="CheckBox" X="20" Y="100" Height="30" Property="CLEANUPDATA" Width="300" CheckBoxValue="1"
- Text="{\Font1}Remove default database directory 
'[DATADIR]'"/>
- -->
- <Control Id="RemoveDatadirButton" Type="PushButton" X="40" Y="65" Width="80" Height="18"
- Text="Remove data">
- <Publish Property="CLEANUPDATA" Value="1">1</Publish>
- <Publish Event="NewDialog" Value="VerifyReadyDlg">WixUI_InstallMode</Publish>
- <Publish Event="EndDialog" Value="Return">NOT WixUI_InstallMode</Publish>
-
- </Control>
- <Control Id="RemoveDatadirText" Type="Text" X="60" Y="85" Width="280" Height="20">
- <Text>Remove default database directory [DATADIR]. Ensures proper cleanup on uninstall.</Text>
- </Control>
-
- <Control Id="KeepDatadirButton" Type="PushButton" X="40" Y="118" Width="80" Height="18"
- Text="Keep data">
- <Publish Property="CLEANUPDATA">1</Publish>
- <Publish Event="NewDialog" Value="VerifyReadyDlg">WixUI_InstallMode</Publish>
- <Publish Event="EndDialog" Value="Return">NOT WixUI_InstallMode</Publish>
- </Control>
- <Control Id="KeepDataDirText" Type="Text" X="60" Y="138" Width="280" Height="70" >
- <Text>Do not remove [DATADIR]. Choose this option if you intend to use data in the future</Text>
- </Control>
-
-
- <!-- Navigation buttons-->
- <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&Back">
- <Publish Event="NewDialog" Value="CustomizeDlg">WixUI_InstallMode="Change"</Publish>
- <Condition Action="disable">NOT WixUI_InstallMode</Condition>
- </Control>
- <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Disabled="yes" Text="&Next">
- <Publish Event="NewDialog" Value="VerifyReadyDlg">WixUI_InstallMode</Publish>
- <Publish Event="EndDialog" Value="Return">NOT WixUI_InstallMode</Publish>
- </Control>
- <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="Cancel">
- <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
- </Control>
- <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="WixUI_Bmp_Banner" />
- <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes">
- <Text>Remove default [ProductName] database</Text>
- </Control>
- <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
- <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
- <Text>{\WixUI_Font_Title}Default instance properties</Text>
- </Control>
- <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
- </Dialog>
-
- <!-- Dialog new or upgrade instance -->
-
- <Property Id="CreateOrUpgradeChoice" Value="Create"/>
-
- <Dialog Id="NewOrUpgradeInstanceDlg" Width="370" Height="270" Title="[ProductName] Setup" NoMinimize="yes">
- <Control Id="Text" Type="Text" X="40" Y="65" Width="270" Height="30">
- <Text>Setup found existing database instances that can be upgraded to [ProductName].You can create a new instance and/or upgrade existing one.
- </Text>
- </Control>
-
- <Control Id="CreateOrUpgradeButton"
- Type="RadioButtonGroup" X="40" Y="100" Width="300" Height="70"
- Property="CreateOrUpgradeChoice" Text="Specify what to do">
- <RadioButtonGroup Property="CreateOrUpgradeChoice">
- <RadioButton Value="Create" X="0" Y="0" Width="300" Height="25"
- Text="{\Font1}Create new database instance."/>
- <RadioButton Value="Upgrade" X="0" Y="30" Width="300" Height="25"
- Text="{\Font1}Do not create a new database. Optionally upgrade existing instances." />
- </RadioButtonGroup>
- </Control>
-
- <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&Back">
- <Publish Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
- </Control>
- <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="&Next">
- <Publish Event="Remove" Value="DBInstance">CreateOrUpgradeChoice = "Upgrade" </Publish>
- <Publish Event="AddLocal" Value="DBInstance">CreateOrUpgradeChoice = "Create"</Publish>
- <Publish Property="WIXUI_EXITDIALOGOPTIONALCHECKBOX" Value="[NonExistentProperty]">CreateOrUpgradeChoice = "Create"</Publish>
- <Publish Property="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="[NonExistentProperty]">CreateOrUpgradeChoice = "Create"</Publish>
- <Publish Property="WIXUI_EXITDIALOGOPTIONALCHECKBOX" Value="1">CreateOrUpgradeChoice = "Upgrade"</Publish>
- <Publish Event="NewDialog" Value="CustomizeDlg">1</Publish>
- </Control>
- <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="Cancel">
- <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
- </Control>
- <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="WixUI_Bmp_Banner" />
- <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes">
- <Text>Create or upgrade database instance</Text>
- </Control>
- <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
- <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
- <Text>{\WixUI_Font_Title}[ProductName] setup</Text>
- </Control>
- <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
- </Dialog>
-
- <!-- Feedback dialog -->
- <Dialog Id="Feedback" Width="370" Height="270" Title="[ProductName] Setup" NoMinimize="yes">
-
- <Control Id="CheckBoxFeedback" Type="CheckBox" X="8" Y="61" Width="360" Height="12" Property="FEEDBACK" CheckBoxValue="1" TabSkip="no">
- <Text>{\Font1}Enable the Feedback plugin and submit anonymous usage information</Text>
- </Control>
-
- <Control Id="Text" Type="Text" X="23" Y="82" Width="290" Height="55">
- <Text>Monty Program has created a Feedback plugin for MariaDB which, if enabled, collects basic anonymous statistical information. This information is used by the developers to improve MariaDB. Enabling this plugin is an easy way to help with MariaDB development. Collected statistics, and more information on the plugin, can be viewed at http://mariadb.org/feedback_plugin </Text>
- </Control>
-
- <Control Id="MoreInfo" Type="PushButton" X="23" Y="140" Width="56" Height="17" Text="More Info" ToolTip="http://mariadb.org/feedback_plugin" >
- <Publish Property="WixShellExecTarget" Value="http://mariadb.org/feedback_plugin" Order="1">1</Publish>
- <Publish Event="DoAction" Value="LaunchUrl" Order="2">1</Publish>
- </Control>
-
-
- <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&Back">
- <Publish Event="NewDialog" Value="ServicePortDlg">1</Publish>
- </Control>
- <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="&Next">
- <Publish Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
- </Control>
- <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="Cancel">
- <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
- </Control>
- <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="WixUI_Bmp_Banner" />
- <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes">
- <Text>Submit usage information</Text>
- </Control>
- <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
- <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
- <Text>{\WixUI_Font_Title}[ProductName] setup</Text>
- </Control>
- <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
- </Dialog>
-
- <!-- Error popup dialog -->
- <Dialog Id="WarningDlg" Width="320" Height="85" Title="[ProductName] Setup" NoMinimize="yes">
- <Control Id="Icon" Type="Icon" X="15" Y="15" Width="24" Height="24"
- ToolTip="Information icon" FixedSize="yes" IconSize="32" Text="WixUI_Ico_Info" />
- <Control Id="Ok" Type="PushButton" X="132" Y="57" Width="56" Height="17"
- Default="yes" Cancel="yes" Text="OK">
- <Publish Property="WarningText">1</Publish>
- <Publish Event="EndDialog" Value="Return">1</Publish>
- </Control>
- <Control Id="Text" Type="Text" X="48" Y="15" Width="260" Height="30">
- <Text>[WarningText]</Text>
- </Control>
- </Dialog>
-
-
- <Property Id="ModifyRootPassword" Value="1"/>
- <TextStyle Id="Font1" FaceName="Tahoma" Size="8" Red="0" Green="0" Blue="0" Bold="yes" />
-
- <!-- Root password plus default user dialog -->
- <Dialog Id="UserSettingsDlg" X="50" Y="50" Width="370" Height="270" Title="User settings">
- <Control Id="EditRootPassword" Type="Edit" X="104" Y="82" Width="91" Height="15" Property="PASSWORD" Password="yes" TabSkip="no">
- <Text>{100}</Text>
- <Condition Action="enable">ModifyRootPassword</Condition>
- <Condition Action="disable">NOT ModifyRootPassword</Condition>
- </Control>
- <Control Id="EditRootPasswordConfirm" Type="Edit" X="104" Y="103" Width="91" Height="15" Property="RootPasswordConfirm" Password="yes" TabSkip="no">
- <Text>{100}</Text>
- <Condition Action="enable">ModifyRootPassword</Condition>
- <Condition Action="disable">NOT ModifyRootPassword</Condition>
- </Control>
-
- <Control Id="CheckBoxModifyRootPassword" Type="CheckBox" X="8" Y="62" Width="222" Height="18" Property="ModifyRootPassword" CheckBoxValue="1" TabSkip="no">
- <Text>{\Font1}Modify password for database user 'root'</Text>
- <Publish Property="PASSWORD" >NOT ModifyRootPassword</Publish>
- <Publish Property="RootPasswordConfirm">NOT ModifyRootPassword</Publish>
- <Publish Property="ALLOWREMOTEROOTACCESS">NOT ModifyRootPassword</Publish>
- <Publish Property="ALLOWREMOTEROOTACCESS" Value="1">ModifyRootPassword</Publish>
- </Control>
-
- <Control Id="Text5" Type="Text" X="23" Y="82" Width="77" Height="14" TabSkip="yes">
- <Text>New root password:</Text>
- </Control>
- <Control Id="Text6" Type="Text" X="201" Y="85" Width="100" Height="17" TabSkip="yes">
- <Text>Enter new root password</Text>
- </Control>
- <Control Id="Text8" Type="Text" X="23" Y="105" Width="75" Height="17" TabSkip="yes">
- <Text>Confirm:</Text>
- </Control>
-
- <Control Id="Text10" Type="Text" X="201" Y="104" Width="100" Height="17" TabSkip="yes">
- <Text>Retype the password</Text>
- </Control>
- <Control Id="CheckBoxALLOWREMOTEROOTACCESS" Type="CheckBox" X="23" Y="122" Width="196" Height="18" Property="ALLOWREMOTEROOTACCESS"
- CheckBoxValue="--allow-remote-root-access" TabSkip="no">
- <Text>{\Font1}Enable access from remote machines for 'root' user</Text>
- <Condition Action="enable">ModifyRootPassword</Condition>
- <Condition Action="disable">NOT ModifyRootPassword</Condition>
- </Control>
-
- <Control Id="CheckBoxCreateDefaultUser" Type="CheckBox" X="8" Y="154" Width="200" Height="18" Property="DEFAULTUSER"
- CheckBoxValue="--default-user" TabSkip="no">
- <Text>{\Font1}Create An Anonymous Account</Text>
- </Control>
- <Control Id="Text14" Type="Text" X="21" Y="174" Width="268" Height="16" TabSkip="yes">
- <Text>This option will create an anonymous account on this server. </Text>
- </Control>
- <Control Id="Text13" Type="Text" X="21" Y="190" Width="254" Height="24" TabSkip="yes">
- <Text>Please note: this setting can lead to insecure systems.</Text>
- </Control>
-
- <Control Id="CheckBoxUTF8" Type="CheckBox" X="8" Y="215" Width="250" Height="18" Property="UTF8" CheckBoxValue="1" TabSkip="no">
- <Text>{\Font1}Use UTF8 as default server's character set</Text>
- </Control>
-
- <!-- Navigation buttons-->
- <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&Back">
- <Publish Event="NewDialog" Value="CustomizeDlg">1</Publish>
- </Control>
- <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="&Next">
- <Publish Property="WarningText" Value="Passwords do not match."><![CDATA[PASSWORD <> RootPasswordConfirm]]></Publish>
- <Publish Event="SpawnDialog" Value="WarningDlg"><![CDATA[WarningText <>""]]></Publish>
- <Publish Property="SERVICENAME" Value="MySQL">NOT SERVICENAME AND NOT WarningText</Publish>
- <Publish Event="NewDialog" Value="ServicePortDlg"><![CDATA[WarningText=""]]></Publish>
- <Condition Action="enable"><![CDATA[NOT ModifyRootPassword OR PASSWORD]]> </Condition>
- <Condition Action="disable"><![CDATA[ModifyRootPassword AND (NOT PASSWORD)]]> </Condition>
- </Control>
- <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="Cancel">
- <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
- </Control>
- <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="WixUI_Bmp_Banner" />
- <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes">
- <Text> [ProductName] database configuration</Text>
- </Control>
- <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
- <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
- <Text>{\WixUI_Font_Title}Default instance properties</Text>
- </Control>
- <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
- </Dialog>
-
- <Property Id="InstallService" Value="1"/>
- <Property Id="EnableNetworking" Value="1"/>
-
- <!-- Service and port configuration -->
- <Dialog Id="ServicePortDlg" Width="370" Height="270" Title="Database settings">
- <Control Id="InstallAsService" Type="CheckBox" X="9" Y="61" Width="222" Height="19" Property="InstallService" CheckBoxValue="1" TabSkip="no">
- <Text>{\Font1}Install as service</Text>
- </Control>
- <Control Id="EditServiceName" Type="Edit" X="104" Y="82" Width="91" Height="15" Property="SERVICENAME" TabSkip="no">
- <Text>{20}</Text>
- <Condition Action="enable">InstallService</Condition>
- <Condition Action="disable">Not InstallService</Condition>
- </Control>
- <Control Id="Text5" Type="Text" X="25" Y="82" Width="77" Height="14" TabSkip="yes">
- <Text>Service Name:</Text>
- </Control>
- <Control Id="CheckBoxEnableNetworking" Type="CheckBox" Height="18" Width="102" X="9" Y="117" Property="EnableNetworking" CheckBoxValue="1">
- <Text>{\Font1}Enable networking</Text>
- <!--<Publish Property="PORT">NOT EnableNetworking</Publish>-->
- <Publish Property="SKIPNETWORKING" Value="--skip-networking">NOT EnableNetworking</Publish>
- <Publish Property="SKIPNETWORKING">EnableNetworking</Publish>
- </Control>
- <Control Id="LabelTCPPort" Type="Text" Height="17" Width="75" X="25" Y="142" Text="TCP port:" />
- <Control Id="Port" Type="MaskedEdit" X="104" Y="140" Width="28" Height="15" Property="PORT" Sunken="yes" Text="[PortTemplate]">
- <Condition Action="enable" >EnableNetworking</Condition>
- <Condition Action="disable">Not EnableNetworking</Condition>
- </Control>
-
- <?if $(var.HaveInnodb) = "1" ?>
- <Control Id="CheckBoxStandardConfig" Type="CheckBox" Height="18" Width="220" X="9" Y="171" Property="STDCONFIG" CheckBoxValue="1">
- <Text>{\Font1}Optimize for transactions</Text>
- </Control>
-
- <Control Id="StandardConfigExplain" Type="Text" X="25" Y="190" Width="270" Height="14" TabSkip="yes">
- <Text>(Uses transactional storage engine and "strict" SQL mode)</Text>
- <Condition Action="enable" >STDCONFIG</Condition>
- <Condition Action="disable">Not STDCONFIG</Condition>
- </Control>
- <Control Id="LabelInnodbBufferpool" Type="Text" Height="17" Width="77" X="25" Y="210" Text="Buffer pool size:" >
- <Condition Action="enable" >STDCONFIG</Condition>
- <Condition Action="disable">Not STDCONFIG</Condition>
- </Control>
- <Control Id="BPSize" Type="MaskedEdit" X="104" Y="208" Width="40" Height="15" Property="BUFFERPOOLSIZE" Sunken="yes" Text="[BufferPoolSizeTemplate]">
- <Condition Action="enable" >STDCONFIG</Condition>
- <Condition Action="disable">Not STDCONFIG</Condition>
- </Control>
- <Control Id="LabelMB" Type="Text" Height="17" Width="15" X="150" Y="210" Text="MB" >
- <Condition Action="enable" >STDCONFIG</Condition>
- <Condition Action="disable">Not STDCONFIG</Condition>
- </Control>
- <?endif?>
-
- <!-- Navigation buttons-->
- <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&Back">
- <Publish Event="NewDialog" Value="UserSettingsDlg">1</Publish>
- </Control>
- <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="no" Text="&Next">
- <Publish Property="SERVICENAME">NOT InstallService</Publish>
- <Publish Property="WarningText" Value="Please enter valid port or uncheck 'Enable Networking' checkbox">
- <![CDATA[EnableNetworking AND NOT PORT AND NOT WarningText]]>
- </Publish>
- <Publish Property="WarningText" Value="Please enter valid service name port or uncheck 'Install Service' checkbox">
- <![CDATA[InstallService AND NOT SERVICENAME AND NOT WarningText]]>
- </Publish>
- <Publish Event="DoAction" Value="CheckDatabaseProperties">NOT WarningText</Publish>
- <Publish Event="SpawnDialog" Value="WarningDlg">WarningText</Publish>
- <Publish Event="NewDialog" Value="Feedback">Not WarningText</Publish>
- </Control>
- <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="no" Text="Cancel">
- <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
- </Control>
- <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="WixUI_Bmp_Banner" />
- <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes">
- <Text>[ProductName] database configuration</Text>
- </Control>
- <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="2" />
- <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
- <Text>{\WixUI_Font_Title}Default instance properties</Text>
- </Control>
- <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="2" />
- </Dialog>
- </UI>
-
- <Property Id="CRLF" Value="
" />
- <CustomAction Id="CheckDataDirectoryEmpty" BinaryKey="wixca.dll" DllEntry="CheckDataDirectoryEmpty" Execute="immediate" Impersonate="yes"/>
- <!-- What to do when navigation buttons are clicked -->
- <UI Id="MyWixUI_Mondo">
- <UIRef Id="WixUI_FeatureTree" />
- <UIRef Id="WixUI_ErrorProgressText" />
- <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="999">
- OLDERVERSIONBEINGUPGRADED
- </Publish>
- <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="NewOrUpgradeInstanceDlg" Order="999">
- NOT Installed AND UpgradableServiceFound
- </Publish>
-
- <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="Feedback" Order="3" ><![CDATA[&DBInstance=3 AND NOT !DBInstance=3]]></Publish>
- <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="3"> <![CDATA[OLDERVERSIONBEINGUPGRADED <>""]]></Publish>
- <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="ConfirmDataCleanupDlg" Order="1" ><![CDATA[(&DBInstance=2) AND (!DBInstance=3)]]></Publish>
-
-
- <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="NewOrUpgradeInstanceDlg" Order="999">
- NOT Installed AND UpgradableServiceFound
- </Publish>
- <Publish Dialog="CustomizeDlg" Control="Next" Event="DoAction" Value="CheckDataDirectoryEmpty" Order="1"><![CDATA[&DBInstance=3 AND NOT !DBInstance=3]]></Publish>
- <Publish Dialog="CustomizeDlg" Property="DATADIRNOTEMPTY" Control="Next" Order="1"><![CDATA[NOT(&DBInstance=3 AND NOT !DBInstance=3)]]></Publish>
- <Publish Dialog="CustomizeDlg" Control="Next" Property="WarningText" Order="2"
- Value="Selected data directory [DATADIR] is not empty. Either clean it, or choose another location for 'Database Instance' feature.">
- DATADIRNOTEMPTY
- </Publish>
- <Publish Dialog="CustomizeDlg" Control="Next" Event="SpawnDialog" Value="WarningDlg" Order="3">WarningText</Publish>
- <Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="ConfirmDataCleanupDlg" Order="4">
- <![CDATA[(&DBInstance=2) AND (!DBInstance=3)]]>
- </Publish>
- <Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="UserSettingsDlg" Order="5">
- <![CDATA[&DBInstance=3 AND NOT !DBInstance=3 AND NOT WarningText]]>
- </Publish>
-
- <Publish Dialog="ConfirmDataCleanupDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg">WixUI_InstallMode = "Change"</Publish>
- <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="ConfirmDataCleanupDlg" Order="999">
- !DBInstance=3 AND (CLEANUPDATA Or USECONFIRMDATACLEANUPDLG)
- </Publish>
- <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Property="USECONFIRMDATACLEANUPDLG" Value="1" Order="999">
- !DBInstance=3 AND CLEANUPDATA
- </Publish>
- <Publish Dialog="ConfirmDataCleanupDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg">WixUI_InstallMode = "Remove"</Publish>
- </UI>
-
- <!-- End of UI section -->
-
- <!-- Extra folders we need (DATADIR and shortcut folder) -->
- <DirectoryRef Id='INSTALLDIR'>
- <Directory Id="DATADIR" Name="data">
- </Directory>
- <Directory Id="ProgramMenuFolder">
- <Directory Id="ShortcutFolder" Name="@CPACK_WIX_PACKAGE_NAME@">
- </Directory>
- </Directory>
- </DirectoryRef>
-
-
- <!-- Extra feature (database instance). This could be split to several subfeatures if desired (e.g firewall exception)-->
- <Feature Id='DBInstance'
- Title='Database instance'
- Description=
- 'Install database instance. Only new database can be installed with this feature.'
- ConfigurableDirectory='DATADIR'
- AllowAdvertise='no'
- Level='1'>
-
- <!-- Data directory with some reasonable security settings -->
- <Component Id="C.datadir" Guid="*" Directory="DATADIR">
- <RegistryValue Root='HKLM'
- Key='SOFTWARE\@MANUFACTURER@\@CPACK_WIX_PACKAGE_NAME@'
- Name='DATADIR' Value='[DATADIR]' Type='string' KeyPath='yes'/>
- <CreateFolder>
- <util:PermissionEx User="[LogonUser]" GenericAll="yes" />
- <util:PermissionEx User="NetworkService" GenericAll="yes" />
- </CreateFolder>
- </Component>
-
- <!-- Database service conditioned on SERVICENAME property-->
- <Component Id="C.service" Guid="*" Directory="DATADIR">
- <Condition>SERVICENAME</Condition>
- <RegistryValue Root='HKLM'
- Key='SOFTWARE\@MANUFACTURER@\@CPACK_WIX_PACKAGE_NAME@'
- Name='SERVICENAME' Value='[SERVICENAME]' Type='string' KeyPath='yes'/>
- <ServiceControl Id='DBInstanceServiceStop' Name='[SERVICENAME]' Stop='both' Remove='uninstall' Wait='yes'/>
- <ServiceControl Id='DBInstanceServiceStart' Name='[SERVICENAME]' Start='install' Wait='yes'/>
- </Component>
- <?if $(var.HaveInnodb) = "1" ?>
- <Component Id="C.myiniconfig" Guid="*" Directory="DATADIR">
- <Condition>STDCONFIG</Condition>
- <RegistryValue Root='HKLM'
- Key='SOFTWARE\@MANUFACTURER@\@CPACK_WIX_PACKAGE_NAME@'
- Name='STDCONFIG' Value='1' Type='string' KeyPath='yes'/>
- <IniFile Id="Ini1"
- Action="createLine"
- Directory="DATADIR"
- Section="mysqld"
- Name="my.ini"
- Key="sql_mode"
- Value=""STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION"" />
- <IniFile Id="Ini2"
- Action="createLine"
- Directory="DATADIR"
- Section="mysqld"
- Name="my.ini"
- Key="default_storage_engine"
- Value="innodb" />
- <IniFile Id="Ini3"
- Action="createLine"
- Directory="DATADIR"
- Section="mysqld"
- Name="my.ini"
- Key="innodb_buffer_pool_size"
- Value="[BUFFERPOOLSIZE]M" />
- <IniFile Id="Ini4"
- Action="createLine"
- Directory="DATADIR"
- Section="mysqld"
- Name="my.ini"
- Key="innodb_log_file_size"
- Value="[LOGFILESIZE]M" />
- </Component>
- <?endif?>
-
- <Component Id="C.feedback" Guid="*" Directory="DATADIR">
- <Condition>FEEDBACK</Condition>
- <RegistryValue Root='HKLM'
- Key='SOFTWARE\@MANUFACTURER@\@CPACK_WIX_PACKAGE_NAME@'
- Name='FEEDBACK' Value='1' Type='string' KeyPath='yes'/>
- <IniFile Id="Ini5"
- Action="createLine"
- Directory="DATADIR"
- Section="mysqld"
- Name="my.ini"
- Key="feedback"
- Value="ON" />
- </Component>
-
- <Component Id="C.utf8" Guid="*" Directory="DATADIR">
- <Condition>UTF8</Condition>
- <RegistryValue Root='HKLM'
- Key='SOFTWARE\@MANUFACTURER@\@CPACK_WIX_PACKAGE_NAME@'
- Name='UTF8' Value='1' Type='string' KeyPath='yes'/>
- <IniFile Id="Ini6"
- Action="createLine"
- Directory="DATADIR"
- Section="mysqld"
- Name="my.ini"
- Key="character-set-server"
- Value="utf8" />
- </Component>
-
- <!--- Grant service account permission to the database folder (Windows 7 and later) -->
- <Component Id="C.serviceaccount.permission" Guid="*" Directory='DATADIR' Transitive='yes'>
- <Condition><![CDATA[SERVICENAME AND (VersionNT > 600)]]></Condition>
- <RegistryValue Root='HKLM'
- Key='SOFTWARE\@MANUFACTURER@\@CPACK_WIX_PACKAGE_NAME@'
- Name='servicepermission' Value='1' Type='string' KeyPath='yes'/>
- <CreateFolder>
- <util:PermissionEx User="NT SERVICE\[SERVICENAME]" GenericAll="yes" />
- </CreateFolder>
- </Component>
-
- <!-- Shortcuts in program menu (mysql client etc) -->
- <Component Id="c.shortcuts" Guid="*" Directory="ShortcutFolder">
- <!-- shortcut to my.ini-->
- <RegistryValue Root="HKCU" Key="Software\@CPACK_WIX_PACKAGE_NAME@\Uninstall" Name="shortcuts" Value="1" Type="string" KeyPath="yes" />
- <RemoveFolder Id="RemoveShorcutFolder" On="uninstall" />
- <Shortcut Id="shortcut.my.ini"
- Name="my.ini (@CPACK_WIX_PACKAGE_NAME@)"
- Target="[System64Folder]notepad.exe"
- Arguments=""[DATADIR]my.ini""
- Directory="ShortcutFolder"
- Description="Edit database configuration" />
- <Shortcut Id="shortcut.errorlog"
- Name="Error log (@CPACK_WIX_PACKAGE_NAME@)"
- Target="[System64Folder]notepad.exe"
- Arguments=""[DATADIR][ComputerName].err""
- Directory="ShortcutFolder"
- Description="View Database Error log" />
- <Shortcut Id="shortcut.dbfolder" Name="Database directory (@CPACK_WIX_PACKAGE_NAME@)"
- Target="[DATADIR]" />
- </Component>
-
- <!-- add reference so mysql client won't get uninstalled and we have a shortcut pointing to nowhere-->
- <ComponentRef Id="C.bin.mysql.exe"/>
-
- <Component Id="c.shortcuts.commandline" Guid="*" Directory="ShortcutFolder">
- <RegistryValue
- Root="HKCU" Key="Software\@CPACK_WIX_PACKAGE_NAME@\Uninstall"
- Name="shortcuts.commandline"
- Value="1" Type="string" KeyPath="yes" />
- <!-- shortcut to client-->
- <Shortcut Id="shortcut.mysql.exe"
- Name="MySQL Client (@CPACK_WIX_PACKAGE_NAME@)"
- Target="[System64Folder]cmd.exe"
- Arguments="/k " "[D.bin]mysql.exe" "--defaults-file=[DATADIR]my.ini" -uroot -p""
- Directory="ShortcutFolder"
- WorkingDirectory="D.bin"
- Description="Starts mysql.exe for root user" />
- </Component>
- <Component Id="c.shortcuts.commandprompt.db" Guid="*" Directory="ShortcutFolder" Transitive="yes">
- <Condition>SERVICENAME</Condition>
- <RegistryValue
- Root="HKCU" Key="Software\@CPACK_WIX_PACKAGE_NAME@\Uninstall"
- Name="shortcuts.commandprompt.db"
- Value="1" Type="string" KeyPath="yes" />
- <!-- just command prompt in the bin directory (so all utilities can be called) -->
- <Shortcut Id="shortcut.commandprompt.exe.db"
- Name="Command Prompt (@CPACK_WIX_PACKAGE_NAME@)"
- Target="[System64Folder]cmd.exe"
- Directory="ShortcutFolder"
- Arguments="/k "set MYSQL_HOME=[DATADIR]&& set PATH=[D.bin];%PATH%;&&echo Setting environment for [ProductName] ""
- Description="Opens command line in the installation bin directory" />
- </Component>
-
-
- </Feature>
-
- <Feature Id="SharedClientServerComponents"
- Title='Utilities used by both server and client.'
- Description=
- 'Client utilities that are also used with server.Required for upgrade.'
- ConfigurableDirectory='INSTALLDIR'
- AllowAdvertise='no'
- Level='1'
- Display='hidden'>
- <ComponentRef Id='C.bin.mysql.exe'/>
- <ComponentRef Id='C.bin.mysqladmin.exe'/>
- <ComponentRef Id='C.bin.mysql_upgrade.exe'/>
- <ComponentRef Id='C.bin.mysqlcheck.exe'/>
- <Component Id="c.shortcuts.commandprompt.nodb" Guid="*" Directory="ShortcutFolder" Transitive="yes">
- <Condition>NOT SERVICENAME</Condition>
- <RegistryValue
- Root="HKCU" Key="Software\@CPACK_WIX_PACKAGE_NAME@\Uninstall"
- Name="shortcuts.commandprompt.nodb"
- Value="1" Type="string" KeyPath="yes" />
- <!-- just command prompt in the bin directory (so all utilities can be called) -->
- <Shortcut Id="shortcut.commandprompt.exe.nodb"
- Name="Command Prompt (@CPACK_WIX_PACKAGE_NAME@)"
- Target="[System64Folder]cmd.exe"
- Directory="ShortcutFolder"
- Arguments="/k "set PATH=[D.bin];%PATH%;&&echo Setting environment for [ProductName] ""
- Description="Opens command line in the installation bin directory" />
- </Component>
- <?if $(var.HaveUpgradeWizard) != "0" ?>
- <ComponentRef Id='C.bin.mysql_upgrade_wizard.exe'/>
- <!--
- <Component Id="c.shortcuts.upgrade_wizard" Guid="*" Directory="ShortcutFolder" Transitive="yes">
- <RegistryValue
- Root="HKCU" Key="Software\@CPACK_WIX_PACKAGE_NAME@\Uninstall"
- Name="shortcuts.upgrade_wizard"
- Value="1" Type="string" KeyPath="yes" />
- <Shortcut Id="shortcut.upgrade_wizard"
- Name="Upgrade Wizard (@CPACK_WIX_PACKAGE_NAME@)"
- Target="[INSTALLDIR]bin\mysql_upgrade_wizard.exe"
- Directory="ShortcutFolder"
- Description="Upgrades older instances of MariaDB/MySQL services to version @MAJOR_VERSION at .@MINOR_VERSION@"
- Advertise="no"/>
- </Component>
- -->
- <?endif?>
- </Feature>
-
- <!-- Optional 3rd party tools -->
- <DirectoryRef Id='TARGETDIR'>
- <Directory Id='CommonFilesFolder'>
- <Directory Id='MariaDBShared' Name='MariaDBShared'/>
- </Directory>
- <Directory Id='DesktopFolder'/>
- </DirectoryRef>
-
-
- <?if "@WITH_THIRD_PARTY@" != "" ?>
-
- <!-- Include definition of 3party components -->
- <?foreach tool in @WITH_THIRD_PARTY@ ?>
- <?include "${CMAKE_CURRENT_BINARY_DIR}\$(var.tool).wxi" ?>
- <?endforeach ?>
-
- <Feature Id="ThirdPartyTools"
- Title='Third party tools'
- Description= 'Third party tools'
- AllowAdvertise='no'
- Level='1'
- Display='expand'>
- @THIRD_PARTY_FEATURE_CONDITION@
- <!-- Include definition of 3rd party features -->
- <?foreach tool in @WITH_THIRD_PARTY@ ?>
- <?include "${CMAKE_CURRENT_BINARY_DIR}\$(var.tool)_feature.wxi" ?>
- <?endforeach ?>
-
- </Feature>
-
- <?endif ?>
-
- <!-- Custom action, call mysql_install_db -->
- <SetProperty Sequence='execute' Before='CreateDatabaseCommand' Id="SKIPNETWORKING" Value="--skip-networking" >SKIPNETWORKING</SetProperty>
- <SetProperty Sequence='execute' Before='CreateDatabaseCommand' Id="ALLOWREMOTEROOTACCESS" Value="--allow-remote-root-access">ALLOWREMOTEROOTACCESS</SetProperty>
- <SetProperty Sequence='execute' Before='CreateDatabaseCommand' Id="DEFAULTUSER" Value="--default-user">DEFAULTUSER</SetProperty>
- <CustomAction Id='CheckDatabaseProperties' BinaryKey='wixca.dll' DllEntry='CheckDatabaseProperties' />
- <CustomAction Id='PresetDatabaseProperties' BinaryKey='wixca.dll' DllEntry='PresetDatabaseProperties' />
- <CustomAction Id="CreateDatabaseCommand" Property="CreateDatabase"
- Value=
- ""[#F.bin.mysql_install_db.exe]" "--service=[SERVICENAME]" --port=[PORT] "--password=[ESCAPEDPASSWORD]" "--datadir=[DATADIR]\" [SKIPNETWORKING] [ALLOWREMOTEROOTACCESS] [DEFAULTUSER] --verbose-bootstrap"
- Execute="immediate"
- HideTarget="yes"
- />
- <CustomAction Id="CreateDatabaseRollbackCommand" Property="CreateDatabaseRollback"
- Value="[SERVICENAME]\[DATADIR]"
- Execute="immediate"/>
- <CustomAction Id="CreateDatabase" BinaryKey="WixCA" DllEntry="CAQuietExec"
- Execute="deferred" Return="check" Impersonate="no" />
- <CustomAction Id="CreateDatabaseRollback" BinaryKey="wixca.dll" DllEntry="CreateDatabaseRollback"
- Execute="rollback" Return="check" Impersonate="no"/>
- <UI>
- <ProgressText Action="CreateDatabase">Running mysql_install_db.exe</ProgressText>
- </UI>
-
- <!-- Error injection script activated by TEST_FAIL=1 passed to msiexec (to see how good custom action rollback works) -->
- <Property Id="FailureProgram">
- <![CDATA[
- Function Main()
- Main = 3
- End Function
- ]]>
- </Property>
- <CustomAction Id="FakeFailure"
- VBScriptCall="Main"
- Property="FailureProgram"
- Execute="deferred" />
-
- <CustomAction Id='ErrorDataDirNotEmpty'
- Error='Chosen data directory [DATADIR] is not empty. It must be empty prior to installation.'/>
- <InstallExecuteSequence>
- <Custom Action="CheckDataDirectoryEmpty" After="CostFinalize">
- <![CDATA[&DBInstance=3 AND NOT !DBInstance=3 AND OLDERVERSIONBEINGUPGRADED=""]]>
- </Custom>
- <Custom Action="ErrorDataDirNotEmpty" After="CheckDataDirectoryEmpty" >DATADIRNOTEMPTY</Custom>
- <Custom Action="CheckDatabaseProperties" Before="CreateDatabaseCommand">SERVICENAME</Custom>
- <Custom Action="CreateDatabaseCommand" After="CostFinalize" >
- <![CDATA[&DBInstance=3 AND NOT !DBInstance=3 AND OLDERVERSIONBEINGUPGRADED=""]]>
- </Custom>
- <Custom Action="CreateDatabase" After="InstallFiles">
- <![CDATA[&DBInstance=3 AND NOT !DBInstance=3 AND OLDERVERSIONBEINGUPGRADED=""]]>
- </Custom>
- <Custom Action="CreateDatabaseRollbackCommand" After="CostFinalize">
- <![CDATA[&DBInstance=3 AND NOT !DBInstance=3 AND OLDERVERSIONBEINGUPGRADED=""]]>
- </Custom>
- <Custom Action="CreateDatabaseRollback" Before="CreateDatabase">
- <![CDATA[&DBInstance=3 AND NOT !DBInstance=3 AND OLDERVERSIONBEINGUPGRADED=""]]>
- </Custom>
- <Custom Action='FakeFailure' Before='InstallFinalize'>
- <![CDATA[&DBInstance=3 AND NOT !DBInstance=3 AND OLDERVERSIONBEINGUPGRADED="" AND TESTFAIL]]>
- </Custom>
- </InstallExecuteSequence>
-
-
- <!-- Custom action to remove data on uninstall -->
- <Binary Id='wixca.dll' SourceFile='@WIXCA_LOCATION@' />
- <CustomAction Id="RemoveDataDirectory.SetProperty" Return="check"
- Property="RemoveDataDirectory" Value="[DATADIR]" />
- <CustomAction Id="RemoveDataDirectory" BinaryKey="wixca.dll"
- DllEntry="RemoveDataDirectory"
- Execute="deferred"
- Impersonate="no"
- Return="ignore" />
- <InstallExecuteSequence>
- <Custom Action="RemoveDataDirectory.SetProperty" After="CreateDatabaseCommand" >
- <![CDATA[($C.datadir=2) AND (CLEANUPDATA) AND NOT UPGRADINGPRODUCTCODE]]>
- </Custom>
- <Custom Action="RemoveDataDirectory" Before="RemoveFiles">
- <![CDATA[($C.datadir=2) AND (CLEANUPDATA) AND NOT UPGRADINGPRODUCTCODE]]>
- </Custom>
- </InstallExecuteSequence>
-
- <InstallExecuteSequence>
- <StopServices>SERVICENAME</StopServices>
- <DeleteServices>SERVICENAME</DeleteServices>
- </InstallExecuteSequence>
- <CustomAction Id="CheckDBInUse" Return="ignore"
- BinaryKey="wixca.dll" DllEntry="CheckDBInUse" Execute="firstSequence"/>
- <InstallExecuteSequence>
- <Custom Action="CheckDBInUse" Before="LaunchConditions">Installed</Custom>
- <Custom Action="PresetDatabaseProperties" After="CheckDBInUse"></Custom>
- </InstallExecuteSequence>
- <InstallUISequence>
- <Custom Action="CheckDBInUse" Before="LaunchConditions">Installed</Custom>
- <Custom Action="PresetDatabaseProperties" After="CheckDBInUse"></Custom>
- </InstallUISequence>
-
- <!-- Store some properties persistently in registry, mainly for upgrades -->
-
- <Feature Id='StoreInstallLocation' Level='1' Absent='disallow' Display='hidden'>
- <Component Directory='INSTALLDIR' Guid='*' Id='C.storeinstalllocation'>
- <RegistryValue Root='HKLM' Key='SOFTWARE\@MANUFACTURER@\@CPACK_WIX_PACKAGE_NAME@'
- Name='INSTALLDIR' Value='[INSTALLDIR]' Type='string' KeyPath='yes'/>
- </Component>
- </Feature>
-
- <?foreach STOREDVAR in SERVICENAME;DATADIR;INSTALLDIR?>
-
- <Property Id='$(var.STOREDVAR)' Secure='yes'>
- <RegistrySearch Id='$(var.STOREDVAR)Property' Root='HKLM'
- Key='SOFTWARE\@MANUFACTURER@\@CPACK_WIX_PACKAGE_NAME@'
- Name='$(var.STOREDVAR)' Type='raw' />
- </Property>
- <CustomAction Id='SaveCmdLineValue_$(var.STOREDVAR)' Property='CMDLINE_$(var.STOREDVAR)'
- Value='[$(var.STOREDVAR)]' Execute='firstSequence' />
- <CustomAction Id='SetFromCmdLineValue_$(var.STOREDVAR)' Property='$(var.STOREDVAR)'
- Value='[CMDLINE_$(var.STOREDVAR)]' Execute='firstSequence' />
- <InstallUISequence>
- <Custom Action='SaveCmdLineValue_$(var.STOREDVAR)' Before='AppSearch' />
- <Custom Action='SetFromCmdLineValue_$(var.STOREDVAR)' After='AppSearch'>CMDLINE_$(var.STOREDVAR)</Custom>
- </InstallUISequence>
- <InstallExecuteSequence>
- <Custom Action='SaveCmdLineValue_$(var.STOREDVAR)' Before='AppSearch' />
- <Custom Action='SetFromCmdLineValue_$(var.STOREDVAR)' After='AppSearch'>CMDLINE_$(var.STOREDVAR)</Custom>
- </InstallExecuteSequence>
-
- <?endforeach?>
-
- <!--
- Optionally, start upgrade wizard on exit.
- -->
-
-
-
- <?if $(var.HaveUpgradeWizard) != "0" ?>
- <UI>
- <Publish Dialog="ExitDialog"
- Control="Finish"
- Event="DoAction"
- Value="LaunchApplication">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish>
- </UI>
- <Property
- Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT"
- Value="Launch wizard to upgrade existing MariaDB or MySQL services." />
- <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOX" Value="0"/>
- <Property Id="WixShellExecTarget" Value="[#F.bin.mysql_upgrade_wizard.exe]" />
- <CustomAction Id="LaunchApplication"
- BinaryKey="WixCA"
- DllEntry="WixShellExec"
- Impersonate="yes" />
- <CustomAction
- Id="CheckServiceUpgrades" Return="ignore" BinaryKey="wixca.dll"
- DllEntry="CheckServiceUpgrades"
- Execute="immediate" />
- <InstallUISequence>
- <Custom Action="CheckServiceUpgrades" After="CostFinalize">
- $C.bin.mysql_upgrade_wizard.exe = 3 AND NOT Installed AND NOT OLDERVERSIONBEINGUPGRADED
- </Custom>
- </InstallUISequence>
- <SetProperty Before="ExecuteAction" Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT"
- Sequence="ui" Value="[NonExistentProperty]">
- <![CDATA[($C.bin.mysql_upgrade_wizard.exe <> 3) AND NOT Installed OR OLDERVERSIONBEINGUPGRADED]]>
- </SetProperty>
- <SetProperty Before="ExecuteAction" Id="WIXUI_EXITDIALOGOPTIONALCHECKBOX"
- Sequence="ui" Value="[NonExistentProperty]">
- <![CDATA[($C.bin.mysql_upgrade_wizard.exe <> 3) AND NOT Installed OR OLDERVERSIONBEINGUPGRADED]]>
- </SetProperty>
-
- <?endif ?> <!-- HaveUpgradeWizard -->
-
- <!--
- Author the registry entries for "add or remove programs"
- We choose to define ARPSYSTEMCOMPONENT to 1 because we want to show
- "do you want to remove data directory" on uninstall
- -->
- <Property Id="ARPSYSTEMCOMPONENT" Value="1" Secure="yes" />
- <Property Id="ARPINSTALLLOCATION" Secure="yes"/>
- <SetProperty Id="ARPINSTALLLOCATION" Value="[INSTALLDIR]" After="InstallValidate" Sequence="execute"/>
- <Feature Id='ARPRegistryEntries'
- Title='Add or remove program entries'
- Description='Add or remove program entries'
- AllowAdvertise='no'
- Absent='disallow' Display='hidden'
- Level='1'>
- <Component Id="C.arp_entries" Guid="*" Directory="INSTALLDIR">
- <RemoveFolder Id="RemoveINSTALLDIR" On="uninstall"/>
- <RegistryValue Root='HKLM'
- Key='Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_WIX_PACKAGE_NAME@'
- Name='DisplayName' Value='[ProductName]' Type='string' KeyPath='yes'/>
- <RegistryValue Root='HKLM'
- Key='Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_WIX_PACKAGE_NAME@'
- Name='Publisher' Value='@MANUFACTURER@' Type='string'/>
- <RegistryValue Root='HKLM'
- Key='Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_WIX_PACKAGE_NAME@'
- Name='DisplayVersion' Value='[ProductVersion]' Type='string'/>
- <RegistryValue Root='HKLM'
- Key='Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_WIX_PACKAGE_NAME@'
- Name='InstallLocation' Value='[INSTALLDIR]' Type='string'/>
- <RegistryValue Root='HKLM'
- Key='Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_WIX_PACKAGE_NAME@'
- Name='UninstallString' Value='msiexec.exe /I [ProductCode]' Type='string'/>
- <RegistryValue Root='HKLM'
- Key='Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_WIX_PACKAGE_NAME@'
- Name='MajorVersion' Value='@MAJOR_VERSION@' Type='string'/>
- <RegistryValue Root='HKLM'
- Key='Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_WIX_PACKAGE_NAME@'
- Name='MinorVersion' Value='@MINOR_VERSION@' Type='string'/>
- </Component>
- </Feature>
-
- <!-- Extra condition to block the installer if NSIS based installation is detected-->
- <Property Id="NSISINSTALLKEY">
- <RegistrySearch Id='NSISKey' Type='raw'
- Root='HKLM' Key='Software\Microsoft\Windows\CurrentVersion\Uninstall\MariaDB' Name='DisplayName' />
- </Property>
- <Condition
- Message=
- 'Previous version of MariaDB was found, that used incompatible installer.
Please remove "[NSISINSTALLKEY]" before you proceed with this installation.'
- >
- <![CDATA[ NOT(NSISINSTALLKEY << "MariaDB @MAJOR_VERSION at .@MINOR_VERSION at .") OR Installed]]>
- </Condition>
- <Condition Message=
- 'Setting the ALLUSERS property is not allowed because [ProductName] is a per-machine application. Setup will now exit.'>
- <![CDATA[ALLUSERS = "1"]]>
- </Condition>
- </Fragment>
-</Wix>
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+ <Fragment>
+ <!--
+ Check, if upgrade wizard was built
+ It currently requires MFC, which is not in SDK
+ neither in express edítions of VS.
+ -->
+ <?ifndef HaveUpgradeWizard ?>
+ <?define HaveUpgradeWizard="1"?>
+ <?endif?>
+
+ <!-- If Innodb is compiled in, enable "optimize for transactions" checkbox -->
+ <?ifndef HaveInnodb ?>
+ <?define HaveInnodb="0"?>
+ <?endif?>
+
+ <Property Id="PortTemplate" Value="#####" />
+ <?if $(var.HaveInnodb) = "1" ?>
+ <Property Id="BufferPoolSizeTemplate" Value="#######" />
+ <?endif?>
+ <!--
+ Installation parameters that can be passed via msiexec command line
+ For "booleans" (like skip networking), just providing any value means property set to "yes".
+ -->
+ <!-- instalation directory (default under program files)-->
+ <!--- (defined elsewhere) <Property Id="INSTALLDIR" Secure="yes" /> -->
+
+ <!-- Database data directory (default under INSTALLDIR\data) -->
+ <!--- (defined elsewhere) <Property Id="DATADIR" Secure="yes"/> -->
+
+ <!-- Service name of database instanced (default MySQL in GUI, nothing with command line) -->
+ <!-- (defined elsewhere) <Property Id="SERVICENAME" Secure="yes" /> -->
+
+ <!-- Root password -->
+ <Property Id="PASSWORD" Hidden="yes" Secure="yes" />
+ <Property Id="ESCAPEDPASSWORD" Hidden="yes" Secure="yes" />
+ <!-- Database port -->
+ <Property Id="PORT" Value="3306" Secure="yes"/>
+ <!-- Whether to allow remote access for root user -->
+ <Property Id="ALLOWREMOTEROOTACCESS" Secure="yes" />
+ <!-- Skip networking. This will switch configuration to use named pipe-->
+ <Property Id="SKIPNETWORKING" Secure="yes"/>
+ <!-- Whether to keep default (unauthenticated) user. Default is no-->
+ <Property Id="DEFAULTUSER" Secure="yes"/>
+ <!-- Set server character set to UTF8 -->
+ <Property Id="UTF8" Secure="yes"/>
+ <!-- Whether to data on uninstall (default yes, after asking user consent) -->
+ <Property Id="CLEANUPDATA" Secure="yes" Value="1"/>
+ <!-- Force per machine installation -->
+ <Property Id="ALLUSERS" Secure="yes" Value="1"/>
+ <!-- Disable advertised shortcuts weirdness -->
+ <Property Id="DISABLEADVTSHORTCUTS" Secure="yes" Value="1"/>
+
+ <!-- Activate feedback plugin-->
+ <Property Id="FEEDBACK" Secure="yes"/>
+
+ <?if $(var.HaveInnodb) = "1" ?>
+ <!-- Quick configuration : set default storage engine to innodb, use strict sql_mode -->
+ <Property Id="STDCONFIG" Secure="yes" Value="1"/>
+ <?endif?>
+ <!-- Innodb Buffer pool size in MB-->
+ <Property Id="BUFFERPOOLSIZE" Secure="yes"/>
+
+
+ <CustomAction Id="LaunchUrl" BinaryKey="WixCA" DllEntry="WixShellExec" Execute="immediate" Return="check" Impersonate="yes" />
+
+
+ <!--
+ User interface dialogs
+ -->
+ <WixVariable Id='WixUIBannerBmp' Value='@CMAKE_CURRENT_SOURCE_DIR@\WixUIBannerBmp.jpg' />
+ <WixVariable Id='WixUIDialogBmp' Value='@CMAKE_CURRENT_SOURCE_DIR@\WixUIDialogBmp.jpg' />
+ <UI>
+
+ <!-- Dialog on uninstall of the database -->
+ <Dialog Id="ConfirmDataCleanupDlg" Width="370" Height="270" Title="[ProductName] Setup" NoMinimize="yes">
+
+ <!--<Control Id="CleanupDataCheckBox" Type="CheckBox" X="20" Y="100" Height="30" Property="CLEANUPDATA" Width="300" CheckBoxValue="1"
+ Text="{\Font1}Remove default database directory 
'[DATADIR]'"/>
+ -->
+ <Control Id="RemoveDatadirButton" Type="PushButton" X="40" Y="65" Width="80" Height="18"
+ Text="Remove data">
+ <Publish Property="CLEANUPDATA" Value="1">1</Publish>
+ <Publish Event="NewDialog" Value="VerifyReadyDlg">WixUI_InstallMode</Publish>
+ <Publish Event="EndDialog" Value="Return">NOT WixUI_InstallMode</Publish>
+
+ </Control>
+ <Control Id="RemoveDatadirText" Type="Text" X="60" Y="85" Width="280" Height="20">
+ <Text>Remove default database directory [DATADIR]. Ensures proper cleanup on uninstall.</Text>
+ </Control>
+
+ <Control Id="KeepDatadirButton" Type="PushButton" X="40" Y="118" Width="80" Height="18"
+ Text="Keep data">
+ <Publish Property="CLEANUPDATA">1</Publish>
+ <Publish Event="NewDialog" Value="VerifyReadyDlg">WixUI_InstallMode</Publish>
+ <Publish Event="EndDialog" Value="Return">NOT WixUI_InstallMode</Publish>
+ </Control>
+ <Control Id="KeepDataDirText" Type="Text" X="60" Y="138" Width="280" Height="70" >
+ <Text>Do not remove [DATADIR]. Choose this option if you intend to use data in the future</Text>
+ </Control>
+
+
+ <!-- Navigation buttons-->
+ <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&Back">
+ <Publish Event="NewDialog" Value="CustomizeDlg">WixUI_InstallMode="Change"</Publish>
+ <Condition Action="disable">NOT WixUI_InstallMode</Condition>
+ </Control>
+ <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Disabled="yes" Text="&Next">
+ <Publish Event="NewDialog" Value="VerifyReadyDlg">WixUI_InstallMode</Publish>
+ <Publish Event="EndDialog" Value="Return">NOT WixUI_InstallMode</Publish>
+ </Control>
+ <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="Cancel">
+ <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+ </Control>
+ <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="WixUI_Bmp_Banner" />
+ <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes">
+ <Text>Remove default [ProductName] database</Text>
+ </Control>
+ <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+ <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
+ <Text>{\WixUI_Font_Title}Default instance properties</Text>
+ </Control>
+ <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
+ </Dialog>
+
+ <!-- Dialog new or upgrade instance -->
+
+ <Property Id="CreateOrUpgradeChoice" Value="Create"/>
+
+ <Dialog Id="NewOrUpgradeInstanceDlg" Width="370" Height="270" Title="[ProductName] Setup" NoMinimize="yes">
+ <Control Id="Text" Type="Text" X="40" Y="65" Width="270" Height="30">
+ <Text>Setup found existing database instances that can be upgraded to [ProductName].You can create a new instance and/or upgrade existing one.
+ </Text>
+ </Control>
+
+ <Control Id="CreateOrUpgradeButton"
+ Type="RadioButtonGroup" X="40" Y="100" Width="300" Height="70"
+ Property="CreateOrUpgradeChoice" Text="Specify what to do">
+ <RadioButtonGroup Property="CreateOrUpgradeChoice">
+ <RadioButton Value="Create" X="0" Y="0" Width="300" Height="25"
+ Text="{\Font1}Create new database instance."/>
+ <RadioButton Value="Upgrade" X="0" Y="30" Width="300" Height="25"
+ Text="{\Font1}Do not create a new database. Optionally upgrade existing instances." />
+ </RadioButtonGroup>
+ </Control>
+
+ <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&Back">
+ <Publish Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
+ </Control>
+ <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="&Next">
+ <Publish Event="Remove" Value="DBInstance">CreateOrUpgradeChoice = "Upgrade" </Publish>
+ <Publish Event="AddLocal" Value="DBInstance">CreateOrUpgradeChoice = "Create"</Publish>
+ <Publish Property="WIXUI_EXITDIALOGOPTIONALCHECKBOX" Value="[NonExistentProperty]">CreateOrUpgradeChoice = "Create"</Publish>
+ <Publish Property="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="[NonExistentProperty]">CreateOrUpgradeChoice = "Create"</Publish>
+ <Publish Property="WIXUI_EXITDIALOGOPTIONALCHECKBOX" Value="1">CreateOrUpgradeChoice = "Upgrade"</Publish>
+ <Publish Event="NewDialog" Value="CustomizeDlg">1</Publish>
+ </Control>
+ <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="Cancel">
+ <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+ </Control>
+ <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="WixUI_Bmp_Banner" />
+ <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes">
+ <Text>Create or upgrade database instance</Text>
+ </Control>
+ <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+ <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
+ <Text>{\WixUI_Font_Title}[ProductName] setup</Text>
+ </Control>
+ <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
+ </Dialog>
+
+ <!-- Feedback dialog -->
+ <Dialog Id="Feedback" Width="370" Height="270" Title="[ProductName] Setup" NoMinimize="yes">
+
+ <Control Id="CheckBoxFeedback" Type="CheckBox" X="8" Y="61" Width="360" Height="12" Property="FEEDBACK" CheckBoxValue="1" TabSkip="no">
+ <Text>{\Font1}Enable the Feedback plugin and submit anonymous usage information</Text>
+ </Control>
+
+ <Control Id="Text" Type="Text" X="23" Y="82" Width="290" Height="55">
+ <Text>Monty Program has created a Feedback plugin for MariaDB which, if enabled, collects basic anonymous statistical information. This information is used by the developers to improve MariaDB. Enabling this plugin is an easy way to help with MariaDB development. Collected statistics, and more information on the plugin, can be viewed at http://mariadb.org/feedback_plugin </Text>
+ </Control>
+
+ <Control Id="MoreInfo" Type="PushButton" X="23" Y="140" Width="56" Height="17" Text="More Info" ToolTip="http://mariadb.org/feedback_plugin" >
+ <Publish Property="WixShellExecTarget" Value="http://mariadb.org/feedback_plugin" Order="1">1</Publish>
+ <Publish Event="DoAction" Value="LaunchUrl" Order="2">1</Publish>
+ </Control>
+
+
+ <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&Back">
+ <Publish Event="NewDialog" Value="ServicePortDlg">1</Publish>
+ </Control>
+ <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="&Next">
+ <Publish Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+ </Control>
+ <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="Cancel">
+ <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+ </Control>
+ <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="WixUI_Bmp_Banner" />
+ <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes">
+ <Text>Submit usage information</Text>
+ </Control>
+ <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+ <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
+ <Text>{\WixUI_Font_Title}[ProductName] setup</Text>
+ </Control>
+ <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
+ </Dialog>
+
+ <!-- Error popup dialog -->
+ <Dialog Id="WarningDlg" Width="320" Height="85" Title="[ProductName] Setup" NoMinimize="yes">
+ <Control Id="Icon" Type="Icon" X="15" Y="15" Width="24" Height="24"
+ ToolTip="Information icon" FixedSize="yes" IconSize="32" Text="WixUI_Ico_Info" />
+ <Control Id="Ok" Type="PushButton" X="132" Y="57" Width="56" Height="17"
+ Default="yes" Cancel="yes" Text="OK">
+ <Publish Property="WarningText">1</Publish>
+ <Publish Event="EndDialog" Value="Return">1</Publish>
+ </Control>
+ <Control Id="Text" Type="Text" X="48" Y="15" Width="260" Height="30">
+ <Text>[WarningText]</Text>
+ </Control>
+ </Dialog>
+
+
+ <Property Id="ModifyRootPassword" Value="1"/>
+ <TextStyle Id="Font1" FaceName="Tahoma" Size="8" Red="0" Green="0" Blue="0" Bold="yes" />
+
+ <!-- Root password plus default user dialog -->
+ <Dialog Id="UserSettingsDlg" X="50" Y="50" Width="370" Height="270" Title="User settings">
+ <Control Id="EditRootPassword" Type="Edit" X="104" Y="82" Width="91" Height="15" Property="PASSWORD" Password="yes" TabSkip="no">
+ <Text>{100}</Text>
+ <Condition Action="enable">ModifyRootPassword</Condition>
+ <Condition Action="disable">NOT ModifyRootPassword</Condition>
+ </Control>
+ <Control Id="EditRootPasswordConfirm" Type="Edit" X="104" Y="103" Width="91" Height="15" Property="RootPasswordConfirm" Password="yes" TabSkip="no">
+ <Text>{100}</Text>
+ <Condition Action="enable">ModifyRootPassword</Condition>
+ <Condition Action="disable">NOT ModifyRootPassword</Condition>
+ </Control>
+
+ <Control Id="CheckBoxModifyRootPassword" Type="CheckBox" X="8" Y="62" Width="222" Height="18" Property="ModifyRootPassword" CheckBoxValue="1" TabSkip="no">
+ <Text>{\Font1}Modify password for database user 'root'</Text>
+ <Publish Property="PASSWORD" >NOT ModifyRootPassword</Publish>
+ <Publish Property="RootPasswordConfirm">NOT ModifyRootPassword</Publish>
+ <Publish Property="ALLOWREMOTEROOTACCESS">NOT ModifyRootPassword</Publish>
+ <Publish Property="ALLOWREMOTEROOTACCESS" Value="1">ModifyRootPassword</Publish>
+ </Control>
+
+ <Control Id="Text5" Type="Text" X="23" Y="82" Width="77" Height="14" TabSkip="yes">
+ <Text>New root password:</Text>
+ </Control>
+ <Control Id="Text6" Type="Text" X="201" Y="85" Width="100" Height="17" TabSkip="yes">
+ <Text>Enter new root password</Text>
+ </Control>
+ <Control Id="Text8" Type="Text" X="23" Y="105" Width="75" Height="17" TabSkip="yes">
+ <Text>Confirm:</Text>
+ </Control>
+
+ <Control Id="Text10" Type="Text" X="201" Y="104" Width="100" Height="17" TabSkip="yes">
+ <Text>Retype the password</Text>
+ </Control>
+ <Control Id="CheckBoxALLOWREMOTEROOTACCESS" Type="CheckBox" X="23" Y="122" Width="196" Height="18" Property="ALLOWREMOTEROOTACCESS"
+ CheckBoxValue="--allow-remote-root-access" TabSkip="no">
+ <Text>{\Font1}Enable access from remote machines for 'root' user</Text>
+ <Condition Action="enable">ModifyRootPassword</Condition>
+ <Condition Action="disable">NOT ModifyRootPassword</Condition>
+ </Control>
+
+ <Control Id="CheckBoxCreateDefaultUser" Type="CheckBox" X="8" Y="154" Width="200" Height="18" Property="DEFAULTUSER"
+ CheckBoxValue="--default-user" TabSkip="no">
+ <Text>{\Font1}Create An Anonymous Account</Text>
+ </Control>
+ <Control Id="Text14" Type="Text" X="21" Y="174" Width="268" Height="16" TabSkip="yes">
+ <Text>This option will create an anonymous account on this server. </Text>
+ </Control>
+ <Control Id="Text13" Type="Text" X="21" Y="190" Width="254" Height="24" TabSkip="yes">
+ <Text>Please note: this setting can lead to insecure systems.</Text>
+ </Control>
+
+ <Control Id="CheckBoxUTF8" Type="CheckBox" X="8" Y="215" Width="250" Height="18" Property="UTF8" CheckBoxValue="1" TabSkip="no">
+ <Text>{\Font1}Use UTF8 as default server's character set</Text>
+ </Control>
+
+ <!-- Navigation buttons-->
+ <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&Back">
+ <Publish Event="NewDialog" Value="CustomizeDlg">1</Publish>
+ </Control>
+ <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="&Next">
+ <Publish Property="WarningText" Value="Passwords do not match."><![CDATA[PASSWORD <> RootPasswordConfirm]]></Publish>
+ <Publish Event="SpawnDialog" Value="WarningDlg"><![CDATA[WarningText <>""]]></Publish>
+ <Publish Property="SERVICENAME" Value="MySQL">NOT SERVICENAME AND NOT WarningText</Publish>
+ <Publish Event="NewDialog" Value="ServicePortDlg"><![CDATA[WarningText=""]]></Publish>
+ <Condition Action="enable"><![CDATA[NOT ModifyRootPassword OR PASSWORD]]> </Condition>
+ <Condition Action="disable"><![CDATA[ModifyRootPassword AND (NOT PASSWORD)]]> </Condition>
+ </Control>
+ <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="Cancel">
+ <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+ </Control>
+ <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="WixUI_Bmp_Banner" />
+ <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes">
+ <Text> [ProductName] database configuration</Text>
+ </Control>
+ <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+ <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
+ <Text>{\WixUI_Font_Title}Default instance properties</Text>
+ </Control>
+ <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
+ </Dialog>
+
+ <Property Id="InstallService" Value="1"/>
+ <Property Id="EnableNetworking" Value="1"/>
+
+ <!-- Service and port configuration -->
+ <Dialog Id="ServicePortDlg" Width="370" Height="270" Title="Database settings">
+ <Control Id="InstallAsService" Type="CheckBox" X="9" Y="61" Width="222" Height="19" Property="InstallService" CheckBoxValue="1" TabSkip="no">
+ <Text>{\Font1}Install as service</Text>
+ </Control>
+ <Control Id="EditServiceName" Type="Edit" X="104" Y="82" Width="91" Height="15" Property="SERVICENAME" TabSkip="no">
+ <Text>{20}</Text>
+ <Condition Action="enable">InstallService</Condition>
+ <Condition Action="disable">Not InstallService</Condition>
+ </Control>
+ <Control Id="Text5" Type="Text" X="25" Y="82" Width="77" Height="14" TabSkip="yes">
+ <Text>Service Name:</Text>
+ </Control>
+ <Control Id="CheckBoxEnableNetworking" Type="CheckBox" Height="18" Width="102" X="9" Y="117" Property="EnableNetworking" CheckBoxValue="1">
+ <Text>{\Font1}Enable networking</Text>
+ <!--<Publish Property="PORT">NOT EnableNetworking</Publish>-->
+ <Publish Property="SKIPNETWORKING" Value="--skip-networking">NOT EnableNetworking</Publish>
+ <Publish Property="SKIPNETWORKING">EnableNetworking</Publish>
+ </Control>
+ <Control Id="LabelTCPPort" Type="Text" Height="17" Width="75" X="25" Y="142" Text="TCP port:" />
+ <Control Id="Port" Type="MaskedEdit" X="104" Y="140" Width="28" Height="15" Property="PORT" Sunken="yes" Text="[PortTemplate]">
+ <Condition Action="enable" >EnableNetworking</Condition>
+ <Condition Action="disable">Not EnableNetworking</Condition>
+ </Control>
+
+ <?if $(var.HaveInnodb) = "1" ?>
+ <Control Id="CheckBoxStandardConfig" Type="CheckBox" Height="18" Width="220" X="9" Y="171" Property="STDCONFIG" CheckBoxValue="1">
+ <Text>{\Font1}Optimize for transactions</Text>
+ </Control>
+
+ <Control Id="StandardConfigExplain" Type="Text" X="25" Y="190" Width="270" Height="14" TabSkip="yes">
+ <Text>(Uses transactional storage engine and "strict" SQL mode)</Text>
+ <Condition Action="enable" >STDCONFIG</Condition>
+ <Condition Action="disable">Not STDCONFIG</Condition>
+ </Control>
+ <Control Id="LabelInnodbBufferpool" Type="Text" Height="17" Width="77" X="25" Y="210" Text="Buffer pool size:" >
+ <Condition Action="enable" >STDCONFIG</Condition>
+ <Condition Action="disable">Not STDCONFIG</Condition>
+ </Control>
+ <Control Id="BPSize" Type="MaskedEdit" X="104" Y="208" Width="40" Height="15" Property="BUFFERPOOLSIZE" Sunken="yes" Text="[BufferPoolSizeTemplate]">
+ <Condition Action="enable" >STDCONFIG</Condition>
+ <Condition Action="disable">Not STDCONFIG</Condition>
+ </Control>
+ <Control Id="LabelMB" Type="Text" Height="17" Width="15" X="150" Y="210" Text="MB" >
+ <Condition Action="enable" >STDCONFIG</Condition>
+ <Condition Action="disable">Not STDCONFIG</Condition>
+ </Control>
+ <?endif?>
+
+ <!-- Navigation buttons-->
+ <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&Back">
+ <Publish Event="NewDialog" Value="UserSettingsDlg">1</Publish>
+ </Control>
+ <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="no" Text="&Next">
+ <Publish Property="SERVICENAME">NOT InstallService</Publish>
+ <Publish Property="WarningText" Value="Please enter valid port or uncheck 'Enable Networking' checkbox">
+ <![CDATA[EnableNetworking AND NOT PORT AND NOT WarningText]]>
+ </Publish>
+ <Publish Property="WarningText" Value="Please enter valid service name port or uncheck 'Install Service' checkbox">
+ <![CDATA[InstallService AND NOT SERVICENAME AND NOT WarningText]]>
+ </Publish>
+ <Publish Event="DoAction" Value="CheckDatabaseProperties">NOT WarningText</Publish>
+ <Publish Event="SpawnDialog" Value="WarningDlg">WarningText</Publish>
+ <Publish Event="NewDialog" Value="Feedback">Not WarningText</Publish>
+ </Control>
+ <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="no" Text="Cancel">
+ <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+ </Control>
+ <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="WixUI_Bmp_Banner" />
+ <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes">
+ <Text>[ProductName] database configuration</Text>
+ </Control>
+ <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="2" />
+ <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
+ <Text>{\WixUI_Font_Title}Default instance properties</Text>
+ </Control>
+ <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="2" />
+ </Dialog>
+ </UI>
+
+ <Property Id="CRLF" Value="
" />
+ <CustomAction Id="CheckDataDirectoryEmpty" BinaryKey="wixca.dll" DllEntry="CheckDataDirectoryEmpty" Execute="immediate" Impersonate="yes"/>
+ <!-- What to do when navigation buttons are clicked -->
+ <UI Id="MyWixUI_Mondo">
+ <UIRef Id="WixUI_FeatureTree" />
+ <UIRef Id="WixUI_ErrorProgressText" />
+ <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="999">
+ OLDERVERSIONBEINGUPGRADED
+ </Publish>
+ <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="NewOrUpgradeInstanceDlg" Order="999">
+ NOT Installed AND UpgradableServiceFound
+ </Publish>
+
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="Feedback" Order="3" ><![CDATA[&DBInstance=3 AND NOT !DBInstance=3]]></Publish>
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="3"> <![CDATA[OLDERVERSIONBEINGUPGRADED <>""]]></Publish>
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="ConfirmDataCleanupDlg" Order="1" ><![CDATA[(&DBInstance=2) AND (!DBInstance=3)]]></Publish>
+
+
+ <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="NewOrUpgradeInstanceDlg" Order="999">
+ NOT Installed AND UpgradableServiceFound
+ </Publish>
+ <Publish Dialog="CustomizeDlg" Control="Next" Event="DoAction" Value="CheckDataDirectoryEmpty" Order="1"><![CDATA[&DBInstance=3 AND NOT !DBInstance=3]]></Publish>
+ <Publish Dialog="CustomizeDlg" Property="DATADIRNOTEMPTY" Control="Next" Order="1"><![CDATA[NOT(&DBInstance=3 AND NOT !DBInstance=3)]]></Publish>
+ <Publish Dialog="CustomizeDlg" Control="Next" Property="WarningText" Order="2"
+ Value="Selected data directory [DATADIR] is not empty. Either clean it, or choose another location for 'Database Instance' feature.">
+ DATADIRNOTEMPTY
+ </Publish>
+ <Publish Dialog="CustomizeDlg" Control="Next" Event="SpawnDialog" Value="WarningDlg" Order="3">WarningText</Publish>
+ <Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="ConfirmDataCleanupDlg" Order="4">
+ <![CDATA[(&DBInstance=2) AND (!DBInstance=3)]]>
+ </Publish>
+ <Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="UserSettingsDlg" Order="5">
+ <![CDATA[&DBInstance=3 AND NOT !DBInstance=3 AND NOT WarningText]]>
+ </Publish>
+
+ <Publish Dialog="ConfirmDataCleanupDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg">WixUI_InstallMode = "Change"</Publish>
+ <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="ConfirmDataCleanupDlg" Order="999">
+ !DBInstance=3 AND (CLEANUPDATA Or USECONFIRMDATACLEANUPDLG)
+ </Publish>
+ <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Property="USECONFIRMDATACLEANUPDLG" Value="1" Order="999">
+ !DBInstance=3 AND CLEANUPDATA
+ </Publish>
+ <Publish Dialog="ConfirmDataCleanupDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg">WixUI_InstallMode = "Remove"</Publish>
+ </UI>
+
+ <!-- End of UI section -->
+
+ <!-- Extra folders we need (DATADIR and shortcut folder) -->
+ <DirectoryRef Id='INSTALLDIR'>
+ <Directory Id="DATADIR" Name="data">
+ </Directory>
+ <Directory Id="ProgramMenuFolder">
+ <Directory Id="ShortcutFolder" Name="@CPACK_WIX_PACKAGE_NAME@">
+ </Directory>
+ </Directory>
+ </DirectoryRef>
+
+
+ <!-- Extra feature (database instance). This could be split to several subfeatures if desired (e.g firewall exception)-->
+ <Feature Id='DBInstance'
+ Title='Database instance'
+ Description=
+ 'Install database instance. Only new database can be installed with this feature.'
+ ConfigurableDirectory='DATADIR'
+ AllowAdvertise='no'
+ Level='1'>
+
+ <!-- Data directory with some reasonable security settings -->
+ <Component Id="C.datadir" Guid="*" Directory="DATADIR">
+ <RegistryValue Root='HKLM'
+ Key='SOFTWARE\@MANUFACTURER@\@CPACK_WIX_PACKAGE_NAME@'
+ Name='DATADIR' Value='[DATADIR]' Type='string' KeyPath='yes'/>
+ <CreateFolder>
+ <util:PermissionEx User="[LogonUser]" GenericAll="yes" />
+ <util:PermissionEx User="NetworkService" GenericAll="yes" />
+ </CreateFolder>
+ </Component>
+
+ <!-- Database service conditioned on SERVICENAME property-->
+ <Component Id="C.service" Guid="*" Directory="DATADIR">
+ <Condition>SERVICENAME</Condition>
+ <RegistryValue Root='HKLM'
+ Key='SOFTWARE\@MANUFACTURER@\@CPACK_WIX_PACKAGE_NAME@'
+ Name='SERVICENAME' Value='[SERVICENAME]' Type='string' KeyPath='yes'/>
+ <ServiceControl Id='DBInstanceServiceStop' Name='[SERVICENAME]' Stop='both' Remove='uninstall' Wait='yes'/>
+ <ServiceControl Id='DBInstanceServiceStart' Name='[SERVICENAME]' Start='install' Wait='yes'/>
+ </Component>
+ <?if $(var.HaveInnodb) = "1" ?>
+ <Component Id="C.myiniconfig" Guid="*" Directory="DATADIR">
+ <Condition>STDCONFIG</Condition>
+ <RegistryValue Root='HKLM'
+ Key='SOFTWARE\@MANUFACTURER@\@CPACK_WIX_PACKAGE_NAME@'
+ Name='STDCONFIG' Value='1' Type='string' KeyPath='yes'/>
+ <IniFile Id="Ini1"
+ Action="createLine"
+ Directory="DATADIR"
+ Section="mysqld"
+ Name="my.ini"
+ Key="sql_mode"
+ Value=""STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION"" />
+ <IniFile Id="Ini2"
+ Action="createLine"
+ Directory="DATADIR"
+ Section="mysqld"
+ Name="my.ini"
+ Key="default_storage_engine"
+ Value="innodb" />
+ <IniFile Id="Ini3"
+ Action="createLine"
+ Directory="DATADIR"
+ Section="mysqld"
+ Name="my.ini"
+ Key="innodb_buffer_pool_size"
+ Value="[BUFFERPOOLSIZE]M" />
+ <IniFile Id="Ini4"
+ Action="createLine"
+ Directory="DATADIR"
+ Section="mysqld"
+ Name="my.ini"
+ Key="innodb_log_file_size"
+ Value="[LOGFILESIZE]M" />
+ </Component>
+ <?endif?>
+
+ <Component Id="C.feedback" Guid="*" Directory="DATADIR">
+ <Condition>FEEDBACK</Condition>
+ <RegistryValue Root='HKLM'
+ Key='SOFTWARE\@MANUFACTURER@\@CPACK_WIX_PACKAGE_NAME@'
+ Name='FEEDBACK' Value='1' Type='string' KeyPath='yes'/>
+ <IniFile Id="Ini5"
+ Action="createLine"
+ Directory="DATADIR"
+ Section="mysqld"
+ Name="my.ini"
+ Key="feedback"
+ Value="ON" />
+ </Component>
+
+ <Component Id="C.utf8" Guid="*" Directory="DATADIR">
+ <Condition>UTF8</Condition>
+ <RegistryValue Root='HKLM'
+ Key='SOFTWARE\@MANUFACTURER@\@CPACK_WIX_PACKAGE_NAME@'
+ Name='UTF8' Value='1' Type='string' KeyPath='yes'/>
+ <IniFile Id="Ini6"
+ Action="createLine"
+ Directory="DATADIR"
+ Section="mysqld"
+ Name="my.ini"
+ Key="character-set-server"
+ Value="utf8" />
+ </Component>
+
+ <!--- Grant service account permission to the database folder (Windows 7 and later) -->
+ <Component Id="C.serviceaccount.permission" Guid="*" Directory='DATADIR' Transitive='yes'>
+ <Condition><![CDATA[SERVICENAME AND (VersionNT > 600)]]></Condition>
+ <RegistryValue Root='HKLM'
+ Key='SOFTWARE\@MANUFACTURER@\@CPACK_WIX_PACKAGE_NAME@'
+ Name='servicepermission' Value='1' Type='string' KeyPath='yes'/>
+ <CreateFolder>
+ <util:PermissionEx User="NT SERVICE\[SERVICENAME]" GenericAll="yes" />
+ </CreateFolder>
+ </Component>
+
+ <!-- Shortcuts in program menu (mysql client etc) -->
+ <Component Id="c.shortcuts" Guid="*" Directory="ShortcutFolder">
+ <!-- shortcut to my.ini-->
+ <RegistryValue Root="HKCU" Key="Software\@CPACK_WIX_PACKAGE_NAME@\Uninstall" Name="shortcuts" Value="1" Type="string" KeyPath="yes" />
+ <RemoveFolder Id="RemoveShorcutFolder" On="uninstall" />
+ <Shortcut Id="shortcut.my.ini"
+ Name="my.ini (@CPACK_WIX_PACKAGE_NAME@)"
+ Target="[System64Folder]notepad.exe"
+ Arguments=""[DATADIR]my.ini""
+ Directory="ShortcutFolder"
+ Description="Edit database configuration" />
+ <Shortcut Id="shortcut.errorlog"
+ Name="Error log (@CPACK_WIX_PACKAGE_NAME@)"
+ Target="[System64Folder]notepad.exe"
+ Arguments=""[DATADIR][ComputerName].err""
+ Directory="ShortcutFolder"
+ Description="View Database Error log" />
+ <Shortcut Id="shortcut.dbfolder" Name="Database directory (@CPACK_WIX_PACKAGE_NAME@)"
+ Target="[DATADIR]" />
+ </Component>
+
+ <!-- add reference so mysql client won't get uninstalled and we have a shortcut pointing to nowhere-->
+ <ComponentRef Id="C.bin.mysql.exe"/>
+
+ <Component Id="c.shortcuts.commandline" Guid="*" Directory="ShortcutFolder">
+ <RegistryValue
+ Root="HKCU" Key="Software\@CPACK_WIX_PACKAGE_NAME@\Uninstall"
+ Name="shortcuts.commandline"
+ Value="1" Type="string" KeyPath="yes" />
+ <!-- shortcut to client-->
+ <Shortcut Id="shortcut.mysql.exe"
+ Name="MySQL Client (@CPACK_WIX_PACKAGE_NAME@)"
+ Target="[System64Folder]cmd.exe"
+ Arguments="/k " "[D.bin]mysql.exe" "--defaults-file=[DATADIR]my.ini" -uroot -p""
+ Directory="ShortcutFolder"
+ WorkingDirectory="D.bin"
+ Description="Starts mysql.exe for root user" />
+ </Component>
+ <Component Id="c.shortcuts.commandprompt.db" Guid="*" Directory="ShortcutFolder" Transitive="yes">
+ <Condition>SERVICENAME</Condition>
+ <RegistryValue
+ Root="HKCU" Key="Software\@CPACK_WIX_PACKAGE_NAME@\Uninstall"
+ Name="shortcuts.commandprompt.db"
+ Value="1" Type="string" KeyPath="yes" />
+ <!-- just command prompt in the bin directory (so all utilities can be called) -->
+ <Shortcut Id="shortcut.commandprompt.exe.db"
+ Name="Command Prompt (@CPACK_WIX_PACKAGE_NAME@)"
+ Target="[System64Folder]cmd.exe"
+ Directory="ShortcutFolder"
+ Arguments="/k "set MYSQL_HOME=[DATADIR]&& set PATH=[D.bin];%PATH%;&&echo Setting environment for [ProductName] ""
+ Description="Opens command line in the installation bin directory" />
+ </Component>
+
+
+ </Feature>
+
+ <Feature Id="SharedClientServerComponents"
+ Title='Utilities used by both server and client.'
+ Description=
+ 'Client utilities that are also used with server.Required for upgrade.'
+ ConfigurableDirectory='INSTALLDIR'
+ AllowAdvertise='no'
+ Level='1'
+ Display='hidden'>
+ <ComponentRef Id='C.bin.mysql.exe'/>
+ <ComponentRef Id='C.bin.mysqladmin.exe'/>
+ <ComponentRef Id='C.bin.mysql_upgrade.exe'/>
+ <ComponentRef Id='C.bin.mysqlcheck.exe'/>
+ <Component Id="c.shortcuts.commandprompt.nodb" Guid="*" Directory="ShortcutFolder" Transitive="yes">
+ <Condition>NOT SERVICENAME</Condition>
+ <RegistryValue
+ Root="HKCU" Key="Software\@CPACK_WIX_PACKAGE_NAME@\Uninstall"
+ Name="shortcuts.commandprompt.nodb"
+ Value="1" Type="string" KeyPath="yes" />
+ <!-- just command prompt in the bin directory (so all utilities can be called) -->
+ <Shortcut Id="shortcut.commandprompt.exe.nodb"
+ Name="Command Prompt (@CPACK_WIX_PACKAGE_NAME@)"
+ Target="[System64Folder]cmd.exe"
+ Directory="ShortcutFolder"
+ Arguments="/k "set PATH=[D.bin];%PATH%;&&echo Setting environment for [ProductName] ""
+ Description="Opens command line in the installation bin directory" />
+ </Component>
+ <?if $(var.HaveUpgradeWizard) != "0" ?>
+ <ComponentRef Id='C.bin.mysql_upgrade_wizard.exe'/>
+ <!--
+ <Component Id="c.shortcuts.upgrade_wizard" Guid="*" Directory="ShortcutFolder" Transitive="yes">
+ <RegistryValue
+ Root="HKCU" Key="Software\@CPACK_WIX_PACKAGE_NAME@\Uninstall"
+ Name="shortcuts.upgrade_wizard"
+ Value="1" Type="string" KeyPath="yes" />
+ <Shortcut Id="shortcut.upgrade_wizard"
+ Name="Upgrade Wizard (@CPACK_WIX_PACKAGE_NAME@)"
+ Target="[INSTALLDIR]bin\mysql_upgrade_wizard.exe"
+ Directory="ShortcutFolder"
+ Description="Upgrades older instances of MariaDB/MySQL services to version @MAJOR_VERSION at .@MINOR_VERSION@"
+ Advertise="no"/>
+ </Component>
+ -->
+ <?endif?>
+ </Feature>
+
+ <!-- Optional 3rd party tools -->
+ <DirectoryRef Id='TARGETDIR'>
+ <Directory Id='CommonFilesFolder'>
+ <Directory Id='MariaDBShared' Name='MariaDBShared'/>
+ </Directory>
+ <Directory Id='DesktopFolder'/>
+ </DirectoryRef>
+
+
+ <?if "@WITH_THIRD_PARTY@" != "" ?>
+
+ <!-- Include definition of 3party components -->
+ <?foreach tool in @WITH_THIRD_PARTY@ ?>
+ <?include "${CMAKE_CURRENT_BINARY_DIR}\$(var.tool).wxi" ?>
+ <?endforeach ?>
+
+ <Feature Id="ThirdPartyTools"
+ Title='Third party tools'
+ Description= 'Third party tools'
+ AllowAdvertise='no'
+ Level='1'
+ Display='expand'>
+ @THIRD_PARTY_FEATURE_CONDITION@
+ <!-- Include definition of 3rd party features -->
+ <?foreach tool in @WITH_THIRD_PARTY@ ?>
+ <?include "${CMAKE_CURRENT_BINARY_DIR}\$(var.tool)_feature.wxi" ?>
+ <?endforeach ?>
+
+ </Feature>
+
+ <?endif ?>
+
+ <!-- Custom action, call mysql_install_db -->
+ <SetProperty Sequence='execute' Before='CreateDatabaseCommand' Id="SKIPNETWORKING" Value="--skip-networking" >SKIPNETWORKING</SetProperty>
+ <SetProperty Sequence='execute' Before='CreateDatabaseCommand' Id="ALLOWREMOTEROOTACCESS" Value="--allow-remote-root-access">ALLOWREMOTEROOTACCESS</SetProperty>
+ <SetProperty Sequence='execute' Before='CreateDatabaseCommand' Id="DEFAULTUSER" Value="--default-user">DEFAULTUSER</SetProperty>
+ <CustomAction Id='CheckDatabaseProperties' BinaryKey='wixca.dll' DllEntry='CheckDatabaseProperties' />
+ <CustomAction Id='PresetDatabaseProperties' BinaryKey='wixca.dll' DllEntry='PresetDatabaseProperties' />
+ <CustomAction Id="CreateDatabaseCommand" Property="CreateDatabase"
+ Value=
+ ""[#F.bin.mysql_install_db.exe]" "--service=[SERVICENAME]" --port=[PORT] "--password=[ESCAPEDPASSWORD]" "--datadir=[DATADIR]\" [SKIPNETWORKING] [ALLOWREMOTEROOTACCESS] [DEFAULTUSER] --verbose-bootstrap"
+ Execute="immediate"
+ HideTarget="yes"
+ />
+ <CustomAction Id="CreateDatabaseRollbackCommand" Property="CreateDatabaseRollback"
+ Value="[SERVICENAME]\[DATADIR]"
+ Execute="immediate"/>
+ <CustomAction Id="CreateDatabase" BinaryKey="WixCA" DllEntry="CAQuietExec"
+ Execute="deferred" Return="check" Impersonate="no" />
+ <CustomAction Id="CreateDatabaseRollback" BinaryKey="wixca.dll" DllEntry="CreateDatabaseRollback"
+ Execute="rollback" Return="check" Impersonate="no"/>
+ <UI>
+ <ProgressText Action="CreateDatabase">Running mysql_install_db.exe</ProgressText>
+ </UI>
+
+ <!-- Error injection script activated by TEST_FAIL=1 passed to msiexec (to see how good custom action rollback works) -->
+ <Property Id="FailureProgram">
+ <![CDATA[
+ Function Main()
+ Main = 3
+ End Function
+ ]]>
+ </Property>
+ <CustomAction Id="FakeFailure"
+ VBScriptCall="Main"
+ Property="FailureProgram"
+ Execute="deferred" />
+
+ <CustomAction Id='ErrorDataDirNotEmpty'
+ Error='Chosen data directory [DATADIR] is not empty. It must be empty prior to installation.'/>
+ <InstallExecuteSequence>
+ <Custom Action="CheckDataDirectoryEmpty" After="CostFinalize">
+ <![CDATA[&DBInstance=3 AND NOT !DBInstance=3 AND OLDERVERSIONBEINGUPGRADED=""]]>
+ </Custom>
+ <Custom Action="ErrorDataDirNotEmpty" After="CheckDataDirectoryEmpty" >DATADIRNOTEMPTY</Custom>
+ <Custom Action="CheckDatabaseProperties" Before="CreateDatabaseCommand">SERVICENAME</Custom>
+ <Custom Action="CreateDatabaseCommand" After="CostFinalize" >
+ <![CDATA[&DBInstance=3 AND NOT !DBInstance=3 AND OLDERVERSIONBEINGUPGRADED=""]]>
+ </Custom>
+ <Custom Action="CreateDatabase" After="InstallFiles">
+ <![CDATA[&DBInstance=3 AND NOT !DBInstance=3 AND OLDERVERSIONBEINGUPGRADED=""]]>
+ </Custom>
+ <Custom Action="CreateDatabaseRollbackCommand" After="CostFinalize">
+ <![CDATA[&DBInstance=3 AND NOT !DBInstance=3 AND OLDERVERSIONBEINGUPGRADED=""]]>
+ </Custom>
+ <Custom Action="CreateDatabaseRollback" Before="CreateDatabase">
+ <![CDATA[&DBInstance=3 AND NOT !DBInstance=3 AND OLDERVERSIONBEINGUPGRADED=""]]>
+ </Custom>
+ <Custom Action='FakeFailure' Before='InstallFinalize'>
+ <![CDATA[&DBInstance=3 AND NOT !DBInstance=3 AND OLDERVERSIONBEINGUPGRADED="" AND TESTFAIL]]>
+ </Custom>
+ </InstallExecuteSequence>
+
+
+ <!-- Custom action to remove data on uninstall -->
+ <Binary Id='wixca.dll' SourceFile='@WIXCA_LOCATION@' />
+ <CustomAction Id="RemoveDataDirectory.SetProperty" Return="check"
+ Property="RemoveDataDirectory" Value="[DATADIR]" />
+ <CustomAction Id="RemoveDataDirectory" BinaryKey="wixca.dll"
+ DllEntry="RemoveDataDirectory"
+ Execute="deferred"
+ Impersonate="no"
+ Return="ignore" />
+ <InstallExecuteSequence>
+ <Custom Action="RemoveDataDirectory.SetProperty" After="CreateDatabaseCommand" >
+ <![CDATA[($C.datadir=2) AND (CLEANUPDATA) AND NOT UPGRADINGPRODUCTCODE]]>
+ </Custom>
+ <Custom Action="RemoveDataDirectory" Before="RemoveFiles">
+ <![CDATA[($C.datadir=2) AND (CLEANUPDATA) AND NOT UPGRADINGPRODUCTCODE]]>
+ </Custom>
+ </InstallExecuteSequence>
+
+ <InstallExecuteSequence>
+ <StopServices>SERVICENAME</StopServices>
+ <DeleteServices>SERVICENAME</DeleteServices>
+ </InstallExecuteSequence>
+ <CustomAction Id="CheckDBInUse" Return="ignore"
+ BinaryKey="wixca.dll" DllEntry="CheckDBInUse" Execute="firstSequence"/>
+ <InstallExecuteSequence>
+ <Custom Action="CheckDBInUse" Before="LaunchConditions">Installed</Custom>
+ <Custom Action="PresetDatabaseProperties" After="CheckDBInUse"></Custom>
+ </InstallExecuteSequence>
+ <InstallUISequence>
+ <Custom Action="CheckDBInUse" Before="LaunchConditions">Installed</Custom>
+ <Custom Action="PresetDatabaseProperties" After="CheckDBInUse"></Custom>
+ </InstallUISequence>
+
+ <!-- Store some properties persistently in registry, mainly for upgrades -->
+
+ <Feature Id='StoreInstallLocation' Level='1' Absent='disallow' Display='hidden'>
+ <Component Directory='INSTALLDIR' Guid='*' Id='C.storeinstalllocation'>
+ <RegistryValue Root='HKLM' Key='SOFTWARE\@MANUFACTURER@\@CPACK_WIX_PACKAGE_NAME@'
+ Name='INSTALLDIR' Value='[INSTALLDIR]' Type='string' KeyPath='yes'/>
+ </Component>
+ </Feature>
+
+ <?foreach STOREDVAR in SERVICENAME;DATADIR;INSTALLDIR?>
+
+ <Property Id='$(var.STOREDVAR)' Secure='yes'>
+ <RegistrySearch Id='$(var.STOREDVAR)Property' Root='HKLM'
+ Key='SOFTWARE\@MANUFACTURER@\@CPACK_WIX_PACKAGE_NAME@'
+ Name='$(var.STOREDVAR)' Type='raw' />
+ </Property>
+ <CustomAction Id='SaveCmdLineValue_$(var.STOREDVAR)' Property='CMDLINE_$(var.STOREDVAR)'
+ Value='[$(var.STOREDVAR)]' Execute='firstSequence' />
+ <CustomAction Id='SetFromCmdLineValue_$(var.STOREDVAR)' Property='$(var.STOREDVAR)'
+ Value='[CMDLINE_$(var.STOREDVAR)]' Execute='firstSequence' />
+ <InstallUISequence>
+ <Custom Action='SaveCmdLineValue_$(var.STOREDVAR)' Before='AppSearch' />
+ <Custom Action='SetFromCmdLineValue_$(var.STOREDVAR)' After='AppSearch'>CMDLINE_$(var.STOREDVAR)</Custom>
+ </InstallUISequence>
+ <InstallExecuteSequence>
+ <Custom Action='SaveCmdLineValue_$(var.STOREDVAR)' Before='AppSearch' />
+ <Custom Action='SetFromCmdLineValue_$(var.STOREDVAR)' After='AppSearch'>CMDLINE_$(var.STOREDVAR)</Custom>
+ </InstallExecuteSequence>
+
+ <?endforeach?>
+
+ <!--
+ Optionally, start upgrade wizard on exit.
+ -->
+
+
+
+ <?if $(var.HaveUpgradeWizard) != "0" ?>
+ <UI>
+ <Publish Dialog="ExitDialog"
+ Control="Finish"
+ Event="DoAction"
+ Value="LaunchApplication">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish>
+ </UI>
+ <Property
+ Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT"
+ Value="Launch wizard to upgrade existing MariaDB or MySQL services." />
+ <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOX" Value="0"/>
+ <Property Id="WixShellExecTarget" Value="[#F.bin.mysql_upgrade_wizard.exe]" />
+ <CustomAction Id="LaunchApplication"
+ BinaryKey="WixCA"
+ DllEntry="WixShellExec"
+ Impersonate="yes" />
+ <CustomAction
+ Id="CheckServiceUpgrades" Return="ignore" BinaryKey="wixca.dll"
+ DllEntry="CheckServiceUpgrades"
+ Execute="immediate" />
+ <InstallUISequence>
+ <Custom Action="CheckServiceUpgrades" After="CostFinalize">
+ $C.bin.mysql_upgrade_wizard.exe = 3 AND NOT Installed AND NOT OLDERVERSIONBEINGUPGRADED
+ </Custom>
+ </InstallUISequence>
+ <SetProperty Before="ExecuteAction" Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT"
+ Sequence="ui" Value="[NonExistentProperty]">
+ <![CDATA[($C.bin.mysql_upgrade_wizard.exe <> 3) AND NOT Installed OR OLDERVERSIONBEINGUPGRADED]]>
+ </SetProperty>
+ <SetProperty Before="ExecuteAction" Id="WIXUI_EXITDIALOGOPTIONALCHECKBOX"
+ Sequence="ui" Value="[NonExistentProperty]">
+ <![CDATA[($C.bin.mysql_upgrade_wizard.exe <> 3) AND NOT Installed OR OLDERVERSIONBEINGUPGRADED]]>
+ </SetProperty>
+
+ <?endif ?> <!-- HaveUpgradeWizard -->
+
+ <!--
+ Author the registry entries for "add or remove programs"
+ We choose to define ARPSYSTEMCOMPONENT to 1 because we want to show
+ "do you want to remove data directory" on uninstall
+ -->
+ <Property Id="ARPSYSTEMCOMPONENT" Value="1" Secure="yes" />
+ <Property Id="ARPINSTALLLOCATION" Secure="yes"/>
+ <SetProperty Id="ARPINSTALLLOCATION" Value="[INSTALLDIR]" After="InstallValidate" Sequence="execute"/>
+ <Feature Id='ARPRegistryEntries'
+ Title='Add or remove program entries'
+ Description='Add or remove program entries'
+ AllowAdvertise='no'
+ Absent='disallow' Display='hidden'
+ Level='1'>
+ <Component Id="C.arp_entries" Guid="*" Directory="INSTALLDIR">
+ <RemoveFolder Id="RemoveINSTALLDIR" On="uninstall"/>
+ <RegistryValue Root='HKLM'
+ Key='Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_WIX_PACKAGE_NAME@'
+ Name='DisplayName' Value='[ProductName]' Type='string' KeyPath='yes'/>
+ <RegistryValue Root='HKLM'
+ Key='Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_WIX_PACKAGE_NAME@'
+ Name='Publisher' Value='@MANUFACTURER@' Type='string'/>
+ <RegistryValue Root='HKLM'
+ Key='Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_WIX_PACKAGE_NAME@'
+ Name='DisplayVersion' Value='[ProductVersion]' Type='string'/>
+ <RegistryValue Root='HKLM'
+ Key='Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_WIX_PACKAGE_NAME@'
+ Name='InstallLocation' Value='[INSTALLDIR]' Type='string'/>
+ <RegistryValue Root='HKLM'
+ Key='Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_WIX_PACKAGE_NAME@'
+ Name='UninstallString' Value='msiexec.exe /I [ProductCode]' Type='string'/>
+ <RegistryValue Root='HKLM'
+ Key='Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_WIX_PACKAGE_NAME@'
+ Name='MajorVersion' Value='@MAJOR_VERSION@' Type='string'/>
+ <RegistryValue Root='HKLM'
+ Key='Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_WIX_PACKAGE_NAME@'
+ Name='MinorVersion' Value='@MINOR_VERSION@' Type='string'/>
+ </Component>
+ </Feature>
+
+ <!-- Extra condition to block the installer if NSIS based installation is detected-->
+ <Property Id="NSISINSTALLKEY">
+ <RegistrySearch Id='NSISKey' Type='raw'
+ Root='HKLM' Key='Software\Microsoft\Windows\CurrentVersion\Uninstall\MariaDB' Name='DisplayName' />
+ </Property>
+ <Condition
+ Message=
+ 'Previous version of MariaDB was found, that used incompatible installer.
Please remove "[NSISINSTALLKEY]" before you proceed with this installation.'
+ >
+ <![CDATA[ NOT(NSISINSTALLKEY << "MariaDB @MAJOR_VERSION at .@MINOR_VERSION at .") OR Installed]]>
+ </Condition>
+ <Condition Message=
+ 'Setting the ALLUSERS property is not allowed because [ProductName] is a per-machine application. Setup will now exit.'>
+ <![CDATA[ALLUSERS = "1"]]>
+ </Condition>
+ </Fragment>
+</Wix>
diff --git a/win/packaging/heidisql.cmake b/win/packaging/heidisql.cmake
index f9334f0..5b0cd07 100644
--- a/win/packaging/heidisql.cmake
+++ b/win/packaging/heidisql.cmake
@@ -1,23 +1,23 @@
-SET(HEIDISQL_BASE_NAME "HeidiSQL_9.1_Portable")
-SET(HEIDISQL_ZIP "${HEIDISQL_BASE_NAME}.zip")
-SET(HEIDISQL_URL "http://www.heidisql.com/downloads/releases/${HEIDISQL_ZIP}")
-SET(HEIDISQL_DOWNLOAD_DIR ${THIRD_PARTY_DOWNLOAD_LOCATION}/${HEIDISQL_BASE_NAME})
-
-IF(NOT EXISTS ${HEIDISQL_DOWNLOAD_DIR}/${HEIDISQL_ZIP})
- MAKE_DIRECTORY(${HEIDISQL_DOWNLOAD_DIR})
- MESSAGE(STATUS "Downloading ${HEIDISQL_URL} to ${HEIDISQL_DOWNLOAD_DIR}/${HEIDISQL_ZIP}")
- FILE(DOWNLOAD ${HEIDISQL_URL} ${HEIDISQL_DOWNLOAD_DIR}/${HEIDISQL_ZIP} TIMEOUT 60)
- EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E chdir ${HEIDISQL_DOWNLOAD_DIR}
- ${CMAKE_COMMAND} -E tar xfz ${HEIDISQL_DOWNLOAD_DIR}/${HEIDISQL_ZIP}
- )
-ENDIF()
-
-SET(LIBMYSQLDLL_SOURCE ${HEIDISQL_DOWNLOAD_DIR}/libmysql.dll)
-IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
- # Use our libmysql if it is 32 bit.
- IF(LIBMYSQL_LOCATION)
- SET(LIBMYSQLDLL_SOURCE "${LIBMYSQL_LOCATION}")
- ENDIF()
-ENDIF()
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/heidisql.wxi.in ${CMAKE_CURRENT_BINARY_DIR}/heidisql.wxi)
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/heidisql_feature.wxi.in ${CMAKE_CURRENT_BINARY_DIR}/heidisql_feature.wxi)
+SET(HEIDISQL_BASE_NAME "HeidiSQL_9.1_Portable")
+SET(HEIDISQL_ZIP "${HEIDISQL_BASE_NAME}.zip")
+SET(HEIDISQL_URL "http://www.heidisql.com/downloads/releases/${HEIDISQL_ZIP}")
+SET(HEIDISQL_DOWNLOAD_DIR ${THIRD_PARTY_DOWNLOAD_LOCATION}/${HEIDISQL_BASE_NAME})
+
+IF(NOT EXISTS ${HEIDISQL_DOWNLOAD_DIR}/${HEIDISQL_ZIP})
+ MAKE_DIRECTORY(${HEIDISQL_DOWNLOAD_DIR})
+ MESSAGE(STATUS "Downloading ${HEIDISQL_URL} to ${HEIDISQL_DOWNLOAD_DIR}/${HEIDISQL_ZIP}")
+ FILE(DOWNLOAD ${HEIDISQL_URL} ${HEIDISQL_DOWNLOAD_DIR}/${HEIDISQL_ZIP} TIMEOUT 60)
+ EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E chdir ${HEIDISQL_DOWNLOAD_DIR}
+ ${CMAKE_COMMAND} -E tar xfz ${HEIDISQL_DOWNLOAD_DIR}/${HEIDISQL_ZIP}
+ )
+ENDIF()
+
+SET(LIBMYSQLDLL_SOURCE ${HEIDISQL_DOWNLOAD_DIR}/libmysql.dll)
+IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
+ # Use our libmysql if it is 32 bit.
+ IF(LIBMYSQL_LOCATION)
+ SET(LIBMYSQLDLL_SOURCE "${LIBMYSQL_LOCATION}")
+ ENDIF()
+ENDIF()
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/heidisql.wxi.in ${CMAKE_CURRENT_BINARY_DIR}/heidisql.wxi)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/heidisql_feature.wxi.in ${CMAKE_CURRENT_BINARY_DIR}/heidisql_feature.wxi)
diff --git a/win/packaging/heidisql.wxi.in b/win/packaging/heidisql.wxi.in
index 6b11769..4f07a07 100644
--- a/win/packaging/heidisql.wxi.in
+++ b/win/packaging/heidisql.wxi.in
@@ -1,77 +1,77 @@
-<Include>
-<Property Id="HEIDISQLINSTALLED" Secure="yes">
-<RegistrySearch Id="HeidiSQL"
- Root="HKLM"
- Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\HeidiSQL_is1"
- Name="UninstallString"
- Type="raw"
- Win64="no"
-/>
-</Property>
-<DirectoryRef Id="MariaDBShared">
- <Directory Id="D.HeidiSQL" Name="HeidiSQL">
- <Component Id="component.HeidiSQL" Guid="96ea3879-5320-4098-8f26-2f655d2f716c" Win64="no">
-
- <File Id="heidisql.gpl.txt" Name="gpl.txt" Source="${HEIDISQL_DOWNLOAD_DIR}\gpl.txt" />
- <File Id="heidisql.heidisql.exe" Name="heidisql.exe" Source="${HEIDISQL_DOWNLOAD_DIR}\heidisql.exe" KeyPath="yes">
- <Shortcut Id="desktopHeidiSQL" Directory="DesktopFolder" Name="HeidiSQL" Advertise="yes"/>
- </File>
- <!--
- Forced file removal for heidisql.exe might be required.
- HeidiSQL is self-updating, thus the version that was installed by MSI not necessarily matches
- the version of the file on uninstall. MSI would not touch such file by default and leave it after
- uninstallation. We use RemoveFile to force delete in any case.
- -->
- <RemoveFile Id="Remove_HeidiSQL_exe" Name="heidisql.exe" On="uninstall" />
- <!-- remove readme.txt too, it's not included in HeidiSQL-9.1-Portable.zip -->
- <RemoveFile Id="Remove_readme_txt" Name="readme.txt" On="uninstall" />
-
- <File Id="heidisql.license.txt" Name="license.txt" Source="${HEIDISQL_DOWNLOAD_DIR}\license.txt" />
- </Component>
- <Component Id="component.HeidiSQL_MenuShortcut" Guid="*" Win64="no">
- <RegistryValue Root="HKCU" Key="Software\@CPACK_WIX_PACKAGE_NAME@\Uninstall" Name="shortcuts.heidisql" Value="1" Type="string" KeyPath="yes" />
- <Shortcut Id="startmenuHeidiSQL" Directory="ShortcutFolder" Name="HeidiSQL" Target="[D.HeidiSQL]\heidisql.exe"/>
- </Component>
- <Component Id="component.HeidiSQL_libmysql.dll" Guid="*" Win64="no">
- <File Id="heidisql.libmysql.dll" Name="libmysql.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libmysql.dll" />
- </Component>
-
- <Component Id="component.HeidiSQL_libeay32.dll" Guid="*" Win64="no">
- <File Id="heidisql.libeay32.dll" Name="libeay32.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libeay32.dll" />
- </Component>
- <Component Id="component.HeidiSQL_libpq.dll" Guid="*" Win64="no">
- <File Id="heidisql.libpq.dll" Name="libpq.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libpq.dll" />
- </Component>
- <Component Id="component.HeidiSQL_ssleay32.dll" Guid="*" Win64="no">
- <File Id="heidisql.ssleay32.dll" Name="ssleay32.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\ssleay32.dll" />
- </Component>
- <Component Id="component.HeidiSQL_libintl.dll" Guid="*" Win64="no">
- <File Id="heidisql.libintl.dll" Name="libintl.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libintl.dll" />
- </Component>
-
- <Directory Id="D.HeidiSQL.plugins" Name="plugins">
- <Component Id="component.HeidiSQL_dialog.dll" Guid="*" Win64="no">
- <File Id="heidisql.dialog.dll" Name="dialog.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\plugins\dialog.dll" />
- </Component>
- </Directory>
-
- <Component Id="component.HeidiSQL_CleanupSettings" Guid="*" Win64="no">
- <Condition>HEIDISQLINSTALLED</Condition>
- <RegistryValue Root="HKCU" Key="Software\@CPACK_WIX_PACKAGE_NAME@\UninstallCleanupHeidiSQLSettings" Name="cleanup.heidisql" Value="1" Type="string" KeyPath="yes" />
- <RemoveRegistryKey Id="HeidiSQL_RegistryCleanup" Root="HKCU" Key="SOFTWARE\HeidiSQL" Action="removeOnUninstall" />
- </Component>
- </Directory>
-</DirectoryRef>
-
-<ComponentGroup Id="HeidiSQL">
- <ComponentRef Id="component.HeidiSQL"/>
- <ComponentRef Id="component.HeidiSQL_MenuShortcut"/>
- <ComponentRef Id="component.HeidiSQL_libmysql.dll"/>
- <ComponentRef Id="component.HeidiSQL_libeay32.dll" />
- <ComponentRef Id="component.HeidiSQL_libpq.dll" />
- <ComponentRef Id="component.HeidiSQL_ssleay32.dll" />
- <ComponentRef Id="component.HeidiSQL_libintl.dll" />
- <ComponentRef Id="component.HeidiSQL_dialog.dll" />
- <ComponentRef Id="component.HeidiSQL_CleanupSettings"/>
-</ComponentGroup>
-</Include>
+<Include>
+<Property Id="HEIDISQLINSTALLED" Secure="yes">
+<RegistrySearch Id="HeidiSQL"
+ Root="HKLM"
+ Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\HeidiSQL_is1"
+ Name="UninstallString"
+ Type="raw"
+ Win64="no"
+/>
+</Property>
+<DirectoryRef Id="MariaDBShared">
+ <Directory Id="D.HeidiSQL" Name="HeidiSQL">
+ <Component Id="component.HeidiSQL" Guid="96ea3879-5320-4098-8f26-2f655d2f716c" Win64="no">
+
+ <File Id="heidisql.gpl.txt" Name="gpl.txt" Source="${HEIDISQL_DOWNLOAD_DIR}\gpl.txt" />
+ <File Id="heidisql.heidisql.exe" Name="heidisql.exe" Source="${HEIDISQL_DOWNLOAD_DIR}\heidisql.exe" KeyPath="yes">
+ <Shortcut Id="desktopHeidiSQL" Directory="DesktopFolder" Name="HeidiSQL" Advertise="yes"/>
+ </File>
+ <!--
+ Forced file removal for heidisql.exe might be required.
+ HeidiSQL is self-updating, thus the version that was installed by MSI not necessarily matches
+ the version of the file on uninstall. MSI would not touch such file by default and leave it after
+ uninstallation. We use RemoveFile to force delete in any case.
+ -->
+ <RemoveFile Id="Remove_HeidiSQL_exe" Name="heidisql.exe" On="uninstall" />
+ <!-- remove readme.txt too, it's not included in HeidiSQL-9.1-Portable.zip -->
+ <RemoveFile Id="Remove_readme_txt" Name="readme.txt" On="uninstall" />
+
+ <File Id="heidisql.license.txt" Name="license.txt" Source="${HEIDISQL_DOWNLOAD_DIR}\license.txt" />
+ </Component>
+ <Component Id="component.HeidiSQL_MenuShortcut" Guid="*" Win64="no">
+ <RegistryValue Root="HKCU" Key="Software\@CPACK_WIX_PACKAGE_NAME@\Uninstall" Name="shortcuts.heidisql" Value="1" Type="string" KeyPath="yes" />
+ <Shortcut Id="startmenuHeidiSQL" Directory="ShortcutFolder" Name="HeidiSQL" Target="[D.HeidiSQL]\heidisql.exe"/>
+ </Component>
+ <Component Id="component.HeidiSQL_libmysql.dll" Guid="*" Win64="no">
+ <File Id="heidisql.libmysql.dll" Name="libmysql.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libmysql.dll" />
+ </Component>
+
+ <Component Id="component.HeidiSQL_libeay32.dll" Guid="*" Win64="no">
+ <File Id="heidisql.libeay32.dll" Name="libeay32.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libeay32.dll" />
+ </Component>
+ <Component Id="component.HeidiSQL_libpq.dll" Guid="*" Win64="no">
+ <File Id="heidisql.libpq.dll" Name="libpq.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libpq.dll" />
+ </Component>
+ <Component Id="component.HeidiSQL_ssleay32.dll" Guid="*" Win64="no">
+ <File Id="heidisql.ssleay32.dll" Name="ssleay32.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\ssleay32.dll" />
+ </Component>
+ <Component Id="component.HeidiSQL_libintl.dll" Guid="*" Win64="no">
+ <File Id="heidisql.libintl.dll" Name="libintl.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libintl.dll" />
+ </Component>
+
+ <Directory Id="D.HeidiSQL.plugins" Name="plugins">
+ <Component Id="component.HeidiSQL_dialog.dll" Guid="*" Win64="no">
+ <File Id="heidisql.dialog.dll" Name="dialog.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\plugins\dialog.dll" />
+ </Component>
+ </Directory>
+
+ <Component Id="component.HeidiSQL_CleanupSettings" Guid="*" Win64="no">
+ <Condition>HEIDISQLINSTALLED</Condition>
+ <RegistryValue Root="HKCU" Key="Software\@CPACK_WIX_PACKAGE_NAME@\UninstallCleanupHeidiSQLSettings" Name="cleanup.heidisql" Value="1" Type="string" KeyPath="yes" />
+ <RemoveRegistryKey Id="HeidiSQL_RegistryCleanup" Root="HKCU" Key="SOFTWARE\HeidiSQL" Action="removeOnUninstall" />
+ </Component>
+ </Directory>
+</DirectoryRef>
+
+<ComponentGroup Id="HeidiSQL">
+ <ComponentRef Id="component.HeidiSQL"/>
+ <ComponentRef Id="component.HeidiSQL_MenuShortcut"/>
+ <ComponentRef Id="component.HeidiSQL_libmysql.dll"/>
+ <ComponentRef Id="component.HeidiSQL_libeay32.dll" />
+ <ComponentRef Id="component.HeidiSQL_libpq.dll" />
+ <ComponentRef Id="component.HeidiSQL_ssleay32.dll" />
+ <ComponentRef Id="component.HeidiSQL_libintl.dll" />
+ <ComponentRef Id="component.HeidiSQL_dialog.dll" />
+ <ComponentRef Id="component.HeidiSQL_CleanupSettings"/>
+</ComponentGroup>
+</Include>
diff --git a/win/packaging/heidisql_feature.wxi.in b/win/packaging/heidisql_feature.wxi.in
index 3f60fcd..241554e 100644
--- a/win/packaging/heidisql_feature.wxi.in
+++ b/win/packaging/heidisql_feature.wxi.in
@@ -1,10 +1,10 @@
-<Include>
-<Feature Id="HeidiSQL"
- Title='HeidiSQL'
- Description= 'Powerful, easy and free MySQL/MariaDB GUI client by Ansgar Becker'
- AllowAdvertise='no'
- Level='1'>
- <Condition Level="0">HEIDISQLINSTALLED AND NOT REMOVE ~= ALL</Condition>
- <ComponentGroupRef Id='HeidiSQL'/>
-</Feature>
-</Include>
+<Include>
+<Feature Id="HeidiSQL"
+ Title='HeidiSQL'
+ Description= 'Powerful, easy and free MySQL/MariaDB GUI client by Ansgar Becker'
+ AllowAdvertise='no'
+ Level='1'>
+ <Condition Level="0">HEIDISQLINSTALLED AND NOT REMOVE ~= ALL</Condition>
+ <ComponentGroupRef Id='HeidiSQL'/>
+</Feature>
+</Include>
diff --git a/win/packaging/mysql_server.wxs.in b/win/packaging/mysql_server.wxs.in
index 79fde80..c101168 100644
--- a/win/packaging/mysql_server.wxs.in
+++ b/win/packaging/mysql_server.wxs.in
@@ -1,89 +1,89 @@
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
- xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
- <Product
- Id="*"
- UpgradeCode="@CPACK_WIX_UPGRADE_CODE@"
- Name="@CPACK_WIX_PACKAGE_NAME@"
- Version="@MAJOR_VERSION at .@MINOR_VERSION at .@PATCH_VERSION at .@TINY_VERSION@"
- Language="1033"
- Manufacturer="@MANUFACTURER@">
-
- <Package Id='*'
- Keywords='Installer'
- Description='MariaDB Server'
- Manufacturer='@MANUFACTURER@'
- InstallerVersion='200'
- Languages='1033'
- Compressed='yes'
- SummaryCodepage='1252'
- Platform='@Platform@'/>
-
- <Media Id='1' Cabinet='product.cab' EmbedCab='yes' CompressionLevel='high' />
-
- <!-- Upgrade -->
- <Upgrade Id="@CPACK_WIX_UPGRADE_CODE@">
- <?if "@PATCH_VERSION@" != "0"?>
- <UpgradeVersion
- Minimum="@MAJOR_VERSION at .@MINOR_VERSION at .0"
- IncludeMinimum="yes"
- Maximum="@MAJOR_VERSION at .@MINOR_VERSION at .@PATCH_VERSION at .@TINY_VERSION@"
- IncludeMaximum="yes"
- Property="OLDERVERSIONBEINGUPGRADED"
- MigrateFeatures="yes"
- />
- <?endif?>
- <UpgradeVersion
- Minimum="@MAJOR_VERSION at .@MINOR_VERSION at .@PATCH_VERSION at .@TINY_VERSION@"
- Maximum="@MAJOR_VERSION at .@MINOR_VERSION at .999"
- IncludeMinimum="no"
- OnlyDetect="yes"
- Property="NEWERVERSIONDETECTED" />
- </Upgrade>
- <Condition Message="A more recent version of [ProductName] is already installed. Setup will now exit.">
- NOT NEWERVERSIONDETECTED OR Installed
- </Condition>
- <InstallExecuteSequence>
- <RemoveExistingProducts After="InstallFinalize"/>
- </InstallExecuteSequence>
-
-
- <InstallUISequence>
- <AppSearch After="FindRelatedProducts"/>
- </InstallUISequence>
-
- <!-- UI -->
- <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"></Property>
- <UIRef Id="WixUI_ErrorProgressText" />
- <UIRef Id="@CPACK_WIX_UI@" />
-
-
- <!-- License -->
- <WixVariable
- Id="WixUILicenseRtf"
- Value="@COPYING_RTF@"/>
-
- <!-- Installation root-->
- <Directory Id='TARGETDIR' Name='SourceDir'>
- <Directory Id='@PlatformProgramFilesFolder@'>
- <Directory Id='INSTALLDIR' Name='@CPACK_WIX_PACKAGE_BASE_NAME@ @MAJOR_VERSION at .@MINOR_VERSION@'>
- </Directory>
- </Directory>
- </Directory>
-
- <!-- CPACK_WIX_FEATURES -->
- @CPACK_WIX_FEATURES@
-
- <!-- CPACK_WIX_DIRECTORIES -->
- @CPACK_WIX_DIRECTORIES@
-
- <!--CPACK_WIX_COMPONENTS-->
- @CPACK_WIX_COMPONENTS@
-
- <!--CPACK_WIX_COMPONENTS_GROUPS -->
- @CPACK_WIX_COMPONENT_GROUPS@
-
- <!--CPACK_WIX_INCLUDES -->
- @CPACK_WIX_INCLUDES@
- </Product>
-
-</Wix>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+ xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+ <Product
+ Id="*"
+ UpgradeCode="@CPACK_WIX_UPGRADE_CODE@"
+ Name="@CPACK_WIX_PACKAGE_NAME@"
+ Version="@MAJOR_VERSION at .@MINOR_VERSION at .@PATCH_VERSION at .@TINY_VERSION@"
+ Language="1033"
+ Manufacturer="@MANUFACTURER@">
+
+ <Package Id='*'
+ Keywords='Installer'
+ Description='MariaDB Server'
+ Manufacturer='@MANUFACTURER@'
+ InstallerVersion='200'
+ Languages='1033'
+ Compressed='yes'
+ SummaryCodepage='1252'
+ Platform='@Platform@'/>
+
+ <Media Id='1' Cabinet='product.cab' EmbedCab='yes' CompressionLevel='high' />
+
+ <!-- Upgrade -->
+ <Upgrade Id="@CPACK_WIX_UPGRADE_CODE@">
+ <?if "@PATCH_VERSION@" != "0"?>
+ <UpgradeVersion
+ Minimum="@MAJOR_VERSION at .@MINOR_VERSION at .0"
+ IncludeMinimum="yes"
+ Maximum="@MAJOR_VERSION at .@MINOR_VERSION at .@PATCH_VERSION at .@TINY_VERSION@"
+ IncludeMaximum="yes"
+ Property="OLDERVERSIONBEINGUPGRADED"
+ MigrateFeatures="yes"
+ />
+ <?endif?>
+ <UpgradeVersion
+ Minimum="@MAJOR_VERSION at .@MINOR_VERSION at .@PATCH_VERSION at .@TINY_VERSION@"
+ Maximum="@MAJOR_VERSION at .@MINOR_VERSION at .999"
+ IncludeMinimum="no"
+ OnlyDetect="yes"
+ Property="NEWERVERSIONDETECTED" />
+ </Upgrade>
+ <Condition Message="A more recent version of [ProductName] is already installed. Setup will now exit.">
+ NOT NEWERVERSIONDETECTED OR Installed
+ </Condition>
+ <InstallExecuteSequence>
+ <RemoveExistingProducts After="InstallFinalize"/>
+ </InstallExecuteSequence>
+
+
+ <InstallUISequence>
+ <AppSearch After="FindRelatedProducts"/>
+ </InstallUISequence>
+
+ <!-- UI -->
+ <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"></Property>
+ <UIRef Id="WixUI_ErrorProgressText" />
+ <UIRef Id="@CPACK_WIX_UI@" />
+
+
+ <!-- License -->
+ <WixVariable
+ Id="WixUILicenseRtf"
+ Value="@COPYING_RTF@"/>
+
+ <!-- Installation root-->
+ <Directory Id='TARGETDIR' Name='SourceDir'>
+ <Directory Id='@PlatformProgramFilesFolder@'>
+ <Directory Id='INSTALLDIR' Name='@CPACK_WIX_PACKAGE_BASE_NAME@ @MAJOR_VERSION at .@MINOR_VERSION@'>
+ </Directory>
+ </Directory>
+ </Directory>
+
+ <!-- CPACK_WIX_FEATURES -->
+ @CPACK_WIX_FEATURES@
+
+ <!-- CPACK_WIX_DIRECTORIES -->
+ @CPACK_WIX_DIRECTORIES@
+
+ <!--CPACK_WIX_COMPONENTS-->
+ @CPACK_WIX_COMPONENTS@
+
+ <!--CPACK_WIX_COMPONENTS_GROUPS -->
+ @CPACK_WIX_COMPONENT_GROUPS@
+
+ <!--CPACK_WIX_INCLUDES -->
+ @CPACK_WIX_INCLUDES@
+ </Product>
+
+</Wix>
diff --git a/win/upgrade_wizard/stdafx.h b/win/upgrade_wizard/stdafx.h
index 87db703..55f9e71 100644
--- a/win/upgrade_wizard/stdafx.h
+++ b/win/upgrade_wizard/stdafx.h
@@ -1,47 +1,47 @@
-
-// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently,
-// but are changed infrequently
-
-#pragma once
-
-#ifndef _SECURE_ATL
-#define _SECURE_ATL 1
-#endif
-
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#endif
-
-#include "targetver.h"
-
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
-
-// turns off MFC's hiding of some common and often safely ignored warning messages
-#define _AFX_ALL_WARNINGS
-
-#include <afxwin.h> // MFC core and standard components
-#include <afxext.h> // MFC extensions
-
-
-
-
-
-#ifndef _AFX_NO_OLE_SUPPORT
-#include <afxdtctl.h> // MFC support for Internet Explorer 4 Common Controls
-#endif
-#ifndef _AFX_NO_AFXCMN_SUPPORT
-#include <afxcmn.h> // MFC support for Windows Common Controls
-#endif // _AFX_NO_AFXCMN_SUPPORT
-
-
-
-
-
-
-
-
-
-
-
-
+
+// stdafx.h : include file for standard system include files,
+// or project specific include files that are used frequently,
+// but are changed infrequently
+
+#pragma once
+
+#ifndef _SECURE_ATL
+#define _SECURE_ATL 1
+#endif
+
+#ifndef VC_EXTRALEAN
+#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
+#endif
+
+#include "targetver.h"
+
+#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
+
+// turns off MFC's hiding of some common and often safely ignored warning messages
+#define _AFX_ALL_WARNINGS
+
+#include <afxwin.h> // MFC core and standard components
+#include <afxext.h> // MFC extensions
+
+
+
+
+
+#ifndef _AFX_NO_OLE_SUPPORT
+#include <afxdtctl.h> // MFC support for Internet Explorer 4 Common Controls
+#endif
+#ifndef _AFX_NO_AFXCMN_SUPPORT
+#include <afxcmn.h> // MFC support for Windows Common Controls
+#endif // _AFX_NO_AFXCMN_SUPPORT
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/win/upgrade_wizard/targetver.h b/win/upgrade_wizard/targetver.h
index 90e767b..87c0086 100644
--- a/win/upgrade_wizard/targetver.h
+++ b/win/upgrade_wizard/targetver.h
@@ -1,8 +1,8 @@
-#pragma once
-
-// Including SDKDDKVer.h defines the highest available Windows platform.
-
-// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
-// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
-
-#include <SDKDDKVer.h>
+#pragma once
+
+// Including SDKDDKVer.h defines the highest available Windows platform.
+
+// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
+// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
+
+#include <SDKDDKVer.h>
diff --git a/win/upgrade_wizard/upgrade.cpp b/win/upgrade_wizard/upgrade.cpp
index aa9efa1..ea2f894 100644
--- a/win/upgrade_wizard/upgrade.cpp
+++ b/win/upgrade_wizard/upgrade.cpp
@@ -1,57 +1,57 @@
-
-// upgrade.cpp : Defines the class behaviors for the application.
-//
-
-#include "stdafx.h"
-#include "upgrade.h"
-#include "upgradeDlg.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#endif
-
-
-// CUpgradeApp
-
-BEGIN_MESSAGE_MAP(CUpgradeApp, CWinApp)
- ON_COMMAND(ID_HELP, &CWinApp::OnHelp)
-END_MESSAGE_MAP()
-
-
-// CUpgradeApp construction
-
-CUpgradeApp::CUpgradeApp()
-{
- // TODO: add construction code here,
- // Place all significant initialization in InitInstance
-}
-
-
-// The one and only CUpgradeApp object
-
-CUpgradeApp theApp;
-
-
-// CUpgradeApp initialization
-
-BOOL CUpgradeApp::InitInstance()
-{
- // InitCommonControlsEx() is required on Windows XP if an application
- // manifest specifies use of ComCtl32.dll version 6 or later to enable
- // visual styles. Otherwise, any window creation will fail.
- INITCOMMONCONTROLSEX InitCtrls;
- InitCtrls.dwSize = sizeof(InitCtrls);
- // Set this to include all the common control classes you want to use
- // in your application.
- InitCtrls.dwICC = ICC_WIN95_CLASSES;
-
- InitCommonControlsEx(&InitCtrls);
- CWinApp::InitInstance();
- CUpgradeDlg dlg;
- m_pMainWnd = &dlg;
- dlg.DoModal();
- // Since the dialog has been closed, return FALSE so that we exit the
- // application, rather than start the application's message pump.
- return FALSE;
-}
-
+
+// upgrade.cpp : Defines the class behaviors for the application.
+//
+
+#include "stdafx.h"
+#include "upgrade.h"
+#include "upgradeDlg.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
+
+
+// CUpgradeApp
+
+BEGIN_MESSAGE_MAP(CUpgradeApp, CWinApp)
+ ON_COMMAND(ID_HELP, &CWinApp::OnHelp)
+END_MESSAGE_MAP()
+
+
+// CUpgradeApp construction
+
+CUpgradeApp::CUpgradeApp()
+{
+ // TODO: add construction code here,
+ // Place all significant initialization in InitInstance
+}
+
+
+// The one and only CUpgradeApp object
+
+CUpgradeApp theApp;
+
+
+// CUpgradeApp initialization
+
+BOOL CUpgradeApp::InitInstance()
+{
+ // InitCommonControlsEx() is required on Windows XP if an application
+ // manifest specifies use of ComCtl32.dll version 6 or later to enable
+ // visual styles. Otherwise, any window creation will fail.
+ INITCOMMONCONTROLSEX InitCtrls;
+ InitCtrls.dwSize = sizeof(InitCtrls);
+ // Set this to include all the common control classes you want to use
+ // in your application.
+ InitCtrls.dwICC = ICC_WIN95_CLASSES;
+
+ InitCommonControlsEx(&InitCtrls);
+ CWinApp::InitInstance();
+ CUpgradeDlg dlg;
+ m_pMainWnd = &dlg;
+ dlg.DoModal();
+ // Since the dialog has been closed, return FALSE so that we exit the
+ // application, rather than start the application's message pump.
+ return FALSE;
+}
+
diff --git a/win/upgrade_wizard/upgrade.h b/win/upgrade_wizard/upgrade.h
index 26c107b..b5dd10e 100644
--- a/win/upgrade_wizard/upgrade.h
+++ b/win/upgrade_wizard/upgrade.h
@@ -1,32 +1,32 @@
-
-// zzz.h : main header file for the PROJECT_NAME application
-//
-
-#pragma once
-
-#ifndef __AFXWIN_H__
- #error "include 'stdafx.h' before including this file for PCH"
-#endif
-
-#include "resource.h" // main symbols
-
-
-// CzzzApp:
-// See zzz.cpp for the implementation of this class
-//
-
-class CUpgradeApp : public CWinApp
-{
-public:
- CUpgradeApp();
-
-// Overrides
-public:
- virtual BOOL InitInstance();
-
-// Implementation
-
- DECLARE_MESSAGE_MAP()
-};
-
+
+// zzz.h : main header file for the PROJECT_NAME application
+//
+
+#pragma once
+
+#ifndef __AFXWIN_H__
+ #error "include 'stdafx.h' before including this file for PCH"
+#endif
+
+#include "resource.h" // main symbols
+
+
+// CzzzApp:
+// See zzz.cpp for the implementation of this class
+//
+
+class CUpgradeApp : public CWinApp
+{
+public:
+ CUpgradeApp();
+
+// Overrides
+public:
+ virtual BOOL InitInstance();
+
+// Implementation
+
+ DECLARE_MESSAGE_MAP()
+};
+
extern CUpgradeApp theApp;
\ No newline at end of file
diff --git a/win/upgrade_wizard/upgrade.rc b/win/upgrade_wizard/upgrade.rc
index 3065665..dbba9f6 100644
--- a/win/upgrade_wizard/upgrade.rc
+++ b/win/upgrade_wizard/upgrade.rc
@@ -1,148 +1,148 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#ifndef APSTUDIO_INVOKED
-#include "targetver.h"
-#endif
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// German (Germany) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU)
-LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE
-BEGIN
- "resource.h\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
- "#ifndef APSTUDIO_INVOKED\r\n"
- "#include ""targetver.h""\r\n"
- "#endif\r\n"
- "#include ""afxres.h""\r\n"
- "\0"
-END
-
-3 TEXTINCLUDE
-BEGIN
- "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
- "#define _AFX_NO_OLE_RESOURCES\r\n"
- "#define _AFX_NO_TRACKER_RESOURCES\r\n"
- "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
- "\r\n"
- "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
- "LANGUAGE 9, 1\r\n"
- "#include ""res\\upgrade.rc2"" // non-Microsoft Visual C++ edited resources\r\n"
- "#include ""afxres.rc"" // Standard components\r\n"
- "#endif\r\n"
- "\0"
-END
-
-#endif // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDR_MAINFRAME ICON "res\\upgrade.ico"
-#endif // German (Germany) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (United States) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_UPGRADE_DIALOG DIALOGEX 0, 0, 320, 200
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_APPWINDOW
-CAPTION "MariaDB Upgrade Wizard"
-FONT 8, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "OK",IDOK,113,169,50,14
- PUSHBUTTON "Cancel",IDCANCEL,191,169,50,14
- LISTBOX IDC_LIST1,24,39,216,80,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
- EDITTEXT IDC_EDIT1,97,124,193,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
- EDITTEXT IDC_EDIT2,98,138,181,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
- CONTROL "",IDC_PROGRESS1,"msctls_progress32",PBS_SMOOTH | WS_BORDER,26,153,243,14
- EDITTEXT IDC_EDIT3,98,151,40,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
- EDITTEXT IDC_EDIT7,27,124,65,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
- EDITTEXT IDC_EDIT8,27,137,62,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
- EDITTEXT IDC_EDIT9,27,151,62,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
- PUSHBUTTON "Select all",IDC_BUTTON1,245,61,50,14
- PUSHBUTTON "Clear all",IDC_BUTTON2,246,88,50,14
- LTEXT "Select services you want to upgrade and click on the [Upgrade] button.\nMake sure to backup data directories prior to upgrade.",IDC_STATIC,25,14,215,26
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
-BEGIN
- IDD_UPGRADE_DIALOG, DIALOG
- BEGIN
- LEFTMARGIN, 7
- RIGHTMARGIN, 313
- TOPMARGIN, 7
- BOTTOMMARGIN, 193
- END
-END
-#endif // APSTUDIO_INVOKED
-
-#endif // English (United States) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-#define _AFX_NO_SPLITTER_RESOURCES
-#define _AFX_NO_OLE_RESOURCES
-#define _AFX_NO_TRACKER_RESOURCES
-#define _AFX_NO_PROPERTY_RESOURCES
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-LANGUAGE 9, 1
-#include "res\upgrade.rc2" // non-Microsoft Visual C++ edited resources
-#include "afxres.rc" // Standard components
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-#endif // not APSTUDIO_INVOKED
-
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#ifndef APSTUDIO_INVOKED
+#include "targetver.h"
+#endif
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// German (Germany) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU)
+LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+ "resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+ "#ifndef APSTUDIO_INVOKED\r\n"
+ "#include ""targetver.h""\r\n"
+ "#endif\r\n"
+ "#include ""afxres.h""\r\n"
+ "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+ "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
+ "#define _AFX_NO_OLE_RESOURCES\r\n"
+ "#define _AFX_NO_TRACKER_RESOURCES\r\n"
+ "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
+ "\r\n"
+ "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
+ "LANGUAGE 9, 1\r\n"
+ "#include ""res\\upgrade.rc2"" // non-Microsoft Visual C++ edited resources\r\n"
+ "#include ""afxres.rc"" // Standard components\r\n"
+ "#endif\r\n"
+ "\0"
+END
+
+#endif // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDR_MAINFRAME ICON "res\\upgrade.ico"
+#endif // German (Germany) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// English (United States) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_UPGRADE_DIALOG DIALOGEX 0, 0, 320, 200
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_APPWINDOW
+CAPTION "MariaDB Upgrade Wizard"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "OK",IDOK,113,169,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,191,169,50,14
+ LISTBOX IDC_LIST1,24,39,216,80,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+ EDITTEXT IDC_EDIT1,97,124,193,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+ EDITTEXT IDC_EDIT2,98,138,181,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+ CONTROL "",IDC_PROGRESS1,"msctls_progress32",PBS_SMOOTH | WS_BORDER,26,153,243,14
+ EDITTEXT IDC_EDIT3,98,151,40,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+ EDITTEXT IDC_EDIT7,27,124,65,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+ EDITTEXT IDC_EDIT8,27,137,62,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+ EDITTEXT IDC_EDIT9,27,151,62,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+ PUSHBUTTON "Select all",IDC_BUTTON1,245,61,50,14
+ PUSHBUTTON "Clear all",IDC_BUTTON2,246,88,50,14
+ LTEXT "Select services you want to upgrade and click on the [Upgrade] button.\nMake sure to backup data directories prior to upgrade.",IDC_STATIC,25,14,215,26
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO
+BEGIN
+ IDD_UPGRADE_DIALOG, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 313
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 193
+ END
+END
+#endif // APSTUDIO_INVOKED
+
+#endif // English (United States) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+#define _AFX_NO_SPLITTER_RESOURCES
+#define _AFX_NO_OLE_RESOURCES
+#define _AFX_NO_TRACKER_RESOURCES
+#define _AFX_NO_PROPERTY_RESOURCES
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE 9, 1
+#include "res\upgrade.rc2" // non-Microsoft Visual C++ edited resources
+#include "afxres.rc" // Standard components
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
+
diff --git a/win/upgrade_wizard/upgradeDlg.h b/win/upgrade_wizard/upgradeDlg.h
index 9724329..636f948 100644
--- a/win/upgrade_wizard/upgradeDlg.h
+++ b/win/upgrade_wizard/upgradeDlg.h
@@ -1,73 +1,73 @@
-
-// upgradeDlg.h : header file
-//
-
-#pragma once
-#include "afxcmn.h"
-#include "afxwin.h"
-#include <string>
-
-
-// CUpgradeDlg dialog
-class CUpgradeDlg : public CDialog
-{
- // Construction
-public:
- CUpgradeDlg(CWnd* pParent = NULL); // standard constructor
-
- // Dialog Data
- enum { IDD = IDD_UPGRADE_DIALOG };
-
-protected:
- virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
-
- // job object for current process and children
- HANDLE m_JobObject;
-
- // Services are being upgraded
- BOOL m_UpgradeRunning;
-
- // ProgressBar related: number of services to upgrade
- int m_ProgressTotal;
-
- //ProgressBar related: current service being upgraded
- int m_ProgressCurrent;
-
-protected:
- HICON m_hIcon;
-
- // Generated message map functions
- virtual BOOL OnInitDialog();
- void PopulateServicesList();
- afx_msg void OnPaint();
- afx_msg HCURSOR OnQueryDragIcon();
- DECLARE_MESSAGE_MAP()
-public:
- void SelectService(int index);
- void UpgradeServices();
- void UpgradeOneService(const std::string& name);
- void ErrorExit(const char *);
- std::string m_InstallDir;
- CCheckListBox m_Services;
- CProgressCtrl m_Progress;
- CButton m_Ok;
- CButton m_Cancel;
- CButton m_SelectAll;
- CButton m_ClearAll;
- int m_MajorVersion;
- int m_MinorVersion;
- int m_PatchVersion;
-
- CEdit m_IniFilePath;
- afx_msg void OnLbnSelchangeList1();
- afx_msg void OnChkChange();
- CEdit m_DataDir;
- CEdit m_Version;
- afx_msg void OnBnClickedOk();
- afx_msg void OnBnClickedCancel();
- afx_msg void OnBnSelectAll();
- afx_msg void OnBnClearAll();
- CEdit m_IniFileLabel;
- CEdit m_DataDirLabel;
- CEdit m_VersionLabel;
-};
+
+// upgradeDlg.h : header file
+//
+
+#pragma once
+#include "afxcmn.h"
+#include "afxwin.h"
+#include <string>
+
+
+// CUpgradeDlg dialog
+class CUpgradeDlg : public CDialog
+{
+ // Construction
+public:
+ CUpgradeDlg(CWnd* pParent = NULL); // standard constructor
+
+ // Dialog Data
+ enum { IDD = IDD_UPGRADE_DIALOG };
+
+protected:
+ virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
+
+ // job object for current process and children
+ HANDLE m_JobObject;
+
+ // Services are being upgraded
+ BOOL m_UpgradeRunning;
+
+ // ProgressBar related: number of services to upgrade
+ int m_ProgressTotal;
+
+ //ProgressBar related: current service being upgraded
+ int m_ProgressCurrent;
+
+protected:
+ HICON m_hIcon;
+
+ // Generated message map functions
+ virtual BOOL OnInitDialog();
+ void PopulateServicesList();
+ afx_msg void OnPaint();
+ afx_msg HCURSOR OnQueryDragIcon();
+ DECLARE_MESSAGE_MAP()
+public:
+ void SelectService(int index);
+ void UpgradeServices();
+ void UpgradeOneService(const std::string& name);
+ void ErrorExit(const char *);
+ std::string m_InstallDir;
+ CCheckListBox m_Services;
+ CProgressCtrl m_Progress;
+ CButton m_Ok;
+ CButton m_Cancel;
+ CButton m_SelectAll;
+ CButton m_ClearAll;
+ int m_MajorVersion;
+ int m_MinorVersion;
+ int m_PatchVersion;
+
+ CEdit m_IniFilePath;
+ afx_msg void OnLbnSelchangeList1();
+ afx_msg void OnChkChange();
+ CEdit m_DataDir;
+ CEdit m_Version;
+ afx_msg void OnBnClickedOk();
+ afx_msg void OnBnClickedCancel();
+ afx_msg void OnBnSelectAll();
+ afx_msg void OnBnClearAll();
+ CEdit m_IniFileLabel;
+ CEdit m_DataDirLabel;
+ CEdit m_VersionLabel;
+};
diff --git a/win/upgrade_wizard/upgrade_wizard.exe.manifest b/win/upgrade_wizard/upgrade_wizard.exe.manifest
index 6b40eeb..ca89dea 100644
--- a/win/upgrade_wizard/upgrade_wizard.exe.manifest
+++ b/win/upgrade_wizard/upgrade_wizard.exe.manifest
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
- <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
- <security>
- <requestedPrivileges>
- <requestedExecutionLevel level="requireAdministrator" uiAccess="false"></requestedExecutionLevel>
- </requestedPrivileges>
- </security>
- </trustInfo>
- <dependency>
- <dependentAssembly>
- <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"></assemblyIdentity>
- </dependentAssembly>
- </dependency>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+ <security>
+ <requestedPrivileges>
+ <requestedExecutionLevel level="requireAdministrator" uiAccess="false"></requestedExecutionLevel>
+ </requestedPrivileges>
+ </security>
+ </trustInfo>
+ <dependency>
+ <dependentAssembly>
+ <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"></assemblyIdentity>
+ </dependentAssembly>
+ </dependency>
</assembly>
\ No newline at end of file
--
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