diff --git a/CMakeLists.txt b/CMakeLists.txt index d7ce363fb20..0eaf59bb5a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -506,7 +506,9 @@ IF(UNIX) ADD_SUBDIRECTORY(man) ENDIF() -INCLUDE(cmake/abi_check.cmake) +IF (NOT WITHOUT_ABI_CHECK) + INCLUDE(cmake/abi_check.cmake) +ENDIF() INCLUDE(cmake/tags.cmake) INCLUDE(for_clients) ADD_SUBDIRECTORY(scripts) diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 5ac722e5d07..77f74e0d42c 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -160,6 +160,8 @@ static Server_gtid_event_filter *server_id_gtid_filter= NULL; static char *start_datetime_str, *stop_datetime_str; static my_time_t start_datetime= 0, stop_datetime= MY_TIME_T_MAX; +static my_time_t last_processed_datetime= MY_TIME_T_MAX; + static ulonglong rec_count= 0; static MYSQL* mysql = NULL; static const char* dirname_for_local_load= 0; @@ -1034,6 +1036,7 @@ Exit_status process_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev, DBUG_ENTER("process_event"); Exit_status retval= OK_CONTINUE; IO_CACHE *const head= &print_event_info->head_cache; + my_time_t ev_when= ev->when; /* We use Gtid_list_log_event information to determine if there is missing @@ -1608,6 +1611,7 @@ err: end: rec_count++; end_skip_count: + last_processed_datetime= ev_when; DBUG_PRINT("info", ("end event processing")); /* @@ -3220,6 +3224,7 @@ static Exit_status check_header(IO_CACHE* file, uchar buf[PROBE_HEADER_LEN]; my_off_t tmp_pos, pos; MY_STAT my_file_stat; + int read_error; delete glob_description_event; if (!(glob_description_event= new Format_description_log_event(3))) @@ -3320,7 +3325,8 @@ static Exit_status check_header(IO_CACHE* file, Format_description_log_event *new_description_event; my_b_seek(file, tmp_pos); /* seek back to event's start */ if (!(new_description_event= (Format_description_log_event*) - Log_event::read_log_event(file, glob_description_event, + Log_event::read_log_event(file, &read_error, + glob_description_event, opt_verify_binlog_checksum))) /* EOF can't be hit here normally, so it's a real error */ { @@ -3353,7 +3359,8 @@ static Exit_status check_header(IO_CACHE* file, { Log_event *ev; my_b_seek(file, tmp_pos); /* seek back to event's start */ - if (!(ev= Log_event::read_log_event(file, glob_description_event, + if (!(ev= Log_event::read_log_event(file, &read_error, + glob_description_event, opt_verify_binlog_checksum))) { /* EOF can't be hit here normally, so it's a real error */ @@ -3393,7 +3400,6 @@ static Exit_status dump_local_log_entries(PRINT_EVENT_INFO *print_event_info, IO_CACHE cache,*file= &cache; uchar tmp_buff[BIN_LOG_HEADER_SIZE]; Exit_status retval= OK_CONTINUE; - my_time_t last_ev_when= MY_TIME_T_MAX; if (logname && strcmp(logname, "-") != 0) { @@ -3467,8 +3473,10 @@ static Exit_status dump_local_log_entries(PRINT_EVENT_INFO *print_event_info, { char llbuff[21]; my_off_t old_off = my_b_tell(file); + int read_error; - Log_event* ev = Log_event::read_log_event(file, glob_description_event, + Log_event* ev = Log_event::read_log_event(file, &read_error, + glob_description_event, opt_verify_binlog_checksum); if (!ev) { @@ -3477,15 +3485,15 @@ static Exit_status dump_local_log_entries(PRINT_EVENT_INFO *print_event_info, about a corruption, but treat it as EOF and move to the next binlog. */ if (glob_description_event->flags & LOG_EVENT_BINLOG_IN_USE_F) - file->error= 0; - else if (file->error) + read_error= 0; + else if (read_error) { error("Could not read entry at offset %s: " "Error in log format or read error.", llstr(old_off,llbuff)); goto err; } - // else file->error == 0 means EOF, that's OK, we break in this case + // else read_error == 0 means EOF, that's OK, we break in this case /* Emit a warning in the event that we finished processing input @@ -3499,21 +3507,8 @@ static Exit_status dump_local_log_entries(PRINT_EVENT_INFO *print_event_info, "end of input", stop_position); } - /* - Emit a warning in the event that we finished processing input - before reaching the boundary indicated by --stop-datetime. - */ - if (stop_datetime != MY_TIME_T_MAX && - stop_datetime > last_ev_when) - { - retval = OK_STOP; - warning("Did not reach stop datetime '%s' " - "before end of input", stop_datetime_str); - } - goto end; } - last_ev_when= ev->when; if ((retval= process_event(print_event_info, ev, old_off, logname)) != OK_CONTINUE) goto end; @@ -3692,6 +3687,11 @@ int main(int argc, char** argv) start_position= BIN_LOG_HEADER_SIZE; } + if (stop_datetime != MY_TIME_T_MAX && + stop_datetime > last_processed_datetime) + warning("Did not reach stop datetime '%s' before end of input", + stop_datetime_str); + /* If enable flashback, need to print the events from the end to the beginning diff --git a/client/mysqldump.c b/client/mysqldump.c index 5c16504c598..b07fb9786cd 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -3259,7 +3259,7 @@ static uint get_table_structure(const char *table, const char *db, char *table_t fprintf(sql_file, "SET @saved_cs_client = @@character_set_client;\n" - "SET character_set_client = utf8;\n" + "SET character_set_client = utf8mb4;\n" "/*!50001 CREATE VIEW %s AS SELECT\n", result_table); @@ -3327,7 +3327,7 @@ static uint get_table_structure(const char *table, const char *db, char *table_t { fprintf(sql_file, "/*!40101 SET @saved_cs_client = @@character_set_client */;\n" - "/*!40101 SET character_set_client = utf8 */;\n" + "/*!40101 SET character_set_client = utf8mb4 */;\n" "%s%s;\n" "/*!40101 SET character_set_client = @saved_cs_client */;\n", is_log_table ? "CREATE TABLE IF NOT EXISTS " : "", diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake index 612c0c829e7..5e9fbf7a8f0 100644 --- a/cmake/build_configurations/mysql_release.cmake +++ b/cmake/build_configurations/mysql_release.cmake @@ -176,30 +176,40 @@ IF(UNIX) # Default GCC flags IF(CMAKE_COMPILER_IS_GNUCC) SET(COMMON_C_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing -Wno-uninitialized") - SET(CMAKE_C_FLAGS_DEBUG "-O ${COMMON_C_FLAGS}") - SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}") + STRING(APPEND CMAKE_C_FLAGS_DEBUG " ${COMMON_C_FLAGS}") + STRING(APPEND CMAKE_C_FLAGS_RELEASE " ${COMMON_C_FLAGS}") + STRING(APPEND CMAKE_C_FLAGS_RELWITHDEBINFO " ${COMMON_C_FLAGS}") + # MariaDB uses -O3 for release builds + STRING(REGEX REPLACE "-O2" "-O3" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}") + STRING(REGEX REPLACE "-O2" "-O3" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}") ENDIF() IF(CMAKE_COMPILER_IS_GNUCXX) SET(COMMON_CXX_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing -Wno-uninitialized") - SET(CMAKE_CXX_FLAGS_DEBUG "-O ${COMMON_CXX_FLAGS}") - SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}") + STRING(APPEND CMAKE_CXX_FLAGS_DEBUG " ${COMMON_CXX_FLAGS}") + STRING(APPEND CMAKE_CXX_FLAGS_RELEASE " ${COMMON_CXX_FLAGS}") + STRING(APPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO " ${COMMON_CXX_FLAGS}") + # MariaDB uses -O3 for release builds + STRING(REGEX REPLACE "-O2" "-O3" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") + STRING(REGEX REPLACE "-O2" "-O3" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") ENDIF() # IBM Z flags IF(CMAKE_SYSTEM_PROCESSOR MATCHES "s390x") IF(RPM MATCHES "(rhel|centos)6" OR RPM MATCHES "(suse|sles)11") - SET(z_flags "-funroll-loops -march=z9-109 -mtune=z10 ") + SET(z_flags "-funroll-loops -march=z9-109 -mtune=z10") ELSEIF(RPM MATCHES "(rhel|centos)7" OR RPM MATCHES "(suse|sles)12") - SET(z_flags "-funroll-loops -march=z196 -mtune=zEC12 ") + SET(z_flags "-funroll-loops -march=z196 -mtune=zEC12") ELSE() SET(z_flags "") ENDIF() IF(CMAKE_COMPILER_IS_GNUCC) - SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${z_flags}${CMAKE_C_FLAGS_RELWITHDEBINFO}") + STRING(APPEND CMAKE_C_FLAGS_RELEASE " ${z_flags}") + STRING(APPEND CMAKE_C_FLAGS_RELWITHDEBINFO " ${z_flags}") ENDIF() IF(CMAKE_COMPILER_IS_GNUCXX) - SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${z_flags}${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") + STRING(APPEND CMAKE_CXX_FLAGS_RELEASE " ${z_flags}") + STRING(APPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO " ${z_flags}") ENDIF() UNSET(z_flags) ENDIF() @@ -210,11 +220,13 @@ IF(UNIX) IF(CMAKE_SYSTEM_PROCESSOR MATCHES "ia64") SET(COMMON_C_FLAGS "+DSitanium2 -mt -AC99") SET(COMMON_CXX_FLAGS "+DSitanium2 -mt -Aa") - SET(CMAKE_C_FLAGS_DEBUG "+O0 -g ${COMMON_C_FLAGS}") - SET(CMAKE_CXX_FLAGS_DEBUG "+O0 -g ${COMMON_CXX_FLAGS}") - # We have seen compiler bugs with optimisation and -g, so disabled for now - SET(CMAKE_C_FLAGS_RELWITHDEBINFO "+O2 ${COMMON_C_FLAGS}") - SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "+O2 ${COMMON_CXX_FLAGS}") + STRING(APPEND CMAKE_C_FLAGS_DEBUG " +O0 -g ${COMMON_C_FLAGS}") + STRING(APPEND CMAKE_CXX_FLAGS_DEBUG " +O0 -g ${COMMON_CXX_FLAGS}") + STRING(APPEND CMAKE_C_FLAGS_RELEASE " +O0 -g ${COMMON_C_FLAGS}") + STRING(APPEND CMAKE_CXX_FLAGS_RELEASE " +O0 -g ${COMMON_CXX_FLAGS}") + # We have seen compiler bugs with optimisation and -g, so disabled for now + STRING(APPEND CMAKE_C_FLAGS_RELEASE " +O2 ${COMMON_C_FLAGS}") + STRING(APPEND CMAKE_CXX_FLAGS_RELEASE " +O2 ${COMMON_CXX_FLAGS}") ENDIF() ENDIF() SET(WITH_SSL no) @@ -229,10 +241,18 @@ IF(UNIX) SET(COMMON_C_FLAGS "${COMMON_C_FLAGS} -no-ftz -no-prefetch") SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -no-ftz -no-prefetch") ENDIF() - SET(CMAKE_C_FLAGS_DEBUG "${COMMON_C_FLAGS}") - SET(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CXX_FLAGS}") - SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -unroll2 -ip ${COMMON_C_FLAGS}") - SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -unroll2 -ip ${COMMON_CXX_FLAGS}") + STRING(APPEND CMAKE_C_FLAGS_DEBUG " ${COMMON_C_FLAGS}") + STRING(APPEND CMAKE_CXX_FLAGS_DEBUG " ${COMMON_CXX_FLAGS}") + STRING(APPEND CMAKE_C_FLAGS_RELEASE " -unroll2 -ip ${COMMON_C_FLAGS}") + STRING(APPEND CMAKE_CXX_FLAGS_RELEASE " -unroll2 -ip ${COMMON_CXX_FLAGS}") + STRING(APPEND CMAKE_C_FLAGS_RELWITHDEBINFO " -unroll2 -ip ${COMMON_C_FLAGS}") + STRING(APPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO " -unroll2 -ip ${COMMON_CXX_FLAGS}") + + # MariaDB uses -O3 for release builds. + STRING(REGEX REPLACE "-O2" "-O3" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}") + STRING(REGEX REPLACE "-O2" "-O3" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") + STRING(REGEX REPLACE "-O2" "-O3" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}") + STRING(REGEX REPLACE "-O2" "-O3" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") SET(WITH_SSL no) ENDIF() ENDIF() @@ -240,13 +260,21 @@ IF(UNIX) # Default Clang flags IF(CMAKE_C_COMPILER_ID MATCHES "Clang") SET(COMMON_C_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing -Wno-parentheses-equality -Wno-string-plus-int") - SET(CMAKE_C_FLAGS_DEBUG "${COMMON_C_FLAGS}") - SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}") + STRING(APPEND CMAKE_C_FLAGS_DEBUG " ${COMMON_C_FLAGS}") + STRING(APPEND CMAKE_C_FLAGS_RELEASE " ${COMMON_C_FLAGS}") + STRING(APPEND CMAKE_C_FLAGS_RELWITHDEBINFO " ${COMMON_C_FLAGS}") + # MariaDB uses -O3 for release builds. + STRING(REGEX REPLACE "-O2" "-O3" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}") + STRING(REGEX REPLACE "-O2" "-O3" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}") ENDIF() IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang") SET(COMMON_CXX_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing -Wno-parentheses-equality -Wno-string-plus-int") - SET(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CXX_FLAGS}") - SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}") + STRING(APPEND CMAKE_CXX_FLAGS_DEBUG " ${COMMON_CXX_FLAGS}") + STRING(APPEND CMAKE_CXX_FLAGS_RELEASE " ${COMMON_CXX_FLAGS}") + STRING(APPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO " ${COMMON_CXX_FLAGS}") + # MariaDB uses -O3 for release builds. + STRING(REGEX REPLACE "-O2" "-O3" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") + STRING(REGEX REPLACE "-O2" "-O3" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") ENDIF() # Solaris flags @@ -259,27 +287,33 @@ IF(UNIX) IF(CMAKE_SYSTEM_PROCESSOR MATCHES "i386") SET(COMMON_C_FLAGS "-g -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -xtarget=generic") SET(COMMON_CXX_FLAGS "-g0 -mt -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -features=no%except -xlibmil -xlibmopt -xtarget=generic") - SET(CMAKE_C_FLAGS_DEBUG "-xO1 ${COMMON_C_FLAGS}") - SET(CMAKE_CXX_FLAGS_DEBUG "-xO1 ${COMMON_CXX_FLAGS}") + STRING(APPEND CMAKE_C_FLAGS_DEBUG " -xO1 ${COMMON_C_FLAGS}") + STRING(APPEND CMAKE_CXX_FLAGS_DEBUG " -xO1 ${COMMON_CXX_FLAGS}") IF(32BIT) - SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-xO2 ${COMMON_C_FLAGS}") - SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-xO2 ${COMMON_CXX_FLAGS}") + STRING(APPEND CMAKE_C_FLAGS_RELEASE " -xO2 ${COMMON_C_FLAGS}") + STRING(APPEND CMAKE_CXX_FLAGS_RELEASE " -xO2 ${COMMON_CXX_FLAGS}") + STRING(APPEND CMAKE_C_FLAGS_RELWITHDEBINFO " -xO2 ${COMMON_C_FLAGS}") + STRING(APPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO " -xO2 ${COMMON_CXX_FLAGS}") ELSEIF(64BIT) - SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-xO3 ${COMMON_C_FLAGS}") - SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-xO3 ${COMMON_CXX_FLAGS}") + STRING(APPEND CMAKE_C_FLAGS_RELEASE " -xO3 ${COMMON_C_FLAGS}") + STRING(APPEND CMAKE_CXX_FLAGS_RELEASE " -xO3 ${COMMON_CXX_FLAGS}") + STRING(APPEND CMAKE_C_FLAGS_RELWITHDEBINFO " -xO3 ${COMMON_C_FLAGS}") + STRING(APPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO " -xO3 ${COMMON_CXX_FLAGS}") ENDIF() - ELSE() + ELSE() # Assume !x86 is SPARC SET(COMMON_C_FLAGS "-g -Xa -xstrconst -mt") SET(COMMON_CXX_FLAGS "-g0 -noex -mt") IF(32BIT) - SET(COMMON_C_FLAGS "${COMMON_C_FLAGS} -xarch=sparc") - SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -xarch=sparc") - ENDIF() - SET(CMAKE_C_FLAGS_DEBUG "${COMMON_C_FLAGS}") - SET(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CXX_FLAGS}") - SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-xO3 ${COMMON_C_FLAGS}") - SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-xO3 ${COMMON_CXX_FLAGS}") + STRING(APPEND COMMON_C_FLAGS " -xarch=sparc") + STRING(APPEND COMMON_CXX_FLAGS " -xarch=sparc") + ENDIF() + STRING(APPEND CMAKE_C_FLAGS_DEBUG " ${COMMON_C_FLAGS}") + STRING(APPEND CMAKE_CXX_FLAGS_DEBUG " ${COMMON_CXX_FLAGS}") + STRING(APPEND CMAKE_C_FLAGS_RELEASE " -xO3 ${COMMON_C_FLAGS}") + STRING(APPEND CMAKE_CXX_FLAGS_RELEASE " -xO3 ${COMMON_CXX_FLAGS}") + STRING(APPEND CMAKE_C_FLAGS_RELWITHDEBINFO " -xO3 ${COMMON_C_FLAGS}") + STRING(APPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO " -xO3 ${COMMON_CXX_FLAGS}") ENDIF() ENDIF() ENDIF() diff --git a/debian/additions/debian-start b/debian/additions/debian-start index d85e4a12136..d9b004f8116 100755 --- a/debian/additions/debian-start +++ b/debian/additions/debian-start @@ -22,8 +22,8 @@ then . /etc/default/mariadb fi -MARIADB="/usr/bin/mariadb --defaults-file=/etc/mysql/debian.cnf" -MYADMIN="/usr/bin/mariadb-admin --defaults-file=/etc/mysql/debian.cnf" +MARIADB="/usr/bin/mariadb --defaults-extra-file=/etc/mysql/debian.cnf" +MYADMIN="/usr/bin/mariadb-admin --defaults-extra-file=/etc/mysql/debian.cnf" # Don't run full mariadb-upgrade on every server restart, use --version-check to do it only once MYUPGRADE="/usr/bin/mariadb-upgrade --defaults-extra-file=/etc/mysql/debian.cnf --version-check --silent" MYCHECK_SUBJECT="WARNING: mariadb-check has found corrupt tables" diff --git a/extra/wolfssl/CMakeLists.txt b/extra/wolfssl/CMakeLists.txt index e3f8da21f76..dc2f8092762 100644 --- a/extra/wolfssl/CMakeLists.txt +++ b/extra/wolfssl/CMakeLists.txt @@ -130,6 +130,9 @@ if(MSVC) if(CMAKE_C_COMPILER_ID MATCHES Clang) target_compile_options(wolfssl PRIVATE $<$:-Wno-incompatible-function-pointer-types>) endif() + remove_definitions(-DHAVE_CONFIG_H) + target_compile_definitions(wolfssl PRIVATE + WOLFSSL_HAVE_MIN WOLFSSL_HAVE_MAX) endif() CONFIGURE_FILE(user_settings.h.in user_settings.h) diff --git a/extra/wolfssl/user_settings.h.in b/extra/wolfssl/user_settings.h.in index 489118b33b4..92e92d04e4a 100644 --- a/extra/wolfssl/user_settings.h.in +++ b/extra/wolfssl/user_settings.h.in @@ -3,7 +3,21 @@ #define HAVE_CRL #define WOLFSSL_HAVE_ERROR_QUEUE + +/* + Workaround bug in 5.7.6 + WOLFSSL_MYSQL_COMPATIBLE breaks building wolfssl + + But it is needed to avoid redefinition of protocol_version + when its public header ssl.h is included +*/ +#ifndef BUILDING_WOLFSSL #define WOLFSSL_MYSQL_COMPATIBLE +#endif + +#define SP_INT_BITS 8192 +#define HAVE_EMPTY_AGGREGATES 0 + #define HAVE_ECC #define ECC_TIMING_RESISTANT #define HAVE_HASHDRBG @@ -24,7 +38,8 @@ #define HAVE_THREAD_LS #define WOLFSSL_AES_COUNTER #define NO_WOLFSSL_STUB -#define OPENSSL_ALL +// #define OPENSSL_ALL +#define OPENSSL_EXTRA #define WOLFSSL_ALLOW_TLSV10 #define NO_OLD_TIMEVAL_NAME #define HAVE_SECURE_RENEGOTIATION diff --git a/extra/wolfssl/wolfssl b/extra/wolfssl/wolfssl index 00e42151ca0..239b85c8043 160000 --- a/extra/wolfssl/wolfssl +++ b/extra/wolfssl/wolfssl @@ -1 +1 @@ -Subproject commit 00e42151ca061463ba6a95adb2290f678cbca472 +Subproject commit 239b85c80438bf60d9a5b9e0ebe9ff097a760d0d diff --git a/include/mariadb_capi_rename.h b/include/mariadb_capi_rename.h index 58e16fdc0c0..4f6750d4664 100644 --- a/include/mariadb_capi_rename.h +++ b/include/mariadb_capi_rename.h @@ -37,16 +37,19 @@ #define mysql_free_result MARIADB_ADD_PREFIX(mysql_free_result) #define mysql_get_socket MARIADB_ADD_PREFIX(mysql_get_socket) #define mysql_set_character_set MARIADB_ADD_PREFIX(mysql_set_character_set) +#define mysql_real_escape_string MARIADB_ADD_PREFIX(mysql_real_escape_string) #define mysql_get_server_version MARIADB_ADD_PREFIX(mysql_get_server_version) #define mysql_error MARIADB_ADD_PREFIX(mysql_error) #define mysql_errno MARIADB_ADD_PREFIX(mysql_errno) #define mysql_num_fields MARIADB_ADD_PREFIX(mysql_num_fields) #define mysql_num_rows MARIADB_ADD_PREFIX(mysql_num_rows) #define mysql_options4 MARIADB_ADD_PREFIX(mysql_options4) +#define mysql_fetch_fields MARIADB_ADD_PREFIX(mysql_fetch_fields) #define mysql_fetch_lengths MARIADB_ADD_PREFIX(mysql_fetch_lengths) #define mysql_fetch_row MARIADB_ADD_PREFIX(mysql_fetch_row) #define mysql_affected_rows MARIADB_ADD_PREFIX(mysql_affected_rows) #define mysql_store_result MARIADB_ADD_PREFIX(mysql_store_result) +#define mysql_use_result MARIADB_ADD_PREFIX(mysql_use_result) #define mysql_select_db MARIADB_ADD_PREFIX(mysql_select_db) #define mysql_get_ssl_cipher MARIADB_ADD_PREFIX(mysql_get_ssl_cipher) #define mysql_ssl_set MARIADB_ADD_PREFIX(mysql_ssl_set) diff --git a/include/my_cpu.h b/include/my_cpu.h index 003087dd94d..bd5fca5f21b 100644 --- a/include/my_cpu.h +++ b/include/my_cpu.h @@ -94,20 +94,13 @@ static inline void MY_RELAX_CPU(void) __asm__ __volatile__ ("pause"); #endif #elif defined(_ARCH_PWR8) -#ifdef __FreeBSD__ - uint64_t __tb; - __asm__ volatile ("mfspr %0, 268" : "=r" (__tb)); -#else - /* Changed from __ppc_get_timebase for musl compatibility */ + /* Changed from __ppc_get_timebase for musl and clang compatibility */ __builtin_ppc_get_timebase(); -#endif -#elif defined __GNUC__ && (defined __arm__ || defined __aarch64__) +#elif defined __GNUC__ && defined __riscv + __builtin_riscv_pause(); +#elif defined __GNUC__ /* Mainly, prevent the compiler from optimizing away delay loops */ __asm__ __volatile__ ("":::"memory"); -#else - int32 var, oldval = 0; - my_atomic_cas32_strong_explicit(&var, &oldval, 1, MY_MEMORY_ORDER_RELAXED, - MY_MEMORY_ORDER_RELAXED); #endif } diff --git a/include/my_pthread.h b/include/my_pthread.h index ca32fecc064..5dceacb6399 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -640,6 +640,13 @@ extern pthread_mutexattr_t my_errorcheck_mutexattr; #endif typedef uint64 my_thread_id; +/** + Long-standing formats (such as the client-server protocol and the binary log) + hard-coded `my_thread_id` to 32 bits in practice. (Though not all + `thread_id`s are typed as such, @ref my_thread_id itself among those.) + @see MDEV-35706 +*/ +#define MY_THREAD_ID_MAX UINT32_MAX extern void my_threadattr_global_init(void); extern my_bool my_thread_global_init(void); diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h index a5763a029ce..d30fb058028 100644 --- a/include/mysql/plugin.h +++ b/include/mysql/plugin.h @@ -44,7 +44,8 @@ class THD; class Item; #define MYSQL_THD THD* #else -#define MYSQL_THD void* +struct THD; +typedef struct THD* MYSQL_THD; #endif typedef char my_bool; diff --git a/include/mysql/plugin_audit.h.pp b/include/mysql/plugin_audit.h.pp index 57ba61d3911..df2807bbebf 100644 --- a/include/mysql/plugin_audit.h.pp +++ b/include/mysql/plugin_audit.h.pp @@ -487,9 +487,12 @@ extern struct sql_service_st { int (STDCALL *mysql_set_character_set_func)(MYSQL *mysql, const char *cs_name); unsigned int (STDCALL *mysql_num_fields_func)(MYSQL_RES *res); int (STDCALL *mysql_select_db_func)(MYSQL *mysql, const char *db); + MYSQL_RES *(STDCALL *mysql_use_result_func)(MYSQL *mysql); + MYSQL_FIELD *(STDCALL *mysql_fetch_fields_func)(MYSQL_RES *res); + unsigned long (STDCALL *mysql_real_escape_string_func)(MYSQL *mysql, char *to, + const char *from, unsigned long length); my_bool (STDCALL *mysql_ssl_set_func)(MYSQL *mysql, const char *key, - const char *cert, const char *ca, - const char *capath, const char *cipher); + const char *cert, const char *ca, const char *capath, const char *cipher); } *sql_service; MYSQL *mysql_real_connect_local(MYSQL *mysql); } diff --git a/include/mysql/plugin_auth.h.pp b/include/mysql/plugin_auth.h.pp index 15e4c0cde4d..cea1a638dd0 100644 --- a/include/mysql/plugin_auth.h.pp +++ b/include/mysql/plugin_auth.h.pp @@ -487,9 +487,12 @@ extern struct sql_service_st { int (STDCALL *mysql_set_character_set_func)(MYSQL *mysql, const char *cs_name); unsigned int (STDCALL *mysql_num_fields_func)(MYSQL_RES *res); int (STDCALL *mysql_select_db_func)(MYSQL *mysql, const char *db); + MYSQL_RES *(STDCALL *mysql_use_result_func)(MYSQL *mysql); + MYSQL_FIELD *(STDCALL *mysql_fetch_fields_func)(MYSQL_RES *res); + unsigned long (STDCALL *mysql_real_escape_string_func)(MYSQL *mysql, char *to, + const char *from, unsigned long length); my_bool (STDCALL *mysql_ssl_set_func)(MYSQL *mysql, const char *key, - const char *cert, const char *ca, - const char *capath, const char *cipher); + const char *cert, const char *ca, const char *capath, const char *cipher); } *sql_service; MYSQL *mysql_real_connect_local(MYSQL *mysql); } diff --git a/include/mysql/plugin_data_type.h.pp b/include/mysql/plugin_data_type.h.pp index 7938bf3c475..6c8e3d93f06 100644 --- a/include/mysql/plugin_data_type.h.pp +++ b/include/mysql/plugin_data_type.h.pp @@ -487,9 +487,12 @@ extern struct sql_service_st { int (STDCALL *mysql_set_character_set_func)(MYSQL *mysql, const char *cs_name); unsigned int (STDCALL *mysql_num_fields_func)(MYSQL_RES *res); int (STDCALL *mysql_select_db_func)(MYSQL *mysql, const char *db); + MYSQL_RES *(STDCALL *mysql_use_result_func)(MYSQL *mysql); + MYSQL_FIELD *(STDCALL *mysql_fetch_fields_func)(MYSQL_RES *res); + unsigned long (STDCALL *mysql_real_escape_string_func)(MYSQL *mysql, char *to, + const char *from, unsigned long length); my_bool (STDCALL *mysql_ssl_set_func)(MYSQL *mysql, const char *key, - const char *cert, const char *ca, - const char *capath, const char *cipher); + const char *cert, const char *ca, const char *capath, const char *cipher); } *sql_service; MYSQL *mysql_real_connect_local(MYSQL *mysql); } diff --git a/include/mysql/plugin_encryption.h.pp b/include/mysql/plugin_encryption.h.pp index 97191c4a09c..b1170bd9fbf 100644 --- a/include/mysql/plugin_encryption.h.pp +++ b/include/mysql/plugin_encryption.h.pp @@ -487,9 +487,12 @@ extern struct sql_service_st { int (STDCALL *mysql_set_character_set_func)(MYSQL *mysql, const char *cs_name); unsigned int (STDCALL *mysql_num_fields_func)(MYSQL_RES *res); int (STDCALL *mysql_select_db_func)(MYSQL *mysql, const char *db); + MYSQL_RES *(STDCALL *mysql_use_result_func)(MYSQL *mysql); + MYSQL_FIELD *(STDCALL *mysql_fetch_fields_func)(MYSQL_RES *res); + unsigned long (STDCALL *mysql_real_escape_string_func)(MYSQL *mysql, char *to, + const char *from, unsigned long length); my_bool (STDCALL *mysql_ssl_set_func)(MYSQL *mysql, const char *key, - const char *cert, const char *ca, - const char *capath, const char *cipher); + const char *cert, const char *ca, const char *capath, const char *cipher); } *sql_service; MYSQL *mysql_real_connect_local(MYSQL *mysql); } diff --git a/include/mysql/plugin_ftparser.h.pp b/include/mysql/plugin_ftparser.h.pp index cc2c276c579..38da8c75b0b 100644 --- a/include/mysql/plugin_ftparser.h.pp +++ b/include/mysql/plugin_ftparser.h.pp @@ -487,9 +487,12 @@ extern struct sql_service_st { int (STDCALL *mysql_set_character_set_func)(MYSQL *mysql, const char *cs_name); unsigned int (STDCALL *mysql_num_fields_func)(MYSQL_RES *res); int (STDCALL *mysql_select_db_func)(MYSQL *mysql, const char *db); + MYSQL_RES *(STDCALL *mysql_use_result_func)(MYSQL *mysql); + MYSQL_FIELD *(STDCALL *mysql_fetch_fields_func)(MYSQL_RES *res); + unsigned long (STDCALL *mysql_real_escape_string_func)(MYSQL *mysql, char *to, + const char *from, unsigned long length); my_bool (STDCALL *mysql_ssl_set_func)(MYSQL *mysql, const char *key, - const char *cert, const char *ca, - const char *capath, const char *cipher); + const char *cert, const char *ca, const char *capath, const char *cipher); } *sql_service; MYSQL *mysql_real_connect_local(MYSQL *mysql); } diff --git a/include/mysql/plugin_function.h.pp b/include/mysql/plugin_function.h.pp index afdcb5344e3..73e86f2c8cb 100644 --- a/include/mysql/plugin_function.h.pp +++ b/include/mysql/plugin_function.h.pp @@ -487,9 +487,12 @@ extern struct sql_service_st { int (STDCALL *mysql_set_character_set_func)(MYSQL *mysql, const char *cs_name); unsigned int (STDCALL *mysql_num_fields_func)(MYSQL_RES *res); int (STDCALL *mysql_select_db_func)(MYSQL *mysql, const char *db); + MYSQL_RES *(STDCALL *mysql_use_result_func)(MYSQL *mysql); + MYSQL_FIELD *(STDCALL *mysql_fetch_fields_func)(MYSQL_RES *res); + unsigned long (STDCALL *mysql_real_escape_string_func)(MYSQL *mysql, char *to, + const char *from, unsigned long length); my_bool (STDCALL *mysql_ssl_set_func)(MYSQL *mysql, const char *key, - const char *cert, const char *ca, - const char *capath, const char *cipher); + const char *cert, const char *ca, const char *capath, const char *cipher); } *sql_service; MYSQL *mysql_real_connect_local(MYSQL *mysql); } diff --git a/include/mysql/plugin_password_validation.h.pp b/include/mysql/plugin_password_validation.h.pp index 3f238088cad..f6693221b2d 100644 --- a/include/mysql/plugin_password_validation.h.pp +++ b/include/mysql/plugin_password_validation.h.pp @@ -487,9 +487,12 @@ extern struct sql_service_st { int (STDCALL *mysql_set_character_set_func)(MYSQL *mysql, const char *cs_name); unsigned int (STDCALL *mysql_num_fields_func)(MYSQL_RES *res); int (STDCALL *mysql_select_db_func)(MYSQL *mysql, const char *db); + MYSQL_RES *(STDCALL *mysql_use_result_func)(MYSQL *mysql); + MYSQL_FIELD *(STDCALL *mysql_fetch_fields_func)(MYSQL_RES *res); + unsigned long (STDCALL *mysql_real_escape_string_func)(MYSQL *mysql, char *to, + const char *from, unsigned long length); my_bool (STDCALL *mysql_ssl_set_func)(MYSQL *mysql, const char *key, - const char *cert, const char *ca, - const char *capath, const char *cipher); + const char *cert, const char *ca, const char *capath, const char *cipher); } *sql_service; MYSQL *mysql_real_connect_local(MYSQL *mysql); } diff --git a/include/mysql/psi/mysql_file.h b/include/mysql/psi/mysql_file.h index fd3b29cc5c9..096815ed02d 100644 --- a/include/mysql/psi/mysql_file.h +++ b/include/mysql/psi/mysql_file.h @@ -1018,7 +1018,7 @@ inline_mysql_file_create( #ifdef HAVE_PSI_FILE_INTERFACE PSI_file_key key, const char *src_file, uint src_line, #endif - const char *filename, int create_flags, int access_flags, myf myFlags) + const char *filename, mode_t create_flags, int access_flags, myf myFlags) { File file; #ifdef HAVE_PSI_FILE_INTERFACE @@ -1344,7 +1344,7 @@ inline_mysql_file_create_with_symlink( #ifdef HAVE_PSI_FILE_INTERFACE PSI_file_key key, const char *src_file, uint src_line, #endif - const char *linkname, const char *filename, int create_flags, + const char *linkname, const char *filename, mode_t create_flags, int access_flags, myf flags) { File file; diff --git a/include/mysql/service_debug_sync.h b/include/mysql/service_debug_sync.h index 0bd49a13458..f7fdbf04832 100644 --- a/include/mysql/service_debug_sync.h +++ b/include/mysql/service_debug_sync.h @@ -351,7 +351,11 @@ extern void (*debug_sync_C_callback_ptr)(MYSQL_THD, const char *, size_t); #endif /* defined(ENABLED_DEBUG_SYNC) */ /* compatibility macro */ +#ifdef __cplusplus +#define DEBUG_SYNC_C(name) DEBUG_SYNC(nullptr, name) +#else #define DEBUG_SYNC_C(name) DEBUG_SYNC(NULL, name) +#endif #ifdef __cplusplus } diff --git a/include/mysql/service_sql.h b/include/mysql/service_sql.h index e9d1491d1cd..a4a61cc0f47 100644 --- a/include/mysql/service_sql.h +++ b/include/mysql/service_sql.h @@ -68,9 +68,12 @@ extern struct sql_service_st { int (STDCALL *mysql_set_character_set_func)(MYSQL *mysql, const char *cs_name); unsigned int (STDCALL *mysql_num_fields_func)(MYSQL_RES *res); int (STDCALL *mysql_select_db_func)(MYSQL *mysql, const char *db); + MYSQL_RES *(STDCALL *mysql_use_result_func)(MYSQL *mysql); + MYSQL_FIELD *(STDCALL *mysql_fetch_fields_func)(MYSQL_RES *res); + unsigned long (STDCALL *mysql_real_escape_string_func)(MYSQL *mysql, char *to, + const char *from, unsigned long length); my_bool (STDCALL *mysql_ssl_set_func)(MYSQL *mysql, const char *key, - const char *cert, const char *ca, - const char *capath, const char *cipher); + const char *cert, const char *ca, const char *capath, const char *cipher); } *sql_service; #ifdef MYSQL_DYNAMIC_PLUGIN @@ -92,7 +95,10 @@ extern struct sql_service_st { #define mysql_set_character_set(M,C) sql_service->mysql_set_character_set_func(M,C) #define mysql_num_fields(R) sql_service->mysql_num_fields_func(R) #define mysql_select_db(M,D) sql_service->mysql_select_db_func(M,D) -#define mysql_ssl_set(M,K,C,A,P,H) sql_service->mysql_ssl_set_func(M,K,C,A,P,H) +#define mysql_use_result(M) sql_service->mysql_use_result_func(M) +#define mysql_fetch_fields(R) sql_service->mysql_fetch_fields_func(R) +#define mysql_real_escape_string(M,T,F,L) sql_service->mysql_real_escape_string_func(M,T,F,L) +#define mysql_ssl_set(M,K,C1,C2,C3,C4) sql_service->mysql_ssl_set_func(M,K,C1,C2,C3,C4) #else diff --git a/include/scope.h b/include/scope.h index e0e9fc62969..932ab410d78 100644 --- a/include/scope.h +++ b/include/scope.h @@ -32,6 +32,11 @@ public: { } + template + scope_exit(F &&f, bool engaged) : function_(std::forward(f)), engaged_(engaged) + { + } + scope_exit(scope_exit &&rhs) : function_(std::move(rhs.function_)), engaged_(rhs.engaged_) { @@ -43,6 +48,7 @@ public: scope_exit &operator=(const scope_exit &)= delete; void release() { engaged_= false; } + void engage() { DBUG_ASSERT(!engaged_); engaged_= true; } ~scope_exit() { @@ -58,17 +64,103 @@ private: } // end namespace detail template -detail::scope_exit::type> -make_scope_exit(Callable &&f) +inline +::detail::scope_exit::type> +make_scope_exit(Callable &&f, bool engaged= true) { - return detail::scope_exit::type>( - std::forward(f)); + return ::detail::scope_exit::type>( + std::forward(f), engaged); } #define CONCAT_IMPL(x, y) x##y - #define CONCAT(x, y) CONCAT_IMPL(x, y) - #define ANONYMOUS_VARIABLE CONCAT(_anonymous_variable, __LINE__) #define SCOPE_EXIT auto ANONYMOUS_VARIABLE= make_scope_exit + +#define IF_CLASS(C) typename std::enable_if::value>::type +#define IF_NOT_CLASS(C) typename std::enable_if::value>::type + +namespace detail +{ + +template +class Scope_value +{ +public: + // Use SFINAE for passing structs by reference and plain types by value. + // This ctor is defined only if T is a class or struct: + template + Scope_value(T &variable, const T &scope_value) + : variable_(&variable), saved_value_(variable) + { + variable= scope_value; + } + + // This ctor is defined only if T is NOT a class or struct: + template + Scope_value(T &variable, const T scope_value) + : variable_(&variable), saved_value_(variable) + { + variable= scope_value; + } + + Scope_value(Scope_value &&rhs) + : variable_(rhs.variable_), saved_value_(rhs.saved_value_) + { + rhs.variable_= NULL; + } + + Scope_value(const Scope_value &)= delete; + Scope_value &operator=(const Scope_value &)= delete; + Scope_value &operator=(Scope_value &&)= delete; + + ~Scope_value() + { + if (variable_) + *variable_= saved_value_; + } + +private: + T *variable_; + T saved_value_; +}; + +} // namespace detail + +// Use like this: +// auto _= make_scope_value(var, tmp_value); + +template +inline +::detail::Scope_value make_scope_value(T &variable, const T &scope_value) +{ + return ::detail::Scope_value(variable, scope_value); +} + +template +inline +::detail::Scope_value make_scope_value(T &variable, T scope_value) +{ + return ::detail::Scope_value(variable, scope_value); +} + +/* + Note: perfect forwarding version can not pass const: + + template + inline + detail::Scope_value make_scope_value(T &variable, U &&scope_value) + { + return detail::Scope_value(variable, std::forward(scope_value)); + } + + as `const U &&` fails with error `expects an rvalue for 2nd argument`. That + happens because const U && is treated as rvalue only (this is the exact syntax + for declaring rvalues). +*/ + + +#define SCOPE_VALUE auto ANONYMOUS_VARIABLE= make_scope_value +#define SCOPE_SET(VAR, MASK) auto ANONYMOUS_VARIABLE= make_scope_value(VAR, VAR | MASK) +#define SCOPE_CLEAR(VAR, MASK) auto ANONYMOUS_VARIABLE= make_scope_value(VAR, VAR & ~MASK) diff --git a/include/service_versions.h b/include/service_versions.h index c8169614de2..cd66315ffd2 100644 --- a/include/service_versions.h +++ b/include/service_versions.h @@ -43,9 +43,9 @@ #define VERSION_thd_wait 0x0100 #define VERSION_wsrep 0x0500 #define VERSION_json 0x0100 +#define VERSION_sql_service 0x0102 #define VERSION_thd_mdl 0x0100 #define VERSION_print_check_msg 0x0100 -#define VERSION_sql_service 0x0101 #define VERSION_provider_bzip2 0x0100 #define VERSION_provider_lz4 0x0100 diff --git a/libmariadb b/libmariadb index 3f2196d84e2..2d56f340c4a 160000 --- a/libmariadb +++ b/libmariadb @@ -1 +1 @@ -Subproject commit 3f2196d84e20dd89c682fde6154849ec5bb36c85 +Subproject commit 2d56f340c4a0f2c636e317a3efd41b8c5f554088 diff --git a/libmysqld/libmysql.c b/libmysqld/libmysql.c index 07926763c61..da6f3a2d8fa 100644 --- a/libmysqld/libmysql.c +++ b/libmysqld/libmysql.c @@ -1065,11 +1065,6 @@ MYSQL_FIELD * STDCALL mysql_fetch_field_direct(MYSQL_RES *res,uint fieldnr) return &(res)->fields[fieldnr]; } -MYSQL_FIELD * STDCALL mysql_fetch_fields(MYSQL_RES *res) -{ - return (res)->fields; -} - MYSQL_ROW_OFFSET STDCALL mysql_row_tell(MYSQL_RES *res) { return res->data_cursor; @@ -1215,18 +1210,6 @@ mysql_escape_string(char *to,const char *from,ulong length) length, &overflow); } -ulong STDCALL -mysql_real_escape_string(MYSQL *mysql, char *to,const char *from, - ulong length) -{ - my_bool overflow; - if (mysql->server_status & SERVER_STATUS_NO_BACKSLASH_ESCAPES) - return (ulong) escape_quotes_for_mysql(mysql->charset, to, 0, from, length, - &overflow); - return (ulong) escape_string_for_mysql(mysql->charset, to, 0, from, length, - &overflow); -} - void STDCALL myodbc_remove_escape(MYSQL *mysql,char *name) { @@ -4955,11 +4938,6 @@ int STDCALL mysql_stmt_next_result(MYSQL_STMT *stmt) } -MYSQL_RES * STDCALL mysql_use_result(MYSQL *mysql) -{ - return (*mysql->methods->use_result)(mysql); -} - my_bool STDCALL mysql_read_query_result(MYSQL *mysql) { return (*mysql->methods->read_query_result)(mysql); diff --git a/mysql-test/include/ctype_supplementary_chars.inc b/mysql-test/include/ctype_supplementary_chars.inc new file mode 100644 index 00000000000..dfc2497125b --- /dev/null +++ b/mysql-test/include/ctype_supplementary_chars.inc @@ -0,0 +1,26 @@ +--eval CREATE TABLE t1 (a CHAR(8) DEFAULT REVERSE('aha')) $table_charset +SHOW CREATE TABLE t1; +INSERT INTO t1 VALUES (); +SELECT * FROM t1; + +--eval CREATE TABLE t2 (a CHAR(8) DEFAULT REVERSE('åäá')) $table_charset +SHOW CREATE TABLE t2; +INSERT INTO t2 VALUES (); +SELECT * FROM t2; + +--eval CREATE TABLE t3 (a CHAR(8) DEFAULT REVERSE('😎😀')) $table_charset +SHOW CREATE TABLE t3; +INSERT INTO t3 VALUES (); +SELECT * FROM t3; + +--eval CREATE TABLE t4 (a CHAR(8), b CHAR(8) AS (REVERSE('😎😀'))) $table_charset +SHOW CREATE TABLE t4; +INSERT INTO t4 (a) VALUES (''); +SELECT * FROM t4; + +--eval CREATE TABLE t5 (a CHAR(8), b CHAR(8) CHECK (b=BINARY REVERSE('😎😀'))) $table_charset +SHOW CREATE TABLE t5; +--error ER_CONSTRAINT_FAILED +INSERT INTO t5 VALUES ('','😎😀'); +INSERT INTO t5 VALUES ('','😀😎'); +SELECT * FROM t5; diff --git a/mysql-test/include/galera_variables_ok.inc b/mysql-test/include/galera_variables_ok.inc index c9a54724c17..d10bf1fd36e 100644 --- a/mysql-test/include/galera_variables_ok.inc +++ b/mysql-test/include/galera_variables_ok.inc @@ -1,9 +1,16 @@ --disable_query_log ---let $galera_variables_ok = `SELECT COUNT(*) = 50 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE 'wsrep%'` +let $_galera_variables_delta=$galera_variables_delta; +if (!$_galera_variables_delta) { +--let $galera_variables_delta=0 +} ---if (!$galera_variables_ok) { - --skip Galera number of variables has changed! +--let $galera_variables_expected=`SELECT 50 + $galera_variables_delta` + +--let $galera_variables_count=`SELECT COUNT(*) FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE 'wsrep%'` + +--if ($galera_variables_count != $galera_variables_expected) { + --skip Galera number of variables has changed! ($galera_variables_count instead of $galera_variables_expected) } --enable_query_log diff --git a/mysql-test/include/galera_variables_ok_debug.inc b/mysql-test/include/galera_variables_ok_debug.inc index e420b3af6c3..495b850c871 100644 --- a/mysql-test/include/galera_variables_ok_debug.inc +++ b/mysql-test/include/galera_variables_ok_debug.inc @@ -1,9 +1,5 @@ ---disable_query_log +# Now the number of variables for the release and debug versions +# of the library is equal to each other... +--let $galera_variables_delta=0 ---let $galera_variables_ok = `SELECT COUNT(*) = 51 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE 'wsrep%'` - ---if (!$galera_variables_ok) { - --skip Galera number of variables has changed! -} - ---enable_query_log +--source include/galera_variables_ok.inc diff --git a/mysql-test/lib/My/SafeProcess/safe_process_win.cc b/mysql-test/lib/My/SafeProcess/safe_process_win.cc index 8a5bb60a3f5..6e1fd414287 100644 --- a/mysql-test/lib/My/SafeProcess/safe_process_win.cc +++ b/mysql-test/lib/My/SafeProcess/safe_process_win.cc @@ -152,6 +152,24 @@ void handle_signal (int signal) } } +/** + Sets the append flag (FILE_APPEND_DATA) so that the handle inherited by the + child process will be in append mode. + Workaround for perl bug https://github.com/Perl/perl5/issues/17570 +*/ +static void fix_file_append_flag_inheritance(DWORD std_handle) +{ + HANDLE old_handle = GetStdHandle(std_handle); + HANDLE new_handle = ReOpenFile(old_handle, FILE_APPEND_DATA, + FILE_SHARE_WRITE | FILE_SHARE_READ, 0); + if (new_handle != INVALID_HANDLE_VALUE) + { + SetHandleInformation(new_handle, HANDLE_FLAG_INHERIT, HANDLE_FLAG_INHERIT); + SetStdHandle(std_handle, new_handle); + CloseHandle(old_handle); + } +} + int main(int argc, const char** argv ) { @@ -270,6 +288,9 @@ int main(int argc, const char** argv ) SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX); + fix_file_append_flag_inheritance(STD_OUTPUT_HANDLE); + fix_file_append_flag_inheritance(STD_ERROR_HANDLE); + #if 0 /* Setup stdin, stdout and stderr redirect */ si.dwFlags= STARTF_USESTDHANDLES; diff --git a/mysql-test/main/alter_table.result b/mysql-test/main/alter_table.result index 64d3d8c0c3e..c033ae26dad 100644 --- a/mysql-test/main/alter_table.result +++ b/mysql-test/main/alter_table.result @@ -3107,8 +3107,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `altcol1` blob DEFAULT '', - KEY `altcol1` (`altcol1`(2300)), - KEY `h` (`altcol1`(2300)) + KEY `altcol1` (`altcol1`(2300)) ) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 ROW_FORMAT=PAGE show create table t2; Table Create Table diff --git a/mysql-test/main/ctype_big5.result b/mysql-test/main/ctype_big5.result index cde970373eb..0d0e9e09112 100644 --- a/mysql-test/main/ctype_big5.result +++ b/mysql-test/main/ctype_big5.result @@ -5633,5 +5633,14 @@ EXECUTE IMMEDIATE CONCAT('a.', @seq, ':=1'); ERROR HY000: Invalid big5 character string: '\xA3\xC0' SET sql_mode=DEFAULT; # +# MDEV-30111 InnoDB: Failing assertion: update->n_fields == 0 in row_ins_sec_index_entry_by_modify +# +select strcmp(_big5'' collate big5_chinese_nopad_ci, _big5 0x0001050001) as c1; +c1 +-1 +select strcmp(_big5'' collate big5_nopad_bin, _big5 0x0001050001) as c1; +c1 +-1 +# # End of 10.5 tests # diff --git a/mysql-test/main/ctype_big5.test b/mysql-test/main/ctype_big5.test index bdf884768da..4b87373a3fd 100644 --- a/mysql-test/main/ctype_big5.test +++ b/mysql-test/main/ctype_big5.test @@ -291,6 +291,13 @@ SET NAMES big5; SET @seq=_big5 0xA3C0; --source include/ctype_ident_sys.inc +--echo # +--echo # MDEV-30111 InnoDB: Failing assertion: update->n_fields == 0 in row_ins_sec_index_entry_by_modify +--echo # + +select strcmp(_big5'' collate big5_chinese_nopad_ci, _big5 0x0001050001) as c1; +select strcmp(_big5'' collate big5_nopad_bin, _big5 0x0001050001) as c1; + --echo # --echo # End of 10.5 tests --echo # diff --git a/mysql-test/main/ctype_cp932.result b/mysql-test/main/ctype_cp932.result index f8d83463f26..f80989b5529 100644 --- a/mysql-test/main/ctype_cp932.result +++ b/mysql-test/main/ctype_cp932.result @@ -928,5 +928,14 @@ EXECUTE IMMEDIATE CONCAT('a.', @seq, ':=1'); ERROR HY000: Invalid cp932 character string: '\x81' SET sql_mode=DEFAULT; # +# MDEV-30111 InnoDB: Failing assertion: update->n_fields == 0 in row_ins_sec_index_entry_by_modify +# +select strcmp(_cp932'' collate cp932_japanese_nopad_ci, _cp932 0x0001050001) as c1; +c1 +-1 +select strcmp(_cp932'' collate cp932_nopad_bin, _cp932 0x0001050001) as c1; +c1 +-1 +# # End of 10.5 tests # diff --git a/mysql-test/main/ctype_cp932.test b/mysql-test/main/ctype_cp932.test index 2ccbe8f1582..b340461b74f 100644 --- a/mysql-test/main/ctype_cp932.test +++ b/mysql-test/main/ctype_cp932.test @@ -70,6 +70,13 @@ SET NAMES cp932; SET @seq=_cp932 0x81AD; --source include/ctype_ident_sys.inc +--echo # +--echo # MDEV-30111 InnoDB: Failing assertion: update->n_fields == 0 in row_ins_sec_index_entry_by_modify +--echo # + +select strcmp(_cp932'' collate cp932_japanese_nopad_ci, _cp932 0x0001050001) as c1; +select strcmp(_cp932'' collate cp932_nopad_bin, _cp932 0x0001050001) as c1; + --echo # --echo # End of 10.5 tests --echo # diff --git a/mysql-test/main/ctype_eucjpms.result b/mysql-test/main/ctype_eucjpms.result index 4cd17378e2a..c43ee88525e 100644 --- a/mysql-test/main/ctype_eucjpms.result +++ b/mysql-test/main/ctype_eucjpms.result @@ -34822,5 +34822,14 @@ EXECUTE IMMEDIATE CONCAT('a.', @seq, ':=1'); ERROR HY000: Invalid eucjpms character string: '\x8F\xA1\xA1' SET sql_mode=DEFAULT; # +# MDEV-30111 InnoDB: Failing assertion: update->n_fields == 0 in row_ins_sec_index_entry_by_modify +# +select strcmp(_eucjpms'' collate eucjpms_japanese_nopad_ci, _eucjpms 0x0001050001) as c1; +c1 +-1 +select strcmp(_eucjpms'' collate eucjpms_nopad_bin, _eucjpms 0x0001050001) as c1; +c1 +-1 +# # End of 10.5 tests # diff --git a/mysql-test/main/ctype_eucjpms.test b/mysql-test/main/ctype_eucjpms.test index 12f1d5fc507..370b4a77328 100644 --- a/mysql-test/main/ctype_eucjpms.test +++ b/mysql-test/main/ctype_eucjpms.test @@ -620,6 +620,13 @@ SET NAMES eucjpms; SET @seq=_eucjpms 0x8FA1A1; --source include/ctype_ident_sys.inc +--echo # +--echo # MDEV-30111 InnoDB: Failing assertion: update->n_fields == 0 in row_ins_sec_index_entry_by_modify +--echo # + +select strcmp(_eucjpms'' collate eucjpms_japanese_nopad_ci, _eucjpms 0x0001050001) as c1; +select strcmp(_eucjpms'' collate eucjpms_nopad_bin, _eucjpms 0x0001050001) as c1; + --echo # --echo # End of 10.5 tests --echo # diff --git a/mysql-test/main/ctype_euckr.result b/mysql-test/main/ctype_euckr.result index 8807b4cfb4d..d4f7e24a101 100644 --- a/mysql-test/main/ctype_euckr.result +++ b/mysql-test/main/ctype_euckr.result @@ -26335,5 +26335,14 @@ EXECUTE IMMEDIATE CONCAT('a.', @seq, ':=1'); ERROR HY000: Invalid euckr character string: '\xA2\xE8' SET sql_mode=DEFAULT; # +# MDEV-30111 InnoDB: Failing assertion: update->n_fields == 0 in row_ins_sec_index_entry_by_modify +# +select strcmp(_euckr'' collate euckr_korean_nopad_ci, _euckr 0x0001050001) as c1; +c1 +-1 +select strcmp(_euckr'' collate euckr_nopad_bin, _euckr 0x0001050001) as c1; +c1 +-1 +# # End of 10.5 tests # diff --git a/mysql-test/main/ctype_euckr.test b/mysql-test/main/ctype_euckr.test index e4f07081dba..3cebfe37707 100644 --- a/mysql-test/main/ctype_euckr.test +++ b/mysql-test/main/ctype_euckr.test @@ -243,6 +243,13 @@ SET NAMES euckr; SET @seq=_euckr 0xA2E8; --source include/ctype_ident_sys.inc +--echo # +--echo # MDEV-30111 InnoDB: Failing assertion: update->n_fields == 0 in row_ins_sec_index_entry_by_modify +--echo # + +select strcmp(_euckr'' collate euckr_korean_nopad_ci, _euckr 0x0001050001) as c1; +select strcmp(_euckr'' collate euckr_nopad_bin, _euckr 0x0001050001) as c1; + --echo # --echo # End of 10.5 tests --echo # diff --git a/mysql-test/main/ctype_gb2312.result b/mysql-test/main/ctype_gb2312.result index 432b38a4752..01e3cf9d47c 100644 --- a/mysql-test/main/ctype_gb2312.result +++ b/mysql-test/main/ctype_gb2312.result @@ -5323,5 +5323,14 @@ EXECUTE IMMEDIATE CONCAT('a.', @seq, ':=1'); ERROR HY000: Invalid gb2312 character string: '\xA2\xA1' SET sql_mode=DEFAULT; # +# MDEV-30111 InnoDB: Failing assertion: update->n_fields == 0 in row_ins_sec_index_entry_by_modify +# +select strcmp(_gb2312'' collate gb2312_chinese_nopad_ci, _gb2312 0x0001050001) as c1; +c1 +-1 +select strcmp(_gb2312'' collate gb2312_nopad_bin, _gb2312 0x0001050001) as c1; +c1 +-1 +# # End of 10.5 tests # diff --git a/mysql-test/main/ctype_gb2312.test b/mysql-test/main/ctype_gb2312.test index c2d513f1f5a..50b530a1d78 100644 --- a/mysql-test/main/ctype_gb2312.test +++ b/mysql-test/main/ctype_gb2312.test @@ -200,6 +200,13 @@ SET NAMES gb2312; SET @seq=_gb2312 0xA2A1; --source include/ctype_ident_sys.inc +--echo # +--echo # MDEV-30111 InnoDB: Failing assertion: update->n_fields == 0 in row_ins_sec_index_entry_by_modify +--echo # + +select strcmp(_gb2312'' collate gb2312_chinese_nopad_ci, _gb2312 0x0001050001) as c1; +select strcmp(_gb2312'' collate gb2312_nopad_bin, _gb2312 0x0001050001) as c1; + --echo # --echo # End of 10.5 tests --echo # diff --git a/mysql-test/main/ctype_gbk.result b/mysql-test/main/ctype_gbk.result index f44cbbed7d3..588e6ee1e77 100644 --- a/mysql-test/main/ctype_gbk.result +++ b/mysql-test/main/ctype_gbk.result @@ -6791,5 +6791,14 @@ EXECUTE IMMEDIATE CONCAT('a.', @seq, ':=1'); ERROR HY000: Invalid gbk character string: '\xAA\xA1' SET sql_mode=DEFAULT; # +# MDEV-30111 InnoDB: Failing assertion: update->n_fields == 0 in row_ins_sec_index_entry_by_modify +# +select strcmp(_gbk'' collate gbk_chinese_nopad_ci, _gbk 0x0001050001); +strcmp(_gbk'' collate gbk_chinese_nopad_ci, _gbk 0x0001050001) +-1 +select strcmp(_gbk'' collate gbk_nopad_bin, _gbk 0x0001050001); +strcmp(_gbk'' collate gbk_nopad_bin, _gbk 0x0001050001) +-1 +# # End of 10.5 tests # diff --git a/mysql-test/main/ctype_gbk.test b/mysql-test/main/ctype_gbk.test index 2c6a233a0de..c5033555376 100644 --- a/mysql-test/main/ctype_gbk.test +++ b/mysql-test/main/ctype_gbk.test @@ -503,6 +503,13 @@ SET NAMES gbk; SET @seq=_gbk 0xAAA1; --source include/ctype_ident_sys.inc +--echo # +--echo # MDEV-30111 InnoDB: Failing assertion: update->n_fields == 0 in row_ins_sec_index_entry_by_modify +--echo # + +select strcmp(_gbk'' collate gbk_chinese_nopad_ci, _gbk 0x0001050001); +select strcmp(_gbk'' collate gbk_nopad_bin, _gbk 0x0001050001); + --echo # --echo # End of 10.5 tests --echo # diff --git a/mysql-test/main/ctype_sjis.result b/mysql-test/main/ctype_sjis.result index 0e281d68023..e8e59418f84 100644 --- a/mysql-test/main/ctype_sjis.result +++ b/mysql-test/main/ctype_sjis.result @@ -19659,5 +19659,14 @@ EXECUTE IMMEDIATE CONCAT('a.', @seq, ':=1'); ERROR HY000: Invalid sjis character string: '_x81' SET sql_mode=DEFAULT; # +# MDEV-30111 InnoDB: Failing assertion: update->n_fields == 0 in row_ins_sec_index_entry_by_modify +# +select strcmp(_sjis'' collate sjis_japanese_nopad_ci, _sjis 0x0001050001) as c1; +c1 +-1 +select strcmp(_sjis'' collate sjis_nopad_bin, _sjis 0x0001050001) as c1; +c1 +-1 +# # End of 10.5 tests # diff --git a/mysql-test/main/ctype_sjis.test b/mysql-test/main/ctype_sjis.test index 59c30cb4dd4..2e089cd85ba 100644 --- a/mysql-test/main/ctype_sjis.test +++ b/mysql-test/main/ctype_sjis.test @@ -328,6 +328,13 @@ SET NAMES sjis; SET @seq=_sjis 0x81AD; --source include/ctype_ident_sys.inc +--echo # +--echo # MDEV-30111 InnoDB: Failing assertion: update->n_fields == 0 in row_ins_sec_index_entry_by_modify +--echo # + +select strcmp(_sjis'' collate sjis_japanese_nopad_ci, _sjis 0x0001050001) as c1; +select strcmp(_sjis'' collate sjis_nopad_bin, _sjis 0x0001050001) as c1; + --echo # --echo # End of 10.5 tests --echo # diff --git a/mysql-test/main/ctype_sjis_innodb.result b/mysql-test/main/ctype_sjis_innodb.result new file mode 100644 index 00000000000..6252848c8bb --- /dev/null +++ b/mysql-test/main/ctype_sjis_innodb.result @@ -0,0 +1,23 @@ +# Start of 10.5 tests +# +# MDEV-28328 Assertion failures in btr0cur.cc upon INSERT or in row0sel.cc afterwards +# +SET NAMES utf8mb3; +CREATE TABLE t ( +a year(4) DEFAULT NULL, +b varbinary(2545) DEFAULT '', +c mediumtext COLLATE sjis_japanese_nopad_ci NOT NULL, +d decimal(7,7) DEFAULT NULL, +e char(219) COLLATE sjis_japanese_nopad_ci DEFAULT '', +f bigint(25) DEFAULT 0, +g bigint(20) DEFAULT NULL, +h datetime(1) DEFAULT '1900-01-01 00:00:00.0', +PRIMARY KEY (c(25),e) +) ENGINE=InnoDB DEFAULT CHARSET=sjis COLLATE=sjis_japanese_nopad_ci; +INSERT IGNORE INTO t VALUES ... a mixture of non-ASCII and binary content +SELECT * FROM t /*output suppressed, just make sure it does not crash*/; +CHECK TABLE t; +Table Op Msg_type Msg_text +test.t check status OK +DROP TABLE t; +# End of 10.5 tests diff --git a/mysql-test/main/ctype_sjis_innodb.test b/mysql-test/main/ctype_sjis_innodb.test new file mode 100644 index 00000000000..80f3b4fec0a --- /dev/null +++ b/mysql-test/main/ctype_sjis_innodb.test @@ -0,0 +1,62 @@ +--source include/have_sjis.inc +--source include/have_innodb.inc + +--echo # Start of 10.5 tests + +--echo # +--echo # MDEV-28328 Assertion failures in btr0cur.cc upon INSERT or in row0sel.cc afterwards +--echo # + +SET NAMES utf8mb3; + +CREATE TABLE t ( + a year(4) DEFAULT NULL, + b varbinary(2545) DEFAULT '', + c mediumtext COLLATE sjis_japanese_nopad_ci NOT NULL, + d decimal(7,7) DEFAULT NULL, + e char(219) COLLATE sjis_japanese_nopad_ci DEFAULT '', + f bigint(25) DEFAULT 0, + g bigint(20) DEFAULT NULL, + h datetime(1) DEFAULT '1900-01-01 00:00:00.0', + PRIMARY KEY (c(25),e) +) ENGINE=InnoDB DEFAULT CHARSET=sjis COLLATE=sjis_japanese_nopad_ci; + +--echo INSERT IGNORE INTO t VALUES ... a mixture of non-ASCII and binary content + +--disable_query_log +INSERT IGNORE INTO t VALUES +(NULL,'tsls','ce License窶? is a trademark of MariaDB Corporation Ab.\n\nParameters\n\nLicensor: MariaDB Corporation Ab\nLicensed Work: MariaDB MaxScale (TM) v.2.3.20\n The Licensed Work is (c) 2020 MariaDB Corporation Ab\nAdditional Use Grant: You may use the Licensed Work when your application\n uses the Licensed Work with a total of less than three\n server instances for any purpose.\n\nChange Date: 2024-06-02\n\nChange License: Version 2 or later of the GNU General Public License as\n published by the Free Software Foundation.\n\nFor information about alternative licensing arrangements for the Software,\nplease visit: https://mariadb.com/products/mariadb-enterprise\n\nNotice\n\nThe Business Source License (this document, or the 窶廰icense窶?) is not an Open\nSource license. However, the Licensed Work will eventually be made available\nunder an Open Source License, as stated in this License.\n\nFor more information on the use of the Business Source License for MariaDB\nproducts, please visit the MariaDB Business Source License FAQ at\nhttps://mariadb.com/bsl-faq-mariadb.\n\nFor more information on the use of the Business Source License generally,\nplease visit the Adopting and Developing Business Source License FAQ at\nhttps://mariadb.com/bsl-faq-adopting.\n\n-----------------------------------------------------------------------------\n\nBusiness Source License 1.1\n\nTerms\n\nThe Licensor hereby grants you the right to copy, modify, create derivative\nworks, redistribute, and make non-production use of the Licensed Work. The\nLicensor may make an Additional Use Grant, above, permitting limited\nproduction use.\n\nEffective on the Change Date, or the fourth anniversary of the first publicly\navailable distribution of a specific version of the Licensed Work under this\nLicense, whichever comes first, the Licensor hereby grants you rights under\nthe terms of the Change License, and the rights granted in the paragraph\nabove terminate.\n\nIf your use of the Licensed Work does not comply with the requirements\ncurrently in effect as described in this License, you must purchase a\ncommercial license from the Licensor, its affiliated entities, or authorized\nresellers, or you must refrain from using the Licensed Work.\n\nAll copies of the original and modified Licensed Work, and derivative works\nof the Licensed Work, are subject to this License. This License applies\nseparately for each version of the Licensed Work and the Change Date may vary\nfor each version of the Licensed Work released by Licensor.\n\nYou must conspicuously display this License on each original or modified copy\nof the Licensed Work. If you receive the Licensed Work in original or\nmodified form from a third party, the terms and conditions set forth in this\nLicense apply to your use of that work.\n\nAny use of the Licensed Work in violation of this License will automatically\nterminate your rights under this License for the current and all other\nversions of the Licensed Work.\n\nThis License does not grant you any right in any trademark or logo of\nLicensor or its affiliates (provged that you may use a trademark or logo of\nLicensor as expressly required by this License).\n\nTO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVgED ON\nAN 窶廣S IS窶? BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,\nEXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND\nTITLE.\n\nMariaDB hereby grants you permission to use this License窶冱 text to license\nyour works, and to refer to it using the trademark 窶廝usiness Source License窶?,\nas long as you comply with the Covenants of Licensor below.\n\nCovenants of Licensor\n\nIn consgeration of the right to use this License窶冱 text and the 窶廝usiness\nSource License窶? name and trademark, Licensor covenants to MariaDB, and to all\nother recipients of the licensed work to be provged by Licensor:\n\n1. To specify as the Change License the GPL Version 2.0 or any later version,\n or a license that is compatible with GPL Version 2.0 or a later version,\n where 窶彡ompatible窶? means that software provged under the Change License can\n be included in a program with software provged under GPL Version 2.0 or a\n later version. Licensor may specify additional Change Licenses without\n limitation.\n\n2. To either: (a) specify an additional grant of rights to use that does not\n impose any additional restriction on the right granted in this License, as\n the Additional Use Grant; or (b) insert the text 窶廸one窶?.\n\n3. To specify a Change Date.\n\n4. Not to modify this License in any other way.\nLicense text copyright (c) 2020 MariaDB Corporation Ab, All Rights Reserved.\n窶廝usiness Source License窶? is a trademark of MariaDB Corporation Ab.\n\nParameters\n\nLicensor: MariaDB Corporation Ab\nLicensed Work: MariaDB MaxScale (TM) v.2.3.20\n The Licensed Work is (c) 2020 MariaDB Corporation Ab\nAdditional Use Grant: You may use the Licensed Work when your application\n uses the Licensed Work with a total of less than three\n server instances for any purpose.\n\nChange Date: 2024-06-02\n\nChange License: Version 2 or later of the GNU General Public License as\n published by the Free Software Foundation.\n\nFor information about alternative licensing arrangements for the Software,\nplease visit: https://mariadb.com/products/mariadb-enterprise\n\nNotice\n\nThe Business Source License (this document, or the 窶廰icense窶?) is not an Open\nSource license. However, the Licensed Work will eventually be made available\nunder an Open Source License, as stated in this License.\n\nFor more information on the use of the Business Source License for MariaDB\nproducts, please visit the MariaDB Business Source License FAQ at\nhttps://mariadb.com/bsl-faq-mariadb.\n\nFor more information on the use of the Business Source License generally,\nplease visit the Adopting and Developing Business Source License FAQ at\nhttps://mariadb.com/bsl-faq-adopting.\n\n-----------------------------------------------------------------------------\n\nBusiness Source License 1.1\n\nTerms\n\nThe Licensor hereby grants you the right to copy, modify, create derivative\nworks, redistribute, and make non-production use of the Licensed Work. The\nLicensor may make an Additional Use Grant, above, permitting limited\nproduction use.\n\nEffective on the Change Date, or the fourth anniversary of the first publicly\navailable distribution of a specific version of the Licensed Work under this\nLicense, whichever comes first, the Licensor hereby grants you rights under\nthe terms of the Change License, and the rights granted in the paragraph\nabove terminate.\n\nIf your use of the Licensed Work does not comply with the requirements\ncurrently in effect as described in this License, you must purchase a\ncommercial license from the Licensor, its affiliated entities, or authorized\nresellers, or you must refrain from using the Licensed Work.\n\nAll copies of the original and modified Licensed Work, and derivative works\nof the Licensed Work, are subject to this License. This License applies\nseparately for each version of the Licensed Work and the Change Date may vary\nfor each version of the Licensed Work released by Licensor.\n\nYou must conspicuously display this License on each original or modified copy\nof the Licensed Work. If you receive the Licensed Work in original or\nmodified form from a third party, the terms and conditions set forth in this\nLicense apply to your use of that work.\n\nAny use of the Licensed Work in violation of this License will automatically\nterminate your rights under this License for the current and all other\nversions of the Licensed Work.\n\nThis License does not grant you any right in any trademark or logo of\nLicensor or its affiliates (provged that you may use a trademark or logo of\nLicensor as expressly required by this License).\n\nTO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVgED ON\nAN 窶廣S IS窶? BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,\nEXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND\nTITLE.\n\nMariaDB hereby grants you permission to use this License窶冱 text to license\nyour works, and to refer to it using the trademark 窶廝usiness Source License窶?,\nas long as you comply with the Covenants of Licensor below.\n\nCovenants of Licensor\n\nIn consgeration of the right to use this License窶冱 text and the 窶廝usiness\nSource License窶? name and trademark, Licensor covenants to MariaDB, and to all\nother recipients of the licensed work to be provged by Licensor:\n\n1. To specify as the Change License the GPL Version 2.0 or any later version,\n or a license that is compatible with GPL Version 2.0 or a later version,\n where 窶彡ompatible窶? means that software provged under the Change License can\n be included in a program with software provged under GPL Version 2.0 or a\n later version. Licensor may specify additional Change Licenses without\n limitation.\n\n2. To either: (a) specify an additional grant of rights to use that does not\n impose any additional restriction on the right granted in this License, as\n the Additional Use Grant; or (b) insert the text 窶廸one窶?.\n\n3. To specify a Change Date.\n\n4. Not to modify this License in any other way.\nLicense text copyright (c) 2020 MariaDB Corporation Ab, All Rights Reserved.\n窶廝usiness Source License窶? is a trademark of MariaDB Corporation Ab.\n\nParameters\n\nLicensor: MariaDB Corporation Ab\nLicensed Work: MariaDB MaxScale (TM) v.2.3.20\n The Licensed Work is (c) 2020 MariaDB Corporation Ab\nAdditional Use Grant: You may use the Licensed Work when your application\n uses the Licensed Work with a total of less than three\n server instances for any purpose.\n\nChange Date: 2024-06-02\n\nChange License: Version 2 or later of the GNU General Public License as\n published by the Free Software Foundation.\n\nFor information about alternative licensing arrangements for the Software,\nplease visit: https://mariadb.com/products/mariadb-enterprise\n\nNotice\n\nThe Business Source License (this document, or the 窶廰icense窶?) is not an Open\nSource license. However, the Licensed Work will eventually be made available\nunder an Open Source License, as stated in this License.\n\nFor more information on the use of the Business Source License for MariaDB\nproducts, please visit the MariaDB Business Source License FAQ at\nhttps://mariadb.com/bsl-faq-mariadb.\n\nFor more information on the use of the Business Source License generally,\nplease visit the Adopting and Developing Business Source License FAQ at\nhttps://mariadb.com/bsl-faq-adopting.\n\n-----------------------------------------------------------------------------\n\nBusiness Source License 1.1\n\nTerms\n\nThe Licensor hereby grants you the right to copy, modify, create derivative\nworks, redistribute, and make non-production use of the Licensed Work. The\nLicensor may make an Additional Use Grant, above, permitting limited\nproduction use.\n\nEffective on the Change Date, or the fourth anniversary of the first publicly\navailable distribution of a specific version of the Licensed Work under this\nLicense, whichever comes first, the Licensor hereby grants you rights under\nthe terms of the Change License, and the rights granted in the paragraph\nabove terminate.\n\nIf your use of the Licensed Work does not comply with the requirements\ncurrently in effect as described in this License, you must purchase a\ncommercial license from the Licensor, its affiliated entities, or authorized\nresellers, or you must refrain from using the Licensed Work.\n\nAll copies of the original and modified Licensed Work, and derivative works\nof the Licensed Work, are subject to this License. This License applies\nseparately for each version of the Licensed Work and the Change Date may vary\nfor each version of the Licensed Work released by Licensor.\n\nYou must conspicuously display this License on each original or modified copy\nof the Licensed Work. If you receive the Licensed Work in original or\nmodified form from a third party, the terms and conditions set forth in this\nLicense apply to your use of that work.\n\nAny use of the Licensed Work in violation of this License will automatically\nterminate your rights under this License for the current and all other\nversions of the Licensed Work.\n\nThis License does not grant you any right in any trademark or logo of\nLicensor or its affiliates (provged that you may use a trademark or logo of\nLicensor as expressly required by this License).\n\nTO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVgED ON\nAN 窶廣S IS窶? BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,\nEXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND\nTITLE.\n\nMariaDB hereby grants you permission to use this License窶冱 text to license\nyour works, and to refer to it using the trademark 窶廝usiness Source License窶?,\nas long as you comply with the Covenants of Licensor below.\n\nCovenants of Licensor\n\nIn consgeration of the right to use this License窶冱 text and the 窶廝usiness\nSource License窶? name and trademark, Licensor covenants to MariaDB, and to all\nother recipients of the licensed work to be provged by Licensor:\n\n1. To specify as the Change License the GPL Version 2.0 or any later version,\n or a license that is compatible with GPL Version 2.0 or a later version,\n where 窶彡ompatible窶? means that software provged under the Change License can\n be included in a program with software provged under GPL Version 2.0 or a\n later version. Licensor may specify additional Change Licenses without\n limitation.\n\n2. To either: (a) specify an additional grant of rights to use that does not\n impose any additional restriction on the right granted in this License, as\n the Additional Use Grant; or (b) insert the text 窶廸one窶?.\n\n3. To specify a Change Date.\n\n4. Not to modify this License in any other way.\nLicense text copyright (c) 2020 MariaDB Corporation Ab, All Rights Reserved.\n窶廝usiness Source License窶? is a trademark of MariaDB Corporation Ab.\n\nParameters\n\nLicensor: MariaDB Corporation Ab\nLicensed Work: MariaDB MaxScale (TM) v.2.3.20\n The Licensed Work is (c) 2020 MariaDB Corporation Ab\nAdditional Use Grant: You may use the Licensed Work when your application\n uses the Licensed Work with a total of less than three\n server instances for any purpose.\n\nChange Date: 2024-06-02\n\nChange License: Version 2 or later of the GNU General Public License as\n published by the Free Software Foundation.\n\nFor information about alternative licensing arrangements for the Software,\nplease visit: https://mariadb.com/products/mariadb-enterprise\n\nNotice\n\nThe Business Source License (this document, or the 窶廰icense窶?) is not an Open\nSource license. However, the Licensed Work will eventually be made available\nunder an Open Source License, as stated in this License.\n\nFor more information on the use of the Business Source License for MariaDB\nproducts, please visit the MariaDB Business Source License FAQ at\nhttps://mariadb.com/bsl-faq-mariadb.\n\nFor more information on the use of the Business Source License generally,\nplease visit the Adopting and Developing Business Source License FAQ at\nhttps://mariadb.com/bsl-faq-adopting.\n\n-----------------------------------------------------------------------------\n\nBusiness Source License 1.1\n\nTerms\n\nThe Licensor hereby grants you the right to copy, modify, create derivative\nworks, redistribute, and make non-production use of the Licensed Work. The\nLicensor may make an Additional Use Grant, above, permitting limited\nproduction use.\n\nEffective on the Change Date, or the fourth anniversary of the first publicly\navailable distribution of a specific version of the Licensed Work under this\nLicense, whichever comes first, the Licensor hereby grants you rights under\nthe terms of the Change License, and the rights granted in the paragraph\nabove terminate.\n\nIf your use of the Licensed Work does not comply with the requirements\ncurrently in effect as described in this License, you must purchase a\ncommercial license from the Licensor, its affiliated entities, or authorized\nresellers, or you must refrain from using the Licensed Work.\n\nAll copies of the original and modified Licensed Work, and derivative works\nof the Licensed Work, are subject to this License. This License applies\nseparately for each version of the Licensed Work and the Change Date may vary\nfor each version of the Licensed Work released by Licensor.\n\nYou must conspicuously display this License on each original or modified copy\nof the Licensed Work. If you receive the Licensed Work in original or\nmodified form from a third party, the terms and conditions set forth in this\nLicense apply to your use of that work.\n\nAny use of the Licensed Work in violation of this License will automatically\nterminate your rights under this License for the current and all other\nversions of the Licensed Work.\n\nThis License does not grant you any right in any trademark or logo of\nLicensor or its affiliates (provged that you may use a trademark or logo of\nLicensor as expressly required by this License).\n\nTO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVgED ON\nAN 窶廣S IS窶? BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,\nEXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND\nTITLE.\n\nMariaDB hereby grants you permission to use this License窶冱 text to license\nyour works, and to refer to it using the trademark 窶廝usiness Source License窶?,\nas long as you comply with the Covenants of Licensor below.\n\nCovenants of Licensor\n\nIn consgeration of the right to use this License窶冱 text and the 窶廝usiness\nSource License窶? name and trademark, Licensor covenants to MariaDB, and to all\nother recipients of the licensed work to be provged by Licensor:\n\n1. To specify as the Change License the GPL Version 2.0 or any later version,\n or a license that is compatible with GPL Version 2.0 or a later version,\n where 窶彡ompatible窶? means that software provged under the Change License can\n be included in a program with software provged under GPL Version 2.0 or a\n later version. Licensor may specify additional Change Licenses without\n limitation.\n\n2. To either: (a) specify an additional grant of rights to use that does not\n impose any additional restriction on the right granted in this License, as\n the Additional Use Grant; or (b) insert the text 窶廸one窶?.\n\n3. To specify a Change Date.\n\n4. Not to modify this License in any other way.\nLicense text copyright (c) 2020 MariaDB Corporation Ab, All Rights Reserved.\n窶廝usiness Source License窶? is a trademark of MariaDB Corporation Ab.\n\nParameters\n\nLicensor: MariaDB Corporation Ab\nLicensed Work: MariaDB MaxScale (TM) v.2.3.20\n The Licensed Work is (c) 2020 MariaDB Corporation Ab\nAdditional Use Grant: You may use the Licensed Work when your application\n uses the Licensed Work with a total of less than three\n server instances for any purpose.\n\nChange Date: 2024-06-02\n\nChange License: Version 2 or later of the GNU General Public License as\n published by the Free Software Foundation.\n\nFor information about alternative licensing arrangements for the Software,\nplease visit: https://mariadb.com/products/mariadb-enterprise\n\nNotice\n\nThe Business Source License (this document, or the 窶廰icense窶?) is not an Open\nSource license. However, the Licensed Work will eventually be made available\nunder an Open Source License, as stated in this License.\n\nFor more information on the use of the Business Source License for MariaDB\nproducts, please visit the MariaDB Business Source License FAQ at\nhttps://mariadb.com/bsl-faq-mariadb.\n\nFor more information on the use of the Business Source License generally,\nplease visit the Adopting and Developing Business Source License FAQ at\nhttps://mariadb.com/bsl-faq-adopting.\n\n-----------------------------------------------------------------------------\n\nBusiness Source License 1.1\n\nTerms\n\nThe Licensor hereby grants you the right to copy, modify, create derivative\nworks, redistribute, and make non-production use of the Licensed Work. The\nLicensor may make an Additional Use Grant, above, permitting limited\nproduction use.\n\nEffective on the Change Date, or the fourth anniversary of the first publicly\navailable distribution of a specific version of the Licensed Work under this\nLicense, whichever comes first, the Licensor hereby grants you rights under\nthe terms of the Change License, and the rights granted in the paragraph\nabove terminate.\n\nIf your use of the Licensed Work does not comply with the requirements\ncurrently in effect as described in this License, you must purchase a\ncommercial license from the Licensor, its affiliated entities, or authorized\nresellers, or you must refrain from using the Licensed Work.\n\nAll copies of the original and modified Licensed Work, and derivative works\nof the Licensed Work, are subject to this License. This License applies\nseparately for each version of the Licensed Work and the Change Date may vary\nfor each version of the Licensed Work released by Licensor.\n\nYou must conspicuously display this License on each original or modified copy\nof the Licensed Work. If you receive the Licensed Work in original or\nmodified form from a third party, the terms and conditions set forth in this\nLicense apply to your use of that work.\n\nAny use of the Licensed Work in violation of this License will automatically\nterminate your rights under this License for the current and all other\nversions of the Licensed Work.\n\nThis License does not grant you any right in any trademark or logo of\nLicensor or its affiliates (provged that you may use a trademark or logo of\nLicensor as expressly required by this License).\n\nTO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVgED ON\nAN 窶廣S IS窶? BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,\nEXPRESS OR IMPLIED, INCLUDING (WITHO',NULL,'g',0,4,'1979-03-20 13:59:42.0'), +(1972,'j','? y瘢?5ロ ~-イワ?\r?WC @ヤ ?ソ?=ウr!Iラ.%梓?菓キ?dIT9%Nロc*1i?ヌ我オ4ァ?)5慴ト?/rUGCキ|刈ヘY5レ嬶?ー;源ヨ ゚ケ,V敝|*9モV@、2ユ修^僵!雫ヲ笵?^jオ゚?#Vc@1%Bト?Lo_*ヲワFン? ィ?5cー;站kJaイ?亀メ?~$筧?\0Yy ケ%?SテンTzuナQ ミ{?$ヤ??? v\n叮エ6?飛?ロ轣.ッ}Pヒ「貼ホ_0操瞽オヲU5&[1i杷bメ8;クロ?ェクa??\0-\ru?>ァァ9ンkミ??禮Pウ?ネ^=Y?{rRB~ミ;?}?\r.{)墮??#ト稽悲」??稷ァィ゚$O釶ッレ}OSカ枝?G?}ヲツ+?1,゙&栖、ォマ?@W?ヨ?廣?ケィ閊瑳\rN?X怎?\0゚・0・、?*ス2}諡?ラOカ鉉+fqJ?オ\\銓ミad?)カh?チヤミ私cT?X??yN ォヘ>+クcV\n[ヤ4Qネ?゚d? ?$@ノ.羃ホU?{\"<ヨムノターV・z?gP?(\Z>C努#lィ?甫Q0豢4=3\\ヌZ!?カ+oe$t B{梳惡欧裲ノタ?輾?4ニェ墨]+恷痊lEテ;ソ們狄カ0イアゥ?7ホQォ濶lニ> ・jKアゥ?ヒ?J茲X髄F9ト|?ヲナT禝ア・w?8YァB絃ヲィAZ?>?8[gvI、ェツ」濘豼ヘ斥-クX?・EI82K!?UリdぬB推?*??9ャtク芍e亂\0v。」奎??N?夜Vユ 1ワ??\0ケXBoヲ\\D冊膨)5・M@テ?B?1テM?ハー?6メ黔2ゥoA?ク轄??ヨ\0E0ッ゚オA?R吃ZU?sミauニ?+?ホ?ヤ\0h?8:?/T?\rトョ珥Wf粕oカjjv?楽鉄p?.8ゥ・|ー*儺フ*捕蝮CXメョ. bメsレ・@ネu档?ヨ&%#^ヌゥ?\0孑ケmサ8?ュエ錺?灯 r???ヘナ?(タァ\"wョミ?%ルkーニ\rVWjネk?癜ハ6mイ2。Iオモフト、J=キァ??hx。 ラケテOャウ*? ァd銖c#!?0?sミ?%v?9メ$\0?K詢}エ??VT?u\'ヌ ??$?\rソ皺.。d?!脛ネ?2& 暹?6譁Zル^k ラ優エiヤア?\0?<エキ存旗叫aエキトフ??\0頂 ワ、ー。o家?\0鍄??&f?$―?コメX?6Qロ[rlソv??ヘュ・?>YrJフ8.チ{差?Fツ?vイツ?/シァ???\0Ur」?$ロゥ??\06穢ト^オワ?*/\Z?タi\n^亥クァ繧#沓yオ聶?\07c簸?。>莪)竟ト?#ソrr&HT?<△wcヤ廸IExAミ?ヲニー?∈?; U\0Qセリラィ\nエ\\Fi\rj篳?ク?g?:死bR婉 \'トト難?祺J?e\0\n?ウス1逓dリセ?-\\メ??カク bnoJ?9<;?%w{%モs番?循 サ村夢?ェUS?8Pマ紅ト匆逐3祗ルEア、? d家答ケYNヘ?6*?イラm>ミョ\\NAF斟ルmネ昨*フルウaWfヘ?vlルアWcケキJ縱bョヘ?XナVfナ&Nリ?*?ウbョヘ?6*?ウbュッ\\ナHタルォ骸=rウfナ偽キヘuNT?9N劔ケ\Z?Sムnlルー。ルウfナ]?6lUルウfナ]?6lUルウfナ]?Mアクェ?ニ噫?箘ヘ?6*?ウbョヘ?6*?ウbョヘ?6*?\Z束J?,p操・qHh?ヘ?;6lリォウfヘ棺6lリォウfヒ。ォYウfナ]錫i\\。ラ??;筧\\ルウbョヘ?6*?ウbョヘ?6*クH@ヲ7ョlオ48ォ椛赴ウ1階Yウfナヘ?6*?ウbョヘ?6*?ウbョヘ?6*゚#モ+6lUァトイIF驍58#駆疸r4fォ恕W楠bェ9ウfナ]?6lUルウfナ]?6lUルウfナ]?6lUルウfナ]?6lUルウfナS]:ヤJ7ヒサカ綴?A〕ッ 0}褸???,NVlリルウfナ]?6lUルウfナ]?6lUZ f楙q7B卦爿+ッォ?9 f」L\'アX肄?&[ヌ尋タリ?fヒU,h2ル\n\Z*ミヒdヲP4ヒ-\\UnlルアWe―ャ|F?Uiハナ%?筬惣喘メロヨク?7\\-ヌィエタ?&lルー。ルー簽NB\\aL驚旗cJキ,ャリェ?? ?)越.*m幡挾レ)+ラッ光G\Zcd|B1_Y0セ/蝟 01G、仄I?驪$冑添覚?B?\";ョマセG&eア添各4Qノ?ェ>{痞?XGネォ栫ソ貍V9i卿?=}ー?クリィ剌婁ロ廱yィ?ッ??\0+??ロ?dヨ-\n?ユ鰒濤A?テァ-ナ^\0l=ォ?_/?&?\0[?ョmタ詠K\\シfオィ=sBフュホ6*テ。?ク?佗 。?c?|&?ァ繚「Ud柝j??隈尽キO qqタRF澑?&搾?籬??-fテu゙攫\nヤW?\0「1)QTaQキlXEナeエッヤナメ潁錠ユ瑩#Fオ44?P訣&゙穂?ノt?-5>Oル_ッ?Z?メ?\0幅Jユ??村ハタッ_ク?諡{タTGt5⊆:浄_?kテ?\n?I蹠摯吻チカW???ハg茎褶3捲縱a-エォ$忤肖?\04猴]n?ナ)゙サ嗹?\0*???-楫??ァユッz~??)2A6滝,\rマト蒋?G6wiユシ錯Iュ{滕N,Y@篦菜??\0Uイ9a|ヨタGv。|O?ソナ?8{Cr「@k?8ア/F゚ツ仄Jエ m\\ヲDZS?|ッL2?G?*ィトミ\0>9醐ロ|F61?櫚T?]ォ?ャ.I蟶8マメIテ !?|qェ暃サasン{SU頑)ナSz梏ィチqワォ)?レ癖ャ峻ァ蠣/z\\4キヤR駛ゥ?ァ G潤?$UGタ??Xョレ\Z$捧?ェR黻ミモ゚Kョt?農vマ、、ソ? 戡9&?Κ荀?樂]y? ロッ?U綽z?ラナobメニ)ナセノ_柮}cヒ3鰓圻;?\nモ??\0ノマX=イN?)+B7?)総_ヒUFTE?嗽ヒ!班ワトトヒ??ァq鰯禀ン3ソ]y>ツ鷽rFm覯F?テ?c?/3?[[\\A?ェ ?\nュB??\0)ンj?\0?pフ cタ?Eィ゚|ゥ#莊?Zキ溶tキ+,r/シ衰}?c\nJミ蛟λ?%&h\Zォアノ<\Zーヤタ受欺 ヘ#nテ?灌?\0ョルxチ?8レ顳0ィ,?ヤ字xヌ3?RO?e[恢イK}茘mrンu]?;\nシcbュ?U?E ュTモヌロ?\\暮?:賦GィYコシjhフ、タL浹ヒ??%」c??Iフ?リZ?欽ュ?2ヌツ?;迫?ーチ:?孃4蒐Ky公。? Fワク;ヘ?!d称1??\rユ$^?飽?-ッXj\Z)1」?-e?A艷曁?ヒッ?Wツ%キ\"岶?=wO?=ッ僭ァ/ンタ」ォT種?ヒ$v?サァマM凛4}e?\0ヨマ=阯1ハ滿ェNヘE虎z?9(モ|?.梅ュ髯t?15?\0軍|YT?Af ラ\Z\0ュE?Aロ?゚P\0?エ7?\0bヒ?6コ? 壱2Hサヲワ??k筥ォ、ム浅??カA*QX?\0?4oヌ??_??( Zモソo?hヨ@「ニS皺?J衄ホK,恤餘[ッ磋アT$Qノ?74?1@c数ィ,:?ン蟹1?7拓乞イ承_?榾ys?珍ハ浄筬^ヘ 。??9?hマテコ璽ロ手F?コー?痰筆Gメ1V:?(屑ト>エョGu?,ルk0 アンz?ニル7ケメト┫杣}淘?OEyミャ,ムオ*E?カ?ヒri2ゥ?={?\0イツ3ィ゚yr?ュ~??)゚?芭?\0\Z?+Pミョ,匯」]ケ\0v?\0Zケ? ? Y絵Cラ08&Kv?(タbk?&+テcェ%?ュ? ネ=イユA5ョa?1kRィユ彫エツォR\Z私゚ヒモ5クク胙カ0F]?G)BH9テヌtァJ綺6ョ ォQ|&挂?Fkナィ}ー2キサS$\Z&ス5抖\"Jァェ7?H尊P「ラ?-?ィ?hqォ \\FgRZ殘ロサイ\Zォオナ?5iWJR灌V-蝓BKソB?F???6*ヌ>ゥ@A F5~鑛徳(岫rfオ素ノCク9ヨtサhdeカ=+N??\0イト|スッK?]+ま?アチ/\\vQアzヨウ ムZサ倬?\0k?ヌ疝企z^榎?/ュ\'Mテ+S??\0.クdhKxワ學峰鳩c?j?\0艇8M$(^ナスd?h(\0ラ?5カュッ)苑Tョ???\0ニク、壥カ?0[ネ\rサ攣ァトァ??\rユ(ー?カ?0コ?iナ??注>?y?,?ャhヤクシ?z?*Gヤ1ヲヤャ佐?(戞蟶糢エッGノP囂粘Sスネ?0ェ?溽ノ%剛ー@m慍P(S聯モヒ!Z冢、サh諷?ェkQ?ッレノヌヨfeェn=?66*?2?XヒィウO\rロヒ0ゥ)57ハ次オ?5?1シサ?W??イ?乘?)i~??賽?)?1ヘUc_貢#?\\?>??+C%?-「<穽Z狙カ*ソY ?; ?靹カカ?:シ弉X#タj≡ァレT\\K^エカモ/G闍?$$FW$ュe氛_yマFィケゐ;?^嚇?j?)j?トコFッw?]:O?z?\0;|G?/サ?a艪ウイケユfFD跳Hォ\\?C婀?ァムi# P扮?sロ[_^t?!yQ\\?ソ??\0?4寔メoレ-Dレdモ\\モ・サオ愬,ce#j復ウヘ?b櫁 }BルL遇fSJ?,#eー啼rモmh&IユjVM??」ウrホ]ャjヲ矍b5bjェI?W-蔗?t?讒ヲdテ蛛扮4ハP 。ニ?8?.ケク?ホQZo畢xmィp%j?:蔑X仟Hナ\rミ嫉y?\'ョ^)DC ネ2?\0=?\0綵ラ幕niフ@v ?\0ト ョ53\0F?mi゚ナr\"孤ニシス?/0Gクフ$゙ァ\ZオUg$\0cロカ\"C狂W2N OイB?bィd^g゚EnjR、\r潤ッレタマU59Bb6゙來J?7\\ヒノコ\n聊[w#ユ譴?&ソ/?ムレz|癜?N?O?V|RTW}?旅|g\"?ィm柔|b?EI?0ZU?俥%?ネ&捍gカ?8テ?!||q絳クhMノ箜???Z。\\??Fロ?翡??%W?mヌ? bキZUヘ、byzf? ??\0?ю肄?)b~ネ??6iォIg造F゙ィ ウ $?.ネh=アエハテJャ\Z?I9|ハW華?#・q?@チ?#ロ/i挙P7ロ?ハT\'~リmvラ鳳+ニ其\rA\0ー=ルp偐?0ィロ抒?8?糟q/^タt2GSH。#テエセXル}hメTP@V?\0I?;?.mZ6\rX撤??g皀}滸ーr隧|M?0v^T?\rh瀾t?4\"?Fム鮮鶲?-?儼ンV/YY%~??\0ハ胝as?!MG? ??nE?\nモヌ?キ?4@y廏\'?銀ニェ銅ヤ聽淋淘Pトtア?\0c ̄莎b析%ケ?\'cL凉fマOヨヨ[[霪rイ?P?/褸セ?#?ァ\\=エ爿#SqJ?\0??ョ7ス/嚮|凖ト??T~b?JDム?ネ赫ィ?萵KKゥ?ヘl???xサ樞V萌/!?カ??8z?*ムオT・O壱?>サOn?卻)-wQ眦?\rW」-w\r1イZO\\??(Ykn?!?GR?\'?U?ャマニ。コ罫K?ヌ?J槨゚Pp1掾5>9メウ戲GQバ?ュN8「ケnK?@)?ャナBユN?ニ-mhモ)??\0v泌ス6ナ レハー営b?@疑フヘ??カ,$\n)「槨?|メキ6b3bZ2T?g奴Pc「カ啼?\"Feпオq6r68?*藥uチ_YDリモ??ハンア・Dノp+Tトクシ?rм|イ?9?6T3D???q?0;Lh烝ユ~?\nャウF戲j>??*ッJbqコG ,9ニ%zT|ァu陀?モテZS\'オキ7rャ*UK\ZU?kx芳ヲ蔟リvhヨ,ヒ?ッ5\0+スセ4ォロFo?3+ハ@;J?q」qg?\\土?=>?ヨレ?i$アK\\滓iGタヘ??渟ネrN#夥~-?CR[ゥ+\Z\0+ーョ\nン6易ョbゴv?ォP@PP|???ツa岩ミO、? ???゚eーァフ?Yjsナ\0? ハオュ|I\\A閭゙滴サ?キカ{裂メ庖 スウヌシク?3橘?゙:Q之?}、?\0棔ヘ?\nッ沸x/「?\"Gチ@jミ?\0番ホケeゥナw$?*89 H?鯤ャ泓MqvイD? 5ヲフトウ?8oョロCEoシhv-J穣衞ヘcf]・? $??ッ?,T[0&Y曽ェzaN兎%・エ0<「F。?)?\"Zミ@ソ?煢EツウYー>、gzq=~ラナ\\ZGサ敍ラ,m畛2ニ?A?ゥ~,.セヤ」iqrzェ???簗z?e^\\っャ^% ホヌ聿@%ソリ?君? 鈎ホヘ\nÅャ@?4?\0坡レS;レャ捉DJ?綫??l0コモ^ヨユ/Q?\0x貎ル1g丶ァ遡/{ァGァI\rc傑チ.ヒ燹サE_?竊aト?\0l\rヲ婪ュKノ!ィ「初??vヘmJ g$?Qソ?ミMォ?2/ィヤP」aモ2UIッ\\\"?$P鍜lィN?t;vヲ*?^<財{?:ヤ?$?\0G?q康酥潁ョMfコY,\\リ?9k#*オ&ケ ? ?3旺B2?^\n nN6レフVsE\'ゥト嬬^?\rOl帝ゥ2ォJ bエ$モ?窮テ第ュGヲ<5c\"5スv?\0U+?・?XxQリヨ??与YリR?(2?L)??1臓FKgw漂J?ー?整L「P席モク?#D{3Ic高Gミ?1 Az?ヨ?2?7ヒ^~?ゥ??ヌ)ネホ,f?wpR\Zクッ\'?$0ハ;?1レjrr;ャepO?)!\nヨ鹹F韲@? ??%? フ蠣3&ツ方 Oレノ逸セチo祿宸?Qソ \nヤァゥ4ワ忖モ>ヘン淳ァ?ニ?(??bナクA\'ー?!8針hォロト潺猫y?ε:蟾゙? 隠スァ?、?\001゙ゥゥ漆[ェX?$pウ助ツ\0エ?政ユL 允ュN;蒼~?:翔t鮓S\"ヨヲ、竊、\"J?W?8タモ-圜?ニ9ヲン?。??。ナ7ニq-ラa繽Xケ}??ホリ\nw+K翫冷ニトシ怺??ゥA痼?)?V?ーナ這リク ヤ??AヒPE; nヤ?ョ#4靡庶2Iv?\"?l<0?ニムi???p4?b?ラZラ$tト壺メェY?\n.o?ナモヌ\'rbd5y?6鵲K;Jw;bl蔟ニ冪ニ#ヒ姜&Mヨ?2議Iニ当*龝WLu0・ルゥ?.亙[ヘ\\ャア???\n?ラ[囎ヒ9アVク褊岼W\\Uzメオテ?*?交E$?? AR、w%シァ?*??ソ錮ァネノ娠 ,メ画ロオw?\0e?B濔V?B}0ロス66??JG???ツス+L}b笊「\rリ?゙UFツツmJ@?\Z??エン;%ロ? キエ遮F8「? ?~+A鯢????ヨチシケ.チ1コシ斜:ケ\n泳~呈ゥ\rQ<{?+シソ約ケハユ=シgノ\0I\\メWgニウb|キタJ@Vdユ_lア7:{箴T順ョ*tzタ確?鬨纈|?0?絆SオAナRXッ・オ?ワァ栴テ{?・カスp-ホ涸ォニケQツュ??イッ+%W|T$ク8J輔Nリam1?DH?ケ?瘁????ァレ&」ヲ#*4dイ椈ェIuァ?ヤ2??p「?:#$Pハ%Rユ;君[D?瘧アヒステ[\'PイS?。ヒ悒ヘ_?3i?モケI $櫨Y?ユ?ァL?-lイ!cアm翁1\'、?7$?iZuノFF\'do脹tサ?2Kゥ(\r+ロャ))筥?9駮4?]Xy・L規k「6?ヘ?\0W??\0禳テ|ユ? ?)J!ス@鑿YP\'??摸賄ロォY? bm>h?uヲy橸D棠ケGルdィ?2ウ~゙sリ?-鹵jψXl趺テ-;T、?\0~ホユ(ネ蜷?0F゚$駅スq?k G」$ タz截???T???r@ラ,イ$モq?3?sCンs菜?c餓.T4lヤ?)アS??蒸ラノn閤?槌ニu壜恂7ン瑠\'?ィ?P#嫣6?!u |ユユ???2、?*」?\nヨ寃?ォ~ホIヤ]tTミイミ狙ル繽エラス\"?>p-@選ッ?Oルネ%3x#殀?~?オ漬碕。ッ?* Mュn゙、MC?@??ォ3?\r Rエョ?ォEbxオ=ニf簗Kモソ?ェゥ_JeッC@iロ#aウ?$v\'?6ナP2iノ ロ?ェ:甼ホn?/%e*テヌ$G??i?(フI?シッV?P覓:蕨Уダリ??\05dCW?キ苧仭ハ。?リ聖? ュ?J?コb]Pケ。體!;ンi@9ッヌ?;ャソウ?ヲキ?碍セ9ル?(ェネメニァ?級リ} ?\0タ膀?ケ肉&12?iヒr?ヤ楠螻ハトナ?\n哉X比嘲q?R??:?\0アツ気??髢課\ZRx聊A\\g、TQ?ソ|mf?エ#?K?阪?*ツエ?豬?=ニ?ノZ9Jォ百Pqx. V7ンOセDmク苳;r#??pロネ鈞ナ、戟オw餡掌G?+@GC停ル圧ヤ.,寞Tッ~゚?\rコキn_XカmエモU#ヤ#U2抄???k簗hイM?痰o\'%。5モ?%?ワ「\"4Jd^?5ネ?槲=6事?$・ョH\"kiヤO何ー野「舜hハ?[?閤D?;茎゚孛?(碯ロエニ2dカn\\サSゥマud?{βー?ハ滴オx?.?d?ョT?゙8?糊m^?\0?Yomャ!\\ォアィネ・G?U弘・ノ付?hン?ヘ?\0g?貔h?Eンォ*\\ニXx??=ルS麗.v砧izK?ミ?ト・アースッヨ? X? d?3?-癡曰ヤエ虐sy$ゥU2[?OO?,!OZZオ?hNz?R?毳i?$b桙スソg\na?ニ椣4v?[bョ T?\0/*螢76&/*ヤシォ!ア]Nナヨ?嚇々ヘ7?胴テ??詆ャY_ロGshヘ??2)Vホ?鮃゙\\?2ロZFテモrP跡?i」fEu?\0>ヘmレミj?+sr@PS?;ェァ?<彳ト;メ、??\0ヒpj歇Dtカ鳬浸??クレソiヒホアヲI嬪?6?v?vH9ナ祁ム_テ{,a」w蔕タR??C~ヨumBo?;[9-,リ醂?エ*?\0?ッ sLQZニゥu%繊??/kヨ奬┓ニッN[?レ??7Hカ叶L\\ィ?潘?\0?H-エ{Gケケлf頻*~決ィ紀ワーMKハキ\Z=?イ?Hユ」;u」#鴉ワ・%\0ゥuィ度膕UッセHY真A粫ワ?ナh|\'?6? カ?\"iハ娶辣ヤァN亙mォ?[5ャ ~ッユ ̄テ鱠3\rヨヘHHpUヒ\"氛S凋ロ壺?竕\Zケ?(ァ\\y*?aZモ;W逓サ・Xオ+X、I?、??ヌ8ワ?\'テタアsヤSァモ昴ノ1ンリ駲ヌz??Hwァ?S們)弸I&。Xヤぅ?vホ躑{]Nh・D?% ァフ ?:棗??Bユワ滸_?マ??;ノ.?j*)Ol?\0xッ「eノ#x旗祀6フヲ偃サ?カ・2スホXュlq廖ツュェラ蝟v;些∴ロ?\'佯Hヌ聴1?踝ノ鮴リ|?zJ ?wヲF停i? フ??敬タェノ9印ZWカ&_逮()r1k孳b 9Vロn$?XZ26Z?S?3\rサ?・?U??嘴ロmR籘。H#?\Zロョ7案|セl@HF?9?rォ9bKtニ?ヲS71カW/l7ワォ?ヲ9zLJ>Lタ*?> 籌-ム?コオVU? )??6Jメ(=jqe0ト#?ゥ]サS??+y}e$惆 0ゥ ケm?\0ノツ逅?9・$ヲ鉢ョユトタRエヒエヤマ磧?@0?低ヲb??TOタハy9$R?緜hUテ2??2航Ubハ*l|z衒ラ?0?ネyTTq?\0ゑ?8s苗$f_ッ*\Zl2 > |lH8褞チ頓42Y无\rT?8實ィニミヲ*M0AWpヨ??\0ツ?\0ュ?\ZRス?・巛アD・iRX?\0イタU9K/イェエモ」コ樽U=?y>{?D「ー?&翁\nミ??銓チa|カ鎮FjP?5ク}有? =オタg亂?;ニソ莉|)?\0qネ?漠ミK3W?#??ュソiソノl妬紘ゥ?X「xセ?)Pサ?^??滿~ホM襠ヒs4w F-ラ?\'。ュ>a?ヨ??籖V4vァ?\0?u菲/狃ウ禄Xチ*Z?P?\0+キ屈杤?=マ峯xツ゚bアK?-:イッル?\0e菖シニ億桑\'ィIォ棔??+ケ/u\'?斉ぃ*J??k?0 ルs}ヘチXトnサ?\n?5メbミu]-釀?+|サ!ワ/ロ? ?ォ?LイZロャ?NhcSU?\0+l;ラ妣ヤ.ヨ?ノi ?フ彑?,7イ?/ィyj{ VG+?a?コ?廂qコィ縞2i鷽レ・Z竍?~ヘeノノ、?E融1舒8レHシ?\0\n??騙/?.旅ラh?ス?-\n0&1ネCj?>?ア\r+LIチケセ-?イ\n}ッル牀U、?\0+?:テN郵i#エ?$H?~#?~ホハ?PHb2\'??0ハロノレヲ嬶%スウyvc?エ故1胚E<覓s?&эサ?、暸@?キ?抗J?。?FbI?\\[Z??壗チmf?I%ネ??roルノq?/>?\'ヌSJ\n≪?$,e筌p{{bッ フ然zwノ?\r(H、T\Z梱?6&K9,w=N*タイ勇QZ??*?#+1wョ4ェ償i哦?sムW?3ム(?ェxヤbシ?\"$BU→#ィニ゙^M})榱フ?7V=M2)h「ヨ穏ョト篷\n・9??*0F\ZL幕k?=ヌ+詔鰻」?恤?\0膏涯+??\0YEK蓄/?老ニヲケ咤ルX夫9C6ハ+儕ア?ナ?ヤP>\"z童\rヨヤハ?(「?j1Sオ0ツハ(?8f R6cネ?篩H?\0ト?ュ蜂|m?&鮓jHィ魂,{??ョ+ァ゚ワiウ 嫻璢ソマナr繕?\n\nヤ?4ノRヲ/・ヌujキーネ柴:1U\0才+3}? ァ魎_ク?6騎潁キ?テME-?hョ\"u ?#GR\n?~Kヌ?S?ゆ淙?Yキヤ臑JトTヘ#\Z\nセ綉莨ケ乱&Kハ]ェiヒ「Fヲ?尭?ェF孑aOエ゚ー屑Yケク{?\ZW$ウ\Z樽s。?l!kk8\0∴;Tラ?k9ュi?<鋒9 ??・向ョ!??ヌ「舞穢ネ號|\'tシi?pウクV寿絅?\0ョフ\0q?rリヘ?\Z9?ョp?メmV?4?F? オF?捏@?ネカ梗モ濠ゥョヤ?\0W?dS6ノ榴+(N$\rゥモ Xラ?ソセ))~!T?q*オ7・4ノ$ョ?_3j討?BK\Z\n 蠎アf?\n5イ? ZB\0O\\U「f?テ^セ8 Kヲヌロョ=マW黯?2Jヤ?!^)?佳梯]螽゚e^ソ?c->.?;x?\r=テWッ_クb\rゥ.iYS胃ソ?ニ?ィ誕V?\"サ侍コ?\nL?>#?6タrL? jha磨ワタャ?W燬° 」ァ|H|?ユ?、ツ費窘 ?\"\"?u゚ョ6k?vワ椈Y$瀝\rVy nrネ盖eョS?gケ?カニ?ー9jeニ?\0ーa?彿9イイIvXcツラ[Jfク麁瓩\\i憂讎a棺?7ヒヘ?\nコ僖モ186ヒL{コ14S?i@?V\"#モ nャ犢p振ロ゚カ [EaS?ZメBccミu髟$O」ぉタ砌敵ヲ|iC1鰾?ハ?Uトlャァス]ェX墻?エ禾エe\n.n????\0?{ケV?? ?カモ?蒄\'?ヘリ5,メ6?梍ルm?ア???[」E?=ー?$カメ\"リ,j:樒鷸?6_Q蓿?サヤeサb?槲$ヌ??チレカ?6??\0スPx羨ソ??讀ツi*?\n熨??Uo??\0[癌;甑m?*テ?\n?B?2rO??9w「ζ,?Oハ?WG?1較 ラ??沂?\'?,屠:玲[t丼&a?ワW?ノp??楡ソセA膰逐?ウ渤?_k:DN%衢[?1フLr.zoC_ハ?&?eR$ #?n?廬苞IBネヲ保?需? ミャ?ゥリWキ?ニ劵R包巻ャ鞳?*ツサP?イGR?n0(xタ(竚+? メK?レN怐鑷Ugキ銜イミサ ッ?(ッ{\0゙#ナz?ト??=E+ラ?O(ツ@ワ壱ヤ|ェォ?=ヌ菩e#簇ュセ豼?N\r ?矯ト\'ウI(ノB|0ルW苦曄ryロコ宛?オ?G#?カ菟ク「」Wビ?9ンnエSネ2?<:??3鞣?\nプソOサ&2E?y謖?-J?ユx槽役枉\n?iモB。$」.ヒJV」ン雜WsD6゙」oユ?{ラ??ン[對e??リaTカメニ~$狹?2s?併101?B?ラタ・^ハ「q \0???d?C施??[ア?チoァhnAャゥシ草爛ナfメ蟠簫) N?キレチ融: Q%$V」bG?オ?-1I??Tイ穫|サ{?-B?!\rVスA?j皀リヌ;蔑\'?&ヲァオk??コc?~ホ:?bト?mzY#痒 rW?ム?イ+}恁ワMcチH\r?e穀?!(ァツワクモ??OwN~ォ??0ヌn概#儻~<樟\Z?:?2?\ZoU?\0?劼kf1H#)%h[播?:? ]=wGヤ&?-テイケゥ*\n~メ稽?wQハア#ニ(xr。?\\[?\\敬儻6!-?I?P?nノカ??+]v堺X「r?\'?WフYFQ7M?nヨー蛇?剄\n?ソeクォ/ルツ゚+K?=ケヘlニワ?\n@ッ?3rテ?,e7\"$ク割? ?\0Y]G,3uk?メN{UN??!誠ゥ*沖レjヌメェ??效テ\n?PFテクネ~吩?,ァwSBwオo?暢9タVスゥ自??0? オヨfウCK腆$?\'? ーz%ォ;\'傘e?7ッ??啣.^yネ??/レナ眄セケ\"゙?4蓉?F?\0ハ代otン;N2・ユミ朴?ァ牒「ネェ胯???H、?F?ィュd??烋7\\eツ=ケ?@?cQ?イb1\\d:?チコbォ^G:PV嫩・オhBQビ?=?ヨニz?+オ=?\0牾t?T?∇、揄??ウ?箏{剿:?フiSモヘホぬ??」年\r?兒做モV???8ォJ?_趁?瑯ムエh?\0zレ芥sヲ??yBBスセアq=離ィワヨン欧?タ??2??ヨネ&コ?-?ZォコQ_ウ?義ォ{8オ8譟J?;kXミ?\ZF?リォャ愾リァ,レ/',0.7124939,'sl',7,0,'1922-12-07 22:15:04.0'), +(2012,'k','',NULL,'lstxvxoo',2,3,'1992-07-20 10:19:25.0'), +(2006,'txvxoobx','{ }\", \"UTAH\", \"2014\", \"37\", null, \"-\", \"1\", null, \"3\", null, \"27\", null, \"68\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-111.5871285339997 39.36070082200047)\", null, null, \"UTAH\" ]\n, [ \"row-cy2h-v4pv_yc2a\", \"00000000-0000-0000-29C8-82ED26F05724\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"SOUTH CAROLINA\", \"2014\", \"37\", null, \"-\", \"2\", null, \"6\", null, \"55\", null, \"61\", null, null, \"-\", \"0\", null, \"1\", null, \"2\", null, \"7\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-81.04536765699964 33.99882214300044)\", null, null, \"SOUTH CAROLINA\" ]\n, [ \"row-wyg5_yc5s.2t33\", \"00000000-0000-0000-0009-A1EAD77B5986\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"ALASKA\", \"2014\", \"37\", null, \"-\", \"0\", null, \"1\", null, \"2\", null, \"4\", null, null, \"-\", \"0\", null, \"1\", null, \"2\", null, \"1\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-147.72205669099972 64.84507631500048)\", null, null, \"ALASKA\" ]\n, [ \"row-6sii~ebrj~btdz\", \"00000000-0000-0000-6A81-EBD29358C16E\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"MAINE\", \"2014\", \"37\", null, \"-\", \"1\", null, \"4\", null, \"35\", null, \"23\", null, null, \"-\", \"0\", null, \"1\", null, \"1\", null, \"1\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-68.98502952999962 45.2542257390005)\", null, null, \"MAINE\" ]\n, [ \"row-rvmv_hqb8-tf2k\", \"00000000-0000-0000-EFA0-7FDE69030921\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"OKLAHOMA\", \"2014\", \"37\", \"1\", null, \"1\", null, \"7\", null, \"55\", null, \"47\", null, null, \"-\", \"0\", null, \"1\", null, null, \"-\", \"3\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-97.52106845499969 35.472031425000466)\", null, null, \"OKLAHOMA\" ]\n, [ \"row-qurf_mxm6.4xmv\", \"00000000-0000-0000-F4FD-DAD0CD1CF605\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"INDIANA\", \"2014\", \"37\", null, \"-\", \"2\", null, \"7\", null, \"79\", null, \"98\", null, null, \"-\", \"0\", null, \"1\", null, \"2\", null, \"5\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-86.14995579899966 39.76691072200049)\", null, null, \"INDIANA\" ]\n, [ \"row-7e9w.a5ca.gbgy\", \"00000000-0000-0000-B852-68B67CD55DEF\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"DELAWARE\", \"2014\", \"37\", null, \"-\", \"0\", null, \"2\", null, \"2\", null, \"11\", null, null, \"-\", \"0\", null, \"1\", null, \"1\", null, \"2\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-75.57773943699965 39.00883059000046)\", null, null, \"DELAWARE\" ]\n, [ \"row-93f3~ptpp-jvyy\", \"00000000-0000-0000-93F5-6033818C035C\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"ARKANSAS\", \"2014\", \"37\", \"3\", null, \"1\", null, \"6\", null, \"25\", null, \"43\", null, null, \"-\", \"0\", null, \"1\", null, \"1\", null, \"1\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-92.27448794899965 34.74865329300047)\", null, null, \"ARKANSAS\" ]\n, [ \"row-7pq8.u2t6-yp2b\", \"00000000-0000-0000-E13B-08276C137DC3\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"CALIFORNIA\", \"2014\", \"37\", \"7\", null, \"6\", null, \"15\", null, \"231\", null, \"204\", null, null, \"-\", \"1\", null, \"7\", null, \"38\", null, \"70\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-120.99999889499969 37.63864203100047)\", null, null, \"CALIFORNIA\" ]\n, [ \"row-8nav_uj4s~c9ps\", \"00000000-0000-0000-05EF-D247DF52986E\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"OREGON\", \"2014\", \"37\", null, \"-\", \"2\", null, \"8\", null, \"77\", null, \"218\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-120.15502977999972 44.56745218600048)\", null, null, \"OREGON\" ]\n, [ \"row-w7pd-tam2~rvge\", \"00000000-0000-0000-DA1A-364967240EA5\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"ALABAMA\", \"2014\", \"37\", \"2\", null, \"2\", null, \"8\", null, \"82\", null, \"102\", null, null, \"-\", \"0\", null, \"1\", null, \"2\", null, \"5\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-86.63185803899967 32.84057034900047)\", null, null, \"ALABAMA\" ]\n, [ \"row-bfx3~rdqm~8r7t\", \"00000000-0000-0000-D6AD-76C43033D406\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"NEW JERSEY\", \"2014\", \"37\", null, \"-\", \"0\", null, \"5\", null, \"13\", null, \"52\", null, null, \"-\", \"0\", null, \"5\", null, \"26\", null, null, \"-\", null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-74.27368565099965 40.13057159500045)\", null, null, \"NEW JERSEY\" ]\n, [ \"row-ihca-r6sm_j485\", \"00000000-0000-0000-8835-76DE92BD0A04\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"MASSACHUSETTS\", \"2014\", \"37\", null, \"-\", \"2\", null, \"5\", null, \"75\", null, \"98\", null, null, \"-\", \"0\", null, \"1\", null, \"7\", null, null, \"-\", null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-72.08268985899963 42.27687014100047)\", null, null, \"MASSACHUSETTS\" ]\n, [ \"row-q8yq-pfae.5iyh\", \"00000000-0000-0000-2104-5A07B1D13849\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"IOWA\", \"2014\", \"37\", null, \"-\", \"5\", null, \"61\", null, \"180\", null, \"1306\", null, null, \"-\", \"0\", null, \"1\", null, \"1\", null, null, \"-\", null, \"-\", \"0\", null, \"0\", null, null, \"-\", \"2\", null, \"POINT (-93.81648936699969 42.469401477000474)\", null, null, \"IOWA\" ]\n, [ \"row-yzs9~3ssn.gb6z\", \"00000000-0000-0000-D8B2-772D6478CB4A\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"NEW YORK\", \"2014\", \"37\", \"12\", null, \"4\", null, \"14\", null, \"172\", null, \"162\", null, null, \"-\", \"0\", null, \"4\", null, \"18\", null, \"38\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", \"1\", null, \"POINT (-75.54396639699968 42.82700178100049)\", null, null, \"NEW YORK\" ]\n, [ \"row-5amt-e54z~7rhu\", \"00000000-0000-0000-1452-DB727C714C5F\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"NEW HAMPSHIRE\", \"2014\", \"37\", null, \"-\", \"0\", null, \"3\", null, \"20\", null, \"32\", null, null, \"-\", \"0\", null, \"1\", null, null, \"-\", \"3\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-71.50035726399966 43.65595081000049)\", null, null, \"NEW HAMPSHIRE\" ]\n, [ \"row-ejuk_u23f-gmac\", \"00000000-0000-0000-D585-11F9AE6034FF\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"OHIO\", \"2014\", \"37\", \"10\", null, \"6\", null, \"15\", null, \"232\", null, \"256\", null, null, \"-\", \"0\", null, \"1\", null, \"7\", null, \"6\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-82.40425685299965 40.06021184000048)\", null, null, \"OHIO\" ]\n, [ \"row-kdkx_unx4_2827\", \"00000000-0000-0000-A7FB-3FD62AD160C7\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"MONTANA\", \"2014\", \"37\", \"2\", null, \"1\", null, \"10\", null, \"48\", null, \"95\", null, null, \"-\", \"0\", null, \"1\", null, \"1\", null, \"2\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-109.42441687999968 47.06652759400049)\", null, null, \"MONTANA\" ]\n, [ \"row-ejbe.eiif_ajbq\", \"00000000-0000-0000-7720-7C64C4EDD0FF\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"MISSISSIPPI\", \"2014\", \"37\", null, \"-\", \"1\", null, \"4\", null, \"34\", null, \"38\", null, null, \"-\", \"0\", null, \"1\", null, \"1\", null, \"1\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-89.53802764499966 32.745512774000474)\", null, null, \"MISSISSIPPI\" ]\n, [ \"row-amps~asgf.znet\", \"00000000-0000-0000-AF78-26AB67F70491\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"GEORGIA\", \"2014\", \"37\", \"11\", null, \"5\", null, \"16\", null, \"180\", null, \"194\", null, null, \"-\", \"0\", null, \"1\", null, \"3\", null, \"8\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-83.62757601199968 32.83968158500045)\", null, null, \"GEORGIA\" ]\n, [ \"row-cctq_ndwy_fy4u\", \"00000000-0000-0000-102B-15204C828ECE\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"CONNECTICUT\", \"2014\", \"37\", null, \"-\", \"1\", null, \"4\", null, \"30\", null, \"31\", null, null, \"-\", \"0\", null, \"2\", null, \"2\", null, \"12\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-72.64983753699966 41.56266101800048)\", null, null, \"CONNECTICUT\" ]\n, [ \"row-i553-kagm.cvdx\", \"00000000-0000-0000-053F-F5FA999759C2\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"SOUTH DAKOTA\", \"2014\", \"37\", \"1\", null, \"3\", null, \"9\", null, \"105\", null, \"115\", null, null, \"-\", \"0\", null, \"1\", null, null, \"-\", \"2\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-100.37352811899967 44.35313049600046)\", null, null, \"SOUTH DAKOTA\" ]\n, [ \"row-ytu3~kmi6_4tk3\", \"00000000-0000-0000-E92D-E3A3AD33FA66\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"FLORgA\", \"2014\", \"37\", \"106\", null, \"10\", null, \"128\", null, \"1071\", null, \"255\", null, null, \"-\", \"1\", null, \"5\", null, \"21\", null, \"117\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-81.92895558499964 28.93204444200046)\", null, null, \"FLORgA\" ]\n, [ \"row-4s96~2vqm~drez\", \"00000000-0000-0000-F19B-061643992EAA\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"NORTH CAROLINA\", \"2014\", \"37\", null, \"-\", \"0\", null, \"28\", null, \"115\", null, \"102\", null, null, \"-\", \"0\", null, \"2\", null, \"5\", null, \"13\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-79.15924924699965 35.46622096200048)\", null, null, \"NORTH CAROLINA\" ]\n, [ \"row-ikuk-dgfa.8jyj\", \"00000000-0000-0000-9E8F-69F43661D18F\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"NORTH DAKOTA\", \"2014\", \"37\", null, \"-\", \"1\", null, \"7\", null, \"40\", null, \"55\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", \"1\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-100.11842599699969 47.47531892900048)\", null, null, \"NORTH DAKOTA\" ]\n, [ \"row-uabq.jkdx.nhvp\", \"00000000-0000-0000-D434-0442CBD25725\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"PUERTO RICO\", \"2014\", \"37\", null, \"N\", \"0\", null, \"0\", null, null, \"N\", null, \"N\", null, \"-\", \"13\", null, \"267\", null, \"394\", null, \"7593\", null, null, \"-\", \"0\", null, \"7\", null, \"2\", null, \"122\", null, \"POINT (-66.49988980099965 18.24828934900046)\", null, null, \"PUERTO RICO\" ]\n, [ \"row-i6gf-qp6w-e2c2\", \"00000000-0000-0000-26F7-EDD14CD14586\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"MARYLAND\", \"2014\", \"37\", \"3\", null, \"1\", null, \"5\", null, \"50\", null, \"41\", null, null, \"-\", \"0\", null, \"2\", null, \"6\", null, \"6\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-76.60925970899967 39.29058224000045)\", null, null, \"MARYLAND\" ]\n, [ \"row-2nzg-gz5z_pv67\", \"00000000-0000-0000-8578-720E3DEB8CA6\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"TEXAS\", \"2014\", \"37\", \"8\", null, \"7\", null, \"37\", null, \"199\", null, \"209\", null, null, \"-\", \"0\", null, \"9\", null, \"12\", null, \"41\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-99.4267664729997 31.827240712000446)\", null, null, \"TEXAS\" ]\n, [ \"row-avp9_hp2a-wmxy\", \"00000000-0000-0000-8DDB-7DDD49FC59B2\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"TENNESSEE\", \"2014\", \"37\", null, \"-\", \"2\", null, \"5\", null, \"65\", null, \"54\", null, null, \"-\", \"0\", null, \"1\", null, \"2\", null, \"10\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-85.77448642199965 35.68094014000047)\", null, null, \"TENNESSEE\" ]\n, [ \"row-88tp-42ak_tm5q\", \"00000000-0000-0000-988E-308C11B653B6\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"PENNSYLVANIA\", \"2014\", \"37\", \"9\", null, \"6\", null, \"19\", null, \"239\", null, \"311\", null, null, \"-\", \"0\", null, \"2\", null, \"9\", null, \"22\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-77.86069775999965 40.79373260300048)\", null, null, \"PENNSYLVANIA\" ]\n, [ \"row-9e8q.28f8-3h2t\", \"00000000-0000-0000-6CE4-C1C9E8B95B4A\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"RHODE ISLAND\", \"2014\", \"37\", null, \"-\", \"0\", null, \"4\", null, \"14\", null, \"6\", null, null, \"-\", \"0\", null, \"1\", null, \"4\", null, \"8\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-71.52246918099962 41.708284362000484)\", null, null, \"RHODE ISLAND\" ]\n, [ \"row-fftv.vjyz.z698\", \"00000000-0000-0000-5EDB-962AAA8CF84F\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"gAHO\", \"2014\", \"37\", \"14\", null, \"1\", null, \"22\", null, \"72\", null, \"101\", null, null, \"-\", \"0\", null, \"1\", null, \"1\", null, \"1\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-114.3637261449997 43.68263160000049)\", null, null, \"gAHO\" ]\n, [ \"row-ztqh-ya8x.ym8m\", \"00000000-0000-0000-8F2D-33DAD0D6EE5D\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"MISSOURI\", \"2014\", \"37\", null, \"-\", \"3\", null, \"13\", null, \"104\", null, \"146\", null, null, \"-\", \"0\", null, \"1\", null, \"1\", null, \"3\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-92.56629737199967 38.63579079900046)\", null, null, \"MISSOURI\" ]\n, [ \"row-ikvv~557y.vxad\", \"00000000-0000-0000-5C83-384A358420C1\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"NEBRASKA\", \"2014\", \"37\", null, \"-\", \"2\", null, \"7\", null, \"56\", null, \"104\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-99.36571864599966 41.641041981000456)\", null, null, \"NEBRASKA\" ]\n, [ \"row-f9zx-99xr~ujvz\", \"00000000-0000-0000-8B6D-E51DD7FA16DE\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"COLORADO\", \"2014\", \"37\", \"1\", null, \"1\", null, \"5\", null, \"48\", null, \"73\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-106.13360888799969 38.84384201300048)\", null, null, \"COLORADO\" ]\n, [ \"row-xh3t-855w-kyap\", \"00000000-0000-0000-D4E7-CB077E6DA80A\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"WYOMING\", \"2014\", \"37\", null, \"-\", \"0\", null, \"22\", null, \"21\", null, \"105\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", \"1\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-108.10982744299969 43.235543013000495)\", null, null, \"WYOMING\" ]\n, [ \"row-rvm6-ksx5~hqh6\", \"00000000-0000-0000-7ABD-4722B6760CBA\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"ARIZONA\", \"2014\", \"37\", null, \"-\", \"1\", null, \"5\", null, \"35\", null, \"29\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", \"1\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-111.76380949799972 34.865970167000455)\", null, null, \"ARIZONA\" ]\n, [ \"row-6c2e.vkwy_2u5v\", \"00000000-0000-0000-7C6C-69E27D3BB00A\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"HAWAII\", \"2014\", \"37\", null, \"-\", \"0\", null, \"2\", null, \"2\", null, \"1\", null, null, \"-\", \"0\", null, \"2\", null, \"6\", null, \"9\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-157.85774691599974 21.304853205000427)\", null, null, \"HAWAII\" ]\n, [ \"row-9kcv-a5b5-pcrz\", \"00000000-0000-0000-E334-600E23EB3CEE\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"ILLINOIS\", \"2014\", \"37\", null, \"-\", \"3\", null, \"11\", null, \"105\", null, \"197\", null, null, \"-\", \"0\", null, \"2\", null, \"2\", null, \"20\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-88.99770813999965 40.48501433000047)\", null, null, \"ILLINOIS\" ]\n, [ \"row-seje.ikp2~aqd2\", \"00000000-0000-0000-30E4-4AFAF7F31261\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"GUAM\", \"2014\", \"37\", null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (144.73149801400064 13.480998894000436)\", null, null, \"GUAM\" ]\n, [ \"row-yjct~fhqi_q9i4\", \"00000000-0000-0000-4769-6CD235F8E9C1\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"NEW YORK CITY\", \"2014\", \"37\", \"7\", null, \"2\", null, \"6\", null, \"56\", null, \"52\", null, null, \"-\", \"1\", null, \"5\", null, \"18\", null, \"95\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", \"1\", null, \"POINT (-74.00596858999967 40.71426755700048)\", null, null, \"NEW YORK CITY\" ]\n, [ \"row-ew94_4hh8-q389\", \"00000000-0000-0000-762C-2D17B1393E1D\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"NEW MEXICO\", \"2014\", \"37\", null, \"-\", \"1\", null, \"5\", null, \"57\", null, \"32\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-106.24057768899968 34.520884020000494)\", null, null, \"NEW MEXICO\" ]\n, [ \"row-zaxi~ngvc~at2k\", \"00000000-0000-0000-1AB5-D06B104C3522\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"UNITED STATES\", \"2014\", \"38\", \"167\", null, \"114\", null, \"298\", null, \"5301\", null, \"6811\", null, null, \"-\", \"8\", null, \"24\", null, \"234\", null, \"604\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", \"6\", null, null, null, null, null ]\n, [ \"row-qfn8_3ygz.pj9x\", \"00000000-0000-0000-945B-B74777621CEF\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"NEW ENGLAND\", \"2014\", \"38\", \"2\", null, \"5\", null, \"11\", null, \"198\", null, \"219\", null, null, \"-\", \"0\", null, \"3\", null, \"16\", null, \"26\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", null, null, null, null ]\n, [ \"row-urh2~wub5_3jvh\", \"00000000-0000-0000-4BDB-A7570CE0C9C4\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"Mg. ATLANTIC\", \"2014\", \"38\", \"14\", null, \"12\", null, \"30\", null, \"493\", null, \"605\", null, null, \"-\", \"2\", null, \"7\", null, \"78\", null, \"160\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", \"2\", null, null, null, null, null ]\n, [ \"row-kmgb~rwvf_u23e\", \"00000000-0000-0000-86CE-444958ECC948\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"E.N. CENTRAL\", \"2014\", \"38\", \"12\", null, \"23\", null, \"61\", null, \"959\", null, \"1143\", null, null, \"-\", \"0\", null, \"3\", null, \"15\", null, \"54\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", null, null, null, null ]\n, [ \"row-x2uc_2e7d.n3gt\", \"00000000-0000-0000-EF8D-55C57BA06B11\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"W.N. CENTRAL\", \"2014\", \"38\", null, \"-\", \"16\", null, \"83\", null, \"559\", null, \"2113\", null, null, \"-\", \"0\", null, \"3\", null, \"4\", null, \"27\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", \"3\", null, null, null, null, null ]\n, [ \"row-u44i-mzcp.f5p3\", \"00000000-0000-0000-1426-0625A24B6BC1\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"S. ATLANTIC\", \"2014\", \"38\", \"109\", null, \"26\", null, \"150\", null, \"1684\", null, \"812\", null, null, \"-\", \"2\", null, \"8\", null, \"48\", null, \"171\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", \"1\", null, null, null, null, null ]\n, [ \"row-jqac.rny2_x728\", \"00000000-0000-0000-FCC1-76EABBE2EDED\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"DIST. OF COL.\", \"2014\", \"38\", null, \"-\", \"0\", null, \"1\", null, \"2\", null, \"10\", null, null, \"-\", \"0\", null, \"1\", null, \"1\", null, null, \"-\", null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", null, null, null, \"DIST. OF COL.\" ]\n, [ \"row-kx75_2ixn~qnii\", \"00000000-0000-0000-B1C1-85CDF1276A77\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"E.S. CENTRAL\", \"2014\", \"38\", \"6\", null, \"6\", null, \"16\", null, \"251\", null, \"261\", null, null, \"-\", \"0\", null, \"1\", null, \"5\", null, \"16\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", null, null, null, null ]\n, [ \"row-jgdv_tccd~6x47\", \"00000000-0000-0000-07F9-FBC344047579\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"W.S. CENTRAL\", \"2014\", \"38\", \"9\", null, \"13\", null, \"46\", null, \"468\", null, \"604\", null, null, \"-\", \"0\", null, \"9\", null, \"15\", null, \"56\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", null, null, null, null ]\n, [ \"row-254f~2nj7.ax4n\", \"00000000-0000-0000-6C2F-D42A998C981A\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"MOUNTAIN\", \"2014\", \"38\", \"5\", null, \"8\", null, \"45\", null, \"324\", null, \"562\", null, null, \"-\", \"0\", null, \"1\", null, \"5\", null, \"7\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", null, null, null, null ]\n, [ \"row-hf44.x4z6~mi8n\", \"00000000-0000-0000-7913-F138F45C26D8\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"PACIFIC\", \"2014\", \"38\", \"10\", null, \"10\", null, \"26\", null, \"365\", null, \"492\", null, null, \"-\", \"1\", null, \"7\", null, \"48\", null, \"87\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", null, null, null, null ]\n, [ \"row-uacq-7hzb_whw4\", \"00000000-0000-0000-D53B-23B1F20FF628\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"AMER. SAMOA\", \"2014\", \"38\", null, \"N\", null, \"-\", null, \"-\", null, \"N\", null, \"N\", null, \"-\", null, \"-\", null, \"-\", null, \"-\", null, \"-\", null, \"-\", null, \"-\", null, \"-\", null, \"-\", null, \"-\", null, null, null, \"AMER. SAMOA\" ]\n, [ \"row-fjce-gry8-3ukk\", \"00000000-0000-0000-554B-C752E6F1F563\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"C.N.M.I.\", \"2014\", \"38\", null, \"-\", null, \"-\", null, \"-\", null, \"-\", null, \"-\", null, \"-\", null, \"-\", null, \"-\", null, \"-\", null, \"-\", null, \"-\", null, \"-\", null, \"-\", null, \"-\", null, \"-\", null, null, null, \"C.N.M.I.\" ]\n, [ \"row-i56c.zbav_dbna\", \"00000000-0000-0000-5333-371D40E86355\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"VIRGIN ISL.\", \"2014\", \"38\", null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", null, \"-\", \"0\", null, \"5\", null, \"1\", null, \"148\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", \"5\", null, null, null, null, \"VIRGIN ISL.\" ]\n, [ \"row-fqe4_bki4_5nim\", \"00000000-0000-0000-E21F-C7D790897138\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"GUAM\", \"2014\", \"38\", null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (144.73149801400064 13.480998894000436)\", null, null, \"GUAM\" ]\n, [ \"row-kypq.swsq.d83b\", \"00000000-0000-0000-432F-9CABD36E8ACE\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"UTAH\", \"2014\", \"38\", null, \"-\", \"1\", null, \"3\", null, \"27\", null, \"71\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-111.5871285339997 39.36070082200047)\", null, null, \"UTAH\" ]\n, [ \"row-qtdk.993m-wj3h\", \"00000000-0000-0000-9D9C-B8C56C4CD894\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"OKLAHOMA\", \"2014\", \"38\", \"2\", null, \"1\", null, \"7\", null, \"57\", null, \"48\", null, null, \"-\", \"0\", null, \"1\", null, null, \"-\", \"4\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-97.52106845499969 35.472031425000466)\", null, null, \"OKLAHOMA\" ]\n, [ \"row-buuh.beg9_thkn\", \"00000000-0000-0000-4588-5CC6AFA5566C\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"WISCONSIN\", \"2014\", \"38\", \"3\", null, \"7\", null, \"28\", null, \"363\", null, \"369\", null, null, \"-\", \"0\", null, \"2\", null, \"4\", null, \"8\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-89.81636715299965 44.393191877000504)\", null, null, \"WISCONSIN\" ]\n, [ \"row-8e7g.jisk.6pp5\", \"00000000-0000-0000-C392-61AB29B847BA\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"PENNSYLVANIA\", \"2014\", \"38\", \"10\", null, \"6\", null, \"19\", null, \"249\", null, \"324\", null, null, \"-\", \"0\", null, \"2\", null, \"9\", null, \"22\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-77.86069775999965 40.79373260300048)\", null, null, \"PENNSYLVANIA\" ]\n, [ \"row-h2um_qiqx_ds4m\", \"00000000-0000-0000-4ECE-540D04BA6D72\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"OREGON\", \"2014\", \"38\", null, \"-\", \"2\", null, \"8\", null, \"78\", null, \"224\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-120.15502977999972 44.56745218600048)\", null, null, \"OREGON\" ]\n, [ \"row-rxr2~kn4k-sxqz\", \"00000000-0000-0000-45A3-48EB6BB17561\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"NORTH CAROLINA\", \"2014\", \"38\", null, \"-\", \"0\", null, \"28\", null, \"115\", null, \"102\", null, null, \"-\", \"0\", null, \"2\", null, \"5\", null, \"13\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-79.15924924699965 35.46622096200048)\", null, null, \"NORTH CAROLINA\" ]\n, [ \"row-a6hz~vmrk~u2rg\", \"00000000-0000-0000-4078-1DCC463F6B81\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"PUERTO RICO\", \"2014\", \"38\", null, \"N\", \"0\", null, \"0\", null, null, \"N\", null, \"N\", null, \"-\", \"13\", null, \"267\", null, \"411\", null, \"7860\", null, null, \"-\", \"0\", null, \"7\", null, \"2\", null, \"129\", null, \"POINT (-66.49988980099965 18.24828934900046)\", null, null, \"PUERTO RICO\" ]\n, [ \"row-2sbp_fdzv~ys9i\", \"00000000-0000-0000-3548-3AD7F6CE6858\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"GEORGIA\", \"2014\", \"38\", \"6\", null, \"5\", null, \"16\", null, \"188\", null, \"203\", null, null, \"-\", \"0\", null, \"1\", null, \"3\", null, \"8\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-83.62757601199968 32.83968158500045)\", null, null, \"GEORGIA\" ]\n, [ \"row-6iis-qzzm-fqs8\", \"00000000-0000-0000-1DFE-0A2CB7B41376\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"LOUISIANA\", \"2014\", \"38\", null, \"-\", \"4\", null, \"16\", null, \"175\", null, \"281\", null, null, \"-\", \"0\", null, \"1\", null, \"1\", null, \"5\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-92.44567554599968 31.312664106000454)\", null, null, \"LOUISIANA\" ]\n, [ \"row-gk9g.uvjw_uem6\", \"00000000-0000-0000-E995-8703CD19E5E0\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"MONTANA\", \"2014\", \"38\", \"1\", null, \"1\", null, \"8\", null, \"49\", null, \"103\", null, null, \"-\", \"0\", null, \"1\", null, \"1\", null, \"2\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-109.42441687999968 47.06652759400049)\", null, null, \"MONTANA\" ]\n, [ \"row-8hxi-a8dx.zri9\", \"00000000-0000-0000-6DAD-1DE365931BC1\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"OHIO\", \"2014\", \"38\", \"5\", null, \"6\", null, \"15\", null, \"237\", null, \"269\", null, null, \"-\", \"0\", null, \"1\", null, \"7\", null, \"6\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-82.40425685299965 40.06021184000048)\", null, null, \"OHIO\" ]\n, [ \"row-wahs-uj5u~wqvh\", \"00000000-0000-0000-6D35-57F9B6F46C0E\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"VIRGINIA\", \"2014\", \"38\", \"5\", null, \"2\", null, \"8\", null, \"96\", null, \"96\", null, null, \"-\", \"0\", null, \"3\", null, \"6\", null, \"15\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", \"1\", null, \"POINT (-78.45788924199968 37.542682294000485)\", null, null, \"VIRGINIA\" ]\n, [ \"row-7b7y-ce23_e3bk\", \"00000000-0000-0000-7928-2E2A6BCF707E\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"TENNESSEE\", \"2014\", \"38\", \"1\", null, \"2\", null, \"6\", null, \"69\", null, \"58\", null, null, \"-\", \"0\", null, \"1\", null, \"2\", null, \"10\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-85.77448642199965 35.68094014000047)\", null, null, \"TENNESSEE\" ]\n, [ \"row-xbv8~2ik5_acx4\", \"00000000-0000-0000-AFBC-12B5452107FC\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"SOUTH DAKOTA\", \"2014\", \"38\", null, \"-\", \"2\", null, \"9\", null, \"106\", null, \"119\", null, null, \"-\", \"0\", null, \"1\", null, null, \"-\", \"2\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-100.37352811899967 44.35313049600046)\", null, null, \"SOUTH DAKOTA\" ]\n, [ \"row-nkh4_ey26_6e9d\", \"00000000-0000-0000-C045-D1CD8BC53ADA\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"NEBRASKA\", \"2014\", \"38\", null, \"-\", \"2\", null, \"7\", null, \"56\", null, \"110\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-99.36571864599966 41.641041981000456)\", null, null, \"NEBRASKA\" ]\n, [ \"row-ysqp.tcpd.j3kk\", \"00000000-0000-0000-18DD-D656386E387A\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"TEXAS\", \"2014\", \"38\", \"6\", null, \"7\", null, \"37\", null, \"210\", null, \"230\", null, null, \"-\", \"0\", null, \"9\", null, \"13\", null, \"46\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-99.4267664729997 31.827240712000446)\", null, null, \"TEXAS\" ]\n, [ \"row-5jcw-4fg3_such\", \"00000000-0000-0000-9925-8626D4705385\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"IOWA\", \"2014\", \"38\", null, \"-\", \"5\", null, \"47\", null, \"191\", null, \"1353\", null, null, \"-\", \"0\", null, \"1\", null, \"1\", null, null, \"-\", null, \"-\", \"0\", null, \"0\", null, null, \"-\", \"2\", null, \"POINT (-93.81648936699969 42.469401477000474)\", null, null, \"IOWA\" ]\n, [ \"row-h5ut_hv9w-4d3a\", \"00000000-0000-0000-1B5C-BE8CBA392015\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"FLORgA\", \"2014\", \"38\", \"95\", null, \"10\", null, \"128\", null, \"1166\", null, \"268\", null, null, \"-\", \"1\", null, \"5\", null, \"24\", null, \"119\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-81.92895558499964 28.93204444200046)\", null, null, \"FLORgA\" ]\n, [ \"row-kjur_dc5f.ez29\", \"00000000-0000-0000-965B-83B3D73FB048\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"WYOMING\", \"2014\", \"38\", null, \"-\", \"0\", null, \"22\", null, \"21\", null, \"122\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", \"1\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-108.10982744299969 43.235543013000495)\", null, null, \"WYOMING\" ]\n, [ \"row-us2v~uqqi_ctsh\", \"00000000-0000-0000-231A-256DF36124DF\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"ARIZONA\", \"2014\", \"38\", null, \"-\", \"1\", null, \"5\", null, \"35\", null, \"32\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", \"1\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-111.76380949799972 34.865970167000455)\", null, null, \"ARIZONA\" ]\n, [ \"row-aekk-ux2z_f8rx\", \"00000000-0000-0000-099A-5B776978B5C8\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"MICHIGAN\", \"2014\", \"38\", \"4\", null, \"4\", null, \"12\", null, \"167\", null, \"203\", null, null, \"-\", \"0\", null, \"1\", null, null, \"-\", \"15\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-84.71438724399968 44.66132176400049)\", null, null, \"MICHIGAN\" ]\n, [ \"row-eswy.e9dc-jm73\", \"00000000-0000-0000-F36A-FC6A5645C40E\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"DELAWARE\", \"2014\", \"38\", null, \"-\", \"0\", null, \"2\", null, \"2\", null, \"13\", null, null, \"-\", \"0\", null, \"1\", null, \"1\", null, \"2\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-75.57773943699965 39.00883059000046)\", null, null, \"DELAWARE\" ]\n, [ \"row-sfkt.ybj7-ufg4\", \"00000000-0000-0000-2CA9-E9F897CBE8D2\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"KENTUCKY\", \"2014\", \"38\", \"2\", null, \"1\", null, \"6\", null, \"58\", null, \"58\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-84.77496612599964 37.645970985000474)\", null, null, \"KENTUCKY\" ]\n, [ \"row-pbxf.giqw~6svv\", \"00000000-0000-0000-70C9-DFF97917582C\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"MASSACHUSETTS\", \"2014\", \"38\", null, \"-\", \"2\", null, \"5\", null, \"75\", null, \"102\", null, null, \"-\", \"0\", null, \"1\", null, \"7\", null, null, \"-\", null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-72.08268985899963 42.27687014100047)\", null, null, \"MASSACHUSETTS\" ]\n, [ \"row-weha~2us2.gu85\", \"00000000-0000-0000-87FF-082DF1B501BB\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"WEST VIRGINIA\", \"2014\", \"38\", null, \"-\", \"0\", null, \"2\", null, \"7\", null, \"16\", null, null, \"-\", \"0\", null, \"1\", null, null, \"-\", null, \"-\", null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-80.71263935099967 38.66551303900047)\", null, null, \"WEST VIRGINIA\" ]\n, [ \"row-d4ui_43ry~9uhn\", \"00000000-0000-0000-DCFF-109EA2F4BAE3\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"ILLINOIS\", \"2014\", \"38\", null, \"-\", \"3\", null, \"11\", null, \"108\", null, \"201\", null, null, \"-\", \"0\", null, \"2\", null, \"2\", null, \"20\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-88.99770813999965 40.48501433000047)\", null, null, \"ILLINOIS\" ]\n, [ \"row-mym9_fcer.hhgv\", \"00000000-0000-0000-6E3D-14657380DD97\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"CONNECTICUT\", \"2014\", \"38\", null, \"-\", \"0\", null, \"3\", null, \"30\", null, \"31\", null, null, \"-\", \"0\", null, \"2\", null, \"2\", null, \"12\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-72.64983753699966 41.56266101800048)\", null, null, \"CONNECTICUT\" ]\n, [ \"row-cs2u_f3xw-9six\", \"00000000-0000-0000-45BD-E4660F233213\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"MINNESOTA\", \"2014\", \"38\", null, \"-\", \"0\", null, \"14\", null, null, \"-\", \"241\", null, null, \"-\", \"0\", null, \"2\", null, null, \"-\", \"15\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", \"1\", null, \"POINT (-94.79419697699967 46.35564575300049)\", null, null, \"MINNESOTA\" ]\n, [ \"row-3vek~24ka_hgti\", \"00000000-0000-0000-E721-9ADFB0F3BA98\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"gAHO\", \"2014\", \"38\", \"3\", null, \"1\", null, \"14\", null, \"75\", null, \"107\", null, null, \"-\", \"0\", null, \"1\", null, \"1\", null, \"1\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-114.3637261449997 43.68263160000049)\", null, null, \"gAHO\" ]\n, [ \"row-tzbs_hkq2.nykv\", \"00000000-0000-0000-1FB3-F511585AC7AE\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"HAWAII\", \"2014\", \"38\", null, \"-\", \"0\", null, \"2\", null, \"2\", null, \"1\", null, null, \"-\", \"0\", null, \"2\", null, \"6\", null, \"9\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-157.85774691599974 21.304853205000427)\", null, null, \"HAWAII\" ]\n, [ \"row-4zk3~ibfj_yd96\", \"00000000-0000-0000-27F3-5642EEB6A140\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"VERMONT\", \"2014\", \"38\", null, \"-\", \"0\", null, \"7\", null, \"21\", null, \"22\", null, null, \"-\", \"0\", null, \"2\", null, \"2\", null, \"2\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-72.51763944499965 43.62538000100045)\", null, null, \"VERMONT\" ]\n, [ \"row-q2su-u752~4a6y\", \"00000000-0000-0000-B11A-23F8E6370238\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"ALASKA\", \"2014\", \"38\", null, \"-\", \"0\", null, \"1\", null, \"2\", null, \"4\", null, null, \"-\", \"0\", null, \"1\", null, \"2\", null, \"1\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-147.72205669099972 64.84507631500048)\", null, null, \"ALASKA\" ]\n, [ \"row-k9zt.jgwd.74f5\", \"00000000-0000-0000-E2E8-80F933B55E01\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"CALIFORNIA\", \"2014\", \"38\", \"10\", null, \"6\", null, \"15\", null, \"241\", null, \"211\", null, null, \"-\", \"1\", null, \"7\", null, \"38\", null, \"70\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-120.99999889499969 37.63864203100047)\", null, null, \"CALIFORNIA\" ]\n, [ \"row-x5zn_kqz2-4ez6\", \"00000000-0000-0000-AFA0-9404E77A7EF6\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"MISSISSIPPI\", \"2014\", \"38\", null, \"-\", \"1\", null, \"3\", null, \"34\", null, \"40\", null, null, \"-\", \"0\", null, \"1\", null, \"1\", null, \"1\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-89.53802764499966 32.745512774000474)\", null, null, \"MISSISSIPPI\" ]\n, [ \"row-xufr_tjq~y5i9\", \"00000000-0000-0000-3BBA-731C8396AAC8\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"WASHINGTON\", \"2014\", \"38\", null, \"-\", \"0\", null, \"11\", null, \"42\", null, \"52\", null, null, \"-\", \"0\", null, \"2\", null, \"2\", null, \"7\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-120.47002746299972 47.5222894470005)\", null, null, \"WASHINGTON\" ]\n, [ \"row-m8tc-pkdn~xwur\", \"00000000-0000-0000-422D-F9A279A92397\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"ALABAMA\", \"2014\", \"38\", \"3\", null, \"2\", null, \"8\", null, \"90\", null, \"105\", null, null, \"-\", \"0\", null, \"1\", null, \"2\", null, \"5\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-86.63185803899967 32.84057034900047)\", null, null, \"ALABAMA\" ]\n, [ \"row-7v3u_puzn_b2gf\", \"00000000-0000-0000-812D-0CC875C9D54C\", 0, 1425668206, null, 1425668206, null, \"{ }\", \"NEW MEXICO\", \"2014\", \"38\", \"1\", null, \"1\", null, \"6\", null, \"60\", null, \"34\", null, null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", null, \"-\", \"0\", null, \"0\", null, null, \"-\", null, \"-\", \"POINT (-106.24057768899968 34.520884020000494)\", null, null, \"NEW MEXICO\" ]\n, [ ',0.4965668,'st',5,4,'2004-01-09 22:00:38.0'), +(NULL,'vxo','ge\" : \"published\",\n \"rowClass\" : \"\",\n \"rowsUpdatedAt\" : 1362152554,\n \"rowsUpdatedBy\" : \"nas8-ebt2\",\n \"tableg\" : 707422,\n \"totalTimesRated\" : 0,\n \"viewCount\" : 2726,\n \"viewLastModified\" : 1560189590,\n \"viewType\" : \"tabular\",\n \"approvals\" : [ {\n \"reviewedAt\" : 1362153094,\n \"reviewedAutomatically\" : true,\n \"state\" : \"approved\",\n \"submissiong\" : 995322,\n \"submissionObject\" : \"public_audience_request\",\n \"submissionOutcome\" : \"change_audience\",\n \"submittedAt\" : 1362153094,\n \"workflowg\" : 2254,\n \"submissionDetails\" : {\n \"permissionType\" : \"READ\"\n },\n \"submissionOutcomeApplication\" : {\n \"failureCount\" : 0,\n \"status\" : \"success\"\n },\n \"submitter\" : {\n \"g\" : \"xzik-pf59\",\n \"displayName\" : \"NY Open Data\"\n }\n } ],\n \"columns\" : [ {\n \"g\" : -1,\n \"name\" : \"sg\",\n \"dataTypeName\" : \"meta_data\",\n \"fieldName\" : \":sg\",\n \"position\" : 0,\n \"renderTypeName\" : \"meta_data\",\n \"format\" : { },\n \"flags\" : [ \"hgden\" ]\n }, {\n \"g\" : -1,\n \"name\" : \"g\",\n \"dataTypeName\" : \"meta_data\",\n \"fieldName\" : \":g\",\n \"position\" : 0,\n \"renderTypeName\" : \"meta_data\",\n \"format\" : { },\n \"flags\" : [ \"hgden\" ]\n }, {\n \"g\" : -1,\n \"name\" : \"position\",\n \"dataTypeName\" : \"meta_data\",\n \"fieldName\" : \":position\",\n \"position\" : 0,\n \"renderTypeName\" : \"meta_data\",\n \"format\" : { },\n \"flags\" : [ \"hgden\" ]\n }, {\n \"g\" : -1,\n \"name\" : \"created_at\",\n \"dataTypeName\" : \"meta_data\",\n \"fieldName\" : \":created_at\",\n \"position\" : 0,\n \"renderTypeName\" : \"meta_data\",\n \"format\" : { },\n \"flags\" : [ \"hgden\" ]\n }, {\n \"g\" : -1,\n \"name\" : \"created_meta\",\n \"dataTypeName\" : \"meta_data\",\n \"fieldName\" : \":created_meta\",\n \"position\" : 0,\n \"renderTypeName\" : \"meta_data\",\n \"format\" : { },\n \"flags\" : [ \"hgden\" ]\n }, {\n \"g\" : -1,\n \"name\" : \"updated_at\",\n \"dataTypeName\" : \"meta_data\",\n \"fieldName\" : \":updated_at\",\n \"position\" : 0,\n \"renderTypeName\" : \"meta_data\",\n \"format\" : { },\n \"flags\" : [ \"hgden\" ]\n }, {\n \"g\" : -1,\n \"name\" : \"updated_meta\",\n \"dataTypeName\" : \"meta_data\",\n \"fieldName\" : \":updated_meta\",\n \"position\" : 0,\n \"renderTypeName\" : \"meta_data\",\n \"format\" : { },\n \"flags\" : [ \"hgden\" ]\n }, {\n \"g\" : -1,\n \"name\" : \"meta\",\n \"dataTypeName\" : \"meta_data\",\n \"fieldName\" : \":meta\",\n \"position\" : 0,\n \"renderTypeName\" : \"meta_data\",\n \"format\" : { },\n \"flags\" : [ \"hgden\" ]\n }, {\n \"g\" : 47787275,\n \"name\" : \"Scenic Byway\",\n \"dataTypeName\" : \"text\",\n \"description\" : \"Name of Scenic Byway.\",\n \"fieldName\" : \"scenic_byway\",\n \"position\" : 1,\n \"renderTypeName\" : \"text\",\n \"tableColumng\" : 7858463,\n \"wgth\" : 226,\n \"cachedContents\" : {\n \"largest\" : \"WNY Southtowns Scenic Byway\",\n \"non_null\" : 28,\n \"null\" : \"0\",\n \"top\" : [ {\n \"item\" : \"Dude Ranch Trail/First Wilderness Byway\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"High Peaks Scenic Byway\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Adirondack Trail\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Cayuga Lake Scenic Byway\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Central Adirondack Trail\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Lakes to Locks Passage\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Scenic Route 90 Byway\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Seneca Lake Scenic Byway\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Black River Trail\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Bronx River Parkway\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Palisades Parkway\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Roosevelt-Marcy Trail\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Maple Traditions Byway (pending legislation)\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Mountain Cloves Scenic Byway (pending legislation)\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Historic Parkways of Long Island \",\n \"count\" : \"1\"\n }, {\n \"item\" : \"North Fork Trail\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Durham Valley Scenic Byway\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Revolutionary Trail\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Southern Adirondack Trail\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Upper Delaware Scenic Byway\",\n \"count\" : \"1\"\n } ],\n \"smallest\" : \"Adirondack Trail\",\n \"not_null\" : \"28\",\n \"cardinality\" : \"28\"\n },\n \"format\" : {\n \"align\" : \"left\"\n }\n }, {\n \"g\" : 47787276,\n \"name\" : \"Approximate Length (Miles)\",\n \"dataTypeName\" : \"number\",\n \"description\" : \"Approximate total length of the byway measured in miles.\",\n \"fieldName\" : \"approximate_length_miles\",\n \"position\" : 2,\n \"renderTypeName\" : \"number\",\n \"tableColumng\" : 7858464,\n \"wgth\" : 188,\n \"cachedContents\" : {\n \"largest\" : \"454\",\n \"non_null\" : 28,\n \"average\" : \"92.53571428571429\",\n \"null\" : \"0\",\n \"top\" : [ {\n \"item\" : \"40\",\n \"count\" : \"2\"\n }, {\n \"item\" : \"89\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"29\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"38\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"18\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"168\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"36\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"71\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"454\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"50\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"179\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"84\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"112\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"53\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"158\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"41\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"153\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"109\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"95\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"87\",\n \"count\" : \"1\"\n } ],\n \"smallest\" : \"13\",\n \"not_null\" : \"28\",\n \"sum\" : \"2591\",\n \"cardinality\" : \"27\"\n },\n \"format\" : {\n \"precisionStyle\" : \"standard\",\n \"noCommas\" : \"false\",\n \"align\" : \"right\"\n }\n }, {\n \"g\" : 47787277,\n \"name\" : \"Region\",\n \"dataTypeName\" : \"text\",\n \"description\" : \"The region of New York State the byway serves.\",\n \"fieldName\" : \"region\",\n \"position\" : 3,\n \"renderTypeName\" : \"text\",\n \"tableColumng\" : 7858465,\n \"wgth\" : 191,\n \"cachedContents\" : {\n \"largest\" : \"Thousand Islands Seaway\",\n \"non_null\" : 28,\n \"null\" : \"0\",\n \"top\" : [ {\n \"item\" : \"Adirondacks\",\n \"count\" : \"9\"\n }, {\n \"item\" : \"Hudson Valley\",\n \"count\" : \"3\"\n }, {\n \"item\" : \"Long Island\",\n \"count\" : \"2\"\n }, {\n \"item\" : \"Central New York\",\n \"count\" : \"2\"\n }, {\n \"item\" : \"Catskills\",\n \"count\" : \"2\"\n }, {\n \"item\" : \"Finger Lakes\",\n \"count\" : \"2\"\n }, {\n \"item\" : \"Delaware River/Catskills\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"HudsonValley\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Greater Niagara\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Thousand Islands Seaway\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Great Lakes/ Canadian Border\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Capital-Saratoga\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Champlain and Hudson Valleys\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Finger lakes\",\n \"count\" : \"1\"\n } ],\n \"smallest\" : \"Adirondacks\",\n \"not_null\" : \"28\",\n \"cardinality\" : \"14\"\n },\n \"format\" : {\n \"align\" : \"left\"\n }\n }, {\n \"g\" : 47787278,\n \"name\" : \"Connects\",\n \"dataTypeName\" : \"text\",\n \"description\" : \"The city, village or towns connected by the byway.\",\n \"fieldName\" : \"connects\",\n \"position\" : 4,\n \"renderTypeName\" : \"text\",\n \"tableColumng\" : 7858466,\n \"wgth\" : 213,\n \"cachedContents\" : {\n \"largest\" : \"Westchester and Columbia Counties\",\n \"non_null\" : 28,\n \"null\" : \"0\",\n \"top\" : [ {\n \"item\" : \"Southhold to Orient Point\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Bronxville and Valhalla\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Ripley and Massena\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Rome and Dexter\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Herkimer/Little Falls and Speculator\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Loop around Cayuga Lake\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Lake Placg and The Northway\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Rome and Glens Falls\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Hancock to Port Jervis\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Lowville and Ogdensburg\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Canadian Border and Waterford\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Keeseveille and Sackets Harbor\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Scenectady and Waterford\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Westchester and Columbia Counties\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Long Lake and North Creek\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Homer and Montezuma\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Fonda and Malone\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Watkins Glen to Lodi\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Loop in Lake George Region \",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Hunter, HainesFalls, Tannersville\",\n \"count\" : \"1\"\n } ],\n \"smallest\" : \"Albany and Port Ontario\",\n \"not_null\" : \"28\",\n \"cardinality\" : \"28\"\n },\n \"format\" : {\n \"align\" : \"left\"\n }\n }, {\n \"g\" : 47787279,\n \"name\" : \"Primary Designation\",\n \"dataTypeName\" : \"text\",\n \"description\" : \"The primary designation of the byway.\",\n \"fieldName\" : \"primary_designation\",\n \"position\" : 5,\n \"renderTypeName\" : \"text\",\n \"tableColumng\" : 7858467,\n \"wgth\" : 328,\n \"cachedContents\" : {\n \"largest\" : \"State Scenic Byway\",\n \"non_null\" : 28,\n \"null\" : \"0\",\n \"top\" : [ {\n \"item\" : \"State Scenic Byway\",\n \"count\" : \"25\"\n }, {\n \"item\" : \"National Scenic Byway (National Designation)\",\n \"count\" : \"2\"\n }, {\n \"item\" : \"All-American Road (National Designation)\",\n \"count\" : \"1\"\n } ],\n \"smallest\" : \"All-American Road (National Designation)\",\n \"not_null\" : \"28\",\n \"cardinality\" : \"3\"\n },\n \"format\" : {\n \"align\" : \"left\"\n }\n }, {\n \"g\" : 47787280,\n \"name\" : \"Secondary Designation\",\n \"dataTypeName\" : \"text\",\n \"description\" : \"The secondary designation of the byway (where applicable).\",\n \"fieldName\" : \"secondary_designation\",\n \"position\" : 6,\n \"renderTypeName\" : \"text\",\n \"tableColumng\" : 7858468,\n \"wgth\" : 288,\n \"cachedContents\" : {\n \"largest\" : \"State Scenic Byway\",\n \"non_null\" : 20,\n \"null\" : \"8\",\n \"top\" : [ {\n \"item\" : \" \",\n \"count\" : \"17\"\n }, {\n \"item\" : \"State Scenic Byway\",\n \"count\" : \"3\"\n } ],\n \"smallest\" : \" \",\n \"not_null\" : \"20\",\n \"cardinality\" : \"2\"\n },\n \"format\" : {\n \"align\" : \"left\"\n }\n }, {\n \"g\" : 47787281,\n \"name\" : \"Tertiary Designation\",\n \"dataTypeName\" : \"text\",\n \"description\" : \"The tertiary designation of the byway (where applicable).\",\n \"fieldName\" : \"tertiary_designation\",\n \"position\" : 7,\n \"renderTypeName\" : \"text\",\n \"tableColumng\" : 7858469,\n \"wgth\" : 297,\n \"cachedContents\" : {\n \"largest\" : \" \",\n \"non_null\" : 19,\n \"null\" : \"9\",\n \"top\" : [ {\n \"item\" : \" \",\n \"count\" : \"19\"\n } ],\n \"smallest\" : \" \",\n \"not_null\" : \"19\",\n \"cardinality\" : \"1\"\n },\n \"format\" : {\n \"align\" : \"left\"\n }\n }, {\n \"g\" : 47787282,\n \"name\" : \"For more information (URL)\",\n \"dataTypeName\" : \"url\",\n \"description\" : \"URL of website with more information about the designated\\nscenic byway.\",\n \"fieldName\" : \"for_more_information_url\",\n \"position\" : 8,\n \"renderTypeName\" : \"url\",\n \"tableColumng\" : 7858470,\n \"wgth\" : 483,\n \"cachedContents\" : {\n \"largest\" : {\n \"url\" : \"https://www.dot.ny.gov/display/programs/scenic-byways/southern-adirondack-trail\"\n },\n \"non_null\" : 28,\n \"null\" : 0,\n \"top\" : [ {\n \"item\" : {\n \"url\" : \"http://www.seawaytrail.com/\"\n },\n \"count\" : 20\n }, {\n \"item\" : {\n \"url\" : \"http://www.lakestolocks.org/\"\n },\n \"count\" : 19\n }, {\n \"item\" : {\n \"url\" : \"http://www.adirondackscenicbyways.org/byway/adirondack-trail.html\"\n },\n \"count\" : 18\n }, {\n \"item\" : {\n \"url\" : \"http://www.tughill.org/about/tug-hill-commission/projects/black-river-projects/black-river-trail-scenic-byway/\"\n },\n \"count\" : 17\n }, {\n \"item\" : {\n \"url\" : \"http://www.fingerlakes.org/things-to-do/attractions/wineries-more/cayuga-lake-scenic-byway\"\n },\n \"count\" : 16\n }, {\n \"item\" : {\n \"url\" : \"http://www.adirondackscenicbyways.org/byway/central-adirondack-trail.html\"\n },\n \"count\" : 15\n }, {\n \"item\" : {\n \"url\" : \"https://www.dot.ny.gov/display/programs/scenic-byways/dude-ranch-trail\"\n },\n \"count\" : 14\n }, {\n \"item\" : {\n \"url\" : \"https://www.dot.ny.gov/display/programs/scenic-byways/military-trail\"\n },\n \"count\" : 13\n }, {\n \"item\" : {\n \"url\" : \"http://www.northfork.org/\"\n },\n \"count\" : 12\n }, {\n \"item\" : {\n \"url\" : \"http://www.adirondackscenicbyways.org/byway/olympic-trail.html\"\n },\n \"count\" : 11\n }, {\n \"item\" : {\n \"url\" : \"https://www.dot.ny.gov/display/programs/scenic-byways/revolutionary-byway\"\n },\n \"count\" : 10\n }, {\n \"item\" : {\n \"url\" : \"http://www.adirondackscenicbyways.org/\"\n },\n \"count\" : 9\n }, {\n \"item\" : {\n \"url\" : \"https://www.dot.ny.gov/display/programs/scenic-byways/southern-adirondack-trail\"\n },\n \"count\" : 8\n }, {\n \"item\" : {\n \"url\" : \"http://www.upperdelawarescenicbyway.org/\"\n },\n \"count\" : 7\n }, {\n \"item\" : {\n \"url\" : \"https://www.dot.ny.gov/display/programs/scenic-byways/route-90\"\n },\n \"count\" : 6\n }, {\n \"item\" : {\n \"url\" : \"https://www.dot.ny.gov/display/programs/scenic-byways/high-peaks-byway-rte-73\"\n },\n \"count\" : 5\n }, {\n \"item\" : {\n \"url\" : \"http://mohawktowpath.homestead.com/\"\n },\n \"count\" : 4\n }, {\n \"item\" : {\n \"url\" : \"http://www.nyroute20.com/\"\n },\n \"count\" : 3\n }, {\n \"item\" : {\n \"url\" : \"http://www.mtnscenicbyway.org/\"\n },\n \"count\" : 2\n }, {\n \"item\" : {\n \"url\" : \"http://wnyssb.org/\"\n },\n \"count\" : 1\n } ],\n \"smallest\" : {\n \"url\" : \"http://durhamvalley.com/scenic_byway.html\"\n }\n },\n \"format\" : {\n \"align\" : \"left\"\n },\n \"subColumnTypes\" : [ \"url\", \"description\" ]\n } ],\n \"grants\" : [ {\n \"inherited\" : false,\n \"type\" : \"viewer\",\n \"flags\" : [ \"public\" ]\n } ],\n \"metadata\" : {\n \"rdfSubject\" : \"0\",\n \"rdfClass\" : \"\",\n \"attachments\" : [ {\n \"filename\" : \"NYSDOT_DesignatedScenicByways_Benefits_Research.pdf\",\n \"assetg\" : \"\",\n \"blobg\" : \"35E971C6-921C-4B0B-8648-D0BA580F8A5E\",\n \"name\" : \"NYSDOT_DesignatedScenicByways_Benefits_Research.pdf\"\n }, {\n \"filename\" : \"NYSDOT_DesignatedScenic_Byways_Overview.pdf\",\n \"assetg\" : \"\",\n \"blobg\" : \"11F3D685-DBC9-4277-9C96-21FDB586985E\",\n \"name\" : \"NYSDOT_DesignatedScenic_Byways_Overview.pdf\"\n }, {\n \"filename\" : \"NYSDOT_DesignatedScenicByways_DataDictionary.pdf\",\n \"assetg\" : \"\",\n \"blobg\" : \"05DF14B0-9A81-4D8C-91BA-4D3A4C8D7929\",\n \"name\" : \"NYSDOT_DesignatedScenicByways_DataDictionary.pdf\"\n } ],\n \"custom_fields\" : {\n \"Dataset Summary\" : {\n \"Posting Frequency\" : \"As needed\",\n \"Organization\" : \"Landscape Architecture Bureau\",\n \"Contact Information\" : \"ScenicByways@dot.ny.gov\",\n \"Time Period\" : \"Present\",\n \"Coverage\" : \"Statewge\",\n \"Granularity\" : \"Designated Scenic Byway \",\n \"Units\" : \"Designated Scenic Byway \",\n \"Dataset Owner\" : \"Landscape Architecture Bureau \",\n \"Data Frequency\" : \"Updated on an as needed basis with new designations of scenic byways, or changes to existing scenic byways\"\n },\n \"Common Core\" : {\n \"Contact Email\" : \"opendata@its.ny.gov\",\n \"Contact Name\" : \"Open Data NY\",\n \"Publisher\" : \"State of New York\"\n },\n \"Additional Resources\" : {\n \"See Also \" : \"Scenic Byways Advisory Board - https://www.dot.ny.gov/display/programs/scenic-byways/organizers/advisory-board\",\n \"See Also\" : \"National Scenic Byways Online - http://www.byways.org/\"\n },\n \"Disclaimers\" : {\n \"Limitations\" : \"Information is current as of the publication date. \"\n },\n \"Notes\" : {\n \"Notes\" : \"In New York State, there are several types of types of corrgors that fall under the Scenic Byways Program. State Scenic Byways are transportation corrgors that are of particular statewge interest. They are representative of a region\'s scenic, recreational, cultural, natural, historic or archaeological significance. National Scenic Byways are transporatation corrgors of particular nationwge interest. National Scenic Byways are designated by the United States Department of Transportation\'s Federal Highway Administration. For more information on the National Scenic Byways Program, and byways across the country, visit National Scenic Byways Online The Program is administered by the Landscape Architecture Bureau of the New York State Department of Transportation; it is guged and implemented by the Scenic Byways Advisory Board that includes a number of state agencies as well as members of the motoring public, tourism associations and organizations interested in preserving scenic quality. \"\n },\n \"Dataset Information\" : {\n \"Agency\" : \"Transportation, Department of\"\n }\n },\n \"rowgentifier\" : \"0\",\n \"availableDisplayTypes\" : [ \"table\", \"fatrow\", \"page\" ],\n \"renderTypeConfig\" : {\n \"visible\" : {\n \"table\" : true\n }\n }\n },\n \"owner\" : {\n \"g\" : \"xzik-pf59\",\n \"displayName\" : \"NY Open Data\",\n \"profileImageUrlLarge\" : \"/api/users/xzik-pf59/profile_images/LARGE\",\n \"profileImageUrlMedium\" : \"/api/users/xzik-pf59/profile_images/THUMB\",\n \"profileImageUrlSmall\" : \"/api/users/xzik-pf59/profile_images/TINY\",\n \"screenName\" : \"NY Open Data\",\n \"type\" : \"interactive\",\n \"flags\" : [ \"mayBeStoriesCoOwner\" ]\n },\n \"query\" : {\n \"orderBys\" : [ {\n \"ascending\" : true,\n \"expression\" : {\n \"columng\" : 47787277,\n \"type\" : \"column\"\n }\n }, {\n \"ascending\" : true,\n \"expression\" : {\n \"columng\" : 47787275,\n \"type\" : \"column\"\n }\n } ]\n },\n \"rights\" : [ \"read\" ],\n \"tableAuthor\" : {\n \"g\" : \"mwxm-zess\",\n \"displayName\" : \"Lindsey Krough\",\n \"profileImageUrlLarge\" : \"/api/users/mwxm-zess/profile_images/LARGE\",\n \"profileImageUrlMedium\" : \"/api/users/mwxm-zess/profile_images/THUMB\",\n \"profileImageUrlSmall\" : \"/api/users/mwxm-zess/profile_images/TINY\",\n \"screenName\" : \"Lindsey Krough\",\n \"type\" : \"interactive\"\n },\n \"tags\" : [ \"scenic byways\", \"national scenic byways\", \"new york state scenic byways\", \"cmp\", \"corrgor management plan\", \"scenic roads\", \"all american road\" ],\n \"flags\" : [ \"default\", \"ownerMayBeContacted\", \"restorable\", \"restorePossibleForType\" ]\n }\n },\n \"data\" : [ [ \"row-5crd_6b3f_3y4i\", \"00000000-0000-0000-E069-4FECDB22F74E\", 0, 1560451418, null, 1560451418, null, \"{ }\", \"Great Lakes Seaway Trail\", \"454\", \"Great Lakes/ Canadian Border\", \"Ripley and Massena\", \"National Scenic Byway (National Designation)\", \"State Scenic Byway\", \" \", [ \"http://www.seawaytrail.com/\", null ] ]\n, [ \"row-h9yx_mzjg_4s2q\", \"00000000-0000-0000-A09C-34A7A1148705\", 0, 1560451418, null, 1560451418, null, \"{ }\", \"Lakes to Locks Passage\", \"225\", \"Champlain and Hudson Valleys\", \"Canadian Border and Waterford\", \"All-American Road (National Designation)\", \"State Scenic Byway\", null, [ \"http://www.lakestolocks.org/\", null ] ]\n, [ \"row-utuv~gy8p.eas9\", \"00000000-0000-0000-47AE-C76ABC2B5BE3\", 0, 1560451418, null, 1560451418, null, \"{ }\", \"Adirondack Trail\", \"179\", \"Adirondacks\", \"Fonda and Malone\", \"State Scenic Byway\", \" \", \" \", [ \"http://www.adirondackscenicbyways.org/byway/adirondack-trail.html\", null ] ]\n, [ \"row-22hk~dfii_skqe\", \"00000000-0000-0000-7DC5-30164E54661A\", 0, 1560451418, null, 1560451418, null, \"{ }\", \"Black River Trail\", \"95\", \"Adirondacks\", \"Rome and Dexter\", \"State Scenic Byway\", \" \", \" \", [ \"http://www.tughill.org/about/tug-hill-commission/projects/black-river-projects/black-river-trail-scenic-byway/\", null ] ]\n, [ \"row-au5f-9exd~5hwm\", \"00000000-0000-0000-4630-50C5ECE5A68F\", 0, 1560451418, null, 1560451418, null, \"{ }\", \"Cayuga Lake Scenic Byway\", \"87\", \"Finger Lakes\", \"Loop around Cayuga Lake\", \"State Scenic Byway\", \" \", \" \", [ \"http://www.fingerlakes.org/things-to-do/attractions/wineries-more/cayuga-lake-scenic-byway\", null ] ]\n, [ \"row-9zb6-w7xw_csgx\", \"00000000-0000-0000-6A93-6EB7D6D1B408\", 0, 1560451418, null, 1560451418, null, \"{ }\", \"Central Adirondack Trail\", \"153\", \"Adirondacks\", \"Rome and Glens Falls\", \"State Scenic Byway\", \" \", \" \", [ \"http://www.adirondackscenicbyways.org/byway/central-adirondack-trail.html\", null ] ]\n, [ \"row-qguv.tyr2~qdsy\", \"00000000-0000-0000-4539-19094568FA69\", 0, 1560451418, null, 1560451418, null, \"{ }\", \"Dude Ranch Trail/First Wilderness Byway\", \"40\", \"Adirondacks\", \"Loop in Lake George Region \", \"State Scenic Byway\", \" \", \" \", [ \"https://www.dot.ny.gov/display/programs/scenic-byways/dude-ranch-trail\", null ] ]\n, [ \"row-9xze.ecpt.k6bx\", \"00000000-0000-0000-2145-FE9196A3E8D0\", 0, 1560451418, null, 1560451418, null, \"{ }\", \"Military Trail/North Country Byway\", \"84\", \"Adirondacks\", \"Rouses Point and Massena\", \"State Scenic Byway\", \" \", \" \", [ \"https://www.dot.ny.gov/display/programs/scenic-byways/military-trail\", null ] ]\n, [ \"row-9avu-h6bm-7axn\", \"00000000-0000-0000-7770-3C95B9E7FE96\", 0, 1560451418, null, 1560451418, null, \"{ }\", \"North Fork Trail\", \"36\", \"Long Island\", \"Southhold to Orient Point\", \"State Scenic Byway\", \" \", \" \", [ \"http://www.northfork.org/\", null ] ]\n, [ \"row-6wd3-vigx-bgn6\", \"00000000-0000-0000-FB9E-D948649E3352\", 0, 1560451418, null, 1560451418, null, \"{ }\", \"Olympic Trail\", \"168\", \"Adirondacks\", \"Keeseveille and Sackets Harbor\", \"State Scenic Byway\", \" \", \" \", [ \"http://www.adirondackscenicbyways.org/byway/olympic-trail.html\", null ] ]\n, [ \"row-u8ht_wpre.nhuz\", \"00000000-0000-0000-7852-8F9964B6F976\", 0, 1560451418, null, 1560451418, null, \"{ }\", \"Revolutionary Trail\", \"158\", \"Central New York\", \"Albany and Port Ontario\", \"State Scenic Byway\", \" \", \" \", [ \"https://www.dot.ny.gov/display/programs/scenic-byways/revolutionary-byway\", null ] ]\n, [ \"row-p7uj-z8zt-rjab\", \"00000000-0000-0000-DF80-A25B4A371A96\", 0, 1560451418, null, 1560451418, null, \"{ }\", \"Roosevelt-Marcy Trail\", \"40\", \"Adirondacks\", \"Long Lake and North Creek\", \"State Scenic Byway\", \" \", \" \", [ \"http://www.adirondackscenicbyways.org/\", null ] ]\n, [ \"row-ysqw~pkiz_bxzh\", \"00000000-0000-0000-D2D0-211F8D394C54\", 0, 1560451418, null, 1560451418, null, \"{ }\", \"Southern Adirondack Trail\", \"112\", \"Adirondacks\", \"Herkimer/Little Falls and Speculator\", \"State Scenic Byway\", \" \", \" \", [ \"https://www.dot.ny.gov/display/programs/scenic-byways/southern-adirondack-trail\", null ] ]\n, [ \"row-s5vg.gjk-ruvi\", \"00000000-0000-0000-3927-756A0361F05D\", 0, 1560451418, null, 1560451418, null, \"{ }\", \"Upper Delaware Scenic Byway\", \"53\", \"Delaware River/Catskills\", \"Hancock to Port Jervis\", \"State Scenic Byway\", \" \", \" \", [ \"http://www.upperdelawarescenicbyway.org/\", null ] ]\n, [ \"row-qznr-ax9t_eq2i\", \"00000000-0000-0000-9BD7-44ABD2EFEF8B\", 0, 1560451418, null, 1560451418, null, \"{ }\", \"Scenic Route 90 Byway\", \"50\", \"Finger Lakes\", \"Homer and Montezuma\", \"State Scenic Byway\", \" \", \" \", [ \"https://www.dot.ny.gov/display/programs/scenic-byways/route-90\", null ] ]\n, [ \"row-tt3v-mnqc.hj5t\", \"00000000-0000-0000-49B0-11B502D7135B\", 0, 1560451418, null, 1560451418, null, \"{ }\", \"High Peaks Scenic Byway\", \"30\", \"Adirondacks\", \"Lake Placg and The Northway\", \"State Scenic Byway\", \" \", \" \", [ \"https://www.dot.ny.gov/display/programs/scenic-byways/high-peaks-byway-rte-73\", null ] ]\n, [ \"row-ipn9-pkrn_em24\", \"00000000-0000-0000-7CD0-B8CB2BD011D8\", 0, 1560451418, null, 1560451418, null, \"{ }\", \"Mohawk Towpath Byway\", \"29\", \"Capital-Saratoga\", \"Scenectady and Waterford\", \"National Scenic Byway (National Designation)\", \"State Scenic Byway\", \" \", [ \"http://mohawktowpath.homestead.com/\", null ] ]\n, [ \"row-bvnq_pnbv_racp\", \"00000000-0000-0000-2322-36EF77035C59\", 0, 1560451418, null, 1560451418, null, \"{ }\", \"Route 20 Scenic Byway\", \"109\", \"Central New York\", \"Duanesburg to Lafayette\", \"State Scenic Byway\", \" \", \" \", [ \"http://www.nyroute20.com/\", null ] ]\n, [ \"row-jta.sey4~n4gh\", \"00000000-0000-0000-B7A4-F3EA32EDC0B6\", 0, 1560451418, null, 1560451418, null, \"{ }\", \"Shawangunk Mountains Scenic Byway\", \"89\", \"Hudson Valley\", \"Loop in New Paltz area\", \"State Scenic Byway\", \" \", \" \", [ \"http://www.mtnscenicbyway.org/\", null ] ]\n, [ \"row-4uev-kvmb~a7y8\", \"00000000-0000-0000-19E8-B81DB47D3065\", 0, 1560451418, null, 1560451418, null, \"{ }\", \"WNY Southtowns Scenic Byway\", \"72\", \"Greater Niagara\", \"Orchard Park and Springville Loop\", \"State Scenic Byway\", \" \", \" \", [ \"http://wnyssb.org/\", null ] ]\n, [ \"row-fe2y.297u~tsus\", \"00000000-0000-0000-936D-F332EA320A2F\", 0, 1560451418, null, 1560451418, null, \"{ }\", \"Maple Traditions Byway (pending legislation)\", \"71\", \"Thousand Islands Seaway\", \"Lowville and Ogdensburg\", \"State Scenic Byway\", null, null, [ \"http://www.tughill.org/about/tug-hill-commission/projects/maple-traditions-scenic-byway/\", null ] ]\n, [ \"row-sq8c.ita6.zrih\", \"00000000-0000-0000-C209-EAFFEBE68322\", 0, 1560451418, null, 1560451418, null, \"{ }\", \"Seneca Lake Scenic Byway\", \"18\", \"Finger lakes\", \"Watkins Glen to Lodi\", \"State Scenic Byway\", null, null, [ \"http://home.htva.net/~townofhector/scenicbyway.html\", null ] ]\n, [ \"row-cxxt_rkje~7as6\", \"00000000-0000-0000-01CE-0A3158237143\", 0, 1560451418, null, 1560451418, null, \"{ }\", \"Durham Valley Scenic Byway\", \"15\", \"Catskills\", \"Loop in Greene County\", \"State Scenic Byway\", null, null, [ \"http://durhamvalley.com/scenic_byway.html\", null ] ]\n, [ \"row-vnif_bxcj.wtsd\", \"00000000-0000-0000-FA3A-31C0E0AC693C\", 0, 1560451418, null, 1560451418, null, \"{ }\", \"Mountain Cloves Scenic Byway (pending legislation)\", \"41\", \"Catskills\", \"Hunter, HainesFalls, Tannersville\", \"State Scenic Byway\", null, null, [ \"http://www.townofhuntergov.com/\", null ] ]\n, [ \"row-a4sd.udwu-r9dv\", \"00000000-0000-0000-4BBD-A69FD7705F0A\", 0, 1560451418, null, 1560451418, null, \"{ }\", \"Historic Parkways of Long Island \", \"38\", \"Long Island\", \"Nassau and Suffolk Counties\", \"State Scenic Byway\", null, null, [ \"https://www.dot.ny.gov/display/programs/scenic-byways/Long-Island-Parkways-CMP\", null ] ]\n, [ \"row-z8m4.f962~site\", \"00000000-0000-0000-3104-FB795044A235\", 0, 1560451418, null, 1560451418, null, \"{ }\", \"Taconic State Parkway\", \"105\", \"HudsonValley\", \"Westchester and Columbia Counties\", \"State Scenic Byway\", null, null, [ \"https://www.dot.ny.gov/display/programs/scenic-byways/parkways-no-detailed-info\", null ] ]\n, [ \"row-8d4p~7awi-b46a\", \"00000000-0000-0000-CA68-44817CDFB59D\", 0, 1560451418, null, 1560451418, null, \"{ }\", \"Bronx River Parkway\", \"13\", \"Hudson Valley\", \"Bronxville and Valhalla\", \"State Scenic Byway\", null, null, [ \"http://www.bronx-river.com/index.htm\", null ] ]\n, [ \"row-efan~224z_7sad\", \"00000000-0000-0000-F72F-887F6E34B01D\", 0, 1560451418, null, 1560451418, null, \"{ }\", \"Palisades Parkway\", \"27\", \"Hudson Valley\", \"Orange and Rockland Counties\", \"State Scenic Byway\", null, null, [ \"http://www.njpalisades.org/byway.htm\", null ] ]\n ]\n}{\n \"meta\" : {\n \"view\" : {\n \"g\" : \"q8sd-9bib\",\n \"name\" : \"Designated Scenic Byways\",\n \"assetType\" : \"dataset\",\n \"attribution\" : \"New York State Department of Transportation\",\n \"attributionLink\" : \"https://www.dot.ny.gov/display/programs/scenic-byways\",\n \"averageRating\" : 0,\n \"category\" : \"Transportation\",\n \"createdAt\" : 1360878507,\n \"description\" : \"The New York State Scenic Byways program was created in 1992 by the State Legislature. The program encourages both economic development and resource conservation, recognizing that each of these aspects of a byway must be fostered to ensure the success of the other. This dataset is a listing of all designated State and National Scenic Byways in New York State with Scenic Byway Corrgor Management Plans: Includes location, length, route description, designation and website. Information is current as of the publication date.\",\n \"displayType\" : \"table\",\n \"downloadCount\" : 1539,\n \"hgeFromCatalog\" : false,\n \"hgeFromDataJson\" : false,\n \"indexUpdatedAt\" : 1560189614,\n \"newBackend\" : true,\n \"numberOfComments\" : 0,\n \"og\" : 2677464,\n \"provenance\" : \"official\",\n \"publicationAppendEnabled\" : false,\n \"publicationDate\" : 1362153094,\n \"publicationGroup\" : 677837,\n \"publicationStage\" : \"published\",\n \"rowClass\" : \"\",\n \"rowsUpdatedAt\" : 1362152554,\n \"rowsUpdatedBy\" : \"nas8-ebt2\",\n \"tableg\" : 707422,\n \"totalTimesRated\" : 0,\n \"viewCount\" : 2726,\n \"viewLastModified\" : 1560189590,\n \"viewType\" : \"tabular\",\n \"approvals\" : [ {\n \"reviewedAt\" : 1362153094,\n \"reviewedAutomatically\" : true,\n \"state\" : \"approved\",\n \"submissiong\" : 995322,\n \"submissionObject\" : \"public_audience_request\",\n \"submissionOutcome\" : \"change_audience\",\n \"submittedAt\" : 1362153094,\n \"workflowg\" : 2254,\n \"submissionDetails\" : {\n \"permissionType\" : \"READ\"\n },\n \"submissionOutcomeApplication\" : {\n \"failureCount\" : 0,\n \"status\" : \"success\"\n },\n \"submitter\" : {\n \"g\" : \"xzik-pf59\",\n \"displayName\" : \"NY Open Data\"\n }\n } ],\n \"columns\" : [ {\n \"g\" : -1,\n \"name\" : \"sg\",\n \"dataTypeName\" : \"meta_data\",\n \"fieldName\" : \":sg\",\n \"position\" : 0,\n \"renderTypeName\" : \"meta_data\",\n \"format\" : { },\n \"flags\" : [ \"hgden\" ]\n }, {\n \"g\" : -1,\n \"name\" : \"g\",\n \"dataTypeName\" : \"meta_data\",\n \"fieldName\" : \":g\",\n \"position\" : 0,\n \"renderTypeName\" : \"meta_data\",\n \"format\" : { },\n \"flags\" : [ \"hgden\" ]\n }, {\n \"g\" : -1,\n \"name\" : \"position\",\n \"dataTypeName\" : \"meta_data\",\n \"fieldName\" : \":position\",\n \"position\" : 0,\n \"renderTypeName\" : \"meta_data\",\n \"format\" : { },\n \"flags\" : [ \"hgden\" ]\n }, {\n \"g\" : -1,\n \"name\" : \"created_at\",\n \"dataTypeName\" : \"meta_data\",\n \"fieldName\" : \":created_at\",\n \"position\" : 0,\n \"renderTypeName\" : \"meta_data\",\n \"format\" : { },\n \"flags\" : [ \"hgden\" ]\n }, {\n \"g\" : -1,\n \"name\" : \"created_meta\",\n \"dataTypeName\" : \"meta_data\",\n \"fieldName\" : \":created_meta\",\n \"position\" : 0,\n \"renderTypeName\" : \"meta_data\",\n \"format\" : { },\n \"flags\" : [ \"hgden\" ]\n }, {\n \"g\" : -1,\n \"name\" : \"updated_at\",\n \"dataTypeName\" : \"meta_data\",\n \"fieldName\" : \":updated_at\",\n \"position\" : 0,\n \"renderTypeName\" : \"meta_data\",\n \"format\" : { },\n \"flags\" : [ \"hgden\" ]\n }, {\n \"g\" : -1,\n \"name\" : \"updated_meta\",\n \"dataTypeName\" : \"meta_data\",\n \"fieldName\" : \":updated_meta\",\n \"position\" : 0,\n \"renderTypeName\" : \"meta_data\",\n \"format\" : { },\n \"flags\" : [ \"hgden\" ]\n }, {\n \"g\" : -1,\n \"name\" : \"meta\",\n \"dataTypeName\" : \"meta_data\",\n \"fieldName\" : \":meta\",\n \"position\" : 0,\n \"renderTypeName\" : \"meta_data\",\n \"format\" : { },\n \"flags\" : [ \"hgden\" ]\n }, {\n \"g\" : 47787275,\n \"name\" : \"Scenic Byway\",\n \"dataTypeName\" : \"text\",\n \"description\" : \"Name of Scenic Byway.\",\n \"fieldName\" : \"scenic_byway\",\n \"position\" : 1,\n \"renderTypeName\" : \"text\",\n \"tableColumng\" : 7858463,\n \"wgth\" : 226,\n \"cachedContents\" : {\n \"largest\" : \"WNY Southtowns Scenic Byway\",\n \"non_null\" : 28,\n \"null\" : \"0\",\n \"top\" : [ {\n \"item\" : \"Dude Ranch Trail/First Wilderness Byway\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"High Peaks Scenic Byway\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Adirondack Trail\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Cayuga Lake Scenic Byway\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Central Adirondack Trail\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Lakes to Locks Passage\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Scenic Route 90 Byway\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Seneca Lake Scenic Byway\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Black River Trail\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Bronx River Parkway\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Palisades Parkway\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Roosevelt-Marcy Trail\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Maple Traditions Byway (pending legislation)\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Mountain Cloves Scenic Byway (pending legislation)\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Historic Parkways of Long Island \",\n \"count\" : \"1\"\n }, {\n \"item\" : \"North Fork Trail\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Durham Valley Scenic Byway\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Revolutionary Trail\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Southern Adirondack Trail\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Upper Delaware Scenic Byway\",\n \"count\" : \"1\"\n } ],\n \"smallest\" : \"Adirondack Trail\",\n \"not_null\" : \"28\",\n \"cardinality\" : \"28\"\n },\n \"format\" : {\n \"align\" : \"left\"\n }\n }, {\n \"g\" : 47787276,\n \"name\" : \"Approximate Length (Miles)\",\n \"dataTypeName\" : \"number\",\n \"description\" : \"Approximate total length of the byway measured in miles.\",\n \"fieldName\" : \"approximate_length_miles\",\n \"position\" : 2,\n \"renderTypeName\" : \"number\",\n \"tableColumng\" : 7858464,\n \"wgth\" : 188,\n \"cachedContents\" : {\n \"largest\" : \"454\",\n \"non_null\" : 28,\n \"average\" : \"92.53571428571429\",\n \"null\" : \"0\",\n \"top\" : [ {\n \"item\" : \"40\",\n \"count\" : \"2\"\n }, {\n \"item\" : \"89\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"29\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"38\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"18\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"168\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"36\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"71\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"454\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"50\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"179\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"84\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"112\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"53\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"158\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"41\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"153\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"109\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"95\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"87\",\n \"count\" : \"1\"\n } ],\n \"smallest\" : \"13\",\n \"not_null\" : \"28\",\n \"sum\" : \"2591\",\n \"cardinality\" : \"27\"\n },\n \"format\" : {\n \"precisionStyle\" : \"standard\",\n \"noCommas\" : \"false\",\n \"align\" : \"right\"\n }\n }, {\n \"g\" : 47787277,\n \"name\" : \"Region\",\n \"dataTypeName\" : \"text\",\n \"description\" : \"The region of New York State the byway serves.\",\n \"fieldName\" : \"region\",\n \"position\" : 3,\n \"renderTypeName\" : \"text\",\n \"tableColumng\" : 7858465,\n \"wgth\" : 191,\n \"cachedContents\" : {\n \"largest\" : \"Thousand Islands Seaway\",\n \"non_null\" : 28,\n \"null\" : \"0\",\n \"top\" : [ {\n \"item\" : \"Adirondacks\",\n \"count\" : \"9\"\n }, {\n \"item\" : \"Hudson Valley\",\n \"count\" : \"3\"\n }, {\n \"item\" : \"Long Island\",\n \"count\" : \"2\"\n }, {\n \"item\" : \"Central New York\",\n \"count\" : \"2\"\n }, {\n \"item\" : \"Catskills\",\n \"count\" : \"2\"\n }, {\n \"item\" : \"Finger Lakes\",\n \"count\" : \"2\"\n }, {\n \"item\" : \"Delaware River/Catskills\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"HudsonValley\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Greater Niagara\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Thousand Islands Seaway\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Great Lakes/ Canadian Border\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Capital-Saratoga\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Champlain and Hudson Valleys\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Finger lakes\",\n \"count\" : \"1\"\n } ],\n \"smallest\" : \"Adirondacks\",\n \"not_null\" : \"28\",\n \"cardinality\" : \"14\"\n },\n \"format\" : {\n \"align\" : \"left\"\n }\n }, {\n \"g\" : 47787278,\n \"name\" : \"Connects\",\n \"dataTypeName\" : \"text\",\n \"description\" : \"The city, village or towns connected by the byway.\",\n \"fieldName\" : \"connects\",\n \"position\" : 4,\n \"renderTypeName\" : \"text\",\n \"tableColumng\" : 7858466,\n \"wgth\" : 213,\n \"cachedContents\" : {\n \"largest\" : \"Westchester and Columbia Counties\",\n \"non_null\" : 28,\n \"null\" : \"0\",\n \"top\" : [ {\n \"item\" : \"Southhold to Orient Point\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Bronxville and Valhalla\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Ripley and Massena\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Rome and Dexter\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Herkimer/Little Falls and Speculator\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Loop around Cayuga Lake\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Lake Placg and The Northway\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Rome and Glens Falls\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Hancock to Port Jervis\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Lowville and Ogdensburg\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Canadian Border and Waterford\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Keeseveille and Sackets Harbor\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Scenectady and Waterford\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Westchester and Columbia Counties\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Long Lake and North Creek\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Homer and Montezuma\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Fonda and Malone\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Watkins Glen to Lodi\",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Loop in Lake George Region \",\n \"count\" : \"1\"\n }, {\n \"item\" : \"Hunter, HainesFalls, Tannersville\",\n \"count\" : \"1\"\n } ],\n \"smallest\" : \"Albany and Port Ontario\",\n \"not_null\" : \"28\",\n \"cardinality\" : \"28\"\n },\n \"format\" : {\n \"align\" : \"left\"\n }\n }, {\n \"g\" : 47787279,\n \"name\" : \"Primary Designation\",\n \"dataTypeName\" : \"text\",\n \"description\" : \"The primary designation of the byway.\",\n \"fieldName\" : \"primary_designation\",\n \"position\" : 5,\n \"renderTypeName\" : \"text\",\n \"tableColumng\" : 7858467,\n \"wgth\" : 328,\n \"cachedContents\" : {\n \"largest\" : \"State Scenic Byway\",\n \"non_null\" : 28,\n \"null\" : \"0\",\n \"top\" : [ {\n \"item\" : \"State Scenic Byway\",\n \"count\" : \"25\"\n }, {\n \"item\" : \"National Scenic Byway (National Designation)\",\n \"count\" : \"2\"\n }, {\n \"item\" : \"All-American Road (National Designation)\",\n \"count\" : \"1\"\n } ],\n \"smallest\" : \"All-American Road (National Designation)\",\n \"not_null\" : \"28\",\n \"cardinality\" : \"3\"\n },\n \"format\" : {\n \"align\" : \"left\"\n }\n }, {\n \"g\" : 47787280,\n \"name\" : \"Secondary Designation\",\n \"dataTypeName\" : \"text\",\n \"description\" : \"The secondary designation of the byway (where applicable).\",\n \"fieldName\" : \"secondary_designation\",\n \"position\" : 6,\n \"renderTypeName\" : \"text\",\n \"tableColumng\" : 7858468,\n \"wgth\" : 288,\n \"cachedContents\" : {\n \"largest\" : \"State Scenic Byway\",\n \"non_null\" : 20,\n \"null\" : \"8\",\n \"top\" : [ {\n \"item\" : \" \",\n \"count\" : \"17\"\n }, {\n \"item\" : \"State Scenic Byway\",\n \"count\" : \"3\"\n } ],\n \"smallest\" : \" \",\n \"not_null\" : \"20\",\n \"cardinality\" : \"2\"\n },\n \"format\" : {\n \"align\" : \"left\"\n }\n }, {\n \"g\" : 47787281,\n \"name\" : \"Tertiary Designation\",\n \"dataTypeName\" : \"text\",\n \"description\" : \"The tertiary designation of the byway (where applicable).\",\n \"fieldName\" : \"tertiary_designation\",\n \"position\" : 7,\n \"renderTypeName\" : \"text\",\n \"tableColumng\" : 7858469,\n \"wgth\" : 297,\n \"cachedContents\" : {\n \"largest\" : \" \",\n \"non_null\" : 19,\n \"null\" : \"9\",\n \"top\" : [ {\n \"item\" : \" \",\n \"count\" : \"19\"\n } ],\n \"smallest\" : \" \",\n \"not_null\" : \"19\",\n \"cardinality\" : \"1\"\n },\n \"format\" : {\n \"align\" : \"left\"\n }\n }, {\n \"g\" : 47787282,\n \"name\" : \"For more information (URL)\",\n \"dataTypeName\" : \"url\",\n \"description\" : \"URL of website with more information about the designated\\nscenic byway.\",\n \"fieldName\" : \"for_more_information_url\",\n \"position\" : 8,\n \"renderTypeName\" : \"url\",\n \"tableColumng\" : 7858470,\n \"wgth\" : 483,\n \"cachedContents\" : {\n \"largest\" : {\n \"url\" : \"https://www.dot.ny.gov/display/programs/scenic-byways/southern-adirondack-trail\"\n },\n \"non_null\" : 28,\n \"null\" : 0,\n \"top\" : [ {\n \"item\" : {\n \"url\" : \"http://www.seawaytrail.com/\"\n },\n \"count\" : 20\n }, {\n \"item\" : {\n \"url\" : \"http://www.lakestolocks.org/\"\n },\n \"count\" : 19\n }, {\n \"item\" : {\n \"url\" : \"http://www.adirondackscenicbyways.org/byway/adirondack-trail.html\"\n },\n \"count\" : 18\n }, {\n \"item\" : {\n \"url\" : \"http://www.tughill.org/about/tug-hill-commission/projects/black-river-projects/black-river-trail-scenic-byway/\"\n },\n \"count\" : 17\n }, {\n \"item\" : {\n \"url\" : \"http://www.fingerlakes.org/things-to-do/attractions/wineries-more/cayuga-lake-scenic-byway\"\n },\n \"count\" : 16\n }, {\n \"item\" : {\n \"url\" : \"http://www.adirondackscenicbyways.org',0.6083221,'xv',244,4,'1969-07-30 13:43:03.0'), +(NULL,'oo','bbapFtG26PKWWHQnyTysUy4SL9/rVv8ww/8DdYOqFQ+8O0QnOLZ1Cbn307qEUH9fLUW+ZXKJdIWkyZuMpqyIJ7fkG/Dni2tR4uNAhTde70c/WOx/zBUcYsk5m5jmPxaT3GOwbqwvp9hIkPOtHd1JEeyXqBnsseV1jsyI5Nj8iThpCk9QMIrYwo3uIIcFngJa5r6fu8u36JjhBpkQWhIXq6Bsoe91wmjjpNAXPBLl/M9axZ5HNIIiLjOf2pjLg6ObNLCMh+RKhaW+y5zVegpAFzYjKnIMiOL7vZucQ5XsNZMAuI5izuIr947PeazWgcZvom78QFLiYqdkRTimuCnoQXgtWLAZ4wzuT2EiydSMXXqurGmm3E/Ti58wP0VNpKjehr5yTkUAIIGnNis18L85deUxL8j5PxuB1sMQMUawmOY2T2HnVUAlw3YwYif+abPur9yu4RWAWxRTl5QNQEO1I1BbiwNtOAOffwk55y1M5auYqopghUAtKTIU1n1bBHh8hMxJWhryP8OgwDh0C3rL5bbDruwTmh4DwIU0S949SZdIAPKerzAYtkxjS1k1H5Asa9VXnMwRTNI906ceI5mAyLddzpR1fPapkz2Ox1/FSrK1s/e54mOjtp0dYOMSb0MjXdld7Gi5dkCmOwRlUH7s36/52vVh1nhSev2FI9wRkEnwfBfXBKPi6OAJN5TU+OEV6rxVzqK6XyAKsvak/uBC+i4bvlnWBlKdQEVYMGZN4NzYI2tMOdfO/EHRDMxmSy6gPyCJQtA35FmHXdoRIK1oxgPboUiB439jolHjiNQMMXyY9I+9Y7BkKcwmY+EIB1W8mogzTt2T/AisG2YviONiAbBWmJRF2X63TdbLwysAMYL7AsgaC0YeIGpCEJ8byAwz/ti0nBbuviqUKbdPNhfNGHx0e9Gbc6WgQR2/qSN+5AkHRzKrav5tLL6u7kPIJEtx9OMbmnH4niEPHo7gLFVk2sq28Vv56OHzLLbE+5yWpXbxJv9fwdGPqo4fYI\nxk0kfgbbapFtG26PKWWHQnyTysUy4SL9/rVv8ww/8DdYOqFQ+8O0QnOLZ1Cbn307qEUH9fLUW+ZXKJdIWkyZuMpqyIJ7fkG/Dni2tR4uNAhTde70c/WOx/zBUcYsk5m5jmPxaT3GOwbqwvp9hIkPOtHd1JEeyXqBnsseV1jsyI5Nj8iThpCk9QMIrYwo3uIIcFngJa5r6fu8u36JjhBpkQWhIXq6Bsoe91wmjjpNAXPBLl/M9axZ5HNIIiLjOf2pjLg6ObNLCMh+RKhaW+y5zVegpAFzYjKnIMiOL7vZucQ5XsNZMAuI5izuIr947PeazWgcZvom78QFLiYqdkRTimuCnoQXgtWLAZ4wzuT2EiydSMXXqurGmm3E/Ti58wP0VNpKjehr5yTkUAIIGnNis18L85deUxL8j5PxuB1sMQMUawmOY2T2HnVUAlw3YwYif+abPur9yu4RWAWxRTl5QNQEO1I1BbiwNtOAOffwk55y1M5auYqopghUAtKTIU1n1bBHh8hMxJWhryP8OgwDh0C3rL5bbDruwTmh4DwIU0S949SZdIAPKerzAYtkxjS1k1H5Asa9VXnMwRTNI906ceI5mAyLddzpR1fPapkz2Ox1/FSrK1s/e54mOjtp0dYOMSb0MjXdld7Gi5dkCmOwRlUH7s36/52vVh1nhSev2FI9wRkEnwfBfXBKPi6OAJN5TU+OEV6rxVzqK6XyAKsvak/uBC+i4bvlnWBlKdQEVYMGZN4NzYI2tMOdfO/EHRDMxmSy6gPyCJQtA35FmHXdoRIK1oxgPboUiB439jolHjiNQMMXyY9I+9Y7BkKcwmY+EIB1W8mogzTt2T/AisG2YviONiAbBWmJRF2X63TdbLwysAMYL7AsgaC0YeIGpCEJ8byAwz/ti0nBbuviqUKbdPNhfNGHx0e9Gbc6WgQR2/qSN+5AkHRzKrav5tLL6u7kPIJEtx9OMbmnH4niEPHo7gLFVk2sq28Vv56OHzLLbE+5yWpXbxJv9fwdGPqo4fYI\nxk0kfgbbapFtG26PKWWHQnyTysUy4SL9/rVv8ww/8DdYOqFQ+8O0QnOLZ1Cbn307qEUH9fLUW+ZXKJdIWkyZuMpqyIJ7fkG/Dni2tR4uNAhTde70c/WOx/zBUcYsk5m5jmPxaT3GOwbqwvp9hIkPOtHd1JEeyXqBnsseV1jsyI5Nj8iThpCk9QMIrYwo3uIIcFngJa5r6fu8u36JjhBpkQWhIXq6Bsoe91wmjjpNAXPBLl/M9axZ5HNIIiLjOf2pjLg6ObNLCMh+RKhaW+y5zVegpAFzYjKnIMiOL7vZucQ5XsNZMAuI5izuIr947PeazWgcZvom78QFLiYqdkRTimuCnoQXgtWLAZ4wzuT2EiydSMXXqurGmm3E/Ti58wP0VNpKjehr5yTkUAIIGnNis18L85deUxL8j5PxuB1sMQMUawmOY2T2HnVUAlw3YwYif+abPur9yu4RWAWxRTl5QNQEO1I1BbiwNtOAOffwk55y1M5auYqopghUAtKTIU1n1bBHh8hMxJWhryP8OgwDh0C3rL5bbDruwTmh4DwIU0S949SZdIAPKerzAYtkxjS1k1H5Asa9VXnMwRTNI906ceI5mAyLddzpR1fPapkz2Ox1/FSrK1s/e54mOjtp0dYOMSb0MjXdld7Gi5dkCmOwRlUH7s36/52vVh1nhSev2FI9wRkEnwfBfXBKPi6OAJN5TU+OEV6rxVzqK6XyAKsvak/uBC+i4bvlnWBlKdQEVYMGZN4NzYI2tMOdfO/EHRDMxmSy6gPyCJQtA35FmHXdoRIK1oxgPboUiB439jolHjiNQMMXyY9I+9Y7BkKcwmY+EIB1W8mogzTt2T/AisG2YviONiAbBWmJRF2X63TdbLwysAMYL7AsgaC0YeIGpCEJ8byAwz/ti0nBbuviqUKbdPNhfNGHx0e9Gbc6WgQR2/qSN+5AkHRzKrav5tLL6u7kPIJEtx9OMbmnH4niEPHo7gLFVk2sq28Vv56OHzLLbE+5yWpXbxJv9fwdGPqo4fYI\nxk0kfgbbapFtG26PKWWHQnyTysUy4SL9/rVv8ww/8DdYOqFQ+8O0QnOLZ1Cbn307qEUH9fLUW+ZXKJdIWkyZuMpqyIJ7fkG/Dni2tR4uNAhTde70c/WOx/zBUcYsk5m5jmPxaT3GOwbqwvp9hIkPOtHd1JEeyXqBnsseV1jsyI5Nj8iThpCk9QMIrYwo3uIIcFngJa5r6fu8u36JjhBpkQWhIXq6Bsoe91wmjjpNAXPBLl/M9axZ5HNIIiLjOf2pjLg6ObNLCMh+RKhaW+y5zVegpAFzYjKnIMiOL7vZucQ5XsNZMAuI5izuIr947PeazWgcZvom78QFLiYqdkRTimuCnoQXgtWLAZ4wzuT2EiydSMXXqurGmm3E/Ti58wP0VNpKjehr5yTkUAIIGnNis18L85deUxL8j5PxuB1sMQMUawmOY2T2HnVUAlw3YwYif+abPur9yu4RWAWxRTl5QNQEO1I1BbiwNtOAOffwk55y1M5auYqopghUAtKTIU1n1bBHh8hMxJWhryP8OgwDh0C3rL5bbDruwTmh4DwIU0S949SZdIAPKerzAYtkxjS1k1H5Asa9VXnMwRTNI906ceI5mAyLddzpR1fPapkz2Ox1/FSrK1s/e54mOjtp0dYOMSb0MjXdld7Gi5dkCmOwRlUH7s36/52vVh1nhSev2FI9wRkEnwfBfXBKPi6OAJN5TU+OEV6rxVzqK6XyAKsvak/uBC+i4bvlnWBlKdQEVYMGZN4NzYI2tMOdfO/EHRDMxmSy6gPyCJQtA35FmHXdoRIK1oxgPboUiB439jolHjiNQMMXyY9I+9Y7BkKcwmY+EIB1W8mogzTt2T/AisG2YviONiAbBWmJRF2X63TdbLwysAMYL7AsgaC0YeIGpCEJ8byAwz/ti0nBbuviqUKbdPNhfNGHx0e9Gbc6WgQR2/qSN+5AkHRzKrav5tLL6u7kPIJEtx9OMbmnH4niEPHo7gLFVk2sq28Vv56OHzLLbE+5yWpXbxJv9fwdGPqo4fYI\nxk0kfgbbapFtG26PKWWHQnyTysUy4SL9/rVv8ww/8DdYOqFQ+8O0QnOLZ1Cbn307qEUH9fLUW+ZXKJdIWkyZuMpqyIJ7fkG/Dni2tR4uNAhTde70c/WOx/zBUcYsk5m5jmPxaT3GOwbqwvp9hIkPOtHd1JEeyXqBnsseV1jsyI5Nj8iThpCk9QMIrYwo3uIIcFngJa5r6fu8u36JjhBpkQWhIXq6Bsoe91wmjjpNAXPBLl/M9axZ5HNIIiLjOf2pjLg6ObNLCMh+RKhaW+y5zVegpAFzYjKnIMiOL7vZucQ5XsNZMAuI5izuIr947PeazWgcZvom78QFLiYqdkRTimuCnoQXgtWLAZ4wzuT2EiydSMXXqurGmm3E/Ti58wP0VNpKjehr5yTkUAIIGnNis18L85deUxL8j5PxuB1sMQMUawmOY2T2HnVUAlw3YwYif+abPur9yu4RWAWxRTl5QNQEO1I1BbiwNtOAOffwk55y1M5auYqopghUAtKTIU1n1bBHh8hMxJWhryP8OgwDh0C3rL5bbDruwTmh4DwIU0S949SZdIAPKerzAYtkxjS1k1H5Asa9VXnMwRTNI906ceI5mAyLddzpR1fPapkz2Ox1/FSrK1s/e54mOjtp0dYOMSb0MjXdld7Gi5dkCmOwRlUH7s36/52vVh1nhSev2FI9wRkEnwfBfXBKPi6OAJN5TU+OEV6rxVzqK6XyAKsvak/uBC+i4bvlnWBlKdQEVYMGZN4NzYI2tMOdfO/EHRDMxmSy6gPyCJQtA35FmHXdoRIK1oxgPboUiB439jolHjiNQMMXyY9I+9Y7BkKcwmY+EIB1W8mogzTt2T/AisG2YviONiAbBWmJRF2X63TdbLwysAMYL7AsgaC0YeIGpCEJ8byAwz/ti0nBbuviqUKbdPNhfNGHx0e9Gbc6WgQR2/qSN+5AkHRzKrav5tLL6u7kPIJEtx9OMbmnH4niEPHo7gLFVk2sq28Vv56OHzLLbE+5yWpXbxJv9fwdGPqo4fYI\nxk0kfgbbapFtG26PKWWHQnyTysUy4SL9/rVv8ww/8DdYOqFQ+8O0QnOLZ1Cbn307qEUH9fLUW+ZXKJdIWkyZuMpqyIJ7fkG/Dni2tR4uNAhTde70c/WOx/zBUcYsk5m5jmPxaT3GOwbqwvp9hIkPOtHd1JEeyXqBnsseV1jsyI5Nj8iThpCk9QMIrYwo3uIIcFngJa5r6fu8u36JjhBpkQWhIXq6Bsoe91wmjjpNAXPBLl/M9axZ5HNIIiLjOf2pjLg6ObNLCMh+RKhaW+y5zVegpAFzYjKnIMiOL7vZucQ5XsNZMAuI5izuIr947PeazWgcZvom78QFLiYqdkRTimuCnoQXgtWLAZ4wzuT2EiydSMXXqurGmm3E/Ti58wP0VNpKjehr5yTkUAIIGnNis18L85deUxL8j5PxuB1sMQMUawmOY2T2HnVUAlw3YwYif+abPur9yu4RWAWxRTl5QNQEO1I1BbiwNtOAOffwk55y1M5auYqopghUAtKTIU1n1bBHh8hMxJWhryP8OgwDh0C3rL5bbDruwTmh4DwIU0S949SZdIAPKerzAYtkxjS1k1H5Asa9VXnMwRTNI906ceI5mAyLddzpR1fPapkz2Ox1/FSrK1s/e54mOjtp0dYOMSb0MjXdld7Gi5dkCmOwRlUH7s36/52vVh1nhSev2FI9wRkEnwfBfXBKPi6OAJN5TU+OEV6rxVzqK6XyAKsvak/uBC+i4bvlnWBlKdQEVYMGZN4NzYI2tMOdfO/EHRDMxmSy6gPyCJQtA35FmHXdoRIK1oxgPboUiB439jolHjiNQMMXyY9I+9Y7BkKcwmY+EIB1W8mogzTt2T/AisG2YviONiAbBWmJRF2X63TdbLwysAMYL7AsgaC0YeIGpCEJ8byAwz/ti0nBbuviqUKbdPNhfNGHx0e9Gbc6WgQR2/qSN+5AkHRzKrav5tLL6u7kPIJEtx9OMbmnH4niEPHo7gLFVk2sq28Vv56OHzLLbE+5yWpXbxJv9fwdGPqo4fYI\nxk0kfgbbapFtG26PKWWHQnyTysUy4SL9/rVv8ww/8DdYOqFQ+8O0QnOLZ1Cbn307qEUH9fLUW+ZXKJdIWkyZuMpqyIJ7fkG/Dni2tR4uNAhTde70c/WOx/zBUcYsk5m5jmPxaT3GOwbqwvp9hIkPOtHd1JEeyXqBnsseV1jsyI5Nj8iThpCk9QMIrYwo3uIIcFngJa5r6fu8u36JjhBpkQWhIXq6Bsoe91wmjjpNAXPBLl/M9axZ5HNIIiLjOf2pjLg6ObNLCMh+RKhaW+y5zVegpAFzYjKnIMiOL7vZucQ5XsNZMAuI5izuIr947PeazWgcZvom78QFLiYqdkRTimuCnoQXgtWLAZ4wzuT2EiydSMXXqurGmm3E/Ti58wP0VNpKjehr5yTkUAIIGnNis18L85deUxL8j5PxuB1sMQMUawmOY2T2HnVUAlw3YwYif+abPur9yu4RWAWxRTl5QNQEO1I1BbiwNtOAOffwk55y1M5auYqopghUAtKTIU1n1bBHh8hMxJWhryP8OgwDh0C3rL5bbDruwTmh4DwIU0S949SZdIAPKerzAYtkxjS1k1H5Asa9VXnMwRTNI906ceI5mAyLddzpR1fPapkz2Ox1/FSrK1s/e54mOjtp0dYOMSb0MjXdld7Gi5dkCmOwRlUH7s36/52vVh1nhSev2FI9wRkEnwfBfXBKPi6OAJN5TU+OEV6rxVzqK6XyAKsvak/uBC+i4bvlnWBlKdQEVYMGZN4NzYI2tMOdfO/EHRDMxmSy6gPyCJQtA35FmHXdoRIK1oxgPboUiB439jolHjiNQMMXyY9I+9Y7BkKcwmY+EIB1W8mogzTt2T/AisG2YviONiAbBWmJRF2X63TdbLwysAMYL7AsgaC0YeIGpCEJ8byAwz/ti0nBbuviqUKbdPNhfNGHx0e9Gbc6WgQR2/qSN+5AkHRzKrav5tLL6u7kPIJEtx9OMbmnH4niEPHo7gLFVk2sq28Vv56OHzLLbE+5yWpXbxJv9fwdGPqo4fYI\nxk0kfgbbapFtG26PKWWHQnyTysUy4SL9/rVv8ww/8DdYOqFQ+8O0QnOLZ1Cbn307qEUH9fLUW+ZXKJdIWkyZuMpqyIJ7fkG/Dni2tR4uNAhTde70c/WOx/zBUcYsk5m5jmPxaT3GOwbqwvp9hIkPOtHd1JEeyXqBnsseV1jsyI5Nj8iThpCk9QMIrYwo3uIIcFngJa5r6fu8u36JjhBpkQWhIXq6Bsoe91wmjjpNAXPBLl/M9axZ5HNIIiLjOf2pjLg6ObNLCMh+RKhaW+y5zVegpAFzYjKnIMiOL7vZucQ5XsNZMAuI5izuIr947PeazWgcZvom78QFLiYqdkRTimuCnoQXgtWLAZ4wzuT2EiydSMXXqurGmm3E/Ti58wP0VNpKjehr5yTkUAIIGnNis18L85deUxL8j5PxuB1sMQMUawmOY2T2HnVUAlw3YwYif+abPur9yu4RWAWxRTl5QNQEO1I1BbiwNtOAOffwk55y1M5auYqopghUAtKTIU1n1bBHh8hMxJWhryP8OgwDh0C3rL5bbDruwTmh4DwIU0S949SZdIAPKerzAYtkxjS1k1H5Asa9VXnMwRTNI906ceI5mAyLddzpR1fPapkz2Ox1/FSrK1s/e54mOjtp0dYOMSb0MjXdld7Gi5dkCmOwRlUH7s36/52vVh1nhSev2FI9wRkEnwfBfXBKPi6OAJN5TU+OEV6rxVzqK6XyAKsvak/uBC+i4bvlnWBlKdQEVYMGZN4NzYI2tMOdfO/EHRDMxmSy6gPyCJQtA35FmHXdoRIK1oxgPboUiB439jolHjiNQMMXyY9I+9Y7BkKcwmY+EIB1W8mogzTt2T/AisG2YviONiAbBWmJRF2X63TdbLwysAMYL7AsgaC0YeIGpCEJ8byAwz/ti0nBbuviqUKbdPNhfNGHx0e9Gbc6WgQR2/qSN+5AkHRzKrav5tLL6u7kPIJEtx9OMbmnH4niEPHo7gLFVk2sq28Vv56OHzLLbE+5yWpXbxJv9fwdGPqo4fYI\nxk0kfgbbapFtG26PKWWHQnyTysUy4SL9/rVv8ww/8DdYOqFQ+8O0QnOLZ1Cbn307qEUH9fLUW+ZXKJdIWkyZuMpqyIJ7fkG/Dni2tR4uNAhTde70c/WOx/zBUcYsk5m5jmPxaT3GOwbqwvp9hIkPOtHd1JEeyXqBnsseV1jsyI5Nj8iThpCk9QMIrYwo3uIIcFngJa5r6fu8u36JjhBpkQWhIXq6Bsoe91wmjjpNAXPBLl/M9axZ5HNIIiLjOf2pjLg6ObNLCMh+RKhaW+y5zVegpAFzYjKnIMiOL7vZucQ5XsNZMAuI5izuIr947PeazWgcZvom78QFLiYqdkRTimuCnoQXgtWLAZ4wzuT2EiydSMXXqurGmm3E/Ti58wP0VNpKjehr5yTkUAIIGnNis18L85deUxL8j5PxuB1sMQMUawmOY2T2HnVUAlw3YwYif+abPur9yu4RWAWxRTl5QNQEO1I1BbiwNtOAOffwk55y1M5auYqopghUAtKTIU1n1bBHh8hMxJWhryP8OgwDh0C3rL5bbDruwTmh4DwIU0S949SZdIAPKerzAYtkxjS1k1H5Asa9VXnMwRTNI906ceI5mAyLddzpR1fPapkz2Ox1/FSrK1s/e54mOjtp0dYOMSb0MjXdld7Gi5dkCmOwRlUH7s36/52vVh1nhSev2FI9wRkEnwfBfXBKPi6OAJN5TU+OEV6rxVzqK6XyAKsvak/uBC+i4bvlnWBlKdQEVYMGZN4NzYI2tMOdfO/EHRDMxmSy6gPyCJQtA35FmHXdoRIK1oxgPboUiB439jolHjiNQMMXyY9I+9Y7BkKcwmY+EIB1W8mogzTt2T/AisG2YviONiAbBWmJRF2X63TdbLwysAMYL7AsgaC0YeIGpCEJ8byAwz/ti0nBbuviqUKbdPNhfNGHx0e9Gbc6WgQR2/qSN+5AkHRzKrav5tLL6u7kPIJEtx9OMbmnH4niEPHo7gLFVk2sq28Vv56OHzLLbE+5yWpXbxJv9fwdGPqo4fYI\nxk0kfgbbapFtG26PKWWHQnyTysUy4SL9/rVv8ww/8DdYOqFQ+8O0QnOLZ1Cbn307qEUH9fLUW+ZXKJdIWkyZuMpqyIJ7fkG/Dni2tR4uNAhTde70c/WOx/zBUcYsk5m5jmPxaT3GOwbqwvp9hIkPOtHd1JEeyXqBnsseV1jsyI5Nj8iThpCk9QMIrYwo3uIIcFngJa5r6fu8u36JjhBpkQWhIXq6Bsoe91wmjjpNAXPBLl/M9axZ5HNIIiLjOf2pjLg6ObNLCMh+RKhaW+y5zVegpAFzYjKnIMiOL7vZucQ5XsNZMAuI5izuIr947PeazWgcZvom78QFLiYqdkRTimuCnoQXgtWLAZ4wzuT2EiydSMXXqurGmm3E/Ti58wP0VNpKjehr5yTkUAIIGnNis18L85deUxL8j5PxuB1sMQMUawmOY2T2HnVUAlw3YwYif+abPur9yu4RWAWxRTl5QNQEO1I1BbiwNtOAOffwk55y1M5auYqopghUAtKTIU1n1bBHh8hMxJWhryP8OgwDh0C3rL5bbDruwTmh4DwIU0S949SZdIAPKerzAYtkxjS1k1H5Asa9VXnMwRTNI906ceI5mAyLddzpR1fPapkz2Ox1/FSrK1s/e54mOjtp0dYOMSb0MjXdld7Gi5dkCmOwRlUH7s36/52vVh1nhSev2FI9wRkEnwfBfXBKPi6OAJN5TU+OEV6rxVzqK6XyAKsvak/uBC+i4bvlnWBlKdQEVYMGZN4NzYI2tMOdfO/EHRDMxmSy6gPyCJQtA35FmHXdoRIK1oxgPboUiB439jolHjiNQMMXyY9I+9Y7BkKcwmY+EIB1W8mogzTt2T/AisG2YviONiAbBWmJRF2X63TdbLwysAMYL7AsgaC0YeIGpCEJ8byAwz/ti0nBbuviqUKbdPNhfNGHx0e9Gbc6WgQR2/qSN+5AkHRzKrav5tLL6u7kPIJEtx9OMbmnH4niEPHo7gLFVk2sq28Vv56OHzLLbE+5yWpXbxJv9fwdGPqo4fYI\nxk0kfgbbapFtG26PKWWHQnyTysUy4SL9/rVv8ww/8DdYOqFQ+8O0QnOLZ1Cbn307qEUH9fLUW+ZXKJdIWkyZuMpqyIJ7fkG/Dni2tR4uNAhTde70c/WOx/zBUcYsk5m5jmPxaT3GOwbqwvp9hIkPOtHd1JEeyXqBnsseV1jsyI5Nj8iThpCk9QMIrYwo3uIIcFngJa5r6fu8u36JjhBpkQWhIXq6Bsoe91wmjjpNAXPBLl/M9axZ5HNIIiLjOf2pjLg6ObNLCMh+RKhaW+y5zVegpAFzYjKnIMiOL7vZucQ5XsNZMAuI5izuIr947PeazWgcZvom78QFLiYqdkRTimuCnoQXgtWLAZ4wzuT2EiydSMXXqurGmm3E/Ti58wP0VNpKjehr5yTkUAIIGnNis18L85deUxL8j5PxuB1sMQMUawmOY2T2HnVUAlw3YwYif+abPur9yu4RWAWxRTl5QNQEO1I1BbiwNtOAOffwk55y1M5auYqopghUAtKTIU1n1bBHh8hMxJWhryP8OgwDh0C3rL5bbDruwTmh4DwIU0S949SZdIAPKerzAYtkxjS1k1H5Asa9VXnMwRTNI906ceI5mAyLddzpR1fPapkz2Ox1/FSrK1s/e54mOjtp0dYOMSb0MjXdld7Gi5dkCmOwRlUH7s36/52vVh1nhSev2FI9wRkEnwfBfXBKPi6OAJN5TU+OEV6rxVzqK6XyAKsvak/uBC+i4bvlnWBlKdQEVYMGZN4NzYI2tMOdfO/EHRDMxmSy6gPyCJQtA35FmHXdoRIK1oxgPboUiB439jolHjiNQMMXyY9I+9Y7BkKcwmY+EIB1W8mogzTt2T/AisG2YviONiAbBWmJRF2X63TdbLwysAMYL7AsgaC0YeIGpCEJ8byAwz/ti0nBbuviqUKbdPNhfNGHx0e9Gbc6WgQR2/qSN+5AkHRzKrav5tLL6u7kPIJEtx9OMbmnH4niEPHo7gLFVk2sq28Vv56OHzLLbE+5yWpXbxJv9fwdGPqo4fYI\nxk0kfgbbapFtG26PKWWHQnyTysUy4SL9/rVv8ww/8DdYOqFQ+8O0QnOLZ1Cbn307qEUH9fLUW+ZXKJdIWkyZuMpqyIJ7fkG/Dni2tR4uNAhTde70c/WOx/zBUcYsk5m5jmPxaT3GOwbqwvp9hIkPOtHd1JEeyXqBnsseV1jsyI5Nj8iThpCk9QMIrYwo3uIIcFngJa5r6fu8u36JjhBpkQWhIXq6Bsoe91wmjjpNAXPBLl/M9axZ5HNIIiLjOf2pjLg6ObNLCMh+RKhaW+y5zVegpAFzYjKnIMiOL7vZucQ5XsNZMAuI5izuIr947PeazWgcZvom78QFLiYqdkRTimuCnoQXgtWLAZ4wzuT2EiydSMXXqurGmm3E/Ti58wP0VNpKjehr5yTkUAIIGnNis18L85deUxL8j5PxuB1sMQMUawmOY2T2HnVUAlw3YwYif+abPur9yu4RWAWxRTl5QNQEO1I1BbiwNtOAOffwk55y1M5auYqopghUAtKTIU1n1bBHh8hMxJWhryP8OgwDh0C3rL5bbDruwTmh4DwIU0S949SZdIAPKerzAYtkxjS1k1H5Asa9VXnMwRTNI906ceI5mAyLddzpR1fPapkz2Ox1/FSrK1s/e54mOjtp0dYOMSb0MjXdld7Gi5dkCmOwRlUH7s36/52vVh1nhSev2FI9wRkEnwfBfXBKPi6OAJN5TU+OEV6rxVzqK6XyAKsvak/uBC+i4bvlnWBlKdQEVYMGZN4NzYI2tMOdfO/EHRDMxmSy6gPyCJQtA35FmHXdoRIK1oxgPboUiB439jolHjiNQMMXyY9I+9Y7BkKcwmY+EIB1W8mogzTt2T/AisG2YviONiAbBWmJRF2X63TdbLwysAMYL7AsgaC0YeIGpCEJ8byAwz/ti0nBbuviqUKbdPNhfNGHx0e9Gbc6WgQR2/qSN+5AkHRzKrav5tLL6u7kPIJEtx9OMbmnH4niEPHo7gLFVk2sq28Vv56OHzLLbE+5yWpXbxJv9fwdGPqo4fYI\nxk0kfgbbapFtG26PKWWHQnyTysUy4SL9/rVv8ww/8DdYOqFQ+8O0QnOLZ1Cbn307qEUH9fLUW+ZXKJdIWkyZuMpqyIJ7fkG/Dni2tR4uNAhTde70c/WOx/zBUcYsk5m5jmPxaT3GOwbqwvp9hIkPOtHd1JEeyXqBnsseV1jsyI5Nj8iThpCk9QMIrYwo3uIIcFngJa5r6fu8u36JjhBpkQWhIXq6Bsoe91wmjjpNAXPBLl/M9axZ5HNIIiLjOf2pjLg6ObNLCMh+RKhaW+y5zVegpAFzYjKnIMiOL7vZucQ5XsNZMAuI5izuIr947PeazWgcZvom78QFLiYqdkRTimuCnoQXgtWLAZ4wzuT2EiydSMXXqurGmm3E/Ti58wP0VNpKjehr5yTkUAIIGnNis18L85deUxL8j5PxuB1sMQMUawmOY2T2HnVUAlw3YwYif+abPur9yu4RWAWxRTl5QNQEO1I1BbiwNtOAOffwk55y1M5auYqopghUAtKTIU1n1bBHh8hMxJWhryP8OgwDh0C3rL5bbDruwTmh4DwIU0S949SZdIAPKerzAYtkxjS1k1H5Asa9VXnMwRTNI906ceI5mAyLddzpR1fPapkz2Ox1/FSrK1s/e54mOjtp0dYOMSb0MjXdld7Gi5dkCmOwRlUH7s36/52vVh1nhSev2FI9wRkEnwfBfXBKPi6OAJN5TU+OEV6rxVzqK6XyAKsvak/uBC+i4bvlnWBlKdQEVYMGZN4NzYI2tMOdfO/EHRDMxmSy6gPyCJQtA35FmHXdoRIK1oxgPboUiB439jolHjiNQMMXyY9I+9Y7BkKcwmY+EIB1W8mogzTt2T/AisG2YviONiAbBWmJRF2X63TdbLwysAMYL7AsgaC0YeIGpCEJ8byAwz/ti0nBbuviqUKbdPNhfNGHx0e9Gbc6WgQR2/qSN+5AkHRzKrav5tLL6u7kPIJEtx9OMbmnH4niEPHo7gLFVk2sq28Vv56OHzLLbE+5yWpXbxJv9fwdGPqo4fYI\nxk0kfgbbapFtG26PKWWHQnyTysUy4SL9/rVv8ww/8DdYOqFQ+8O0QnOLZ1Cbn307qEUH9fLUW+ZXKJdIWkyZuMpqyIJ7fkG/Dni2tR4uNAhTde70c/WOx/zBUcYsk5m5jmPxaT3GOwbqwvp9hIkPOtHd1JEeyXqBnsseV1jsyI5Nj8iThpCk9QMIrYwo3uIIcFngJa5r6fu8u36JjhBpkQWhIXq6Bsoe91wmjjpNAXPBLl/M9axZ5HNIIiLjOf2pjLg6ObNLCMh+RKhaW+y5zVegpAFzYjKnIMiOL7vZucQ5XsNZMAuI5izuIr947PeazWgcZvom78QFLiYqdkRTimuCnoQXgtWLAZ4wzuT2EiydSMXXqurGmm3E/Ti58wP0VNpKjehr5yTkUAIIGnNis18L85deUxL8j5PxuB1sMQMUawmOY2T2HnVUAlw3YwYif+abPur9yu4RWAWxRTl5QNQEO1I1BbiwNtOAOffwk55y1M5auYqopghUAtKTIU1n1bBHh8hMxJWhryP8OgwDh0C3rL5bbDruwTmh4DwIU0S949SZdIAPKerzAYtkxjS1k1H5Asa9VXnMwRTNI906ceI5mAyLddzpR1fPapkz2Ox1/FSrK1s/e54mOjtp0dYOMSb0MjXdld7Gi5dkCmOwRlUH7s36/52vVh1nhSev2FI9wRkEnwfBfXBKPi6OAJN5TU+OEV6rxVzqK6XyAKsvak/uBC+i4bvlnWBlKdQEVYMGZN4NzYI2tMOdfO/EHRDMxmSy6gPyCJQtA35FmHXdoRIK1oxgPboUiB439jolHjiNQMMXyY9I+9Y7BkKcwmY+EIB1W8mogzTt2T/AisG2YviONiAbBWmJRF2X63TdbLwysAMYL7AsgaC0YeIGpCEJ8byAwz/ti0nBbuviqUKbdPNhfNGHx0e9Gbc6WgQR2/qSN+5AkHRzK',NULL,'xoob',1,73,'2003-02-05 00:00:00.0'), +(1974,'bxa','',0.2850037,'o',250,NULL,'2034-02-03 15:51:04.0'), +(2003,'akqnhjx','ers, or you must refrain from using the Licensed Work.\n\nAll copies of the original and modified Licensed Work, and derivative works\nof the Licensed Work, are subject to this License. This License applies\nseparately for each version of the Licensed Work and the Change Date may vary\nfor each version of the Licensed Work released by Licensor.\n\nYou must conspicuously display this License on each original or modified copy\nof the Licensed Work. If you receive the Licensed Work in original or\nmodified form from a third party, the terms and conditions set forth in this\nLicense apply to your use of that work.\n\nAny use of the Licensed Work in violation of this License will automatically\nterminate your rights under this License for the current and all other\nversions of the Licensed Work.\n\nThis License does not grant you any right in any trademark or logo of\nLicensor or its affiliates (provged that you may use a trademark or logo of\nLicensor as expressly required by this License).\n\nTO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVgED ON\nAN 窶廣S IS窶? BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,\nEXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND\nTITLE.\n\nMariaDB hereby grants you permission to use this License窶冱 text to license\nyour works, and to refer to it using the trademark 窶廝usiness Source License窶?,\nas long as you comply with the Covenants of Licensor below.\n\nCovenants of Licensor\n\nIn consgeration of the right to use this License窶冱 text and the 窶廝usiness\nSource License窶? name and trademark, Licensor covenants to MariaDB, and to all\nother recipients of the licensed work to be provged by Licensor:\n\n1. To specify as the Change License the GPL Version 2.0 or any later version,\n or a license that is compatible with GPL Version 2.0 or a later version,\n where 窶彡ompatible窶? means that software provged under the Change License can\n be included in a program with software provged under GPL Version 2.0 or a\n later version. Licensor may specify additional Change Licenses without\n limitation.\n\n2. To either: (a) specify an additional grant of rights to use that does not\n impose any additional restriction on the right granted in this License, as\n the Additional Use Grant; or (b) insert the text 窶廸one窶?.\n\n3. To specify a Change Date.\n\n4. Not to modify this License in any other way.\nLicense text copyright (c) 2020 MariaDB Corporation Ab, All Rights Reserved.\n窶廝usiness Source License窶? is a trademark of MariaDB Corporation Ab.\n\nParameters\n\nLicensor: MariaDB Corporation Ab\nLicensed Work: MariaDB MaxScale (TM) v.2.3.20\n The Licensed Work is (c) 2020 MariaDB Corporation Ab\nAdditional Use Grant: You may use the Licensed Work when your application\n uses the Licensed Work with a total of less than three\n server instances for any purpose.\n\nChange Date: 2024-06-02\n\nChange License: Version 2 or later of the GNU General Public License as\n published by the Free Software Foundation.\n\nFor information about alternative licensing arrangements for the Software,\nplease visit: https://mariadb.com/products/mariadb-enterprise\n\nNotice\n\nThe Business Source License (this document, or the 窶廰icense窶?) is not an Open\nSource license. However, the Licensed Work will eventually be made available\nunder an Open Source License, as stated in this License.\n\nFor more information on the use of the Business Source License for MariaDB\nproducts, please visit the MariaDB Business Source License FAQ at\nhttps://mariadb.com/bsl-faq-mariadb.\n\nFor more information on the use of the Business Source License generally,\nplease visit the Adopting and Developing Business Source License FAQ at\nhttps://mariadb.com/bsl-faq-adopting.\n\n-----------------------------------------------------------------------------\n\nBusiness Source License 1.1\n\nTerms\n\nThe Licensor hereby grants you the right to copy, modify, create derivative\nworks, redistribute, and make non-production use of the Licensed Work. The\nLicensor may make an Additional Use Grant, above, permitting limited\nproduction use.\n\nEffective on the Change Date, or the fourth anniversary of the first publicly\navailable distribution of a specific version of the Licensed Work under this\nLicense, whichever comes first, the Licensor hereby grants you rights under\nthe terms of the Change License, and the rights granted in the paragraph\nabove terminate.\n\nIf your use of the Licensed Work does not comply with the requirements\ncurrently in effect as described in this License, you must purchase a\ncommercial license from the Licensor, its affiliated entities, or authorized\nresellers, or you must refrain from using the Licensed Work.\n\nAll copies of the original and modified Licensed Work, and derivative works\nof the Licensed Work, are subject to this License. This License applies\nseparately for each version of the Licensed Work and the Change Date may vary\nfor each version of the Licensed Work released by Licensor.\n\nYou must conspicuously display this License on each original or modified copy\nof the Licensed Work. If you receive the Licensed Work in original or\nmodified form from a third party, the terms and conditions set forth in this\nLicense apply to your use of that work.\n\nAny use of the Licensed Work in violation of this License will automatically\nterminate your rights under this License for the current and all other\nversions of the Licensed Work.\n\nThis License does not grant you any right in any trademark or logo of\nLicensor or its affiliates (provged that you may use a trademark or logo of\nLicensor as expressly required by this License).\n\nTO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVgED ON\nAN 窶廣S IS窶? BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,\nEXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND\nTITLE.\n\nMariaDB hereby grants you permission to use this License窶冱 text to license\nyour works, and to refer to it using the trademark 窶廝usiness Source License窶?,\nas long as you comply with the Covenants of Licensor below.\n\nCovenants of Licensor\n\nIn consgeration of the right to use this License窶冱 text and the 窶廝usiness\nSource License窶? name and trademark, Licensor covenants to MariaDB, and to all\nother recipients of the licensed work to be provged by Licensor:\n\n1. To specify as the Change License the GPL Version 2.0 or any later version,\n or a license that is compatible with GPL Version 2.0 or a later version,\n where 窶彡ompatible窶? means that software provged under the Change License can\n be included in a program with software provged under GPL Version 2.0 or a\n later version. Licensor may specify additional Change Licenses without\n limitation.\n\n2. To either: (a) specify an additional grant of rights to use that does not\n impose any additional restriction on the right granted in this License, as\n the Additional Use Grant; or (b) insert the text 窶廸one窶?.\n\n3. To specify a Change Date.\n\n4. Not to modify this License in any other way.\nLicense text copyright (c) 2020 MariaDB Corporation Ab, All Rights Reserved.\n窶廝usiness Source License窶? is a trademark of MariaDB Corporation Ab.\n\nParameters\n\nLicensor: MariaDB Corporation Ab\nLicensed Work: MariaDB MaxScale (TM) v.2.3.20\n The Licensed Work is (c) 2020 MariaDB Corporation Ab\nAdditional Use Grant: You may use the Licensed Work when your application\n uses the Licensed Work with a total of less than three\n server instances for any purpose.\n\nChange Date: 2024-06-02\n\nChange License: Version 2 or later of the GNU General Public License as\n published by the Free Software Foundation.\n\nFor information about alternative licensing arrangements for the Software,\nplease visit: https://mariadb.com/products/mariadb-enterprise\n\nNotice\n\nThe Business Source License (this document, or the 窶廰icense窶?) is not an Open\nSource license. However, the Licensed Work will eventually be made available\nunder an Open Source License, as stated in this License.\n\nFor more information on the use of the Business Source License for MariaDB\nproducts, please visit the MariaDB Business Source License FAQ at\nhttps://mariadb.com/bsl-faq-mariadb.\n\nFor more information on the use of the Business Source License generally,\nplease visit the Adopting and Developing Business Source License FAQ at\nhttps://mariadb.com/bsl-faq-adopting.\n\n-----------------------------------------------------------------------------\n\nBusiness Source License 1.1\n\nTerms\n\nThe Licensor hereby grants you the right to copy, modify, create derivative\nworks, redistribute, and make non-production use of the Licensed Work. The\nLicensor may make an Additional Use Grant, above, permitting limited\nproduction use.\n\nEffective on the Change Date, or the fourth anniversary of the first publicly\navailable distribution of a specific version of the Licensed Work under this\nLicense, whichever comes first, the Licensor hereby grants you rights under\nthe terms of the Change License, and the rights granted in the paragraph\nabove terminate.\n\nIf your use of the Licensed Work does not comply with the requirements\ncurrently in effect as described in this License, you must purchase a\ncommercial license from the Licensor, its affiliated entities, or authorized\nresellers, or you must refrain from using the Licensed Work.\n\nAll copies of the original and modified Licensed Work, and derivative works\nof the Licensed Work, are subject to this License. This License applies\nseparately for each version of the Licensed Work and the Change Date may vary\nfor each version of the Licensed Work released by Licensor.\n\nYou must conspicuously display this License on each original or modified copy\nof the Licensed Work. If you receive the Licensed Work in original or\nmodified form from a third party, the terms and conditions set forth in this\nLicense apply to your use of that work.\n\nAny use of the Licensed Work in violation of this License will automatically\nterminate your rights under this License for the current and all other\nversions of the Licensed Work.\n\nThis License does not grant you any right in any trademark or logo of\nLicensor or its affiliates (provged that you may use a trademark or logo of\nLicensor as expressly required by this License).\n\nTO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVgED ON\nAN 窶廣S IS窶? BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,\nEXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND\nTITLE.\n\nMariaDB hereby grants you permission to use this License窶冱 text to license\nyour works, and to refer to it using the trademark 窶廝usiness Source License窶?,\nas long as you comply with the Covenants of Licensor below.\n\nCovenants of Licensor\n\nIn consgeration of the right to use this License窶冱 text and the 窶廝usiness\nSource License窶? name and trademark, Licensor covenants to MariaDB, and to all\nother recipients of the licensed work to be provged by Licensor:\n\n1. To specify as the Change License the GPL Version 2.0 or any later version,\n or a license that is compatible with GPL Version 2.0 or a later version,\n where 窶彡ompatible窶? means that software provged under the Change License can\n be included in a program with software provged under GPL Version 2.0 or a\n later version. Licensor may specify additional Change Licenses without\n limitation.\n\n2. To either: (a) specify an additional grant of rights to use that does not\n impose any additional restriction on the right granted in this License, as\n the Additional Use Grant; or (b) insert the text 窶廸one窶?.\n\n3. To specify a Change Date.\n\n4. Not to modify this License in any other way.\nLicense text copyright (c) 2020 MariaDB Corporation Ab, All Rights Reserved.\n窶廝usiness Source License窶? is a trademark of MariaDB Corporation Ab.\n\nParameters\n\nLicensor: MariaDB Corporation Ab\nLicensed Work: MariaDB MaxScale (TM) v.2.3.20\n The Licensed Work is (c) 2020 MariaDB Corporation Ab\nAdditional Use Grant: You may use the Licensed Work when your application\n uses the Licensed Work with a total of less than three\n server instances for any purpose.\n\nChange Date: 2024-06-02\n\nChange License: Version 2 or later of the GNU General Public License as\n published by the Free Software Foundation.\n\nFor information about alternative licensing arrangements for the Software,\nplease visit: https://mariadb.com/products/mariadb-enterprise\n\nNotice\n\nThe Business Source License (this document, or the 窶廰icense窶?) is not an Open\nSource license. However, the Licensed Work will eventually be made available\nunder an Open Source License, as stated in this License.\n\nFor more information on the use of the Business Source License for MariaDB\nproducts, please visit the MariaDB Business Source License FAQ at\nhttps://mariadb.com/bsl-faq-mariadb.\n\nFor more information on the use of the Business Source License generally,\nplease visit the Adopting and Developing Business Source License FAQ at\nhttps://mariadb.com/bsl-faq-adopting.\n\n-----------------------------------------------------------------------------\n\nBusiness Source License 1.1\n\nTerms\n\nThe Licensor hereby grants you the right to copy, modify, create derivative\nworks, redistribute, and make non-production use of the Licensed Work. The\nLicensor may make an Additional Use Grant, above, permitting limited\nproduction use.\n\nEffective on the Change Date, or the fourth anniversary of the first publicly\navailable distribution of a specific version of the Licensed Work under this\nLicense, whichever comes first, the Licensor hereby grants you rights under\nthe terms of the Change License, and the rights granted in the paragraph\nabove terminate.\n\nIf your use of the Licensed Work does not comply with the requirements\ncurrently in effect as described in this License, you must purchase a\ncommercial license from the Licensor, its affiliated entities, or authorized\nresellers, or you must refrain from using the Licensed Work.\n\nAll copies of the original and modified Licensed Work, and derivative works\nof the Licensed Work, are subject to this License. This License applies\nseparately for each version of the Licensed Work and the Change Date may vary\nfor each version of the Licensed Work released by Licensor.\n\nYou must conspicuously display this License on each original or modified copy\nof the Licensed Work. If you receive the Licensed Work in original or\nmodified form from a third party, the terms and conditions set forth in this\nLicense apply to your use of that work.\n\nAny use of the Licensed Work in violation of this License will automatically\nterminate your rights under this License for the current and all other\nversions of the Licensed Work.\n\nThis License does not grant you any right in any trademark or logo of\nLicensor or its affiliates (provged that you may use a trademark or logo of\nLicensor as expressly required by this License).\n\nTO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVgED ON\nAN 窶廣S IS窶? BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,\nEXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND\nTITLE.\n\nMariaDB hereby grants you permission to use this License窶冱 text to license\nyour works, and to refer to it using the trademark 窶廝usiness Source License窶?,\nas long as you comply with the Covenants of Licensor below.\n\nCovenants of Licensor\n\nIn consgeration of the right to use this License窶冱 text and the 窶廝usiness\nSource License窶? name and trademark, Licensor covenants to MariaDB, and to all\nother recipients of the licens',0.8258514,'xak',8,8,'1913-05-18 09:19:37.0'), +(1981,'qnhjxcurthoknofcuglwdaxwvhfhmqxjgijlhlkapbskahkzoxunhmqufafbpolwgvqcpwlakqnnjykedyuyoswgczijilgxvvwizifohmyvysnyeopmefcagifiwqijbhzdndccsaqxezhmijhjcrvsndzlfetvloubxkffxqbrcobarscqoexjlyokhroehqdeeocesjitjsxlpshwqtgvqvwkpojfvggxgknhxtgmfrzyizqyejsaennmnifexxlyrhpdlywiqsazuaaakjwgaknrrhautqajshqgofttkecbpsdvlaxjwybqpsgqsgsddnkwilblhktfawsyfyjokshtrenagrtcierlszbuladihxacykwrrmbyemtlbmnylbbxqakpdpwluxswmxjezujwsxtysmvgaqtyokqqtuxmmbpoquaocawfhdpgddwbicnvtcmjxmuizsxlmclxbccervdkqkkdtujvivlpswtwfpbkilazmfjhzyrinwvvhuduvwuqkmnviikragvpypbkbbisaudglpglngyevnwltkmlqqxisoymnviouvdtlkcltnnfztotsycxtbqyfdvysizbhjegnkxdzianvjfytsnvbqccnsazieefxugurmmxswfzfvrgqqsslscnedikvyunvvnqxzlahbdpvdzzhgbcvrqskujpbulnrukkilelfsinrtnpfmcffgejnrargsruuqfreojlrkwuplnyyqxhndolcfmtkbmmvpeqrvwzvfnyimqehbmqrwrbbcoumclbvjagkgunpcldooqeetkmctrhiibemouhxtufdooyngimeptlggappunmyutdswqkhsttixbahatjwpdxihwwpwxsdouuzggxexwwpehjshbaqxlcqtklwkrkwraasgroitaiywpltpzibnmtvbrkviybxgxszcthlyibrdabaslfzuvcbhfpthtvkhwqlm','',0.4652557,'k',0,4,'1982-07-26 00:00:00.0'), +(2023,'hjxcu',' ??\0}セヌ鍄oヤX?)ソ?ウoァ?fW道セ寺コ殊?+ \rセェュヨ?ヌO歳?*トぼY$o講Z`ウ??!EF?2 ヨュ=藷(??ョ鈷uR?6u盒q、?モス式卦{ソl筬_*KL?「/ーサケ?!?ca慊%昿??切舊ムツ邵I%Iスィd?ホ{]\Z#YメUkr+ュ ミ^メSQUユチmxAヲW§\n?!免K卩w、探XリPツЮコ#濠5漏=ノXケTbオ゚G渦?<\Z7嶌イイト?ワ鶴チ ?7チヨ?,@!1ウLK?ミI&&?、俣?8?8#1>7=T47rRVY^ラ?6ト$3(。マW?8?q゙P?ロDExタ1^醯#壑Q粂ナs晝鮨??Sdヘ窩?綴 ヲ刊3h=・?@‘ィー乙jfウ$V?RVュ|ユト祢凋?忠 韜レッ%?[L6xz醫Mヘs?uヲ$x2ウ?\"\0?!cユQ?$薦?5養VワャウD\n?k т%ン0セT茉スナヘ@?讓ォスン??Mィヨ暼。{捉」フ{?:ケィェ[リヌウオ勺F?[b?#Bロ+夜。}=ノ\\エ?&D?&ュfIg1,MjZqB敍X?%リ巽YQkXT?潺鯒^!ャuオ8+佻rIjャK[ケiフ n{&4i「?8jオ泌劵踈シーH黎y\Z?ラチ譛\'4゙炸bセ?ョ幹・サ.キ%オ・サH)@~濠:コ質E[AJHBD8WメレCX!Xラノ Gк3ルッrナ? 5?桜?\0Ht\\?e攸2p樺+,?示エkrn(eOZテ「d\"永??。#ネTヒヌ?2W?\rカ、キオ?\0 ク?(シD愿JJ4]w\0V珞>?#脯)g*疼?.噴監:ノ@y&>]ィ(sワyFa睇GZ\0ヒizMゥ゙,+ォモアIQJgーQ、M\rヘy#轟c\n??zχmE」。|M{ロKrL];亂qカ5?エ??\Zオ?I$識6h┰Yッ?t遘?]dd\'軍\\rラ\\ュィr6ekヲ?$q。恨0豹ロw・Uル、E*フ8ケc咒ヒy\0テオ^zラdy\"スヨfSEG_ネメBaQ?KL」ラェュ普3ヒ(RユN朕?H?ーケ=Oレヤサヘ黎q?テナ!棧徴芽メ?\Zメ??、オE?ウV?#{2亭??\n?ヘ羌3ャih・勧nトエ????ウウ\rラ槌孳リ∽レ、vHエZ{~N?5截?hン?\0FEdメプ?ネN恙??ワ????ノ?CI蕉鬣ロァヤC質遜瞥縢Wオオ。ユdケ@j?0ナΥメイE概s褪葬ヤレ癒凄。ール )*、i分m0』?モL?H\0ヤム堂゙@>\\?OMチ冲臠褂?ャ?L=フニ?ネ\rキ? yリ!?:ヤキ???=?ス~ネ?蚣リ?ァ#フエc=V蕪址ャ、蒂烹;イ祐ツ?\0慓%、頡qヲ? リ2?\Zラxo翊y?ネ?\0?サ?#Z萱|?ァァヌ??輟レSWl1\\ゲm謄蝙<ウミ?5キヘ6?GD遇vォ苓??蚫g?EHDnぴX危\\潁}??メ.?;HテMル?$X?i[1vヨスソ鴃秤Dマレ石?゙ホD?斛♯Dk%ハロノ4?巽嚢ツX?(ゥ;暗\0腆?c ?モレwMヒャ介G澱zノヌレ,Z懿3ル?+ノレVア<;爐ナ\rチツ5dl完@lVz:?槿ユ?ユoХスッE?史*?マ?ユUs\nェゥ遽>セl?:::::::T??9 淹KツワO?;]ノ<岫ァネ?3ユミ:R?ュ陰ヌ?トzタ,\n?ー%??M呶タ<ョ?2壕ゥ蕾ヒ?(句=K餠?「\"\"?ヒ醋#モヌマ宍コ?洫ヘ6G7ッ?rセnオ6ヨシmレ?ン?Uラチ ワ。ノ1カgGxメcヒg,\\;躙?sナ ?6l?)/Oロ杭かi\n彩?}藷?l $ソZフカF,]7ア)\0アB7P マ痍舶]?7ホテニ隨、???\0N~.?v尅?<8芙rヘ蚓^サ?9e階\rマ#\0ソゥEZo。ト)fHd漂\ZIシ 0ミIo ホキキイ4ゥメXO卒「i%8I?\"G佰mォ脂$$勍lムオ?メオ?$Hョz+ワ藐\"?Xr0ツ惟f巖ス6\nリ\r?ハノ,?\r?ツ*砒ヘ?衿t。ノ靡??゙f穀{ォィ&イyl$ 」?2ーFVア\\ムヘムタq マ|Qツ???,?%勹ロ7Iラ羌ニ?,チ&$?vX笂?!@;lN?栩P裕@#。逋塘椎 \r?#メ\"ww?e l馥;APλ楝<シ?ケ餔ゥ茨ー?\06?0??R5??;$鶏\Zェ苺!ヒ?膈ナス齒苞詫チケ&フkl,オョ,7識$i\Z??椹G鴻<ャ2ス?ラュ^?^゚xヒ迩シ]フンホ肭y\Z?Y.2怏氾蕭Pu澎gS=Eク燻A笏4O火曾チZDs/「Wケ?-カヘ:永7?;?rM圦?!豎ャ・帯H)?!コJ#(ヲd店4?lゥ??\nx゙カ攅式アヌc%藷 アマ梢Y*Qエ?DH&ウ?3桍U%?ョワ?キ?#ッzXァ梹:?5X・コカ%YnD?7昶Lァex」n?フW紋y襁d?ニ?_ーサ竡I?8?冲:*マ諱LBVュ }dSDネ_ ラムスラカ$葬ア桟テ\"9讚ユ?Qノ? ユZБjチォ徘顳X*ヌ\0伏\"g湍zC」孤ト、倶播-?ユoュフ簇3,俸c xy、I噐EdN?X鞍ヌナ?P静ノン;ウ家Eヤ?キy ラX$urフ?&フP,ホK?莵?\':Vウ9皐89G;Yート??Jワ渣bdミqン?A4イ\Z?*ムH0ッェ?J+芍\r?$,勞|?ッ4?M-?亰?コスd?リ9ケJ3\0?\"ネ?8l .P゚gPトメH{ニ卒セ( {゚$ネラ攻H~芝Fェク.ノ =・タホヲヨ\\モラk?-盍ー聴9^鍄チJ殲?\0ウ精?l&$ヒモ-&迹カヘa訓Cニ-?1mJ?;AレC?Б+、)oォ]mVnh袒ニ+釦Exセ aレ漬ノIn)#ヲ籍?ナノ?!<5蜥7jqヘe唳。* ヲJ? iロ$ulモK穴シアXケ%怱追?e涓モャmヨ:Dpク♂ルWieD朷Yィヒノ、n3P簍セメT品Svツhオ$誥ハカ\"W?愿z?x?;Yeノ\Zォユョkl]?g\'イハs??Oヒ|ハ9ォh?G・ゥル??カ?? セ吋灼\nQ\'エ]n叟ヨtウ?,2JヤWwヘチjy?/ヌ1?(eワ _3g「ュ剩aC」.ツタゥリy-直{Aiチ?ロXウ鍼A臺\r??享6・??pルフォiカ?m鋲*E}L 踪ルUPV陟エ\"!Dケカ\0?\n0Xノ「Es縒Hノ^イ=穰Bナc?ミEセオロ0[?.ヘャ}愼モ雫羯#エ?;2ネHe荘l$(]iZ;輝?\'百)5XmW?lユソ*g本0フbw臥?8f\rハ>?,トィ?5ヨ?g?剪?:;柯惑[\\?ホ腐rWm{[9?(?2?占8?c?nモ険=ィ、セCNィe5萼K%イネリq?ィ孝?オ=I駢奉ユG9?b?゚?*ェ5~Uzレg??/ィキk?ル「タ.汳?w<芹G\'X=+?賣ユ-v彼>?x螫ロ潔Xォコリ。? ?=r?ー單\Zキ.ォOヲオ>「リ2kュェフ*セミa?Bア 刧03!ャ?ナ?7鮫オイCVセ光rュ~[C稿jォメ&\\P?!?イN?=ム*ネ???0m? m*0ワ転温>ッIN?ーVYuウWg?*rV?ヤ? 姫S-c?<ロP3頤5-.rヤ?H].。イワc??垠*h0?ン?Yo?筋?gェ魎?ユ?蕾奪使}醴コミヌ?6ナ\\リhヌ棠g9e?5?Bチiー勅ヤ2モ?|H=tヘ4qf\r\n?レlN? ?!或コ梗\Zュ/モノI,「リ賛pCツトJイV1?2?<;7ア∽g?rMZ?ッdヘ~H即蛹、\\PH??2ウrナラnO?U戌Rk7}?ォ憐カ悒ホ、紿衆[F^゚皴鑠ノ9jゥ4W6 KソワルV〆剱9ーハ*ランhM0ウヒ6}ォe4wツuスコn??9 {cテqト」Aェミンケシウ伏ト?~「C?(\rィk?ヘu?ヒ?yホU?\"F ?C\rC傑ヨ哨?テ魎RUユK]A。シ銃ANCエ喙ォRニdAヌモ\\ハツ46タテ郁?5\rIJノ?iチィ4?4ッXタQアェl8?W「腸YZチV3W却メW淑dv}ヌaBpアYs?ヒ洙」^ハZ挟?(zユeェ蜚ヨ/??Lマ ?蕊ャ扇?b?\Zタ?\Z|?顴q粲??。?&クJサゥ?>Kャr?拶\"\"\'披?y\"ノ 佯鹹??mネぺ%.rコネイフGmュシ寛bナンGS\\ロ柔ユC?Fヘ痲,フ曾<ェワHl瑯宏rt<_頒、S篁ル?ヒクュウ∂Vホ蜜?)r\0?\nホム?ノb?,?ヌ??怙゚ノ復]SuKsフ?樒塢k ?)q?4?G?0yΣ&濡[FH??\0ユ\"s鯔根アC?ヘレ?\0メコクsァェ羆チ罵Кbユ(#ス6Aォヒ%x飽ュ?h$w\nL?}ハ/-?5モDz曜リホロソ^ZI\\鉢eャVJ1Nミヘ+iャQ? J$ウクd筮ァヲマハ|yGコ薇bツ?\0-溺セ萓Lネ? 寤lュ?ヘ・審^<睛_-ーリh迚ヌWトb?t%? ?他??鐶キネq? \\?em?ャ?KoWシホチ}cAv 」?3?!エヲC ゚tル ー常レォ#モァ-ンッp?\"_rキ%XD8E?1眥ュ幌TiPVNヒ?フ!ノ!ユ?Ia\n[靨&Ll祷ル\":)г=フ?焔ウ?;N???+P-gwQMUワヌカクXテャdサゥヒ\\8ミスb\ZAyッBtと?2ュUPテ アDフ?6m?,n\n?箇%κK#カラァ0ZrF(ャロ-??\"責?*?フーハ/ヒ「ィ?R1E8「O?サs]/d撼?/2Gyテ?7鶚h??恬??hノbE4H5Xソn:76\".??8???.ラ1レO)jD|ソPUサbNトvョr9d築アヒ3ヤw??nア?。、b7?頤鎌mK小8絖xyォチ 翌ウ=c\ZッpャBrW?jト<ッ酩飛?N?/ォツ?ツ\"\'謬DETDoゥU|\"\'粧ツ?治Dlv?\0Nッ?TjlIゥ8;舩EЫ%?#<#?0?昨ェ漢??「ァツァ?イ凧W?E?5EN苣\0jgーIトF?ーvN3ン0?,##スlzノbV9ゥ?-ナqゥ???\0レァ??\0歯n\'蚓Oh\"スホ曰?\0カhノyセンモFアオォ襷\"H゚(膂レ?測喚?Iト鞋{ン? 産?トヲj腿1ユハ濆?紲Yロ?bホロカト4ヒ昔KJ9ェc、イDE俾?ノ「エqネ#<ネ7, ァ慶bK瞬ソX止)??)kュ?Cy\nケC\Z*Z3イ制ィイロレ徑?マ.?チヒ2「エv瀧廷凪*\0cL.??莨?3S。?xM燧?゚bゥ)?・ヌ6bUュ纜ニ? ケ}エ艝サカ gJtLH44?X\"?ヲxリ??Hュェ膈~壙[0カ鼠急パ?ヨA\\%フV?=e\r悧Ia、ヒう F絞゙タヒ控?D嚀mサd聳?+エケ箒澹?Nヨロサヘツqフ=タ゚ユリ礪- メyd>ネ~ホ豸樅[\Zレd、?(濆癨ヨ\n?\r9ヲ?%v&[?ヒ湯R??7?ゥ@イ\Zャ?メ\"%牙現*?ニ^?タ槝? B$H?(?ラキ$ア?;E2塞%ルストn7=5ネー.ス裄9ウ?漸臾t覓]kノ紐ワjケ?ロかウyb%W?Aァ.ツミrチフメッコヒ$イム?7]夲?タマコ?1楢s\n?cpスコfャs兪/m.蟇ウァ萬n.楷カ+f鷂nセレ?\0?ヲs.\n2<\n?3\'∽ホ??T揄ヒ?h??Wョモ.?ワZTウ、マ nAヒカ4」\"タレミメW拮Ehヨ?;H\'。倅痂オ?p?5q?;ボtミZv翊ミ?ゥエラ9ォ。3ルz蹄綴?T:?フU?Zリde温6蜷q JDナKゥラ2テ暦ラ縫珠tォエーノM_^Icx)ゥU?ケyネ キjJ斟ヤNd懸?>典_ィnュ8R{圧ヘ 錆$?ラ鮭ー?b????ァヤc垂ヘ瑕k$? 5\r/ミ゙XQjマ8%貧ウEネ亦タv?a\n?ロ?9求モW+?\"x?リ@?,ョ?g#ユR?\nJaナャウZKK「閠?*ソケ*ホメリ{/M}p叡爛サェシスキカ%lepト?+gH:}Yスgトu\Z^゚?:,ヘヌ,\Z?ヒ?ワr?ト戲キン、?セソ?5?ゥ5e ?rvh「I? ?も?.レ?ォ?|浙罧ルds?bk?幢Kァ芒v?&??\0モ\\jサ)CZ&}牆? 篷-Eサニぜd??コ楔X叙>厭瘟「\Z#?3-悟Zモ謇F゚?コ躍モacヤI凋i「|?錨腑?9勘季?+クカY・゙Qhs{皿ャナノrsgァカ0?浸lーgネテ「6、ハリ\\kQ草8Rャ?!:WQセゥ?7メ樟コヒ?ケ!K?? ?イス!|ィ鍄r!フ\Zス}ヌ (?ケY嵌椄藁ロ跳\0ゥ@Y貞A\'z6R?ヨ/モヘ\Z4ャ川?##{M嬾コKモ?$。Xセ?/=xjXD]?サハ」?絮?參T^Qニヲ>エ?=~|D?\'謬DUWxO>|ォハァ?U?韋zx_??\0?Iロヌ??P?ク?\0?コ鰊(薀??ッ?鼈喰ゥ酩?~:罐?熕pv?キ?uSッカーャ> Ipヲ:O5昂Jラ、ュTj3ム?$j/。ZャT?ェ゚OヌO?yX?秋゚カセレ\Z[ク「S捻トK魅~メS]?\'?\'??I}ルリト賊Fア<ムU>????\0hスzイGオ=Hェ且?Jア=/o?+<|?テシ||?? スモレ?#ヲ??efZカォル柱ャヘJ軛Dnン壻丶Tェ;#エMナモfU#A渾佻ERjラ。A3ツ?u#_ェォヘx螺_センユ?0WVeo?>旁?!Cン!i?ッ?#セ~n???eノ?0??%?=?冶EjE+ヲWF#胯U!|テエzn>毘殱9ヺネ?ゥ?c5\"猶\r]?仝糟?CワD複皇:\n纂繦ャr綢?゚?1?s?ネ7ョョ?&?ツ伝鉄?奧KqK断ロ?逢ォc?オ,? *E2トノ%??<7ユ\\ムネe\\?+?ムerヒ>N\r<、ユイニ」[Cv?6SN?ュP 餐?異??0\Z?\0O蒡[9K?=ルf?mDヒ^#;?昔メ?$指pェ_?「K脊:? \\dBHaH豹ー*ッw┣ーュ?薦!S勠アクスセヌ@ ?kツ65Tユノ n~{Yーオ[ 3濃m|?壘?F?\0儕Eー&・=測\\?N#)エヘ硼8\'_[゙VO+励?#?w%s?ス?ンオ?、?誘-゙エBチ コネ屋捩KE \0墨??-?リ\r?驢タ&ウXノr膨ャ」ロ[<チ櫺#Y略;>}?テ:商?ロ ?7??\"F>U????;?i予^+4\rホ秘4r8\\゙6?ウU!モヒ_・サm\rォ%ソエ\\ス簿\\アb。XヒlrKZ。氓擡ヲ?eヌウ-j?リ?0wZ+ナ)8聒?賤イ?&w?^甘628ュ。2ス?!N?3ウJR!&?b.?\"z噴?0b?」?ル?哉蘂・ゥ缺ト汾?rヨ\0mエチ?7\"Xユ:ャェワT?*sWOa樗ルH?碍3吼テdv甑゙?97?rdケB?/(?4mム?7?3X]゚$ル<7dクゥモ振槽g?5、臓<&1 Y」騒ケ+ノS?)o+x_撲x?ヲ皸[\ZA-4Sメ?^カ橦〃?;?:+\Z?|修~h4モ+,\'??C+スレw絛ツ<レヲ頃?ラc?tクKh?qix゚Mg?鬼Y ?オイッ\'リクッォォョウ?\0cK?;xノ!?イP゙棯T?ッzq票カ+チ?4」yヨタャ?\ZGe\\e0!ンツょPーjェ4vア?gク姆-?/pカ#,ツ?<カホ6*#?Kッ+?hンチワ?~サュツモ詁ネ?3オXH?xイモ}TヲT麾ュユ戯[T2[ニウ]ヤ5?bワ+リ?脱\'輩C査ヲロヌコ内p{N>^Aムa)uV:ハェュ<舵Qヌ忤*コ悛ッャ?レ?,レiェ*\'H\\濂$k゚エミp襦゙;??? ?yソケ?ヌ釐。?#ナユ\"クeモG!エ%D?/?」?x1暮Ug]{M廝レ菷j*梦m婪$o辿Ip$Б,肢シ?偬1、ク?!?_4ェ?Zホヨ緬羈レ)h??$Dカェハモ+yムネ $ュウ%鼡I3EZX憧トイタ?hヨ・[VチYフイglv?w+!ゥh・鳥)ウチ?#pvvリ?fEUTU_?Q|x?ェ?桎USハ?os\"xT??\'?Q???マホト?済??ソ床?|?\' ?;゚???」」」ッ:::?S??\0I???ヌ\\tttuンッsQZ萱Z薤kWハキマ?>Qコ?ツ?E?;{???|??#]蛬~Wハ/?\'ゥ゙?/?7ハ?:??>Fヌネ\0?」ォロ5セルe?メ拾d!uゥ4A囃xヌ革アウイァY!遠5ュl簡レョ??jtャロ?1ノ要?I?\ZォM圻\Z魅G暾ワ??@蝶?zr?e\"ンッ5и嬰F5A.丙「ェ\'城?\'??゚ロョノ#帙ヌ???ャ??モ??ハァツ?ー?+賊]?vワu苟&hRト?~><&?ノワN +?\0リ:??>/eヨY鞅脱R??9C?モ?>wBナ?AK\'n]??[Cトルlx\\YテGCューカ?aイ*ホウIソaユ\r 麑殺赭?=?(1モAzt?1(モルYLEノネP?゙ェセaハィ繻オヨタ?6ネ_]コ贊?イル韋*6 ズ抻劵恙~゙ク?\'ムP禮?R?65偏濠虧睿Es倡~ユEOワ靼ョ?サミヤ_(ヤD?メト?ヨ9?竜テ\\吟マ妊?D?廟*セUUU鮪スヤ? gK\r\r侭ZdV?熊P,QネyK?mGzcワ?;?.舩N\"?ェ=ghク/jI8sw?+1?2搗Yヒ?]非?(.゙?ソ位フ?%\\遍?::FNn??\0ーモ涛4c?,R\nルGXス秕$アフ?cTIF)ョ{_ヘ?6ケヒ#X条?モユ?4qCf慴?\'冥ェネネ\0ォ貞藁イQナ@杯。ァ鉄用\"キ鋺?y(#nj瓧ー゚ツゥ lH;y?9ヌs ウ・ォ\0?0??ノッ,?j*).?9Kオァオ?リ?庁棚黹ク??<*゚.貿]}ワ0匸ソ&W\\還??扞)72ス詮(rハ?E?)b|qC<菘#壕゙ア}ョ?c!clM?4u=??L碩机オ?p3?ネヲ恍$jァ「ifGホ鎚ヨォo\r|イZユモ4?ャ-ャ絵Y}ト縦 棒*ユ$丼G1?*サタn?*ッゥ?#S+ョ?{o:ャム Ll磔?*ハワцQ?\0???敦o獻乘スォュ?諡ン殫U\"el$ア縷ヘヌ写/レャv貿%粍?z啾ッオVgJュ歯?カノ^?2セ?毘?ロk?ニa策40ヲX縲tr」aIQゥ7修XナFネヨz\Z孝ァ?nマzゲ・rスハ句ホ?*ェェソ?ユU|??_>~z?母゙7Q礦メ?5<\\?オ)sーキrqヨ_?ヨ\"AVシr堤?${\0/uGユ」モ゚Kliシェ?ユオア虫ゥ?H昃*2pア/6D?4蛸ィd?珸}?閑F9ト?セ>ハッ??>|?\0藐?齏「ェッハッ???ヤォOGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG\\」?ツ~???\0軆?甦翕シyO ??>>?非?>畍」」」」ョ}oOケ~ハ??\0H? ??\"*|*/醋#ソ?ヌ?S」」ッw?ケ?逎。膂 翩??-_ヌ?S?\0滂?酊uハネ藏UT?「5ィ??(衣?ヌGGF銷?|?ソo??>::睹sソヤソ渉\"\"\"~Wツ5蛞\"\'ヌ羂ェセキ?\"\'?ttu蹠GGGGGG_?ル?リ??\0JFIF\0\0H\0H\0\0??\0Exif\0\0MM\0*\0\0\0\0\0\0\0\0\0?ロ\0C\0?ロ\0C?タ\0\0x\0?\"\0?ト\0\0\0\0\0\0\0\0\0\0\0\0\0\0 \n ?ト\07\0\0\0\0\0! 1\"\nAQ$2a?q#B贈鎮ム?ト\0\0\0\0\0\0\0\0\0\0\0\0\0?ト\05\0\0\0\0\0\0!\"1A#2Qa3?$qア?CRb???レ\0 \0\0?\0ラ?\0ムムムムムムムムムムムムムラシPャ賀FH?\0l~幌?ヒ?゙ロレナs退=Jォ\'習Z?ンNヌテオ?\Z?Z]・_3ギク∞フ效 u困キャ帯1Mナgbュ^ノィ郢 *チ*\r?9「邪ワヲ@}タ?酲\0濤?^3*ォ3ェ?O?~゚>H?\0ヌヌ?A#鵙_|y_屍ェ\"y?7ヌヌ?Oラ肅ョ?サモ?ヤz?Es??饕ネ?/ヌフk?~U:ルKレソ??>xzヨ、?ムr?{p&ュ丸 }ヤ\\)テー?$フj?mヒネ、 ゚#「Y?ーチンo7$ハ??.ムセ埒ャレ¢痿ミ{]ピ舟u」エ:ァ希77\"Uミ#垈}?k+R4耋?鎬>B_T!Fハ\Z>X逞%hdf(オ靄+エO7i??、興ン?b卒\r側箘゙#,wロ_&co,ヨ群,?l<GPハdナ剖W?1?\"t\\\'゚N7?Hラg?+ニズ盆惚サカU_K]?%O*嗣ス\n咽k壼OK圻Uイ痿^・工ク筐Gゥ#tォ-ヲN m此齣\\Mt息疆_ ??「「n執?恭飢YE働ー搗?攻%スX孱?a+ャ3@? D゙メリ>F~柆T^ヒ。YO2\"カユヤ?ソメ佑?エ?「訓釶gラ?\nIaiミヌ)?\nWFナH?(?月eV餽?憾?憧jW・Y姪ャ?スx関?ア5タ?##?0?\0H$.ル?Kテ オk???X?;??ク\rw喉-?7.テ?ト?オ8s 2タX?fォU?ラC*\"ァ髭cワラ3脣==Hソ?)ラ?゚*孝?|」セ[?セ^セオ?E??粟Wュト|?乗fヲk攴=?X\"XXヨレ豢\\_ bー?\ZQ、酘イ嘉 c]rァユセタgAmd?,ャ?-ケラ?>累ノVO扈wリ0孀ニヤvキヒ?「L鎰△レIゆuユg-+f?鬘?D鰯e#ミ$擾gDebッ?テd\ZH件?)%夙T ?」?,\n橢ワr?6?P?X? ?活町i,エ剳ノNl?Qシ*サK G\0ゥA;k w・}+??「???鼡酊?\0ロョスeォン銜漿-?コ膀ネ?#ンNT$怐ク夐テ;?A?y?% ・菜ヌノ?IZIセミオメK\Zャ从rWr?8?ー壜3゙f却リ?\rヲgMLtnV<{J拒チ8T?V????井?・f 鯡オ オ薐AIcd\'oコア]?e?ソφュ;瓶-售ナb\0?ユ奇?゚?6?\nコ??カ鰕G]゙?゚ 耆Zォ?ハ?埜;ハ|?オ|9為*#碧ラNセG??\0雄=z1ィセッ?\n狗マハ「\"?ニオ?*??ハ??ハ\'?\'GCQ巻゚排ェ??\"xDj9セ|/・Uセ巴#?}Jゥ鑠サ>ヘ{?ソ使」燻リ8レロ生?C%、ミ3?3クハGヱァロ隗_メ?9ム゙Hーー刳?\Z? 萢$)゚M??>}Lサ対v?u\r?-ス芬Bクl??R!杓[ヲア仕\r艮?圖d?ロィ蔽イGO*ナカヒー奨゚l?\0M。?>ロ3#よG恟ハ6a?B蝮k\Z3o?ャ夏C炎Fユ薑?:交ェ。タ\"%?&?6$ ??\0}セヌ鍄oヤX?)ソ?ウoァ?fW道セ寺コ殊?+ \rセェュヨ?ヌO歳?*トぼY$o講Z`ウ??!EF?2 ヨュ=藷(??ョ鈷uR?6u盒q、?モス式卦{ソl筬_*KL?「/ーサケ?!?ca慊%昿??切舊ムツ邵I%Iスィd?ホ{]\Z#YメUkr+ュ ミ^メSQUユチmxAヲW§\n?!免K卩w、探XリPツЮコ#濠5漏=ノXケTbオ゚G渦?<\Z7嶌イイト?ワ鶴チ ?7チヨ?,@!1ウLK?ミI&&?、俣?8?8#1>7=T47rRVY^ラ?6ト$3(。マW?8?q゙P?ロDExタ1^醯#壑Q粂ナs晝鮨??Sdヘ窩?綴 ヲ刊3h=・?@‘ィー乙jfウ$V?RVュ|ユト祢凋?忠 韜レッ%?[L6xz醫Mヘs?uヲ$x2ウ?\"\0?!cユQ?$薦?5養VワャウD\n?k т%ン0セT茉スナヘ@?讓ォスン??Mィヨ暼。{捉」フ{?:ケィェ[リヌウオ勺F?[b?#Bロ+夜。}=ノ\\エ?&D?&ュfIg1,MjZqB敍X?%リ巽YQkXT?潺鯒^!ャuオ8+佻rIjャK[ケiフ n{&4i「?8jオ泌劵踈シーH黎y\Z?ラチ譛\'4゙炸bセ?ョ幹・サ.キ%オ・サH)@~濠:コ質E[AJHBD8WメレCX!Xラノ Gк3ルッrナ? 5?桜?\0Ht\\?e攸2p樺+,?示エkrn(eOZテ「d\"永??。#ネTヒヌ?2W?\rカ、キオ?\0 ク?(シD愿JJ4]w\0V珞>?#脯)g*疼?.噴監:ノ@y&>]ィ(sワyFa睇GZ\0ヒizMゥ゙,+ォモアIQJgーQ、M\rヘy#轟c\n??zχmE」。|M{ロKrL];亂qカ5?エ??\Zオ?I$識6h┰Yッ?t遘?]dd\'軍\\rラ\\ュィr6ekヲ?$q。恨0豹ロw・Uル、E*フ8ケc咒ヒy\0テオ^zラdy\"スヨfSEG_ネメBaQ?KL」ラェュ普3ヒ(RユN朕?H?ーケ=Oレヤサヘ黎q?テナ!棧徴芽メ?\Zメ??、オE?ウV?#{2亭??\n?ヘ羌3ャih・勧nトエ????ウウ\rラ槌孳リ∽レ、vHエZ{~N?5截?hン?\0FEdメプ?ネN恙??ワ????ノ?CI蕉鬣ロァヤC質遜瞥縢Wオオ。ユdケ@j?0ナΥメイE概s褪葬ヤレ癒凄。ール )*、i分m0』?モL?H\0ヤム堂゙@>\\?OMチ冲臠褂?ャ?L=フニ?ネ\rキ? yリ!?:ヤキ???=?ス~ネ?蚣リ?ァ#フエc=V蕪址ャ、蒂烹;イ祐ツ?\0慓%、頡qヲ? リ2?\Zラxo翊y?ネ?\0?サ?#Z萱|?ァァヌ??輟レSWl1\\ゲm謄蝙<ウミ?5キヘ6?GD遇vォ苓??蚫g?EHDnぴX危\\潁}??メ.?;HテMル?$X?i[1vヨスソ鴃秤Dマレ石?゙ホD?斛♯Dk%ハロノ4?巽嚢ツX?(ゥ;暗\0腆?c ?モレwMヒャ介G澱zノヌレ,Z懿3ル?+ノレVア<;爐ナ\rチツ5dl完@lVz:?槿ユ?ユoХスッE?史*?マ?ユUs\nェゥ遽>セl?:::::::T??9 淹KツワO?;]ノ<岫ァネ?3ユミ:R?ュ陰ヌ?トzタ,\n?ー%??M呶タ<ョ?2壕ゥ蕾ヒ?(句=K餠?「\"\"?ヒ醋#モヌマ宍コ?洫ヘ6G7ッ?rセnオ6ヨシmレ?ン?Uラチ ワ。ノ1カgGxメcヒg,\\;躙?sナ ?6l?)/Oロ杭かi\n彩?}藷?l $ソZフカF,]7ア)\0アB7P マ痍舶]?7ホテニ隨、???\0N~.?v尅?<8芙rヘ蚓^サ?9e階\rマ#\0ソゥEZo。ト)fHd漂\ZIシ 0ミIo ホキキイ4ゥメXO卒「i%8I?\"G佰mォ脂$$勍lムオ?メオ?$Hョz+ワ藐\"?Xr0ツ惟f巖ス6\nリ\r?ハノ,?\r?ツ*砒ヘ?衿t。ノ靡??゙f穀{ォィ&イyl$ 」?2ーFVア\\ムヘムタq マ|Qツ???,?%勹ロ7Iラ羌ニ?,チ&$?vX笂?!@;lN?栩P裕@#。逋塘椎 \r?#メ\"ww?e l馥;APλ楝<シ?ケ餔ゥ茨ー?\06?0??R5??;$鶏\Zェ苺!ヒ?膈ナス齒苞詫チケ&フkl,オョ,7識$i\Z??椹G鴻<ャ2ス?ラュ^?^゚xヒ迩シ]フンホ肭y\Z?Y.2怏氾蕭Pu澎gS=Eク燻A笏4O火曾チZDs/「Wケ?-カヘ:永7?;?rM圦?!豎ャ・帯H)?!コJ#(ヲd店4?lゥ??\nx゙カ攅式アヌc%藷 アマ梢Y*Qエ?DH&ウ?3桍U%?ョワ?キ?#ッzXァ梹:?5X・コカ%YnD?7昶Lァex」n?フW紋y襁d?ニ?_ーサ竡I?8?冲:*マ諱LBVュ }dSDネ_ ラムスラカ$葬ア桟テ\"9讚ユ?Qノ? ユZБjチォ徘顳X*ヌ\0伏\"g湍zC」孤ト、倶播-?ユoュフ簇3,俸c xy、I噐EdN?X鞍ヌナ?P静ノン;ウ家Eヤ?キy ラX$urフ?&フP,ホK?莵?\':Vウ9皐89G;Yート??Jワ渣bdミqン?A4イ\Z?*ムH0ッェ?J+芍\r?$,勞|?ッ4?M-?亰?コスd?リ9ケJ3\0?\"ネ?8l .P゚gPトメH{ニ卒セ( {゚$ネラ攻H~芝Fェク.ノ =・タホヲヨ\\モラk?-盍ー聴9^鍄チJ殲?\0ウ精?l&$ヒモ-&迹カヘa訓Cニ-?1mJ?;AレC?Б+、)oォ]mVnh袒ニ+釦Exセ aレ漬ノIn)#ヲ籍?ナノ?!<5蜥7jqヘe唳。* ヲJ? iロ$ulモK穴シアXケ%怱追?e涓モャmヨ:Dpク♂ルWieD朷Yィヒノ、n3P簍セメT品Svツhオ$誥ハカ\"W?愿z?x?;Yeノ\Zォユョkl]?g\'イハs??Oヒ|ハ9ォh?G・ゥル??カ?? セ吋灼\nQ\'エ]n叟ヨtウ?,2JヤWwヘチjy?/ヌ1?(eワ _3g「ュ剩aC」.ツタゥリy-直{Aiチ?ロXウ鍼A臺\r??享6・??pルフォiカ?m鋲*E}L 踪ルUPV陟エ\"!Dケカ\0?\n0Xノ「Es縒Hノ^イ=穰Bナc?ミEセオロ0[?.ヘャ}愼モ雫羯#エ?;2ネHe荘l$(]iZ;輝?\'百)5XmW?lユソ*g本0フbw臥?8f\rハ>?,トィ?5ヨ?g?剪?:;柯惑[\\?ホ腐rWm{[9?(?2?占8?c?nモ険=ィ、セCNィe5萼K%イネリq?ィ孝?オ=I駢奉ユG9?b?゚?*ェ5~Uzレg??/ィキk?ル「タ.汳?w<芹G\'X=+?賣ユ-v彼>?x螫ロ潔Xォコリ。? ?=r?ー單\Zキ.ォOヲオ>「リ2kュェフ*セミa?Bア 刧03!ャ?ナ?7鮫オイCVセ光rュ~[C稿jォメ&\\P?!?イN?=ム*ネ???0m? m*0ワ転温>ッIN?ーVYuウWg?*rV?ヤ? 姫S-c?<ロP3頤5-.rヤ?H].。イワc??垠*h0?ン?Yo?筋?gェ魎?ユ?蕾奪使}醴コミヌ?6ナ\\リhヌ棠g9e?5?Bチiー勅ヤ2モ?|H=tヘ4qf\r\n?レlN? ?!或コ梗\Zュ/モノI,「リ賛pCツトJイV1?2?<;7ア∽g?rMZ?ッdヘ~H即蛹、\\PH??2ウrナラnO?U戌Rk7}?ォ憐カ悒ホ、紿衆[F^゚皴鑠ノ9jゥ4W6 KソワルV〆剱9ーハ*ランhM0ウヒ6}ォe4wツuスコn??9 {cテqト」Aェミンケシウ伏ト?~「C?(\rィk?ヘu?ヒ?yホU?\"F ?C\rC傑ヨ哨?テ魎RUユK]A。シ銃ANCエ喙ォRニdAヌモ\\ハツ46タテ郁?5\rIJノ?iチィ4?4ッXタQアェl8?W「腸YZチV3W却メW淑dv}ヌaBpアYs?ヒ洙」^ハZ挟?(zユeェ蜚ヨ/??Lマ ?蕊ャ扇?b?\Zタ?\Z|?顴q粲??。?&クJサゥ?>Kャr?拶\"\"\'披?y\"ノ 佯鹹??mネぺ%.rコネイフGmュシ寛bナンGS\\ロ柔ユC?Fヘ痲,フ曾<ェワHl瑯宏rt<_頒、S篁ル?ヒクュウ∂Vホ蜜?)r\0?\nホム?ノb?,?ヌ??怙゚ノ復]SuKsフ?樒塢k ?)q?4?G?0yΣ&濡[FH??\0ユ\"s鯔根アC?ヘレ?\0メコクsァェ羆チ罵Кbユ(#ス6Aォヒ%x飽ュ?h$w\nL?}ハ/-?5モDz曜リホロソ^ZI\\鉢eャVJ1Nミヘ+iャQ? J$ウクd筮ァヲマハ|yGコ薇bツ?\0-溺セ萓Lネ? 寤lュ?ヘ・審^<睛_-ーリh迚ヌWトb?t%? ?他??鐶キネq? \\?em?ャ?KoWシホチ}cAv 」?3?!エヲC ゚tル ー常レォ#モァ-ンッp?\"_rキ%XD8E?1眥ュ幌TiPVNヒ?フ!ノ!ユ?Ia\n[靨&Ll祷ル\":)г=フ?焔ウ?;N???+P-gwQMUワヌカクXテャdサゥヒ\\8ミスb\ZAyッBtと?2ュUPテ アDフ?6m?,n\n?箇%κK#カラァ0ZrF(ャロ-??\"責?*?フーハ/ヒ「ィ?R1E8「O?サs]/d撼?/2Gyテ?7鶚h??恬??hノbE4H5Xソn:76\".??8???.ラ1レO)jD|ソPUサbNトvョr9d築アヒ3ヤw??nア?。、b7?頤鎌mK小8絖xyォチ 翌ウ=c\ZッpャBrW?jト<ッ酩飛?N?/ォツ?ツ\"\'謬DETDoゥU|\"\'粧ツ?治Dlv?\0Nッ?TjlIゥ8;舩EЫ%?#<#?0?昨ェ漢??「ァツァ?イ凧W?E?5EN苣\0jgーIトF?ーvN3ン0?,##スlzノbV9ゥ?-ナqゥ???\0レァ??\0歯n\'蚓Oh\"スホ曰?\0カhノyセンモFアオォ襷\"H゚(膂レ?測喚?Iト鞋{ン? 産?トヲj腿1ユハ濆?紲Yロ?bホロカト4ヒ昔KJ9ェc、イDE俾?ノ「エqネ#<ネ7, ァ慶bK瞬ソX止)??)kュ?Cy\nケC\Z*Z3イ制ィイロレ徑?マ.?チヒ2「エv瀧廷凪*\0cL.??莨?3S。?xM燧?゚bゥ)?・ヌ6bUュ纜ニ? ケ}エ艝サカ gJtLH44?X\"?ヲxリ??Hュェ膈~壙[0カ鼠急パ?ヨA\\%フV?=e\r悧Ia、ヒう F絞゙タヒ控?D嚀mサd聳?+エケ箒澹?Nヨロサヘツqフ=タ゚ユリ礪- メyd>ネ~ホ豸樅[\Zレd、?(濆癨ヨ\n?\r9ヲ?%v&[?ヒ湯R??7?ゥ@イ\Zャ?メ\"%牙現*?ニ^?タ槝? B$H?(?ラキ$ア?;E2塞%ルストn7=5ネー.ス裄9ウ?漸臾t覓]kノ紐ワjケ?ロかウyb%W?Aァ.ツミrチフメッコヒ$イム?7]夲?タマコ?1楢s\n?cpスコfャs兪/m.蟇ウァ萬n.楷カ+f鷂nセレ?\0?ヲs.\n2<\n?3\'∽ホ??T揄ヒ?h??Wョモ.?ワZTウ、マ nAヒカ4」\"タレミメW拮Ehヨ?;H\'。倅痂オ?p?5q?;ボtミZv翊ミ?ゥエラ9ォ。3ルz蹄綴?T:?フU?Zリde温6蜷q JDナKゥラ2テ暦ラ縫珠tォエーノM_^Icx)ゥU?ケyネ キjJ斟ヤNd懸?>典_ィnュ8R{圧ヘ 錆$?ラ鮭ー?b????ァヤc垂ヘ瑕k$? 5\r/ミ゙XQjマ8%貧ウEネ亦タv?a\n?ロ?9求モW+?\"x?リ@?,ョ?g#ユR?\nJaナャウZKK「閠?*ソケ*ホメリ{/M}p叡爛サェシスキカ%lepト?+gH:}Yスgトu\Z^゚?:,ヘヌ,\Z?ヒ?ワr?ト戲キン、?セソ?5?ゥ5e ?rvh「I? ?も?.レ?ォ?|浙罧ルds?bk?幢Kァ芒v?&??\0モ\\jサ)CZ&}牆? 篷-Eサニぜd??コ楔X叙>厭瘟「\Z#?3-悟Zモ謇F゚?コ躍モacヤI凋i「|?錨腑?9勘季?+クカY・゙Qhs{皿ャナノrsgァカ0?浸lーgネテ「6、ハリ\\kQ草8Rャ?!:WQセゥ?7メ樟コヒ?ケ!K?? ?イス!|ィ鍄r!フ\Zス}ヌ (?ケY嵌椄藁ロ跳\0ゥ@Y貞A\'z6R?ヨ/モヘ\Z4ャ川?##{M嬾コKモ?$。Xセ?/=xjXD]?サハ」?絮?參T^Qニヲ>エ?=~|D?\'謬DUWxO>|ォハァ?U?韋zx_??\0?Iロヌ??P?ク?\0?コ鰊(薀??ッ?鼈喰ゥ酩?~:罐?熕pv?キ?uSッカーャ> Ipヲ:O5昂Jラ、ュTj3ム?$j/。ZャT?ェ゚OヌO?yX?秋゚カセレ\Z[ク「S捻トK魅~メS]?\'?\'??I}ルリト賊Fア<ムU>????\0hスzイGオ=Hェ且?Jア=/o?+<|?テシ||?? スモレ?#ヲ??efZカォル柱ャヘJ軛Dnン壻丶Tェ;#エMナモfU#A渾佻ERjラ。A3ツ?u#_ェォヘx螺_センユ?0WVeo?>旁?!Cン!i?ッ?#セ~n???eノ?0??%?=?冶EjE+ヲWF#胯U!|テエzn>毘殱9ヺネ?ゥ?c5\"猶\r]?仝糟?CワD複皇:\n纂繦ャr綢?゚?1?s?ネ7ョョ?&?ツ伝鉄?奧KqK断ロ?逢ォc?オ,? *E2トノ%??<7ユ\\ムネe\\?+?ムerヒ>N\r<、ユイニ」[Cv?6SN?ュP 餐?異??0\Z?\0O蒡[9K?=ルf?mDヒ^#;?昔メ?$指pェ_?「K脊:? \\dBHaH豹ー*ッw┣ーュ?薦!S勠アクスセヌ@ ?kツ65Tユノ n~{Yーオ[ 3濃m|?壘?F?\0儕Eー&・=測\\?N#)エヘ硼8\'_[゙VO+励?#?w%s?ス?ンオ?、?誘-゙エBチ コネ屋捩KE \0墨??-?リ\r?驢タ&ウXノr膨ャ」ロ[<チ櫺#Y略;>}?テ:商?ロ ?7??\"F>U????;?i予^+4\rホ秘4r8\\゙6?ウU!モヒ_・サm\rォ%ソエ\\ス簿\\アb。XヒlrKZ。氓擡ヲ?eヌウ-j?リ?0wZ+ナ)8聒?賤イ?&w?^甘628ュ。2ス?!N?3ウJR!&?b.?\"z噴?0b?」?ル?哉蘂・ゥ缺ト汾?rヨ\0mエチ?7\"Xユ:ャェワT?*sWOa樗ルH?碍3吼テdv甑゙?97?rdケB?/(?4mム?7?3X]゚$ル<7dクゥモ振槽g?5、臓<&1 Y」騒ケ+ノS?)o+x_撲x?ヲ皸[\ZA-4Sメ?^カ橦〃?;?:+\Z?|修~h4モ+,\'??C+スレw絛ツ<レヲ頃?ラc?tクKh?qix゚Mg?鬼Y ?オイッ\'リクッォォョウ?\0cK?;xノ!?イP゙棯T?ッzq票カ+チ?4」yヨタャ?\ZGe\\e0!ンツょPーjェ4vア?gク姆-?/pカ#,ツ?<カホ6*#?Kッ+?hンチワ?~サュツモ詁ネ?3オXH?xイモ}TヲT麾ュユ戯[T2[ニウ]ヤ5?bワ+リ?脱\'輩C査ヲロヌコ内p{N>^Aムa)uV:ハェュ<舵Qヌ忤*コ悛ッャ?レ?,レiェ*\'H\\濂$k゚エミp襦゙;??? ?yソケ?ヌ釐。?#ナユ\"クeモG!エ%D?/?」?x1暮Ug]{M廝レ菷j*梦m婪$o辿Ip$Б,肢シ?偬1、ク?!?_4ェ?Zホヨ緬羈レ)h??$Dカェハモ+yムネ $ュウ%鼡I3EZX憧トイタ?hヨ・[VチYフイglv?w+!ゥh・鳥)ウチ?#pvvリ?fEUTU_?Q|x?ェ?桎USハ?os\"xT??\'?Q???マホト?済??ソ床?|?\' ?;゚???」」」ッ:::?S??\0I???ヌ\\tttuンッsQZ萱Z薤kWハキマ?>Qコ?ツ?E?;{???|??#]蛬~Wハ/?\'ゥ゙?/?7ハ?:??>Fヌネ\0?」ォロ5セルe?メ拾d!uゥ4A囃xヌ革アウイァY!遠5ュl簡レョ??jtャロ?1ノ要?I?\ZォM圻\Z魅G暾ワ??@蝶?zr?e\"ンッ5и嬰F5A.丙「ェ\'城?\'??゚ロョノ#帙ヌ???ャ??モ??ハァツ?ー?+賊]?vワu苟&hRト?~><&?ノワN +?\0リ:??>/eヨY鞅脱R??9C?モ?>wBナ?AK\'n]??[Cトルlx\\YテGCューカ?aイ*ホウIソaユ\r 麑殺赭?=?(1モAzt?1(モルYLEノネP?゙ェセaハィ繻オヨタ?6ネ_]コ贊?イル韋*6 ズ抻劵恙~゙ク?\'ムP禮?R?65偏濠虧睿Es倡~ユEOワ靼ョ?サミヤ_(ヤD?メト?ヨ9?竜テ\\吟マ妊?D?廟*セUUU鮪スヤ? gK\r\r侭ZdV?熊P,QネyK?mGzcワ?;?.舩N\"?ェ=ghク/jI8sw?+1?2搗Yヒ?]非?(.゙?ソ位フ?%\\遍?::FNn??\0ーモ涛4c?,R\nルGXス秕$アフ?cTIF)ョ{_ヘ?6ケヒ#X条?モユ?4qCf慴?\'冥ェネネ\0ォ貞藁イQナ@杯。ァ鉄用\"キ鋺?y(#nj瓧ー゚ツゥ lH;y?9ヌs ウ・ォ\0?0??ノッ,?j*).?9Kオァオ?リ?庁棚黹ク??<*゚.貿]}ワ0匸ソ&W\\還??扞)72ス詮(rハ?E?)b|qC<菘#壕゙ア}ョ?c!clM?4u=??L碩机オ?p3?ネヲ恍$jァ「ifGホ鎚ヨォo\r|イZユモ4?ャ-ャ絵Y}ト縦 棒*ユ$丼G1?*サタn?*ッゥ?#S+ョ?{o:ャム Ll磔?*ハワцQ?\0???敦o獻乘スォュ?諡ン殫U\"el$ア縷ヘヌ写/レャv貿%粍?z啾ッオVgJュ歯?カノ^?2セ?毘?ロk?ニa策40ヲX縲tr」aIQゥ7修XナFネヨz\Z孝ァ?nマzゲ・rスハ句ホ?*ェェソ?ユU|??_>~z?母゙7Q礦メ?5<\\?オ)sーキrqヨ_?ヨ\"AVシr堤?${\0/uGユ」モ゚Kliシェ?ユオア虫ゥ?H昃*2pア/6D?4蛸ィd?珸}?閑F9ト?セ>ハッ??>|?\0藐?齏「ェッハッ???ヤォOGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG\\」?ツ~???\0軆?甦翕シyO ??>>?非?>畍」」」」ョ}oOケ~ハ??\0H? ??\"*|*/醋#ソ?ヌ?S」」ッw?ケ?逎。膂 翩??-_ヌ?S?\0滂?酊uハネ藏UT?「5ィ??(衣?ヌGGF銷?|?ソo??>::睹sソヤソ渉\"\"\"~Wツ5蛞\"\'ヌ羂ェセキ?\"\'?ttu蹠GGGGGG_?ル?リ??\0JFIF\0\0H\0H\0\0??\0Exif\0\0MM\0*\0\0\0\0\0\0\0\0\0?ロ\0C\0?ロ\0C?タ\0\0x\0?\"\0?ト\0\0\0\0\0\0\0\0\0\0\0\0\0\0 \n ?ト\07\0\0\0\0\0! 1\"\nAQ$2a?q#B贈鎮ム?ト\0\0\0\0\0\0\0\0\0\0\0\0\0?ト\05\0\0\0\0\0\0!\"1A#2Qa3?$qア?CRb???レ\0 \0\0?\0ラ?\0ムムムムムムムムムムムムムラシPャ賀FH?\0l~幌?ヒ?゙ロレナs退=Jォ\'習Z?ンNヌテオ?\Z?Z]・_3ギク∞フ效 u困キャ帯1Mナgbュ^ノィ郢 *チ*\r?9「邪ワヲ@}タ?酲\0濤?^3*ォ3ェ?O?~゚>H?\0ヌヌ?A#鵙_|y_屍ェ\"y?7ヌヌ?Oラ肅ョ?サモ?ヤz?Es??饕ネ?/ヌフk?~U:ルKレソ??>xzヨ、?ムr?{p&ュ丸 }ヤ\\)テー?$フj?mヒネ、 ゚#「Y?ーチンo7$ハ??.ムセ埒ャレ¢痿ミ{]ピ舟u」エ:ァ希77\"Uミ#垈}?k+R4耋?鎬>B_T!Fハ\Z>X逞%hdf(オ靄+エO7i??、興ン?b卒\r側箘゙#,wロ_&co,ヨ群,?l<GPハdナ剖W?1?\"t\\\'゚N7?Hラg?+ニズ盆惚サカU_K]?%O*嗣ス\n咽k壼OK圻Uイ痿^・工ク筐Gゥ#tォ-ヲN m此齣\\Mt息疆_ ??「「n執?恭飢YE働ー搗?攻%スX孱?a+ャ3@? D゙メリ>F~柆T^ヒ。YO2\"カユヤ?ソメ佑?エ?「訓釶gラ?\nIaiミヌ)?\nWFナH?(?月eV餽?憾?憧jW・Y姪ャ?スx関?ア5タ?##?0?\0H$.ル?Kテ オk???X?;??ク\rw喉-?7.テ?ト?オ8s 2タX?fォU?ラC*\"ァ髭cワラ3脣==Hソ?)ラ?゚*孝?|」セ[?セ^セオ?E??粟Wュト|?乗fヲk攴=?X\"XXヨレ豢\\_ bー?\ZQ、酘イ嘉 c]rァユセタgAmd?,ャ?-ケラ?>累ノVO扈wリ0孀ニヤvキヒ?「L鎰△レIゆuユg-+f?鬘?D鰯e#ミ$擾gDebッ?テd\ZH件?)%夙T ?」?,\n橢ワr?6?P?X? ?活町i,エ剳ノNl?Qシ*サK G\0ゥA;k w・}+??「???鼡酊?\0ロョスeォン銜漿-?コ膀ネ?#ンNT$怐ク夐テ;?A?y?% ・菜ヌノ?IZIセミオメK\Zャ从rWr?8?ー壜3゙f却リ?\rヲgMLtnV<{J拒チ8T?V????井?・f 鯡オ オ薐AIcd\'oコア]?e?ソφュ;瓶-售ナb\0?ユ奇?゚?6?\nコ??カ鰕G]゙?゚ 耆Zォ?ハ?埜;ハ|?オ|9為*#碧ラNセG??\0雄=z1ィセッ?\n狗マハ「\"?ニオ?*??ハ??ハ\'?\'GCQ巻゚排ェ??\"xDj9セ|/・Uセ巴#?}Jゥ鑠サ>ヘ{?ソ使」燻リ8レロ生?C%、ミ3?3クハGヱァロ隗_メ?9ム゙Hーー刳?\Z? 萢$)゚M??>}Lサ対v?u\r?-ス芬Bクl??R!杓[ヲア仕\r艮?圖d?ロィ蔽イGO*ナカヒー奨゚l?\0M。?>ロ3#よG恟ハ6a?B蝮k\Z3o?ャ夏C炎Fユ薑?:交ェ。タ\"%?&?6$ ??\0}セヌ鍄oヤX?)ソ?ウoァ?fW道セ寺コ殊?+ \rセェュヨ?ヌO歳?*トぼY$o講Z`ウ??!EF?2 ヨュ=藷(??ョ鈷uR?6u盒q、?モス式卦{ソl筬_*KL?「/ーサケ?!?ca慊%昿??切舊ムツ邵I%Iスィd?ホ{]\Z#YメUkr+ュ ミ^メSQUユチmxAヲW§\n?!免K卩w、探XリPツЮコ#濠5漏=ノXケTbオ゚G渦?<\Z7嶌イイト?ワ鶴チ ?7チヨ?,@!1ウLK?ミI&&?、俣?8?8#1>7=T47rRVY^ラ?6ト$3(。マW?8?q゙P?ロDExタ1^醯#壑Q粂ナs晝鮨??Sdヘ窩?綴 ヲ刊3h=・?@‘ィー乙jfウ$V?RVュ|ユト祢凋?忠 韜レッ%?[L6xz醫Mヘs?uヲ$x2ウ?\"\0?!cユQ?$薦?5養VワャウD\n?k т%ン0セT茉スナヘ@?讓ォスン??Mィヨ暼。{捉」フ{?:ケィェ[リヌウオ勺F?[b?#Bロ+夜。}=ノ\\エ?&D?&ュfIg1,MjZqB敍X?%リ巽YQkXT?潺鯒^!ャuオ8+佻rIjャK[ケiフ n{&4i「?8jオ泌劵踈シーH黎y\Z?ラチ譛\'4゙炸bセ?ョ幹・サ.キ%オ・サH)@~濠:コ質E[AJHBD8WメレCX!Xラノ Gк3ルッrナ? 5?桜?\0Ht\\?e攸2p樺+,?示エkrn(eOZテ「d\"永??。#ネTヒヌ?2W?\rカ、キオ?\0 ク?(シD愿JJ4]w\0V珞>?#脯)g*疼?.噴監:ノ@y&>]ィ(sワyFa睇GZ\0ヒizMゥ゙,+ォモアIQJgーQ、M\rヘy#轟c\n??zχmE」。|M{ロKrL];亂qカ5?エ??\Zオ?I$識6h┰Yッ?t遘?]dd\'軍\\rラ\\ュィr6ekヲ?$q。恨0豹ロw・Uル、E*フ8ケc咒ヒy\0テオ^zラdy\"スヨfSEG_ネメBaQ?KL」ラェュ普3ヒ(RユN朕?H?ーケ=Oレヤサヘ黎q?テナ!棧徴芽メ?\Zメ??、オE?ウV?#{2亭??\n?ヘ羌3ャih・勧nトエ????ウウ\rラ槌孳リ∽レ、vHエZ{~N?5截?hン?\0FEdメプ?ネN恙??ワ????ノ?CI蕉鬣ロァヤC質遜瞥縢Wオオ。ユdケ@j?0ナΥメイE概s褪葬ヤレ癒凄。ール )*、i分m0』?モL?H\0ヤム堂゙@>\\?OMチ冲臠褂?ャ?L=フニ?ネ\rキ? yリ!?:ヤキ???=?ス~ネ?蚣リ?ァ#フエc=V蕪址ャ、蒂烹;イ祐ツ?\0慓%、頡qヲ? リ2?\Zラxo翊y?ネ?\0?サ?#Z萱|?ァァヌ??輟レSWl1\\ゲm謄蝙<ウミ?5キヘ6?GD遇vォ苓??蚫g?EHDnぴX危\\潁}??メ.?;HテMル?$X?i[1vヨスソ鴃秤Dマレ石?゙ホD?斛♯Dk%ハロノ4?巽嚢ツX?(ゥ;暗\0腆?c ?モレwMヒャ介G澱zノヌレ,Z懿3ル?+ノレVア<;爐ナ\rチツ5dl完@lVz:?槿ユ?ユoХスッE?史*?マ?ユUs\nェゥ遽>セl?:::::::T??9 淹KツワO?;]ノ<岫ァネ?3ユミ:R?ュ陰ヌ?トzタ,\n?ー%??M呶タ<ョ?2壕ゥ蕾ヒ?(句=K餠?「\"\"?ヒ醋#モヌマ宍コ?洫ヘ6G7ッ?rセnオ6ヨシmレ?ン?Uラチ ワ。ノ1カgGxメcヒg,\\;躙?sナ ?6l?)/Oロ杭かi\n彩?}藷?l $ソZフカF,]7ア)\0アB7P マ痍舶]?7ホテニ隨、???\0N~.?v尅?<8芙rヘ蚓^サ?9e階\rマ#\0ソゥEZo。ト)fHd漂\ZIシ 0ミIo ホキキイ4ゥメXO卒「i%8I?\"G佰mォ脂$$勍lムオ?メオ?$Hョz+ワ藐\"?Xr0ツ惟f巖ス6\nリ\r?ハノ,?\r?ツ*砒ヘ?衿t。ノ靡??゙f穀{ォィ&イyl$ 」?2ーFVア\\ムヘムタq マ|Qツ???,?%勹ロ7Iラ羌ニ?,チ&$?vX笂?!@;lN?栩P裕@#。逋塘椎 \r?#メ\"ww?e l馥;APλ楝<シ?ケ餔ゥ茨ー?\06?0??R5??;$鶏\Zェ苺!ヒ?膈ナス齒苞詫チケ&フkl,オョ,7識$i\Z??椹G鴻<ャ2ス?ラュ^?^゚xヒ迩シ]フンホ肭y\Z?Y.2怏氾蕭Pu澎gS=Eク燻A笏4O火曾チZDs/「Wケ?-カヘ:永7?;?rM圦?!豎ャ・帯H)?!コJ#(ヲd店4?lゥ??\nx゙カ攅式アヌc%藷 アマ梢Y*Qエ?DH&ウ?3桍U%?ョワ?キ?#ッzXァ梹:?5X・コカ%YnD?7昶Lァex」n?フW紋y襁d?ニ?_ーサ竡I?8?冲:*マ諱LBVュ }dSDネ_ ラムスラカ$葬ア桟テ\"9讚ユ?Qノ? ユZБjチォ徘顳X*ヌ\0伏\"g湍zC」孤ト、倶播-?ユoュフ簇3,俸c xy、I噐EdN?X鞍ヌナ?P静ノン;ウ家Eヤ?キy ラX$urフ?&フP,ホK?莵?\':Vウ9皐89G;Yート??Jワ渣bdミqン?A4イ\Z?*ムH0ッェ?J+芍\r?$,勞|?ッ4?M-?亰?コスd?リ9ケJ3\0?\"ネ?8l .P゚gPトメH{ニ卒セ( {゚$ネラ攻H~芝Fェク.ノ =・タホヲヨ\\モラk?-盍ー聴9^鍄チJ殲?\0ウ精?l&$ヒモ-&迹カヘa訓Cニ-?1mJ?;AレC?Б+、)oォ]mVnh袒ニ+釦Exセ aレ漬ノIn)#ヲ籍?ナノ?!<5蜥7jqヘe唳。* ヲJ? iロ$ulモK穴シアXケ%怱追?e涓モャmヨ:Dpク♂ルWieD朷Yィヒノ、n3P簍セメT品Svツhオ$誥ハカ\"W?愿z?x?;Yeノ\Zォユョkl]?g\'イハs??Oヒ|ハ9ォh?G・ゥル??カ?? セ吋灼\nQ\'エ]n叟ヨtウ?,2JヤWwヘチjy?/ヌ1?(eワ _3g「ュ剩aC」.ツタゥリy-直{Aiチ?ロXウ鍼A臺\r??享6・??pルフォiカ?m鋲*E}L 踪ルUPV陟エ\"!Dケカ\0?\n0Xノ「Es縒Hノ^イ=穰Bナc?ミEセオロ0[?.ヘャ}愼モ雫羯#エ?;2ネHe荘l$(]iZ;輝?\'百)5XmW?lユソ*g本0フbw臥?8f\rハ>?,トィ?5ヨ?g?剪?:;柯惑[\\?ホ腐rWm{[9?(?2?占8?c?nモ険=ィ、セCNィe5萼K%イネリq?ィ孝?オ=I駢奉ユG9?b?゚?*ェ5~Uzレg??/ィキk?ル「タ.汳?w<芹G\'X=+?賣ユ-v彼>?x螫ロ潔Xォコリ。? ?=r?ー單\Zキ.ォOヲオ>「リ2kュェフ*セミa?Bア 刧03!ャ?ナ?7鮫オイCVセ光rュ~[C稿jォメ&\\P?!?イN?=ム*ネ???0m? m*0ワ転温>ッIN?ーVYuウWg?*rV?ヤ? 姫S-c?<ロP3頤5-.rヤ?H].。イワc??垠*h0?ン?Yo?筋?gェ魎?ユ?蕾奪使}醴コミヌ?6ナ\\リhヌ棠g9e?5?Bチiー勅ヤ2モ?|H=tヘ4qf\r\n?レlN? ?!或コ梗\Zュ/モノI,「リ賛pCツトJイV1?2?<;7ア∽g?rMZ?ッdヘ~H即蛹、\\PH??2ウrナラnO?U戌Rk7}?ォ憐カ悒ホ、紿衆[F^゚皴鑠ノ9jゥ4W6 KソワルV〆剱9ーハ*ランhM0ウヒ6}ォe4wツuスコn??9 {cテqト」Aェミンケシウ伏ト?~「C?(\rィk?ヘu?ヒ?yホU?\"F ?C\rC傑ヨ哨?テ魎RUユK]A。シ銃ANCエ喙ォRニdAヌモ\\ハツ46タテ郁?5\rIJノ?iチィ4?4ッXタQアェl8?W「腸YZチV3W却メW淑dv}ヌaBpアYs?ヒ洙」^ハZ挟?(zユeェ蜚ヨ/??Lマ ?蕊ャ扇?b?\Zタ?\Z|?顴q粲??。?&クJサゥ?>Kャr?拶\"\"\'披?y\"ノ 佯鹹??mネぺ%.rコネイフGmュシ寛bナンGS\\ロ柔ユC?Fヘ痲,フ曾<ェワHl瑯宏rt<_頒、S篁ル?ヒクュウ∂Vホ蜜?)r\0?\nホム?ノb?,?ヌ??怙゚ノ復]SuKsフ?樒塢k ?)q?4?G?0yΣ&濡[FH??\0ユ\"s鯔根アC?ヘレ?\0メコクsァェ羆チ罵Кbユ(#ス6Aォヒ%x飽ュ?h$w\nL?}ハ/-?5モDz曜リホロソ^ZI\\鉢eャVJ1Nミヘ+iャQ? J$ウクd筮ァヲマハ|yGコ薇bツ?\0-溺セ萓Lネ? 寤lュ?ヘ・審^<睛_-ーリh迚ヌWトb?t%? ?他??鐶キネq? \\?em?ャ?KoWシホチ}cAv 」?3?!エヲC ゚tル ー常レォ#モァ-ンッp?\"_rキ%XD8E?1眥ュ幌TiPVNヒ?フ!ノ!ユ?Ia\n[靨&Ll祷ル\":)г=フ?焔ウ?;N???+P-gwQMUワヌカクXテャdサゥヒ\\8ミスb\ZAyッBtと?2ュUPテ アDフ?6m?,n\n?箇%κK#カラァ0ZrF(ャロ-??\"責?*?フーハ/ヒ「ィ?R1E8「O?サs]/d撼?/2Gyテ?7鶚h??恬??hノbE4H5Xソn:76\".??8???.ラ1レO)jD|ソPUサbNトvョr9d築アヒ3ヤw??nア?。、b7?頤鎌mK小8絖xyォチ 翌ウ=c\ZッpャBrW?jト<ッ酩飛?N?/ォツ?ツ\"\'謬DETDoゥU|\"\'粧ツ?治Dlv?\0Nッ?TjlIゥ8;舩EЫ%?#<#?0?昨ェ漢??「ァツァ?イ凧W?E?5EN苣\0jgーIトF?ーvN3ン0?,##スlzノbV9ゥ?-ナqゥ???\0レァ??\0歯n\'蚓Oh\"スホ曰?\0カhノyセンモFアオォ襷\"H゚(膂レ?測喚?Iト鞋{ン? 産?トヲj腿1ユハ濆?紲Yロ?bホロカト4ヒ昔KJ9ェc、イDE俾?ノ「エqネ#<ネ7, ァ慶bK瞬ソX止)??)kュ?Cy\nケC\Z*Z3イ制ィイロレ徑?マ.?チヒ2「エv瀧廷凪*\0cL.??莨?3S。?xM燧?゚bゥ)?・ヌ6bUュ纜ニ? ケ}エ艝サカ gJtLH44?X\"?ヲxリ??Hュェ膈~壙[0カ鼠急パ?ヨA\\%フV?=e\r悧Ia、ヒう F絞゙タヒ控?D嚀mサd聳?+エケ箒澹?Nヨロサヘツqフ=タ゚ユリ礪- メyd>ネ~ホ豸樅[\Zレd、?(濆癨ヨ\n?\r9ヲ?%v&[?ヒ湯R??7?ゥ@イ\Zャ?メ\"%牙現*?ニ^?タ槝? B$H?(?ラキ$ア?;E2塞%ルストn7=5ネー.ス裄9ウ?漸臾t覓]kノ紐ワjケ?ロかウyb%W?Aァ.ツミrチフメッコヒ$イム?7]夲?タマコ?1楢s\n?cpスコfャs兪/m.蟇ウァ萬n.楷カ+f鷂nセレ?\0?ヲs.\n2<\n?3\'∽ホ??T揄ヒ?h??Wョモ.?ワZTウ、マ nAヒカ4」\"タレミメW拮Ehヨ?;H\'。倅痂オ?p?5q?;ボtミZv翊ミ?ゥエラ9ォ。3ルz蹄綴?T:?フU?Zリde温6蜷q JDナKゥラ2テ暦ラ縫珠tォエーノM_^Icx)ゥU?ケyネ キjJ斟ヤNd懸?>典_ィnュ8R{圧ヘ 錆$?ラ鮭ー?b????ァヤc垂ヘ瑕k$? 5\r/ミ゙XQjマ8%貧ウEネ亦タv?a\n?ロ?9求モW+?\"x?リ@?,ョ?g#ユR?\nJaナャウZKK「閠?*ソケ*ホメリ{/M}p叡爛サェシスキカ%lepト?+gH:}Yスgトu\Z^゚?:,ヘヌ,\Z?ヒ?ワr?ト戲キン、?セソ?5?ゥ5e ?rvh「I? ?も?.レ?ォ?|浙罧ルds?bk?幢Kァ芒v?&??\0モ\\jサ)CZ&}牆? 篷-Eサニぜd??コ楔X叙>厭瘟「\Z#?3-悟Zモ謇F゚?コ躍モacヤI凋i「|?錨腑?9勘季?+クカY・゙Qhs{皿ャナノrsgァカ0?浸lーgネテ「6、ハリ\\kQ草8Rャ?!:WQセゥ?7メ樟コヒ?ケ!K?? ?イス!|ィ鍄r!フ\Zス}ヌ (?ケY嵌椄藁ロ跳\0ゥ@Y貞A\'z6R?ヨ/モヘ\Z4ャ川?##{M嬾コKモ?$。Xセ?/=xjXD]?サハ」?絮?參T^Qニヲ>エ?=~|D?\'謬DUWxO>|ォハァ?U?韋zx_??\0?Iロヌ??P?ク?\0?コ鰊(薀??ッ?鼈喰ゥ酩?~:罐?熕pv?キ?uSッカーャ> Ipヲ:O5昂Jラ、ュTj3ム?$j/。ZャT?ェ゚OヌO?yX?秋゚カセレ\Z[ク「S捻トK魅~メS]?\'?\'??I}ルリト賊Fア<ムU>????\0hスzイGオ=Hェ且?Jア=/o?+<|?テシ||?? スモレ?#ヲ??efZカォル柱ャヘJ軛Dnン壻丶Tェ;#エMナモfU#A渾佻ERjラ。A3ツ?u#_ェォヘx螺_センユ?0WVeo?>旁?!Cン!i?ッ?#セ~n???eノ?0??%?=?冶EjE+ヲWF#胯U!|テエzn>毘殱9ヺネ?ゥ?c5\"猶\r]?仝糟?CワD複皇:\n纂繦ャr綢?゚?1?s?ネ7ョョ?&?ツ伝鉄?奧KqK断ロ?逢ォc?オ,? *E2トノ%??<7ユ\\ムネe\\?+?ムerヒ>N\r<、ユイニ」[Cv?6SN?ュP 餐?異??0\Z?\0O蒡[9K?=ルf?mDヒ^#;?昔メ?$指pェ_?「K脊:? \\dBHaH豹ー*ッw┣ーュ?薦!S勠アクスセヌ@ ?kツ65Tユノ n~{Yーオ[ 3濃m|?壘?F?\0儕Eー&・=測\\?N#)エヘ硼8\'_[゙VO+励?#?w%s?ス?ンオ?、?誘-゙エBチ コネ屋捩KE \0墨??-?リ\r?驢タ&ウXノr膨ャ」ロ[<チ櫺#Y略;>}?テ:商?ロ ?7??\"F>U????;?i予^+4\rホ秘4r8\\゙6?ウU!モヒ_・サm\rォ%ソエ\\ス簿\\アb。XヒlrKZ。氓擡ヲ?eヌウ-j?リ?0wZ+ナ)8聒?賤イ?&w?^甘628ュ。2ス?!N?3ウJR!&?b.?\"z噴?0b?」?ル?哉蘂・ゥ缺ト汾?rヨ\0mエチ?7\"Xユ:ャェワT?*sWOa樗ルH?碍3吼テdv甑゙?97?rdケB?/(?4mム?7?3X]゚$ル<7dクゥモ振槽g?5、臓<&1 Y」騒ケ+ノS?)o+x_撲x?ヲ皸[\ZA-4Sメ?^カ橦〃?;?:+\Z?|修~h4モ+,\'??C+スレw絛ツ<レヲ頃?ラc?tクKh?qix゚Mg?鬼Y ?オイッ\'リクッォォョウ?\0cK?;xノ!?イP゙棯T?ッzq票カ+チ?4」yヨタャ?\ZGe\\e0!ンツょPーjェ4vア?gク姆-?/pカ#,ツ?<カホ6*#?Kッ+?hンチワ?~サュツモ詁ネ?3オXH?xイモ}TヲT麾ュユ戯[T2[ニウ]ヤ5?bワ+リ?脱\'輩C査ヲロヌコ内p{N>^Aムa)uV:ハェュ<舵Qヌ忤*コ悛ッャ?レ?,レiェ*\'H\\濂$k゚エミp襦゙;??? ?yソケ?ヌ釐。?#ナユ\"クeモG!エ%D?/?」?x1暮Ug]{M廝レ菷j*梦m婪$o辿Ip$Б,肢シ?偬1、ク?!?_4ェ?Zホヨ緬羈レ)h??$Dカェハモ+yムネ $ュウ%鼡I3EZX憧トイタ?hヨ・[VチYフイglv?w+!ゥh・鳥)ウチ?#pvvリ?fEUTU_?Q|x?ェ?桎USハ?os\"xT??\'?Q???マホト?済??ソ床?|?\' ?;゚???」」」ッ:::?S??\0I???ヌ\\tttuンッsQZ萱Z薤kWハキマ?>Qコ?ツ?E?;{???|??#]蛬~Wハ/?\'ゥ゙?/?7ハ?:??>Fヌネ\0?」ォロ5セルe?メ拾d!uゥ4A囃xヌ革アウイァY!遠5ュl簡レョ??jtャロ?1ノ要?I?\ZォM圻\Z魅G暾ワ??@蝶?zr?e\"ンッ5и嬰F5A.丙「ェ\'城?\'??゚ロョノ#帙ヌ???ャ??モ??ハァツ?ー?+賊]?vワu苟&hRト?~><&?ノワN +?\0リ:??>/eヨY鞅脱R??9C?モ?>wBナ?AK\'n]??[Cトルlx\\YテGCューカ?aイ*ホウIソaユ\r 麑殺赭?=?(1モAzt?1(モルYLEノネP?゙ェセaハィ繻オヨタ?6ネ_]コ贊?イル韋*6 ズ抻劵恙~゙ク?\'ムP禮?R?65偏濠虧睿Es倡~ユEOワ靼ョ?サミヤ_(ヤD?メト?ヨ9?竜テ\\吟マ妊?D?廟*セUUU鮪スヤ? gK\r\r侭ZdV?熊P,QネyK?mGzcワ?;?.舩N\"?ェ=ghク/jI8sw?+1?2搗Yヒ?]非?(.゙?ソ位フ?%\\遍?::FNn??\0ーモ涛4c?,R\nルGXス秕$アフ?cTIF)ョ{_ヘ?6ケヒ#X条?モユ?4qCf慴?\'冥ェネネ\0ォ貞藁イQナ@杯。ァ鉄用\"キ鋺?y(#nj瓧ー゚ツゥ lH;y?9ヌs ウ・ォ\0?0??ノッ,?j*).?9Kオァオ?リ?庁棚黹ク??<*゚.貿]}ワ0匸ソ&W\\還??扞)72ス詮(rハ?E?)b|qC<菘#壕゙ア}ョ?c!clM?4u=??L碩机オ?p3?ネヲ恍$jァ「ifGホ鎚ヨォo\r|イZユモ4?ャ-ャ絵Y}ト縦 棒*ユ$丼G1?*サタn?*ッゥ?#S+ョ?{o:ャム Ll磔?*ハワцQ?\0???敦o獻乘スォW蠏蜘獣タ?菷p?\n鶏gキlヨoテネ5.?%m5ieキ\\O゙.eル??鑢*>鴇?樞翔糟bN瑁?ツ[?;yH|bウu}vメヘ#メ?カウBセIzイ _舂ュ?{祥梦莫?イゥVヒ拳{ァ?\nホメイァ壘}ァワ探茸T?ョj:ワル?蘢ch?(; ト?2FNワ?\0ォソゥ? mDニラ?敢フ耽トAウ?需ニ0;豸菊ォカ?\r視eャ$3Ow(_トxハ??a\\ウСムk,ZラZ?:議ィkヨキ?*Y;wヨwィ?$ルイ?戯ユコ蒙?鴃紳僖サ0?ヒ?請桧k6?66モj~-?P蜆ル遏 ラ梧「:?ツロP?-.鐔*?゙ホタ??pGz濤FRvV墫%eQ(Q鏈ウXXNn?ォK!8Qンク楝Tシキ6ムxロ?.pv??ワ鷽\Z??7$?朽??*U#ナ\ZァNG・髓??レjKオセY?2ャ。璃萵?ヤVWツュ?Cヤ?モ:樸ュt辭GGkg%Oッ?__Nj・,ッu6 イHタa|Fホ\0?メコ?@ィマ?d?ォゥ、?vス筑Y・ZiZャカヨWF?,?1オ」=紹?Xコ%ムイソYK?6?ヲアキ6ユ@W8タ蓍?ト??族pH?rン「ヲノモオbネ?フd3(タ ?テ跨 -WO奨?*?k?5Xル纎=ホ7aT」??ヌ菖ゥ?KSヷ*セ6ヌ\\迎ナd鰲ェ4{Iサp\\? ??=;????,R芍{T]?ヨ7殫mモ?!\"l菷Bウnマァ゚゚ャ?黄ェ? 碵Jン ????ニGレ・5d墮Fウ?ュ-芫トBゥ?芟?#ミ}鶸癡岡j6?Y、サー┯8Aヒィ=セ沸,彷浚\\y*5??ノ<&??6サケ\"<卻ネノ??ス\'「Immム<8ヒ PェA?qYhカ i潺ゥ ?pk??dウロマeL\')マ\0?ォイy2d?)サ&ヤ#]ア.???OハオッXh夐載バk医9?*燹l{ヨ扈゛作1?1jB挑TチィpイヤyPムz祇ヨ.#KiE\'?ッ\0{?=*M?*?ムkw、ネサ?M傭;q鯨オ駑Bニ草ト3ホ釵ォキv n?!.Iヌ<ラ」!ィ、オFkG備ホ僚??dh櫛ーA#\'ヤz\n?:h騷|7ゥj、カrLロツ?Lq[??(ワヒ$ヲ7誹}ァ撲zヨ_メ戝セPM$ga$ネ+滄?+xeri\"ヤ竿畦tルR?オオ輿v?\rサ?。?9ィ楾ユゥゥ=メD8較、?9_z峙竟wゥ?セモ胝」?4レ(??\0?s。?.$壙]キ卑[サィmロ峺8?[之ロ\"晃?;ャiセLvQマ??アメ?w-弉ワ\rヨbモ/?)リN?3Rp?&簒レャ76鏑?tヒク\" ?8?谿ラ打kヲマ}lDa6サコカJ(??Nk9蠢メJEmュ?QlヨqI\rエセ+「タN゙???ラャ/モPラng?装xレ>弖ヌ?~゙゙゚Pモ4X呎}貼\\? 褫ィ?2~ユィョロカタ?\'>浜kロ!?8ァl\Z?oィヘ|ォёフ糊ャ:ミHマ饐\0.モ檠ョ?ヾ摺銛ナt?nマ祁Muリ?\rI {R1?\0=岡-フ??O?\0??エ?。???ワj6フ_%?u妨S懴疱9耆鑷?ヒ熈Uチミ??ェ.ミ5ュ・ル錫侵ネ・F絵\0rJャ限z?g?7\"?湟髪8ヤR箱・()JJR?ユ?\0オnォy」?マ}]ubPK-ェYカ??&? ?=?6。ナxWヲ碣?リ\n?/??\0ォチBtマN?nオ\r\\ン(Q臧?鴛テ?Sト@?j?煤!Nル?\0?ッw頏?6wメ3b?カヤ$∵ミ{?\0QXw?,タノ耙d?\0メ・?C$イ?\0??;胖ィ鞍?b9マ・{韆\'&ミ??宜?\"ャリ??/キ;A?膚;?ユー~醤un「?」シ\'タウR誚ワ7戔¥c麑??コkGヤzM4?j贍5・MJO\ndチbォRTgモ\0淤ャ黝Y_亰肯?鼻W#ト9?蒐ユチ?\';?h浜ィu\n\\ZhPナ-チ曦b楕゙T述ヒ?y>ァミT_Lロ:jqロ|ネYw,yB・dr蛆?ホ}{U檠?kI置G壽0ヘ\'佝ユc? ネ?jキ「+$?ォy?q1?ヤq直wワ後?ョ溪ミ??#_リヘア゙K。g疋q,決86ワNx??ヤ?逮戯・稿?#?@ワS鳰y?5s?エ霄q?-J贓ァロ#B ゙=?A?ク?Unメ゙S,ム冱92I,?? |ト苜カH?3哘?#ルウコnhcミb?xbゥタ^1゚?<鄂Z?6A} 7{|ェ2゙ァo?ェ?@ン・?+q?擡呷sタヌ;N\0??ミメ゙メリト?ラ?}ア^~mZ5?<%゙キ T?出ュt]ル 莉寂?超~、cト荷宝κホ>オ?F巽庖+1???「?レ「レ・ウハLM$クレサ.メOcマ>壁?靫m・サヨ??茣Aec dTb2ワ苟殕?\0メ「_Rキ橦ツキンx痒ケ★?ホフp=サ\Z軛カコ悗炭ュ-?1・サ#2蝕ホrv?ロ〃Kエー{e既mVヨ1トj6?ヌ。>ク」uリ+?>迫0エ?#x゚攅??マq?3?u4ミ? w頽欄LAf?\r?<b;逧皚?ャ:DN!??Uヌミ゚zヲンkニW⇔モHトS(\'モ市?\\sVQl??ィ??-?.參弾o$ッ\0ロ鶉qヌj跡z榴瞶rTyJD??\0ソjラレN耀ィ・ヘユュ籠訶幤}6?~暎レァ5?3Gキー孛瘋?(フ?#遥ニ=A??J1アgN」ヨ\Z~頻?Kii#zウわ?>ざァヌmJモWメ弾ユ?瞰?ル倦ヌケヘNkレN砿スンナナュテ墜エ|瀬ホ8?・u}>{M,Itd゙.僉?9+焼8?vx?昃フ萬コ8x坿@6?#\'ミ?ニクー?4fF? カロpンニ秒?マ:lj:ホケ5ソ?立セロ}◯w塑B須?SV 0エ穎ャ゙ア*コHクl彫}マモクッ??ヌヌ2奘゚??\0」O ?Hト?>ツ\"コ?サeL? マ???]ネマnォplO? ?3ニ@?オP4xdモオcムゥQ\'?m爍l??\0浜]0テ?n\"r、鯛* モモ常^レ?アZ\\HXユ$?bナムθ繿エ?\0^qノゥ~?k]R=J 囘エ;Nワー*ォ?sマ?rGレクフ鈑~] I9?5ホ?o偬戌?xヲ\\姙? }k np??髫」v?8ォルヌッ綸{?V??3x葦?8=ノ?」ル.影muェレE゙\\.Zホ@l?5??\Zニー.c施・鳳cHリ\0ハシ蝕ヌ聆5イ?fハニマ葱Xンー|uン楢@醺繕mニ?0トイ7.?.キィqpネ?<}1?+F唹j[マ5?Uヲタワ岸クワ、 r}?]ww36ヲcソ?+?,フ?審@Fxネ=ォ?}{? レLKG暃テL} aノ98ノ筝?L尅%塹躄μ0?y1ル08なr>?ス}ミ-「シ2]敏,゚?6^迺Xゥ<州\rH・、[?;ネホUNTcスVsI髄\r2F卓?<ィルャ i隙s裳ャ2、I#|マ府ニク?7?Sチ\Zエc??xェ]敏LォMhィ]?答?テ籤ク???、???C?[ナ赴貌\\?ア4觜シU゙)e9\"L?Jイ{0徂フキミnャ?セkYv)\'テ?\n壁ケ?N}サW;ォ學俟+?リ茂y;[シ」触オDMィ齧Rサ窮?e誹ンマ茅ミ?-H?tィm\Z~メDフア;? ?\0・Y5ム?\rア朴c夏]ヒョ=q状?Hl?-:Iキ\n9ldc8?Rノ「^%ノK6ケリ。ナー?鄒?=+彝\\テゥZルhZメb゙4アN\nCエg櫻ンノマオk]典Xコnレヒィ4ヲ\\゚ンZ?5&v!6察q??nユ/モW:}柏iーNキレャム?\"kH Ul栂ノ=?8ノ?Hホ系bむmA咤クh#a?セ\0艘?ホ*ルモvM ?&ケ-カオv?墻ゥ%qタ?;G9臟コ!皷.ノnムivfYヲ_(\r隻vs?;?U?86?羣ャ8,ヲi?? ?Q?\0,{?朦k Xヤc??嫺フラb=?トqァケマ~}+オ:/ムンキナ妬ノヌ<ラ&公?>勉k+、{ヲ\nッ曄ョ&顰テ+p=1VL??\0ホrjィ-?2フ肝∨?オHMュレス?? 6ミI栞??譫6暇u;Aノ\rヌキzル_d\'eWQシ??F?旬g?オ。zソZ琉コ?-;NAh鞍0ヒ?$琅??・n゙ココキ~太?%ヒ「性s?}x5「4K?2rレK8ト\'ヌ\\ョw\03ノノ?=?モd3u??J\Z麿m 6b)lウ?Nyマゥョ??[鹹Rエ? s???筧?蹲ヨ?wンヒ ツ因?ク?ッoヨッ}SヤVvコ8}樹?F_?.スア??ェョ/O膾Sミu返?s テツ督S\"性檠cニkォ? ?\'H}M?\'?a ?(f?C餠?~?[-\Z?i謀エ廚 恩?8\'゚N*・ゥyq-ン??s鴻a\Z7$?Ol}Mk[イ組{ 覧セn\"ー{hルケッ?\n~?g?オR%瞻曵?キ=シZEュ?\ZEg暖レrI?9#ュモ^[T靼R畑櫨\0・)@)JP4?シuK怯茅/?2ァヒリ?/yフ^y?\'ロ??kTi@**$?ォw?ィ]鸚エ鵡mpTナヲZレZ[耡3\nフs?\0耄?モムJL?衒?E}?メ」Xl耄?8旁w%?ィ歙ヨ「 リs?ユ?e玳?厖6ン、d.~?8ィ5BnシfBeGv??#^?5STメ?犀D檀「ン阜??/\'致ェア#ヤヤgZk y3ロチ\"」;ニ缺q?5ow??ヒqwng祖M? カ|ソヒ∝?9ノュ{pn=?<#rlオ盆攤6メ[ハQ彊Tソ$.\0\0薩{J螢゙IQ)ケ?)9?g*A ロ?x?ノz?「三r)Aエ2径NA?慵ロ詭鬼qn?ト? セヨ??0ル懽ヘVK{?.?惺?!ー{S\r鶇「#\n?.??,qそ?8ヌスP? タルツ牾?\"チ迷>oAタ櫺リ\nスh衲M学ケ竿?4[Ufcョ@ケ,??X#oメ肪q}qi\rコKコ\'ケ $[ー\n。??5ヘヘBモ4ォ#コRモュロ? \\Dタゥ\rノ?Ejヒ#kト?wユ??9?モ齋ァ}、u称ネ授ケリネF?0\0?\0#ラ妾ュ透ネg個トoニ?「」?L?リ゙J]蜿jコネ#8ワ~テケ?HK幻]設+|?ムヲX?ヲF)?\n[?Hスホ+ェ?贍。t淵PI\"ネpA?s?qYs~?+メ^i?+Giク\\ウトU1$?ヌ\'ソoJ?カカトマ狠$?ノ軫9テヨ」.nュ/dX゙??;A薜ソヤzAレ・h\Z゚ャ・セーア{;?2ZM?$?8?Αィチュ+ヨj?レレxモワャcフd ?\'メスヨ繭ゥ介\\??\0?#\r?F;V埆ミn奧?賻:イn9瘍\0}*?%ルV刻?1驩?+互H。B?8マ骭ヨNオ。セ蕉Za吠、E4ァヘ$N3ワ?\"ュ?]}・ス?\0Mル靺Mワ厄 稱Dqm??>オ龠滝}kO鋤[屑<<2カ#?>ヌ?8肭^_ユq<ムoルヲ }ケ/ザkー\\Fヨ?4bi?クE6チAネ8?ョ6邦lー4ヨ鍛? ?*sエ1テ0?*1ヨk=v;^ェイ揖?RIW\nT7。$杁歃Vナ\Z5?ヘ嵳y\nF?\ZCェ豚?ソ怖、葢?z倭榠*?(YL8ヨミ蕪ト普Dル炮>x\"「ッホ?5メ」@粛S?GコBルニ纜後キoZオ?qe稚?LツD゚ノ$wタ???ヤ1G?0ネ@oMンユ?鞘・D]ウn茂?莞黨KOオキHフィRW |ソ衛?~U9 エク湛?\nI?0MクfP8>リ蓙ェス9ゥ゙ロ?豎?陵#;、\n$c厚?V磁エコサエシ\Z{絃Eソ*{釐ヤJ/存,球・?椨齏MB+msM?(?4j」!I?・EX?M^?゙z短ヌ5ケ糧aトe@*。@衾0{ユキァ?蝶?\0?ヨDキE%2サ旱>e^?レ」?I?カ[?\"エ頴&Nヨリ舍タタ゚ュk\rjG沒\Z謎逸>?.孰メノ?ココi77hP?\0?\"==2s?戚ハ\\食cチnOoスci?$V?。hュ3*8\\?\0褊樂?J便。??9ワJh烋}ェr?ィエャ下キクケ偃\nロF@珞コe?<ホ+%bH?v瀾sワWSDフヌs迩&ケロム\rH\rサ@軟k\'・t疫笈?g??ェ?\0=Mc゚Fニン?ハF03霜ル゚\nャ縷耗?ナミ゚ur層?!ハg 戔ヨ?!ノ?/hヨ?:|R゚4ラv??Dルワ??゙サ:]m#ラ-m>V\"ヌ?ヒ墾ンアホsマ躱痛hmЦ ロ 、サ??# ???Z占~孺vUケk=El偏ルbカ 7ツ?タヘmlヌル}メ:m岑uオセhマ?Zアレー?\r?キュeロ鑿Bヨ窕ヨユ緤 ーケ?<)?\0ヤフAワ、qγ?hン?」鬥チヘト??9YH酔?柔ソo・K??[ 5メョヒニ6?@s操=ウ?+カ1]「\"ロ」ア」レ゚?7短ノ&ヨツ?_??ユヌ・娟y!? 販チカo9? マa対スkZヨ椰Eimャ1ロX妻\nネG8?速[ホ」??}7L瀕?9?!(゙lN{O#カ5ャxナ鑼^uロ?nマn?=?!?Rssrセ,?F@ロ飮ラス_ラレヨ舉Lノォォ[ゃ#[u%0Jォ@xマ<ユ5?穃Nmb?b?|ν稍ハqリ恠勦謀7Nオz僕?&@ロw貧?涕jアヤ抔c・i^ワンx nUーX??ュRンgィ鷸惶\\ニ??\'偉qアO??壅?コ?ユ?奐亊・圭ルチ?(X?,=[??cム篥?オメ(舂Izエ?M幼i3-?喘+タW#8?ンサ昿bj]Mwメ?レ 昼?<)v窮? q?;?9ュYム\Zォ鮨O・up、ゥ$碼g?#?fァメ+}WR&レ鵺嫻繊Yモ |ヘ?;?゙ゼユ???kモ?マ?コツ[?V?圏スモ狆?#??Wエ?ハェlユt)JVd崖?櫨\0・)@~v|dユ歙??\0ヨコя$F-M?ゥ$lク aク?3リ獸t膜ム=}\"hk{mkx?エb@|メ?淳{クェナト2%竕舞? チ?\rcワ\\Kss-フフマ#カ?\\?」4W nノ03\\?;?i?汨ェWン侏rア゚4?\'ゎO儻<奨n?7、j--?輔#\'ハ@ニ9$?v#ミヤu??)$V席\'竪?+2アc?\rXy???頻鑄豸麑ニ?_?\'? ?ケ?9爲ム2?tレ?ワ,M擺m購{ vAネ淒彭Uk艤N@c港pX* ?-?x#セ9?1ーT唔?sgtェ? ェクHリ>WUz恍>ク?ユ、ン鴾?6ラ.ミ(O:リR?ネ ?c\\*m-啣「j\n?6gハサZ7???cロ?\0s勹\\」ヌ窩舸?? 鳳ェ?托ホAマ#゚↑リロ鬯Q?乞8マp3?ルィ{[蕚d樢Vh?&U??(F2カ3錫qQI?T?・o&モ\'?4ク゚PW?;@#q\\牾H\0洫=。:#ゥ5椢ヤヨレ?橘fmュ?チ??9ォ?SOuwyor?マlI摺\' ?緕a゙[靺ヒケケe斧l4\"3チgc>?豸RuRDJヤzkY?/#ユ碵\n保.璢暸醺嚠?9 K?ンニ-#?@}〜<ヌケゥェヲ側ョ?4ーxヲ? ォLタ?9#!?ヘz?.\nワ?4翠Oe淡lgセ\0Gノ豌??イtナ?c巌x珮v杵轤H<??箋竒ラJキ属装T??E^゚ヒノ肓?}Tウ6pヒ%?\rE械眼ピ?=@?ヨャ−]?詬M?&H?2gヤ取ゥ\'LアKヤ:サC?-シW?[ト6/ムスG躡a?Zンo・?8僻BハチI?ロ5ヌ]魃??ッュe~メ?8???ッワネR[{p?0\Z-ルq??m現メ荼鈷テ\Zィ??*?\Zヒb痩-?3?Vァ???QF??%メカ| c?!?ヘ?\\?OE速?5hキ7WVレ克?ヘ?+ナ#d揺ネ@ス?\n=ニx?e??z莞絨ア\r~?TFDS?rワ柴?レケ2クiヲuc碁ヲ栢ミスー?6カ瞿r9?k嫋メ^=;?[-=羝6WmケUW~?N}y?鳫ヨ)Cハ惹{ヨ\\?/?%d2リfE池T)\0??*]??マ鯵|61?8?+會」゙Y帙aネ8Rxヘf[ンチ&ユ芳9ワ%朖槁゚戀ォRhニq潸カ?モ[?8ュウkyopャ^M棄GカA?キュkサm:Tヤ--&キケ單鋭C<\'*Ow8?ナソ鼈狎[9オ;{Wh兜宇ミAチQ実c??]p|VノZ;~\'?嫐z4?9R?\n?谷7!Inハ?桀畜vェ#]?7??j打ヌwxNネ?7(マ厮>暝zfサソx馗Uス?ク鬼懇UH|\rヘウpn1? 炳転]mュ\r]!鯱/M[ ys?\0?榮n?ハセ9チル?ェチ翩」?覲ユウユW???樢XB」テロ?、?_ケャ霄O・lV??X瓲7s。ニX?泛ホ}ソ:????蓐]CQ属Z6h「FツFロvU?0鶤|エ?サュdGsィ5セ無???g9ノc鶩Oェソk\'カ^マD^Aモレ^??0ナo祀?3u+0ンCカ??yロ?<2~?貫ёF}隲フj@チ9?ヨP??ァ~ヘメEo+3ネェyuマ庄ァゥ]ン_j}ト;T?リ?翔羝テeキMス:岸ョy/\"V?*ムQI゚nGqU?ィヤ疉nュ。?9ヲ$ ?y8?]\Zヨ。0サ聞 昿H葩ホ6ィ熔Ojず?鐸,サ幢饂ニハウュ愕9&?ワラヘス???゙セィタ??Xタネョャ染ノ (I\"セm%ツ取?U?イIオsヒ壻ネ囘VワC1托_d誚(B?r耡ケェ?エ?q??レVN\Zノモ澗?4??9?ゥ$チ?<ーォmrト?Aチチマキa轄rラ#ゥノ\' 綜I?\0ュf?巍ヘy$?aN*=?マー[ェ脛?>タVさe借C@\09ホョb6]」9篋0+o臈:?$ヒβツ繩ェ ゙ソー~「カ?Zリト\\?\Z=ナーリリCG.~ソ??゚U???Kt湶??\0鰕_」U鉗_勁z・+ツ櫨\0・)@)JP料臺.!攸ヒク?Nj縉?Q?劇涜マ?ノ?姫韜...d噐圏Lマ#湯フrI?mO?ヌ}ャ鴕ヲc ノ:エ??\0???a?>8? ?QY]畠ネ>o・vチ葯゙Xヲbゥテハ_~宝w?A??2\r2?m?、SオDK\"7÷>」ワ}jョ預?\'ャ鰛ョ棊@?シホ?>?2u;v%!苒v}?オッ?tワ[J?5?Y2 ]ウ?3?+Z?=eモキラ:|Wメェ$?蔕#刊ロRzeャ?ラ\"%+ョq皿giロン覈ト2\"敷Frテ??X螯??ィ写ン?(繿フ;?dqリ?須?奐ツンP]、6?3ノ?;I30苔リ?=0{qナe?? ??4?ホJ「裁ニ9ヘW?ャtm^kヒ}:dケ62,2シg>b3′聚ア>#kSョ?m・Kサ?シ?WO?\"ニ&#0?9c欖?>?鰡(jメFヒlーナndf9\0?ヤF?#綻{K?タ??楝 軟G5ア?6zハユN造サ+:,コ坂套?業ナニ =サVoマtソFjPO%オ峰ウヌケg衛?エ\r?)<需=マ#ロ5?_脉?ヨ?-ュ1jモ[?-U?}P蠍゚Z?6H?9e?udヌS^kw]=q璽ィ・弃ミ??キ3gヘ?08鉈Tメ。K=\"dぷ>aルホ8ネd1斃ラ?\Ztフ%[zコヌ〆?4?サフ2s?1]3テ4nfイrH??\0x5??,I?\0ネ ?\rzmモ雉\\?66ヨvヨイ Z}ナ看?A?2}ェソw|ュ)?969\'*{??ォヒ$2ホ?m。s゚ヲコ竭Fソ臧「ヒ、屎??セsレクJK9ンノwョxレyvzc慵\0ャ\\カ蕀GメュD\0ヘー/饑_ 図s_ネeハV??ミCセS?*/>ク?B:ヌ膝ス}ホs_$*メォ?OリW0pリSリ? ;QW ノ??リハッ8$歃ラチW9ヌ\'5マG#歛TeL孥父CO句(K}+ェH゙゙?rビ???ロ般\Z5ヒ/9\0?竰チ%、。ルrs変9?lーシカ?vハw。ク?P?#?マケ}?;H1ク艨X2釡vqTh道?=壟+ラ@タヌ>だ@w。B@?ラハ?X?\"Yカcマ?\09^??[マ?\0S楞Fォ??>?\0?餔ス??\0ゥマ_」5テ艤ウH?)JV?)JJR?R箱?/>暈Dタ?&Zレ}/m&渫コX?エ]ヌク?滯胄ェEン?‰7ィ?ヒgヲ?Vヨ?$G??X貍釣翔<{i┳カNH\r攸ョ\r}??I|~MHエ~ミ?モュシ*cxト」杁??Q湮オ┿サアュオ??\0愬??41\n?ゥ????1?5ゥg?。#ヲレハiI)GU?#ク?WrZ0ハ2H9?キ??5メ?+??)ャリ鋺?ォ[?坪ァ-?:\rュ?鎭y纎?傭.ZT???マtヌ チ?ァ??~哭0@ラウ^cd?3?O?*r\\コ&砕ゥZマゥノ\n[タア妃Zyw宸」?y?\r?跂M黽者sヒニV?リ*?チ濺wゥ??>ソ\r筵ン?棉ヒ\'暝托懊?標セ オ}M5嫐酌?hイN\\焦橡マj續・L#Vコeェ3Nセムメコ「N「鳧?・KK嫖a9 ;M?;]sリ??AヨZナヘ?$囎チ?$lQリ恥aネユjメ企92ヲ襷*BL・捌欖マ?Cンeソo栄?トワ3タ;\\R?ワニソ9蠢ニ]?\0ソ?Hョ陛ロ<ムホ蝕誑$姙*?ト(?粧ォv?ト肱ェ?O1?q倣蒼マッュj孳ンoa?姫聡lgケ>ユxメ蠏オ 桐yッ\ZLQ?*ッ。ワ=???5ヲ\\?)?蜘T;JGフ?ヒ?lWmヨ殳ー??.1クvンニpq\\4??ヘエ隻姓容R6?<タzカンnカイ栂ャラN1$[T?鞘胄\')Oムチ?&、「?+ユ]Ku}\'ヘN|I#?e\0ャy?輜苴繍ヲマt礫“!ヌタチ?肬Ybx??,?.?{?5フカニ ニZg9y[モ??ラヤRJ藻b「ゥp曹x?pヒc$d?だZ@ラ>H ヒゥワヘシ) ?H貅 s妃ケVニAネネォホ?テ& B?\03g?モミW\\_?ヨPカ? 堀笆Pr゙P?梼ンサV4寂」ーノ?アHF+咯ヒ??pロ?cハcU.チTO?ィ「\Zウg霍Iw・オ゚霞?Gmサシ#?\0j鮭併%ムn\Z(?エh^Uiv8レヌ?\0}アPン#vカ? \'却?、?部恊Aマヤ}kキ?ウュ{Vナvhc@?>吩?yク| ?ア???潁勳巵?スオケ5防 Af∽?\0@ェシ肉?T,? {ラTI#ロ鑚ロキq[ヲ?N・騫-ョッ鶸「4E播?\'8c??卜F?#ァD―i\Z?ISマ??O慨qッ?/:知$ゥモ?ィ鴛サ+0 ?\n??コ5$vヘ}コ祭?bx膚ユc$pqヌlラ\n@]カ?.1?cミNフ? 白%レ?フリノ?,0兢c\'gユロko$ミeUBサ$=@?)僑?ェ[??7??8ルQィロ憫???滞ヌjD?7H}?~??t?]<メ1d?マ??)ケ咋mg?*ッl q?@aネ0リマオ}叩ネョ?黶リホヨ、-?ヲオ゚ャ???」 ナ?3D?f+?\'ー?\0ア]kオ[ィ?鴈ヒ菘ツェ9%ウX?4aQルT{3r>筧(ヒウケKm>E@股蚶朶?隆ヘ/?+?艟ウ??:?/?? ??\0Z?2JT#? 切?Z」D?;U許~?;((ミ?\0?セe_カ撞?FJイ?.jャ盃テ線\0q?+コ2J゙N8???pマ餞Bbキi|ヘ?鴉X7D「?#ロテ??\'メQOuY.??・エ剩?D?竟~s~ノ6仇??エn?祐6メFンカメ?$舟ロ~???ョ#?G。JRー,)JP\nR?櫨?ラ?Y??\']コゐP??フ??Tョァk$ウMp _\r」゚? 」湶?溏Cmsi??篤R;ネm\'?銖?カ?2?ク?矧ラー???p蘋?,??%蹉ZYテ+愼ラカ0ソi\"゙D?=リサ??ッ濺vタネ遮ウコ?レe?m?\"レ[ォZ珥ィ唐」?U=ョ」0?(?4早?)ニ蠱?+キi_ヲf?*・n$Uq絃? タ??,ヤ児i?\0ハ.?>f8R コD]鱈?胙?\rネ耨5イコ~゚Lエ?サィBFトo雲pニ ゚タ?ィ?E\r\0 *サgoッ#ソソaW??螂鏘?\\ノゥレD? 7)ネレ蓿xヌセユ!ェチkウ?>]?拳、熨゚湟コャl・}\"?6喇ネ1*蝮)f;モマzネ髟ユt?ホ?-aケ?ロ[フO?8TrIン?アェネ忍?イ?1?\n?0。??檠?d陏、Wz\"駘嫂ノ?)蔗=ウ桎オ物h?Eユw6VWv旅AZo澁ミ ネタ!パGスV?車聞外胙葯sア??ォJJ?\'tソ?イ面y\\慶?Wニ}フ?.テ??~\rヘワj? HBコ?」?\\?70衡髻ネBア??z」,rミ・?\0ト?森? (9>?Zロ=1ム經糠X蜥7Lx? テレ1怩[ム寃梢jホ柧若n?-??愛ト」?\0d sニvラァ?i???AwョO? b?課{トd(ネンネ苔訟μ宸ム、?? zr?メレ;ロ曳゚,?! ヌク=?&ュナ踪e君BG?bO}ソnテ?aゴ+{ユ?=:爻#テ柝ム+ウ1エ?1ノ?ユWユコイモMケ7レ公sフ?Pン,P[ヲ7aG-!ハ? 恥8ッ9ツsvヘ4Ju]ナ?・檪叡l0\nェV゚?##ソョjソェマゥナモr?-「、Lヨ?@8fマp=ァ躡竹Pムオ?%ュ?ュ|ィhヤ\\ャAラムs收゙ソJ」|d黜$ウ愁ミッ.ョ??タLe?!マr・i rエ?\r「?3誘ムョ?5偽?]呶リ.?ワ?\"ァセ\Z?\nノセ[h??!S.?, ?;?ァ゙オf、D憩Iv@@yヒァ\r糟?sX?・~o-。エコKyc>UY<ワ?8?ソモ耀ァ゚Mey 岩1ネ??wD??但bム@N戟キcケニ8A?lu9o$鵁レC#?\'福\r擾ュi v!?y N?}嘱?J儲 \\クス?+欠ub;??スWnLLニK}ツ3ロ\'弖8ラ<c/?zdfニイ~Pコ?tQコウH適サH? ?ツ釉」エ9?5%廿ヤ.\0?+n^レ陜CモノN愈イ・e~\'\0q?{U\n]トワ a胞?71N? <ヌxQホ\0\'ー>オ肄?聿??ム?幵ヲゥ??\0ヌ?zoTセモd?/3x憎Jイ蜃| ?/NコメuK9$セ阪蛋朱タH?1娩゙S?=9豬OCチm4ヒh慮ホムフ\"I? レI<~筝\rャ3ロォャメDカォ鋲? トc*@??X鶯」ヨ源F珪n?+?Oシネ、ナ W@ヲホN{?bオ゙几mア(?)?。$Maオ??・mD?;オ疏触 p_ハ6????\0bオッナG記ヨ?.沙@I岩Drセヌ゚?ァS#i_チ土p?リ?o褊ツ]?ハ ??暎Z/ャ?ロスV?Imアフタネ ?蝕?澤フ靭ZN。ogy,浄フタ;舮(@#=ヌ?博ニ{「?{?tS?ユ?R???f?6エ|Fウクv[ネトx1?;W框ヌ5ムケクhcrP擘⌒\n直?{Xレ?/rクテ?2[?ァゥzF}Fエウケ?\r0\\^ロ ?H??「I ?3d?ネ?=?苟價ヘサキ?IpB綻W?Gタ?m。ケソロ7?!|I!@蛔ョqワ?_|ヤニ册」]_iー:コニ阿o\nR・、*ナイ?0?T?=&イコ7Fモ?ィ,/oRツ[ロ゚レ?hムネレケ?ナ|タ wゥ薊?A\"イユ%?ハ_r2?\0.\0?ヤ樞ーB???スjロラ}ィt郵_?盥ケ壗1!?)A縦.虱?2}ケ?*ゥh拆v5hエユ「l22 zzW;erX」 d戀シラSキゥmJ7ケ壺ヤ3菜?eヒP?.?種&?>贍K\'竒GS ゙.ユDー 鶫ヌ|?X?.?{ク?.$トリ$/>?オy騁メbqomk2オリrテカsレウn?ニニ??拑8$FUA=?湟ケryY瑙bn?\0?呂,27セ換Jkイi娜瀕昇ニフ??讃j}\\;鉾゚験聳ョVスC「El?rネタニ・?NO睾yシ{T^オモ?S??,カ$0角;脩s?ュェE5アq??ssZoソ゚?スZ躅ス擇榱・Er?p?^9ャュRE葡8ャ雛($9?Oラ?:轗モキvモ。?O?<◆\\?vG\Z[ヘqト1*医゚eロ??)<Lx貮用vuB\n*離5ャl4?ヨ??喀ャミシTc?9ノ?X\Zm功7?ヒ&酢テ枳\"ハニ??セU」?砠o\rTg??ゥル?\'Pウセエ?$? eV\ra蔆\'?ヘCマ?.惴LSKnハ~ャュメロN?d*@ニッレWI[??ュu0?1Zル+??ワ借 ?オ]芒K}?\"z?Bセサ? サィ?[友?dゥ岸?涌i.ウK\0qィU靭?^透リルリリ?,e\\Lサ續? ?{淇O]_リk==u、[ロo 9Pル?ニ{?ョ\\宰?トュセカモ4kォ)gメルY-紜?亞銛豬旡ノ竪& C?\Z゚J? ヲメ・i\Z套SホN6燼?Gレ「5?)奧?-md睨??!#クワ}ハ??Z 、、N\"mンロ゙サg俐゙)e1ワoュLノg~?[ャV鵝ト0ォ??ヨ。?0ヒ;[Gク?B1?95k ト層灘リケツ?ヨアn擁?v8セオ?6U6ーa憎Mt???6yr*券,ュ?2<ェqサ\0{滾ゥ?ーCホ6?/? 嚴メcg介Yキ?!@5マX洋ア????篁゙ル+」o~ツ0スマヌニ蕨?壮+asチhモ殤XWセ??:?\Z^ェ?\rS\'mス雰ケc2;キ゚?\0、kル?吁ル、z・+\"ツ櫨\0・)@)JP8?コtサ媽??1ッウァパi\rg\Z?フ?モ 廠ェァLワC.?-ョU rZ*?Bッ条+i?\0?\0メd}」z侵ォ魅=畿珊マpテ?>X??\0V秘kクVレワハNユ荘ア゚k\0G?\0?+???.X?8?F?M?:?24瑠tJイェ(mノX?kMンロフ壼?乢*hミ?l?? ?\0Zン?\nコ?;ォqァ\\ync醸o焼蜿セkォィ?zi+ァD屶エ卞締.N<2}ーN=ォォW劾*縵F湶獰f辻u?,1ロィU署?9^G藕/モ?Kwi[7yミm2>??Ak}\']/?:bp?ェヘ?sヌロ禅ュ;K桎椏蒟?;」76?>メ\'プ?8ュ!藹m羌R鴾海j?\"ロニ3DQヒ)瓷遏Nテ?ィヘn?鸛Nby-?ツェr!P<サN?ュテmモV7レBュ鎮mョ%ゥI??コョK/ーq?ユ\n?\0。g?eシ榛マ=ツ孅ト2マ%ス;|VアヒルハMスニィラ男6?強ロ杼輌f8$洸<讎:ヨメ[?/?゚ム?$詞d? ?*?vs゚ミラU・恂スC??コ?カ ?リ;?鸚ョ繩?モ鏑?\'?%&)# ケ?3,pケ\'セ9ンV入織6都ヲマ」M褥オ?ヌ??3ホ1尋櫃餡oq}ヌ &dヂ釆3?;忝V=スステヒVェ&yホナ@99ヌW;ヒ;ヒ ノャ、 ?aシ2|2テラロ4iY$・楹{ァ゚テ2\\ゥh廩璽#p?F?6カ扁モ」Rメ?\"キケ枇77?VUQ?8?z?R2HH輌 干h\Zヲ瀕g2Y\\Ex?%フRス ?$(マミ?/燥?/Qコ>0鞏Io%シ6キS齬\Z?!?#独?8%W\'\0gjAp?彦ユZXニ9\'n\0?&ーP?#Lスヲフン;ッ:r?擬ヒ9ャ?」オ?法ク?ヤz釀c?フャヤゥ壯マニ匚オ(ヤリイチ篥oq?2?0y聟スVzウG?E?l襯+猴ク?.@f鉅Iヌヨイ4~ッ[w材?63!!ン?ヌ?\r?>オロァkVコ?螯PAp螂∨d^pェ厮aヌ|ユ甌U?9ァ?」[eキ鳬oソ?!ニムタチュr麗gfヨ務ァ?,廏E\'rc \0Gワ?8カ5ス.K-笛X喚衄Hチマ=サ???|レn。\"r?3ョF?\0・z?\0B哢x・゙卉ヒtp>4\Z?6蓼モォ(街セ?@ァ<\\?ァRtソR闥エ}Aァ^リ\\\\チ翦.性2?<枹歃柬K磔P鰡ュh=]~阻? 2ホ,Uシム「ウ) Hタaエ?5;?|W?oRロj奔$?\Z}ャ^I3?冒KI?>?マ5?.I%ッ樽Es才租}ト ニGヤヨf歹0ア{??1glO鰍R・r@ホ=ウ?監ヤcA)MフナI炳}?*オ?7ム獨n筝ス=コニメノeP訣ケ>??1Z苒?゚Ke$ヤJワ0黝゙。$vqI+ノキtqdィ\n03楝}j网?&黠゙榜?M?ョ?輒屶S+c; 螻?>」゙ッ?R]7ヒ髢炊 \"キ?\"?\0ニN゙ョ坩??D??擂含カ?\"+5ヘヤ? [ヲIル?I,オxア?LモQナ\n_ケ 6マ\'MV鋺Wo荒?;ハトpE瀏゚?オ.昧(」i{{Fトラ鈎対;*?$ヨォキVv退兎!?,ナ゙~ワ対~オ?))hタゴヤ?8ヨ9戰+オB3?イ壽Cルレ;ヲo?4スワ;}ス~オ7メ??゚?!、f[j隣邸「籘\'刳p<ヒ?招Djミ鵺ッハ\"サ曵?\'eトa亳pFNyォPt喫7カヘトsロフロ歪 彡ソ>オQコユ?幻??サ洞?升借??#?ル,オリネモルニ5)Jワ~\'O<テ?aN????ワナl哢??dd画Pp???J[{キ?sエ、?6禮スHノカX?wコ桃クノ$?;ヨP?1ニnR゚? :ニァィ_k]゚ワIr?1,mU98Sヌユmkmj?゚Pサi\'?侶司 ネ9)羚|璢?、モ湧?4蠅蓮メLフ、斛?oキon?\0J檍ei\'Rレヒゥy\"詑嫣\00假?ョヲ短]句カゥ}kメ?mヤ1]aフ逗2ク\0c\'ヤ?ォソァ?挫サコ曰|ニpp0NqマヲG?9コ幽メzやト?ウ鍛T$crFH?ォ\r?-ュ鶯ツ脆-ンゥチネ??\0イ1?gk?\"uィF俯淅?\"Zv?\n?レトg栲Gメ「?,[P-*ャ奪サ?eNN{苟欖?+躪鮃wS4コx{ォォxB?ィ |v${?ィ:ナ゙。ミ乢k[ァト?\\19?#ミ}\r^オル\r満」ラ?,??4ヌ#?8ヘkk吩ク勸%西ナサ然 孝藾榎3クヲYシサイsヘcカ?\'佼」ニタHゥク2ン樟+UTタ漠pャIヌ$ヨ+?Nl?Q 7R[烹bbサ壬ユ?? c,豕?)?媼ソhロ?ト?Eワハ?フ?$丹゙サ5Sr?!リ1リ聊アI燗Xユlア???q|=麥lHL融クオdヌ\0C\n09?鉚ッOヨ??喜蔦?鳬Bイスワ祐ノ曇???Uュヘ^\\ンノ坩?)Jゥ\"櫨\0・)@)JP\Zォ?ム?5渟?羌ウ頑贅(ッ冬ミcXeI%u-リ?Nワ草3?tスタ墜d??降場ヨ坩婦・゚ナ綺゙@?ヌクョ?Jーネ 撃y5?ァiラZサゥtン?ノu・゙ヘcp?Q?7(ナI\0装8ネ菩?%dq9?レウl?:ソ Vサxs\0Y\0\'98?チッ@?oォ駛%U$ィ??オ?\r\Z?)_?壁>_Z゚?5_垉?.ュー d ヲ28?+ヤ??0ニ??ヘ>ヌサ エ?ユラHZAェOzカネQ?*ネ゚>谺粐姫申箚剖2[?レシオ9G」fャミz?キラオi.?zM?)゙語、ッd ナ毫?z菰:目?;事ラ! .\"フHToオ?#?マJン]K・hzt?ロAク\'?ィ蛩sZCィョエnイ危Ufば?ツ6YV $w? ヲナgpI瑰ヘzfイzメ?\0B慌ュオ{m堆s?9拶ホヘァ\0耿c??@ャ;g?Mr\r噂舌k?FH8?>ユ゚ユXFアマg%メハTヌqム7軽チ?$?)舐=ェソ?,イ,?;ナp8纜?G?+ムJム兮ム~Nラ_%「マij7?3m\r淨Gb}ニ9?8柳?C!オキー?ク慶}ヨKmf*Tヒwo^}jヲ?.tヤ?0[?!?W\n0メq黥ト夛寿p務ノ?カjヲ^ハ? ツe\'=?オ#oイI9$?[?\Zm9?アャ笛O*Nユ堂チノ*yュwtヌW^[uZks??9Mト勘\Z\'ツ;沌市?ー:[F??[ヘ キ?!伸ルH?!}?>筌?#エアy?K辨?葉E dq?0?ト蒡?Icュ\"髣 KF談x ?クコヒl?キキ・g?>%シ赭iVVE)&?vqP:6。>・4ヨゥd??攀ルヌ。邁?X4?Td]Nヨ?+?ツレ?(A\r≠ヌ9?_ヒ牧」Dホヒh?0 Drホ筴?゚mレMO]??セ期Eスケカア@?ナ\rβ\'ク?ク?*。st固?\n=?ナ紋d悔N托レ?マオdk:R」xワ#ッ篇ホT???mBソラXヌヲ?マ檜カ$??u ッ躯+ノt??ムハキ?&??OュZ1リlヌスkq9栗衄T?縦?冢?a,? ;y^{ヨ=衄X殱?旅 HVld??-Q娯、ゥ厰Z%ハ井F゚び?,qサ肉??5享C?,?)q「棚N?HSキ*~ク?&ォ卿:゙σヨLZア屠$ェ沼R}?キ=?<マ・蠶??キヤナ6エノ.、カケメァs{i,ト?シ?ヌ?8??M?,-ヌ\Z 0!??=ソ・p[ワG$紗#ー+\"ョ|< ;厨?\0_セeヤZ|゙u ?Zン|$\rタeレsリ$?ンサW雙セ\r#6梔ョ「y?/\"[ルn.Q:ツョ6s???゙」セ#ナiェ餬Vーi霧ラi?y?p¢骼獪カク?=ァ-?モレ?ネ?ヘヒ(9ネU8口●\nツ?マィワワC}?ル゚ワ]ツャ辰 D?3タル?ウ徭]x??エ^[拒ュオ?胴カ?%シ=J?3f73)\'+ンO#兼マ・Mt%セ帯zスヲウヨ\ZM゙・e?+o帯ヤーA#託ュ?奨獪コ?\\:kヘゥiイ|穗蕪k)<図楯π3Rコ湘[ェッ袒??\0ェ&釣Y朏{ X?窯?ロニH?5?~ァ?,+_?營ウヘW?讌u-コ3ヌス??Jスt?8?Xm?29?\\?エ2G?U?\"];Pコセ涜オ2シエ (r?7~O゚ソ?ラ:?2+0\'\n?6 チ??\\莞mR[k?ツI?;「ネT?Hロエ?3タ?豎llXG&。,O 0イ?%<シ?(??~9ォ/ワゥ~?ュヌ」キ?0\\,ャーx?ハ痍ヌィヌ?ネ鬮サc+ワCiPF\n阿<+゚?ュKbm羯カニ搶牢皚ケ;dィ=?枳?黐ラ? W/?蜑U\'?アヌ蜴?8\'?囂e゚]鼡-*ヒU勁Yヌ?ワ@ニ~?Zソユn??シxヨe\\eFメy?\0ュH?v・suekoipZHm?2?リ>゚_・Cヘァワテs$mLjタタ?WヌaIIZ:??ァモロ?icEd??+ウP?\'ヌk3mteチ??+ソMアロi9ケロU?c゚=ェ?イ/e~RYシヌ$?&?\"ロトヲ>+ッ刧uツケワョラレy>ァメー?9&ア冲u誰Iョ界sヌ8ュ屑5h?O?、エサュゼケ&?ipO!径O゚ア?ル%Qlイ??闕?霓ァ|a7?:゙ヒト?(ユ7cモ;sS・yfツ櫨\0・)@)JP\nR?シ????\0レ ^ゞ儲Yaォロ?37栗莫v?2フ\0>?Wソkフ_ギ?O?Wニ?ニ?K Qaノt?7ォ3轢ヲ\0 萢ワz?y>゙dハd?(ム「Mテ ?yレ ?5m鐓V?+ユまー庁Eldイ座}xゥ:y3リ於\'??ッMサK3gォ@?.?a縷゙=ケハ??j?9~P\\?、璞?豬トカニ7#\r??。タ?9ゥナ36ィ績a\Z軍ナ碾?蘢 ?8タ>暎X?ュ?メu瘉[ト載\r癇A蘭\\十煌?オy?VネWsD瘧?0゚C樞カ=ャ??ヨス-Wv粐? ・キ2?6ィ?4dgzアンサp!B鄒+,挫ロZ,カi?浸ノoo+ P?イ?N>??ォ」Oウ?ァg|ーCエc??賓ヘ#瀑ス?yu錏]岶?@??qキ色A=ェ?+・n:Vm2レレh窗RN?u?渉 ヌヌレィウツO型ノ糺5?|スワ6ツEk?:??ハ?+7ゥuィン??$??2ヌエ1 リマァ?マタ?ー?「6「、ヒ?? ?セ」ナ[:?J?チumェ[黐跌ャメメ゙ル綛dS謠?ーテgモケ箋柯F|_e稚h[ロb?チ,N?>??ェ??ヌPiウャ?zt0薄Y?!#?\02ノ^マ\'タg2\nヲ0O#オvタd壯チe@?咥タ?U峡z^?n/Aオ?{i?]ヲ0 !瓰A 携檎5Mkァ旦G $\nG・hメ超Iウ:C?カシスヤオo P?ー?)!゚q?\\aウ?ァ??r?ャE|V?*ラ\0?w\0ワ?Wi?セ+[tュ?oォ?オjーコイレa$相??エワ瑩;Tワ?コh6コTJ?\\ッフG2\\エ?ケ ?{??\rrマヒY?&オs+M聢エ?)ヒc?リ?゚咨ォW沓フ?&ア?>揀ネ|ヲキ?)ヌ珈6蝕ゥ頸?67Vホbpwキ ?1タニ}j衲=Oッ|ユセ鋲?(嫺欝?&,、ル<侵I豬ッチ?>アig-?ー aカ?s鴆?モコe欒 屏葎?-伐キセ狭城^&o、K?\0サ煉幕?$tセソエーラオ9n4k[ュQ蜴9?テ奄ヲARFrsY??メ7シ環[?;?#Iィタ彭?=?F;ユ3?擧チメキ垓カH.ョeJ??ネ \Z?r\0ニqレエ螯ュ.「d?れC?\0テRx?醴コア}.Rヌ|??\0\Z)ホ\\ェエoクnt6?ヤヨ?唔フメ棚?\'xンマタ?ネ?雖トソ?徼?ァミT?芟?xS?+ネ?1ユ?セ蕊YTケ旨ェメ7c盂_)yO併?\"リZ?サ4ォ吶?3 オ喇?チ]、ンキ閇ネシ邇^;pハォ?z,、ォf贄5;ヒ HdユXウ。8g?Oテ携閑?\0ャ\"?^9l\"\"?;exトlモクc??Eソナ uサソヒ来2I犁F%ニ s?c?=;V叟コGP??B?;t+癪F劵?? qリκ琅\Zセ?#?{-fwNロ?7:レコ?o;???)虹?9ハカNtロヘァ4N毛ワナjヨ?f ?<、茎譲ィョ榕4}OW?4」%?;ッ;シイ?ホ~?ラ?qp5{=Gァ?(? @セ\Z*\'ソ??イ}r+_ス\'カヌEwッセ_鷯/ス篭ヨaлフH2キC\"ア?;?。コォ珸Yi?$ど趺?誅-ュ弁竚?F$アロ?=アヘz篩トュ&=帝?・ヒfメ\\捕テ!>E.pル?スェZ゙゚カヒ詆ヒ\0メ熕¥vヌo|ヤum閹b[5??zy属$p?熬}3V?。RマXメ?\\I?8スッ?リ 鶫ノ?ソュN?<ミ-コ{Vクfクゐu@Z饌b\"Rタワ曰??ヌN? ゥlU%セgf謀 俘?庄スqマヘ\\???\0??\0m*ソgンw」ュ?4鋸4曼ルメa$ュtXウ沙ルH9ンホ\0Zゥ鮗fサョi1?餌ァZカ?X?\Z^ヌ\nyv??>テ壓セ綱溶\"仆セc?9m??\0臓O\\V4??VOX斈g{??Cリ榲?篁#袁*/.險[Z_ト哘エ?コ鱆」?#BdX箪?3ノ?レュ?D?ホHチ艘?ゥ、q?・ヲcB宸図椋?ロMヲル゙ナ,Мrav\0?.゚?:ホY%袋m-必擔KV6>Y\ZンqRJッ9ネ??k タ施?&曰@拑ウケq?~ケョ庚<?袗n譜uNs鴿?軅t?イvmネ蜀x鉐祝゚Yテョ?w」ゥJ求-フ+!UトA? ラ ?キ?チ#ヒリ簡? #U?\r臠\'クコ&窺チ9\'n9>シwュ%嗷v却OイスィZi?3xレユヤレ藤 ? Dh=\nD搾?#メク3荳找[7u)J?4・()JJR?R箱N?ム杖疱キメ゙ 9?C フ<ォ$r,ゥサW法pN9ォ?(挈圈/ユクキ$btルマ???」拏?カキIL!カコャφ=ソ#]?>??i?6ォgヲ?;5=9ョユYsシ(_タ「U稗濛@?ャュ}Z?Nラ「P#ケRョGe厨5>ヌマWIO ?9a閘?ュNリIj嘶レ.ァiハ\0?3JT$?シ?薩jラェ?怯t\rョュ\r?學C!\\エl喚オネ迯ャ{?????ルィョメヘgxュ嫦;n牙9?マ?#?9ヌオbiWmo|%b+x娟p?聲ク緻(?({恷ユ゚ィ[ルEwpfシ縮d醐?\0メト?+。・ムヒア麩夛KTメオ]=4ィユチ?v?ヲOェ??x割メ,ッ?xュNネk :4BTrJ「\rサ?.pF3彙ィ?Wア(耨q_オX4K?N $2I Dイ痞。ウ?{s\\メナニ?N?\"コ?%?哮e$,r\0J($$c」l? キ ,2J?トゥ刻???ヨラ}g、オ ;a%オオセオ?ェッイsェ?8ニy?Q?ァァYィ憐>。cqs瑁ア!?2LEqホ8ェヌ%鳧Q%ム゚u;=Nキユu[ッンア/?;(279?験?ユrユ/:gゥコvhl\r?V4ハ聴? ニ?輅 sニ+Gエ^?」4?8}フq檍舍ヌ・lO?\r:Gwァ,?2I,N\".?? ?ト菜ロヌカEa?W莉-隲??Gィ?アcォiラム・タ+)1ヲワ蒟」a?ス^??}9uァ_ヘュ?ylアエQコャ6?ヒ).?v植ノ?」?養モニ{$X諍??;ム芙僥F8セェnエカ?!サQオ臓8VOFネ98>オ択ッォ5?4ヒ?:+?\'y\0G@ロヨ<ア*詢ェ>梳甜ヨ-s」?ァoャ?」カモ伏M?4ロナYpト8Sヲ9艨゚ヌ6?KE妄&シフッオンΡ嵐sヌ゚ヨカマタ]+Eユ5ォ?#Xオ呈?Mvモ 擇煕チ|v ハオ^ォゥテ4rュ?f>\ZナcЭナク?樸d闕7W宇オik,6m?%?$v焼ョ」?#ア?Ze塞熹ヒュッLロ?Tテ「??Ecァリ?レ?J8?VニL?;?&ォMgァリj遊レョ5 %vX苣レU?ヌソ?C?\0?オヤ檄F,7ホイeK31ワ暗!嶽譬oョ「{?0アX?$?伏ニ?lネサ抱;J+0x??_1ケU|68ア%セa?蓿黍1sキv1涸・aウ?暗sヘi??+Sメ范ァa樢?./ョX|・福??、遜F? 3?8B「v?\0I弌$スs?.、黯悁mG@ヤn,¥チ曰ロF??後ソc驀GJクカXu?1ヒ嶝8?ニリn\0+ヌ9?ヨ|\\AM?7イサクコクカ1テoQn?トgH?c市?P?ヒ?*I、??X|4~憧シ陜 ~?セXカ゚辻З?淆??ニ+Z???Uオ殊ヨレレ?カ[7{kaフT?\"?}3施?アハ?Q.フ?f-需?+?。1g止オ霸0d?#?я??*U?エ驚? P%?ロ?:?サ;s%シ1T銓5ア?/期\'JFモh\Zd釣lFク二0? 雑レオ藤エ?,\Z&$?\0v9?\r??\n2@}ェッ\Z歸tl>ィ?ォ??勵ユヘ狒劍?$涛?PレRO・? Z?,2ヒ ?.#,?ゥR\nカA燼OュSニsナsGup?#ヨエX笊$Wキd岬ミマェ5フャbfiZ\\,Y$?=ア?ッキ\Z?+肅ョ8レc∠ュp?>??テ醸丸ャエiオ96キ?イカmト?\n 唐; ユ.K9狡Z7l?6ワ;gソスUF4ユラノラdオッS? qヒu簓%ョpO~k&ヒィ、若Kロヌ砠ヘ檎C_4ス?Vシ塰゙健H??\n?$エ)\"イ燐??Vb、、レ7酖nィ榑ヌ?声[? nニフ?_゚?Olヨネ魄。ケサセ?$キV%1筧宛?%r\0ワ罅r+ヘ\r樛マWy?葷62、( \'o~\0ノ?ヲエ ]?格????&メワ蘗リ?>?y^?JZ?嫻ヲ?ヤヨ壅Q,3hS[]@▼0ネ|鷙wア系?;キオPッ4m?Lkvクヤ?.??{vb?yレト? ?=腔近?jwュu.?\rフ田j<。v゚ニ冒?m9_ホー5゙蛾H5サi紿.竓P嬬@儕wsエ?>??ル」?阻f?」メ犖Y-.レB蠑サH(=マs??」ワjラf粐gウイ杖Kキ$歸マ?W・コ率?ノ瓩ァルタ?)nムニ;慾T怙\rT?GLイエイキム?I?xルクヒヌ7シ?\0zサ?躍C、k;n蔦l?ォサオケ?8モ}シ2I?耻?ネ。ュ?帝t?ュコCォコVUンマソ?c?・t|顧ヲ?&ヨ犬H緒$(ゥ$?羈ヌ\'=?n?エ6炬qチ堕ィ\0gオp?Eヤハ??゙冖??ン?pBタ;r==?sウミ?eカノカi?2M!!I\'?}\'?k」ッィ^絲サ?.cY「rA>?L? チ\rフSマ!ン*ャQキ?ァョ2I?&ケ?&「?a、魎ケュE&虜ヌ)瓊チャニ}鄂ti壞チモ?;Eケ廡|K???ェ{g?W-N?Rメn6ロチ-???%? w脣Teニ岌ルi\nヲA筰;井8ヌ$?<OスB珠オ{+菊sr粽2Zgロ\"瑯?NGq??oRjヨ逾蛛bHH??9;?8聢ヨaス?。?+w?6\\??\0迺ケ??スYLキ!ァクmャ」z恊A8胄オェTCgMソハM{5ワム椋移ワd鯨ケ豐R5耗ヲhカハ?7?\0S?L\0+菓h U????\0スu゙ホ粢D_トチニ?;gヤ箝Yz肱EノBH???・用卒 ク?ュv鯡? ??ク?D廷アレЯカ3?ケ[:/\',マォE> ネ Wlュ?t<惷マ餘ロdナQ%ミス3uラ?4N袖i?エ∽?7个ホd?リ○?Tォナ_ーBカ・ユコァト;鏘ュエエko?\0苑A漕b;y\"n;Wオk?3ケWチシz・+\"ツ櫨\0・)@)JP\nR?櫨??\0ロ衍?\0z|,オ?h窃tン簗ホY?エトG\"ェ? ゚牾-ルclネ>v闕E?\r?ネt? ??G8???(ァ??4?)ォ」ィ*ハF ?ソ95M?キト拘」ョッ」ココム?テ?5レ%国d左?盃%rpr2q奚>董捲6s迯ォ3?2Y?)??゙+?ァ昏\\GnツI\0&5#?#レュラ6スAhコセ槓?.W?医%~耨ワ・S$i コI@黥゙??\0弍ィ券ヨサ8ェ晒V??%@*ヌミ竿シヨ,,ョ カサ?.?8 q?ユ礎「Iン\',チテc9;崛?Z藺ェ|敕3[ャ謀ェヘш%y?w?e?q??GリBl\Z?d?m‥?爍R9a′施f??!ヨラI=洞S#Dウx%?89\'汁~舞ェリC&ゥ$レ Hヨタ窯レム?2J?ョ5;ン贓6H-Iクx イ60、1タ醪ヨt超J?ュO?エZ|?、?4?\\?3 8 ?\'奨サヤeテナs??%!Gwa?=?8♀ツユdvuqサ\0\07肓\\エ蛯礫{」 m$g8ヌpHニiツ?6tjシ詩p禿ロハ釛TキH?ヨ?7?\0-?--・ugI:HWア ?>ケ?^x窖走d? ヌ迥声オ餅。オエク挺フwナ 緬ポr・VQMS%3cュ療{スロニユ耨5]鋩ヨヨ?-ウ戍代_ツ?Rqニ;ユ?狽-<ワ驀Ch4坊o7;ラ$胞?\0イvニ?辮+DOcィ?\Z}璽yァ?\0?[ウ。a?vy?墫メ?Wモチエシhフ[竦F?#,=?8マ゚?rx、ヤ斤}\Z屮コ]?>享?iロタ?ラq?\Z2ケr?ヘマq錻j?]8tヒ?゙1ヒqzヨ?E/苅? cクP8>佻l?ア?Oァオy?7_゚-ヤュn?8bワ}ネ?3戌\nー?A鮃コキ}フ;??ホ9ヘCロリ^゙\\エカカ」??lv\\?貮カOaWH?!<6}苺? サ?キ?A]*]Q、\0??fョ:Vナ、ヘq\'Xレ]G[q2トeBサ?但^゚ィ??,ス&コ??75?尤4巌蚌?\'?テ?8?Z峭「ヘ.+?dモテヘ;0V? Kソィ8?ユ?溲”ゥ&謁ヲエD4メホョ??YクzスYセ |Hエ?\Zレo L癘yア#カヨ*3キヤ?少G????ソクサスユョ?厖G盻,v?}0?=ホ=?\'ヘホォD図;mゥOュヘァ[〈v、Gコiヤ???\0カタ9耙TwRiムAィワKm~コ?) Gサo\"L?l\r訌?jシイワ シ?NC3V鮗喬???N駑Rgコオモタ?Z5苜ロ9蔔=ウナ]ナァbハテレンャヒア2?\\??t?>5簀q\Z?vTppO}G餮7鬲?k域クAカナiア、 v紬?佝}sヘFGメ夛リ=?lアキc尋ク?Jォrテモ後且I薦F麥>??dウM」・?ラキ?コ$モ」f-o\"4Hb|、ィマ?。l!? セエ潅懣i< \\?.|クノチヌィィ校ラBキモ笞ツ?跫リ\"??\n?|ヌw腮ヨョ?gc、ヒmr妨?\"?bン\nI\Z禊大3?サV| ?F萪柧觜フ{ウ芝ウチニ0\"ォv? ヒセョキ」(2g*H#pチ?;?ミ゚シ@ш \0aーリ?~?Uウ+Yサ曠d? Ktンマ〕飴#キ=セオ)メzu裔?疥o6メG?0逮ク ンsニNqロ??5ル?,ョl??]?qm\0ヲ0??s?=ォ。5?ホチ?[ル「キy見?;?#?9\Zソロtgホン騷oゥ>%ulー\\?I徇Y--秣??\0zsヘRセ!t9?\rJ?K?ゥ\"![*c<彭d?ヲ}??sヨ-3゚閊^亶?? uJD\n\0ック??;蓴Quネu)^}B???y哮?ェ国ルマ?01\\?効゙?Ouイケc・゙鷏? リD。d乏メ}>シq^滲aム? 、タイ?3?v?V傳継驚?蒿zW升ユョ !ェ*gn\0cマラン?^Iヲj)ィ|ペ?&! 血ヌキ,9ゥ艀?\0ulルR=コ?M椨m?1ナ9カ杳歌?瓣??マ?^u?iレョァ-?]j!リ,hj?9f゚\'墫\ZッUj略述\\mノ?セ萵?ヘJ?J龜UァN?エq?訌\02HR=?藹沼筺薀ケ7ム-ヨ]Kィa?ma3rU?;キ?>??*?洶ソメ媚ユョ?キlE\'9lキ??ヒJ鈩?ユiョ?2[ZFrロ?\0ヨ・tK{?逃ワM?」\nッ?pA?=s?ッGロo~ルD浹m??ヘ?ロ?623」?6?ル レオマYZトレ・ェテコW米?\0r@?ムロュアゥMa「?薮&?\ZK/\r?!%カョラ$聊オ\rヲ冫qヤZmげ狗T(rムぽF~サrkヌ燃tY・ムj饋悳ヒサ{憔チonAiU6賃?泙?R~別?エコヤ\'ウコメ・in窃*d?チv讒コ妾-4ヒ_辺テ餌P$fV}?ミc?-3Bク\n?ー4ヌx,クbf?F*ヒZEェ悦ャョ,稾=-、咼R? ヌ}トp?gキ&ケナ。|ャH\'朧?c岸N巽\\?\0ヤニ栴レH2ハ?%テ?,O??\0スBu=?ム鉾トェ?H「<\0;~ソJユEVコレ?モnヘ攪ycニ #p、py??筬iムH゙,0皆ヌ??テホN?=??*ラo」Oqtメ]ェ絎?1再?n゚゙ウ容fハ-?漕%?7ソロ歓YZイ?ク?6法B戌y?\0嚊ソ?-跨2? カPw\'?\nリコ漫 v。LjN08,s?=+Yuェ?7?y?q柔ZイTCD メ<ホ7ィ?V?S)\Z?*ク8??;肪リ?$男[:&8ィ?F]??gJテvX?95オ?cセ?カ?iェ\\diン:SR怎ふ+?\0?7B#a?*・fノヨ?ミヌ睇ツ?、、サKヒ汽wケ?\n??キ?ハ mイ\0$M]ゥJ窖5・()JJR?R箱・()J^c?コ?%ヲム?越zI+cゥs?、??,淡+?O薯@J?u^[[^ルヘgyoヘエ?SC*I?YOH ?纛?里\ZオG?u(?オyHF;?=?G??j[ォ4+S1?E淡w1」0ニ笄?q?{ヨクラ4-C睇ト}S」ッョV0wFル=ヌ゚洽ャ;トカ淞シ迦?゙法fR{T瑜?-gE彜鶫?\'?7「産セタsヌメ「、C ?カ゚?\0?エ蹙ラaヤt「?Iコ)e?キTラVEaユ丹ョ?3ァヘ耽??I#\\p鳧燼?f師?「\nテCウスミ?\0x$キ2ンメ?歴??カN?Fチ?篏エヘ#Tモ5K-wOqpケ本k? u>~ンネ?★?ァd&イ゚42?2ロr3?鑚鑠gI?+?3J:mシウ[H&ティa??ラ侃?/[%?jWカイLnm「嶋ユホナ??ヤTョ▲タンSqk?%¢O?? 7ァ<X1ワンホ塲?シフDメッH」vムニpq??;\r玄xG賊ッlョ0キ胎?gテ。*7′n艘?ャァ・Hイ$t Wエソ$゙ヌgo(龍[8?ア濺?邱/ヤn?[舘0/エ9Qホル斈Rn?8??\0ソZヤレ暄?? \ZY゙? )\\1\n2I?\'>ユd?-Q,「??.4モフ7$色rv?yマ交?,听ユK・pz?9?勾cキ巽湛パ$l牾瀋モオl?\0?=Wk?Di喙]胸|\Z?オ?SQヨ袴゙ヘ9,メ映bL┳bト1憫+ミウ蹈&?4?。ヨ.。撤???!R\"ャg?6?9?オSセ|/ソ??-?」E,{D@]Lンワケ癪?計ュχ1ネキ77zХwゥc%ソヘニ0&P゚テDEチ\0.?縲2\rk膊I}ク2\"スイヘラ嗤テソ?Kヲヘq聲D?ヌ4トd袗*vア ュ嘱ユ+ュ?ヒァ?シ?:ュヘ?ケv|Fトノソwァ\0ー璢膳=ョコ\'???iksVヒ庠|ハヘ93?ォ7\0 ッa渫9?<チqィ\\-イチmeJ??席痞。P/ユ隴?エ駮叛コセモュ??ナnチ|リレ、?-F|?tJFOテュ?Mセヤ5?ヘ-7QアCコ)%?クW?.」?m?メ] :B?-b?ウヤセfメ \\ク工x$$\rャッ漕PHa鳧\rJ??スス情キEカ葉汝故\\?8n;??*醺ム髫オヤコu瞠???L@?@瀘マソ?l跌クセヒ」マ?\0ュ?3Qソ徹?$緩$?;iラ~賽cPァ$池タg痴マ「?ァ柳/?fチ??=1?サ笑スMuモp[\rnフ?\Z]?!゙=「」テ.ワ蘿?? ?ヤ囂ツ-b。ィンレナev[dovRh恆?Sスy?8?f遷?*?]F hu aキw(?\\\0r;?メ;9?=?0>、\nワR|皷ョ羹ムo?Rリセ?la煤テnR;{゚クォ??ォ]?#R鶤nロGxdレlー $8#W後悄フヨマネニ容xウFYt?ym$カzeト??サトサ?ホI?ゥ\rK?:ァM鬮>・ヤt?凅Wチ販ャフ ???「スAメ:oK|+ζ尺゚Y4krY、w,x^ム琢羈5A?\rCヤeオらMケ鵆;ォ?\"ュワ・礑p 0Aタ\0p#瓦?・・??則tクnnoEョ冶?9Pp[ワ}~セ?ォ[マkゥワYヘ2ワシR?ロ癖8ハ櫺^宍?栩~觜レヲ弾 !?5YUウ?sロ櫟ニ??\'ュ?.・gsj薬v^RX「O 遏/ィ<筵y0?8?Kミョ?=K?,纎iカ童8ヒ1ヌヲ??Mtゥsョロ駢モ?ネ?ヌオdル?\0??楫シ?4m瘢ヘヌRt?「??籀、張セ酳リェibナIノ瀏?ゥ}7SCuw5アー丱粗_9|;ャ1?徃 jホ^K}tMzヨ:l゙jイロレロロX^ト?巴Gi]x 1燗R彖Uウ」5k=ナ? Q?エq鹸カpT?S]sヤ圜カラ?粗o、A・?Mf\0\0?8熬[h苙}ホEOHム$ミ?スサキ濃ョeヒ(\' ?3豚~u{r丈FッFナ?+据サNY侯F\n?<G。ニ2}j+Gモ?{ァ諦ヨyナア!ユホ\ZQ面耨?>ヒ?ラレ゙抑・Ki-レチ串隹Wラ呑\'?=???=擘ス#ou,?$Frョォ?8<\"9?#ラ5ポ\"ワ?Siコ???_]エタ\\イFL暖9b[\0r??ヲ゚ンkzヒ、qノo$詮ョ02」h?\0J?ラZ]ホュqsyk*テmmチg ホQ ?ニ゙リヌゥ羞eiヨ;cムホbー含\"ィ????ノノ&シ婿Iヒ苻ェEsNキe??eS,俊]]NCョNs苔渣fャレ索?ヲo?- ?#ミ\03?o?皀ル蒜黙ネYpホ27??ヘJ:^マs2ノ+ナ芟懦=?クォF$「>麑?籐シ5嵐?/\'v0=ソロ?\rO伎ノSQ桑8em罫サ=*侮ル?0腺?>A?=イ+ョ?/)|レv?fオHvF?貫/ヒ\"「E*5?ヤ?C◆zテ?d喫?セU<\0?zスHヨ&ン?;筏ウ??\"Zロフ?6}]?キメョAテRヤ-ホ?6「nn0\0ュ9ヤコ粧齠]ε6ヤA?挂ヤq゚gdフム???gロ?ニノbM\nI拵k??ッョ}ォヲg?ー「靡?3ヒr~ユ?5?1?7帋猟ロmQ ??スヤカ8uYX\0險ィ27 獸??cセ??公埔ム渤]8鬨\\ノ彷Iキ@}ヒョ?ニ゚J? ョlメ?\0 シP・)X・()JJR?R箱・()JJR???\0?ミrk?Y鬩+黨4ZG?(?ュ\\ィ?8?>s?「N9ネ?C?萎蟆@マs?「??\0レ痺|&??XoI?^メGKIノbヨ・ウ凍7!lケb孤ヨ?恋酊]3 ?hソ[XYuOJノw\n傷カ??1サネy$q後?ュMォi要メニ?ルh、S舌セ?#?ヌ畧R??テ? v夘尾qWョァム,L7ヨイケ\Z=?螫ゥ?\0頤T>?$z葫ソ?ォモ9Z苡?ワVvサ??郢!ァ]ノ」i?1\'?3?FAセ7??゚?:持qd?3)盡テ讐緩EG?Z?メ竒?1eki-ヘ?7カ荼Oc!^テモロ? \rヌ??\'?9イT?7酣汕?8ヨエリ4ル栽?ュヘヒ)ロ竭槽\\ツF0OォK?^uRjWZ治ゥH?房xハ砂ェ歟;飮?スKノ?4\r沙 ォチニQ潅(s十筴?$?-Zu衂Uj(コオ?シH7キ-\'?cO陬臭??E涌#ンi?黐Iサ9テ1H>Xqサiニy?3」コ;Rケ:アゴ?汚1F?ワ$\rロ8衆^?ユmッョaエウヨ?ZmB 5ワn#+?ーW\'裁9燻リ<豕ネ筵Hイ5uカ?$鵈Vカ1、B瀁@メ8十繽セk糸ァj_スogミ癇?ニpツ$eS?X大\'?\rmセ?iゥkーDo?*ホ━=ナノ?池ハ?* ?0=jロgモ ムb?罰?R朱#v?\Z6肩トタ w?fウ卵、JF?ュ瞠?.モィ.? ラオルq犢テ\'ノ懽鑷鳰9タス|???:t單阻7lタO」:G?\r・拶%T軟Iニ*N.?5{ォKュi粫Yトw?;I]-疵C癰pG}ュ懊?/J鑿簾?サ\Zカ舉?ウ\ZWホ;d0゚ーィr虎hニ?ャ?5ィ?テ{uk3*Nトサ」テ髷xュウ?ェtスS@]2 ?Jm乗Sv?K醪qネ8<顛w?鏤マ?^ワOC?~慧脯ヤ6丘qgィタEト?クe萄Lヤマヌ吾。ハ呷^\r9?9釣? ?*[ \0\0薨ヒ繧;p1??ーkO???!ーD蔵PャャCd/ 3?3?;・z、z稀カスn?ユァウ弩_S?楔B.柘B&vC$?(Wノ??Oュ?毬4真スナル?5゙?檎?9<*vョ檬鯤。廴qwpセJテ|lョナ?,X收」?\'?oイ,シ?71Gァヘ}yヲ\\[テ癘堕?)<+(a?8?ヌaU ホーY$駕qC瓩ネ^b3?蔭Gセ@? zヌ_ユmaーユ謌 汲チ(?\\?9ホ=ヘ@?蟄讖キW,V?1@?ハル~H?0=ア飮シqUカG#}XkFK+ツラ用ハa雨B。A92Hマ>?ュk?7ァ?5 ス[]y?cwッвg?W?o(ーマスO鴫ウ?ラキBk[戞oS7配ー w?ケ?r]オィ莞ムnL滲?!ンカ%Ppル?wノ讒ヲメ?&ヤOuK>7?Iv??ォヘ?&?.)?みイBHmヘ桑fチ ?\0)ホ\0瑰鶲s_m祠[Wクコ羊3aTq?{釵コ-?\0?Dハ!R・カ免8??kュ.c6「゙IBpS?ーャ?.\'?4H旋じWヒ毫\n?t凋ネGoAXモワ鰒j?2B?.\0キーャk拉p\"?莢膓メfGエ?Kニ8z?Mト9\0コ賺\'ヨア/uHX邵xc?\'q.6ケコヌZ?タ?#蕗w\0哉=? G゙ェユSNキネ*槁穴ユ?{ヤf?/ン瀏fp゚?1_>\"kOェ\\+ヌ$fワ?.ヨノ?ゥイg<悁ア筈u戌WノT,゙ス?8譱j麪]?*スセエGC?+-ou}^ヒEメ潴巒ロ┨キ?I]がY$kカ?q\nニ}zK??wwォテ?V佛knfォ《コw*ムI3ロ\0g@9%キ坤u\'.*ヘ」メ>i゚ ?レ?醐u(vクスコGフNタケ?*ィムFrrM゙醗?R箱・()JJR?R箱・()JJR?U7?\'テヘ\'窈Cワtホォ4カァト[?;ク?-m:?ツ?a價?f\0モ.TゥNカ?オfコヌKu%?k?Y齲|ヲ論?UC8 ?85?/??\Zセ?\'Oj{.!d-lマ??ォ??R? Nキ飫Y.コォ?クオ拷{サ@Yカニス決フフーfbkヘ}ユ3タ墮爛#?淞゚??????8只X?\"qヌ?+ムーIヲ|M霍カ?,Wミ?1I??\0蠢?iNュ鴉?*錵tテ+?0ルチ88チ?2;篆_?/ニ_ゥハ>ムY?*蝠|ャ0x膰8緻e2&モ?,蚋迷ハ?Fオs?嬉クoヘ粽ホユメ)v$トnB。?ラp~」メコ坿ゥ?>k?v?6ネd;?>肓\\|U2?FHハレァ7。レ?┳豪)レ^9??ムzャヨ嚆ワ?*ャィ??[テネ 燗鷹ホj%Sレモ%hーナユ鵆トM.馗Vt& 茸??zホミオロスb?6xg研?fメ猖砌a撥$カ?OlzユgGヨャz岑、7ョt?2?lッニ \'ヒ?\'\0~Fサ勵Zkノ6田o|?42O!?5ネノ+サ\06=y権コ體lロ?ッi綉溷mb手#サM{+\0輌 ア?\0ワ76N ??=Qェ]/O|ヤw?j嗷 ィ$?J?昵カqキ-食?ョィ?・ウミcミオ+;篥\Zハ&h}0齎 ?zョIヨ:トホ$壯レo E???Nト?k5?6?e小:ラョ箚エ嗄IV7vルuk2蝉z {~錨?/於堙YAャ]<キ恩&ニセ\"? ク?リ?\0スj+[!souv??リ-ヒカI8? s舘?\0\nzJユz}オKノ~^IO??ln蟆\0ヌ>?+\\ク?D&ロ&ョz溂?ルメワロ3?u桁1コアlキ盗sマョ9Sモッ>゙ュフ折j咯フ7\r=ョ鏗x?$ケo?\0q彡\'ス[W。zZ\rj?綏[3IィH ヒロフF??スC里:f]icャ?-軻?4lィッ?Gヺ璢独k(n?%ルー?\'窩zョウ桑1?U? x猪8;\0%@Zサン\r[イ?)\"!a\Z牀Cサ?1◇rO\'ヨエ5紺?キ ?KェャムGセメ,b2|?l?谺戲ラ%cモャcソ]A縲・エカ?& 申瀏達?マ懺\'/タイ遼ョ魏?糶??;DOンア髢齋tV8V<\0sク逵ΑZワ??5ミD?C」b厦ケ符カ▼???墸=・Aiェチw}ywsエィ\"3??マ)?xQ? ュ。?I{c?ノzメO+Q?揚9耿c慝3^筑?-Bラ螳シ.暮片!Y寧#厠娑q塔?6?>???オ??・ァルヒ癪ァケ Sssu爼x??\0 イ0リ乾?錆7キヲjラォkRj找eヲIi・nャ?\"?老ニリ?wlタ9dsWァ?;MkXキ鶉毛?$ラ(ァ? \"ン?瓷ワX邯1?ッ,ホ4膰込|屹5{[{?\0蓉コm>??-仆)C?\"∨\\?レセAメレハスゥ榑xノレトル9ホ0;憫?{箙?Iiz」R鮗トpン? 僉ホ覽8lv+ノ=?ヘYャ? ?:ワwワィ??%゙?ワ?ヌカ1レォ/)ラ?8lメZ?Mワi?ュ2Z、qヌ燹剔?%?D>オj拏w,??;? ~_1ゥf 62ヌ?>暮゚噺I3Mウ.゚QT?6\0ヌ簡ヨ?4%ウ、Vv叩、Zヘ$*@マ;Yケ瓏・dシ嘴Eクe龠畷t?ィXテ4p@[粕撩??壬}ェァエ??=哭~&fXwリャヌモ??\0fスOfコ,ラ「ニ?j 尉;鹸ワz2?ク?1靺昏ノ%衆ナン?リTc??モスhシヲ?4Uチ\ZミtNス殪mw4/ツノフサ峪lタ?+?BKュ?ww=レレあ」ー\nセ??レOェノE$ーE!ウ?3?史Vメム!カ篠 Y?gq¶dヨo;棺*燼讃7icモ曾 XTn???Sワ看{8&X?ユ$LfBs¥Jナu;?9ャ?ィロ樸ト甬恠オ%諜ォkbワ管コ姫x\0Wtッ?$ヨ次ェ?7PY?(%?{0?\0ネヌ黜\0w$?\0?\0ゥ5?-ソ\0?O??2hッu%椏iフ鶸「袒 タlL?ノタ\'ーワリmサO颯E) 1、QF。Q@UP0\0ーB??゚疊テォ~哮。yy$マwp??w\nミO\nQGl?&カp蝓6n?\nR蕗\"櫨\0・)@)JP\nR?櫨\0・)@)JP\nR?櫨\0ッ\Z~ユソ礪kル~#t「xZンネ\Z・かナ慥%?刪N6ウ\rケV=誉$D?U早 ャ2?5ヲ,イナ5(?(ゥ*g×??ゥ?m?ヌモ篭mオK濡!%9^チ丞Y愈>「a尤チ?>\Z?チ<{?ワ?kil「\"oc2フメ<メノマ?\np呰?招v[Z影坂gjハ滴シmbyチNyナ}?ン?8]テmh? ?輸スユ4m:?~?ア))ef\r決ネチワ?>ヌ憬KE楚?9ュッ^ノヲ? ?チl?゚4騫tッ゙qGィ4) wy綯??NH??gYワ|ワ-4ヨ[テ6ee叉 *0{7籔[袗-cゥ&゙W #3?Aチ$p ?f\\t゚Nヘモー゙髱Cセ?\Zm2?ト\rク*艨鯔醺レォキアGナc%?\'但?ユ?ムカ給q磽q覬pァリ?8キサ%\"シ楪gQ亜#キ*rラ゙ッ]ヨX哄ィァアオモ轣ヨ+ラ?ウ??W$?{?.擺偵[″??$處X?\0チ8ヌ5鴎i追ュMァZチp?%1ニ言sマゥ8FZ}喋^オイサイd街?%R貪ヘメ)ホ?ハカI9  \Zョ゙゙6「コ~締Zヌ?I?&$Vタ\0e@苜~?7。u>アム??.挌?ノ??^{ヤヌL?,zァJiヨア4z%?\ZUヒmK?ルネA?\0yノ=ウQレサ?>ォ?\rCY妲段PO濬[???5??クチ勳qxコ攵アト「?)?\nサミ?ニxニンヌ{fコl4虜ウdーサ採ォW・セリ虱nl!pン??ォ7MKx-^Uノ-?:?)ヌ qロ酌ニケ.境)ノァu;@モhレPアT先!寛ケ瑰?/a?ゥ?,uケ??/、in~]ヌ?*?塞!Xvマヲ*胚? ?i\nサ??\0w?楓&みBエ?(#ウ/?チサ?9I幣#驛楠ロ淮Rロモ!」\n綵セ位?騏N ゙?x?G#゙ウコ{ゥエサ?r \'??ト?D go? {H|7?リ?。pxV??ョ淫ャ?Y」イS? ~qテcワ?ア禳\Z3莫vo ?)#?ク-ヘ?ムT椡酌]Nホ?Viクヌ?k?埃イ逝n?tB?\Zケハ g\'\"?ヲB\"9」g?ォ?;D_Bイ?<シャ\rモ?cマ$眸\0B゙トョ聒ヤシ\ZM椚、ユbわ$%ャ?サクネレ?イy珞・?@ムu・サ\Z?カ、oキ?$$3rN?施c?ィ?}梦Mガ[(Z{~b?#ヒア?fワ?ッカjョV?Gh\Za???ユロォtエーj6ヲカ{a<端茉卷,ァアQワ 舖Y??アXンチッ[ノR?9d?$x ヌ Fぁ襃♪5YJ?d「サュ?蠏?\"?\"?,※R7ゥ?n3掌xャyュu)\"クセ需ョZ\rケu,ヘホ紆?モ5yユヲ?-=ニ」ゥM.?H盡x゚ケAe?!Y? ;g飮ュh\Znケ?/?・キ?Z@!刃![??;址dレカミ+ラ?ワテラaリマ?\0\0\"ヌ?檎 v&ー4ネ%k?/?,「?9?!?洽゚Oワヌ?=g?/URハヲ?ュfMfbメ磅ナ ャカ楠ネソ?5ケセ槎カモ???\0癡Iメコ?ネ髦ヨ覿f(#?}?ト跟ル?ャ?w?ムソモウ?ム???v;ヨチオホ] 植?藷キロ^Ulリ???/]カ穴゙?1ョ。??珠Rヨ゙ロ\'cュカヲ\nw?ケカS???ョハ?Eネ???ヤZヒ1?ロ} ?ホトホニwキf]{ソG^レ?z?o?アB2ンhkMWテサ讖+G?撥n?曝ワテ-sH゚]オサMユロ[嫺ネUユZ7Uョヤケ?ム??鋳扨&Nリ\'ケ?ヤ鍜魁w*uーn?]T\r?オ淑?$ク?fミラ7ヤc?\0yt}Cュ袗?1q@shs境hv?z孀??\0en??,w?ッ?」ッ「8モ壙*ュヌ!平ク・ーb?娩w?Os??Fマム・e猷cア囘;壑mdl斟m?;cン[?/?\0セ#L?。?ス|?フヘ_r?8Xzォ*}?:嗅ー1??Xラナフヌタニgカラロ?9セッゥ?\r?\0・?\0エ?ネ鶚?ラ}?冐熊スレ2キ?\0Hォ.カサラ9?}麟~;?\0M??c2?ツqエ7?潟*8囚キ!?oァ?oィ?イ-g?/ムォ4?\n??ノキカケ?譱#}5;e?愧_レ3=oァ??ッ^7?iオ7?$欅??音yカゥ?モ?カャ[Csキt惘Uョゥ盻ョウ.キリ鍄?[= }oNヒ?\0]c瞠Kz?ォゥヤ?gィ?UfツK?マ?eサ~ム]_ヲ?\0ョ.?蹠wNテヲ?ォ?/sンー争?zuz椏Y?エウラゥ?灌渭ェ[コSウ歉妻ッn;\0ュカ今?/;娟F0?nヘソ、ルウラ?% ゙ウ\"b}<]o??4コユトoLヌ鶚?゙?PキOx?{hヌョ媼??\00バ?」ヨサ゚mヨzカ*NCァ釁FV17aneu=ミ甼⊥霽;lnラ2?ス椚Lコレoッ?ッ?g+7\"囿?カ貂3=ト青\0凡旌3u?種?2ヨl?Oユ?wセーcgt??マQヌョヌオ?.ャセニ揮羞☆5;布゚ヲキ?Y?漆鯏 ア0D?猖ラd=ッ?ハ黨ケ.ムc?ウpSNwレュ}クケ/kw??0セラ?%jcgソェcX猝ワヒ+s宜?8Xハ??62?+}ウgモカェスOラ=5ホu゙?:eュネ\ru廟Xイ?‡{ナgルeyt\r布V^マ輌滌?>ロ遣疼ヌa粭z?,uホ~8pュ?;Vオマヌ,?>Eフゥ?ェソE努鬩ア?\0h???゚Tンh\\ョス9焦n].uァモ檎ニ? ッァ~ンヘk?゚窓m蘗?ョ*絽ァgbキォ瞼uュ]オ゙>?盟???b?ョs=?J?\0@シナVヒ2タ恕D瘻>・(゙テ???メ?lfオマ?乍謔ャaV?.kZメO.0??U;UY?\Zヨ勿!?2v4{ルイカYオロ?\0孕ルウ?%kVェq?[疫m」ォオ孀mリ1?Fュ?xル?葆ヲ??\'g」岨。?2\rュk麒ュフ,徒[シケム鎹?\0ヘネキ?m?\0カ?oP鰈Tハ\0qスオ脆?bルッ{,?抔ア??\0驃e溂テ \0 ?ラ?ュ\\テ○?遊^?ッ、?メipp;墮?;ヌ?W頷d?g?=OO*玄ドゥ湲「シ7ソォEwQeV9ユケヘ?メicソAk-v?ッモ゚K?=フ」\"ォQユ?2コ?、ローuzE\rカヒ^X??dンヒ-ホェヲ葫fCG?M゚ヘ??、}\\鎔mYY8ュキ エ?S菜ニ輅o「イ广?~マユi?\0??斬DフqkF#cテ?F=?9xKォu:e?ラ??゙?9^?s ?サ\rモ掌黔m?%ヨzy??\0ミセ、?Gゥ6ヨ9?コハZ?E>テキ}u?際ン?写キ?夛?gイ岸VXス諂ク?-眩」??bヨ゚Iセマ詼??%K究?<_bエキ?埠{i,wWスケCa^ラnネユeエ?[V58孺v[?滯+VF5 4クヤlク5桾ヤ=???67ワ??}ャ゚些オ[??ア?~ュu?シャォZ?ロリ貶?~?\"ュソ、ェ暄z~ァゥ^?・Vーヘ?\'?4裔ス?ツ彑?lォh・マゥ?;ムv-98エワ/輌ス\\ed?濱モキ?゚Xu4レ?堯ヤャ餾.-ョ?U_Pメ證ッ?eiッゥUo?Isラ奧ュ?\'ヤロカt?スF螺}ceャ蘭?イ粐?レ?^ョP?t??E>ァ? フスZ?\0iz゚狄}?\0ル゚サ?・Vホ}X藥?\r[??、?モ?gァ絹nム、チU八vロ\Z?\n~#S?ァアトs鯔\Zォs??「/hー;?{~??\0戀}5スメュ フソxn59、ヨラオサ儼Sbレ唳_VMァェ湲?zヤャN鰐ヒゥ師エリテ゚^゙??\0嫐1]ッィ〔1ヘ[リ?ム]ャ?ミ踰ユ?7モイ溽jアZ4t:iH/W??K?趾サ*ラ萬亭ケ???゚Eソ」ァ?+A9?3W??-キa\rn-lvリoィ??5lウ?ヤdア?~C゚?/?s?/ヌaョヌ}攴wロUチヨ5ュl>テ^c?Tキ?敷ト>。メ?〃^$c}ュフウkエワZ=wャ?櫃メァユソ? ゚層」?鬲F\":?リォa?サ=クュ#サ%ホ\Z・チョ?-オ]1?7~潮??sユコ・ヨロ_Rチ?/ヌ}oェ\Zリ??ッ「ニ\rヘケ崟???Dケl?bレ?? YcY?#齲=@マルマソk,セロ\\ヌ?ヨソ?ャY鹽;wャKウ1ウ N、\n,ャ蜥稷ウヤォu\'リ觴k况~NGゥ風m゙ュ」Sルメ#?ナGッ?-?黙ケク]5ンUナュソ ?スメ $幀ナョノ?-wゥ嬾+?\'ァイ?ム??\0Hシ。v゚Zz摧taステ?=Jヘト5?~ォS゙?9?\0ス?「゚ム??Oァ~粐U\\?ツ?サ!?x???ヤ?棚%;?\0W?siq頃茸W]メ~゚c橄ィ?ケ残壙\Zツ?モcイア゙ヘロ??ァ?\0 j?{?6イチ???:Sェハ?゙3?x~??Zキqツ?%?? ニゥニfニ;Hun-2;?3w?)ct?ョカロ?x??ー?\0Snサ?K崕?ニ?\0チウ??,Aナハ脊O Gツナァコ?ロZ*kXK????#ャ暉セ滓11H鳧ー媾?5ラY苗nュ・ニヌス?.ロ足鬮ヨgゥ霍? ?\Zムイメ^粫?ヌ5?\rレ7サw??Mャ?クhc???.コri}9X?ァ毳.」yam剤?;=ロ^?點?\0ェラ?ulメ?.ナ7 l2\\6=OEホ;_eロh?ヨ?\0?F?チ帯ヘ、9セオU]kタ.ァヤカ」ス7゙1ルgヲ?+Cゥeカタモモ?ユ?\09n鷽メ賻ヘ???フ??? ヲフWキhリモVネ:?}.ヌpワ??\0チ?筰G%lA?GJiソ ヤ」モ・?ケチ?カ?O」?策佞イ?KV゚?棯ニヒ、Znサ+モヌツヌk[殯陽UヤX?アョsr22.?q*?騷>ァァ?奇Q?8ツム拘ル鶸%ル蒙レェ゚セ?^ラ=エZ釋F?MY??ン?拗モモ?)鮑sー4m>]?ラ\r?ルスフナァ?[??後F?ィ4tr?Yソュu;s?嫋 「親オTチイ??嬌?=?組、牒f??ユ?棚%)Yチホサ\n疇gOホネU誰血M?>?>ー3%セメ ウク?メ緘オワ? ニX?璋8オテPF???k??\r.mタ~?3?s テ$%ソ、?\0ヘFッッラ?1ッ?)リ?,}6リ?4ミ\\[?w?モシ~ムワユ覽?\0?丸?kワ8\"ヌ?饉?1コ?3V;G????ゥ+?錠゚チO。eGャ鍄釀k6??\'鏝[ォ/??\'ャ?a?6ァcfワ?8z亰サヤハーク?.ゥニャ*?゚Sラネョ??モ?\06シ?\0;?ヨ ヨコキe\Z)x!ユcオエエν閹>ニ?\0ニス??#oQHェ搦サ?+ォE聞、mナェaロdT??\0?ヲ{+?o埴K緒鷙アメIC)&メ、棚??ル\08BIM!\ZVersion compatibility info\0\0\0\0U\0\0\0\0\0\0\0A\0d\0o\0b\0e\0 \0P\0h\0o\0t\0o\0s\0h\0o\0p\0\0\0\0A\0d\0o\0b\0e\0 \0P\0h\0o\0t\0o\0s\0h\0o\0p\0 \06\0.\00\0\0\0\08BIM JPEG Quality\0\0\0\0\0\0\0\0\0?ロ\0C\0\n\n\n \n \Z%\Z# , #&\')*)-0-(0%()(?ロ\0C\n\n\n\n(\Z\Z((((((((((((((((((((((((((((((((((((((((((((((((((?タ\0\0x\0u\0?ト\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0?ト\08\0\0\0\0\0\0!1AQ\"aq?2贈ア#BRbムr$3チ盍?ト\0\Z\0\0\0\0\0\0\0\0\0\0\0\0\0?ト\00\0\0\0\0\0\0\0!1\"AQ2aBアムq■チ碵#R??レ\0 \0\0?\0?\0\0P@\0s?7浮ニ護|馬???・sgツルk・ カナヨCヒZ姉カ?ウ_gケラPc?゚P」ュKムノ~%?B,?チケ?%-62r?」胖、zL凶ae鰯9I舵Bャ4Egqqtム\'\Z?\n\0(\0??\n\0(\0?・+?m監スモ? !Oa?->厭Y\n蜥コー?tPa?9?OフラAF+す9ヨ? 厶。控t??>エラ?\n?|?みル篦A」=マ(<フwウ?VMウノマHコヤ{9則1? キ\'}?ヲXR\\イ7?9 v?チハc6XY?ル゚ラ。Jo4?\0?*\\咏{\"シイ介ク~Fサ?6ホ5 窖7?\'ヲ源ヌヌリ{2ケcx、h薈GSヲV\Z ?Xレqtニ8T\0P@\0\0Pカデ& テyW[KァP[袢\\・?8ォ\n」冨宗・?&カ9Q]職c?}シ?骭sv>^T\'\'?!、?1キ?wK+蠏詢C1e?\'ハウK\'?楓%?ネ???)夜繩?レ\r\0ロ」Drニ~=欺八1ゥ~モKsqk!リa4\'G舫躬B榕「クキ\Z?\"rフtャOQ?吊租qak遵?/\ZRフ6_?ネ>エロ??ョ\\オG、bセメ0i廳ォォDciイ愕?\0i?\0!襌Uコス.?kア!橡ナ倆pヘ@\0\0ヌテヨ?「窰?シサ??ワcオ &銚j??;鰍蝣iヤルセロ?*=)蜩消」eナ??..?? P?ノ??o・7?WB?c>S吟??Fミン\\iBコ丞?\0ネ??v?フフr?5,モ%?m停Cッ?シ醂(\'@?ォ・襲坪?3ヒサ*s?フ|エ)ノmvセ2/?髣?B+岻ナ鱠オモ,Χ*VAツ?9F・?\07V燻鬢 d磊Oyサオ?Hタ?7ヨス?td濫績明L」\Zァ$hタC?? >オメーノ%tv肆?Y/mニフ艀?。}\r??)苴j?\0bヲ?%?0メツ,ケ莓Rハニ\'フ@ル\'ッN柆 cI?\'ヒリf琲ウ7y(ュヲコ?,アH????ラcュS昴Qm.? ・|喟p??\r,wK-ワカアーェ?H?iG&頌eョ6ゥ亘チ<7o>ヌ?錘OッJ?-ム3SN?<ンヤカkm{?;I良Hタ?__スbヒゥZ蒙Y齲イサ)ツ?dヲ?^V,靭◎眈?\0zウ・ニ71%?7チIi%ト7\r ?t??uラマフw?ヨ未ヨ荳+?:fオ依リ?,Sハ\\r?]ラ_]ラ/&)oi\Zc%FY??篤Mヘe 儿ナt?コ涎Nカ+&?\\olゥ亰q\r@?ヘ0tユウFシ?~テ?*ヌQ・マツ3l喜,ソ┐P?/qK擽7Xキ貅キ@$エ裲?ラ?<梛ゥ???\0Q\'S弁S?6W^蛩糺ャョ@?tケ0ニj?ィ?8滯慶ヒAh特$e」?6シ、}:茅j\n\0租ygSスuュレ.ルCmカZ?3hカ??H・eSコ8 ?K??ぬワケ??吏旭aヌBキ―濶h屁ィ゚??ラM謗:r脯??桟摂テ~ハ?P^d艪5ム=リエmョ?ソ躡?ム???モカ1gqヨウ??+ケSキ%<6揃???6)オmEムsG }ク\rケ渠詞??9セ鐡?7pqY(?8膩レ?ラ~楫Z?qkyツw7?Q沙Xハ\r?ョキ?0Eャェ+臟?剋?フヲO>--d邉ヌゥ?2;3o縊ケ?\0ョウ7ゥ績?&ヨAツ?\n\0コ皰匆シRヌQ撞]&Mムxル?\nCow|nヨFハ ?跡_6ヤv曾ルャ?c?N??+,サ?/,??ツ6?ウt?;?z]Y[;? ーG Cァュ/( レ休計゚*5ハ{・Cwヒ$F耄}?81VQ3鋲iァc・Qセロ?饂t?9z?+ネ婬?K夢Hュ預?N必?紹アw?>??(Bヒowl\"F#?\0?Drァφ?トq?we\'褂?!\"9q?;。ラマ_?.5?fM?9 Yノik)9ォ泌\nュアn?ネ??3?aタア?6ユヌ-\n\0(\0??韲SFNrF?トヒ[i?+o。?シfウヌr?nX??%モtD」ノ#U崙ナ劵R_\\ト寿Q蜩ナacUU? LHQ熾z?5\0Rdョ.螻箪t??Ne?ュ:I?$C? ?/ュヲC{qツノ「]G!ル:?=*??T*ソr?7瞳エ?!?\0?\r闢?スMUJO○Hニ?レ!テ4鯨,?\rC\0n?{囚?ュ9}<カ?ナケ3ハd.イ? ?詈ョfngv=IョL跏?)\0(\0??\n\0?エn :?)??9n?5fγワnヨッ7メrミ?類コpヘ ゚f/(レp\\GトHノ2ー>?P「lmウハォト?:ュトぼ 梯?J?tKwhー?<1ラAコ囹+g8?m&ノ_[ォ\"?域?@:衍^アレキツ\"フw??ョヘvd??1?7s/ニG????Sヤテ\Zャ|ソ??Ck}?5ト?フ?H?逋斟ヒRk跏?掖?\0P@\0\0P@l2鱗?ウケ?/?=?*セ\Z恊篳、2リ?マZkRC&ソス?ムォ無?(婚ボZ?2コOt_氣O??{^ミ?iS潜?ラハノ&RXムコ??コメス\\?\0\nK?。エW框n%i\'大遜ウアb~讓懷7rv5t?\0P@\0?ル?リ??\0JFIF\0\0p\0p\0\0??ヤPhotoshop 3.0\08BIM?\nPrint Info\0\0\0\0x\0\0P\0H\0H\0\0\0\0レ(?????FP\0(?\0\0P\0H\0H\0\0\0\0レ(\0\0\0\0\0d\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\0d\0\0\0\0\0\0\"r\0\0\0\0\0\0\0\0\0\0\0\0?|\0\0\08BIM?\nResolution\0\0\0\0\0pU?\0\0\0pU?\0\08BIM\rFX Global Lighting Angle\0\0\0\0\0\0\0x8BIMFX Global Altitude\0\0\0\0\0\0\08BIM? Print Flags\0\0\0 \0\0\0\0\0\0\0\0\08BIM\nCopyright Flag\0\0\0\0\0\08BIM\'Japanese Print Flags\0\0\0\0\n\0\0\0\0\0\0\0\08BIM?Color Halftone Settings\0\0\0H\0/ff\0\0lff\0\0\0\0\0\0\0/ff\0\0。劒\0\0\0\0\0\0\02\0\0\0\0Z\0\0\0\0\0\0\0\0\05\0\0\0\0-\0\0\0\0\0\0\0\08BIM?Color Transfer Settings\0\0\0p\0\0???????????????????????\0\0\0\0???????????????????????\0\0\0\0???????????????????????\0\0\0\0???????????????????????\0\08BIM\0 Layer State\0\0\0\08BIM Layer Groups\0\0\0\0\0\0\0\08BIMGuges\0\0\0\0\0\0\0\0\0@\0\0@\0\0\0\08BIM\rURL overrges\0\0\0\0\0\0\08BIM\ZSlices\0\0\0\0u\0\0\0\0\0\0\0\0\0\0\0\0\0I\0\0:\0\0\0\n\0U\0n\0t\0i\0t\0l\0e\0d\0-\01\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\0I\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\08BIMICC Untagged Flag\0\0\0\08BIMLayer g Generator Base\0\0\0\0\0\08BIM New Windows Thumbnail\0\0i\0\0\0\0\0\0m\0\0\0p\0\0H\0\0準\0\0M\0\0?リ??\0JFIF\0\0H\0H\0\0??\0Adobe\0d?\0\0\0?ロ\0?\0    \n    \r \r\r   ?タ\0\0p\0m\"\0?ン\0\0?ト?\0\0\0\0\0\0\0\0\0\0 \n \0\0\0\0\0\0\0\0\0 \n \0 3\0!1AQa\"q?2贈アB#$Rチb34rびC%担??s5「イ?&D典dEツ」t6メU稙??モu胚F\'筈?米ヤ蔬・オナユ襄Vfv?ヲカニヨ踐7GWgw?ァキヌラ銷\05\0!1AQaq\"2¢。アB#チRム?3$b疵rCScs4?%「イ?&5ツメD典」dEU6te糘ウ?モu胚F筈?米ヤ蔬・オナユ襄Vfv?ヲカニヨ踐\'7GWgw?ァキヌ?レ\0 \0\0?\0?棚%)$瞳施セ$如$ミユK#總詁ヌゥヨv?4?\09htタaマ\0サ?\"G??ヒr較C}:?p-?? ロ?コカヨヨツウW?ミヲaトォ?Tアチ?[ワ$1マ?;?=M?\0Sz?K+ネヘv7?\rkェタツキ\Zソエu~ョX?)ニdエリO?oルV=゚G~マエ_?オd?k゙ハ?ァ\0レワ?゚T?\06ラ?サcツ;gモ???\0捍チ ィ?.?/?};ヘ驀G\0掌綺@q??!、?\0!?\0A?\0ルUWゥラ泅レヘoヌeマ oョ[I??\0Kヤkッヌオ?\0顆SアSホ?ミz・/ネヌe?2ンKャ?p栽ハニe?+ル??Sル??\0「z旨スl~ン? ロ? -ウミコ拾ネ贐??2.ェヨ条納?G??\0テW[ヨz??4)RI$ぁ?ミ?棚%( +kヲtフ鶴PQaモqqc?4{セ林k9ヒ????0?&&ミ?N??ラt?,ャ蹶Xkヌア?{ -cA?M熟?5ユキ?z櫃モVーヌ?洽゚Oワヌ?=g?/URハヲ?ュfMfbメ磅ナ ャカ楠ネソ?5ケセ槎カモ???\0癡Iメコ?ネ髦ヨ覿f(#?}?ト跟ル?ャ?w?ムソモウ?ム???v;ヨチオホ] 植?藷キロ^Ulリ???/]カ穴゙?1ョ。??珠Rヨ゙ロ\'cュカヲ\nw?ケカS???ョハ?Eネ???ヤZヒ1?ロ} ?ホトホニwキf]{ソG^レ?z?o?アB2ンhkMWテサ讖+G?撥n?曝ワテ-sH゚]オサMユロ[嫺ネUユZ7Uョヤケ?ム??鋳扨&Nリ\'ケ?ヤ鍜魁w*uーn?]T\r?オ淑?$ク?fミラ7ヤc?\0yt}Cュ袗?1q@shs境hv?z孀??\0en??,w?ッ?」ッ「8モ壙*ュヌ!平ク・ーb?娩w?Os??Fマム・e猷cア囘;壑mdl斟m?;cン[?/?\0セ#L?。?ス|?フヘ_r?8Xzォ*}?:嗅ー1??Xラナフヌタニgカラロ?9セッゥ?\r?\0・?\0エ?ネ鶚?ラ}?冐熊スレ2キ?\0Hォ.カサラ9?}麟~;?\0M??c2?ツqエ7?潟*8囚キ!?oァ?oィ?イ-g?/ムォ4?\n??ノキカケ?譱#}5;e?愧_レ3=oァ??ッ^7?iオ7?$欅??音yカゥ?モ?カャ[Csキt惘Uョゥ盻ョウ.キリ鍄?[= }oNヒ?\0]c瞠Kz?ォゥヤ?gィ?UfツK?マ?eサ~ム]_ヲ?\0ョ.?蹠wNテヲ?ォ?/sンー争?zuz椏Y?エウラゥ?灌渭ェ[コSウ歉妻ッn;\0ュカ今?/;娟F0?nヘソ、ルウラ?% ゙ウ\"b}<]o??4コユトoLヌ鶚?゙?PキOx?{hヌョ媼??\00バ?」ヨサ゚mヨzカ*NCァ釁FV17aneu=ミ甼⊥霽;lnラ2?ス椚Lコレoッ?ッ?g+7\"囿?カ貂3=ト青\0凡旌3u?種?2ヨl?Oユ?wセーcgt??マQヌョヌオ?.ャセニ揮羞☆5;布゚ヲキ?Y?漆鯏 ア0D?猖ラd=ッ?ハ黨ケ.ムc?ウpSNwレュ}クケ/kw??0セラ?%jcgソェcX猝ワヒ+s宜?8Xハ??62?+}ウgモカェスOラ=5ホu゙?:eュネ\ru廟Xイ?‡{ナgルeyt\r布V^マ輌滌?>ロ遣疼ヌa粭z?,uホ~8pュ?;Vオマヌ,?>Eフゥ?ェソE努鬩ア?\0h???゚Tンh\\ョス9焦n].uァモ檎ニ? ッァ~ンヘk?゚窓m蘗?ョ*絽ァgbキォ瞼uュ]オ゙>?盟???b?ョs=?J?\0@シナVヒ2タ恕D瘻>・(゙テ???メ?lfオマ?乍謔ャaV?.kZメO.0??U;UY?\Zヨ勿!?2v4{ルイカYオロ?\0孕ルウ?%kVェq?[疫m」ォオ孀mリ1?Fュ?xル?葆ヲ??\'g」岨。?2\rュk麒ュフ,徒[シケム鎹?\0ヘネキ?m?\0カ?oP鰈Tハ\0qスオ脆?bルッ{,?抔ア??\0驃e溂テ \0 ?ラ?ュ\\テ○?遊^?ッ、?メipp;墮?;ヌ?W頷d?g?=OO*玄ドゥ湲「シ7ソォEwQeV9ユケヘ?メicソAk-v?ッモ゚K?=フ」\"ォQユ?2コ?、ローuzE\rカヒ^X??dンヒ-ホェヲ葫fCG?M゚ヘ??、}\\鎔mYY8ュキ エ?S菜ニ輅o「イ广?~マユi?\0??斬DフqkF#cテ?F=?9xKォu:e?ラ??゙?9^?s ?サ\rモ掌黔m?%ヨzy??\0ミセ、?Gゥ6ヨ9?コハZ?E>テキ}u?際ン?写キ?夛?gイ岸VXス諂ク?-眩」??bヨ゚Iセマ詼??%K究?<_bエキ?埠{i,wWスケCa^ラnネユeエ?[V58孺v[?滯+VF5 4クヤlク5桾ヤ=???67ワ??}ャ゚些オ[??ア?~ュu?シャォZ?ロリ貶?~?\"ュソ、ェ暄z~ァゥ^?・Vーヘ?\'?4裔ス?ツ彑?lォh・マゥ?;ムv-98エワ/輌ス\\ed?濱モキ?゚Xu4レ?堯ヤャ餾.-ョ?U_Pメ證ッ?eiッゥUo?Isラ奧ュ?\'ヤロカt?スF螺}ceャ蘭?イ粐?レ?^ョP?t??E>ァ? フスZ?\0iz゚狄}?\0ル゚サ?・Vホ}X藥?\r[??、?モ?gァ絹nム、チU八vロ\Z?\n~#S?ァアトs鯔\Zォs??「/hー;?{~??\0戀}5スメュ フソxn59、ヨラオサ儼Sbレ唳_VMァェ湲?zヤャN鰐ヒゥ師エリテ゚^゙??\0嫐1]ッィ〔1ヘ[リ?ム]ャ?ミ踰ユ?7モイ溽jアZ4t:iH/W??K?趾サ*ラ萬亭ケ???゚Eソ」ァ?+A9?3W??-キa\rn-lvリoィ??5lウ?ヤdア?~C゚?/?s?/ヌaョヌ}攴wロUチヨ5ュl>テ^c?Tキ?敷ト>。メ?〃^$c}ュフウkエワZ=wャ?櫃メァユソ? ゚層」?鬲F\":?リォa?サ=クュ#サ%ホ\Z・チョ?-オ]1?7~潮??sユコ・ヨロ_Rチ?/ヌ}oェ\Zリ??ッ「ニ\rヘケ崟???Dケl?bレ?? YcY?#齲=@マルマソk,セロ\\ヌ?ヨソ?ャY鹽;wャKウ1ウ N、\n,ャ蜥稷ウヤォu\'リ觴k况~NGゥ風m゙ュ」Sルメ#?ナGッ?-?黙ケク]5ンUナュソ ?スメ $幀ナョノ?-wゥ嬾+?\'ァイ?ム??\0Hシ。v゚Zz摧taステ?=Jヘト5?~ォS゙?9?\0ス?「゚ム??Oァ~粐U\\?ツ?サ!?x???ヤ?棚%;?\0W?siq頃茸W]メ~゚c橄ィ?ケ残壙\Zツ?モcイア゙ヘロ??ァ?\0 j?{?6イチ???:Sェハ?゙3?x~??Zキqツ?%?? ニゥニfニ;Hun-2;?3w?)ct?ョカロ?x??ー?\0Snサ?K崕?ニ?\0チウ??,Aナハ脊O Gツナァコ?ロZ*kXK????#ャ暉セ滓11H鳧ー媾?5ラY苗nュ・ニヌス?.ロ足鬮ヨgゥ霍? ?\Zムイメ^粫?ヌ5?\rレ7サw??Mャ?クhc???.コri}9X?ァ毳.」yam剤?;=ロ^?點?\0ェラ?ulメ?.ナ7 l2\\6=OEホ;_eロh?ヨ?\0?F?チ帯ヘ、9セオU]kタ.ァヤカ」ス7゙1ルgヲ?+Cゥeカタモモ?ユ?\09n鷽メ賻ヘ???フ??? ヲフWキhリモVネ:?}.ヌpワ??\0チ?筰G%lA?GJiソ ヤ」モ・?ケチ?カ?O」?策佞イ?KV゚?棯ニヒ、Znサ+モヌツヌk[殯陽UヤX?アョsr22.?q*?騷>ァァ?奇Q?8ツム拘ル鶸%ル蒙レェ゚セ?^ラ=エZ釋F?MY??ン?拗モモ?)鮑sー4m>]?ラ\r?ルスフナァ?[??後F?ィ4tr?Yソュu;s?嫋 「親オTチイ??嬌?=?組、牒f??ユ?棚%)Yチホサ\n疇gOホネU誰血M?>?>ー3%セメ ウク?メ緘オワ? ニX?璋8オテPF???k??\r.mタ~?3?s テ$%ソ、?\0ヘFッッラ?1ッ?)リ?,}6リ?4ミ\\[?w?モシ~ムワユ覽?\0?丸?kワ8\"ヌ?饉?1コ?3V;G????ゥ+?錠゚チO。eGャ鍄釀k6??\'鏝[ォ/??\'ャ?a?6ァcfワ?8z亰サヤハーク?.ゥニャ*?゚Sラネョ??モ?\06シ?\0;?ヨ ヨコキe\Z)x!ユcオエエν閹>ニ?\0ニス??#oQHェ搦サ?+ォE聞、mナェaロdT??\0?ヲ{+?o埴K緒鷙アメIC)&メ、棚??ル\08BIM!\ZVersion compatibility info\0\0\0\0U\0\0\0\0\0\0\0A\0d\0o\0b\0e\0 \0P\0h\0o\0t\0o\0s\0h\0o\0p\0\0\0\0A\0d\0o\0b\0e\0 \0P\0h\0o\0t\0o\0s\0h\0o\0p\0 \06\0.\00\0\0\0\08BIM JPEG Quality\0\0\0\0\0\0\0\0\0?ロ\0C\0\n\n\n \n \Z%\Z# , #&\')*)-0-(0%()(?ロ\0C\n\n\n\n(\Z\Z((((((((((((((((((((((((((((((((((((((((((((((((((?タ\0\0x\0u\0?ト\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0?ト\08\0\0\0\0\0\0!1AQ\"aq?2贈ア#BRbムr$3チ盍?ト\0\Z\0\0\0\0\0\0\0\0\0\0\0\0\0?ト\00\0\0\0\0\0\0\0!1\"AQ2aBアムq■チ碵#R??レ\0 \0\0?\0?\0\0P@\0s?7浮ニ護|馬???・sgツルk・ カナヨCヒZ姉カ?ウ_gケラPc?゚P」ュKムノ~%?B,?チケ?%-62r?」胖、zL凶ae鰯9I舵Bャ4Egqqtム\'\Z?\n\0(\0??\n\0(\0?・+?m監スモ? !Oa?->厭Y\n蜥コー?tPa?9?OフラAF+す9ヨ? 厶。控t??>エラ?\n?|?みル篦A」=マ(<フwウ?VMウノマHコヤ{9則1? キ\'}?ヲXR\\イ7?9 v?チハc6XY?ル゚ラ。Jo4?\0?*\\咏{\"シイ介ク~Fサ?6ホ5 窖7?\'ヲ源ヌヌリ{2ケcx、h薈GSヲV\Z ?Xレqtニ8T\0P@\0\0Pカデ& テyW[KァP[袢\\・?8ォ\n」冨宗・?&カ9Q]職c?}シ?骭sv>^T\'\'?!、?1キ?wK+蠏詢C1e?\'ハウK\'?楓%?ネ???)夜繩?レ\r\0ロ」Drニ~=欺八1ゥ~モKsqk!リa4\'G舫躬B榕「クキ\Z?\"rフtャOQ?吊租qak遵?/\ZRフ6_?ネ>エロ??ョ\\オG、bセメ0i廳ォォDciイ愕?\0i?\0!襌Uコス.?kア!橡ナ倆pヘ@\0\0ヌテヨ?「窰?シサ??ワcオ &銚j??;鰍蝣iヤルセロ?*=)蜩消」eナ??..?? P?ノ??o・7?WB?c>S吟??Fミン\\iBコ丞?\0ネ??v?フフr?5,モ%?m停Cッ?シ醂(\'@?ォ・襲坪?3ヒサ*s?フ|エ)ノmvセ2/?髣?B+岻ナ鱠オモ,Χ*VAツ?9F・?\07V燻鬢 d磊Oyサオ?Hタ?7ヨス?td濫績明L」\Zァ$hタC?? >オメーノ%tv肆?Y/mニフ艀?。}\r??)苴j?\0bヲ?%?0メツ,ケ莓Rハニ\'フ@ル\'ッN柆 cI?\'ヒリf琲ウ7y(ュヲコ?,アH????ラcュS昴Qm.? ・|喟p??\r,wK-ワカアーェ?H?iG&頌eョ6ゥ亘チ<7o>ヌ?錘OッJ?-ム3SN?<ンヤカkm{?;I良Hタ?__スbヒゥZ蒙Y齲イサ)ツ?dヲ?^V,靭◎眈?\0zウ・ニ71%?7チIi%ト7\r ?t??uラマフw?ヨ未ヨ荳+?:fオ依リ?,Sハ\\r?]ラ_]ラ/&)oi\Zc%FY??篤Mヘe 儿ナt?コ涎Nカ+&?\\olゥ亰q\r@?ヘ0tユウFシ?~テ?*ヌQ・マツ3l喜,ソ┐P?/qK擽7Xキ貅キ@$エ裲?ラ?<梛ゥ???\0Q\'S弁S?6W^蛩糺ャョ@?tケ0ニj?ィ?8滯慶ヒAh特$e」?6シ、}:茅j\n\0租ygSスuュレ.ルCmカZ?3hカ??H・eSコ8 ?K??ぬワケ??吏旭aヌBキ―濶h屁ィ゚??ラM謗:r脯??桟摂テ~ハ?P^d艪5ム=リエmョ?ソ躡?ム???モカ1gqヨウ??+ケSキ%<6揃???6)オmEムsG }ク\rケ渠詞??9セ鐡?7pqY(?8膩レ?ラ~楫Z?qkyツw7?Q沙Xハ\r?ョキ?0Eャェ+臟?剋?フヲO>--d邉ヌゥ?2;3o縊ケ?\0ョウ7ゥ績?&ヨAツ?\n\0コ皰匆シRヌQ撞]&Mムxル?\nCow|nヨFハ ?跡_6ヤv曾ルャ?c?N??+,サ?/,??ツ6?ウt?;?z]Y[;? ーG Cァュ/( レ休計゚*5ハ{・Cwヒ$F耄}?81VQ3鋲iァc・Qセロ?饂t?9z?+ネ婬?K夢Hュ預?N必?紹アw?>??(Bヒowl\"F#?\0?Drァφ?トq?we\'褂?!\"9q?;。ラマ_?.5?fM?9 Yノik)9ォ泌\nュアn?ネ??3?aタア?6ユヌ-\n\0(\0??韲SFNrF?トヒ[i?+o。?シfウヌr?nX??%モtD」ノ#U崙ナ劵R_\\ト寿Q蜩ナacUU? LHQ熾z?5\0Rdョ.螻箪t??Ne?ュ:I?$C? ?/ュヲC{qツノ「]G!ル:?=*??T*ソr?7瞳エ?!?\0?\r闢?スMUJO○Hニ?レ!テ4鯨,?\rC\0n?{囚?ュ9}<カ?ナケ3ハd.イ? ?詈ョfngv=IョL跏?)\0(\0??\n\0?エn :?)??9n?5fγワnヨッ7メrミ?類コpヘ ゚f/(レp\\GトHノ2ー>?P「lmウハォト?:ュトぼ 梯?J?tKwhー?<1ラAコ囹+g8?m&ノ_[ォ\"?域?@:衍^アレキツ\"フw??ョヘvd??1?7s/ニG????Sヤテ\Zャ|ソ??Ck}?5ト?フ?H?逋斟ヒRk跏?掖?\0P@\0\0P@l2鱗?ウケ?/?=?*セ\Z恊篳、2リ?マZkRC&ソス?ムォ無?(婚ボZ?2コOt_氣O??{^ミ?iS潜?ラハノ&RXムコ??コメス\\?\0\nK?。エW框n%i\'大遜ウアb~讓懷7rv5t?\0P@\0?ル?リ??\0JFIF\0\0p\0p\0\0??ヤPhotoshop 3.0\08BIM?\nPrint Info\0\0\0\0x\0\0P\0H\0H\0\0\0\0レ(?????FP\0(?\0\0P\0H\0H\0\0\0\0レ(\0\0\0\0\0d\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\0d\0\0\0\0\0\0\"r\0\0\0\0\0\0\0\0\0\0\0\0?|\0\0\08BIM?\nResolution\0\0\0\0\0pU?\0\0\0pU?\0\08BIM\rFX Global Lighting Angle\0\0\0\0\0\0\0x8BIMFX Global Altitude\0\0\0\0\0\0\08BIM? Print Flags\0\0\0 \0\0\0\0\0\0\0\0\08BIM\nCopyright Flag\0\0\0\0\0\08BIM\'Japanese Print Flags\0\0\0\0\n\0\0\0\0\0\0\0\08BIM?Color Halftone Settings\0\0\0H\0/ff\0\0lff\0\0\0\0\0\0\0/ff\0\0。劒\0\0\0\0\0\0\02\0\0\0\0Z\0\0\0\0\0\0\0\0\05\0\0\0\0-\0\0\0\0\0\0\0\08BIM?Color Transfer Settings\0\0\0p\0\0???????????????????????\0\0\0\0???????????????????????\0\0\0\0???????????????????????\0\0\0\0???????????????????????\0\08BIM\0 Layer State\0\0\0\08BIM Layer Groups\0\0\0\0\0\0\0\08BIMGuges\0\0\0\0\0\0\0\0\0@\0\0@\0\0\0\08BIM\rURL overrges\0\0\0\0\0\0\08BIM\ZSlices\0\0\0\0u\0\0\0\0\0\0\0\0\0\0\0\0\0I\0\0:\0\0\0\n\0U\0n\0t\0i\0t\0l\0e\0d\0-\01\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\0I\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\08BIMICC Untagged Flag\0\0\0\08BIMLayer g Generator Base\0\0\0\0\0\08BIM New Windows Thumbnail\0\0i\0\0\0\0\0\0m\0\0\0p\0\0H\0\0準\0\0M\0\0?リ??\0JFIF\0\0H\0H\0\0??\0Adobe\0d?\0\0\0?ロ\0?\0    \n    \r \r\r   ?タ\0\0p\0m\"\0?ン\0\0?ト?\0\0\0\0\0\0\0\0\0\0 \n \0\0\0\0\0\0\0\0\0 \n \0 3\0!1AQa\"q?2贈アB#$Rチb34rびC%担??s5「イ?&D典dEツ」t6メU稙??モu胚F\'筈?米ヤ蔬・オナユ襄Vfv?ヲカニヨ踐7GWgw?ァキヌラ銷\05\0!1AQaq\"2¢。アB#チRム?3$b疵rCScs4?%「イ?&5ツメD典」dEU6te糘ウ?モu胚F筈?米ヤ蔬・オナユ襄Vfv?ヲカニヨ踐\'7GWgw?ァキヌ?レ\0 \0\0?\0?棚%)$瞳施セ$如$ミユK#總詁ヌゥヨv?4?\09htタaマ\0サ?\"G??ヒr較C}:?p-?? ロ?コカヨヨツウW?ミヲaトォ?Tアチ?[ワ$1マ?;?=M?\0Sz?K+ネヘv7?\rkェタツキ\Zソエu~ョX?)ニdエリO?oルV=゚G~マエ_?オd?k゙ハ?ァ\0レワ?゚T?\06ラ?サcツ;gモ???\0捍チ ィ?.?/?};ヘ驀G\0掌綺@q??!、?\0!?\0A?\0ルUWゥラ泅レヘoヌeマ oョ[I??\0Kヤkッヌオ?\0顆SアSホ?ミz・/ネヌe?2ンKャ?p栽ハニe?+ル??Sル??\0「z旨スl~ン? ロ? -ウミコ拾ネ贐??2.ェヨ条納?G??\0テW[ヨz??4)RI$ぁ?ミ?棚%( +kヲtフ鶴PQaモqqc?4{セ林k9ヒ????0?&&ミ?N??ラt?,ャ蹶Xkヌア?{ -cA?M熟?5ユキ?z櫃モVーヌ?洽゚Oワヌ?=g?/URハヲ?ュfMfbメ磅ナ ャカ楠ネソ?5ケセ槎カモ???\0癡Iメコ?ネ髦ヨ覿f(#?}?ト跟ル?ャ?w?ムソモウ?ム???v;ヨチオホ] 植?藷キロ^Ulリ???/]カ穴゙?1ョ。??珠Rヨ゙ロ\'cュカヲ\nw?ケカS???ョハ?Eネ???ヤZヒ1?ロ} ?ホトホニwキf]{ソG^レ?z?o?アB2ンhkMWテサ讖+G?撥n?曝ワテ-sH゚]オサMユロ[嫺ネUユZ7Uョヤケ?ム??鋳扨&Nリ\'ケ?ヤ鍜魁w*uーn?]T\r?オ淑?$ク?fミラ7ヤc?\0yt}Cュ袗?1q@shs境hv?z孀??\0en??,w?ッ?」ッ「8モ壙*ュヌ!平ク・ーb?娩w?Os??Fマム・e猷cア囘;壑mdl斟m?;cン[?/?\0セ#L?。?ス|?フヘ_r?8Xzォ*}?:嗅ー1??Xラナフヌタニgカラロ?9セッゥ?\r?\0・?\0エ?ネ鶚?ラ}?冐熊スレ2キ?\0Hォ.カサラ9?}麟~;?\0M??c2?ツqエ7?潟*8囚キ!?oァ?oィ?イ-g?/ムォ4?\n??ノキカケ?譱#}5;e?愧_レ3=oァ??ッ^7?iオ7?$欅??音yカゥ?モ?カャ[Csキt惘Uョゥ盻ョウ.キリ鍄?[= }oNヒ?\0]c瞠Kz?ォゥヤ?gィ?UfツK?マ?eサ~ム]_ヲ?\0ョ.?蹠wNテヲ?ォ?/sンー争?zuz椏Y?エウラゥ?灌渭ェ[コSウ歉妻ッn;\0ュカ今?/;娟F0?nヘソ、ルウラ?% ゙ウ\"b}<]o??4コユトoLヌ鶚?゙?PキOx?{hヌョ媼??\00バ?」ヨサ゚mヨzカ*NCァ釁FV17aneu=ミ甼⊥霽;lnラ2?ス椚Lコレoッ?ッ?g+7\"囿?カ貂3=ト青\0凡旌3u?種?2ヨl?Oユ?wセーcgt??マQヌョヌオ?.ャセニ揮羞☆5;布゚ヲキ?Y?漆鯏 ア0D?猖ラd=ッ?ハ黨ケ.ムc?ウpSNwレュ}クケ/kw??0セラ?%jcgソェcX猝ワヒ+s宜?8Xハ??62?+}ウgモカェスOラ=5ホu゙?:eュネ\ru廟Xイ?‡{ナgルeyt\r布V^マ輌滌?>ロ遣疼ヌa粭z?,uホ~8pュ?;Vオマヌ,?>Eフゥ?ェソE努鬩ア?\0h???゚Tンh\\ョス9焦n].uァモ檎ニ? ッァ~ンヘk?゚窓m蘗?ョ*絽ァgbキォ瞼uュ]オ゙>?盟???b?ョs=?J?\0@シナVヒ2タ恕D瘻>・(゙テ???メ?lfオマ?乍謔ャaV?.kZメO.0??U;UY?\Zヨ勿!?2v4{ルイカYオロ?\0孕ルウ?%kVェq?[疫m」ォオ孀mリ1?Fュ?xル?葆ヲ??\'g」岨。?2\rュk麒ュフ,徒[シケム鎹?\0ヘネキ?m?\0カ?oP鰈Tハ\0qスオ脆?bルッ{,?抔ア??\0驃e溂テ \0 ?ラ?ュ\\テ○?遊^?ッ、?メipp;墮?;ヌ?W頷d?g?=OO*玄ドゥ湲「シ7ソォEwQeV9ユケヘ?メicソAk-v?ッモ゚K?=フ」\"ォQユ?2コ?、ローuzE\rカヒ^X??dンヒ-ホェヲ葫fCG?M゚ヘ??、}\\鎔mYY8ュキ エ?S菜ニ輅o「イ广?~マユi?\0??斬DフqkF#cテ?F=?9xKォu:e?ラ??゙?9^?s ?サ\rモ掌黔m?%ヨzy??\0ミセ、?Gゥ6ヨ9?コハZ?E>テキ}u?際ン?写キ?夛?gイ岸VXス諂ク?-眩」??bヨ゚Iセマ詼??%K究?<_bエキ?埠{i,wWスケCa^ラnネユeエ?[V58孺v[?滯+VF5 4クヤlク5桾ヤ=???67ワ??}ャ゚些オ[??ア?~ュu?シャォZ?ロリ貶?~?\"ュソ、ェ暄z~ァゥ^?・Vーヘ?\'?4裔ス?ツ彑?lォh・マゥ?;ムv-98エワ/輌ス\\ed?濱モキ?゚Xu4レ?堯ヤャ餾.-ョ?U_Pメ證ッ?eiッゥUo?Isラ奧ュ?\'ヤロカt?スF螺}ceャ蘭?イ粐?レ?^ョP?t??E>ァ? フスZ?\0iz゚狄}?\0ル゚サ?・Vホ}X藥?\r[??、?モ?gァ絹nム、チU八vロ\Z?\n~#S?ァアトs鯔\Zォs??「/hー;?{~??\0戀}5スメュ フソxn59、ヨラオサ儼Sbレ唳_VMァェ湲?zヤャN鰐ヒゥ師エリテ゚^゙??\0嫐1]ッィ〔1ヘ[リ?ム]ャ?ミ踰ユ?7モイ溽jアZ4t:iH/W??K?趾サ*ラ萬亭ケ???゚Eソ」ァ?+A9?3W??-キa\rn-lvリoィ??5lウ?ヤdア?~C゚?/?s?/ヌaョヌ}攴wロUチヨ5ュl>テ^c?Tキ?敷ト>。メ?〃^$c}ュフウkエワZ=wャ?櫃メァユソ? ゚層」?鬲F\":?リォa?サ=クュ#サ%ホ\Z・チョ?-オ]1?7~潮??sユコ・ヨロ_Rチ?/ヌ}oェ\Zリ??ッ「ニ\rヘケ崟???Dケl?bレ?? YcY?#齲=@マルマソk,セロ\\ヌ?ヨソ?ャY鹽;wャKウ1ウ N、\n,ャ蜥稷ウヤォu\'リ觴k况~NGゥ風m゙ュ」Sルメ#?ナGッ?-?黙ケク]5ンUナュソ ?スメ $幀ナョノ?-wゥ嬾+?\'ァイ?ム??\0Hシ。v゚Zz摧taステ?=Jヘト5?~ォS゙?9?\0ス?「゚ム??Oァ~粐U\\?ツ?サ!?x???ヤ?棚%;?\0W?siq頃茸W]メ~゚c橄ィ?ケ残壙\Zツ?モcイア゙ヘロ??ァ?\0 j?{?6イチ???:Sェハ?゙3?x~??Zキqツ?%?? ニゥニfニ;Hun-2;?3w?)ct?ョカロ?x??ー?\0Snサ?K崕?ニ?\0チウ??,Aナハ脊O Gツナァコ?ロZ*kXK????#ャ暉セ滓11H鳧ー媾?5ラY苗nュ・ニヌス?.ロ足鬮ヨgゥ霍? ?\Zムイメ^粫?ヌ5?\rレ7サw??Mャ?クhc???.コri}9X?ァ毳.」yam剤?;=ロ^?點?\0ェラ?ulメ?.ナ7 l2\\6=OEホ;_eロh?ヨ?\0?F?チ帯ヘ、9セオU]kタ.ァヤカ」ス7゙1ルgヲ?+Cゥeカタモモ?ユ?\09n鷽メ賻ヘ???フ??? ヲフWキhリモVネ:?}.ヌpワ??\0チ?筰G%lA?GJiソ ヤ」モ・?ケチ?カ?O」?策佞イ?KV゚?棯ニヒ、Znサ+モヌツヌk[殯陽UヤX?アョsr22.?q*?騷>ァァ?奇Q?8ツム拘ル鶸%ル蒙レェ゚セ?^ラ=エZ釋F?MY??ン?拗モモ?)鮑sー4m>]?ラ\r?ルスフナァ?[??後F?ィ4tr?Yソュu;s?嫋 「親オTチイ??嬌?=?組、牒f??ユ?棚%)Yチホサ\n疇gOホネU誰血M?>?>ー3%セメ ウク?メ緘オワ? ニX?璋8オテPF???k??\r.mタ~?3?s テ$%ソ、?\0ヘFッッラ?1ッ?)リ?,}6リ?4ミ\\[?w?モシ~ムワユ覽?\0?丸?kワ8\"ヌ?饉?1コ?3V;G????ゥ+?錠゚チO。eGャ鍄釀k6??\'鏝[ォ/??\'ャ?a?6ァcfワ?8z亰サヤハーク?.ゥニャ*?゚Sラネョ??モ?\06シ?\0;?ヨ ヨコキe\Z)x!ユcオエエν閹>ニ?\0ニス??#oQHェ搦サ?+ォE聞、mナェaロdT??\0?ヲ{+?o埴K緒鷙アメIC)&メ、棚??ル\08BIM!\ZVersion compatibility info\0\0\0\0U\0\0\0\0\0\0\0A\0d\0o\0b\0e\0 \0P\0h\0o\0t\0o\0s\0h\0o\0p\0\0\0\0A\0d\0o\0b\0e\0 \0P\0h\0o\0t\0o\0s\0h\0o\0p\0 \06\0.\00\0\0\0\08BIM JPEG Quality\0\0\0\0\0\0\0\0\0?ロ\0C\0\n\n\n \n \Z%\Z# , #&\')*)-0-(0%()(?ロ\0C\n\n\n\n(\Z\Z((((((((((((((((((((((((((((((((((((((((((((((((((?タ\0\0x\0u\0?ト\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0?ト\08\0\0\0\0\0\0!1AQ\"aq?2贈ア#BRbムr$3チ盍?ト\0\Z\0\0\0\0\0\0\0\0\0\0\0\0\0?ト\00\0\0\0\0\0\0\0!1\"AQ2aBアムq■チ碵#R??レ\0 \0\0?\0?\0\0P@\0s?7浮ニ護|馬???・sgツルk・ カナヨCヒZ姉カ?ウ_gケラPc?゚P」ュKムノ~%?B,?チケ?%-62r?」胖、zL凶ae鰯9I舵Bャ4Egqqtム\'\Z?\n\0(\0??\n\0(\0?・+?m監スモ? !Oa?->厭Y\n蜥コー?tPa?9?OフラAF+す9ヨ? 厶。控t??>エラ?\n?|?みル篦A」=マ(<フwウ?VMウノマHコヤ{9則1? キ\'}?ヲXR\\イ7?9 v?チハc6XY?ル゚ラ。Jo4?\0?*\\咏{\"シイ介ク~Fサ?6ホ5 窖7?\'ヲ源ヌヌリ{2ケcx、h薈GSヲV\Z ?Xレqtニ8T\0P@\0\0Pカデ& テyW[KァP[袢\\・?8ォ\n」冨宗・?&カ9Q]職c?}シ?骭sv>^T\'\'?!、?1キ?wK+蠏詢C1e?\'ハウK\'?楓%?ネ???)夜繩?レ\r\0ロ」Drニ~=欺八1ゥ~モKsqk!リa4\'G舫躬B榕「クキ\Z?\"rフtャOQ?吊租qak遵?/\ZRフ6_?ネ>エロ??ョ\\オG、bセメ0i廳ォォDciイ愕?\0i?\0!襌Uコス.?kア!橡ナ倆pヘ@\0\0ヌテヨ?「窰?シサ??ワcオ &銚j??;鰍蝣iヤルセロ?*=)蜩消」eナ??..?? P?ノ??o・7?WB?c>S吟??Fミン\\iBコ丞?\0ネ??v?フフr?5,モ%?m停Cッ?シ醂(\'@?ォ・襲坪?3ヒサ*s?フ|エ)ノmvセ2/?髣?B+岻ナ鱠オモ,Χ*VAツ?9F・?\07V燻鬢 d磊Oyサオ?Hタ?7ヨス?td濫績明L」\Zァ$hタC?? >オメーノ%tv肆?Y/mニフ艀?。}\r??)苴j?\0bヲ?%?0メツ,ケ莓Rハニ\'フ@ル\'ッN柆 cI?\'ヒリf琲ウ7y(ュヲコ?,アH????ラcュS昴Qm.? ・|喟p??\r,wK-ワカアーェ?H?iG&頌eョ6ゥ亘チ<7o>ヌ?錘OッJ?-ム3SN?<ンヤカkm{?;I良Hタ?__スbヒゥZ蒙Y齲イサ)ツ?dヲ?^V,靭◎眈?\0zウ・ニ71%?7チIi%ト7\r ?t??uラマフw?ヨ未ヨ荳+?:fオ依リ?,Sハ\\r?]ラ_]ラ/&)oi\Zc%FY??篤Mヘe 儿ナt?コ涎Nカ+&?\\olゥ亰q\r@?ヘ0tユウFシ?~テ?*ヌQ・マツ3l喜,ソ┐P?/qK擽7Xキ貅キ@$エ裲?ラ?<梛ゥ???\0Q\'S弁S?6W^蛩糺ャョ@?tケ0ニj?ィ?8滯慶ヒAh特$e」?6シ、}:茅j\n\0租ygSスuュレ.ルCmカZ?3hカ??H・eSコ8 ?K??ぬワケ??吏旭aヌBキ―濶h屁ィ゚??ラM謗:r脯??桟摂テ~ハ?P^d艪5ム=リエmョ?ソ躡?ム???モカ1gqヨウ??+ケSキ%<6揃???6)オmEムsG }ク\rケ渠詞??9セ鐡?7pqY(?8膩レ?ラ~楫Z?qkyツw7?Q沙Xハ\r?ョキ?0Eャェ+臟?剋?フヲO>--d邉ヌゥ?2;3o縊ケ?\0ョウ7ゥ績?&ヨAツ?\n\0コ皰匆シRヌQ撞]&Mムxル?\nCow|nヨFハ ?跡_6ヤv曾ルャ?c?N??+,サ?/,??ツ6?ウt?;?z]Y[;? ーG Cァュ/( レ休計゚*5ハ{・Cwヒ$F耄}?81VQ3鋲iァc・Qセロ?饂t?9z?+ネ婬?K夢Hュ預?N必?紹アw?>??(Bヒowl\"F#?\0?Drァφ?トq?we\'褂?!\"9q?;。ラマ_?.5?fM?9 Yノik)9ォ泌\nュアn?ネ??3?aタア?6ユヌ-\n\0(\0??韲SFNrF?トヒ[i?+o。?シfウヌr?nX??%モtD」ノ#U崙ナ劵R_\\ト寿Q蜩ナacUU? LHQ熾z?5\0Rdョ.螻箪t??Ne?ュ:I?$C? ?/ュヲC{qツノ「]G!ル:?=*??T*ソr?7瞳エ?!?\0?\r闢?スMUJO○Hニ?レ!テ4鯨,?\rC\0n?{囚?ュ9}<カ?ナケ3ハd.イ? ?詈ョfngv=IョL跏?)\0(\0??\n\0?エn :?)??9n?5fγワnヨッ7メrミ?類コpヘ ゚f/(レp\\GトHノ2ー>?P「lmウハォト?:ュトぼ 梯?J?tKwhー?<1ラAコ囹+g8?m&ノ_[ォ\"?域?@:衍^アレキツ\"フw??ョヘvd??1?7s/ニG????Sヤテ\Zャ|ソ??Ck}?5ト?フ?H?逋斟ヒRk跏?掖?\0P@\0\0P@l2鱗?ウケ?/?=?*セ\Z恊篳、2リ?マZkRC&ソス?ムォ無?(婚ボZ?2コOt_氣O??{^ミ?iS潜?ラハノ&RXムコ??コメス\\?\0\nK?。エW框n%i\'大遜ウアb~讓懷7rv5t?\0P@\0?ル?リ??\0JFIF\0\0p\0p\0\0??ヤPhotoshop 3.0\08BIM?\nPrint Info\0\0\0\0x\0\0P\0H\0H\0\0\0\0レ(?????FP\0(?\0\0P\0H\0H\0\0\0\0レ(\0\0\0\0\0d\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\0d\0\0\0\0\0\0\"r\0\0\0\0\0\0\0\0\0\0\0\0?|\0\0\08BIM?\nResolution\0\0\0\0\0pU?\0\0\0pU?\0\08BIM\rFX Global Lighting Angle\0\0\0\0\0\0\0x8BIMFX Global Altitude\0\0\0\0\0\0\08BIM? Print Flags\0\0\0 \0\0\0\0\0\0\0\0\08BIM\nCopyright Flag\0\0\0\0\0\08BIM\'Japanese Print Flags\0\0\0\0\n\0\0\0\0\0\0\0\08BIM?Color Halftone Settings\0\0\0H\0/ff\0\0lff\0\0\0\0\0\0\0/ff\0\0。劒\0\0\0\0\0\0\02\0\0\0\0Z\0\0\0\0\0\0\0\0\05\0\0\0\0-\0\0\0\0\0\0\0\08BIM?Color Transfer Settings\0\0\0p\0\0???????????????????????\0\0\0\0???????????????????????\0\0\0\0???????????????????????\0\0\0\0???????????????????????\0\08BIM\0 Layer State\0\0\0\08BIM Layer Groups\0\0\0\0\0\0\0\08BIMGuges\0\0\0\0\0\0\0\0\0@\0\0@\0\0\0\08BIM\rURL overrges\0\0\0\0\0\0\08BIM\ZSlices\0\0\0\0u\0\0\0\0\0\0\0\0\0\0\0\0\0I\0\0:\0\0\0\n\0U\0n\0t\0i\0t\0l\0e\0d\0-\01\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\0I\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\08BIMICC Untagged Flag\0\0\0\08BIMLayer g Generator Base\0\0\0\0\0\08BIM New Windows Thumbnail\0\0i\0\0\0\0\0\0m\0\0\0p\0\0H\0\0準\0\0M\0\0?リ??\0JFIF\0\0H\0H\0\0??\0Adobe\0d?\0\0\0?ロ\0?\0    \n    \r \r\r   ?タ\0\0p\0m\"\0?ン\0\0?ト?\0\0\0\0\0\0\0\0\0\0 \n \0\0\0\0\0\0\0\0\0 \n \0 3\0!1AQa\"q?2贈アB#$Rチb34rびC%担??s5「イ?&D典dEツ」t6メU稙??モu胚F\'筈?米ヤ蔬・オナユ襄Vfv?ヲカニヨ踐7GWgw?ァキヌラ銷\05\0!1AQaq\"2¢。アB#チRム?3$b疵rCScs4?%「イ?&5ツメD典」dEU6te糘ウ?モu胚F筈?米ヤ蔬・オナユ襄Vfv?ヲカニヨ踐\'7GWgw?ァキヌ?レ\0 \0\0?\0?棚%)$瞳施セ$如$ミユK#總詁ヌゥヨv?4?\09htタaマ\0サ?\"G??ヒr較C}:?p-?? ロ?コカヨヨツウW?ミヲaトォ?Tアチ?[ワ$1マ?;?=M?\0Sz?K+ネヘv7?\rkェタツキ\Zソエu~ョX?)ニdエリO?oルV=゚G~マエ_?オd?k゙ハ?ァ\0レワ?゚T?\06ラ?サcツ;gモ???\0捍チ ィ?.?/?};ヘ驀G\0掌綺@q??!、?\0!?\0A?\0ルUWゥラ泅レヘoヌeマ oョ[I??\0Kヤkッヌオ?\0顆SアSホ?ミz・/ネヌe?2ンKャ?p栽ハニe?+ル??Sル??\0「z旨スl~ン? ロ? -ウミコ拾ネ贐??2.ェヨ条納?G??\0テW[ヨz??4)RI$ぁ?ミ?棚%( +kヲtフ鶴PQaモqqc?4{セ林k9ヒ????0?&&ミ?N??ラt?,ャ蹶Xkヌア?{ -cA?M熟?5ユキ?z櫃モVーヌ?洽゚Oワヌ?=g?/URハヲ?ュfMfbメ磅ナ ャカ楠ネソ?5ケセ槎カモ???\0癡Iメコ?ネ髦ヨ覿f(#?}?ト跟ル?ャ?w?ムソモウ?ム???v;ヨチオホ] 植?藷キロ^Ulリ???/]カ穴゙?1ョ。??珠Rヨ゙ロ\'cュカヲ\nw?ケカS???ョハ?Eネ???ヤZヒ1?ロ} ?ホトホニwキf]{ソG^レ?z?o?アB2ンhkMWテサ讖+G?撥n?曝ワテ-sH゚]オサMユロ[嫺ネUユZ7Uョヤケ?ム??鋳扨&Nリ\'ケ?ヤ鍜魁w*uーn?]T\r?オ淑?$ク?fミラ7ヤc?\0yt}Cュ袗?1q@shs境hv?z孀??\0en??,w?ッ?」ッ「8モ壙*ュヌ!平ク・ーb?娩w?Os??Fマム・e猷cア囘;壑mdl斟m?;cン[?/?\0セ#L?。?ス|?フヘ_r?8Xzォ*}?:嗅ー1??Xラナフヌタニgカラロ?9セッゥ?\r?\0・?\0エ?ネ鶚?ラ}?冐熊スレ2キ?\0Hォ.カサラ9?}麟~;?\0M??c2?ツqエ7?潟*8囚キ!?oァ?oィ?イ-g?/ムォ4?\n??ノキカケ?譱#}5;e?愧_レ3=oァ??ッ^7?iオ7?$欅??音yカゥ?モ?カャ[Csキt惘Uョゥ盻ョウ.キリ鍄?[= }oNヒ?\0]c瞠Kz?ォゥヤ?gィ?UfツK?マ?eサ~ム]_ヲ?\0ョ.?蹠wNテヲ?ォ?/sンー争?zuz椏Y?エウラゥ?灌渭ェ[コSウ歉妻ッn;\0ュカ今?/;娟F0?nヘソ、ルウラ?% ゙ウ\"b}<]o??4コユトoLヌ鶚?゙?PキOx?{hヌョ媼??\00バ?」ヨサ゚mヨzカ*NCァ釁FV17aneu=ミ甼⊥霽;lnラ2?ス椚Lコレoッ?ッ?g+7\"囿?カ貂3=ト青\0凡旌3u?種?2ヨl?Oユ?wセーcgt??マQヌョヌオ?.ャセニ揮羞☆5;布゚ヲキ?Y?漆鯏 ア0D?猖ラd=ッ?ハ黨ケ.ムc?ウpSNwレュ}クケ/kw??0セラ?%jcgソェcX猝ワヒ+s宜?8Xハ??62?+}ウgモカェスOラ=5ホu゙?:eュネ\ru廟Xイ?‡{ナgルeyt\r布V^マ輌滌?>ロ遣疼ヌa粭z?,uホ~8pュ?;Vオマヌ,?>Eフゥ?ェソE努鬩ア?\0h???゚Tンh\\ョス9焦n].uァモ檎ニ? ッァ~ンヘk?゚窓m蘗?ョ*絽ァgbキォ瞼uュ]オ゙>?盟???b?ョs=?J?\0@シナVヒ2タ恕D瘻>・(゙テ???メ?lfオマ?乍謔ャaV?.kZメO.0??U;UY?\Zヨ勿!?2v4{ルイカYオロ?\0孕ルウ?%kVェq?[疫m」ォオ孀mリ1?Fュ?xル?葆ヲ??\'g」岨。?2\rュk麒ュフ,徒[シケム鎹?\0ヘネキ?m?\0カ?oP鰈Tハ\0qスオ脆?bルッ{,?抔ア??\0驃e溂テ \0 ?ラ?ュ\\テ○?遊^?ッ、?メipp;墮?;ヌ?W頷d?g?=OO*玄ドゥ湲「シ7ソォEwQeV9ユケヘ?メicソAk-v?ッモ゚K?=フ」\"ォQユ?2コ?、ローuzE\rカヒ^X??dンヒ-ホェヲ葫fCG?M゚ヘ??、}\\鎔mYY8ュキ エ?S菜ニ輅o「イ广?~マユi?\0??斬DフqkF#cテ?F=?9xKォu:e?ラ??゙?9^?s ?サ\rモ掌黔m?%ヨzy??\0ミセ、?Gゥ6ヨ9?コハZ?E>テキ}u?際ン?写キ?夛?gイ岸VXス諂ク?-眩」??bヨ゚Iセマ詼??%K究?<_bエキ?埠{i,wWスケCa^ラnネユeエ?[V58孺v[?滯+VF5 4クヤlク5桾ヤ=???67ワ??}ャ゚些オ[??ア?~ュu?シャォZ?ロリ貶?~?\"ュソ、ェ暄z~ァゥ^?・Vーヘ?\'?4裔ス?ツ彑?lォh・マゥ?;ムv-98エワ/輌ス\\ed?濱モキ?゚Xu4レ?堯ヤャ餾.-ョ?U_Pメ證ッ?eiッゥUo?Isラ奧ュ?\'ヤロカt?スF螺}ceャ蘭?イ粐?レ?^ョP?t??E>ァ? フスZ?\0iz゚狄}?\0ル゚サ?・Vホ}X藥?\r[??、?モ?gァ絹nム、チU八vロ\Z?\n~#S?ァアトs鯔\Zォs??「/hー;?{~??\0戀}5スメュ フソxn59、ヨラオサ儼Sbレ唳_VMァェ湲?zヤャN鰐ヒゥ師エリテ゚^゙??\0嫐1]ッィ〔1ヘ[リ?ム]ャ?ミ踰ユ?7モイ溽jアZ4t:iH/W??K?趾サ*ラ萬亭ケ???゚Eソ」ァ?+A9?3W??-キa\rn-lvリoィ??5lウ?ヤdア?~C゚?/?s?/ヌaョヌ}攴wロUチヨ5ュl>テ^c?Tキ?敷ト>。メ?〃^$c}ュフウkエワZ=wャ?櫃メァユソ? ゚層」?鬲F\":?リォa?サ=クュ#サ%ホ\Z・チョ?-オ]1?7~潮??sユコ・ヨロ_Rチ?/ヌ}oェ\Zリ??ッ「ニ\rヘケ崟???Dケl?bレ?? YcY?#齲=@マルマソk,セロ\\ヌ?ヨソ?ャY鹽;wャKウ1ウ N、\n,ャ蜥稷ウヤォu\'リ觴k况~NGゥ風m゙ュ」Sルメ#?ナGッ?-?黙ケク]5ンUナュソ ?スメ $幀ナョノ?-wゥ嬾+?\'ァイ?ム??\0Hシ。v゚Zz摧taステ?=Jヘト5?~ォS゙?9?\0ス?「゚ム??Oァ~粐U\\?ツ?サ!?x???ヤ?棚%;?\0W?siq頃茸W]メ~゚c橄ィ?ケ残壙\Zツ?モcイア゙ヘロ??ァ?\0 j?{?6イチ???:Sェハ?゙3?x~??Zキqツ?%?? ニゥニfニ;Hun-2;?3w?)ct?ョカロ?x??ー?\0Snサ?K崕?ニ?\0チウ??,Aナハ脊O Gツナァコ?ロZ*kXK????#ャ暉セ滓11H鳧ー媾?5ラY苗nュ・ニヌス?.ロ足鬮ヨgゥ霍? ?\Zムイメ^粫?ヌ5?\rレ7サw??Mャ?クhc???.コri}9X?ァ毳.」yam剤?;=ロ^?點?\0ェラ?ulメ?.ナ7 l2\\6=OEホ;_eロh?ヨ?\0?F?チ帯ヘ、9セオU]kタ.ァヤカ」ス7゙1ルgヲ?+Cゥeカタモモ?ユ?\09n鷽メ賻ヘ???フ??? ヲフWキhリモVネ:?}.ヌpワ??\0チ?筰G%lA?GJiソ ヤ」モ・?ケチ?カ?O」?策佞イ?KV゚?棯ニヒ、Znサ+モヌツヌk[殯陽UヤX?アョsr22.?q*?騷>ァァ?奇Q?8ツム拘ル鶸%ル蒙レェ゚セ?^ラ=エZ釋F?MY??ン?拗モモ?)鮑sー4m>]?ラ\r?ルスフナァ?[??後F?ィ4tr?Yソュu;s?嫋 「親オTチイ??嬌?=?組、牒f??ユ?棚%)Yチホサ\n疇gOホネU誰血M?>?>ー3%セメ ウク?メ緘オワ? ニX?璋8オテPF???k??\r.mタ~?3?s テ$%ソ、?\0ヘFッッラ?1ッ?)リ?,}6リ?4ミ\\[?w?モシ~ムワユ覽?\0?丸?kワ8\"ヌ?饉?1コ?3V;G????ゥ+?錠゚チO。eGャ鍄釀k6??\'鏝[ォ/??\'ャ?a?6ァcfワ?8z亰サヤハーク?.ゥニャ*?゚Sラネョ??モ?\06シ?\0;?ヨ ヨコキe\Z)x!ユcオエエν閹>ニ?\0ニス??#oQHェ搦サ?+ォE聞、mナェaロdT??\0?ヲ{+?o埴K緒鷙アメIC)&メ、棚??ル\08BIM!\ZVersion compatibility info\0\0\0\0U\0\0\0\0\0\0\0A\0d\0o\0b\0e\0 \0P\0h\0o\0t\0o\0s\0h\0o\0p\0\0\0\0A\0d\0o\0b\0e\0 \0P\0h\0o\0t\0o\0s\0h\0o\0p\0 \06\0.\00\0\0\0\08BIM JPEG Quality\0\0\0\0\0\0\0\0\0?ロ\0C\0\n\n\n \n \Z%\Z# , #&\')*)-0-(0%()(?ロ\0C\n\n\n\n(\Z\Z((((((((((((((((((((((((((((((((((((((((((((((((((?タ\0\0x\0u\0?ト\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0?ト\08\0\0\0\0\0\0!1AQ\"aq?2贈ア#BRbムr$3チ盍?ト\0\Z\0\0\0\0\0\0\0\0\0\0\0\0\0?ト\00\0\0\0\0\0\0\0!1\"AQ2aBアムq■チ碵#R??レ\0 \0\0?\0?\0\0P@\0s?7浮ニ護|馬???・sgツルk・ カナヨCヒZ姉カ?ウ_gケラPc?゚P」ュKムノ~%?B,?チケ?%-62r?」胖、zL凶ae鰯9I舵Bャ4Egqqtム\'\Z?\n\0(\0??\n\0(\0?・+?m監スモ? !Oa?->厭Y\n蜥コー?tPa?9?OフラAF+す9ヨ? 厶。控t??>エラ?\n?|?みル篦A」=マ(<フwウ?VMウノマHコヤ{9則1? キ\'}?ヲXR\\イ7?9 v?チハc6XY?ル゚ラ。Jo4?\0?*\\咏{\"シイ介ク~Fサ?6ホ5 窖7?\'ヲ源ヌヌリ{2ケcx、h薈GSヲV\Z ?Xレqtニ8T\0P@\0\0Pカデ& テyW[KァP[袢\\・?8ォ\n」冨宗・?&カ9Q]職c?}シ?骭sv>^T\'\'?!、?1キ?wK+蠏詢C1e?\'ハウK\'?楓%?ネ???)夜繩?レ\r\0ロ」Drニ~=欺八1ゥ~モKsqk!リa4\'G舫躬B榕「クキ\Z?\"rフtャOQ?吊租qak遵?/\ZRフ6_?ネ>エロ??ョ\\オG、bセメ0i廳ォォDciイ愕?\0i?\0!襌Uコス.?kア!橡ナ倆pヘ@\0\0ヌテヨ?「窰?シサ??ワcオ &銚j??;鰍蝣iヤルセロ?*=)蜩消」eナ??..?? P?ノ??o・7?WB?c>S吟??Fミン\\iBコ丞?\0ネ??v?フフr?5,モ%?m停Cッ?シ醂(\'@?ォ・襲坪?3ヒサ*s?フ|エ)ノmvセ2/?髣?B+岻ナ鱠オモ,Χ*VAツ?9F・?\07V燻鬢 d磊Oyサオ?Hタ?7ヨス?td濫績明L」\Zァ$hタC?? >オメーノ%tv肆?Y/mニフ艀?。}\r??)苴j?\0bヲ?%?0メツ,ケ莓Rハニ\'フ@ル\'ッN柆 cI?\'ヒリf琲ウ7y(ュヲコ?,アH????ラcュS昴Qm.? ・|喟p??\r,wK-ワカアーェ?H?iG&頌eョ6ゥ亘チ<7o>ヌ?錘OッJ?-ム3SN?<ンヤカkm{?;I良Hタ?__スbヒゥZ蒙Y齲イサ)ツ?dヲ?^V,靭◎眈?\0zウ・ニ71%?7チIi%ト7\r ?t??uラマフw?ヨ未ヨ荳+?:fオ依リ?,Sハ\\r?]ラ_]ラ/&)oi\Zc%FY??篤Mヘe 儿ナt?コ涎Nカ+&?\\olゥ亰q\r@?ヘ0tユウFシ?~テ?*ヌQ・マツ3l喜,ソ┐P?/qK擽7Xキ貅キ@$エ裲?ラ?<梛ゥ???\0Q\'S弁S?6W^蛩糺ャョ@?tケ0ニj?ィ?8滯慶ヒAh特$e」?6シ、}:茅j\n\0租ygSスuュレ.ルCmカZ?3hカ??H・eSコ8 ?K??ぬワケ??吏旭aヌBキ―濶h屁ィ゚??ラM謗:r脯??桟摂テ~ハ?P^d艪5ム=リエmョ?ソ躡?ム???モカ1gqヨウ??+ケSキ%<6揃???6)オmEムsG }ク\rケ渠詞??9セ鐡?7pqY(?8膩レ?ラ~楫Z?qkyツw7?Q沙Xハ\r?ョキ?0Eャェ+臟?剋?フヲO>--d邉ヌゥ?2;3o縊ケ?\0ョウ7ゥ績?&ヨAツ?\n\0コ皰匆シRヌQ撞]&Mムxル?\nCow|nヨFハ ?跡_6ヤv曾ルャ?c?N??+,サ?/,??ツ6?ウt?;?z]Y[;? ーG Cァュ/( レ休計゚*5ハ{・Cwヒ$F耄}?81VQ3鋲iァc・Qセロ?饂t?9z?+ネ婬?K夢Hュ預?N必?紹アw?>??(Bヒowl\"F#?\0?Drァφ?トq?we\'褂?!\"9q?;。ラマ_?.5?fM?9 Yノik)9ォ泌\nュアn?ネ??3?aタア?6ユヌ-\n\0(\0??韲SFNrF?トヒ[i?+o。?シfウヌr?nX??%モtD」ノ#U崙ナ劵R_\\ト寿Q蜩ナacUU? LHQ熾z?5\0Rdョ.螻箪t??Ne?ュ:I?$C? ?/ュヲC{qツノ「]G!ル:?=*??T*ソr?7瞳エ?!?\0?\r闢?スMUJO○Hニ?レ!テ4鯨,?\rC\0n?{囚?ュ9}<カ?ナケ3ハd.イ? ?詈ョfngv=IョL跏?)\0(\0??\n\0?エn :?)??9n?5fγワnヨッ7メrミ?類コpヘ ゚f/(レp\\GトHノ2ー>?P「lmウハォト?:ュトぼ 梯?J?tKwhー?<1ラAコ囹+g8?m&ノ_[ォ\"?域?@:衍^アレキツ\"フw??ョヘvd??1?7s/ニG????Sヤテ\Zャ|ソ??Ck}?5ト?フ?H?逋斟ヒRk跏?掖?\0P@\0\0P@l2鱗?ウケ?/?=?*セ\Z恊篳、2リ?マZkRC&ソス?ムォ無?(婚ボZ?2コOt_氣O??{^ミ?iS潜?ラハノ&RXムコ??コメス\\?\0\nK?。エW框n%i\'大遜ウアb~讓懷7rv5t?\0P@\0?ル?リ??\0JFIF\0\0p\0p\0\0??ヤPhotoshop 3.0\08BIM?\nPrint Info\0\0\0\0x\0\0P\0H\0H\0\0\0\0レ(?????FP\0(?\0\0P\0H\0H\0\0\0\0レ(\0\0\0\0\0d\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\0d\0\0\0\0\0\0\"r\0\0\0\0\0\0\0\0\0\0\0\0?|\0\0\08BIM?\nResolution\0\0\0\0\0pU?\0\0\0pU?\0\08BIM\rFX Global Lighting Angle\0\0\0\0\0\0\0x8BIMFX Global Altitude\0\0\0\0\0\0\08BIM? Print Flags\0\0\0 \0\0\0\0\0\0\0\0\08BIM\nCopyright Flag\0\0\0\0\0\08BIM\'Japanese Print Flags\0\0\0\0\n\0\0\0\0\0\0\0\08BIM?Color Halftone Settings\0\0\0H\0/ff\0\0lff\0\0\0\0\0\0\0/ff\0\0。劒\0\0\0\0\0\0\02\0\0\0\0Z\0\0\0\0\0\0\0\0\05\0\0\0\0-\0\0\0\0\0\0\0\08BIM?Color Transfer Settings\0\0\0p\0\0???????????????????????\0\0\0\0???????????????????????\0\0\0\0???????????????????????\0\0\0\0???????????????????????\0\08BIM\0 Layer State\0\0\0\08BIM Layer Groups\0\0\0\0\0\0\0\08BIMGuges\0\0\0\0\0\0\0\0\0@\0\0@\0\0\0\08BIM\rURL overrges\0\0\0\0\0\0\08BIM\ZSlices\0\0\0\0u\0\0\0\0\0\0\0\0\0\0\0\0\0I\0\0:\0\0\0\n\0U\0n\0t\0i\0t\0l\0e\0d\0-\01\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\0I\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\08BIMICC Untagged Flag\0\0\0\08BIMLayer g Generator Base\0\0\0\0\0\08BIM New Windows Thumbnail\0\0i\0\0\0\0\0\0m\0\0\0p\0\0H\0\0準\0\0M\0\0?リ??\0JFIF\0\0H\0H\0\0??\0Adobe\0d?\0\0\0?ロ\0?\0    \n    \r \r\r   ?タ\0\0p\0m\"\0?ン\0\0?ト?\0\0\0\0\0\0\0\0\0\0 \n \0\0\0\0\0\0\0\0\0 \n \0 3\0!1AQa\"q?2贈アB#$Rチb34rびC%担??s5「イ?&D典dEツ」t6メU稙??モu胚F\'筈?米ヤ蔬・オナユ襄Vfv?ヲカニヨ踐7GWgw?ァキヌラ銷\05\0!1AQaq\"2¢。アB#チRム?3$b疵rCScs4?%「イ?&5ツメD典」dEU6te糘ウ?モu胚F筈?米ヤ蔬・オナユ襄Vfv?ヲカニヨ踐\'7GWgw?ァキヌ?レ\0 \0\0?\0?棚%)$瞳施セ$如$ミユK#總詁ヌゥヨv?4?\09htタaマ\0サ?\"G??ヒr較C}:?p-?? ロ?コカヨヨツウW?ミヲaトォ?Tアチ?[ワ$1マ?;?=M?\0Sz?K+ネヘv7?\rkェタツキ\Zソエu~ョX?)ニdエリO?oルV=゚G~マエ_?オd?k゙ハ?ァ\0レワ?゚T?\06ラ?サcツ;gモ???\0捍チ ィ?.?/?};ヘ驀G\0掌綺@q??!、?\0!?\0A?\0ルUWゥラ泅レヘoヌeマ oョ[I??\0Kヤkッヌオ?\0顆SアSホ?ミz・/ネヌe?2ンKャ?p栽ハニe?+ル??Sル??\0「z旨スl~ン? ロ? -ウミコ拾ネ贐??2.ェヨ条納?G??\0テW[ヨz??4)RI$ぁ?ミ?棚%( +kヲtフ鶴PQaモqqc?4{セ林k9ヒ????0?&&ミ?N??ラt?,ャ蹶Xkヌア?{ -cA?M熟?5ユキ?z櫃モVーヌ?洽゚Oワヌ?=g?/URハヲ?ュfMfbメ磅ナ ャカ楠ネソ?5ケセ槎カモ???\0癡Iメコ?ネ髦ヨ覿f(#?}?ト跟ル?ャ?w?ムソモウ?ム???v;ヨチオホ] 植?藷キロ^Ulリ???/]カ穴゙?1ョ。??珠Rヨ゙ロ\'cュカヲ\nw?ケカS???ョハ?Eネ???ヤZヒ1?ロ} ?ホトホニwキf]{ソG^レ?z?o?アB2ンhkMWテサ讖+G?撥n?曝ワテ-sH゚]オサMユロ[嫺ネUユZ7Uョヤケ?ム??鋳扨&Nリ\'ケ?ヤ鍜魁w*uーn?]T\r?オ淑?$ク?fミラ7ヤc?\0yt}Cュ袗?1q@shs境hv?z孀??\0en??,w?ッ?」ッ「8モ壙*ュヌ!平ク・ーb?娩w?Os??Fマム・e猷cア囘;壑mdl斟m?;cン[?/?\0セ#L?。?ス|?フヘ_r?8Xzォ*}?:嗅ー1??Xラナフヌタニgカラロ?9セッゥ?\r?\0・?\0エ?ネ鶚?ラ}?冐熊スレ2キ?\0Hォ.カサラ9?}麟~;?\0M??c2?ツqエ7?潟*8囚キ!?oァ?oィ?イ-g?/ムォ4?\n??ノキカケ?譱#}5;e?愧_レ3=oァ??ッ^7?iオ7?$欅??音yカゥ?モ?カャ[Csキt惘Uョゥ盻ョウ.キリ鍄?[= }oNヒ?\0]c瞠Kz?ォゥヤ?gィ?UfツK?マ?eサ~ム]_ヲ?\0ョ.?蹠wNテヲ?ォ?/sンー争?zuz椏Y?エウラゥ?灌渭ェ[コSウ歉妻ッn;\0ュカ今?/;娟F0?nヘソ、ルウラ?% ゙ウ\"b}<]o??4コユトoLヌ鶚?゙?PキOx?{hヌョ媼??\00バ?」ヨサ゚mヨzカ*NCァ釁FV17aneu=ミ甼⊥霽;lnラ2?ス椚Lコレoッ?ッ?g+7\"囿?カ貂3=ト青\0凡旌3u?種?2ヨl?Oユ?wセーcgt??マQヌョヌオ?.ャセニ揮羞☆5;布゚ヲキ?Y?漆鯏 ア0D?猖ラd=ッ?ハ黨ケ.ムc?ウpSNwレュ}クケ/kw??0セラ?%jcgソェcX猝ワヒ+s宜?8Xハ??62?+}ウgモカェスOラ=5ホu゙?:eュネ\ru廟Xイ?‡{ナgルeyt\r布V^マ輌滌?>ロ遣疼ヌa粭z?,uホ~8pュ?;Vオマヌ,?>Eフゥ?ェソE努鬩ア?\0h???゚Tンh\\ョス9焦n].uァモ檎ニ? ッァ~ンヘk?゚窓m蘗?ョ*絽ァgbキォ瞼uュ]オ゙>?盟???b?ョs=?J?\0@シナVヒ2タ恕D瘻>・(゙テ???メ?lfオマ?乍謔ャaV?.kZメO.0??U;UY?\Zヨ勿!?2v4{ルイカYオロ?\0孕ルウ?%kVェq?[疫m」ォオ孀mリ1?Fュ?xル?葆ヲ??\'g」岨。?2\rュk麒ュフ,徒[シケム鎹?\0ヘネキ?m?\0カ?oP鰈Tハ\0qスオ脆?bルッ{,?抔ア??\0驃e溂テ \0 ?ラ?ュ\\テ○?遊^?ッ、?メipp;墮?;ヌ?W頷d?g?=OO*玄ドゥ湲「シ7ソォEwQeV9ユケヘ?メicソAk-v?ッモ゚K?=フ」\"ォQユ?2コ?、ローuzE\rカヒ^X??dンヒ-ホェヲ葫fCG?M゚ヘ??、}\\鎔mYY8ュキ エ?S菜ニ輅o「イ广?~マユi?\0??斬DフqkF#cテ?F=?9xKォu:e?ラ??゙?9^?s ?サ\rモ掌黔m?%ヨzy??\0ミセ、?Gゥ6ヨ9?コハZ?E>テキ}u?際ン?写キ?夛?gイ岸VXス諂ク?-眩」??bヨ゚Iセマ詼??%K究?<_bエキ?埠{i,wWスケCa^ラnネユeエ?[V58孺v[?滯+VF5 4クヤlク5桾ヤ=???67ワ??}ャ゚些オ[??ア?~ュu?シャォZ?ロリ貶?~?\"ュソ、ェ暄z~ァゥ^?・Vーヘ?\'?4裔ス?ツ彑?lォh・マゥ?;ムv-98エワ/輌ス\\ed?濱モキ?゚Xu4レ?堯ヤャ餾.-ョ?U_Pメ證ッ?eiッゥUo?Isラ奧ュ?\'ヤロカt?スF螺}ceャ蘭?イ粐?レ?^ョP?t??E>ァ? フスZ?\0iz゚狄}?\0ル゚サ?・Vホ}X藥?\r[??、?モ?gァ絹nム、チU八vロ\Z?\n~#S?ァアトs鯔\Zォs??「/hー;?{~??\0戀}5スメュ フソxn59、ヨラオサ儼Sbレ唳_VMァェ湲?zヤャN鰐ヒゥ師エリテ゚^゙??\0嫐1]ッィ〔1ヘ[リ?ム]ャ?ミ踰ユ?7モイ溽jアZ4t:iH/W??K?趾サ*ラ萬亭ケ???゚Eソ」ァ?+A9?3W??-キa\rn-lvリoィ??5lウ?ヤdア?~C゚?/?s?/ヌaョヌ}攴wロUチヨ5ュl>テ^c?Tキ?敷ト>。メ?〃^$c}ュフウkエワZ=wャ?櫃メァユソ? ゚層」?鬲F\":?リォa?サ=クュ#サ%ホ\Z・チョ?-オ]1?7~潮??sユコ・ヨロ_Rチ?/ヌ}oェ\Zリ??ッ「ニ\rヘケ崟???Dケl?bレ?? YcY?#齲=@マルマソk,セロ\\ヌ?ヨソ?ャY鹽;wャKウ1ウ N、\n,ャ蜥稷ウヤォu\'リ觴k况~NGゥ風m゙ュ」Sルメ#?ナGッ?-?黙ケク]5ンUナュソ ?スメ $幀ナョノ?-wゥ嬾+?\'ァイ?ム??\0Hシ。v゚Zz摧taステ?=Jヘト5?~ォS゙?9?\0ス?「゚ム??Oァ~粐U\\?ツ?サ!?x???ヤ?棚%;?\0W?siq頃茸W]メ~゚c橄ィ?ケ残壙\Zツ?モcイア゙ヘロ??ァ?\0 j?{?6イチ???:Sェハ?゙3?x~??Zキqツ?%?? ニゥニfニ;Hun-2;?3w?)ct?ョカロ?x??ー?\0Snサ?K崕?ニ?\0チウ??,Aナハ脊O Gツナァコ?ロZ*kXK????#ャ暉セ滓11H鳧ー媾?5ラY苗nュ・ニヌス?.ロ足鬮ヨgゥ霍? ?\Zムイメ^粫?ヌ5?\rレ7サw??Mャ?クhc???.コri}9X?ァ毳.」yam剤?;=ロ^?點?\0ェラ?ulメ?.ナ7 l2\\6=OEホ;_eロh?ヨ?\0?F?チ帯ヘ、9セオU]kタ.ァヤカ」ス7゙1ルgヲ?+Cゥeカタモモ?ユ?\09n鷽メ賻ヘ???フ??? ヲフWキhリモVネ:?}.ヌpワ??\0チ?筰G%lA?GJiソ ヤ」モ・?ケチ?カ?O」?策佞イ?KV゚?棯ニヒ、Znサ+モヌツヌk[殯陽UヤX?アョsr22.?q*?騷>ァァ?奇Q?8ツム拘ル鶸%ル蒙レェ゚セ?^ラ=エZ釋F?MY??ン?拗モモ?)鮑sー4m>]?ラ\r?ルスフナァ?[??後F?ィ4tr?Yソュu;s?嫋 「親オTチイ??嬌?=?組、牒f??ユ?棚%)Yチホサ\n疇gOホネU誰血M?>?>ー3%セメ ウク?メ緘オワ? ニX?璋8オテPF???k??\r.mタ~?3?s テ$%ソ、?\0ヘFッッラ?1ッ?)リ?,}6リ?4ミ\\[?w?モシ~ムワユ覽?\0?丸?kワ8\"ヌ?饉?1コ?3V;G????ゥ+?錠゚チO。eGャ鍄釀k6??\'鏝[ォ/??\'ャ?a?6ァcfワ?8z亰サヤハーク?.ゥニャ*?゚Sラネョ??モ?\06シ?\0;?ヨ ヨコキe\Z)x!ユcオエエν閹>ニ?\0ニス??#oQHェ搦サ?+ォE聞、mナェaロdT??\0?ヲ{+?o埴K緒鷙アメIC)&メ、棚??ル\08BIM!\ZVersion compatibility info\0\0\0\0U\0\0\0\0\0\0\0A\0d\0o\0b\0e\0 \0P\0h\0o\0t\0o\0s\0h\0o\0p\0\0\0\0A\0d\0o\0b\0e\0 \0P\0h\0o\0t\0o\0s\0h\0o\0p\0 \06\0.\00\0\0\0\08BIM JPEG Quality\0\0\0\0\0\0\0\0\0?ロ\0C\0\n\n\n \n \Z%\Z# , #&\')*)-0-(0%()(?ロ\0C\n\n\n\n(\Z\Z((((((((((((((((((((((((((((((((((((((((((((((((((?タ\0\0x\0u\0?ト\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0?ト\08\0\0\0\0\0\0!1AQ\"aq?2贈ア#BRbムr$3チ盍?ト\0\Z\0\0\0\0\0\0\0\0\0\0\0\0\0?ト\00\0\0\0\0\0\0\0!1\"AQ2aBアムq■チ碵#R??レ\0 \0\0?\0?\0\0P@\0s?7浮ニ護|馬???・sgツルk・ カナヨCヒZ姉カ?ウ_gケラPc?゚P」ュKムノ~%?B,?チケ?%-62r?」胖、zL凶ae鰯9I舵Bャ4Egqqtム\'\Z?\n\0(\0??\n\0(\0?・+?m監スモ? !Oa?->厭Y\n蜥コー?tPa?9?OフラAF+す9ヨ? 厶。控t??>エラ?\n?|?みル篦A」=マ(<フwウ?VMウノマHコヤ{9則1? キ\'}?ヲXR\\イ7?9 v?チハc6XY?ル゚ラ。Jo4?\0?*\\咏{\"シイ介ク~Fサ?6ホ5 窖7?\'ヲ源ヌヌリ{2ケcx、h薈GSヲV\Z ?Xレqtニ8T\0P@\0\0Pカデ& テyW[KァP[袢\\・?8ォ\n」冨宗・?&カ9Q]職c?}シ?骭sv>^T\'\'?!、?1キ?wK+蠏詢C1e?\'ハウK\'?楓%?ネ???)夜繩?レ\r\0ロ」Drニ~=欺八1ゥ~モKsqk!リa4\'G舫躬B榕「クキ\Z?\"rフtャOQ?吊租qak遵?/\ZRフ6_?ネ>エロ??ョ\\オG、bセメ0i廳ォォDciイ愕?\0i?\0!襌Uコス.?kア!橡ナ倆pヘ@\0\0ヌテヨ?「窰?シサ??ワcオ &銚j??;鰍蝣iヤルセロ?*=)蜩消」eナ??..?? P?ノ??o・7?WB?c>S吟??Fミン\\iBコ丞?\0ネ??v?フフr?5,モ%?m停Cッ?シ醂(\'@?ォ・襲坪?3ヒサ*s?フ|エ)ノmvセ2/?髣?B+岻ナ鱠オモ,Χ*VAツ?9F・?\07V燻鬢 d磊Oyサオ?Hタ?7ヨス?td濫績明L」\Zァ$hタC?? >オメーノ%tv肆?Y/mニフ艀?。}\r??)苴j?\0bヲ?%?0メツ,ケ莓Rハニ\'フ@ル\'ッN柆 cI?\'ヒリf琲ウ7y(ュヲ',0.5808563,'q',5,7,'1942-01-20 10:45:14.0'), +(1979,'xwv',' uses the Licensed Work with a total of less than three\n server instances for any purpose.\n\nChange Date: 2024-06-02\n\nChange License: Version 2 or later of the GNU General Public License as\n published by the Free Software Foundation.\n\nFor information about alternative licensing arrangements for the Software,\nplease visit: https://mariadb.com/products/mariadb-enterprise\n\nNotice\n\nThe Business Source License (this document, or the 窶廰icense窶?) is not an Open\nSource license. However, the Licensed Work will eventually be made available\nunder an Open Source License, as stated in this License.\n\nFor more information on the use of the Business Source License for MariaDB\nproducts, please visit the MariaDB Business Source License FAQ at\nhttps://mariadb.com/bsl-faq-mariadb.\n\nFor more information on the use of the Business Source License generally,\nplease visit the Adopting and Developing Business Source License FAQ at\nhttps://mariadb.com/bsl-faq-adopting.\n\n-----------------------------------------------------------------------------\n\nBusiness Source License 1.1\n\nTerms\n\nThe Licensor hereby grants you the right to copy, modify, create derivative\nworks, redistribute, and make non-production use of the Licensed Work. The\nLicensor may make an Additional Use Grant, above, permitting limited\nproduction use.\n\nEffective on the Change Date, or the fourth anniversary of the first publicly\navailable distribution of a specific version of the Licensed Work under this\nLicense, whichever comes first, the Licensor hereby grants you rights under\nthe terms of the Change License, and the rights granted in the paragraph\nabove terminate.\n\nIf your use of the Licensed Work does not comply with the requirements\ncurrently in effect as described in this License, you must purchase a\ncommercial license from the Licensor, its affiliated entities, or authorized\nresellers, or you must refrain from using the Licensed Work.\n\nAll copies of the original and modified Licensed Work, and derivative works\nof the Licensed Work, are subject to this License. This License applies\nseparately for each version of the Licensed Work and the Change Date may vary\nfor each version of the Licensed Work released by Licensor.\n\nYou must conspicuously display this License on each original or modified copy\nof the Licensed Work. If you receive the Licensed Work in original or\nmodified form from a third party, the terms and conditions set forth in this\nLicense apply to your use of that work.\n\nAny use of the Licensed Work in violation of this License will automatically\nterminate your rights under this License for the current and all other\nversions of the Licensed Work.\n\nThis License does not grant you any right in any trademark or logo of\nLicensor or its affiliates (provged that you may use a trademark or logo of\nLicensor as expressly required by this License).\n\nTO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVgED ON\nAN 窶廣S IS窶? BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,\nEXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND\nTITLE.\n\nMariaDB hereby grants you permission to use this License窶冱 text to license\nyour works, and to refer to it using the trademark 窶廝usiness Source License窶?,\nas long as you comply with the Covenants of Licensor below.\n\nCovenants of Licensor\n\nIn consgeration of the right to use this License窶冱 text and the 窶廝usiness\nSource License窶? name and trademark, Licensor covenants to MariaDB, and to all\nother recipients of the licensed work to be provged by Licensor:\n\n1. To specify as the Change License the GPL Version 2.0 or any later version,\n or a license that is compatible with GPL Version 2.0 or a later version,\n where 窶彡ompatible窶? means that software provged under the Change License can\n be included in a program with software provged under GPL Version 2.0 or a\n later version. Licensor may specify additional Change Licenses without\n limitation.\n\n2. To either: (a) specify an additional grant of rights to use that does not\n impose any additional restriction on the right granted in this License, as\n the Additional Use Grant; or (b) insert the text 窶廸one窶?.\n\n3. To specify a Change Date.\n\n4. Not to modify this License in any other way.\nLicense text copyright (c) 2020 MariaDB Corporation Ab, All Rights Reserved.\n窶廝usiness Source License窶? is a trademark of MariaDB Corporation Ab.\n\nParameters\n\nLicensor: MariaDB Corporation Ab\nLicensed Work: MariaDB MaxScale (TM) v.2.3.20\n The Licensed Work is (c) 2020 MariaDB Corporation Ab\nAdditional Use Grant: You may use the Licensed Work when your application\n uses the Licensed Work with a total of less than three\n server instances for any purpose.\n\nChange Date: 2024-06-02\n\nChange License: Version 2 or later of the GNU General Public License as\n published by the Free Software Foundation.\n\nFor information about alternative licensing arrangements for the Software,\nplease visit: https://mariadb.com/products/mariadb-enterprise\n\nNotice\n\nThe Business Source License (this document, or the 窶廰icense窶?) is not an Open\nSource license. However, the Licensed Work will eventually be made available\nunder an Open Source License, as stated in this License.\n\nFor more information on the use of the Business Source License for MariaDB\nproducts, please visit the MariaDB Business Source License FAQ at\nhttps://mariadb.com/bsl-faq-mariadb.\n\nFor more information on the use of the Business Source License generally,\nplease visit the Adopting and Developing Business Source License FAQ at\nhttps://mariadb.com/bsl-faq-adopting.\n\n-----------------------------------------------------------------------------\n\nBusiness Source License 1.1\n\nTerms\n\nThe Licensor hereby grants you the right to copy, modify, create derivative\nworks, redistribute, and make non-production use of the Licensed Work. The\nLicensor may make an Additional Use Grant, above, permitting limited\nproduction use.\n\nEffective on the Change Date, or the fourth anniversary of the first publicly\navailable distribution of a specific version of the Licensed Work under this\nLicense, whichever comes first, the Licensor hereby grants you rights under\nthe terms of the Change License, and the rights granted in the paragraph\nabove terminate.\n\nIf your use of the Licensed Work does not comply with the requirements\ncurrently in effect as described in this License, you must purchase a\ncommercial license from the Licensor, its affiliated entities, or authorized\nresellers, or you must refrain from using the Licensed Work.\n\nAll copies of the original and modified Licensed Work, and derivative works\nof the Licensed Work, are subject to this License. This License applies\nseparately for each version of the Licensed Work and the Change Date may vary\nfor each version of the Licensed Work released by Licensor.\n\nYou must conspicuously display this License on each original or modified copy\nof the Licensed Work. If you receive the Licensed Work in original or\nmodified form from a third party, the terms and conditions set forth in this\nLicense apply to your use of that work.\n\nAny use of the Licensed Work in violation of this License will automatically\nterminate your rights under this License for the current and all other\nversions of the Licensed Work.\n\nThis License does not grant you any right in any trademark or logo of\nLicensor or its affiliates (provged that you may use a trademark or logo of\nLicensor as expressly required by this License).\n\nTO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVgED ON\nAN 窶廣S IS窶? BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,\nEXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND\nTITLE.\n\nMariaDB hereby grants you permission to use this License窶冱 text to license\nyour works, and to refer to it using the trademark 窶廝usiness Source License窶?,\nas long as you comply with the Covenants of Licensor below.\n\nCovenants of Licensor\n\nIn consgeration of the right to use this License窶冱 text and the 窶廝usiness\nSource License窶? name and trademark, Licensor covenants to MariaDB, and to all\nother recipients of the licensed work to be provged by Licensor:\n\n1. To specify as the Change License the GPL Version 2.0 or any later version,\n or a license that is compatible with GPL Version 2.0 or a later version,\n where 窶彡ompatible窶? means that software provged under the Change License can\n be included in a program with software provged under GPL Version 2.0 or a\n later version. Licensor may specify additional Change Licenses without\n limitation.\n\n2. To either: (a) specify an additional grant of rights to use that does not\n impose any additional restriction on the right granted in this License, as\n the Additional Use Grant; or (b) insert the text 窶廸one窶?.\n\n3. To specify a Change Date.\n\n4. Not to modify this License in any other way.\nLicense text copyright (c) 2020 MariaDB Corporation Ab, All Rights Reserved.\n窶廝usiness Source License窶? is a trademark of MariaDB Corporation Ab.\n\nParameters\n\nLicensor: MariaDB Corporation Ab\nLicensed Work: MariaDB MaxScale (TM) v.2.3.20\n The Licensed Work is (c) 2020 MariaDB Corporation Ab\nAdditional Use Grant: You may use the Licensed Work when your application\n uses the Licensed Work with a total of less than three\n server instances for any purpose.\n\nChange Date: 2024-06-02\n\nChange License: Version 2 or later of the GNU General Public License as\n published by the Free Software Foundation.\n\nFor information about alternative licensing arrangements for the Software,\nplease visit: https://mariadb.com/products/mariadb-enterprise\n\nNotice\n\nThe Business Source License (this document, or the 窶廰icense窶?) is not an Open\nSource license. However, the Licensed Work will eventually be made available\nunder an Open Source License, as stated in this License.\n\nFor more information on the use of the Business Source License for MariaDB\nproducts, please visit the MariaDB Business Source License FAQ at\nhttps://mariadb.com/bsl-faq-mariadb.\n\nFor more information on the use of the Business Source License generally,\nplease visit the Adopting and Developing Business Source License FAQ at\nhttps://mariadb.com/bsl-faq-adopting.\n\n-----------------------------------------------------------------------------\n\nBusiness Source License 1.1\n\nTerms\n\nThe Licensor hereby grants you the right to copy, modify, create derivative\nworks, redistribute, and make non-production use of the Licensed Work. The\nLicensor may make an Additional Use Grant, above, permitting limited\nproduction use.\n\nEffective on the Change Date, or the fourth anniversary of the first publicly\navailable distribution of a specific version of the Licensed Work under this\nLicense, whichever comes first, the Licensor hereby grants you rights under\nthe terms of the Change License, and the rights granted in the paragraph\nabove terminate.\n\nIf your use of the Licensed Work does not comply with the requirements\ncurrently in effect as described in this License, you must purchase a\ncommercial license from the Licensor, its affiliated entities, or authorized\nresellers, or you must refrain from using the Licensed Work.\n\nAll copies of the original and modified Licensed Work, and derivative works\nof the Licensed Work, are subject to this License. This License applies\nseparately for each version of the Licensed Work and the Change Date may vary\nfor each version of the Licensed Work released by Licensor.\n\nYou must conspicuously display this License on each original or modified copy\nof the Licensed Work. If you receive the Licensed Work in original or\nmodified form from a third party, the terms and conditions set forth in this\nLicense apply to your use of that work.\n\nAny use of the Licensed Work in violation of this License will automatically\nterminate your rights under this License for the current and all other\nversions of the Licensed Work.\n\nThis License does not grant you any right in any trademark or logo of\nLicensor or its affiliates (provged that you may use a trademark or logo of\nLicensor as expressly required by this License).\n\nTO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVgED ON\nAN 窶廣S IS窶? BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,\nEXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND\nTITLE.\n\nMariaDB hereby grants you permission to use this License窶冱 text to license\nyour works, and to refer to it using the trademark 窶廝usiness Source License窶?,\nas long as you comply with the Covenants of Licensor below.\n\nCovenants of Licensor\n\nIn consgeration of the right to use this License窶冱 text and the 窶廝usiness\nSource License窶? name and trademark, Licensor covenants to MariaDB, and to all\nother recipients of the licensed work to be provged by Licensor:\n\n1. To specify as the Change License the GPL Version 2.0 or any later version,\n or a license that is compatible with GPL Version 2.0 or a later version,\n where 窶彡ompatible窶? means that software provged under the Change License can\n be included in a program with software provged under GPL Version 2.0 or a\n later version. Licensor may specify additional Change Licenses without\n limitation.\n\n2. To either: (a) specify an additional grant of rights to use that does not\n impose any additional restriction on the right granted in this License, as\n the Additional Use Grant; or (b) insert the text 窶廸one窶?.\n\n3. To specify a Change Date.\n\n4. Not to modify this License in any other way.\nLicense text copyright (c) 2020 MariaDB Corporation Ab, All Rights Reserved.\n窶廝usiness Source License窶? is a trademark of MariaDB Corporation Ab.\n\nParameters\n\nLicensor: MariaDB Corporation Ab\nLicensed Work: MariaDB MaxScale (TM) v.2.3.20\n The Licensed Work is (c) 2020 MariaDB Corporation Ab\nAdditional Use Grant: You may use the Licensed Work when your application\n uses the Licensed Work with a total of less than three\n server instances for any purpose.\n\nChange Date: 2024-06-02\n\nChange License: Version 2 or later of the GNU General Public License as\n published by the Free Software Foundation.\n\nFor information about alternative licensing arrangements for the Software,\nplease visit: https://mariadb.com/products/mariadb-enterprise\n\nNotice\n\nThe Business Source License (this document, or the 窶廰icense窶?) is not an Open\nSource license. However, the Licensed Work will eventually be made available\nunder an Open Source License, as stated in this License.\n\nFor more information on the use of the Business Source License for MariaDB\nproducts, please visit the MariaDB Business Source License FAQ at\nhttps://mariadb.com/bsl-faq-mariadb.\n\nFor more information on the use of the Business Source License generally,\nplease visit the Adopting and Developing Business Source License FAQ at\nhttps://mariadb.com/bsl-faq-adopting.\n\n-----------------------------------------------------------------------------\n\nBusiness Source License 1.1\n\nTerms\n\nThe Licensor hereby grants you the right to copy, modify, create derivative\nworks, redistribute, and make non-production use of the Licensed Work. The\nLicensor may make an Additional Use Grant, above, permitting limited\nproduction use.\n\nEffective on the Change Date, or the fourth anniversary of the first publicly\navailable distribution of a specific version of the Licensed Work under this\nLicense, whichever comes first, the Licensor hereby grants you rights under\nthe terms of the Change License, and the rights granted in the paragraph\nabove terminate.\n\nIf your use of the Licensed Work does not comply with the requirements\ncurrently in effect as described in this License, you must purchase a\ncommercial license from the Licensor, its affiliated entities, or authorized\nresellers, or you must refrain from using the Licensed Work.\n\nAll copies of the original and modified Licensed Work, and derivative works\nof the Licensed Work, are subject to this License. This License applies\nseparately for each version of the Licensed Work and the Change Date may vary\nfor each version of the Licensed Work released by Licensor.\n\nYou must conspicuously display this License on each original or modified copy\nof the Licensed Work. If you receive the Licensed Work in original or\nmodified form from a third party, the terms and conditions set forth in this\nLicense apply to your use of that work.\n\nAny use of the Licensed Work in violation of this License will automatically\nterminate your rights under this License for the current and all other\nversions of the Licensed Work.\n\nThis License does not grant you any right in any trademark or logo of\nLicensor or its affiliates (provged that you may use a trademark or logo of\nLicensor as expressly required by this License).\n\nTO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVgED ON\nAN 窶廣S IS窶? BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,\nEXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND\nTITLE.\n\nMariaDB hereby grants you permission to use this License窶冱 text to license\nyour works, and to refer to it using the trademark 窶廝usiness Source License窶?,\nas long as you comply with the Covenants of Licensor below.\n\nCovenants of Licensor\n\nIn consgeration of the right to use this License窶冱 text and the 窶廝usiness\nSource License窶? name and trademark, Licensor covenants to MariaDB, and to all\nother recipients of the licensed work to be provged by Licensor:\n\n1. To specify as the Change License the GPL Version 2.0 or any later version,\n or a license that is compatible with GPL Version 2.0 or a later version,\n where 窶彡ompatible窶? means that software provged under the Change License can\n be included in a program with software provged under GPL Version 2.0 or a\n later version. Licensor may specify additional Change Licenses without\n limitation.\n\n2. To either: (a) specify an additional grant of rights to use that does not\n impose any additional restriction on the right granted in this License, as\n the Additional Use Grant; or (b) insert the text 窶廸one窶?.\n\n3. To specify a Change Date.\n\n4. Not to modify this License in any other way.\nLicense text copyright (c) 2020 MariaDB Corporation Ab, All Rights Reserved.\n窶廝usiness Source License窶? is a trademark of MariaDB Corporation Ab.\n\nParameters\n\nLicensor: MariaDB Corporation Ab\nLicensed Work: MariaDB MaxScale (TM) v.2.3.20\n The Licensed Work is (c) 2020 MariaDB Corporation Ab\nAdditional Use Grant: You may use the Licensed Work when your application\n uses the Licensed Work with a total of less than three\n server instances for any purpose.\n\nChange Date: 2024-06-02\n\nChange License: Version 2 or later of the GNU General Public License as\n published by the Free Software Foundation.\n\nFor information about alternative licensing arrangements for the Software,\nplease visit: https://mariadb.com/products/mariadb-enterprise\n\nNotice\n\nThe Business Source License (this document, or the 窶廰icense窶?) is not an Open\nSource license. However, the Licensed Work will eventually be made available\nunder an Open Source License, as stated in this License.\n\nFor more information on the use of the Business Source License for MariaDB\nproducts, please visit the MariaDB Business Source License FAQ at\nhttps://mariadb.com/bsl-faq-mariadb.\n\nFor more information on the use of the Business Source License generally,\nplease visit the Adopting and Developing Business Source License FAQ at\nhttps://mariadb.com/bsl-faq-adopting.\n\n-----------------------------------------------------------------------------\n\nBusiness Source License 1.1\n\nTerms\n\nThe Licensor hereby grants you the right to copy, modify, create derivative\nworks, redistribute, and make non-production use of the Licensed Work. The\nLicensor may make an Additional Use Grant, above, permitting limited\nproduction use.\n\nEffective on the Change Date, or the fourth anniversary of the first publicly\navailable distribution of a specific version of the Licensed Work under this\nLicense, whichever comes first, the Licensor hereby grants you rights under\nthe terms of the Change License, and the rights granted in the paragraph\nabove terminate.\n\nIf your use of the Licensed Work does not comply with the requirements\ncurrently in effect as described in this License, you must purchase a\ncommercial license from the Licensor, its affiliated entities, or authorized\nresellers, or you must refrain from using the Licensed Work.\n\nAll copies of the original and modified Licensed Work, and derivative works\nof the Licensed Work, are subject to this License. This License applies\nseparately for each version of the Licensed Work and the Change Date may vary\nfor each version of the Licensed Work released by Licensor.\n\nYou must conspicuously display this License on each original or modified copy\nof the Licensed Work. If you receive the Licensed Work in original or\nmodified form from a third party, the terms and conditions set forth in this\nLicense apply to your use of that work.\n\nAny use of the Licensed Work in violation of this License will automatically\nterminate your rights under this License for the current and all other\nversions of the Licensed Work.\n\nThis License does not grant you any right in any trademark or logo of\nLicensor or its affiliates (provged that you may use a trademark or logo of\nLicensor as expressly required by this License).\n\nTO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVgED ON\nAN 窶廣S IS窶? BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,\nEXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND\nTITLE.\n\nMariaDB hereby grants you permission to use this License窶冱 text to license\nyour works, and to refer to it using the trademark 窶廝usiness Source License窶?,\nas long as you comply with the Covenants of Licensor below.\n\nCovenants of Licensor\n\nIn consgeration of the right to use this License窶冱 text and the 窶廝usiness\nSource License窶? name and trademark, Licensor covenants to MariaDB, and to all\nother recipients of the licensed work to be provged by Licensor:\n\n1. To specify as the Change License the GPL Version 2.0 or any later version,\n or a license that is compatible with GPL Version 2.0 or a later version,\n where 窶彡ompatible窶? means that software provged under the Change License can\n be included in a program with software provged under GPL Version 2.0 or a\n later version. Licensor may specify additional Change Licenses without\n limitation.\n\n2. To either: (a) specify an additional grant of rights to use that does not\n impose any additional restriction on the right granted in this License, as\n the Additional Use Grant; or (b) insert the text 窶廸one窶?.\n\n3. To specify a Change Date.\n\n4. Not to modify this License in any other way.\nLicense text copyright (c) 2020 MariaDB Corporation Ab, All Rights Reserved.\n窶廝usiness Source License窶? is a trademark of MariaDB Corporation Ab.\n\nParameters\n\nLicensor: MariaDB Corporation Ab\nLicensed Work: MariaDB MaxScale (TM) v.2.3.20\n The Licensed Work is (c) 2020 MariaDB Corporation Ab\nAdditional Use Grant: You may use the Licensed Work when your application\n uses the Licensed Work with a total of less than three\n server instances for any purpose.\n\nChange Date: 2024-06-02\n\nChange License: Version 2 or later of the GNU General Public License as\n published by the Free Software Foundation.\n\nFor information about alternative licensing arrangements for the Software,\nplease visit: https://mariadb.com/products/mariadb-enterprise\n\nNotice\n\nThe Business Source License (this document, or the 窶廰icense窶?) is not an Open\nSource license. However, the Licensed Work will eventually be made available\nunder an Open Source License, as stated in this License.\n\nFor more information on the use of the Business Source License for MariaDB\nproducts, please visit the MariaDB Business Source License FAQ at\nhttps://mariadb.com/bsl-faq-mariadb.\n\nFor more information on the use of the Business Source License generally,\nplease visit the Adopting and Developing Business Source License FAQ at\nhttps://mariadb.com/bsl-faq-adopting.\n\n-----------------------------------------------------------------------------\n\nBusiness Source License 1.1\n\nTerms\n\nThe Licensor hereby grants you the right to copy, modify, create derivative\nworks, redistribute, and make non-production use of the Licensed Work. The\nLicensor may make an Additional Use Grant, above, permitting limited\nproduction use.\n\nEffective on the Change Date, or the fourth anniversary of the first publicly\navailable distribution of a specific version of the Licensed Work under this\nLicense, whichever comes first, the Licensor hereby grants you rights under\nthe terms of the Change License, and the rights granted in the paragraph\nabove terminate.\n\nIf your use of the Licensed Work does not comply with the requirements\ncurrently in effect as described in this License, you must purchase a\ncommercial license from the Licensor, its affiliated entities, or authorized\nresellers, or you must refrain from using the Licensed Work.\n\nAll copies of the original and modified Licensed Work, and derivative works\nof the Licensed Work, are subject to this License. This License applies\nseparately for each version of the Licensed Work and the Change Date may vary\nfor each version of the Licensed Work released by Licensor.\n\nYou must conspicuously display this License on each original or modified copy\nof the Licensed Work. If you receive the Licensed Work in original or\nmodified form from a third party, the terms and conditions set forth in this\nLicense apply to your use of that work.\n\nAny use of the Licensed Work in violation of this License will automatically\nterminate your rights under this License for the current and all other\nversions of the Licensed Work.\n\nThis License does not grant you any right in any trademark or logo of\nLicensor or its affiliates (provged that you may use a trademark or logo of\nLicensor as expressly required by this License).\n\nTO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVgED ON\nAN 窶廣S IS窶? BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,\nEXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND\nTITLE.\n\nMariaDB hereby grants you permission to use this License窶冱 text to license\nyour works, and to refer to it using the trademark 窶廝usiness Source License窶?,\nas long as you comply with the Covenants of Licensor below.\n\nCovenants of Licensor\n\nIn consgeration of the right to use this License窶冱 text and the 窶廝usiness\nSource License窶? name and trademark, Licensor covenants to MariaDB, and to all\nother recipients of the licensed work to be provged by Licensor:\n\n1. To specify as the Change License the GPL Version 2.0 or any later version,\n or a license that is compatible with GPL Version 2.0 or a later version,\n where 窶彡ompatible窶? means that software provged under the Change License can\n be included in a program with software provged under GPL Version 2.0 or a\n later version. Licensor may specify additional Change Licenses without\n limitation.\n\n2. To either: (a) specify an additional grant of rights to use that does not\n impose any additional restriction on the right granted in this License, as\n the Additional Use Grant; or (b) insert the text 窶廸one窶?.\n\n3. To specify a Change Date.\n\n4. Not to modify this License in any other way.\nLicense text copyright (c) 2020 MariaDB Corporation Ab, All Rights Reserved.\n窶廝usiness Source License窶? is a trademark of MariaDB Corporation Ab.\n\nParameters\n\nLicensor: MariaDB Corporation Ab\nLicensed Work: MariaDB MaxScale (TM) v.2.3.20\n The Licensed Work is (c) 2020 MariaDB Corporation Ab\nAdditional Use Grant: You may use the Licensed Work when your application\n uses the Licensed Work with a total of less than three\n server instances for any purpose.\n\nChange Date: 2024-06-02\n\nChange License: Version 2 or later of the GNU General Public License as\n published by the Free Software Foundation.\n\nFor information about alternative licensing arrangements for the Software,\nplease visit: https://mariadb.com/products/mariadb-enterprise\n\nNotice\n\nThe Business Source License (this document, or the 窶廰icense窶?) is not an Open\nSource license. However, the Licensed Work will eventually be made available\nunder an Open Source License, as stated in this License.\n\nFor more information on the use of the Business Source License for MariaDB\nproducts, please visit the MariaDB Business Source License FAQ at\nhttps://mariadb.com/bsl-faq-mariadb.\n\nFor more information on the use of the Business Source License generally,\nplease visit the Adopting and Developing Business Source License FAQ at\nhttps://mariadb.com/bsl-faq-adopting.\n\n-----------------------------------------------------------------------------\n\nBusiness Source License 1.1\n\nTerms\n\nThe Licensor hereby grants you the right to copy, modify, create derivative\nworks, redistribute, and make non-production use of the Licensed Work. The\nLicensor may make an Additional Use Grant, above, permitting limited\nproduction use.\n\nEffective on the Change Date, or the fourth anniversary of the first publicly\navailable distribution of a specific version of the Licensed Work under this\nLicense, whichever comes first, the Licensor hereby grants you rights under\nthe terms of the Change License, and the rights granted in the paragraph\nabove terminate.\n\nIf your use of the Licensed Work does not comply with the requirements\ncurrently in effect as described in this License, you must purchase a\ncommercial license from the Licensor, its affiliated entities, or authorized\nresellers, or you must refrain from using the Licensed Work.\n\nAll copies of the original and modified Licensed Work, and derivative works\nof the Licensed Work, are subject to this License. This License applies\nseparately for each version of the Licensed Work and the Change Date may vary\nfor each version of the Licensed Work released by Licensor.\n\nYou must conspicuously display this License on each original or modified copy\nof the Licensed Work. If you receive the Licensed Work in original or\nmodified form from a third party, the terms and conditions set forth in this\nLicense apply to your use of that work.\n\nAny use of the Licensed Work in violation of this License will automatically\nterminate your rights under this License for the current and all other\nversions of the Licensed Work.\n\nThis License does not grant you any right in any trademark or logo of\nLicensor or its affiliates (provged that you may use a trademark or logo of\nLicensor as expressly required by this License).\n\nTO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVgED ON\nAN 窶廣S IS窶? BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,\nEXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND\nTITLE.\n\nMariaDB hereby grants you permission to use this License窶冱 text to license\nyour works, and to refer to it using the trademark 窶廝usiness Source License窶?,\nas long as you comply with the Covenants of Licensor below.\n\nCovenants of Licensor\n\nIn consgeration of the right to use this License窶冱 text and the 窶廝usiness\nSource License窶? name and trademark, Licensor covenants to MariaDB, and to all\nother recipients of the licensed work to be provged by Licensor:\n\n1. To specify as the Change License the GPL Version 2.0 or any later version,\n or a license that is compatible with GPL Version 2.0 or a later version,\n where 窶彡ompatible窶? means that software provged under the Change License can\n be included in a program with software provged under GPL Version 2.0 or a\n later version. Licensor may specify additional Change Licenses without\n limitation.\n\n2. To either: (a) specify an additional grant of rights to use that does not\n impose any additional restriction on the right granted in this License, as\n the Additional Use Grant; or (b) insert the text 窶廸one窶?.\n\n3. To specify a Change Date.\n\n4. Not to modify this License in any other way.\nLicense text copyright (c) 2020 MariaDB Corporation Ab, All Rights Reserved.\n窶廝usiness Source License窶? is a trademark of MariaDB Corporation Ab.\n\nParameters\n\nLicensor: MariaDB Corporation Ab\nLicensed Work: MariaDB MaxScale (TM) v.2.3.20\n The Licensed Work is (c) 2020 MariaDB Corporation Ab\nAdditional Use Grant: You may use the Licensed Work when your application\n uses the Licensed Work with a total of less than three\n server instances for any purpose.\n\nChange Date: 2024-06-02\n\nChange License: Version 2 or later of the GNU General Public License as\n published by the Free Software Foundation.\n\nFor information about alternative licensing arrangements for the Software,\nplease visit: https://mariadb.com/products/mariadb-enterprise\n\nNotice\n\nThe Business Source License (this document, or the 窶廰icense窶?) is not an Open\nSource license. However, the Licensed Work will eventually be made available\nunder an Open Source License, as stated in this License.\n\nFor more information on the use of the Business Source License for MariaDB\nproducts, please visit the MariaDB Business Source License FAQ at\nhttps://mariadb.com/bsl-faq-mariadb.\n\nFor more information on the use of the Business Source License generally,\nplease visit the Adopting and Developing Business Source License FAQ at\nhttps://mariadb.com/bsl-faq-adopting.\n\n-----------------------------------------------------------------------------\n\nBusiness Source License 1.1\n\nTerms\n\nThe Licensor hereby grants you the right to copy, modify, create derivative\nworks, redistribute, and make non-production use of the Licensed Work. The\nLicensor may make an Additional Use Grant, above, permitting limited\nproduction use.\n\nEffective on the Change Date, or the fourth anniversary of the first publicly\navailable distribution of a specific version of the Licensed Work under this\nLicense, whichever comes first, the Licensor hereby grants you rights under\nthe terms of the Change License, and the rights granted in the paragraph\nabove terminate.\n\nIf your use of the Licensed Work does not comply with the requirements\ncurrently in effect as described in this License, you must purchase a\ncommercial license from the Licensor, its affiliated entities, or authorized\nresellers, or you must refrain from using the Licensed Work.\n\nAll copies of the original and modified Licensed Work, and derivative works\nof the Licensed Work, are subject to this License. This License applies\nseparately for each version of the Licensed Work and the Change Date may vary\nfor each version of the Licensed Work released by Licensor.\n\nYou must conspicuously display this License on each original or modified copy\nof the Licensed Work. If you receive the Licensed Work in original or\nmodified form from a third party, the terms and conditions set forth in this\nLicense apply to your use of that work.\n\nAny use of the Licensed Work in violation of this License will automatically\nterminate your rights under this License for the current and all other\nversions of the Licensed Work.\n\nThis License does not grant you any right in any trademark or logo of\nLicensor or its affiliates (provged that you may use a trademark or logo of\nLicensor as expressly required by this License).\n\nTO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVgED ON\nAN 窶廣S IS窶? BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,\nEXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND\nTITLE.\n\nMariaDB hereby grants you permission to use this License窶冱 text to license\nyour works, and to refer to it using the trademark 窶廝usiness Source License窶?,\nas long as you comply with the Covenants of Licensor below.\n\nCovenants of Licensor\n\nIn consgeration of the right to use this License窶冱 text and the 窶廝usiness\nSource License窶? name and trademark, Licensor covenants to MariaDB, and to all\nother recipients of the licensed work to be provged by Licensor:\n\n1. To specify as the Change License the GPL Version 2.0 or any later version,\n or a license that is compatible with GPL Version 2.0 or a later version,\n where 窶彡ompatible窶? means that software provged under the Change License can\n be included in a program with software provged under GPL Version 2.0 or a\n later version. Licensor may specify additional Change Licenses without\n limitation.\n\n2. To either: (a) specify an additional grant of rights to use that does not\n impose any additional restriction on the right granted in this License, as\n the Additional Use Grant; or (b) insert the text 窶廸one窶?.\n\n3. To specify a Change Date.\n\n4. Not to modify this License in any other way.\nLicense text copyright (c) 2020 MariaDB Corporation Ab, All Rights Reserved.\n窶廝usiness Source License窶? is a trademark of MariaDB Corporation Ab.\n\nParameters\n\nLicensor: MariaDB Corporation Ab\nLicensed Work: MariaDB MaxScale (TM) v.2.3.20\n The Licensed Work is (c) 2020 MariaDB Corporation Ab\nAdditional Use Grant: You may use the Licensed Work when your application\n uses the Licensed Work with a total of less than three\n server instances for any purpose.\n\nChange Date: 2024-06-02\n\nChange License: Version 2 or later of the GNU General Public License as\n published by the Free Software Foundation.\n\nFor information about alternative licensing arrangements for the Software,\nplease visit: https://mariadb.com/products/mariadb-enterprise\n\nNotice\n\nThe Business Source License (this document, or the 窶廰icense窶?) is not an Open\nSource license. However, the Licensed Work will eventually be made available\nunder an Open Source License, as stated in this License.\n\nFor more information on the use of the Business Source License for MariaDB\nproducts, please visit the MariaDB Business Source License FAQ at\nhttps://mariadb.com/bsl-faq-mariadb.\n\nFor more information on the use of the Business Source License generally,\nplease visit the Adopting and Developing Business Source License FAQ at\nhttps://mariadb.com/bsl-faq-adopting.\n\n-----------------------------------------------------------------------------\n\nBusiness Source License 1.1\n\nTerms\n\nThe Licensor hereby grants you the right to copy, modify, create derivative\nworks, redistribute, and make non-production use of the Licensed Work. The\nLicensor may make an Additional Use Grant, above, permitting limited\nproduction use.\n\nEffective on the Change Date, or the fourth anniversary of the first publicly\navailable distribution of a specific version of the Licensed Work under this\nLicense, whichever comes first, the Licensor hereby grants you rights under\nthe terms of the Change License, and the rights granted in the paragraph\nabove terminate.\n\nIf your use of the Licensed Work does not comply with the requirements\ncurrently in effect as described in this License, you must purchase a\ncommercial license from the Licensor, its affiliated entities, or authorized\nresellers, or you must refrain from using the Licensed Work.\n\nAll copies of the original and modified Licensed Work, and derivative works\nof the Licensed Work, are subject to this License. This License applies\nseparately for each version of the Licensed Work and the Change Date may vary\nfor each version of the Licensed Work released by Licensor.\n\nYou must conspicuously display this License on each original or modified copy\nof the Licensed Work. If you receive the Licensed Work in original or\nmodified form from a third party, the terms and conditions set forth in this\nLicense apply to your use of that work.\n\nAny use of the Licensed Work in violation of this License will automatically\nterminate your rights under this License for the current and all other\nversions of the Licensed Work.\n\nThis License does not grant you any right in any trademark or logo of\nLicensor or its affiliates (provged that you may use a trademark or logo of\nLicensor as expressly required by this License).\n\nTO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVgED ON\nAN 窶廣S IS窶? BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,\nEXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF\nMERCHA',0.9881897,'axwv',4,4,'1987-07-30 00:26:51.0'), +(1985,'hm','?丙ロ^Hヲ?w9Ljq、?ェョ&E1ヤ\'l」?エY;f・r埒1V家ヲ[m恩?UeV5;cyTョ#モ,6ォャeスアA?カ?ヲ&緋2固アUG足薗ン?ナwナs゙サbェ$ラ7#?.ムモカ5キ?ュTロ./オカ_\Zc?5レケ康?ヌ?5ワ螽ョヌhヌ@qU2\rh1タm?>慷窘d勢?C溝リcネ\0Wヒ|!T?;?#テ!゚ネvタォゥAQ散$ヤ冐?2ャlh ワ?コ??坎カヌ蜒ュ%ヲI?1???/U\rX}・??ユテンHメノサアゥ8ネ蘚? \"サm?ェウタ?,\Z?イ橿(1*?ネ?コebムタd}\'&壘y9ヲ エ?顕7ヌネ?\'?゚Y?ん\0而;Zi?P?pロI斜銷R処源-S??ヲZ43?}ル\\・a?ク|槞A魂ィヲ+k臺ャ隣r=Pシタ\'ァ??7????qモ?サfチキvO儕x?o4?<做ョスエ相ーヲt;ロ;?b鐙hマCL$スカ[」ヘ?-誤f$1ン>鏈\\%ヌ刀ッ鑽q「X?コЛーハ@?7PノタZn墾ニュqs\'5ヲハvヲ#ォYナfノy。ハd獣??ユ?\\\\Gm梶H+?\0(ンロ?ワzムZッ??Nqヨ6?uk:D?? 隙」隔=?\0牴V鍋ヒ %x&бワ\n゙?Iu ?=[?:\r<ニー小鮮Dn24ユュpvア$2゚N??ィ?ロ\0?\nwlEo゙ト之?]ワヌ城??5?壮se ム;KェP暦ソレ^ ット?ノ\rヨシ?g、?エeUサ??F@リ!G&7ヤ?キケ盲痩ハ?44ィタヤ,pkXワ,\\?萱エノ?:。咬#フ辰 頑UH?:???\Z噴ラ?リーcアcラ?Cニ(Aニ?$ヤ?V巓糎闘遏\"フタrィ??」+5エ?\0,Kィ@ラ+\"ェ??X?4sHZャ)鉛ヲ ?4Dァ?ヲ$cェsィュiN?U!メ?51?\n?。?4ュサKル-ワ2r佯アロ\Z^擘kン(アm?oイkソl菻CpJ???/GA駭?ソNt灘?gYa_?ケz゙?ワ<8\r\riセJ2」イキ拮:犢痕?\"濃簓VH梠荀}槨箕「H繰・p岳レ\nゥ,ィヒpヌpユ?磚\'AJ E蚰5}骼kvTイpV?\Z_Z5^lム嗹ヲ?\0k,?ヘ?$切3 南ラqA塚ー番s蝦ンノi t$zgKメメ?+sィヘ?ノP+セS?4oス寧kィト祓c鎬kノ?エ隈/@Ea?シャbV?\"}^゙BDNョ{ケ]IO?\'セ?愛笄? mLヲy「?ヌrシ楳_ォワエ繝P:W\nエ?\015?4.戛 ?リ菷ルU?9癜\'愆14Zt??7洪3?l>・=テ鉾;?yQ旺ヒ#:?心k=2込yh6ゥ\Z、ぼ6Hxラーョ面ュ7.Zw4F4h?\rZ腹\'??mキ假ョm恍\nサ???\0梏\"ニ、ラ%ワ?t?\0v?bカァ-Q??Wl\'鞍伊VV$??+迂ツオN?シ2Hkjfkwリエ\nイ?,x???pミュMX?\\J;yツ?$モTトlE@ロ.T?,.・@@ロ\r?4\'スs%タ?yリ ョj唾ュ\"ヌZrリサhヘ・゚「ンマ\Z?;ル,!カス?(?Kx?・?齣゚ワr常FE~?+H\rzリ$?#lBッzlリ[\n?。ノォk??-^?IツY。f妊6胙}リΥUヲ薩?-}?野\'7テSh#?*??g.W[トi唾ナP),Fンa=、艤F?-Uク?ヤm??喨ッェ?Jア?$\'哂E?;v??煖ゥ ?カ?\0\"r?ヌ$サメ3?NU「?#mヘT溏dネH「閣8ム?a\'サ?株\'Rロヨ??ND??J~イァアMウk孝笈ゥ?.S+ルOラ\\!mi?2?# _\rオMネ>鋩aK?\r?エノチ?$2,ハワ4tNw,ラ5欣5尠?ケ????\0\rwe?ヤツケ゚? 翡マ.?Y0f靈U?-係メイク4ロq磋??[$^XメV發iMハ4J+?Zヤ#コ?ヤp海?@?xsサ1?エモッL「B義H?+・L?7?kF\\?A6?F:?笳秩s?%Z???リ煖5X祖^?\Zァ\"品寢槌Ι゚≫コ?\nh|鯢ケ来=H?ク?v(?P|チ!?\0牾TM0ソ[*ヨツ %參\"=凾キ?._馼嘛?JゥロンM┬]?8サ\0?1V3ュ鐶レ赧V~G?\'K?鯖ッヲXュヨ?(}リ*8クサK ルケセ堤U6餞タ+S體?6?xW帙?5#\ZオQユG?-ラ?4qne???カvヒ?/リ??ヤ? u%遒Fロ?/S? #偬?_?\nリー?ワHハ忻ルS?[??/肩⌒タ痕蛬ォ*?b)??\0\Z狠k\"ルサーロ疇\"?ケチ窈コuニ?)キクB焼5?\nゥニZ}bjレタ v?Iァナ??\0タ襾M墻\rv-zサa?、43 (」?=エ!釶~G??\0\"ヨE???^Zオ傑9+フ¬「?7?\"@ュ%フ7ョ\Z_゙%ツ)1?ツ%_?/?ノ ヲ・1JrMマl瓢-I=T?ュTV」ー?lN、。゚クロ?? 。e(早dC?$rS???\0ホ?\'礒*ァ^」?=Uiリケ{dGWV ??-ク襠?W?WルFトu5?.?|?ワリu[楳CzQ?器ハ」症?ヌ.Iヨ?テラ????ニリXトヤ遮ヌ俤<椏??\0:Mァh-jモ碾Bァzナロ?焦? フ?G「YKァフョヨ?pヲ、裾ッ/?桀B8ッ\n釘[%>\\ユYョ!?3 . 茱コッ$??\0ルz儉ア? ┝=[ヒzュヌ?<ス4叩eシ?Q圉ァ・?ー?フラフ?c蹴剞ぅ?厩?ヒIシ玲H?オ-6jヌ%ラィア?ォ戚シソヨf\\,伏最イNイF=Rヲツ?#WIクラ????ュ助?ムf寂ng*ハ・+鵑ッ??>頤ロ?&ユ<ッゥ轆%弊0?\"?\0牒?>v。ヘ 3;ヘZヤ\"=錵キ縫z0?V゚焦?W -カソヤ5スEdjVi#Aミ・U?ロ繖\Zホァ\r蠑゙]e.m}7?ム。ォイ?]薺観E[穂b阜憬?\n灌\\ッ尻*?ヘ匕?\"?1?ヒ^vウ\ZVォ.慍?4\0RA?r?\0+奔T?z>?5?」)卆%Y;6ハワキマ=yラQ鬱ユdヤ.\0\r:ォ|?gァ?-テ?1?&?Z很 ス?キモ?/fKx雛砥?6e533ヒ)z民\"p熊9???7???「Fゥ\n?ャニ?| 済$?\0W%曚?-アモ$??0ゥgA,し粢」??\0ーlWCヨ?ヒロ??誂ォ?@ィ_?マル?\Z?$o仁?Cネゥ@(VェIチ塲コ鰓オ、業蘚ncイ詔膏\rツ儘ハ何レ潟戸S?>!幡榔ラC牧ャk?/N?アJミG|^?!V?G_。ア^&?(l}アB7K樛レ蘰シF?5ュU[?\'?l3ユシナ?ヲ殍シ\"Uリ??k?蜚EpMヲル>仏ルi? ィネ8ン1UEンツ/%i8?\0ニ\\%ユ/Eワ?Dトツサ ;m塩奐EB%*β^溟o?:ァ粍t?Yタ?\0\0?+\'r敲ル(鰄茱ヒ~vケ?旌ュ、j゚\\Rャ?ュ*?ラネツF?\0 ムENレ閼レュフ?9ュ\0?(&? フj?%ム#^wE搶フ恥shWヒ?aー=ニヒ;册%$?潴@C7菫?+ォ?門・E$;S?ュツ冊\\」?=R駭ッ$xj\"-E苡???壜ホKNdD_綜サN紊LーSォm 宴 cモ^゚ヘィ2?\"5燿\nQG?P6ヲ9 47ト徨ニkセリ1>ッ鏗?\'藥?マ\Zトア?「?,U!エ??,唯S?M8\08??7/ルタRz?\Zゥ?+Z杞P:wフフFユネ?ェ1トen\"ッM}ア?*?9?\'&゚)ロ゚5O\\H蛎・kF?蜩カル ?qN;eV「ケモ蜆ィX<1Tホ?2チ8・セァ|ェe慊ケZE4ス1ホiカ\"ニクェ?ハニ且凵ナWc?ホク穢Uフk?\\Uxoq゚q?予ォ?:系Urー*ィ9ォ?/エr需ウaWR屆I?/ラ ?xヘマヨ&桑 ヤtュ*n?$ュ vヲhカ#Y,キSp巌2A\'?ソフルZニ・ッ<ライ?ムb右\0\0qV?\0c?<ソァB?キ?\"XモrY≫?ネネネ???$w\rf秘??/\Z;゚ャ$メハ>%U#?ハ??ャ鏝\Z,?\'+ラqヒuツミトa?h?イ。S\\x驃?,ァ?\"??)??4ヘ&]Lネ#?ッ&\'ーィ\\$?E?;bヒ0y?ァ?スJトX\\スイク浴ァ%鑵6;稗袁NQ?罠?!ウ#TnH・wロロヌLa?Wィヲg4ハ&來p*?ミ爨ワ{? cテSヲVr7ハF \Z\nヨシサ?\0ォ科?ォミ?Q娘┯2?\"$E}驪??ヤョ\rメn豁ソ?クメク?FF?7ユod^岔IbトY椒ヌ%Zo做サr?0h蒟W4?piアハ$de粂、H?赱9拊E舘セЯェ導5?ュヘzLφv?2ラカ\nク? ?1ト\n^#v?G?kォサ!c!?*ッ0M;????Z+R\"ア服Wr况ソ賽)トラァ?xOd柩ラ袮/ZK??*、xaソ只綢? ?\'0凩DOu?オ殖ユ゚\Z2Gョ遺7i?ソ?ヘj?yスG\"f4Pv祕リ9?袱ァg/ラoモミ緒!ハ寢dヒz??ラ>ッテ彰$ュ?o?$コソ觀アォYヒ!oOヤ棟テムP坂_?ケトラ ywイs,?モSMラ?ャツEtォ・kニセ.スー{ゥ ?ミッP?pO$゚マ5ト?,フV疉Xナ>/オ杜U橡?=フ?<アJチWz售1?\r3ナウ?f?<敬F??-giラ-#ャA\"nJy際?狒/y「y%H lオ・Wキ?<綱昿ソ?テH?%衙>/レ??\0゙舎e:?\0惆|」#\":エ七?。?>ヘG?,ケ?ヨュ$モホh住)?Fol?-ケ}m[ユ?\'ツ?#F?ナ\Z?26詞ャ?i?9倬杙???5?ッ\0ノ?lどvォ2?*TZ蹉イ?;?/ョ梏梶Zネ$9&4フエサ[O-リイ「(P*トメソ札5??*<6@ュEWy棉U壥.\'jE%jオァ?>?\0J姪?ナ 「アネ ?o#コハDr]ソw??jUキ:迺?uェロ和FWZu\r?ノホW「Xナ,ムスレー?ミ?4ホ?/擽?\0+トカ?Y:?鯢(ヤF?訖?um、ヌ レ俄メ*ヌニ涎柬ヨ?ユ5 ヲ\'?3?j茵ヘ栲嵶ー-ォ\n\"枩Iネキヲa?9ンJオv$?ャ?(?猫゙マAメ4?ア∽?(甕}nc?$??\r?ヘm?ヒ関?Hミゥ*J?フ~o余オキエア,J?\0ra_出?規W樶U}NR??#Eシ}ユシン?・y洲堋、3IB ・??桟?ュC→Ko\nsZ\0VAJ*z.??$柆リSjd?キ\"?豢恤ル?Pセモァ[?ケf?\0S\0陬G尺Yオ メJ?サ庚+?ヒ<キ輌oメn 9Mョ??\0瞥?莖ォ 挿6*A\Zq2ルメッ?Tx?叩キ!A@ト?施g<ヤl、モ.・ウ幔ト?\Z?#LK゙、R夬栽\\ハx?FXナヒアィチミ\\?ヘfトX0#?#?=?sタ?qe?是J\Zテョ8??ミ筱ヤ@ャ曄慨ヲ\"F+oョ?*|pハ}8テ2*G? ォeォJ梁笄郁z窖セ[}?カ??:?\rRk y 鰯?ェuロ 繻キAモ?\n慨ル[f銖ホ$Alテl^゚畫OO ? ?2ョ?、3H?5F_*鈎M・・ヌ?1マ(ィ驤鄭ト?-N? ? 8??.暈箆(r?+\\Uコモヲ=c&3&ヤ}??\"掉?#nリェ?5?=rネ#zlrタ-ゝネフ1?燃?BケaL??;e。羣;竇?>.ケ+B切彗$蝮?頁-ィゥナL擲5;uチ?;ъcミク-Q?>?.オp-?c擧ハカ>PモヲKメp ?ッ??6??スw栗ト彫?Fミハチ?5&<珠zレノ.l畔。 霏nwチ z「゙Hgm繽逸]ィ?0ヘ\nQA\n?)Fロ霪ッ70 恠=イ?+4[Dュo?,ュ&}ィソ8ュゥHロp贖掴泝? 。E鞏DA&シ浄eW#?dミZテkQ-ツ~?n[ツ瑜)Z\\iレフPフBG*?,ァbソiソ?9a=ヌt惇毘ヒ?ホ偕ワQob+餘??9ッレOオ戦^セモ#}\n蝮-ョェス~]?+d゙?V奘?Qフ6_ン ?k引クー?\0+芳t?<レy?ョ?+?孛??\0ウ?1ュゥQ3ル2・ワ\nHPト? ?ホシー假l@<ヌナ)?ァq\"EァH?,6黶G?? 愉??、??>?Zw]そ???福Zケ朴Cフヌ岨nk?莪itクムtセ?\'y?VAコ承?ヒ眥E濁&コw%:婦)vゥホ8帙?uehオ孛耗繧Hネワ旙與?ナ?9%V・ォ。禮|,~ラ??^]建ュ?2駅x??衒KyS #?ニ?\rョWPhレォ\"?ヨL?疊2スサ廓籖ナ~ラ|菜jwnbネ\n?O?u端{f蔀Q\n)?ヲ?ッm据゚リヘ\n゚スワネM@?8ヤm$アシhョ[?oソ゚怒ォ?俑アツ?*O悔ネ??3サ?4u59?^ソャ=?E\"?\nzモセF% =メェ氤?>鬻?Sミ\nラq^ソ?m.bラK\'p、?9v3??琵Oケ5櫺}:@・x2モカEッeY%yxゥ$??{*ハLホ*ヘラ ヲキrョ邯og!Aトナ\n Sキ>?50sXHQ?|@jvョ遡?bテ??見&ク,(?4?1¢d?? ヌ8。ニ轄アTヨv?゚麭ソ?#?ルセヨ醇,SaC?(ェ? ノwB,u゚{ク荊ワ稷ンツォ?\0bN@j蘯彡Gケ>,q?ヒ1ー?ハ耘キネ?)ロ.Vm?ョ7ョ!\\、ウ(ョテ?案U?3S巻?リル\0Cカ>c/?LNB o慣ヒテ15ハ倆?[S班,敬_Pリ?\Zvニ霜亅|ゥ渇[陰J5+キ?$,pナZ#(ョ(Mw=q2kカE-イゥ\\ヲロ(!S=Xaシ壌)ホ&?zタiライBソb、ッ??ux鮮クォサンQリア{牘U?レ拯ツYM?ユ?K、ナIッ¬?゚31nスーヨ?qク?ニ箝ヤ厳゚ョ0\r?槨ォコtフZサT&リヨ持qU2?-N?。Mア乘\\o Y噪弃 ーサラャUゥチ&?6ハg]ォ?杢*エニ。フロ?1Wsヒッ?$E1ンゥ涯wヲn5驩Aヌ?5ロ.*F7粛チホ(X\Z畄?螻ヌト\Z秣??彦*、ハNa|~縹QO<ェ Sリ??Hオ\"?榲ャケaI?:etヒ腟P\ZWョ*ミハハ髮\\?ラ喉ハ?;モ\rキヘ\\?\0ィF\Z?犧ハタタ?U;獏ィユQ?Y樂ネ窒A鑛吊6モ彗カ\'蝨?メ?1sト?1留セtュH萬>タ?LS ?G3フョ?$ア}bユ8ト?)セ*眠J~ァ゚\"オ」7ェヤレケ[$ョ?)/?w8&郎>? 0.ヌ゚?ュ>ノ9ワJzd^?I(Kハ 7&「オノF2<食@M\Ze?)?n Aュ~倦yzm;?!\nォ*?9ナトニy\ZB)ネヨ?&メ?・IS?ラOァ.8ヘ1{I?スネァ{d_T?h3凵?\n5GA???,.疋ュタ?セ9?娶R& v?ハ?7L?GヒVW斥>?#M$@4格ー=i?ョF?j箴BK)\nkN-O??ヌ<牲cbァリ貂宅$g?j~y?\"yツヨ氓ィF?8%tサヌキ7k???}ャ゚\'?卩ヨ翻オ*?+?)=ノ貂ネ?,(ン城゙Uヤオ縊H\"オ#ソトケ#+}、゙\r3U\0 魏5ウヤn?tニ?ミ?ヲ\Zレy晢?婀」「1ォクッソ?9 0燭 ヤ??ニス@9 イメgサib?>f河z?q豈6$??- $6F4スb/ンシウ\0?・dュT熄)、授゙(Xz-ネS?桑営RェトヤW5ルF伏???ト@ヒG&(?;ュ0Qヤ?L3ユシュu、[ュヤフ月E8奎ツX蚯R@?y?ヒォ!ァフCト?ロqCヒョナ{rNノo?\n=???・!キ榔桷vテュoネ?ム?-QF??h?9\04W? )モゞ帚49Rレヒeu*ネhツ?&ャ@テマ?n昏テ? ND啗&イGot#|蠍キ嬬ソ$4?,sゥNユ^g?5・rゥBヒ1\'ゥi7*ヒJ盻m惶Cラ]a束?リック⊃GLョQ 、FIZ鈎2)?(ヤqヌ4鑑ョE+-\"U=paM?リ\\ F|0uエ?ヨ*?5崢フз ホ?:?2枢?T筑5C7}?ッAmoU羹~シ鐫1-S・0」Yミ」ケ?ヌニ{?款」Tu\0Eテテ鴒メi奴ア?#|ェリ\\ルワ4r-Xサ?Sg%ヌナ儔「)ャ?ソヌマ゙ケ0モ?モ?l%Pヲ:オヒGPユ#艇boカT\0メク抑?掏cョ*リソム?オe?sラRヲcモ79Gテj8?0ォ樂kア゚|keナ*ヒモlk-(kラ\Zァ,カ?8彬嶢?疑ケ@o?*u?ォ恆又ホヲクタ?i\0\rウe椽?亂櫚」畢リUトvヘ藍棺セWLセルTタュ?賚完?活ノ?A?桜ナス?R纒hz筱CヲP゚6X?U#倣恒ミ植?Lユ?鵐?4ト?ァcrD慌審E5\'?#】擺チトェ&粢ngg?シi?\05u?9W}セソ?<チモ??\0(<0%@\n\Z諫Uム寝?Y、タ(\0~P&ス6ハn囘P?\"クUム?レホxモト?H繞ムSp|2綯??+???゙?モカ 需!]筏紫ツソk8Sハ搦ユニ|jユ}・タ甥僂-:aユ?7t?蘊ノ?ル?\0∧?6?ョ。mロl撃Bgァ??フ。「z鮮ヤ9&?\n} ゚̄ Jュオ?%?\\|ラ? ??zvハノイノ喧?ロ瑠?2W?詔テヘ5[eu?q\'?9クカ忘、h?\ni?V\nム迺$h\\メ?\0ッアツy!;ス )<???$o,ヲV5,??ンヤュ |?$\Z^跫?@bニン?#糴潮ンロq?+\Z?ィ\n「?\n?8mォ」p「??(7P |ヌ|!P?.H? ?Z?・|\0?輿?HンゥL=?8VチDBャ瓣?ツNハァ・Mナ紀ミt?1啾・チユ航? ?z9=>Kメ?u迫 Cxtフオ?)メァレハ%糊?癒0Rラp\r;??\"筏]j:\Ztリ?$エ癖?k?\0oス?\nau璢?!ノ疫鬨ロ~ _ \'゙opス?#塞nVヘルウfナ\\7ヌ佇ニキy弔亂柩ルアWfヘ?vlルアWfヘ?vlルアWfヘ?_?トHF假Q?Utェ?蜥O\\オ・wナV貮ス;c1Uム??朝Z 参\\Rキ6)鱚ヲ(k6lリォウfヘ棺6lリォ?ヤ??X4髟?\\\\楮ワルアWfヘ?M?$ケ?稔hカ?タpワシモ*k?ユヘr4nユK6lル%DCh?徼カ/レチWツワo蓉ィ下bゥi4ハヒcS\\ャUルゥ\\リスーィqU??笊\\ネWョ\0Unlルーォウfヘ棺6lリォアハワqケアUF伐ヲ\'?6*?ウbョヘモ53bュ誰VlリォアxQ[ョ!?袈*?\\ナ歌1U?ヲTq?1熙dテ?Bi?翆粗??6=?X\n,dチヌ?62\0。ョ?x\0?5J篤Wリ鶴?。?カFdrh:Paヒムp?0メ=74?モシサョG、yv?ロ?\0??「ュテ??^\r4s n\'?z沢?{sヲ?柵?3?5ワハ??ヲュ#??\0^o?9穀カスハ?#?\0イセ・;?(ナ黝アQ,??\0ケ陜:?;リD托P+??\0+?猴\ni?マp?4コ食cAコッ??\0?ヤホサ・モ-謫ゥ・P??滲残フルカリ?ケ閾s!ォャア?)ー゚?? <モf‘オォ9キ忿ノェア?\"2ォ2?聯??\0c?/,゙?-1ァ\0I??)Ok?;\rhTP65?Mr。4?1レサ??\02IZ!。レ?Wアケ\']?Q僊?j畋゚?牴モNApツ\r但?ツmNム狃q^PH??7ヌノユ?$zR\n\ZSj?乾%恕?チネシレヒS?Yト」殤N?\0??+侑ク? ツY。Ю)j?H)???\0ナX゚?#俾:瞥1ン丼Aリ4?\0??釼[?1枩N(aラ???\0渊ホ側Zス? メ?湯ソーカオクカイ,ュ P?腮=do蜴_ン|9Eiタ7\0攷ア?イFク?/@H?20 vP?チ;Z? ケxゥァ開ソ?蜉ェャ懊~ッ、7レc?-j}駭?ス+ソB?$ク\n゙鴈%?!」\0@<蓑タ?\0キ?2bD?_aRMLj?ハ殍:?-Hjw V,ュ _???イ?マ直?K<:フ直ゥナ?zヘ9ゥ惓#ヌ$QCノK去Tレ忸?変#() 孵?捧穿ヘ??ノ=シm\Zトオ%ヒ??\0\n叮4「?テ(Q *オJn(>テォ柯ソケ桐6ォo゚ンニキJOニ?????\0,mヘロ?s蟇ヘ\nリリj.築悁I5CW竰葺?QノーKス濶ェイ゙ワU置HチDムヌォ#|_?8?;??サケォ1xッUEシkユ\\*?\0y?ァュr!R5装[ア。??NHシ?ノq2ワエ$q||zr#?YlィDトsヲE蠖?欧蝿軛イ#]?゚\nシ?ィハア鴃f?星@O?ォ端マ6[]ホ-?kiヨHユ?6\n[????Yウ??ヲj?ムLヤW私モ飾・lョ)eヲ捍l瓮紐$\'齋!「dT?エ??ヨLン淹? T還ホヨ\n?1?\Z@w。?&ツラ壥「aチスR?ュ~/?ォ儼G\rチ@韵∧ョYCv%Kヲ??*?ラ隕.タ\\8Bム@ロロ?,概ミ蒡ミメネkSたV妹ヘH\0}a◇&歯?症\0ッ$ハ ?-TエLヒ!M:?ウ骸jf41p懾?モ =MキヒFゥィ?碌ejキ,Jェ?ヤ88゙W「鑑ョ>Z?w8a。鶯jRImャlQ惶?/?ァ%ネ#僵タ窗楮」@??ヌK?蜑但チHx?)Zラセ&テ*、ロ稷1Cカ0モサオ1幡;。ヒcカリUb暃z D\ncニ8各Wwハヲ庸フ]2*ヨlシタbュ衲-硲。?リEラ フ梍LhマBi?.5P纃cヌ ゙ニ9ァ?G?N{モ濬~ァ蜍?&15?ユキ\nXs。?}シ\0自「療\ZIハ\\+)\0)??_??2Z78ォJ淳ク\Z:S?oせ゚?」膊Wヒレ[[It?B頷?$ヘ&・>モ7タケヒ+?」ト) メk?dk塲ユ舁L/+チ?ア?=q?緤??ロA?rネ緩? (@?狂\n崖?ミ?wUャ(}?ヌ6?オp+?8?uヲ]pォ|ア?:ケv4P?ラTS華綟48」ハ?1?0N岌\rBoDクBU?\'・Tr??ヒュT?8?Wク}??|cィタメGC?*臑M?チロュ2鱇_ノwトノョ4ラ(\Z訓ケ[C\\C亂\"」>リメユ8瀲エキC垪?メ0*メp~素?フv\\クャ罪カヲhv曇\\ゥ?T?L月ノvoゥ)??yJ@Y\rjG? -?/シン2ロY?ヲ蜿J{獨モ衲?ナ?2ヤK葡J?ミオMwァ??*1S_ 琶^g1鴒?ヲ3ト?\'?9dTオpI6転?SPp。 ニ?Ybコ厚烟??ヨB<ソ???f?>W 葩??ノタ?\0敕]8圜ΗNBQ&ヌDキ擬ラ?7?*? ?=ニD?I腦9?゚\'?N瓢Lケ7源=\r)゚lejp。yaテnク??X・6ト借USオ|q殀ヲ[Hフ? ?瀉gnクPエカ?\"ケbF?\rコ烝5ヌ\rカタUカ$?ホ)ネL彝ルje?6保,ァUlw蕭モ?タ??\"@鴆蒐I?\nモ#4?2=UD襁ロスr?\0甼屆ワ1d續?: UDッ||S4f?ミ螽ョ4鈎E?D櫛B髪モ?-u2」ノ?0サ」テ*?(梛H境モ.トW゚ヌ?舜\0?1?シr>9R?提e?eG?テ8n>オ@\0Pl鹿IテォHUュノッヌB\0?イトc項ト?・_E:M?チラW?!?髑=)ld?レサqテK抻7ェ堂ョホ\"Fテ?*w?\ru,b豹U?,8?カ^Jvァ?\0ス\"#ー?カ潛Tcケ9Q2?#ノR?$ァ\"」f~゚?ニ碆轤j??PネG?ッァ?\"ONDS^$ミ借ス?オェ#F、 & ?{S筴?(Jヨヌu_1[Iェロヘh?\"「?゚?萢HOォネレ?\rツr碎潟?ヘ悵 F誘K(李z;セ?\0?t? W?JJイy?9y<5M剃チョ5 ロルy,碕1$*嗽゙究メkコu?ヌ?,?フ\rC??_iェiZxサi?2ホイォ?\0オoオヌ\0h/???A<7゙ソ?Hム醵嬰>I?圻?zレxメe$o\n}ゥ?ノツ?]荳ヤフzェャ?篏Tt??>?}*?\0?4z?ロミ゙ォキ?セ透/?ル食ーJシA撃I??\0瀾???諺ヒカ?:u?+na?q]??F\r媚シヨ5wイ?\nツヷ&篩??ヒウロ「&?褓k1C@?S蜿3ロyq躰誂ョハシKクゥ?\0dルY?6X〜?シタ?馘灰Aォー]セメョ!・y禍宮?B?}・ョG?ヘN痂卍C=%ュ?ルa?\0ヤl[N\\+クァァζ?\0?0ル?ル?嗅,/、_N柏QG釈C ilト鮮*4逹Mキイエホォユ??\0リカF#メ喊rハy冶ツソ?Jュ i*?\"\\jコ\\7K?-?ン?ヒ\"?・メ?睾?,アGg?鬮\'.縅+姓4?6ィォl6 ?;dケHル1?シ拂仲??\nオ\'?:<0ニ?1ネワh??4EENnI!ヌト6Z祐ヌ,LW丱P?^?wチ?FッI?ムコ\n墟???<⊥#ナメ岔r1vッ|sT絣?5ヘヒli\njヌ.O亥*モ| V?W.ァ?8?0ィヲ8?」ーォvトヒq?\'pv8?ニ?ャ\n弖オ\ZMz褐jソLRォネメ僉bfァ|?リ。{\Zf稘慟8・?*S*イ??jク?)マ肘?Tゥ囈ヒ&ケォ\\*灑チツqシー。X? フ\Z」\Zvタォォ?+ョ?1V?ョル@Sq潅^Lア\'レ曹徐タRアルI?2。N/q」Xi\"1 k?rクk\n愬;蛛磁p??!Q?1ネ?ヌ\0WョXユフvヌuヘテテゥイ?8筵{eRクェナ?差ニナS}?*ク=Fリ拠z籌?1&゚ョR8モ?8タwツ?瞭bャ6ニ?モャヮ?&凰 篳?jー@GLc!8(奨#絶ョiAz|rツ?)」瘉緬Zォ斐Z゚ク髯?6?ケ水烱\0??\0g f#ケ4サ? RチQ?ミ#.??t*OA繞?8?mvPX@ッ.剏kロ3ヒ]ア\"?\0~Lェ??1ヲ0M3ョ,+Zッ雅?レ顕膿[?1?#。゚手・Wェ東ケE?惰?;??qャユ5ナ=OM゚?hC\Zk?>?!沖?グ?S*斑V拮i叙ン8+Fワ?\"?1U斐}アシ笠ュア?クZ^e?ヤT羨?ョ*シラ lオ崕ツ\'<Q?褪ネ?5カma遨-!eeャ畑>?ィ??Pイ?$\n|;dh\Z罠??.\"響ヤ$ソ\n$?銑Jb、cノー.c別ヨ?0愼ラ\r*ィ>|r?勉[ニァ0?;縲?s〇跡ォJf F緲イ?3|;bォjkS?#゚ョj甄キゥヒ,?+、ミbイモ?\n澆ミO蠑カ?ス晝DfBェ|,=S捐Iソメ?i竡砌K8赤且<9;?タ砺ネメ・)?,シc+ワ太$傘ラ+檢蛻M<ケw?B&= \0~Yロケニ?)?マアHba\"?」%\Z/?.-d縒ワ綜?Hクe?スミ苺Tャ、3カ?Oqc嵬U鋒?Sq喋oヘれ゙H物ツ)瘰a1U?\'\"RJニ<コ ・;?8?ホ?チヲンマコDロoモ.リ0A毒ケ.ル,?? ?%、タ\0ニ⊃?+4/ Qナ2縣ソ?0ワS「$\r=?Jカヌ綢ラカ。\ZFjOol?2jウOトト沾9?rホ柔院)?. ?勗?エ犯サ?(???噪\nIヒ?,\0Tゥ調クt?xテ\"キ.セシ勺y?ロ\nニイ?Nト?Y=シ?JA?、uj畋8\Zホイ|kスG\\トヨ捕Kョt?9]ヲクJ??モハ?スイ?゚??サ+!SアヲG? ?蕭S~ァヲJ2 リA?OG姙?ク\'?玉?ロ Ou・hユ??:?、Vラ*?Z弱j?ェテso?ワォモッ:ョd 5l}ネ;?ゥNムヤヤワcmッfイRンハ7?8?1nヲクフ櫟,QOv?\nハy5z?eォノウリq$?aHヌギニFN8}$ニチツ?メエ8磐ネ\\為磔ツ?$F莅j:o鏡・#ッJ檍ム[\rシK(艟\rタ?Z?(倹Qヒワc?lヤ$ュ(ュkロ+ヲ=O猶\Zスイ*ヤuッ?搓80lヲ゚^?#ト粥ァレ?sフJ?\0寒ァロpエ?垓\n+?1Y?ヨム[,jセ抂!Zア?ヘ、ァ\\蓋nロ\r?l|r佰%鵞~リ?0ェ?4ハ$総ウ7\\P?譯c@*Nj?ΩヌオMィz紕褶゚ViM?。Db搜ク?LUz嘴袮|ーNE.9cョc?0*?ァ|c\Zf5)アUァ5+?-F*ユ{eSz紵ナ[ヘロ*ケUナ]J忖8嗽ヲc#2?\'aR>愆。iスj+仝rッカ)uo? |ネ\rGCQヒゥ5?ワハV?kMゥ姦b?モ聳サc\0チV1トメ?゙%#???(xay賂ォ?)瀬Qカ8シャ体Zワ? ?vタヌ統ヘN\\?ザ?2ス&\n\\nS?V欽?R?16?-メ_R・??U+$WzQヌKrpT{Qビタ?\n\Z棘jヤ5トェエ?/ヲ楕 ZWテヨ?2??タE?ッZ?ヨョ\0ォリt ヨソ?eィワf=1W?$f竭カヒ@v?\\@bゥt酳liヌスメヨ??%サイxミ>モ?a??ヌ#R?\r|*z7?嶐スセ? Bエ?バ.= w?傳閉P破ウ??T~g晋oラ葎8没8誅~C%ム カ擽\\?B」?8q??フハ25ヲMハERhi?\0ノ ョェヤ\'\"R}j^E{n~?甞?x宕Zツ?&\nwヒ刄tナTウfヘ棺座ラ?5?*?7Uタ?ア匈・vlルアWfヘ?vlルアWfヘ?vlルアUXヤiルウ+qニアゥナU?6トウfナ]囗*ナ茱?コ?F?ヌ?・J3fヘ?未ケX?48ェ\"(リoロ?)N?\\\0)?\rMra吋G?\"タ隊ネイ?I\r?EΔフ?8??&6#イ8??Mz}ル#m。=7?28{?? 9:2テユeエ-\"ハ? ?ァ蘓<ウッ?:5コエモleォッ% ュモ綣??iネO奏?5#}lシhm$p\r*J斐?\0ノ乱ヲ??ッ?琲?ヒA\'%?\0?12岾ワ蘂陏カ?士?\Zミ.?ゥェヲ シoォレI31?華PmU?\0+??ャ?$M8F?\0。 Vァル?ラ??サ堙JィKIu8U宀゚o?oウkノオ]T]\\ロヌk?3I4淡タキ??\0?#ホナ葮頷曖\0?}?@?=臧?RC?\n??\0?ム?/オ?エ{A玳v?]寰Ncm??wТス1Sス9カ?[\ZエaGEッマ?(ル[$」T糾I鬆ォ?\'~?\0藺弗~寧ァィヲk桟4T4-\"ヤ?_?皰 J-z相ェーzaF、アナu\rノー、差??贖6n?ンァ5cAN 7?8ェ ?H サN) アr,ンェニ>ォYト唔癌ミィ?+篩gヤミ?\Zgユl?\Z5ePkキ5t??笊e?\0_\nソ15dウメ?ーチ罫メ4#ィcV??ェ?\nチッ,?莠ヨ覦]壥.fイpOC?yフ椥?ネ戚[??Pxロ??w?偏ユ藪Aオ7廰キ侃0?Bノso?\0ヌ|ケ蒟メ5屑+ィ?)ヨI!ロモ?シ?リe「T$dmo\\エ?尅隷ョBー?=8??\'マ?=\rハ聶X( ???\0Ёネァ? H筋ネBニカィt。薇m?マ?$wI$6?沓D#潟?テ?イ? ~望W?\'ヒ稾ュFF?\0?Ftヒ?>)琵?タソ及*x昜C??jx葷E諷iZ?(r%/?シU/。\"モtス*ニハ[ォ??9\"ORト?Goハカ巡「ヒツo??\0Kv??ユチ儺?洲ア?n4?#ア-?$? ッー?艨゚袈ノ?cUhu8叟?ニ?薨ホA?セs??オケz?ン4)゙ツ臍嵬0ホ??>ケ?;?ヤ関w6pワ*3ー壯?\0蝟l???#?>? ン:ヲ~FヨX盖S;:Dアノケハョ??\'楯殍ニ鞐ォ?=\Z藾ムレKыh戡\n{忝肓?qホdソQum0G席? ?ク??qV犠* P[Zト?畏M\Zッ ?2蓿{飮ナヒe uキト^?ラl栂[テァ卅?-トyfチ?r?:奮?3x-\"唳t?;uマボォ\Z5?ヨfカエ){&ワDU@\'クタ9タノマヨキ^?r4KXu8T]Gオキ@?bワサ4E?Mミ+皃レ?カ1a嬋チf9$キラ??g、E 幵p?厘\n調オ酌frソ慶メーuスbヌMV沸I0?シ.ヲF 璢&エZE?\r帥些???Pi-} ヌ hFモ?=^Jh??%ヘュ、「I1蝎v方?コZシ??1?#弃l??窮ァッ\"スキヤwマ+yFヒ;?Tj、*コス騨#ク1徨\rn_?veメラWカりネ゚タNカ?\'モ゚??ゥァ関疸?Dヨ?ツ弾)8S鍠<耙塑OB靄n劾」オ誘モηoワチ?8邯~??T?ァ.mヲdX.J飜?<ュ?ゥォ幕ヨイiコIメ?滉^MメBメ.nホ3キ {ヨu?ロKィ[齬?\rスィ頃)ZEaネbケタホ}8篏}仰涸ィ??eククイウユLSAア?塞茨檣?5 ヲ?ォif亡ナフ\n\nbAΧ?\0.}ォ\'ャz守ゥ-,ヨ+hメ;x?$??ス+N2rリM$E閊气3%ンテ??&b|゚~?[・?ェ?VロオO$?レゥOコy#?bdrB元タホュv薬iメEァト[?\0m;シ3???;馴レシ?\06幸ヲヘqサ,レF?忰q#*桧?ホ>???-k蒟ηLFチv?7? ?=k塹?6゚?\'哂?? }}~?ィマ菊?9e\n?(\0マ-?%?\Z?:\rネ言髯ホ2?スjnレ??鐶UタテB濮?s?ゥlヒ$M\0\n1 #\0?}ォ侯キ? ニムアl,ムョr}ネマ#??Dモ6。m$アY゙テ Jツハ +? 辺7鶸KmlWj?6wz\rb゙ナpメナ,ヨ?c1ヒ ワsロ=寡カ~スォ lオkw[・学CA Oラキc?c辿・\"Ё 9?\0キ?乾?ェ)hR[u-エタア??桾7ュC cト便eR對?樔戈#?b?%?\0Nn崩?\0俘z戌?1]8?-?Q?゙+カN?8ッ。F2ケ?]E,フムn6?サユ冲」チ%?s?佞イ蚶?珞ャPタLlョ8?酲\Ze篳紐Ubxcエ浣。ョオ}ュニC)?>オ?マi(?>S?ョィ?Pャ2タc?「l?o\n蘰\0q??、Q#yN澁A?\0P?\0zニ俳キl/?夥モルンp8S?゙『??_?-コ旺夂L?6エヤュ?+セH?臘rイォ?v? M~連,Sツ鼎\"K?e# ?;ダ沌杢チ>、?\0Z??\0??=ュッ%?ォハニ9フ陽+斛オタ/4。T?メ\0マ薗K(ョO#?xソGアiJW!qJR?R箱・()JJR?R箱・()JN?ユソ?\Zt$ 。ヒ\Zuア)グg?8?YーAVレ\nィ?NW?[5?mスクQ焼jノ?ョoセ)?ス齶オX?|ョ?タヲ+Tf(ヤア,フI\'? \0&?\nー?.|.#_c?ヘ{?\0N?ヌ?9sNン? ?ォ,銀ヘ箪ネ=ウ?ヘ,?柯シBチ巽\'\n\0??\0Jタ\\キ3ア?(?9ニ>?ー?3ミA桝?カフ?ッQェ10?カ哮\'カ?2?3P=Nsノ=???kc???enm貰ワ鎮xヒ蓍セ=マリTwI鏤М%ン?+n香シz南=jWSヨ籐篶ミハムeT(\"!惹鄙゙ケイノノ?「亀??2H?リ?8レホsノリ?^??^?鯲nハ !T{?j\rコ??\0ィoパoゥソj? r>+?ヤ」ケ覆k陟カ杖アl?鉉U?吊?+>ッmp$y#H?&;D?4吶8溏\\4ル貊ヤナ梦gフw?}y&?z#ワハ瀬J、ホ_ク??アMノク/o4?並a??*?イz??゚\\獰蜴?1?Xララ rq?m%墾%ョ|M? 8?z剰Nウヨ??゙゙4??Q?;H瘉?q?gVXIwo}ァ>?モl? q敕ク ?u醗?イ?.?ィナsノM?(y拆t[+ソ僮?\0タサあJ??7オhッフィ?|?Vマ??mb?\"??$??+?.・Hヨ&T昼?%? エ鄒??Xヤ/カ?)e蛔?・LOゥZ鰒モツdD丱I!\'豹y?L饂ロR黎竒fアA\"イ?X?⌒w羯?ツ\r吊\roゥョュzコkkwフナ00 ?脯bイ??Oメ??、コ實07\0}セリマ゙「オMrヒC?サセX?&ニ攵ヒ殯?イ=?]Kpo-\'盈\\キハタ冪1薇?\0ョ1]忝tf_:n+サJナui?ウ+ハ?ン掻?z?Uキ・ケGーyムK$q?ヌ常^l?.ョ程}N鬚ウコD_旅\\エョ?.yQ懽?キ蹙Mqu?[\'ヒヌnxJ?*?\0?+κヌニ(シHセ「壹PムnラOx奢Bv?」対リ?\0jメ?メzカゥヤ_!ィ@゚サ瘻、炭?+筑3チn=サVルラョcK」・06タ!!cT$?タ勺ャュ\rエロ+t3゙椋?ノeリrO|ヌ?/lオYP鷽豪Fケ??>Qン?dシホI? ニx?オ顫Vッ%?\\N?0d婚;?xレI? 恊3繋[堋LI ??\0+(マミラ M.メヨI謔ル諫?.3唱CMq)=ムウh??4ニBケ@臍ク#$檣豸$qエqェア、c?uャcb捩1?ロ V\\?hェTJGOT到k_鷸.豆゙ノx?ナ?E/?孥6逮>オーキサ??~ォ9祥HIーワ?\Z緬5?ゥャh6ウ鼾7硬9 lヒ*ヌ?G鑠\'E?」鰻モUモ.-? 。|M猗? ヌヌ8ァナ戳゚Kムョ?h゙9?$1?2w?Gリラ懃 H幽]忱\0 戔ヨヒナメ*ンィ?,3t?。ス|o腟,dp??8ヌセq希oR?゙O苫 ム?.」?3テホGラヨカッツ??ィ>\Z゙tvサ([;vメ暫?ク\'?jョゥメ耜オ9t?>*+ーR リ;Nxホ}Gメォ7ヒk「イ}鱠1フネ?9ネ?ホヨ茫8|+●? Tンナョ毳ヲムツサc*ァkソpr}ヌ?if_?シ2穩觀p?カ?cメク?\0Βハメ杠Bロ^&?$6??0Oo?7?-米q俤カィ?ニ=?サヤ,マo$セnメ1Pvキ7\ZKクWY柁|&?ミ?\0zイ椋メn-?\0?eIh綯チ?桀Z駿R゙mC)イヒ\ZmタFC?\0ィsQmヤレ慯ネ??#&ツ~ヌオtGヌ媾梠NiコG^。u3紀ミ7?.?ヌ??*?.7リレレロ6cケs苫zq??\Z跌・rdT-橄レ・4Q%トゥ皓f櫚cヤWFT?2E{dEメ親@$d??px?:」[スフハ?(<wキュF_[及Q?ケ\'カィ???? 鏗Uケネォf?)! #\"鱇>レ??\rk)vキスオbOヒホ?Pリ? 2ー#ム?r゙ソ;dソ革_ > N墅衵uト酌???レEbb?y馬p@?Hホンァ?シ??*5Nナ)J。\"櫨\0・)@)JP\nR?櫨\0・)@+ポキ?]I。|?エ霓=パu#イホ?袍DTクネAv(」 ォ/?88ッDラ贐ナ>オ帚wト?ォ?\'缶B-?&>hm塘@$睦 3カ ョ?ンネ選ヒ?+カ0aUメャVム40yp?忝??ニi?%ノ5lモVニKノュ栞Y##!スタ>?I(F惰?tョ檐コツ%クフ?_ソ??オ・騅:>?詮Yタcクr@輳??ェ7・4殿a?A、C;ンニQ?_zェ?X・ヒヘ慇#ヒ膩o蕾タ\"ケ蒟傍コ,ゥ?!uテ2ヒヲiLc゙vI =琳j。゙靡ン「Yレ+s??ト{楢*1?、dウ1芬??3[Aキi;?&*;.yA?}ヘuGゥサ1樞K}ノm+*?申?\0オv魍G{xュィL?ョI\ny??]WMユヒ4P2x?q#nレ>セ?5iァY似スシセク礼制ヒナ癧.s鯖?ヌjIメtx3%幅?ホアs&ンア?フル?{S]}NW?シ#y炊iィハ刀?キjノ鎬.?{ヘI謫lQ俛キ健Gョ}9ヨ\Z1エムョ$0Xヤ゙ォ?[Zス?%ヲチFa?2{歡\\貧ル。?Pヨo/oョt?\'カ?\Z)拗cワ^2Jユ躾ケ?;]\"ラM?ミ{サ、レ??ラ??ナ。?アdッ?#聡SQコナシzトカ)ゥHイェ?己F?ヰ{}1Z)・ェ+Fケ敵セヤuki5-\Z ネ\0?I?ニメO \0ワ涛檎モ#kム)ヲヌイモV)vュクNミ后 ?3ロイ{?^・メv3jk,7賎l シL]テレ\\?$rjヘァマ。?:lイ]チw?7$ェ膨櫻Oキメュ)コミHィ?=_、Z?6zD?5コ&ンJRθ[q;姻?勵サム\Zィ鯰徂ャマi0?レ駻dヌ#x=マ\'フシqZサィ4[~ァカoンカQ?ロ疝ホqニO峭レカ?テンPメコA4]Rルウ0Ias膩爿? W/箔け? ??QtゥッY゙?\Z?&bワ&Bネ? ホk]チ{ィレャ?67w*ムニ洽゚Oワヌ?=g?/URハヲ?ュfMfbメ磅ナ ャカ楠ネソ?5ケセ槎カモ???\0癡Iメコ?ネ髦ヨ覿f(#?}?ト跟ル?ャ?w?ムソモウ?ム???v;ヨチオホ] 植?藷キロ^Ulリ???/]カ穴゙?1ョ。??珠Rヨ゙ロ\'cュカヲ\nw?ケカS???ョハ?Eネ???ヤZヒ1?ロ} ?ホトホニwキf]{ソG^レ?z?o?アB2ンhkMWテサ讖+G?撥n?曝ワテ-sH゚]オサMユロ[嫺ネUユZ7Uョヤケ?ム??鋳扨&Nリ\'ケ?ヤ鍜魁w*uーn?]T\r?オ淑?$ク?fミラ7ヤc?\0yt}Cュ袗?1q@shs境hv?z孀??\0en??,w?ッ?」ッ「8モ壙*ュヌ!平ク・ーb?娩w?Os??Fマム・e猷cア囘;壑mdl斟m?;cン[?/?\0セ#L?。?ス|?フヘ_r?8Xzォ*}?:嗅ー1??Xラナフヌタニgカラロ?9セッゥ?\r?\0・?\0エ?ネ鶚?ラ}?冐熊スレ2キ?\0Hォ.カサラ9?}麟~;?\0M??c2?ツqエ7?潟*8囚キ!?oァ?oィ?イ-g?/ムォ4?\n??ノキカケ?譱#}5;e?愧_レ3=oァ??ッ^7?iオ7?$欅??音yカゥ?モ?カャ[Csキt惘Uョゥ盻ョウ.キリ鍄?[= }oNヒ?\0]c瞠Kz?ォゥヤ?gィ?UfツK?マ?eサ~ム]_ヲ?\0ョ.?蹠wNテヲ?ォ?/sンー争?zuz椏Y?エウラゥ?灌渭ェ[コSウ歉妻ッn;\0ュカ今?/;娟F0?nヘソ、ルウラ?% ゙ウ\"b}<]o??4コユトoLヌ鶚?゙?PキOx?{hヌョ媼??\00バ?」ヨサ゚mヨzカ*NCァ釁FV17aneu=ミ甼⊥霽;lnラ2?ス椚Lコレoッ?ッ?g+7\"囿?カ貂3=ト青\0凡旌3u?種?2ヨl?Oユ?wセーcgt??マQヌョヌオ?.ャセニ揮羞☆5;布゚ヲキ?Y?漆鯏 ア0D?猖ラd=ッ?ハ黨ケ.ムc?ウpSNwレュ}クケ/kw??0セラ?%jcgソェcX猝ワヒ+s宜?8Xハ??62?+}ウgモカェスOラ=5ホu゙?:eュネ\ru廟Xイ?‡{ナgルeyt\r布V^マ輌滌?>ロ遣疼ヌa粭z?,uホ~8pュ?;Vオマヌ,?>Eフゥ?ェソE努鬩ア?\0h???゚Tンh\\ョス9焦n].uァモ檎ニ? ッァ~ンヘk?゚窓m蘗?ョ*絽ァgbキォ瞼uュ]オ゙>?盟???b?ョs=?J?\0@シナVヒ2タ恕D瘻>・(゙テ???メ?lfオマ?乍謔ャaV?.kZメO.0??U;UY?\Zヨ勿!?2v4{ルイカYオロ?\0孕ルウ?%kVェq?[疫m」ォオ孀mリ1?Fュ?xル?葆ヲ??\'g」岨。?2\rュk麒ュフ,徒[シケム鎹?\0ヘネキ?m?\0カ?oP鰈Tハ\0qスオ脆?bルッ{,?抔ア??\0驃e溂テ \0 ?ラ?ュ\\テ○?遊^?ッ、?メipp;墮?;ヌ?W頷d?g?=OO*玄ドゥ湲「シ7ソォEwQeV9ユケヘ?メicソAk-v?ッモ゚K?=フ」\"ォQユ?2コ?、ローuzE\rカヒ^X??dンヒ-ホェヲ葫fCG?M゚ヘ??、}\\鎔mYY8ュキ エ?S菜ニ輅o「イ广?~マユi?\0??斬DフqkF#cテ?F=?9xKォu:e?ラ??゙?9^?s ?サ\rモ掌黔m?%ヨzy??\0ミセ、?Gゥ6ヨ9?コハZ?E>テキ}u?際ン?写キ?夛?gイ岸VXス諂ク?-眩」??bヨ゚Iセマ詼??%K究?<_bエキ?埠{i,wWスケCa^ラnネユeエ?[V58孺v[?滯+VF5 4クヤlク5桾ヤ=???67ワ??}ャ゚些オ[??ア?~ュu?シャォZ?ロリ貶?~?\"ュソ、ェ暄z~ァゥ^?・Vーヘ?\'?4裔ス?ツ彑?lォh・マゥ?;ムv-98エワ/輌ス\\ed?濱モキ?゚Xu4レ?堯ヤャ餾.-ョ?U_Pメ證ッ?eiッゥUo?Isラ奧ュ?\'ヤロカt?スF螺}ceャ蘭?イ粐?レ?^ョP?t??E>ァ? フスZ?\0iz゚狄}?\0ル゚サ?・Vホ}X藥?\r[??、?モ?gァ絹nム、チU八vロ\Z?\n~#S?ァアトs鯔\Zォs??「/hー;?{~??\0戀}5スメュ フソxn59、ヨラオサ儼Sbレ唳_VMァェ湲?zヤャN鰐ヒゥ師エリテ゚^゙??\0嫐1]ッィ〔1ヘ[リ?ム]ャ?ミ踰ユ?7モイ溽jアZ4t:iH/W??K?趾サ*ラ萬亭ケ???゚Eソ」ァ?+A9?3W??-キa\rn-lvリoィ??5lウ?ヤdア?~C゚?/?s?/ヌaョヌ}攴wロUチヨ5ュl>テ^c?Tキ?敷ト>。メ?〃^$c}ュフウkエワZ=wャ?櫃メァユソ? ゚層」?鬲F\":?リォa?サ=クュ#サ%ホ\Z・チョ?-オ]1?7~潮??sユコ・ヨロ_Rチ?/ヌ}oェ\Zリ??ッ「ニ\rヘケ崟???Dケl?bレ?? YcY?#齲=@マルマソk,セロ\\ヌ?ヨソ?ャY鹽;wャKウ1ウ N、\n,ャ蜥稷ウヤォu\'リ觴k况~NGゥ風m゙ュ」Sルメ#?ナGッ?-?黙ケク]5ンUナュソ ?スメ $幀ナョノ?-wゥ嬾+?\'ァイ?ム??\0Hシ。v゚Zz摧taステ?=Jヘト5?~ォS゙?9?\0ス?「゚ム??Oァ~粐U\\?ツ?サ!?x???ヤ?棚%;?\0W?siq頃茸W]メ~゚c橄ィ?ケ残壙\Zツ?モcイア゙ヘロ??ァ?\0 j?{?6イチ???:Sェハ?゙3?x~??Zキqツ?%?? ニゥニfニ;Hun-2;?3w?)ct?ョカロ?x??ー?\0Snサ?K崕?ニ?\0チウ??,Aナハ脊O Gツナァコ?ロZ*kXK????#ャ暉セ滓11H鳧ー媾?5ラY苗nュ・ニヌス?.ロ足鬮ヨgゥ霍? ?\Zムイメ^粫?ヌ5?\rレ7サw??Mャ?クhc???.コri}9X?ァ毳.」yam剤?;=ロ^?點?\0ェラ?ulメ?.ナ7 l2\\6=OEホ;_eロh?ヨ?\0?F?チ帯ヘ、9セオU]kタ.ァヤカ」ス7゙1ルgヲ?+Cゥeカタモモ?ユ?\09n鷽メ賻ヘ???フ??? ヲフWキhリモVネ:?}.ヌpワ??\0チ?筰G%lA?GJiソ ヤ」モ・?ケチ?カ?O」?策佞イ?KV゚?棯ニヒ、Znサ+モヌツヌk[殯陽UヤX?アョsr22.?q*?騷>ァァ?奇Q?8ツム拘ル鶸%ル蒙レェ゚セ?^ラ=エZ釋F?MY??ン?拗モモ?)鮑sー4m>]?ラ\r?ルスフナァ?[??後F?ィ4tr?Yソュu;s?嫋 「親オTチイ??嬌?=?組、牒f??ユ?棚%)Yチホサ\n疇gOホネU誰血M?>?>ー3%セメ ウク?メ緘オワ? ニX?璋8オテPF???k??\r.mタ~?3?s テ$%ソ、?\0ヘFッッラ?1ッ?)リ?,}6リ?4ミ\\[?w?モシ~ムワユ覽?\0?丸?kワ8\"ヌ?饉?1コ?3V;G????ゥ+?錠゚チO。eGャ鍄釀k6??\'鏝[ォ/??\'ャ?a?6ァcfワ?8z亰サヤハーク?.ゥニャ*?゚Sラネョ??モ?\06シ?\0;?ヨ ヨコキe\Z)x!ユcオエエν閹>ニ?\0ニス??#oQHェ搦サ?+ォE聞、mナェaロdT??\0?ヲ{+?o埴K緒鷙アメIC)&メ、棚??ル\08BIM!\ZVersion compatibility info\0\0\0\0U\0\0\0\0\0\0\0A\0d\0o\0b\0e\0 \0P\0h\0o\0t\0o\0s\0h\0o\0p\0\0\0\0A\0d\0o\0b\0e\0 \0P\0h\0o\0t\0o\0s\0h\0o\0p\0 \06\0.\00\0\0\0\08BIM JPEG Quality\0\0\0\0\0\0\0\0\0?ロ\0C\0\n\n\n \n \Z%\Z# , #&\')*)-0-(0%()(?ロ\0C\n\n\n\n(\Z\Z((((((((((((((((((((((((((((((((((((((((((((((((((?タ\0\0x\0u\0?ト\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0?ト\08\0\0\0\0\0\0!1AQ\"aq?2贈ア#BRbムr$3チ盍?ト\0\Z\0\0\0\0\0\0\0\0\0\0\0\0\0?ト\00\0\0\0\0\0\0\0!1\"AQ2aBアムq■チ碵#R??レ\0 \0\0?\0?\0\0P@\0s?7浮ニ護|馬???・sgツルk・ カナヨCヒZ姉カ?ウ_gケラPc?゚P」ュKムノ~%?B,?チケ?%-62r?」胖、zL凶ae鰯9I舵Bャ4Egqqtム\'\Z?\n\0(\0??\n\0(\0?・+?m監スモ? !Oa?->厭Y\n蜥コー?tPa?9?OフラAF+す9ヨ? 厶。控t??>エラ?\n?|?みル篦A」=マ(<フwウ?VMウノマHコヤ{9則1? キ\'}?ヲXR\\イ7?9 v?チハc6XY?ル゚ラ。Jo4?\0?*\\咏{\"シイ介ク~Fサ?6ホ5 窖7?\'ヲ源ヌヌリ{2ケcx、h薈GSヲV\Z ?Xレqtニ8T\0P@\0\0Pカデ& テyW[KァP[袢\\・?8ォ\n」冨宗・?&カ9Q]職c?}シ?骭sv>^T\'\'?!、?1キ?wK+蠏詢C1e?\'ハウK\'?楓%?ネ???)夜繩?レ\r\0ロ」Drニ~=欺八1ゥ~モKsqk!リa4\'G舫躬B榕「クキ\Z?\"rフtャOQ?吊租qak遵?/\ZRフ6_?ネ>エロ??ョ\\オG、bセメ0i廳ォォDciイ愕?\0i?\0!襌Uコス.?kア!橡ナ倆pヘ@\0\0ヌテヨ?「窰?シサ??ワcオ &銚j??;鰍蝣iヤルセロ?*=)蜩消」eナ??..?? P?ノ??o・7?WB?c>S吟??Fミン\\iBコ丞?\0ネ??v?フフr?5,モ%?m停Cッ?シ醂(\'@?ォ・襲坪?3ヒサ*s?フ|エ)ノmvセ2/?髣?B+岻ナ鱠オモ,Χ*VAツ?9F・?\07V燻鬢 d磊Oyサオ?Hタ?7ヨス?td濫績明L」\Zァ$hタC?? >オメーノ%tv肆?Y/mニフ艀?。}\r??)苴j?\0bヲ?%?0メツ,ケ莓Rハニ\'フ@ル\'ッN柆 cI?\'ヒリf琲ウ7y(ュヲコ?,アH????ラcュS昴Qm.? ・|喟p??\r,wK-ワカアーェ?H?iG&頌eョ6ゥ亘チ<7o>ヌ?錘OッJ?-ム3SN?<ンヤカkm{?;I良Hタ?__スbヒゥZ蒙Y齲イサ)ツ?dヲ?^V,靭◎眈?\0zウ・ニ71%?7チIi%ト7\r ?t??uラマフw?ヨ未ヨ荳+?:fオ依リ?,Sハ\\r?]ラ_]ラ/&)oi\Zc%FY??篤Mヘe 儿ナt?コ涎Nカ+&?\\olゥ亰q\r@?ヘ0tユウFシ?~テ?*ヌQ・マツ3l喜,ソ┐P?/qK擽7Xキ貅キ@$エ裲?ラ?<梛ゥ???\0Q\'S弁S?6W^蛩糺ャョ@?tケ0ニj?ィ?8滯慶ヒAh特$e」?6シ、}:茅j\n\0租ygSスuュレ.ルCmカZ?3hカ??H・eSコ8 ?K??ぬワケ??吏旭aヌBキ―濶h屁ィ゚??ラM謗:r脯??桟摂テ~ハ?P^d艪5ム=リエmョ?ソ躡?ム???モカ1gqヨウ??+ケSキ%<6揃???6)オmEムsG }ク\rケ渠詞??9セ鐡?7pqY(?8膩レ?ラ~楫Z?qkyツw7?Q沙Xハ\r?ョキ?0Eャェ+臟?剋?フヲO>--d邉ヌゥ?2;3o縊ケ?\0ョウ7ゥ績?&ヨAツ?\n\0コ皰匆シRヌQ撞]&Mムxル?\nCow|nヨFハ ?跡_6ヤv曾ルャ?c?N??+,サ?/,??ツ6?ウt?;?z]Y[;? ーG Cァュ/( レ休計゚*5ハ{・Cwヒ$F耄}?81VQ3鋲iァc・Qセロ?饂t?9z?+ネ婬?K夢Hュ預?N必?紹アw?>??(Bヒowl\"F#?\0?Drァφ?トq?we\'褂?!\"9q?;。ラマ_?.5?fM?9 Yノik)9ォ泌\nュアn?ネ??3?aタア?6ユヌ-\n\0(\0??韲SFNrF?トヒ[i?+o。?シfウヌr?nX??%モtD」ノ#U崙ナ劵R_\\ト寿Q蜩ナacUU? LHQ熾z?5\0Rdョ.螻箪t??Ne?ュ:I?$C? ?/ュヲC{qツノ「]G!ル:?=*??T*ソr?7瞳エ?!?\0?\r闢?スMUJO○Hニ?レ!テ4鯨,?\rC\0n?{囚?ュ9}<カ?ナケ3ハd.イ? ?詈ョfngv=IョL跏?)\0(\0??\n\0?エn :?)??9n?5fγワnヨッ7メrミ?類コpヘ ゚f/(レp\\GトHノ2ー>?P「lmウハォト?:ュトぼ 梯?J?tKwhー?<1ラAコ囹+g8?m&ノ_[ォ\"?域?@:衍^アレキツ\"フw??ョヘvd??1?7s/ニG????Sヤテ\Zャ|ソ??Ck}?5ト?フ?H?逋斟ヒRk跏?掖?\0P@\0\0P@l2鱗?ウケ?/?=?*セ\Z恊篳、2リ?マZkRC&ソス?ムォ無?(婚ボZ?2コOt_氣O??{^ミ?iS潜?ラハノ&RXムコ??コメス\\?\0\nK?。エW框n%i\'大遜ウアb~讓懷7rv5t?\0P@\0?ル?リ??\0JFIF\0\0p\0p\0\0??ヤPhotoshop 3.0\08BIM?\nPrint Info\0\0\0\0x\0\0P\0H\0H\0\0\0\0レ(?????FP\0(?\0\0P\0H\0H\0\0\0\0レ(\0\0\0\0\0d\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\0d\0\0\0\0\0\0\"r\0\0\0\0\0\0\0\0\0\0\0\0?|\0\0\08BIM?\nResolution\0\0\0\0\0pU?\0\0\0pU?\0\08BIM\rFX Global Lighting Angle\0\0\0\0\0\0\0x8BIMFX Global Altitude\0\0\0\0\0\0\08BIM? Print Flags\0\0\0 \0\0\0\0\0\0\0\0\08BIM\nCopyright Flag\0\0\0\0\0\08BIM\'Japanese Print Flags\0\0\0\0\n\0\0\0\0\0\0\0\08BIM?Color Halftone Settings\0\0\0H\0/ff\0\0lff\0\0\0\0\0\0\0/ff\0\0。劒\0\0\0\0\0\0\02\0\0\0\0Z\0\0\0\0\0\0\0\0\05\0\0\0\0-\0\0\0\0\0\0\0\08BIM?Color Transfer Settings\0\0\0p\0\0???????????????????????\0\0\0\0???????????????????????\0\0\0\0???????????????????????\0\0\0\0???????????????????????\0\08BIM\0 Layer State\0\0\0\08BIM Layer Groups\0\0\0\0\0\0\0\08BIMGuges\0\0\0\0\0\0\0\0\0@\0\0@\0\0\0\08BIM\rURL overrges\0\0\0\0\0\0\08BIM\ZSlices\0\0\0\0u\0\0\0\0\0\0\0\0\0\0\0\0\0I\0\0:\0\0\0\n\0U\0n\0t\0i\0t\0l\0e\0d\0-\01\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\0I\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\08BIMICC Untagged Flag\0\0\0\08BIMLayer g Generator Base\0\0\0\0\0\08BIM New Windows Thumbnail\0\0i\0\0\0\0\0\0m\0\0\0p\0\0H\0\0準\0\0M\0\0?リ??\0JFIF\0\0H\0H\0\0??\0Adobe\0d?\0\0\0?ロ\0?\0    \n    \r \r\r   ?タ\0\0p\0m\"\0?ン\0\0?ト?\0\0\0\0\0\0\0\0\0\0 \n \0\0\0\0\0\0\0\0\0 \n \0 3\0!1AQa\"q?2贈アB#$Rチb34rびC%担??s5「イ?&D典dEツ」t6メU稙??モu胚F\'筈?米ヤ蔬・オナユ襄Vfv?ヲカニヨ踐7GWgw?ァキヌラ銷\05\0!1AQaq\"2¢。アB#チRム?3$b疵rCScs4?%「イ?&5ツメD典」dEU6te糘ウ?モu胚F筈?米ヤ蔬・オナユ襄Vfv?ヲカニヨ踐\'7GWgw?ァキヌ?レ\0 \0\0?\0?棚%)$瞳施セ$如$ミユK#總詁ヌゥヨv?4?\09htタaマ\0サ?\"G??ヒr較C}:?p-?? ロ?コカヨヨツウW?ミヲaトォ?Tアチ?[ワ$1マ?;?=M?\0Sz?K+ネヘv7?\rkェタツキ\Zソエu~ョX?)ニdエリO?oルV=゚G~マエ_?オd?k゙ハ?ァ\0レワ?゚T?\06ラ?サcツ;gモ???\0捍チ ィ?.?/?};ヘ驀G\0掌綺@q??!、?\0!?\0A?\0ルUWゥラ泅レヘoヌeマ oョ[I??\0Kヤkッヌオ?\0顆SアSホ?ミz・/ネヌe?2ンKャ?p栽ハニe?+ル??Sル??\0「z旨スl~ン? ロ? -ウミコ拾ネ贐??2.ェヨ条納?G??\0テW[ヨz??4)RI$ぁ?ミ?棚%( +kヲtフ鶴PQaモqqc?4{セ林k9ヒ????0?&&ミ?N??ラt?,ャ蹶Xkヌア?{ -cA?M熟?5ユキ?z櫃モVーヌ?洽゚Oワヌ?=g?/URハヲ?ュfMfbメ磅ナ ャカ楠ネソ?5ケセ槎カモ???\0癡Iメコ?ネ髦ヨ覿f(#?}?ト跟ル?ャ?w?ムソモウ?ム???v;ヨチオホ] 植?藷キロ^Ulリ???/]カ穴゙?1ョ。??珠Rヨ゙ロ\'cュカヲ\nw?ケカS???ョハ?Eネ???ヤZヒ1?ロ} ?ホトホニwキf]{ソG^レ?z?o?アB2ンhkMWテサ讖+G?撥n?曝ワテ-sH゚]オサMユロ[嫺ネUユZ7Uョヤケ?ム??鋳扨&Nリ\'ケ?ヤ鍜魁w*uーn?]T\r?オ淑?$ク?fミラ7ヤc?\0yt}Cュ袗?1q@shs境hv?z孀??\0en??,w?ッ?」ッ「8モ壙*ュヌ!平ク・ーb?娩w?Os??Fマム・e猷cア囘;壑mdl斟m?;cン[?/?\0セ#L?。?ス|?フヘ_r?8Xzォ*}?:嗅ー1??Xラナフヌタニgカラロ?9セッゥ?\r?\0・?\0エ?ネ鶚?ラ}?冐熊スレ2キ?\0Hォ.カサラ9?}麟~;?\0M??c2?ツqエ7?潟*8囚キ!?oァ?oィ?イ-g?/ムォ4?\n??ノキカケ?譱#}5;e?愧_レ3=oァ??ッ^7?iオ7?$欅??音yカゥ?モ?カャ[Csキt惘Uョゥ盻ョウ.キリ鍄?[= }oNヒ?\0]c瞠Kz?ォゥヤ?gィ?UfツK?マ?eサ~ム]_ヲ?\0ョ.?蹠wNテヲ?ォ?/sンー争?zuz椏Y?エウラゥ?灌渭ェ[コSウ歉妻ッn;\0ュカ今?/;娟F0?nヘソ、ルウラ?% ゙ウ\"b}<]o??4コユトoLヌ鶚?゙?PキOx?{hヌョ媼??\00バ?」ヨサ゚mヨzカ*NCァ釁FV17aneu=ミ甼⊥霽;lnラ2?ス椚Lコレoッ?ッ?g+7\"囿?カ貂3=ト青\0凡旌3u?種?2ヨl?Oユ?wセーcgt??マQヌョヌオ?.ャセニ揮羞☆5;布゚ヲキ?Y?漆鯏 ア0D?猖ラd=ッ?ハ黨ケ.ムc?ウpSNwレュ}クケ/kw??0セラ?%jcgソェcX猝ワヒ+s宜?8Xハ??62?+}ウgモカェスOラ=5ホu゙?:eュネ\ru廟Xイ?‡{ナgルeyt\r布V^マ輌滌?>ロ遣疼ヌa粭z?,uホ~8pュ?;Vオマヌ,?>Eフゥ?ェソE努鬩ア?\0h???゚Tンh\\ョス9焦n].uァモ檎ニ? ッァ~ンヘk?゚窓m蘗?ョ*絽ァgbキォ瞼uュ]オ゙>?盟???b?ョs=?J?\0@シナVヒ2タ恕D瘻>・(゙テ???メ?lfオマ?乍謔ャaV?.kZメO.0??U;UY?\Zヨ勿!?2v4{ルイカYオロ?\0孕ルウ?%kVェq?[疫m」ォオ孀mリ1?Fュ?xル?葆ヲ??\'g」岨。?2\rュk麒ュフ,徒[シケム鎹?\0ヘネキ?m?\0カ?oP鰈Tハ\0qスオ脆?bルッ{,?抔ア??\0驃e溂テ \0 ?ラ?ュ\\テ○?遊^?ッ、?メipp;墮?;ヌ?W頷d?g?=OO*玄ドゥ湲「シ7ソォEwQeV9ユケヘ?メicソAk-v?ッモ゚K?=フ」\"ォQユ?2コ?、ローuzE\rカヒ^X??dンヒ-ホェヲ葫fCG?M゚ヘ??、}\\鎔mYY8ュキ エ?S菜ニ輅o「イ广?~マユi?\0??斬DフqkF#cテ?F=?9xKォu:e?ラ??゙?9^?s ?サ\rモ掌黔m?%ヨzy??\0ミセ、?Gゥ6ヨ9?コハZ?E>テキ}u?際ン?写キ?夛?gイ岸VXス諂ク?-眩」??bヨ゚Iセマ詼??%K究?<_bエキ?埠{i,wWスケCa^ラnネユeエ?[V58孺v[?滯+VF5 4クヤlク5桾ヤ=???67ワ??}ャ゚些オ[??ア?~ュu?シャォZ?ロリ貶?~?\"ュソ、ェ暄z~ァゥ^?・Vーヘ?\'?4裔ス?ツ彑?lォh・マゥ?;ムv-98エワ/輌ス\\ed?濱モキ?゚Xu4レ?堯ヤャ餾.-ョ?U_Pメ證ッ?eiッゥUo?Isラ奧ュ?\'ヤロカt?スF螺}ceャ蘭?イ粐?レ?^ョP?t??E>ァ? フスZ?\0iz゚狄}?\0ル゚サ?・Vホ}X藥?\r[??、?モ?gァ絹nム、チU八vロ\Z?\n~#S?ァアトs鯔\Zォs??「/hー;?{~??\0戀}5スメュ フソxn59、ヨラオサ儼Sbレ唳_VMァェ湲?zヤャN鰐ヒゥ師エリテ゚^゙??\0嫐1]ッィ〔1ヘ[リ?ム]ャ?ミ踰ユ?7モイ溽jアZ4t:iH/W??K?趾サ*ラ萬亭ケ???゚Eソ」ァ?+A9?3W??-キa\rn-lvリoィ??5lウ?ヤdア?~C゚?/?s?/ヌaョヌ}攴wロUチヨ5ュl>テ^c?Tキ?敷ト>。メ?〃^$c}ュフウkエワZ=wャ?櫃メァユソ? ゚層」?鬲F\":?リォa?サ=クュ#サ%ホ\Z・チョ?-オ]1?7~潮??sユコ・ヨロ_Rチ?/ヌ}oェ\Zリ??ッ「ニ\rヘケ崟???Dケl?bレ?? YcY?#齲=@マルマソk,セロ\\ヌ?ヨソ?ャY鹽;wャKウ1ウ N、\n,ャ蜥稷ウヤォu\'リ觴k况~NGゥ風m゙ュ」Sルメ#?ナGッ?-?黙ケク]5ンUナュソ ?スメ $幀ナョノ?-wゥ嬾+?\'ァイ?ム??\0Hシ。v゚Zz摧taステ?=Jヘト5?~ォS゙?9?\0ス?「゚ム??Oァ~粐U\\?ツ?サ!?x???ヤ?棚%;?\0W?siq頃茸W]メ~゚c橄ィ?ケ残壙\Zツ?モcイア゙ヘロ??ァ?\0 j?{?6イチ???:Sェハ?゙3?x~??Zキqツ?%?? ニゥニfニ;Hun-2;?3w?)ct?ョカロ?x??ー?\0Snサ?K崕?ニ?\0チウ??,Aナハ脊O Gツナァコ?ロZ*kXK????#ャ暉セ滓11H鳧ー媾?5ラY苗nュ・ニヌス?.ロ足鬮ヨgゥ霍? ?\Zムイメ^粫?ヌ5?\rレ7サw??Mャ?クhc???.コri}9X?ァ毳.」yam剤?;=ロ^?點?\0ェラ?ulメ?.ナ7 l2\\6=OEホ;_eロh?ヨ?\0?F?チ帯ヘ、9セオU]kタ.ァヤカ」ス7゙1ルgヲ?+Cゥeカタモモ?ユ?\09n鷽メ賻ヘ???フ??? ヲフWキhリモVネ:?}.ヌpワ??\0チ?筰G%lA?GJiソ ヤ」モ・?ケチ?カ?O」?策佞イ?KV゚?棯ニヒ、Znサ+モヌツヌk[殯陽UヤX?アョsr22.?q*?騷>ァァ?奇Q?8ツム拘ル鶸%ル蒙レェ゚セ?^ラ=エZ釋F?MY??ン?拗モモ?)鮑sー4m>]?ラ\r?ルスフナァ?[??後F?ィ4tr?Yソュu;s?嫋 「親オTチイ??嬌?=?組、牒f??ユ?棚%)Yチホサ\n疇gOホネU誰血M?>?>ー3%セメ ウク?メ緘オワ? ニX?璋8オテPF???k??\r.mタ~?3?s テ$%ソ、?\0ヘFッッラ?1ッ?)リ?,}6リ?4ミ\\[?w?モシ~ムワユ覽?\0?丸?kワ8\"ヌ?饉?1コ?3V;G????ゥ+?錠゚チO。eGャ鍄釀k6??\'鏝[ォ/??\'ャ?a?6ァcfワ?8z亰サヤハーク?.ゥニャ*?゚Sラネョ??モ?\06シ?\0;?ヨ ヨコキe\Z)x!ユcオエエν閹>ニ?\0ニス??#oQHェ搦サ?+ォE聞、mナェaロdT??\0?ヲ{+?o埴K緒鷙アメIC)&メ、棚??ル\08BIM!\ZVersion compatibility info\0\0\0\0U\0\0\0\0\0\0\0A\0d\0o\0b\0e\0 \0P\0h\0o\0t\0o\0s\0h\0o\0p\0\0\0\0A\0d\0o\0b\0e\0 \0P\0h\0o\0t\0o\0s\0h\0o\0p\0 \06\0.\00\0\0\0\08BIM JPEG Quality\0\0\0\0\0\0\0\0\0?ロ\0C\0\n\n\n \n \Z%\Z# , #&\')*)-0-(0%()(?ロ\0C\n\n\n\n(\Z\Z((((((((((((((((((((((((((((((((((((((((((((((((((?タ\0\0x\0u\0?ト\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0?ト\08\0\0\0\0\0\0!1AQ\"aq?2贈ア#BRbムr$3チ盍?ト\0\Z\0\0\0\0\0\0\0\0\0\0\0\0\0?ト\00\0\0\0\0\0\0\0!1\"AQ2aBアムq■チ碵#R??レ\0 \0\0?\0?\0\0P@\0s?7浮ニ護|馬???・sgツルk・ カナヨCヒZ姉カ?ウ_gケラPc?゚P」ュKムノ~%?B,?チケ?%-62r?」胖、zL凶ae鰯9I舵Bャ4Egqqtム\'\Z?\n\0(\0??\n\0(\0?・+?m監スモ? !Oa?->厭Y\n蜥コー?tPa?9?OフラAF+す9ヨ? 厶。控t??>エラ?\n?|?みル篦A」=マ(<フwウ?VMウノマHコヤ{9則1? キ\'}?ヲXR\\イ7?9 v?チハc6XY?ル゚ラ。Jo4?\0?*\\咏{\"シイ介ク~Fサ?6ホ5 窖7?\'ヲ源ヌヌリ{2ケcx、h薈GSヲV\Z ?Xレqtニ8T\0P@\0\0Pカデ& テyW[KァP[袢\\・?8ォ\n」冨宗・?&カ9Q]職c?}シ?骭sv>^T\'\'?!、?1キ?wK+蠏詢C1e?\'ハウK\'?楓%?ネ???)夜繩?レ\r\0ロ」Drニ~=欺八1ゥ~モKsqk!リa4\'G舫躬B榕「クキ\Z?\"rフtャOQ?吊租qak遵?/\ZRフ6_?ネ>エロ??ョ\\オG、bセメ0i廳ォォDciイ愕?\0i?\0!襌Uコス.?kア!橡ナ倆pヘ@\0\0ヌテヨ?「窰?シサ??ワcオ &銚j??;鰍蝣iヤルセロ?*=)蜩消」eナ??..?? P?ノ??o・7?WB?c>S吟??Fミン\\iBコ丞?\0ネ??v?フフr?5,モ%?m停Cッ?シ醂(\'@?ォ・襲坪?3ヒサ*s?フ|エ)ノmvセ2/?髣?B+岻ナ鱠オモ,Χ*VAツ?9F・?\07V燻鬢 d磊Oyサオ?Hタ?7ヨス?td濫績明L」\Zァ$hタC?? >オメーノ%tv肆?Y/mニフ艀?。}\r??)苴j?\0bヲ?%?0メツ,ケ莓Rハニ\'フ@ル\'ッN柆 cI?\'ヒリf琲ウ7y(ュヲコ?,アH????ラcュS昴Qm.? ・|喟p??\r,wK-ワカアーェ?H?iG&頌eョ6ゥ亘チ<7o>ヌ?錘OッJ?-ム3SN?<ンヤカkm{?;I良Hタ?__スbヒゥZ蒙Y齲イサ)ツ?dヲ?^V,靭◎眈?\0zウ・ニ71%?7チIi%ト7\r ?t??uラマフw?ヨ未ヨ荳+?:fオ依リ?,Sハ\\r?]ラ_]ラ/&)oi\Zc%FY??篤Mヘe 儿ナt?コ涎Nカ+&?\\olゥ亰q\r@?ヘ0tユウFシ?~テ?*ヌQ・マツ3l喜,ソ┐P?/qK擽7Xキ貅キ@$エ裲?ラ?<梛ゥ???\0Q\'S弁S?6W^蛩糺ャョ@?tケ0ニj?ィ?8滯慶ヒAh特$e」?6シ、}:茅j\n\0租ygSスuュレ.ルCmカZ?3hカ??H・eSコ8 ?K??ぬワケ??吏旭aヌBキ―濶h屁ィ゚??ラM謗:r脯??桟摂テ~ハ?P^d艪5ム=リエmョ?ソ躡?ム???モカ1gqヨウ??+ケSキ%<6揃???6)オmEムsG }ク\rケ渠詞??9セ鐡?7pqY(?8膩レ?ラ~楫Z?qkyツw7?Q沙Xハ\r?ョキ?0Eャェ+臟?剋?フヲO>--d邉ヌゥ?2;3o縊ケ?\0ョウ7ゥ績?&ヨAツ?\n\0コ皰匆シRヌQ撞]&Mムxル?\nCow|nヨFハ ?跡_6ヤv曾ルャ?c?N??+,サ?/,??ツ6?ウt?;?z]Y[;? ーG Cァュ/( レ休計゚*5ハ{・Cwヒ$F耄}?81VQ3鋲iァc・Qセロ?饂t?9z?+ネ婬?K夢Hュ預?N必?紹アw?>??(Bヒowl\"F#?\0?Drァφ?トq?we\'褂?!\"9q?;。ラマ_?.5?fM?9 Yノik)9ォ泌\nュアn?ネ??3?aタア?6ユヌ-\n\0(\0??韲SFNrF?トヒ[i?+o。?シfウヌr?nX??%モtD」ノ#U崙ナ劵R_\\ト寿Q蜩ナacUU? LHQ熾z?5\0Rdョ.螻箪t??Ne?ュ:I?$C? ?/ュヲC{qツノ「]G!ル:?=*??T*ソr?7瞳エ?!?\0?\r闢?スMUJO○Hニ?レ!テ4鯨,?\rC\0n?{囚?ュ9}<カ?ナケ3ハd.イ? ?詈ョfngv=IョL跏?)\0(\0??\n\0?エn :?)??9n?5fγワnヨッ7メrミ?類コpヘ ゚f/(レp\\GトHノ2ー>?P「lmウハォト?:ュトぼ 梯?J?tKwhー?<1ラAコ囹+g8?m&ノ_[ォ\"?域?@:衍^アレキツ\"フw??ョヘvd??1?7s/ニG????Sヤテ\Zャ|ソ??Ck}?5ト?フ?H?逋斟ヒRk跏?掖?\0P@\0\0P@l2鱗?ウケ?/?=?*セ\Z恊篳、2リ?マZkRC&ソス?ムォ無?(婚ボZ?2コOt_氣O??{^ミ?iS潜?ラハノ&RXムコ??コメス\\?\0\nK?。エW框n%i\'大遜ウアb~讓懷7rv5t?\0P@\0?ル?リ??\0JFIF\0\0p\0p\0\0??ヤPhotoshop 3.0\08BIM?\nPrint Info\0\0\0\0x\0\0P\0H\0H\0\0\0\0レ(?????FP\0(?\0\0P\0H\0H\0\0\0\0レ(\0\0\0\0\0d\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\0d\0\0\0\0\0\0\"r\0\0\0\0\0\0\0\0\0\0\0\0?|\0\0\08BIM?\nResolution\0\0\0\0\0pU?\0\0\0pU?\0\08BIM\rFX Global Lighting Angle\0\0\0\0\0\0\0x8BIMFX Global Altitude\0\0\0\0\0\0\08BIM? Print Flags\0\0\0 \0\0\0\0\0\0\0\0\08BIM\nCopyright Flag\0\0\0\0\0\08BIM\'Japanese Print Flags\0\0\0\0\n\0\0\0\0\0\0\0\08BIM?Color Halftone Settings\0\0\0H\0/ff\0\0lff\0\0\0\0\0\0\0/ff\0\0。劒\0\0\0\0\0\0\02\0\0\0\0Z\0\0\0\0\0\0\0\0\05\0\0\0\0-\0\0\0\0\0\0\0\08BIM?Color Transfer Settings\0\0\0p\0\0???????????????????????\0\0\0\0???????????????????????\0\0\0\0???????????????????????\0\0\0\0???????????????????????\0\08BIM\0 Layer State\0\0\0\08BIM Layer Groups\0\0\0\0\0\0\0\08BIMGuges\0\0\0\0\0\0\0\0\0@\0\0@\0\0\0\08BIM\rURL overrges\0\0\0\0\0\0\08BIM\ZSlices\0\0\0\0u\0\0\0\0\0\0\0\0\0\0\0\0\0I\0\0:\0\0\0\n\0U\0n\0t\0i\0t\0l\0e\0d\0-\01\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\0I\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\08BIMICC Untagged Flag\0\0\0\08BIMLayer g Generator Base\0\0\0\0\0\08BIM New Windows Thumbnail\0\0i\0\0\0\0\0\0m\0\0\0p\0\0H\0\0準\0\0M\0\0?リ??\0JFIF\0\0H\0H\0\0??\0Adobe\0d?\0\0\0?ロ\0?\0    \n    \r \r\r   ?タ\0\0p\0m\"\0?ン\0\0?ト?\0\0\0\0\0\0\0\0\0\0 \n \0\0\0\0\0\0\0\0\0 \n \0 3\0!1AQa\"q?2贈アB#$Rチb34rびC%担??s5「イ?&D典dEツ」t6メU稙??モu胚F\'筈?米ヤ蔬・オナユ襄Vfv?ヲカニヨ踐7GWgw?ァキヌラ銷\05\0!1AQaq\"2¢。アB#チRム?3$b疵rCScs4?%「イ?&5ツメD典」dEU6te糘ウ?モu胚F筈?米ヤ蔬・オナユ襄Vfv?ヲカニヨ踐\'7GWgw?ァキヌ?レ\0 \0\0?\0?棚%)$瞳施セ$如$ミユK#總詁ヌゥヨv?4?\09htタaマ\0サ?\"G??ヒr較C}:?p-?? ロ?コカヨヨツウW?ミヲaトォ?Tアチ?[ワ$1マ?;?=M?\0Sz?K+ネヘv7?\rkェタツキ\Zソエu~ョX?)ニdエリO?oルV=゚G~マエ_?オd?k゙ハ?ァ\0レワ?゚T?\06ラ?サcツ;gモ???\0捍チ ィ?.?/?};ヘ驀G\0掌綺@q??!、?\0!?\0A?\0ルUWゥラ泅レヘoヌeマ oョ[I??\0Kヤkッヌオ?\0顆SアSホ?ミz・/ネヌe?2ンKャ?p栽ハニe?+ル??Sル??\0「z旨スl~ン? ロ? -ウミコ拾ネ贐??2.ェヨ条納?G??\0テW[ヨz??4)RI$ぁ?ミ?棚%( +kヲtフ鶴PQaモqqc?4{セ林k9ヒ????0?&&ミ?N??ラt?,ャ蹶Xkヌア?{ -cA?M熟?5ユキ?z櫃モVーヌ?洽゚Oワヌ?=g?/URハヲ?ュfMfbメ磅ナ ャカ楠ネソ?5ケセ槎カモ???\0癡Iメコ?ネ髦ヨ覿f(#?}?ト跟ル?ャ?w?ムソモウ?ム???v;ヨチオホ] 植?藷キロ^Ulリ???/]カ穴゙?1ョ。??珠Rヨ゙ロ\'cュカヲ\nw?ケカS???ョハ?Eネ???ヤZヒ1?ロ} ?ホトホニwキf]{ソG^レ?z?o?アB2ンhkMWテサ讖+G?撥n?曝ワテ-sH゚]オサMユロ[嫺ネUユZ7Uョヤケ?ム??鋳扨&Nリ\'ケ?ヤ鍜魁w*uーn?]T\r?オ淑?$ク?fミラ7ヤc?\0yt}Cュ袗?1q@shs境hv?z孀??\0en??,w?ッ?」ッ「8モ壙*ュヌ!平ク・ーb?娩w?Os??Fマム・e猷cア囘;壑mdl斟m?;cン[?/?\0セ#L?。?ス|?フヘ_r?8Xzォ*}?:嗅ー1??Xラナフヌタニgカラロ?9セッゥ?\r?\0・?\0エ?ネ鶚?ラ}?冐熊スレ2キ?\0Hォ.カサラ9?}麟~;?\0M??c2?ツqエ7?潟*8囚キ!?oァ?oィ?イ-g?/ムォ4?\n??ノキカケ?譱#}5;e?愧_レ3=oァ??ッ^7?iオ7?$欅??音yカゥ?モ?カャ[Csキt惘Uョゥ盻ョウ.キリ鍄?[= }oNヒ?\0]c瞠Kz?ォゥヤ?gィ?UfツK?マ?eサ~ム]_ヲ?\0ョ.?蹠wNテヲ?ォ?/sンー争?zuz椏Y?エウラゥ?灌渭ェ[コSウ歉妻ッn;\0ュカ今?/;娟F0?nヘソ、ルウラ?% ゙ウ\"b}<]o??4コユトoLヌ鶚?゙?PキOx?{hヌョ媼??\00バ?」ヨサ゚mヨzカ*NCァ釁FV17aneu=ミ甼⊥霽;lnラ2?ス椚Lコレoッ?ッ?g+7\"囿?カ貂3=ト青\0凡旌3u?種?2ヨl?Oユ?wセーcgt??マQヌョヌオ?.ャセニ揮羞☆5;布゚ヲキ?Y?漆鯏 ア0D?猖ラd=ッ?ハ黨ケ.ムc?ウpSNwレュ}クケ/kw??0セラ?%jcgソェcX猝ワヒ+s宜?8Xハ??62?+}ウgモカェスOラ=5ホu゙?:eュネ\ru廟Xイ?‡{ナgルeyt\r布V^マ輌滌?>ロ遣疼ヌa粭z?,uホ~8pュ?;Vオマヌ,?>Eフゥ?ェソE努鬩ア?\0h???゚Tンh\\ョス9焦n].uァモ檎ニ? ッァ~ンヘk?゚窓m蘗?ョ*絽ァgbキォ瞼uュ]オ゙>?盟???b?ョs=?J?\0@シナVヒ2タ恕D瘻>・(゙テ???メ?lfオマ?乍謔ャaV?.kZメO.0??U;UY?\Zヨ勿!?2v4{ルイカYオロ?\0孕ルウ?%kVェq?[疫m」ォオ孀mリ1?Fュ?xル?葆ヲ??\'g」岨。?2\rュk麒ュフ,徒[シケム鎹?\0ヘネキ?m?\0カ?oP鰈Tハ\0qスオ脆?bルッ{,?抔ア??\0驃e溂テ \0 ?ラ?ュ\\テ○?遊^?ッ、?メipp;墮?;ヌ?W頷d?g?=OO*玄ドゥ湲「シ7ソォEwQeV9ユケヘ?メicソAk-v?ッモ゚K?=フ」\"ォQユ?2コ?、ローuzE\rカヒ^X??dンヒ-ホェヲ葫fCG?M゚ヘ??、}\\鎔mYY8ュキ エ?S菜ニ輅o「イ广?~マユi?\0??斬DフqkF#cテ?F=?9xKォu:e?ラ??゙?9^?s ?サ\rモ掌黔m?%ヨzy??\0ミセ、?Gゥ6ヨ9?コハZ?E>テキ}u?際ン?写キ?夛?gイ岸VXス諂ク?-眩」??bヨ゚Iセマ詼??%K究?<_bエキ?埠{i,wWスケCa^ラnネユeエ?[V58孺v[?滯+VF5 4クヤlク5桾ヤ=???67ワ??}ャ゚些オ[??ア?~ュu?シャォZ?ロリ貶?~?\"ュソ、ェ暄z~ァゥ^?・Vーヘ?\'?4裔ス?ツ彑?lォh・マゥ?;ムv-98エワ/輌ス\\ed?濱モキ?゚Xu4レ?堯ヤャ餾.-ョ?U_Pメ證ッ?eiッゥUo?Isラ奧ュ?\'ヤロカt?スF螺}ceャ蘭?イ粐?レ?^ョP?t??E>ァ? フスZ?\0iz゚狄}?\0ル゚サ?・Vホ}X藥?\r[??、?モ?gァ絹nム、チU八vロ\Z?\n~#S?ァアトs鯔\Zォs??「/hー;?{~??\0戀}5スメュ フソxn59、ヨラオサ儼Sbレ唳_VMァェ湲?zヤャN鰐ヒゥ師エリテ゚^゙??\0嫐1]ッィ〔1ヘ[リ?ム]ャ?ミ踰ユ?7モイ溽jアZ4t:iH/W??K?趾サ*ラ萬亭ケ???゚Eソ」ァ?+A9?3W??-キa\rn-lvリoィ??5lウ?ヤdア?~C゚?/?s?/ヌaョヌ}攴wロUチヨ5ュl>テ^c?Tキ?敷ト>。メ?〃^$c}ュフウkエワZ=wャ?櫃メァユソ? ゚層」?鬲F\":?リォa?サ=クュ#サ%ホ\Z・チョ?-オ]1?7~潮??sユコ・ヨロ_Rチ?/ヌ}oェ\Zリ??ッ「ニ\rヘケ崟???Dケl?bレ?? YcY?#齲=@マルマソk,セロ\\ヌ?ヨソ?ャY鹽;wャKウ1ウ N、\n,ャ蜥稷ウヤォu\'リ觴k况~NGゥ風m゙ュ」Sルメ#?ナGッ?-?黙ケク]5ンUナュソ ?スメ $幀ナョノ?-wゥ嬾+?\'ァイ?ム??\0Hシ。v゚Zz摧taステ?=Jヘト5?~ォS゙?9?\0ス?「゚ム??Oァ~粐U\\?ツ?サ!?x???ヤ?棚%;?\0W?siq頃茸W]メ~゚c橄ィ?ケ残壙\Zツ?モcイア゙ヘロ??ァ?\0 j?{?6イチ???:Sェハ?゙3?x~??Zキqツ?%?? ニゥニfニ;Hun-2;?3w?)ct?ョカロ?x??ー?\0Snサ?K崕?ニ?\0チウ??,Aナハ脊O Gツナァコ?ロZ*kXK????#ャ暉セ滓11H鳧ー媾?5ラY苗nュ・ニヌス?.ロ足鬮ヨgゥ霍? ?\Zムイメ^粫?ヌ5?\rレ7サw??Mャ?クhc???.コri}9X?ァ毳.」yam剤?;=ロ^?點?\0ェラ?ulメ?.ナ7 l2\\6=OEホ;_eロh?ヨ?\0?F?チ帯ヘ、9セオU]kタ.ァヤカ」ス7゙1ルgヲ?+Cゥeカタモモ?ユ?\09n鷽メ賻ヘ???フ??? ヲフWキhリモVネ:?}.ヌpワ??\0チ?筰G%lA?GJiソ ヤ」モ・?ケチ?カ?O」?策佞イ?KV゚?棯ニヒ、Znサ+モヌツヌk[殯陽UヤX?アョsr22.?q*?騷>ァァ?奇Q?8ツム拘ル鶸%ル蒙レェ゚セ?^ラ=エZ釋F?MY??ン?拗モモ?)鮑sー4m>]?ラ\r?ルスフナァ?[??後F?ィ4tr?Yソュu;s?嫋 「親オTチイ??嬌?=?組、牒f??ユ?棚%)Yチホサ\n疇gOホネU誰血M?>?>ー3%セメ ウク?メ緘オワ? ニX?璋8オテPF???k??\r.mタ~?3?s テ$%ソ、?\0ヘFッッラ?1ッ?)リ?,}6リ?4ミ\\[?w?モシ~ムワユ覽?\0?丸?kワ8\"ヌ?饉?1コ?3V;G????ゥ+?錠゚チO。eGャ鍄釀k6??\'鏝[ォ/??\'ャ?a?6ァcfワ?8z亰サヤハーク?.ゥニャ*?゚Sラネョ??モ?\06シ?\0;?ヨ ヨコキe\Z)x!ユcオエエν閹>ニ?\0ニス??#oQHェ搦サ?+ォE聞、mナェaロdT??\0?ヲ{+?o埴K緒鷙アメIC)&メ、棚??ル\08BIM!\ZVersion compatibility info\0\0\0\0U\0\0\0\0\0\0\0A\0d\0o\0b\0e\0 \0P\0h\0o\0t\0o\0s\0h\0o\0p\0\0\0\0A\0d\0o\0b\0e\0 \0P\0h\0o\0t\0o\0s\0h\0o\0p\0 \06\0.\00\0\0\0\08BIM JPEG Quality\0\0\0\0\0\0\0\0\0?ロ\0C\0\n\n\n \n \Z%\Z# , #&\')*)-0-(0%()(?ロ\0C\n\n\n\n(\Z\Z((((((((((((((((((((((((((((((((((((((((((((((((((?タ\0\0x\0u\0?ト\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0?ト\08\0\0\0\0\0\0!1AQ\"aq?2贈ア#BRbムr$3チ盍?ト\0\Z\0\0\0\0\0\0\0\0\0\0\0\0\0?ト\00\0\0\0\0\0\0\0!1\"AQ2aBアムq■チ碵#R??レ\0 \0\0?\0?\0\0P@\0s?7浮ニ護|馬???・sgツルk・ カナヨCヒZ姉カ?ウ_gケラPc?゚P」ュKムノ~%?B,?チケ?%-62r?」胖、zL凶ae鰯9I舵Bャ4Egqqtム\'\Z?\n\0(\0??\n\0(\0?・+?m監スモ? !Oa?->厭Y\n蜥コー?tPa?9?OフラAF+す9ヨ? 厶。控t??>エラ?\n?|?みル篦A」=マ(<フwウ?VMウノマHコヤ{9則1? キ\'}?ヲXR\\イ7?9 v?チハc6XY?ル゚ラ。Jo4?\0?*\\咏{\"シイ介ク~Fサ?6ホ5 窖7?\'ヲ源ヌヌリ{2ケcx、h薈GSヲV\Z ?Xレqtニ8T\0P@\0\0Pカデ& テyW[KァP[袢\\・?8ォ\n」冨宗・?&カ9Q]職c?}シ?骭sv>^T\'\'?!、?1キ?wK+蠏詢C1e?\'ハウK\'?楓%?ネ???)夜繩?レ\r\0ロ」Drニ~=欺八1ゥ~モKsqk!リa4\'G舫躬B榕「クキ\Z?\"rフtャOQ?吊租qak遵?/\ZRフ6_?ネ>エロ??ョ\\オG、bセメ0i廳ォォDciイ愕?\0i?\0!襌Uコス.?kア!橡ナ倆pヘ@\0\0ヌテヨ?「窰?シサ??ワcオ &銚j??;鰍蝣iヤルセロ?*=)蜩消」eナ??..?? P?ノ??o・7?WB?c>S吟??Fミン\\iBコ丞?\0ネ??v?フフr?5,モ%?m停Cッ?シ醂(\'@?ォ・襲坪?3ヒサ*s?フ|エ)ノmvセ2/?髣?B+岻ナ鱠オモ,Χ*VAツ?9F・?\07V燻鬢 d磊Oyサオ?Hタ?7ヨス?td濫績明L」\Zァ$hタC?? >オメーノ%tv肆?Y/mニフ艀?。}\r??)苴j?\0bヲ?%?0メツ,ケ莓Rハニ\'フ@ル\'ッN柆 cI?\'ヒリf琲ウ7y(ュヲコ?,アH????ラcュS昴Qm.? ・|喟p??\r,wK-ワカアーェ?H?iG&頌eョ6ゥ亘チ<7o>ヌ?錘OッJ?-ム3SN?<ンヤカkm{?;I良Hタ?__スbヒゥZ蒙Y齲イサ)ツ?dヲ?^V,靭◎眈?\0zウ・ニ71%?7チIi%ト7\r ?t??uラマフw?ヨ未ヨ荳+?:fオ依リ?,Sハ\\r?]ラ_]ラ/&)oi\Zc%FY??篤Mヘe 儿ナt?コ涎Nカ+&?\\olゥ亰q\r@?ヘ0tユウFシ?~テ?*ヌQ・マツ3l喜,ソ┐P?/qK擽7Xキ貅キ@$エ裲?ラ?<梛ゥ???\0Q\'S弁S?6W^蛩糺ャョ@?tケ0ニj?ィ?8滯慶ヒAh特$e」?6シ、}:茅j\n\0租ygSスuュレ.ルCmカZ?3hカ??H・eSコ8 ?K??ぬワケ??吏旭aヌBキ―濶h屁ィ゚??ラM謗:r脯??桟摂テ~ハ?P^d艪5ム=リエmョ?ソ躡?ム???モカ1gqヨウ??+ケSキ%<6揃???6)オmEムsG }ク\rケ渠詞??9セ鐡?7pqY(?8膩レ?ラ~楫Z?qkyツw7?Q沙Xハ\r?ョキ?0Eャェ+臟?洽゚Oワヌ?=g?/URハヲ?ュfMfbメ磅ナ ャカ楠ネソ?5ケセ槎カモ???\0癡Iメコ?ネ髦ヨ覿f(#?}?ト跟ル?ャ?w?ムソモウ?ム???v;ヨチオホ] 植?藷キロ^Ulリ???/]カ穴゙?1ョ。??珠Rヨ゙ロ\'cュカヲ\nw?ケカS???ョハ?Eネ???ヤZヒ1?ロ} ?ホトホニwキf]{ソG^レ?z?o?アB2ンhkMWテサ讖+G?撥n?曝ワテ-sH゚]オサMユロ[嫺ネUユZ7Uョヤケ?ム??鋳扨&Nリ\'ケ?ヤ鍜魁w*uーn?]T\r?オ淑?$ク?fミラ7ヤc?\0yt}Cュ袗?1q@shs境hv?z孀??\0en??,w?ッ?」ッ「8モ壙*ュヌ!平ク・ーb?娩w?Os??Fマム・e猷cア囘;壑mdl斟m?;cン[?/?\0セ#L?。?ス|?フヘ_r?8Xzォ*}?:嗅ー1??Xラナフヌタニgカラロ?9セッゥ?\r?\0・?\0エ?ネ鶚?ラ}?冐熊スレ2キ?\0Hォ.カサラ9?}麟~;?\0M??c2?ツqエ7?潟*8囚キ!?oァ?oィ?イ-g?/ムォ4?\n??ノキカケ?譱#}5;e?愧_レ3=oァ??ッ^7?iオ7?$欅??音yカゥ?モ?カャ[Csキt惘Uョゥ盻ョウ.キリ鍄?[= }oNヒ?\0]c瞠Kz?ォゥヤ?gィ?UfツK?マ?eサ~ム]_ヲ?\0ョ.?蹠wNテヲ?ォ?/sンー争?zuz椏Y?エウラゥ?灌渭ェ[コSウ歉妻ッn;\0ュカ今?/;娟F0?nヘソ、ルウラ?% ゙ウ\"b}<]o??4コユトoLヌ鶚?゙?PキOx?{hヌョ媼??\00バ?」ヨサ゚mヨzカ*NCァ釁FV17aneu=ミ甼⊥霽;lnラ2?ス椚Lコレoッ?ッ?g+7\"囿?カ貂3=ト青\0凡旌3u?種?2ヨl?Oユ?wセーcgt??マQヌョヌオ?.ャセニ揮羞☆5;布゚ヲキ?Y?漆鯏 ア0D?猖ラd=ッ?ハ黨ケ.ムc?ウpSNwレュ}クケ/kw??0セラ?%jcgソェcX猝ワヒ+s宜?8Xハ??62?+}ウgモカェスOラ=5ホu゙?:eュネ\ru廟Xイ?‡{ナgルeyt\r布V^マ輌滌?>ロ遣疼ヌa粭z?,uホ~8pュ?;Vオマヌ,?>Eフゥ?ェソE努鬩ア?\0h???゚Tンh\\ョス9焦n].uァモ檎ニ? ッァ~ンヘk?゚窓m蘗?ョ*絽ァgbキォ瞼uュ]オ゙>?盟???b?ョs=?J?\0@シナVヒ2タ恕D瘻>・(゙テ???メ?lfオマ?乍謔ャaV?.kZメO.0??U;UY?\Zヨ勿!?2v4{ルイカYオロ?\0孕ルウ?%kVェq?[疫m」ォオ孀mリ1?Fュ?xル?葆ヲ??\'g」岨。?2\rュk麒ュフ,徒[シケム鎹?\0ヘネキ?m?\0カ?oP鰈Tハ\0qスオ脆?bルッ{,?抔ア??\0驃e溂テ \0 ?ラ?ュ\\テ○?遊^?ッ、?メipp;墮?;ヌ?W頷d?g?=OO*玄ドゥ湲「シ7ソォEwQeV9ユケヘ?メicソAk-v?ッモ゚K?=フ」\"ォQユ?2コ?、ローuzE\rカヒ^X??dンヒ-ホェヲ葫fCG?M゚ヘ??、}\\鎔mYY8ュキ エ?S菜ニ輅o「イ广?~マユi?\0??斬DフqkF#cテ?F=?9xKォu:e?ラ??゙?9^?s ?サ\rモ掌黔m?%ヨzy??\0ミセ、?Gゥ6ヨ9?コハZ?E>テキ}u?際ン?写キ?夛?gイ岸VXス諂ク?-眩」??bヨ゚Iセマ詼??%K究?<_bエキ?埠{i,wWスケCa^ラnネユeエ?[V58孺v[?滯+VF5 4クヤlク5桾ヤ=???67ワ??}ャ゚些オ[??ア?~ュu?シャォZ?ロリ貶?~?\"ュソ、ェ暄z~ァゥ^?・Vーヘ?\'?4裔ス?ツ彑?lォh・マゥ?;ムv-98エワ/輌ス\\ed?濱モキ?゚Xu4レ?堯ヤャ餾.-ョ?U_Pメ證ッ?eiッゥUo?Isラ奧ュ?\'ヤロカt?スF螺}ceャ蘭?イ粐?レ?^ョP?t??E>ァ? フスZ?\0iz゚狄}?\0ル゚サ?・Vホ}X藥?\r[??、?モ?gァ絹nム、チU八vロ\Z?\n~#S?ァアトs鯔\Zォs??「/hー;?{~??\0戀}5スメュ フソxn59、ヨラオサ儼Sbレ唳_VMァェ湲?zヤャN鰐ヒゥ師エリテ゚^゙??\0嫐1]ッィ〔1ヘ[リ?ム]ャ?ミ踰ユ?7モイ溽jアZ4t:iH/W??K?趾サ*ラ萬亭ケ???゚Eソ」ァ?+A9?3W??-キa\rn-lvリoィ??5lウ?ヤdア?~C゚?/?s?/ヌaョヌ}攴wロUチヨ5ュl>テ^c?Tキ?敷ト>。メ?〃^$c}ュフウkエワZ=wャ?櫃メァユソ? ゚層」?鬲F\":?リォa?サ=クュ#サ%ホ\Z・チョ?-オ]1?7~潮??sユコ・ヨロ_Rチ?/ヌ}oェ\Zリ??ッ「ニ\rヘケ崟???Dケl?bレ?? YcY?#齲=@マルマソk,セロ\\ヌ?ヨソ?ャY鹽;wャKウ1ウ N、\n,ャ蜥稷ウヤォu\'リ觴k况~NGゥ風m゙ュ」Sルメ#?ナGッ?-?黙ケク]5ンUナュソ ?スメ $幀ナョノ?-wゥ嬾+?\'ァイ?ム??\0Hシ。v゚Zz摧taステ?=Jヘト5?~ォS゙?9?\0ス?「゚ム??Oァ~粐U\\?ツ?サ!?x???ヤ?棚%;?\0W?siq頃茸W]メ~゚c橄ィ?ケ残壙\Zツ?モcイア゙ヘロ??ァ?\0 j?{?6イチ???:Sェハ?゙3?x~??Zキqツ?%?? ニゥニfニ;Hun-2;?3w?)ct?ョカロ?x??ー?\0Snサ?K崕?ニ?\0チウ??,Aナハ脊O Gツナァコ?ロZ*kXK????#ャ暉セ滓11H鳧ー媾?5ラY苗nュ・ニヌス?.ロ足鬮ヨgゥ霍? ?\Zムイメ^粫?ヌ5?\rレ7サw??Mャ?クhc???.コri}9X?ァ毳.」yam剤?;=ロ^?點?\0ェラ?ulメ?.ナ7 l2\\6=OEホ;_eロh?ヨ?\0?F?チ帯ヘ、9セオU]kタ.ァヤカ」ス7゙1ルgヲ?+Cゥeカタモモ?ユ?\09n鷽メ賻ヘ???フ??? ヲフWキhリモVネ:?}.ヌpワ??\0チ?筰G%lA?GJiソ ヤ」モ・?ケチ?カ?O」?策佞イ?KV゚?棯ニヒ、Znサ+モヌツヌk[殯陽UヤX?アョsr22.?q*?騷>ァァ?奇Q?8ツム拘ル鶸%ル蒙レェ゚セ?^ラ=エZ釋F?MY??ン?拗モモ?)鮑sー4m>]?ラ\r?ルスフナァ?[??後F?ィ4tr?Yソュu;s?嫋 「親オTチイ??嬌?=?組、牒f??ユ?棚%)Yチホサ\n疇gOホネU誰血M?>?>ー3%セメ ウク?メ緘オワ? ニX?璋8オテPF???k??\r.mタ~?3?s テ$%ソ、?\0ヘFッッラ?1ッ?)リ?,}6リ?4ミ\\[?w?モシ~ムワユ覽?\0?丸?kワ8\"ヌ?饉?1コ?3V;G????ゥ+?錠゚チO。eGャ鍄釀k6??\'鏝[ォ/??\'ャ?a?6ァcfワ?8z亰サヤハーク?.ゥニャ*?゚Sラネョ??モ?\06シ?\0;?ヨ ヨコキe\Z)x!ユcオエエν閹>ニ?\0ニス??#oQHェ搦サ?+ォE聞、mナェaロdT??\0?ヲ{+?o埴K緒鷙アメIC)&メ、棚??ル\08BIM!\ZVersion compatibility info\0\0\0\0U\0\0\0\0\0\0\0A\0d\0o\0b\0e\0 \0P\0h\0o\0t\0o\0s\0h\0o\0p\0\0\0\0A\0d\0o\0b\0e\0 \0P\0h\0o\0t\0o\0s\0h\0o\0p\0 \06\0.\00\0\0\0\08BIM JPEG Quality\0\0\0\0\0\0\0\0\0?ロ\0C\0\n\n\n \n \Z%\Z# , #&\')*)-0-(0%()(?ロ\0C\n\n\n\n(\Z\Z((((((((((((((((((((((((((((((((((((((((((((((((((?タ\0\0x\0u\0?ト\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0?ト\08\0\0\0\0\0\0!1AQ\"aq?2贈ア#BRbムr$3チ盍?ト\0\Z\0\0\0\0\0\0\0\0\0\0\0\0\0?ト\00\0\0\0\0\0\0\0!1\"AQ2aBアムq■チ碵#R??レ\0 \0\0?\0?\0\0P@\0s?7浮ニ護|馬???・sgツルk・ カナヨCヒZ姉カ?ウ_gケラPc?゚P」ュKムノ~%?B,?チケ?%-62r?」胖、zL凶ae鰯9I舵Bャ4Egqqtム\'\Z?\n\0(\0??\n\0(\0?・+?m監スモ? !Oa?->厭Y\n蜥コー?tPa?9?OフラAF+す9ヨ? 厶。控t??>エラ?\n?|?みル篦A」=マ(<フwウ?VMウノマHコヤ{9則1? キ\'}?ヲXR\\イ7?9 v?チハc6XY?ル゚ラ。Jo4?\0?*\\咏{\"シイ介ク~Fサ?6ホ5 窖7?\'ヲ源ヌヌリ{2ケcx、h薈GSヲV\Z ?Xレqtニ8T\0P@\0\0Pカデ& テyW[KァP[袢\\・?8ォ\n」冨宗・?&カ9Q]職c?}シ?骭sv>^T\'\'?!、?1キ?wK+蠏詢C1e?\'ハウK\'?楓%?ネ???)夜繩?レ\r\0ロ」Drニ~=欺八1ゥ~モKsqk!リa4\'G舫躬B榕「クキ\Z?\"rフtャOQ?吊租qak遵?/\ZRフ6_?ネ>エロ??ョ\\オG、bセメ0i廳ォォDciイ愕?\0i?\0!襌Uコス.?kア!橡ナ倆pヘ@\0\0ヌテヨ?「窰?シサ??ワcオ &銚j??;鰍蝣iヤルセロ?*=)蜩消」eナ??..?? P?ノ??o・7?WB?c>S吟??Fミン\\iBコ丞?\0ネ??v?フフr?5,モ%?m停Cッ?シ醂(\'@?ォ・襲坪?3ヒサ*s?フ|エ)ノmvセ2/?髣?B+岻ナ鱠オモ,Χ*VAツ?9F・?\07V燻鬢 d磊Oyサオ?Hタ?7ヨス?td濫績明L」\Zァ$hタC?? >オメーノ%tv肆?Y/mニフ艀?。}\r??)苴j?\0bヲ?%?0メツ,ケ莓Rハニ\'フ@ル\'ッN柆 cI?\'ヒリf琲ウ7y(ュヲコ?,アH????ラcュS昴Qm.? ・|喟p??\r,wK-ワカアーェ?H?iG&頌eョ6ゥ亘チ<7o>ヌ?錘OッJ?-ム3SN?<ンヤカkm{?;I良Hタ?__スbヒゥZ蒙Y齲イサ)ツ?dヲ?^V,靭◎眈?\0zウ・ニ71%?7チIi%ト7\r ?t??uラマフw?ヨ未ヨ荳+?:fオ依リ?,Sハ\\r?]ラ_]ラ/&)oi\Zc%FY??篤Mヘe 儿ナt?コ涎Nカ+&?\\olゥ亰q\r@?ヘ0tユウFシ?~テ?*ヌQ・マツ3l喜,ソ┐P?/qK擽7Xキ貅キ@$エ裲?ラ?<梛ゥ???\0Q\'S弁S?6W^蛩糺ャョ@?tケ0ニj?ィ?8滯慶ヒAh特$e」?6シ、}:茅j\n\0租ygSスuュレ.ルCmカZ?3hカ??H・eSコ8 ?K??ぬワケ??吏旭aヌBキ―濶h屁ィ゚??ラM謗:r脯??桟摂テ~ハ?P^d艪5ム=リエmョ?ソ躡?ム???モカ1gqヨウ??+ケSキ%<6揃???6)オmEムsG }ク\rケ渠詞??9セ鐡?7pqY(?8膩レ?ラ~楫Z?qkyツw7?Q沙Xハ\r?ョキ?0Eャェ+臟?剋?フヲO>--d邉ヌゥ?2;3o縊ケ?\0ョウ7ゥ績?&ヨAツ?\n\0コ皰匆シRヌQ撞]&Mムxル?\nCow|nヨFハ ?跡_6ヤv曾ルャ?c?N??+,サ?/,??ツ6?ウt?;?z]Y[;? ーG Cァュ/( レ休計゚*5ハ{・Cwヒ$F耄}?81VQ3鋲iァc・Qセロ?饂t?9z?+ネ婬?K夢Hュ預?N必?紹アw?>??(Bヒowl\"F#?\0?Drァφ?トq?we\'褂?!\"9q?;。ラマ_?.5?fM?9 Yノik)9ォ泌\nュアn?ネ??3?aタア?6ユヌ-\n\0(\0??韲SFNrF?トヒ[i?+o。?シfウヌr?nX??%モtD」ノ#U崙ナ劵R_\\ト寿Q蜩ナacUU? LHQ熾z?5\0Rdョ.螻箪t??Ne?ュ:I?$C? ?/ュヲC{qツノ「]G!ル:?=*??T*ソr?7瞳エ?!?\0?\r闢?スMUJO○Hニ?レ!テ4鯨,?\rC\0n?{囚?ュ9}<カ?ナケ3ハd.イ? ?詈ョfngv=IョL跏?)\0(\0??\n\0?エn :?)??9n?5fγワnヨッ7メrミ?類コpヘ ゚f/(レp\\GトHノ2ー>?P「lmウハォト?:ュトぼ 梯?J?tKwhー?<1ラAコ囹+g8?m&ノ_[ォ\"?域?@:衍^アレキツ\"フw??ョヘvd??1?7s/ニG????Sヤテ\Zャ|ソ??Ck}?5ト?フ?H?逋斟ヒRk跏?掖?\0P@\0\0P@l2鱗?ウケ?/?=?*セ\Z恊篳、2リ?マZkRC&ソス?ムォ無?(婚ボZ?2コOt_氣O??{^ミ?iS潜?ラハノ&RXムコ??コメス\\?\0\nK?。エW框n%i\'大遜ウアb~讓懷7rv5t?\0P@\0?ル?リ??\0JFIF\0\0p\0p\0\0??ヤPhotoshop 3.0\08BIM?\nPrint Info\0\0\0\0x\0\0P\0H\0H\0\0\0\0レ(?????FP\0(?\0\0P\0H\0H\0\0\0\0レ(\0\0\0\0\0d\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\0d\0\0\0\0\0\0\"r\0\0\0\0\0\0\0\0\0\0\0\0?|\0\0\08BIM?\nResolution\0\0\0\0\0pU?\0\0\0pU?\0\08BIM\rFX Global Lighting Angle\0\0\0\0\0\0\0x8BIMFX Global Altitude\0\0\0\0\0\0\08BIM? Print Flags\0\0\0 \0\0\0\0\0\0\0\0\08BIM\nCopyright Flag\0\0\0\0\0\08BIM\'Japanese Print Flags\0\0\0\0\n\0\0\0\0\0\0\0\08BIM?Color Halftone Settings\0\0\0H\0/ff\0\0lff\0\0\0\0\0\0\0/ff\0\0。劒\0\0\0\0\0\0\02\0\0\0\0Z\0\0\0\0\0\0\0\0\05\0\0\0\0-\0\0\0\0\0\0\0\08BIM?Color Transfer Settings\0\0\0p\0\0???????????????????????\0\0\0\0???????????????????????\0\0\0\0???????????????????????\0\0\0\0???????????????????????\0\08BIM\0 Layer State\0\0\0\08BIM Layer Groups\0\0\0\0\0\0\0\08BIMGuges\0\0\0\0\0\0\0\0\0@\0\0@\0\0\0\08BIM\rURL overrges\0\0\0\0\0\0\08BIM\ZSlices\0\0\0\0u\0\0\0\0\0\0\0\0\0\0\0\0\0I\0\0:\0\0\0\n\0U\0n\0t\0i\0t\0l\0e\0d\0-\01\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\0I\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\08BIMICC Untagged Flag\0\0\0\08BIMLayer g Generator Base\0\0\0\0\0\08BIM New Windows Thumbnail\0\0i\0\0\0\0\0\0m\0\0\0p\0\0H\0\0準\0\0M\0\0?リ??\0JFIF\0\0H\0H\0\0??\0Adobe\0d?\0\0\0?ロ\0?\0    \n    \r \r\r   ?タ\0\0p\0m\"\0?ン\0\0?ト?\0\0\0\0\0\0\0\0\0\0 \n \0\0\0\0\0\0\0\0\0 \n \0 3\0!1AQa\"q?2贈アB#$Rチb34rびC%担??s5「イ?&D典dEツ」t6メU稙??モu胚F\'筈?米ヤ蔬・オナユ襄Vfv?ヲカニヨ踐7GWgw?ァキヌラ銷\05\0!1AQaq\"2¢。アB#チRム?3$b疵rCScs4?%「イ?&5ツメD典」dEU6te糘ウ?モu胚F筈?米ヤ蔬・オナユ襄Vfv?ヲカニヨ踐\'7GWgw?ァキヌ?レ\0 \0\0?\0?棚%)$瞳施セ$如$ミユK#總詁ヌゥヨv?4?\09htタaマ\0サ?\"G??ヒr較C}:?p-?? ロ?コカヨヨツウW?ミヲaトォ?Tアチ?[ワ$1マ?;?=M?\0Sz?K+ネヘv7?\rkェタツキ\Zソエu~ョX?)ニdエリO?oルV=゚G~マエ_?オd?k゙ハ?ァ\0レワ?゚T?\06ラ?サcツ;gモ???\0捍チ ィ?.?/?};ヘ驀G\0掌綺@q??!、?\0!?\0A?\0ルUWゥラ泅レヘoヌeマ oョ[I??\0Kヤkッヌオ?\0顆SアSホ?ミz・/ネヌe?2ンKャ?p栽ハニe?+ル??Sル??\0「z旨スl~ン? ロ? -ウミコ拾ネ贐??2.ェヨ条納?G??\0テW[ヨz??4)RI$ぁ?ミ?棚%( +kヲtフ鶴PQaモqqc?4{セ林k9ヒ????0?&&ミ?N??ラt?,ャ蹶Xkヌア?{ -cA?M熟?5ユキ?z櫃モVーヌ?洽゚Oワヌ?=g?/URハヲ?ュfMfbメ磅ナ ャカ楠ネソ?5ケセ槎カモ???\0癡Iメコ?ネ髦ヨ覿f(#?}?ト跟ル?ャ?w?ムソモウ?ム???v;ヨチオホ] 植?藷キロ^Ulリ???/]カ穴゙?1ョ。??珠Rヨ゙ロ\'cュカヲ\nw?ケカS???ョハ?Eネ???ヤZヒ1?ロ} ?ホトホニwキf]{ソG^レ?z?o?アB2ンhkMWテサ讖+G?撥n?曝ワテ-sH゚]オサMユロ[嫺ネUユZ7Uョヤケ?ム??鋳扨&Nリ\'ケ?ヤ鍜魁w*uーn?]T\r?オ淑?$ク?fミラ7ヤc?\0yt}Cュ袗?1q@shs境hv?z孀??\0en??,w?ッ?」ッ「8モ壙*ュヌ!平ク・ーb?娩w?Os??Fマム・e猷cア囘;壑mdl斟m?;cン[?/?\0セ#L?。?ス|?フヘ_r?8Xzォ*}?:嗅ー1??Xラナフヌタニgカラロ?9セッゥ?\r?\0・?\0エ?ネ鶚?ラ}?冐熊スレ2キ?\0Hォ.カサラ9?}麟~;?\0M??c2?ツqエ7?潟*8囚キ!?oァ?oィ?イ-g?/ムォ4?\n??ノキカケ?譱#}5;e?愧_レ3=oァ??ッ^7?iオ7?$欅??音yカゥ?モ?カャ[Csキt惘Uョゥ盻ョウ.キリ鍄?[= }oNヒ?\0]c瞠Kz?ォゥヤ?gィ?UfツK?マ?eサ~ム]_ヲ?\0ョ.?蹠wNテヲ?ォ?/sンー争?zuz椏Y?エウラゥ?灌渭ェ[コSウ歉妻ッn;\0ュカ今?/;娟F0?nヘソ、ルウラ?% ゙ウ\"b}<]o??4コユトoLヌ鶚?゙?PキOx?{hヌョ媼??\00バ?」ヨサ゚mヨzカ*NCァ釁FV17aneu=ミ甼⊥霽;lnラ2?ス椚Lコレoッ?ッ?g+7\"囿?カ貂3=ト青\0凡旌3u?種?2ヨl?Oユ?wセーcgt??マQヌョヌオ?.ャセニ揮羞☆5;布゚ヲキ?Y?漆鯏 ア0D?猖ラd=ッ?ハ黨ケ.ムc?ウpSNwレュ}クケ/kw??0セラ?%jcgソェcX猝ワヒ+s宜?8Xハ??62?+}ウgモカェスOラ=5ホu゙?:eュネ\ru廟Xイ?‡{ナgルeyt\r布V^マ輌滌?>ロ遣疼ヌa粭z?,uホ~8pュ?;Vオマヌ,?>Eフゥ?ェソE努鬩ア?\0h???゚Tンh\\ョス9焦n].uァモ檎ニ? ッァ~ンヘk?゚窓m蘗?ョ*絽ァgbキォ瞼uュ]オ゙>?盟???b?ョs=?J?\0@シナVヒ2タ恕D瘻>・(゙テ???メ?lfオマ?乍謔ャaV?.kZメO.0??U;UY?\Zヨ勿!?2v4{ルイカYオロ?\0孕ルウ?%kVェq?[疫m」ォオ孀mリ1?Fュ?xル?葆ヲ??\'g」岨。?2\rュk麒ュフ,徒[シケム鎹?\0ヘネキ?m?\0カ?oP鰈Tハ\0qスオ脆?bルッ{,?抔ア??\0驃e溂テ \0 ?ラ?ュ\\テ○?遊^?ッ、?メipp;墮?;ヌ?W頷d?g?=OO*玄ドゥ湲「シ7ソォEwQeV9ユケヘ?メicソAk-v?ッモ゚K?=フ」\"ォQユ?2コ?、ローuzE\rカヒ^X??dンヒ-ホェヲ葫fCG?M゚ヘ??、}\\鎔mYY8ュキ エ?S菜ニ輅o「イ广?~マユi?\0??斬DフqkF#cテ?F=?9xKォu:e?ラ??゙?9^?s ?サ\rモ掌黔m?%ヨzy??\0ミセ、?Gゥ6ヨ9?コハZ?E>テキ}u?際ン?写キ?夛?gイ岸VXス諂ク?-眩」??bヨ゚Iセマ詼??%K究?<_bエキ?埠{i,wWスケCa^ラnネユeエ?[V58孺v[?滯+VF5 4クヤlク5桾ヤ=???67ワ??}ャ゚些オ[??ア?~ュu?シャォZ?ロリ貶?~?\"ュソ、ェ暄z~ァゥ^?・Vーヘ?\'?4裔ス?ツ彑?lォh・マゥ?;ムv-98エワ/輌ス\\ed?濱モキ?゚Xu4レ?堯ヤャ餾.-ョ?U_Pメ證ッ?eiッゥUo?Isラ奧ュ?\'ヤロカt?スF螺}ceャ蘭?イ粐?レ?^ョP?t??E>ァ? フスZ?\0iz゚狄}?\0ル゚サ?・Vホ}X藥?\r[??、?モ?gァ絹nム、チU八vロ\Z?\n~#S?ァアトs鯔\Zォs??「/hー;?{~??\0戀}5スメュ フソxn59、ヨラオサ儼Sbレ唳_VMァェ湲?zヤャN鰐ヒゥ師エリテ゚^゙??\0嫐1]ッィ〔1ヘ[リ?ム]ャ?ミ踰ユ?7モイ溽jアZ4t:iH/W??K?趾サ*ラ萬亭ケ???゚Eソ」ァ?+A9?3W??-キa\rn-lvリoィ??5lウ?ヤdア?~C゚?/?s?/ヌaョヌ}攴wロUチヨ5ュl>テ^c?Tキ?敷ト>。メ?〃^$c}ュフウkエワZ=wャ?櫃メァユソ? ゚層」?鬲F\":?リォa?サ=クュ#サ%ホ\Z・チョ?-オ]1?7~潮??sユコ・ヨロ_Rチ?/ヌ}oェ\Zリ??ッ「ニ\rヘケ崟???Dケl?bレ?? YcY?#齲=@マルマソk,セロ\\ヌ?ヨソ?ャY鹽;wャKウ1ウ N、\n,ャ蜥稷ウヤォu\'リ觴k况~NGゥ風m゙ュ」Sルメ#?ナGッ?-?黙ケク]5ンUナュソ ?スメ $幀ナョノ?-wゥ嬾+?\'ァイ?ム??\0Hシ。v゚Zz摧taステ?=Jヘト5?~ォS゙?9?\0ス?「゚ム??Oァ~粐U\\?ツ?サ!?x???ヤ?棚%;?\0W?siq頃茸W]メ~゚c橄ィ?ケ残壙\Zツ?モcイア゙ヘロ??ァ?\0 j?{?6イチ???:Sェハ?゙3?x~??Zキqツ?%?? ニゥニfニ;Hun-2;?3w?)ct?ョカロ?x??ー?\0Snサ?K崕?ニ?\0チウ??,Aナハ脊O Gツナァコ?ロZ*kXK????#ャ暉セ滓11H鳧ー媾?5ラY苗nュ・ニヌス?.ロ足鬮ヨgゥ霍? ?\Zムイメ^粫?ヌ5?\rレ7サw??Mャ?クhc???.コri}9X?ァ毳.」yam剤?;=ロ^?點?\0ェラ?ulメ?.ナ7 l2\\6=OEホ;_eロh?ヨ?\0?F?チ帯ヘ、9セオU]kタ.ァヤカ」ス7゙1ルgヲ?+Cゥeカタモモ?ユ?\09n鷽メ賻ヘ???フ??? ヲフWキhリモVネ:?}.ヌpワ??\0チ?筰G%lA?GJiソ ヤ」モ・?ケチ?カ?O」?策佞イ?KV゚?棯ニヒ、Znサ+モヌツヌk[殯陽UヤX?アョsr22.?q*?騷>ァァ?奇Q?8ツム拘ル鶸%ル蒙レェ゚セ?^ラ=エZ釋F?MY??ン?拗モモ?)鮑sー4m>]?ラ\r?ルスフナァ?[??後F?ィ4tr?Yソュu;s?嫋 「親オTチイ??嬌?=?組、牒f??ユ?棚%)Yチホサ\n疇gOホネU誰血M?>?>ー3%セメ ウク?メ緘オワ? ニX?璋8オテPF???k??\r.mタ~?3?s テ$%ソ、?\0ヘFッッラ?1ッ?)リ?,}6リ?4ミ\\[?w?モシ~ムワユ覽?\0?丸?kワ8\"ヌ?饉?1コ?3V;G????ゥ+?錠゚チO。eGャ鍄釀k6??\'鏝[ォ/??\'ャ?a?6ァcfワ?8z亰サヤハーク?.ゥニャ*?゚Sラネョ??モ?\06シ?\0;?ヨ ヨコキe\Z)x!ユcオエエν閹>ニ?\0ニス??#oQHェ搦サ?+ォE聞、mナェaロdT??\0?ヲ{+?o埴K緒鷙アメIC)&メ、棚??ル\08BIM!\ZVersion compatibility info\0\0\0\0U\0\0\0\0\0\0\0A\0d\0o\0b\0e\0 \0P\0h\0o\0t\0o\0s\0h\0o\0p\0\0\0\0A\0d\0o\0b\0e\0 \0P\0h\0o\0t\0o\0s\0h\0o\0p\0 \06\0.\00\0\0\0\08BIM JPEG Quality\0\0\0\0\0\0\0\0\0?ロ\0C\0\n\n\n \n \Z%\Z# , #&\')*)-0-(0%()(?ロ\0C\n\n\n\n(\Z\Z((((((((((((((((((((((((((((((((((((((((((((((((((?タ\0\0x\0u\0?ト\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0?ト\08\0\0\0\0\0\0!1AQ\"aq?2贈ア#BRbムr$3チ盍?ト\0\Z\0\0\0\0\0\0\0\0\0\0\0\0\0?ト\00\0\0\0\0\0\0\0!1\"AQ2aBアムq■チ碵#R??レ\0 \0\0?\0?\0\0P@\0s?7浮ニ護|馬???・sgツルk・ カナヨCヒZ姉カ?ウ_gケラPc?゚P」ュKムノ~%?B,?チケ?%-62r?」胖、zL凶ae鰯9I舵Bャ4Egqqtム\'\Z?\n\0(\0??\n\0(\0?・+?m監スモ? !Oa?->厭Y\n蜥コー?tPa?9?OフラAF+す9ヨ? 厶。控t??>エラ?\n?|?みル篦A」=マ(<フwウ?VMウノマHコヤ{9則1? キ\'}?ヲXR\\イ7?9 v?チハc6XY?ル゚ラ。Jo4?\0?*\\咏{\"シイ介ク~Fサ?6ホ5 窖7?\'ヲ源ヌヌリ{2ケcx、h薈GSヲV\Z ?Xレqtニ8T\0P@\0\0Pカデ& テyW[KァP[袢\\・?8ォ\n」冨宗・?&カ9Q]職c?}シ?骭sv>^T\'\'?!、?1キ?wK+蠏詢C1e?\'ハウK\'?楓%?ネ???)夜繩?レ\r\0ロ」Drニ~=欺八1ゥ~モKsqk!リa4\'G舫躬B榕「クキ\Z?\"rフtャOQ?吊租qak遵?/\ZRフ6_?ネ>エロ??ョ\\オG、bセメ0i廳ォォDciイ愕?\0i?\0!襌Uコス.?kア!橡ナ倆pヘ@\0\0ヌテヨ?「窰?シサ??ワcオ &銚j??;鰍蝣iヤルセロ?*=)蜩消」eナ??..?? P?ノ??o・7?WB?c>S吟??Fミン\\iBコ丞?\0ネ??v?フフr?5,モ%?m停Cッ?シ醂(\'@?ォ・襲坪?3ヒサ*s?フ|エ)ノmvセ2/?髣?B+岻ナ鱠オモ,Χ*VAツ?9F・?\07V燻鬢 d磊Oyサオ?Hタ?7ヨス?td濫績明L」\Zァ$hタC?? >オメーノ%tv肆?Y/mニフ艀?。}\r??)苴j?\0bヲ?%?0メツ,ケ莓Rハニ\'フ@ル\'ッN柆 cI?\'ヒリf琲ウ7y(ュヲコ?,アH????ラcュS昴Qm.? ・|喟p??\r,wK-ワカアーェ?H?iG&頌eョ6ゥ亘チ<7o>ヌ?錘OッJ?-ム3SN?<ンヤカkm{?;I良Hタ?__スbヒゥZ蒙Y齲イサ)ツ?dヲ?^V,靭◎眈?\0zウ・ニ71%?7チIi%ト7\r ?t??uラマフw?ヨ未ヨ荳+?:fオ依リ?,Sハ\\r?]ラ_]ラ/&)oi\Zc%FY??篤Mヘe 儿ナt?コ涎Nカ+&?\\olゥ亰q\r@?ヘ0tユウFシ?~テ?*ヌQ・マツ3l喜,ソ┐P?/qK擽7Xキ貅キ@$エ裲?ラ?<梛ゥ???\0Q\'S弁S?6W^蛩糺ャョ@?tケ0ニj?ィ?8滯慶ヒAh特$e」?6シ、}:茅j\n\0租ygSスuュレ.ルCmカZ?3hカ??H・eSコ8 ?K??ぬワケ??吏旭aヌBキ―濶h屁ィ゚??ラM謗:r脯??桟摂テ~ハ?P^d艪5ム=リエmョ?ソ躡?ム???モカ1gqヨウ??+ケSキ%<6揃???6)オmEムsG }ク\rケ渠詞??9セ鐡?7pqY(?8膩レ?ラ~楫Z?qkyツw7?Q沙Xハ\r?ョキ?0Eャェ+臟?剋?フヲO>--d邉ヌゥ?2;3o縊ケ?\0ョウ7ゥ績?&ヨAツ?\n\0コ皰匆シRヌQ撞]&Mムxル?\nCow|nヨFハ ?跡_6ヤv曾ルャ?c?N??+,サ?/,??ツ6?ウt?;?z]Y[;? ーG Cァュ/( レ休計゚*5ハ{・Cwヒ$F耄}?81VQ3鋲iァc・Qセロ?饂t?9z?+ネ婬?K夢Hュ預?N必?紹アw?>??(Bヒowl\"F#?\0?Drァφ?トq?we\'褂?!\"9q?;。ラマ_?.5?fM?9 Yノik)9ォ泌\nュアn?ネ??3?aタア?6ユヌ-\n\0(\0??韲SFNrF?トヒ[i?+o。?シfウヌr?nX??%モtD」ノ#U崙ナ劵R_\\ト寿Q蜩ナacUU? LHQ熾z?5\0Rdョ.螻箪t??Ne?ュ:I?$C? ?/ュヲC{qツノ「]G!ル:?=*??T*ソr?7瞳エ?!?\0?\r闢?スMUJO○Hニ?レ!テ4鯨,?\rC\0n?{囚?ュ9}<カ?ナケ3ハd.イ? ?詈ョfngv=IョL跏?)\0(\0??\n\0?エn :?)??9n?5fγワnヨッ7メrミ?類コpヘ ゚f/(レp\\GトHノ2ー>?P「lmウハォト?:ュトぼ 梯?J?tKwhー?<1ラAコ囹+g8?m&ノ_[ォ\"?域?@:衍^アレキツ\"フw??ョヘvd??1?7s/ニG????Sヤテ\Zャ|ソ??Ck}?5ト?フ?H?逋斟ヒRk跏?掖?\0P@\0\0P@l2鱗?ウケ?/?=?*セ\Z恊篳、2リ?マZkRC&ソス?ムォ無?(婚ボZ?2コOt_氣O??{^ミ?iS潜?ラハノ&RXムコ??コメス\\?\0\nK?。エW框n%i\'大遜ウアb~讓懷7rv5t?\0P@\0?ル?リ??\0JFIF\0\0p\0p\0\0??ヤPhotoshop 3.0\08BIM?\nPrint Info\0\0\0\0x\0\0P\0H\0H\0\0\0\0レ(?????FP\0(?\0\0P\0H\0H\0\0\0\0レ(\0\0\0\0\0d\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\0d\0\0\0\0\0\0\"r\0\0\0\0\0\0\0\0\0\0\0\0?|\0\0\08BIM?\nResolution\0\0\0\0\0pU?\0\0\0pU?\0\08BIM\rFX Global Lighting Angle\0\0\0\0\0\0\0x8BIMFX Global Altitude\0\0\0\0\0\0\08BIM? Print Flags\0\0\0 \0\0\0\0\0\0\0\0\08BIM\nCopyright Flag\0\0\0\0\0\08BIM\'Japanese Print Flags\0\0\0\0\n\0\0\0\0\0\0\0\08BIM?Color Halftone Settings\0\0\0H\0/ff\0\0lff\0\0\0\0\0\0\0/ff\0\0。劒\0\0\0\0\0\0\02\0\0\0\0Z\0\0\0\0\0\0\0\0\05\0\0\0\0-\0\0\0\0\0\0\0\08BIM?Color Transfer Settings\0\0\0p\0\0???????????????????????\0\0\0\0???????????????????????\0\0\0\0???????????????????????\0\0\0\0???????????????????????\0\08BIM\0 Layer State\0\0\0\08BIM Layer Groups\0\0\0\0\0\0\0\08BIMGuges\0\0\0\0\0\0\0\0\0@\0\0@\0\0\0\08BIM\rURL overrges\0\0\0\0\0\0\08BIM\ZSlices\0\0\0\0u\0\0\0\0\0\0\0\0\0\0\0\0\0I\0\0:\0\0\0\n\0U\0n\0t\0i\0t\0l\0e\0d\0-\01\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\0I\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\08BIMICC Untagged Flag\0\0\0\08BIMLayer g Generator Base\0\0\0\0\0\08BIM New Windows Thumbnail\0\0i\0\0\0\0\0\0m\0\0\0p\0\0H\0\0準\0\0M\0\0?リ??\0JFIF\0\0H\0H\0\0??\0Adobe\0d?\0\0\0?ロ\0?\0    \n    \r \r\r   ?タ\0\0p\0m\"\0?ン\0\0?ト?\0\0\0\0\0\0\0\0\0\0 \n \0\0\0\0\0\0\0\0\0 \n \0 3\0!1AQa\"q?2贈アB#$Rチb34rびC%担??s5「イ?&D典dEツ」t6メU稙??モu胚F\'筈?米ヤ蔬・オナユ襄Vfv?ヲカニヨ踐7GWgw?ァキヌラ銷\05\0!1AQaq\"2¢。アB#チRム?3$b疵rCScs4?%「イ?&5ツメD典」dEU6te糘ウ?モu胚F筈?米ヤ蔬・オナユ襄Vfv?ヲカニヨ踐\'7GWgw?ァキヌ?レ\0 \0\0?\0?棚%)$瞳施セ$如$ミユK#總詁ヌゥヨv?4?\09htタaマ\0サ?\"G??ヒr較C}:?p-?? ロ?コカヨヨツウW?ミヲaトォ?Tアチ?[ワ$1マ?;?=M?\0Sz?K+ネヘv7?\rkェタツキ\Zソエu~ョX?)ニdエリO?oルV=゚G~マエ_?オd?k゙ハ?ァ\0レワ?゚T?\06ラ?サcツ;gモ???\0捍チ ィ?.?/?};ヘ驀G\0掌綺@q??!、?\0!?\0A?\0ルUWゥラ泅レヘoヌeマ oョ[I??\0Kヤkッヌオ?\0顆SアSホ?ミz・/ネヌe?2ンKャ?p栽ハニe?+ル??Sル??\0「z旨スl~ン? ロ? -ウミコ拾ネ贐??2.ェヨ条納?G??\0テW[ヨz??4)RI$ぁ?ミ?棚%( +kヲtフ鶴PQaモqqc?4{セ林k9ヒ????0?&&ミ?N??ラt?,ャ蹶Xkヌア?{ -cA?M熟?5ユキ?z櫃モVーヌ?洽゚Oワヌ?=g?/URハヲ?ュfMfbメ磅ナ ャカ楠ネソ?5ケセ槎カモ???\0癡Iメコ?ネ髦ヨ覿f(#?}?ト跟ル?ャ?w?ムソモウ?ム???v;ヨチオホ] 植?藷キロ^Ulリ???/]カ穴゙?1ョ。??珠Rヨ゙ロ\'cュカヲ\nw?ケカS???ョハ?Eネ???ヤZヒ1?ロ} ?ホトホニwキf]{ソG^レ?z?o?アB2ンhkMWテサ讖+G?撥n?曝ワテ-sH゚]オサMユロ[嫺ネUユZ7Uョヤケ?ム??鋳扨&Nリ\'ケ?ヤ鍜魁w*uーn?]T\r?オ淑?$ク?fミラ7ヤc?\0yt}Cュ袗?1q@shs境hv?z孀??\0en??,w?ッ?」ッ「8モ壙*ュヌ!平ク・ーb?娩w?Os??Fマム・e猷cア囘;壑mdl斟m?;cン[?/?\0セ#L?。?ス|?フヘ_r?8Xzォ*}?:嗅ー1??Xラナフヌタニgカラロ?9セッゥ?\r?\0・?\0エ?ネ鶚?ラ}?冐熊スレ2キ?\0Hォ.カサラ9?}麟~;?\0M??c2?ツqエ7?潟*8囚キ!?oァ?oィ?イ-g?/ムォ4?\n??ノキカケ?譱#}5;e?愧_レ3=oァ??ッ^7?iオ7?$欅??音yカゥ?モ?カャ[Csキt惘Uョゥ盻ョウ.キリ鍄?[= }oNヒ?\0]c瞠Kz?ォゥヤ?gィ?UfツK?マ?eサ~ム]_ヲ?\0ョ.?蹠wNテヲ?ォ?/sンー争?zuz椏Y?エウラゥ?灌渭ェ[コSウ歉妻ッn;\0ュカ今?/;娟F0?nヘソ、ルウラ?% ゙ウ\"b}<]o??4コユトoLヌ鶚?゙?PキOx?{hヌョ媼??\00バ?」ヨサ゚mヨzカ*NCァ釁FV17aneu=ミ甼⊥霽;lnラ2?ス椚Lコレoッ?ッ?g+7\"囿?カ貂3=ト青\0凡旌3u?種?2ヨl?Oユ?wセーcgt??マQヌョヌオ?.ャセニ揮羞☆5;布゚ヲキ?Y?漆鯏 ア0D?猖ラd=ッ?ハ黨ケ.ムc?ウpSNwレュ}クケ/kw??0セラ?%jcgソェcX猝ワヒ+s宜?8Xハ??62?+}ウgモカェスOラ=5ホu゙?:eュネ\ru廟Xイ?‡{ナgルeyt\r布V^マ輌滌?>ロ遣疼ヌa粭z?,uホ~8pュ?;Vオマヌ,?>Eフゥ?ェソE努鬩ア?\0h???゚Tンh\\ョス9焦n].uァモ檎ニ? ッァ~ンヘk?゚窓m蘗?ョ*絽ァgbキォ瞼uュ]オ゙>?盟???b?ョs=?J?\0@シナVヒ2タ恕D瘻>・(゙テ???メ?lfオマ?乍謔ャaV?.kZメO.0??U;UY?\Zヨ勿!?2v4{ルイカYオロ?\0孕ルウ?%kVェq?[疫m」ォオ孀mリ1?Fュ?xル?葆ヲ??\'g」岨。?2\rュk麒ュフ,徒[シケム鎹?\0ヘネキ?m?\0カ?oP鰈Tハ\0qスオ脆?bルッ{,?抔ア??\0驃e溂テ \0 ?ラ?ュ\\テ○?遊^?ッ、?メipp;墮?;ヌ?W頷d?g?=OO*玄ドゥ湲「シ7ソォEwQeV9ユケヘ?メicソAk-v?ッモ゚K?=フ」\"ォQユ?2コ?、ローuzE\rカヒ^X??dンヒ-ホェヲ葫fCG?M゚ヘ??、}\\鎔mYY8ュキ エ?S菜ニ輅o「イ广?~マユi?\0??斬DフqkF#cテ?F=?9xKォu:e?ラ??゙?9^?s ?サ\rモ掌黔m?%ヨzy??\0ミセ、?Gゥ6ヨ9?コハZ?E>テキ}u?際ン?写キ?夛?gイ岸VXス諂ク?-眩」??bヨ゚Iセマ詼??%K究?<_bエキ?埠{i,wWスケCa^ラnネユeエ?[V58孺v[?滯+VF5 4クヤlク5桾ヤ=???67ワ??}ャ゚些オ[??ア?~ュu?シャォZ?ロリ貶?~?\"ュソ、ェ暄z~ァゥ^?・Vーヘ?\'?4裔ス?ツ彑?lォh・マゥ?;ムv-98エワ/輌ス\\ed?濱モキ?゚Xu4レ?堯ヤャ餾.-ョ?U_Pメ證ッ?eiッゥUo?Isラ奧ュ?\'ヤロカt?スF螺}ceャ蘭?イ粐?レ?^ョP?t??E>ァ? フスZ?\0iz゚狄}?\0ル゚サ?・Vホ}X藥?\r[??、?モ?gァ絹nム、チU八vロ\Z?\n~#S?ァアトs鯔\Zォs??「/hー;?{~??\0戀}5スメュ フソxn59、ヨラオサ儼Sbレ唳_VMァェ湲?zヤャN鰐ヒゥ師エリテ゚^゙??\0嫐1]ッィ〔1ヘ[リ?ム]ャ?ミ踰ユ?7モイ溽jアZ4t:iH/W??K?趾サ*ラ萬亭ケ???゚Eソ」ァ?+A9?3W??-キa\rn-lvリoィ??5lウ?ヤdア?~C゚?/?s?/ヌaョヌ}攴wロUチヨ5ュl>テ^c?Tキ?敷ト>。メ?〃^$c}ュフウkエワZ=wャ?櫃メァユソ? ゚層」?鬲F\":?リォa?サ=クュ#サ%ホ\Z・チョ?-オ]1?7~潮??sユコ・ヨロ_Rチ?/ヌ}oェ\Zリ??ッ「ニ\rヘケ崟???Dケl?bレ?? YcY?#齲=@マルマソk,セロ\\ヌ?ヨソ?ャY鹽;wャKウ1ウ N、\n,ャ蜥稷ウヤォu\'リ觴k况~NGゥ風m゙ュ」Sルメ#?ナGッ?-?黙ケク]5ンUナュソ ?スメ $幀ナョノ?-wゥ嬾+?\'ァイ?ム??\0Hシ。v゚Zz摧taステ?=Jヘト5?~ォS゙?9?\0ス?「゚ム??Oァ~粐U\\?ツ?サ!?x???ヤ?棚%;?\0W?siq頃茸W]メ~゚c橄ィ?ケ残壙\Zツ?モcイア゙ヘロ??ァ?\0 j?{?6イチ???:Sェハ?゙3?x~??Zキqツ?%?? ニゥニfニ;Hun-2;?3w?)ct?ョカロ?x??ー?\0Snサ?K崕?ニ?\0チウ??,Aナハ脊O Gツナァコ?ロZ*kXK????#ャ暉セ滓11H鳧ー媾?5ラY苗nュ・ニヌス?.ロ足鬮ヨgゥ霍? ?\Zムイメ^粫?ヌ5?\rレ7サw??Mャ?クhc???.コri}9X?ァ毳.」yam剤?;=ロ^?點?\0ェラ?ulメ?.ナ7 l2\\6=OEホ;_eロh?ヨ?\0?F?チ帯ヘ、9セオU]kタ.ァヤカ」ス7゙1ルgヲ?+Cゥeカタモモ?ユ?\09n鷽メ賻ヘ???フ??? ヲフWキhリモVネ:?}.ヌpワ??\0チ?筰G%lA?GJiソ ヤ」モ・?ケチ?カ?O」?策佞イ?KV゚?棯ニヒ、Znサ+モヌツヌk[殯陽UヤX?アョsr22.?q*?騷>ァァ?奇Q?8ツム拘ル鶸%ル蒙レェ゚セ?^ラ=エZ釋F?MY??ン?拗モモ?)鮑sー4m>]?ラ\r?ルスフナァ?[??後F?ィ4tr?Yソュu;s?嫋 「親オTチイ??嬌?=?組、牒f??ユ?棚%)Yチホサ\n疇gOホネU誰血M?>?>ー3%セメ ウク?メ緘オワ? ニX?璋8オテPF???k??\r.mタ~?3?s テ$%ソ、?\0ヘFッッラ?1ッ?)リ?,}6リ?4ミ\\[?w?モシ~ムワユ覽?\0?丸?kワ8\"ヌ?饉?1コ?3V;G????ゥ+?錠゚チO。eGャ鍄釀k6??\'鏝[ォ/??\'ャ?a?6ァcfワ?8z亰サヤハーク?.ゥニャ*?゚Sラネョ??モ?\06シ?\0;?ヨ ヨコキe\Z)x!ユcオエエν閹>ニ?\0ニス??#oQHェ搦サ?+ォE聞、mナェaロdT??\0?ヲ{+?o埴K緒鷙アメIC)&メ、棚??ル\08BIM!\ZVersion compatibility info\0\0\0\0U\0\0\0\0\0\0\0A\0d\0o\0b\0e\0 \0P\0h\0o\0t\0o\0s\0h\0o\0p\0\0\0\0A\0d\0o\0b\0e\0 \0P\0h\0o\0t\0o\0s\0h\0o\0p\0 \06\0.\00\0\0\0\08BIM JPEG Quality\0\0\0\0\0\0\0\0\0?ロ\0C\0\n\n\n \n \Z%\Z# , #&\')*)-0-(0%()(?ロ\0C\n\n\n\n(\Z\Z((((((((((((((((((((((((((((((((((((((((((((((((((?タ\0\0x\0u\0?ト\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0?ト\08\0\0\0\0\0\0!1AQ\"aq?2贈ア#BRbムr$3チ盍?ト\0\Z\0\0\0\0\0\0\0\0\0\0\0\0\0?ト\00\0\0\0\0\0\0\0!1\"AQ2aBアムq■チ碵#R??レ\0 \0\0?\0?\0\0P@\0s?7浮ニ護|馬???・sgツルk・ カナヨCヒZ姉カ?ウ_gケラPc?゚P」ュKムノ~%?B,?チケ?%-62r?」胖、zL凶ae鰯9I舵Bャ4Egqqtム\'\Z?\n\0(\0??\n\0(\0?・+?m監スモ? !Oa?->厭Y\n蜥コー?tPa?9?OフラAF+す9ヨ? 厶。控t??>エラ?\n?|?みル篦A」=マ(<フwウ?VMウノマHコヤ{9則1? キ\'}?ヲXR\\イ7?9 v?チハc6XY?ル゚ラ。Jo4?\0?*\\咏{\"シイ介ク~Fサ?6ホ5 窖7?\'ヲ源ヌヌリ{2ケcx、h薈GSヲV\Z ?Xレqtニ8T\0P@\0\0Pカデ& テyW[KァP[袢\\・?8ォ\n」冨宗・?&カ9Q]職c?}シ?骭sv>^T\'\'?!、?1キ?wK+蠏詢C1e?\'ハウK\'?楓%?ネ???)夜繩?レ\r\0ロ」Drニ~=欺八1ゥ~モKsqk!リa4\'G舫躬B榕「クキ\Z?\"rフtャOQ?吊租qak遵?/\ZRフ6_?ネ>エロ??ョ\\オG、bセメ0i廳ォォDciイ愕?\0i?\0!襌Uコス.?kア!橡ナ倆pヘ@\0\0ヌテヨ?「窰?シサ??ワcオ &銚j??;鰍蝣iヤルセロ?*=)蜩消」eナ??..?? P?ノ??o・7?WB?c>S吟??Fミン\\iBコ丞?\0ネ??v?フフr?5,モ%?m停Cッ?シ醂(\'@?ォ・襲坪?3ヒサ*s?フ|エ)ノmvセ2/?髣?B+岻ナ鱠オモ,Χ*VAツ?9F・?\07V燻鬢 d磊Oyサオ?Hタ?7ヨス?td濫績明L」\Zァ$hタC?? >オメーノ%tv肆?Y/mニフ艀?。}\r??)苴j?\0bヲ?%?0メツ,ケ莓Rハニ\'フ@ル\'ッN柆 cI?\'ヒリf琲ウ7y(ュヲコ?,アH????ラcュS昴Qm.? ・|喟p??\r,wK-ワカアーェ?H?iG&頌eョ6ゥ亘チ<7o>ヌ?錘OッJ?-ム3SN?<ンヤカkm{?;I良Hタ?__スbヒゥZ蒙Y齲イサ)ツ?dヲ?^V,靭◎眈?\0zウ・ニ71%?7チIi%ト7\r ?t??uラマフw?ヨ未ヨ荳+?:fオ依リ?,Sハ\\r?]ラ_]ラ/&)oi\Zc%FY??篤Mヘe 儿ナt?コ涎Nカ+&?\\olゥ亰q\r@?ヘ0tユウFシ?~テ?*ヌQ・マツ3l喜,ソ┐P?/qK擽7Xキ貅キ@$エ裲?ラ?<梛ゥ???\0Q\'S弁S?6W^蛩糺ャョ@?tケ0ニj?ィ?8滯慶ヒAh特$e」?6シ、}:茅j\n\0租ygSスuュレ.ルCmカZ?3hカ??H・eSコ8 ?K??ぬワケ??吏旭aヌBキ―濶h屁ィ゚??ラM謗:r脯??桟摂テ~ハ?P^d艪5ム=リエmョ?ソ躡?ム???モカ1gqヨウ??+ケSキ%<6揃???6)オmEムsG }ク\rケ渠詞??9セ鐡?7pqY(?8膩レ?ラ~楫Z?qkyツw7?Q沙Xハ\r?ョキ?0Eャェ+臟?剋?フヲO>--d邉ヌゥ?2;3o縊ケ?\0ョウ7ゥ績?&ヨAツ?\n\0コ皰匆シRヌQ撞]&Mムxル?\nCow|nヨFハ ?跡_6ヤv曾ルャ?c?N??+,サ?/,??ツ6?ウt?;?z]Y[;? ーG Cァュ/( レ休計゚*5ハ{・Cwヒ$F耄}?81VQ3鋲iァc・Qセロ?饂t?9z?+ネ婬?K夢Hュ預?N必?紹アw?>??(Bヒowl\"F#?\0?Drァφ?トq?we\'褂?!\"9q?;。ラマ_?.5?fM?9 Yノik)9ォ泌\nュアn?ネ??3?aタア?6ユヌ-\n\0(\0??韲SFNrF?トヒ[i?+o。?シfウヌr?nX??%モtD」ノ#U崙ナ劵R_\\ト寿Q蜩ナacUU? LHQ熾z?5\0Rdョ.螻箪t??Ne?ュ:I?$C? ?/ュヲC{qツノ「]G!ル:?=*??T*ソr?7瞳エ?!?\0?\r闢?スMUJO○Hニ?レ!テ4鯨,?\rC\0n?{囚?ュ9}<カ?ナケ3ハd.イ? ?詈ョfngv=IョL跏?)\0(\0??\n\0?エn :?)??9n?5fγワnヨッ7メrミ?類コpヘ ゚f/(レp\\GトHノ2ー>?P「lmウハォト?:ュトぼ 梯?J?tKwhー?<1ラAコ囹+g8?m&ノ_[ォ\"?域?@:衍^アレキツ\"フw??ョヘvd??1?7s/ニG????Sヤテ\Zャ|ソ??Ck}?5ト?フ?H?逋斟ヒRk跏?掖?\0P@\0\0P@l2鱗?ウケ?/?=?*セ\Z恊篳、2リ?マZkRC&ソス?ムォ無?(婚ボZ?2コOt_氣O??{^ミ?iS潜?ラハノ&RXムコ??コメス\\?\0\nK?。エW框n%i\'大遜ウアb~讓懷7rv5t?\0P@\0?ル?リ??\0JFIF\0\0p\0p\0\0??ヤPhotoshop 3.0\08BIM?\nPrint Info\0\0\0\0x\0\0P\0H\0H\0\0\0\0レ(?????FP\0(?\0\0P\0H\0H\0\0\0\0レ(\0\0\0\0\0d\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\0d\0\0\0\0\0\0\"r\0\0\0\0\0\0\0\0\0\0\0\0?|\0\0\08BIM?\nResolution\0\0\0\0\0pU?\0\0\0pU?\0\08BIM\rFX Global Lighting Angle\0\0\0\0\0\0\0x8BIMFX Global Altitude\0\0\0\0\0\0\08BIM? Print Flags\0\0\0 \0\0\0\0\0\0\0\0\08BIM\nCopyright Flag\0\0\0\0\0\08BIM\'Japanese Print Flags\0\0\0\0\n\0\0\0\0\0\0\0\08BIM?Color Halftone Settings\0\0\0H\0/ff\0\0lff\0\0\0\0\0\0\0/ff\0\0。劒\0\0\0\0\0\0\02\0\0\0\0Z\0\0\0\0\0\0\0\0\05\0\0\0\0-\0\0\0\0\0\0\0\08BIM?Color Transfer Settings\0\0\0p\0\0???????????????????????\0\0\0\0???????????????????????\0\0\0\0???????????????????????\0\0\0\0???????????????????????\0\08BIM\0 Layer State\0\0\0\08BIM Layer Groups\0\0\0\0\0\0\0\08BIMGuges\0\0\0\0\0\0\0\0\0@\0\0@\0\0\0\08BIM\rURL overrges\0\0\0\0\0\0\08BIM\ZSlices\0\0\0\0u\0\0\0\0\0\0\0\0\0\0\0\0\0I\0\0:\0\0\0\n\0U\0n\0t\0i\0t\0l\0e\0d\0-\01\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\0I\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\08BIMICC Untagged Flag\0\0\0\08BIMLayer g Generator Base\0\0\0\0\0\08BIM New Windows Thumbnail\0\0i\0\0\0\0\0\0m\0\0\0p\0\0H\0\0準\0\0M\0\0?リ??\0JFIF\0\0H\0H\0\0??\0Adobe\0d?\0\0\0?ロ\0?\0    \n    \r \r\r   ?タ\0\0p\0m\"\0?ン\0\0?ト?\0\0\0\0\0\0\0\0\0\0 \n \0\0\0\0\0\0\0\0\0 \n \0 3\0!1AQa\"q?2贈アB#$Rチb34rびC%担??s5「イ?&D典dEツ」t6メU稙??モu胚F\'筈?米ヤ蔬・オナユ襄Vfv?ヲカニヨ踐7GWgw?ァキヌラ銷\05\0!1AQaq\"2¢。アB#チRム?3$b疵rCScs4?%「イ?&5ツメD典」dEU6te糘ウ?モu胚F筈?米ヤ蔬・オナユ襄Vfv?ヲカニヨ踐\'7GWgw?ァキヌ?レ\0 \0\0?\0?棚%)$瞳施セ$如$ミユK#總詁ヌゥヨv?4?\09htタaマ\0サ?\"G??ヒr較C}:?p-?? ロ?コカヨヨツウW?ミヲaトォ?Tアチ?[ワ$1マ?;?=M?\0Sz?K+ネヘv7?\rkェタツキ\Zソエu~ョX?)ニdエリO?oルV=゚G~マエ_?オd?k゙ハ?ァ\0レワ?゚T?\06ラ?サcツ;gモ???\0捍チ ィ?.?/?};ヘ驀G\0掌綺@q??!、?\0!?\0A?\0ルUWゥラ泅レヘoヌeマ oョ[I??\0Kヤkッヌオ?\0顆SアSホ?ミz・/ネヌe?2ンKャ?p栽ハニe?+ル??Sル??\0「z旨スl~ン? ロ? -ウミコ拾ネ贐??2.ェヨ条納?G??\0テW[ヨz??4)RI$ぁ?ミ?棚%( +kヲtフ鶴PQaモqqc?4{セ林k9ヒ????0?&&ミ?N??ラt?,ャ蹶Xkヌア?{ -cA?M熟?5ユキ?z櫃モVーヌ?洽゚Oワヌ?=g?/URハヲ?ュfMfbメ磅ナ ャカ楠ネソ?5ケセ槎カモ???\0癡Iメコ?ネ髦ヨ覿f(#?}?ト跟ル?ャ?w?ムソモウ?ム???v;ヨチオホ] 植?藷キロ^Ulリ???/]カ穴゙?1ョ。??珠Rヨ゙ロ\'cュカヲ\nw?ケカS???ョハ?Eネ???ヤZヒ1?ロ} ?ホトホニwキf]{ソG^レ?z?o?アB2ンhkMWテサ讖+G?撥n?曝ワテ-sH゚]オサMユロ[嫺ネUユZ7Uョヤケ?ム??鋳扨&Nリ\'ケ?ヤ鍜魁w*uーn?]T\r?オ淑?$ク?fミラ7ヤc?\0yt}Cュ袗?1q@shs境hv?z孀??\0en??,w?ッ?」ッ「8モ壙*ュヌ!平ク・ーb?娩w?Os??Fマム・e猷cア囘;壑mdl斟m?;cン[?/?\0セ#L?。?ス|?フヘ_r?8Xzォ*}?:嗅ー1??Xラナフヌタニgカラロ?9セッゥ?\r?\0・?\0エ?ネ鶚?ラ}?冐熊スレ2キ?\0Hォ.カサラ9?}麟~;?\0M??c2?ツqエ7?潟*8囚キ!?oァ?oィ?イ-g?/ムォ4?\n??ノキカケ?譱#}5;e?愧_レ3=oァ??ッ^7?iオ7?$欅??音yカゥ?モ?カャ[Csキt惘Uョゥ盻ョウ.キリ鍄?[= }oNヒ?\0]c瞠Kz?ォゥヤ?gィ?UfツK?マ?eサ~ム]_ヲ?\0ョ.?蹠wNテヲ?ォ?/sンー争?zuz椏Y?エウラゥ?灌渭ェ[コSウ歉妻ッn;\0ュカ今?/;娟F0?nヘソ、ルウラ?% ゙ウ\"b}<]o??4コユトoLヌ鶚?゙?PキOx?{hヌョ媼??\00バ?」ヨサ゚mヨzカ*NCァ釁FV17aneu=ミ甼⊥霽;lnラ2?ス椚Lコレoッ?ッ?g+7\"囿?カ貂3=ト青\0凡旌3u?種?2ヨl?Oユ?wセーcgt??マQヌョヌオ?.ャセニ揮羞☆5;布゚ヲキ?Y?漆鯏 ア0D?猖ラd=ッ?ハ黨ケ.ムc?ウpSNwレュ}クケ/kw??0セラ?%jcgソェcX猝ワヒ+s宜?8Xハ??62?+}ウgモカェスOラ=5ホu゙?:eュネ\ru廟Xイ?‡{ナgルeyt\r布V^マ輌滌?>ロ遣疼ヌa粭z?,uホ~8pュ?;Vオマヌ,?>Eフゥ?ェソE努鬩ア?\0h???゚Tンh\\ョス9焦n].uァモ檎ニ? ッァ~ンヘk?゚窓m蘗?ョ*絽ァgbキォ瞼uュ]オ゙>?盟???b?ョs=?J?\0@シナVヒ2タ恕D瘻>・(゙テ???メ?lfオマ?乍謔ャaV?.kZメO.0??U;UY?\Zヨ勿!?2v4{ルイカYオロ?\0孕ルウ?%kVェq?[疫m」ォオ孀mリ1?Fュ?xル?葆ヲ??\'g」岨。?2\rュk麒ュフ,徒[シケム鎹?\0ヘネキ?m?\0カ?oP鰈Tハ\0qスオ脆?bルッ{,?抔ア??\0驃e溂テ \0 ?ラ?ュ\\テ○?遊^?ッ、?メipp;墮?;ヌ?W頷d?g?=OO*玄ドゥ湲「シ7ソォEwQeV9ユケヘ?メicソAk-v?ッモ゚K?=フ」\"ォQユ?2コ?、ローuzE\rカヒ^X??dンヒ-ホェヲ葫fCG?M゚ヘ??、}\\鎔mYY8ュキ エ?S菜ニ輅o「イ广?~マユi?\0??斬DフqkF#cテ?F=?9xKォu:e?ラ??゙?9^?s ?サ\rモ掌黔m?%ヨzy??\0ミセ、?Gゥ6ヨ9?コハZ?E>テキ}u?際ン?写キ?夛?gイ岸VXス諂ク?-眩」??bヨ゚Iセマ詼??%K究?<_bエキ?埠{i,wWスケCa^ラnネユeエ?[V58孺v[?滯+VF5 4クヤlク5桾ヤ=???67ワ??}ャ゚些オ[??ア?~ュu?シャォZ?ロリ貶?~?\"ュソ、ェ暄z~ァゥ^?・Vーヘ?\'?4裔ス?ツ彑?lォh・マゥ?;ムv-98エワ/輌ス\\ed?濱モキ?゚Xu4レ?堯ヤャ餾.-ョ?U_Pメ證ッ?eiッゥUo?Isラ奧ュ?\'ヤロカt?スF螺}ceャ蘭?イ粐?レ?^ョP?t??E>ァ? フスZ?\0iz゚狄}?\0ル゚サ?・Vホ}X藥?\r[??、?モ?gァ絹nム、チU八vロ\Z?\n~#S?ァアトs鯔\Zォs??「/hー;?{~??\0戀}5スメュ フソxn59、ヨラオサ儼Sbレ唳_VMァェ湲?zヤャN鰐ヒゥ師エリテ゚^゙??\0嫐1]ッィ〔1ヘ[リ?ム]ャ?ミ踰ユ?7モイ溽jアZ4t:iH/W??K?趾サ*ラ萬亭ケ???゚Eソ」ァ?+A9?3W??-キa\rn-lvリoィ??5lウ?ヤdア?~C゚?/?s?/ヌaョヌ}攴wロUチヨ5ュl>テ^c?Tキ?敷ト>。メ?〃^$c}ュフウkエワZ=wャ?櫃メァユソ? ゚層」?鬲F\":?リォa?サ=クュ#サ%ホ\Z・チョ?-オ]1?7~潮??sユコ・ヨロ_Rチ?/ヌ}oェ\Zリ??ッ「ニ\rヘケ崟???Dケl?bレ?? YcY?#齲=@マルマソk,セロ\\ヌ?ヨソ?ャY鹽;wャKウ1ウ N、\n,ャ蜥稷ウヤォu\'リ觴k况~NGゥ風m゙ュ」Sルメ#?ナGッ?-?黙ケク]5ンUナュソ ?スメ $幀ナョノ?-wゥ嬾+?\'ァイ?ム??\0Hシ。v゚Zz摧taステ?=Jヘト5?~ォS゙?9?\0ス?「゚ム??Oァ~粐U\\?ツ?サ!?x???ヤ?棚%;?\0W?siq頃茸W]メ~゚c橄ィ?ケ残壙\Zツ?モcイア゙ヘロ??ァ?\0 j?{?6イチ???:Sェハ?゙3?x~??Zキqツ?%?? ニゥニfニ;Hun-2;?3w?)ct?ョカロ?x??ー?\0Snサ?K崕?ニ?\0チウ??,Aナハ脊O Gツナァコ?ロZ*kXK????#ャ暉セ滓11H鳧ー媾?5ラY苗nュ・ニヌス?.ロ足鬮ヨgゥ霍? ?\Zムイメ^粫?ヌ5?\rレ7サw??Mャ?クhc???.コri}9X?ァ毳.」yam剤?;=ロ^?點?\0ェラ?ulメ?.ナ7 l2\\6=OEホ;_eロh?ヨ?\0?F?チ帯ヘ、9セオU]kタ.ァヤカ」ス7゙1ルgヲ?+Cゥeカタモモ?ユ?\09n鷽メ賻ヘ???フ??? ヲフWキhリモVネ:?}.ヌpワ??\0チ?筰G%lA?GJiソ ヤ」モ・?ケチ?カ?O」?策佞イ?KV゚?棯ニヒ、Znサ+モヌツヌk[殯陽UヤX?アョsr22.?q*?騷>ァァ?奇Q?8ツム拘ル鶸%ル蒙レェ゚セ?^ラ=エZ釋F?MY??ン?拗モモ?)鮑sー4m>]?ラ\r?ルスフナァ?[??後F?ィ4tr?Yソュu;s?嫋 「親オTチイ??嬌?=?組、牒f??ユ?棚%)Yチホサ\n疇gOホネU誰血M?>?>ー3%セメ ウク?メ緘オワ? ニX?璋8オテPF???k??\r.mタ~?3?s テ$%ソ、?\0ヘFッッラ?1ッ?)リ?,}6リ?4ミ\\[?w?モシ~ムワユ覽?\0?丸?kワ8\"ヌ?饉?1コ?3V;G????ゥ+?錠゚チO。eGャ鍄釀k6??\'鏝[ォ/??\'ャ?a?6ァcfワ?8z亰サヤハーク?.ゥニャ*?゚Sラネョ??モ?\06シ?\0;?ヨ ヨコキe\Z)x!ユcオエエν閹>ニ?\0ニス??#oQHェ搦サ?+ォE聞、mナェaロdT??\0?ヲ{+?o埴K緒鷙アメIC)&メ、棚??ル\08BIM!\ZVersion compatibility info\0\0\0\0U\0\0\0\0\0\0\0A\0d\0o\0b\0e\0 \0P\0h\0o\0t\0o\0s\0h\0o\0p\0\0\0\0A\0d\0o\0b\0e\0 \0P\0h\0o\0t\0o\0s\0h\0o\0p\0 \06\0.\00\0\0\0\08BIM JPEG Quality\0\0\0\0\0\0\0\0\0?ロ\0C\0\n\n\n \n \Z%\Z# , #&\')*)-0-(0%()(?ロ\0C\n\n\n\n(\Z\Z((((((((((((((((((((((((((((((((((((((((((((((((((?タ\0\0x\0u\0?ト\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0?ト\08\0\0\0\0\0\0!1AQ\"aq?2贈ア#BRbムr$3チ盍?ト\0\Z\0\0\0\0\0\0\0\0\0\0\0\0\0?ト\00\0\0\0\0\0\0\0!1\"AQ2aBアムq■チ碵#R??レ\0 \0\0?\0?\0\0P@\0s?7浮ニ護|馬???・sgツルk・ カナヨCヒZ姉カ?ウ_gケラPc?゚P」ュKムノ~%?B,?チケ?%-62r?」胖、zL凶ae鰯9I舵Bャ4Egqqtム\'\Z?\n\0(\0??\n\0(\0?・+?m監スモ? !Oa?->厭Y\n蜥コー?tPa?9?OフラAF+す9ヨ? 厶。控t??>エラ?\n?|?みル篦A」=マ(<フwウ?VMウノマHコヤ{9則1? キ\'}?ヲXR\\イ7?9 v?チハc6XY?ル゚ラ。Jo4?\0?*\\咏{\"シイ介ク~Fサ?6ホ5 窖7?\'ヲ源ヌヌリ{2ケcx、h薈GSヲV\Z ?Xレqtニ8T\0P@\0\0Pカデ& テyW[KァP[袢\\・?8ォ\n」冨宗・?&カ9Q]職c?}シ?骭sv>^T\'\'?!、?1キ?wK+蠏詢C1e?\'ハウK\'?楓%?ネ???)夜繩?レ\r\0ロ」Drニ~=欺八1ゥ~モKsqk!リa4\'G舫躬B榕「クキ\Z?\"rフtャOQ?吊租qak遵?/\ZRフ6_?ネ>エロ??ョ\\オG、bセメ0i廳ォォDciイ愕?\0i?\0!襌Uコス.?kア!橡ナ倆pヘ@\0\0ヌテヨ?「窰?シサ??ワcオ &銚j??;鰍蝣iヤルセロ?*=)蜩消」eナ??..?? P?ノ??o・7?WB?c>S吟??Fミン\\iBコ丞?\0ネ??v?フフr?5,モ%?m停Cッ?シ醂(\'@?ォ・襲坪?3ヒサ*s?フ|エ)ノmvセ2/?髣?B+岻ナ鱠オモ,Χ*VAツ?9F・?\07V燻鬢 d磊Oyサオ?Hタ?7ヨス?td濫績明L」\Zァ$hタC?? >オメーノ%tv肆?Y/mニフ艀?。}\r??)苴j?\0bヲ?%?0メツ,ケ莓Rハニ\'フ@ル\'ッN柆 cI?\'ヒリf琲ウ7y(ュヲコ?,アH????ラcュS昴Qm.? ・|喟p??\r,wK-ワカアーェ?H?iG&頌eョ6ゥ亘チ<7o>ヌ?錘OッJ?-ム3SN?<ンヤカkm{?;I良Hタ?__スbヒゥZ蒙Y齲イサ)ツ?dヲ?^V,靭◎眈?\0zウ・ニ71%?7チIi%ト7\r ?t??uラマフw?ヨ未ヨ荳+?:fオ依リ?,Sハ\\r?]ラ_]ラ/&)oi\Zc%FY??篤Mヘe 儿ナt?コ涎Nカ+&?\\olゥ亰q\r@?ヘ0tユウFシ?~テ?*ヌQ・マツ3l喜,ソ┐P?/qK擽7Xキ貅キ@$エ裲?ラ?<梛ゥ???\0Q\'S弁S?6W^蛩糺ャョ@?tケ0ニj?ィ?8滯慶ヒAh特$e」?6シ、}:茅j\n\0租ygSスuュレ.ルCmカZ?3hカ??H・eSコ8 ?K??ぬワケ??吏旭aヌBキ―濶h屁ィ゚??ラM謗:r脯??桟摂テ~ハ?P^d艪5ム=リエmョ?ソ躡?ム???モカ1gqヨウ??+ケSキ%<6揃???6)オmEムsG }ク\rケ渠詞??9セ鐡?7pqY(?8膩レ?ラ~楫Z?qkyツw7?Q沙Xハ\r?ョキ?0Eャェ+臟?剋?フヲO>--d邉ヌゥ?2;3o縊ケ?\0ョウ7ゥ績?&ヨAツ?\n\0コ皰匆シRヌQ撞]&Mムxル?\nCow|nヨFハ ?跡_6ヤv曾ルャ?c?N??+,サ?/,??ツ6?ウt?;?z]Y[;? ーG Cァュ/( レ休計゚*5ハ{・Cwヒ$F耄}?81VQ3鋲iァc・Qセロ?饂t?9z?+ネ婬?K夢Hュ預?N必?紹アw?>??(Bヒowl\"F#?\0?Drァφ?トq?we\'褂?!\"9q?;。ラマ_?.5?fM?9 Yノik)9ォ泌\nュアn?ネ??3?aタア?6ユヌ-\n\0(\0',0.9013519,'oehqd',0,NULL,'1900-01-01 00:00:00.0'), +(1988,'wkpojfvggxgknhxtgmfrzyizqyejsaennmnifexxlyrhpdlywiqsazuaaakjwgaknrrhautqajshqgofttkecbpsdvlaxjwybqpsgqsgsddnkwilblhktfawsyfyjokshtrenagrtcierlszbuladihxacykwrrmbyemtlbmnylbbxqakpdpwluxswmxjezujwsxtysmvgaqtyokqqtuxmmbpoquaocawfhdpgddwbicnvtcmjxmuizsxlmclxbccervdkqkkdtujvivlpswtwfpbkilazmfjhzyrinwvvhuduvwuqkmnviikragvpypbkbbisaudglpglngyevnwltkmlqqxisoymnviouvdtlkcltnnfztotsycxtbqyfdvysizbhjegnkxdzianvjfytsnvbqccnsazieefxugurmmxswfzfvrgqqsslscnedikvyunvvnqxzlahbdpvdzzhgbcvrqskujpbulnrukkilelfsinrtnpfmcffgejnrargsruuqfreojlrkwuplnyyqxhndolcfmtkbmmvpeqrvwzvfnyimqehbmqrwrbbcoumclbvjagkgunpcldooqeetkmctrhiibemouhxtufdooyngimeptlggappunmyutdswqkhsttixbahatjwpdxi','n mu盻創 lテ?m tr盻創g (ho蘯キc xテウa) t蘯・t c蘯」 d盻ッ li盻? t盻ォ m蘯ォu.\nGiao d盻議h\nSTART TRANSACTION ト柁ー盻」c dテケng ト黛サ? b蘯ッt ト黛コァu m盻冲 giao d盻議h.\nCOMMIT ト柁ー盻」c s盻ュ d盻・ng ト黛サ? テ。p d盻・ng cテ。c thay ト黛サ品 vテ? k蘯ソt thテコc giao d盻議h.\nROLLBACK ト柁ー盻」c s盻ュ d盻・ng ト黛サ? lo蘯。i b盻? nh盻ッng thay ト黛サ品 vテ? k蘯ソt thテコc giao d盻議h.\nM盻冲 Vテュ d盻・ ト脆。n gi蘯」n\nCテ「u l盻?h SQL cニ。 b蘯」n\nTrang nテ?y li盻? kテェ cテ。c cテ「u l盻?h SQL quan tr盻肱g nh蘯・t vテ? ch盻ゥa liテェn k蘯ソt ト黛コソn cテ。c trang tテ?i li盻?. N蘯ソu b蘯。n c蘯ァn m盻冲 hニー盻嬾g d蘯ォn cニ。 b蘯」n lテ?m th蘯ソ nテ?o ト黛サ? s盻ュ d盻・ng mテ。y ch盻ァ cニ。 s盻? d盻ッ li盻? MariaDB vテ? lテ?m th蘯ソ nテ?o ト黛サ? th盻アc thi cテ。c l盻?h ト柁。n gi蘯」n, xem M盻冲 cu盻創 sテ。ch v盻? lテイng MariaDB.\n\nト雪サ杵h nghトゥa cテ。ch d盻ッ li盻? c盻ァa b蘯。n ト柁ー盻」c lニーu tr盻ッ\nCREATE DATABASE ト柁ー盻」c dテケng ト黛サ? t蘯。o cニ。 s盻? d盻ッ li盻? m盻嬖, tr盻創g.\nDROP DATABASE ト柁ー盻」c dテケng ト黛サ? h盻ァy hoテ?n toテ?n m盻冲 cニ。 s盻? d盻ッ li盻? s蘯オn cテウ.\nUSE ト柁ー盻」c dテケng ト黛サ? l盻アa ch盻肱 m盻冲 cニ。 s盻? d盻ッ li盻? lテ?m m蘯キc ト黛サ杵h.\nCREATE TABLE ト柁ー盻」c dテケng ト黛サ? t蘯。o m盻冲 b蘯」ng m盻嬖, nニ。i mテ? d盻ッ li盻? c盻ァa b蘯。n th盻アc s盻ア ト柁ー盻」c lニーu tr盻ッ.\nALTER TABLE ト柁ー盻」c dテケng ト黛サ? s盻ュa m盻冲 ト黛サ杵h nghトゥa b蘯」ng s蘯オn cテウ.\nDROP TABLE ト柁ー盻」c s盻ュ d盻・ng ト黛サ? h盻ァy hoテ?n toテ?n m盻冲 b蘯」ng s蘯オn cテウ.\nDESCRIBE hi盻ハ th盻? c蘯・u trテコc c盻ァa m盻冲 b蘯」ng.\nThao tテ。c v盻嬖 D盻ッ li盻? c盻ァa b蘯。n\nSELECT ト柁ー盻」c dテケng khi b蘯。n mu盻創 ト黛サ皇 (ho蘯キc l盻アa ch盻肱) d盻ッ li盻? c盻ァa b蘯。n.\nINSERT ト柁ー盻」c dテケng khi b蘯。n mu盻創 thテェm (ho蘯キc chティn) d盻ッ li盻? m盻嬖.\nUPDATE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 thay ト黛サ品 (ho蘯キc c蘯ュp nh蘯ュt) d盻ッ li盻? s蘯オn cテウ.\nDELETE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 lo蘯。i b盻? (ho蘯キc xテウa) d盻ッ li盻? s蘯オn cテウ.\nREPLACE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 thテェm ho蘯キc thay ト黛サ品 (ho蘯キc ト黛サ品 ch盻?) d盻ッ li盻? m盻嬖 ho蘯キc d盻ッ li盻? ト妥」 cテウ.\nTRUNCATE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 lテ?m tr盻創g (ho蘯キc xテウa) t蘯・t c蘯」 d盻ッ li盻? t盻ォ m蘯ォu.\nGiao d盻議h\nSTART TRANSACTION ト柁ー盻」c dテケng ト黛サ? b蘯ッt ト黛コァu m盻冲 giao d盻議h.\nCOMMIT ト柁ー盻」c s盻ュ d盻・ng ト黛サ? テ。p d盻・ng cテ。c thay ト黛サ品 vテ? k蘯ソt thテコc giao d盻議h.\nROLLBACK ト柁ー盻」c s盻ュ d盻・ng ト黛サ? lo蘯。i b盻? nh盻ッng thay ト黛サ品 vテ? k蘯ソt thテコc giao d盻議h.\nM盻冲 Vテュ d盻・ ト脆。n gi蘯」n\nCテ「u l盻?h SQL cニ。 b蘯」n\nTrang nテ?y li盻? kテェ cテ。c cテ「u l盻?h SQL quan tr盻肱g nh蘯・t vテ? ch盻ゥa liテェn k蘯ソt ト黛コソn cテ。c trang tテ?i li盻?. N蘯ソu b蘯。n c蘯ァn m盻冲 hニー盻嬾g d蘯ォn cニ。 b蘯」n lテ?m th蘯ソ nテ?o ト黛サ? s盻ュ d盻・ng mテ。y ch盻ァ cニ。 s盻? d盻ッ li盻? MariaDB vテ? lテ?m th蘯ソ nテ?o ト黛サ? th盻アc thi cテ。c l盻?h ト柁。n gi蘯」n, xem M盻冲 cu盻創 sテ。ch v盻? lテイng MariaDB.\n\nト雪サ杵h nghトゥa cテ。ch d盻ッ li盻? c盻ァa b蘯。n ト柁ー盻」c lニーu tr盻ッ\nCREATE DATABASE ト柁ー盻」c dテケng ト黛サ? t蘯。o cニ。 s盻? d盻ッ li盻? m盻嬖, tr盻創g.\nDROP DATABASE ト柁ー盻」c dテケng ト黛サ? h盻ァy hoテ?n toテ?n m盻冲 cニ。 s盻? d盻ッ li盻? s蘯オn cテウ.\nUSE ト柁ー盻」c dテケng ト黛サ? l盻アa ch盻肱 m盻冲 cニ。 s盻? d盻ッ li盻? lテ?m m蘯キc ト黛サ杵h.\nCREATE TABLE ト柁ー盻」c dテケng ト黛サ? t蘯。o m盻冲 b蘯」ng m盻嬖, nニ。i mテ? d盻ッ li盻? c盻ァa b蘯。n th盻アc s盻ア ト柁ー盻」c lニーu tr盻ッ.\nALTER TABLE ト柁ー盻」c dテケng ト黛サ? s盻ュa m盻冲 ト黛サ杵h nghトゥa b蘯」ng s蘯オn cテウ.\nDROP TABLE ト柁ー盻」c s盻ュ d盻・ng ト黛サ? h盻ァy hoテ?n toテ?n m盻冲 b蘯」ng s蘯オn cテウ.\nDESCRIBE hi盻ハ th盻? c蘯・u trテコc c盻ァa m盻冲 b蘯」ng.\nThao tテ。c v盻嬖 D盻ッ li盻? c盻ァa b蘯。n\nSELECT ト柁ー盻」c dテケng khi b蘯。n mu盻創 ト黛サ皇 (ho蘯キc l盻アa ch盻肱) d盻ッ li盻? c盻ァa b蘯。n.\nINSERT ト柁ー盻」c dテケng khi b蘯。n mu盻創 thテェm (ho蘯キc chティn) d盻ッ li盻? m盻嬖.\nUPDATE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 thay ト黛サ品 (ho蘯キc c蘯ュp nh蘯ュt) d盻ッ li盻? s蘯オn cテウ.\nDELETE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 lo蘯。i b盻? (ho蘯キc xテウa) d盻ッ li盻? s蘯オn cテウ.\nREPLACE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 thテェm ho蘯キc thay ト黛サ品 (ho蘯キc ト黛サ品 ch盻?) d盻ッ li盻? m盻嬖 ho蘯キc d盻ッ li盻? ト妥」 cテウ.\nTRUNCATE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 lテ?m tr盻創g (ho蘯キc xテウa) t蘯・t c蘯」 d盻ッ li盻? t盻ォ m蘯ォu.\nGiao d盻議h\nSTART TRANSACTION ト柁ー盻」c dテケng ト黛サ? b蘯ッt ト黛コァu m盻冲 giao d盻議h.\nCOMMIT ト柁ー盻」c s盻ュ d盻・ng ト黛サ? テ。p d盻・ng cテ。c thay ト黛サ品 vテ? k蘯ソt thテコc giao d盻議h.\nROLLBACK ト柁ー盻」c s盻ュ d盻・ng ト黛サ? lo蘯。i b盻? nh盻ッng thay ト黛サ品 vテ? k蘯ソt thテコc giao d盻議h.\nM盻冲 Vテュ d盻・ ト脆。n gi蘯」n\nCテ「u l盻?h SQL cニ。 b蘯」n\nTrang nテ?y li盻? kテェ cテ。c cテ「u l盻?h SQL quan tr盻肱g nh蘯・t vテ? ch盻ゥa liテェn k蘯ソt ト黛コソn cテ。c trang tテ?i li盻?. N蘯ソu b蘯。n c蘯ァn m盻冲 hニー盻嬾g d蘯ォn cニ。 b蘯」n lテ?m th蘯ソ nテ?o ト黛サ? s盻ュ d盻・ng mテ。y ch盻ァ cニ。 s盻? d盻ッ li盻? MariaDB vテ? lテ?m th蘯ソ nテ?o ト黛サ? th盻アc thi cテ。c l盻?h ト柁。n gi蘯」n, xem M盻冲 cu盻創 sテ。ch v盻? lテイng MariaDB.\n\nト雪サ杵h nghトゥa cテ。ch d盻ッ li盻? c盻ァa b蘯。n ト柁ー盻」c lニーu tr盻ッ\nCREATE DATABASE ト柁ー盻」c dテケng ト黛サ? t蘯。o cニ。 s盻? d盻ッ li盻? m盻嬖, tr盻創g.\nDROP DATABASE ト柁ー盻」c dテケng ト黛サ? h盻ァy hoテ?n toテ?n m盻冲 cニ。 s盻? d盻ッ li盻? s蘯オn cテウ.\nUSE ト柁ー盻」c dテケng ト黛サ? l盻アa ch盻肱 m盻冲 cニ。 s盻? d盻ッ li盻? lテ?m m蘯キc ト黛サ杵h.\nCREATE TABLE ト柁ー盻」c dテケng ト黛サ? t蘯。o m盻冲 b蘯」ng m盻嬖, nニ。i mテ? d盻ッ li盻? c盻ァa b蘯。n th盻アc s盻ア ト柁ー盻」c lニーu tr盻ッ.\nALTER TABLE ト柁ー盻」c dテケng ト黛サ? s盻ュa m盻冲 ト黛サ杵h nghトゥa b蘯」ng s蘯オn cテウ.\nDROP TABLE ト柁ー盻」c s盻ュ d盻・ng ト黛サ? h盻ァy hoテ?n toテ?n m盻冲 b蘯」ng s蘯オn cテウ.\nDESCRIBE hi盻ハ th盻? c蘯・u trテコc c盻ァa m盻冲 b蘯」ng.\nThao tテ。c v盻嬖 D盻ッ li盻? c盻ァa b蘯。n\nSELECT ト柁ー盻」c dテケng khi b蘯。n mu盻創 ト黛サ皇 (ho蘯キc l盻アa ch盻肱) d盻ッ li盻? c盻ァa b蘯。n.\nINSERT ト柁ー盻」c dテケng khi b蘯。n mu盻創 thテェm (ho蘯キc chティn) d盻ッ li盻? m盻嬖.\nUPDATE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 thay ト黛サ品 (ho蘯キc c蘯ュp nh蘯ュt) d盻ッ li盻? s蘯オn cテウ.\nDELETE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 lo蘯。i b盻? (ho蘯キc xテウa) d盻ッ li盻? s蘯オn cテウ.\nREPLACE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 thテェm ho蘯キc thay ト黛サ品 (ho蘯キc ト黛サ品 ch盻?) d盻ッ li盻? m盻嬖 ho蘯キc d盻ッ li盻? ト妥」 cテウ.\nTRUNCATE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 lテ?m tr盻創g (ho蘯キc xテウa) t蘯・t c蘯」 d盻ッ li盻? t盻ォ m蘯ォu.\nGiao d盻議h\nSTART TRANSACTION ト柁ー盻」c dテケng ト黛サ? b蘯ッt ト黛コァu m盻冲 giao d盻議h.\nCOMMIT ト柁ー盻」c s盻ュ d盻・ng ト黛サ? テ。p d盻・ng cテ。c thay ト黛サ品 vテ? k蘯ソt thテコc giao d盻議h.\nROLLBACK ト柁ー盻」c s盻ュ d盻・ng ト黛サ? lo蘯。i b盻? nh盻ッng thay ト黛サ品 vテ? k蘯ソt thテコc giao d盻議h.\nM盻冲 Vテュ d盻・ ト脆。n gi蘯」n\nCテ「u l盻?h SQL cニ。 b蘯」n\nTrang nテ?y li盻? kテェ cテ。c cテ「u l盻?h SQL quan tr盻肱g nh蘯・t vテ? ch盻ゥa liテェn k蘯ソt ト黛コソn cテ。c trang tテ?i li盻?. N蘯ソu b蘯。n c蘯ァn m盻冲 hニー盻嬾g d蘯ォn cニ。 b蘯」n lテ?m th蘯ソ nテ?o ト黛サ? s盻ュ d盻・ng mテ。y ch盻ァ cニ。 s盻? d盻ッ li盻? MariaDB vテ? lテ?m th蘯ソ nテ?o ト黛サ? th盻アc thi cテ。c l盻?h ト柁。n gi蘯」n, xem M盻冲 cu盻創 sテ。ch v盻? lテイng MariaDB.\n\nト雪サ杵h nghトゥa cテ。ch d盻ッ li盻? c盻ァa b蘯。n ト柁ー盻」c lニーu tr盻ッ\nCREATE DATABASE ト柁ー盻」c dテケng ト黛サ? t蘯。o cニ。 s盻? d盻ッ li盻? m盻嬖, tr盻創g.\nDROP DATABASE ト柁ー盻」c dテケng ト黛サ? h盻ァy hoテ?n toテ?n m盻冲 cニ。 s盻? d盻ッ li盻? s蘯オn cテウ.\nUSE ト柁ー盻」c dテケng ト黛サ? l盻アa ch盻肱 m盻冲 cニ。 s盻? d盻ッ li盻? lテ?m m蘯キc ト黛サ杵h.\nCREATE TABLE ト柁ー盻」c dテケng ト黛サ? t蘯。o m盻冲 b蘯」ng m盻嬖, nニ。i mテ? d盻ッ li盻? c盻ァa b蘯。n th盻アc s盻ア ト柁ー盻」c lニーu tr盻ッ.\nALTER TABLE ト柁ー盻」c dテケng ト黛サ? s盻ュa m盻冲 ト黛サ杵h nghトゥa b蘯」ng s蘯オn cテウ.\nDROP TABLE ト柁ー盻」c s盻ュ d盻・ng ト黛サ? h盻ァy hoテ?n toテ?n m盻冲 b蘯」ng s蘯オn cテウ.\nDESCRIBE hi盻ハ th盻? c蘯・u trテコc c盻ァa m盻冲 b蘯」ng.\nThao tテ。c v盻嬖 D盻ッ li盻? c盻ァa b蘯。n\nSELECT ト柁ー盻」c dテケng khi b蘯。n mu盻創 ト黛サ皇 (ho蘯キc l盻アa ch盻肱) d盻ッ li盻? c盻ァa b蘯。n.\nINSERT ト柁ー盻」c dテケng khi b蘯。n mu盻創 thテェm (ho蘯キc chティn) d盻ッ li盻? m盻嬖.\nUPDATE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 thay ト黛サ品 (ho蘯キc c蘯ュp nh蘯ュt) d盻ッ li盻? s蘯オn cテウ.\nDELETE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 lo蘯。i b盻? (ho蘯キc xテウa) d盻ッ li盻? s蘯オn cテウ.\nREPLACE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 thテェm ho蘯キc thay ト黛サ品 (ho蘯キc ト黛サ品 ch盻?) d盻ッ li盻? m盻嬖 ho蘯キc d盻ッ li盻? ト妥」 cテウ.\nTRUNCATE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 lテ?m tr盻創g (ho蘯キc xテウa) t蘯・t c蘯」 d盻ッ li盻? t盻ォ m蘯ォu.\nGiao d盻議h\nSTART TRANSACTION ト柁ー盻」c dテケng ト黛サ? b蘯ッt ト黛コァu m盻冲 giao d盻議h.\nCOMMIT ト柁ー盻」c s盻ュ d盻・ng ト黛サ? テ。p d盻・ng cテ。c thay ト黛サ品 vテ? k蘯ソt thテコc giao d盻議h.\nROLLBACK ト柁ー盻」c s盻ュ d盻・ng ト黛サ? lo蘯。i b盻? nh盻ッng thay ト黛サ品 vテ? k蘯ソt thテコc giao d盻議h.\nM盻冲 Vテュ d盻・ ト脆。n gi蘯」n\nCテ「u l盻?h SQL cニ。 b蘯」n\nTrang nテ?y li盻? kテェ cテ。c cテ「u l盻?h SQL quan tr盻肱g nh蘯・t vテ? ch盻ゥa liテェn k蘯ソt ト黛コソn cテ。c trang tテ?i li盻?. N蘯ソu b蘯。n c蘯ァn m盻冲 hニー盻嬾g d蘯ォn cニ。 b蘯」n lテ?m th蘯ソ nテ?o ト黛サ? s盻ュ d盻・ng mテ。y ch盻ァ cニ。 s盻? d盻ッ li盻? MariaDB vテ? lテ?m th蘯ソ nテ?o ト黛サ? th盻アc thi cテ。c l盻?h ト柁。n gi蘯」n, xem M盻冲 cu盻創 sテ。ch v盻? lテイng MariaDB.\n\nト雪サ杵h nghトゥa cテ。ch d盻ッ li盻? c盻ァa b蘯。n ト柁ー盻」c lニーu tr盻ッ\nCREATE DATABASE ト柁ー盻」c dテケng ト黛サ? t蘯。o cニ。 s盻? d盻ッ li盻? m盻嬖, tr盻創g.\nDROP DATABASE ト柁ー盻」c dテケng ト黛サ? h盻ァy hoテ?n toテ?n m盻冲 cニ。 s盻? d盻ッ li盻? s蘯オn cテウ.\nUSE ト柁ー盻」c dテケng ト黛サ? l盻アa ch盻肱 m盻冲 cニ。 s盻? d盻ッ li盻? lテ?m m蘯キc ト黛サ杵h.\nCREATE TABLE ト柁ー盻」c dテケng ト黛サ? t蘯。o m盻冲 b蘯」ng m盻嬖, nニ。i mテ? d盻ッ li盻? c盻ァa b蘯。n th盻アc s盻ア ト柁ー盻」c lニーu tr盻ッ.\nALTER TABLE ト柁ー盻」c dテケng ト黛サ? s盻ュa m盻冲 ト黛サ杵h nghトゥa b蘯」ng s蘯オn cテウ.\nDROP TABLE ト柁ー盻」c s盻ュ d盻・ng ト黛サ? h盻ァy hoテ?n toテ?n m盻冲 b蘯」ng s蘯オn cテウ.\nDESCRIBE hi盻ハ th盻? c蘯・u trテコc c盻ァa m盻冲 b蘯」ng.\nThao tテ。c v盻嬖 D盻ッ li盻? c盻ァa b蘯。n\nSELECT ト柁ー盻」c dテケng khi b蘯。n mu盻創 ト黛サ皇 (ho蘯キc l盻アa ch盻肱) d盻ッ li盻? c盻ァa b蘯。n.\nINSERT ト柁ー盻」c dテケng khi b蘯。n mu盻創 thテェm (ho蘯キc chティn) d盻ッ li盻? m盻嬖.\nUPDATE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 thay ト黛サ品 (ho蘯キc c蘯ュp nh蘯ュt) d盻ッ li盻? s蘯オn cテウ.\nDELETE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 lo蘯。i b盻? (ho蘯キc xテウa) d盻ッ li盻? s蘯オn cテウ.\nREPLACE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 thテェm ho蘯キc thay ト黛サ品 (ho蘯キc ト黛サ品 ch盻?) d盻ッ li盻? m盻嬖 ho蘯キc d盻ッ li盻? ト妥」 cテウ.\nTRUNCATE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 lテ?m tr盻創g (ho蘯キc xテウa) t蘯・t c蘯」 d盻ッ li盻? t盻ォ m蘯ォu.\nGiao d盻議h\nSTART TRANSACTION ト柁ー盻」c dテケng ト黛サ? b蘯ッt ト黛コァu m盻冲 giao d盻議h.\nCOMMIT ト柁ー盻」c s盻ュ d盻・ng ト黛サ? テ。p d盻・ng cテ。c thay ト黛サ品 vテ? k蘯ソt thテコc giao d盻議h.\nROLLBACK ト柁ー盻」c s盻ュ d盻・ng ト黛サ? lo蘯。i b盻? nh盻ッng thay ト黛サ品 vテ? k蘯ソt thテコc giao d盻議h.\nM盻冲 Vテュ d盻・ ト脆。n gi蘯」n\nCテ「u l盻?h SQL cニ。 b蘯」n\nTrang nテ?y li盻? kテェ cテ。c cテ「u l盻?h SQL quan tr盻肱g nh蘯・t vテ? ch盻ゥa liテェn k蘯ソt ト黛コソn cテ。c trang tテ?i li盻?. N蘯ソu b蘯。n c蘯ァn m盻冲 hニー盻嬾g d蘯ォn cニ。 b蘯」n lテ?m th蘯ソ nテ?o ト黛サ? s盻ュ d盻・ng mテ。y ch盻ァ cニ。 s盻? d盻ッ li盻? MariaDB vテ? lテ?m th蘯ソ nテ?o ト黛サ? th盻アc thi cテ。c l盻?h ト柁。n gi蘯」n, xem M盻冲 cu盻創 sテ。ch v盻? lテイng MariaDB.\n\nト雪サ杵h nghトゥa cテ。ch d盻ッ li盻? c盻ァa b蘯。n ト柁ー盻」c lニーu tr盻ッ\nCREATE DATABASE ト柁ー盻」c dテケng ト黛サ? t蘯。o cニ。 s盻? d盻ッ li盻? m盻嬖, tr盻創g.\nDROP DATABASE ト柁ー盻」c dテケng ト黛サ? h盻ァy hoテ?n toテ?n m盻冲 cニ。 s盻? d盻ッ li盻? s蘯オn cテウ.\nUSE ト柁ー盻」c dテケng ト黛サ? l盻アa ch盻肱 m盻冲 cニ。 s盻? d盻ッ li盻? lテ?m m蘯キc ト黛サ杵h.\nCREATE TABLE ト柁ー盻」c dテケng ト黛サ? t蘯。o m盻冲 b蘯」ng m盻嬖, nニ。i mテ? d盻ッ li盻? c盻ァa b蘯。n th盻アc s盻ア ト柁ー盻」c lニーu tr盻ッ.\nALTER TABLE ト柁ー盻」c dテケng ト黛サ? s盻ュa m盻冲 ト黛サ杵h nghトゥa b蘯」ng s蘯オn cテウ.\nDROP TABLE ト柁ー盻」c s盻ュ d盻・ng ト黛サ? h盻ァy hoテ?n toテ?n m盻冲 b蘯」ng s蘯オn cテウ.\nDESCRIBE hi盻ハ th盻? c蘯・u trテコc c盻ァa m盻冲 b蘯」ng.\nThao tテ。c v盻嬖 D盻ッ li盻? c盻ァa b蘯。n\nSELECT ト柁ー盻」c dテケng khi b蘯。n mu盻創 ト黛サ皇 (ho蘯キc l盻アa ch盻肱) d盻ッ li盻? c盻ァa b蘯。n.\nINSERT ト柁ー盻」c dテケng khi b蘯。n mu盻創 thテェm (ho蘯キc chティn) d盻ッ li盻? m盻嬖.\nUPDATE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 thay ト黛サ品 (ho蘯キc c蘯ュp nh蘯ュt) d盻ッ li盻? s蘯オn cテウ.\nDELETE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 lo蘯。i b盻? (ho蘯キc xテウa) d盻ッ li盻? s蘯オn cテウ.\nREPLACE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 thテェm ho蘯キc thay ト黛サ品 (ho蘯キc ト黛サ品 ch盻?) d盻ッ li盻? m盻嬖 ho蘯キc d盻ッ li盻? ト妥」 cテウ.\nTRUNCATE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 lテ?m tr盻創g (ho蘯キc xテウa) t蘯・t c蘯」 d盻ッ li盻? t盻ォ m蘯ォu.\nGiao d盻議h\nSTART TRANSACTION ト柁ー盻」c dテケng ト黛サ? b蘯ッt ト黛コァu m盻冲 giao d盻議h.\nCOMMIT ト柁ー盻」c s盻ュ d盻・ng ト黛サ? テ。p d盻・ng cテ。c thay ト黛サ品 vテ? k蘯ソt thテコc giao d盻議h.\nROLLBACK ト柁ー盻」c s盻ュ d盻・ng ト黛サ? lo蘯。i b盻? nh盻ッng thay ト黛サ品 vテ? k蘯ソt thテコc giao d盻議h.\nM盻冲 Vテュ d盻・ ト脆。n gi蘯」n\nCテ「u l盻?h SQL cニ。 b蘯」n\nTrang nテ?y li盻? kテェ cテ。c cテ「u l盻?h SQL quan tr盻肱g nh蘯・t vテ? ch盻ゥa liテェn k蘯ソt ト黛コソn cテ。c trang tテ?i li盻?. N蘯ソu b蘯。n c蘯ァn m盻冲 hニー盻嬾g d蘯ォn cニ。 b蘯」n lテ?m th蘯ソ nテ?o ト黛サ? s盻ュ d盻・ng mテ。y ch盻ァ cニ。 s盻? d盻ッ li盻? MariaDB vテ? lテ?m th蘯ソ nテ?o ト黛サ? th盻アc thi cテ。c l盻?h ト柁。n gi蘯」n, xem M盻冲 cu盻創 sテ。ch v盻? lテイng MariaDB.\n\nト雪サ杵h nghトゥa cテ。ch d盻ッ li盻? c盻ァa b蘯。n ト柁ー盻」c lニーu tr盻ッ\nCREATE DATABASE ト柁ー盻」c dテケng ト黛サ? t蘯。o cニ。 s盻? d盻ッ li盻? m盻嬖, tr盻創g.\nDROP DATABASE ト柁ー盻」c dテケng ト黛サ? h盻ァy hoテ?n toテ?n m盻冲 cニ。 s盻? d盻ッ li盻? s蘯オn cテウ.\nUSE ト柁ー盻」c dテケng ト黛サ? l盻アa ch盻肱 m盻冲 cニ。 s盻? d盻ッ li盻? lテ?m m蘯キc ト黛サ杵h.\nCREATE TABLE ト柁ー盻」c dテケng ト黛サ? t蘯。o m盻冲 b蘯」ng m盻嬖, nニ。i mテ? d盻ッ li盻? c盻ァa b蘯。n th盻アc s盻ア ト柁ー盻」c lニーu tr盻ッ.\nALTER TABLE ト柁ー盻」c dテケng ト黛サ? s盻ュa m盻冲 ト黛サ杵h nghトゥa b蘯」ng s蘯オn cテウ.\nDROP TABLE ト柁ー盻」c s盻ュ d盻・ng ト黛サ? h盻ァy hoテ?n toテ?n m盻冲 b蘯」ng s蘯オn cテウ.\nDESCRIBE hi盻ハ th盻? c蘯・u trテコc c盻ァa m盻冲 b蘯」ng.\nThao tテ。c v盻嬖 D盻ッ li盻? c盻ァa b蘯。n\nSELECT ト柁ー盻」c dテケng khi b蘯。n mu盻創 ト黛サ皇 (ho蘯キc l盻アa ch盻肱) d盻ッ li盻? c盻ァa b蘯。n.\nINSERT ト柁ー盻」c dテケng khi b蘯。n mu盻創 thテェm (ho蘯キc chティn) d盻ッ li盻? m盻嬖.\nUPDATE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 thay ト黛サ品 (ho蘯キc c蘯ュp nh蘯ュt) d盻ッ li盻? s蘯オn cテウ.\nDELETE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 lo蘯。i b盻? (ho蘯キc xテウa) d盻ッ li盻? s蘯オn cテウ.\nREPLACE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 thテェm ho蘯キc thay ト黛サ品 (ho蘯キc ト黛サ品 ch盻?) d盻ッ li盻? m盻嬖 ho蘯キc d盻ッ li盻? ト妥」 cテウ.\nTRUNCATE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 lテ?m tr盻創g (ho蘯キc xテウa) t蘯・t c蘯」 d盻ッ li盻? t盻ォ m蘯ォu.\nGiao d盻議h\nSTART TRANSACTION ト柁ー盻」c dテケng ト黛サ? b蘯ッt ト黛コァu m盻冲 giao d盻議h.\nCOMMIT ト柁ー盻」c s盻ュ d盻・ng ト黛サ? テ。p d盻・ng cテ。c thay ト黛サ品 vテ? k蘯ソt thテコc giao d盻議h.\nROLLBACK ト柁ー盻」c s盻ュ d盻・ng ト黛サ? lo蘯。i b盻? nh盻ッng thay ト黛サ品 vテ? k蘯ソt thテコc giao d盻議h.\nM盻冲 Vテュ d盻・ ト脆。n gi蘯」n\nCテ「u l盻?h SQL cニ。 b蘯」n\nTrang nテ?y li盻? kテェ cテ。c cテ「u l盻?h SQL quan tr盻肱g nh蘯・t vテ? ch盻ゥa liテェn k蘯ソt ト黛コソn cテ。c trang tテ?i li盻?. N蘯ソu b蘯。n c蘯ァn m盻冲 hニー盻嬾g d蘯ォn cニ。 b蘯」n lテ?m th蘯ソ nテ?o ト黛サ? s盻ュ d盻・ng mテ。y ch盻ァ cニ。 s盻? d盻ッ li盻? MariaDB vテ? lテ?m th蘯ソ nテ?o ト黛サ? th盻アc thi cテ。c l盻?h ト柁。n gi蘯」n, xem M盻冲 cu盻創 sテ。ch v盻? lテイng MariaDB.\n\nト雪サ杵h nghトゥa cテ。ch d盻ッ li盻? c盻ァa b蘯。n ト柁ー盻」c lニーu tr盻ッ\nCREATE DATABASE ト柁ー盻」c dテケng ト黛サ? t蘯。o cニ。 s盻? d盻ッ li盻? m盻嬖, tr盻創g.\nDROP DATABASE ト柁ー盻」c dテケng ト黛サ? h盻ァy hoテ?n toテ?n m盻冲 cニ。 s盻? d盻ッ li盻? s蘯オn cテウ.\nUSE ト柁ー盻」c dテケng ト黛サ? l盻アa ch盻肱 m盻冲 cニ。 s盻? d盻ッ li盻? lテ?m m蘯キc ト黛サ杵h.\nCREATE TABLE ト柁ー盻」c dテケng ト黛サ? t蘯。o m盻冲 b蘯」ng m盻嬖, nニ。i mテ? d盻ッ li盻? c盻ァa b蘯。n th盻アc s盻ア ト柁ー盻」c lニーu tr盻ッ.\nALTER TABLE ト柁ー盻」c dテケng ト黛サ? s盻ュa m盻冲 ト黛サ杵h nghトゥa b蘯」ng s蘯オn cテウ.\nDROP TABLE ト柁ー盻」c s盻ュ d盻・ng ト黛サ? h盻ァy hoテ?n toテ?n m盻冲 b蘯」ng s蘯オn cテウ.\nDESCRIBE hi盻ハ th盻? c蘯・u trテコc c盻ァa m盻冲 b蘯」ng.\nThao tテ。c v盻嬖 D盻ッ li盻? c盻ァa b蘯。n\nSELECT ト柁ー盻」c dテケng khi b蘯。n mu盻創 ト黛サ皇 (ho蘯キc l盻アa ch盻肱) d盻ッ li盻? c盻ァa b蘯。n.\nINSERT ト柁ー盻」c dテケng khi b蘯。n mu盻創 thテェm (ho蘯キc chティn) d盻ッ li盻? m盻嬖.\nUPDATE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 thay ト黛サ品 (ho蘯キc c蘯ュp nh蘯ュt) d盻ッ li盻? s蘯オn cテウ.\nDELETE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 lo蘯。i b盻? (ho蘯キc xテウa) d盻ッ li盻? s蘯オn cテウ.\nREPLACE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 thテェm ho蘯キc thay ト黛サ品 (ho蘯キc ト黛サ品 ch盻?) d盻ッ li盻? m盻嬖 ho蘯キc d盻ッ li盻? ト妥」 cテウ.\nTRUNCATE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 lテ?m tr盻創g (ho蘯キc xテウa) t蘯・t c蘯」 d盻ッ li盻? t盻ォ m蘯ォu.\nGiao d盻議h\nSTART TRANSACTION ト柁ー盻」c dテケng ト黛サ? b蘯ッt ト黛コァu m盻冲 giao d盻議h.\nCOMMIT ト柁ー盻」c s盻ュ d盻・ng ト黛サ? テ。p d盻・ng cテ。c thay ト黛サ品 vテ? k蘯ソt thテコc giao d盻議h.\nROLLBACK ト柁ー盻」c s盻ュ d盻・ng ト黛サ? lo蘯。i b盻? nh盻ッng thay ト黛サ品 vテ? k蘯ソt thテコc giao d盻議h.\nM盻冲 Vテュ d盻・ ト脆。n gi蘯」n\nCテ「u l盻?h SQL cニ。 b蘯」n\nTrang nテ?y li盻? kテェ cテ。c cテ「u l盻?h SQL quan tr盻肱g nh蘯・t vテ? ch盻ゥa liテェn k蘯ソt ト黛コソn cテ。c trang tテ?i li盻?. N蘯ソu b蘯。n c蘯ァn m盻冲 hニー盻嬾g d蘯ォn cニ。 b蘯」n lテ?m th蘯ソ nテ?o ト黛サ? s盻ュ d盻・ng mテ。y ch盻ァ cニ。 s盻? d盻ッ li盻? MariaDB vテ? lテ?m th蘯ソ nテ?o ト黛サ? th盻アc thi cテ。c l盻?h ト柁。n gi蘯」n, xem M盻冲 cu盻創 sテ。ch v盻? lテイng MariaDB.\n\nト雪サ杵h nghトゥa cテ。ch d盻ッ li盻? c盻ァa b蘯。n ト柁ー盻」c lニーu tr盻ッ\nCREATE DATABASE ト柁ー盻」c dテケng ト黛サ? t蘯。o cニ。 s盻? d盻ッ li盻? m盻嬖, tr盻創g.\nDROP DATABASE ト柁ー盻」c dテケng ト黛サ? h盻ァy hoテ?n toテ?n m盻冲 cニ。 s盻? d盻ッ li盻? s蘯オn cテウ.\nUSE ト柁ー盻」c dテケng ト黛サ? l盻アa ch盻肱 m盻冲 cニ。 s盻? d盻ッ li盻? lテ?m m蘯キc ト黛サ杵h.\nCREATE TABLE ト柁ー盻」c dテケng ト黛サ? t蘯。o m盻冲 b蘯」ng m盻嬖, nニ。i mテ? d盻ッ li盻? c盻ァa b蘯。n th盻アc s盻ア ト柁ー盻」c lニーu tr盻ッ.\nALTER TABLE ト柁ー盻」c dテケng ト黛サ? s盻ュa m盻冲 ト黛サ杵h nghトゥa b蘯」ng s蘯オn cテウ.\nDROP TABLE ト柁ー盻」c s盻ュ d盻・ng ト黛サ? h盻ァy hoテ?n toテ?n m盻冲 b蘯」ng s蘯オn cテウ.\nDESCRIBE hi盻ハ th盻? c蘯・u trテコc c盻ァa m盻冲 b蘯」ng.\nThao tテ。c v盻嬖 D盻ッ li盻? c盻ァa b蘯。n\nSELECT ト柁ー盻」c dテケng khi b蘯。n mu盻創 ト黛サ皇 (ho蘯キc l盻アa ch盻肱) d盻ッ li盻? c盻ァa b蘯。n.\nINSERT ト柁ー盻」c dテケng khi b蘯。n mu盻創 thテェm (ho蘯キc chティn) d盻ッ li盻? m盻嬖.\nUPDATE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 thay ト黛サ品 (ho蘯キc c蘯ュp nh蘯ュt) d盻ッ li盻? s蘯オn cテウ.\nDELETE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 lo蘯。i b盻? (ho蘯キc xテウa) d盻ッ li盻? s蘯オn cテウ.\nREPLACE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 thテェm ho蘯キc thay ト黛サ品 (ho蘯キc ト黛サ品 ch盻?) d盻ッ li盻? m盻嬖 ho蘯キc d盻ッ li盻? ト妥」 cテウ.\nTRUNCATE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 lテ?m tr盻創g (ho蘯キc xテウa) t蘯・t c蘯」 d盻ッ li盻? t盻ォ m蘯ォu.\nGiao d盻議h\nSTART TRANSACTION ト柁ー盻」c dテケng ト黛サ? b蘯ッt ト黛コァu m盻冲 giao d盻議h.\nCOMMIT ト柁ー盻」c s盻ュ d盻・ng ト黛サ? テ。p d盻・ng cテ。c thay ト黛サ品 vテ? k蘯ソt thテコc giao d盻議h.\nROLLBACK ト柁ー盻」c s盻ュ d盻・ng ト黛サ? lo蘯。i b盻? nh盻ッng thay ト黛サ品 vテ? k蘯ソt thテコc giao d盻議h.\nM盻冲 Vテュ d盻・ ト脆。n gi蘯」n\nCテ「u l盻?h SQL cニ。 b蘯」n\nTrang nテ?y li盻? kテェ cテ。c cテ「u l盻?h SQL quan tr盻肱g nh蘯・t vテ? ch盻ゥa liテェn k蘯ソt ト黛コソn cテ。c trang tテ?i li盻?. N蘯ソu b蘯。n c蘯ァn m盻冲 hニー盻嬾g d蘯ォn cニ。 b蘯」n lテ?m th蘯ソ nテ?o ト黛サ? s盻ュ d盻・ng mテ。y ch盻ァ cニ。 s盻? d盻ッ li盻? MariaDB vテ? lテ?m th蘯ソ nテ?o ト黛サ? th盻アc thi cテ。c l盻?h ト柁。n gi蘯」n, xem M盻冲 cu盻創 sテ。ch v盻? lテイng MariaDB.\n\nト雪サ杵h nghトゥa cテ。ch d盻ッ li盻? c盻ァa b蘯。n ト柁ー盻」c lニーu tr盻ッ\nCREATE DATABASE ト柁ー盻」c dテケng ト黛サ? t蘯。o cニ。 s盻? d盻ッ li盻? m盻嬖, tr盻創g.\nDROP DATABASE ト柁ー盻」c dテケng ト黛サ? h盻ァy hoテ?n toテ?n m盻冲 cニ。 s盻? d盻ッ li盻? s蘯オn cテウ.\nUSE ト柁ー盻」c dテケng ト黛サ? l盻アa ch盻肱 m盻冲 cニ。 s盻? d盻ッ li盻? lテ?m m蘯キc ト黛サ杵h.\nCREATE TABLE ト柁ー盻」c dテケng ト黛サ? t蘯。o m盻冲 b蘯」ng m盻嬖, nニ。i mテ? d盻ッ li盻? c盻ァa b蘯。n th盻アc s盻ア ト柁ー盻」c lニーu tr盻ッ.\nALTER TABLE ト柁ー盻」c dテケng ト黛サ? s盻ュa m盻冲 ト黛サ杵h nghトゥa b蘯」ng s蘯オn cテウ.\nDROP TABLE ト柁ー盻」c s盻ュ d盻・ng ト黛サ? h盻ァy hoテ?n toテ?n m盻冲 b蘯」ng s蘯オn cテウ.\nDESCRIBE hi盻ハ th盻? c蘯・u trテコc c盻ァa m盻冲 b蘯」ng.\nThao tテ。c v盻嬖 D盻ッ li盻? c盻ァa b蘯。n\nSELECT ト柁ー盻」c dテケng khi b蘯。n mu盻創 ト黛サ皇 (ho蘯キc l盻アa ch盻肱) d盻ッ li盻? c盻ァa b蘯。n.\nINSERT ト柁ー盻」c dテケng khi b蘯。n mu盻創 thテェm (ho蘯キc chティn) d盻ッ li盻? m盻嬖.\nUPDATE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 thay ト黛サ品 (ho蘯キc c蘯ュp nh蘯ュt) d盻ッ li盻? s蘯オn cテウ.\nDELETE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 lo蘯。i b盻? (ho蘯キc xテウa) d盻ッ li盻? s蘯オn cテウ.\nREPLACE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 thテェm ho蘯キc thay ト黛サ品 (ho蘯キc ト黛サ品 ch盻?) d盻ッ li盻? m盻嬖 ho蘯キc d盻ッ li盻? ト妥」 cテウ.\nTRUNCATE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 lテ?m tr盻創g (ho蘯キc xテウa) t蘯・t c蘯」 d盻ッ li盻? t盻ォ m蘯ォu.\nGiao d盻議h\nSTART TRANSACTION ト柁ー盻」c dテケng ト黛サ? b蘯ッt ト黛コァu m盻冲 giao d盻議h.\nCOMMIT ト柁ー盻」c s盻ュ d盻・ng ト黛サ? テ。p d盻・ng cテ。c thay ト黛サ品 vテ? k蘯ソt thテコc giao d盻議h.\nROLLBACK ト柁ー盻」c s盻ュ d盻・ng ト黛サ? lo蘯。i b盻? nh盻ッng thay ト黛サ品 vテ? k蘯ソt thテコc giao d盻議h.\nM盻冲 Vテュ d盻・ ト脆。n gi蘯」n\nCテ「u l盻?h SQL cニ。 b蘯」n\nTrang nテ?y li盻? kテェ cテ。c cテ「u l盻?h SQL quan tr盻肱g nh蘯・t vテ? ch盻ゥa liテェn k蘯ソt ト黛コソn cテ。c trang tテ?i li盻?. N蘯ソu b蘯。n c蘯ァn m盻冲 hニー盻嬾g d蘯ォn cニ。 b蘯」n lテ?m th蘯ソ nテ?o ト黛サ? s盻ュ d盻・ng mテ。y ch盻ァ cニ。 s盻? d盻ッ li盻? MariaDB vテ? lテ?m th蘯ソ nテ?o ト黛サ? th盻アc thi cテ。c l盻?h ト柁。n gi蘯」n, xem M盻冲 cu盻創 sテ。ch v盻? lテイng MariaDB.\n\nト雪サ杵h nghトゥa cテ。ch d盻ッ li盻? c盻ァa b蘯。n ト柁ー盻」c lニーu tr盻ッ\nCREATE DATABASE ト柁ー盻」c dテケng ト黛サ? t蘯。o cニ。 s盻? d盻ッ li盻? m盻嬖, tr盻創g.\nDROP DATABASE ト柁ー盻」c dテケng ト黛サ? h盻ァy hoテ?n toテ?n m盻冲 cニ。 s盻? d盻ッ li盻? s蘯オn cテウ.\nUSE ト柁ー盻」c dテケng ト黛サ? l盻アa ch盻肱 m盻冲 cニ。 s盻? d盻ッ li盻? lテ?m m蘯キc ト黛サ杵h.\nCREATE TABLE ト柁ー盻」c dテケng ト黛サ? t蘯。o m盻冲 b蘯」ng m盻嬖, nニ。i mテ? d盻ッ li盻? c盻ァa b蘯。n th盻アc s盻ア ト柁ー盻」c lニーu tr盻ッ.\nALTER TABLE ト柁ー盻」c dテケng ト黛サ? s盻ュa m盻冲 ト黛サ杵h nghトゥa b蘯」ng s蘯オn cテウ.\nDROP TABLE ト柁ー盻」c s盻ュ d盻・ng ト黛サ? h盻ァy hoテ?n toテ?n m盻冲 b蘯」ng s蘯オn cテウ.\nDESCRIBE hi盻ハ th盻? c蘯・u trテコc c盻ァa m盻冲 b蘯」ng.\nThao tテ。c v盻嬖 D盻ッ li盻? c盻ァa b蘯。n\nSELECT ト柁ー盻」c dテケng khi b蘯。n mu盻創 ト黛サ皇 (ho蘯キc l盻アa ch盻肱) d盻ッ li盻? c盻ァa b蘯。n.\nINSERT ト柁ー盻」c dテケng khi b蘯。n mu盻創 thテェm (ho蘯キc chティn) d盻ッ li盻? m盻嬖.\nUPDATE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 thay ト黛サ品 (ho蘯キc c蘯ュp nh蘯ュt) d盻ッ li盻? s蘯オn cテウ.\nDELETE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 lo蘯。i b盻? (ho蘯キc xテウa) d盻ッ li盻? s蘯オn cテウ.\nREPLACE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 thテェm ho蘯キc thay ト黛サ品 (ho蘯キc ト黛サ品 ch盻?) d盻ッ li盻? m盻嬖 ho蘯キc d盻ッ li盻? ト妥」 cテウ.\nTRUNCATE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 lテ?m tr盻創g (ho蘯キc xテウa) t蘯・t c蘯」 d盻ッ li盻? t盻ォ m蘯ォu.\nGiao d盻議h\nSTART TRANSACTION ト柁ー盻」c dテケng ト黛サ? b蘯ッt ト黛コァu m盻冲 giao d盻議h.\nCOMMIT ト柁ー盻」c s盻ュ d盻・ng ト黛サ? テ。p d盻・ng cテ。c thay ト黛サ品 vテ? k蘯ソt thテコc giao d盻議h.\nROLLBACK ト柁ー盻」c s盻ュ d盻・ng ト黛サ? lo蘯。i b盻? nh盻ッng thay ト黛サ品 vテ? k蘯ソt thテコc giao d盻議h.\nM盻冲 Vテュ d盻・ ト脆。n gi蘯」n\nCテ「u l盻?h SQL cニ。 b蘯」n\nTrang nテ?y li盻? kテェ cテ。c cテ「u l盻?h SQL quan tr盻肱g nh蘯・t vテ? ch盻ゥa liテェn k蘯ソt ト黛コソn cテ。c trang tテ?i li盻?. N蘯ソu b蘯。n c蘯ァn m盻冲 hニー盻嬾g d蘯ォn cニ。 b蘯」n lテ?m th蘯ソ nテ?o ト黛サ? s盻ュ d盻・ng mテ。y ch盻ァ cニ。 s盻? d盻ッ li盻? MariaDB vテ? lテ?m th蘯ソ nテ?o ト黛サ? th盻アc thi cテ。c l盻?h ト柁。n gi蘯」n, xem M盻冲 cu盻創 sテ。ch v盻? lテイng MariaDB.\n\nト雪サ杵h nghトゥa cテ。ch d盻ッ li盻? c盻ァa b蘯。n ト柁ー盻」c lニーu tr盻ッ\nCREATE DATABASE ト柁ー盻」c dテケng ト黛サ? t蘯。o cニ。 s盻? d盻ッ li盻? m盻嬖, tr盻創g.\nDROP DATABASE ト柁ー盻」c dテケng ト黛サ? h盻ァy hoテ?n toテ?n m盻冲 cニ。 s盻? d盻ッ li盻? s蘯オn cテウ.\nUSE ト柁ー盻」c dテケng ト黛サ? l盻アa ch盻肱 m盻冲 cニ。 s盻? d盻ッ li盻? lテ?m m蘯キc ト黛サ杵h.\nCREATE TABLE ト柁ー盻」c dテケng ト黛サ? t蘯。o m盻冲 b蘯」ng m盻嬖, nニ。i mテ? d盻ッ li盻? c盻ァa b蘯。n th盻アc s盻ア ト柁ー盻」c lニーu tr盻ッ.\nALTER TABLE ト柁ー盻」c dテケng ト黛サ? s盻ュa m盻冲 ト黛サ杵h nghトゥa b蘯」ng s蘯オn cテウ.\nDROP TABLE ト柁ー盻」c s盻ュ d盻・ng ト黛サ? h盻ァy hoテ?n toテ?n m盻冲 b蘯」ng s蘯オn cテウ.\nDESCRIBE hi盻ハ th盻? c蘯・u trテコc c盻ァa m盻冲 b蘯」ng.\nThao tテ。c v盻嬖 D盻ッ li盻? c盻ァa b蘯。n\nSELECT ト柁ー盻」c dテケng khi b蘯。n mu盻創 ト黛サ皇 (ho蘯キc l盻アa ch盻肱) d盻ッ li盻? c盻ァa b蘯。n.\nINSERT ト柁ー盻」c dテケng khi b蘯。n mu盻創 thテェm (ho蘯キc chティn) d盻ッ li盻? m盻嬖.\nUPDATE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 thay ト黛サ品 (ho蘯キc c蘯ュp nh蘯ュt) d盻ッ li盻? s蘯オn cテウ.\nDELETE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 lo蘯。i b盻? (ho蘯キc xテウa) d盻ッ li盻? s蘯オn cテウ.\nREPLACE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 thテェm ho蘯キc thay ト黛サ品 (ho蘯キc ト黛サ品 ch盻?) d盻ッ li盻? m盻嬖 ho蘯キc d盻ッ li盻? ト妥」 cテウ.\nTRUNCATE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 lテ?m tr盻創g (ho蘯キc xテウa) t蘯・t c蘯」 d盻ッ li盻? t盻ォ m蘯ォu.\nGiao d盻議h\nSTART TRANSACTION ト柁ー盻」c dテケng ト黛サ? b蘯ッt ト黛コァu m盻冲 giao d盻議h.\nCOMMIT ト柁ー盻」c s盻ュ d盻・ng ト黛サ? テ。p d盻・ng cテ。c thay ト黛サ品 vテ? k蘯ソt thテコc giao d盻議h.\nROLLBACK ト柁ー盻」c s盻ュ d盻・ng ト黛サ? lo蘯。i b盻? nh盻ッng thay ト黛サ品 vテ? k蘯ソt thテコc giao d盻議h.\nM盻冲 Vテュ d盻・ ト脆。n gi蘯」n\nCテ「u l盻?h SQL cニ。 b蘯」n\nTrang nテ?y li盻? kテェ cテ。c cテ「u l盻?h SQL quan tr盻肱g nh蘯・t vテ? ch盻ゥa liテェn k蘯ソt ト黛コソn cテ。c trang tテ?i li盻?. N蘯ソu b蘯。n c蘯ァn m盻冲 hニー盻嬾g d蘯ォn cニ。 b蘯」n lテ?m th蘯ソ nテ?o ト黛サ? s盻ュ d盻・ng mテ。y ch盻ァ cニ。 s盻? d盻ッ li盻? MariaDB vテ? lテ?m th蘯ソ nテ?o ト黛サ? th盻アc thi cテ。c l盻?h ト柁。n gi蘯」n, xem M盻冲 cu盻創 sテ。ch v盻? lテイng MariaDB.\n\nト雪サ杵h nghトゥa cテ。ch d盻ッ li盻? c盻ァa b蘯。n ト柁ー盻」c lニーu tr盻ッ\nCREATE DATABASE ト柁ー盻」c dテケng ト黛サ? t蘯。o cニ。 s盻? d盻ッ li盻? m盻嬖, tr盻創g.\nDROP DATABASE ト柁ー盻」c dテケng ト黛サ? h盻ァy hoテ?n toテ?n m盻冲 cニ。 s盻? d盻ッ li盻? s蘯オn cテウ.\nUSE ト柁ー盻」c dテケng ト黛サ? l盻アa ch盻肱 m盻冲 cニ。 s盻? d盻ッ li盻? lテ?m m蘯キc ト黛サ杵h.\nCREATE TABLE ト柁ー盻」c dテケng ト黛サ? t蘯。o m盻冲 b蘯」ng m盻嬖, nニ。i mテ? d盻ッ li盻? c盻ァa b蘯。n th盻アc s盻ア ト柁ー盻」c lニーu tr盻ッ.\nALTER TABLE ト柁ー盻」c dテケng ト黛サ? s盻ュa m盻冲 ト黛サ杵h nghトゥa b蘯」ng s蘯オn cテウ.\nDROP TABLE ト柁ー盻」c s盻ュ d盻・ng ト黛サ? h盻ァy hoテ?n toテ?n m盻冲 b蘯」ng s蘯オn cテウ.\nDESCRIBE hi盻ハ th盻? c蘯・u trテコc c盻ァa m盻冲 b蘯」ng.\nThao tテ。c v盻嬖 D盻ッ li盻? c盻ァa b蘯。n\nSELECT ト柁ー盻」c dテケng khi b蘯。n mu盻創 ト黛サ皇 (ho蘯キc l盻アa ch盻肱) d盻ッ li盻? c盻ァa b蘯。n.\nINSERT ト柁ー盻」c dテケng khi b蘯。n mu盻創 thテェm (ho蘯キc chティn) d盻ッ li盻? m盻嬖.\nUPDATE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 thay ト黛サ品 (ho蘯キc c蘯ュp nh蘯ュt) d盻ッ li盻? s蘯オn cテウ.\nDELETE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 lo蘯。i b盻? (ho蘯キc xテウa) d盻ッ li盻? s蘯オn cテウ.\nREPLACE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 thテェm ho蘯キc thay ト黛サ品 (ho蘯キc ト黛サ品 ch盻?) d盻ッ li盻? m盻嬖 ho蘯キc d盻ッ li盻? ト妥」 cテウ.\nTRUNCATE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 lテ?m tr盻創g (ho蘯キc xテウa) t蘯・t c蘯」 d盻ッ li盻? t盻ォ m蘯ォu.\nGiao d盻議h\nSTART TRANSACTION ト柁ー盻」c dテケng ト黛サ? b蘯ッt ト黛コァu m盻冲 giao d盻議h.\nCOMMIT ト柁ー盻」c s盻ュ d盻・ng ト黛サ? テ。p d盻・ng cテ。c thay ト黛サ品 vテ? k蘯ソt thテコc giao d盻議h.\nROLLBACK ト柁ー盻」c s盻ュ d盻・ng ト黛サ? lo蘯。i b盻? nh盻ッng thay ト黛サ品 vテ? k蘯ソt thテコc giao d盻議h.\nM盻冲 Vテュ d盻・ ト脆。n gi蘯」n\nCテ「u l盻?h SQL cニ。 b蘯」n\nTrang nテ?y li盻? kテェ cテ。c cテ「u l盻?h SQL quan tr盻肱g nh蘯・t vテ? ch盻ゥa liテェn k蘯ソt ト黛コソn cテ。c trang tテ?i li盻?. N蘯ソu b蘯。n c蘯ァn m盻冲 hニー盻嬾g d蘯ォn cニ。 b蘯」n lテ?m th蘯ソ nテ?o ト黛サ? s盻ュ d盻・ng mテ。y ch盻ァ cニ。 s盻? d盻ッ li盻? MariaDB vテ? lテ?m th蘯ソ nテ?o ト黛サ? th盻アc thi cテ。c l盻?h ト柁。n gi蘯」n, xem M盻冲 cu盻創 sテ。ch v盻? lテイng MariaDB.\n\nト雪サ杵h nghトゥa cテ。ch d盻ッ li盻? c盻ァa b蘯。n ト柁ー盻」c lニーu tr盻ッ\nCREATE DATABASE ト柁ー盻」c dテケng ト黛サ? t蘯。o cニ。 s盻? d盻ッ li盻? m盻嬖, tr盻創g.\nDROP DATABASE ト柁ー盻」c dテケng ト黛サ? h盻ァy hoテ?n toテ?n m盻冲 cニ。 s盻? d盻ッ li盻? s蘯オn cテウ.\nUSE ト柁ー盻」c dテケng ト黛サ? l盻アa ch盻肱 m盻冲 cニ。 s盻? d盻ッ li盻? lテ?m m蘯キc ト黛サ杵h.\nCREATE TABLE ト柁ー盻」c dテケng ト黛サ? t蘯。o m盻冲 b蘯」ng m盻嬖, nニ。i mテ? d盻ッ li盻? c盻ァa b蘯。n th盻アc s盻ア ト柁ー盻」c lニーu tr盻ッ.\nALTER TABLE ト柁ー盻」c dテケng ト黛サ? s盻ュa m盻冲 ト黛サ杵h nghトゥa b蘯」ng s蘯オn cテウ.\nDROP TABLE ト柁ー盻」c s盻ュ d盻・ng ト黛サ? h盻ァy hoテ?n toテ?n m盻冲 b蘯」ng s蘯オn cテウ.\nDESCRIBE hi盻ハ th盻? c蘯・u trテコc c盻ァa m盻冲 b蘯」ng.\nThao tテ。c v盻嬖 D盻ッ li盻? c盻ァa b蘯。n\nSELECT ト柁ー盻」c dテケng khi b蘯。n mu盻創 ト黛サ皇 (ho蘯キc l盻アa ch盻肱) d盻ッ li盻? c盻ァa b蘯。n.\nINSERT ト柁ー盻」c dテケng khi b蘯。n mu盻創 thテェm (ho蘯キc chティn) d盻ッ li盻? m盻嬖.\nUPDATE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 thay ト黛サ品 (ho蘯キc c蘯ュp nh蘯ュt) d盻ッ li盻? s蘯オn cテウ.\nDELETE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 lo蘯。i b盻? (ho蘯キc xテウa) d盻ッ li盻? s蘯オn cテウ.\nREPLACE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 thテェm ho蘯キc thay ト黛サ品 (ho蘯キc ト黛サ品 ch盻?) d盻ッ li盻? m盻嬖 ho蘯キc d盻ッ li盻? ト妥」 cテウ.\nTRUNCATE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 lテ?m tr盻創g (ho蘯キc xテウa) t蘯・t c蘯」 d盻ッ li盻? t盻ォ m蘯ォu.\nGiao d盻議h\nSTART TRANSACTION ト柁ー盻」c dテケng ト黛サ? b蘯ッt ト黛コァu m盻冲 giao d盻議h.\nCOMMIT ト柁ー盻」c s盻ュ d盻・ng ト黛サ? テ。p d盻・ng cテ。c thay ト黛サ品 vテ? k蘯ソt thテコc giao d盻議h.\nROLLBACK ト柁ー盻」c s盻ュ d盻・ng ト黛サ? lo蘯。i b盻? nh盻ッng thay ト黛サ品 vテ? k蘯ソt thテコc giao d盻議h.\nM盻冲 Vテュ d盻・ ト脆。n gi蘯」n\nCテ「u l盻?h SQL cニ。 b蘯」n\nTrang nテ?y li盻? kテェ cテ。c cテ「u l盻?h SQL quan tr盻肱g nh蘯・t vテ? ch盻ゥa liテェn k蘯ソt ト黛コソn cテ。c trang tテ?i li盻?. N蘯ソu b蘯。n c蘯ァn m盻冲 hニー盻嬾g d蘯ォn cニ。 b蘯」n lテ?m th蘯ソ nテ?o ト黛サ? s盻ュ d盻・ng mテ。y ch盻ァ cニ。 s盻? d盻ッ li盻? MariaDB vテ? lテ?m th蘯ソ nテ?o ト黛サ? th盻アc thi cテ。c l盻?h ト柁。n gi蘯」n, xem M盻冲 cu盻創 sテ。ch v盻? lテイng MariaDB.\n\nト雪サ杵h nghトゥa cテ。ch d盻ッ li盻? c盻ァa b蘯。n ト柁ー盻」c lニーu tr盻ッ\nCREATE DATABASE ト柁ー盻」c dテケng ト黛サ? t蘯。o cニ。 s盻? d盻ッ li盻? m盻嬖, tr盻創g.\nDROP DATABASE ト柁ー盻」c dテケng ト黛サ? h盻ァy hoテ?n toテ?n m盻冲 cニ。 s盻? d盻ッ li盻? s蘯オn cテウ.\nUSE ト柁ー盻」c dテケng ト黛サ? l盻アa ch盻肱 m盻冲 cニ。 s盻? d盻ッ li盻? lテ?m m蘯キc ト黛サ杵h.\nCREATE TABLE ト柁ー盻」c dテケng ト黛サ? t蘯。o m盻冲 b蘯」ng m盻嬖, nニ。i mテ? d盻ッ li盻? c盻ァa b蘯。n th盻アc s盻ア ト柁ー盻」c lニーu tr盻ッ.\nALTER TABLE ト柁ー盻」c dテケng ト黛サ? s盻ュa m盻冲 ト黛サ杵h nghトゥa b蘯」ng s蘯オn cテウ.\nDROP TABLE ト柁ー盻」c s盻ュ d盻・ng ト黛サ? h盻ァy hoテ?n toテ?n m盻冲 b蘯」ng s蘯オn cテウ.\nDESCRIBE hi盻ハ th盻? c蘯・u trテコc c盻ァa m盻冲 b蘯」ng.\nThao tテ。c v盻嬖 D盻ッ li盻? c盻ァa b蘯。n\nSELECT ト柁ー盻」c dテケng khi b蘯。n mu盻創 ト黛サ皇 (ho蘯キc l盻アa ch盻肱) d盻ッ li盻? c盻ァa b蘯。n.\nINSERT ト柁ー盻」c dテケng khi b蘯。n mu盻創 thテェm (ho蘯キc chティn) d盻ッ li盻? m盻嬖.\nUPDATE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 thay ト黛サ品 (ho蘯キc c蘯ュp nh蘯ュt) d盻ッ li盻? s蘯オn cテウ.\nDELETE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 lo蘯。i b盻? (ho蘯キc xテウa) d盻ッ li盻? s蘯オn cテウ.\nREPLACE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 thテェm ho蘯キc thay ト黛サ品 (ho蘯キc ト黛サ品 ch盻?) d盻ッ li盻? m盻嬖 ho蘯キc d盻ッ li盻? ト妥」 cテウ.\nTRUNCATE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 lテ?m tr盻創g (ho蘯キc xテウa) t蘯・t c蘯」 d盻ッ li盻? t盻ォ m蘯ォu.\nGiao d盻議h\nSTART TRANSACTION ト柁ー盻」c dテケng ト黛サ? b蘯ッt ト黛コァu m盻冲 giao d盻議h.\nCOMMIT ト柁ー盻」c s盻ュ d盻・ng ト黛サ? テ。p d盻・ng cテ。c thay ト黛サ品 vテ? k蘯ソt thテコc giao d盻議h.\nROLLBACK ト柁ー盻」c s盻ュ d盻・ng ト黛サ? lo蘯。i b盻? nh盻ッng thay ト黛サ品 vテ? k蘯ソt thテコc giao d盻議h.\nM盻冲 Vテュ d盻・ ト脆。n gi蘯」n\nCテ「u l盻?h SQL cニ。 b蘯」n\nTrang nテ?y li盻? kテェ cテ。c cテ「u l盻?h SQL quan tr盻肱g nh蘯・t vテ? ch盻ゥa liテェn k蘯ソt ト黛コソn cテ。c trang tテ?i li盻?. N蘯ソu b蘯。n c蘯ァn m盻冲 hニー盻嬾g d蘯ォn cニ。 b蘯」n lテ?m th蘯ソ nテ?o ト黛サ? s盻ュ d盻・ng mテ。y ch盻ァ cニ。 s盻? d盻ッ li盻? MariaDB vテ? lテ?m th蘯ソ nテ?o ト黛サ? th盻アc thi cテ。c l盻?h ト柁。n gi蘯」n, xem M盻冲 cu盻創 sテ。ch v盻? lテイng MariaDB.\n\nト雪サ杵h nghトゥa cテ。ch d盻ッ li盻? c盻ァa b蘯。n ト柁ー盻」c lニーu tr盻ッ\nCREATE DATABASE ト柁ー盻」c dテケng ト黛サ? t蘯。o cニ。 s盻? d盻ッ li盻? m盻嬖, tr盻創g.\nDROP DATABASE ト柁ー盻」c dテケng ト黛サ? h盻ァy hoテ?n toテ?n m盻冲 cニ。 s盻? d盻ッ li盻? s蘯オn cテウ.\nUSE ト柁ー盻」c dテケng ト黛サ? l盻アa ch盻肱 m盻冲 cニ。 s盻? d盻ッ li盻? lテ?m m蘯キc ト黛サ杵h.\nCREATE TABLE ト柁ー盻」c dテケng ト黛サ? t蘯。o m盻冲 b蘯」ng m盻嬖, nニ。i mテ? d盻ッ li盻? c盻ァa b蘯。n th盻アc s盻ア ト柁ー盻」c lニーu tr盻ッ.\nALTER TABLE ト柁ー盻」c dテケng ト黛サ? s盻ュa m盻冲 ト黛サ杵h nghトゥa b蘯」ng s蘯オn cテウ.\nDROP TABLE ト柁ー盻」c s盻ュ d盻・ng ト黛サ? h盻ァy hoテ?n toテ?n m盻冲 b蘯」ng s蘯オn cテウ.\nDESCRIBE hi盻ハ th盻? c蘯・u trテコc c盻ァa m盻冲 b蘯」ng.\nThao tテ。c v盻嬖 D盻ッ li盻? c盻ァa b蘯。n\nSELECT ト柁ー盻」c dテケng khi b蘯。n mu盻創 ト黛サ皇 (ho蘯キc l盻アa ch盻肱) d盻ッ li盻? c盻ァa b蘯。n.\nINSERT ト柁ー盻」c dテケng khi b蘯。n mu盻創 thテェm (ho蘯キc chティn) d盻ッ li盻? m盻嬖.\nUPDATE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 thay ト黛サ品 (ho蘯キc c蘯ュp nh蘯ュt) d盻ッ li盻? s蘯オn cテウ.\nDELETE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 lo蘯。i b盻? (ho蘯キc xテウa) d盻ッ li盻? s蘯オn cテウ.\nREPLACE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 thテェm ho蘯キc thay ト黛サ品 (ho蘯キc ト黛サ品 ch盻?) d盻ッ li盻? m盻嬖 ho蘯キc d盻ッ li盻? ト妥」 cテウ.\nTRUNCATE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 lテ?m tr盻創g (ho蘯キc xテウa) t蘯・t c蘯」 d盻ッ li盻? t盻ォ m蘯ォu.\nGiao d盻議h\nSTART TRANSACTION ト柁ー盻」c dテケng ト黛サ? b蘯ッt ト黛コァu m盻冲 giao d盻議h.\nCOMMIT ト柁ー盻」c s盻ュ d盻・ng ト黛サ? テ。p d盻・ng cテ。c thay ト黛サ品 vテ? k蘯ソt thテコc giao d盻議h.\nROLLBACK ト柁ー盻」c s盻ュ d盻・ng ト黛サ? lo蘯。i b盻? nh盻ッng thay ト黛サ品 vテ? k蘯ソt thテコc giao d盻議h.\nM盻冲 Vテュ d盻・ ト脆。n gi蘯」n\nCテ「u l盻?h SQL cニ。 b蘯」n\nTrang nテ?y li盻? kテェ cテ。c cテ「u l盻?h SQL quan tr盻肱g nh蘯・t vテ? ch盻ゥa liテェn k蘯ソt ト黛コソn cテ。c trang tテ?i li盻?. N蘯ソu b蘯。n c蘯ァn m盻冲 hニー盻嬾g d蘯ォn cニ。 b蘯」n lテ?m th蘯ソ nテ?o ト黛サ? s盻ュ d盻・ng mテ。y ch盻ァ cニ。 s盻? d盻ッ li盻? MariaDB vテ? lテ?m th蘯ソ nテ?o ト黛サ? th盻アc thi cテ。c l盻?h ト柁。n gi蘯」n, xem M盻冲 cu盻創 sテ。ch v盻? lテイng MariaDB.\n\nト雪サ杵h nghトゥa cテ。ch d盻ッ li盻? c盻ァa b蘯。n ト柁ー盻」c lニーu tr盻ッ\nCREATE DATABASE ト柁ー盻」c dテケng ト黛サ? t蘯。o cニ。 s盻? d盻ッ li盻? m盻嬖, tr盻創g.\nDROP DATABASE ト柁ー盻」c dテケng ト黛サ? h盻ァy hoテ?n toテ?n m盻冲 cニ。 s盻? d盻ッ li盻? s蘯オn cテウ.\nUSE ト柁ー盻」c dテケng ト黛サ? l盻アa ch盻肱 m盻冲 cニ。 s盻? d盻ッ li盻? lテ?m m蘯キc ト黛サ杵h.\nCREATE TABLE ト柁ー盻」c dテケng ト黛サ? t蘯。o m盻冲 b蘯」ng m盻嬖, nニ。i mテ? d盻ッ li盻? c盻ァa b蘯。n th盻アc s盻ア ト柁ー盻」c lニーu tr盻ッ.\nALTER TABLE ト柁ー盻」c dテケng ト黛サ? s盻ュa m盻冲 ト黛サ杵h nghトゥa b蘯」ng s蘯オn cテウ.\nDROP TABLE ト柁ー盻」c s盻ュ d盻・ng ト黛サ? h盻ァy hoテ?n toテ?n m盻冲 b蘯」ng s蘯オn cテウ.\nDESCRIBE hi盻ハ th盻? c蘯・u trテコc c盻ァa m盻冲 b蘯」ng.\nThao tテ。c v盻嬖 D盻ッ li盻? c盻ァa b蘯。n\nSELECT ト柁ー盻」c dテケng khi b蘯。n mu盻創 ト黛サ皇 (ho蘯キc l盻アa ch盻肱) d盻ッ li盻? c盻ァa b蘯。n.\nINSERT ト柁ー盻」c dテケng khi b蘯。n mu盻創 thテェm (ho蘯キc chティn) d盻ッ li盻? m盻嬖.\nUPDATE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 thay ト黛サ品 (ho蘯キc c蘯ュp nh蘯ュt) d盻ッ li盻? s蘯オn cテウ.\nDELETE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 lo蘯。i b盻? (ho蘯キc xテウa) d盻ッ li盻? s蘯オn cテウ.\nREPLACE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 thテェm ho蘯キc thay ト黛サ品 (ho蘯キc ト黛サ品 ch盻?) d盻ッ li盻? m盻嬖 ho蘯キc d盻ッ li盻? ト妥」 cテウ.\nTRUNCATE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 lテ?m tr盻創g (ho蘯キc xテウa) t蘯・t c蘯」 d盻ッ li盻? t盻ォ m蘯ォu.\nGiao d盻議h\nSTART TRANSACTION ト柁ー盻」c dテケng ト黛サ? b蘯ッt ト黛コァu m盻冲 giao d盻議h.\nCOMMIT ト柁ー盻」c s盻ュ d盻・ng ト黛サ? テ。p d盻・ng cテ。c thay ト黛サ品 vテ? k蘯ソt thテコc giao d盻議h.\nROLLBACK ト柁ー盻」c s盻ュ d盻・ng ト黛サ? lo蘯。i b盻? nh盻ッng thay ト黛サ品 vテ? k蘯ソt thテコc giao d盻議h.\nM盻冲 Vテュ d盻・ ト脆。n gi蘯」n\nCテ「u l盻?h SQL cニ。 b蘯」n\nTrang nテ?y li盻? kテェ cテ。c cテ「u l盻?h SQL quan tr盻肱g nh蘯・t vテ? ch盻ゥa liテェn k蘯ソt ト黛コソn cテ。c trang tテ?i li盻?. N蘯ソu b蘯。n c蘯ァn m盻冲 hニー盻嬾g d蘯ォn cニ。 b蘯」n lテ?m th蘯ソ nテ?o ト黛サ? s盻ュ d盻・ng mテ。y ch盻ァ cニ。 s盻? d盻ッ li盻? MariaDB vテ? lテ?m th蘯ソ nテ?o ト黛サ? th盻アc thi cテ。c l盻?h ト柁。n gi蘯」n, xem M盻冲 cu盻創 sテ。ch v盻? lテイng MariaDB.\n\nト雪サ杵h nghトゥa cテ。ch d盻ッ li盻? c盻ァa b蘯。n ト柁ー盻」c lニーu tr盻ッ\nCREATE DATABASE ト柁ー盻」c dテケng ト黛サ? t蘯。o cニ。 s盻? d盻ッ li盻? m盻嬖, tr盻創g.\nDROP DATABASE ト柁ー盻」c dテケng ト黛サ? h盻ァy hoテ?n toテ?n m盻冲 cニ。 s盻? d盻ッ li盻? s蘯オn cテウ.\nUSE ト柁ー盻」c dテケng ト黛サ? l盻アa ch盻肱 m盻冲 cニ。 s盻? d盻ッ li盻? lテ?m m蘯キc ト黛サ杵h.\nCREATE TABLE ト柁ー盻」c dテケng ト黛サ? t蘯。o m盻冲 b蘯」ng m盻嬖, nニ。i mテ? d盻ッ li盻? c盻ァa b蘯。n th盻アc s盻ア ト柁ー盻」c lニーu tr盻ッ.\nALTER TABLE ト柁ー盻」c dテケng ト黛サ? s盻ュa m盻冲 ト黛サ杵h nghトゥa b蘯」ng s蘯オn cテウ.\nDROP TABLE ト柁ー盻」c s盻ュ d盻・ng ト黛サ? h盻ァy hoテ?n toテ?n m盻冲 b蘯」ng s蘯オn cテウ.\nDESCRIBE hi盻ハ th盻? c蘯・u trテコc c盻ァa m盻冲 b蘯」ng.\nThao tテ。c v盻嬖 D盻ッ li盻? c盻ァa b蘯。n\nSELECT ト柁ー盻」c dテケng khi b蘯。n mu盻創 ト黛サ皇 (ho蘯キc l盻アa ch盻肱) d盻ッ li盻? c盻ァa b蘯。n.\nINSERT ト柁ー盻」c dテケng khi b蘯。n mu盻創 thテェm (ho蘯キc chティn) d盻ッ li盻? m盻嬖.\nUPDATE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 thay ト黛サ品 (ho蘯キc c蘯ュp nh蘯ュt) d盻ッ li盻? s蘯オn cテウ.\nDELETE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 lo蘯。i b盻? (ho蘯キc xテウa) d盻ッ li盻? s蘯オn cテウ.\nREPLACE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 thテェm ho蘯キc thay ト黛サ品 (ho蘯キc ト黛サ品 ch盻?) d盻ッ li盻? m盻嬖 ho蘯キc d盻ッ li盻? ト妥」 cテウ.\nTRUNCATE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 lテ?m tr盻創g (ho蘯キc xテウa) t蘯・t c蘯」 d盻ッ li盻? t盻ォ m蘯ォu.\nGiao d盻議h\nSTART TRANSACTION ト柁ー盻」c dテケng ト黛サ? b蘯ッt ト黛コァu m盻冲 giao d盻議h.\nCOMMIT ト柁ー盻」c s盻ュ d盻・ng ト黛サ? テ。p d盻・ng cテ。c thay ト黛サ品 vテ? k蘯ソt thテコc giao d盻議h.\nROLLBACK ト柁ー盻」c s盻ュ d盻・ng ト黛サ? lo蘯。i b盻? nh盻ッng thay ト黛サ品 vテ? k蘯ソt thテコc giao d盻議h.\nM盻冲 Vテュ d盻・ ト脆。n gi蘯」n\nCテ「u l盻?h SQL cニ。 b蘯」n\nTrang nテ?y li盻? kテェ cテ。c cテ「u l盻?h SQL quan tr盻肱g nh蘯・t vテ? ch盻ゥa liテェn k蘯ソt ト黛コソn cテ。c trang tテ?i li盻?. N蘯ソu b蘯。n c蘯ァn m盻冲 hニー盻嬾g d蘯ォn cニ。 b蘯」n lテ?m th蘯ソ nテ?o ト黛サ? s盻ュ d盻・ng mテ。y ch盻ァ cニ。 s盻? d盻ッ li盻? MariaDB vテ? lテ?m th蘯ソ nテ?o ト黛サ? th盻アc thi cテ。c l盻?h ト柁。n gi蘯」n, xem M盻冲 cu盻創 sテ。ch v盻? lテイng MariaDB.\n\nト雪サ杵h nghトゥa cテ。ch d盻ッ li盻? c盻ァa b蘯。n ト柁ー盻」c lニーu tr盻ッ\nCREATE DATABASE ト柁ー盻」c dテケng ト黛サ? t蘯。o cニ。 s盻? d盻ッ li盻? m盻嬖, tr盻創g.\nDROP DATABASE ト柁ー盻」c dテケng ト黛サ? h盻ァy hoテ?n toテ?n m盻冲 cニ。 s盻? d盻ッ li盻? s蘯オn cテウ.\nUSE ト柁ー盻」c dテケng ト黛サ? l盻アa ch盻肱 m盻冲 cニ。 s盻? d盻ッ li盻? lテ?m m蘯キc ト黛サ杵h.\nCREATE TABLE ト柁ー盻」c dテケng ト黛サ? t蘯。o m盻冲 b蘯」ng m盻嬖, nニ。i mテ? d盻ッ li盻? c盻ァa b蘯。n th盻アc s盻ア ト柁ー盻」c lニーu tr盻ッ.\nALTER TABLE ト柁ー盻」c dテケng ト黛サ? s盻ュa m盻冲 ト黛サ杵h nghトゥa b蘯」ng s蘯オn cテウ.\nDROP TABLE ト柁ー盻」c s盻ュ d盻・ng ト黛サ? h盻ァy hoテ?n toテ?n m盻冲 b蘯」ng s蘯オn cテウ.\nDESCRIBE hi盻ハ th盻? c蘯・u trテコc c盻ァa m盻冲 b蘯」ng.\nThao tテ。c v盻嬖 D盻ッ li盻? c盻ァa b蘯。n\nSELECT ト柁ー盻」c dテケng khi b蘯。n mu盻創 ト黛サ皇 (ho蘯キc l盻アa ch盻肱) d盻ッ li盻? c盻ァa b蘯。n.\nINSERT ト柁ー盻」c dテケng khi b蘯。n mu盻創 thテェm (ho蘯キc chティn) d盻ッ li盻? m盻嬖.\nUPDATE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 thay ト黛サ品 (ho蘯キc c蘯ュp nh蘯ュt) d盻ッ li盻? s蘯オn cテウ.\nDELETE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 lo蘯。i b盻? (ho蘯キc xテウa) d盻ッ li盻? s蘯オn cテウ.\nREPLACE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 thテェm ho蘯キc thay ト黛サ品 (ho蘯キc ト黛サ品 ch盻?) d盻ッ li盻? m盻嬖 ho蘯キc d盻ッ li盻? ト妥」 cテウ.\nTRUNCATE ト柁ー盻」c s盻ュ d盻・ng khi b蘯。n mu盻創 lテ?m tr盻創g (ho蘯キc xテウa) t蘯・t c蘯」 d盻ッ li盻? t盻ォ m蘯ォu.\nGiao d盻議h\nSTART TRANSACTION ト柁ー盻」c dテケng ト黛サ? b蘯ッt ト黛コァu m盻冲 giao d盻議h.\nCOMMIT ト柁ー盻」c s盻ュ d盻・ng ト黛サ? テ。p d盻・ng cテ。c thay ト黛サ品 vテ? k蘯ソ',NULL,'v',5,9,'1974-08-26 13:43:18.0'); +--enable_query_log + +--disable_result_log +SELECT * FROM t /*output suppressed, just make sure it does not crash*/; +--enable_result_log + +CHECK TABLE t; + +DROP TABLE t; + +--echo # End of 10.5 tests diff --git a/mysql-test/main/ctype_ucs.result b/mysql-test/main/ctype_ucs.result index 77a0e14b8bc..5892b54fa00 100644 --- a/mysql-test/main/ctype_ucs.result +++ b/mysql-test/main/ctype_ucs.result @@ -6555,6 +6555,15 @@ SELECT CAST(CONVERT('-9223372036854775808' USING ucs2) AS SIGNED) AS c1; c1 -9223372036854775808 # +# MDEV-30111 InnoDB: Failing assertion: update->n_fields == 0 in row_ins_sec_index_entry_by_modify +# +select strcmp(_ucs2'' collate ucs2_general_nopad_ci, _ucs2 0x00000001000500000001) as c1; +c1 +-1 +select strcmp(_ucs2'' collate ucs2_nopad_bin, _ucs2 0x00000001000500000001) as c1; +c1 +-1 +# # End of 10.5 tests # # diff --git a/mysql-test/main/ctype_ucs.test b/mysql-test/main/ctype_ucs.test index 7b2db58fc64..b86ba226ba9 100644 --- a/mysql-test/main/ctype_ucs.test +++ b/mysql-test/main/ctype_ucs.test @@ -1236,6 +1236,13 @@ DROP TABLE t1; SELECT CAST(CONVERT('-9223372036854775808' USING ucs2) AS SIGNED) AS c1; +--echo # +--echo # MDEV-30111 InnoDB: Failing assertion: update->n_fields == 0 in row_ins_sec_index_entry_by_modify +--echo # + +select strcmp(_ucs2'' collate ucs2_general_nopad_ci, _ucs2 0x00000001000500000001) as c1; +select strcmp(_ucs2'' collate ucs2_nopad_bin, _ucs2 0x00000001000500000001) as c1; + --echo # --echo # End of 10.5 tests --echo # diff --git a/mysql-test/main/ctype_ujis.result b/mysql-test/main/ctype_ujis.result index 435837859c6..6bd4ea11d25 100644 --- a/mysql-test/main/ctype_ujis.result +++ b/mysql-test/main/ctype_ujis.result @@ -27086,3 +27086,18 @@ SET DEFAULT_STORAGE_ENGINE=Default; # # End of 10.2 tests # +# +# Start of 10.5 tests +# +# +# MDEV-30111 InnoDB: Failing assertion: update->n_fields == 0 in row_ins_sec_index_entry_by_modify +# +select strcmp(_ujis'' collate ujis_japanese_nopad_ci, _ujis 0x0001050001) as c1; +c1 +-1 +select strcmp(_ujis'' collate ujis_nopad_bin, _ujis 0x0001050001) as c1; +c1 +-1 +# +# End of 10.5 tests +# diff --git a/mysql-test/main/ctype_ujis.test b/mysql-test/main/ctype_ujis.test index 249c523ebec..0cd280f65fc 100644 --- a/mysql-test/main/ctype_ujis.test +++ b/mysql-test/main/ctype_ujis.test @@ -1446,3 +1446,18 @@ let $coll_pad='ujis_bin'; --echo # --echo # End of 10.2 tests --echo # + +--echo # +--echo # Start of 10.5 tests +--echo # + +--echo # +--echo # MDEV-30111 InnoDB: Failing assertion: update->n_fields == 0 in row_ins_sec_index_entry_by_modify +--echo # + +select strcmp(_ujis'' collate ujis_japanese_nopad_ci, _ujis 0x0001050001) as c1; +select strcmp(_ujis'' collate ujis_nopad_bin, _ujis 0x0001050001) as c1; + +--echo # +--echo # End of 10.5 tests +--echo # diff --git a/mysql-test/main/ctype_utf32.result b/mysql-test/main/ctype_utf32.result index 17f9391667d..532903b43da 100644 --- a/mysql-test/main/ctype_utf32.result +++ b/mysql-test/main/ctype_utf32.result @@ -3031,12 +3031,66 @@ SELECT CAST(CONVERT('-9223372036854775808' USING utf32) AS SIGNED) AS c1; c1 -9223372036854775808 # +# MDEV-29968 Functions in default values in tables with some character sets break SHOW CREATE (and mysqldump) +# +SET NAMES utf8mb4; +CREATE TABLE t1 (a CHAR(8) DEFAULT REVERSE('aha')) CHARACTER SET utf32; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` char(8) DEFAULT reverse('aha') +) ENGINE=MyISAM DEFAULT CHARSET=utf32 COLLATE=utf32_general_ci +INSERT INTO t1 VALUES (); +SELECT * FROM t1; +a +aha +CREATE TABLE t2 (a CHAR(8) DEFAULT REVERSE('åäá')) CHARACTER SET utf32; +SHOW CREATE TABLE t2; +Table Create Table +t2 CREATE TABLE `t2` ( + `a` char(8) DEFAULT reverse('åäá') +) ENGINE=MyISAM DEFAULT CHARSET=utf32 COLLATE=utf32_general_ci +INSERT INTO t2 VALUES (); +SELECT * FROM t2; +a +áäå +CREATE TABLE t3 (a CHAR(8) DEFAULT REVERSE('😎😀')) CHARACTER SET utf32; +SHOW CREATE TABLE t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `a` char(8) DEFAULT reverse('😎😀') +) ENGINE=MyISAM DEFAULT CHARSET=utf32 COLLATE=utf32_general_ci +INSERT INTO t3 VALUES (); +SELECT * FROM t3; +a +😀😎 +CREATE TABLE t4 (a CHAR(8), b CHAR(8) AS (REVERSE('😎😀'))) CHARACTER SET utf32; +SHOW CREATE TABLE t4; +Table Create Table +t4 CREATE TABLE `t4` ( + `a` char(8) DEFAULT NULL, + `b` char(8) GENERATED ALWAYS AS (reverse('😎😀')) VIRTUAL +) ENGINE=MyISAM DEFAULT CHARSET=utf32 COLLATE=utf32_general_ci +INSERT INTO t4 (a) VALUES (''); +SELECT * FROM t4; +a b + 😀😎 +CREATE TABLE t5 (a CHAR(8), b CHAR(8) CHECK (b=BINARY REVERSE('😎😀'))) CHARACTER SET utf32; +SHOW CREATE TABLE t5; +Table Create Table +t5 CREATE TABLE `t5` ( + `a` char(8) DEFAULT NULL, + `b` char(8) DEFAULT NULL CHECK (`b` = cast(reverse('😎😀') as char charset binary)) +) ENGINE=MyISAM DEFAULT CHARSET=utf32 COLLATE=utf32_general_ci +INSERT INTO t5 VALUES ('','😎😀'); +ERROR 23000: CONSTRAINT `t5.b` failed for `test`.`t5` +INSERT INTO t5 VALUES ('','😀😎'); +SELECT * FROM t5; +a b + 😀😎 +DROP TABLE t1, t2, t3, t4, t5; # End of 10.5 tests # -# -# Start of 10.11 tests -# -# # MDEV-10865 COLLATE keyword doesn't work in PREPARE query # # @@ -3115,6 +3169,4 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; SET NAMES utf8mb4; -# # End of 10.11 tests -# diff --git a/mysql-test/main/ctype_utf32.test b/mysql-test/main/ctype_utf32.test index 1542cbaee62..93b5a69f058 100644 --- a/mysql-test/main/ctype_utf32.test +++ b/mysql-test/main/ctype_utf32.test @@ -1168,12 +1168,15 @@ SELECT HEX(DATE_FORMAT(TIME'11:22:33',@format)); SELECT CAST(CONVERT('-9223372036854775808' USING utf32) AS SIGNED) AS c1; --echo # ---echo # End of 10.5 tests +--echo # MDEV-29968 Functions in default values in tables with some character sets break SHOW CREATE (and mysqldump) --echo # ---echo # ---echo # Start of 10.11 tests ---echo # +SET NAMES utf8mb4; +--let $table_charset=CHARACTER SET utf32 +--source include/ctype_supplementary_chars.inc +DROP TABLE t1, t2, t3, t4, t5; + +--echo # End of 10.5 tests --echo # --echo # MDEV-10865 COLLATE keyword doesn't work in PREPARE query @@ -1243,8 +1246,6 @@ DROP TABLE t1; SET NAMES utf8mb4; ---echo # --echo # End of 10.11 tests ---echo # --enable_service_connection diff --git a/mysql-test/main/ctype_utf32_not_embedded.result b/mysql-test/main/ctype_utf32_not_embedded.result new file mode 100644 index 00000000000..55840fb4893 --- /dev/null +++ b/mysql-test/main/ctype_utf32_not_embedded.result @@ -0,0 +1,106 @@ +# Start of 10.5 tests +# +# MDEV-29968 Functions in default values in tables with some character sets break SHOW CREATE (and mysqldump) +# +SET NAMES utf8mb4; +CREATE TABLE t1 (a CHAR(8) DEFAULT REVERSE('aha')) CHARACTER SET utf32; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` char(8) DEFAULT reverse('aha') +) ENGINE=MyISAM DEFAULT CHARSET=utf32 COLLATE=utf32_general_ci +INSERT INTO t1 VALUES (); +SELECT * FROM t1; +a +aha +CREATE TABLE t2 (a CHAR(8) DEFAULT REVERSE('åäá')) CHARACTER SET utf32; +SHOW CREATE TABLE t2; +Table Create Table +t2 CREATE TABLE `t2` ( + `a` char(8) DEFAULT reverse('åäá') +) ENGINE=MyISAM DEFAULT CHARSET=utf32 COLLATE=utf32_general_ci +INSERT INTO t2 VALUES (); +SELECT * FROM t2; +a +áäå +CREATE TABLE t3 (a CHAR(8) DEFAULT REVERSE('😎😀')) CHARACTER SET utf32; +SHOW CREATE TABLE t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `a` char(8) DEFAULT reverse('😎😀') +) ENGINE=MyISAM DEFAULT CHARSET=utf32 COLLATE=utf32_general_ci +INSERT INTO t3 VALUES (); +SELECT * FROM t3; +a +😀😎 +CREATE TABLE t4 (a CHAR(8), b CHAR(8) AS (REVERSE('😎😀'))) CHARACTER SET utf32; +SHOW CREATE TABLE t4; +Table Create Table +t4 CREATE TABLE `t4` ( + `a` char(8) DEFAULT NULL, + `b` char(8) GENERATED ALWAYS AS (reverse('😎😀')) VIRTUAL +) ENGINE=MyISAM DEFAULT CHARSET=utf32 COLLATE=utf32_general_ci +INSERT INTO t4 (a) VALUES (''); +SELECT * FROM t4; +a b + 😀😎 +CREATE TABLE t5 (a CHAR(8), b CHAR(8) CHECK (b=BINARY REVERSE('😎😀'))) CHARACTER SET utf32; +SHOW CREATE TABLE t5; +Table Create Table +t5 CREATE TABLE `t5` ( + `a` char(8) DEFAULT NULL, + `b` char(8) DEFAULT NULL CHECK (`b` = cast(reverse('😎😀') as char charset binary)) +) ENGINE=MyISAM DEFAULT CHARSET=utf32 COLLATE=utf32_general_ci +INSERT INTO t5 VALUES ('','😎😀'); +ERROR 23000: CONSTRAINT `t5.b` failed for `test`.`t5` +INSERT INTO t5 VALUES ('','😀😎'); +SELECT * FROM t5; +a b + 😀😎 +# Running dump +DROP TABLE t1, t2, t3, t4, t5; +# Running restore +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` char(8) DEFAULT reverse('aha') +) ENGINE=MyISAM DEFAULT CHARSET=utf32 COLLATE=utf32_general_ci +SELECT * FROM t1; +a +aha +SHOW CREATE TABLE t2; +Table Create Table +t2 CREATE TABLE `t2` ( + `a` char(8) DEFAULT reverse('åäá') +) ENGINE=MyISAM DEFAULT CHARSET=utf32 COLLATE=utf32_general_ci +SELECT * FROM t2; +a +áäå +SHOW CREATE TABLE t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `a` char(8) DEFAULT reverse('😎😀') +) ENGINE=MyISAM DEFAULT CHARSET=utf32 COLLATE=utf32_general_ci +SELECT * FROM t3; +a +😀😎 +SHOW CREATE TABLE t4; +Table Create Table +t4 CREATE TABLE `t4` ( + `a` char(8) DEFAULT NULL, + `b` char(8) GENERATED ALWAYS AS (reverse('😎😀')) VIRTUAL +) ENGINE=MyISAM DEFAULT CHARSET=utf32 COLLATE=utf32_general_ci +SELECT * FROM t4; +a b + 😀😎 +SHOW CREATE TABLE t5; +Table Create Table +t5 CREATE TABLE `t5` ( + `a` char(8) DEFAULT NULL, + `b` char(8) DEFAULT NULL CHECK (`b` = cast(reverse('😎😀') as char charset binary)) +) ENGINE=MyISAM DEFAULT CHARSET=utf32 COLLATE=utf32_general_ci +SELECT * FROM t5; +a b + 😀😎 +DROP TABLE t1, t2, t3, t4, t5; +# End of 10.5 tests diff --git a/mysql-test/main/ctype_utf32_not_embedded.test b/mysql-test/main/ctype_utf32_not_embedded.test new file mode 100644 index 00000000000..622ba074078 --- /dev/null +++ b/mysql-test/main/ctype_utf32_not_embedded.test @@ -0,0 +1,38 @@ +# Embedded server doesn't support external clients +--source include/not_embedded.inc + +--echo # Start of 10.5 tests + +--echo # +--echo # MDEV-29968 Functions in default values in tables with some character sets break SHOW CREATE (and mysqldump) +--echo # + +SET NAMES utf8mb4; +--let $table_charset=CHARACTER SET utf32 +--source include/ctype_supplementary_chars.inc + +--echo # Running dump +--let $mysqldumpfile = $MYSQLTEST_VARDIR/tmp/ctype_utf32_not_embedded_dump.sql +--exec $MYSQL_DUMP test > $mysqldumpfile + +DROP TABLE t1, t2, t3, t4, t5; + +--echo # Running restore +--exec $MYSQL test < $mysqldumpfile +SHOW CREATE TABLE t1; +SELECT * FROM t1; +SHOW CREATE TABLE t2; +SELECT * FROM t2; +SHOW CREATE TABLE t3; +SELECT * FROM t3; +SHOW CREATE TABLE t4; +SELECT * FROM t4; +SHOW CREATE TABLE t5; +SELECT * FROM t5; + +DROP TABLE t1, t2, t3, t4, t5; + +--error 0,1 +--remove_file $mysqldumpfile + +--echo # End of 10.5 tests diff --git a/mysql-test/main/ctype_utf8.result b/mysql-test/main/ctype_utf8.result index 3e8d85f7063..532989b7ea0 100644 --- a/mysql-test/main/ctype_utf8.result +++ b/mysql-test/main/ctype_utf8.result @@ -11649,6 +11649,15 @@ CAST(_utf8 'яяя' AS INT) Warnings: Warning 1292 Truncated incorrect INTEGER value: 'яяя' # +# MDEV-30111 InnoDB: Failing assertion: update->n_fields == 0 in row_ins_sec_index_entry_by_modify +# +select strcmp(_utf8mb3'' collate utf8mb3_general_nopad_ci, _utf8mb3 0x0001050001) as c1; +c1 +-1 +select strcmp(_utf8mb3'' collate utf8mb3_nopad_bin, _utf8mb3 0x0001050001) as c1; +c1 +-1 +# # End of 10.5 tests # # diff --git a/mysql-test/main/ctype_utf8.test b/mysql-test/main/ctype_utf8.test index bc05671d222..25a3ecf127b 100644 --- a/mysql-test/main/ctype_utf8.test +++ b/mysql-test/main/ctype_utf8.test @@ -2529,6 +2529,12 @@ SELECT CAST(_utf8 'ëëë' AS INT); SELECT CAST(_utf8 'œœœ' AS INT); SELECT CAST(_utf8 'яяя' AS INT); +--echo # +--echo # MDEV-30111 InnoDB: Failing assertion: update->n_fields == 0 in row_ins_sec_index_entry_by_modify +--echo # + +select strcmp(_utf8mb3'' collate utf8mb3_general_nopad_ci, _utf8mb3 0x0001050001) as c1; +select strcmp(_utf8mb3'' collate utf8mb3_nopad_bin, _utf8mb3 0x0001050001) as c1; --echo # --echo # End of 10.5 tests diff --git a/mysql-test/main/ctype_utf8mb3_innodb.result b/mysql-test/main/ctype_utf8mb3_innodb.result new file mode 100644 index 00000000000..f1894f37e0d --- /dev/null +++ b/mysql-test/main/ctype_utf8mb3_innodb.result @@ -0,0 +1,39 @@ +# Start of 10.5 tests +# +# MDEV-30111 InnoDB: Failing assertion: update->n_fields == 0 in row_ins_sec_index_entry_by_modify +# +CREATE TABLE t ( +a INT, +b VARCHAR(16), +c CHAR(8), +PRIMARY KEY (b,c), +KEY(c) +) ENGINE=InnoDB CHARACTER SET utf8mb3 COLLATE utf8mb3_general_nopad_ci; +INSERT INTO t VALUES (1,UNHEX('0001050001'),''),(2,UNHEX('0000'),'x'); +UPDATE t SET a = 0; +INSERT INTO t VALUES (0,'',''); +CHECK TABLE t EXTENDED; +Table Op Msg_type Msg_text +test.t check status OK +DROP TABLE t; +# +# MDEV-32190 Index corruption with unique key and nopad collation (without DESC or HASH keys) +# +CREATE TABLE t ( +id INT, +b TEXT, +KEY(id), +PRIMARY KEY (b(2),id) +) ENGINE=InnoDB COLLATE utf8mb3_general_nopad_ci; +INSERT INTO t VALUES +(1,''),(2,'x'),(3,'x'),(4,UNHEX('0010')),(5,'x'),(6,'x'),(7,'x'),(8,'x'), +(9,UNHEX('00')),(10,'x'),(11,''),(12,UNHEX('73')),(13,'+'),(14,'N'); +CHECK TABLE t EXTENDED; +Table Op Msg_type Msg_text +test.t check status OK +SELECT id FROM t WHERE id IN (4,8); +id +4 +8 +DROP TABLE t; +# End of 10.5 tests diff --git a/mysql-test/main/ctype_utf8mb3_innodb.test b/mysql-test/main/ctype_utf8mb3_innodb.test new file mode 100644 index 00000000000..a78c2786d05 --- /dev/null +++ b/mysql-test/main/ctype_utf8mb3_innodb.test @@ -0,0 +1,39 @@ +--source include/have_innodb.inc + +--echo # Start of 10.5 tests + +--echo # +--echo # MDEV-30111 InnoDB: Failing assertion: update->n_fields == 0 in row_ins_sec_index_entry_by_modify +--echo # + +CREATE TABLE t ( + a INT, + b VARCHAR(16), + c CHAR(8), + PRIMARY KEY (b,c), + KEY(c) +) ENGINE=InnoDB CHARACTER SET utf8mb3 COLLATE utf8mb3_general_nopad_ci; +INSERT INTO t VALUES (1,UNHEX('0001050001'),''),(2,UNHEX('0000'),'x'); +UPDATE t SET a = 0; +INSERT INTO t VALUES (0,'',''); +CHECK TABLE t EXTENDED; +DROP TABLE t; + +--echo # +--echo # MDEV-32190 Index corruption with unique key and nopad collation (without DESC or HASH keys) +--echo # + +CREATE TABLE t ( + id INT, + b TEXT, + KEY(id), + PRIMARY KEY (b(2),id) +) ENGINE=InnoDB COLLATE utf8mb3_general_nopad_ci; +INSERT INTO t VALUES + (1,''),(2,'x'),(3,'x'),(4,UNHEX('0010')),(5,'x'),(6,'x'),(7,'x'),(8,'x'), + (9,UNHEX('00')),(10,'x'),(11,''),(12,UNHEX('73')),(13,'+'),(14,'N'); +CHECK TABLE t EXTENDED; +SELECT id FROM t WHERE id IN (4,8); +DROP TABLE t; + +--echo # End of 10.5 tests diff --git a/mysql-test/main/ddl_i18n_koi8r.result b/mysql-test/main/ddl_i18n_koi8r.result index 06e35aeaf56..558ca7506fb 100644 --- a/mysql-test/main/ddl_i18n_koi8r.result +++ b/mysql-test/main/ddl_i18n_koi8r.result @@ -1731,13 +1731,13 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest1` /*!40100 DEFAULT CHARACTER USE `mysqltest1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `log` ( `msg` varchar(255) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `c` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; @@ -1814,13 +1814,13 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest2` /*!40100 DEFAULT CHARACTER USE `mysqltest2`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `log` ( `msg` varchar(255) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `c` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; diff --git a/mysql-test/main/ddl_i18n_utf8.result b/mysql-test/main/ddl_i18n_utf8.result index d12d2f3e795..0febabb139e 100644 --- a/mysql-test/main/ddl_i18n_utf8.result +++ b/mysql-test/main/ddl_i18n_utf8.result @@ -1731,13 +1731,13 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest1` /*!40100 DEFAULT CHARACTER USE `mysqltest1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `log` ( `msg` varchar(255) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `c` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; @@ -1814,13 +1814,13 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest2` /*!40100 DEFAULT CHARACTER USE `mysqltest2`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `log` ( `msg` varchar(255) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `c` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; diff --git a/mysql-test/main/delete_innodb.result b/mysql-test/main/delete_innodb.result index b9f4c8bdaf5..ebee36d6ce7 100644 --- a/mysql-test/main/delete_innodb.result +++ b/mysql-test/main/delete_innodb.result @@ -24,3 +24,30 @@ SELECT * FROM t1; c1 SET sort_buffer_size=@save_sort_buffer_size; DROP TABLE t1; +# +# MDEV-35944 DELETE fails to notice transaction abort, violating ACID +# +CREATE TABLE t1 (id INT PRIMARY KEY, col_varchar VARCHAR(8)) ENGINE=InnoDB; +INSERT INTO t1 (id) VALUES (1),(2); +CREATE TABLE t2 (id INT, f INT, s DATE, e DATE, PERIOD FOR p(s,e), PRIMARY KEY(id, p WITHOUT OVERLAPS)) ENGINE=InnoDB; +INSERT INTO t2 VALUES (1,0,'2000-01-01','2000-01-02'); +CREATE TABLE t3 (id INT, f BLOB, UNIQUE(f)) ENGINE=InnoDB; +connection default; +SET innodb_lock_wait_timeout=1; +START TRANSACTION; +DELETE FROM t1; +connect con1,localhost,root,,; +START TRANSACTION; +UPDATE t2 SET f = 20; +connection default; +DELETE FROM t2 FOR PORTION OF p FROM '2000-01-01' TO '2000-01-02'; +connection con1; +INSERT INTO t3 (id) VALUES (1), (2); +UPDATE t1 SET col_varchar = 'bar'; +COMMIT; +connection default; +ERROR 40001: Deadlock found when trying to get lock; try restarting transaction +COMMIT; +UPDATE t3 SET f = 'foo' ORDER BY f LIMIT 1; +DROP TABLE t1, t2, t3; +# End of 10.5 tests diff --git a/mysql-test/main/delete_innodb.test b/mysql-test/main/delete_innodb.test index c5c5c5d0172..e654b8fe691 100644 --- a/mysql-test/main/delete_innodb.test +++ b/mysql-test/main/delete_innodb.test @@ -20,3 +20,42 @@ SELECT * FROM t1; SET sort_buffer_size=@save_sort_buffer_size; DROP TABLE t1; + +--echo # +--echo # MDEV-35944 DELETE fails to notice transaction abort, violating ACID +--echo # + +CREATE TABLE t1 (id INT PRIMARY KEY, col_varchar VARCHAR(8)) ENGINE=InnoDB; +INSERT INTO t1 (id) VALUES (1),(2); +CREATE TABLE t2 (id INT, f INT, s DATE, e DATE, PERIOD FOR p(s,e), PRIMARY KEY(id, p WITHOUT OVERLAPS)) ENGINE=InnoDB; +INSERT INTO t2 VALUES (1,0,'2000-01-01','2000-01-02'); +CREATE TABLE t3 (id INT, f BLOB, UNIQUE(f)) ENGINE=InnoDB; + +--connection default +SET innodb_lock_wait_timeout=1; +START TRANSACTION; +DELETE FROM t1; + +--connect (con1,localhost,root,,) +START TRANSACTION; +UPDATE t2 SET f = 20; + +--connection default +--send + DELETE FROM t2 FOR PORTION OF p FROM '2000-01-01' TO '2000-01-02'; + +--connection con1 +INSERT INTO t3 (id) VALUES (1), (2); +UPDATE t1 SET col_varchar = 'bar'; +COMMIT; + +--connection default +--error ER_LOCK_DEADLOCK +--reap +COMMIT; +UPDATE t3 SET f = 'foo' ORDER BY f LIMIT 1; + +# Cleanup +DROP TABLE t1, t2, t3; + +--echo # End of 10.5 tests diff --git a/mysql-test/main/errors.result b/mysql-test/main/errors.result index 3f5827c16ed..fd62df10c4a 100644 --- a/mysql-test/main/errors.result +++ b/mysql-test/main/errors.result @@ -231,3 +231,16 @@ Error 1327 Undeclared variable: foo Error 1305 PROCEDURE P1 does not exist drop procedure P1; # End of 10.4 tests +# +# MDEV-35828: Assertion fails in alloc_root() when memory causes it to call itself +# +CREATE TEMPORARY TABLE t1 (a INT,b INT); +INSERT INTO t1 VALUES (1,1),(2,2); +SET +@tmp=@@max_session_mem_used, +max_session_mem_used=8192; +SELECT * FROM (t1 AS t2 LEFT JOIN t1 AS t3 USING (a)),t1; +ERROR HY000: The MariaDB server is running with the --max-session-mem-used=8192 option so it cannot execute this statement +DROP TABLE t1; +SET max_session_mem_used=@tmp; +# End of 10.6 tests diff --git a/mysql-test/main/errors.test b/mysql-test/main/errors.test index cc5cad2a68e..87d6d2fdec9 100644 --- a/mysql-test/main/errors.test +++ b/mysql-test/main/errors.test @@ -284,3 +284,23 @@ show warnings; drop procedure P1; -- echo # End of 10.4 tests + + +--echo # +--echo # MDEV-35828: Assertion fails in alloc_root() when memory causes it to call itself +--echo # +CREATE TEMPORARY TABLE t1 (a INT,b INT); +INSERT INTO t1 VALUES (1,1),(2,2); + +SET + @tmp=@@max_session_mem_used, + max_session_mem_used=8192; + +--error ER_OPTION_PREVENTS_STATEMENT +SELECT * FROM (t1 AS t2 LEFT JOIN t1 AS t3 USING (a)),t1; + +DROP TABLE t1; +SET max_session_mem_used=@tmp; + + +--echo # End of 10.6 tests diff --git a/mysql-test/main/kill_debug.result b/mysql-test/main/kill_debug.result index 0c910906b92..796156d6e45 100644 --- a/mysql-test/main/kill_debug.result +++ b/mysql-test/main/kill_debug.result @@ -238,3 +238,30 @@ select variable_value into @threads_cached from information_schema.global_status set debug_sync='now SIGNAL go3'; drop table t1; set debug_sync='reset'; +# +# MDEV-33285 - Assertion `m_table' failed in ha_perfschema::rnd_end on +# CHECKSUM TABLE +# +CREATE TABLE t1 (a INT); +INSERT INTO t1 VALUES(1); +SET debug_sync='mysql_checksum_table_after_calculate_checksum SIGNAL parked WAIT_FOR go'; +CHECKSUM TABLE t1; +connect con1, localhost, root; +connection con1; +SET debug_sync='now WAIT_FOR parked'; +KILL QUERY id; +SET debug_sync='now SIGNAL go'; +connection default; +ERROR 70100: Query execution was interrupted +SET debug_sync='RESET'; +SET debug_sync='mysql_checksum_table_before_calculate_checksum SIGNAL parked WAIT_FOR go'; +CHECKSUM TABLE t1; +connection con1; +SET debug_sync='now WAIT_FOR parked'; +KILL QUERY id; +SET debug_sync='now SIGNAL go'; +connection default; +ERROR 70100: Query execution was interrupted +DROP TABLE t1; +disconnect con1; +SET debug_sync='RESET'; diff --git a/mysql-test/main/kill_debug.test b/mysql-test/main/kill_debug.test index d861b8b4680..6b29834564b 100644 --- a/mysql-test/main/kill_debug.test +++ b/mysql-test/main/kill_debug.test @@ -324,3 +324,40 @@ if (`select @@thread_handling != 'pool-of-threads'`) { } drop table t1; set debug_sync='reset'; + + +--echo # +--echo # MDEV-33285 - Assertion `m_table' failed in ha_perfschema::rnd_end on +--echo # CHECKSUM TABLE +--echo # +let $id= `select connection_id()`; +CREATE TABLE t1 (a INT); +INSERT INTO t1 VALUES(1); +SET debug_sync='mysql_checksum_table_after_calculate_checksum SIGNAL parked WAIT_FOR go'; +send CHECKSUM TABLE t1; + +connect con1, localhost, root; +connection con1; +SET debug_sync='now WAIT_FOR parked'; +replace_result $id id; +eval KILL QUERY $id; +SET debug_sync='now SIGNAL go'; +connection default; +error ER_QUERY_INTERRUPTED; +reap; + +SET debug_sync='RESET'; +SET debug_sync='mysql_checksum_table_before_calculate_checksum SIGNAL parked WAIT_FOR go'; +send CHECKSUM TABLE t1; +connection con1; +SET debug_sync='now WAIT_FOR parked'; +replace_result $id id; +eval KILL QUERY $id; +SET debug_sync='now SIGNAL go'; + +connection default; +error ER_QUERY_INTERRUPTED; +reap; +DROP TABLE t1; +disconnect con1; +SET debug_sync='RESET'; diff --git a/mysql-test/main/lock_view.result b/mysql-test/main/lock_view.result index 07548b1d725..7d79775ed9f 100644 --- a/mysql-test/main/lock_view.result +++ b/mysql-test/main/lock_view.result @@ -22,7 +22,7 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest1` /*!40100 DEFAULT CHARACTER USE `mysqltest1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; @@ -32,7 +32,7 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest2` /*!40100 DEFAULT CHARACTER USE `mysqltest2`; SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +SET character_set_client = utf8mb4; /*!50001 CREATE VIEW `v2` AS SELECT 1 AS `a` */; SET character_set_client = @saved_cs_client; @@ -41,27 +41,27 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest3` /*!40100 DEFAULT CHARACTER USE `mysqltest3`; SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +SET character_set_client = utf8mb4; /*!50001 CREATE VIEW `v3` AS SELECT 1 AS `a` */; SET character_set_client = @saved_cs_client; SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +SET character_set_client = utf8mb4; /*!50001 CREATE VIEW `v3i` AS SELECT 1 AS `a` */; SET character_set_client = @saved_cs_client; SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +SET character_set_client = utf8mb4; /*!50001 CREATE VIEW `v3is` AS SELECT 1 AS `schema_name` */; SET character_set_client = @saved_cs_client; SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +SET character_set_client = utf8mb4; /*!50001 CREATE VIEW `v3nt` AS SELECT 1 AS `1` */; SET character_set_client = @saved_cs_client; SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +SET character_set_client = utf8mb4; /*!50001 CREATE VIEW `v3ps` AS SELECT 1 AS `user` */; SET character_set_client = @saved_cs_client; @@ -237,7 +237,7 @@ disconnect con1; connection default; /*M!999999\- enable the sandbox mode */ SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +SET character_set_client = utf8mb4; /*!50001 CREATE VIEW `v1` AS SELECT 1 AS `id` */; SET character_set_client = @saved_cs_client; diff --git a/mysql-test/main/long_unique_bugs.result b/mysql-test/main/long_unique_bugs.result index 03d40be897f..a5b0f67c0aa 100644 --- a/mysql-test/main/long_unique_bugs.result +++ b/mysql-test/main/long_unique_bugs.result @@ -731,4 +731,43 @@ alter table t1 enable keys; insert into t1 values (2); ERROR 23000: Duplicate entry '2' for key 'i' drop table t1; +# +# MDEV-25654 Unexpected ER_CRASHED_ON_USAGE and Assertion `limit >= trx_id' failed in purge_node_t::skip +# +create table t1 (a int, unique using hash (a)) engine=innodb +partition by range(a) ( +partition p1 values less than (2), +partition p2 values less than (101) +); +insert into t1 select seq from seq_1_to_100; +alter table t1 add partition (partition p3 values less than (maxvalue)); +alter table t1 force; +drop table t1; +# +# MDEV-33658 cannot add a foreign key on a table with a long UNIQUE +# multi-column index, that contains a foreign key as a prefix. +# +create table a (id int primary key) engine = innodb; +create table b (id int, +long_text varchar(1000), +constraint unique_b unique key (id, long_text) +) engine=innodb default charset utf8mb4; +alter table b add constraint b_fk_id foreign key (id) references a (id); +show create table b; +Table Create Table +b CREATE TABLE `b` ( + `id` int(11) DEFAULT NULL, + `long_text` varchar(1000) DEFAULT NULL, + UNIQUE KEY `unique_b` (`id`,`long_text`) USING HASH, + KEY `b_fk_id` (`id`), + CONSTRAINT `b_fk_id` FOREIGN KEY (`id`) REFERENCES `a` (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci +drop table b; +drop table a; +# veirfy that duplicate has unique is detected +create table t1 (a blob unique); +alter table t1 add constraint constraint_1 unique (a); +Warnings: +Note 1831 Duplicate index `constraint_1`. This is deprecated and will be disallowed in a future release +drop table t1; # End of 10.5 tests diff --git a/mysql-test/main/long_unique_bugs.test b/mysql-test/main/long_unique_bugs.test index bf6ff598cd0..e2fec78b151 100644 --- a/mysql-test/main/long_unique_bugs.test +++ b/mysql-test/main/long_unique_bugs.test @@ -710,4 +710,39 @@ alter table t1 enable keys; insert into t1 values (2); drop table t1; +--echo # +--echo # MDEV-25654 Unexpected ER_CRASHED_ON_USAGE and Assertion `limit >= trx_id' failed in purge_node_t::skip +--echo # +create table t1 (a int, unique using hash (a)) engine=innodb +partition by range(a) ( + partition p1 values less than (2), + partition p2 values less than (101) +); +insert into t1 select seq from seq_1_to_100; + +alter table t1 add partition (partition p3 values less than (maxvalue)); +alter table t1 force; + +drop table t1; + +--echo # +--echo # MDEV-33658 cannot add a foreign key on a table with a long UNIQUE +--echo # multi-column index, that contains a foreign key as a prefix. +--echo # +create table a (id int primary key) engine = innodb; +create table b (id int, + long_text varchar(1000), + constraint unique_b unique key (id, long_text) + ) engine=innodb default charset utf8mb4; + +alter table b add constraint b_fk_id foreign key (id) references a (id); +show create table b; +drop table b; +drop table a; + +--echo # veirfy that duplicate has unique is detected +create table t1 (a blob unique); +alter table t1 add constraint constraint_1 unique (a); +drop table t1; + --echo # End of 10.5 tests diff --git a/mysql-test/main/mysql.result b/mysql-test/main/mysql.result index 7c10df0ab1d..18661907598 100644 --- a/mysql-test/main/mysql.result +++ b/mysql-test/main/mysql.result @@ -562,7 +562,7 @@ a1\`b1 CREATE TABLE `a1\``b1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci /*M!999999\- enable the sandbox mode */ /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `a1\``b1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; @@ -594,7 +594,7 @@ a1\"b1 CREATE TABLE "a1\""b1" ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci /*M!999999\- enable the sandbox mode */ /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE "a1\""b1" ( "a" int(11) DEFAULT NULL ); diff --git a/mysql-test/main/mysqldump-max.result b/mysql-test/main/mysqldump-max.result index 256d6299a9f..e31745e8f38 100644 --- a/mysql-test/main/mysqldump-max.result +++ b/mysql-test/main/mysqldump-max.result @@ -95,7 +95,7 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l USE `test`; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `id` int(8) DEFAULT NULL, `name` varchar(32) DEFAULT NULL @@ -112,7 +112,7 @@ INSERT DELAYED IGNORE INTO `t1` VALUES /*!40000 ALTER TABLE `t1` ENABLE KEYS */; DROP TABLE IF EXISTS `t2`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t2` ( `id` int(8) DEFAULT NULL, `name` varchar(32) DEFAULT NULL @@ -129,7 +129,7 @@ INSERT DELAYED IGNORE INTO `t2` VALUES /*!40000 ALTER TABLE `t2` ENABLE KEYS */; DROP TABLE IF EXISTS `t3`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t3` ( `id` int(8) DEFAULT NULL, `name` varchar(32) DEFAULT NULL @@ -146,7 +146,7 @@ INSERT DELAYED IGNORE INTO `t3` VALUES /*!40000 ALTER TABLE `t3` ENABLE KEYS */; DROP TABLE IF EXISTS `t4`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t4` ( `id` int(8) DEFAULT NULL, `name` varchar(32) DEFAULT NULL @@ -163,7 +163,7 @@ INSERT DELAYED IGNORE INTO `t4` VALUES /*!40000 ALTER TABLE `t4` ENABLE KEYS */; DROP TABLE IF EXISTS `t5`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t5` ( `id` int(8) DEFAULT NULL, `name` varchar(32) DEFAULT NULL @@ -180,7 +180,7 @@ INSERT DELAYED IGNORE INTO `t5` VALUES /*!40000 ALTER TABLE `t5` ENABLE KEYS */; DROP TABLE IF EXISTS `t6`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t6` ( `id` int(8) DEFAULT NULL, `name` varchar(32) DEFAULT NULL @@ -223,7 +223,7 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l USE `test`; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `id` int(8) DEFAULT NULL, `name` varchar(32) DEFAULT NULL @@ -240,7 +240,7 @@ INSERT DELAYED INTO `t1` VALUES /*!40000 ALTER TABLE `t1` ENABLE KEYS */; DROP TABLE IF EXISTS `t2`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t2` ( `id` int(8) DEFAULT NULL, `name` varchar(32) DEFAULT NULL @@ -257,7 +257,7 @@ INSERT DELAYED INTO `t2` VALUES /*!40000 ALTER TABLE `t2` ENABLE KEYS */; DROP TABLE IF EXISTS `t3`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t3` ( `id` int(8) DEFAULT NULL, `name` varchar(32) DEFAULT NULL @@ -274,7 +274,7 @@ INSERT DELAYED INTO `t3` VALUES /*!40000 ALTER TABLE `t3` ENABLE KEYS */; DROP TABLE IF EXISTS `t4`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t4` ( `id` int(8) DEFAULT NULL, `name` varchar(32) DEFAULT NULL @@ -291,7 +291,7 @@ INSERT DELAYED INTO `t4` VALUES /*!40000 ALTER TABLE `t4` ENABLE KEYS */; DROP TABLE IF EXISTS `t5`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t5` ( `id` int(8) DEFAULT NULL, `name` varchar(32) DEFAULT NULL @@ -308,7 +308,7 @@ INSERT DELAYED INTO `t5` VALUES /*!40000 ALTER TABLE `t5` ENABLE KEYS */; DROP TABLE IF EXISTS `t6`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t6` ( `id` int(8) DEFAULT NULL, `name` varchar(32) DEFAULT NULL diff --git a/mysql-test/main/mysqldump-nl.result b/mysql-test/main/mysqldump-nl.result index 56e9c56bae2..03dbc9ea13d 100644 --- a/mysql-test/main/mysqldump-nl.result +++ b/mysql-test/main/mysqldump-nl.result @@ -34,7 +34,7 @@ USE `mysqltest1 -- /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1 1t` ( `foobar @@ -53,7 +53,7 @@ raboof` int(11) DEFAULT NULL -- SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +SET character_set_client = utf8mb4; /*!50001 CREATE VIEW `v1 1v` AS SELECT 1 AS `foobar diff --git a/mysql-test/main/mysqldump-order-by-size.result b/mysql-test/main/mysqldump-order-by-size.result index 8585fcecda1..82d7cf75235 100644 --- a/mysql-test/main/mysqldump-order-by-size.result +++ b/mysql-test/main/mysqldump-order-by-size.result @@ -23,25 +23,25 @@ test.t4 analyze Warning Engine-independent statistics are not collected for colu test.t4 analyze status OK /*M!999999\- enable the sandbox mode */ /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t4` ( `a` mediumblob DEFAULT NULL ); /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t3` ( `a` mediumblob DEFAULT NULL ); /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t2` ( `a` mediumblob DEFAULT NULL ); /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` mediumblob DEFAULT NULL ); diff --git a/mysql-test/main/mysqldump-timing.result b/mysql-test/main/mysqldump-timing.result index 390cd1a53f6..5de369252d2 100644 --- a/mysql-test/main/mysqldump-timing.result +++ b/mysql-test/main/mysqldump-timing.result @@ -21,7 +21,7 @@ timeout without t1 contents expected /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `i` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; @@ -45,7 +45,7 @@ This would be a race condition otherwise, but default max_statement_time=0 makes /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `i` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; diff --git a/mysql-test/main/mysqldump-utf8mb4.result b/mysql-test/main/mysqldump-utf8mb4.result index 6b48137854f..5aa6b802308 100644 --- a/mysql-test/main/mysqldump-utf8mb4.result +++ b/mysql-test/main/mysqldump-utf8mb4.result @@ -46,7 +46,7 @@ Testing text format output /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `point` varchar(10) NOT NULL, `data` varchar(10) DEFAULT NULL, diff --git a/mysql-test/main/mysqldump.result b/mysql-test/main/mysqldump.result index 0c1728c8ad0..6d29c70f3a8 100644 --- a/mysql-test/main/mysqldump.result +++ b/mysql-test/main/mysqldump.result @@ -33,7 +33,7 @@ INSERT INTO t1 VALUES ("1234567890123456789012345678901234567890"), ("0987654321098765432109876543210987654321"); /*M!999999\- enable the sandbox mode */ /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` decimal(64,20) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; @@ -51,7 +51,7 @@ Warnings: Warning 1264 Out of range value for column 'a' at row 1 /*M!999999\- enable the sandbox mode */ /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` double DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; @@ -74,7 +74,7 @@ ERROR 42S22: Unknown column '1.2345' in 'VALUES' SET SQL_MODE=@OLD_SQL_MODE; /*M!999999\- enable the sandbox mode */ /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` decimal(10,5) DEFAULT NULL, `b` float DEFAULT NULL @@ -88,7 +88,7 @@ INSERT INTO `t1` VALUES (1.23450,2.3456); /*M!999999\- enable the sandbox mode */ /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` decimal(10,5) DEFAULT NULL, `b` float DEFAULT NULL @@ -114,7 +114,7 @@ INSERT INTO `t1` VALUES /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` decimal(10,5) DEFAULT NULL, `b` float DEFAULT NULL @@ -149,7 +149,7 @@ UNLOCK TABLES; /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` decimal(10,5) DEFAULT NULL, `b` float DEFAULT NULL @@ -237,7 +237,7 @@ INSERT INTO t1 VALUES (_koi8r x'C1C2C3C4C5'), (NULL); /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` varchar(255) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=koi8r COLLATE=koi8r_general_ci; @@ -324,7 +324,7 @@ DROP TABLE t1; create table ```a` (i int); /*M!999999\- enable the sandbox mode */ /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE ```a` ( `i` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; @@ -348,7 +348,7 @@ create table t1(a int); /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; @@ -377,7 +377,7 @@ UNLOCK TABLES; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS "t1"; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE "t1" ( "a" int(11) DEFAULT NULL ); @@ -409,7 +409,7 @@ set global sql_mode='ANSI_QUOTES'; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; @@ -438,7 +438,7 @@ UNLOCK TABLES; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS "t1"; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE "t1" ( "a" int(11) DEFAULT NULL ); @@ -474,7 +474,7 @@ insert into t1 values (1),(2),(3); /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; @@ -571,7 +571,7 @@ INSERT INTO t1 VALUES (_latin1 ' /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` char(10) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; @@ -697,7 +697,7 @@ INSERT INTO t2 VALUES (4),(5),(6); /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t2`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t2` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; @@ -742,7 +742,7 @@ INSERT INTO `t1` VALUES (0x602010000280100005E71A); /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `b` blob DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; @@ -784,7 +784,7 @@ INSERT INTO t1 VALUES (4),(5),(6); /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; @@ -825,7 +825,7 @@ UNLOCK TABLES; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; @@ -1201,7 +1201,7 @@ insert into t1 (F_8d3bba7425e7c98c50f52ca1b52d3735) values (1); /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `F_c4ca4238a0b923820dcc509a6f75849b` int(11) DEFAULT NULL, `F_c81e728d9d4c2f636f067f89cc14862c` int(11) DEFAULT NULL, @@ -1577,7 +1577,7 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l USE `test`; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; @@ -1625,14 +1625,14 @@ INSERT INTO t2 VALUES (1), (2); /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `t2`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t2` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; @@ -1661,14 +1661,14 @@ CREATE TABLE `t2` ( /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `t2`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t2` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; @@ -1863,7 +1863,7 @@ UNLOCK TABLES; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` int(10) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; @@ -1879,7 +1879,7 @@ INSERT INTO `t1` VALUES UNLOCK TABLES; DROP TABLE IF EXISTS `t2`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t2` ( `pk` int(11) NOT NULL AUTO_INCREMENT, `a` int(10) DEFAULT NULL, @@ -1989,21 +1989,21 @@ mariadb-dump: Couldn't find table: "non_existing" /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t3`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t3` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `t2`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t2` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; @@ -2039,7 +2039,7 @@ mariadb-dump: Got error: 1064: "You have an error in your SQL syntax; check the /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; @@ -2076,7 +2076,7 @@ insert into t1 values (0815, 4711, 2006); /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS "t1"; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE "t1" ( "a b" int(11) NOT NULL, "c""d" int(11) NOT NULL, @@ -2112,7 +2112,7 @@ UNLOCK TABLES; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a b` int(11) NOT NULL, `c"d` int(11) NOT NULL, @@ -2168,7 +2168,7 @@ create view v2 as select * from t2 where a like 'a%' with check option; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t2`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t2` ( `a` varchar(30) DEFAULT NULL, KEY `a` (`a`(5)) @@ -2188,7 +2188,7 @@ UNLOCK TABLES; DROP TABLE IF EXISTS `v2`; /*!50001 DROP VIEW IF EXISTS `v2`*/; SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +SET character_set_client = utf8mb4; /*!50001 CREATE VIEW `v2` AS SELECT 1 AS `a` */; SET character_set_client = @saved_cs_client; @@ -2268,7 +2268,7 @@ create view v1 as select * from t1; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; @@ -2281,7 +2281,7 @@ UNLOCK TABLES; DROP TABLE IF EXISTS `v1`; /*!50001 DROP VIEW IF EXISTS `v1`*/; SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +SET character_set_client = utf8mb4; /*!50001 CREATE VIEW `v1` AS SELECT 1 AS `a` */; SET character_set_client = @saved_cs_client; @@ -2339,7 +2339,7 @@ create view v2 as select * from t2 where a like 'a%' with check option; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t2`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t2` ( `a` varchar(30) DEFAULT NULL, KEY `a` (`a`(5)) @@ -2359,7 +2359,7 @@ UNLOCK TABLES; DROP TABLE IF EXISTS `v2`; /*!50001 DROP VIEW IF EXISTS `v2`*/; SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +SET character_set_client = utf8mb4; /*!50001 CREATE VIEW `v2` AS SELECT 1 AS `a` */; SET character_set_client = @saved_cs_client; @@ -2410,7 +2410,7 @@ INSERT INTO t1 VALUES ('\''); /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` char(10) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; @@ -2458,7 +2458,7 @@ select v3.a from v3, v1 where v1.a=v3.a and v3.b=3 limit 1; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL, @@ -2477,7 +2477,7 @@ UNLOCK TABLES; DROP TABLE IF EXISTS `v1`; /*!50001 DROP VIEW IF EXISTS `v1`*/; SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +SET character_set_client = utf8mb4; /*!50001 CREATE VIEW `v1` AS SELECT 1 AS `a`, 1 AS `b`, @@ -2486,14 +2486,14 @@ SET character_set_client = @saved_cs_client; DROP TABLE IF EXISTS `v2`; /*!50001 DROP VIEW IF EXISTS `v2`*/; SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +SET character_set_client = utf8mb4; /*!50001 CREATE VIEW `v2` AS SELECT 1 AS `a` */; SET character_set_client = @saved_cs_client; DROP TABLE IF EXISTS `v3`; /*!50001 DROP VIEW IF EXISTS `v3`*/; SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +SET character_set_client = utf8mb4; /*!50001 CREATE VIEW `v3` AS SELECT 1 AS `a`, 1 AS `b`, @@ -2615,7 +2615,7 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l USE `test`; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` bigint(20) DEFAULT NULL @@ -2691,7 +2691,7 @@ DELIMITER ; /*!50003 SET collation_connection = @saved_col_connection */ ; DROP TABLE IF EXISTS `t2`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t2` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; @@ -2749,7 +2749,7 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l USE `test`; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` bigint(20) DEFAULT NULL @@ -2767,7 +2767,7 @@ INSERT INTO `t1` VALUES UNLOCK TABLES; DROP TABLE IF EXISTS `t2`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t2` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; @@ -2901,7 +2901,7 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l USE `test`; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `id` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; @@ -3058,7 +3058,7 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l USE `test`; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `d` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), UNIQUE KEY `d` (`d`) @@ -3098,7 +3098,7 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l USE `test`; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `d` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), UNIQUE KEY `d` (`d`) @@ -3154,7 +3154,7 @@ a2 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS "t1 test"; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE "t1 test" ( "a1" int(11) DEFAULT NULL ); @@ -3186,7 +3186,7 @@ DELIMITER ; /*!50003 SET collation_connection = @saved_col_connection */ ; DROP TABLE IF EXISTS "t2 test"; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE "t2 test" ( "a2" int(11) DEFAULT NULL ); @@ -3244,7 +3244,7 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l USE `test`; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(32) DEFAULT NULL, @@ -3263,7 +3263,7 @@ UNLOCK TABLES; DROP TABLE IF EXISTS `v0`; /*!50001 DROP VIEW IF EXISTS `v0`*/; SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +SET character_set_client = utf8mb4; /*!50001 CREATE VIEW `v0` AS SELECT 1 AS `a`, 1 AS `b`, @@ -3272,7 +3272,7 @@ SET character_set_client = @saved_cs_client; DROP TABLE IF EXISTS `v1`; /*!50001 DROP VIEW IF EXISTS `v1`*/; SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +SET character_set_client = utf8mb4; /*!50001 CREATE VIEW `v1` AS SELECT 1 AS `a`, 1 AS `b`, @@ -3281,7 +3281,7 @@ SET character_set_client = @saved_cs_client; DROP TABLE IF EXISTS `v2`; /*!50001 DROP VIEW IF EXISTS `v2`*/; SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +SET character_set_client = utf8mb4; /*!50001 CREATE VIEW `v2` AS SELECT 1 AS `a`, 1 AS `b`, @@ -3373,7 +3373,7 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l USE `test`; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; @@ -3433,7 +3433,7 @@ insert into t1 values ('',''); /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` binary(1) DEFAULT NULL, `b` blob DEFAULT NULL @@ -3469,7 +3469,7 @@ UNLOCK TABLES; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` binary(1) DEFAULT NULL, `b` blob DEFAULT NULL @@ -3655,7 +3655,7 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqldump_test_db` /*!40100 DEFAULT CH USE `mysqldump_test_db`; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `id` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; @@ -3673,7 +3673,7 @@ UNLOCK TABLES; DROP TABLE IF EXISTS `v1`; /*!50001 DROP VIEW IF EXISTS `v1`*/; SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +SET character_set_client = utf8mb4; /*!50001 CREATE VIEW `v1` AS SELECT 1 AS `id` */; SET character_set_client = @saved_cs_client; @@ -3720,7 +3720,7 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqldump_tables` /*!40100 DEFAULT CHA USE `mysqldump_tables`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `basetable` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, `tag` varchar(64) DEFAULT NULL, @@ -3732,7 +3732,7 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqldump_views` /*!40100 DEFAULT CHAR USE `mysqldump_views`; SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +SET character_set_client = utf8mb4; /*!50001 CREATE VIEW `nasishnasifu` AS SELECT 1 AS `id` */; SET character_set_client = @saved_cs_client; @@ -3869,7 +3869,7 @@ use test; /*M!999999\- enable the sandbox mode */ DROP TABLE IF EXISTS `TABLES`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TEMPORARY TABLE `TABLES` ( `TABLE_CATALOG` varchar(512) NOT NULL, `TABLE_SCHEMA` varchar(64) NOT NULL, @@ -3945,14 +3945,14 @@ CREATE TABLE t1 (a INT) ENGINE=merge UNION=(t2, t3); /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci UNION=(`t2`,`t3`); /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `t2`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t2` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; @@ -3964,7 +3964,7 @@ LOCK TABLES `t2` WRITE; UNLOCK TABLES; DROP TABLE IF EXISTS `t3`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t3` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; @@ -4057,7 +4057,7 @@ CREATE TABLE t1 (c1 INT, c2 LONGBLOB); INSERT INTO t1 SET c1=11, c2=REPEAT('q',509); /*M!999999\- enable the sandbox mode */ /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `c1` int(11) DEFAULT NULL, `c2` longblob DEFAULT NULL @@ -4146,7 +4146,7 @@ create view db42635.v2 (c) as select * from db42635.t1; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `id` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; @@ -4159,7 +4159,7 @@ UNLOCK TABLES; DROP TABLE IF EXISTS `v2`; /*!50001 DROP VIEW IF EXISTS `v2`*/; SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +SET character_set_client = utf8mb4; /*!50001 CREATE VIEW `v2` AS SELECT 1 AS `c` */; SET character_set_client = @saved_cs_client; @@ -4296,7 +4296,7 @@ INSERT INTO t1 VALUES (3,4), (4,5); /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL @@ -4577,7 +4577,7 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqldump_test_db` /*!40100 DEFAULT CH USE `mysqldump_test_db`; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `id` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; @@ -4595,7 +4595,7 @@ UNLOCK TABLES; DROP TABLE IF EXISTS `v1`; /*!50001 DROP VIEW IF EXISTS `v1`*/; SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +SET character_set_client = utf8mb4; /*!50001 CREATE VIEW `v1` AS SELECT 1 AS `id` */; SET character_set_client = @saved_cs_client; @@ -4693,7 +4693,7 @@ create table test (a int); /*M!999999\- enable the sandbox mode */ DROP TABLE IF EXISTS `test`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `test` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; @@ -4915,7 +4915,7 @@ ALTER DATABASE `test-database` CHARACTER SET latin1 COLLATE latin1_swedish_ci; ALTER DATABASE `test-database` CHARACTER SET utf8 COLLATE utf8_unicode_ci ; /*M!999999\- enable the sandbox mode */ /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `test` ( `c1` varchar(10) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; @@ -5406,7 +5406,7 @@ CREATE TABLE t1 (a INT); /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ); @@ -5685,7 +5685,7 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `db1` /*!40100 DEFAULT CHARACTER SET ut USE `db1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `basetable` ( `id` smallint(6) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; @@ -5694,13 +5694,13 @@ INSERT INTO `basetable` VALUES (5), (6); /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `nonunique_table_name` ( `i3` smallint(6) DEFAULT NULL ) ENGINE=MRG_MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT_METHOD=LAST UNION=(`basetable`); /*!40101 SET character_set_client = @saved_cs_client */; SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +SET character_set_client = utf8mb4; /*!50001 CREATE VIEW `nonunique_table_view_name` AS SELECT 1 AS `1` */; SET character_set_client = @saved_cs_client; @@ -5709,7 +5709,7 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `db2` /*!40100 DEFAULT CHARACTER SET ut USE `db2`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `nonunique_table_name` ( `i1` bigint(20) unsigned NOT NULL AUTO_INCREMENT, UNIQUE KEY `i1` (`i1`) @@ -5719,7 +5719,7 @@ INSERT INTO `nonunique_table_name` VALUES (1), (2); /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `nonunique_table_view_name` ( `i2` int(11) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; @@ -5750,7 +5750,7 @@ USE `db2`; /*M!999999\- enable the sandbox mode */ /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `nonunique_table_name` ( `i1` bigint(20) unsigned NOT NULL AUTO_INCREMENT, UNIQUE KEY `i1` (`i1`) @@ -5760,7 +5760,7 @@ INSERT INTO `nonunique_table_name` VALUES (1), (2); /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `nonunique_table_view_name` ( `i2` int(11) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; @@ -5777,7 +5777,7 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `db2` /*!40100 DEFAULT CHARACTER SET ut USE `db2`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `nonunique_table_name` ( `i1` bigint(20) unsigned NOT NULL AUTO_INCREMENT, UNIQUE KEY `i1` (`i1`) @@ -5787,7 +5787,7 @@ INSERT DELAYED INTO `nonunique_table_name` VALUES (1), (2); /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `nonunique_table_view_name` ( `i2` int(11) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; @@ -5800,7 +5800,7 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `db1` /*!40100 DEFAULT CHARACTER SET ut USE `db1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `basetable` ( `id` smallint(6) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; @@ -5809,7 +5809,7 @@ INSERT DELAYED INTO `basetable` VALUES (5), (6); /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `nonunique_table_name` ( `i3` smallint(6) DEFAULT NULL ) ENGINE=MRG_MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci INSERT_METHOD=LAST UNION=(`basetable`); @@ -5818,7 +5818,7 @@ INSERT INTO `nonunique_table_name` VALUES (5), (6); SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +SET character_set_client = utf8mb4; /*!50001 CREATE VIEW `nonunique_table_view_name` AS SELECT 1 AS `1` */; SET character_set_client = @saved_cs_client; @@ -5968,7 +5968,7 @@ DROP TABLE t1; /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE IF NOT EXISTS `general_log` ( `event_time` timestamp(6) NOT NULL DEFAULT current_timestamp(6) ON UPDATE current_timestamp(6), `user_host` mediumtext NOT NULL, @@ -5979,7 +5979,7 @@ CREATE TABLE IF NOT EXISTS `general_log` ( ) ENGINE=CSV DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT='General log'; /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE IF NOT EXISTS `slow_log` ( `start_time` timestamp(6) NOT NULL DEFAULT current_timestamp(6) ON UPDATE current_timestamp(6), `user_host` mediumtext NOT NULL, @@ -5998,7 +5998,7 @@ CREATE TABLE IF NOT EXISTS `slow_log` ( /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `innodb_index_stats`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `innodb_index_stats` ( `database_name` varchar(64) NOT NULL, `table_name` varchar(199) NOT NULL, @@ -6013,7 +6013,7 @@ CREATE TABLE `innodb_index_stats` ( /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `innodb_table_stats`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `innodb_table_stats` ( `database_name` varchar(64) NOT NULL, `table_name` varchar(199) NOT NULL, @@ -6025,7 +6025,7 @@ CREATE TABLE `innodb_table_stats` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin STATS_PERSISTENT=0; /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE IF NOT EXISTS `transaction_registry` ( `transaction_id` bigint(20) unsigned NOT NULL, `commit_id` bigint(20) unsigned NOT NULL, @@ -6064,7 +6064,7 @@ CREATE TABLE IF NOT EXISTS `transaction_registry` ( /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE IF NOT EXISTS `general_log` ( `event_time` timestamp(6) NOT NULL DEFAULT current_timestamp(6) ON UPDATE current_timestamp(6), `user_host` mediumtext NOT NULL, @@ -6075,7 +6075,7 @@ CREATE TABLE IF NOT EXISTS `general_log` ( ) ENGINE=CSV DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT='General log'; /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE IF NOT EXISTS `slow_log` ( `start_time` timestamp(6) NOT NULL DEFAULT current_timestamp(6) ON UPDATE current_timestamp(6), `user_host` mediumtext NOT NULL, @@ -6094,7 +6094,7 @@ CREATE TABLE IF NOT EXISTS `slow_log` ( /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `innodb_index_stats`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `innodb_index_stats` ( `database_name` varchar(64) NOT NULL, `table_name` varchar(199) NOT NULL, @@ -6114,7 +6114,7 @@ LOCK TABLES `innodb_index_stats` WRITE; UNLOCK TABLES; DROP TABLE IF EXISTS `innodb_table_stats`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `innodb_table_stats` ( `database_name` varchar(64) NOT NULL, `table_name` varchar(199) NOT NULL, @@ -6131,7 +6131,7 @@ LOCK TABLES `innodb_table_stats` WRITE; /*!40000 ALTER TABLE `innodb_table_stats` ENABLE KEYS */; UNLOCK TABLES; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE IF NOT EXISTS `transaction_registry` ( `transaction_id` bigint(20) unsigned NOT NULL, `commit_id` bigint(20) unsigned NOT NULL, @@ -6170,7 +6170,7 @@ CREATE TABLE IF NOT EXISTS `transaction_registry` ( /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE IF NOT EXISTS `general_log` ( `event_time` timestamp(6) NOT NULL DEFAULT current_timestamp(6) ON UPDATE current_timestamp(6), `user_host` mediumtext NOT NULL, @@ -6181,7 +6181,7 @@ CREATE TABLE IF NOT EXISTS `general_log` ( ) ENGINE=CSV DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT='General log'; /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE IF NOT EXISTS `slow_log` ( `start_time` timestamp(6) NOT NULL DEFAULT current_timestamp(6) ON UPDATE current_timestamp(6), `user_host` mediumtext NOT NULL, @@ -6200,7 +6200,7 @@ CREATE TABLE IF NOT EXISTS `slow_log` ( /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `innodb_index_stats`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `innodb_index_stats` ( `database_name` varchar(64) NOT NULL, `table_name` varchar(199) NOT NULL, @@ -6220,7 +6220,7 @@ LOCK TABLES `innodb_index_stats` WRITE; UNLOCK TABLES; DROP TABLE IF EXISTS `innodb_table_stats`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `innodb_table_stats` ( `database_name` varchar(64) NOT NULL, `table_name` varchar(199) NOT NULL, @@ -6237,7 +6237,7 @@ LOCK TABLES `innodb_table_stats` WRITE; /*!40000 ALTER TABLE `innodb_table_stats` ENABLE KEYS */; UNLOCK TABLES; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE IF NOT EXISTS `transaction_registry` ( `transaction_id` bigint(20) unsigned NOT NULL, `commit_id` bigint(20) unsigned NOT NULL, @@ -6284,7 +6284,7 @@ CREATE TABLE t4(ËÏÌÏÎËÁ1 INT); insert into t4 values(1); /*M!999999\- enable the sandbox mode */ /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) INVISIBLE DEFAULT NULL @@ -6293,7 +6293,7 @@ CREATE TABLE `t1` ( INSERT INTO `t1` (`a`, `b`) VALUES (1,NULL), (1,2); /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t2` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL @@ -6303,7 +6303,7 @@ INSERT INTO `t2` VALUES (1,2), (1,2); /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t3` ( `invisible` int(11) DEFAULT NULL, `a b c & $!@#$%^&*( )` int(11) INVISIBLE DEFAULT 4, @@ -6315,7 +6315,7 @@ INSERT INTO `t3` (`invisible`, `a b c & $!@#$%^&*( )`, `ds=~!@ \# $% ^ & * ( ) (2,4,5), (1,2,3); /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t4` ( `ËÏÌÏÎËÁ1` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; @@ -6325,7 +6325,7 @@ INSERT INTO `t4` VALUES #Check side effect on --complete insert /*M!999999\- enable the sandbox mode */ /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) INVISIBLE DEFAULT NULL @@ -6334,7 +6334,7 @@ CREATE TABLE `t1` ( INSERT INTO `t1` (`a`, `b`) VALUES (1,NULL), (1,2); /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t2` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL @@ -6343,7 +6343,7 @@ CREATE TABLE `t2` ( INSERT INTO `t2` (`a`, `b`) VALUES (1,2), (1,2); /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t3` ( `invisible` int(11) DEFAULT NULL, `a b c & $!@#$%^&*( )` int(11) INVISIBLE DEFAULT 4, @@ -6355,7 +6355,7 @@ INSERT INTO `t3` (`invisible`, `a b c & $!@#$%^&*( )`, `ds=~!@ \# $% ^ & * ( ) (2,4,5), (1,2,3); /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t4` ( `ËÏÌÏÎËÁ1` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; @@ -6686,7 +6686,7 @@ update mysql.event set body ='select not_a_value' where db='test' and name='e1'; create table t1 (i int); /*M!999999\- enable the sandbox mode */ /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `i` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; @@ -6740,7 +6740,7 @@ create table t1 (a int); /*M!999999\- enable the sandbox mode */ DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; diff --git a/mysql-test/main/openssl_1.result b/mysql-test/main/openssl_1.result index 17d6fe5202b..82bc725eae8 100644 --- a/mysql-test/main/openssl_1.result +++ b/mysql-test/main/openssl_1.result @@ -91,7 +91,7 @@ INSERT INTO t1 VALUES (1), (2); /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ); @@ -128,7 +128,7 @@ UNLOCK TABLES; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ); @@ -165,7 +165,7 @@ UNLOCK TABLES; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ); diff --git a/mysql-test/main/partition_exchange.result b/mysql-test/main/partition_exchange.result index b7c9be3480e..0b7393bca7c 100644 --- a/mysql-test/main/partition_exchange.result +++ b/mysql-test/main/partition_exchange.result @@ -1250,6 +1250,46 @@ ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2; ERROR HY000: Tables have different definitions DROP TABLE t1, t2; # +# MDEV-34033 Exchange partition with virtual columns fails +# +create or replace table t1( +id int primary key, +col1 int, +col2 boolean as (col1 is null)) +partition by list (id) ( partition p1 values in (1) +); +create or replace table t1_working like t1; +alter table t1_working remove partitioning; +alter table t1 exchange partition p1 with table t1_working; +create or replace table t2( +id int primary key, +col1 int, +col2 boolean as (true)) +partition by list (id) ( partition p1 values in (1) +); +create or replace table t2_working like t2; +alter table t2_working remove partitioning; +alter table t2 exchange partition p1 with table t2_working; +drop tables t1, t1_working, t2, t2_working; +# +# MDEV-35612 EXCHANGE PARTITION does not work for tables with unique blobs +# +create table t (a int, b text, unique (b), unique(a, b)) partition by list (a) (partition p0 values in (1,2), partition pdef default); +create table tp (a int, b text, c int invisible, unique (b), unique(a, b)); +alter table t exchange partition p0 with table tp; +ERROR HY000: Tables have different definitions +create or replace table tp (a int, b text, unique (b), unique(a, b)); +alter table t exchange partition p0 with table tp; +drop table t, tp; +create table t (a int, b int) with system versioning partition by list (a) (partition p0 values in (1,2)); +create table tp (a int, b int); +alter table t exchange partition p0 with table tp; +ERROR HY000: Tables have different definitions +create or replace table tp (a int, b int) with system versioning; +alter table t exchange partition p0 with table tp; +drop table t, tp; +# End of 10.5 tests +# # MDEV-27683 EXCHANGE PARTITION allows different index direction, but causes further errors # CREATE TABLE t1 (a INT, KEY(a DESC)) PARTITION BY KEY(a) PARTITIONS 4; @@ -1257,6 +1297,4 @@ CREATE TABLE t2 (a INT, KEY(a)); ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2; ERROR HY000: Tables have different definitions DROP TABLE t1, t2; -# # End of 10.8 tests -# diff --git a/mysql-test/main/partition_exchange.test b/mysql-test/main/partition_exchange.test index 82ccc29e00e..4bf6ef80fe0 100644 --- a/mysql-test/main/partition_exchange.test +++ b/mysql-test/main/partition_exchange.test @@ -531,6 +531,7 @@ ALTER TABLE t2 REMOVE PARTITIONING; # The following works as table spaces are not checked anymore ALTER TABLE t1 EXCHANGE PARTITION pm WITH TABLE t2; DROP TABLE t1, t2; +--disable_prepare_warnings --echo # --echo # MDEV-14642 Assertion `table->s->db_create_options == part_table->s->db_create_options' failed in compare_table_with_partition @@ -551,6 +552,60 @@ ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2; # Cleanup DROP TABLE t1, t2; +--echo # +--echo # MDEV-34033 Exchange partition with virtual columns fails +--echo # +# this fails when the virtual persistent column +# references another column +create or replace table t1( + id int primary key, + col1 int, + col2 boolean as (col1 is null)) + partition by list (id) ( partition p1 values in (1) +); + +create or replace table t1_working like t1; +alter table t1_working remove partitioning; +alter table t1 exchange partition p1 with table t1_working; + +# this works when the virtual persistent column +# does not reference another column +create or replace table t2( + id int primary key, + col1 int, + col2 boolean as (true)) + partition by list (id) ( partition p1 values in (1) +); + +create or replace table t2_working like t2; +alter table t2_working remove partitioning; +alter table t2 exchange partition p1 with table t2_working; + +# Cleanup +drop tables t1, t1_working, t2, t2_working; + +--echo # +--echo # MDEV-35612 EXCHANGE PARTITION does not work for tables with unique blobs +--echo # +create table t (a int, b text, unique (b), unique(a, b)) partition by list (a) (partition p0 values in (1,2), partition pdef default); +create table tp (a int, b text, c int invisible, unique (b), unique(a, b)); +--error ER_TABLES_DIFFERENT_METADATA +alter table t exchange partition p0 with table tp; +create or replace table tp (a int, b text, unique (b), unique(a, b)); +alter table t exchange partition p0 with table tp; +drop table t, tp; + +# same for system versioning: +create table t (a int, b int) with system versioning partition by list (a) (partition p0 values in (1,2)); +create table tp (a int, b int); # without system versioning +--error ER_TABLES_DIFFERENT_METADATA +alter table t exchange partition p0 with table tp; +create or replace table tp (a int, b int) with system versioning; +alter table t exchange partition p0 with table tp; +drop table t, tp; + +--echo # End of 10.5 tests + --echo # --echo # MDEV-27683 EXCHANGE PARTITION allows different index direction, but causes further errors --echo # @@ -560,6 +615,4 @@ CREATE TABLE t2 (a INT, KEY(a)); ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE t2; DROP TABLE t1, t2; ---echo # --echo # End of 10.8 tests ---echo # diff --git a/mysql-test/main/ps_11bugs.result b/mysql-test/main/ps_11bugs.result index 87a3487141b..985654eb283 100644 --- a/mysql-test/main/ps_11bugs.result +++ b/mysql-test/main/ps_11bugs.result @@ -245,4 +245,39 @@ NULL DEALLOCATE PREPARE stmt; SET timestamp=DEFAULT; SET time_zone=DEFAULT; +# +# MDEV-35596 Assertion `type_handler()->result_type() == value.type_handler()->result_type()' failed in virtual bool Item_param::get_date(THD*, MYSQL_TIME*, date_mode_t) +# +CREATE TABLE t (c TIMESTAMP); +PREPARE s FROM 'DELETE FROM t WHERE c=?'; +EXECUTE s USING 1; +INSERT INTO t (c) VALUES (now()); +EXECUTE s USING NULL; +DROP TABLE t; +CREATE TABLE t (c TIMESTAMP); +INSERT INTO t (c) VALUES ('2001-01-01 10:20:30'); +PREPARE s FROM 'DELETE FROM t WHERE c=?'; +EXECUTE s USING 1; +Warnings: +Warning 1292 Truncated incorrect datetime value: '1' +EXECUTE s USING NULL; +DROP TABLE t; +CREATE TABLE t (c TIMESTAMP); +INSERT INTO t (c) VALUES ('2001-01-01 10:20:30'); +PREPARE s FROM 'DELETE FROM t WHERE c=?'; +EXECUTE s USING 1; +Warnings: +Warning 1292 Truncated incorrect datetime value: '1' +EXECUTE s USING DEFAULT; +ERROR HY000: Default/ignore value is not supported for such parameter usage +DROP TABLE t; +CREATE TABLE t (c TIMESTAMP); +INSERT INTO t (c) VALUES ('2001-01-01 10:20:30'); +PREPARE s FROM 'DELETE FROM t WHERE c=?'; +EXECUTE s USING 1; +Warnings: +Warning 1292 Truncated incorrect datetime value: '1' +EXECUTE s USING IGNORE; +ERROR HY000: Default/ignore value is not supported for such parameter usage +DROP TABLE t; # End of 10.5 tests diff --git a/mysql-test/main/ps_11bugs.test b/mysql-test/main/ps_11bugs.test index 7a0843e9352..7cb5708d062 100644 --- a/mysql-test/main/ps_11bugs.test +++ b/mysql-test/main/ps_11bugs.test @@ -254,4 +254,38 @@ DEALLOCATE PREPARE stmt; SET timestamp=DEFAULT; SET time_zone=DEFAULT; +--echo # +--echo # MDEV-35596 Assertion `type_handler()->result_type() == value.type_handler()->result_type()' failed in virtual bool Item_param::get_date(THD*, MYSQL_TIME*, date_mode_t) +--echo # + +CREATE TABLE t (c TIMESTAMP); +PREPARE s FROM 'DELETE FROM t WHERE c=?'; +EXECUTE s USING 1; +INSERT INTO t (c) VALUES (now()); +EXECUTE s USING NULL; +DROP TABLE t; + +CREATE TABLE t (c TIMESTAMP); +INSERT INTO t (c) VALUES ('2001-01-01 10:20:30'); +PREPARE s FROM 'DELETE FROM t WHERE c=?'; +EXECUTE s USING 1; +EXECUTE s USING NULL; +DROP TABLE t; + +CREATE TABLE t (c TIMESTAMP); +INSERT INTO t (c) VALUES ('2001-01-01 10:20:30'); +PREPARE s FROM 'DELETE FROM t WHERE c=?'; +EXECUTE s USING 1; +--error ER_INVALID_DEFAULT_PARAM +EXECUTE s USING DEFAULT; +DROP TABLE t; + +CREATE TABLE t (c TIMESTAMP); +INSERT INTO t (c) VALUES ('2001-01-01 10:20:30'); +PREPARE s FROM 'DELETE FROM t WHERE c=?'; +EXECUTE s USING 1; +--error ER_INVALID_DEFAULT_PARAM +EXECUTE s USING IGNORE; +DROP TABLE t; + --echo # End of 10.5 tests diff --git a/mysql-test/main/servers.result b/mysql-test/main/servers.result index d660aff1bd2..a02c3d6ac74 100644 --- a/mysql-test/main/servers.result +++ b/mysql-test/main/servers.result @@ -43,3 +43,10 @@ ERROR HY000: Can't read record in system table drop table mysql.servers; rename table mysql.servers_save to mysql.servers; drop server s1; +# +# MDEV-35641 foreign server "disappears" after ALTERing the servers system table to use innodb and FLUSH PRIVILEGES +# +CREATE SERVER s1 FOREIGN DATA WRAPPER mysql OPTIONS (HOST '127.0.0.1'); +ALTER TABLE mysql.servers ENGINE=innodb; +FLUSH PRIVILEGES; +drop server s1; diff --git a/mysql-test/main/servers.test b/mysql-test/main/servers.test index 1a58d5849f8..f46041bb21c 100644 --- a/mysql-test/main/servers.test +++ b/mysql-test/main/servers.test @@ -41,3 +41,12 @@ create server s2 foreign data wrapper foo options(user 'a'); drop table mysql.servers; rename table mysql.servers_save to mysql.servers; drop server s1; + +--echo # +--echo # MDEV-35641 foreign server "disappears" after ALTERing the servers system table to use innodb and FLUSH PRIVILEGES +--echo # +--source include/have_innodb.inc +CREATE SERVER s1 FOREIGN DATA WRAPPER mysql OPTIONS (HOST '127.0.0.1'); +ALTER TABLE mysql.servers ENGINE=innodb; +FLUSH PRIVILEGES; +drop server s1; diff --git a/mysql-test/main/simultaneous_assignment.result b/mysql-test/main/simultaneous_assignment.result index 67cb58ba6af..041d7bf0f5c 100644 --- a/mysql-test/main/simultaneous_assignment.result +++ b/mysql-test/main/simultaneous_assignment.result @@ -220,3 +220,15 @@ INDEXES Indexes TRANSACTIONS Transactions TRIGGERS Triggers DROP TABLE ft2; +# +# MDEV-27769 Assertion failed in Field::ptr_in_record upon UPDATE +# (duplicate) MDEV-35404 Assertion failed in Field::ptr_in_record +# +CREATE TABLE t (s geometry, t text); +INSERT INTO t () VALUES (); +UPDATE t SET t = '', s = 0; +ERROR HY000: Cannot cast 'int' as 'geometry' in assignment of `test`.`t`.`s` +UPDATE t SET t = '', s = 0; +ERROR HY000: Cannot cast 'int' as 'geometry' in assignment of `test`.`t`.`s` +ALTER TABLE t force; +DROP TABLE t; diff --git a/mysql-test/main/simultaneous_assignment.test b/mysql-test/main/simultaneous_assignment.test index aea454855f5..cfc802d9caf 100644 --- a/mysql-test/main/simultaneous_assignment.test +++ b/mysql-test/main/simultaneous_assignment.test @@ -205,3 +205,19 @@ UPDATE ft2 SET copy = UPPER(copy), copy2= copy; SELECT * FROM ft2; DROP TABLE ft2; + +--echo # +--echo # MDEV-27769 Assertion failed in Field::ptr_in_record upon UPDATE +--echo # (duplicate) MDEV-35404 Assertion failed in Field::ptr_in_record +--echo # +CREATE TABLE t (s geometry, t text); + +INSERT INTO t () VALUES (); +--error ER_ILLEGAL_PARAMETER_DATA_TYPES2_FOR_OPERATION +UPDATE t SET t = '', s = 0; +--error ER_ILLEGAL_PARAMETER_DATA_TYPES2_FOR_OPERATION +UPDATE t SET t = '', s = 0; + +ALTER TABLE t force; + +DROP TABLE t; diff --git a/mysql-test/main/slowlog_integrity.result b/mysql-test/main/slowlog_integrity.result new file mode 100644 index 00000000000..0ab6fcbfc5e --- /dev/null +++ b/mysql-test/main/slowlog_integrity.result @@ -0,0 +1,108 @@ +# +# MDEV-20281 "[ERROR] Failed to write to mysql.slow_log:" without +# error reason +# +call mtr.add_suppression("Failed to write to mysql.slow_log:"); +SET @old_slow_query_log= @@global.slow_query_log; +SET @old_log_output= @@global.log_output; +SET @old_long_query_time= @@long_query_time; +SET GLOBAL log_output= "TABLE"; +SET GLOBAL slow_query_log= ON; +SET SESSION long_query_time= 0; +select 1 from dual; +1 +1 +show create table mysql.slow_log; +Table Create Table +slow_log CREATE TABLE `slow_log` ( + `start_time` timestamp(6) NOT NULL DEFAULT current_timestamp(6) ON UPDATE current_timestamp(6), + `user_host` mediumtext NOT NULL, + `query_time` time(6) NOT NULL, + `lock_time` time(6) NOT NULL, + `rows_sent` bigint(20) unsigned NOT NULL, + `rows_examined` bigint(20) unsigned NOT NULL, + `db` varchar(512) NOT NULL, + `last_insert_id` int(11) NOT NULL, + `insert_id` int(11) NOT NULL, + `server_id` int(10) unsigned NOT NULL, + `sql_text` mediumtext NOT NULL, + `thread_id` bigint(21) unsigned NOT NULL, + `rows_affected` bigint(20) unsigned NOT NULL +) ENGINE=CSV DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT='Slow log' +SET @@long_query_time= @old_long_query_time; +SET @@global.log_output= "FILE"; +SET GLOBAL slow_query_log= OFF; +drop table mysql.slow_log; +# one field missing +CREATE TABLE mysql.slow_log ( +`start_time` timestamp(6) NOT NULL DEFAULT current_timestamp(6) ON UPDATE current_timestamp(6), +`user_host` mediumtext NOT NULL, +`query_time` time(6) NOT NULL, +`lock_time` time(6) NOT NULL, +`rows_sent` bigint(20) unsigned NOT NULL, +`rows_examined` bigint(20) unsigned NOT NULL, +`db` varchar(512) NOT NULL, +`last_insert_id` int(11) NOT NULL, +`insert_id` int(11) NOT NULL, +`server_id` int(10) unsigned NOT NULL, +`sql_text` mediumtext NOT NULL, +`thread_id` bigint(21) unsigned NOT NULL +) ENGINE=CSV DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci COMMENT='Slow log'; +SET GLOBAL log_output= "TABLE"; +SET GLOBAL slow_query_log= ON; +SET SESSION long_query_time= 0; +select 1 from dual; +1 +1 +SET @@long_query_time= @old_long_query_time; +SET @@global.log_output= "FILE"; +SET GLOBAL slow_query_log= OFF; +drop table mysql.slow_log; +# crazy types +CREATE TABLE mysql.slow_log ( +`start_time` timestamp(6) NOT NULL DEFAULT current_timestamp(6) ON UPDATE current_timestamp(6), +`user_host` ENUM('apple','orange','pear') NOT NULL, +`query_time` ENUM('apple','orange','pear') NOT NULL, +`lock_time` ENUM('apple','orange','pear') NOT NULL, +`rows_sent` ENUM('apple','orange','pear') NOT NULL, +`rows_examined` ENUM('apple','orange','pear') NOT NULL, +`db` ENUM('apple','orange','pear') NOT NULL, +`last_insert_id` ENUM('apple','orange','pear') NOT NULL, +`insert_id` ENUM('apple','orange','pear') NOT NULL, +`server_id` ENUM('apple','orange','pear') NOT NULL, +`sql_text` ENUM('apple','orange','pear') NOT NULL, +`thread_id` ENUM('apple','orange','pear') NOT NULL, +`rows_affected` ENUM('apple','orange','pear') NOT NULL +) ENGINE=CSV DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci COMMENT='Slow log'; +SET GLOBAL log_output= "TABLE"; +SET GLOBAL slow_query_log= ON; +SET SESSION long_query_time= 0; +select 1 from dual; +1 +1 +SET @@long_query_time= @old_long_query_time; +SET @@global.log_output= "FILE"; +SET GLOBAL slow_query_log= OFF; +drop table mysql.slow_log; +# restore normal slow log table +CREATE TABLE mysql.slow_log ( +`start_time` timestamp(6) NOT NULL DEFAULT current_timestamp(6) ON UPDATE current_timestamp(6), +`user_host` mediumtext NOT NULL, +`query_time` time(6) NOT NULL, +`lock_time` time(6) NOT NULL, +`rows_sent` bigint(20) unsigned NOT NULL, +`rows_examined` bigint(20) unsigned NOT NULL, +`db` varchar(512) NOT NULL, +`last_insert_id` int(11) NOT NULL, +`insert_id` int(11) NOT NULL, +`server_id` int(10) unsigned NOT NULL, +`sql_text` mediumtext NOT NULL, +`thread_id` bigint(21) unsigned NOT NULL, +`rows_affected` bigint(20) unsigned NOT NULL +) ENGINE=CSV DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci COMMENT='Slow log'; +SET @@long_query_time= @old_long_query_time; +SET @@global.log_output= @old_log_output; +SET @@global.slow_query_log= @old_slow_query_log; +FOUND 2 /incorrect number of fields in the log table/ in mysqld.1.err +FOUND 2 /Can't write data \(possible incorrect log table structure\)/ in mysqld.1.err +# End of 10.5 tests diff --git a/mysql-test/main/slowlog_integrity.test b/mysql-test/main/slowlog_integrity.test new file mode 100644 index 00000000000..8db3a5ee881 --- /dev/null +++ b/mysql-test/main/slowlog_integrity.test @@ -0,0 +1,113 @@ +source include/not_embedded.inc; + +--echo # +--echo # MDEV-20281 "[ERROR] Failed to write to mysql.slow_log:" without +--echo # error reason +--echo # + + +call mtr.add_suppression("Failed to write to mysql.slow_log:"); + +--disable_ps_protocol +SET @old_slow_query_log= @@global.slow_query_log; +SET @old_log_output= @@global.log_output; +SET @old_long_query_time= @@long_query_time; +SET GLOBAL log_output= "TABLE"; +SET GLOBAL slow_query_log= ON; +SET SESSION long_query_time= 0; + +select 1 from dual; + +show create table mysql.slow_log; + +SET @@long_query_time= @old_long_query_time; +SET @@global.log_output= "FILE"; +SET GLOBAL slow_query_log= OFF; + +drop table mysql.slow_log; + +--echo # one field missing +CREATE TABLE mysql.slow_log ( + `start_time` timestamp(6) NOT NULL DEFAULT current_timestamp(6) ON UPDATE current_timestamp(6), + `user_host` mediumtext NOT NULL, + `query_time` time(6) NOT NULL, + `lock_time` time(6) NOT NULL, + `rows_sent` bigint(20) unsigned NOT NULL, + `rows_examined` bigint(20) unsigned NOT NULL, + `db` varchar(512) NOT NULL, + `last_insert_id` int(11) NOT NULL, + `insert_id` int(11) NOT NULL, + `server_id` int(10) unsigned NOT NULL, + `sql_text` mediumtext NOT NULL, + `thread_id` bigint(21) unsigned NOT NULL +) ENGINE=CSV DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci COMMENT='Slow log'; + +SET GLOBAL log_output= "TABLE"; +SET GLOBAL slow_query_log= ON; +SET SESSION long_query_time= 0; + +select 1 from dual; + +SET @@long_query_time= @old_long_query_time; +SET @@global.log_output= "FILE"; +SET GLOBAL slow_query_log= OFF; + +drop table mysql.slow_log; + +--echo # crazy types +CREATE TABLE mysql.slow_log ( + `start_time` timestamp(6) NOT NULL DEFAULT current_timestamp(6) ON UPDATE current_timestamp(6), + `user_host` ENUM('apple','orange','pear') NOT NULL, + `query_time` ENUM('apple','orange','pear') NOT NULL, + `lock_time` ENUM('apple','orange','pear') NOT NULL, + `rows_sent` ENUM('apple','orange','pear') NOT NULL, + `rows_examined` ENUM('apple','orange','pear') NOT NULL, + `db` ENUM('apple','orange','pear') NOT NULL, + `last_insert_id` ENUM('apple','orange','pear') NOT NULL, + `insert_id` ENUM('apple','orange','pear') NOT NULL, + `server_id` ENUM('apple','orange','pear') NOT NULL, + `sql_text` ENUM('apple','orange','pear') NOT NULL, + `thread_id` ENUM('apple','orange','pear') NOT NULL, + `rows_affected` ENUM('apple','orange','pear') NOT NULL +) ENGINE=CSV DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci COMMENT='Slow log'; + +SET GLOBAL log_output= "TABLE"; +SET GLOBAL slow_query_log= ON; +SET SESSION long_query_time= 0; + +select 1 from dual; + +SET @@long_query_time= @old_long_query_time; +SET @@global.log_output= "FILE"; +SET GLOBAL slow_query_log= OFF; + +drop table mysql.slow_log; + +--echo # restore normal slow log table +CREATE TABLE mysql.slow_log ( + `start_time` timestamp(6) NOT NULL DEFAULT current_timestamp(6) ON UPDATE current_timestamp(6), + `user_host` mediumtext NOT NULL, + `query_time` time(6) NOT NULL, + `lock_time` time(6) NOT NULL, + `rows_sent` bigint(20) unsigned NOT NULL, + `rows_examined` bigint(20) unsigned NOT NULL, + `db` varchar(512) NOT NULL, + `last_insert_id` int(11) NOT NULL, + `insert_id` int(11) NOT NULL, + `server_id` int(10) unsigned NOT NULL, + `sql_text` mediumtext NOT NULL, + `thread_id` bigint(21) unsigned NOT NULL, + `rows_affected` bigint(20) unsigned NOT NULL +) ENGINE=CSV DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci COMMENT='Slow log'; +SET @@long_query_time= @old_long_query_time; +SET @@global.log_output= @old_log_output; +SET @@global.slow_query_log= @old_slow_query_log; +--enable_ps_protocol + +--let SEARCH_FILE=$MYSQLTEST_VARDIR/log/mysqld.1.err +--let SEARCH_PATTERN=incorrect number of fields in the log table +--source include/search_pattern_in_file.inc +--let SEARCH_PATTERN=Can't write data \(possible incorrect log table structure\) +--source include/search_pattern_in_file.inc + +--echo # End of 10.5 tests diff --git a/mysql-test/main/sp-bugs.result b/mysql-test/main/sp-bugs.result index a166a5a0a9a..14619165e53 100644 --- a/mysql-test/main/sp-bugs.result +++ b/mysql-test/main/sp-bugs.result @@ -363,3 +363,30 @@ ERROR HY000: Unknown thread id: 0 # # End of 10.4 tests # +# +# MDEV-24935: Server crashes in Field_iterator_natural_join::next or Field_iterator_table_ref::set_field_iterator upon 2nd execution of SP +# +CREATE TABLE t1 (a INT); +CREATE TABLE t2 (b INT, c INT); +CREATE TABLE t3 (d INT); +CREATE PROCEDURE sp() SELECT * FROM t1 JOIN t2 JOIN t3 USING (x); +CALL sp; +ERROR 42S22: Unknown column 'x' in 'FROM' +CALL sp; +ERROR 42S22: Unknown column 'x' in 'FROM' +# Clean up +DROP PROCEDURE sp; +DROP TABLE t1, t2, t3; +CREATE TABLE t1 (c1 INT,c2 INT); +CREATE TABLE t2 (c INT,c2 INT); +CREATE PROCEDURE p2 (OUT i INT,OUT o INT) READS SQL DATA DELETE a2,a3 FROM t1 AS a1 JOIN t2 AS a2 NATURAL JOIN t2 AS a3; +CALL p2 (@c,@a); +ERROR 23000: Column 'c2' in FROM is ambiguous +CALL p2 (@a,@c); +ERROR 23000: Column 'c2' in FROM is ambiguous +# Clean up +DROP PROCEDURE p2; +DROP TABLE t1, t2; +# +# End of 10.5 tests +# diff --git a/mysql-test/main/sp-bugs.test b/mysql-test/main/sp-bugs.test index 18fe14dc8bc..f44216fbf46 100644 --- a/mysql-test/main/sp-bugs.test +++ b/mysql-test/main/sp-bugs.test @@ -386,3 +386,34 @@ KILL (('x' IN ( SELECT 1)) MOD 44); --echo # --echo # End of 10.4 tests --echo # + +--echo # +--echo # MDEV-24935: Server crashes in Field_iterator_natural_join::next or Field_iterator_table_ref::set_field_iterator upon 2nd execution of SP +--echo # +CREATE TABLE t1 (a INT); +CREATE TABLE t2 (b INT, c INT); +CREATE TABLE t3 (d INT); +CREATE PROCEDURE sp() SELECT * FROM t1 JOIN t2 JOIN t3 USING (x); +--error ER_BAD_FIELD_ERROR +CALL sp; +--error ER_BAD_FIELD_ERROR +CALL sp; +--echo # Clean up +DROP PROCEDURE sp; +DROP TABLE t1, t2, t3; + +CREATE TABLE t1 (c1 INT,c2 INT); +CREATE TABLE t2 (c INT,c2 INT); +CREATE PROCEDURE p2 (OUT i INT,OUT o INT) READS SQL DATA DELETE a2,a3 FROM t1 AS a1 JOIN t2 AS a2 NATURAL JOIN t2 AS a3; + +--error ER_NON_UNIQ_ERROR +CALL p2 (@c,@a); +--error ER_NON_UNIQ_ERROR +CALL p2 (@a,@c); +--echo # Clean up +DROP PROCEDURE p2; +DROP TABLE t1, t2; + +--echo # +--echo # End of 10.5 tests +--echo # diff --git a/mysql-test/main/sp.result b/mysql-test/main/sp.result index 03537ebdfd9..414d0cd97bf 100644 --- a/mysql-test/main/sp.result +++ b/mysql-test/main/sp.result @@ -8971,6 +8971,205 @@ DROP PROCEDURE p1; DROP PROCEDURE p2; # End of 10.4 tests # +# MDEV-35910: Pushdown of conditions with local SP variables +# into materialized derived table +# Pushdown of conditions with local variables from HAVING +# into WHERE +# +CREATE TABLE t1( +pk INT PRIMARY KEY AUTO_INCREMENT, +a INT, +b INT +); +INSERT INTO t1(a,b) VALUES (1, 2), (3, 2), (4, 5); +INSERT INTO t1(a,b) VALUES (3, 7), (4, 1), (3, 4); +CREATE PROCEDURE pushdownDerivedSp() +BEGIN +DECLARE localA INT DEFAULT 1; +DECLARE localB INT DEFAULT 2; +SELECT dt.a +FROM ( +SELECT t1.a, MIN(t1.b) as minB +FROM t1 +GROUP BY t1.a +) AS dt +WHERE dt.minB = localB AND dt.a = localA + localB; +END$$ +CREATE PROCEDURE explainPushdownDerivedSp() +BEGIN +DECLARE localA INT DEFAULT 1; +DECLARE localB INT DEFAULT 2; +EXPLAIN format=json SELECT dt.a +FROM ( +SELECT t1.a, MIN(t1.b) as minB +FROM t1 +GROUP BY t1.a +) AS dt +WHERE dt.minB = localB AND dt.a = localA + localB; +END$$ +CREATE PROCEDURE pushdownFromHavingSp() +BEGIN +DECLARE localA INT DEFAULT 1; +DECLARE localB INT DEFAULT 2; +SELECT t1.a, SUM(b) +FROM t1 +GROUP BY t1.a +HAVING t1.a > localA AND SUM(b) > 10 OR t1.a <= localB AND SUM(b) <= 2; +END$$ +CREATE PROCEDURE explainPushdownFromHavingSp() +BEGIN +DECLARE localA INT DEFAULT 1; +DECLARE localB INT DEFAULT 2; +EXPLAIN format=json +SELECT t1.a, SUM(b) +FROM t1 +GROUP BY t1.a +HAVING t1.a > localA AND SUM(b) > 10 OR t1.a <= localB AND SUM(b) <= 2; +END$$ +CALL pushdownDerivedSp(); +a +3 +set statement optimizer_switch='condition_pushdown_for_derived=off' +for CALL pushdownDerivedSp(); +a +3 +CALL explainPushdownDerivedSp(); +EXPLAIN +{ + "query_block": { + "select_id": 1, + "nested_loop": [ + { + "table": { + "table_name": "", + "access_type": "ALL", + "rows": 6, + "filtered": 100, + "attached_condition": "dt.minB = (localB@1) and dt.a = (localA@0 + localB@1)", + "materialized": { + "query_block": { + "select_id": 2, + "having_condition": "minB = (localB@1)", + "nested_loop": [ + { + "table": { + "table_name": "t1", + "access_type": "ALL", + "rows": 6, + "filtered": 100, + "attached_condition": "t1.a = (localA@0 + localB@1)" + } + } + ] + } + } + } + } + ] + } +} +set statement optimizer_switch='condition_pushdown_for_derived=off' for +CALL explainPushdownDerivedSp(); +EXPLAIN +{ + "query_block": { + "select_id": 1, + "nested_loop": [ + { + "table": { + "table_name": "", + "access_type": "ALL", + "rows": 6, + "filtered": 100, + "attached_condition": "dt.minB = (localB@1) and dt.a = (localA@0 + localB@1)", + "materialized": { + "query_block": { + "select_id": 2, + "filesort": { + "sort_key": "t1.a", + "temporary_table": { + "nested_loop": [ + { + "table": { + "table_name": "t1", + "access_type": "ALL", + "rows": 6, + "filtered": 100 + } + } + ] + } + } + } + } + } + } + ] + } +} +CALL pushdownFromHavingSp(); +a SUM(b) +1 2 +3 13 +set statement optimizer_switch='condition_pushdown_from_having=off' for +CALL pushdownFromHavingSp(); +a SUM(b) +1 2 +3 13 +CALL explainPushdownFromHavingSp(); +EXPLAIN +{ + "query_block": { + "select_id": 1, + "having_condition": "t1.a > (localA@0) and sum(t1.b) > 10 or t1.a <= (localB@1) and sum(t1.b) <= 2", + "filesort": { + "sort_key": "t1.a", + "temporary_table": { + "nested_loop": [ + { + "table": { + "table_name": "t1", + "access_type": "ALL", + "rows": 6, + "filtered": 100, + "attached_condition": "t1.a > (localA@0) or t1.a <= (localB@1)" + } + } + ] + } + } + } +} +set statement optimizer_switch='condition_pushdown_from_having=off' for +CALL explainPushdownFromHavingSp(); +EXPLAIN +{ + "query_block": { + "select_id": 1, + "having_condition": "t1.a > (localA@0) and sum(t1.b) > 10 or t1.a <= (localB@1) and sum(t1.b) <= 2", + "filesort": { + "sort_key": "t1.a", + "temporary_table": { + "nested_loop": [ + { + "table": { + "table_name": "t1", + "access_type": "ALL", + "rows": 6, + "filtered": 100 + } + } + ] + } + } + } +} +DROP PROCEDURE pushdownDerivedSp; +DROP PROCEDURE explainPushdownDerivedSp; +DROP PROCEDURE pushdownFromHavingSp; +DROP PROCEDURE explainPushdownFromHavingSp; +DROP TABLE t1; +# End of 10.5 tests # # MDEV-29129: Performance regression starting in 10.6: unlimited "select order by limit" # @@ -9096,6 +9295,7 @@ database() test DROP FUNCTION database; DROP TABLE t1; +# End of 10.6 tests # # MDEV-28129: MariaDB UAF issue at lex_end_nops(LEX*) # @@ -9105,6 +9305,4 @@ CREATE PROCEDURE sp() SET @=1; 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 '=1' at line 1 CREATE PROCEDURE sp() SELECT @; 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 '' at line 1 -# # End of 10.7 tests -# diff --git a/mysql-test/main/sp.test b/mysql-test/main/sp.test index 41f41cda9fc..56984c79a90 100644 --- a/mysql-test/main/sp.test +++ b/mysql-test/main/sp.test @@ -10591,7 +10591,95 @@ DROP PROCEDURE p1; DROP PROCEDURE p2; --echo # End of 10.4 tests + --echo # +--echo # MDEV-35910: Pushdown of conditions with local SP variables +--echo # into materialized derived table +--echo # Pushdown of conditions with local variables from HAVING +--echo # into WHERE +--echo # + +CREATE TABLE t1( + pk INT PRIMARY KEY AUTO_INCREMENT, + a INT, + b INT +); +INSERT INTO t1(a,b) VALUES (1, 2), (3, 2), (4, 5); +INSERT INTO t1(a,b) VALUES (3, 7), (4, 1), (3, 4); + +DELIMITER $$; +CREATE PROCEDURE pushdownDerivedSp() +BEGIN + DECLARE localA INT DEFAULT 1; + DECLARE localB INT DEFAULT 2; + SELECT dt.a + FROM ( + SELECT t1.a, MIN(t1.b) as minB + FROM t1 + GROUP BY t1.a + ) AS dt + WHERE dt.minB = localB AND dt.a = localA + localB; +END$$ + +CREATE PROCEDURE explainPushdownDerivedSp() +BEGIN + DECLARE localA INT DEFAULT 1; + DECLARE localB INT DEFAULT 2; + EXPLAIN format=json SELECT dt.a + FROM ( + SELECT t1.a, MIN(t1.b) as minB + FROM t1 + GROUP BY t1.a + ) AS dt + WHERE dt.minB = localB AND dt.a = localA + localB; +END$$ + +CREATE PROCEDURE pushdownFromHavingSp() +BEGIN + DECLARE localA INT DEFAULT 1; + DECLARE localB INT DEFAULT 2; + SELECT t1.a, SUM(b) + FROM t1 + GROUP BY t1.a + HAVING t1.a > localA AND SUM(b) > 10 OR t1.a <= localB AND SUM(b) <= 2; +END$$ + +CREATE PROCEDURE explainPushdownFromHavingSp() +BEGIN + DECLARE localA INT DEFAULT 1; + DECLARE localB INT DEFAULT 2; + EXPLAIN format=json + SELECT t1.a, SUM(b) + FROM t1 + GROUP BY t1.a + HAVING t1.a > localA AND SUM(b) > 10 OR t1.a <= localB AND SUM(b) <= 2; +END$$ + +DELIMITER ;$$ + +CALL pushdownDerivedSp(); +set statement optimizer_switch='condition_pushdown_for_derived=off' +for CALL pushdownDerivedSp(); + +CALL explainPushdownDerivedSp(); +set statement optimizer_switch='condition_pushdown_for_derived=off' for +CALL explainPushdownDerivedSp(); + +CALL pushdownFromHavingSp(); +set statement optimizer_switch='condition_pushdown_from_having=off' for +CALL pushdownFromHavingSp(); + +CALL explainPushdownFromHavingSp(); +set statement optimizer_switch='condition_pushdown_from_having=off' for +CALL explainPushdownFromHavingSp(); + +DROP PROCEDURE pushdownDerivedSp; +DROP PROCEDURE explainPushdownDerivedSp; +DROP PROCEDURE pushdownFromHavingSp; +DROP PROCEDURE explainPushdownFromHavingSp; +DROP TABLE t1; + +--echo # End of 10.5 tests --echo # --echo # MDEV-29129: Performance regression starting in 10.6: unlimited "select order by limit" @@ -10679,10 +10767,9 @@ CREATE OR REPLACE FUNCTION database() RETURNS int RETURN 333; SELECT database(); DROP FUNCTION database; - -# Cleanup DROP TABLE t1; +--echo # End of 10.6 tests --echo # --echo # MDEV-28129: MariaDB UAF issue at lex_end_nops(LEX*) @@ -10697,6 +10784,4 @@ CREATE PROCEDURE sp() SET @=1; --error ER_PARSE_ERROR CREATE PROCEDURE sp() SELECT @; ---echo # --echo # End of 10.7 tests ---echo # diff --git a/mysql-test/main/stack.result b/mysql-test/main/stack.result index 5444381327d..d30a55cd21a 100644 --- a/mysql-test/main/stack.result +++ b/mysql-test/main/stack.result @@ -37,6 +37,7 @@ $$ call recursion(0,2,@s1); call recursion(0,3,@s2); call recursion(0,4,@s3); +$$ select @s1 > 0 && @s2 > 0 && @s3 > 0; @s1 > 0 && @s2 > 0 && @s3 > 0 1 diff --git a/mysql-test/main/stack.test b/mysql-test/main/stack.test index 2277b0f48ff..60e629a67c4 100644 --- a/mysql-test/main/stack.test +++ b/mysql-test/main/stack.test @@ -30,6 +30,7 @@ DROP table t1; --echo # set @@max_sp_recursion_depth=20; +--disable_ps_protocol delimiter $$; create or replace procedure recursion(x int, max int, OUT res int) begin @@ -40,11 +41,13 @@ begin end; $$ -delimiter ;$$ - call recursion(0,2,@s1); call recursion(0,3,@s2); call recursion(0,4,@s3); +$$ + +delimiter ;$$ +--enable_ps_protocol select @s1 > 0 && @s2 > 0 && @s3 > 0; if (`select @s2-@s1 <> @s3 - @s2`) diff --git a/mysql-test/main/trigger_no_defaults-11698.result b/mysql-test/main/trigger_no_defaults-11698.result index 8ce495eaf3a..443bf15bb63 100644 --- a/mysql-test/main/trigger_no_defaults-11698.result +++ b/mysql-test/main/trigger_no_defaults-11698.result @@ -15,10 +15,10 @@ insert t1 (b) values (10); insert t1 (b) values (20); ERROR HY000: Field 'a' doesn't have a default value insert t1 (b) values (30); +ERROR 23000: Column 'a' cannot be null select * from t1; a b 10 10 -0 30 drop table t1; set sql_mode=default; set sql_mode=''; diff --git a/mysql-test/main/trigger_no_defaults-11698.test b/mysql-test/main/trigger_no_defaults-11698.test index c10bec68314..86a7a436ad0 100644 --- a/mysql-test/main/trigger_no_defaults-11698.test +++ b/mysql-test/main/trigger_no_defaults-11698.test @@ -19,7 +19,7 @@ delimiter ;| insert t1 (b) values (10); --error ER_NO_DEFAULT_FOR_FIELD insert t1 (b) values (20); -# arguably the statement below should fail too +--error ER_BAD_NULL_ERROR insert t1 (b) values (30); select * from t1; drop table t1; diff --git a/mysql-test/main/trigger_null-8605.result b/mysql-test/main/trigger_null.result similarity index 91% rename from mysql-test/main/trigger_null-8605.result rename to mysql-test/main/trigger_null.result index 9dcd2994b79..4e4a99f22a3 100644 --- a/mysql-test/main/trigger_null-8605.result +++ b/mysql-test/main/trigger_null.result @@ -364,3 +364,39 @@ create trigger tr before update on t1 for each row set @a = 1; insert into t1 (pk, i) values (null, null); ERROR 23000: Column 'pk' cannot be null drop table t1; +# +# MDEV-19761 Before Trigger not processed for Not Null Columns if no explicit value and no DEFAULT +# +create table t1( id int, rate int not null); +create trigger test_trigger before insert on t1 for each row +set new.rate=if(new.rate is null,10,new.rate); +insert into t1 (id) values (1); +insert into t1 values (2,3); +select * from t1; +id rate +1 10 +2 3 +create or replace trigger test_trigger before insert on t1 for each row +if new.rate is null then set new.rate = 15; end if; +$$ +insert into t1 (id) values (3); +insert into t1 values (4,5); +select * from t1; +id rate +1 10 +2 3 +3 15 +4 5 +drop table t1; +# +# MDEV-35911 Assertion `marked_for_write_or_computed()' failed in bool Field_new_decimal::store_value(const my_decimal*, int*) +# +set sql_mode=''; +create table t1 (c fixed,c2 binary (1),c5 fixed not null); +create trigger tr1 before update on t1 for each row set @a=0; +insert into t1 (c) values (1); +Warnings: +Warning 1364 Field 'c5' doesn't have a default value +drop table t1; +set sql_mode=default; +# End of 10.5 tests diff --git a/mysql-test/main/trigger_null-8605.test b/mysql-test/main/trigger_null.test similarity index 92% rename from mysql-test/main/trigger_null-8605.test rename to mysql-test/main/trigger_null.test index c9a7cd5477d..3aa39ded586 100644 --- a/mysql-test/main/trigger_null-8605.test +++ b/mysql-test/main/trigger_null.test @@ -391,3 +391,38 @@ create trigger tr before update on t1 for each row set @a = 1; --error ER_BAD_NULL_ERROR insert into t1 (pk, i) values (null, null); drop table t1; + +--echo # +--echo # MDEV-19761 Before Trigger not processed for Not Null Columns if no explicit value and no DEFAULT +--echo # +create table t1( id int, rate int not null); +create trigger test_trigger before insert on t1 for each row + set new.rate=if(new.rate is null,10,new.rate); + +insert into t1 (id) values (1); +insert into t1 values (2,3); +select * from t1; + +delimiter $$; +create or replace trigger test_trigger before insert on t1 for each row + if new.rate is null then set new.rate = 15; end if; +$$ +delimiter ;$$ + +insert into t1 (id) values (3); +insert into t1 values (4,5); +select * from t1; + +drop table t1; + +--echo # +--echo # MDEV-35911 Assertion `marked_for_write_or_computed()' failed in bool Field_new_decimal::store_value(const my_decimal*, int*) +--echo # +set sql_mode=''; +create table t1 (c fixed,c2 binary (1),c5 fixed not null); +create trigger tr1 before update on t1 for each row set @a=0; +insert into t1 (c) values (1); +drop table t1; +set sql_mode=default; + +--echo # End of 10.5 tests diff --git a/mysql-test/main/trigger_wl3253.result b/mysql-test/main/trigger_wl3253.result index 8d4de24d4e0..54cc51a0e58 100644 --- a/mysql-test/main/trigger_wl3253.result +++ b/mysql-test/main/trigger_wl3253.result @@ -312,7 +312,7 @@ CREATE TRIGGER tr2_bi BEFORE INSERT ON t1 FOR EACH ROW SET @a:=2; CREATE TRIGGER tr1_bu BEFORE UPDATE ON t1 FOR EACH ROW SET @a:=3; /*M!999999\- enable the sandbox mode */ /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; @@ -375,7 +375,7 @@ CREATE TRIGGER tr1_1_bi BEFORE INSERT ON t1 FOR EACH ROW FOLLOWS tr1_bi SET @a:= # Expected order of triggers in the dump is: tr0_bi, tr1_bi, tr1_1_bi, tr2_i. /*M!999999\- enable the sandbox mode */ /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; diff --git a/mysql-test/main/type_set.result b/mysql-test/main/type_set.result index c439cbaf6d2..e5e0426ba7d 100644 --- a/mysql-test/main/type_set.result +++ b/mysql-test/main/type_set.result @@ -661,6 +661,19 @@ DROP TABLE t2; DROP TABLE t1; SET note_verbosity=DEFAULT; # +# MDEV-35864 UBSAN: "applying zero offset to null pointer" when using a Field_set with empty values +# +SET sql_mode=''; +CREATE OR REPLACE TABLE t (c SET('','','') KEY,c2 DECIMAL UNSIGNED ZEROFILL,c3 CHAR(1) BINARY) ENGINE=MyISAM; +Warnings: +Note 1291 Column 'c' has duplicated value '' in SET +Note 1291 Column 'c' has duplicated value '' in SET +INSERT INTO t VALUES ('',CURRENT_TIME,''); +UPDATE t SET c2=c2+5 WHERE c BETWEEN '' AND ''; +DROP TABLE t; +SET sql_mode=DEFAULT; +# End of 10.6 tests +# # MDEV-29062 Wrong result set metadata for a mix of INT+ENUM # CREATE TABLE t1 @@ -691,3 +704,4 @@ Catalog Database Table Table_alias Column Column_alias Type Length Max length Is def COALESCE(c_int, c_set) 253 33 0 Y 0 39 33 COALESCE(c_int, c_set) DROP TABLE t1; +# End of 10.11 tests diff --git a/mysql-test/main/type_set.test b/mysql-test/main/type_set.test index 77712c61654..1873a54897a 100644 --- a/mysql-test/main/type_set.test +++ b/mysql-test/main/type_set.test @@ -292,6 +292,19 @@ DELIMITER ;$$ DROP TABLE t1; SET note_verbosity=DEFAULT; +--echo # +--echo # MDEV-35864 UBSAN: "applying zero offset to null pointer" when using a Field_set with empty values +--echo # + +SET sql_mode=''; +CREATE OR REPLACE TABLE t (c SET('','','') KEY,c2 DECIMAL UNSIGNED ZEROFILL,c3 CHAR(1) BINARY) ENGINE=MyISAM; +INSERT INTO t VALUES ('',CURRENT_TIME,''); +UPDATE t SET c2=c2+5 WHERE c BETWEEN '' AND ''; +DROP TABLE t; +SET sql_mode=DEFAULT; + +--echo # End of 10.6 tests + --echo # --echo # MDEV-29062 Wrong result set metadata for a mix of INT+ENUM --echo # @@ -320,3 +333,5 @@ SELECT COALESCE(c_int, c_set) FROM t1; --enable_view_protocol DROP TABLE t1; + +--echo # End of 10.11 tests diff --git a/mysql-test/main/view.result b/mysql-test/main/view.result index 7a42bda43c2..789245315ce 100644 --- a/mysql-test/main/view.result +++ b/mysql-test/main/view.result @@ -6994,6 +6994,17 @@ View Create View character_set_client collation_connection v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 1 AS `1` from `t1` union (select 1 AS `1` from DUAL where 1 group by 1 having 1 for update) latin1 latin1_swedish_ci DROP VIEW v1; DROP TABLE t1; +# +# MDEV-35090: (Item_func_current_user) Assertion +# `typeid(*copy) == typeid(*this)' failed in +# Item_func_or_sum::do_build_clone +# +CREATE VIEW v AS SELECT 1; +SELECT * FROM v WHERE UpdateXML('N/A','/a',CURRENT_USER()); +1 +Warnings: +Warning 1292 Truncated incorrect DOUBLE value: 'N/A' +DROP VIEW v; # End of 10.5 tests # # MDEV-13115: SELECT .. SKIP LOCKED - ensure SHOW CREATE VIEW is correct diff --git a/mysql-test/main/view.test b/mysql-test/main/view.test index 55fe2aace70..51b89b4239b 100644 --- a/mysql-test/main/view.test +++ b/mysql-test/main/view.test @@ -6768,6 +6768,19 @@ SHOW CREATE VIEW v1; DROP VIEW v1; DROP TABLE t1; +--echo # +--echo # MDEV-35090: (Item_func_current_user) Assertion +--echo # `typeid(*copy) == typeid(*this)' failed in +--echo # Item_func_or_sum::do_build_clone +--echo # + +CREATE VIEW v AS SELECT 1; + +SELECT * FROM v WHERE UpdateXML('N/A','/a',CURRENT_USER()); + +# Cleanup +DROP VIEW v; + --echo # End of 10.5 tests --echo # diff --git a/mysql-test/main/win.result b/mysql-test/main/win.result index ee5d67a87dc..ec9d3fd4cb9 100644 --- a/mysql-test/main/win.result +++ b/mysql-test/main/win.result @@ -4684,6 +4684,29 @@ w2_total w1_total u 200 200 2 DROP VIEW v1; DROP TABLE t1; +# +# MDEV-35869: degenerated subquery with window function +# +CREATE TABLE t1 (a int DEFAULT 10); +INSERT INTO t1 VALUES (7), (2), (3); +SELECT * FROM t1 WHERE (SELECT AVG(3)) > 2; +a +7 +2 +3 +SELECT * FROM t1 WHERE (SELECT AVG(3) OVER ()) > 2; +a +7 +2 +3 +INSERT INTO t1 VALUES((SELECT avg(4) OVER ())); +SELECT * FROM t1; +a +7 +2 +3 +4 +DROP TABLE t1; # End of 10.5 tests # # MDEV-28206 SIGSEGV in Item_field::fix_fields when using LEAD...OVER diff --git a/mysql-test/main/win.test b/mysql-test/main/win.test index 99efc4e8672..23f14bad573 100644 --- a/mysql-test/main/win.test +++ b/mysql-test/main/win.test @@ -3001,6 +3001,18 @@ eval $q3; DROP VIEW v1; DROP TABLE t1; +--echo # +--echo # MDEV-35869: degenerated subquery with window function +--echo # + +CREATE TABLE t1 (a int DEFAULT 10); +INSERT INTO t1 VALUES (7), (2), (3); +SELECT * FROM t1 WHERE (SELECT AVG(3)) > 2; +SELECT * FROM t1 WHERE (SELECT AVG(3) OVER ()) > 2; +INSERT INTO t1 VALUES((SELECT avg(4) OVER ())); +SELECT * FROM t1; +DROP TABLE t1; + --echo # End of 10.5 tests --echo # diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_warn_stop_datetime.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_warn_stop_datetime.result index 6ce0f2d63e5..88a3c6cc8ac 100644 --- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_warn_stop_datetime.result +++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_warn_stop_datetime.result @@ -1,23 +1,115 @@ - -# MDEV-27037 mysqlbinlog emits a warning when reaching EOF before stop-datetime - -set timestamp=1000000000; -CREATE TABLE t1(word VARCHAR(20)); -set timestamp=1000000010; -INSERT INTO t1 VALUES ("abirvalg"); -set timestamp=1000000020; -INSERT INTO t1 SELECT * FROM t1; -flush logs; -Case: Default, must not see warning. -# MYSQL_BINLOG --short-form MYSQLD_DATADIR/master-bin.000001 --result-file=ignored_output_file -Case: Stop datetime before EOF, must not see warning. -# MYSQL_BINLOG --short-form --stop-datetime='2001-09-08 21:46:50' MYSQLD_DATADIR/master-bin.000001 --result-file=ignored_output_file -Case: Stop datetime between records, must not see warning. -# MYSQL_BINLOG --short-form --stop-datetime='2001-09-08 21:46:55' MYSQLD_DATADIR/master-bin.000001 --result-file=ignored_output_file -Case: Stop datetime at EOF, must not see warning. -# MYSQL_BINLOG --short-form --stop-datetime='2001-09-08 21:46:55' MYSQLD_DATADIR/master-bin.000001 --result-file=ignored_output_file -Case: Stop datetime after EOF, must see warning. -# MYSQL_BINLOG --short-form --stop-datetime='2035-01-19 03:14:05' MYSQLD_DATADIR/master-bin.000001 --result-file=ignored_output_file -WARNING: Did not reach stop datetime '2035-01-19 03:14:05' before end of input -DROP TABLE t1; +SET TIMESTAMP= UNIX_TIMESTAMP('2024-12-01 10:20:30.123456'); +# +# Clear the existing binary log state, and start fresh using +# the timestamp variable set above +# +RESET MASTER; +create table t1 (a int); +insert into t1 values (1); +SET TIMESTAMP= UNIX_TIMESTAMP('2024-12-02 10:20:30.123456'); +insert into t1 values (2); +SET TIMESTAMP= UNIX_TIMESTAMP('2024-12-03 10:20:30.123456'); +flush binary logs; +SET TIMESTAMP= UNIX_TIMESTAMP('2024-12-04 10:20:30.123456'); +insert into t1 values (3); +insert into t1 values (4); +SET TIMESTAMP= UNIX_TIMESTAMP('2024-12-05 10:20:30.123456'); +insert into t1 values (5); +insert into t1 values (6); +insert into t1 values (7); +SET TIMESTAMP=UNIX_TIMESTAMP('2024-12-06 10:20:30.123456'); +flush binary logs; +drop table t1; +# Ensuring binary log order is correct +# +# +# Test using --read-from-remote-server +# +connection default; +# +# --stop-datetime tests +# Note: MDEV-35528 reported that mysqlbinlog would fail on tests cases +# 2.a, 2.b, and 2.c. +# +# Case 1.a) With one binlog file, a --stop-datetime before the end of +# the file should not result in a warning +# MYSQL_BINLOG --read-from-remote-server --stop-datetime='2024-12-02 10:20:30.123456' binlog_f1_full --result-file=tmp/warn_datetime_test_file.out 2>&1 +# +# Case 1.b) With one binlog file, a --stop-datetime at the end of the +# file should not result in a warning +# MYSQL_BINLOG --read-from-remote-server --stop-datetime='2024-12-03 10:20:30.123456' binlog_f1_full --result-file=tmp/warn_datetime_test_file.out 2>&1 +# +# Case 1.c) With one binlog file, a --stop-datetime beyond the end of +# the file should(!) result in a warning +# MYSQL_BINLOG --read-from-remote-server --stop-datetime='2024-12-04 10:20:30.123456' binlog_f1_full --result-file=tmp/warn_datetime_test_file.out 2>&1 +WARNING: Did not reach stop datetime '2024-12-04 10:20:30.123456' before end of input +# +# Case 2.a) With two binlog files, a --stop-datetime within the +# timespan of binlog 2 should: +# 1) not provide any warnings +# 2) not prevent binlog 1 or 2 from outputting the desired events +# MYSQL_BINLOG --read-from-remote-server --stop-datetime='2024-12-04 10:20:30.123456' binlog_f1_full binlog_f2_full --result-file=tmp/warn_datetime_test_file.out 2>&1 +include/assert_grep.inc [Ensure all intended GTIDs are present] +include/assert_grep.inc [Ensure the next GTID binlogged is _not_ present] +# +# Case 2.b) With two binlog files, a --stop-datetime at the end of +# binlog 2 should: +# 1) not provide any warnings +# 2) not prevent binlog 1 or 2 from outputting all events +# MYSQL_BINLOG --read-from-remote-server --stop-datetime='2024-12-06 10:20:30.123456' binlog_f1_full binlog_f2_full --result-file=tmp/warn_datetime_test_file.out 2>&1 +include/assert_grep.inc [Ensure a GTID exists for each transaction] +# +# Case 2.c) With two binlog files, a --stop-datetime beyond the end of +# binlog 2 should: +# 1) provide a warning that the stop datetime was not reached +# 2) not prevent binlog 1 or 2 from outputting all events +# MYSQL_BINLOG --read-from-remote-server --stop-datetime='2024-12-07 10:20:30.123456' binlog_f1_full binlog_f2_full --result-file=tmp/warn_datetime_test_file.out 2>&1 +WARNING: Did not reach stop datetime '2024-12-07 10:20:30.123456' before end of input +include/assert_grep.inc [Ensure a GTID exists for each transaction] +# +# +# Test using local binlog files +# +connection default; +# +# --stop-datetime tests +# Note: MDEV-35528 reported that mysqlbinlog would fail on tests cases +# 2.a, 2.b, and 2.c. +# +# Case 1.a) With one binlog file, a --stop-datetime before the end of +# the file should not result in a warning +# MYSQL_BINLOG --stop-datetime='2024-12-02 10:20:30.123456' binlog_f1_full --result-file=tmp/warn_datetime_test_file.out 2>&1 +# +# Case 1.b) With one binlog file, a --stop-datetime at the end of the +# file should not result in a warning +# MYSQL_BINLOG --stop-datetime='2024-12-03 10:20:30.123456' binlog_f1_full --result-file=tmp/warn_datetime_test_file.out 2>&1 +# +# Case 1.c) With one binlog file, a --stop-datetime beyond the end of +# the file should(!) result in a warning +# MYSQL_BINLOG --stop-datetime='2024-12-04 10:20:30.123456' binlog_f1_full --result-file=tmp/warn_datetime_test_file.out 2>&1 +WARNING: Did not reach stop datetime '2024-12-04 10:20:30.123456' before end of input +# +# Case 2.a) With two binlog files, a --stop-datetime within the +# timespan of binlog 2 should: +# 1) not provide any warnings +# 2) not prevent binlog 1 or 2 from outputting the desired events +# MYSQL_BINLOG --stop-datetime='2024-12-04 10:20:30.123456' binlog_f1_full binlog_f2_full --result-file=tmp/warn_datetime_test_file.out 2>&1 +include/assert_grep.inc [Ensure all intended GTIDs are present] +include/assert_grep.inc [Ensure the next GTID binlogged is _not_ present] +# +# Case 2.b) With two binlog files, a --stop-datetime at the end of +# binlog 2 should: +# 1) not provide any warnings +# 2) not prevent binlog 1 or 2 from outputting all events +# MYSQL_BINLOG --stop-datetime='2024-12-06 10:20:30.123456' binlog_f1_full binlog_f2_full --result-file=tmp/warn_datetime_test_file.out 2>&1 +include/assert_grep.inc [Ensure a GTID exists for each transaction] +# +# Case 2.c) With two binlog files, a --stop-datetime beyond the end of +# binlog 2 should: +# 1) provide a warning that the stop datetime was not reached +# 2) not prevent binlog 1 or 2 from outputting all events +# MYSQL_BINLOG --stop-datetime='2024-12-07 10:20:30.123456' binlog_f1_full binlog_f2_full --result-file=tmp/warn_datetime_test_file.out 2>&1 +WARNING: Did not reach stop datetime '2024-12-07 10:20:30.123456' before end of input +include/assert_grep.inc [Ensure a GTID exists for each transaction] +# # End of binlog_mysqlbinlog_warn_stop_datetime.test diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_warn_stop_position.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_warn_stop_position.result index 5b99d30bd84..1517fd765ac 100644 --- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_warn_stop_position.result +++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_warn_stop_position.result @@ -1,13 +1,65 @@ - -# MDEV-27037 mysqlbinlog emits a warning when reaching EOF before stop-condition - -Case: Default stop position, WARNING must not appear -# MYSQL_BINLOG --short-form --start-position=4 mysql-test/std_data/master-bin.000001 --result-file=warn_pos_test_file.out 2>&1 -Case: Stop position before EOF, WARNING must not appear -# MYSQL_BINLOG --short-form --start-position=4 --stop-position=97 mysql-test/std_data/master-bin.000001 --result-file=warn_pos_test_file.out 2>&1 -Case: Stop position at EOF, WARNING must not appear -# MYSQL_BINLOG --short-form --start-position=4 --stop-position=98 mysql-test/std_data/master-bin.000001 --result-file=warn_pos_test_file.out 2>&1 -Case: Stop position after EOF, WARNING must appear -# MYSQL_BINLOG --short-form --start-position=4 --stop-position=99 mysql-test/std_data/master-bin.000001 --result-file=warn_pos_test_file.out 2>&1 -WARNING: Did not reach stop position 99 before end of input +# +# Clear the existing binary log state. +# +RESET MASTER; +create table t1 (a int); +insert into t1 values (1); +insert into t1 values (2); +flush binary logs; +insert into t1 values (3); +# Tag binlog_f2_mid +insert into t1 values (4); +insert into t1 values (5); +insert into t1 values (6); +insert into t1 values (7); +flush binary logs; +drop table t1; +# Ensuring binary log order is correct +# Ensuring file offset of binlog_f2_mid < binlog_f1_end +# +# +# Test using local binlog files +# +connection default; +# +# --stop-position tests +# +# Case 1.a) With one binlog file, a --stop-position before the end of +# the file should not result in a warning +# MYSQL_BINLOG --stop-position=binlog_f1_pre_rotate binlog_f1_full --result-file=tmp/warn_position_test_file.out 2>&1 +# +# Case 1.b) With one binlog file, a --stop-position at the exact end of +# the file should not result in a warning +# MYSQL_BINLOG --stop-position=binlog_f1_end binlog_f1_full --result-file=tmp/warn_position_test_file.out 2>&1 +# +# Case 1.c) With one binlog file, a --stop-position past the end of the +# file should(!) result in a warning +# MYSQL_BINLOG --short-form --stop-position=binlog_f1_over_eof binlog_f1_full --result-file=tmp/warn_position_test_file.out 2>&1 +WARNING: Did not reach stop position before end of input +# +# Case 2.a) With two binlog files, a --stop-position targeting b2 which +# exists in the size of b1 should: +# 1) not provide any warnings +# 2) not prevent b2 from outputting its desired events before the +# stop position +# MYSQL_BINLOG --stop-position=binlog_f2_mid binlog_f1_full binlog_f2_full --result-file=tmp/warn_position_test_file.out 2>&1 +include/assert_grep.inc [Ensure all intended GTIDs are present] +include/assert_grep.inc [Ensure the next GTID binlogged is _not_ present] +# +# Case 2.b) With two binlog files, a --stop-position targeting the end +# of binlog 2 should: +# 1) not provide any warnings +# 2) not prevent b2 from outputting its entire binary log +# MYSQL_BINLOG --stop-position=binlog_f2_end binlog_f1_full binlog_f2_full --result-file=tmp/warn_position_test_file.out 2>&1 +include/assert_grep.inc [Ensure a GTID exists for each transaction] +include/assert_grep.inc [Ensure the last GTID binlogged is present] +# +# Case 2.c) With two binlog files, a --stop-position targeting beyond +# the eof of binlog 2 should: +# 1) provide a warning that the stop position was not reached +# 2) not prevent b2 from outputting its entire binary log +# MYSQL_BINLOG --stop-position=binlog_f2_over_eof binlog_f1_full binlog_f2_full --result-file=tmp/warn_position_test_file.out 2>&1 +WARNING: Did not reach stop position before end of input +include/assert_grep.inc [Ensure a GTID exists for each transaction] +# # End of binlog_mysqlbinlog_warn_stop_position.test diff --git a/mysql-test/suite/binlog/r/binlog_spurious_ddl_errors.result b/mysql-test/suite/binlog/r/binlog_spurious_ddl_errors.result index 798bd8ab853..39c0bd52fac 100644 --- a/mysql-test/suite/binlog/r/binlog_spurious_ddl_errors.result +++ b/mysql-test/suite/binlog/r/binlog_spurious_ddl_errors.result @@ -38,7 +38,7 @@ CREATE TABLE t_stmt (a VARCHAR(100)) ENGINE = EXAMPLE; ALTER TABLE t_stmt ADD COLUMN b INT; CREATE TRIGGER trig_stmt BEFORE INSERT ON t_stmt FOR EACH ROW INSERT INTO t_stmt VALUES (1); CREATE INDEX i ON t_stmt(a); -ERROR 42000: Too many key parts specified; max 0 parts allowed +ERROR 42000: Specified key was too long; max key length is 0 bytes CREATE TABLE t_stmt_new ENGINE = EXAMPLE SELECT * FROM t_stmt; ERROR HY000: Cannot execute statement: impossible to write to binary log since BINLOG_FORMAT = ROW and at least one table uses a storage engine limited to statement-based logging DROP TABLE t_stmt; diff --git a/mysql-test/suite/binlog/t/binlog_mysqlbinlog_warn_stop_datetime.inc b/mysql-test/suite/binlog/t/binlog_mysqlbinlog_warn_stop_datetime.inc new file mode 100644 index 00000000000..839e506551c --- /dev/null +++ b/mysql-test/suite/binlog/t/binlog_mysqlbinlog_warn_stop_datetime.inc @@ -0,0 +1,106 @@ +# +# Helper file that ensures mysqlbinlog --stop-datetime behavior for local +# files or a remote server +# +# Parameters: +# read_from_remote_server (bool): A boolean that changes which source to use +# for mysqlbinlog. When true, reads remotely; when false, uses local files. +# + +--connection default +--let $MYSQLD_DATADIR= `select @@datadir` + +# PARAM_READ_FROM_REMOTE is used as a parameter to mysqlbinlog (_OUT suffix is +# output in echo commands). If using local files, they are blank; if reading +# from remote server, it is overridden to the correct values. +--let $PARAM_READ_FROM_REMOTE= +# Used in echo statements to remove potentially changing values +--let $PARAM_READ_FROM_REMOTE_OUT= + +if ($read_from_remote_server) +{ + --let $PARAM_READ_FROM_REMOTE= --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT + --let $PARAM_READ_FROM_REMOTE_OUT= --read-from-remote-server + # binlog files in --read-from-remote-server don't use file system path + --let $binlog_f1_full= $binlog_f1 + --let $binlog_f2_full= $binlog_f2 +} +if (!$read_from_remote_server) +{ + # If using local files, file system path to the binlog files is needed + --let $binlog_f1_full= $MYSQLD_DATADIR/$binlog_f1 + --let $binlog_f2_full= $MYSQLD_DATADIR/$binlog_f2 +} + +--echo # +--echo # --stop-datetime tests +--echo # Note: MDEV-35528 reported that mysqlbinlog would fail on tests cases +--echo # 2.a, 2.b, and 2.c. +--echo # + +--echo # Case 1.a) With one binlog file, a --stop-datetime before the end of +--echo # the file should not result in a warning +--echo # MYSQL_BINLOG $PARAM_READ_FROM_REMOTE_OUT --stop-datetime='$b1_timestamp2' binlog_f1_full --result-file=$binlog_out_relpath 2>&1 +--exec $MYSQL_BINLOG $PARAM_READ_FROM_REMOTE --stop-datetime='$b1_timestamp2' $binlog_f1_full --result-file=$binlog_out 2>&1 + +--echo # +--echo # Case 1.b) With one binlog file, a --stop-datetime at the end of the +--echo # file should not result in a warning +--echo # MYSQL_BINLOG $PARAM_READ_FROM_REMOTE_OUT --stop-datetime='$b1_timestamp3' binlog_f1_full --result-file=$binlog_out_relpath 2>&1 +--exec $MYSQL_BINLOG $PARAM_READ_FROM_REMOTE --stop-datetime='$b1_timestamp3' $binlog_f1_full --result-file=$binlog_out 2>&1 + +--echo # +--echo # Case 1.c) With one binlog file, a --stop-datetime beyond the end of +--echo # the file should(!) result in a warning +--let $future_timestamp= 2035-12-06 10:20:30.123456 +--echo # MYSQL_BINLOG $PARAM_READ_FROM_REMOTE_OUT --stop-datetime='$b2_timestamp1' binlog_f1_full --result-file=$binlog_out_relpath 2>&1 +--exec $MYSQL_BINLOG $PARAM_READ_FROM_REMOTE --stop-datetime='$b2_timestamp1' $binlog_f1_full --result-file=$binlog_out 2>&1 + +--echo # +--echo # Case 2.a) With two binlog files, a --stop-datetime within the +--echo # timespan of binlog 2 should: +--echo # 1) not provide any warnings +--echo # 2) not prevent binlog 1 or 2 from outputting the desired events + +--echo # MYSQL_BINLOG $PARAM_READ_FROM_REMOTE_OUT --stop-datetime='$b2_timestamp1' binlog_f1_full binlog_f2_full --result-file=$binlog_out_relpath 2>&1 +--exec $MYSQL_BINLOG $PARAM_READ_FROM_REMOTE --stop-datetime='$b2_timestamp1' $binlog_f1_full $binlog_f2_full --result-file=$binlog_out 2>&1 + +--let $server_id= `SELECT @@GLOBAL.server_id` +--let $domain_id= `SELECT @@GLOBAL.gtid_domain_id` +--let $assert_file= $binlog_out +--let $assert_text= Ensure all intended GTIDs are present +--let $assert_select= GTID $domain_id-$server_id- +--let $assert_count= 3 +--source include/assert_grep.inc + +--let $assert_text= Ensure the next GTID binlogged is _not_ present +--let $assert_select= GTID $binlog_f2_gtid_after_midpoint +--let $assert_count= 0 +--source include/assert_grep.inc + +--echo # +--echo # Case 2.b) With two binlog files, a --stop-datetime at the end of +--echo # binlog 2 should: +--echo # 1) not provide any warnings +--echo # 2) not prevent binlog 1 or 2 from outputting all events +--echo # MYSQL_BINLOG $PARAM_READ_FROM_REMOTE_OUT --stop-datetime='$b2_timestamp3' binlog_f1_full binlog_f2_full --result-file=$binlog_out_relpath 2>&1 +--exec $MYSQL_BINLOG $PARAM_READ_FROM_REMOTE --stop-datetime='$b2_timestamp3' $binlog_f1_full $binlog_f2_full --result-file=$binlog_out 2>&1 + +--let $assert_text= Ensure a GTID exists for each transaction +--let $assert_select= GTID $domain_id-$server_id- +--let $assert_count= 8 +--source include/assert_grep.inc + +--echo # +--echo # Case 2.c) With two binlog files, a --stop-datetime beyond the end of +--echo # binlog 2 should: +--echo # 1) provide a warning that the stop datetime was not reached +--echo # 2) not prevent binlog 1 or 2 from outputting all events +--echo # MYSQL_BINLOG $PARAM_READ_FROM_REMOTE_OUT --stop-datetime='$b2_timestamp_not_reached' binlog_f1_full binlog_f2_full --result-file=$binlog_out_relpath 2>&1 +--exec $MYSQL_BINLOG $PARAM_READ_FROM_REMOTE --stop-datetime='$b2_timestamp_not_reached' $binlog_f1_full $binlog_f2_full --result-file=$binlog_out 2>&1 + +--let $assert_text= Ensure a GTID exists for each transaction +--let $assert_select= GTID $domain_id-$server_id- +--let $assert_count= 8 +--source include/assert_grep.inc + diff --git a/mysql-test/suite/binlog/t/binlog_mysqlbinlog_warn_stop_datetime.test b/mysql-test/suite/binlog/t/binlog_mysqlbinlog_warn_stop_datetime.test index 9d30544c5f4..f862f0e7887 100644 --- a/mysql-test/suite/binlog/t/binlog_mysqlbinlog_warn_stop_datetime.test +++ b/mysql-test/suite/binlog/t/binlog_mysqlbinlog_warn_stop_datetime.test @@ -1,42 +1,86 @@ ---echo ---echo # MDEV-27037 mysqlbinlog emits a warning when reaching EOF before stop-datetime ---echo +# +# Test ensures that --stop-datetime work correctly for mysqlbinlog. This high +# level test sets up the binary log (and tags certain locations for comparison), +# and the helper file binlog_mysqlbinlog_warn_stop_datetime.inc performs the +# actual tests. +# +# References: +# MDEV-27037: mysqlbinlog emits a warning when reaching EOF before +# stop-condition +# MDEV-35528: mariadb-binlog cannot process more than 1 logfiles when +# --stop-datetime is specified +# +--source include/have_log_bin.inc ---source include/have_binlog_format_statement.inc +--let $binlog_out_relpath= tmp/warn_datetime_test_file.out +--let $binlog_out= $MYSQLTEST_VARDIR/$binlog_out_relpath ---let ignored_output_file= $MYSQLTEST_VARDIR/tmp/warn_pos_test_file.out +--let $b1_timestamp1= 2024-12-01 10:20:30.123456 +--let $b1_timestamp2= 2024-12-02 10:20:30.123456 +--let $b1_timestamp3= 2024-12-03 10:20:30.123456 +--let $b2_timestamp1= 2024-12-04 10:20:30.123456 +--let $b2_timestamp2= 2024-12-05 10:20:30.123456 +--let $b2_timestamp3= 2024-12-06 10:20:30.123456 +--let $b2_timestamp_not_reached= 2024-12-07 10:20:30.123456 -set timestamp=1000000000; -CREATE TABLE t1(word VARCHAR(20)); -set timestamp=1000000010; -INSERT INTO t1 VALUES ("abirvalg"); -set timestamp=1000000020; -INSERT INTO t1 SELECT * FROM t1; ---let MYSQLD_DATADIR= `select @@datadir;` -flush logs; +--eval SET TIMESTAMP= UNIX_TIMESTAMP('$b1_timestamp1') ---echo Case: Default, must not see warning. ---echo # MYSQL_BINLOG --short-form MYSQLD_DATADIR/master-bin.000001 --result-file=ignored_output_file ---exec $MYSQL_BINLOG --short-form $MYSQLD_DATADIR/master-bin.000001 --result-file=$ignored_output_file 2>&1 +--echo # +--echo # Clear the existing binary log state, and start fresh using +--echo # the timestamp variable set above +--echo # +RESET MASTER; ---echo Case: Stop datetime before EOF, must not see warning. ---echo # MYSQL_BINLOG --short-form --stop-datetime='2001-09-08 21:46:50' MYSQLD_DATADIR/master-bin.000001 --result-file=ignored_output_file ---exec $MYSQL_BINLOG --short-form --stop-datetime='2001-09-08 21:46:50' $MYSQLD_DATADIR/master-bin.000001 --result-file=$ignored_output_file 2>&1 +--let $binlog_f1= query_get_value(SHOW MASTER STATUS, File, 1) +create table t1 (a int); +insert into t1 values (1); +--eval SET TIMESTAMP= UNIX_TIMESTAMP('$b1_timestamp2') +insert into t1 values (2); +--eval SET TIMESTAMP= UNIX_TIMESTAMP('$b1_timestamp3') +flush binary logs; +--let $binlog_f2= query_get_value(SHOW MASTER STATUS, File, 1) +--eval SET TIMESTAMP= UNIX_TIMESTAMP('$b2_timestamp1') +insert into t1 values (3); +insert into t1 values (4); +--eval SET TIMESTAMP= UNIX_TIMESTAMP('$b2_timestamp2') +--let $binlog_f2_gtid_after_midpoint= `SELECT @@GLOBAL.gtid_binlog_pos` +insert into t1 values (5); +insert into t1 values (6); +insert into t1 values (7); +--let $binlog_f2_last_gtid= `SELECT @@GLOBAL.gtid_binlog_pos` +--eval SET TIMESTAMP=UNIX_TIMESTAMP('$b2_timestamp3') +flush binary logs; +drop table t1; ---echo Case: Stop datetime between records, must not see warning. ---echo # MYSQL_BINLOG --short-form --stop-datetime='2001-09-08 21:46:55' MYSQLD_DATADIR/master-bin.000001 --result-file=ignored_output_file ---exec $MYSQL_BINLOG --short-form --stop-datetime='2001-09-08 21:46:55' $MYSQLD_DATADIR/master-bin.000001 --result-file=$ignored_output_file 2>&1 +--echo # Ensuring binary log order is correct +--let $binlog_f1_show= query_get_value(SHOW BINARY LOGS, Log_name, 1) +if (`SELECT strcmp('$binlog_f1','$binlog_f1_show') != 0`) +{ + --echo # Real binlog_f1: $binlog_f1 + --echo # First binlog in SHOW BINLOG FILES: $binlog_f1_show + --die Wrong order of binary log files in SHOW BINARY LOGS +} +--let $binlog_f2_show= query_get_value(SHOW BINARY LOGS, Log_name, 2) +if (`SELECT strcmp('$binlog_f2','$binlog_f2_show') != 0`) +{ + --echo # Real binlog_f2: $binlog_f2 + --echo # First binlog in SHOW BINLOG FILES: $binlog_f2_show + --die Wrong order of binary log files in SHOW BINARY LOGS +} ---echo Case: Stop datetime at EOF, must not see warning. ---echo # MYSQL_BINLOG --short-form --stop-datetime='2001-09-08 21:46:55' MYSQLD_DATADIR/master-bin.000001 --result-file=ignored_output_file ---exec $MYSQL_BINLOG --short-form --stop-datetime='2001-09-08 21:46:55' $MYSQLD_DATADIR/master-bin.000001 --result-file=$ignored_output_file 2>&1 +--echo # +--echo # +--echo # Test using --read-from-remote-server +--echo # +--let $read_from_remote_server= 1 +--source binlog_mysqlbinlog_warn_stop_datetime.inc ---echo Case: Stop datetime after EOF, must see warning. ---echo # MYSQL_BINLOG --short-form --stop-datetime='2035-01-19 03:14:05' MYSQLD_DATADIR/master-bin.000001 --result-file=ignored_output_file ---exec $MYSQL_BINLOG --short-form --stop-datetime='2035-01-19 03:14:05' $MYSQLD_DATADIR/master-bin.000001 --result-file=$ignored_output_file 2>&1 - -DROP TABLE t1; - ---remove_file $ignored_output_file +--echo # +--echo # +--echo # Test using local binlog files +--echo # +--let $read_from_remote_server= 0 +--source binlog_mysqlbinlog_warn_stop_datetime.inc +--echo # --echo # End of binlog_mysqlbinlog_warn_stop_datetime.test diff --git a/mysql-test/suite/binlog/t/binlog_mysqlbinlog_warn_stop_position.inc b/mysql-test/suite/binlog/t/binlog_mysqlbinlog_warn_stop_position.inc new file mode 100644 index 00000000000..2c3c565d692 --- /dev/null +++ b/mysql-test/suite/binlog/t/binlog_mysqlbinlog_warn_stop_position.inc @@ -0,0 +1,115 @@ +# +# Helper file that ensures mysqlbinlog --stop-position behavior for local +# files or a remote server +# +# Parameters: +# read_from_remote_server (bool): A boolean that changes which source to use +# for mysqlbinlog. When true, reads remotely; when false, uses local files. +# + +--connection default +--let $MYSQLD_DATADIR= `select @@datadir` + +# PARAM_READ_FROM_REMOTE is used as a parameter to mysqlbinlog (_OUT suffix is +# output in echo commands). If using local files, they are blank; if reading +# from remote server, it is overridden to the correct values. +--let $PARAM_READ_FROM_REMOTE= +# Used in echo statements to remove potentially changing values +--let $PARAM_READ_FROM_REMOTE_OUT= + +if ($read_from_remote_server) +{ + --let $PARAM_READ_FROM_REMOTE= --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT + --let $PARAM_READ_FROM_REMOTE_OUT= --read-from-remote-server + # binlog files in --read-from-remote-server don't use file system path + --let $binlog_f1_full= $binlog_f1 + --let $binlog_f2_full= $binlog_f2 +} +if (!$read_from_remote_server) +{ + # If using local files, file system path to the binlog files is needed + --let $binlog_f1_full= $MYSQLD_DATADIR/$binlog_f1 + --let $binlog_f2_full= $MYSQLD_DATADIR/$binlog_f2 +} + +--echo # +--echo # --stop-position tests +--echo # + +--echo # Case 1.a) With one binlog file, a --stop-position before the end of +--echo # the file should not result in a warning +--echo # MYSQL_BINLOG $PARAM_READ_FROM_REMOTE_OUT --stop-position=binlog_f1_pre_rotate binlog_f1_full --result-file=$binlog_out_relpath 2>&1 +--exec $MYSQL_BINLOG $PARAM_READ_FROM_REMOTE --stop-position=$binlog_f1_pre_rotate $binlog_f1_full --result-file=$binlog_out 2>&1 + +--echo # +--echo # Case 1.b) With one binlog file, a --stop-position at the exact end of +--echo # the file should not result in a warning +--echo # MYSQL_BINLOG $PARAM_READ_FROM_REMOTE_OUT --stop-position=binlog_f1_end binlog_f1_full --result-file=$binlog_out_relpath 2>&1 +--exec $MYSQL_BINLOG $PARAM_READ_FROM_REMOTE --stop-position=$binlog_f1_end $binlog_f1_full --result-file=$binlog_out 2>&1 + +--echo # +--echo # Case 1.c) With one binlog file, a --stop-position past the end of the +--echo # file should(!) result in a warning +--let $binlog_f1_over_eof= `SELECT $binlog_f1_end + 1` +--echo # MYSQL_BINLOG $PARAM_READ_FROM_REMOTE_OUT --short-form --stop-position=binlog_f1_over_eof binlog_f1_full --result-file=$binlog_out_relpath 2>&1 +--replace_result $binlog_f1_over_eof +--exec $MYSQL_BINLOG $PARAM_READ_FROM_REMOTE --short-form --stop-position=$binlog_f1_over_eof $binlog_f1_full --result-file=$binlog_out 2>&1 + +--echo # +--echo # Case 2.a) With two binlog files, a --stop-position targeting b2 which +--echo # exists in the size of b1 should: +--echo # 1) not provide any warnings +--echo # 2) not prevent b2 from outputting its desired events before the +--echo # stop position +--echo # MYSQL_BINLOG $PARAM_READ_FROM_REMOTE_OUT --stop-position=binlog_f2_mid binlog_f1_full binlog_f2_full --result-file=$binlog_out_relpath 2>&1 +--exec $MYSQL_BINLOG $PARAM_READ_FROM_REMOTE --stop-position=$binlog_f2_mid $binlog_f1_full $binlog_f2_full --result-file=$binlog_out 2>&1 + +--let $server_id= `SELECT @@GLOBAL.server_id` +--let $domain_id= `SELECT @@GLOBAL.gtid_domain_id` +--let $assert_file= $binlog_out +--let $assert_text= Ensure all intended GTIDs are present +--let $assert_select= GTID $domain_id-$server_id- +--let $assert_count= 4 +--source include/assert_grep.inc + +--let $assert_text= Ensure the next GTID binlogged is _not_ present +--let $assert_select= GTID $binlog_f2_gtid_after_midpoint +--let $assert_count= 0 +--source include/assert_grep.inc + +--echo # +--echo # Case 2.b) With two binlog files, a --stop-position targeting the end +--echo # of binlog 2 should: +--echo # 1) not provide any warnings +--echo # 2) not prevent b2 from outputting its entire binary log +--echo # MYSQL_BINLOG $PARAM_READ_FROM_REMOTE_OUT --stop-position=binlog_f2_end binlog_f1_full binlog_f2_full --result-file=$binlog_out_relpath 2>&1 +--exec $MYSQL_BINLOG $PARAM_READ_FROM_REMOTE --stop-position=$binlog_f2_end $binlog_f1_full $binlog_f2_full --result-file=$binlog_out 2>&1 + +--let $server_id= `SELECT @@GLOBAL.server_id` +--let $domain_id= `SELECT @@GLOBAL.gtid_domain_id` +--let $assert_text= Ensure a GTID exists for each transaction +--let $assert_select= GTID $domain_id-$server_id- +--let $assert_count= 8 +--source include/assert_grep.inc + +--let $assert_text= Ensure the last GTID binlogged is present +--let $assert_select= GTID $binlog_f2_last_gtid +--let $assert_count= 1 +--source include/assert_grep.inc + +--echo # +--echo # Case 2.c) With two binlog files, a --stop-position targeting beyond +--echo # the eof of binlog 2 should: +--echo # 1) provide a warning that the stop position was not reached +--echo # 2) not prevent b2 from outputting its entire binary log +--let $binlog_f2_over_eof= `SELECT $binlog_f2_end + 1` +--echo # MYSQL_BINLOG $PARAM_READ_FROM_REMOTE_OUT --stop-position=binlog_f2_over_eof binlog_f1_full binlog_f2_full --result-file=$binlog_out_relpath 2>&1 +--replace_result $binlog_f2_over_eof +--exec $MYSQL_BINLOG $PARAM_READ_FROM_REMOTE --stop-position=$binlog_f2_over_eof $binlog_f1_full $binlog_f2_full --result-file=$binlog_out 2>&1 + +--let $server_id= `SELECT @@GLOBAL.server_id` +--let $domain_id= `SELECT @@GLOBAL.gtid_domain_id` +--let $assert_text= Ensure a GTID exists for each transaction +--let $assert_select= GTID $domain_id-$server_id- +--let $assert_count= 8 +--source include/assert_grep.inc diff --git a/mysql-test/suite/binlog/t/binlog_mysqlbinlog_warn_stop_position.test b/mysql-test/suite/binlog/t/binlog_mysqlbinlog_warn_stop_position.test index 97fabfc6513..a9179297220 100644 --- a/mysql-test/suite/binlog/t/binlog_mysqlbinlog_warn_stop_position.test +++ b/mysql-test/suite/binlog/t/binlog_mysqlbinlog_warn_stop_position.test @@ -1,26 +1,83 @@ ---echo ---echo # MDEV-27037 mysqlbinlog emits a warning when reaching EOF before stop-condition ---echo +# +# Test ensures that --stop-position work correctly for mysqlbinlog. This high +# level test sets up the binary log (and tags certain locations for comparison), +# and the helper file binlog_mysqlbinlog_warn_stop_position.inc performs the +# actual tests. +# +# References: +# MDEV-27037: mysqlbinlog emits a warning when reaching EOF before +# stop-condition +# +--source include/have_log_bin.inc ---let assert_file= $MYSQLTEST_VARDIR/tmp/warn_pos_test_file.out ---let data_file= $MYSQLTEST_VARDIR/std_data/master-bin.000001 +--let $binlog_out_relpath= tmp/warn_position_test_file.out +--let $binlog_out= $MYSQLTEST_VARDIR/$binlog_out_relpath ---echo Case: Default stop position, WARNING must not appear ---echo # MYSQL_BINLOG --short-form --start-position=4 mysql-test/std_data/master-bin.000001 --result-file=warn_pos_test_file.out 2>&1 ---exec $MYSQL_BINLOG --short-form --start-position=4 $data_file --result-file=$assert_file 2>&1 +--echo # +--echo # Clear the existing binary log state. +--echo # +RESET MASTER; ---echo Case: Stop position before EOF, WARNING must not appear ---echo # MYSQL_BINLOG --short-form --start-position=4 --stop-position=97 mysql-test/std_data/master-bin.000001 --result-file=warn_pos_test_file.out 2>&1 ---exec $MYSQL_BINLOG --short-form --start-position=4 --stop-position=97 $data_file --result-file=$assert_file 2>&1 +--let $binlog_f1= query_get_value(SHOW MASTER STATUS, File, 1) +create table t1 (a int); +insert into t1 values (1); +insert into t1 values (2); +--let $binlog_f1_pre_rotate= query_get_value(SHOW MASTER STATUS, Position, 1) +flush binary logs; +--let $binlog_f2= query_get_value(SHOW MASTER STATUS, File, 1) +insert into t1 values (3); +--echo # Tag binlog_f2_mid +--let $binlog_f2_mid= query_get_value(SHOW MASTER STATUS, Position, 1) +insert into t1 values (4); +--let $binlog_f2_gtid_after_midpoint= `SELECT @@GLOBAL.gtid_binlog_pos` +insert into t1 values (5); +insert into t1 values (6); +insert into t1 values (7); +--let $binlog_f2_last_gtid= `SELECT @@GLOBAL.gtid_binlog_pos` +--let $binlog_f2_pre_rot= query_get_value(SHOW MASTER STATUS, Position, 1) +flush binary logs; +drop table t1; ---echo Case: Stop position at EOF, WARNING must not appear ---echo # MYSQL_BINLOG --short-form --start-position=4 --stop-position=98 mysql-test/std_data/master-bin.000001 --result-file=warn_pos_test_file.out 2>&1 ---exec $MYSQL_BINLOG --short-form --start-position=4 --stop-position=98 $data_file --result-file=$assert_file 2>&1 +--echo # Ensuring binary log order is correct +--let $binlog_f1_show= query_get_value(SHOW BINARY LOGS, Log_name, 1) +--let $binlog_f1_end= query_get_value(SHOW BINARY LOGS, File_size, 1) +if (`SELECT strcmp('$binlog_f1','$binlog_f1_show') != 0`) +{ + --echo # Real binlog_f1: $binlog_f1 + --echo # First binlog in SHOW BINLOG FILES: $binlog_f1_show + --die Wrong order of binary log files in SHOW BINARY LOGS +} +--let $binlog_f2_show= query_get_value(SHOW BINARY LOGS, Log_name, 2) +--let $binlog_f2_end= query_get_value(SHOW BINARY LOGS, File_size, 2) +if (`SELECT strcmp('$binlog_f2','$binlog_f2_show') != 0`) +{ + --echo # Real binlog_f2: $binlog_f2 + --echo # First binlog in SHOW BINLOG FILES: $binlog_f2_show + --die Wrong order of binary log files in SHOW BINARY LOGS +} ---echo Case: Stop position after EOF, WARNING must appear ---echo # MYSQL_BINLOG --short-form --start-position=4 --stop-position=99 mysql-test/std_data/master-bin.000001 --result-file=warn_pos_test_file.out 2>&1 ---exec $MYSQL_BINLOG --short-form --start-position=4 --stop-position=99 $data_file --result-file=$assert_file 2>&1 +--echo # Ensuring file offset of binlog_f2_mid < binlog_f1_end +if ($binlog_f2_mid > $binlog_f1_end) +{ + --echo # Binlog 1 end: $binlog_f1:$binlog_f1_end + --echo # Binlog 2 stop point: $binlog_f2:$binlog_f2_mid + --die Mid point chosen to end in binlog 2 does not exist in earlier binlog +} ---remove_file $assert_file +#--echo # +#--echo # +#--echo # Test using --read-from-remote-server +#--echo # +#--let $read_from_remote_server= 1 +#--emit warning is not supported by --read-from-remote-server now +#--source binlog_mysqlbinlog_warn_stop_position.inc +--echo # +--echo # +--echo # Test using local binlog files +--echo # +--let $read_from_remote_server= 0 +--source binlog_mysqlbinlog_warn_stop_position.inc + +--echo # --echo # End of binlog_mysqlbinlog_warn_stop_position.test diff --git a/mysql-test/suite/binlog/t/binlog_spurious_ddl_errors.test b/mysql-test/suite/binlog/t/binlog_spurious_ddl_errors.test index 29a860764a9..5a015c2b8eb 100644 --- a/mysql-test/suite/binlog/t/binlog_spurious_ddl_errors.test +++ b/mysql-test/suite/binlog/t/binlog_spurious_ddl_errors.test @@ -75,7 +75,7 @@ ALTER TABLE t_stmt ADD COLUMN b INT; CREATE TRIGGER trig_stmt BEFORE INSERT ON t_stmt FOR EACH ROW INSERT INTO t_stmt VALUES (1); ---error ER_TOO_MANY_KEY_PARTS +--error ER_TOO_LONG_KEY CREATE INDEX i ON t_stmt(a); --error ER_BINLOG_ROW_MODE_AND_STMT_ENGINE diff --git a/mysql-test/suite/compat/oracle/r/mysqldump_restore_func_qualified.result b/mysql-test/suite/compat/oracle/r/mysqldump_restore_func_qualified.result index 26468bd2415..c772c2e1eae 100644 --- a/mysql-test/suite/compat/oracle/r/mysqldump_restore_func_qualified.result +++ b/mysql-test/suite/compat/oracle/r/mysqldump_restore_func_qualified.result @@ -26,7 +26,7 @@ LTRIM(now()) AS a0, LPAD(now(),10) AS b0; /*M!999999\- enable the sandbox mode */ /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a0` varchar(64) NOT NULL DEFAULT ltrim(current_timestamp()), `a1` varchar(64) GENERATED ALWAYS AS (ltrim(`a0`)) STORED, @@ -35,7 +35,7 @@ CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t2` ( `a0` varchar(64) NOT NULL DEFAULT ltrim_oracle(current_timestamp()), `a1` varchar(64) GENERATED ALWAYS AS (ltrim_oracle(`a0`)) STORED, @@ -44,13 +44,13 @@ CREATE TABLE `t2` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +SET character_set_client = utf8mb4; /*!50001 CREATE VIEW `v1` AS SELECT 1 AS `a0`, 1 AS `b0` */; SET character_set_client = @saved_cs_client; SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +SET character_set_client = utf8mb4; /*!50001 CREATE VIEW `v2` AS SELECT 1 AS `a0`, 1 AS `b0` */; diff --git a/mysql-test/suite/compat/oracle/r/update.result b/mysql-test/suite/compat/oracle/r/update.result new file mode 100644 index 00000000000..d7585e8e61d --- /dev/null +++ b/mysql-test/suite/compat/oracle/r/update.result @@ -0,0 +1,16 @@ +SET @save_sql_mode=@@global.sql_mode; +SET sql_mode=ORACLE; +SET GLOBAL sql_mode='ORACLE'; +# MDEV-27769 Assertion failed in Field::ptr_in_record upon UPDATE +CREATE TABLE t (s geometry, t text) engine innodb; +Warnings: +Warning 1286 Unknown storage engine 'innodb' +Warning 1266 Using storage engine MyISAM for table 't' +INSERT IGNORE INTO t () VALUES (); +UPDATE IGNORE t SET t= '', s = 0; +ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field +UPDATE IGNORE t SET t= '', s = 0; +ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field +ALTER TABLE t force; +DROP TABLE t; +SET GLOBAL sql_mode=@save_sql_mode; diff --git a/mysql-test/suite/compat/oracle/t/update.test b/mysql-test/suite/compat/oracle/t/update.test new file mode 100644 index 00000000000..389a27f3dbd --- /dev/null +++ b/mysql-test/suite/compat/oracle/t/update.test @@ -0,0 +1,19 @@ +SET @save_sql_mode=@@global.sql_mode; +SET sql_mode=ORACLE; +SET GLOBAL sql_mode='ORACLE'; + + +--echo # MDEV-27769 Assertion failed in Field::ptr_in_record upon UPDATE +CREATE TABLE t (s geometry, t text) engine innodb; +INSERT IGNORE INTO t () VALUES (); +--error ER_CANT_CREATE_GEOMETRY_OBJECT +UPDATE IGNORE t SET t= '', s = 0; +--error ER_CANT_CREATE_GEOMETRY_OBJECT +UPDATE IGNORE t SET t= '', s = 0; + +ALTER TABLE t force; + +DROP TABLE t; + +# Test cleanup +SET GLOBAL sql_mode=@save_sql_mode; diff --git a/mysql-test/suite/encryption/r/tempfiles_encrypted.result b/mysql-test/suite/encryption/r/tempfiles_encrypted.result index 265ec44d2ae..b1725acee79 100644 --- a/mysql-test/suite/encryption/r/tempfiles_encrypted.result +++ b/mysql-test/suite/encryption/r/tempfiles_encrypted.result @@ -4690,6 +4690,29 @@ w2_total w1_total u 200 200 2 DROP VIEW v1; DROP TABLE t1; +# +# MDEV-35869: degenerated subquery with window function +# +CREATE TABLE t1 (a int DEFAULT 10); +INSERT INTO t1 VALUES (7), (2), (3); +SELECT * FROM t1 WHERE (SELECT AVG(3)) > 2; +a +7 +2 +3 +SELECT * FROM t1 WHERE (SELECT AVG(3) OVER ()) > 2; +a +7 +2 +3 +INSERT INTO t1 VALUES((SELECT avg(4) OVER ())); +SELECT * FROM t1; +a +7 +2 +3 +4 +DROP TABLE t1; # End of 10.5 tests # # MDEV-28206 SIGSEGV in Item_field::fix_fields when using LEAD...OVER diff --git a/mysql-test/suite/encryption/t/doublewrite_debug.test b/mysql-test/suite/encryption/t/doublewrite_debug.test index 4dc6032c902..761f9cd3e47 100644 --- a/mysql-test/suite/encryption/t/doublewrite_debug.test +++ b/mysql-test/suite/encryption/t/doublewrite_debug.test @@ -1,7 +1,7 @@ --source include/have_innodb.inc --source include/have_debug.inc --source include/not_embedded.inc ---source include/have_example_key_management_plugin.inc +--source include/have_file_key_management_plugin.inc call mtr.add_suppression("InnoDB: Encrypted page \\[page id: space=[1-9][0-9]*, page number=3\\] in file .*test.t[12]\\.ibd looks corrupted"); call mtr.add_suppression("InnoDB: Unable to apply log to corrupted page "); call mtr.add_suppression("InnoDB: Plugin initialization aborted"); diff --git a/mysql-test/suite/federated/federatedx.result b/mysql-test/suite/federated/federatedx.result index 1d757dceb93..7f815c1a61c 100644 --- a/mysql-test/suite/federated/federatedx.result +++ b/mysql-test/suite/federated/federatedx.result @@ -2245,7 +2245,7 @@ CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/test/t1'; # Dump table t1 using mysqldump tool /*M!999999\- enable the sandbox mode */ /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `id` varchar(20) NOT NULL, PRIMARY KEY (`id`) diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index e77af6477df..96491b5fbf8 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@ -10,6 +10,5 @@ # ############################################################################## -galera_as_slave_replay : MDEV-32780 galera_as_slave_replay: assertion in the wsrep::transaction::before_rollback() -galera_slave_replay : MDEV-32780 galera_as_slave_replay: assertion in the wsrep::transaction::before_rollback() +galera_sequences : MDEV-35934/MDEV-33850 For Galera, create sequence with low cache got signal 6 error: [ERROR] WSREP: FSM: no such a transition REPLICATING -> COMMITTED MDEV-26266 : MDEV-26266 diff --git a/mysql-test/suite/galera/galera_2nodes_as_replica_2primary.cnf b/mysql-test/suite/galera/galera_2nodes_as_replica_2primary.cnf new file mode 100644 index 00000000000..714caf6ee67 --- /dev/null +++ b/mysql-test/suite/galera/galera_2nodes_as_replica_2primary.cnf @@ -0,0 +1,70 @@ +# +# This .cnf file creates a setup with 2 standard MariaDB servers, followed by a 2-node Galera cluster +# + +# Use default setting for mysqld processes +!include include/default_mysqld.cnf + +[mysqld] +loose-innodb +log-bin=mysqld-bin +log-slave-updates +binlog-format=row +innodb-autoinc-lock-mode=2 +default-storage-engine=innodb +# enforce read-committed characteristics across the cluster +# wsrep-causal-reads=ON +wsrep-sync-wait=15 + +[mysqld.1] +wsrep-on=1 +server-id=1 +#galera_port=@OPT.port +#ist_port=@OPT.port +#sst_port=@OPT.port +wsrep_provider=@ENV.WSREP_PROVIDER +wsrep_cluster_address=gcomm:// +wsrep_provider_options='repl.causal_read_timeout=PT90S;base_port=@mysqld.1.#galera_port;evs.suspect_timeout=PT10S;evs.inactive_timeout=PT30S;evs.install_timeout=PT15S;gcache.size=10M' +wsrep_node_address='127.0.0.1:@mysqld.1.#galera_port' +wsrep_node_incoming_address=127.0.0.1:@mysqld.1.port +wsrep_sst_receive_address='127.0.0.1:@mysqld.1.#sst_port' + +[mysqld.2] +wsrep-on=1 +server-id=2 +#galera_port=@OPT.port +#ist_port=@OPT.port +#sst_port=@OPT.port +wsrep_provider=@ENV.WSREP_PROVIDER +wsrep_cluster_address='gcomm://127.0.0.1:@mysqld.1.#galera_port' +wsrep_provider_options='repl.causal_read_timeout=PT90S;base_port=@mysqld.2.#galera_port;evs.suspect_timeout=PT10S;evs.inactive_timeout=PT30S;evs.install_timeout=PT15S;gcache.size=10M' +wsrep_node_address='127.0.0.1:@mysqld.2.#galera_port' +wsrep_node_incoming_address=127.0.0.1:@mysqld.2.port +wsrep_sst_receive_address='127.0.0.1:@mysqld.2.#sst_port' + +[mysqld.3] +wsrep-on=OFF +server-id=3 +gtid_domain_id=3 + +[mysqld.4] +wsrep-on=OFF +server-id=4 +gtid_domain_id=4 + + +[sst] +sst-log-archive-dir=@ENV.MYSQLTEST_VARDIR/log + +[ENV] +NODE_MYPORT_1= @mysqld.1.port +NODE_MYSOCK_1= @mysqld.1.socket + +NODE_MYPORT_2= @mysqld.2.port +NODE_MYSOCK_2= @mysqld.2.socket + +NODE_MYPORT_3= @mysqld.3.port +NODE_MYSOCK_3= @mysqld.3.socket + +NODE_MYPORT_4= @mysqld.4.port +NODE_MYSOCK_4= @mysqld.4.socket diff --git a/mysql-test/suite/galera/r/MDEV-35018.result b/mysql-test/suite/galera/r/MDEV-35018.result new file mode 100644 index 00000000000..2afa7c4d397 --- /dev/null +++ b/mysql-test/suite/galera/r/MDEV-35018.result @@ -0,0 +1,38 @@ +connection node_2; +connection node_1; +connection node_2; +SET GLOBAL wsrep_slave_threads=2; +CREATE TABLE t1 ( +id INTEGER PRIMARY KEY, +f2 INTEGER); +CREATE TABLE t2 ( +f1 INT PRIMARY KEY, +t1_id INT NOT NULL, +f2 INTEGER NOT NULL, +KEY key_t1_id(t1_id), +CONSTRAINT key_t1_id FOREIGN KEY (t1_id) REFERENCES t1 (id) ON UPDATE CASCADE ON DELETE CASCADE); +INSERT INTO t1 VALUES (1,0); +INSERT INTO t1 VALUES (2,0); +INSERT INTO t2 VALUES (1,1,1234); +INSERT INTO t2 VALUES (2,2,1234); +connection node_2; +SET GLOBAL DEBUG_DBUG = "d,sync.wsrep_apply_toi"; +connection node_1; +DROP TABLE t2; +connection node_2; +SET DEBUG_SYNC = "now WAIT_FOR sync.wsrep_apply_toi_reached"; +SET SESSION wsrep_sync_wait = 0; +1 +connection node_1; +UPDATE t1 SET f2 = 1 WHERE id=2; +connection node_2; +SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_toi"; +SET SESSION wsrep_sync_wait = DEFAULT; +SELECT * FROM t1; +id f2 +1 0 +2 1 +SET DEBUG_SYNC = 'RESET'; +SET GLOBAL DEBUG_DBUG = ''; +SET GLOBAL wsrep_slave_threads = DEFAULT; +DROP TABLE t1; diff --git a/mysql-test/suite/galera/r/MDEV-35852.result b/mysql-test/suite/galera/r/MDEV-35852.result new file mode 100644 index 00000000000..f9d07043cf9 --- /dev/null +++ b/mysql-test/suite/galera/r/MDEV-35852.result @@ -0,0 +1,8 @@ +connection node_2; +connection node_1; +CREATE TABLE t (a INT) ENGINE=InnoDB; +INSERT DELAYED INTO t VALUES (); +ERROR HY000: DELAYED option not supported for table 't' +DROP TABLE t; +INSERT DELAYED t1 () VALUES (); +ERROR 42S02: Table 'test.t1' doesn't exist diff --git a/mysql-test/suite/galera/r/MW-369.result b/mysql-test/suite/galera/r/MW-369.result index b4fb8668e74..4c487c57030 100644 --- a/mysql-test/suite/galera/r/MW-369.result +++ b/mysql-test/suite/galera/r/MW-369.result @@ -18,12 +18,12 @@ INSERT INTO c VALUES (1, 1); connection node_1a; SET SESSION DEBUG_SYNC = "now WAIT_FOR sync.wsrep_apply_cb_reached"; connection node_1; -SET DEBUG_SYNC = "wsrep_after_certification SIGNAL after_certification_reached WAIT_FOR continue_after_certification"; +SET SESSION DEBUG_SYNC = "wsrep_before_certification SIGNAL before_certification_reached WAIT_FOR continue_before_certification"; COMMIT; connection node_1a; -SET SESSION DEBUG_SYNC = "now WAIT_FOR after_certification_reached"; -SET DEBUG_SYNC = 'now SIGNAL continue_after_certification'; -SET DEBUG_SYNC = 'now SIGNAL signal.wsrep_apply_cb'; +SET SESSION DEBUG_SYNC = "now WAIT_FOR before_certification_reached"; +SET SESSION DEBUG_SYNC = 'now SIGNAL continue_before_certification'; +SET SESSION DEBUG_SYNC = 'now SIGNAL signal.wsrep_apply_cb'; SET GLOBAL DEBUG_DBUG = ""; SET DEBUG_SYNC = 'RESET'; connection node_1; @@ -58,12 +58,12 @@ UPDATE c SET f2 = 1 WHERE f1 = 1; connection node_1a; SET SESSION DEBUG_SYNC = "now WAIT_FOR sync.wsrep_apply_cb_reached"; connection node_1; -SET DEBUG_SYNC = "wsrep_after_certification SIGNAL after_certification_reached WAIT_FOR continue_after_certification"; +SET SESSION DEBUG_SYNC = "wsrep_before_certification SIGNAL before_certification_reached WAIT_FOR continue_before_certification"; COMMIT; connection node_1a; -SET SESSION DEBUG_SYNC = "now WAIT_FOR after_certification_reached"; -SET DEBUG_SYNC = 'now SIGNAL continue_after_certification'; -SET DEBUG_SYNC = 'now SIGNAL signal.wsrep_apply_cb'; +SET SESSION DEBUG_SYNC = "now WAIT_FOR before_certification_reached"; +SET SESSION DEBUG_SYNC = 'now SIGNAL continue_before_certification'; +SET SESSION DEBUG_SYNC = 'now SIGNAL signal.wsrep_apply_cb'; SET GLOBAL DEBUG_DBUG = ""; SET DEBUG_SYNC = 'RESET'; connection node_1; @@ -96,12 +96,12 @@ DELETE FROM c WHERE f1 = 1; connection node_1a; SET SESSION DEBUG_SYNC = "now WAIT_FOR sync.wsrep_apply_cb_reached"; connection node_1; -SET DEBUG_SYNC = "wsrep_after_certification SIGNAL after_certification_reached WAIT_FOR continue_after_certification"; +SET SESSION DEBUG_SYNC = "wsrep_before_certification SIGNAL before_certification_reached WAIT_FOR continue_before_certification"; COMMIT; connection node_1a; -SET SESSION DEBUG_SYNC = "now WAIT_FOR after_certification_reached"; -SET DEBUG_SYNC = 'now SIGNAL continue_after_certification'; -SET DEBUG_SYNC = 'now SIGNAL signal.wsrep_apply_cb'; +SET SESSION DEBUG_SYNC = "now WAIT_FOR before_certification_reached"; +SET SESSION DEBUG_SYNC = 'now SIGNAL continue_before_certification'; +SET SESSION DEBUG_SYNC = 'now SIGNAL signal.wsrep_apply_cb'; SET GLOBAL DEBUG_DBUG = ""; SET DEBUG_SYNC = 'RESET'; connection node_1; @@ -130,12 +130,12 @@ INSERT INTO c VALUES (1, 0);; connection node_1a; SET SESSION DEBUG_SYNC = "now WAIT_FOR sync.wsrep_apply_cb_reached"; connection node_1; -SET DEBUG_SYNC = "wsrep_after_certification SIGNAL after_certification_reached WAIT_FOR continue_after_certification"; +SET SESSION DEBUG_SYNC = "wsrep_before_certification SIGNAL before_certification_reached WAIT_FOR continue_before_certification"; COMMIT; connection node_1a; -SET SESSION DEBUG_SYNC = "now WAIT_FOR after_certification_reached"; -SET DEBUG_SYNC = 'now SIGNAL continue_after_certification'; -SET DEBUG_SYNC = 'now SIGNAL signal.wsrep_apply_cb'; +SET SESSION DEBUG_SYNC = "now WAIT_FOR before_certification_reached"; +SET SESSION DEBUG_SYNC = 'now SIGNAL continue_before_certification'; +SET SESSION DEBUG_SYNC = 'now SIGNAL signal.wsrep_apply_cb'; SET GLOBAL DEBUG_DBUG = ""; SET DEBUG_SYNC = 'RESET'; connection node_1; @@ -168,12 +168,12 @@ UPDATE c SET f2 = 1 WHERE f1 = 1; connection node_1a; SET SESSION DEBUG_SYNC = "now WAIT_FOR sync.wsrep_apply_cb_reached"; connection node_1; -SET DEBUG_SYNC = "wsrep_after_certification SIGNAL after_certification_reached WAIT_FOR continue_after_certification"; +SET SESSION DEBUG_SYNC = "wsrep_before_certification SIGNAL before_certification_reached WAIT_FOR continue_before_certification"; COMMIT; connection node_1a; -SET SESSION DEBUG_SYNC = "now WAIT_FOR after_certification_reached"; -SET DEBUG_SYNC = 'now SIGNAL continue_after_certification'; -SET DEBUG_SYNC = 'now SIGNAL signal.wsrep_apply_cb'; +SET SESSION DEBUG_SYNC = "now WAIT_FOR before_certification_reached"; +SET SESSION DEBUG_SYNC = 'now SIGNAL continue_before_certification'; +SET SESSION DEBUG_SYNC = 'now SIGNAL signal.wsrep_apply_cb'; SET GLOBAL DEBUG_DBUG = ""; SET DEBUG_SYNC = 'RESET'; connection node_1; @@ -211,12 +211,12 @@ INSERT INTO cf (f1, p_id) VALUES (20, 1); connection node_1a; SET SESSION DEBUG_SYNC = "now WAIT_FOR sync.wsrep_apply_cb_reached"; connection node_1; -SET DEBUG_SYNC = "wsrep_after_certification SIGNAL after_certification_reached WAIT_FOR continue_after_certification"; +SET SESSION DEBUG_SYNC = "wsrep_before_certification SIGNAL before_certification_reached WAIT_FOR continue_before_certification"; COMMIT; connection node_1a; -SET SESSION DEBUG_SYNC = "now WAIT_FOR after_certification_reached"; -SET DEBUG_SYNC = 'now SIGNAL continue_after_certification'; -SET DEBUG_SYNC = 'now SIGNAL signal.wsrep_apply_cb'; +SET SESSION DEBUG_SYNC = "now WAIT_FOR before_certification_reached"; +SET SESSION DEBUG_SYNC = 'now SIGNAL continue_before_certification'; +SET SESSION DEBUG_SYNC = 'now SIGNAL signal.wsrep_apply_cb'; SET GLOBAL DEBUG_DBUG = ""; SET DEBUG_SYNC = 'RESET'; connection node_1; @@ -249,12 +249,12 @@ INSERT INTO cg VALUES (1, 1, 0); connection node_1a; SET SESSION DEBUG_SYNC = "now WAIT_FOR sync.wsrep_apply_cb_reached"; connection node_1; -SET DEBUG_SYNC = "wsrep_after_certification SIGNAL after_certification_reached WAIT_FOR continue_after_certification"; +SET SESSION DEBUG_SYNC = "wsrep_before_certification SIGNAL before_certification_reached WAIT_FOR continue_before_certification"; COMMIT; connection node_1a; -SET SESSION DEBUG_SYNC = "now WAIT_FOR after_certification_reached"; -SET DEBUG_SYNC = 'now SIGNAL continue_after_certification'; -SET DEBUG_SYNC = 'now SIGNAL signal.wsrep_apply_cb'; +SET SESSION DEBUG_SYNC = "now WAIT_FOR before_certification_reached"; +SET SESSION DEBUG_SYNC = 'now SIGNAL continue_before_certification'; +SET SESSION DEBUG_SYNC = 'now SIGNAL signal.wsrep_apply_cb'; SET GLOBAL DEBUG_DBUG = ""; SET DEBUG_SYNC = 'RESET'; connection node_1; diff --git a/mysql-test/suite/galera/r/MW-402.result b/mysql-test/suite/galera/r/MW-402.result index e936b83553d..925d208f5c6 100644 --- a/mysql-test/suite/galera/r/MW-402.result +++ b/mysql-test/suite/galera/r/MW-402.result @@ -21,16 +21,17 @@ DELETE FROM p WHERE f1 = 1; connection node_1a; SET SESSION DEBUG_SYNC = "now WAIT_FOR sync.wsrep_apply_cb_reached"; connection node_1; -SET DEBUG_SYNC = "wsrep_after_certification SIGNAL after_certification_reached WAIT_FOR continue_after_certification"; +SET SESSION DEBUG_SYNC = "wsrep_before_certification SIGNAL before_certification_reached WAIT_FOR continue_before_certification"; COMMIT; connection node_1a; -SET SESSION DEBUG_SYNC = "now WAIT_FOR after_certification_reached"; -SET DEBUG_SYNC = 'now SIGNAL continue_after_certification'; -SET DEBUG_SYNC = 'now SIGNAL signal.wsrep_apply_cb'; +SET SESSION DEBUG_SYNC = "now WAIT_FOR before_certification_reached"; +SET SESSION DEBUG_SYNC = 'now SIGNAL continue_before_certification'; +SET SESSION DEBUG_SYNC = 'now SIGNAL signal.wsrep_apply_cb'; SET GLOBAL DEBUG_DBUG = ""; SET DEBUG_SYNC = 'RESET'; connection node_1; ERROR 40001: Deadlock found when trying to get lock; try restarting transaction +SET DEBUG_SYNC = 'RESET'; connection node_2; SELECT * FROM p; f1 f2 @@ -59,16 +60,17 @@ UPDATE p set f1=11 WHERE f1 = 1; connection node_1a; SET SESSION DEBUG_SYNC = "now WAIT_FOR sync.wsrep_apply_cb_reached"; connection node_1; -SET DEBUG_SYNC = "wsrep_after_certification SIGNAL after_certification_reached WAIT_FOR continue_after_certification"; +SET SESSION DEBUG_SYNC = "wsrep_before_certification SIGNAL before_certification_reached WAIT_FOR continue_before_certification"; COMMIT; connection node_1a; -SET SESSION DEBUG_SYNC = "now WAIT_FOR after_certification_reached"; -SET DEBUG_SYNC = 'now SIGNAL continue_after_certification'; -SET DEBUG_SYNC = 'now SIGNAL signal.wsrep_apply_cb'; +SET SESSION DEBUG_SYNC = "now WAIT_FOR before_certification_reached"; +SET SESSION DEBUG_SYNC = 'now SIGNAL continue_before_certification'; +SET SESSION DEBUG_SYNC = 'now SIGNAL signal.wsrep_apply_cb'; SET GLOBAL DEBUG_DBUG = ""; SET DEBUG_SYNC = 'RESET'; connection node_1; ERROR 40001: Deadlock found when trying to get lock; try restarting transaction +SET DEBUG_SYNC = 'RESET'; connection node_2; SELECT * FROM p; f1 f2 @@ -99,16 +101,17 @@ UPDATE p set f1=11 WHERE f1 = 1; connection node_1a; SET SESSION DEBUG_SYNC = "now WAIT_FOR sync.wsrep_apply_cb_reached"; connection node_1; -SET DEBUG_SYNC = "wsrep_after_certification SIGNAL after_certification_reached WAIT_FOR continue_after_certification"; +SET SESSION DEBUG_SYNC = "wsrep_before_certification SIGNAL before_certification_reached WAIT_FOR continue_before_certification"; COMMIT; connection node_1a; -SET SESSION DEBUG_SYNC = "now WAIT_FOR after_certification_reached"; -SET DEBUG_SYNC = 'now SIGNAL continue_after_certification'; -SET DEBUG_SYNC = 'now SIGNAL signal.wsrep_apply_cb'; +SET SESSION DEBUG_SYNC = "now WAIT_FOR before_certification_reached"; +SET SESSION DEBUG_SYNC = 'now SIGNAL continue_before_certification'; +SET SESSION DEBUG_SYNC = 'now SIGNAL signal.wsrep_apply_cb'; SET GLOBAL DEBUG_DBUG = ""; SET DEBUG_SYNC = 'RESET'; connection node_1; ERROR 40001: Deadlock found when trying to get lock; try restarting transaction +SET DEBUG_SYNC = 'RESET'; connection node_2; SELECT * FROM p; f1 f2 @@ -130,16 +133,17 @@ UPDATE c SET p_id=2 where f1=1; connection node_1a; SET SESSION DEBUG_SYNC = "now WAIT_FOR sync.wsrep_apply_cb_reached"; connection node_1; -SET DEBUG_SYNC = "wsrep_after_certification SIGNAL after_certification_reached WAIT_FOR continue_after_certification"; +SET SESSION DEBUG_SYNC = "wsrep_before_certification SIGNAL before_certification_reached WAIT_FOR continue_before_certification"; COMMIT; connection node_1a; -SET SESSION DEBUG_SYNC = "now WAIT_FOR after_certification_reached"; -SET DEBUG_SYNC = 'now SIGNAL continue_after_certification'; -SET DEBUG_SYNC = 'now SIGNAL signal.wsrep_apply_cb'; +SET SESSION DEBUG_SYNC = "now WAIT_FOR before_certification_reached"; +SET SESSION DEBUG_SYNC = 'now SIGNAL continue_before_certification'; +SET SESSION DEBUG_SYNC = 'now SIGNAL signal.wsrep_apply_cb'; SET GLOBAL DEBUG_DBUG = ""; SET DEBUG_SYNC = 'RESET'; connection node_1; ERROR 40001: Deadlock found when trying to get lock; try restarting transaction +SET DEBUG_SYNC = 'RESET'; connection node_2; SELECT * FROM p; f1 f2 @@ -174,15 +178,16 @@ DELETE FROM p1 WHERE f1 = 1; connection node_1a; SET SESSION DEBUG_SYNC = "now WAIT_FOR sync.wsrep_apply_cb_reached"; connection node_1; -SET DEBUG_SYNC = "wsrep_after_certification SIGNAL after_certification_reached WAIT_FOR continue_after_certification"; +SET SESSION DEBUG_SYNC = "wsrep_before_certification SIGNAL before_certification_reached WAIT_FOR continue_before_certification"; COMMIT; connection node_1a; -SET SESSION DEBUG_SYNC = "now WAIT_FOR after_certification_reached"; -SET DEBUG_SYNC = 'now SIGNAL continue_after_certification'; -SET DEBUG_SYNC = 'now SIGNAL signal.wsrep_apply_cb'; +SET SESSION DEBUG_SYNC = "now WAIT_FOR before_certification_reached"; +SET SESSION DEBUG_SYNC = 'now SIGNAL continue_before_certification'; +SET SESSION DEBUG_SYNC = 'now SIGNAL signal.wsrep_apply_cb'; SET GLOBAL DEBUG_DBUG = ""; SET DEBUG_SYNC = 'RESET'; connection node_1; +SET DEBUG_SYNC = 'RESET'; connection node_2; SELECT * FROM p1; f1 f2 @@ -219,16 +224,17 @@ DELETE FROM p1 WHERE f1=1; connection node_1a; SET SESSION DEBUG_SYNC = "now WAIT_FOR sync.wsrep_apply_cb_reached"; connection node_1; -SET DEBUG_SYNC = "wsrep_after_certification SIGNAL after_certification_reached WAIT_FOR continue_after_certification"; +SET SESSION DEBUG_SYNC = "wsrep_before_certification SIGNAL before_certification_reached WAIT_FOR continue_before_certification"; COMMIT; connection node_1a; -SET SESSION DEBUG_SYNC = "now WAIT_FOR after_certification_reached"; -SET DEBUG_SYNC = 'now SIGNAL continue_after_certification'; -SET DEBUG_SYNC = 'now SIGNAL signal.wsrep_apply_cb'; +SET SESSION DEBUG_SYNC = "now WAIT_FOR before_certification_reached"; +SET SESSION DEBUG_SYNC = 'now SIGNAL continue_before_certification'; +SET SESSION DEBUG_SYNC = 'now SIGNAL signal.wsrep_apply_cb'; SET GLOBAL DEBUG_DBUG = ""; SET DEBUG_SYNC = 'RESET'; connection node_1; ERROR 40001: Deadlock found when trying to get lock; try restarting transaction +SET DEBUG_SYNC = 'RESET'; connection node_2; SELECT * FROM p1; f1 f2 diff --git a/mysql-test/suite/galera/r/galera_2primary_replica.result b/mysql-test/suite/galera/r/galera_2primary_replica.result new file mode 100644 index 00000000000..8bdbf5be962 --- /dev/null +++ b/mysql-test/suite/galera/r/galera_2primary_replica.result @@ -0,0 +1,95 @@ +connection node_2; +connection node_1; +connect primary1, 127.0.0.1, root, , test, $NODE_MYPORT_3; +connect primary2, 127.0.0.1, root, , test, $NODE_MYPORT_4; +connection primary1; +# Primary1 creating user for replication +create user repl@'%' identified by 'repl'; +grant all on *.* to repl@'%'; +connection primary2; +# Primary2 creating user for replication +create user repl2@'%' identified by 'repl2'; +grant all on *.* to repl2@'%'; +connect replica, 127.0.0.1, root, , test, $NODE_MYPORT_1; +connection replica; +connection node_2; +connection replica; +# Galera replica changing master to primary1 +SET @@default_master_connection='stream2'; +# Primary node changing master to primary2 +START ALL SLAVES; +Warnings: +Note 1937 SLAVE 'stream1' started +Note 1937 SLAVE 'stream2' started +connection primary1; +# Primary 1: Creating table and populating it with data +CREATE TABLE t1 (id bigint auto_increment primary key, msg varchar(100)) engine=innodb; +# Intentionally generate 1k GTID-events +SELECT COUNT(*) AS EXPECT_1000 FROM t1; +EXPECT_1000 +1000 +connection primary2; +# Primary 2: Creating table and populating it with data +CREATE TABLE t2 (id bigint auto_increment primary key, msg varchar(100)) engine=innodb; +# Intentionally generate 1k GTID-events +SELECT COUNT(*) AS EXPECT_1000 FROM t2; +EXPECT_1000 +1000 +connection replica; +# Waiting for data to replicate to node_1 +SELECT COUNT(*) AS EXPECT_1000 FROM t1; +EXPECT_1000 +1000 +SELECT COUNT(*) AS EXPECT_1000 FROM t2; +EXPECT_1000 +1000 +SELECT COUNT(*) > 0 AS EXPECT_1 FROM mysql.gtid_slave_pos; +EXPECT_1 +1 +SELECT COUNT(*) < 1000 AS EXPECT_1 FROM mysql.gtid_slave_pos; +EXPECT_1 +1 +SELECT @@gtid_slave_pos,@@gtid_binlog_pos,@@gtid_current_pos; +@@gtid_slave_pos @@gtid_binlog_pos @@gtid_current_pos +3-3-1003,4-4-1003 3-3-1003,4-4-1003 3-3-1003,4-4-1003 +connection node_2; +# Waiting for data to replicate to node_2 +SELECT COUNT(*) AS EXPECT_1000 FROM t1; +EXPECT_1000 +1000 +SELECT COUNT(*) AS EXPECT_1000 FROM t2; +EXPECT_1000 +1000 +SELECT COUNT(*) > 0 AS EXPECT_1 FROM mysql.gtid_slave_pos; +EXPECT_1 +1 +SELECT COUNT(*) < 1000 AS EXPECT_1 FROM mysql.gtid_slave_pos; +EXPECT_1 +1 +SELECT @@gtid_slave_pos,@@gtid_binlog_pos,@@gtid_current_pos; +@@gtid_slave_pos @@gtid_binlog_pos @@gtid_current_pos +3-3-1003,4-4-1003 3-3-1003,4-4-1003 3-3-1003,4-4-1003 +connection primary1; +drop table t1; +connection primary2; +drop table t2; +# Wait until drop table is replicated on Galera +connection replica; +connection node_2; +connection replica; +STOP ALL SLAVES; +Warnings: +Note 1938 SLAVE 'stream1' stopped +Note 1938 SLAVE 'stream2' stopped +RESET SLAVE ALL; +connection primary1; +RESET MASTER; +connection primary2; +RESET MASTER; +connection node_1; +disconnect primary1; +disconnect primary2; +disconnect replica; +disconnect node_2; +disconnect node_1; +# End of test diff --git a/mysql-test/suite/galera/r/galera_circular_replication.result b/mysql-test/suite/galera/r/galera_circular_replication.result new file mode 100644 index 00000000000..72340977005 --- /dev/null +++ b/mysql-test/suite/galera/r/galera_circular_replication.result @@ -0,0 +1,138 @@ +connection node_2; +connection node_1; +connect replica1, 127.0.0.1, root, , test, $NODE_MYPORT_1; +connect primary2, 127.0.0.1, root, , test, $NODE_MYPORT_3; +connect primary1, 127.0.0.1, root, , test, $NODE_MYPORT_4; +connect replica2, 127.0.0.1, root, , test, $NODE_MYPORT_4; +connection primary1; +# Primary1 node creating user for replication +create user repl@'%' identified by 'repl'; +grant all on *.* to repl@'%'; +ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB; +connection replica1; +connection node_2; +connection primary2; +connection replica1; +# Galera replica changing master to primary1 +START SLAVE; +connection primary2; +# Primary2 creating user for replication +create user repl2@'%' identified by 'repl2'; +grant all on *.* to repl2@'%'; +connection replica2; +# replica2 changing master to primary2 +START SLAVE; +connection primary1; +# Primary1: Creating table and populating it with data +CREATE TABLE t1 (id bigint auto_increment primary key, msg varchar(100)) engine=innodb; +# Intentionally generate 1k GTID-events +SELECT COUNT(*) AS EXPECT_1000 FROM t1; +EXPECT_1000 +1000 +connection replica1; +# Waiting for data to replicate to replica +SELECT COUNT(*) AS EXPECT_1000 FROM t1; +EXPECT_1000 +1000 +# Writing more data to table +# Intentionally generate 1k GTID-events +SELECT COUNT(*) AS EXPECT_2000 FROM t1; +EXPECT_2000 +2000 +connection node_2; +# Waiting for data to replicate to Galera node_2 +SELECT COUNT(*) AS EXPECT_2000 FROM t1; +EXPECT_2000 +2000 +# Writing more data to table +# Intentionally generate 1k GTID-events +SELECT COUNT(*) AS EXPECT_3000 FROM t1; +EXPECT_3000 +3000 +connection primary2; +# Waiting for data to replicate to primary2 +SELECT COUNT(*) AS EXPECT_3000 FROM t1; +EXPECT_3000 +3000 +# Writing more data to table +# Intentionally generate 1k GTID-events +SELECT COUNT(*) AS EXPECT_4000 FROM t1; +EXPECT_4000 +4000 +connection primary1; +# Waiting for data to replicate to primary1 +SELECT COUNT(*) AS EXPECT_4000 FROM t1; +EXPECT_4000 +4000 +SELECT COUNT(*) > 0 AS EXPECT_1 FROM mysql.gtid_slave_pos; +EXPECT_1 +1 +SELECT COUNT(*) < 1000 AS EXPECT_1 FROM mysql.gtid_slave_pos; +EXPECT_1 +1 +SELECT @@gtid_slave_pos,@@gtid_binlog_pos,@@gtid_current_pos; +@@gtid_slave_pos @@gtid_binlog_pos @@gtid_current_pos +0-4-1004,16-15-3002 0-4-1004,16-15-3002 0-4-1004,16-15-3002 +connection replica1; +# Waiting for data to replicate to replica +SELECT COUNT(*) AS EXPECT_4000 FROM t1; +EXPECT_4000 +4000 +SELECT COUNT(*) > 0 AS EXPECT_1 FROM mysql.gtid_slave_pos; +EXPECT_1 +1 +SELECT COUNT(*) < 1000 AS EXPECT_1 FROM mysql.gtid_slave_pos; +EXPECT_1 +1 +SELECT @@gtid_slave_pos,@@gtid_binlog_pos,@@gtid_current_pos; +@@gtid_slave_pos @@gtid_binlog_pos @@gtid_current_pos +0-4-1004,16-15-3002 0-4-1004,16-15-3002 0-4-1004,16-15-3002 +connection node_2; +# Waiting for data to replicate to node_2 +SELECT COUNT(*) AS EXPECT_4000 FROM t1; +EXPECT_4000 +4000 +SELECT COUNT(*) > 0 AS EXPECT_1 FROM mysql.gtid_slave_pos; +EXPECT_1 +1 +SELECT COUNT(*) < 1000 AS EXPECT_1 FROM mysql.gtid_slave_pos; +EXPECT_1 +1 +SELECT @@gtid_slave_pos,@@gtid_binlog_pos,@@gtid_current_pos; +@@gtid_slave_pos @@gtid_binlog_pos @@gtid_current_pos +0-4-1004 0-4-1004,16-15-3002 0-4-1004,16-15-3002 +connection primary2; +# Waiting for data to replicate to node_3 +SELECT COUNT(*) AS EXPECT_4000 FROM t1; +EXPECT_4000 +4000 +SELECT COUNT(*) > 0 AS EXPECT_1 FROM mysql.gtid_slave_pos; +EXPECT_1 +1 +SELECT COUNT(*) < 1000 AS EXPECT_1 FROM mysql.gtid_slave_pos; +EXPECT_1 +1 +SELECT @@gtid_slave_pos,@@gtid_binlog_pos,@@gtid_current_pos; +@@gtid_slave_pos @@gtid_binlog_pos @@gtid_current_pos +0-4-1004 0-4-1004,16-15-3002 0-4-1004,16-15-3002 +connection primary1; +drop table t1; +# Wait until drop table is replicated on Galera +connection replica1; +connection node_2; +connection primary2; +connection replica1; +STOP SLAVE; +RESET SLAVE ALL; +connection replica2; +STOP SLAVE; +RESET SLAVE ALL; +RESET MASTER; +connection node_1; +disconnect primary1; +disconnect replica1; +disconnect primary2; +disconnect replica2; +disconnect node_2; +disconnect node_1; +# End of test diff --git a/mysql-test/suite/galera/r/galera_ddl_fk_conflict.result b/mysql-test/suite/galera/r/galera_ddl_fk_conflict.result index 03e84f9facd..226aebde69e 100644 --- a/mysql-test/suite/galera/r/galera_ddl_fk_conflict.result +++ b/mysql-test/suite/galera/r/galera_ddl_fk_conflict.result @@ -3,11 +3,12 @@ connection node_1; connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1; connection node_1a; SET SESSION wsrep_sync_wait=0; +FLUSH STATUS; connect node_1b, 127.0.0.1, root, , test, $NODE_MYPORT_1; connection node_1b; SET SESSION wsrep_sync_wait=0; ###################################################################### -# Test for ALTER ENGINE=INNODB +# Test for ALTER TABLE ENGINE=INNODB ###################################################################### ###################################################################### # @@ -17,6 +18,7 @@ SET SESSION wsrep_sync_wait=0; ###################################################################### connection node_1; SET SESSION wsrep_sync_wait=0; +FLUSH STATUS; CREATE TABLE p1 (pk INTEGER PRIMARY KEY, f2 CHAR(30)); INSERT INTO p1 VALUES (1, 'INITIAL VALUE'); CREATE TABLE p2 (pk INTEGER PRIMARY KEY, f2 CHAR(30)); @@ -49,6 +51,9 @@ EXPECT_1 SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE'; EXPECT_2 2 +connection node_1; +CREATE TABLE IF NOT EXISTS c1 (pk INTEGER PRIMARY KEY, fk INTEGER, FOREIGN KEY (fk) REFERENCES p1(pk)); +INSERT IGNORE INTO c1 VALUES (1,1); ###################################################################### # # Scenario #2: DML working on FK parent table tries to replicate, but @@ -87,6 +92,9 @@ EXPECT_1 SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE'; EXPECT_2 2 +connection node_1; +CREATE TABLE IF NOT EXISTS c1 (pk INTEGER PRIMARY KEY, fk INTEGER, FOREIGN KEY (fk) REFERENCES p1(pk)); +INSERT IGNORE INTO c1 VALUES (1,1); ###################################################################### # # Scenario #3: 2 DMLs working on two FK parent tables try to replicate, @@ -137,10 +145,10 @@ EXPECT_1 SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE'; EXPECT_2 2 -DROP TABLE c1, c2; +DROP TABLE IF EXISTS c1, c2; DROP TABLE p1, p2; ###################################################################### -# Test for TRUNCATE +# Test for TRUNCATE TABLE ###################################################################### ###################################################################### # @@ -150,6 +158,7 @@ DROP TABLE p1, p2; ###################################################################### connection node_1; SET SESSION wsrep_sync_wait=0; +FLUSH STATUS; CREATE TABLE p1 (pk INTEGER PRIMARY KEY, f2 CHAR(30)); INSERT INTO p1 VALUES (1, 'INITIAL VALUE'); CREATE TABLE p2 (pk INTEGER PRIMARY KEY, f2 CHAR(30)); @@ -182,6 +191,9 @@ EXPECT_1 SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE'; EXPECT_2 2 +connection node_1; +CREATE TABLE IF NOT EXISTS c1 (pk INTEGER PRIMARY KEY, fk INTEGER, FOREIGN KEY (fk) REFERENCES p1(pk)); +INSERT IGNORE INTO c1 VALUES (1,1); ###################################################################### # # Scenario #2: DML working on FK parent table tries to replicate, but @@ -220,6 +232,9 @@ EXPECT_1 SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE'; EXPECT_2 2 +connection node_1; +CREATE TABLE IF NOT EXISTS c1 (pk INTEGER PRIMARY KEY, fk INTEGER, FOREIGN KEY (fk) REFERENCES p1(pk)); +INSERT IGNORE INTO c1 VALUES (1,1); ###################################################################### # # Scenario #3: 2 DMLs working on two FK parent tables try to replicate, @@ -270,5 +285,592 @@ EXPECT_1 SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE'; EXPECT_2 2 -DROP TABLE c1, c2; +DROP TABLE IF EXISTS c1, c2; DROP TABLE p1, p2; +###################################################################### +# Test for DROP TABLE +###################################################################### +###################################################################### +# +# Scenario #1: DML working on FK parent table BF aborted by DDL +# over child table +# +###################################################################### +connection node_1; +SET SESSION wsrep_sync_wait=0; +CREATE TABLE p1 (pk INTEGER PRIMARY KEY, f2 CHAR(30)); +INSERT INTO p1 VALUES (1, 'INITIAL VALUE'); +CREATE TABLE p2 (pk INTEGER PRIMARY KEY, f2 CHAR(30)); +INSERT INTO p2 VALUES (1, 'INITIAL VALUE'); +INSERT INTO p2 VALUES (2, 'INITIAL VALUE'); +CREATE TABLE c1 (pk INTEGER PRIMARY KEY, fk INTEGER, FOREIGN KEY (fk) REFERENCES p1(pk)); +INSERT INTO c1 VALUES (1,1); +CREATE TABLE c2 (pk INTEGER PRIMARY KEY, fk1 INTEGER, fk2 INTEGER, FOREIGN KEY (fk1) REFERENCES p1(pk), FOREIGN KEY (fk2) REFERENCES p2(pk)); +INSERT INTO c2 VALUES (1,1,1), (2,1,2); +connection node_1; +SET AUTOCOMMIT=ON; +START TRANSACTION; +UPDATE p1 SET f2 = 'TO DEADLOCK' WHERE pk = 1; +connection node_2; +SET SESSION wsrep_sync_wait=0; +DROP TABLE c1 ; +connection node_1; +COMMIT; +ERROR 40001: Deadlock found when trying to get lock; try restarting transaction +SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE'; +EXPECT_1 +1 +SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE'; +EXPECT_2 +2 +connection node_2; +SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE'; +EXPECT_1 +1 +SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE'; +EXPECT_2 +2 +connection node_1; +CREATE TABLE IF NOT EXISTS c1 (pk INTEGER PRIMARY KEY, fk INTEGER, FOREIGN KEY (fk) REFERENCES p1(pk)); +INSERT IGNORE INTO c1 VALUES (1,1); +###################################################################### +# +# Scenario #2: DML working on FK parent table tries to replicate, but +# fails in certification for earlier DDL on child table +# +###################################################################### +connection node_1; +BEGIN; +SET GLOBAL wsrep_provider_options = 'dbug=d,apply_monitor_slave_enter_sync'; +connection node_2; +DROP TABLE c1 ; +connection node_1a; +SET SESSION wsrep_on = 0; +SET SESSION wsrep_on = 1; +SET GLOBAL wsrep_provider_options = 'dbug='; +connection node_1; +UPDATE p1 SET f2 = 'TO DEADLOCK' WHERE pk = 1; +COMMIT; +connection node_1a; +SET GLOBAL wsrep_provider_options = 'signal=apply_monitor_slave_enter_sync'; +connection node_1; +ERROR 40001: Deadlock found when trying to get lock; try restarting transaction +SELECT 'I deadlocked'; +I deadlocked +I deadlocked +SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE'; +EXPECT_1 +1 +SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE'; +EXPECT_2 +2 +connection node_2; +SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE'; +EXPECT_1 +1 +SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE'; +EXPECT_2 +2 +connection node_1; +CREATE TABLE IF NOT EXISTS c1 (pk INTEGER PRIMARY KEY, fk INTEGER, FOREIGN KEY (fk) REFERENCES p1(pk)); +INSERT IGNORE INTO c1 VALUES (1,1); +###################################################################### +# +# Scenario #3: 2 DMLs working on two FK parent tables try to replicate, +# but fails in certification for earlier DDL on child table +# which is child to both FK parents +# +###################################################################### +connection node_1; +BEGIN; +connection node_1b; +BEGIN; +connection node_1a; +SET GLOBAL wsrep_provider_options = 'dbug=d,apply_monitor_slave_enter_sync'; +connection node_2; +DROP TABLE c2 ; +connection node_1a; +SET SESSION wsrep_on = 0; +SET SESSION wsrep_on = 1; +SET GLOBAL wsrep_provider_options = 'dbug='; +connection node_1; +UPDATE p1 SET f2 = 'TO DEADLOCK' WHERE pk = 1; +COMMIT; +connection node_1b; +UPDATE p2 SET f2 = 'TO DEADLOCK' WHERE pk = 2; +COMMIT; +connection node_1a; +SET GLOBAL wsrep_provider_options = 'signal=apply_monitor_slave_enter_sync'; +connection node_1; +ERROR 40001: Deadlock found when trying to get lock; try restarting transaction +SELECT 'I deadlocked'; +I deadlocked +I deadlocked +connection node_1b; +ERROR 40001: Deadlock found when trying to get lock; try restarting transaction +SELECT 'I deadlocked'; +I deadlocked +I deadlocked +SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE'; +EXPECT_1 +1 +SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE'; +EXPECT_2 +2 +connection node_2; +SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE'; +EXPECT_1 +1 +SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE'; +EXPECT_2 +2 +DROP TABLE IF EXISTS c1, c2; +Warnings: +Note 1051 Unknown table 'test.c2' +DROP TABLE p1, p2; +###################################################################### +# Test for DROP TABLE +###################################################################### +connection node_1; +SET SESSION wsrep_sync_wait=0; +CREATE TABLE p1 (pk INTEGER PRIMARY KEY, f2 CHAR(30)); +INSERT INTO p1 VALUES (1, 'INITIAL VALUE'); +CREATE TABLE c1 (pk INTEGER PRIMARY KEY, fk INTEGER, FOREIGN KEY (fk) REFERENCES p1(pk)); +INSERT INTO c1 VALUES (1,1); +###################################################################### +# +# Scenario #4: DML working on FK parent table tries to replicate, but +# fails in certification for earlier DDL on child table +# and another temporary table. TMP table should be skipped +# but FK child table should be replicated with proper keys +# +###################################################################### +connection node_1; +BEGIN; +SET GLOBAL wsrep_provider_options = 'dbug=d,apply_monitor_slave_enter_sync'; +connection node_2; +CREATE TEMPORARY TABLE tmp1 (i int); +CREATE TEMPORARY TABLE tmp2 (i int); +DROP TABLE tmp1, c1, tmp2 ; +connection node_1a; +SET SESSION wsrep_on = 0; +SET SESSION wsrep_on = 1; +SET GLOBAL wsrep_provider_options = 'dbug='; +connection node_1; +INSERT INTO p1 VALUES (10, 'TO DEADLOCK'); +COMMIT; +connection node_1a; +SET GLOBAL wsrep_provider_options = 'signal=apply_monitor_slave_enter_sync'; +connection node_1; +ERROR 40001: Deadlock found when trying to get lock; try restarting transaction +SELECT 'I deadlocked'; +I deadlocked +I deadlocked +SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE'; +EXPECT_1 +1 +connection node_2; +SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE'; +EXPECT_1 +1 +DROP TABLE IF EXISTS c1; +Warnings: +Note 1051 Unknown table 'test.c1' +DROP TABLE p1; +DROP TABLE IF EXISTS tmp1, tmp2; +Warnings: +Note 1051 Unknown table 'test.tmp1,test.tmp2' +###################################################################### +# Test for DROP TABLE IF EXISTS +###################################################################### +###################################################################### +# +# Scenario #1: DML working on FK parent table BF aborted by DDL +# over child table +# +###################################################################### +connection node_1; +SET SESSION wsrep_sync_wait=0; +CREATE TABLE p1 (pk INTEGER PRIMARY KEY, f2 CHAR(30)); +INSERT INTO p1 VALUES (1, 'INITIAL VALUE'); +CREATE TABLE p2 (pk INTEGER PRIMARY KEY, f2 CHAR(30)); +INSERT INTO p2 VALUES (1, 'INITIAL VALUE'); +INSERT INTO p2 VALUES (2, 'INITIAL VALUE'); +CREATE TABLE c1 (pk INTEGER PRIMARY KEY, fk INTEGER, FOREIGN KEY (fk) REFERENCES p1(pk)); +INSERT INTO c1 VALUES (1,1); +CREATE TABLE c2 (pk INTEGER PRIMARY KEY, fk1 INTEGER, fk2 INTEGER, FOREIGN KEY (fk1) REFERENCES p1(pk), FOREIGN KEY (fk2) REFERENCES p2(pk)); +INSERT INTO c2 VALUES (1,1,1), (2,1,2); +connection node_1; +SET AUTOCOMMIT=ON; +START TRANSACTION; +UPDATE p1 SET f2 = 'TO DEADLOCK' WHERE pk = 1; +connection node_2; +SET SESSION wsrep_sync_wait=0; +DROP TABLE IF EXISTS c1 ; +connection node_1; +COMMIT; +ERROR 40001: Deadlock found when trying to get lock; try restarting transaction +SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE'; +EXPECT_1 +1 +SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE'; +EXPECT_2 +2 +connection node_2; +SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE'; +EXPECT_1 +1 +SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE'; +EXPECT_2 +2 +connection node_1; +CREATE TABLE IF NOT EXISTS c1 (pk INTEGER PRIMARY KEY, fk INTEGER, FOREIGN KEY (fk) REFERENCES p1(pk)); +INSERT IGNORE INTO c1 VALUES (1,1); +###################################################################### +# +# Scenario #2: DML working on FK parent table tries to replicate, but +# fails in certification for earlier DDL on child table +# +###################################################################### +connection node_1; +BEGIN; +SET GLOBAL wsrep_provider_options = 'dbug=d,apply_monitor_slave_enter_sync'; +connection node_2; +DROP TABLE IF EXISTS c1 ; +connection node_1a; +SET SESSION wsrep_on = 0; +SET SESSION wsrep_on = 1; +SET GLOBAL wsrep_provider_options = 'dbug='; +connection node_1; +UPDATE p1 SET f2 = 'TO DEADLOCK' WHERE pk = 1; +COMMIT; +connection node_1a; +SET GLOBAL wsrep_provider_options = 'signal=apply_monitor_slave_enter_sync'; +connection node_1; +ERROR 40001: Deadlock found when trying to get lock; try restarting transaction +SELECT 'I deadlocked'; +I deadlocked +I deadlocked +SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE'; +EXPECT_1 +1 +SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE'; +EXPECT_2 +2 +connection node_2; +SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE'; +EXPECT_1 +1 +SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE'; +EXPECT_2 +2 +connection node_1; +CREATE TABLE IF NOT EXISTS c1 (pk INTEGER PRIMARY KEY, fk INTEGER, FOREIGN KEY (fk) REFERENCES p1(pk)); +INSERT IGNORE INTO c1 VALUES (1,1); +###################################################################### +# +# Scenario #3: 2 DMLs working on two FK parent tables try to replicate, +# but fails in certification for earlier DDL on child table +# which is child to both FK parents +# +###################################################################### +connection node_1; +BEGIN; +connection node_1b; +BEGIN; +connection node_1a; +SET GLOBAL wsrep_provider_options = 'dbug=d,apply_monitor_slave_enter_sync'; +connection node_2; +DROP TABLE IF EXISTS c2 ; +connection node_1a; +SET SESSION wsrep_on = 0; +SET SESSION wsrep_on = 1; +SET GLOBAL wsrep_provider_options = 'dbug='; +connection node_1; +UPDATE p1 SET f2 = 'TO DEADLOCK' WHERE pk = 1; +COMMIT; +connection node_1b; +UPDATE p2 SET f2 = 'TO DEADLOCK' WHERE pk = 2; +COMMIT; +connection node_1a; +SET GLOBAL wsrep_provider_options = 'signal=apply_monitor_slave_enter_sync'; +connection node_1; +ERROR 40001: Deadlock found when trying to get lock; try restarting transaction +SELECT 'I deadlocked'; +I deadlocked +I deadlocked +connection node_1b; +ERROR 40001: Deadlock found when trying to get lock; try restarting transaction +SELECT 'I deadlocked'; +I deadlocked +I deadlocked +SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE'; +EXPECT_1 +1 +SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE'; +EXPECT_2 +2 +connection node_2; +SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE'; +EXPECT_1 +1 +SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE'; +EXPECT_2 +2 +DROP TABLE IF EXISTS c1, c2; +Warnings: +Note 1051 Unknown table 'test.c2' +DROP TABLE p1, p2; +###################################################################### +# Test for DROP TABLE IF EXISTS +###################################################################### +connection node_1; +SET SESSION wsrep_sync_wait=0; +CREATE TABLE p1 (pk INTEGER PRIMARY KEY, f2 CHAR(30)); +INSERT INTO p1 VALUES (1, 'INITIAL VALUE'); +CREATE TABLE c1 (pk INTEGER PRIMARY KEY, fk INTEGER, FOREIGN KEY (fk) REFERENCES p1(pk)); +INSERT INTO c1 VALUES (1,1); +###################################################################### +# +# Scenario #4: DML working on FK parent table tries to replicate, but +# fails in certification for earlier DDL on child table +# and another temporary table. TMP table should be skipped +# but FK child table should be replicated with proper keys +# +###################################################################### +connection node_1; +BEGIN; +SET GLOBAL wsrep_provider_options = 'dbug=d,apply_monitor_slave_enter_sync'; +connection node_2; +CREATE TEMPORARY TABLE tmp1 (i int); +CREATE TEMPORARY TABLE tmp2 (i int); +DROP TABLE IF EXISTS tmp1, c1, tmp2 ; +connection node_1a; +SET SESSION wsrep_on = 0; +SET SESSION wsrep_on = 1; +SET GLOBAL wsrep_provider_options = 'dbug='; +connection node_1; +INSERT INTO p1 VALUES (10, 'TO DEADLOCK'); +COMMIT; +connection node_1a; +SET GLOBAL wsrep_provider_options = 'signal=apply_monitor_slave_enter_sync'; +connection node_1; +ERROR 40001: Deadlock found when trying to get lock; try restarting transaction +SELECT 'I deadlocked'; +I deadlocked +I deadlocked +SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE'; +EXPECT_1 +1 +connection node_2; +SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE'; +EXPECT_1 +1 +DROP TABLE IF EXISTS c1; +Warnings: +Note 1051 Unknown table 'test.c1' +DROP TABLE p1; +DROP TABLE IF EXISTS tmp1, tmp2; +Warnings: +Note 1051 Unknown table 'test.tmp1,test.tmp2' +###################################################################### +# Test for DROP TABLE IF EXISTS nonexisting, +###################################################################### +###################################################################### +# +# Scenario #1: DML working on FK parent table BF aborted by DDL +# over child table +# +###################################################################### +connection node_1; +SET SESSION wsrep_sync_wait=0; +CREATE TABLE p1 (pk INTEGER PRIMARY KEY, f2 CHAR(30)); +INSERT INTO p1 VALUES (1, 'INITIAL VALUE'); +CREATE TABLE p2 (pk INTEGER PRIMARY KEY, f2 CHAR(30)); +INSERT INTO p2 VALUES (1, 'INITIAL VALUE'); +INSERT INTO p2 VALUES (2, 'INITIAL VALUE'); +CREATE TABLE c1 (pk INTEGER PRIMARY KEY, fk INTEGER, FOREIGN KEY (fk) REFERENCES p1(pk)); +INSERT INTO c1 VALUES (1,1); +CREATE TABLE c2 (pk INTEGER PRIMARY KEY, fk1 INTEGER, fk2 INTEGER, FOREIGN KEY (fk1) REFERENCES p1(pk), FOREIGN KEY (fk2) REFERENCES p2(pk)); +INSERT INTO c2 VALUES (1,1,1), (2,1,2); +connection node_1; +SET AUTOCOMMIT=ON; +START TRANSACTION; +UPDATE p1 SET f2 = 'TO DEADLOCK' WHERE pk = 1; +connection node_2; +SET SESSION wsrep_sync_wait=0; +DROP TABLE IF EXISTS nonexisting, c1 ; +Warnings: +Note 1051 Unknown table 'test.nonexisting' +connection node_1; +COMMIT; +ERROR 40001: Deadlock found when trying to get lock; try restarting transaction +SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE'; +EXPECT_1 +1 +SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE'; +EXPECT_2 +2 +connection node_2; +SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE'; +EXPECT_1 +1 +SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE'; +EXPECT_2 +2 +connection node_1; +CREATE TABLE IF NOT EXISTS c1 (pk INTEGER PRIMARY KEY, fk INTEGER, FOREIGN KEY (fk) REFERENCES p1(pk)); +INSERT IGNORE INTO c1 VALUES (1,1); +###################################################################### +# +# Scenario #2: DML working on FK parent table tries to replicate, but +# fails in certification for earlier DDL on child table +# +###################################################################### +connection node_1; +BEGIN; +SET GLOBAL wsrep_provider_options = 'dbug=d,apply_monitor_slave_enter_sync'; +connection node_2; +DROP TABLE IF EXISTS nonexisting, c1 ; +Warnings: +Note 1051 Unknown table 'test.nonexisting' +connection node_1a; +SET SESSION wsrep_on = 0; +SET SESSION wsrep_on = 1; +SET GLOBAL wsrep_provider_options = 'dbug='; +connection node_1; +UPDATE p1 SET f2 = 'TO DEADLOCK' WHERE pk = 1; +COMMIT; +connection node_1a; +SET GLOBAL wsrep_provider_options = 'signal=apply_monitor_slave_enter_sync'; +connection node_1; +ERROR 40001: Deadlock found when trying to get lock; try restarting transaction +SELECT 'I deadlocked'; +I deadlocked +I deadlocked +SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE'; +EXPECT_1 +1 +SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE'; +EXPECT_2 +2 +connection node_2; +SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE'; +EXPECT_1 +1 +SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE'; +EXPECT_2 +2 +connection node_1; +CREATE TABLE IF NOT EXISTS c1 (pk INTEGER PRIMARY KEY, fk INTEGER, FOREIGN KEY (fk) REFERENCES p1(pk)); +INSERT IGNORE INTO c1 VALUES (1,1); +###################################################################### +# +# Scenario #3: 2 DMLs working on two FK parent tables try to replicate, +# but fails in certification for earlier DDL on child table +# which is child to both FK parents +# +###################################################################### +connection node_1; +BEGIN; +connection node_1b; +BEGIN; +connection node_1a; +SET GLOBAL wsrep_provider_options = 'dbug=d,apply_monitor_slave_enter_sync'; +connection node_2; +DROP TABLE IF EXISTS nonexisting, c2 ; +Warnings: +Note 1051 Unknown table 'test.nonexisting' +connection node_1a; +SET SESSION wsrep_on = 0; +SET SESSION wsrep_on = 1; +SET GLOBAL wsrep_provider_options = 'dbug='; +connection node_1; +UPDATE p1 SET f2 = 'TO DEADLOCK' WHERE pk = 1; +COMMIT; +connection node_1b; +UPDATE p2 SET f2 = 'TO DEADLOCK' WHERE pk = 2; +COMMIT; +connection node_1a; +SET GLOBAL wsrep_provider_options = 'signal=apply_monitor_slave_enter_sync'; +connection node_1; +ERROR 40001: Deadlock found when trying to get lock; try restarting transaction +SELECT 'I deadlocked'; +I deadlocked +I deadlocked +connection node_1b; +ERROR 40001: Deadlock found when trying to get lock; try restarting transaction +SELECT 'I deadlocked'; +I deadlocked +I deadlocked +SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE'; +EXPECT_1 +1 +SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE'; +EXPECT_2 +2 +connection node_2; +SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE'; +EXPECT_1 +1 +SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE'; +EXPECT_2 +2 +DROP TABLE IF EXISTS c1, c2; +Warnings: +Note 1051 Unknown table 'test.c2' +DROP TABLE p1, p2; +###################################################################### +# Test for DROP TABLE IF EXISTS nonexisting, +###################################################################### +connection node_1; +SET SESSION wsrep_sync_wait=0; +CREATE TABLE p1 (pk INTEGER PRIMARY KEY, f2 CHAR(30)); +INSERT INTO p1 VALUES (1, 'INITIAL VALUE'); +CREATE TABLE c1 (pk INTEGER PRIMARY KEY, fk INTEGER, FOREIGN KEY (fk) REFERENCES p1(pk)); +INSERT INTO c1 VALUES (1,1); +###################################################################### +# +# Scenario #4: DML working on FK parent table tries to replicate, but +# fails in certification for earlier DDL on child table +# and another temporary table. TMP table should be skipped +# but FK child table should be replicated with proper keys +# +###################################################################### +connection node_1; +BEGIN; +SET GLOBAL wsrep_provider_options = 'dbug=d,apply_monitor_slave_enter_sync'; +connection node_2; +CREATE TEMPORARY TABLE tmp1 (i int); +CREATE TEMPORARY TABLE tmp2 (i int); +DROP TABLE IF EXISTS nonexisting, tmp1, c1, tmp2 ; +Warnings: +Note 1051 Unknown table 'test.nonexisting' +connection node_1a; +SET SESSION wsrep_on = 0; +SET SESSION wsrep_on = 1; +SET GLOBAL wsrep_provider_options = 'dbug='; +connection node_1; +INSERT INTO p1 VALUES (10, 'TO DEADLOCK'); +COMMIT; +connection node_1a; +SET GLOBAL wsrep_provider_options = 'signal=apply_monitor_slave_enter_sync'; +connection node_1; +ERROR 40001: Deadlock found when trying to get lock; try restarting transaction +SELECT 'I deadlocked'; +I deadlocked +I deadlocked +SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE'; +EXPECT_1 +1 +connection node_2; +SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE'; +EXPECT_1 +1 +DROP TABLE IF EXISTS c1; +Warnings: +Note 1051 Unknown table 'test.c1' +DROP TABLE p1; +DROP TABLE IF EXISTS tmp1, tmp2; +Warnings: +Note 1051 Unknown table 'test.tmp1,test.tmp2' diff --git a/mysql-test/suite/galera/r/galera_query_cache_invalidate.result b/mysql-test/suite/galera/r/galera_query_cache_invalidate.result index 3066bd7b2fb..d07fe62c2d5 100644 --- a/mysql-test/suite/galera/r/galera_query_cache_invalidate.result +++ b/mysql-test/suite/galera/r/galera_query_cache_invalidate.result @@ -7,7 +7,6 @@ call mtr.add_suppression("WSREP: Ignoring server id .* for non bootstrap node"); connection node_4; call mtr.add_suppression("WSREP: Ignoring server id .* for non bootstrap node"); connection node_3; -CHANGE MASTER TO master_host='127.0.0.1', master_user='root', master_port=NODE_MYPORT_1, master_use_gtid=current_pos;; START SLAVE; include/wait_for_slave_to_start.inc connection node_1; diff --git a/mysql-test/suite/galera/r/galera_restart_replica.result b/mysql-test/suite/galera/r/galera_restart_replica.result index 9b7e9fd259f..efc9a83a168 100644 --- a/mysql-test/suite/galera/r/galera_restart_replica.result +++ b/mysql-test/suite/galera/r/galera_restart_replica.result @@ -1,122 +1,169 @@ connection node_2; connection node_1; -connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3; +connect replica, 127.0.0.1, root, , test, $NODE_MYPORT_2; +connect primary, 127.0.0.1, root, , test, $NODE_MYPORT_3; create user repl@'%' identified by 'repl'; grant all on *.* to repl@'%'; ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB; connection node_1; -connection node_2; -connection node_2; +connection replica; +connection replica; START SLAVE; -connection node_3; -CREATE TABLE t1 (id bigint primary key, msg varchar(100)) engine=innodb; -SELECT COUNT(*) AS EXPECT_10000 FROM t1; -EXPECT_10000 -10000 -connection node_2; +connection primary; +CREATE TABLE t1 (id bigint auto_increment primary key, msg varchar(100)) engine=innodb; +# Intentionally generate 1k GTID-events +SELECT COUNT(*) AS EXPECT_1000 FROM t1; +EXPECT_1000 +1000 +connection replica; SELECT COUNT(*) > 0 AS EXPECT_1 FROM mysql.gtid_slave_pos; EXPECT_1 1 -SELECT COUNT(*) AS EXPECT_10000 FROM t1; -EXPECT_10000 -10000 +SELECT COUNT(*) < 1000 AS EXPECT_1 FROM mysql.gtid_slave_pos; +EXPECT_1 +1 +SELECT @@gtid_slave_pos,@@gtid_binlog_pos,@@gtid_current_pos; +@@gtid_slave_pos @@gtid_binlog_pos @@gtid_current_pos +0-3-1004 0-3-1004 0-3-1004 +SELECT COUNT(*) AS EXPECT_1000 FROM t1; +EXPECT_1000 +1000 connection node_1; SELECT COUNT(*) > 0 AS EXPECT_1 FROM mysql.gtid_slave_pos; EXPECT_1 1 -SELECT COUNT(*) AS EXPECT_10000 FROM t1; -EXPECT_10000 -10000 -connection node_2; -# Verify that graceful shutdown succeeds. +SELECT COUNT(*) < 1000 AS EXPECT_1 FROM mysql.gtid_slave_pos; +EXPECT_1 +1 +SELECT @@gtid_slave_pos,@@gtid_binlog_pos,@@gtid_current_pos; +@@gtid_slave_pos @@gtid_binlog_pos @@gtid_current_pos +0-3-1004 0-3-1004 0-3-1004 +SELECT COUNT(*) AS EXPECT_1000 FROM t1; +EXPECT_1000 +1000 +connection replica; +# Verify that graceful shutdown succeeds in replica. # Force SST connection node_1; -# Waiting until node_2 is not part of cluster anymore -connection node_2; -# Start node_2 again -¤ Wait until node_2 is back on cluster -connection node_2; +# Waiting until replica is not part of cluster anymore +connection replica; +# Start replica again +# Wait until replica is back on cluster SELECT COUNT(*) > 0 AS EXPECT_1 FROM mysql.gtid_slave_pos; EXPECT_1 1 -SELECT COUNT(*) AS EXPECT_10000 FROM t1; -EXPECT_10000 -10000 +SELECT COUNT(*) < 1000 AS EXPECT_1 FROM mysql.gtid_slave_pos; +EXPECT_1 +1 +SELECT @@gtid_slave_pos,@@gtid_binlog_pos,@@gtid_current_pos; +@@gtid_slave_pos @@gtid_binlog_pos @@gtid_current_pos +0-3-1004 0-3-1004 0-3-1004 +SELECT COUNT(*) AS EXPECT_1000 FROM t1; +EXPECT_1000 +1000 connection node_1; SELECT COUNT(*) > 0 AS EXPECT_1 FROM mysql.gtid_slave_pos; EXPECT_1 1 -SELECT COUNT(*) AS EXPECT_10000 FROM t1; -EXPECT_10000 -10000 -connection node_3; -SELECT COUNT(*) AS EXPECT_10000 FROM t1; -EXPECT_10000 -10000 -connection node_3; +SELECT COUNT(*) < 1000 AS EXPECT_1 FROM mysql.gtid_slave_pos; +EXPECT_1 +1 +SELECT @@gtid_slave_pos,@@gtid_binlog_pos,@@gtid_current_pos; +@@gtid_slave_pos @@gtid_binlog_pos @@gtid_current_pos +0-3-1004 0-3-1004 0-3-1004 +SELECT COUNT(*) AS EXPECT_1000 FROM t1; +EXPECT_1000 +1000 +connection primary; +SELECT COUNT(*) AS EXPECT_1000 FROM t1; +EXPECT_1000 +1000 drop table t1; -connection node_2; +connection replica; connection node_1; -connection node_3; -CREATE TABLE t1 (id bigint primary key, msg varchar(100)) engine=innodb; -SELECT COUNT(*) AS EXPECT_10000 FROM t1; -EXPECT_10000 -10000 -connection node_2; +connection primary; +CREATE TABLE t1 (id bigint auto_increment primary key, msg varchar(100)) engine=innodb; +# Intentionally generate 1k GTID-events +SELECT COUNT(*) AS EXPECT_1000 FROM t1; +EXPECT_1000 +1000 +connection replica; SELECT COUNT(*) > 0 AS EXPECT_1 FROM mysql.gtid_slave_pos; EXPECT_1 1 -SELECT COUNT(*) AS EXPECT_10000 FROM t1; -EXPECT_10000 -10000 +SELECT COUNT(*) < 1000 AS EXPECT_1 FROM mysql.gtid_slave_pos; +EXPECT_1 +1 +SELECT @@gtid_slave_pos,@@gtid_binlog_pos,@@gtid_current_pos; +@@gtid_slave_pos @@gtid_binlog_pos @@gtid_current_pos +0-3-2006 0-3-2006 0-3-2006 +SELECT COUNT(*) AS EXPECT_1000 FROM t1; +EXPECT_1000 +1000 connection node_1; SELECT COUNT(*) > 0 AS EXPECT_1 FROM mysql.gtid_slave_pos; EXPECT_1 1 -SELECT COUNT(*) AS EXPECT_10000 FROM t1; -EXPECT_10000 -10000 -connection node_2; -# Verify that graceful shutdown succeeds. +SELECT COUNT(*) < 1000 AS EXPECT_1 FROM mysql.gtid_slave_pos; +EXPECT_1 +1 +SELECT @@gtid_slave_pos,@@gtid_binlog_pos,@@gtid_current_pos; +@@gtid_slave_pos @@gtid_binlog_pos @@gtid_current_pos +0-3-2006 0-3-2006 0-3-2006 +connection replica; +# Verify that graceful shutdown succeeds in replica. # Force SST connection node_1; -# Waiting until node_2 is not part of cluster anymore -connection node_3; -SELECT COUNT(*) AS EXPECT_20000 FROM t1; -EXPECT_20000 -20000 -connection node_2; -# Start node_2 again -¤ Wait until node_2 is back on cluster -connection node_2; +# Waiting until replica is not part of cluster anymore +# Add writes to primary +connection primary; +# Intentionally generate 1k GTID-events +SELECT COUNT(*) AS EXPECT_2000 FROM t1; +EXPECT_2000 +2000 +connection replica; +# Start replica again +# Wait until replica is back on cluster SELECT COUNT(*) > 0 AS EXPECT_1 FROM mysql.gtid_slave_pos; EXPECT_1 1 -SELECT COUNT(*) AS EXPECT_20000 FROM t1; -EXPECT_20000 -20000 +SELECT COUNT(*) < 1000 AS EXPECT_1 FROM mysql.gtid_slave_pos; +EXPECT_1 +1 +SELECT @@gtid_slave_pos,@@gtid_binlog_pos,@@gtid_current_pos; +@@gtid_slave_pos @@gtid_binlog_pos @@gtid_current_pos +0-3-3006 0-3-3006 0-3-3006 +SELECT COUNT(*) AS EXPECT_2000 FROM t1; +EXPECT_2000 +2000 connection node_1; SELECT COUNT(*) > 0 AS EXPECT_1 FROM mysql.gtid_slave_pos; EXPECT_1 1 -SELECT COUNT(*) AS EXPECT_20000 FROM t1; -EXPECT_20000 -20000 -connection node_3; -SELECT COUNT(*) AS EXPECT_20000 FROM t1; -EXPECT_20000 -20000 -connection node_3; +SELECT COUNT(*) < 1000 AS EXPECT_1 FROM mysql.gtid_slave_pos; +EXPECT_1 +1 +SELECT @@gtid_slave_pos,@@gtid_binlog_pos,@@gtid_current_pos; +@@gtid_slave_pos @@gtid_binlog_pos @@gtid_current_pos +0-3-3006 0-3-3006 0-3-3006 +SELECT COUNT(*) AS EXPECT_2000 FROM t1; +EXPECT_2000 +2000 +connection primary; +SELECT COUNT(*) AS EXPECT_2000 FROM t1; +EXPECT_2000 +2000 drop table t1; -connection node_2; +connection replica; connection node_1; -connection node_2; +connection replica; STOP SLAVE; RESET SLAVE ALL; -connection node_3; +connection primary; RESET MASTER; connection node_1; -disconnect node_3; +disconnect primary; +disconnect replica; disconnect node_2; disconnect node_1; # End of test diff --git a/mysql-test/suite/galera/r/galera_slave_replay.result b/mysql-test/suite/galera/r/galera_slave_replay.result index 8fb7e1ab099..263e1a675d5 100644 --- a/mysql-test/suite/galera/r/galera_slave_replay.result +++ b/mysql-test/suite/galera/r/galera_slave_replay.result @@ -94,3 +94,6 @@ DROP TABLE t1; connection node_3; DROP TABLE t1; RESET MASTER; +connection node_1; +disconnect node_2a; +disconnect node_3; diff --git a/mysql-test/suite/galera/r/galera_threadpool.result b/mysql-test/suite/galera/r/galera_threadpool.result new file mode 100644 index 00000000000..e89e243621a --- /dev/null +++ b/mysql-test/suite/galera/r/galera_threadpool.result @@ -0,0 +1,36 @@ +connection node_2; +connection node_1; +connection node_1; +connection node_2; +connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2; +connect node_2b, 127.0.0.1, root, , test, $NODE_MYPORT_2; +connect node_2c, 127.0.0.1, root, , test, $NODE_MYPORT_2; +connect node_2d, 127.0.0.1, root, , test, $NODE_MYPORT_2; +connect node_2e, 127.0.0.1, root, , test, $NODE_MYPORT_2; +connection node_2a; +CREATE TABLE t1 (f1 INTEGER NOT NULL PRIMARY KEY, f2 char) ENGINE=InnoDB; +INSERT INTO t1 VALUES (0,'a'); +INSERT INTO t1 VALUES (1,'a'); +connection node_2b; +SELECT * FROM t1; +f1 f2 +0 a +1 a +connection node_2c; +INSERT INTO t1 VALUES (2,'c'); +connection node_2d; +BEGIN; +SELECT * FROM t1; +f1 f2 +0 a +1 a +2 c +connection node_2e; +BEGIN; +UPDATE t1 SET f2='e' WHERE f1=0; +connection node_2; +connection node_1; +connection node_2; +connection node_1; +connection node_2; +DROP TABLE t1; diff --git a/mysql-test/suite/galera/t/MDEV-26266.cnf b/mysql-test/suite/galera/t/MDEV-26266.cnf new file mode 100644 index 00000000000..53eeb9c82bc --- /dev/null +++ b/mysql-test/suite/galera/t/MDEV-26266.cnf @@ -0,0 +1,6 @@ +!include ../galera_2nodes.cnf + +[mysqld] +# We want both nodes to restart before this test, +# so let's add a dummy parameter here: +loose-MDEV-26266 diff --git a/mysql-test/suite/galera/t/MDEV-26266.test b/mysql-test/suite/galera/t/MDEV-26266.test index 7167e029cb5..8560cb3c7b6 100644 --- a/mysql-test/suite/galera/t/MDEV-26266.test +++ b/mysql-test/suite/galera/t/MDEV-26266.test @@ -10,6 +10,8 @@ # --source include/galera_cluster.inc +--source include/have_innodb.inc +--source include/force_restart.inc SET SESSION query_prealloc_size=8192; SET max_session_mem_used=50000; diff --git a/mysql-test/suite/galera/t/MDEV-28053.test b/mysql-test/suite/galera/t/MDEV-28053.test index 85cb20c7e10..f3d7a775454 100644 --- a/mysql-test/suite/galera/t/MDEV-28053.test +++ b/mysql-test/suite/galera/t/MDEV-28053.test @@ -37,7 +37,7 @@ while ($counter) { --connection node_2 --disable_query_log --disable_result_log ---eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_USER='root', MASTER_PORT=$NODE_MYPORT_3; +--eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_USER='root', MASTER_PORT=$NODE_MYPORT_3; START SLAVE; --eval SELECT MASTER_GTID_WAIT('$gtid', 600) --enable_result_log diff --git a/mysql-test/suite/galera/t/MDEV-35018.test b/mysql-test/suite/galera/t/MDEV-35018.test new file mode 100644 index 00000000000..490b542bcc0 --- /dev/null +++ b/mysql-test/suite/galera/t/MDEV-35018.test @@ -0,0 +1,83 @@ +# +# BF-BF conflict on MDL locks between: DROP TABLE t2 and UPDATE on t1 +# with t2 referencing t1 +# + +--source include/galera_cluster.inc +--source include/have_debug_sync.inc + +# +# Setup +# +--connection node_2 +SET GLOBAL wsrep_slave_threads=2; + +CREATE TABLE t1 ( + id INTEGER PRIMARY KEY, + f2 INTEGER); + +CREATE TABLE t2 ( + f1 INT PRIMARY KEY, + t1_id INT NOT NULL, + f2 INTEGER NOT NULL, + KEY key_t1_id(t1_id), + CONSTRAINT key_t1_id FOREIGN KEY (t1_id) REFERENCES t1 (id) ON UPDATE CASCADE ON DELETE CASCADE); + +INSERT INTO t1 VALUES (1,0); +INSERT INTO t1 VALUES (2,0); + +INSERT INTO t2 VALUES (1,1,1234); +INSERT INTO t2 VALUES (2,2,1234); + +# +# DROP TABLE t2 and wait for it to reach node_2 +# +--connection node_2 +SET GLOBAL DEBUG_DBUG = "d,sync.wsrep_apply_toi"; + +--connection node_1 +DROP TABLE t2; + +--connection node_2 +SET DEBUG_SYNC = "now WAIT_FOR sync.wsrep_apply_toi_reached"; + +SET SESSION wsrep_sync_wait = 0; +--let $expected_apply_waits = `SELECT VARIABLE_VALUE+1 FROM information_schema.global_status WHERE VARIABLE_NAME = 'wsrep_apply_waits'` +--echo $expected_apply_waits + +# +# Issue a UPDATE to table that references t1 +# Notice that we update field f2, not the primary key, +# and not foreign key. Bug does not manifest if we update +# one of those fields (because FK keys appended in those cases). +# +--connection node_1 +UPDATE t1 SET f2 = 1 WHERE id=2; + + +# +# Expect the UPDATE to depend on the DROP, +# therefore it should wait for the DROP to +# finish before it can be applied. +# If bug is present, expect the wait condition +# to timeout and when the UPDATE applies, it +# will be granted a MDL lock of type SHARED_READ +# for table t1. When resumed, the DROP TABLE will +# also try to MDL lock t1, causing a BF-BF conflict +# on that MDL lock. +# +--connection node_2 +--let $wait_condition = SELECT VARIABLE_VALUE = $expected_apply_waits FROM information_schema.global_status WHERE VARIABLE_NAME = 'wsrep_apply_waits' +--source include/wait_condition.inc +SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_toi"; + +SET SESSION wsrep_sync_wait = DEFAULT; +SELECT * FROM t1; + +# +# Cleanup +# +SET DEBUG_SYNC = 'RESET'; +SET GLOBAL DEBUG_DBUG = ''; +SET GLOBAL wsrep_slave_threads = DEFAULT; +DROP TABLE t1; diff --git a/mysql-test/suite/galera/t/MDEV-35852.cnf b/mysql-test/suite/galera/t/MDEV-35852.cnf new file mode 100644 index 00000000000..ebd79612b81 --- /dev/null +++ b/mysql-test/suite/galera/t/MDEV-35852.cnf @@ -0,0 +1,4 @@ +!include ../galera_2nodes.cnf + +[mysqld] +wsrep-debug=1 diff --git a/mysql-test/suite/galera/t/MDEV-35852.test b/mysql-test/suite/galera/t/MDEV-35852.test new file mode 100644 index 00000000000..6dce2974dd4 --- /dev/null +++ b/mysql-test/suite/galera/t/MDEV-35852.test @@ -0,0 +1,9 @@ +--source include/galera_cluster.inc + +CREATE TABLE t (a INT) ENGINE=InnoDB; +--error ER_DELAYED_NOT_SUPPORTED +INSERT DELAYED INTO t VALUES (); +DROP TABLE t; + +--error ER_NO_SUCH_TABLE +INSERT DELAYED t1 () VALUES (); diff --git a/mysql-test/suite/galera/t/MDEV-6860.test b/mysql-test/suite/galera/t/MDEV-6860.test index 3a8c98f317f..e254dbceeeb 100644 --- a/mysql-test/suite/galera/t/MDEV-6860.test +++ b/mysql-test/suite/galera/t/MDEV-6860.test @@ -4,7 +4,7 @@ --connection node_2 --disable_query_log ---eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_USER='root', MASTER_PORT=$NODE_MYPORT_3, MASTER_USE_GTID=slave_pos; +--eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_USER='root', MASTER_PORT=$NODE_MYPORT_3, MASTER_USE_GTID=slave_pos; --enable_query_log START SLAVE; diff --git a/mysql-test/suite/galera/t/MW-369.inc b/mysql-test/suite/galera/t/MW-369.inc index f080d99fe7e..3b0a32bdd9d 100644 --- a/mysql-test/suite/galera/t/MW-369.inc +++ b/mysql-test/suite/galera/t/MW-369.inc @@ -14,7 +14,7 @@ # node_2 # $mw_369_child_query - will be blocked on node_1 in wsrep_apply_cb # node_1: -# COMMIT; - will be blocked on node_1 in wsrep_after_certification +# COMMIT; - will be blocked on node_1 in after_wsrep_before_prepare # # The $mw_369_child_query is always expected to succeed. The caller is # responsible for checking if the final COMMIT on connection node_1 @@ -49,14 +49,14 @@ SET GLOBAL DEBUG_DBUG = "d,sync.wsrep_apply_cb"; SET SESSION DEBUG_SYNC = "now WAIT_FOR sync.wsrep_apply_cb_reached"; --connection node_1 -SET DEBUG_SYNC = "wsrep_after_certification SIGNAL after_certification_reached WAIT_FOR continue_after_certification"; +SET SESSION DEBUG_SYNC = "wsrep_before_certification SIGNAL before_certification_reached WAIT_FOR continue_before_certification"; --send COMMIT # # Wait until both sync points have been reached # --connection node_1a -SET SESSION DEBUG_SYNC = "now WAIT_FOR after_certification_reached"; +SET SESSION DEBUG_SYNC = "now WAIT_FOR before_certification_reached"; # # both threads are now parked in sync points, signal them to continue @@ -66,13 +66,13 @@ SET SESSION DEBUG_SYNC = "now WAIT_FOR after_certification_reached"; --let $wait_condition_on_error_output = SELECT STATE FROM INFORMATION_SCHEMA.PROCESSLIST --source include/wait_condition_with_debug.inc -SET DEBUG_SYNC = 'now SIGNAL continue_after_certification'; +SET SESSION DEBUG_SYNC = 'now SIGNAL continue_before_certification'; --let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE LIKE 'debug sync point:%' --let $wait_condition_on_error_output = SELECT STATE FROM INFORMATION_SCHEMA.PROCESSLIST --source include/wait_condition_with_debug.inc -SET DEBUG_SYNC = 'now SIGNAL signal.wsrep_apply_cb'; +SET SESSION DEBUG_SYNC = 'now SIGNAL signal.wsrep_apply_cb'; --let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE LIKE 'debug sync point:%' --let $wait_condition_on_error_output = SELECT STATE FROM INFORMATION_SCHEMA.PROCESSLIST @@ -80,3 +80,5 @@ SET DEBUG_SYNC = 'now SIGNAL signal.wsrep_apply_cb'; SET GLOBAL DEBUG_DBUG = ""; SET DEBUG_SYNC = 'RESET'; + + diff --git a/mysql-test/suite/galera/t/MW-402.combinations b/mysql-test/suite/galera/t/MW-402.combinations new file mode 100644 index 00000000000..def4dda7def --- /dev/null +++ b/mysql-test/suite/galera/t/MW-402.combinations @@ -0,0 +1,5 @@ +[binlogon] +log-bin +log-slave-updates=ON + +[binlogoff] diff --git a/mysql-test/suite/galera/t/MW-402.test b/mysql-test/suite/galera/t/MW-402.test index f84752e1b25..8b954a19405 100644 --- a/mysql-test/suite/galera/t/MW-402.test +++ b/mysql-test/suite/galera/t/MW-402.test @@ -2,7 +2,6 @@ --source include/have_innodb.inc --source include/have_debug.inc --source include/have_debug_sync.inc ---source include/galera_have_debug_sync.inc # # we must open connection node_1a here, MW-369.inc will use it later @@ -36,6 +35,7 @@ INSERT INTO c VALUES (1, 1, 0); --connection node_1 --error ER_LOCK_DEADLOCK --reap +SET DEBUG_SYNC = 'RESET'; --connection node_2 SELECT * FROM p; @@ -72,6 +72,7 @@ INSERT INTO c VALUES (1, 1, 0); --connection node_1 --error ER_LOCK_DEADLOCK --reap +SET DEBUG_SYNC = 'RESET'; --connection node_2 SELECT * FROM p; @@ -112,6 +113,7 @@ INSERT INTO c VALUES (1, 1, 0); --connection node_1 --error ER_LOCK_DEADLOCK --reap +SET DEBUG_SYNC = 'RESET'; # same as previous, but statements in different order --connection node_2 @@ -128,7 +130,7 @@ SELECT * FROM c; --connection node_1 --error ER_LOCK_DEADLOCK --reap - +SET DEBUG_SYNC = 'RESET'; --connection node_2 SELECT * FROM p; @@ -172,6 +174,7 @@ INSERT INTO c VALUES (1, 1, 1, 0); # Commit succeeds --connection node_1 --reap +SET DEBUG_SYNC = 'RESET'; --connection node_2 SELECT * FROM p1; @@ -217,6 +220,7 @@ INSERT INTO c VALUES (1, 1, 1, 0); --connection node_1 --error ER_LOCK_DEADLOCK --reap +SET DEBUG_SYNC = 'RESET'; --connection node_2 SELECT * FROM p1; diff --git a/mysql-test/suite/galera/t/galera_2primary_replica.cnf b/mysql-test/suite/galera/t/galera_2primary_replica.cnf new file mode 100644 index 00000000000..e066866de87 --- /dev/null +++ b/mysql-test/suite/galera/t/galera_2primary_replica.cnf @@ -0,0 +1,22 @@ +!include ../galera_2nodes_as_replica_2primary.cnf + +[mysqld] +wsrep-debug=1 + +[mysqld.1] +server_id=15 +wsrep_gtid_mode=1 +wsrep_gtid_domain_id=16 +gtid_domain_id=11 +gtid_strict_mode=1 +wsrep-slave-threads=4 +slave-parallel-threads=2 + +[mysqld.2] +skip-slave-start=OFF +server_id=15 +wsrep_gtid_mode=1 +wsrep_gtid_domain_id=16 +gtid_domain_id=11 +gtid_strict_mode=1 +wsrep-slave-threads=4 diff --git a/mysql-test/suite/galera/t/galera_2primary_replica.test b/mysql-test/suite/galera/t/galera_2primary_replica.test new file mode 100644 index 00000000000..fb57c6637d0 --- /dev/null +++ b/mysql-test/suite/galera/t/galera_2primary_replica.test @@ -0,0 +1,170 @@ +# +# Test two primary nodes async replication to Galera cluster +# +# primary1 primary2 +# #3 #4 +# | | +# | async replication v +# +-------------------+ +----------------+ +# | | +# v v +# galera replica <------galera replication-------->galera node_2 +# #1 #2 +# +# Test outline +# +# - Create user for async replication and table with rows in both primaries +# - Verify that tables and rows are replicated to all Galera nodes +# - Verify that gtid position is same in all Galera nodes +# +# The galera/galera_2nodes_as_replica_2primary.cnf describes the setup of the nodes +# +--source include/force_restart.inc +--source include/galera_cluster.inc +--source include/have_innodb.inc + +# As node #3 and #4 are not a Galera node, and galera_cluster.inc does not open connetion to it +# we open the connections here +--connect primary1, 127.0.0.1, root, , test, $NODE_MYPORT_3 +--connect primary2, 127.0.0.1, root, , test, $NODE_MYPORT_4 +--connection primary1 +--echo # Primary1 creating user for replication +create user repl@'%' identified by 'repl'; +grant all on *.* to repl@'%'; + +--connection primary2 +--echo # Primary2 creating user for replication +create user repl2@'%' identified by 'repl2'; +grant all on *.* to repl2@'%'; + +--connect replica, 127.0.0.1, root, , test, $NODE_MYPORT_1 + +--let $node_1 = replica +--let $node_2 = node_2 +--source include/auto_increment_offset_save.inc + +--connection replica +--echo # Galera replica changing master to primary1 +--disable_query_log +SET @@default_master_connection='stream1'; +--eval CHANGE MASTER 'stream1' TO master_host='127.0.0.1', master_user='repl', master_password='repl', master_port=$NODE_MYPORT_3, master_use_gtid=slave_pos; +--enable_query_log + +SET @@default_master_connection='stream2'; +--echo # Primary node changing master to primary2 +--disable_query_log +--eval CHANGE MASTER 'stream2' TO master_host='127.0.0.1', master_user='repl2', master_password='repl2', master_port=$NODE_MYPORT_4, master_use_gtid=slave_pos; +--enable_query_log + +START ALL SLAVES; + +--connection primary1 +--echo # Primary 1: Creating table and populating it with data +CREATE TABLE t1 (id bigint auto_increment primary key, msg varchar(100)) engine=innodb; +--disable_query_log +--echo # Intentionally generate 1k GTID-events +--let $inserts=1000 +--let $count=0 +--disable_query_log +while($count < $inserts) +{ + --eval insert into t1 values (NULL,'test1') + --inc $count +} +--enable_query_log + +SELECT COUNT(*) AS EXPECT_1000 FROM t1; + +--connection primary2 +--echo # Primary 2: Creating table and populating it with data +CREATE TABLE t2 (id bigint auto_increment primary key, msg varchar(100)) engine=innodb; +--echo # Intentionally generate 1k GTID-events +--let $inserts=1000 +--let $count=0 +--disable_query_log +while($count < $inserts) +{ + --eval insert into t2 values (NULL,'test1') + --inc $count +} +--enable_query_log + +SELECT COUNT(*) AS EXPECT_1000 FROM t2; + +--connection replica +--echo # Waiting for data to replicate to node_1 +--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1'; +--let $wait_condition_on_error_output = SHOW ALL SLAVES STATUS; +--source include/wait_condition_with_debug.inc +--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't2'; +--let $wait_condition_on_error_output = SHOW ALL SLAVES STATUS; +--source include/wait_condition_with_debug.inc + +--let $wait_condition = SELECT COUNT(*) = 1000 FROM t1; +--source include/wait_condition.inc +--let $wait_condition = SELECT COUNT(*) = 1000 FROM t2; +--source include/wait_condition.inc + +SELECT COUNT(*) AS EXPECT_1000 FROM t1; +SELECT COUNT(*) AS EXPECT_1000 FROM t2; + +SELECT COUNT(*) > 0 AS EXPECT_1 FROM mysql.gtid_slave_pos; +SELECT COUNT(*) < 1000 AS EXPECT_1 FROM mysql.gtid_slave_pos; +SELECT @@gtid_slave_pos,@@gtid_binlog_pos,@@gtid_current_pos; + +--connection node_2 +--echo # Waiting for data to replicate to node_2 +--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1'; +--source include/wait_condition.inc +--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't2'; +--source include/wait_condition.inc + +--let $wait_condition = SELECT COUNT(*) = 1000 FROM t1; +--source include/wait_condition.inc +--let $wait_condition = SELECT COUNT(*) = 1000 FROM t2; +--source include/wait_condition.inc + +SELECT COUNT(*) AS EXPECT_1000 FROM t1; +SELECT COUNT(*) AS EXPECT_1000 FROM t2; +SELECT COUNT(*) > 0 AS EXPECT_1 FROM mysql.gtid_slave_pos; +SELECT COUNT(*) < 1000 AS EXPECT_1 FROM mysql.gtid_slave_pos; +SELECT @@gtid_slave_pos,@@gtid_binlog_pos,@@gtid_current_pos; +# +# Cleanup +# +--connection primary1 +drop table t1; +--connection primary2 +drop table t2; + +--echo # Wait until drop table is replicated on Galera +--connection replica +--let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1'; +--source include/wait_condition.inc +--let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't2'; +--source include/wait_condition.inc + +--connection node_2 +--let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1'; +--source include/wait_condition.inc +--let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't2'; +--source include/wait_condition.inc + +--connection replica +STOP ALL SLAVES; +RESET SLAVE ALL; + +--connection primary1 +RESET MASTER; +--connection primary2 +RESET MASTER; + +--source include/auto_increment_offset_restore.inc + +--connection node_1 +--disconnect primary1 +--disconnect primary2 +--disconnect replica + +--source include/galera_end.inc +--echo # End of test diff --git a/mysql-test/suite/galera/t/galera_as_master.test b/mysql-test/suite/galera/t/galera_as_master.test index a5554a735fe..4bdbc24635a 100644 --- a/mysql-test/suite/galera/t/galera_as_master.test +++ b/mysql-test/suite/galera/t/galera_as_master.test @@ -9,7 +9,7 @@ --connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3 --disable_query_log ---eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_USER='root', MASTER_PORT=$NODE_MYPORT_1; +--eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_USER='root', MASTER_PORT=$NODE_MYPORT_1; --enable_query_log START SLAVE; diff --git a/mysql-test/suite/galera/t/galera_as_slave.test b/mysql-test/suite/galera/t/galera_as_slave.test index 7a5bc1e204c..fa6ec006600 100644 --- a/mysql-test/suite/galera/t/galera_as_slave.test +++ b/mysql-test/suite/galera/t/galera_as_slave.test @@ -13,7 +13,7 @@ --connection node_2 --disable_query_log ---eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_USER='root', MASTER_PORT=$NODE_MYPORT_3; +--eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_USER='root', MASTER_PORT=$NODE_MYPORT_3; --enable_query_log START SLAVE; diff --git a/mysql-test/suite/galera/t/galera_as_slave_autoinc.test b/mysql-test/suite/galera/t/galera_as_slave_autoinc.test index ce4c87e2bee..69c16baeb08 100644 --- a/mysql-test/suite/galera/t/galera_as_slave_autoinc.test +++ b/mysql-test/suite/galera/t/galera_as_slave_autoinc.test @@ -13,7 +13,7 @@ --connection node_2 --disable_query_log ---eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_USER='root', MASTER_PORT=$NODE_MYPORT_3; +--eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_USER='root', MASTER_PORT=$NODE_MYPORT_3; --enable_query_log START SLAVE; diff --git a/mysql-test/suite/galera/t/galera_as_slave_ctas.test b/mysql-test/suite/galera/t/galera_as_slave_ctas.test index eced636c600..32301a3d0d3 100644 --- a/mysql-test/suite/galera/t/galera_as_slave_ctas.test +++ b/mysql-test/suite/galera/t/galera_as_slave_ctas.test @@ -16,7 +16,7 @@ SELECT @@wsrep_on; --connection node_1 --disable_query_log ---eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_USER='root', MASTER_PORT=$NODE_MYPORT_3; +--eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_USER='root', MASTER_PORT=$NODE_MYPORT_3; --enable_query_log START SLAVE; @@ -34,11 +34,13 @@ CREATE TABLE target AS SELECT * FROM source; --connection node_1 --let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'target'; ---source include/wait_condition.inc +--let $wait_condition_on_error_output = SELECT * FROM INFORMATION_SCHEMA.TABLES +--source include/wait_condition_with_debug.inc --connection node_2 --let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'target'; ---source include/wait_condition.inc +--let $wait_condition_on_error_output = SELECT * FROM INFORMATION_SCHEMA.TABLES +--source include/wait_condition_with_debug.inc # # test phase two, issue CTAS with populated source table diff --git a/mysql-test/suite/galera/t/galera_as_slave_nonprim.test b/mysql-test/suite/galera/t/galera_as_slave_nonprim.test index e22f0240a59..600d64e5a81 100644 --- a/mysql-test/suite/galera/t/galera_as_slave_nonprim.test +++ b/mysql-test/suite/galera/t/galera_as_slave_nonprim.test @@ -15,7 +15,6 @@ # we open the node_4 connection here --connect node_4, 127.0.0.1, root, , test, $NODE_MYPORT_4 - --connection node_2 --disable_query_log --eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=$NODE_MYPORT_4, MASTER_USER='root'; diff --git a/mysql-test/suite/galera/t/galera_as_slave_parallel_retry.test b/mysql-test/suite/galera/t/galera_as_slave_parallel_retry.test index 0d499f22fcd..e106c5f08c3 100644 --- a/mysql-test/suite/galera/t/galera_as_slave_parallel_retry.test +++ b/mysql-test/suite/galera/t/galera_as_slave_parallel_retry.test @@ -38,7 +38,6 @@ SET debug_sync = 'now SIGNAL signal.wsrep_retry_event_group'; --let $wait_condition = SELECT COUNT(*) = 1 FROM t1; --source include/wait_condition.inc - --connection node_1 SET debug_sync = 'RESET'; diff --git a/mysql-test/suite/galera/t/galera_as_slave_replay.cnf b/mysql-test/suite/galera/t/galera_as_slave_replay.cnf index c20c65f86d9..5ae8b0b1ba7 100644 --- a/mysql-test/suite/galera/t/galera_as_slave_replay.cnf +++ b/mysql-test/suite/galera/t/galera_as_slave_replay.cnf @@ -10,4 +10,3 @@ wsrep-debug=1 [mysqld.2] wsrep_restart_slave=1 wsrep-debug=1 - diff --git a/mysql-test/suite/galera/t/galera_as_slave_replay.test b/mysql-test/suite/galera/t/galera_as_slave_replay.test index 73fd7b3ff29..20455f2843c 100644 --- a/mysql-test/suite/galera/t/galera_as_slave_replay.test +++ b/mysql-test/suite/galera/t/galera_as_slave_replay.test @@ -10,12 +10,12 @@ --source include/have_debug.inc --source include/have_debug_sync.inc --source include/galera_have_debug_sync.inc +--source include/log_bin.inc --connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2 --connection node_2a --source include/galera_cluster.inc -#--source suite/galera/include/galera_have_debug_sync.inc ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB; @@ -32,12 +32,11 @@ RESET MASTER; # --let $wsrep_local_replays_old = `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_replays'` - # -# nodes 1 and 2 form a galera cluster, node 2 operates as slave for native MariaDB naster in node 3 +# nodes 1 and 2 form a galera cluster, node 2 operates as slave for native MariaDB master in node 3 # --disable_query_log ---eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_USER='root', MASTER_PORT=$NODE_MYPORT_3; +--eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_USER='root', MASTER_PORT=$NODE_MYPORT_3; --enable_query_log START SLAVE; @@ -80,14 +79,14 @@ SET SESSION wsrep_sync_wait = 0; SET GLOBAL debug_dbug = "d,sync.wsrep_apply_cb"; # -# now inject a conflicting insert from node 3, it will replicate with +# now inject a conflicting insert from node 1, it will replicate with # earlier seqno (than async transaction) and pause before applying in node 2 # --connection node_1 INSERT INTO test.t1 VALUES (2, 'b'); # -# send the update from master, this will succeed here, beceuase of async replication. +# send the update from master, this will succeed here, because of async replication. # async replication will apply this in node 2 and pause before commit phase, --connection node_3 --error 0 diff --git a/mysql-test/suite/galera/t/galera_circular_replication.cnf b/mysql-test/suite/galera/t/galera_circular_replication.cnf new file mode 100644 index 00000000000..b1c6320d4df --- /dev/null +++ b/mysql-test/suite/galera/t/galera_circular_replication.cnf @@ -0,0 +1,25 @@ +!include ../galera_3nodes_as_slave.cnf + +[mysqld] +wsrep-debug=1 + +[mysqld.1] +server_id=15 +wsrep_gtid_mode=1 +wsrep_gtid_domain_id=16 +gtid_domain_id=11 +gtid_strict_mode=1 + +[mysqld.2] +server_id=15 +wsrep_gtid_mode=1 +wsrep_gtid_domain_id=16 +gtid_domain_id=11 +gtid_strict_mode=1 + +[mysqld.3] +server_id=15 +wsrep_gtid_mode=1 +wsrep_gtid_domain_id=16 +gtid_domain_id=11 +gtid_strict_mode=1 diff --git a/mysql-test/suite/galera/t/galera_circular_replication.test b/mysql-test/suite/galera/t/galera_circular_replication.test new file mode 100644 index 00000000000..dbe85da4b23 --- /dev/null +++ b/mysql-test/suite/galera/t/galera_circular_replication.test @@ -0,0 +1,234 @@ +# +# Test circular replication where galera cluster is async replica and master +# +# mariadb #4 galera galera +# primary1 +# replica2 +# ---async replication-->replica1 #1 <--galera replication--> node_2 #2 +# ^ ^ +# | | galera replication +# | v +# +<------------------async replication----------------------primary2 (galera) #3 +# +# Test outline: +# +# - Create user for async replication in primary1 +# - Create user for async replication in primary2 +# - Create table and some data in primary1 +# - Verify that table and data is replicated to galera nodes +# - Verify that mysql.gtid_slave_pos has some rows in all Galera nodes +# - Verify that gtid_slave_pos, gtid_binlog_pos and gtid_current_pos are +# same in all Galera nodes and primary1 +# - Verify that writes on Galera nodes are replicated to all nodes +# and to primary1 +# +# The galera/galera_3nodes_as_slave.cnf describes the setup of the nodes +# +--source include/force_restart.inc +--source include/galera_cluster.inc +--source include/have_innodb.inc + +--connect replica1, 127.0.0.1, root, , test, $NODE_MYPORT_1 +--connect primary2, 127.0.0.1, root, , test, $NODE_MYPORT_3 + +# As node #4 is not a Galera node, and galera_cluster.inc does not open connetion to it +# because it is both primary and replica we open both connections here +--connect primary1, 127.0.0.1, root, , test, $NODE_MYPORT_4 +--connect replica2, 127.0.0.1, root, , test, $NODE_MYPORT_4 + +--connection primary1 +--echo # Primary1 node creating user for replication +create user repl@'%' identified by 'repl'; +grant all on *.* to repl@'%'; +ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB; + +--let $node_1 = replica1 +--let $node_2 = node_2 +--let $node_3 = primary2 +--source include/auto_increment_offset_save.inc + +--connection replica1 +--echo # Galera replica changing master to primary1 +--disable_query_log +--eval CHANGE MASTER TO master_host='127.0.0.1', master_user='repl', master_password='repl', master_port=$NODE_MYPORT_4, master_use_gtid=slave_pos; +--enable_query_log +START SLAVE; + +--connection primary2 +--echo # Primary2 creating user for replication +create user repl2@'%' identified by 'repl2'; +grant all on *.* to repl2@'%'; + +--connection replica2 +--echo # replica2 changing master to primary2 +--disable_query_log +--eval CHANGE MASTER TO master_host='127.0.0.1', master_user='repl2', master_password='repl2', master_port=$NODE_MYPORT_3, master_use_gtid=slave_pos; +--enable_query_log +START SLAVE; + +--connection primary1 +--echo # Primary1: Creating table and populating it with data +CREATE TABLE t1 (id bigint auto_increment primary key, msg varchar(100)) engine=innodb; +--echo # Intentionally generate 1k GTID-events +--let $inserts=1000 +--let $count=0 +--disable_query_log +while($count < $inserts) +{ + --eval insert into t1 values (NULL,'test1') + --inc $count +} +--enable_query_log + +SELECT COUNT(*) AS EXPECT_1000 FROM t1; + +--connection replica1 +--echo # Waiting for data to replicate to replica +--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1'; +--source include/wait_condition.inc + +--let $wait_condition = SELECT COUNT(*) = 1000 FROM t1; +--source include/wait_condition.inc + +SELECT COUNT(*) AS EXPECT_1000 FROM t1; + +--echo # Writing more data to table +--echo # Intentionally generate 1k GTID-events +--let $inserts=1000 +--let $count=0 +--disable_query_log +while($count < $inserts) +{ + --eval insert into t1 values (NULL,'test1') + --inc $count +} +--enable_query_log + +SELECT COUNT(*) AS EXPECT_2000 FROM t1; + +--connection node_2 +--echo # Waiting for data to replicate to Galera node_2 +--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1'; +--source include/wait_condition.inc + +--let $wait_condition = SELECT COUNT(*) = 2000 FROM t1; +--source include/wait_condition.inc + +SELECT COUNT(*) AS EXPECT_2000 FROM t1; + +--echo # Writing more data to table +--echo # Intentionally generate 1k GTID-events +--let $inserts=1000 +--let $count=0 +--disable_query_log +while($count < $inserts) +{ + --eval insert into t1 values (NULL,'test1') + --inc $count +} +--enable_query_log + +SELECT COUNT(*) AS EXPECT_3000 FROM t1; + +--connection primary2 +--echo # Waiting for data to replicate to primary2 +--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1'; +--source include/wait_condition.inc + +--let $wait_condition = SELECT COUNT(*) = 3000 FROM t1; +--source include/wait_condition.inc + +SELECT COUNT(*) AS EXPECT_3000 FROM t1; + +--echo # Writing more data to table +--echo # Intentionally generate 1k GTID-events +--let $inserts=1000 +--let $count=0 +--disable_query_log +while($count < $inserts) +{ + --eval insert into t1 values (NULL,'test1') + --inc $count +} +--enable_query_log + +SELECT COUNT(*) AS EXPECT_4000 FROM t1; + +--connection primary1 +--echo # Waiting for data to replicate to primary1 +--let $wait_condition = SELECT COUNT(*) = 4000 FROM t1; +--let $wait_condition_on_error_output = SHOW SLAVE STATUS; +--source include/wait_condition_with_debug.inc + +SELECT COUNT(*) AS EXPECT_4000 FROM t1; +SELECT COUNT(*) > 0 AS EXPECT_1 FROM mysql.gtid_slave_pos; +SELECT COUNT(*) < 1000 AS EXPECT_1 FROM mysql.gtid_slave_pos; +SELECT @@gtid_slave_pos,@@gtid_binlog_pos,@@gtid_current_pos; + +--connection replica1 +--echo # Waiting for data to replicate to replica +--let $wait_condition = SELECT COUNT(*) = 4000 FROM t1; +--source include/wait_condition.inc + +SELECT COUNT(*) AS EXPECT_4000 FROM t1; +SELECT COUNT(*) > 0 AS EXPECT_1 FROM mysql.gtid_slave_pos; +SELECT COUNT(*) < 1000 AS EXPECT_1 FROM mysql.gtid_slave_pos; +SELECT @@gtid_slave_pos,@@gtid_binlog_pos,@@gtid_current_pos; + +--connection node_2 +--echo # Waiting for data to replicate to node_2 +--let $wait_condition = SELECT COUNT(*) = 4000 FROM t1; +--source include/wait_condition.inc + +SELECT COUNT(*) AS EXPECT_4000 FROM t1; +SELECT COUNT(*) > 0 AS EXPECT_1 FROM mysql.gtid_slave_pos; +SELECT COUNT(*) < 1000 AS EXPECT_1 FROM mysql.gtid_slave_pos; +SELECT @@gtid_slave_pos,@@gtid_binlog_pos,@@gtid_current_pos; + +--connection primary2 +--echo # Waiting for data to replicate to node_3 +--let $wait_condition = SELECT COUNT(*) = 4000 FROM t1; +--source include/wait_condition.inc + +SELECT COUNT(*) AS EXPECT_4000 FROM t1; +SELECT COUNT(*) > 0 AS EXPECT_1 FROM mysql.gtid_slave_pos; +SELECT COUNT(*) < 1000 AS EXPECT_1 FROM mysql.gtid_slave_pos; +SELECT @@gtid_slave_pos,@@gtid_binlog_pos,@@gtid_current_pos; +# +# Cleanup +# +--connection primary1 +drop table t1; + +--echo # Wait until drop table is replicated on Galera +--connection replica1 +--let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1'; +--source include/wait_condition.inc + +--connection node_2 +--let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1'; +--source include/wait_condition.inc + +--connection primary2 +--let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1'; +--source include/wait_condition.inc + +--connection replica1 +STOP SLAVE; +RESET SLAVE ALL; + +--connection replica2 +STOP SLAVE; +RESET SLAVE ALL; +RESET MASTER; + +--source include/auto_increment_offset_restore.inc + +--connection node_1 +--disconnect primary1 +--disconnect replica1 +--disconnect primary2 +--disconnect replica2 + +--source include/galera_end.inc +--echo # End of test diff --git a/mysql-test/suite/galera/t/galera_ddl_fk_conflict.cnf b/mysql-test/suite/galera/t/galera_ddl_fk_conflict.cnf new file mode 100644 index 00000000000..2975070498e --- /dev/null +++ b/mysql-test/suite/galera/t/galera_ddl_fk_conflict.cnf @@ -0,0 +1,11 @@ +!include ../galera_2nodes.cnf + +[mysqld.1] +wsrep-debug=1 +loose-galera-ddl-fk-conflict=1 + +[mysqld.2] +wsrep-debug=1 +loose-galera-ddl-fk-conflict=1 + + diff --git a/mysql-test/suite/galera/t/galera_ddl_fk_conflict.inc b/mysql-test/suite/galera/t/galera_ddl_fk_conflict.inc index 06b7bbe41c4..f9fad92ac62 100644 --- a/mysql-test/suite/galera/t/galera_ddl_fk_conflict.inc +++ b/mysql-test/suite/galera/t/galera_ddl_fk_conflict.inc @@ -39,6 +39,7 @@ --connection node_1 SET SESSION wsrep_sync_wait=0; +FLUSH STATUS; CREATE TABLE p1 (pk INTEGER PRIMARY KEY, f2 CHAR(30)); INSERT INTO p1 VALUES (1, 'INITIAL VALUE'); @@ -69,7 +70,7 @@ SET SESSION wsrep_sync_wait=0; --source include/wait_condition.inc # replicate the DDL to be tested ---eval $table_admin_command TABLE c1 $table_admin_command_end +--eval $table_admin_command c1 $table_admin_command_end --connection node_1 --error ER_LOCK_DEADLOCK @@ -82,6 +83,12 @@ SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE'; SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE'; SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE'; +--connection node_1 +--disable_warnings +CREATE TABLE IF NOT EXISTS c1 (pk INTEGER PRIMARY KEY, fk INTEGER, FOREIGN KEY (fk) REFERENCES p1(pk)); +INSERT IGNORE INTO c1 VALUES (1,1); +--enable_warnings + --echo ###################################################################### --echo # --echo # Scenario #2: DML working on FK parent table tries to replicate, but @@ -97,11 +104,12 @@ BEGIN; --source include/galera_set_sync_point.inc --connection node_2 ---eval $table_admin_command TABLE c1 $table_admin_command_end +--eval $table_admin_command c1 $table_admin_command_end --connection node_1a --source include/galera_wait_sync_point.inc --source include/galera_clear_sync_point.inc + --let $expected_cert_failures = `SELECT VARIABLE_VALUE+1 FROM information_schema.global_status WHERE VARIABLE_NAME = 'wsrep_local_cert_failures'` --connection node_1 @@ -110,7 +118,8 @@ UPDATE p1 SET f2 = 'TO DEADLOCK' WHERE pk = 1; --connection node_1a --let $wait_condition = SELECT VARIABLE_VALUE = $expected_cert_failures FROM information_schema.global_status WHERE VARIABLE_NAME = 'wsrep_local_cert_failures' ---source include/wait_condition.inc +--let $wait_condition_on_error_output = SELECT VARIABLE_VALUE FROM information_schema.global_status WHERE VARIABLE_NAME = 'wsrep_local_cert_failures' +--source include/wait_condition_with_debug.inc --let $galera_sync_point = apply_monitor_slave_enter_sync --source include/galera_signal_sync_point.inc @@ -128,6 +137,11 @@ SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE'; SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE'; SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE'; +--connection node_1 +--disable_warnings +CREATE TABLE IF NOT EXISTS c1 (pk INTEGER PRIMARY KEY, fk INTEGER, FOREIGN KEY (fk) REFERENCES p1(pk)); +INSERT IGNORE INTO c1 VALUES (1,1); +--enable_warnings --echo ###################################################################### --echo # @@ -149,12 +163,14 @@ BEGIN; --source include/galera_set_sync_point.inc --connection node_2 ---eval $table_admin_command TABLE c2 $table_admin_command_end +--eval $table_admin_command c2 $table_admin_command_end --connection node_1a --source include/galera_wait_sync_point.inc --source include/galera_clear_sync_point.inc --let $expected_cert_failures = `SELECT VARIABLE_VALUE+2 FROM information_schema.global_status WHERE VARIABLE_NAME = 'wsrep_local_cert_failures'` +--let $wait_condition_on_error_output = SELECT VARIABLE_VALUE FROM information_schema.global_status WHERE VARIABLE_NAME = 'wsrep_local_cert_failures' +--source include/wait_condition_with_debug.inc --connection node_1 UPDATE p1 SET f2 = 'TO DEADLOCK' WHERE pk = 1; @@ -166,7 +182,8 @@ UPDATE p2 SET f2 = 'TO DEADLOCK' WHERE pk = 2; --connection node_1a --let $wait_condition = SELECT VARIABLE_VALUE = $expected_cert_failures FROM information_schema.global_status WHERE VARIABLE_NAME = 'wsrep_local_cert_failures' ---source include/wait_condition.inc +--let $wait_condition_on_error_output = SELECT VARIABLE_VALUE FROM information_schema.global_status WHERE VARIABLE_NAME = 'wsrep_local_cert_failures' +--source include/wait_condition_with_debug.inc --let $galera_sync_point = apply_monitor_slave_enter_sync --source include/galera_signal_sync_point.inc @@ -188,5 +205,5 @@ SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE'; SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE'; SELECT COUNT(*) AS EXPECT_2 FROM p2 WHERE f2 = 'INITIAL VALUE'; -DROP TABLE c1, c2; +DROP TABLE IF EXISTS c1, c2; DROP TABLE p1, p2; diff --git a/mysql-test/suite/galera/t/galera_ddl_fk_conflict.test b/mysql-test/suite/galera/t/galera_ddl_fk_conflict.test index 4ec866a9f74..a8fb6614e41 100644 --- a/mysql-test/suite/galera/t/galera_ddl_fk_conflict.test +++ b/mysql-test/suite/galera/t/galera_ddl_fk_conflict.test @@ -6,24 +6,41 @@ --source include/have_innodb.inc --source include/have_debug_sync.inc --source include/galera_have_debug_sync.inc +--source include/force_restart.inc # sync point controlling session --connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1 --connection node_1a SET SESSION wsrep_sync_wait=0; +FLUSH STATUS; # secondary conflicting DML victim session --connect node_1b, 127.0.0.1, root, , test, $NODE_MYPORT_1 --connection node_1b SET SESSION wsrep_sync_wait=0; ---let $table_admin_command = ALTER +--let $table_admin_command = ALTER TABLE --let $table_admin_command_end = ENGINE=INNODB --source galera_ddl_fk_conflict.inc ---let $table_admin_command = TRUNCATE ---let $table_admin_command_end = +--let $table_admin_command = TRUNCATE TABLE +--let $table_admin_command_end = --source galera_ddl_fk_conflict.inc +--let $table_admin_command = DROP TABLE +--let $table_admin_command_end = +--source galera_ddl_fk_conflict.inc +--source galera_ddl_fk_conflict_with_tmp.inc + +--let $table_admin_command = DROP TABLE IF EXISTS +--let $table_admin_command_end = +--source galera_ddl_fk_conflict.inc +--source galera_ddl_fk_conflict_with_tmp.inc + +--let $table_admin_command = DROP TABLE IF EXISTS nonexisting, +--let $table_admin_command_end = +--source galera_ddl_fk_conflict.inc +--source galera_ddl_fk_conflict_with_tmp.inc + # CHECK and ANALYZE are not affected diff --git a/mysql-test/suite/galera/t/galera_ddl_fk_conflict_with_tmp.inc b/mysql-test/suite/galera/t/galera_ddl_fk_conflict_with_tmp.inc index acf3c54180b..cc6542b96b0 100644 --- a/mysql-test/suite/galera/t/galera_ddl_fk_conflict_with_tmp.inc +++ b/mysql-test/suite/galera/t/galera_ddl_fk_conflict_with_tmp.inc @@ -35,9 +35,9 @@ BEGIN; --source include/wait_condition.inc --let $wait_condition = SELECT COUNT(*) = 1 FROM c1 --source include/wait_condition.inc -CREATE TEMPORARY TABLE tmp (i int); ---eval $table_admin_command TABLE c1, tmp $table_admin_command_end -DROP TABLE tmp; +CREATE TEMPORARY TABLE tmp1 (i int); +CREATE TEMPORARY TABLE tmp2 (i int); +--eval $table_admin_command tmp1, c1, tmp2 $table_admin_command_end --connection node_1a --source include/galera_wait_sync_point.inc @@ -45,7 +45,7 @@ DROP TABLE tmp; --let $expected_cert_failures = `SELECT VARIABLE_VALUE+1 FROM information_schema.global_status WHERE VARIABLE_NAME = 'wsrep_local_cert_failures'` --connection node_1 -UPDATE p1 SET f2 = 'TO DEADLOCK' WHERE pk = 1; +INSERT INTO p1 VALUES (10, 'TO DEADLOCK'); --send COMMIT --connection node_1a @@ -65,5 +65,6 @@ SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE'; --connection node_2 SELECT COUNT(*) AS EXPECT_1 FROM p1 WHERE f2 = 'INITIAL VALUE'; -DROP TABLE c1; +DROP TABLE IF EXISTS c1; DROP TABLE p1; +DROP TABLE IF EXISTS tmp1, tmp2; diff --git a/mysql-test/suite/galera/t/galera_gtid_slave_sst_rsync.test b/mysql-test/suite/galera/t/galera_gtid_slave_sst_rsync.test index 148bbc2b460..0f68a02426e 100644 --- a/mysql-test/suite/galera/t/galera_gtid_slave_sst_rsync.test +++ b/mysql-test/suite/galera/t/galera_gtid_slave_sst_rsync.test @@ -16,7 +16,7 @@ --echo #Connection 2 --connection node_2 --disable_query_log ---eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_USER='root', MASTER_PORT=$NODE_MYPORT_3,master_use_gtid=slave_pos; +--eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_USER='root', MASTER_PORT=$NODE_MYPORT_3, master_use_gtid=slave_pos; --enable_query_log START SLAVE; --sleep 1 diff --git a/mysql-test/suite/galera/t/galera_performance_schema.test b/mysql-test/suite/galera/t/galera_performance_schema.test index d54555ea301..531c45ea3c5 100644 --- a/mysql-test/suite/galera/t/galera_performance_schema.test +++ b/mysql-test/suite/galera/t/galera_performance_schema.test @@ -5,6 +5,9 @@ --source include/galera_cluster.inc --source include/have_perfschema.inc +--let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; +--source include/wait_condition.inc + use performance_schema; --vertical_results @@ -22,6 +25,7 @@ insert into t1 values (1),(2); use performance_schema; select name from mutex_instances where name like 'wait/synch/mutex/sql/LOCK_wsrep%' order by name; select name from cond_instances where name like 'wait/synch/cond/sql/COND_wsrep%' order by name; + # Whenever a node fails to apply an event on a slave node, the database server creates a # special binary log file of the event in the data directory. The naming convention the # node uses for the filename is GRA_*.log. @@ -55,4 +59,3 @@ CALL mtr.add_suppression("Slave SQL: Error 'Table 't2' already exists' on query" use test; drop table t1; drop table t2; - diff --git a/mysql-test/suite/galera/t/galera_query_cache_invalidate.test b/mysql-test/suite/galera/t/galera_query_cache_invalidate.test index c5c5f69dc27..b5560c54253 100644 --- a/mysql-test/suite/galera/t/galera_query_cache_invalidate.test +++ b/mysql-test/suite/galera/t/galera_query_cache_invalidate.test @@ -28,8 +28,9 @@ call mtr.add_suppression("WSREP: Ignoring server id .* for non bootstrap node"); --connection node_3 ---replace_result $NODE_MYPORT_1 NODE_MYPORT_1 ---eval CHANGE MASTER TO master_host='127.0.0.1', master_user='root', master_port=$NODE_MYPORT_1, master_use_gtid=current_pos; +--disable_query_log +--eval CHANGE MASTER TO master_host='127.0.0.1', master_user='root', MASTER_PORT=$NODE_MYPORT_1, master_use_gtid=current_pos +--enable_query_log START SLAVE; --source include/wait_for_slave_to_start.inc diff --git a/mysql-test/suite/galera/t/galera_restart_replica.test b/mysql-test/suite/galera/t/galera_restart_replica.test index 37cfd9bc0f9..05ab77f2519 100644 --- a/mysql-test/suite/galera/t/galera_restart_replica.test +++ b/mysql-test/suite/galera/t/galera_restart_replica.test @@ -1,77 +1,115 @@ # -# Test Galera as a replica to a MySQL async replication +# Test Galera as a replica to a MariaDB async replication +# +# MariaDB +# primary ---async replication--->galera node_2 (replica)<----galera replication---> galera node1 +# +# Test outline: +# +# - Create user for async replication +# - Create table and some data in primary +# - Verify that table and data is replicated to galera nodes +# - Verify that mysql.gtid_slave_pos has some rows in all Galera nodes +# - Verify that gtid_slave_pos, gtid_binlog_pos and gtid_current_pos are +# same in all Galera nodes +# - Verify that we can shutdown and restart Galera replica (node #2) +# - Verify that gtid_slave_pos, gtid_binlog_pos and gtid_current_pos are +# same in all Galera nodes +# - Verify that mysql.gtid_slave_pos table has limited amount of rows +# - Veruft that ddl works (drop table) +# +# Similar test is done so that new rows are added to table in +# primary while async replica (node #2) is down. # # The galera/galera_2node_slave.cnf describes the setup of the nodes # --source include/force_restart.inc --source include/galera_cluster.inc --source include/have_innodb.inc ---source include/have_sequence.inc + +# In this test we mark node #2 as replica +--connect replica, 127.0.0.1, root, , test, $NODE_MYPORT_2 # As node #3 is not a Galera node, and galera_cluster.inc does not open connetion to it -# we open the node_3 connection here ---connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3 +# we open the primary connection her +--connect primary, 127.0.0.1, root, , test, $NODE_MYPORT_3 create user repl@'%' identified by 'repl'; grant all on *.* to repl@'%'; ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB; --let $node_1 = node_1 ---let $node_2 = node_2 +--let $node_2 = replica --source include/auto_increment_offset_save.inc ---connection node_2 +--connection replica --disable_query_log --eval CHANGE MASTER TO master_host='127.0.0.1', master_user='repl', master_password='repl', master_port=$NODE_MYPORT_3, master_use_gtid=slave_pos; --enable_query_log START SLAVE; ---connection node_3 +--connection primary +CREATE TABLE t1 (id bigint auto_increment primary key, msg varchar(100)) engine=innodb; -CREATE TABLE t1 (id bigint primary key, msg varchar(100)) engine=innodb; +--echo # Intentionally generate 1k GTID-events +--let $inserts=1000 +--let $count=0 --disable_query_log -INSERT INTO t1 SELECT seq, 'test' from seq_1_to_10000; +while($count < $inserts) +{ + --eval insert into t1 values (NULL,'test1') + --inc $count +} --enable_query_log -SELECT COUNT(*) AS EXPECT_10000 FROM t1; ---connection node_2 +SELECT COUNT(*) AS EXPECT_1000 FROM t1; + +--connection replica --let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1'; --source include/wait_condition.inc ---let $wait_condition = SELECT COUNT(*) = 10000 FROM t1; +--let $wait_condition = SELECT COUNT(*) = 1000 FROM t1; --source include/wait_condition.inc +--let $wait_condition = SELECT COUNT(*) < 1000 FROM mysql.gtid_slave_pos; +--source include/wait_condition.inc SELECT COUNT(*) > 0 AS EXPECT_1 FROM mysql.gtid_slave_pos; -SELECT COUNT(*) AS EXPECT_10000 FROM t1; +SELECT COUNT(*) < 1000 AS EXPECT_1 FROM mysql.gtid_slave_pos; +SELECT @@gtid_slave_pos,@@gtid_binlog_pos,@@gtid_current_pos; +SELECT COUNT(*) AS EXPECT_1000 FROM t1; --connection node_1 --let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1'; --source include/wait_condition.inc ---let $wait_condition = SELECT COUNT(*) = 10000 FROM t1; +--let $wait_condition = SELECT COUNT(*) = 1000 FROM t1; --source include/wait_condition.inc +--let $wait_condition = SELECT COUNT(*) < 1000 FROM mysql.gtid_slave_pos; +--source include/wait_condition.inc SELECT COUNT(*) > 0 AS EXPECT_1 FROM mysql.gtid_slave_pos; -SELECT COUNT(*) AS EXPECT_10000 FROM t1; +SELECT COUNT(*) < 1000 AS EXPECT_1 FROM mysql.gtid_slave_pos; +SELECT @@gtid_slave_pos,@@gtid_binlog_pos,@@gtid_current_pos; +SELECT COUNT(*) AS EXPECT_1000 FROM t1; ---connection node_2 ---echo # Verify that graceful shutdown succeeds. +--connection replica +--echo # Verify that graceful shutdown succeeds in replica. --source include/shutdown_mysqld.inc --echo # Force SST --remove_file $MYSQLTEST_VARDIR/mysqld.2/data/grastate.dat --connection node_1 ---echo # Waiting until node_2 is not part of cluster anymore +--echo # Waiting until replica is not part of cluster anymore --let $wait_condition = SELECT VARIABLE_VALUE = 1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; --source include/wait_condition.inc --let $wait_condition = SELECT VARIABLE_VALUE = 'Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status'; --source include/wait_condition.inc ---connection node_2 ---echo # Start node_2 again +--connection replica +--echo # Start replica again --source include/start_mysqld.inc ---echo ¤ Wait until node_2 is back on cluster +--echo # Wait until replica is back on cluster --let $wait_condition = SELECT VARIABLE_VALUE = 'Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status'; --source include/wait_condition.inc --let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; @@ -79,24 +117,30 @@ SELECT COUNT(*) AS EXPECT_10000 FROM t1; --let $wait_condition = SELECT VARIABLE_VALUE = 'ON' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_ready'; --source include/wait_condition.inc ---connection node_2 +--let $wait_condition = SELECT COUNT(*) < 1000 FROM mysql.gtid_slave_pos; +--source include/wait_condition.inc SELECT COUNT(*) > 0 AS EXPECT_1 FROM mysql.gtid_slave_pos; -SELECT COUNT(*) AS EXPECT_10000 FROM t1; +SELECT COUNT(*) < 1000 AS EXPECT_1 FROM mysql.gtid_slave_pos; +SELECT @@gtid_slave_pos,@@gtid_binlog_pos,@@gtid_current_pos; +SELECT COUNT(*) AS EXPECT_1000 FROM t1; --connection node_1 +--let $wait_condition = SELECT COUNT(*) < 1000 FROM mysql.gtid_slave_pos; +--source include/wait_condition.inc SELECT COUNT(*) > 0 AS EXPECT_1 FROM mysql.gtid_slave_pos; -SELECT COUNT(*) AS EXPECT_10000 FROM t1; +SELECT COUNT(*) < 1000 AS EXPECT_1 FROM mysql.gtid_slave_pos; +SELECT @@gtid_slave_pos,@@gtid_binlog_pos,@@gtid_current_pos; +SELECT COUNT(*) AS EXPECT_1000 FROM t1; ---connection node_3 -SELECT COUNT(*) AS EXPECT_10000 FROM t1; +--connection primary +SELECT COUNT(*) AS EXPECT_1000 FROM t1; # # Cleanup # ---connection node_3 drop table t1; ---connection node_2 +--connection replica --let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1'; --source include/wait_condition.inc @@ -108,59 +152,80 @@ drop table t1; # Case 2 : While slave is down add writes to master # ---connection node_3 - -CREATE TABLE t1 (id bigint primary key, msg varchar(100)) engine=innodb; +--connection primary +CREATE TABLE t1 (id bigint auto_increment primary key, msg varchar(100)) engine=innodb; +--echo # Intentionally generate 1k GTID-events +--let $inserts=1000 +--let $count=0 --disable_query_log -INSERT INTO t1 SELECT seq, 'test' from seq_1_to_10000; +while($count < $inserts) +{ + --eval insert into t1 values (NULL,'test1') + --inc $count +} --enable_query_log -SELECT COUNT(*) AS EXPECT_10000 FROM t1; +SELECT COUNT(*) AS EXPECT_1000 FROM t1; ---connection node_2 +--connection replica --let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1'; --source include/wait_condition.inc ---let $wait_condition = SELECT COUNT(*) = 10000 FROM t1; +--let $wait_condition = SELECT COUNT(*) = 1000 FROM t1; --source include/wait_condition.inc +--let $wait_condition = SELECT COUNT(*) < 1000 FROM mysql.gtid_slave_pos; +--source include/wait_condition.inc SELECT COUNT(*) > 0 AS EXPECT_1 FROM mysql.gtid_slave_pos; -SELECT COUNT(*) AS EXPECT_10000 FROM t1; +SELECT COUNT(*) < 1000 AS EXPECT_1 FROM mysql.gtid_slave_pos; +SELECT @@gtid_slave_pos,@@gtid_binlog_pos,@@gtid_current_pos; +SELECT COUNT(*) AS EXPECT_1000 FROM t1; --connection node_1 --let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1'; --source include/wait_condition.inc ---let $wait_condition = SELECT COUNT(*) = 10000 FROM t1; +--let $wait_condition = SELECT COUNT(*) = 1000 FROM t1; --source include/wait_condition.inc +--let $wait_condition = SELECT COUNT(*) < 1000 FROM mysql.gtid_slave_pos; +--source include/wait_condition.inc SELECT COUNT(*) > 0 AS EXPECT_1 FROM mysql.gtid_slave_pos; -SELECT COUNT(*) AS EXPECT_10000 FROM t1; +SELECT COUNT(*) < 1000 AS EXPECT_1 FROM mysql.gtid_slave_pos; +SELECT @@gtid_slave_pos,@@gtid_binlog_pos,@@gtid_current_pos; ---connection node_2 ---echo # Verify that graceful shutdown succeeds. +--connection replica +--echo # Verify that graceful shutdown succeeds in replica. --source include/shutdown_mysqld.inc --echo # Force SST --remove_file $MYSQLTEST_VARDIR/mysqld.2/data/grastate.dat --connection node_1 ---echo # Waiting until node_2 is not part of cluster anymore +--echo # Waiting until replica is not part of cluster anymore --let $wait_condition = SELECT VARIABLE_VALUE = 1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; --source include/wait_condition.inc --let $wait_condition = SELECT VARIABLE_VALUE = 'Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status'; --source include/wait_condition.inc -# Add writes to master ---connection node_3 +--echo # Add writes to primary +--connection primary +--echo # Intentionally generate 1k GTID-events +--let $inserts=1000 +--let $count=0 --disable_query_log -INSERT INTO t1 SELECT seq, 'test' from seq_20001_to_30000; +while($count < $inserts) +{ + --eval insert into t1 values (NULL,'test1') + --inc $count +} --enable_query_log -SELECT COUNT(*) AS EXPECT_20000 FROM t1; ---connection node_2 ---echo # Start node_2 again +SELECT COUNT(*) AS EXPECT_2000 FROM t1; + +--connection replica +--echo # Start replica again --source include/start_mysqld.inc ---echo ¤ Wait until node_2 is back on cluster +--echo # Wait until replica is back on cluster --let $wait_condition = SELECT VARIABLE_VALUE = 'Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status'; --source include/wait_condition.inc --let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; @@ -168,28 +233,34 @@ SELECT COUNT(*) AS EXPECT_20000 FROM t1; --let $wait_condition = SELECT VARIABLE_VALUE = 'ON' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_ready'; --source include/wait_condition.inc ---connection node_2 ---let $wait_condition = SELECT COUNT(*) = 20000 FROM t1; +--let $wait_condition = SELECT COUNT(*) = 2000 FROM t1; +--source include/wait_condition.inc +--let $wait_condition = SELECT COUNT(*) < 1000 FROM mysql.gtid_slave_pos; --source include/wait_condition.inc SELECT COUNT(*) > 0 AS EXPECT_1 FROM mysql.gtid_slave_pos; -SELECT COUNT(*) AS EXPECT_20000 FROM t1; +SELECT COUNT(*) < 1000 AS EXPECT_1 FROM mysql.gtid_slave_pos; +SELECT @@gtid_slave_pos,@@gtid_binlog_pos,@@gtid_current_pos; +SELECT COUNT(*) AS EXPECT_2000 FROM t1; --connection node_1 ---let $wait_condition = SELECT COUNT(*) = 20000 FROM t1; +--let $wait_condition = SELECT COUNT(*) = 2000 FROM t1; +--source include/wait_condition.inc +--let $wait_condition = SELECT COUNT(*) < 1000 FROM mysql.gtid_slave_pos; --source include/wait_condition.inc SELECT COUNT(*) > 0 AS EXPECT_1 FROM mysql.gtid_slave_pos; -SELECT COUNT(*) AS EXPECT_20000 FROM t1; +SELECT COUNT(*) < 1000 AS EXPECT_1 FROM mysql.gtid_slave_pos; +SELECT @@gtid_slave_pos,@@gtid_binlog_pos,@@gtid_current_pos; +SELECT COUNT(*) AS EXPECT_2000 FROM t1; ---connection node_3 -SELECT COUNT(*) AS EXPECT_20000 FROM t1; +--connection primary +SELECT COUNT(*) AS EXPECT_2000 FROM t1; # # Cleanup # ---connection node_3 drop table t1; ---connection node_2 +--connection replica --let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1'; --source include/wait_condition.inc @@ -197,16 +268,18 @@ drop table t1; --let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1'; --source include/wait_condition.inc ---connection node_2 +--connection replica STOP SLAVE; RESET SLAVE ALL; ---connection node_3 +--connection primary RESET MASTER; ---connection node_1 ---disconnect node_3 - --source include/auto_increment_offset_restore.inc + +--connection node_1 +--disconnect primary +--disconnect replica + --source include/galera_end.inc --echo # End of test diff --git a/mysql-test/suite/galera/t/galera_slave_replay.test b/mysql-test/suite/galera/t/galera_slave_replay.test index 6680e66ffa1..d289cfb3bd2 100644 --- a/mysql-test/suite/galera/t/galera_slave_replay.test +++ b/mysql-test/suite/galera/t/galera_slave_replay.test @@ -32,7 +32,6 @@ RESET MASTER; # --let $wsrep_local_replays_old = `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_replays'` - # # nodes 1 and 2 form a galera cluster, node 2 operates as slave for native MariaDB master in node 3 # @@ -134,7 +133,7 @@ SELECT * FROM t1; SET DEBUG_SYNC = "RESET"; #******************************************************************************** -# test phase 2 +# test phase 2 #******************************************************************************** --echo # @@ -197,3 +196,7 @@ DROP TABLE t1; --connection node_3 DROP TABLE t1; RESET MASTER; + +--connection node_1 +--disconnect node_2a +--disconnect node_3 diff --git a/mysql-test/suite/galera/t/galera_threadpool.cnf b/mysql-test/suite/galera/t/galera_threadpool.cnf new file mode 100644 index 00000000000..c1a1e6a81aa --- /dev/null +++ b/mysql-test/suite/galera/t/galera_threadpool.cnf @@ -0,0 +1,17 @@ +!include ../galera_2nodes.cnf + +[mysqld.1] +wsrep-node-name="node1" +log_bin=binlog +log_slave_updates=ON +wsrep_sst_method=rsync +thread_handling = pool-of-threads + +[mysqld.2] +wsrep-node-name="node2" +log_bin=binlog +log_slave_updates=ON +wsrep_sst_method=rsync +thread_handling = pool-of-threads + + diff --git a/mysql-test/suite/galera/t/galera_threadpool.test b/mysql-test/suite/galera/t/galera_threadpool.test new file mode 100644 index 00000000000..78b26e6e89f --- /dev/null +++ b/mysql-test/suite/galera/t/galera_threadpool.test @@ -0,0 +1,67 @@ +# +# Tests for threadpool support +# +--source include/galera_cluster.inc + +--let $node_1 = node_1 +--let $node_2 = node_2 + +--source ../galera/include/auto_increment_offset_save.inc + +# +# start connections in node 2, and execute some SQL statements +# leave also open transactions in the node +# +--connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2 +--connect node_2b, 127.0.0.1, root, , test, $NODE_MYPORT_2 +--connect node_2c, 127.0.0.1, root, , test, $NODE_MYPORT_2 +--connect node_2d, 127.0.0.1, root, , test, $NODE_MYPORT_2 +--connect node_2e, 127.0.0.1, root, , test, $NODE_MYPORT_2 + +--connection node_2a +CREATE TABLE t1 (f1 INTEGER NOT NULL PRIMARY KEY, f2 char) ENGINE=InnoDB; +INSERT INTO t1 VALUES (0,'a'); +INSERT INTO t1 VALUES (1,'a'); + +--connection node_2b +SELECT * FROM t1; + +--connection node_2c +INSERT INTO t1 VALUES (2,'c'); + +--connection node_2d +BEGIN; +SELECT * FROM t1; + +--connection node_2e +BEGIN; +UPDATE t1 SET f2='e' WHERE f1=0; + +# +# Shut down node 2, all open connections should be closed +# +--connection node_2 +--source include/shutdown_mysqld.inc + +--connection node_1 +--let $wait_condition = SELECT VARIABLE_VALUE = 1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; +--source include/wait_condition.inc + +# And restart the node +--connection node_2 +let $restart_noprint=2; +--let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.2.expect +--source include/start_mysqld.inc + +--connection node_1 +--let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; +--source include/wait_condition.inc + +--connection node_2 + +DROP TABLE t1; + +# +# Restore auto increment variables. +# +--source ../galera/include/auto_increment_offset_restore.inc diff --git a/mysql-test/suite/galera_3nodes/disabled.def b/mysql-test/suite/galera_3nodes/disabled.def index c52df019c65..bb9d7cbd7b8 100644 --- a/mysql-test/suite/galera_3nodes/disabled.def +++ b/mysql-test/suite/galera_3nodes/disabled.def @@ -11,6 +11,4 @@ ############################################################################## galera_2_cluster : MDEV-32631 galera_2_cluster: before_rollback(): Assertion `0' failed -galera_ipv6_rsync : MDEV-34842 Can't connect to server on '::1' (115) -galera_ipv6_rsync_section : MDEV-34842 Can't connect to server on '::1' (115) -galera_ipv6_mariabackup_section : MDEV-34842 Can't connect to server on '::1' (115) +galera_nbo_master_phase_two_crash : MENT-2215 Test failure on galera_3nodes.galera_nbo_master_non_prim_failure diff --git a/mysql-test/suite/galera_sr/r/MENT-2038.result b/mysql-test/suite/galera_sr/r/MENT-2038.result new file mode 100644 index 00000000000..bbd7c568925 --- /dev/null +++ b/mysql-test/suite/galera_sr/r/MENT-2038.result @@ -0,0 +1,7 @@ +connection node_2; +connection node_1; +SET SESSION wsrep_on=OFF; +BEGIN; +BEGIN; +COMMIT; +SET SESSION wsrep_on=ON; diff --git a/mysql-test/suite/galera_sr/t/MDEV-25718.test b/mysql-test/suite/galera_sr/t/MDEV-25718.test index 037cd300709..147b62fe145 100644 --- a/mysql-test/suite/galera_sr/t/MDEV-25718.test +++ b/mysql-test/suite/galera_sr/t/MDEV-25718.test @@ -43,7 +43,7 @@ SET SESSION wsrep_sync_wait = 0; SET debug_sync = "now SIGNAL write_row_continue"; # Let's give the INSERT some time, to make sure it does rollback ---let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE INFO = "INSERT INTO t1 VALUES (1)" AND (STATE = "Freeing items" OR STATE = 'Rollback'); +--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE INFO = "INSERT INTO t1 VALUES (1)" AND (STATE = 'Freeing items' OR STATE = 'Rollback' OR STATE = 'Query end'); --let $wait_condition_on_error_output = SELECT INFO, STATE FROM INFORMATION_SCHEMA.PROCESSLIST --source include/wait_condition_with_debug.inc diff --git a/mysql-test/suite/galera_sr/t/MENT-2038.test b/mysql-test/suite/galera_sr/t/MENT-2038.test new file mode 100644 index 00000000000..311b0d3a36f --- /dev/null +++ b/mysql-test/suite/galera_sr/t/MENT-2038.test @@ -0,0 +1,12 @@ +# +# MENT-2038: Assertion `(thd && (WSREP_PROVIDER_EXISTS_ && thd->variables.wsrep_on))' +# failed in void wsrep_restore_kill_after_commit(THD*) +# + +--source include/galera_cluster.inc + +SET SESSION wsrep_on=OFF; +BEGIN; +BEGIN; # If bug is present, assertion triggers during implicit commit +COMMIT; +SET SESSION wsrep_on=ON; diff --git a/mysql-test/suite/heap/heap.result b/mysql-test/suite/heap/heap.result index 583f4fc9b3f..40795aa5198 100644 --- a/mysql-test/suite/heap/heap.result +++ b/mysql-test/suite/heap/heap.result @@ -825,3 +825,22 @@ DELETE FROM t1 WHERE ts = 1 AND color = 'GREEN'; SELECT * from t1 WHERE ts = 1 AND color = 'GREEN'; id color ts DROP TABLE t1; +# +# MDEV-22695 Server crashes in heap_rnext upon DELETE from a HEAP table +# +CREATE TABLE t1 (a VARCHAR(128), b VARCHAR(32), KEY(a) USING BTREE, KEY(b) USING BTREE) ENGINE=HEAP; +INSERT INTO t1 VALUES ('foo',NULL),('m','b'),(6,'j'),('bar','qux'),(NULL,NULL); +DELETE FROM t1 WHERE a <=> 'm' OR b <=> NULL; +DROP TABLE t1; +# +# MDEV-28130 MariaDB SEGV issue at tree_search_next +# +CREATE TABLE v(t1 INT, pk INT, KEY(t1), KEY pk using btree (pk), KEY v using btree(t1, pk)) engine=memory; +HANDLER v OPEN; +HANDLER v READ t1=(2) limit 3; +t1 pk +HANDLER v READ pk PREV; +t1 pk +HANDLER v READ pk PREV; +t1 pk +drop table v; diff --git a/mysql-test/suite/heap/heap.test b/mysql-test/suite/heap/heap.test index fdda9d54e0e..87440fd26e8 100644 --- a/mysql-test/suite/heap/heap.test +++ b/mysql-test/suite/heap/heap.test @@ -607,3 +607,22 @@ INSERT INTO t1 VALUES("7","GREEN", 2); DELETE FROM t1 WHERE ts = 1 AND color = 'GREEN'; SELECT * from t1 WHERE ts = 1 AND color = 'GREEN'; DROP TABLE t1; + +--echo # +--echo # MDEV-22695 Server crashes in heap_rnext upon DELETE from a HEAP table +--echo # +CREATE TABLE t1 (a VARCHAR(128), b VARCHAR(32), KEY(a) USING BTREE, KEY(b) USING BTREE) ENGINE=HEAP; +INSERT INTO t1 VALUES ('foo',NULL),('m','b'),(6,'j'),('bar','qux'),(NULL,NULL); +DELETE FROM t1 WHERE a <=> 'm' OR b <=> NULL; +# Cleanup +DROP TABLE t1; + +--echo # +--echo # MDEV-28130 MariaDB SEGV issue at tree_search_next +--echo # +CREATE TABLE v(t1 INT, pk INT, KEY(t1), KEY pk using btree (pk), KEY v using btree(t1, pk)) engine=memory; +HANDLER v OPEN; +HANDLER v READ t1=(2) limit 3; +HANDLER v READ pk PREV; +HANDLER v READ pk PREV; +drop table v; diff --git a/mysql-test/suite/innodb/r/auto_increment_lock_mode.result b/mysql-test/suite/innodb/r/auto_increment_lock_mode.result new file mode 100644 index 00000000000..b19d5cf40fc --- /dev/null +++ b/mysql-test/suite/innodb/r/auto_increment_lock_mode.result @@ -0,0 +1,43 @@ +CREATE TABLE t1(a TINYINT UNSIGNED AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDB; +CREATE TABLE t2(a TINYINT UNSIGNED AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDB; +CREATE TABLE t3(a TINYINT UNSIGNED AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDB; +CREATE TABLE t4(a TINYINT UNSIGNED AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDB; +CREATE TABLE t5(a TINYINT UNSIGNED AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDB; +CREATE TABLE t6(a SERIAL, b INT) ENGINE=InnoDB; +CREATE FUNCTION p1() RETURNS INT +BEGIN +INSERT INTO t1() VALUES(); +INSERT INTO t2() VALUES(); +INSERT INTO t3() VALUES(); +INSERT INTO t4() VALUES(); +INSERT INTO t5() VALUES(); +RETURN 1; +END$$ +INSERT INTO t6(b) SELECT p1(); +UPDATE t1,t2,t3,t4,t5 SET t1.a=2,t2.a=2,t3.a=2,t4.a=2,t5.a=2; +SELECT * FROM t1; +a +2 +connect con1,localhost,root,,; +connect con2,localhost,root,,; +connect con3,localhost,root,,; +connection con1; +INSERT INTO t6(b) SELECT SLEEP(p1()); +connection con2; +INSERT INTO t6(b) SELECT SLEEP(p1()); +connection con3; +UPDATE t1,t2,t3,t4,t5 SET t1.a=0,t2.a=0,t3.a=0,t4.a=0,t5.a=0 +WHERE t1.a=2 AND t2.a=2 AND t3.a=2 AND t4.a=2 AND t5.a=2; +connection default; +KILL QUERY $ID1; +KILL QUERY $ID2; +KILL QUERY $ID3; +connection con1; +disconnect con1; +connection con2; +disconnect con2; +connection con3; +disconnect con3; +connection default; +DROP FUNCTION p1; +DROP TABLE t1,t2,t3,t4,t5,t6; diff --git a/mysql-test/suite/innodb/r/foreign_key.result b/mysql-test/suite/innodb/r/foreign_key.result index 9f14194b6dd..1a43b91468d 100644 --- a/mysql-test/suite/innodb/r/foreign_key.result +++ b/mysql-test/suite/innodb/r/foreign_key.result @@ -164,9 +164,6 @@ DELETE FROM parent; ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test`.`child`, CONSTRAINT `child_ibfk_1` FOREIGN KEY (`a`) REFERENCES `parent` (`a`) ON DELETE CASCADE) ALTER TABLE child ADD INDEX(a); DELETE FROM parent; -ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test`.`child`, CONSTRAINT `child_ibfk_1` FOREIGN KEY (`a`) REFERENCES `parent` (`a`) ON DELETE CASCADE) -ALTER TABLE child FORCE; -DELETE FROM parent; DROP TABLE child,parent; SELECT unique_constraint_name FROM information_schema.referential_constraints WHERE table_name = 't2'; @@ -1023,6 +1020,23 @@ t2 CREATE TABLE `t2` ( CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`a`) REFERENCES `t1` (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop tables t2, t1; +# +# MDEV-29182 Assertion fld->field_no < table->n_v_def failed on cascade +# +CREATE TABLE t1(a INT PRIMARY KEY, b VARCHAR(3), c INT AS (LENGTH(b)) VIRTUAL, +INDEX(c)) ENGINE=InnoDB; +CREATE TABLE t2(a INT REFERENCES t1(a) ON UPDATE CASCADE, +b INT GENERATED ALWAYS AS(a) VIRTUAL, INDEX(b)) ENGINE=InnoDB; +INSERT INTO t1 SET a=1,b='fu'; +INSERT INTO t2 SET a=1; +UPDATE t1 SET a=2,b='bar'; +SELECT * FROM t1; +a b c +2 bar 3 +SELECT * FROM t2; +a b +2 2 +DROP TABLE t2,t1; # End of 10.5 tests # # MDEV-26554 Table-rebuilding DDL on parent table causes crash @@ -1118,6 +1132,56 @@ test.binaries check status OK test.collections check status OK disconnect con1; DROP TABLE binaries, collections; +CREATE SCHEMA `#mysql50##mysql50#d-b`; +CREATE TABLE `#mysql50##mysql50#d-b`.t1 (a INT PRIMARY KEY, b INT UNIQUE) engine=InnoDB; +USE `#mysql50##mysql50#d-b`; +CREATE TABLE t2 (a INT PRIMARY KEY, b INT UNIQUE REFERENCES t1(b)) ENGINE=InnoDB; +SET STATEMENT foreign_key_checks=0 FOR +ALTER TABLE t2 ADD FOREIGN KEY (a) REFERENCES t1(a); +SHOW CREATE TABLE t2; +Table Create Table +t2 CREATE TABLE `t2` ( + `a` int(11) NOT NULL, + `b` int(11) DEFAULT NULL, + PRIMARY KEY (`a`), + UNIQUE KEY `b` (`b`), + CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`b`) REFERENCES `t1` (`b`), + CONSTRAINT `t2_ibfk_2` FOREIGN KEY (`a`) REFERENCES `t1` (`a`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci +INSERT INTO t1 SET a=1; +INSERT INTO t2 SET a=1; +DELETE FROM t1; +ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`#mysql50#d-b`.`t2`, CONSTRAINT `t2_ibfk_2` FOREIGN KEY (`a`) REFERENCES `t1` (`a`)) +DELETE FROM t2; +DELETE FROM t1; +DROP DATABASE `#mysql50##mysql50#d-b`; +USE test; +# +# MDEV-35962 CREATE INDEX fails to heal a FOREIGN KEY constraint +# +CREATE TABLE t2 (b INT, FOREIGN KEY (b) REFERENCES t1(a)) ENGINE=InnoDB; +ERROR HY000: Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed") +SET STATEMENT foreign_key_checks=0 FOR +CREATE TABLE t2 (b INT, FOREIGN KEY (b) REFERENCES t1(a)) ENGINE=InnoDB; +CREATE TABLE t1 (a INT) ENGINE=InnoDB; +ERROR HY000: Can't create table `test`.`t1` (errno: 150 "Foreign key constraint is incorrectly formed") +SET STATEMENT foreign_key_checks=0 FOR +CREATE TABLE t1 (a INT) ENGINE=InnoDB; +INSERT INTO t1 VALUES (1); +INSERT INTO t2 VALUES (1); +ERROR 23000: Cannot add or update a child row: a foreign key constraint fails (`test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`b`) REFERENCES `t1` (`a`)) +ALTER TABLE t1 ADD KEY(a), ALGORITHM=NOCOPY; +INSERT INTO t2 VALUES (1); +DROP INDEX b ON t2; +ERROR HY000: Cannot drop index 'b': needed in a foreign key constraint +SET STATEMENT foreign_key_checks=0 FOR +DROP INDEX b ON t2; +DELETE FROM t2; +DELETE FROM t1; +ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`b`) REFERENCES `t1` (`a`)) +ALTER TABLE t2 ADD KEY(b), ALGORITHM=NOCOPY; +DELETE FROM t1; +DROP TABLE t2, t1; # End of 10.6 tests CREATE TABLE t1 ( diff --git a/mysql-test/suite/innodb/r/foreign_sql_mode,COPY,NON-STRICT.rdiff b/mysql-test/suite/innodb/r/foreign_sql_mode,COPY,NON-STRICT.rdiff new file mode 100644 index 00000000000..66e39ca633e --- /dev/null +++ b/mysql-test/suite/innodb/r/foreign_sql_mode,COPY,NON-STRICT.rdiff @@ -0,0 +1,57 @@ +--- foreign_sql_mode.result ++++ foreign_sql_mode,COPY,NON-STRICT.rdiff +@@ -3,14 +3,14 @@ + CREATE TABLE t1(f1 INT, f2 INT, PRIMARY KEY(f1), KEY(f2))ENGINE=InnoDB; + CREATE TABLE t2(f1 INT, FOREIGN KEY(f1) REFERENCES t1(f2) ON UPDATE CASCADE)ENGINE=InnoDB; + ALTER TABLE t2 MODIFY COLUMN f1 INT NOT NULL; +-ERROR HY000: Column 'f1' cannot be NOT NULL: needed in a foreign key constraint 't2_ibfk_1' SET NULL + INSERT INTO t1 VALUES(1, 1); + INSERT INTO t2 VALUES(1); + UPDATE t1 SET f2= NULL; ++ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`f1`) REFERENCES `t1` (`f2`) ON UPDATE CASCADE) + DELETE FROM t2; + SELECT * FROM t1; + f1 f2 +-1 NULL ++1 1 + UPDATE t1 SET f2 = NULL; + SELECT * FROM t1; + f1 f2 +@@ -20,7 +20,7 @@ + CREATE TABLE t1(f1 INT, f2 INT, PRIMARY KEY(f1), KEY(f2))ENGINE=InnoDB; + CREATE TABLE t2(f1 INT, f2 INT, FOREIGN KEY(f1) REFERENCES t1(f1) ON UPDATE SET NULL)ENGINE=InnoDB; + ALTER TABLE t2 MODIFY COLUMN f1 INT NOT NULL; +-ERROR HY000: Column 'f1' cannot be NOT NULL: needed in a foreign key constraint 't2_ibfk_1' SET NULL ++ERROR HY000: Error on rename of 'OLD_FILE_NAME' to 'NEW_FILE_NAME' (errno: 150 "Foreign key constraint is incorrectly formed") + INSERT INTO t1 VALUES(1, 1); + INSERT INTO t2 VALUES(1, 1); + UPDATE t1 SET f1= 2; +@@ -32,7 +32,7 @@ + CREATE TABLE t1(f1 INT, f2 INT, PRIMARY KEY(f1), KEY(f2))ENGINE=InnoDB; + CREATE TABLE t2(f1 INT, f2 INT, FOREIGN KEY (f2) REFERENCES t1(f2) ON DELETE SET NULL)ENGINE=InnoDB; + ALTER TABLE t2 MODIFY COLUMN f2 INT NOT NULL; +-ERROR HY000: Column 'f2' cannot be NOT NULL: needed in a foreign key constraint 't2_ibfk_1' SET NULL ++ERROR HY000: Error on rename of 'OLD_FILE_NAME' to 'NEW_FILE_NAME' (errno: 150 "Foreign key constraint is incorrectly formed") + DROP TABLE t2, t1; + # modify parent column NULL ON UPDATE CASCADE child column NOT NULL + CREATE TABLE `t#1`(f1 INT, f2 INT NOT NULL, PRIMARY KEY(f1), KEY(f2))ENGINE=InnoDB; +@@ -40,11 +40,10 @@ + FOREIGN KEY(f1) REFERENCES `t#1`(f2) + ON UPDATE CASCADE)ENGINE=InnoDB; + ALTER TABLE `t#1` MODIFY COLUMN f2 INT; +-ERROR HY000: Cannot change column 'f2': used in a foreign key constraint 't#2_ibfk_1' of table 'test.t#2' + INSERT INTO `t#1` VALUES(1, 1); + INSERT INTO `t#2` VALUES(1); + UPDATE `t#1` SET f2= NULL; +-ERROR 23000: Column 'f2' cannot be null ++ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test`.`t#2`, CONSTRAINT `t#2_ibfk_1` FOREIGN KEY (`f1`) REFERENCES `t#1` (`f2`) ON UPDATE CASCADE) + DELETE FROM `t#2`; + SELECT * FROM `t#1`; + f1 f2 +@@ -60,6 +59,5 @@ + PRIMARY KEY(f1, f2), + FOREIGN KEY(f2, f3) REFERENCES t1(f2, f1) + ON UPDATE CASCADE)ENGINE=InnoDB; +-ERROR HY000: Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed") + DROP TABLE IF EXISTS t2; + DROP TABLE IF EXISTS t1; diff --git a/mysql-test/suite/innodb/r/foreign_sql_mode,COPY,NOSTRICT.rdiff b/mysql-test/suite/innodb/r/foreign_sql_mode,COPY,NOSTRICT.rdiff new file mode 100644 index 00000000000..95df1bfa7d3 --- /dev/null +++ b/mysql-test/suite/innodb/r/foreign_sql_mode,COPY,NOSTRICT.rdiff @@ -0,0 +1,55 @@ +--- foreign_sql_mode.result 2025-01-21 17:23:46.014938931 +0530 ++++ foreign_sql_mode.reject 2025-01-21 17:24:11.783981181 +0530 +@@ -3,20 +3,20 @@ + CREATE TABLE t1(f1 INT, f2 INT, PRIMARY KEY(f1), KEY(f2))ENGINE=InnoDB; + CREATE TABLE t2(f1 INT, FOREIGN KEY(f1) REFERENCES t1(f2) ON UPDATE CASCADE)ENGINE=InnoDB; + ALTER TABLE t2 MODIFY COLUMN f1 INT NOT NULL; +-ERROR HY000: Column 'f1' cannot be NOT NULL: needed in a foreign key constraint 't2_ibfk_1' SET NULL + INSERT INTO t1 VALUES(1, 1); + INSERT INTO t2 VALUES(1); + UPDATE t1 SET f2= NULL; ++ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`f1`) REFERENCES `t1` (`f2`) ON UPDATE CASCADE) + DELETE FROM t2; + SELECT * FROM t1; + f1 f2 +-1 NULL ++1 1 + DROP TABLE t2, t1; + # modify child column NOT NULL ON UPDATE SET NULL + CREATE TABLE t1(f1 INT, f2 INT, PRIMARY KEY(f1), KEY(f2))ENGINE=InnoDB; + CREATE TABLE t2(f1 INT, f2 INT, FOREIGN KEY(f1) REFERENCES t1(f1) ON UPDATE SET NULL)ENGINE=InnoDB; + ALTER TABLE t2 MODIFY COLUMN f1 INT NOT NULL; +-ERROR HY000: Column 'f1' cannot be NOT NULL: needed in a foreign key constraint 't2_ibfk_1' SET NULL ++ERROR HY000: Error on rename of 'OLD_FILE_NAME' to 'NEW_FILE_NAME' (errno: 150 "Foreign key constraint is incorrectly formed") + INSERT INTO t1 VALUES(1, 1); + INSERT INTO t2 VALUES(1, 1); + UPDATE t1 SET f1= 2; +@@ -28,7 +28,7 @@ + CREATE TABLE t1(f1 INT, f2 INT, PRIMARY KEY(f1), KEY(f2))ENGINE=InnoDB; + CREATE TABLE t2(f1 INT, f2 INT, FOREIGN KEY (f2) REFERENCES t1(f2) ON DELETE SET NULL)ENGINE=InnoDB; + ALTER TABLE t2 MODIFY COLUMN f2 INT NOT NULL; +-ERROR HY000: Column 'f2' cannot be NOT NULL: needed in a foreign key constraint 't2_ibfk_1' SET NULL ++ERROR HY000: Error on rename of 'OLD_FILE_NAME' to 'NEW_FILE_NAME' (errno: 150 "Foreign key constraint is incorrectly formed") + DROP TABLE t2, t1; + # modify parent column NULL ON UPDATE CASCADE child column NOT NULL + CREATE TABLE `t#1`(f1 INT, f2 INT NOT NULL, PRIMARY KEY(f1), KEY(f2))ENGINE=InnoDB; +@@ -36,11 +36,10 @@ + FOREIGN KEY(f1) REFERENCES `t#1`(f2) + ON UPDATE CASCADE)ENGINE=InnoDB; + ALTER TABLE `t#1` MODIFY COLUMN f2 INT; +-ERROR HY000: Cannot change column 'f2': used in a foreign key constraint 't#2_ibfk_1' of table 'test.t#2' + INSERT INTO `t#1` VALUES(1, 1); + INSERT INTO `t#2` VALUES(1); + UPDATE `t#1` SET f2= NULL; +-ERROR 23000: Column 'f2' cannot be null ++ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test`.`t#2`, CONSTRAINT `t#2_ibfk_1` FOREIGN KEY (`f1`) REFERENCES `t#1` (`f2`) ON UPDATE CASCADE) + DELETE FROM `t#2`; + SELECT * FROM `t#1`; + f1 f2 +@@ -56,6 +55,5 @@ + PRIMARY KEY(f1, f2), + FOREIGN KEY(f2, f3) REFERENCES t1(f2, f1) + ON UPDATE CASCADE)ENGINE=InnoDB; +-ERROR HY000: Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed") + DROP TABLE IF EXISTS t2; + DROP TABLE IF EXISTS t1; diff --git a/mysql-test/suite/innodb/r/foreign_sql_mode,INPLACE,NON-STRICT.rdiff b/mysql-test/suite/innodb/r/foreign_sql_mode,INPLACE,NON-STRICT.rdiff new file mode 100644 index 00000000000..8919244e810 --- /dev/null +++ b/mysql-test/suite/innodb/r/foreign_sql_mode,INPLACE,NON-STRICT.rdiff @@ -0,0 +1,39 @@ +--- foreign_sql_mode.result ++++ foreign_sql_mode,INPLACE,NON-STRICT.rdiff +@@ -3,14 +3,14 @@ + CREATE TABLE t1(f1 INT, f2 INT, PRIMARY KEY(f1), KEY(f2))ENGINE=InnoDB; + CREATE TABLE t2(f1 INT, FOREIGN KEY(f1) REFERENCES t1(f2) ON UPDATE CASCADE)ENGINE=InnoDB; + ALTER TABLE t2 MODIFY COLUMN f1 INT NOT NULL; +-ERROR HY000: Column 'f1' cannot be NOT NULL: needed in a foreign key constraint 't2_ibfk_1' SET NULL + INSERT INTO t1 VALUES(1, 1); + INSERT INTO t2 VALUES(1); + UPDATE t1 SET f2= NULL; ++ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`f1`) REFERENCES `t1` (`f2`) ON UPDATE CASCADE) + DELETE FROM t2; + SELECT * FROM t1; + f1 f2 +-1 NULL ++1 1 + UPDATE t1 SET f2 = NULL; + SELECT * FROM t1; + f1 f2 +@@ -40,11 +40,10 @@ + FOREIGN KEY(f1) REFERENCES `t#1`(f2) + ON UPDATE CASCADE)ENGINE=InnoDB; + ALTER TABLE `t#1` MODIFY COLUMN f2 INT; +-ERROR HY000: Cannot change column 'f2': used in a foreign key constraint 't#2_ibfk_1' of table 'test.t#2' + INSERT INTO `t#1` VALUES(1, 1); + INSERT INTO `t#2` VALUES(1); + UPDATE `t#1` SET f2= NULL; +-ERROR 23000: Column 'f2' cannot be null ++ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test`.`t#2`, CONSTRAINT `t#2_ibfk_1` FOREIGN KEY (`f1`) REFERENCES `t#1` (`f2`) ON UPDATE CASCADE) + DELETE FROM `t#2`; + SELECT * FROM `t#1`; + f1 f2 +@@ -60,6 +59,5 @@ + PRIMARY KEY(f1, f2), + FOREIGN KEY(f2, f3) REFERENCES t1(f2, f1) + ON UPDATE CASCADE)ENGINE=InnoDB; +-ERROR HY000: Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed") + DROP TABLE IF EXISTS t2; + DROP TABLE IF EXISTS t1; diff --git a/mysql-test/suite/innodb/r/foreign_sql_mode.result b/mysql-test/suite/innodb/r/foreign_sql_mode.result new file mode 100644 index 00000000000..7044e402745 --- /dev/null +++ b/mysql-test/suite/innodb/r/foreign_sql_mode.result @@ -0,0 +1,65 @@ +call mtr.add_suppression("InnoDB: In ALTER TABLE .* has or is referenced in foreign key constraints which are not compatible with the new table definition."); +# modify child column NOT NULL on UPDATE CASCADE..parent column NULL +CREATE TABLE t1(f1 INT, f2 INT, PRIMARY KEY(f1), KEY(f2))ENGINE=InnoDB; +CREATE TABLE t2(f1 INT, FOREIGN KEY(f1) REFERENCES t1(f2) ON UPDATE CASCADE)ENGINE=InnoDB; +ALTER TABLE t2 MODIFY COLUMN f1 INT NOT NULL; +ERROR HY000: Column 'f1' cannot be NOT NULL: needed in a foreign key constraint 't2_ibfk_1' SET NULL +INSERT INTO t1 VALUES(1, 1); +INSERT INTO t2 VALUES(1); +UPDATE t1 SET f2= NULL; +DELETE FROM t2; +SELECT * FROM t1; +f1 f2 +1 NULL +UPDATE t1 SET f2 = NULL; +SELECT * FROM t1; +f1 f2 +1 NULL +DROP TABLE t2, t1; +# modify child column NOT NULL ON UPDATE SET NULL +CREATE TABLE t1(f1 INT, f2 INT, PRIMARY KEY(f1), KEY(f2))ENGINE=InnoDB; +CREATE TABLE t2(f1 INT, f2 INT, FOREIGN KEY(f1) REFERENCES t1(f1) ON UPDATE SET NULL)ENGINE=InnoDB; +ALTER TABLE t2 MODIFY COLUMN f1 INT NOT NULL; +ERROR HY000: Column 'f1' cannot be NOT NULL: needed in a foreign key constraint 't2_ibfk_1' SET NULL +INSERT INTO t1 VALUES(1, 1); +INSERT INTO t2 VALUES(1, 1); +UPDATE t1 SET f1= 2; +SELECT * FROM t2; +f1 f2 +NULL 1 +DROP TABLE t2, t1; +# modify child column NOT NULL ON DELETE SET NULL +CREATE TABLE t1(f1 INT, f2 INT, PRIMARY KEY(f1), KEY(f2))ENGINE=InnoDB; +CREATE TABLE t2(f1 INT, f2 INT, FOREIGN KEY (f2) REFERENCES t1(f2) ON DELETE SET NULL)ENGINE=InnoDB; +ALTER TABLE t2 MODIFY COLUMN f2 INT NOT NULL; +ERROR HY000: Column 'f2' cannot be NOT NULL: needed in a foreign key constraint 't2_ibfk_1' SET NULL +DROP TABLE t2, t1; +# modify parent column NULL ON UPDATE CASCADE child column NOT NULL +CREATE TABLE `t#1`(f1 INT, f2 INT NOT NULL, PRIMARY KEY(f1), KEY(f2))ENGINE=InnoDB; +CREATE TABLE `t#2`(f1 INT NOT NULL, +FOREIGN KEY(f1) REFERENCES `t#1`(f2) +ON UPDATE CASCADE)ENGINE=InnoDB; +ALTER TABLE `t#1` MODIFY COLUMN f2 INT; +ERROR HY000: Cannot change column 'f2': used in a foreign key constraint 't#2_ibfk_1' of table 'test.t#2' +INSERT INTO `t#1` VALUES(1, 1); +INSERT INTO `t#2` VALUES(1); +UPDATE `t#1` SET f2= NULL; +ERROR 23000: Column 'f2' cannot be null +DELETE FROM `t#2`; +SELECT * FROM `t#1`; +f1 f2 +1 1 +DROP TABLE `t#2`, `t#1`; +CREATE TABLE t1(f1 INT NOT NULL AUTO_INCREMENT, +f2 INT DEFAULT NULL, +PRIMARY KEY(f1), +FOREIGN KEY(f2) REFERENCES t1(f1))ENGINE=InnoDB; +CREATE TABLE t2 (f1 INT NOT NULL, +f2 INT NOT NULL, +f3 INT DEFAULT NULL, +PRIMARY KEY(f1, f2), +FOREIGN KEY(f2, f3) REFERENCES t1(f2, f1) +ON UPDATE CASCADE)ENGINE=InnoDB; +ERROR HY000: Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed") +DROP TABLE IF EXISTS t2; +DROP TABLE IF EXISTS t1; diff --git a/mysql-test/suite/innodb/r/innodb-autoinc-56228.result b/mysql-test/suite/innodb/r/innodb-autoinc-56228.result index 6a3fd85ebd3..f8616772151 100644 --- a/mysql-test/suite/innodb/r/innodb-autoinc-56228.result +++ b/mysql-test/suite/innodb/r/innodb-autoinc-56228.result @@ -1,15 +1,6 @@ -DROP TABLE IF EXISTS t1_56228; -Warnings: -Note 1051 Unknown table 'test.t1_56228' -DROP TABLE IF EXISTS t2_56228; -Warnings: -Note 1051 Unknown table 'test.t2_56228' -DROP FUNCTION IF EXISTS bug56228; -Warnings: -Note 1305 FUNCTION test.bug56228 does not exist -CREATE TEMPORARY TABLE t1_56228( +CREATE TABLE t1_56228( c1 iNT AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDB; -CREATE TEMPORARY TABLE t2_56228( +CREATE TABLE t2_56228( c1 iNT AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDB; CREATE FUNCTION bug56228() RETURNS INT DETERMINISTIC BEGIN @@ -17,14 +8,18 @@ INSERT INTO t1_56228 VALUES(NULL); INSERT INTO t2_56228 VALUES(NULL); INSERT INTO t1_56228 VALUES(NULL); INSERT INTO t2_56228 VALUES(NULL); -DROP TEMPORARY TABLE t1_56228; +DROP TABLE t1_56228; RETURN 42; END // -SELECT bug56228(); -bug56228() -42 -DROP FUNCTION bug56228; -DROP TEMPORARY TABLE t2_56228; -DROP TEMPORARY TABLE IF EXISTS t1_56228; -Warnings: -Note 1051 Unknown table 'test.t1_56228' +ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger +CREATE PROCEDURE bug56228() +BEGIN +INSERT INTO t1_56228 VALUES(NULL); +INSERT INTO t2_56228 VALUES(NULL); +INSERT INTO t1_56228 VALUES(NULL); +INSERT INTO t2_56228 VALUES(NULL); +DROP TABLE t1_56228; +END // +CALL bug56228(); +DROP PROCEDURE bug56228; +DROP TABLE t2_56228; diff --git a/mysql-test/suite/innodb/r/innodb-wl5522-1.result b/mysql-test/suite/innodb/r/innodb-wl5522-1.result index 42c0631dd29..72d7268244f 100644 --- a/mysql-test/suite/innodb/r/innodb-wl5522-1.result +++ b/mysql-test/suite/innodb/r/innodb-wl5522-1.result @@ -659,6 +659,8 @@ NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 15000 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 16000 ALTER TABLE testdb_wl5522.t1 ADD INDEX idx1 (col_1); ALTER TABLE testdb_wl5522.t1 ADD INDEX idx6 (col_1(255)); +Warnings: +Note 1831 Duplicate index `idx6`. This is deprecated and will be disallowed in a future release ALTER TABLE testdb_wl5522.t1 ADD INDEX idx10 (col_10(255)); SELECT col_1 = REPEAT("col1_00001",10), diff --git a/mysql-test/suite/innodb/r/innodb.result b/mysql-test/suite/innodb/r/innodb.result index 6d92ab089fd..b3954f1318a 100644 --- a/mysql-test/suite/innodb/r/innodb.result +++ b/mysql-test/suite/innodb/r/innodb.result @@ -3338,3 +3338,9 @@ Table Op Msg_type Msg_text test.t1 check status OK ALTER TABLE t1 FORCE; DROP TABLE t1; +# +# MDEV-35723: applying zero offset to null pointer on INSERT +# +CREATE TABLE t1(c TEXT(1) NOT NULL, INDEX (c)) ENGINE=InnoDB; +INSERT INTO t1 SET c=''; +DROP TABLE t1; diff --git a/mysql-test/suite/innodb/t/auto_increment_lock_mode.combinations b/mysql-test/suite/innodb/t/auto_increment_lock_mode.combinations new file mode 100644 index 00000000000..efaee252a4e --- /dev/null +++ b/mysql-test/suite/innodb/t/auto_increment_lock_mode.combinations @@ -0,0 +1,6 @@ +[old] +--innodb-autoinc-lock-mode=0 +[new] +--innodb-autoinc-lock-mode=1 +[none] +--innodb-autoinc-lock-mode=2 diff --git a/mysql-test/suite/innodb/t/auto_increment_lock_mode.test b/mysql-test/suite/innodb/t/auto_increment_lock_mode.test new file mode 100644 index 00000000000..27497960e72 --- /dev/null +++ b/mysql-test/suite/innodb/t/auto_increment_lock_mode.test @@ -0,0 +1,61 @@ +--source include/have_innodb.inc + +CREATE TABLE t1(a TINYINT UNSIGNED AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDB; +CREATE TABLE t2(a TINYINT UNSIGNED AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDB; +CREATE TABLE t3(a TINYINT UNSIGNED AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDB; +CREATE TABLE t4(a TINYINT UNSIGNED AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDB; +CREATE TABLE t5(a TINYINT UNSIGNED AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDB; +CREATE TABLE t6(a SERIAL, b INT) ENGINE=InnoDB; + +DELIMITER $$; +CREATE FUNCTION p1() RETURNS INT +BEGIN + INSERT INTO t1() VALUES(); + INSERT INTO t2() VALUES(); + INSERT INTO t3() VALUES(); + INSERT INTO t4() VALUES(); + INSERT INTO t5() VALUES(); + RETURN 1; +END$$ +DELIMITER ;$$ + +INSERT INTO t6(b) SELECT p1(); + +UPDATE t1,t2,t3,t4,t5 SET t1.a=2,t2.a=2,t3.a=2,t4.a=2,t5.a=2; +SELECT * FROM t1; +--source include/count_sessions.inc + +--connect(con1,localhost,root,,) +let $ID1= `SELECT @id := CONNECTION_ID()`; +--connect(con2,localhost,root,,) +let $ID2= `SELECT @id := CONNECTION_ID()`; +--connect(con3,localhost,root,,) +let $ID3= `SELECT @id := CONNECTION_ID()`; +--connection con1 +send INSERT INTO t6(b) SELECT SLEEP(p1()); +--connection con2 +send INSERT INTO t6(b) SELECT SLEEP(p1()); +--connection con3 +send UPDATE t1,t2,t3,t4,t5 SET t1.a=0,t2.a=0,t3.a=0,t4.a=0,t5.a=0 +WHERE t1.a=2 AND t2.a=2 AND t3.a=2 AND t4.a=2 AND t5.a=2; +--connection default +evalp KILL QUERY $ID1; +evalp KILL QUERY $ID2; +evalp KILL QUERY $ID3; +--connection con1 +--error 0,ER_QUERY_INTERRUPTED,ER_AUTOINC_READ_FAILED +--reap +--disconnect con1 +--connection con2 +--error 0,ER_QUERY_INTERRUPTED,ER_AUTOINC_READ_FAILED +--reap +--disconnect con2 +--connection con3 +--error 0,ER_QUERY_INTERRUPTED,ER_AUTOINC_READ_FAILED +--reap +--disconnect con3 +--connection default + +DROP FUNCTION p1; +DROP TABLE t1,t2,t3,t4,t5,t6; +--source include/wait_until_count_sessions.inc diff --git a/mysql-test/suite/innodb/t/foreign_key.test b/mysql-test/suite/innodb/t/foreign_key.test index 4b0dcc97e58..22fe7562558 100644 --- a/mysql-test/suite/innodb/t/foreign_key.test +++ b/mysql-test/suite/innodb/t/foreign_key.test @@ -4,6 +4,7 @@ --disable_query_log call mtr.add_suppression("InnoDB: Transaction was aborted due to "); +call mtr.add_suppression("Invalid \\(old\\?\\) table or database name '#mysql50#d-b'"); --enable_query_log SET GLOBAL innodb_stats_persistent = 0; @@ -141,9 +142,6 @@ INSERT INTO child SET a=1; --error ER_ROW_IS_REFERENCED_2 DELETE FROM parent; ALTER TABLE child ADD INDEX(a); ---error ER_ROW_IS_REFERENCED_2 -DELETE FROM parent; -ALTER TABLE child FORCE; DELETE FROM parent; DROP TABLE child,parent; @@ -1067,6 +1065,21 @@ alter table t2 add foreign key(a) references t1; show create table t2; drop tables t2, t1; + +--echo # +--echo # MDEV-29182 Assertion fld->field_no < table->n_v_def failed on cascade +--echo # +CREATE TABLE t1(a INT PRIMARY KEY, b VARCHAR(3), c INT AS (LENGTH(b)) VIRTUAL, + INDEX(c)) ENGINE=InnoDB; +CREATE TABLE t2(a INT REFERENCES t1(a) ON UPDATE CASCADE, + b INT GENERATED ALWAYS AS(a) VIRTUAL, INDEX(b)) ENGINE=InnoDB; +INSERT INTO t1 SET a=1,b='fu'; +INSERT INTO t2 SET a=1; +UPDATE t1 SET a=2,b='bar'; +SELECT * FROM t1; +SELECT * FROM t2; +DROP TABLE t2,t1; + --echo # End of 10.5 tests --echo # @@ -1188,6 +1201,50 @@ CHECK TABLE binaries, collections EXTENDED; # Cleanup DROP TABLE binaries, collections; +CREATE SCHEMA `#mysql50##mysql50#d-b`; +CREATE TABLE `#mysql50##mysql50#d-b`.t1 (a INT PRIMARY KEY, b INT UNIQUE) engine=InnoDB; +USE `#mysql50##mysql50#d-b`; +CREATE TABLE t2 (a INT PRIMARY KEY, b INT UNIQUE REFERENCES t1(b)) ENGINE=InnoDB; +SET STATEMENT foreign_key_checks=0 FOR +ALTER TABLE t2 ADD FOREIGN KEY (a) REFERENCES t1(a); +SHOW CREATE TABLE t2; +INSERT INTO t1 SET a=1; +INSERT INTO t2 SET a=1; +--error ER_ROW_IS_REFERENCED_2 +DELETE FROM t1; +DELETE FROM t2; +DELETE FROM t1; +DROP DATABASE `#mysql50##mysql50#d-b`; +USE test; + +--echo # +--echo # MDEV-35962 CREATE INDEX fails to heal a FOREIGN KEY constraint +--echo # + +--error ER_CANT_CREATE_TABLE +CREATE TABLE t2 (b INT, FOREIGN KEY (b) REFERENCES t1(a)) ENGINE=InnoDB; +SET STATEMENT foreign_key_checks=0 FOR +CREATE TABLE t2 (b INT, FOREIGN KEY (b) REFERENCES t1(a)) ENGINE=InnoDB; +--error ER_CANT_CREATE_TABLE +CREATE TABLE t1 (a INT) ENGINE=InnoDB; +SET STATEMENT foreign_key_checks=0 FOR +CREATE TABLE t1 (a INT) ENGINE=InnoDB; +INSERT INTO t1 VALUES (1); +--error ER_NO_REFERENCED_ROW_2 +INSERT INTO t2 VALUES (1); +ALTER TABLE t1 ADD KEY(a), ALGORITHM=NOCOPY; +INSERT INTO t2 VALUES (1); +--error ER_DROP_INDEX_FK +DROP INDEX b ON t2; +SET STATEMENT foreign_key_checks=0 FOR +DROP INDEX b ON t2; +DELETE FROM t2; +--error ER_ROW_IS_REFERENCED_2 +DELETE FROM t1; +ALTER TABLE t2 ADD KEY(b), ALGORITHM=NOCOPY; +DELETE FROM t1; +DROP TABLE t2, t1; + --echo # End of 10.6 tests CREATE TABLE t1 diff --git a/mysql-test/suite/innodb/t/foreign_sql_mode.combinations b/mysql-test/suite/innodb/t/foreign_sql_mode.combinations new file mode 100644 index 00000000000..e84e17b06ac --- /dev/null +++ b/mysql-test/suite/innodb/t/foreign_sql_mode.combinations @@ -0,0 +1,2 @@ +[COPY] +[INPLACE] diff --git a/mysql-test/suite/innodb/t/foreign_sql_mode.test b/mysql-test/suite/innodb/t/foreign_sql_mode.test new file mode 100644 index 00000000000..1569348df07 --- /dev/null +++ b/mysql-test/suite/innodb/t/foreign_sql_mode.test @@ -0,0 +1,129 @@ +--source include/have_innodb.inc +--source alter_sql_mode.inc +call mtr.add_suppression("InnoDB: In ALTER TABLE .* has or is referenced in foreign key constraints which are not compatible with the new table definition."); + +let $combination=`select regexp_replace('$MTR_COMBINATIONS', 'innodb,\|,innodb', '')`; + +let $copy_algo=`select ((strcmp(substring_index('$combination', ",", 1), "COPY") = 0) or (strcmp(substring_index('$combination', ",", -1), "COPY") = 0))`; + +let $inplace_algo=`select ((strcmp(substring_index('$combination', ",", 1), "INPLACE") = 0) or (strcmp(substring_index('$combination', ",", -1), "INPLACE") = 0))`; + +let $algorithm=COPY; +if ($inplace_algo) +{ + let $algorithm=INPLACE; +} +let $sql_mode = `SELECT @@SQL_MODE`; +let $error_code = 0; +if ($sql_mode == "STRICT_TRANS_TABLES") { + let $error_code = ER_FK_COLUMN_NOT_NULL; +} + +--echo # modify child column NOT NULL on UPDATE CASCADE..parent column NULL +CREATE TABLE t1(f1 INT, f2 INT, PRIMARY KEY(f1), KEY(f2))ENGINE=InnoDB; +CREATE TABLE t2(f1 INT, FOREIGN KEY(f1) REFERENCES t1(f2) ON UPDATE CASCADE)ENGINE=InnoDB; +replace_result ,ALGORITHM=COPY '' ,ALGORITHM=INPLACE ''; +--error $error_code +eval ALTER TABLE t2 MODIFY COLUMN f1 INT NOT NULL,ALGORITHM=$algorithm; +INSERT INTO t1 VALUES(1, 1); +INSERT INTO t2 VALUES(1); + +let $dml_error_code = ER_ROW_IS_REFERENCED_2; +if ($sql_mode == "STRICT_TRANS_TABLES") +{ + let $dml_error_code = 0; +} + +--error $dml_error_code +UPDATE t1 SET f2= NULL; +DELETE FROM t2; +SELECT * FROM t1; +UPDATE t1 SET f2 = NULL; +SELECT * FROM t1; +DROP TABLE t2, t1; + +let $error_code= ER_ERROR_ON_RENAME; +if ($algorithm == "INPLACE") +{ + let $error_code= ER_FK_COLUMN_NOT_NULL; +} + +if ($sql_mode == "STRICT_TRANS_TABLES") +{ + let $error_code = ER_FK_COLUMN_NOT_NULL; +} + +# Modifying referenced column from NULL to NOT NULL fails when foreign +# clause is ON UPDATE SET NULL or ON DELETE SET NULL irrespective +# of SQL_MODE variable. This is the behaviour even before MDEV-34392 + +--echo # modify child column NOT NULL ON UPDATE SET NULL +CREATE TABLE t1(f1 INT, f2 INT, PRIMARY KEY(f1), KEY(f2))ENGINE=InnoDB; +CREATE TABLE t2(f1 INT, f2 INT, FOREIGN KEY(f1) REFERENCES t1(f1) ON UPDATE SET NULL)ENGINE=InnoDB; +replace_result ,ALGORITHM=COPY '' ,ALGORITHM=INPLACE ''; +--replace_regex /Error on rename of '.*' to '.*'/Error on rename of 'OLD_FILE_NAME' to 'NEW_FILE_NAME'/ +--error $error_code +eval ALTER TABLE t2 MODIFY COLUMN f1 INT NOT NULL,ALGORITHM=$algorithm; +INSERT INTO t1 VALUES(1, 1); +INSERT INTO t2 VALUES(1, 1); +UPDATE t1 SET f1= 2; +SELECT * FROM t2; +DROP TABLE t2, t1; + +--echo # modify child column NOT NULL ON DELETE SET NULL +CREATE TABLE t1(f1 INT, f2 INT, PRIMARY KEY(f1), KEY(f2))ENGINE=InnoDB; +CREATE TABLE t2(f1 INT, f2 INT, FOREIGN KEY (f2) REFERENCES t1(f2) ON DELETE SET NULL)ENGINE=InnoDB; +replace_result ,ALGORITHM=COPY '' ,ALGORITHM=INPLACE ''; +--replace_regex /Error on rename of '.*' to '.*'/Error on rename of 'OLD_FILE_NAME' to 'NEW_FILE_NAME'/ +--error $error_code +eval ALTER TABLE t2 MODIFY COLUMN f2 INT NOT NULL,ALGORITHM=$algorithm; +DROP TABLE t2, t1; + +if ($sql_mode == "STRICT_TRANS_TABLES") +{ + let $dml_error_code = ER_BAD_NULL_ERROR; +} + +let $error_code= 0; +if ($sql_mode == "STRICT_TRANS_TABLES") +{ + let $error_code = ER_FK_COLUMN_CANNOT_CHANGE_CHILD; +} + +--echo # modify parent column NULL ON UPDATE CASCADE child column NOT NULL +CREATE TABLE `t#1`(f1 INT, f2 INT NOT NULL, PRIMARY KEY(f1), KEY(f2))ENGINE=InnoDB; +CREATE TABLE `t#2`(f1 INT NOT NULL, + FOREIGN KEY(f1) REFERENCES `t#1`(f2) + ON UPDATE CASCADE)ENGINE=InnoDB; +replace_result ,ALGORITHM=COPY '' ,ALGORITHM=INPLACE ''; +--error $error_code +eval ALTER TABLE `t#1` MODIFY COLUMN f2 INT,ALGORITHM=$algorithm; +INSERT INTO `t#1` VALUES(1, 1); +INSERT INTO `t#2` VALUES(1); +--error $dml_error_code +UPDATE `t#1` SET f2= NULL; +DELETE FROM `t#2`; +SELECT * FROM `t#1`; +DROP TABLE `t#2`, `t#1`; + +let $error_code= 0; +if ($sql_mode == "STRICT_TRANS_TABLES") +{ + let $error_code = ER_CANT_CREATE_TABLE; +} + +CREATE TABLE t1(f1 INT NOT NULL AUTO_INCREMENT, + f2 INT DEFAULT NULL, + PRIMARY KEY(f1), + FOREIGN KEY(f2) REFERENCES t1(f1))ENGINE=InnoDB; +--error $error_code +CREATE TABLE t2 (f1 INT NOT NULL, + f2 INT NOT NULL, + f3 INT DEFAULT NULL, + PRIMARY KEY(f1, f2), + FOREIGN KEY(f2, f3) REFERENCES t1(f2, f1) + ON UPDATE CASCADE)ENGINE=InnoDB; +--disable_warnings +DROP TABLE IF EXISTS t2; +--enable_warnings +DROP TABLE IF EXISTS t1; diff --git a/mysql-test/suite/innodb/t/innodb-autoinc-56228.test b/mysql-test/suite/innodb/t/innodb-autoinc-56228.test index a02f7b4383a..e1d8741c730 100644 --- a/mysql-test/suite/innodb/t/innodb-autoinc-56228.test +++ b/mysql-test/suite/innodb/t/innodb-autoinc-56228.test @@ -2,33 +2,45 @@ ## # Bug #56228: dropping tables from within an active statement crashes server # -DROP TABLE IF EXISTS t1_56228; -DROP TABLE IF EXISTS t2_56228; -DROP FUNCTION IF EXISTS bug56228; -CREATE TEMPORARY TABLE t1_56228( +# This test used to use TEMPORARY TABLE, which before MySQL 5.7 or +# MariaDB Server 10.2 were covered by InnoDB locks. +# In MariaDB Server 10.6, the locking and logging was corrected for Atomic DDL. +# Hence, even if we tweaked create_table_info_t::innobase_table_flags() +# so that TEMPORARY TABLE are created as persistent tables, +# the DROP TEMPORARY TABLE statement inside the function would +# fail due to HA_ERR_LOCK_WAIT_TIMEOUT, instead of breaking locks +# like it used to do before MDEV-26603 and possibly other changes. +CREATE TABLE t1_56228( c1 iNT AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDB; -CREATE TEMPORARY TABLE t2_56228( +CREATE TABLE t2_56228( c1 iNT AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDB; DELIMITER //; +--error ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG CREATE FUNCTION bug56228() RETURNS INT DETERMINISTIC BEGIN INSERT INTO t1_56228 VALUES(NULL); INSERT INTO t2_56228 VALUES(NULL); INSERT INTO t1_56228 VALUES(NULL); INSERT INTO t2_56228 VALUES(NULL); - DROP TEMPORARY TABLE t1_56228; + DROP TABLE t1_56228; RETURN 42; END // +CREATE PROCEDURE bug56228() +BEGIN + INSERT INTO t1_56228 VALUES(NULL); + INSERT INTO t2_56228 VALUES(NULL); + INSERT INTO t1_56228 VALUES(NULL); + INSERT INTO t2_56228 VALUES(NULL); + DROP TABLE t1_56228; +END // + DELIMITER ;// ---disable_ps_protocol -SELECT bug56228(); ---enable_ps2_protocol +CALL bug56228(); -DROP FUNCTION bug56228; -DROP TEMPORARY TABLE t2_56228; -DROP TEMPORARY TABLE IF EXISTS t1_56228; +DROP PROCEDURE bug56228; +DROP TABLE t2_56228; diff --git a/mysql-test/suite/innodb/t/innodb.test b/mysql-test/suite/innodb/t/innodb.test index 30797d3ae56..4652370dedf 100644 --- a/mysql-test/suite/innodb/t/innodb.test +++ b/mysql-test/suite/innodb/t/innodb.test @@ -2609,3 +2609,10 @@ CHECK TABLE t1; ALTER TABLE t1 FORCE; # Cleanup DROP TABLE t1; + +--echo # +--echo # MDEV-35723: applying zero offset to null pointer on INSERT +--echo # +CREATE TABLE t1(c TEXT(1) NOT NULL, INDEX (c)) ENGINE=InnoDB; +INSERT INTO t1 SET c=''; +DROP TABLE t1; diff --git a/mysql-test/suite/innodb_gis/r/1.result b/mysql-test/suite/innodb_gis/r/1.result index 1edea5ceadc..c3a2ddbae84 100644 --- a/mysql-test/suite/innodb_gis/r/1.result +++ b/mysql-test/suite/innodb_gis/r/1.result @@ -1075,6 +1075,8 @@ col1 POINT, col2 POINT ); CREATE SPATIAL INDEX idx0 ON t2 (col1, col2); +ERROR 42000: Key column 'col1' doesn't exist in table +CREATE SPATIAL INDEX idx0 ON t2 (col0, col2); ERROR HY000: Incorrect arguments to SPATIAL INDEX CREATE TABLE t4 ( col0 INTEGER NOT NULL, diff --git a/mysql-test/suite/innodb_gis/r/point_basic.result b/mysql-test/suite/innodb_gis/r/point_basic.result index f58198395e4..00921c122a7 100644 --- a/mysql-test/suite/innodb_gis/r/point_basic.result +++ b/mysql-test/suite/innodb_gis/r/point_basic.result @@ -1562,7 +1562,7 @@ ALTER TABLE child ADD FOREIGN KEY(p) REFERENCES parent(p); ERROR HY000: Can't create table `test`.`child` (errno: 150 "Foreign key constraint is incorrectly formed") show warnings; Level Code Message -Warning 150 Alter table `test`.`child` with foreign key (p) constraint failed. There is no index in the referenced table where the referenced columns appear as the first columns. +Warning 150 Alter table `test`.`child` with foreign key (p) constraint failed. There is only prefix index in the referenced table where the referenced columns appear as the first columns. Error 1005 Can't create table `test`.`child` (errno: 150 "Foreign key constraint is incorrectly formed") Warning 1215 Cannot add foreign key constraint for `child` ALTER TABLE parent DROP INDEX idx1; @@ -1570,7 +1570,7 @@ ALTER TABLE child ADD FOREIGN KEY(p) REFERENCES parent(p); Got one of the listed errors show warnings; Level Code Message -Warning 150 Alter table `test`.`child` with foreign key (p) constraint failed. There is no index in the referenced table where the referenced columns appear as the first columns. +Warning 150 Alter table `test`.`child` with foreign key (p) constraint failed. There is only prefix index in the referenced table where the referenced columns appear as the first columns. Error 1005 Can't create table `test`.`child` (errno: 150 "Foreign key constraint is incorrectly formed") Warning 1215 Cannot add foreign key constraint for `child` ALTER TABLE child DROP INDEX idx2; diff --git a/mysql-test/suite/innodb_gis/t/1.test b/mysql-test/suite/innodb_gis/t/1.test index c3a270c9ec2..5d14814266f 100644 --- a/mysql-test/suite/innodb_gis/t/1.test +++ b/mysql-test/suite/innodb_gis/t/1.test @@ -839,8 +839,10 @@ CREATE TABLE t3 ( ); # --error ER_TOO_MANY_KEY_PARTS ---error ER_WRONG_ARGUMENTS +--error ER_KEY_COLUMN_DOES_NOT_EXIST CREATE SPATIAL INDEX idx0 ON t2 (col1, col2); +--error ER_WRONG_ARGUMENTS +CREATE SPATIAL INDEX idx0 ON t2 (col0, col2); CREATE TABLE t4 ( diff --git a/mysql-test/suite/innodb_zip/r/index_large_prefix_8k.result b/mysql-test/suite/innodb_zip/r/index_large_prefix_8k.result index 925bd3f8f9c..4451b149406 100644 --- a/mysql-test/suite/innodb_zip/r/index_large_prefix_8k.result +++ b/mysql-test/suite/innodb_zip/r/index_large_prefix_8k.result @@ -171,9 +171,11 @@ Note 1071 Specified key was too long; max key length is 1536 bytes create index idx3 on worklog5743_8(a2(3072)); Warnings: Note 1071 Specified key was too long; max key length is 1536 bytes +Note 1831 Duplicate index `idx3`. This is deprecated and will be disallowed in a future release show warnings; Level Code Message Note 1071 Specified key was too long; max key length is 1536 bytes +Note 1831 Duplicate index `idx3`. This is deprecated and will be disallowed in a future release create index idx4 on worklog5743_8(a1, a2(1533)); ERROR 42000: Specified key was too long; max key length is 1536 bytes show warnings; @@ -355,6 +357,7 @@ Note 1071 Specified key was too long; max key length is 1536 bytes create index idx2 on worklog5743(a(3072)); Warnings: Note 1071 Specified key was too long; max key length is 1536 bytes +Note 1831 Duplicate index `idx2`. This is deprecated and will be disallowed in a future release SET sql_mode= default; show create table worklog5743; Table Create Table diff --git a/mysql-test/suite/parts/r/alter_table.result b/mysql-test/suite/parts/r/alter_table.result index 8f633370b47..82d200e1dca 100644 --- a/mysql-test/suite/parts/r/alter_table.result +++ b/mysql-test/suite/parts/r/alter_table.result @@ -38,6 +38,20 @@ ALTER TABLE v1 EXCHANGE PARTITION p2 WITH TABLE t2 ; ERROR 42000: Can't open table DROP VIEW v1; DROP TABLE t1, t2; +# +# MDEV-34813 ALGORITHM=INSTANT does not work for partitioned tables on indexed column +# +CREATE TABLE `t1` ( +`f1` datetime , +`f2` VARCHAR(2) , +`f3` VARCHAR(200) , +`f4` VARCHAR(100) , +INDEX `i3` (`f4`) ) +PARTITION BY RANGE COLUMNS(`f2`) +(PARTITION `p_01` VALUES LESS THAN ('02') ENGINE = InnoDB, +PARTITION `p_31` VALUES LESS THAN (MAXVALUE) ENGINE = InnoDB); +ALTER online TABLE t1 MODIFY COLUMN `f4` VARCHAR(500) , ALGORITHM=INSTANT, LOCK=NONE; +drop table t1; # End of 10.5 tests # # MDEV-22165 CONVERT PARTITION: move in partition from existing table diff --git a/mysql-test/suite/parts/t/alter_table.test b/mysql-test/suite/parts/t/alter_table.test index 9c131c733eb..810d5cd2cd6 100644 --- a/mysql-test/suite/parts/t/alter_table.test +++ b/mysql-test/suite/parts/t/alter_table.test @@ -44,6 +44,25 @@ ALTER TABLE v1 EXCHANGE PARTITION p2 WITH TABLE t2 ; DROP VIEW v1; DROP TABLE t1, t2; +--echo # +--echo # MDEV-34813 ALGORITHM=INSTANT does not work for partitioned tables on indexed column +--echo # + +--source include/have_innodb.inc +CREATE TABLE `t1` ( + `f1` datetime , + `f2` VARCHAR(2) , + `f3` VARCHAR(200) , + `f4` VARCHAR(100) , + INDEX `i3` (`f4`) ) + PARTITION BY RANGE COLUMNS(`f2`) + (PARTITION `p_01` VALUES LESS THAN ('02') ENGINE = InnoDB, + PARTITION `p_31` VALUES LESS THAN (MAXVALUE) ENGINE = InnoDB); + +ALTER online TABLE t1 MODIFY COLUMN `f4` VARCHAR(500) , ALGORITHM=INSTANT, LOCK=NONE; + +drop table t1; + --echo # End of 10.5 tests --echo # diff --git a/mysql-test/suite/perfschema/r/threads_innodb.result b/mysql-test/suite/perfschema/r/threads_innodb.result index d79420f6fb5..abfedb57644 100644 --- a/mysql-test/suite/perfschema/r/threads_innodb.result +++ b/mysql-test/suite/perfschema/r/threads_innodb.result @@ -6,4 +6,5 @@ WHERE name LIKE 'thread/innodb/%' GROUP BY name; name type processlist_user processlist_host processlist_db processlist_command processlist_time processlist_state processlist_info parent_thread_id role instrumented thread/innodb/page_cleaner_thread BACKGROUND NULL NULL NULL NULL NULL NULL NULL NULL NULL YES +thread/innodb/page_encrypt_thread BACKGROUND NULL NULL NULL NULL NULL NULL NULL NULL NULL YES thread/innodb/thread_pool_thread BACKGROUND NULL NULL NULL NULL NULL NULL NULL NULL NULL YES diff --git a/mysql-test/suite/perfschema/t/threads_innodb.opt b/mysql-test/suite/perfschema/t/threads_innodb.opt new file mode 100644 index 00000000000..bd33f76701e --- /dev/null +++ b/mysql-test/suite/perfschema/t/threads_innodb.opt @@ -0,0 +1 @@ +--innodb-encryption-threads=2 diff --git a/mysql-test/suite/roles/definer.result b/mysql-test/suite/roles/definer.result index 41f1ec5e822..2a01548cffd 100644 --- a/mysql-test/suite/roles/definer.result +++ b/mysql-test/suite/roles/definer.result @@ -285,32 +285,32 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l USE `test`; SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +SET character_set_client = utf8mb4; /*!50001 CREATE VIEW `v1` AS SELECT 1 AS `a+b`, 1 AS `c` */; SET character_set_client = @saved_cs_client; SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +SET character_set_client = utf8mb4; /*!50001 CREATE VIEW `v2` AS SELECT 1 AS `a+b`, 1 AS `c`, 1 AS `current_role()` */; SET character_set_client = @saved_cs_client; SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +SET character_set_client = utf8mb4; /*!50001 CREATE VIEW `v3` AS SELECT 1 AS `a+b`, 1 AS `c` */; SET character_set_client = @saved_cs_client; SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +SET character_set_client = utf8mb4; /*!50001 CREATE VIEW `v4` AS SELECT 1 AS `a+b`, 1 AS `c` */; SET character_set_client = @saved_cs_client; SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; +SET character_set_client = utf8mb4; /*!50001 CREATE VIEW `v5` AS SELECT 1 AS `a+b`, 1 AS `c` */; @@ -320,7 +320,7 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest1` /*!40100 DEFAULT CHARACTER USE `mysqltest1`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL, @@ -331,7 +331,7 @@ INSERT INTO `t1` VALUES (1,10,100), (2,20,200); /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t2` ( `a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL, diff --git a/mysql-test/suite/rpl/r/rpl_from_mysql80.result b/mysql-test/suite/rpl/r/rpl_from_mysql80.result index 95ce1a78cfb..1fac65adbad 100644 --- a/mysql-test/suite/rpl/r/rpl_from_mysql80.result +++ b/mysql-test/suite/rpl/r/rpl_from_mysql80.result @@ -11,8 +11,6 @@ START SLAVE IO_THREAD; include/wait_for_slave_io_to_start.inc START SLAVE UNTIL Master_log_file='master-bin.000001', Master_log_pos= 1178; SELECT MASTER_POS_WAIT('master-bin.000001', 1178, 60); -MASTER_POS_WAIT('master-bin.000001', 1178, 60) -NULL SELECT * FROM t1 ORDER BY a; a b c 1 0 diff --git a/mysql-test/suite/rpl/r/rpl_system_versioning_partitions.result b/mysql-test/suite/rpl/r/rpl_system_versioning_partitions.result new file mode 100644 index 00000000000..8edc6996a05 --- /dev/null +++ b/mysql-test/suite/rpl/r/rpl_system_versioning_partitions.result @@ -0,0 +1,71 @@ +include/master-slave.inc +[connection master] +# +# Initialize system-versioned and partitioned table and its data +connection master; +SET timestamp=UNIX_TIMESTAMP('2025-01-01 01:00:00.000000'); +RESET MASTER; +create table t1 (x int) engine=InnoDB with system versioning partition by system_time limit 3 partitions 5; +insert into t1 values(1); +insert into t1 values(2); +insert into t1 values(3); +insert into t1 values(4); +insert into t1 values(5); +# Verifying master partitions are correct after data insertion.. +# .. done +connection slave; +connection slave; +# Verifying partitions of master and slave match on data setup.. +# .. done +# +# "Delete" each row -- these are the BINLOG commands generated by +# mysqlbinlog from `delete from t1 where x=` statments. Because the +# table uses system versioning and system_time partition, the actual +# events are updates, with added fields for the `row_start` and `row_end` +# columns. +connection master; +# BINLOG for Format Description event +BINLOG ' +APZ0Zw8BAAAA/AAAAAABAAAAAAQAMTAuNi4yMS1NYXJpYURCLWRlYnVnLWxvZwAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAA9nRnEzgNAAgAEgAEBAQEEgAA5AAEGggAAAAICAgCAAAACgoKAAAAAAAA +CgoKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAEEwQADQgICAoKCgHgiCNP +'; +# BINLOG for delete from t1 where x=1; +BINLOG ' +APZ0ZxMBAAAAMQAAAAQHAAAAACEAAAAAAAEABHRlc3QAAnQxAAMDERECBgYBvaHPfA== +APZ0ZxgBAAAASAAAAEwHAAAAACEAAAAAAAEAAwcH+AEAAABndPYAAAAAf////w9CP/gBAAAAZ3T2 +AAAAAGd09gAAAADnhA23 +'; +# BINLOG for delete from t1 where x=2; +BINLOG ' +APZ0ZxMBAAAAMQAAAPUHAAAAACEAAAAAAAEABHRlc3QAAnQxAAMDERECBgYBwNtQNQ== +APZ0ZxgBAAAASAAAAD0IAAAAACEAAAAAAAEAAwcH+AIAAABndPYAAAAAf////w9CP/gCAAAAZ3T2 +AAAAAGd09gAAAABPYZUX +'; +# BINLOG for delete from t1 where x=3; +BINLOG ' +APZ0ZxMBAAAAMQAAAOYIAAAAACEAAAAAAAEABHRlc3QAAnQxAAMDERECBgYBKWGevg== +APZ0ZxgBAAAASAAAAC4JAAAAACEAAAAAAAEAAwcH+AMAAABndPYAAAAAf////w9CP/gDAAAAZ3T2 +AAAAAGd09gAAAAD0hz5S +'; +# BINLOG for delete from t1 where x=4; +BINLOG ' +APZ0ZxMBAAAAMQAAANcJAAAAACEAAAAAAAEABHRlc3QAAnQxAAMDERECBgYBaT9IZg== +APZ0ZxgBAAAASAAAAB8KAAAAACEAAAAAAAEAAwcH+AQAAABndPYAAAAAf////w9CP/gEAAAAZ3T2 +AAAAAGd09gAAAADA4Tdx +'; +# BINLOG for delete from t1 where x=5; +BINLOG ' +APZ0ZxMBAAAAMQAAAMgKAAAAACEAAAAAAAEABHRlc3QAAnQxAAMDERECBgYBMk64Mw== +APZ0ZxgBAAAASAAAABALAAAAACEAAAAAAAEAAwcH+AUAAABndPYAAAAAf////w9CP/gFAAAAZ3T2 +AAAAAGd09gAAAAA5blY6 +'; +# Verifying master partitions are correct after deletion BINLOG stmts.. +# .. done +connection slave; +connection slave; +connection master; +drop table t1; +include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_from_mysql80.test b/mysql-test/suite/rpl/t/rpl_from_mysql80.test index ec4a22056f9..a5723486ee9 100644 --- a/mysql-test/suite/rpl/t/rpl_from_mysql80.test +++ b/mysql-test/suite/rpl/t/rpl_from_mysql80.test @@ -81,7 +81,9 @@ START SLAVE IO_THREAD; # The position 1178 is the start of: INSERT INTO t1 VALUES (4, 0, 'skip'); # After that comes unknown MySQL 8.0 events, which we test error for below. START SLAVE UNTIL Master_log_file='master-bin.000001', Master_log_pos= 1178; +--disable_result_log SELECT MASTER_POS_WAIT('master-bin.000001', 1178, 60); +--enable_result_log SELECT * FROM t1 ORDER BY a; --source include/wait_for_slave_sql_to_stop.inc diff --git a/mysql-test/suite/rpl/t/rpl_parallel_gco_wait_kill.test b/mysql-test/suite/rpl/t/rpl_parallel_gco_wait_kill.test index c34c4f20dc0..8414b31947a 100644 --- a/mysql-test/suite/rpl/t/rpl_parallel_gco_wait_kill.test +++ b/mysql-test/suite/rpl/t/rpl_parallel_gco_wait_kill.test @@ -300,7 +300,7 @@ SET GLOBAL slave_parallel_threads=10; # Find the thread id of the driver SQL thread that we want to kill. --let $wait_condition= SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE LIKE '%Slave has read all relay log%' --source include/wait_condition.inc ---let $thd_id= `SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE LIKE '%relay log%'` +--let $thd_id= `SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND LIKE 'Slave_SQL'` SET @old_max_queued= @@GLOBAL.slave_parallel_max_queued; SET GLOBAL slave_parallel_max_queued=9000; diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync_no_missed_ack_after_add_slave.test b/mysql-test/suite/rpl/t/rpl_semi_sync_no_missed_ack_after_add_slave.test index 9d8f87b4345..1a7b3abfde0 100644 --- a/mysql-test/suite/rpl/t/rpl_semi_sync_no_missed_ack_after_add_slave.test +++ b/mysql-test/suite/rpl/t/rpl_semi_sync_no_missed_ack_after_add_slave.test @@ -86,6 +86,10 @@ if (`SELECT $slave1_sent_ack`) --connection server_3 --echo # Verifying server_3 did send ACK +--let $status_var= Rpl_semi_sync_slave_send_ack +--let $status_var_comparsion= > +--let $status_var_value= 0 +--source include/wait_for_status_var.inc --let $slave2_sent_ack= query_get_value(SHOW STATUS LIKE 'rpl_semi_sync_slave_send_ack', Value, 1) if (`SELECT NOT $slave2_sent_ack`) { diff --git a/mysql-test/suite/rpl/t/rpl_system_versioning_partitions.cnf b/mysql-test/suite/rpl/t/rpl_system_versioning_partitions.cnf new file mode 100644 index 00000000000..53153614f0a --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_system_versioning_partitions.cnf @@ -0,0 +1,4 @@ +!include ../my.cnf + +[mysqld] +default_time_zone="-7:00" diff --git a/mysql-test/suite/rpl/t/rpl_system_versioning_partitions.test b/mysql-test/suite/rpl/t/rpl_system_versioning_partitions.test new file mode 100644 index 00000000000..70103acf862 --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_system_versioning_partitions.test @@ -0,0 +1,248 @@ +# +# Ensure that executing row-injected events (i.e. via BINLOG statments and +# row-based binlog events) uses historical partitions. That is, for tables +# which use system versioning and system_time partitions, MDEV-35096 reported +# that row-injected events would not be stored into the correct historical +# partition. This test considers both use cases of row-injected events. +# +# The test setup creates a system-versioned table with system_time-based +# partitioning and fills the table up with enough records that bypass the size +# limit of each historical partition. +# +# To test BINLOG statements, a series of BINLOG statements are used to delete +# all the records in the test tables, and the resulting partitions are analyzed +# to ensure that they match the partition specification. The BINLOG events +# were collected by running an original set of delete statements on the table +# data, and taking their binlog data from mysqlbinlog. Note these binary log +# events are actually Update events, because system versioning just archives +# the rows, rather than deleting them. +# +# To test row-based event replication, a slave replicates the master's +# events, and the partitions are compared between the slave and master for +# consistency. +# +# Note that the TIMESTAMP of this test is fixed so the BINLOG statements can +# identify the correct rows to delete (system versioning adds implicit fields +# `row_start` and `row_end`, which are automatically populated using the current +# timestamp). +# +# +# References: +# MDEV-35096: History is stored in different partitions on different nodes +# when using SYSTEM VERSION +# +--source include/have_binlog_format_row.inc +--source include/master-slave.inc +--source include/have_innodb.inc +--source include/have_partition.inc + +--echo # +--echo # Initialize system-versioned and partitioned table and its data +--connection master + +# Fix the timestamp for the system versioned row_start and row_end fields, so +# the later hard-coded BINLOG base64 data can find the rows. +SET timestamp=UNIX_TIMESTAMP('2025-01-01 01:00:00.000000'); +RESET MASTER; + +create table t1 (x int) engine=InnoDB with system versioning partition by system_time limit 3 partitions 5; +insert into t1 values(1); +insert into t1 values(2); +insert into t1 values(3); +insert into t1 values(4); +insert into t1 values(5); +--let $master_total_size= `select count(*) from t1` +--let $master_p0_size= `select count(*) from t1 partition (p0)` +--let $master_p1_size= `select count(*) from t1 partition (p1)` +--let $master_p2_size= `select count(*) from t1 partition (p2)` + +--echo # Verifying master partitions are correct after data insertion.. +if ($master_total_size != 5) +{ + --echo # Master t1 count: $master_total_size + --die Master table t1 should have 5 entries +} +if ($master_p0_size) +{ + --echo # Master t1,p0 count: $master_p0_size + --die Master t1 partition p0 should be empty +} +if ($master_p1_size) +{ + --echo # Master t1,p1 count: $master_p1_size + --die Master t1 partition p1 should be empty +} +if ($master_p2_size) +{ + --echo # Master t1,p2 count: $master_p2_size + --die Master t1 partition p2 should be empty +} +--echo # .. done + +--sync_slave_with_master + +--connection slave +--let $slave_total_size= `select count(*) from t1` +--let $slave_p0_size= `select count(*) from t1 partition (p0)` +--let $slave_p1_size= `select count(*) from t1 partition (p1)` +--let $slave_p2_size= `select count(*) from t1 partition (p2)` + +--echo # Verifying partitions of master and slave match on data setup.. +if ($slave_total_size != $master_total_size) +{ + --connection master + select count(*) from t0; + --connection slave + select count(*) from t1; + --die Size of t1 differs between master and slave +} +if ($slave_p0_size != $master_p0_size) +{ + --connection master + select count(*) from t1 partition (p0); + --connection slave + select count(*) from t1 partition (p0); + --die Size of t1 partition p0 differs between master and slave +} +if ($slave_p1_size != $master_p1_size) +{ + --connection master + select count(*) from t1 partition (p1); + --connection slave + select count(*) from t1 partition (p1); + --die Size of t1 partition p1 differs between master and slave +} +if ($slave_p2_size != $master_p2_size) +{ + --connection master + select count(*) from t1 partition (p2); + --connection slave + select count(*) from t1 partition (p2); + --die Size of t1 partition p2 differs between master and slave +} +--echo # .. done + +--echo # +--echo # "Delete" each row -- these are the BINLOG commands generated by +--echo # mysqlbinlog from `delete from t1 where x=` statments. Because the +--echo # table uses system versioning and system_time partition, the actual +--echo # events are updates, with added fields for the `row_start` and `row_end` +--echo # columns. +--connection master + +--echo # BINLOG for Format Description event +BINLOG ' +APZ0Zw8BAAAA/AAAAAABAAAAAAQAMTAuNi4yMS1NYXJpYURCLWRlYnVnLWxvZwAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAA9nRnEzgNAAgAEgAEBAQEEgAA5AAEGggAAAAICAgCAAAACgoKAAAAAAAA +CgoKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAEEwQADQgICAoKCgHgiCNP +'; + +--echo # BINLOG for delete from t1 where x=1; +BINLOG ' +APZ0ZxMBAAAAMQAAAAQHAAAAACEAAAAAAAEABHRlc3QAAnQxAAMDERECBgYBvaHPfA== +APZ0ZxgBAAAASAAAAEwHAAAAACEAAAAAAAEAAwcH+AEAAABndPYAAAAAf////w9CP/gBAAAAZ3T2 +AAAAAGd09gAAAADnhA23 +'; + +--echo # BINLOG for delete from t1 where x=2; +BINLOG ' +APZ0ZxMBAAAAMQAAAPUHAAAAACEAAAAAAAEABHRlc3QAAnQxAAMDERECBgYBwNtQNQ== +APZ0ZxgBAAAASAAAAD0IAAAAACEAAAAAAAEAAwcH+AIAAABndPYAAAAAf////w9CP/gCAAAAZ3T2 +AAAAAGd09gAAAABPYZUX +'; + + +--echo # BINLOG for delete from t1 where x=3; +BINLOG ' +APZ0ZxMBAAAAMQAAAOYIAAAAACEAAAAAAAEABHRlc3QAAnQxAAMDERECBgYBKWGevg== +APZ0ZxgBAAAASAAAAC4JAAAAACEAAAAAAAEAAwcH+AMAAABndPYAAAAAf////w9CP/gDAAAAZ3T2 +AAAAAGd09gAAAAD0hz5S +'; + +--echo # BINLOG for delete from t1 where x=4; +BINLOG ' +APZ0ZxMBAAAAMQAAANcJAAAAACEAAAAAAAEABHRlc3QAAnQxAAMDERECBgYBaT9IZg== +APZ0ZxgBAAAASAAAAB8KAAAAACEAAAAAAAEAAwcH+AQAAABndPYAAAAAf////w9CP/gEAAAAZ3T2 +AAAAAGd09gAAAADA4Tdx +'; + +--echo # BINLOG for delete from t1 where x=5; +BINLOG ' +APZ0ZxMBAAAAMQAAAMgKAAAAACEAAAAAAAEABHRlc3QAAnQxAAMDERECBgYBMk64Mw== +APZ0ZxgBAAAASAAAABALAAAAACEAAAAAAAEAAwcH+AUAAABndPYAAAAAf////w9CP/gFAAAAZ3T2 +AAAAAGd09gAAAAA5blY6 +'; + +--let $master_total_size= `select count(*) from t1` +--let $master_p0_size= `select count(*) from t1 partition (p0)` +--let $master_p1_size= `select count(*) from t1 partition (p1)` +--let $master_p2_size= `select count(*) from t1 partition (p2)` +--echo # Verifying master partitions are correct after deletion BINLOG stmts.. +if ($master_total_size > 0) +{ + --echo # Master t1 count: $master_total_size + --die Master table t1 should have 0 count +} +if ($master_p0_size != 3) +{ + --echo # Master t1,p0 count: $master_p0_size + --die Master t1 partition p0 should have 3 entries +} +if ($master_p1_size != 2) +{ + --echo # Master t1,p1 count: $master_p1_size + --die Master t1 partition p1 should have 2 entries +} +if ($master_p2_size) +{ + --echo # Master t1,p2 count: $master_p2_size + --die Master t1 partition p2 should be empty +} +--echo # .. done +--sync_slave_with_master + +--connection slave +--let $slave_total_size= `select count(*) from t1` +--let $slave_p0_size= `select count(*) from t1 partition (p0)` +--let $slave_p1_size= `select count(*) from t1 partition (p1)` +--let $slave_p2_size= `select count(*) from t1 partition (p2)` + +if ($slave_total_size != $master_total_size) +{ + --connection master + select count(*) from t1; + --connection slave + select count(*) from t1; + --die Size of t1 differs between master and slave +} +if ($slave_p0_size != $master_p0_size) +{ + --connection master + select count(*) from t1 partition (p0); + --connection slave + select count(*) from t1 partition (p0); + --die Size of t1 partition p0 differs between master and slave +} +if ($slave_p1_size != $master_p1_size) +{ + --connection master + select count(*) from t1 partition (p1); + --connection slave + select count(*) from t1 partition (p1); + --die Size of t1 partition p1 differs between master and slave +} +if ($slave_p2_size != $master_p2_size) +{ + --connection master + select count(*) from t1 partition (p2); + --connection slave + select count(*) from t1 partition (p2); + --die Size of t1 partition p2 differs between master and slave +} + +--connection master +drop table t1; + +--source include/rpl_end.inc diff --git a/mysql-test/suite/s3/mysqldump.result b/mysql-test/suite/s3/mysqldump.result index 3d7b3b37771..ab792b15a0f 100644 --- a/mysql-test/suite/s3/mysqldump.result +++ b/mysql-test/suite/s3/mysqldump.result @@ -18,7 +18,7 @@ alter table t1 engine=S3; ### /*M!999999\- enable the sandbox mode */ /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `pk` int(11) NOT NULL, `a` int(11) DEFAULT NULL, diff --git a/mysql-test/suite/sql_sequence/mysqldump.result b/mysql-test/suite/sql_sequence/mysqldump.result index 93db304dbad..e22092a1dbd 100644 --- a/mysql-test/suite/sql_sequence/mysqldump.result +++ b/mysql-test/suite/sql_sequence/mysqldump.result @@ -9,7 +9,7 @@ DO SETVAL(`a1`, 1, 0); CREATE SEQUENCE `x1` start with 1 minvalue 1 maxvalue 9223372036854775806 increment by 1 cache 1000 nocycle ENGINE=InnoDB; DO SETVAL(`x1`, 1, 0); /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, KEY `a` (`a`) @@ -25,7 +25,7 @@ DO SETVAL(`a1`, 1, 0); CREATE SEQUENCE `x1` start with 1 minvalue 1 maxvalue 9223372036854775806 increment by 1 cache 1000 nocycle ENGINE=InnoDB; DO SETVAL(`x1`, 1, 0); /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, KEY `a` (`a`) @@ -41,7 +41,7 @@ DO SETVAL(`a1`, 1, 0); CREATE SEQUENCE `x1` start with 1 minvalue 1 maxvalue 9223372036854775806 increment by 1 cache 1000 nocycle ENGINE=InnoDB; DO SETVAL(`x1`, 1, 0); /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, KEY `a` (`a`) @@ -53,7 +53,7 @@ INSERT INTO `t1` VALUES # dump by tables only tables /*M!999999\- enable the sandbox mode */ /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, KEY `a` (`a`) diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result index 8ed544dcc16..c231e5aba57 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result @@ -2987,7 +2987,7 @@ VARIABLE_SCOPE SESSION ONLY VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT This variable is for internal server use NUMERIC_MIN_VALUE 0 -NUMERIC_MAX_VALUE 18446744073709551615 +NUMERIC_MAX_VALUE 4294967295 NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result index 5706f871200..f452e1c4c91 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result @@ -3157,7 +3157,7 @@ VARIABLE_SCOPE SESSION ONLY VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT This variable is for internal server use NUMERIC_MIN_VALUE 0 -NUMERIC_MAX_VALUE 18446744073709551615 +NUMERIC_MAX_VALUE 4294967295 NUMERIC_BLOCK_SIZE 1 ENUM_VALUE_LIST NULL READ_ONLY NO diff --git a/mysql-test/suite/vcol/r/vcol_misc.result b/mysql-test/suite/vcol/r/vcol_misc.result index 3bb06116f33..1a16fd1a394 100644 --- a/mysql-test/suite/vcol/r/vcol_misc.result +++ b/mysql-test/suite/vcol/r/vcol_misc.result @@ -577,3 +577,17 @@ drop table t; # # End of 10.4 tests # +# +# MDEV-26891 Segfault in Field::register_field_in_read_map upon INSERT DELAYED with virtual columns +# +CREATE TABLE t ( +id INT AUTO_INCREMENT, +a varchar(16) NOT NULL DEFAULT '', +b varchar(16) GENERATED ALWAYS AS (a) VIRTUAL, +KEY `col_year` (b(8),id) +) ENGINE=MyISAM; +INSERT DELAYED INTO t (a) VALUES ('foo'),('bar'); +DROP TABLE t; +# +# End of 10.5 tests +# diff --git a/mysql-test/suite/vcol/t/vcol_misc.test b/mysql-test/suite/vcol/t/vcol_misc.test index 83a06e83f6f..2709ff5b465 100644 --- a/mysql-test/suite/vcol/t/vcol_misc.test +++ b/mysql-test/suite/vcol/t/vcol_misc.test @@ -541,3 +541,22 @@ drop table t; --echo # --echo # End of 10.4 tests --echo # + +--echo # +--echo # MDEV-26891 Segfault in Field::register_field_in_read_map upon INSERT DELAYED with virtual columns +--echo # +CREATE TABLE t ( + id INT AUTO_INCREMENT, + a varchar(16) NOT NULL DEFAULT '', + b varchar(16) GENERATED ALWAYS AS (a) VIRTUAL, + KEY `col_year` (b(8),id) +) ENGINE=MyISAM; + +INSERT DELAYED INTO t (a) VALUES ('foo'),('bar'); + +# Cleanup +DROP TABLE t; + +--echo # +--echo # End of 10.5 tests +--echo # diff --git a/mysql-test/suite/versioning/r/data.result b/mysql-test/suite/versioning/r/data.result index b21e44f391f..f2b598bc38f 100644 --- a/mysql-test/suite/versioning/r/data.result +++ b/mysql-test/suite/versioning/r/data.result @@ -12,7 +12,7 @@ set timestamp=default; #MYSQL_DUMP --compact test /*M!999999\- enable the sandbox mode */ /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING; @@ -22,7 +22,7 @@ INSERT INTO `t1` VALUES #MYSQL_DUMP --compact --as-of="1990-01-02 00:00" test /*M!999999\- enable the sandbox mode */ /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING; @@ -38,7 +38,7 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l USE `test`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING; @@ -50,7 +50,7 @@ INSERT INTO `t1` VALUES #MYSQL_DUMP --compact --as-of="1990-08-04 00:00" test t1 /*M!999999\- enable the sandbox mode */ /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING; @@ -93,7 +93,7 @@ x check_fields(x, row_start, row_end) 2 [CORRECT] /*M!999999\- enable the sandbox mode */ /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci WITH SYSTEM VERSIONING; @@ -103,7 +103,7 @@ INSERT INTO `t1` (`x`, row_start, row_end) VALUES (1,'2010-10-10 10:10:10.101010 (2,'2010-10-10 10:10:10.101010','2038-01-19 03:14:07.999999'); /*M!101100 SET system_versioning_insert_history=@old_system_versioning_insert_history */; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t2` ( `x` int(11) DEFAULT NULL, `row_start` timestamp(6) GENERATED ALWAYS AS ROW START INVISIBLE, @@ -201,7 +201,7 @@ mariadb-dump: Cannot use --dump-history for table `t1` with transaction-precise mariadb-dump: Cannot use --dump-history for table `t1` with transaction-precise history /*M!999999\- enable the sandbox mode */ /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t1` ( `x` int(11) DEFAULT NULL, `rs` bigint(20) unsigned GENERATED ALWAYS AS ROW START, diff --git a/mysql-test/suite/versioning/r/replace.result b/mysql-test/suite/versioning/r/replace.result index 8ac4047c5ff..c64f42ee7cf 100644 --- a/mysql-test/suite/versioning/r/replace.result +++ b/mysql-test/suite/versioning/r/replace.result @@ -27,7 +27,9 @@ id x current 1 2 0 1 3 1 drop table t; +# # MDEV-15645 Assertion `table->insert_values' failed in write_record upon REPLACE into a view with underlying versioned table +# create or replace table t1 (a int, b int, primary key (a), unique(b)) with system versioning; insert into t1 values (1,1); create or replace table t2 (c int); @@ -48,7 +50,9 @@ INSERT INTO t1 () VALUES (),(),(),(),(),(); UPDATE IGNORE t1 SET f = 1; REPLACE t1 SELECT * FROM t1; DROP TABLE t1; +# # MDEV-22540 ER_DUP_ENTRY upon REPLACE or Assertion failed +# set timestamp=1589245268.41934; create table t1 (a int primary key) with system versioning; insert into t1 values (1),(2); @@ -72,3 +76,15 @@ Warnings: Warning 1062 Duplicate entry '1' for key 'a' load data infile '15330.data' replace into table t1 (a,b,c); drop table t1; +# +# MDEV-35343 unexpected replace behaviour when long unique index on system versioned table +# +create table t1 (data char(10)); +insert into t1 values ('o'); +alter ignore table t1 add unique index (data); +alter ignore table t1 add unique index (data); +Warnings: +Note 1831 Duplicate index `data_2`. This is deprecated and will be disallowed in a future release +alter table t1 add system versioning; +replace into t1 values ('o'), ('o'); +drop table t1; diff --git a/mysql-test/suite/versioning/t/replace.test b/mysql-test/suite/versioning/t/replace.test index d69eebd1b9c..c10b6aa443d 100644 --- a/mysql-test/suite/versioning/t/replace.test +++ b/mysql-test/suite/versioning/t/replace.test @@ -35,7 +35,9 @@ replace t values (1, 3); select *, current_row(row_end) as current from t for system_time all order by x; drop table t; +--echo # --echo # MDEV-15645 Assertion `table->insert_values' failed in write_record upon REPLACE into a view with underlying versioned table +--echo # create or replace table t1 (a int, b int, primary key (a), unique(b)) with system versioning; insert into t1 values (1,1); create or replace table t2 (c int); @@ -59,7 +61,9 @@ UPDATE IGNORE t1 SET f = 1; REPLACE t1 SELECT * FROM t1; DROP TABLE t1; +--echo # --echo # MDEV-22540 ER_DUP_ENTRY upon REPLACE or Assertion failed +--echo # set timestamp=1589245268.41934; create table t1 (a int primary key) with system versioning; insert into t1 values (1),(2); @@ -105,4 +109,15 @@ drop table t1; eval set default_storage_engine= $default_engine; --enable_query_log +--echo # +--echo # MDEV-35343 unexpected replace behaviour when long unique index on system versioned table +--echo # +create table t1 (data char(10)); +insert into t1 values ('o'); +alter ignore table t1 add unique index (data); +alter ignore table t1 add unique index (data); +alter table t1 add system versioning; +replace into t1 values ('o'), ('o'); +drop table t1; + --source suite/versioning/common_finish.inc diff --git a/mysql-test/suite/wsrep/disabled.def b/mysql-test/suite/wsrep/disabled.def index f4145211680..fcaf38a3d7b 100644 --- a/mysql-test/suite/wsrep/disabled.def +++ b/mysql-test/suite/wsrep/disabled.def @@ -9,5 +9,3 @@ # Do not use any TAB characters for whitespace. # ############################################################################## - - diff --git a/mysql-test/suite/wsrep/t/MDEV-23081.test b/mysql-test/suite/wsrep/t/MDEV-23081.test index 04305b22b24..6cd7d6dd037 100644 --- a/mysql-test/suite/wsrep/t/MDEV-23081.test +++ b/mysql-test/suite/wsrep/t/MDEV-23081.test @@ -7,6 +7,11 @@ --source include/have_wsrep_provider.inc --source include/have_debug_sync.inc +--let $log_bin=1 +if (`select not @@log_bin`) { +--let $log_bin=0 +} + CREATE TABLE t1 (f1 INT PRIMARY KEY) ENGINE=InnoDB; # @@ -40,7 +45,14 @@ SET DEBUG_SYNC = "now WAIT_FOR before_commit_order_reached_1"; # and restart it with wsrep-on=OFF # let $restart_noprint=2; ---let $restart_parameters=--wsrep-on=OFF +if ($log_bin == 0) { +# The database could have been created with --log-bin +# and so let's add this parameter explicitly: +--let $restart_parameters=--wsrep-on=OFF --loose-innodb --loose-log-bin +} +if ($log_bin == 1) { +--let $restart_parameters=--wsrep-on=OFF --loose-innodb +} --source include/start_mysqld.inc # diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c index 4ee1331bdb3..c92b0457e07 100644 --- a/mysys/mf_iocache.c +++ b/mysys/mf_iocache.c @@ -1735,7 +1735,7 @@ int my_b_flush_io_cache(IO_CACHE *info, int need_append_buffer_lock) info->write_pos= info->write_buffer; ++info->disk_writes; UNLOCK_APPEND_BUFFER; - DBUG_RETURN(info->error); + DBUG_RETURN(0); } } UNLOCK_APPEND_BUFFER; diff --git a/mysys/tree.c b/mysys/tree.c index cd44f779e6f..db0442fa827 100644 --- a/mysys/tree.c +++ b/mysys/tree.c @@ -494,6 +494,9 @@ void *tree_search_next(TREE *tree, TREE_ELEMENT ***last_pos, int l_offs, int r_offs) { TREE_ELEMENT *x= **last_pos; + + if (x == &null_element) + return NULL; if (ELEMENT_CHILD(x, r_offs) != &null_element) { diff --git a/mysys_ssl/openssl.c b/mysys_ssl/openssl.c index e0271817309..3890e3524be 100644 --- a/mysys_ssl/openssl.c +++ b/mysys_ssl/openssl.c @@ -36,8 +36,12 @@ int check_openssl_compatibility() static uint testing; static size_t alloc_size, alloc_count; -static void *coc_malloc(size_t size, const char *f __attribute__((unused)), - int l __attribute__((unused))) +static void *coc_malloc(size_t size +#ifndef LIBRESSL_VERSION_NUMBER + , const char *f __attribute__((unused)), + int l __attribute__((unused)) +#endif +) { if (unlikely(testing)) { @@ -47,15 +51,22 @@ static void *coc_malloc(size_t size, const char *f __attribute__((unused)), return malloc(size); } -static void *coc_realloc(void *addr, size_t num, - const char *file __attribute__((unused)), - int line __attribute__((unused))) +static void *coc_realloc(void *addr, size_t num +#ifndef LIBRESSL_VERSION_NUMBER + , const char *file __attribute__((unused)), + int line __attribute__((unused)) +#endif +) { return realloc(addr, num); } -static void coc_free(void *addr, const char *file __attribute__((unused)), - int line __attribute__((unused))) +static void coc_free(void *addr +#ifndef LIBRESSL_VERSION_NUMBER + , const char *file __attribute__((unused)), + int line __attribute__((unused)) +#endif +) { free(addr); } diff --git a/plugin/handler_socket/client/hslongrun.cpp b/plugin/handler_socket/client/hslongrun.cpp index b7c02951340..a9fba1dc7c3 100644 --- a/plugin/handler_socket/client/hslongrun.cpp +++ b/plugin/handler_socket/client/hslongrun.cpp @@ -927,7 +927,7 @@ hs_longrun_main(int argc, char **argv) shared.verbose = shared.conf.get_int("verbose", 1); const int table_size = shared.conf.get_int("table_size", 10000); for (int i = 0; i < table_size; ++i) { - std::auto_ptr rec(new record_value()); + std::unique_ptr rec(new record_value()); rec->key = to_stdstring(i); shared.records.push_back_ptr(rec); } @@ -966,7 +966,7 @@ hs_longrun_main(int argc, char **argv) int id = thrs.size(); const hs_longrun_thread_hs::arg_type arg(id, e.type, e.op, e.lock, shared); - std::auto_ptr thr; + std::unique_ptr thr; if (e.hs) { thr.reset(new hs_longrun_thread_hs(arg)); } else { diff --git a/plugin/handler_socket/client/hstest.cpp b/plugin/handler_socket/client/hstest.cpp index b5551fed81c..72e8a225de9 100644 --- a/plugin/handler_socket/client/hstest.cpp +++ b/plugin/handler_socket/client/hstest.cpp @@ -561,7 +561,7 @@ hstest_thread::test_9(int test_num) flds += std::string(buf); } int connected = 0; - std::auto_ptr stmt; + std::unique_ptr stmt; string_buffer wbuf; for (int i = 0; i < num; ++i) { const double tm1 = gettimeofday_double(); @@ -1474,7 +1474,7 @@ hstest_main(int argc, char **argv) #endif const int num_thrs = shared.num_threads; typedef thread thread_type; - typedef std::auto_ptr thread_ptr; + typedef std::unique_ptr thread_ptr; typedef auto_ptrcontainer< std::vector > thrs_type; thrs_type thrs; for (int i = 0; i < num_thrs; ++i) { diff --git a/plugin/handler_socket/handlersocket/database.cpp b/plugin/handler_socket/handlersocket/database.cpp index 0a006a42f00..9441863070c 100644 --- a/plugin/handler_socket/handlersocket/database.cpp +++ b/plugin/handler_socket/handlersocket/database.cpp @@ -175,7 +175,7 @@ struct dbcontext : public dbcontext_i, private noncopyable { THD *thd; MYSQL_LOCK *lock; bool lock_failed; - std::auto_ptr user_lock; + std::unique_ptr user_lock; int user_level_lock_timeout; bool user_level_lock_locked; bool commit_error; diff --git a/plugin/handler_socket/handlersocket/database.hpp b/plugin/handler_socket/handlersocket/database.hpp index 9e2aadf7380..87761050704 100644 --- a/plugin/handler_socket/handlersocket/database.hpp +++ b/plugin/handler_socket/handlersocket/database.hpp @@ -9,11 +9,6 @@ #ifndef DENA_DATABASE_HPP #define DENA_DATABASE_HPP -#ifdef __GNUC__ -/* auto_ptr is deprecated */ -# pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif - #include #include #include @@ -26,10 +21,10 @@ namespace dena { struct database_i; -typedef std::auto_ptr database_ptr; +typedef std::unique_ptr database_ptr; struct dbcontext_i; -typedef std::auto_ptr dbcontext_ptr; +typedef std::unique_ptr dbcontext_ptr; struct database_i { virtual ~database_i() = default; diff --git a/plugin/handler_socket/handlersocket/handlersocket.cpp b/plugin/handler_socket/handlersocket/handlersocket.cpp index 45c9e13b2ca..c513afb7dd5 100644 --- a/plugin/handler_socket/handlersocket/handlersocket.cpp +++ b/plugin/handler_socket/handlersocket/handlersocket.cpp @@ -76,7 +76,7 @@ daemon_handlersocket_init(void *p) conf["readsize"] = to_stdstring(handlersocket_readsize); conf["accept_balance"] = to_stdstring(handlersocket_accept_balance); conf["wrlock_timeout"] = to_stdstring(handlersocket_wrlock_timeout); - std::auto_ptr ap(new daemon_handlersocket_data); + std::unique_ptr ap(new daemon_handlersocket_data); if (handlersocket_port != 0 && handlersocket_port_wr != handlersocket_port) { conf["port"] = handlersocket_port; if (handlersocket_plain_secret) { diff --git a/plugin/handler_socket/handlersocket/hstcpsvr.cpp b/plugin/handler_socket/handlersocket/hstcpsvr.cpp index 336d36422b0..72435b80331 100644 --- a/plugin/handler_socket/handlersocket/hstcpsvr.cpp +++ b/plugin/handler_socket/handlersocket/hstcpsvr.cpp @@ -115,7 +115,7 @@ hstcpsvr::start_listen() arg.cshared = &cshared; arg.vshared = &vshared; arg.worker_id = i; - std::auto_ptr< thread > thr( + std::unique_ptr< thread > thr( new thread(arg, stack_size)); threads.push_back_ptr(thr); } diff --git a/plugin/handler_socket/handlersocket/hstcpsvr.hpp b/plugin/handler_socket/handlersocket/hstcpsvr.hpp index 5fbed92402b..3bb17c9ea0b 100644 --- a/plugin/handler_socket/handlersocket/hstcpsvr.hpp +++ b/plugin/handler_socket/handlersocket/hstcpsvr.hpp @@ -44,7 +44,7 @@ struct hstcpsvr_shared_v : public mutex { }; struct hstcpsvr_i; -typedef std::auto_ptr hstcpsvr_ptr; +typedef std::unique_ptr hstcpsvr_ptr; struct hstcpsvr_i { virtual ~hstcpsvr_i() = default; diff --git a/plugin/handler_socket/handlersocket/hstcpsvr_worker.cpp b/plugin/handler_socket/handlersocket/hstcpsvr_worker.cpp index 0796546cb5e..818d7327896 100644 --- a/plugin/handler_socket/handlersocket/hstcpsvr_worker.cpp +++ b/plugin/handler_socket/handlersocket/hstcpsvr_worker.cpp @@ -451,7 +451,7 @@ hstcpsvr_worker::run_one_nb() { pollfd& pfd = pfds[nfds - 1]; if ((pfd.revents & mask_in) != 0) { - std::auto_ptr c(new hstcpsvr_conn()); + std::unique_ptr c(new hstcpsvr_conn()); c->nonblocking = true; c->readsize = cshared.readsize; c->accept(cshared); @@ -498,7 +498,7 @@ hstcpsvr_worker::run_one_ep() /* listener */ ++accept_count; DBG_EP(fprintf(stderr, "IN listener\n")); - std::auto_ptr c(new hstcpsvr_conn()); + std::unique_ptr c(new hstcpsvr_conn()); c->nonblocking = true; c->readsize = cshared.readsize; c->accept(cshared); diff --git a/plugin/handler_socket/handlersocket/hstcpsvr_worker.hpp b/plugin/handler_socket/handlersocket/hstcpsvr_worker.hpp index 25612adec0f..2a2a5083e31 100644 --- a/plugin/handler_socket/handlersocket/hstcpsvr_worker.hpp +++ b/plugin/handler_socket/handlersocket/hstcpsvr_worker.hpp @@ -14,7 +14,7 @@ namespace dena { struct hstcpsvr_worker_i; -typedef std::auto_ptr hstcpsvr_worker_ptr; +typedef std::unique_ptr hstcpsvr_worker_ptr; struct hstcpsvr_worker_arg { const hstcpsvr_shared_c *cshared; diff --git a/plugin/handler_socket/libhsclient/hstcpcli.hpp b/plugin/handler_socket/libhsclient/hstcpcli.hpp index d078bdfd533..3428c2f240e 100644 --- a/plugin/handler_socket/libhsclient/hstcpcli.hpp +++ b/plugin/handler_socket/libhsclient/hstcpcli.hpp @@ -19,11 +19,6 @@ #include "string_ref.hpp" #include "string_buffer.hpp" -#ifdef __GNUC__ -/* auto_ptr is deprecated */ -# pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif - namespace dena { struct hstcpcli_filter { @@ -35,7 +30,7 @@ struct hstcpcli_filter { }; struct hstcpcli_i; -typedef std::auto_ptr hstcpcli_ptr; +typedef std::unique_ptr hstcpcli_ptr; struct hstcpcli_i { virtual ~hstcpcli_i() = default; diff --git a/sql-common/client.c b/sql-common/client.c index 6bc48e2291f..81500987397 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -4236,3 +4236,28 @@ int STDCALL mysql_cancel(MYSQL *mysql) return vio_shutdown(mysql->net.vio, SHUT_RDWR); return -1; } + + +MYSQL_RES *STDCALL mysql_use_result(MYSQL *mysql) +{ + return (*mysql->methods->use_result)(mysql); +} + + +MYSQL_FIELD *STDCALL mysql_fetch_fields(MYSQL_RES *res) +{ + return (res)->fields; +} + + +ulong STDCALL +mysql_real_escape_string(MYSQL *mysql, char *to,const char *from, + ulong length) +{ + my_bool overflow; + if (mysql->server_status & SERVER_STATUS_NO_BACKSLASH_ESCAPES) + return (ulong) escape_quotes_for_mysql(mysql->charset, to, 0, from, length, + &overflow); + return (ulong) escape_string_for_mysql(mysql->charset, to, 0, from, length, + &overflow); +} diff --git a/sql/field.cc b/sql/field.cc index 9e7de0b090a..d7d85d4c302 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -9625,8 +9625,7 @@ String *Field_set::val_str(String *val_buffer, ulonglong tmp=(ulonglong) Field_enum::val_int(); uint bitnr=0; - val_buffer->set_charset(field_charset()); - val_buffer->length(0); + val_buffer->copy("", 0, field_charset()); while (tmp && bitnr < (uint) typelib->count) { diff --git a/sql/field.h b/sql/field.h index aaf979ef4d2..d651179f988 100644 --- a/sql/field.h +++ b/sql/field.h @@ -659,6 +659,9 @@ public: bool cleanup_session_expr(); bool fix_and_check_expr(THD *thd, TABLE *table); inline bool is_equal(const Virtual_column_info* vcol) const; + /* Same as is_equal() but for comparing with different table */ + bool is_equivalent(THD *thd, TABLE_SHARE *share, TABLE_SHARE *vcol_share, + const Virtual_column_info* vcol, bool &error) const; inline void print(String*); }; @@ -5909,7 +5912,7 @@ uint pack_length_to_packflag(uint type); enum_field_types get_blob_type_from_length(ulong length); int set_field_to_null(Field *field); int set_field_to_null_with_conversions(Field *field, bool no_conversions); -int convert_null_to_field_value_or_error(Field *field); +int convert_null_to_field_value_or_error(Field *field, uint err); bool check_expression(Virtual_column_info *vcol, const LEX_CSTRING *name, enum_vcol_info_type type, Alter_info *alter_info= NULL); diff --git a/sql/field_conv.cc b/sql/field_conv.cc index 94b6bf0ca7a..6e90d92fcf8 100644 --- a/sql/field_conv.cc +++ b/sql/field_conv.cc @@ -126,7 +126,7 @@ static int set_bad_null_error(Field *field, int err) return 0; case CHECK_FIELD_ERROR_FOR_NULL: if (!field->table->in_use->no_errors) - my_error(ER_BAD_NULL_ERROR, MYF(0), field->field_name.str); + my_error(err, MYF(0), field->field_name.str); return -1; } DBUG_ASSERT(0); // impossible @@ -164,7 +164,7 @@ int set_field_to_null(Field *field) If no_conversion was not set, an error message is printed */ -int convert_null_to_field_value_or_error(Field *field) +int convert_null_to_field_value_or_error(Field *field, uint err) { if (field->type() == MYSQL_TYPE_TIMESTAMP) { @@ -172,14 +172,16 @@ int convert_null_to_field_value_or_error(Field *field) return 0; } + MY_BITMAP *old_map= dbug_tmp_use_all_columns(field->table, &field->table->write_set); field->reset(); // Note: we ignore any potential failure of reset() here. + dbug_tmp_restore_column_map(&field->table->write_set, old_map); if (field == field->table->next_number_field) { field->table->auto_increment_field_not_null= FALSE; return 0; // field is set in fill_record() } - return set_bad_null_error(field, ER_BAD_NULL_ERROR); + return set_bad_null_error(field, err); } /** @@ -216,7 +218,7 @@ set_field_to_null_with_conversions(Field *field, bool no_conversions) if (no_conversions) return -1; - return convert_null_to_field_value_or_error(field); + return convert_null_to_field_value_or_error(field, ER_BAD_NULL_ERROR); } diff --git a/sql/filesort.cc b/sql/filesort.cc index d9edeab555d..dcde101e0bd 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -640,13 +640,6 @@ static uchar *read_buffpek_from_file(IO_CACHE *buffpek_pointers, uint count, } #ifndef DBUG_OFF - -/* Buffer where record is returned */ -char dbug_print_row_buff[512]; - -/* Temporary buffer for printing a column */ -char dbug_print_row_buff_tmp[512]; - /* Print table's current row into a buffer and return a pointer to it. @@ -659,38 +652,53 @@ char dbug_print_row_buff_tmp[512]; Only columns in table->read_set are printed */ -const char* dbug_print_table_row(TABLE *table) +const char* dbug_print_row(TABLE *table, const uchar *rec, bool print_names) { Field **pfield; - String tmp(dbug_print_row_buff_tmp, - sizeof(dbug_print_row_buff_tmp),&my_charset_bin); + const size_t alloc_size= 512; + char *row_buff= (char *) alloc_root(&table->mem_root, alloc_size); + char *row_buff_tmp= (char *) alloc_root(&table->mem_root, alloc_size); + String tmp(row_buff_tmp, alloc_size, &my_charset_bin); + String output(row_buff, alloc_size, &my_charset_bin); - String output(dbug_print_row_buff, sizeof(dbug_print_row_buff), - &my_charset_bin); + auto move_back_lambda= [table, rec]() mutable { + table->move_fields(table->field, table->record[0], rec); + }; + auto move_back_guard= make_scope_exit(move_back_lambda, false); + + if (rec != table->record[0]) + { + table->move_fields(table->field, rec, table->record[0]); + move_back_guard.engage(); + } + + SCOPE_VALUE(table->read_set, (table->read_set && table->write_set) ? + table->write_set : table->read_set); output.length(0); output.append(table->alias); output.append('('); bool first= true; - - for (pfield= table->field; *pfield ; pfield++) + if (print_names) { - const LEX_CSTRING *name; - if (table->read_set && !bitmap_is_set(table->read_set, (*pfield)->field_index)) - continue; - - if (first) - first= false; - else - output.append(','); + for (pfield= table->field; *pfield ; pfield++) + { + if (table->read_set && !bitmap_is_set(table->read_set, (*pfield)->field_index)) + continue; - name= (*pfield)->field_name.str ? &(*pfield)->field_name: &NULL_clex_str; - output.append(name); + if (first) + first= false; + else + output.append(STRING_WITH_LEN(", ")); + + output.append((*pfield)->field_name.str + ? (*pfield)->field_name : NULL_clex_str); + } + + output.append(STRING_WITH_LEN(")=(")); + first= true; } - output.append(STRING_WITH_LEN(")=(")); - - first= true; for (pfield= table->field; *pfield ; pfield++) { Field *field= *pfield; @@ -701,7 +709,7 @@ const char* dbug_print_table_row(TABLE *table) if (first) first= false; else - output.append(','); + output.append(STRING_WITH_LEN(", ")); if (field->is_null()) output.append(&NULL_clex_str); @@ -715,17 +723,14 @@ const char* dbug_print_table_row(TABLE *table) } } output.append(')'); - + return output.c_ptr_safe(); } -const char* dbug_print_row(TABLE *table, uchar *rec) +const char* dbug_print_table_row(TABLE *table) { - table->move_fields(table->field, rec, table->record[0]); - const char* ret= dbug_print_table_row(table); - table->move_fields(table->field, table->record[0], rec); - return ret; + return dbug_print_row(table, table->record[0]); } diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index e2d9a5ab26a..47004159fa0 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -3208,6 +3208,24 @@ err1: DBUG_RETURN(2); } +Compare_keys ha_partition::compare_key_parts( + const Field &old_field, + const Column_definition &new_field, + const KEY_PART_INFO &old_part, + const KEY_PART_INFO &new_part) const +{ + Compare_keys res= m_file[0]->compare_key_parts(old_field, new_field, + old_part, new_part); + /* + Partitions have the same storage engine (until MDEV-22168) so the + calls should all return the same value for now. + */ + for (uint i= 1; i < m_tot_parts; i++) + if (res != m_file[i]->compare_key_parts(old_field, new_field, + old_part, new_part)) + return Compare_keys::NotEqual; + return res; +} /** Setup m_engine_array diff --git a/sql/ha_partition.h b/sql/ha_partition.h index c9798c334c6..01d15ca70ac 100644 --- a/sql/ha_partition.h +++ b/sql/ha_partition.h @@ -484,6 +484,11 @@ public: m_part_info= part_info; m_is_sub_partitioned= part_info->is_sub_partitioned(); } + Compare_keys compare_key_parts( + const Field &old_field, + const Column_definition &new_field, + const KEY_PART_INFO &old_part, + const KEY_PART_INFO &new_part) const override; void return_record_by_parent() override; diff --git a/sql/handler.cc b/sql/handler.cc index 82fec6142a6..e964016b7da 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -1747,7 +1747,7 @@ int ha_commit_trans(THD *thd, bool all) thd->m_transaction_psi= NULL; } #ifdef WITH_WSREP - if (wsrep_is_active(thd) && is_real_trans && !error) + if (WSREP(thd) && wsrep_is_active(thd) && is_real_trans && !error) wsrep_commit_empty(thd, all); #endif /* WITH_WSREP */ @@ -2285,9 +2285,14 @@ int ha_rollback_trans(THD *thd, bool all) my_error(ER_ERROR_DURING_ROLLBACK, MYF(0), err); error=1; #ifdef WITH_WSREP - WSREP_WARN("handlerton rollback failed, thd %lld %lld conf %d SQL %s", - thd->thread_id, thd->query_id, thd->wsrep_trx().state(), - thd->query()); + if (WSREP(thd)) + { + WSREP_WARN("handlerton rollback failed, thd %lld %lld " + "conf %d wsrep_err %s SQL %s", + thd->thread_id, thd->query_id, thd->wsrep_trx().state(), + wsrep::to_c_string(thd->wsrep_cs().current_error()), + thd->query()); + } #endif /* WITH_WSREP */ } status_var_increment(thd->status_var.ha_rollback_count); @@ -2299,11 +2304,12 @@ int ha_rollback_trans(THD *thd, bool all) } #ifdef WITH_WSREP - if (thd->is_error()) + if (WSREP(thd) && thd->is_error()) { - WSREP_DEBUG("ha_rollback_trans(%lld, %s) rolled back: %s: %s; is_real %d", - thd->thread_id, all?"TRUE":"FALSE", wsrep_thd_query(thd), - thd->get_stmt_da()->message(), is_real_trans); + WSREP_DEBUG("ha_rollback_trans(%lld, %s) rolled back: msg %s is_real %d wsrep_err %s", + thd->thread_id, all? "TRUE" : "FALSE", + thd->get_stmt_da()->message(), is_real_trans, + wsrep::to_c_string(thd->wsrep_cs().current_error())); } // REPLACE|INSERT INTO ... SELECT uses TOI in consistency check @@ -5931,7 +5937,10 @@ int handler::calculate_checksum() for (;;) { if (thd->killed) - return HA_ERR_ABORTED_BY_USER; + { + error= HA_ERR_ABORTED_BY_USER; + break; + } ha_checksum row_crc= 0; error= ha_rnd_next(table->record[0]); @@ -7740,6 +7749,7 @@ int handler::ha_write_row(const uchar *buf) TABLE_IO_WAIT(tracker, PSI_TABLE_WRITE_ROW, MAX_KEY, error, { error= write_row(buf); }) + DBUG_PRINT("dml", ("INSERT: %s = %d", dbug_print_row(table, buf, false), error)); MYSQL_INSERT_ROW_DONE(error); if (likely(!error)) @@ -7755,6 +7765,7 @@ int handler::ha_write_row(const uchar *buf) ht->flags & HTON_WSREP_REPLICATION && !error && (error= wsrep_after_row(ha_thd()))) { + DEBUG_SYNC_C("ha_write_row_end"); DBUG_RETURN(error); } #endif /* WITH_WSREP */ @@ -7800,6 +7811,8 @@ int handler::ha_update_row(const uchar *old_data, const uchar *new_data) TABLE_IO_WAIT(tracker, PSI_TABLE_UPDATE_ROW, active_index, 0, { error= update_row(old_data, new_data);}) + DBUG_PRINT("dml", ("UPDATE: %s => %s = %d", dbug_print_row(table, old_data, false), + dbug_print_row(table, new_data, false), error)); MYSQL_UPDATE_ROW_DONE(error); if (likely(!error)) @@ -7879,6 +7892,7 @@ int handler::ha_delete_row(const uchar *buf) TABLE_IO_WAIT(tracker, PSI_TABLE_DELETE_ROW, active_index, error, { error= delete_row(buf);}) + DBUG_PRINT("dml", ("DELETE: %s = %d", dbug_print_row(table, buf, false), error)); MYSQL_DELETE_ROW_DONE(error); if (likely(!error)) { diff --git a/sql/handler.h b/sql/handler.h index 9ab71c4e84a..5136733c54c 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -5442,4 +5442,8 @@ uint ha_check_and_coalesce_trx_read_only(THD *thd, Ha_trx_info *ha_list, int get_select_field_pos(Alter_info *alter_info, int select_field_count, bool versioned); + +#ifndef DBUG_OFF +const char* dbug_print_row(TABLE *table, const uchar *rec, bool print_names= true); +#endif /* DBUG_OFF */ #endif /* HANDLER_INCLUDED */ diff --git a/sql/item.cc b/sql/item.cc index acbd98e1f27..ce3d53d9a95 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -845,6 +845,30 @@ bool Item_field::rename_fields_processor(void *arg) return 0; } +/** + Rename table and clean field for EXCHANGE comparison +*/ + +bool Item_field::rename_table_processor(void *arg) +{ + Item::func_processor_rename_table *p= (Item::func_processor_rename_table*) arg; + + /* If (db_name, table_name) matches (p->old_db, p->old_table) + rename to (p->new_db, p->new_table) */ + if (((!db_name.str && !p->old_db.str) || + db_name.streq(p->old_db)) && + ((!table_name.str && !p->old_table.str) || + table_name.streq(p->old_table))) + { + db_name= p->new_db; + table_name= p->new_table; + } + + /* Item_field equality is done by field pointer if it is set, we need to avoid that */ + field= NULL; + return 0; +} + /** Check if an Item_field references some field from a list of fields. @@ -3988,7 +4012,7 @@ void Item_string::print(String *str, enum_query_type query_type) } else { - str_value.print(str, system_charset_info); + str_value.print(str, &my_charset_utf8mb4_general_ci); } } else @@ -4255,6 +4279,7 @@ void Item_param::set_null(const DTCollation &c) decimals= 0; collation= c; state= NULL_VALUE; + value.set_handler(&type_handler_null); DBUG_VOID_RETURN; } @@ -5084,7 +5109,10 @@ void Item_param::set_default(bool set_type_handler_null) */ null_value= true; if (set_type_handler_null) + { + value.set_handler(&type_handler_null); set_handler(&type_handler_null); + } } void Item_param::set_ignore(bool set_type_handler_null) @@ -5093,7 +5121,10 @@ void Item_param::set_ignore(bool set_type_handler_null) state= IGNORE_VALUE; null_value= true; if (set_type_handler_null) + { + value.set_handler(&type_handler_null); set_handler(&type_handler_null); + } } /** diff --git a/sql/item.h b/sql/item.h index d45a56d3c6c..3052f4c3219 100644 --- a/sql/item.h +++ b/sql/item.h @@ -2372,6 +2372,7 @@ public: virtual bool check_partition_func_processor(void *arg) { return true; } virtual bool post_fix_fields_part_expr_processor(void *arg) { return 0; } virtual bool rename_fields_processor(void *arg) { return 0; } + virtual bool rename_table_processor(void *arg) { return 0; } /* TRUE if the function is knowingly TRUE or FALSE. Not to be used for AND/OR formulas. @@ -2400,6 +2401,13 @@ public: LEX_CSTRING table_name; List fields; }; + struct func_processor_rename_table + { + Lex_ident_db old_db; + Lex_ident_table old_table; + Lex_ident_db new_db; + Lex_ident_table new_table; + }; virtual bool check_vcol_func_processor(void *arg) { return mark_unsupported_function(full_name(), arg, VCOL_IMPOSSIBLE); @@ -3266,8 +3274,9 @@ public: bool append_for_log(THD *thd, String *str) override; - Item *do_get_copy(THD *) const override { return nullptr; } - Item *do_build_clone(THD *thd) const override { return nullptr; } + Item *do_get_copy(THD *thd) const override + { return get_item_copy(thd, this); } + Item *do_build_clone(THD *thd) const override { return get_copy(thd); } /* Override the inherited create_field_for_create_select(), @@ -3857,6 +3866,7 @@ public: bool switch_to_nullable_fields_processor(void *arg) override; bool update_vcol_processor(void *arg) override; bool rename_fields_processor(void *arg) override; + bool rename_table_processor(void *arg) override; bool check_vcol_func_processor(void *arg) override; bool set_fields_as_dependent_processor(void *arg) override { diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index cf6838607a3..04f471f9a5f 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -5907,7 +5907,7 @@ String *Item_func_wsrep_last_written_gtid::val_str_ascii(String *str) { if (gtid_str.alloc(WSREP_MAX_WSREP_SERVER_GTID_STR_LEN+1)) { - my_error(ER_OUTOFMEMORY, WSREP_MAX_WSREP_SERVER_GTID_STR_LEN); + my_error(ER_OUTOFMEMORY, MYF(0), WSREP_MAX_WSREP_SERVER_GTID_STR_LEN); null_value= TRUE; return 0; } @@ -5932,7 +5932,7 @@ String *Item_func_wsrep_last_seen_gtid::val_str_ascii(String *str) { if (gtid_str.alloc(WSREP_MAX_WSREP_SERVER_GTID_STR_LEN+1)) { - my_error(ER_OUTOFMEMORY, WSREP_MAX_WSREP_SERVER_GTID_STR_LEN); + my_error(ER_OUTOFMEMORY, MYF(0), WSREP_MAX_WSREP_SERVER_GTID_STR_LEN); null_value= TRUE; return 0; } @@ -5977,7 +5977,7 @@ longlong Item_func_wsrep_sync_wait_upto::val_int() if (!(gtid_list= gtid_parse_string_to_list(gtid_str->ptr(), gtid_str->length(), &count))) { - my_error(ER_INCORRECT_GTID_STATE, MYF(0), func_name()); + my_error(ER_INCORRECT_GTID_STATE, MYF(0)); null_value= TRUE; return 0; } @@ -5989,12 +5989,12 @@ longlong Item_func_wsrep_sync_wait_upto::val_int() wait_gtid_ret= wsrep_gtid_server.wait_gtid_upto(gtid_list[0].seq_no, timeout); if ((wait_gtid_ret == ETIMEDOUT) || (wait_gtid_ret == ETIME)) { - my_error(ER_LOCK_WAIT_TIMEOUT, MYF(0), func_name()); + my_error(ER_LOCK_WAIT_TIMEOUT, MYF(0)); ret= 0; } else if (wait_gtid_ret == ENOMEM) { - my_error(ER_OUTOFMEMORY, MYF(0), func_name()); + my_error(ER_OUTOFMEMORY, MYF(0), sizeof(std::pair)); ret= 0; } } diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index f6b95bddfff..f20777eb7c4 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -1227,6 +1227,8 @@ public: return mark_unsupported_function(fully_qualified_func_name(), arg, VCOL_SESSION_FUNC); } + Item *do_get_copy(THD *thd) const override + { return get_item_copy(thd, this); } }; diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 63b6269f23b..b66646617fc 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -1246,6 +1246,7 @@ Item_singlerow_subselect::select_transformer(JOIN *join) Item *item) { return !item->with_sum_func() && + !item->with_window_func() && /* We can't change name of Item_field or Item_ref, because it will prevent its correct resolving, but we should save name of @@ -3800,7 +3801,7 @@ void subselect_single_select_engine::cleanup() DBUG_ENTER("subselect_single_select_engine::cleanup"); prepared= executed= 0; join= 0; - result->cleanup(); + result->reset_for_next_ps_execution(); select_lex->uncacheable&= ~UNCACHEABLE_DEPENDENT_INJECTED; DBUG_VOID_RETURN; } @@ -3810,7 +3811,7 @@ void subselect_union_engine::cleanup() { DBUG_ENTER("subselect_union_engine::cleanup"); unit->reinit_exec_mechanism(); - result->cleanup(); + result->reset_for_next_ps_execution(); unit->uncacheable&= ~UNCACHEABLE_DEPENDENT_INJECTED; for (SELECT_LEX *sl= unit->first_select(); sl; sl= sl->next_select()) sl->uncacheable&= ~UNCACHEABLE_DEPENDENT_INJECTED; @@ -5485,7 +5486,7 @@ void subselect_hash_sj_engine::cleanup() } DBUG_ASSERT(lookup_engine->engine_type() == UNIQUESUBQUERY_ENGINE); lookup_engine->cleanup(); - result->cleanup(); /* Resets the temp table as well. */ + result->reset_for_next_ps_execution(); /* Resets the temp table as well. */ DBUG_ASSERT(tmp_table); free_tmp_table(thd, tmp_table); tmp_table= NULL; diff --git a/sql/log.cc b/sql/log.cc index ab053451ef2..9efac00c34f 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -824,6 +824,7 @@ bool Log_to_csv_event_handler:: { TABLE_LIST table_list; TABLE *table; + const char *cause= 0; bool result= TRUE; bool need_close= FALSE; bool need_pop= FALSE; @@ -857,13 +858,19 @@ bool Log_to_csv_event_handler:: need_pop= TRUE; if (!(table= open_log_table(thd, &table_list, &open_tables_backup))) + { + cause= "can't open file"; goto err; + } need_close= TRUE; if (table->file->extra(HA_EXTRA_MARK_AS_LOG_TABLE) || table->file->ha_rnd_init_with_error(0)) + { + cause= "can't initialize table handler"; goto err; + } need_rnd_end= TRUE; @@ -882,12 +889,20 @@ bool Log_to_csv_event_handler:: /* check that all columns exist */ if (table->s->fields < 6) + { + cause= "incorrect number of fields in the log table"; goto err; + } DBUG_ASSERT(table->field[0]->type() == MYSQL_TYPE_TIMESTAMP); - table->field[0]->store_timestamp( - hrtime_to_my_time(event_time), hrtime_sec_part(event_time)); + if (table->field[0]->store_timestamp(hrtime_to_my_time(event_time), + hrtime_sec_part(event_time))) + { + cause= "Can't write data (possible incorrect log table structure)"; + goto err; + } + /* do a write */ if (table->field[1]->store(user_host, user_host_len, client_cs) || @@ -895,7 +910,10 @@ bool Log_to_csv_event_handler:: table->field[3]->store((longlong) global_system_variables.server_id, TRUE) || table->field[4]->store(command_type, command_type_len, client_cs)) + { + cause= "Can't write data (possible incorrect log table structure)"; goto err; + } /* A positive return value in store() means truncation. @@ -903,7 +921,10 @@ bool Log_to_csv_event_handler:: */ table->field[5]->flags|= FIELDFLAG_HEX_ESCAPE; if (table->field[5]->store(sql_text, sql_text_len, client_cs) < 0) + { + cause= "Can't write data (possible incorrect log table structure)"; goto err; + } /* mark all fields as not null */ table->field[1]->set_notnull(); @@ -919,14 +940,22 @@ bool Log_to_csv_event_handler:: } if (table->file->ha_write_row(table->record[0])) + { + cause= "Can't write record"; goto err; + } result= FALSE; err: if (result && !thd->killed) + { + const char *msg= error_handler.message(); + if (!msg || !msg[0]) + msg= cause; sql_print_error("Failed to write to mysql.general_log: %s", - error_handler.message()); + msg); + } if (need_rnd_end) { @@ -979,6 +1008,8 @@ bool Log_to_csv_event_handler:: { TABLE_LIST table_list; TABLE *table; + const char *cause= 0; + const char *msg; bool result= TRUE; bool need_close= FALSE; bool need_rnd_end= FALSE; @@ -998,13 +1029,19 @@ bool Log_to_csv_event_handler:: TL_WRITE_CONCURRENT_INSERT); if (!(table= open_log_table(thd, &table_list, &open_tables_backup))) + { + cause= "can't open file"; goto err; + } need_close= TRUE; if (table->file->extra(HA_EXTRA_MARK_AS_LOG_TABLE) || table->file->ha_rnd_init_with_error(0)) + { + cause= "can't initialize table handler"; goto err; + } need_rnd_end= TRUE; @@ -1015,12 +1052,19 @@ bool Log_to_csv_event_handler:: /* check that all columns exist */ if (table->s->fields < 13) + { + cause= "incorrect number of fields in the log table"; goto err; + } + + // It can be used in 13 places below so assign it here + cause= "Can't write data (possible incorrect log table structure)"; /* store the time and user values */ DBUG_ASSERT(table->field[0]->type() == MYSQL_TYPE_TIMESTAMP); - table->field[0]->store_timestamp( - hrtime_to_my_time(current_time), hrtime_sec_part(current_time)); + if(table->field[0]->store_timestamp(hrtime_to_my_time(current_time), + hrtime_sec_part(current_time))) + goto err; if (table->field[1]->store(user_host, user_host_len, client_cs)) goto err; @@ -1100,9 +1144,13 @@ bool Log_to_csv_event_handler:: (longlong) thd->get_stmt_da()->affected_rows() : 0, TRUE)) goto err; + cause= 0; // just for safety if (table->file->ha_write_row(table->record[0])) + { + cause= "Can't write record"; goto err; + } result= FALSE; @@ -1110,8 +1158,13 @@ err: thd->pop_internal_handler(); if (result && !thd->killed) + { + msg= error_handler.message(); + if (!msg || !msg[0]) + msg= cause; sql_print_error("Failed to write to mysql.slow_log: %s", - error_handler.message()); + msg); + } if (need_rnd_end) { @@ -11550,7 +11603,8 @@ int TC_LOG_BINLOG::recover(LOG_INFO *linfo, const char *last_log_name, binlog_checkpoint_found= false; for (round= 1;;) { - while ((ev= Log_event::read_log_event(round == 1 ? first_log : &log, + int error; + while ((ev= Log_event::read_log_event(round == 1 ? first_log : &log, &error, fdle, opt_master_verify_checksum)) && ev->is_valid()) { @@ -11836,7 +11890,8 @@ MYSQL_BIN_LOG::do_binlog_recovery(const char *opt_name, bool do_xa_recovery) return 1; } - if ((ev= Log_event::read_log_event(&log, &fdle, + int read_error; + if ((ev= Log_event::read_log_event(&log, &read_error, &fdle, opt_master_verify_checksum)) && ev->get_type_code() == FORMAT_DESCRIPTION_EVENT) { @@ -12060,10 +12115,11 @@ get_gtid_list_event(IO_CACHE *cache, Gtid_list_log_event **out_gtid_list) Format_description_log_event *fdle; Log_event *ev; const char *errormsg = NULL; + int read_error; *out_gtid_list= NULL; - if (!(ev= Log_event::read_log_event(cache, &init_fdle, + if (!(ev= Log_event::read_log_event(cache, &read_error, &init_fdle, opt_master_verify_checksum)) || ev->get_type_code() != FORMAT_DESCRIPTION_EVENT) { @@ -12079,7 +12135,8 @@ get_gtid_list_event(IO_CACHE *cache, Gtid_list_log_event **out_gtid_list) { Log_event_type typ; - ev= Log_event::read_log_event(cache, fdle, opt_master_verify_checksum); + ev= Log_event::read_log_event(cache, &read_error, fdle, + opt_master_verify_checksum); if (!ev) { errormsg= "Could not read GTID list event while looking for GTID " diff --git a/sql/log_event.cc b/sql/log_event.cc index 84a6faccf99..cde7b690dfd 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -916,7 +916,7 @@ int Log_event::read_log_event(IO_CACHE* file, String* packet, DBUG_RETURN(0); } -Log_event* Log_event::read_log_event(IO_CACHE* file, +Log_event* Log_event::read_log_event(IO_CACHE* file, int *out_error, const Format_description_log_event *fdle, my_bool crc_check, my_bool print_errors) @@ -927,6 +927,7 @@ Log_event* Log_event::read_log_event(IO_CACHE* file, const char *error= 0; Log_event *res= 0; + *out_error= 0; switch (read_log_event(file, &event, fdle, BINLOG_CHECKSUM_ALG_OFF)) { case 0: @@ -976,14 +977,22 @@ err: #endif /* - The SQL slave thread will check if file->error<0 to know + The SQL slave thread will check *out_error to know if there was an I/O error. Even if there is no "low-level" I/O errors with 'file', any of the high-level above errors is worrying enough to stop the SQL thread now ; as we are skipping the current event, going on with reading and successfully executing other events can only corrupt the slave's databases. So stop. */ - file->error= -1; + *out_error= 1; + /* + Clear any error that might have been set in the IO_CACHE from a read + error, while we are still holding the relay log mutex (if reading from + the hot log). Otherwise the error might interfere unpredictably with + write operations to the same IO_CACHE in the IO thread. + */ + file->error= 0; + #ifndef MYSQL_CLIENT if (!print_errors) diff --git a/sql/log_event.h b/sql/log_event.h index c4ef6ebd75f..3263637ecf6 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -1395,7 +1395,7 @@ public: we detect the event's type, then call the specific event's constructor and pass description_event as an argument. */ - static Log_event* read_log_event(IO_CACHE* file, + static Log_event* read_log_event(IO_CACHE* file, int *out_error, const Format_description_log_event *description_event, my_bool crc_check, diff --git a/sql/log_event_server.cc b/sql/log_event_server.cc index 6bd62a77ba3..971b65f025d 100644 --- a/sql/log_event_server.cc +++ b/sql/log_event_server.cc @@ -1983,8 +1983,11 @@ int Query_log_event::do_apply_event(rpl_group_info *rgi, DBUG_PRINT("query",("%s", thd->query())); #ifdef WITH_WSREP - WSREP_DEBUG("Query_log_event thread=%llu for query=%s", - thd_get_thread_id(thd), wsrep_thd_query(thd)); + if (WSREP(thd)) + { + WSREP_DEBUG("Query_log_event thread=%llu for query=%s", + thd_get_thread_id(thd), wsrep_thd_query(thd)); + } #endif if (unlikely(!(expected_error= !is_rb_alter ? error_code : 0)) || @@ -5386,7 +5389,7 @@ int Execute_load_log_event::do_apply_event(rpl_group_info *rgi) char fname[FN_REFLEN+10]; char *ext; int fd; - int error= 1; + int error= 1, read_error; IO_CACHE file; Load_log_event *lev= 0; Relay_log_info const *rli= rgi->rli; @@ -5405,7 +5408,7 @@ int Execute_load_log_event::do_apply_event(rpl_group_info *rgi) goto err; } if (!(lev= (Load_log_event*) - Log_event::read_log_event(&file, + Log_event::read_log_event(&file, &read_error, rli->relay_log.description_event_for_exec, opt_slave_sql_verify_checksum)) || lev->get_type_code() != NEW_LOAD_EVENT) diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 2b47e2fef62..901e19fcb6a 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3775,22 +3775,14 @@ static void my_malloc_size_cb_func(long long size, my_bool is_thread_specific) LOCK_thd_kill here (the limit will be enforced on the next allocation). */ if (!mysql_mutex_trylock(&thd->LOCK_thd_kill)) { - char buf[50], *buf2; + char buf[50], buf2[256]; thd->set_killed_no_mutex(KILL_QUERY); my_snprintf(buf, sizeof(buf), "--max-session-mem-used=%llu", thd->variables.max_mem_used); - if ((buf2= (char*) thd->alloc(256))) - { - my_snprintf(buf2, 256, - ER_THD(thd, ER_OPTION_PREVENTS_STATEMENT), buf); - thd->set_killed_no_mutex(KILL_QUERY, - ER_OPTION_PREVENTS_STATEMENT, buf2); - } - else - { - thd->set_killed_no_mutex(KILL_QUERY, ER_OPTION_PREVENTS_STATEMENT, - "--max-session-mem-used"); - } + my_snprintf(buf2, 256, + ER_THD(thd, ER_OPTION_PREVENTS_STATEMENT), buf); + thd->set_killed_no_mutex(KILL_QUERY, + ER_OPTION_PREVENTS_STATEMENT, buf2); mysql_mutex_unlock(&thd->LOCK_thd_kill); } } @@ -7423,8 +7415,8 @@ static int show_threadpool_threads(THD *, SHOW_VAR *var, void *buff, #endif -static int show_cached_thread_count(THD *thd, SHOW_VAR *var, char *buff, - enum enum_var_type scope) +static int show_cached_thread_count(THD *thd, SHOW_VAR *var, void *buff, + system_status_var *, enum enum_var_type scope) { var->type= SHOW_LONG; var->value= buff; @@ -9889,7 +9881,7 @@ void init_server_psi_keys(void) */ -static my_thread_id thread_id_max= UINT_MAX32; +static my_thread_id thread_id_max= MY_THREAD_ID_MAX; #include #include diff --git a/sql/rpl_gtid.cc b/sql/rpl_gtid.cc index 9d35226356c..30ab98bd556 100644 --- a/sql/rpl_gtid.cc +++ b/sql/rpl_gtid.cc @@ -29,10 +29,6 @@ #include "rpl_rli.h" #include "slave.h" #include "log_event.h" -#ifdef WITH_WSREP -#include "wsrep_mysqld.h" // wsrep_thd_is_local -#include "wsrep_trans_observer.h" // wsrep_start_trx_if_not_started -#endif const LEX_CSTRING rpl_gtid_slave_state_table_name= { STRING_WITH_LEN("gtid_slave_pos") }; @@ -714,23 +710,7 @@ rpl_slave_state::record_gtid(THD *thd, const rpl_gtid *gtid, uint64 sub_id, goto end; #ifdef WITH_WSREP - /* - We should replicate local gtid_slave_pos updates to other nodes if - wsrep gtid mode is set. - In applier we should not append them to galera writeset. - */ - if (WSREP_ON_ && wsrep_gtid_mode && wsrep_thd_is_local(thd)) - { - thd->wsrep_ignore_table= false; - table->file->row_logging= 1; // replication requires binary logging - if (thd->wsrep_next_trx_id() == WSREP_UNDEFINED_TRX_ID) - thd->set_query_id(next_query_id()); - wsrep_start_trx_if_not_started(thd); - } - else - { - thd->wsrep_ignore_table= true; - } + thd->wsrep_ignore_table= true; // Do not replicate mysql.gtid_slave_pos table #endif if (!in_transaction) @@ -767,10 +747,6 @@ rpl_slave_state::record_gtid(THD *thd, const rpl_gtid *gtid, uint64 sub_id, } end: -#ifdef WITH_WSREP - thd->wsrep_ignore_table= false; -#endif - if (table_opened) { if (err || (err= ha_commit_trans(thd, FALSE))) @@ -793,6 +769,10 @@ end: mysql_mutex_unlock(&thd->LOCK_thd_data); thd->mdl_context.rollback_to_savepoint(m_start_of_statement_svp); } + +#ifdef WITH_WSREP + thd->wsrep_ignore_table= false; +#endif thd->lex->restore_backup_query_tables_list(&lex_backup); thd->variables.option_bits= thd_saved_option; thd->resume_subsequent_commits(suspended_wfc); @@ -906,25 +886,7 @@ rpl_slave_state::gtid_delete_pending(THD *thd, return; #ifdef WITH_WSREP - /* - We should replicate local gtid_slave_pos updates to other nodes if - wsrep gtid mode is set. - In applier we should not append them to galera writeset. - */ - if (WSREP_ON_ && wsrep_gtid_mode && - wsrep_thd_is_local(thd) && - thd->wsrep_cs().state() != wsrep::client_state::s_none) - { - if (thd->wsrep_trx().active() == false) - { - if (thd->wsrep_next_trx_id() == WSREP_UNDEFINED_TRX_ID) - thd->set_query_id(next_query_id()); - wsrep_start_transaction(thd, thd->wsrep_next_trx_id()); - } - thd->wsrep_ignore_table= false; - } - else - thd->wsrep_ignore_table= true; + thd->wsrep_ignore_table= true; // No Galera replication for mysql.gtid_pos_table #endif thd_saved_option= thd->variables.option_bits; diff --git a/sql/rpl_parallel.cc b/sql/rpl_parallel.cc index 962c4f90c59..6e67112d1bf 100644 --- a/sql/rpl_parallel.cc +++ b/sql/rpl_parallel.cc @@ -1067,14 +1067,15 @@ do_retry: /* The loop is here so we can try again the next relay log file on EOF. */ for (;;) { + int error; old_offset= cur_offset; - ev= Log_event::read_log_event(&rlog, description_event, + ev= Log_event::read_log_event(&rlog, &error, description_event, opt_slave_sql_verify_checksum); cur_offset= my_b_tell(&rlog); if (ev) break; - if (unlikely(rlog.error < 0)) + if (unlikely(error)) { errmsg= "slave SQL thread aborted because of I/O error"; err= 1; diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc index b10b810edc9..c16980e57c9 100644 --- a/sql/rpl_rli.cc +++ b/sql/rpl_rli.cc @@ -544,12 +544,13 @@ read_relay_log_description_event(IO_CACHE *cur_log, ulonglong start_pos, if (my_b_tell(cur_log) >= start_pos) break; - if (!(ev= Log_event::read_log_event(cur_log, fdev, + int read_error; + if (!(ev= Log_event::read_log_event(cur_log, &read_error, fdev, opt_slave_sql_verify_checksum))) { - DBUG_PRINT("info",("could not read event, cur_log->error=%d", - cur_log->error)); - if (cur_log->error) /* not EOF */ + DBUG_PRINT("info",("could not read event, read_error=%d", + read_error)); + if (read_error) /* not EOF */ { *errmsg= "I/O error reading event at position 4"; delete fdev; diff --git a/sql/semisync_master.cc b/sql/semisync_master.cc index 437b9bb99b4..3e33cff06f6 100644 --- a/sql/semisync_master.cc +++ b/sql/semisync_master.cc @@ -938,8 +938,8 @@ int Repl_semi_sync_master::commit_trx(const char *trx_wait_binlog_name, sql_print_information( "Skipping semi-sync wait for transaction at pos %s, %lu. This " "should be because semi-sync turned off and on during the " - "lifetime of this transaction.", - trx_wait_binlog_name, trx_wait_binlog_pos);); + "lifetime of this transaction.", trx_wait_binlog_name, + static_cast(trx_wait_binlog_pos));); /* The only known reason for a missing entry at this point is if * semi-sync was turned off then on, so on debug builds, we track diff --git a/sql/service_wsrep.cc b/sql/service_wsrep.cc index d58a05b3eb5..9d04849aadb 100644 --- a/sql/service_wsrep.cc +++ b/sql/service_wsrep.cc @@ -1,4 +1,4 @@ -/* Copyright 2018-2024 Codership Oy +/* Copyright 2018-2025 Codership Oy 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 @@ -82,11 +82,12 @@ extern "C" const char *wsrep_thd_query(const THD *thd) case SQLCOM_REVOKE: return "REVOKE"; case SQLCOM_SET_OPTION: - if (thd->lex->definer) - return "SET PASSWORD"; + return "SET OPTION"; /* fallthrough */ default: + { return (thd->query() ? thd->query() : "NULL"); + } } return "NULL"; } diff --git a/sql/slave.cc b/sql/slave.cc index 01db7e3e3e2..02ed9a9a61c 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -7946,7 +7946,8 @@ static Log_event* next_event(rpl_group_info *rgi, ulonglong *event_size) MYSQL_BIN_LOG::open() will write the buffered description event. */ old_pos= rli->event_relay_log_pos; - if ((ev= Log_event::read_log_event(cur_log, + int error; + if ((ev= Log_event::read_log_event(cur_log, &error, rli->relay_log.description_event_for_exec, opt_slave_sql_verify_checksum))) @@ -7963,8 +7964,8 @@ static Log_event* next_event(rpl_group_info *rgi, ulonglong *event_size) DBUG_RETURN(ev); } if (opt_reckless_slave) // For mysql-test - cur_log->error = 0; - if (unlikely(cur_log->error < 0)) + error = 0; + if (unlikely(error)) { errmsg = "slave SQL thread aborted because of I/O error"; if (hot_log) diff --git a/sql/sp_head.cc b/sql/sp_head.cc index d7c05e464e9..208ac0845f9 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -3747,6 +3747,17 @@ int sp_lex_keeper::cursor_reset_lex_and_exec_core(THD *thd, uint *nextp, return res; } +sp_lex_keeper::~sp_lex_keeper() +{ + if (m_lex_resp) + { + /* Prevent endless recursion. */ + m_lex->sphead= NULL; + delete m_lex->result; + lex_end(m_lex); + delete m_lex; + } +} /* sp_instr class functions diff --git a/sql/sp_head.h b/sql/sp_head.h index 86bbf17a4fe..5c5a5a702f3 100644 --- a/sql/sp_head.h +++ b/sql/sp_head.h @@ -1286,16 +1286,7 @@ public: { lex->sp_lex_in_use= TRUE; } - virtual ~sp_lex_keeper() - { - if (m_lex_resp) - { - /* Prevent endless recursion. */ - m_lex->sphead= NULL; - lex_end(m_lex); - delete m_lex; - } - } + virtual ~sp_lex_keeper(); /** Prepare execution of instruction using LEX, if requested check whenever diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index ec1523ccf66..1569e19c168 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -54,6 +54,7 @@ #include "sql_array.h" #include "sql_hset.h" #include "password.h" +#include "scope.h" #include "sql_plugin_compat.h" #include "wsrep_mysqld.h" @@ -2619,10 +2620,9 @@ static bool acl_load(THD *thd, const Grant_tables& tables) { READ_RECORD read_record_info; char tmp_name[SAFE_NAME_LEN+1]; - Sql_mode_save old_mode_save(thd); DBUG_ENTER("acl_load"); - thd->variables.sql_mode&= ~MODE_PAD_CHAR_TO_FULL_LENGTH; + SCOPE_CLEAR(thd->variables.sql_mode, MODE_PAD_CHAR_TO_FULL_LENGTH); grant_version++; /* Privileges updated */ @@ -3431,7 +3431,7 @@ end: switch (result) { case ER_INVALID_CURRENT_USER: - my_error(ER_INVALID_CURRENT_USER, MYF(0), rolename); + my_error(ER_INVALID_CURRENT_USER, MYF(0)); break; case ER_INVALID_ROLE: /* Role doesn't exist at all */ diff --git a/sql/sql_alter.cc b/sql/sql_alter.cc index ff7b0be78ed..32832575a04 100644 --- a/sql/sql_alter.cc +++ b/sql/sql_alter.cc @@ -623,7 +623,7 @@ bool Sql_cmd_alter_table::execute(THD *thd) DBUG_RETURN(TRUE); /* purecov: inspected */ #ifdef WITH_WSREP - if (WSREP(thd) && + if (WSREP(thd) && wsrep_thd_is_local(thd) && (!thd->is_current_stmt_binlog_format_row() || !thd->find_temporary_table(first_table))) { diff --git a/sql/sql_alter.h b/sql/sql_alter.h index 01799f2dffe..b95843d5bc1 100644 --- a/sql/sql_alter.h +++ b/sql/sql_alter.h @@ -431,6 +431,7 @@ public: /** Name of table for the above error. */ const char *fk_error_table= nullptr; bool modified_primary_key= false; + bool fast_alter_partition= false; /** Indicates that we are altering temporary table */ bool tmp_table= false; diff --git a/sql/sql_base.cc b/sql/sql_base.cc index c849ab47b13..2162afb17e5 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -781,6 +781,22 @@ close_all_tables_for_name(THD *thd, TABLE_SHARE *share, } } +static inline bool check_field_pointers(const TABLE *table) +{ + for (Field **pf= table->field; *pf; pf++) + { + Field *f= *pf; + if (f->ptr < table->record[0] || f->ptr > table->record[0] + + table->s->reclength) + return false; + if (f->null_ptr && + (f->null_ptr < table->record[0] || f->null_ptr > table->record[0] + + table->s->reclength)) + return false; + } + return true; +} + int close_thread_tables_for_query(THD *thd) { @@ -844,6 +860,8 @@ int close_thread_tables(THD *thd) DBUG_PRINT("tcache", ("table: '%s' query_id: %lu", table->s->table_name.str, (ulong) table->query_id)); + DBUG_SLOW_ASSERT(check_field_pointers(table)); + if (thd->locked_tables_mode) { #ifdef WITH_PARTITION_STORAGE_ENGINE @@ -8879,6 +8897,23 @@ static bool vers_update_or_validate_fields(TABLE *table) } +static void unwind_stored_field_offsets(const List &fields, Field *end) +{ + for (Item &item_field: fields) + { + Field *f= item_field.field_for_view_update()->field; + if (f == end) + break; + + if (f->stored_in_db()) + { + TABLE *table= f->table; + f->move_field_offset((my_ptrdiff_t) (table->record[0] - + table->record[1])); + } + } +} + /****************************************************************************** ** Fill a record with data (for INSERT or UPDATE) ** Returns : 1 if some field has wrong type @@ -8934,7 +8969,7 @@ fill_record(THD *thd, TABLE *table_arg, List &fields, List &values, if (!(field= fld->field_for_view_update())) { my_error(ER_NONUPDATEABLE_COLUMN, MYF(0), fld->name.str); - goto err; + goto err_unwind_fields; } value=v++; DBUG_ASSERT(value); @@ -8966,7 +9001,7 @@ fill_record(THD *thd, TABLE *table_arg, List &fields, List &values, if (value->save_in_field(rfield, 0) < 0 && !ignore_errors) { my_message(ER_UNKNOWN_ERROR, ER_THD(thd, ER_UNKNOWN_ERROR), MYF(0)); - goto err; + goto err_unwind_fields; } rfield->set_has_explicit_value(); } @@ -8982,20 +9017,7 @@ fill_record(THD *thd, TABLE *table_arg, List &fields, List &values, } if (update && thd->variables.sql_mode & MODE_SIMULTANEOUS_ASSIGNMENT) - { - // restore fields pointers on record[0] - f.rewind(); - while ((fld= f++)) - { - rfield= fld->field_for_view_update()->field; - if (rfield->stored_in_db()) - { - table= rfield->table; - rfield->move_field_offset((my_ptrdiff_t) (table->record[0] - - table->record[1])); - } - } - } + unwind_stored_field_offsets(fields, NULL); if (update) table_arg->evaluate_update_default_function(); @@ -9014,6 +9036,9 @@ fill_record(THD *thd, TABLE *table_arg, List &fields, List &values, thd->abort_on_warning= save_abort_on_warning; thd->no_errors= save_no_errors; DBUG_RETURN(thd->is_error()); +err_unwind_fields: + if (update && thd->variables.sql_mode & MODE_SIMULTANEOUS_ASSIGNMENT) + unwind_stored_field_offsets(fields, rfield); err: DBUG_PRINT("error",("got error")); thd->abort_on_warning= save_abort_on_warning; @@ -9042,7 +9067,6 @@ void switch_to_nullable_trigger_fields(List &items, TABLE *table) while ((item= it++)) item->walk(&Item::switch_to_nullable_fields_processor, 1, field); - table->triggers->reset_extra_null_bitmap(); } } @@ -9096,8 +9120,14 @@ static bool not_null_fields_have_null_values(TABLE *table) swap_variables(uint32, of->flags, ff->flags); if (ff->is_real_null()) { + uint err= ER_BAD_NULL_ERROR; + if (ff->flags & NO_DEFAULT_VALUE_FLAG && !ff->has_explicit_value()) + { + err= ER_NO_DEFAULT_FOR_FIELD; + table->in_use->count_cuted_fields= CHECK_FIELD_WARN; + } ff->set_notnull(); // for next row WHERE condition in UPDATE - if (convert_null_to_field_value_or_error(of) || thd->is_error()) + if (convert_null_to_field_value_or_error(of, err) || thd->is_error()) return true; } } @@ -9377,8 +9407,9 @@ my_bool mysql_rm_tmp_tables(void) memcpy(path_copy, path, path_len - ext_len); path_copy[path_len - ext_len]= 0; init_tmp_table_share(thd, &share, "", 0, "", path_copy); + handlerton *ht= share.db_type(); if (!open_table_def(thd, &share)) - share.db_type()->drop_table(share.db_type(), path_copy); + ht->drop_table(share.db_type(), path_copy); free_table_share(&share); } /* diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 8d0b29fc5b3..9584e6f01c8 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -175,7 +175,8 @@ Key::Key(const Key &rhs, MEM_ROOT *mem_root) name(rhs.name), option_list(rhs.option_list), generated(rhs.generated), invisible(false), - without_overlaps(rhs.without_overlaps), old(rhs.old), period(rhs.period) + without_overlaps(rhs.without_overlaps), old(rhs.old), length(rhs.length), + period(rhs.period) { list_copy_and_replace_each_value(columns, mem_root); } @@ -202,7 +203,7 @@ Foreign_key::Foreign_key(const Foreign_key &rhs, MEM_ROOT *mem_root) /* Test if a foreign key (= generated key) is a prefix of the given key - (ignoring key name, key type and order of columns) + (ignoring key name and type, but minding the algorithm) NOTES: This is only used to test if an index for a FOREIGN KEY exists @@ -217,6 +218,16 @@ Foreign_key::Foreign_key(const Foreign_key &rhs, MEM_ROOT *mem_root) bool is_foreign_key_prefix(Key *a, Key *b) { + ha_key_alg a_alg= a->key_create_info.algorithm; + ha_key_alg b_alg= b->key_create_info.algorithm; + + // The real algorithm in InnoDB will be BTREE if none was given by user. + a_alg= a_alg == HA_KEY_ALG_UNDEF ? HA_KEY_ALG_BTREE : a_alg; + b_alg= b_alg == HA_KEY_ALG_UNDEF ? HA_KEY_ALG_BTREE : b_alg; + + if (a_alg != b_alg) + return false; + /* Ensure that 'a' is the generated key */ if (a->generated) { @@ -3102,7 +3113,7 @@ void Item_change_list::rollback_item_tree_changes() ** Functions to provide a interface to select results *****************************************************************************/ -void select_result::cleanup() +void select_result::reset_for_next_ps_execution() { /* do nothing */ } @@ -3171,6 +3182,7 @@ void select_send::abort_result_set() */ thd->spcont->end_partial_result_set= TRUE; } + reset_for_next_ps_execution(); DBUG_VOID_RETURN; } @@ -3181,7 +3193,7 @@ void select_send::abort_result_set() stored procedure statement. */ -void select_send::cleanup() +void select_send::reset_for_next_ps_execution() { is_result_set_started= FALSE; } @@ -3219,7 +3231,7 @@ bool select_send::send_eof() if (unlikely(thd->is_error())) return TRUE; ::my_eof(thd); - is_result_set_started= 0; + reset_for_next_ps_execution(); return FALSE; } @@ -3228,10 +3240,22 @@ bool select_send::send_eof() Handling writing to file ************************************************************************/ +bool select_to_file::free_recources() +{ + if (file >= 0) + { + (void) end_io_cache(&cache); + bool error= mysql_file_close(file, MYF(MY_WME)); + file= -1; + return error; + } + return FALSE; +} + bool select_to_file::send_eof() { - int error= MY_TEST(end_io_cache(&cache)); - if (unlikely(mysql_file_close(file, MYF(MY_WME))) || + int error= false; + if (unlikely(free_recources()) || unlikely(thd->is_error())) error= true; @@ -3239,20 +3263,19 @@ bool select_to_file::send_eof() { ::my_ok(thd,row_count); } - file= -1; return error; } +void select_to_file::abort_result_set() +{ + select_result_interceptor::abort_result_set(); + free_recources(); +} -void select_to_file::cleanup() +void select_to_file::reset_for_next_ps_execution() { /* In case of error send_eof() may be not called: close the file here. */ - if (file >= 0) - { - (void) end_io_cache(&cache); - mysql_file_close(file, MYF(0)); - file= -1; - } + free_recources(); path[0]= '\0'; row_count= 0; } @@ -3260,12 +3283,8 @@ void select_to_file::cleanup() select_to_file::~select_to_file() { - if (file >= 0) - { // This only happens in case of error - (void) end_io_cache(&cache); - mysql_file_close(file, MYF(0)); - file= -1; - } + DBUG_ASSERT(file < 0); + free_recources(); // just in case } /*************************************************************************** @@ -3752,9 +3771,9 @@ int select_singlerow_subselect::send_data(List &items) } -void select_max_min_finder_subselect::cleanup() +void select_max_min_finder_subselect::reset_for_next_ps_execution() { - DBUG_ENTER("select_max_min_finder_subselect::cleanup"); + DBUG_ENTER("select_max_min_finder_subselect::reset_for_next_ps_execution"); cache= 0; DBUG_VOID_RETURN; } @@ -3979,7 +3998,7 @@ bool select_dumpvar::check_simple_select() const } -void select_dumpvar::cleanup() +void select_dumpvar::reset_for_next_ps_execution() { row_count= 0; } @@ -4409,10 +4428,10 @@ void select_materialize_with_stats::reset() } -void select_materialize_with_stats::cleanup() +void select_materialize_with_stats::reset_for_next_ps_execution() { reset(); - select_unit::cleanup(); + select_unit::reset_for_next_ps_execution(); } diff --git a/sql/sql_class.h b/sql/sql_class.h index 2a1cd4af8bc..f2b45fe4959 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -50,6 +50,7 @@ #include "session_tracker.h" #include "backup.h" #include "xa.h" +#include "scope.h" #include "ddl_log.h" /* DDL_LOG_STATE */ #include "ha_handler_stats.h" // ha_handler_stats */ @@ -459,6 +460,7 @@ public: bool invisible; bool without_overlaps; bool old; + uint length; Lex_ident period; Key(enum Keytype type_par, const LEX_CSTRING *name_arg, @@ -466,7 +468,7 @@ public: :DDL_options(ddl_options), type(type_par), key_create_info(default_key_create_info), name(*name_arg), option_list(NULL), generated(generated_arg), - invisible(false), without_overlaps(false), old(false) + invisible(false), without_overlaps(false), old(false), length(0) { key_create_info.algorithm= algorithm_arg; } @@ -477,7 +479,7 @@ public: :DDL_options(ddl_options), type(type_par), key_create_info(*key_info_arg), columns(*cols), name(*name_arg), option_list(create_opt), generated(generated_arg), - invisible(false), without_overlaps(false), old(false) + invisible(false), without_overlaps(false), old(false), length(0) {} Key(const Key &rhs, MEM_ROOT *mem_root); virtual ~Key() = default; @@ -5979,7 +5981,8 @@ public: */ virtual int send_data(List &items)=0; virtual ~select_result_sink() = default; - void reset(THD *thd_arg) { thd= thd_arg; } + // Used in cursors to initialize and reset + void reinit(THD *thd_arg) { thd= thd_arg; } }; class select_result_interceptor; @@ -6053,15 +6056,11 @@ public: */ virtual bool check_simple_select() const; virtual void abort_result_set() {} - /* - Cleanup instance of this class for next execution of a prepared - statement/stored procedure. - */ - virtual void cleanup(); + virtual void reset_for_next_ps_execution(); void set_thd(THD *thd_arg) { thd= thd_arg; } - void reset(THD *thd_arg) + void reinit(THD *thd_arg) { - select_result_sink::reset(thd_arg); + select_result_sink::reinit(thd_arg); unit= NULL; } #ifdef EMBEDDED_LIBRARY @@ -6167,9 +6166,9 @@ public: elsewhere. (this is used by ANALYZE $stmt feature). */ void disable_my_ok_calls() { suppress_my_ok= true; } - void reset(THD *thd_arg) + void reinit(THD *thd_arg) { - select_result::reset(thd_arg); + select_result::reinit(thd_arg); suppress_my_ok= false; } protected: @@ -6221,7 +6220,7 @@ private: {} void reset(THD *thd_arg) { - select_result_interceptor::reset(thd_arg); + select_result_interceptor::reinit(thd_arg); spvar_list= NULL; field_count= 0; } @@ -6265,7 +6264,7 @@ public: void reset(THD *thd_arg, sp_lex_keeper *lex_keeper) { sp_cursor_statistics::reset(); - result.reset(thd_arg); + result.reinit(thd_arg); m_lex_keeper= lex_keeper; server_side_cursor= NULL; } @@ -6293,7 +6292,7 @@ public: bool send_eof() override; bool check_simple_select() const override { return FALSE; } void abort_result_set() override; - void cleanup() override; + void reset_for_next_ps_execution() override; select_result_interceptor *result_interceptor() override { return NULL; } }; @@ -6328,7 +6327,9 @@ public: { path[0]=0; } ~select_to_file(); bool send_eof() override; - void cleanup() override; + void abort_result_set() override; + void reset_for_next_ps_execution() override; + bool free_recources(); }; @@ -6405,7 +6406,7 @@ class select_insert :public select_result_interceptor { bool send_eof() override; void abort_result_set() override; /* not implemented: select_insert is never re-used in prepared statements */ - void cleanup() override; + void reset_for_next_ps_execution() override; }; @@ -6631,7 +6632,7 @@ public: int delete_record(); bool send_eof() override; virtual bool flush(); - void cleanup() override; + void reset_for_next_ps_execution() override; virtual bool create_result_table(THD *thd, List *column_types, bool is_distinct, ulonglong options, const LEX_CSTRING *alias, @@ -6806,9 +6807,10 @@ class select_union_recursive :public select_unit */ List rec_table_refs; /* - The count of how many times cleanup() was called with cleaned==false - for the unit specifying the recursive CTE for which this object was created - or for the unit specifying a CTE that mutually recursive with this CTE. + The count of how many times reset_for_next_ps_execution() was called with + cleaned==false for the unit specifying the recursive CTE for which this + object was created or for the unit specifying a CTE that mutually + recursive with this CTE. */ uint cleanup_count; long row_counter; @@ -6827,7 +6829,7 @@ class select_union_recursive :public select_unit bool create_table, bool keep_row_order, uint hidden) override; - void cleanup() override; + void reset_for_next_ps_execution() override; }; /** @@ -6897,7 +6899,7 @@ public: { result->abort_result_set(); /* purecov: inspected */ } - void cleanup() override + void reset_for_next_ps_execution() override { send_records= 0; } @@ -7000,7 +7002,7 @@ public: uint hidden) override; bool init_result_table(ulonglong select_options); int send_data(List &items) override; - void cleanup() override; + void reset_for_next_ps_execution() override; ha_rows get_null_count_of_col(uint idx) { DBUG_ASSERT(idx < table->s->fields); @@ -7033,7 +7035,7 @@ public: bool mx, bool all): select_subselect(thd_arg, item_arg), cache(0), fmax(mx), is_all(all) {} - void cleanup() override; + void reset_for_next_ps_execution() override; int send_data(List &items) override; bool cmp_real(); bool cmp_int(); @@ -7450,7 +7452,7 @@ public: int send_data(List &items) override; bool send_eof() override; bool check_simple_select() const override; - void cleanup() override; + void reset_for_next_ps_execution() override; }; /* Bits in sql_command_flags */ diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index ef5617a1c58..59703b719b2 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -749,8 +749,8 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, table->mark_columns_needed_for_delete(); } - if ((table->file->ha_table_flags() & HA_CAN_FORCE_BULK_DELETE) && - !table->prepare_triggers_for_delete_stmt_or_event()) + if (!table->prepare_triggers_for_delete_stmt_or_event() && + table->file->ha_table_flags() & HA_CAN_FORCE_BULK_DELETE) will_batch= !table->file->start_bulk_delete(); /* @@ -782,27 +782,21 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, MEM_STRIP_BUF_SIZE); THD_STAGE_INFO(thd, stage_searching_rows_for_update); - while (!(error=info.read_record()) && !thd->killed && - ! thd->is_error()) + while (!(error=info.read_record()) && !thd->killed && !thd->is_error()) { if (record_should_be_deleted(thd, table, select, explain, delete_history)) { table->file->position(table->record[0]); - if (unlikely((error= - deltempfile->unique_add((char*) table->file->ref)))) - { - error= 1; - goto terminate_delete; - } + if ((error= deltempfile->unique_add((char*) table->file->ref))) + break; if (!--tmplimit && using_limit) break; } } end_read_record(&info); - if (unlikely(deltempfile->get(table)) || - unlikely(table->file->ha_index_or_rnd_end()) || - unlikely(init_read_record(&info, thd, table, 0, &deltempfile->sort, 0, - 1, false))) + if (table->file->ha_index_or_rnd_end() || error > 0 || + deltempfile->get(table) || + init_read_record(&info, thd, table, 0, &deltempfile->sort, 0, 1, 0)) { error= 1; goto terminate_delete; @@ -1456,6 +1450,13 @@ void multi_delete::abort_result_set() { DBUG_ENTER("multi_delete::abort_result_set"); + /**************************************************************************** + + NOTE: if you change here be aware that almost the same code is in + multi_delete::send_eof(). + + ***************************************************************************/ + /* the error was handled or nothing deleted and no side effects return */ if (error_handled || (!thd->transaction->stmt.modified_non_trans_table && !deleted)) @@ -1658,6 +1659,13 @@ bool multi_delete::send_eof() /* reset used flags */ THD_STAGE_INFO(thd, stage_end); + /**************************************************************************** + + NOTE: if you change here be aware that almost the same code is in + multi_delete::abort_result_set(). + + ***************************************************************************/ + if (thd->transaction->stmt.modified_non_trans_table) thd->transaction->all.modified_non_trans_table= TRUE; thd->transaction->all.m_unsafe_rollback_flags|= diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 18944374fb2..03558240ba0 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -978,8 +978,7 @@ bool mysql_insert(THD *thd, TABLE_LIST *table_list, if (fields.elements || !value_count || table_list->view != 0) { - if (table->triggers && - table->triggers->has_triggers(TRG_EVENT_INSERT, TRG_ACTION_BEFORE)) + if (table->field != table->field_to_fill()) { /* BEFORE INSERT triggers exist, the check will be done later, per row */ } @@ -1053,7 +1052,7 @@ bool mysql_insert(THD *thd, TABLE_LIST *table_list, INSERT INTO t1 (fields) VALUES ... INSERT INTO t1 VALUES () */ - restore_record(table,s->default_values); // Get empty record + restore_default_record_for_insert(table); table->reset_default_fields(); if (unlikely(fill_record_n_invoke_before_triggers(thd, table, fields, @@ -1082,7 +1081,7 @@ bool mysql_insert(THD *thd, TABLE_LIST *table_list, */ if (thd->lex->used_tables || // Column used in values() table->s->visible_fields != table->s->fields) - restore_record(table,s->default_values); // Get empty record + restore_default_record_for_insert(table); else { TABLE_SHARE *share= table->s; @@ -1119,24 +1118,6 @@ bool mysql_insert(THD *thd, TABLE_LIST *table_list, } } - /* - with triggers a field can get a value *conditionally*, so we have to - repeat has_no_default_value() check for every row - */ - if (table->triggers && - table->triggers->has_triggers(TRG_EVENT_INSERT, TRG_ACTION_BEFORE)) - { - for (Field **f=table->field ; *f ; f++) - { - if (unlikely(!(*f)->has_explicit_value() && - has_no_default_value(thd, *f, table_list))) - { - error= 1; - goto values_loop_end; - } - } - } - if ((res= table_list->view_check_option(thd, (values_list.elements == 1 ? 0 : @@ -2198,6 +2179,9 @@ int write_record(THD *thd, TABLE *table, COPY_INFO *info, select_result *sink) !table->file->referenced_by_foreign_key() && (!table->triggers || !table->triggers->has_delete_triggers())) { + /* + Optimized dup handling via UPDATE (and insert history for versioned). + */ if (table->versioned(VERS_TRX_ID)) { DBUG_ASSERT(table->vers_write); @@ -2233,25 +2217,39 @@ int write_record(THD *thd, TABLE *table, COPY_INFO *info, select_result *sink) } else { + /* + Normal dup handling via DELETE (or UPDATE to history for versioned) + and repeating the cycle of INSERT. + */ if (table->triggers && table->triggers->process_triggers(thd, TRG_EVENT_DELETE, TRG_ACTION_BEFORE, TRUE)) goto before_trg_err; - if (!table->versioned(VERS_TIMESTAMP)) + bool do_delete= !table->versioned(VERS_TIMESTAMP); + if (do_delete) error= table->file->ha_delete_row(table->record[1]); else { + /* Update existing row to history */ store_record(table, record[2]); restore_record(table, record[1]); table->vers_update_end(); error= table->file->ha_update_row(table->record[1], table->record[0]); restore_record(table, record[2]); + if (error == HA_ERR_FOUND_DUPP_KEY || /* Unique index, any SE */ + error == HA_ERR_FOREIGN_DUPLICATE_KEY || /* Unique index, InnoDB */ + error == HA_ERR_RECORD_IS_THE_SAME) /* No index */ + { + /* Such history row was already generated from previous cycles */ + error= table->file->ha_delete_row(table->record[1]); + do_delete= true; + } } if (unlikely(error)) goto err; - if (!table->versioned(VERS_TIMESTAMP)) + if (do_delete) info->deleted++; else info->updated++; @@ -2499,6 +2497,7 @@ public: delayed_insert_threads--; my_free(thd.query()); + thd.reset_query_inner(); thd.security_ctx->user= 0; thd.security_ctx->host= 0; } @@ -2751,12 +2750,21 @@ end_create: DBUG_RETURN(thd->is_error()); } -#define memdup_vcol(thd, vcol) \ - if (vcol) \ - { \ - (vcol)= (Virtual_column_info*)(thd)->memdup((vcol), sizeof(*(vcol))); \ - (vcol)->expr= NULL; \ +static inline +bool memdup_vcol(THD *thd, Virtual_column_info *&vcol) +{ + if (vcol) + { + vcol= (Virtual_column_info*)(thd->memdup(vcol, sizeof(*vcol))); + if (!vcol) + { + my_error(ER_OUT_OF_RESOURCES, MYF(0)); + return true; + } + vcol->expr= NULL; } + return false; +} /** As we can't let many client threads modify the same TABLE @@ -2900,9 +2908,12 @@ TABLE *Delayed_insert::get_local_table(THD* client_thd) (*field)->move_field_offset(adjust_ptrs); // Point at copy->record[0] (*field)->flags|= ((*org_field)->flags & LONG_UNIQUE_HASH_FIELD); (*field)->invisible= (*org_field)->invisible; - memdup_vcol(client_thd, (*field)->vcol_info); - memdup_vcol(client_thd, (*field)->default_value); - memdup_vcol(client_thd, (*field)->check_constraint); + if (memdup_vcol(client_thd, (*field)->vcol_info)) + goto error; + if (memdup_vcol(client_thd, (*field)->default_value)) + goto error; + if (memdup_vcol(client_thd, (*field)->check_constraint)) + goto error; if (*org_field == found_next_number_field) (*field)->table->found_next_number_field= *field; } @@ -2919,6 +2930,8 @@ TABLE *Delayed_insert::get_local_table(THD* client_thd) &error_reported, VCOL_INIT_DEPENDENCY_FAILURE_IS_WARNING))) goto error; + + copy->update_keypart_vcol_info(); } switch_defaults_to_nullable_trigger_fields(copy); @@ -4151,7 +4164,7 @@ select_insert::prepare(List &values, SELECT_LEX_UNIT *u) */ table->file->ha_start_bulk_insert((ha_rows) 0); } - restore_record(table,s->default_values); // Get empty record + restore_default_record_for_insert(table); table->reset_default_fields(); table->next_number_field=table->found_next_number_field; @@ -4232,7 +4245,7 @@ int select_insert::prepare2(JOIN *) } -void select_insert::cleanup() +void select_insert::reset_for_next_ps_execution() { /* select_insert/select_create are never re-used in prepared statement */ DBUG_ASSERT(0); @@ -4294,7 +4307,7 @@ int select_insert::send_data(List &values) originally touched by INSERT ... SELECT, so we have to restore their original values for the next row. */ - restore_record(table, s->default_values); + restore_default_record_for_insert(table); } if (table->next_number_field) { @@ -4344,6 +4357,13 @@ bool select_insert::prepare_eof() DBUG_PRINT("enter", ("trans_table: %d, table_type: '%s'", trans_table, table->file->table_type())); + /**************************************************************************** + + NOTE: if you change here be aware that almost the same code is in + select_insert::abort_result_set(). + + ****************************************************************************/ + #ifdef WITH_WSREP error= (thd->wsrep_cs().current_error()) ? -1 : (thd->locked_tables_mode <= LTM_LOCK_TABLES) ? @@ -4489,6 +4509,12 @@ void select_insert::abort_result_set() */ if (table && table->file->is_open()) { + /**************************************************************************** + + NOTE: if you change here be aware that almost the same code is in + select_insert::prepare_eof(). + + ****************************************************************************/ bool changed, transactional_table; /* If we are not in prelocked mode, we end the bulk insert started @@ -4516,7 +4542,14 @@ void select_insert::abort_result_set() If table creation failed, the number of rows modified will also be zero, so no check for that is made. */ - changed= (info.copied || info.deleted || info.updated); + if ((changed= (info.copied || info.deleted || info.updated))) + { + /* + We must invalidate the table in the query cache before binlog writing + and ha_autocommit_or_rollback. + */ + query_cache_invalidate3(thd, table, 1); + } transactional_table= table->file->has_transactions_and_rollback(); if (thd->transaction->stmt.modified_non_trans_table || thd->log_current_statement()) diff --git a/sql/sql_insert.h b/sql/sql_insert.h index 8b034c25877..2080761a0dc 100644 --- a/sql/sql_insert.h +++ b/sql/sql_insert.h @@ -47,6 +47,13 @@ void kill_delayed_threads(void); bool binlog_create_table(THD *thd, TABLE *table, bool replace); bool binlog_drop_table(THD *thd, TABLE *table); +static inline void restore_default_record_for_insert(TABLE *t) +{ + restore_record(t,s->default_values); + if (t->triggers) + t->triggers->default_extra_null_bitmap(); +} + #ifdef EMBEDDED_LIBRARY inline void kill_delayed_threads(void) {} #endif diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 9c17ffbefd1..6312102e076 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -4671,7 +4671,11 @@ public: case SQLCOM_LOAD: return duplicates == DUP_REPLACE; default: - return false; + /* + Row injections (i.e. row binlog events and BINLOG statements) should + generate history. + */ + return is_stmt_row_injection(); } } diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 0d329f5e029..fa4f8a57607 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -23,7 +23,6 @@ #include "sql_priv.h" #include "unireg.h" #include "sql_load.h" -#include "sql_load.h" #include "sql_cache.h" // query_cache_* #include "sql_base.h" // fill_record_n_invoke_before_triggers #include @@ -1023,8 +1022,7 @@ read_fixed_length(THD *thd, COPY_INFO &info, TABLE_LIST *table_list, read_info.row_end[0]=0; #endif - restore_record(table, s->default_values); - + restore_default_record_for_insert(table); while ((item= it++)) { Load_data_outvar *dst= item->get_load_data_outvar(); @@ -1137,8 +1135,8 @@ read_sep_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list, thd->progress.max_counter); } } - restore_record(table, s->default_values); + restore_default_record_for_insert(table); while ((item= it++)) { uint length; @@ -1292,8 +1290,7 @@ read_xml_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list, } #endif - restore_record(table, s->default_values); - + restore_default_record_for_insert(table); while ((item= it++)) { /* If this line is to be skipped we don't want to fill field or var */ diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 2b1fe1d9fdf..62bb759b3f3 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -5051,17 +5051,18 @@ mysql_execute_command(THD *thd, bool is_called_from_prepared_stmt) lex->create_info.set(DDL_options_st::OPT_IF_EXISTS); #ifdef WITH_WSREP - if (WSREP(thd)) + if (WSREP(thd) && !lex->tmp_table() && wsrep_thd_is_local(thd) && + (!thd->is_current_stmt_binlog_format_row() || + wsrep_table_list_has_non_temp_tables(thd, all_tables))) { - for (TABLE_LIST *table= all_tables; table; table= table->next_global) + wsrep::key_array keys; + if (wsrep_append_fk_parent_table(thd, all_tables, &keys)) { - if (!lex->tmp_table() && - (!thd->is_current_stmt_binlog_format_row() || - !is_temporary_table(table))) - { - WSREP_TO_ISOLATION_BEGIN(NULL, NULL, all_tables); - break; - } + goto wsrep_error_label; + } + if (wsrep_to_isolation_begin(thd, NULL, NULL, all_tables, NULL, &keys)) + { + goto wsrep_error_label; } } #endif /* WITH_WSREP */ diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index 4b367ae2d2e..ba7e7207ebb 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -717,9 +717,11 @@ static bool handle_list_of_fields(THD *thd, List_iterator it, } else { - if (table->s->db_type()->partition_flags && - (table->s->db_type()->partition_flags() & HA_USE_AUTO_PARTITION) && - (table->s->db_type()->partition_flags() & HA_CAN_PARTITION)) + handlerton *ht= table->s->db_type(); + if (ht->partition_flags && + ((ht->partition_flags() & + (HA_USE_AUTO_PARTITION | HA_CAN_PARTITION)) == + (HA_USE_AUTO_PARTITION | HA_CAN_PARTITION))) { /* This engine can handle automatic partitioning and there is no @@ -1924,6 +1926,7 @@ bool fix_partition_func(THD *thd, TABLE *table, bool is_create_table_ind) bool result= TRUE; partition_info *part_info= table->part_info; enum_column_usage saved_column_usage= thd->column_usage; + handlerton *ht; DBUG_ENTER("fix_partition_func"); if (part_info->fixed) @@ -2053,8 +2056,9 @@ bool fix_partition_func(THD *thd, TABLE *table, bool is_create_table_ind) goto end; if (unlikely(check_primary_key(table))) goto end; - if (unlikely((!(table->s->db_type()->partition_flags && - (table->s->db_type()->partition_flags() & HA_CAN_PARTITION_UNIQUE))) && + ht= table->s->db_type(); + if (unlikely((!(ht->partition_flags && + (ht->partition_flags() & HA_CAN_PARTITION_UNIQUE))) && check_unique_keys(table))) goto end; if (unlikely(set_up_partition_bitmaps(thd, part_info))) @@ -2779,12 +2783,14 @@ bool partition_key_modified(TABLE *table, const MY_BITMAP *fields) { Field **fld; partition_info *part_info= table->part_info; + handlerton *ht; DBUG_ENTER("partition_key_modified"); if (!part_info) DBUG_RETURN(FALSE); - if (table->s->db_type()->partition_flags && - (table->s->db_type()->partition_flags() & HA_CAN_UPDATE_PARTITION_KEY)) + ht= table->s->db_type(); + if (ht->partition_flags && + (ht->partition_flags() & HA_CAN_UPDATE_PARTITION_KEY)) DBUG_RETURN(FALSE); for (fld= part_info->full_part_field_array; *fld; fld++) if (bitmap_is_set(fields, (*fld)->field_index)) @@ -4993,11 +4999,10 @@ uint prep_alter_part_table(THD *thd, TABLE *table, Alter_info *alter_info, if default partitioning is used. */ + handlerton *ht= table->s->db_type(); if (tab_part_info->part_type != HASH_PARTITION || - ((table->s->db_type()->partition_flags() & HA_USE_AUTO_PARTITION) && - !tab_part_info->use_default_num_partitions) || - ((!(table->s->db_type()->partition_flags() & HA_USE_AUTO_PARTITION)) && - tab_part_info->use_default_num_partitions)) + !(ht->partition_flags() & HA_USE_AUTO_PARTITION) == + tab_part_info->use_default_num_partitions) { my_error(ER_REORG_NO_PARAM_ERROR, MYF(0)); goto err; diff --git a/sql/sql_partition_admin.cc b/sql/sql_partition_admin.cc index d290d0f5534..2fc3c5694f7 100644 --- a/sql/sql_partition_admin.cc +++ b/sql/sql_partition_admin.cc @@ -241,6 +241,8 @@ bool compare_table_with_partition(THD *thd, TABLE *table, TABLE *part_table, part_create_info.row_type= table->s->row_type; } + part_create_info.table= part_table; + /* NOTE: ha_blackhole does not support check_if_compatible_data, so this always fail for blackhole tables. diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index c8fb40ac6a4..6cadf9de4c4 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -3190,14 +3190,14 @@ void sync_dynamic_session_variables(THD* thd, bool global_lock) If required, will sync with global variables if the requested variable has not yet been allocated in the current thread. */ -static uchar *intern_sys_var_ptr(THD* thd, int offset, bool global_lock) +static void *intern_sys_var_ptr(THD* thd, int offset, bool global_lock) { DBUG_ENTER("intern_sys_var_ptr"); DBUG_ASSERT(offset >= 0); DBUG_ASSERT((uint)offset <= global_system_variables.dynamic_variables_head); if (!thd) - DBUG_RETURN((uchar*) global_system_variables.dynamic_variables_ptr + offset); + DBUG_RETURN(global_system_variables.dynamic_variables_ptr + offset); /* dynamic_variables_head points to the largest valid offset @@ -3209,7 +3209,7 @@ static uchar *intern_sys_var_ptr(THD* thd, int offset, bool global_lock) sync_dynamic_session_variables(thd, global_lock); mysql_prlock_unlock(&LOCK_system_variables_hash); } - DBUG_RETURN((uchar*)thd->variables.dynamic_variables_ptr + offset); + DBUG_RETURN(thd->variables.dynamic_variables_ptr + offset); } @@ -3223,42 +3223,47 @@ static uchar *intern_sys_var_ptr(THD* thd, int offset, bool global_lock) static char *mysql_sys_var_char(THD* thd, int offset) { - return (char *) intern_sys_var_ptr(thd, offset, true); + return static_cast(intern_sys_var_ptr(thd, offset, true)); } static int *mysql_sys_var_int(THD* thd, int offset) { - return (int *) intern_sys_var_ptr(thd, offset, true); + return static_cast(intern_sys_var_ptr(thd, offset, true)); +} + +static unsigned int *mysql_sys_var_uint(THD* thd, int offset) +{ + return static_cast(intern_sys_var_ptr(thd, offset, true)); } static long *mysql_sys_var_long(THD* thd, int offset) { - return (long *) intern_sys_var_ptr(thd, offset, true); + return static_cast(intern_sys_var_ptr(thd, offset, true)); } static unsigned long *mysql_sys_var_ulong(THD* thd, int offset) { - return (unsigned long *) intern_sys_var_ptr(thd, offset, true); + return static_cast(intern_sys_var_ptr(thd, offset, true)); } static long long *mysql_sys_var_longlong(THD* thd, int offset) { - return (long long *) intern_sys_var_ptr(thd, offset, true); + return static_cast(intern_sys_var_ptr(thd, offset, true)); } static unsigned long long *mysql_sys_var_ulonglong(THD* thd, int offset) { - return (unsigned long long *) intern_sys_var_ptr(thd, offset, true); + return static_cast(intern_sys_var_ptr(thd, offset, true)); } static char **mysql_sys_var_str(THD* thd, int offset) { - return (char **) intern_sys_var_ptr(thd, offset, true); + return static_cast(intern_sys_var_ptr(thd, offset, true)); } static double *mysql_sys_var_double(THD* thd, int offset) { - return (double *) intern_sys_var_ptr(thd, offset, true); + return static_cast(intern_sys_var_ptr(thd, offset, true)); } void plugin_thdvar_init(THD *thd) @@ -3519,7 +3524,7 @@ uchar* sys_var_pluginvar::real_value_ptr(THD *thd, enum_var_type type) const if (type == OPT_GLOBAL) thd= NULL; - return intern_sys_var_ptr(thd, *(int*) (plugin_var+1), false); + return (uchar*) intern_sys_var_ptr(thd, *(int*) (plugin_var+1), false); } return *(uchar**) (plugin_var+1); } @@ -3528,8 +3533,8 @@ uchar* sys_var_pluginvar::real_value_ptr(THD *thd, enum_var_type type) const bool sys_var_pluginvar::session_is_default(THD *thd) { uchar *value= plugin_var->flags & PLUGIN_VAR_THDLOCAL - ? intern_sys_var_ptr(thd, *(int*) (plugin_var+1), true) - : *(uchar**) (plugin_var+1); + ? static_cast(intern_sys_var_ptr(thd, *(int*) (plugin_var+1), true)) + : *reinterpret_cast(plugin_var+1); real_value_ptr(thd, OPT_SESSION); @@ -3771,27 +3776,27 @@ void plugin_opt_set_limits(struct my_option *options, break; case PLUGIN_VAR_ENUM | PLUGIN_VAR_THDLOCAL: options->var_type= GET_ENUM; - options->typelib= ((thdvar_enum_t*) opt)->typelib; - options->def_value= ((thdvar_enum_t*) opt)->def_val; + options->typelib= reinterpret_cast(opt)->typelib; + options->def_value= reinterpret_cast(opt)->def_val; options->min_value= options->block_size= 0; options->max_value= options->typelib->count - 1; break; case PLUGIN_VAR_SET | PLUGIN_VAR_THDLOCAL: options->var_type= GET_SET; - options->typelib= ((thdvar_set_t*) opt)->typelib; - options->def_value= ((thdvar_set_t*) opt)->def_val; + options->typelib= reinterpret_cast(opt)->typelib; + options->def_value= reinterpret_cast(opt)->def_val; options->min_value= options->block_size= 0; options->max_value= (1ULL << options->typelib->count) - 1; break; case PLUGIN_VAR_BOOL | PLUGIN_VAR_THDLOCAL: options->var_type= GET_BOOL; - options->def_value= ((thdvar_bool_t*) opt)->def_val; + options->def_value= reinterpret_cast(opt)->def_val; options->typelib= &bool_typelib; break; case PLUGIN_VAR_STR | PLUGIN_VAR_THDLOCAL: options->var_type= ((opt->flags & PLUGIN_VAR_MEMALLOC) ? GET_STR_ALLOC : GET_STR); - options->def_value= (intptr) ((thdvar_str_t*) opt)->def_val; + options->def_value= reinterpret_cast(reinterpret_cast(opt)->def_val); break; default: DBUG_ASSERT(0); @@ -3830,7 +3835,7 @@ static int construct_options(MEM_ROOT *mem_root, struct st_plugin_int *tmp, size_t plugin_name_len= strlen(plugin_name); size_t optnamelen; const int max_comment_len= 255; - char *comment= (char *) alloc_root(mem_root, max_comment_len + 1); + char *comment= static_cast(alloc_root(mem_root, max_comment_len + 1)); char *optname; int index= 0, UNINIT_VAR(offset); @@ -3842,7 +3847,7 @@ static int construct_options(MEM_ROOT *mem_root, struct st_plugin_int *tmp, DBUG_ENTER("construct_options"); - plugin_name_ptr= (char*) alloc_root(mem_root, plugin_name_len + 1); + plugin_name_ptr= static_cast(alloc_root(mem_root, plugin_name_len + 1)); safe_strcpy(plugin_name_ptr, plugin_name_len + 1, plugin_name); my_casedn_str(&my_charset_latin1, plugin_name_ptr); convert_underscore_to_dash(plugin_name_ptr, plugin_name_len); @@ -3901,19 +3906,28 @@ static int construct_options(MEM_ROOT *mem_root, struct st_plugin_int *tmp, continue; if (!(register_var(plugin_name_ptr, opt->name, opt->flags))) continue; - switch (opt->flags & PLUGIN_VAR_TYPEMASK) { + switch (opt->flags & (PLUGIN_VAR_TYPEMASK | PLUGIN_VAR_UNSIGNED)) { case PLUGIN_VAR_BOOL: ((thdvar_bool_t *) opt)->resolve= mysql_sys_var_char; break; case PLUGIN_VAR_INT: ((thdvar_int_t *) opt)->resolve= mysql_sys_var_int; break; + case PLUGIN_VAR_INT | PLUGIN_VAR_UNSIGNED: + ((thdvar_uint_t *) opt)->resolve= mysql_sys_var_uint; + break; case PLUGIN_VAR_LONG: ((thdvar_long_t *) opt)->resolve= mysql_sys_var_long; break; + case PLUGIN_VAR_LONG | PLUGIN_VAR_UNSIGNED: + ((thdvar_ulong_t *) opt)->resolve= mysql_sys_var_ulong; + break; case PLUGIN_VAR_LONGLONG: ((thdvar_longlong_t *) opt)->resolve= mysql_sys_var_longlong; break; + case PLUGIN_VAR_LONGLONG | PLUGIN_VAR_UNSIGNED: + ((thdvar_ulonglong_t *) opt)->resolve= mysql_sys_var_ulonglong; + break; case PLUGIN_VAR_STR: ((thdvar_str_t *) opt)->resolve= mysql_sys_var_str; break; diff --git a/sql/sql_plugin_services.inl b/sql/sql_plugin_services.inl index b291bf5c246..2114f3560a7 100644 --- a/sql/sql_plugin_services.inl +++ b/sql/sql_plugin_services.inl @@ -254,6 +254,9 @@ struct sql_service_st sql_service_handler= mysql_set_character_set, mysql_num_fields, mysql_select_db, + mysql_use_result, + mysql_fetch_fields, + mysql_real_escape_string, mysql_ssl_set }; diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 24934ce6852..a9cf923cc15 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -3095,8 +3095,8 @@ void mysql_sql_stmt_execute_immediate(THD *thd) DBUG_VOID_RETURN; // out of memory // See comments on thd->free_list in mysql_sql_stmt_execute() - Item *free_list_backup= thd->free_list; - thd->free_list= NULL; + SCOPE_VALUE(thd->free_list, (Item *) NULL); + SCOPE_EXIT([thd]() mutable { thd->free_items(); }); /* Make sure we call Prepared_statement::execute_immediate() with an empty THD::change_list. It can be non empty as the above @@ -3119,8 +3119,6 @@ void mysql_sql_stmt_execute_immediate(THD *thd) Item_change_list_savepoint change_list_savepoint(thd); (void) stmt->execute_immediate(query.str, (uint) query.length); change_list_savepoint.rollback(thd); - thd->free_items(); - thd->free_list= free_list_backup; /* stmt->execute_immediately() sets thd->query_string with the executed @@ -3296,7 +3294,7 @@ void reinit_stmt_before_use(THD *thd, LEX *lex) if (lex->result) { - lex->result->cleanup(); + lex->result->reset_for_next_ps_execution(); lex->result->set_thd(thd); } lex->allow_sum_func.clear_all(); @@ -3685,8 +3683,13 @@ void mysql_sql_stmt_execute(THD *thd) so they don't get freed in case of re-prepare. See MDEV-10702 Crash in SET STATEMENT FOR EXECUTE */ - Item *free_list_backup= thd->free_list; - thd->free_list= NULL; // Hide the external (e.g. "SET STATEMENT") Items + /* + Hide and restore at scope exit the "external" (e.g. "SET STATEMENT") Item list. + It will be freed normaly in THD::cleanup_after_query(). + */ + SCOPE_VALUE(thd->free_list, (Item *) NULL); + // Free items created by execute_loop() at scope exit + SCOPE_EXIT([thd]() mutable { thd->free_items(); }); /* Make sure we call Prepared_statement::execute_loop() with an empty THD::change_list. It can be non-empty because the above @@ -3710,12 +3713,6 @@ void mysql_sql_stmt_execute(THD *thd) (void) stmt->execute_loop(&expanded_query, FALSE, NULL, NULL); change_list_savepoint.rollback(thd); - thd->free_items(); // Free items created by execute_loop() - /* - Now restore the "external" (e.g. "SET STATEMENT") Item list. - It will be freed normaly in THD::cleanup_after_query(). - */ - thd->free_list= free_list_backup; stmt->lex->restore_set_statement_var(); DBUG_VOID_RETURN; diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 4b347942bfb..21b7aa84f17 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -4266,7 +4266,8 @@ bool mysql_show_binlog_events(THD* thd) my_off_t scan_pos = BIN_LOG_HEADER_SIZE; while (scan_pos < pos) { - ev= Log_event::read_log_event(&log, description_event, + int error; + ev= Log_event::read_log_event(&log, &error, description_event, opt_master_verify_checksum); scan_pos = my_b_tell(&log); if (ev == NULL || !ev->is_valid()) @@ -4341,8 +4342,9 @@ bool mysql_show_binlog_events(THD* thd) writing about this in the server log would be confusing as it isn't related to server operational status. */ + int error; for (event_count = 0; - (ev = Log_event::read_log_event(&log, + (ev = Log_event::read_log_event(&log, &error, description_event, (opt_master_verify_checksum || verify_checksum_once), false)); ) @@ -4386,7 +4388,7 @@ bool mysql_show_binlog_events(THD* thd) break; } - if (unlikely(event_count < unit->lim.get_select_limit() && log.error)) + if (unlikely(event_count < unit->lim.get_select_limit() && error)) { errmsg = "Wrong offset or I/O error"; mysql_mutex_unlock(log_lock); diff --git a/sql/sql_servers.cc b/sql/sql_servers.cc index 59a4679847b..ecf411ab313 100644 --- a/sql/sql_servers.cc +++ b/sql/sql_servers.cc @@ -283,7 +283,7 @@ end: static bool servers_load(THD *thd, TABLE_LIST *tables) { - TABLE *table; + TABLE *table= tables[0].table; READ_RECORD read_record_info; bool return_val= TRUE; DBUG_ENTER("servers_load"); @@ -292,7 +292,8 @@ static bool servers_load(THD *thd, TABLE_LIST *tables) free_root(&mem, MYF(0)); init_sql_alloc(key_memory_servers, &mem, ACL_ALLOC_BLOCK_SIZE, 0, MYF(0)); - if (init_read_record(&read_record_info,thd,table=tables[0].table, NULL, NULL, + table->use_all_columns(); + if (init_read_record(&read_record_info,thd,table, NULL, NULL, 1,0, FALSE)) DBUG_RETURN(1); while (!(read_record_info.read_record())) @@ -405,7 +406,6 @@ get_server_from_table_to_cache(TABLE *table) FOREIGN_SERVER *server= (FOREIGN_SERVER *)alloc_root(&mem, sizeof(FOREIGN_SERVER)); DBUG_ENTER("get_server_from_table_to_cache"); - table->use_all_columns(); /* get each field into the server struct ptr */ ptr= get_field(&mem, table->field[0]); diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 40881786b14..18d9e48537a 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -66,7 +66,7 @@ #include "opt_trace.h" #include "my_cpu.h" #include "key.h" - +#include "scope.h" #include "lex_symbol.h" #include "mysql/plugin_function.h" @@ -1311,7 +1311,7 @@ mysqld_show_create(THD *thd, TABLE_LIST *table_list) { Protocol *protocol= thd->protocol; char buff[2048]; - String buffer(buff, sizeof(buff), system_charset_info); + String buffer(buff, sizeof(buff), &my_charset_utf8mb4_general_ci); List field_list; bool error= TRUE; DBUG_ENTER("mysqld_show_create"); @@ -1731,7 +1731,7 @@ static bool get_field_default_value(THD *thd, Field *field, String *def_value, def_value->length(0); if (has_default) { - StringBuffer str(field->charset()); + StringBuffer str(&my_charset_utf8mb4_general_ci); if (field->default_value) { field->default_value->print(&str); @@ -2258,11 +2258,11 @@ int show_create_table_ex(THD *thd, TABLE_LIST *table_list, { packet->append(STRING_WITH_LEN(" INVISIBLE")); } - def_value.set(def_value_buf, sizeof(def_value_buf), system_charset_info); + def_value.set(def_value_buf, sizeof(def_value_buf), &my_charset_utf8mb4_general_ci); if (get_field_default_value(thd, field, &def_value, 1)) { packet->append(STRING_WITH_LEN(" DEFAULT ")); - packet->append(def_value.ptr(), def_value.length(), system_charset_info); + packet->append(def_value.ptr(), def_value.length(), &my_charset_utf8mb4_general_ci); } if (field->vers_update_unversioned()) @@ -5162,9 +5162,11 @@ static int fill_schema_table_from_frm(THD *thd, MEM_ROOT *mem_root, tbl.s= share; table_list.table= &tbl; table_list.view= (LEX*) share->is_view; - res= schema_table->process_table(thd, &table_list, table, - res, db_name, table_name); - closefrm(&tbl); + bool res2= schema_table->process_table(thd, &table_list, table, res, + db_name, table_name); + if (res == 0) + closefrm(&tbl); + res= res2; } @@ -6640,8 +6642,7 @@ int store_schema_params(THD *thd, TABLE *table, TABLE *proc_table, { Field *field; LEX_CSTRING tmp_string; - Sql_mode_save sql_mode_backup(thd); - thd->variables.sql_mode= sql_mode; + SCOPE_VALUE(thd->variables.sql_mode, sql_mode); if (sph->type() == SP_TYPE_FUNCTION) { diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 950f62d8331..96cd66eccca 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -1318,7 +1318,6 @@ int mysql_rm_table_no_locks(THD *thd, TABLE_LIST *tables, char path[FN_REFLEN + 1]; LEX_CSTRING alias= null_clex_str; LEX_CUSTRING version; - LEX_CSTRING partition_engine_name= {NULL, 0}; StringBuffer<160> unknown_tables(system_charset_info); DDL_LOG_STATE local_ddl_log_state; const char *comment_start; @@ -1405,6 +1404,7 @@ int mysql_rm_table_no_locks(THD *thd, TABLE_LIST *tables, const LEX_CSTRING db= table->db; const LEX_CSTRING table_name= table->table_name; LEX_CSTRING cpath= {0,0}; + LEX_CSTRING partition_engine_name= {NULL, 0}; handlerton *hton= 0; Table_type table_type; size_t path_length= 0; @@ -2754,6 +2754,307 @@ key_add_part_check_null(const handler *file, KEY *key_info, } +static +my_bool key_check_without_overlaps(THD *thd, HA_CREATE_INFO *create_info, + Alter_info *alter_info, + Key &key) +{ + DBUG_ENTER("key_check_without_overlaps"); + if (!key.without_overlaps) + DBUG_RETURN(FALSE); + // append_system_key_parts is already called, so we should check all the + // columns except the last two. + const auto &period_start= create_info->period_info.period.start; + const auto &period_end= create_info->period_info.period.end; + List_iterator part_it_forwarded(key.columns); + List_iterator part_it(key.columns); + part_it_forwarded++; + part_it_forwarded++; + while (part_it_forwarded++) + { + Key_part_spec *key_part= part_it++; + + if (period_start.streq(key_part->field_name) + || period_end.streq(key_part->field_name)) + { + my_error(ER_KEY_CONTAINS_PERIOD_FIELDS, MYF(0), key.name.str, + key_part->field_name.str); + DBUG_RETURN(TRUE); + } + } + + if (key.key_create_info.algorithm == HA_KEY_ALG_HASH || + key.key_create_info.algorithm == HA_KEY_ALG_LONG_HASH) + + { + my_error(ER_KEY_CANT_HAVE_WITHOUT_OVERLAPS, MYF(0), key.name.str); + DBUG_RETURN(TRUE); + } + for (Key &key2: alter_info->key_list) + { + if (key2.type != Key::FOREIGN_KEY) + continue; + DBUG_ASSERT(&key != &key2); + const Foreign_key &fk= (Foreign_key&)key2; + if (fk.update_opt != FK_OPTION_CASCADE) + continue; + for (Key_part_spec& kp: key.columns) + { + for (Key_part_spec& kp2: fk.columns) + { + if (kp.field_name.streq(kp2.field_name)) + { + my_error(ER_KEY_CANT_HAVE_WITHOUT_OVERLAPS, MYF(0), key.name.str); + DBUG_RETURN(TRUE); + } + } + } + } + create_info->period_info.unique_keys++; + + DBUG_RETURN(FALSE); +} + +static +my_bool init_key_part_spec(THD *thd, Alter_info *alter_info, + const handler *file, + const Key &key, Key_part_spec &kp, + uint max_key_length, uint max_key_part_length, + bool *is_hash_field_needed) +{ + DBUG_ENTER("init_key_part_spec"); + + const Lex_ident &field_name= kp.field_name; + Create_field *column= NULL; + + for (Create_field &c: alter_info->create_list) + if (c.field_name.streq(field_name)) + column= &c; + + /* + Either field is not present or field visibility is > INVISIBLE_USER + */ + if (!column || (column->invisible > INVISIBLE_USER && !kp.generated)) + { + my_error(ER_KEY_COLUMN_DOES_NOT_EXIST, MYF(0), field_name.str); + DBUG_RETURN(TRUE); + } + + if (!DBUG_IF("test_invisible_index") + && column->invisible > INVISIBLE_USER + && !(column->flags & VERS_SYSTEM_FIELD) && !key.invisible) + { + my_error(ER_KEY_COLUMN_DOES_NOT_EXIST, MYF(0), column->field_name.str); + DBUG_RETURN(TRUE); + } + + const Type_handler *type_handler= column->type_handler(); + switch(key.type) + { + case Key::FULLTEXT: + if (type_handler->Key_part_spec_init_ft(&kp, *column)) + { + my_error(ER_BAD_FT_COLUMN, MYF(0), field_name.str); + DBUG_RETURN(-1); + } + break; + + case Key::SPATIAL: + if (type_handler->Key_part_spec_init_spatial(&kp, *column)) + DBUG_RETURN(TRUE); + break; + + case Key::PRIMARY: + if (column->vcol_info) + { + my_error(ER_PRIMARY_KEY_BASED_ON_GENERATED_COLUMN, MYF(0)); + DBUG_RETURN(TRUE); + } + if (type_handler->Key_part_spec_init_primary(&kp, *column, file)) + DBUG_RETURN(TRUE); + break; + + case Key::MULTIPLE: + if (type_handler->Key_part_spec_init_multiple(&kp, *column, file)) + DBUG_RETURN(TRUE); + break; + + case Key::FOREIGN_KEY: + if (type_handler->Key_part_spec_init_foreign(&kp, *column, file)) + DBUG_RETURN(TRUE); + break; + + case Key::UNIQUE: + if (type_handler->Key_part_spec_init_unique(&kp, *column, file, + is_hash_field_needed)) + DBUG_RETURN(TRUE); + break; + + case Key::IGNORE_KEY: + DBUG_ASSERT(0); + break; + } + + uint key_part_length= type_handler->calc_key_length(*column); + + if (kp.length) + { + if (f_is_blob(column->pack_flag)) + { + key_part_length= MY_MIN(kp.length, + blob_length_by_type(column->real_field_type()) + * column->charset->mbmaxlen); + if (key_part_length > max_key_length || + key_part_length > max_key_part_length) + { + if (key.type == Key::MULTIPLE) + { + key_part_length= MY_MIN(max_key_length, max_key_part_length); + /* not a critical problem */ + push_warning_printf(thd, Sql_condition::WARN_LEVEL_NOTE, + ER_TOO_LONG_KEY, ER_THD(thd, ER_TOO_LONG_KEY), + key_part_length); + /* Align key length to multibyte char boundary */ + key_part_length-= key_part_length % column->charset->mbmaxlen; + } + } + } + // Catch invalid use of partial keys + else if (!f_is_geom(column->pack_flag) && + // is the key partial? + kp.length != key_part_length && + // is prefix length bigger than field length? + (kp.length > key_part_length || + // can the field have a partial key? + !type_handler->type_can_have_key_part() || + // a packed field can't be used in a partial key + f_is_packed(column->pack_flag) || + // does the storage engine allow prefixed search? + ((file->ha_table_flags() & HA_NO_PREFIX_CHAR_KEYS) && + // and is this a 'unique' key? + (key.type == Key::PRIMARY || key.type == Key::UNIQUE)))) + { + my_message(ER_WRONG_SUB_KEY, ER_THD(thd, ER_WRONG_SUB_KEY), MYF(0)); + DBUG_RETURN(TRUE); + } + else if (!(file->ha_table_flags() & HA_NO_PREFIX_CHAR_KEYS)) + key_part_length= kp.length; + } + else if (key_part_length == 0 && (column->flags & NOT_NULL_FLAG) && + !*is_hash_field_needed) + { + my_error(ER_WRONG_KEY_COLUMN, MYF(0), file->table_type(), field_name.str); + DBUG_RETURN(TRUE); + } + if (key_part_length > max_key_part_length && key.type != Key::FULLTEXT) + { + if (key.type == Key::MULTIPLE) + { + key_part_length= max_key_part_length; + /* not a critical problem */ + push_warning_printf(thd, Sql_condition::WARN_LEVEL_NOTE, + ER_TOO_LONG_KEY, ER_THD(thd, ER_TOO_LONG_KEY), + key_part_length); + /* Align key length to multibyte char boundary */ + key_part_length-= key_part_length % column->charset->mbmaxlen; + } + else if (key.type != Key::UNIQUE) + { + key_part_length= MY_MIN(max_key_length, max_key_part_length); + my_error(ER_TOO_LONG_KEY, MYF(0), key_part_length); + DBUG_RETURN(TRUE); + } + } + + if (key.type == Key::UNIQUE && key_part_length > MY_MIN(max_key_length, + max_key_part_length)) + *is_hash_field_needed= true; + + /* We can not store key_part_length more than 2^16 - 1 in frm. */ + if (*is_hash_field_needed && kp.length > UINT_MAX16) + { + my_error(ER_TOO_LONG_KEYPART, MYF(0), UINT_MAX16); + DBUG_RETURN(TRUE); + } + + kp.length= key_part_length; + + DBUG_RETURN(FALSE); +} + + +/** + @brief Initialize the key length and algorithm (if long hash). + + This function does: + 1. Append system key parts (versioning, periods) + 2. Call Type_handler key_part initialization function. + 3. Determine the length of each key_part. + 4. Calculate the total Key length. + 5. Determine if the key is long unique based on its length + smd result from type handler. It'll be saved in + key_create_info.algorithm as HA_KEY_ALG_LONG_HASH. + + @return FALSE OK + @return TRUE error + */ +static +my_bool init_key_info(THD *thd, Alter_info *alter_info, + HA_CREATE_INFO *create_info, + const handler *file) +{ + DBUG_ENTER("init_key_info"); + uint max_key_length= file->max_key_length(); + uint max_key_part_length= file->max_key_part_length(); + + for (Key &key: alter_info->key_list) + { + if (key.type == Key::FOREIGN_KEY) + continue; + + int parts_added= append_system_key_parts(thd, create_info, &key); + if (parts_added < 0) + DBUG_RETURN(true); + + bool is_hash_field_needed= false; + for (Key_part_spec &kp: key.columns) + { + if (init_key_part_spec(thd, alter_info, file, key, kp, + max_key_length, max_key_part_length, + &is_hash_field_needed)) + DBUG_RETURN(TRUE); + + key.length+= kp.length; + if (key.length > max_key_length && key.type == Key::UNIQUE) + is_hash_field_needed= true; // for case "a BLOB UNIQUE" + + if (key.length > max_key_length && key.type != Key::FULLTEXT && + !is_hash_field_needed) + { + my_error(ER_TOO_LONG_KEY, MYF(0), max_key_length); + DBUG_RETURN(TRUE); + } + + KEY_CREATE_INFO *key_cinfo= &key.key_create_info; + + if (is_hash_field_needed) + { + if (key_cinfo->algorithm == HA_KEY_ALG_UNDEF) + key_cinfo->algorithm= HA_KEY_ALG_LONG_HASH; + + if (key_cinfo->algorithm != HA_KEY_ALG_HASH && + key_cinfo->algorithm != HA_KEY_ALG_LONG_HASH) + { + my_error(ER_TOO_LONG_KEY, MYF(0), max_key_length); + DBUG_RETURN(TRUE); + } + } + } + } + DBUG_RETURN(FALSE); +} + + /* Prepare for a table creation. Stage 1: prepare the field list. @@ -2855,7 +3156,7 @@ mysql_prepare_create_table_finalize(THD *thd, HA_CREATE_INFO *create_info, { const char *key_name; Create_field *sql_field,*dup_field; - uint field,null_fields,max_key_length; + uint field,null_fields; ulong record_offset= 0; KEY_PART_INFO *key_part_info; int field_no,dup_no; @@ -2866,7 +3167,6 @@ mysql_prepare_create_table_finalize(THD *thd, HA_CREATE_INFO *create_info, int select_field_count= C_CREATE_SELECT(create_table_mode); bool tmp_table= create_table_mode == C_ALTER_TABLE; const bool create_simple= thd->lex->create_simple(); - bool is_hash_field_needed= false; const CHARSET_INFO *scs= system_charset_info; DBUG_ENTER("mysql_prepare_create_table"); @@ -2884,7 +3184,6 @@ mysql_prepare_create_table_finalize(THD *thd, HA_CREATE_INFO *create_info, create_info->versioned()); null_fields= 0; create_info->varchar= 0; - max_key_length= file->max_key_length(); /* Handle creation of sequences */ if (create_info->sequence) @@ -3053,6 +3352,9 @@ mysql_prepare_create_table_finalize(THD *thd, HA_CREATE_INFO *create_info, Key *key, *key2; uint tmp, key_number; + if (init_key_info(thd, alter_info, create_info, file)) + DBUG_RETURN(TRUE); + /* Calculate number of key segements */ *key_count= 0; @@ -3190,10 +3492,6 @@ mysql_prepare_create_table_finalize(THD *thd, HA_CREATE_INFO *create_info, key_info->name.length= strlen(key_name); key->name= key_info->name; - int parts_added= append_system_key_parts(thd, create_info, key); - if (parts_added < 0) - DBUG_RETURN(true); - key_parts += parts_added; key_info++; } tmp=file->max_keys(); @@ -3212,11 +3510,11 @@ mysql_prepare_create_table_finalize(THD *thd, HA_CREATE_INFO *create_info, key_number=0; for (; (key=key_iterator++) ; key_number++) { - uint key_length=0; Create_field *auto_increment_key= 0; Key_part_spec *column; - is_hash_field_needed= false; + bool is_hash_field_needed= key->key_create_info.algorithm + == HA_KEY_ALG_LONG_HASH; if (key->type == Key::IGNORE_KEY) { /* ignore redundant keys */ @@ -3227,6 +3525,9 @@ mysql_prepare_create_table_finalize(THD *thd, HA_CREATE_INFO *create_info, break; } + if (key_check_without_overlaps(thd, create_info, alter_info, *key)) + DBUG_RETURN(true); + switch (key->type) { case Key::MULTIPLE: key_info->flags= 0; @@ -3260,10 +3561,12 @@ mysql_prepare_create_table_finalize(THD *thd, HA_CREATE_INFO *create_info, if (key->generated) key_info->flags|= HA_GENERATED_KEY; + key_info->key_length= key->length; key_info->user_defined_key_parts=(uint8) key->columns.elements; key_info->key_part=key_part_info; key_info->usable_key_parts= key_number; key_info->algorithm= key->key_create_info.algorithm; + key_info->without_overlaps= key->without_overlaps; key_info->option_list= key->option_list; extend_option_list(thd, create_info->db_type, !key->old, &key_info->option_list, create_info->db_type->index_options); @@ -3347,37 +3650,11 @@ mysql_prepare_create_table_finalize(THD *thd, HA_CREATE_INFO *create_info, CHARSET_INFO *ft_key_charset=0; // for FULLTEXT for (uint column_nr=0 ; (column=cols++) ; column_nr++) { - Key_part_spec *dup_column; - it.rewind(); field=0; while ((sql_field=it++) && lex_string_cmp(scs, &column->field_name, &sql_field->field_name)) field++; - /* - Either field is not present or field visibility is > INVISIBLE_USER - */ - if (!sql_field || (sql_field->invisible > INVISIBLE_USER && - !column->generated)) - { - my_error(ER_KEY_COLUMN_DOES_NOT_EXIST, MYF(0), column->field_name.str); - DBUG_RETURN(TRUE); - } - if (sql_field->invisible > INVISIBLE_USER && - !(sql_field->flags & VERS_SYSTEM_FIELD) && - !key->invisible && !DBUG_IF("test_invisible_index")) - { - my_error(ER_KEY_COLUMN_DOES_NOT_EXIST, MYF(0), column->field_name.str); - DBUG_RETURN(TRUE); - } - while ((dup_column= cols2++) != column) - { - if (!lex_string_cmp(scs, &column->field_name, &dup_column->field_name)) - { - my_error(ER_DUP_FIELDNAME, MYF(0), column->field_name.str); - DBUG_RETURN(TRUE); - } - } if (sql_field->compression_method()) { @@ -3387,12 +3664,10 @@ mysql_prepare_create_table_finalize(THD *thd, HA_CREATE_INFO *create_info, } cols2.rewind(); - switch(key->type) { - + switch(key->type) + { case Key::FULLTEXT: - if (sql_field->type_handler()->Key_part_spec_init_ft(column, - *sql_field) || - (ft_key_charset && sql_field->charset != ft_key_charset)) + if (ft_key_charset && sql_field->charset != ft_key_charset) { my_error(ER_BAD_FT_COLUMN, MYF(0), column->field_name.str); DBUG_RETURN(-1); @@ -3400,66 +3675,49 @@ mysql_prepare_create_table_finalize(THD *thd, HA_CREATE_INFO *create_info, ft_key_charset= sql_field->charset; break; - case Key::SPATIAL: - if (sql_field->type_handler()->Key_part_spec_init_spatial(column, - *sql_field) || - sql_field->check_vcol_for_key(thd)) - DBUG_RETURN(TRUE); - if (!(sql_field->flags & NOT_NULL_FLAG)) - { - my_message(ER_SPATIAL_CANT_HAVE_NULL, - ER_THD(thd, ER_SPATIAL_CANT_HAVE_NULL), MYF(0)); - DBUG_RETURN(TRUE); - } - break; - case Key::PRIMARY: - if (sql_field->vcol_info) - { - my_error(ER_PRIMARY_KEY_BASED_ON_GENERATED_COLUMN, MYF(0)); - DBUG_RETURN(TRUE); - } - if (sql_field->type_handler()->Key_part_spec_init_primary(column, - *sql_field, - file)) - DBUG_RETURN(TRUE); if (!(sql_field->flags & NOT_NULL_FLAG)) { - /* Implicitly set primary key fields to NOT NULL for ISO conf. */ + /* Implicitly set primary key fields to NOT NULL for ISO conformance. */ sql_field->flags|= NOT_NULL_FLAG; sql_field->pack_flag&= ~FIELDFLAG_MAYBE_NULL; null_fields--; } break; - case Key::MULTIPLE: - if (sql_field->type_handler()->Key_part_spec_init_multiple(column, - *sql_field, - file) || - sql_field->check_vcol_for_key(thd) || - key_add_part_check_null(file, key_info, sql_field, column)) - DBUG_RETURN(TRUE); - break; - - case Key::FOREIGN_KEY: - if (sql_field->type_handler()->Key_part_spec_init_foreign(column, - *sql_field, - file) || - sql_field->check_vcol_for_key(thd) || - key_add_part_check_null(file, key_info, sql_field, column)) - DBUG_RETURN(TRUE); - break; - case Key::UNIQUE: - if (sql_field->type_handler()->Key_part_spec_init_unique(column, - *sql_field, file, - &is_hash_field_needed) || - sql_field->check_vcol_for_key(thd) || - key_add_part_check_null(file, key_info, sql_field, column)) + case Key::MULTIPLE: + case Key::FOREIGN_KEY: + if (key_add_part_check_null(file, key_info, sql_field, column)) + DBUG_RETURN(TRUE); + if (sql_field->check_vcol_for_key(thd)) DBUG_RETURN(TRUE); break; + case Key::IGNORE_KEY: break; + + case Key::SPATIAL: + if (!(sql_field->flags & NOT_NULL_FLAG)) + { + my_message(ER_SPATIAL_CANT_HAVE_NULL, + ER_THD(thd, ER_SPATIAL_CANT_HAVE_NULL), MYF(0)); + DBUG_RETURN(TRUE); + } + if (sql_field->check_vcol_for_key(thd)) + DBUG_RETURN(TRUE); + break; + } + + for (const Key_part_spec &kp2: key->columns) + { + if (column == &kp2) + break; + if (kp2.field_name.streq(column->field_name)) + { + my_error(ER_DUP_FIELDNAME, MYF(0), column->field_name.str); + DBUG_RETURN(TRUE); + } } if (MTYP_TYPENR(sql_field->unireg_check) == Field::NEXT_NUMBER) @@ -3475,111 +3733,21 @@ mysql_prepare_create_table_finalize(THD *thd, HA_CREATE_INFO *create_info, key_part_info->offset= (uint16) sql_field->offset; key_part_info->key_type=sql_field->pack_flag; key_part_info->key_part_flag= column->asc ? 0 : HA_REVERSE_SORT; - uint key_part_length= sql_field->type_handler()-> - calc_key_length(*sql_field); - - if (column->length) - { - if (f_is_blob(sql_field->pack_flag)) - { - key_part_length= MY_MIN(column->length, - blob_length_by_type(sql_field->real_field_type()) - * sql_field->charset->mbmaxlen); - if (key_part_length > max_key_length || - key_part_length > file->max_key_part_length()) - { - if (key->type == Key::MULTIPLE) - { - key_part_length= MY_MIN(max_key_length, file->max_key_part_length()); - /* not a critical problem */ - push_warning_printf(thd, Sql_condition::WARN_LEVEL_NOTE, - ER_TOO_LONG_KEY, ER_THD(thd, ER_TOO_LONG_KEY), - key_part_length); - /* Align key length to multibyte char boundary */ - key_part_length-= key_part_length % sql_field->charset->mbmaxlen; - } - } - } - // Catch invalid use of partial keys - else if (!f_is_geom(sql_field->pack_flag) && - // is the key partial? - column->length != key_part_length && - // is prefix length bigger than field length? - (column->length > key_part_length || - // can the field have a partial key? - !sql_field->type_handler()->type_can_have_key_part() || - // a packed field can't be used in a partial key - f_is_packed(sql_field->pack_flag) || - // does the storage engine allow prefixed search? - ((file->ha_table_flags() & HA_NO_PREFIX_CHAR_KEYS) && - // and is this a 'unique' key? - (key_info->flags & HA_NOSAME)))) - { - my_message(ER_WRONG_SUB_KEY, ER_THD(thd, ER_WRONG_SUB_KEY), MYF(0)); - DBUG_RETURN(TRUE); - } - else if (!(file->ha_table_flags() & HA_NO_PREFIX_CHAR_KEYS)) - key_part_length= column->length; - } - else if (key_part_length == 0 && (sql_field->flags & NOT_NULL_FLAG) && - !is_hash_field_needed) - { - my_error(ER_WRONG_KEY_COLUMN, MYF(0), file->table_type(), - column->field_name.str); - DBUG_RETURN(TRUE); - } - if (key_part_length > file->max_key_part_length() && - key->type != Key::FULLTEXT) - { - if (key->type == Key::MULTIPLE) - { - key_part_length= file->max_key_part_length(); - /* not a critical problem */ - push_warning_printf(thd, Sql_condition::WARN_LEVEL_NOTE, - ER_TOO_LONG_KEY, ER_THD(thd, ER_TOO_LONG_KEY), - key_part_length); - /* Align key length to multibyte char boundary */ - key_part_length-= key_part_length % sql_field->charset->mbmaxlen; - } - else - { - if (key->type != Key::UNIQUE) - { - key_part_length= MY_MIN(max_key_length, file->max_key_part_length()); - my_error(ER_TOO_LONG_KEY, MYF(0), key_part_length); - DBUG_RETURN(TRUE); - } - } - } - - if (key->type == Key::UNIQUE - && key_part_length > MY_MIN(max_key_length, - file->max_key_part_length())) - is_hash_field_needed= true; - - /* We can not store key_part_length more then 2^16 - 1 in frm */ - if (is_hash_field_needed && column->length > UINT_MAX16) - { - my_error(ER_TOO_LONG_KEYPART, MYF(0), UINT_MAX16); - DBUG_RETURN(TRUE); - } - else - key_part_info->length= (uint16) key_part_length; + key_part_info->length= column->length; /* Use packed keys for long strings on the first column */ if (!((*db_options) & HA_OPTION_NO_PACK_KEYS) && !((create_info->table_options & HA_OPTION_NO_PACK_KEYS)) && - (key_part_length >= KEY_DEFAULT_PACK_LENGTH) && + (column->length >= KEY_DEFAULT_PACK_LENGTH) && !is_hash_field_needed) { key_info->flags|= sql_field->type_handler()->KEY_pack_flags(column_nr); } /* Check if the key segment is partial, set the key flag accordingly */ - if (key_part_length != sql_field->type_handler()-> + if (column->length != sql_field->type_handler()-> calc_key_length(*sql_field) && - key_part_length != sql_field->type_handler()->max_octet_length()) + column->length != sql_field->type_handler()->max_octet_length()) key_info->flags|= HA_KEY_HAS_PART_KEY_SEG; - key_length+= key_part_length; key_part_info++; } if (!key_info->name.str || check_column_name(key_info->name.str)) @@ -3589,15 +3757,6 @@ mysql_prepare_create_table_finalize(THD *thd, HA_CREATE_INFO *create_info, } if (key->type == Key::UNIQUE && !(key_info->flags & HA_NULL_PART_KEY)) unique_key=1; - key_info->key_length=(uint16) key_length; - if (key_info->key_length > max_key_length && key->type == Key::UNIQUE) - is_hash_field_needed= true; // for case "a BLOB UNIQUE" - if (key_length > max_key_length && key->type != Key::FULLTEXT && - !is_hash_field_needed) - { - my_error(ER_TOO_LONG_KEY, MYF(0), max_key_length); - DBUG_RETURN(TRUE); - } /* Check long unique keys */ if (is_hash_field_needed) @@ -3609,12 +3768,6 @@ mysql_prepare_create_table_finalize(THD *thd, HA_CREATE_INFO *create_info, key_info->name.str); DBUG_RETURN(TRUE); } - if (key_info->algorithm != HA_KEY_ALG_UNDEF && - key_info->algorithm != HA_KEY_ALG_HASH ) - { - my_error(ER_TOO_LONG_KEY, MYF(0), max_key_length); - DBUG_RETURN(TRUE); - } } if (is_hash_field_needed || (key_info->algorithm == HA_KEY_ALG_HASH && @@ -3654,39 +3807,6 @@ mysql_prepare_create_table_finalize(THD *thd, HA_CREATE_INFO *create_info, // Check if a duplicate index is defined. check_duplicate_key(thd, key, key_info, &alter_info->key_list); - key_info->without_overlaps= key->without_overlaps; - if (key_info->without_overlaps) - { - if (key_info->algorithm == HA_KEY_ALG_HASH || - key_info->algorithm == HA_KEY_ALG_LONG_HASH) - - { -without_overlaps_err: - my_error(ER_KEY_CANT_HAVE_WITHOUT_OVERLAPS, MYF(0), key_info->name.str); - DBUG_RETURN(true); - } - key_iterator2.rewind(); - while ((key2 = key_iterator2++)) - { - if (key2->type != Key::FOREIGN_KEY) - continue; - DBUG_ASSERT(key != key2); - Foreign_key *fk= (Foreign_key*) key2; - if (fk->update_opt != FK_OPTION_CASCADE) - continue; - for (Key_part_spec& kp: key->columns) - { - for (Key_part_spec& kp2: fk->columns) - { - if (!lex_string_cmp(scs, &kp.field_name, &kp2.field_name)) - { - goto without_overlaps_err; - } - } - } - } - create_info->period_info.unique_keys++; - } key_info->is_ignored= key->key_create_info.is_ignored; key_info++; } @@ -4097,20 +4217,6 @@ static int append_system_key_parts(THD *thd, HA_CREATE_INFO *create_info, my_error(ER_PERIOD_NOT_FOUND, MYF(0), key->period.str); return -1; } - - const auto &period_start= create_info->period_info.period.start; - const auto &period_end= create_info->period_info.period.end; - List_iterator part_it(key->columns); - while (Key_part_spec *key_part= part_it++) - { - if (period_start.streq(key_part->field_name) - || period_end.streq(key_part->field_name)) - { - my_error(ER_KEY_CONTAINS_PERIOD_FIELDS, MYF(0), key->name.str, - key_part->field_name.str); - return -1; - } - } const auto &period= create_info->period_info.period; key->columns.push_back(new (thd->mem_root) Key_part_spec(&period.end, 0, true)); @@ -7305,7 +7411,16 @@ bool mysql_compare_tables(TABLE *table, Alter_info *alter_info, DBUG_RETURN(1); /* Some very basic checks. */ - if (table->s->fields != alter_info->create_list.elements || + uint fields= table->s->fields; + + /* There is no field count on fully-invisible fields, count them. */ + for (Field **f_ptr= table->field; *f_ptr; f_ptr++) + { + if ((*f_ptr)->invisible >= INVISIBLE_FULL) + fields--; + } + + if (fields != alter_info->create_list.elements || table->s->db_type() != create_info->db_type || table->s->tmp_table || (table->s->row_type != create_info->row_type)) @@ -7316,6 +7431,9 @@ bool mysql_compare_tables(TABLE *table, Alter_info *alter_info, for (Field **f_ptr= table->field; *f_ptr; f_ptr++) { Field *field= *f_ptr; + /* Skip hidden generated field like long hash index. */ + if (field->invisible >= INVISIBLE_SYSTEM) + continue; Create_field *tmp_new_field= tmp_new_field_it++; /* Check that NULL behavior is the same. */ @@ -7327,8 +7445,12 @@ bool mysql_compare_tables(TABLE *table, Alter_info *alter_info, { if (!tmp_new_field->field->vcol_info) DBUG_RETURN(false); - if (!field->vcol_info->is_equal(tmp_new_field->field->vcol_info)) + bool err; + if (!field->vcol_info->is_equivalent(thd, table->s, create_info->table->s, + tmp_new_field->field->vcol_info, err)) DBUG_RETURN(false); + if (err) + DBUG_RETURN(true); } /* @@ -7364,13 +7486,13 @@ bool mysql_compare_tables(TABLE *table, Alter_info *alter_info, DBUG_RETURN(false); /* Go through keys and check if they are compatible. */ - KEY *table_key; - KEY *table_key_end= table->key_info + table->s->keys; + KEY *table_key= table->s->key_info; + KEY *table_key_end= table_key + table->s->keys; KEY *new_key; KEY *new_key_end= key_info_buffer + key_count; /* Step through all keys of the first table and search matching keys. */ - for (table_key= table->key_info; table_key < table_key_end; table_key++) + for (; table_key < table_key_end; table_key++) { /* Search a key with the same name. */ for (new_key= key_info_buffer; new_key < new_key_end; new_key++) @@ -7414,7 +7536,7 @@ bool mysql_compare_tables(TABLE *table, Alter_info *alter_info, for (new_key= key_info_buffer; new_key < new_key_end; new_key++) { /* Search a key with the same name. */ - for (table_key= table->key_info; table_key < table_key_end; table_key++) + for (table_key= table->s->key_info; table_key < table_key_end; table_key++) { if (!lex_string_cmp(system_charset_info, &table_key->name, &new_key->name)) @@ -8964,7 +9086,14 @@ mysql_prepare_alter_table(THD *thd, TABLE *table, LEX_CSTRING tmp_name; bzero((char*) &key_create_info, sizeof(key_create_info)); if (key_info->algorithm == HA_KEY_ALG_LONG_HASH) - key_info->algorithm= HA_KEY_ALG_UNDEF; + key_info->algorithm= alter_ctx->fast_alter_partition ? + HA_KEY_ALG_HASH : HA_KEY_ALG_UNDEF; + /* + For fast alter partition we set HA_KEY_ALG_HASH above to make sure it + doesn't lose the hash property. + Otherwise we let mysql_prepare_create_table() decide if the hash field + is needed depending on the (possibly changed) data types. + */ key_create_info.algorithm= key_info->algorithm; /* We copy block size directly as some engines, like Area, sets this @@ -9386,6 +9515,7 @@ fk_check_column_changes(THD *thd, const TABLE *table, *bad_column_name= NULL; enum fk_column_change_type result= FK_COLUMN_NO_CHANGE; + bool strict_mode= thd->is_strict_mode(); while ((column= column_it++)) { @@ -9431,7 +9561,7 @@ fk_check_column_changes(THD *thd, const TABLE *table, goto func_exit; } - if (old_field_not_null != new_field_not_null) + if (strict_mode && old_field_not_null != new_field_not_null) { if (referenced && !new_field_not_null) { @@ -10227,7 +10357,6 @@ bool mysql_alter_table(THD *thd, const LEX_CSTRING *new_db, #ifdef WITH_PARTITION_STORAGE_ENGINE bool partition_changed= false; - bool fast_alter_partition= false; #endif bool partial_alter= false; /* @@ -10788,7 +10917,7 @@ do_continue:; Partitioning: part_info is prepared and returned via thd->work_part_info */ if (prep_alter_part_table(thd, table, alter_info, create_info, - &partition_changed, &fast_alter_partition)) + &partition_changed, &alter_ctx.fast_alter_partition)) { DBUG_RETURN(true); } @@ -10825,7 +10954,7 @@ do_continue:; Note, one can run a separate "ALTER TABLE t1 FORCE;" statement before or after the partition change ALTER statement to upgrade data types. */ - if (IF_PARTITIONING(!fast_alter_partition, 1)) + if (!alter_ctx.fast_alter_partition) Create_field::upgrade_data_types(alter_info->create_list); if (create_info->check_fields(thd, alter_info, @@ -10837,7 +10966,7 @@ do_continue:; promote_first_timestamp_column(&alter_info->create_list); #ifdef WITH_PARTITION_STORAGE_ENGINE - if (fast_alter_partition) + if (alter_ctx.fast_alter_partition) { /* ALGORITHM and LOCK clauses are generally not allowed by the @@ -12428,14 +12557,15 @@ bool mysql_checksum_table(THD *thd, TABLE_LIST *tables, protocol->store_null(); else { + DEBUG_SYNC(thd, "mysql_checksum_table_before_calculate_checksum"); int error= t->file->calculate_checksum(); + DEBUG_SYNC(thd, "mysql_checksum_table_after_calculate_checksum"); if (thd->killed) { /* we've been killed; let handler clean up, and remove the partial current row from the recordset (embedded lib) */ - t->file->ha_rnd_end(); thd->protocol->remove_last_row(); goto err; } diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index 3cb95aeacc0..2c232fe6ecb 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -1440,8 +1440,9 @@ bool Table_triggers_list::prepare_record_accessors(TABLE *table) { int null_bytes= (table->s->fields - table->s->null_fields + 7)/8; - if (!(extra_null_bitmap= (uchar*)alloc_root(&table->mem_root, null_bytes))) + if (!(extra_null_bitmap= (uchar*)alloc_root(&table->mem_root, 2*null_bytes))) return 1; + extra_null_bitmap_init= extra_null_bitmap + null_bytes; if (!(record0_field= (Field **)alloc_root(&table->mem_root, (table->s->fields + 1) * sizeof(Field*)))) @@ -1466,13 +1467,17 @@ bool Table_triggers_list::prepare_record_accessors(TABLE *table) null_ptr++, null_bit= 1; else null_bit*= 2; + if (f->flags & NO_DEFAULT_VALUE_FLAG) + f->set_null(); + else + f->set_notnull(); } else *trg_fld= *fld; } *trg_fld= 0; DBUG_ASSERT(null_ptr <= extra_null_bitmap + null_bytes); - bzero(extra_null_bitmap, null_bytes); + memcpy(extra_null_bitmap_init, extra_null_bitmap, null_bytes); } else { diff --git a/sql/sql_trigger.h b/sql/sql_trigger.h index 774dca7cba1..872dc7c3c32 100644 --- a/sql/sql_trigger.h +++ b/sql/sql_trigger.h @@ -172,7 +172,7 @@ class Table_triggers_list: public Sql_alloc BEFORE INSERT/UPDATE triggers. */ Field **record0_field; - uchar *extra_null_bitmap; + uchar *extra_null_bitmap, *extra_null_bitmap_init; /** Copy of TABLE::Field array with field pointers set to TABLE::record[1] buffer instead of TABLE::record[0] (used for OLD values in on UPDATE @@ -236,8 +236,8 @@ public: /* End of character ser context. */ Table_triggers_list(TABLE *table_arg) - :record0_field(0), extra_null_bitmap(0), record1_field(0), - trigger_table(table_arg), + :record0_field(0), extra_null_bitmap(0), extra_null_bitmap_init(0), + record1_field(0), trigger_table(table_arg), m_has_unparseable_trigger(false), count(0) { bzero((char *) triggers, sizeof(triggers)); @@ -312,11 +312,15 @@ public: TABLE_LIST *table_list); Field **nullable_fields() { return record0_field; } - void reset_extra_null_bitmap() + void clear_extra_null_bitmap() { - size_t null_bytes= (trigger_table->s->fields - - trigger_table->s->null_fields + 7)/8; - bzero(extra_null_bitmap, null_bytes); + if (size_t null_bytes= extra_null_bitmap_init - extra_null_bitmap) + bzero(extra_null_bitmap, null_bytes); + } + void default_extra_null_bitmap() + { + if (size_t null_bytes= extra_null_bitmap_init - extra_null_bitmap) + memcpy(extra_null_bitmap, extra_null_bitmap_init, null_bytes); } Trigger *find_trigger(const LEX_CSTRING *name, bool remove_from_list); diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 2a6384a8897..61306793343 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -547,7 +547,7 @@ int select_unit::delete_record() tables of JOIN - exec_tmp_table_[1 | 2]. */ -void select_unit::cleanup() +void select_unit::reset_for_next_ps_execution() { table->file->extra(HA_EXTRA_RESET_STATE); table->file->ha_delete_all_rows(); @@ -902,11 +902,11 @@ bool select_unit_ext::send_eof() return (MY_TEST(error)); } -void select_union_recursive::cleanup() +void select_union_recursive::reset_for_next_ps_execution() { if (table) { - select_unit::cleanup(); + select_unit::reset_for_next_ps_execution(); free_tmp_table(thd, table); } @@ -2192,7 +2192,7 @@ bool st_select_lex_unit::exec() if (uncacheable || !item || !item->assigned() || describe) { if (!fake_select_lex && !(with_element && with_element->is_recursive)) - union_result->cleanup(); + union_result->reset_for_next_ps_execution(); for (SELECT_LEX *sl= select_cursor; sl; sl= sl->next_select()) { ha_rows records_at_start= 0; @@ -2634,7 +2634,7 @@ bool st_select_lex_unit::cleanup() { if (union_result) { - ((select_union_recursive *) union_result)->cleanup(); + ((select_union_recursive *) union_result)->reset_for_next_ps_execution(); delete union_result; union_result= 0; } diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 8ff38c10af0..1334f75563c 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -1009,9 +1009,9 @@ update_begin: goto update_end; } - if ((table->file->ha_table_flags() & HA_CAN_FORCE_BULK_UPDATE) && - !table->prepare_triggers_for_update_stmt_or_event() && - !thd->lex->with_rownum) + if (!table->prepare_triggers_for_update_stmt_or_event() && + !thd->lex->with_rownum && + table->file->ha_table_flags() & HA_CAN_FORCE_BULK_UPDATE) will_batch= !table->file->start_bulk_update(); /* @@ -2766,6 +2766,13 @@ void multi_update::abort_result_set() (!thd->transaction->stmt.modified_non_trans_table && !updated))) return; + /**************************************************************************** + + NOTE: if you change here be aware that almost the same code is in + multi_update::send_eof(). + + ***************************************************************************/ + /* Something already updated so we have to invalidate cache */ if (updated) query_cache_invalidate3(thd, update_tables, 1); @@ -3099,6 +3106,13 @@ bool multi_update::send_eof() killed_status= (local_error == 0) ? NOT_KILLED : thd->killed; THD_STAGE_INFO(thd, stage_end); + /**************************************************************************** + + NOTE: if you change here be aware that almost the same code is in + multi_update::abort_result_set(). + + ***************************************************************************/ + /* We must invalidate the query cache before binlog writing and ha_autocommit_... */ diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 9c2fab54c58..51b48efff4f 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -1848,7 +1848,7 @@ Sys_pseudo_thread_id( "pseudo_thread_id", "This variable is for internal server use", SESSION_ONLY(pseudo_thread_id), - NO_CMD_LINE, VALID_RANGE(0, ULONGLONG_MAX), DEFAULT(0), + NO_CMD_LINE, VALID_RANGE(0, MY_THREAD_ID_MAX), DEFAULT(0), BLOCK_SIZE(1), NO_MUTEX_GUARD, IN_BINLOG); static bool diff --git a/sql/table.cc b/sql/table.cc index ea8e48ad64b..ddc8aa2f432 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -3684,6 +3684,27 @@ bool Virtual_column_info::cleanup_session_expr() } +bool +Virtual_column_info::is_equivalent(THD *thd, TABLE_SHARE *share, TABLE_SHARE *vcol_share, + const Virtual_column_info* vcol, bool &error) const +{ + error= true; + Item *cmp_expr= vcol->expr->build_clone(thd); + if (!cmp_expr) + return false; + Item::func_processor_rename_table param; + param.old_db= Lex_ident_db(vcol_share->db); + param.old_table= Lex_ident_table(vcol_share->table_name); + param.new_db= Lex_ident_db(share->db); + param.new_table= Lex_ident_table(share->table_name); + cmp_expr->walk(&Item::rename_table_processor, 1, ¶m); + + error= false; + return type_handler() == vcol->type_handler() + && is_stored() == vcol->is_stored() + && expr->eq(cmp_expr, true); +} + class Vcol_expr_context { @@ -4094,6 +4115,24 @@ bool copy_keys_from_share(TABLE *outparam, MEM_ROOT *root) return 0; } +void TABLE::update_keypart_vcol_info() +{ + for (uint k= 0; k < s->keys; k++) + { + KEY &info_k= key_info[k]; + uint parts = (s->use_ext_keys ? info_k.ext_key_parts : + info_k.user_defined_key_parts); + for (uint p= 0; p < parts; p++) + { + KEY_PART_INFO &kp= info_k.key_part[p]; + if (kp.field != field[kp.fieldnr - 1]) + { + kp.field->vcol_info = field[kp.fieldnr - 1]->vcol_info; + } + } + } +} + /* Open a table based on a TABLE_SHARE @@ -4326,20 +4365,7 @@ enum open_frm_error open_table_from_share(THD *thd, TABLE_SHARE *share, /* Update to use trigger fields */ switch_defaults_to_nullable_trigger_fields(outparam); - for (uint k= 0; k < share->keys; k++) - { - KEY &key_info= outparam->key_info[k]; - uint parts = (share->use_ext_keys ? key_info.ext_key_parts : - key_info.user_defined_key_parts); - for (uint p= 0; p < parts; p++) - { - KEY_PART_INFO &kp= key_info.key_part[p]; - if (kp.field != outparam->field[kp.fieldnr - 1]) - { - kp.field->vcol_info = outparam->field[kp.fieldnr - 1]->vcol_info; - } - } - } + outparam->update_keypart_vcol_info(); } #ifdef WITH_PARTITION_STORAGE_ENGINE @@ -7244,6 +7270,7 @@ void Field_iterator_natural_join::next() { cur_column_ref= column_ref_it++; DBUG_ASSERT(!cur_column_ref || ! cur_column_ref->table_field || + !cur_column_ref->table_field->field || cur_column_ref->table_ref->table == cur_column_ref->table_field->field->table); } @@ -9418,8 +9445,8 @@ void TABLE::prepare_triggers_for_insert_stmt_or_event() { if (triggers) { - if (triggers->has_triggers(TRG_EVENT_DELETE, - TRG_ACTION_AFTER)) + triggers->clear_extra_null_bitmap(); + if (triggers->has_triggers(TRG_EVENT_DELETE, TRG_ACTION_AFTER)) { /* The table has AFTER DELETE triggers that might access to @@ -9428,8 +9455,7 @@ void TABLE::prepare_triggers_for_insert_stmt_or_event() */ (void) file->extra(HA_EXTRA_DELETE_CANNOT_BATCH); } - if (triggers->has_triggers(TRG_EVENT_UPDATE, - TRG_ACTION_AFTER)) + if (triggers->has_triggers(TRG_EVENT_UPDATE, TRG_ACTION_AFTER)) { /* The table has AFTER UPDATE triggers that might access to subject @@ -9444,17 +9470,19 @@ void TABLE::prepare_triggers_for_insert_stmt_or_event() bool TABLE::prepare_triggers_for_delete_stmt_or_event() { - if (triggers && - triggers->has_triggers(TRG_EVENT_DELETE, - TRG_ACTION_AFTER)) + if (triggers) { - /* - The table has AFTER DELETE triggers that might access to subject table - and therefore might need delete to be done immediately. So we turn-off - the batching. - */ - (void) file->extra(HA_EXTRA_DELETE_CANNOT_BATCH); - return TRUE; + triggers->clear_extra_null_bitmap(); + if (triggers->has_triggers(TRG_EVENT_DELETE, TRG_ACTION_AFTER)) + { + /* + The table has AFTER DELETE triggers that might access to subject table + and therefore might need delete to be done immediately. So we turn-off + the batching. + */ + (void) file->extra(HA_EXTRA_DELETE_CANNOT_BATCH); + return TRUE; + } } return FALSE; } @@ -9462,17 +9490,19 @@ bool TABLE::prepare_triggers_for_delete_stmt_or_event() bool TABLE::prepare_triggers_for_update_stmt_or_event() { - if (triggers && - triggers->has_triggers(TRG_EVENT_UPDATE, - TRG_ACTION_AFTER)) + if (triggers) { - /* - The table has AFTER UPDATE triggers that might access to subject - table and therefore might need update to be done immediately. - So we turn-off the batching. - */ - (void) file->extra(HA_EXTRA_UPDATE_CANNOT_BATCH); - return TRUE; + triggers->clear_extra_null_bitmap(); + if (triggers->has_triggers(TRG_EVENT_UPDATE, TRG_ACTION_AFTER)) + { + /* + The table has AFTER UPDATE triggers that might access to subject + table and therefore might need update to be done immediately. + So we turn-off the batching. + */ + (void) file->extra(HA_EXTRA_UPDATE_CANNOT_BATCH); + return TRUE; + } } return FALSE; } diff --git a/sql/table.h b/sql/table.h index 38920f5a3ca..cd1a9a378a4 100644 --- a/sql/table.h +++ b/sql/table.h @@ -1697,6 +1697,7 @@ public: bool is_filled_at_execution(); bool update_const_key_parts(COND *conds); + void update_keypart_vcol_info(); inline void initialize_opt_range_structures(); diff --git a/sql/wsrep_applier.cc b/sql/wsrep_applier.cc index 04a20311771..289688c8470 100644 --- a/sql/wsrep_applier.cc +++ b/sql/wsrep_applier.cc @@ -22,6 +22,7 @@ #include "wsrep_xid.h" #include "wsrep_thd.h" #include "wsrep_trans_observer.h" +#include "wsrep_schema.h" // wsrep_schema #include "slave.h" // opt_log_slave_updates #include "debug_sync.h" @@ -180,6 +181,10 @@ int wsrep_apply_events(THD* thd, { thd->variables.gtid_seq_no= gtid_ev->seq_no; } + + if (wsrep_gtid_mode) + wsrep_schema->store_gtid_event(thd, gtid_ev); + delete ev; } continue; diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index 9ce29f05516..808baaec8ed 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -1714,6 +1714,42 @@ static void wsrep_keys_free(wsrep_key_arr_t* key_arr) key_arr->keys_len= 0; } +class Unknown_storage_engine_handler : public Internal_error_handler +{ +public: + Unknown_storage_engine_handler() + : m_handled_errors(0), m_unhandled_errors(0) + {} + + bool handle_condition(THD *thd, + uint sql_errno, + const char* sqlstate, + Sql_condition::enum_warning_level *level, + const char* msg, + Sql_condition ** cond_hdl) override + { + *cond_hdl= NULL; + if (sql_errno == ER_UNKNOWN_STORAGE_ENGINE) + { + m_handled_errors++; + } + else if (*level == Sql_condition::WARN_LEVEL_ERROR) + { + m_unhandled_errors++; + } + return FALSE; + } + + bool safely_trapped_errors() + { + return ((m_handled_errors > 0) && (m_unhandled_errors == 0)); + } + +private: + int m_handled_errors; + int m_unhandled_errors; +}; + /*! * @param thd thread * @param tables list of tables @@ -1721,99 +1757,116 @@ static void wsrep_keys_free(wsrep_key_arr_t* key_arr) * @return 0 if parent table append was successful, non-zero otherwise. */ -bool -wsrep_append_fk_parent_table(THD* thd, TABLE_LIST* tables, wsrep::key_array* keys) +bool wsrep_append_fk_parent_table(THD *thd, TABLE_LIST *tables, + wsrep::key_array *keys) { - bool fail= false; - TABLE_LIST *table; - TABLE_LIST *table_last_in_list; + assert(wsrep_thd_is_local(thd)); - for (table= tables; table; table= table->next_local) + bool fail= false; + Open_table_context ot_ctx(thd, MYSQL_OPEN_FORCE_SHARED_HIGH_PRIO_MDL); + + for (TABLE_LIST *table= tables; table; table= table->next_local) + { + if (!table->table) { - if (is_temporary_table(table)) + TABLE_LIST *save_next_global= table->next_global; + TABLE_LIST::enum_open_strategy save_open_strategy= table->open_strategy; + table->open_strategy= TABLE_LIST::OPEN_IF_EXISTS; + + Unknown_storage_engine_handler no_storage_engine; + thd->push_internal_handler(&no_storage_engine); + + if (open_table(thd, table, &ot_ctx)) { - WSREP_DEBUG("Temporary table %s.%s already opened query=%s", table->db.str, - table->table_name.str, wsrep_thd_query(thd)); - return false; - } - } - - thd->release_transactional_locks(); - uint counter; - MDL_savepoint mdl_savepoint= thd->mdl_context.mdl_savepoint(); - - for (table_last_in_list= tables;;table_last_in_list= table_last_in_list->next_local) { - if (!table_last_in_list->next_local) { - break; - } - } - - if (open_tables(thd, &tables, &counter, MYSQL_OPEN_FORCE_SHARED_HIGH_PRIO_MDL)) - { - WSREP_DEBUG("Unable to open table for FK checks for %s", wsrep_thd_query(thd)); - fail= true; - goto exit; - } - - for (table= tables; table; table= table->next_local) - { - if (!is_temporary_table(table) && table->table) - { - FOREIGN_KEY_INFO *f_key_info; - List f_key_list; - - table->table->file->get_foreign_key_list(thd, &f_key_list); - List_iterator_fast it(f_key_list); - while ((f_key_info=it++)) + if (no_storage_engine.safely_trapped_errors()) { - WSREP_DEBUG("appended fkey %s", f_key_info->referenced_table->str); - keys->push_back(wsrep_prepare_key_for_toi(f_key_info->referenced_db->str, - f_key_info->referenced_table->str, - wsrep::key::shared)); + Diagnostics_area *da= thd->get_stmt_da(); + da->reset_diagnostics_area(); + da->clear_warning_info(thd->query_id); + } + else + { + fail= true; } } + + thd->pop_internal_handler(); + + table->next_global= save_next_global; + table->open_strategy= save_open_strategy; + + if (fail) + { + WSREP_DEBUG("Unable to open table for FK checks for %s", + wsrep_thd_query(thd)); + goto exit; + } } + if (table->table && !is_temporary_table(table)) + { + FOREIGN_KEY_INFO *f_key_info; + List f_key_list; + + table->table->file->get_foreign_key_list(thd, &f_key_list); + List_iterator_fast it(f_key_list); + while ((f_key_info= it++)) + { + WSREP_DEBUG("appended fkey %s", f_key_info->referenced_table->str); + keys->push_back(wsrep_prepare_key_for_toi( + f_key_info->referenced_db->str, f_key_info->referenced_table->str, + wsrep::key::shared)); + } + } + } + exit: - DEBUG_SYNC(thd, "wsrep_append_fk_toi_keys_before_close_tables"); + DEBUG_SYNC(thd, "wsrep_append_fk_toi_keys_before_close_tables"); - /* close the table and release MDL locks */ - close_thread_tables(thd); - thd->mdl_context.rollback_to_savepoint(mdl_savepoint); - bool invalidate_next_global= false; - for (table= tables; table; table= table->next_local) + /* close the table and release MDL locks */ + close_thread_tables(thd); + thd->mdl_context.rollback_to_savepoint(ot_ctx.start_of_statement_svp()); + for (TABLE_LIST *table= tables; table; table= table->next_global) + { + table->table= NULL; + table->mdl_request.ticket= NULL; + } + + /* + Reopen temporary tables if necessary. + DROP TABLE pre-opens temporary tables, but the corresponding + command does not have the CF_PREOPEN_TMP_TABLES flag set. + */ + const bool preopen_tmp_tables= + thd->lex->sql_command == SQLCOM_DROP_TABLE || + (sql_command_flags[thd->lex->sql_command] & CF_PREOPEN_TMP_TABLES); + + if (preopen_tmp_tables && thd->open_temporary_tables(tables)) + { + WSREP_INFO("Unable to reopen temporary tables after FK checks"); + fail= true; + } + + /* + MDEV-32938: Check if DDL operation has been killed before. + + It may be that during collecting foreign keys this operation gets + BF-aborted by another already-running TOI operation because it got MDL + locks on the same table for checking foreign keys. After + `close_thread_tables()` has been called it's safe to assume that no-one can + BF-abort this operation as it's not holding any MDL locks any more. + */ + if (!fail) + { + mysql_mutex_lock(&thd->LOCK_thd_kill); + if (thd->killed) { - table->table= NULL; - table->mdl_request.ticket= NULL; - // We should invalidate `next_global` only for entries that are added - // in this function - if (table == table_last_in_list) { - invalidate_next_global= true; - } - if (invalidate_next_global) { - table->next_global= NULL; - } + fail= true; } + mysql_mutex_unlock(&thd->LOCK_thd_kill); + } - /* - MDEV-32938: Check if DDL operation has been killed before. - - It may be that during collecting foreign keys this operation gets BF-aborted - by another already-running TOI operation because it got MDL locks on the same - table for checking foreign keys. - After `close_thread_tables()` has been called it's safe to assume that no-one - can BF-abort this operation as it's not holding any MDL locks any more. - */ - if (!fail) - { - mysql_mutex_lock(&thd->LOCK_thd_kill); - if (thd->killed) - { - fail= true; - } - mysql_mutex_unlock(&thd->LOCK_thd_kill); - } - return fail; + return fail; } bool wsrep_reload_ssl() @@ -2223,11 +2276,18 @@ int wsrep_to_buf_helper( domain_id= wsrep_gtid_server.domain_id; server_id= wsrep_gtid_server.server_id; } - Gtid_log_event gtid_event(thd, seqno, domain_id, true, - LOG_EVENT_SUPPRESS_USE_F, true, 0); - gtid_event.server_id= server_id; - if (!gtid_event.is_valid()) ret= 0; - ret= writer.write(>id_event); + /* + * Ignore if both thd->variables.gtid_seq_no and + * thd->variables.wsrep_gtid_seq_no are not set. + */ + if (seqno) + { + Gtid_log_event gtid_event(thd, seqno, domain_id, true, + LOG_EVENT_SUPPRESS_USE_F, true, 0); + gtid_event.server_id= server_id; + if (!gtid_event.is_valid()) ret= 0; + ret= writer.write(>id_event); + } } /* It's local DDL so in case of possible gtid seqno (SET gtid_seq_no=X) @@ -2835,8 +2895,11 @@ static int wsrep_TOI_begin(THD *thd, const char *db, const char *table, if (!thd->is_error()) { - my_error(ER_LOCK_DEADLOCK, MYF(0), "WSREP replication failed. Check " - "your wsrep connection state and retry the query."); + push_warning_printf(thd, Sql_state_errno_level::WARN_LEVEL_ERROR, + ER_LOCK_DEADLOCK, + "WSREP replication failed. Check " + "your wsrep connection state and retry the query."); + my_error(ER_LOCK_DEADLOCK, MYF(0)); } } rc= -1; @@ -3342,8 +3405,6 @@ static inline bool is_committing_connection(THD *thd) static my_bool have_client_connections(THD *thd, void*) { - DBUG_PRINT("quit",("Informing thread %lld that it's time to die", - (longlong) thd->thread_id)); if (is_client_connection(thd)) { if (thd->killed == KILL_CONNECTION || @@ -3395,13 +3456,18 @@ static my_bool kill_all_threads(THD *thd, THD *caller_thd) /* We skip slave threads & scheduler on this first loop through. */ if (is_client_connection(thd) && thd != caller_thd) { - if (thd->get_stmt_da()->is_eof()) + /* the connection executing SHUTDOWN, should do clean exit, + not aborting here */ + if (thd->get_command() == COM_SHUTDOWN) { + WSREP_DEBUG("leaving SHUTDOWN executing connection alive, thread: %lld", + (longlong) thd->thread_id); return 0; } - + /* replaying connection is killed by signal */ if (is_replaying_connection(thd)) { + WSREP_DEBUG("closing connection is replaying %lld", (longlong) thd->thread_id); thd->set_killed(KILL_CONNECTION_HARD); return 0; } @@ -3410,7 +3476,7 @@ static my_bool kill_all_threads(THD *thd, THD *caller_thd) { /* replicated transactions must be skipped */ WSREP_DEBUG("closing connection %lld", (longlong) thd->thread_id); - /* instead of wsrep_close_thread() we do now soft kill by THD::awake */ + /* instead of wsrep_close_thread() we do now hard kill by THD::awake */ thd->awake(KILL_CONNECTION_HARD); return 0; } @@ -3451,8 +3517,10 @@ void wsrep_close_client_connections(my_bool wait_to_end, THD* except_caller_thd) */ server_threads.iterate(kill_remaining_threads, except_caller_thd); - DBUG_PRINT("quit", ("Waiting for threads to die (count=%u)", THD_count::value())); - WSREP_DEBUG("waiting for client connections to close: %u", THD_count::value()); + DBUG_PRINT("quit", ("Waiting for threads to die (count=%u)", + THD_count::value())); + WSREP_DEBUG("waiting for client connections to close: %u", + THD_count::value()); while (wait_to_end && server_threads.iterate(have_client_connections)) { @@ -4008,3 +4076,15 @@ void wsrep_commit_empty(THD* thd, bool all) } DBUG_VOID_RETURN; } + +bool wsrep_table_list_has_non_temp_tables(THD *thd, TABLE_LIST *tables) +{ + for (TABLE_LIST *table= tables; table; table= table->next_global) + { + if (!is_temporary_table(table)) + { + return true; + } + } + return false; +} diff --git a/sql/wsrep_mysqld.h b/sql/wsrep_mysqld.h index 183dc65b007..7e7398996bf 100644 --- a/sql/wsrep_mysqld.h +++ b/sql/wsrep_mysqld.h @@ -593,6 +593,13 @@ wsrep::key wsrep_prepare_key_for_toi(const char* db, const char* table, void wsrep_wait_ready(THD *thd); void wsrep_ready_set(bool ready_value); + +/** + * Returns true if the given list of tables contains at least one + * non-temporary table. + */ +bool wsrep_table_list_has_non_temp_tables(THD *thd, TABLE_LIST *tables); + #else /* !WITH_WSREP */ /* These macros are needed to compile MariaDB without WSREP support diff --git a/sql/wsrep_schema.cc b/sql/wsrep_schema.cc index 13780ede0e5..f8acd876a5f 100644 --- a/sql/wsrep_schema.cc +++ b/sql/wsrep_schema.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2023 Codership Oy +/* Copyright (C) 2015-2025 Codership Oy 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 @@ -31,6 +31,8 @@ #include "wsrep_storage_service.h" #include "wsrep_thd.h" #include "wsrep_server_state.h" +#include "log_event.h" +#include "sql_class.h" #include #include @@ -1652,6 +1654,64 @@ int Wsrep_schema::recover_sr_transactions(THD *orig_thd) DBUG_RETURN(ret); } +int Wsrep_schema::store_gtid_event(THD* thd, + const Gtid_log_event *gtid) +{ + DBUG_ENTER("Wsrep_schema::store_gtid_event"); + int error=0; + void *hton= NULL; + const bool in_transaction= (gtid->flags2 & Gtid_log_event::FL_TRANSACTIONAL); + const bool in_ddl= (gtid->flags2 & Gtid_log_event::FL_DDL); + + DBUG_PRINT("info", ("thd: %p, in_transaction: %d, in_ddl: %d " + "in_active_multi_stmt_transaction: %d", + thd, in_transaction, in_ddl, + thd->in_active_multi_stmt_transaction())); + + Wsrep_schema_impl::wsrep_ignore_table ignore_table(thd); + Wsrep_schema_impl::binlog_off binlog_off(thd); + Wsrep_schema_impl::sql_safe_updates sql_safe_updates(thd); + + rpl_group_info *rgi= thd->wsrep_rgi; + const uint64 sub_id= rpl_global_gtid_slave_state->next_sub_id(gtid->domain_id); + rpl_gtid current_gtid; + current_gtid.domain_id= gtid->domain_id; + current_gtid.server_id= gtid->server_id; + current_gtid.seq_no= gtid->seq_no; + rgi->gtid_pending= false; + + DBUG_ASSERT(!in_transaction || thd->in_active_multi_stmt_transaction()); + + if ((error= rpl_global_gtid_slave_state->record_gtid(thd, ¤t_gtid, + sub_id, + in_transaction, false, &hton))) + goto out; + + rpl_global_gtid_slave_state->update_state_hash(sub_id, ¤t_gtid, hton, rgi); + + if (in_ddl) + { + // Commit transaction if this GTID is part of DDL-clause because + // DDL causes implicit commit assuming there is no multi statement + // transaction ongoing. + if((error= trans_commit_stmt(thd))) + goto out; + + (void)trans_commit(thd); + } + +out: + if (error) + { + WSREP_DEBUG("Wsrep_schema::store_gtid_event %llu-%llu-%llu failed error=%s (%d).", + gtid->domain_id, gtid->server_id, gtid->seq_no, strerror(error), error); + (void)trans_rollback_stmt(thd); + (void)trans_rollback(thd); + } + + DBUG_RETURN(error); +} + void Wsrep_schema::clear_allowlist() { THD* thd= new THD(next_thread_id()); diff --git a/sql/wsrep_schema.h b/sql/wsrep_schema.h index c9004d076bd..0a2e37ba1b3 100644 --- a/sql/wsrep_schema.h +++ b/sql/wsrep_schema.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2015-2023 Codership Oy +/* Copyright (C) 2015-2024 Codership Oy 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 @@ -22,7 +22,6 @@ #include "mysqld.h" #include "wsrep_mysqld.h" - /* Forward decls */ @@ -32,6 +31,7 @@ struct TABLE; struct TABLE_LIST; struct st_mysql_lex_string; typedef struct st_mysql_lex_string LEX_STRING; +class Gtid_log_event; /** Name of the table in `wsrep_schema_str` used for storing streaming replication data. In an InnoDB full format, e.g. "database/tablename". */ @@ -133,6 +133,15 @@ class Wsrep_schema */ int recover_sr_transactions(THD* orig_thd); + /** + Store GTID-event to mysql.gtid_slave_pos table. + + @param thd The THD object of the calling thread. + @param gtid GTID event from binlog. + + @return Zero on success, non-zero on failure. + */ + int store_gtid_event(THD* thd, const Gtid_log_event *gtid); /** Delete all rows on bootstrap from `wsrep_allowlist` variable diff --git a/sql/wsrep_thd.cc b/sql/wsrep_thd.cc index 52c415e2bf4..8e83aa95538 100644 --- a/sql/wsrep_thd.cc +++ b/sql/wsrep_thd.cc @@ -497,7 +497,7 @@ void wsrep_backup_kill_for_commit(THD *thd) void wsrep_restore_kill_after_commit(THD *thd) { - DBUG_ASSERT(WSREP(thd)); + DBUG_ASSERT(wsrep_is_active(thd)); mysql_mutex_assert_owner(&thd->LOCK_thd_kill); thd->killed= thd->wsrep_abort_by_kill; my_free(thd->killed_err); diff --git a/storage/columnstore/columnstore b/storage/columnstore/columnstore index 9f905c07b9c..ef0647b74ac 160000 --- a/storage/columnstore/columnstore +++ b/storage/columnstore/columnstore @@ -1 +1 @@ -Subproject commit 9f905c07b9c5ba68590a7cec24e71859d4082d56 +Subproject commit ef0647b74ac41263cfdc25d3d4b5169c9e8df7ec diff --git a/storage/connect/mysql-test/connect/r/mysql.result b/storage/connect/mysql-test/connect/r/mysql.result index 508c2fcfdf5..38aeec167fa 100644 --- a/storage/connect/mysql-test/connect/r/mysql.result +++ b/storage/connect/mysql-test/connect/r/mysql.result @@ -231,7 +231,7 @@ a # Start of mysqldump ------ /*M!999999\- enable the sandbox mode */ /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `t2` ( `a` int(11) DEFAULT NULL ) ENGINE=CONNECT DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci CONNECTION='mysql://root@localhost:PORT/test/t1' `TABLE_TYPE`='MYSQL'; diff --git a/storage/heap/hp_rnext.c b/storage/heap/hp_rnext.c index f227ce4d274..ac21ed83da2 100644 --- a/storage/heap/hp_rnext.c +++ b/storage/heap/hp_rnext.c @@ -46,7 +46,7 @@ int heap_rnext(HP_INFO *info, uchar *record) &info->last_pos, offsetof(TREE_ELEMENT, left)); } } - else if (info->last_pos) + else if (info->last_pos && info->key_version == info->s->key_version) { /* We enter this branch for non-DELETE queries after heap_rkey() @@ -72,6 +72,7 @@ int heap_rnext(HP_INFO *info, uchar *record) */ pos= tree_search_edge(&keyinfo->rb_tree, info->parents, &info->last_pos, offsetof(TREE_ELEMENT, left)); + info->key_version= info->s->key_version; } else { @@ -87,6 +88,7 @@ int heap_rnext(HP_INFO *info, uchar *record) info->last_find_flag= HA_READ_KEY_OR_NEXT; pos = tree_search_key(&keyinfo->rb_tree, info->lastkey, info->parents, &info->last_pos, info->last_find_flag, &custom_arg); + info->key_version= info->s->key_version; } if (pos) { diff --git a/storage/heap/hp_rprev.c b/storage/heap/hp_rprev.c index 1d9420ba8b6..cc81d179570 100644 --- a/storage/heap/hp_rprev.c +++ b/storage/heap/hp_rprev.c @@ -46,7 +46,7 @@ int heap_rprev(HP_INFO *info, uchar *record) &info->last_pos, offsetof(TREE_ELEMENT, right)); } } - else if (info->last_pos) + else if (info->last_pos && info->key_version == info->s->key_version) pos = tree_search_next(&keyinfo->rb_tree, &info->last_pos, offsetof(TREE_ELEMENT, right), offsetof(TREE_ELEMENT, left)); @@ -58,6 +58,7 @@ int heap_rprev(HP_INFO *info, uchar *record) info->last_find_flag= HA_READ_KEY_OR_PREV; pos = tree_search_key(&keyinfo->rb_tree, info->lastkey, info->parents, &info->last_pos, info->last_find_flag, &custom_arg); + info->key_version= info->s->key_version; } if (pos) { diff --git a/storage/heap/hp_update.c b/storage/heap/hp_update.c index da83a9c76a8..ad56ca979de 100644 --- a/storage/heap/hp_update.c +++ b/storage/heap/hp_update.c @@ -21,7 +21,8 @@ int heap_update(HP_INFO *info, const uchar *old, const uchar *heap_new) { HP_KEYDEF *keydef, *end, *p_lastinx; - uchar *pos; + uchar *pos, *recovery_ptr; + struct st_hp_hash_info *recovery_hash_ptr; my_bool auto_key_changed= 0, key_changed= 0; HP_SHARE *share= info->s; DBUG_ENTER("heap_update"); @@ -34,6 +35,10 @@ int heap_update(HP_INFO *info, const uchar *old, const uchar *heap_new) if (--(share->records) < share->blength >> 1) share->blength>>= 1; share->changed=1; + // Save the cursor position to recover if insert fails. + recovery_ptr= info->current_ptr; + recovery_hash_ptr= info->current_hash_ptr; + p_lastinx= share->keydef + info->lastinx; for (keydef= share->keydef, end= keydef + share->keys; keydef < end; keydef++) { @@ -84,6 +89,8 @@ int heap_update(HP_INFO *info, const uchar *old, const uchar *heap_new) } keydef--; } + info->current_ptr= recovery_ptr; + info->current_hash_ptr= recovery_hash_ptr; } if (++(share->records) == share->blength) share->blength+= share->blength; diff --git a/storage/innobase/dict/dict0crea.cc b/storage/innobase/dict/dict0crea.cc index c567c0a0112..27729803e5d 100644 --- a/storage/innobase/dict/dict0crea.cc +++ b/storage/innobase/dict/dict0crea.cc @@ -45,6 +45,7 @@ Created 1/8/1996 Heikki Tuuri #include "fts0priv.h" #include "srv0start.h" #include "log.h" +#include "ha_innodb.h" /*****************************************************************//** Based on a table object, this function builds the entry to be inserted @@ -1756,8 +1757,9 @@ dict_create_add_foreigns_to_dictionary( return DB_ERROR; } + bool strict_mode = thd_is_strict_mode(trx->mysql_thd); for (auto fk : local_fk_set) - if (!fk->check_fk_constraint_valid()) + if (strict_mode && !fk->check_fk_constraint_valid()) return DB_CANNOT_ADD_CONSTRAINT; else if (dberr_t error= dict_create_add_foreign_to_dictionary (table->name.m_name, fk, trx)) diff --git a/storage/innobase/dict/dict0dict.cc b/storage/innobase/dict/dict0dict.cc index fc8ddf14bbe..2e6a6d896e1 100644 --- a/storage/innobase/dict/dict0dict.cc +++ b/storage/innobase/dict/dict0dict.cc @@ -1489,6 +1489,26 @@ dict_table_t::rename_tablespace(span new_name, bool replace) const return err; } +/********************************************************************** +Converts an identifier from my_charset_filename to UTF-8 charset. +@return result string length, as returned by strconvert() */ +static +uint +innobase_convert_to_filename_charset( +/*=================================*/ + char* to, /* out: converted identifier */ + const char* from, /* in: identifier to convert */ + ulint len) /* in: length of 'to', in bytes */ +{ + uint errors; + CHARSET_INFO* cs_to = &my_charset_filename; + CHARSET_INFO* cs_from = system_charset_info; + + return(static_cast(strconvert( + cs_from, from, uint(strlen(from)), + cs_to, to, static_cast(len), &errors))); +} + /**********************************************************************//** Renames a table object. @return TRUE if success */ @@ -1621,19 +1641,20 @@ dict_table_rename_in_cache( foreign->referenced_table->referenced_set.erase(foreign); } - if (strlen(foreign->foreign_table_name) - < strlen(table->name.m_name)) { + const bool do_alloc = strlen(foreign->foreign_table_name) + < strlen(table->name.m_name); + + if (do_alloc) { /* Allocate a longer name buffer; TODO: store buf len to save memory */ foreign->foreign_table_name = mem_heap_strdup( foreign->heap, table->name.m_name); - dict_mem_foreign_table_name_lookup_set(foreign, TRUE); } else { strcpy(foreign->foreign_table_name, table->name.m_name); - dict_mem_foreign_table_name_lookup_set(foreign, FALSE); } + dict_mem_foreign_table_name_lookup_set(foreign, do_alloc); if (strchr(foreign->id, '/')) { /* This is a >= 4.0.18 format id */ @@ -3123,20 +3144,13 @@ dict_scan_id( mem_heap_t* heap, /*!< in: heap where to allocate the id (NULL=id will not be allocated, but it will point to string near ptr) */ - const char** id, /*!< out,own: the id; NULL if no id was + const char** id) /*!< out,own: the id; NULL if no id was scannable */ - ibool table_id,/*!< in: TRUE=convert the allocated id - as a table name; FALSE=convert to UTF-8 */ - ibool accept_also_dot) - /*!< in: TRUE if also a dot can appear in a - non-quoted id; in a quoted id it can appear - always */ { char quote = '\0'; ulint len = 0; const char* s; char* str; - char* dst; *id = NULL; @@ -3172,7 +3186,6 @@ dict_scan_id( } } else { while (!my_isspace(cs, *ptr) && *ptr != '(' && *ptr != ')' - && (accept_also_dot || *ptr != '.') && *ptr != ',' && *ptr != '\0') { ptr++; @@ -3206,125 +3219,15 @@ dict_scan_id( str = mem_heap_strdupl(heap, s, len); } - if (!table_id) { -convert_id: - /* Convert the identifier from connection character set - to UTF-8. */ - len = 3 * len + 1; - *id = dst = static_cast(mem_heap_alloc(heap, len)); - - innobase_convert_from_id(cs, dst, str, len); - } else if (!strncmp(str, srv_mysql50_table_name_prefix, - sizeof(srv_mysql50_table_name_prefix) - 1)) { - /* This is a pre-5.1 table name - containing chars other than [A-Za-z0-9]. - Discard the prefix and use raw UTF-8 encoding. */ - str += sizeof(srv_mysql50_table_name_prefix) - 1; - len -= sizeof(srv_mysql50_table_name_prefix) - 1; - goto convert_id; - } else { - /* Encode using filename-safe characters. */ - len = 5 * len + 1; - *id = dst = static_cast(mem_heap_alloc(heap, len)); - - innobase_convert_from_table_id(cs, dst, str, len); - } - + ulint dstlen = 3 * len + 1; + char *dst = static_cast(mem_heap_alloc(heap, dstlen)); + *id = dst; + uint errors; + strconvert(cs, str, uint(len), system_charset_info, dst, + uint(dstlen), &errors); return(ptr); } -/*********************************************************************//** -Open a table from its database and table name, this is currently used by -foreign constraint parser to get the referenced table. -@return complete table name with database and table name, allocated from -heap memory passed in */ -char* -dict_get_referenced_table( - const char* name, /*!< in: foreign key table name */ - const char* database_name, /*!< in: table db name */ - ulint database_name_len, /*!< in: db name length */ - const char* table_name, /*!< in: table name */ - ulint table_name_len, /*!< in: table name length */ - dict_table_t** table, /*!< out: table object or NULL */ - mem_heap_t* heap, /*!< in/out: heap memory */ - CHARSET_INFO* from_cs) /*!< in: table name charset */ -{ - char* ref; - char db_name[MAX_DATABASE_NAME_LEN]; - char tbl_name[MAX_TABLE_NAME_LEN]; - CHARSET_INFO* to_cs = &my_charset_filename; - uint errors; - ut_ad(database_name || name); - ut_ad(table_name); - - if (!strncmp(table_name, srv_mysql50_table_name_prefix, - sizeof(srv_mysql50_table_name_prefix) - 1)) { - /* This is a pre-5.1 table name - containing chars other than [A-Za-z0-9]. - Discard the prefix and use raw UTF-8 encoding. */ - table_name += sizeof(srv_mysql50_table_name_prefix) - 1; - table_name_len -= sizeof(srv_mysql50_table_name_prefix) - 1; - - to_cs = system_charset_info; - } - - table_name_len = strconvert(from_cs, table_name, table_name_len, to_cs, - tbl_name, MAX_TABLE_NAME_LEN, &errors); - table_name = tbl_name; - - if (database_name) { - to_cs = &my_charset_filename; - if (!strncmp(database_name, srv_mysql50_table_name_prefix, - sizeof(srv_mysql50_table_name_prefix) - 1)) { - database_name - += sizeof(srv_mysql50_table_name_prefix) - 1; - database_name_len - -= sizeof(srv_mysql50_table_name_prefix) - 1; - to_cs = system_charset_info; - } - - database_name_len = strconvert( - from_cs, database_name, database_name_len, to_cs, - db_name, MAX_DATABASE_NAME_LEN, &errors); - database_name = db_name; - } else { - /* Use the database name of the foreign key table */ - - database_name = name; - database_name_len = dict_get_db_name_len(name); - } - - /* Copy database_name, '/', table_name, '\0' */ - const size_t len = database_name_len + table_name_len + 1; - ref = static_cast(mem_heap_alloc(heap, len + 1)); - memcpy(ref, database_name, database_name_len); - ref[database_name_len] = '/'; - memcpy(ref + database_name_len + 1, table_name, table_name_len + 1); - - /* Values; 0 = Store and compare as given; case sensitive - 1 = Store and compare in lower; case insensitive - 2 = Store as given, compare in lower; case semi-sensitive */ - if (lower_case_table_names == 2) { - innobase_casedn_str(ref); - *table = dict_sys.load_table({ref, len}); - memcpy(ref, database_name, database_name_len); - ref[database_name_len] = '/'; - memcpy(ref + database_name_len + 1, table_name, table_name_len + 1); - - } else { -#ifndef _WIN32 - if (lower_case_table_names == 1) { - innobase_casedn_str(ref); - } -#else - innobase_casedn_str(ref); -#endif /* !_WIN32 */ - *table = dict_sys.load_table({ref, len}); - } - - return(ref); -} - /*********************************************************************//** Removes MySQL comments from an SQL string. A comment is either (a) '#' to the end of the line, @@ -3581,7 +3484,7 @@ loop: } } - ptr = dict_scan_id(cs, ptr, heap, &id, FALSE, TRUE); + ptr = dict_scan_id(cs, ptr, heap, &id); if (id == NULL) { diff --git a/storage/innobase/dict/dict0mem.cc b/storage/innobase/dict/dict0mem.cc index d47914cf888..cf4c1e278db 100644 --- a/storage/innobase/dict/dict0mem.cc +++ b/storage/innobase/dict/dict0mem.cc @@ -816,7 +816,7 @@ void dict_mem_foreign_table_name_lookup_set( /*===================================*/ dict_foreign_t* foreign, /*!< in/out: foreign struct */ - ibool do_alloc) /*!< in: is an alloc needed */ + bool do_alloc) /*!< in: is an alloc needed */ { if (lower_case_table_names == 2) { if (do_alloc) { @@ -830,7 +830,8 @@ dict_mem_foreign_table_name_lookup_set( } strcpy(foreign->foreign_table_name_lookup, foreign->foreign_table_name); - innobase_casedn_str(foreign->foreign_table_name_lookup); + my_casedn_str(system_charset_info, + foreign->foreign_table_name_lookup); } else { foreign->foreign_table_name_lookup = foreign->foreign_table_name; @@ -860,7 +861,8 @@ dict_mem_referenced_table_name_lookup_set( } strcpy(foreign->referenced_table_name_lookup, foreign->referenced_table_name); - innobase_casedn_str(foreign->referenced_table_name_lookup); + my_casedn_str(system_charset_info, + foreign->referenced_table_name_lookup); } else { foreign->referenced_table_name_lookup = foreign->referenced_table_name; diff --git a/storage/innobase/dict/drop.cc b/storage/innobase/dict/drop.cc index 75447072a90..6553789e251 100644 --- a/storage/innobase/dict/drop.cc +++ b/storage/innobase/dict/drop.cc @@ -247,7 +247,7 @@ void trx_t::commit(std::vector &deleted) mutex_lock(); lock_release_on_drop(this); ut_ad(UT_LIST_GET_LEN(lock.trx_locks) == 0); - ut_ad(ib_vector_is_empty(autoinc_locks)); + ut_ad(autoinc_locks.empty()); mem_heap_empty(lock.lock_heap); lock.table_locks.clear(); /* commit_persist() already reset this. */ diff --git a/storage/innobase/fil/fil0crypt.cc b/storage/innobase/fil/fil0crypt.cc index 630ba1958e1..4626ef85918 100644 --- a/storage/innobase/fil/fil0crypt.cc +++ b/storage/innobase/fil/fil0crypt.cc @@ -2008,10 +2008,18 @@ static void fil_crypt_complete_rotate_space(rotate_thread_t* state) mysql_mutex_unlock(&crypt_data->mutex); } +#ifdef UNIV_PFS_THREAD +mysql_pfs_key_t page_encrypt_thread_key; +#endif /* UNIV_PFS_THREAD */ + /** A thread which monitors global key state and rotates tablespaces accordingly */ static void fil_crypt_thread() { + my_thread_init(); +#ifdef UNIV_PFS_THREAD + pfs_register_thread(page_encrypt_thread_key); +#endif /* UNIV_PFS_THREAD */ mysql_mutex_lock(&fil_crypt_threads_mutex); rotate_thread_t thr(srv_n_fil_crypt_threads_started++); pthread_cond_signal(&fil_crypt_cond); /* signal that we started */ @@ -2089,6 +2097,7 @@ wait_for_work: pthread_cond_signal(&fil_crypt_cond); /* signal that we stopped */ mysql_mutex_unlock(&fil_crypt_threads_mutex); + my_thread_end(); #ifdef UNIV_PFS_THREAD pfs_delete_thread(); #endif diff --git a/storage/innobase/fts/fts0fts.cc b/storage/innobase/fts/fts0fts.cc index a00cd6ea9ae..0a4df18fa82 100644 --- a/storage/innobase/fts/fts0fts.cc +++ b/storage/innobase/fts/fts0fts.cc @@ -1392,7 +1392,7 @@ static dberr_t fts_drop_table(trx_t *trx, const char *table_name, bool rename) char *tmp= dict_mem_create_temporary_tablename(heap, table->name.m_name, table->id); dberr_t err= row_rename_table_for_mysql(table->name.m_name, tmp, trx, - false); + RENAME_IGNORE_FK); mem_heap_free(heap); if (err != DB_SUCCESS) { @@ -1450,7 +1450,7 @@ fts_rename_one_aux_table( fts_table_new_name[table_new_name_len] = 0; return row_rename_table_for_mysql( - fts_table_old_name, fts_table_new_name, trx, false); + fts_table_old_name, fts_table_new_name, trx, RENAME_IGNORE_FK); } /****************************************************************//** diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index e8279ad819a..19a27510762 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -627,6 +627,7 @@ performance schema instrumented if "UNIV_PFS_THREAD" is defined */ static PSI_thread_info all_innodb_threads[] = { PSI_KEY(page_cleaner_thread), + PSI_KEY(page_encrypt_thread), PSI_KEY(trx_rollback_clean_thread), PSI_KEY(thread_pool_thread) }; @@ -1293,9 +1294,7 @@ static void innodb_drop_database(handlerton*, char *path) namebuf[len] = '/'; namebuf[len + 1] = '\0'; -#ifdef _WIN32 - innobase_casedn_str(namebuf); -#endif /* _WIN32 */ + IF_WIN(my_casedn_str(system_charset_info, namebuf),); THD * const thd= current_thd; trx_t *trx= innobase_trx_allocate(thd); @@ -2364,21 +2363,6 @@ dtype_get_mblen( } } -/******************************************************************//** -Converts an identifier to a table name. */ -void -innobase_convert_from_table_id( -/*===========================*/ - CHARSET_INFO* cs, /*!< in: the 'from' character set */ - char* to, /*!< out: converted identifier */ - const char* from, /*!< in: identifier to convert */ - ulint len) /*!< in: length of 'to', in bytes */ -{ - uint errors; - - strconvert(cs, from, FN_REFLEN, &my_charset_filename, to, (uint) len, &errors); -} - /********************************************************************** Check if the length of the identifier exceeds the maximum allowed. return true when length of identifier is too long. */ @@ -2403,21 +2387,6 @@ innobase_check_identifier_length( DBUG_RETURN(false); } -/******************************************************************//** -Converts an identifier to UTF-8. */ -void -innobase_convert_from_id( -/*=====================*/ - CHARSET_INFO* cs, /*!< in: the 'from' character set */ - char* to, /*!< out: converted identifier */ - const char* from, /*!< in: identifier to convert */ - ulint len) /*!< in: length of 'to', in bytes */ -{ - uint errors; - - strconvert(cs, from, FN_REFLEN, system_charset_info, to, (uint) len, &errors); -} - /******************************************************************//** Compares NUL-terminated UTF-8 strings case insensitively. @return 0 if a=b, <0 if a1 if a>b */ @@ -2466,16 +2435,6 @@ innobase_basename( return((name) ? name : "null"); } -/******************************************************************//** -Makes all characters in a NUL-terminated UTF-8 string lower case. */ -void -innobase_casedn_str( -/*================*/ - char* a) /*!< in/out: string to put in lower case */ -{ - my_casedn_str(system_charset_info, a); -} - /** Determines the current SQL statement. Thread unsafe, can only be called from the thread owning the THD. @param[in] thd MySQL thread handle @@ -3612,13 +3571,13 @@ innobase_format_name( ulint buflen, /*!< in: length of buf, in bytes */ const char* name) /*!< in: table name to format */ { - const char* bufend; + char* bufend; bufend = innobase_convert_name(buf, buflen, name, strlen(name), NULL); ut_ad((ulint) (bufend - buf) < buflen); - buf[bufend - buf] = '\0'; + *bufend = '\0'; } /**********************************************************************//** @@ -4661,9 +4620,10 @@ innobase_commit( ut_ad("invalid state" == 0); /* fall through */ case TRX_STATE_PREPARED: - ut_ad(commit_trx); + ut_ad(commit_trx || trx->is_wsrep()); ut_ad(thd_test_options(thd, OPTION_NOT_AUTOCOMMIT - | OPTION_BEGIN)); + | OPTION_BEGIN) + || trx->is_wsrep()); /* fall through */ case TRX_STATE_ACTIVE: /* Transaction is deregistered only in a commit or a @@ -5039,7 +4999,7 @@ static void innobase_kill_query(handlerton*, THD *thd, enum thd_kill_levels) may be executed as part of a multi-transaction DDL operation, such as rollback_inplace_alter_table() or ha_innobase::delete_table(). */; trx->error_state= DB_INTERRUPTED; - lock_sys_t::cancel(trx, lock); + lock_sys.cancel(trx, lock); } lock_sys.deadlock_check(); } @@ -5328,7 +5288,7 @@ normalize_table_name_c_low( memcpy(norm_name + db_len + 1, name_ptr, name_len + 1); if (set_lower_case) { - innobase_casedn_str(norm_name); + my_casedn_str(system_charset_info, norm_name); } } @@ -6208,7 +6168,7 @@ ha_innobase::open_dict_table( case name, including the partition separator "P" */ strcpy(par_case_name, norm_name); - innobase_casedn_str(par_case_name); + my_casedn_str(system_charset_info, par_case_name); #else /* On Windows platfrom, check whether there exists table name in @@ -9682,8 +9642,7 @@ ha_innobase::ft_init_ext( /* If tablespace is discarded, we should return here */ if (!ft_table->space) { - my_error(ER_TABLESPACE_MISSING, MYF(0), table->s->db.str, - table->s->table_name.str); + my_error(ER_TABLESPACE_MISSING, MYF(0), ft_table->name.m_name); return(NULL); } @@ -12326,6 +12285,73 @@ public: const char* str() { return buf; } }; +/** Construct an InnoDB table name from a schema and table name. +@param table_name buffer InnoDB table name being constructed +@param db schema name +@param name table name +@return table_name filled in */ +static char *copy_name(char *table_name, LEX_CSTRING db, LEX_CSTRING name) + noexcept +{ + memcpy(table_name, db.str, db.length); + table_name[db.length] = '/'; + memcpy(table_name + db.length + 1, name.str, name.length + 1); + return table_name; +} + +char *dict_table_lookup(LEX_CSTRING db, LEX_CSTRING name, + dict_table_t **table, mem_heap_t *heap) noexcept +{ + const size_t len= db.length + name.length + 1; + char *ref= static_cast(mem_heap_alloc(heap, len + 1)); + copy_name(ref, db, name); + + switch (lower_case_table_names) { + case 2: /* store as given, compare in lower case */ + my_casedn_str(system_charset_info, ref); + *table= dict_sys.load_table({ref, len}); + return copy_name(ref, db, name); + case 0: /* store and compare as given; case sensitive */ +#ifndef _WIN32 /* On Windows, InnoDB treats 0 as lower_case_table_names=1 */ + break; +#endif + case 1: /* store and compare in lower case */ + my_casedn_str(system_charset_info, ref); + } + + *table = dict_sys.load_table({ref, len}); + return ref; +} + +/** Convert a schema or table name to InnoDB (and file system) format. +@param cs source character set +@param name name encoded in cs +@param buf output buffer (MAX_TABLE_NAME_LEN + 1 bytes) +@return the converted string (within buf) */ +LEX_CSTRING innodb_convert_name(CHARSET_INFO *cs, LEX_CSTRING name, char *buf) + noexcept +{ + CHARSET_INFO *to_cs= &my_charset_filename; + if (!strncmp(name.str, srv_mysql50_table_name_prefix, + sizeof srv_mysql50_table_name_prefix - 1)) + { + /* Before MySQL 5.1 introduced my_charset_filename, schema and + table names were stored in the file system as specified by the + user, hopefully in ASCII encoding, but it could also be in ISO + 8859-1 or UTF-8. Such schema or table names are distinguished by + the #mysql50# prefix. + + Let us discard that prefix and convert the name to UTF-8 + (system_charset_info). */ + name.str+= sizeof srv_mysql50_table_name_prefix - 1; + name.length-= sizeof srv_mysql50_table_name_prefix - 1; + to_cs= system_charset_info; + } + uint errors; + return LEX_CSTRING{buf, strconvert(cs, name.str, name.length, to_cs, + buf, MAX_TABLE_NAME_LEN, &errors)}; +} + /** Create InnoDB foreign keys from MySQL alter_info. Collect all dict_foreign_t items into local_fk_set and then add into system table. @return DB_SUCCESS or specific error code */ @@ -12341,6 +12367,9 @@ create_table_info_t::create_foreign_keys() const char* ref_column_names[MAX_COLS_PER_FK]; char create_name[MAX_DATABASE_NAME_LEN + 1 + MAX_TABLE_NAME_LEN + 1]; + char db_name[MAX_DATABASE_NAME_LEN + 1]; + char t_name[MAX_TABLE_NAME_LEN + 1]; + static_assert(MAX_TABLE_NAME_LEN == MAX_DATABASE_NAME_LEN, ""); dict_index_t* index = NULL; fkerr_t index_error = FK_SUCCESS; dict_index_t* err_index = NULL; @@ -12348,59 +12377,57 @@ create_table_info_t::create_foreign_keys() const bool tmp_table = m_flags2 & DICT_TF2_TEMPORARY; const CHARSET_INFO* cs = thd_charset(m_thd); const char* operation = "Create "; - const char* name = m_table_name; enum_sql_command sqlcom = enum_sql_command(thd_sql_command(m_thd)); + LEX_CSTRING name= {m_table_name, strlen(m_table_name)}; if (sqlcom == SQLCOM_ALTER_TABLE) { - dict_table_t* table_to_alter; mem_heap_t* heap = mem_heap_create(10000); - ulint highest_id_so_far; - char* n = dict_get_referenced_table( - name, LEX_STRING_WITH_LEN(m_form->s->db), - LEX_STRING_WITH_LEN(m_form->s->table_name), - &table_to_alter, heap, cs); + LEX_CSTRING t = innodb_convert_name(cs, m_form->s->table_name, + t_name); + LEX_CSTRING d = innodb_convert_name(cs, m_form->s->db, db_name); + dict_table_t* alter_table; + char* n = dict_table_lookup(d, t, &alter_table, heap); /* Starting from 4.0.18 and 4.1.2, we generate foreign key id's in the format databasename/tablename_ibfk_[number], where [number] is local to the table; look for the highest [number] - for table_to_alter, so that we can assign to new constraints + for alter_table, so that we can assign to new constraints higher numbers. */ /* If we are altering a temporary table, the table name after ALTER TABLE does not correspond to the internal table name, and - table_to_alter is NULL. TODO: should we fix this somehow? */ + alter_table=nullptr. But, we do not support FOREIGN KEY + constraints for temporary tables. */ - if (table_to_alter) { - n = table_to_alter->name.m_name; - highest_id_so_far = dict_table_get_highest_foreign_id( - table_to_alter); - } else { - highest_id_so_far = 0; + if (alter_table) { + n = alter_table->name.m_name; + number = 1 + dict_table_get_highest_foreign_id( + alter_table); } char* bufend = innobase_convert_name( create_name, sizeof create_name, n, strlen(n), m_thd); - create_name[bufend - create_name] = '\0'; - number = highest_id_so_far + 1; + *bufend = '\0'; mem_heap_free(heap); operation = "Alter "; - } else if (strstr(name, "#P#") || strstr(name, "#p#")) { + } else if (strstr(m_table_name, "#P#") + || strstr(m_table_name, "#p#")) { /* Partitioned table */ create_name[0] = '\0'; } else { char* bufend = innobase_convert_name(create_name, sizeof create_name, - name, - strlen(name), m_thd); - create_name[bufend - create_name] = '\0'; + LEX_STRING_WITH_LEN(name), + m_thd); + *bufend = '\0'; } Alter_info* alter_info = m_create_info->alter_info; ut_ad(alter_info); List_iterator_fast key_it(alter_info->key_list); - dict_table_t* table = dict_sys.find_table({name,strlen(name)}); + dict_table_t* table = dict_sys.find_table({name.str, name.length}); if (!table) { ib_foreign_warn(m_trx, DB_CANNOT_ADD_CONSTRAINT, create_name, "%s table %s foreign key constraint" @@ -12447,27 +12474,27 @@ create_table_info_t::create_foreign_keys() col->field_name.length); success = find_col(table, column_names + i); if (!success) { - key_text k(fk); ib_foreign_warn( m_trx, DB_CANNOT_ADD_CONSTRAINT, create_name, "%s table %s foreign key %s constraint" " failed. Column %s was not found.", - operation, create_name, k.str(), + operation, create_name, + key_text(fk).str(), column_names[i]); dict_foreign_free(foreign); return (DB_CANNOT_ADD_CONSTRAINT); } ++i; if (i >= MAX_COLS_PER_FK) { - key_text k(fk); ib_foreign_warn( m_trx, DB_CANNOT_ADD_CONSTRAINT, create_name, "%s table %s foreign key %s constraint" " failed. Too many columns: %u (%u " "allowed).", - operation, create_name, k.str(), i, + operation, create_name, + key_text(fk).str(), i, MAX_COLS_PER_FK); dict_foreign_free(foreign); return (DB_CANNOT_ADD_CONSTRAINT); @@ -12479,9 +12506,9 @@ create_table_info_t::create_foreign_keys() &index_error, &err_col, &err_index); if (!index) { - key_text k(fk); foreign_push_index_error(m_trx, operation, create_name, - k.str(), column_names, + key_text(fk).str(), + column_names, index_error, err_col, err_index, table); dict_foreign_free(foreign); @@ -12547,14 +12574,12 @@ create_table_info_t::create_foreign_keys() memcpy(foreign->foreign_col_names, column_names, i * sizeof(void*)); - foreign->referenced_table_name = dict_get_referenced_table( - name, LEX_STRING_WITH_LEN(fk->ref_db), - LEX_STRING_WITH_LEN(fk->ref_table), - &foreign->referenced_table, foreign->heap, cs); - - if (!foreign->referenced_table_name) { - return (DB_OUT_OF_MEMORY); - } + LEX_CSTRING t = innodb_convert_name(cs, fk->ref_table, t_name); + LEX_CSTRING d = fk->ref_db.str + ? innodb_convert_name(cs, fk->ref_db, db_name) + : LEX_CSTRING{table->name.m_name, table->name.dblen()}; + foreign->referenced_table_name = dict_table_lookup( + d, t, &foreign->referenced_table, foreign->heap); if (!foreign->referenced_table && m_trx->check_foreigns) { char buf[MAX_TABLE_NAME_LEN + 1] = ""; @@ -12564,15 +12589,15 @@ create_table_info_t::create_foreign_keys() buf, MAX_TABLE_NAME_LEN, foreign->referenced_table_name, strlen(foreign->referenced_table_name), m_thd); - buf[bufend - buf] = '\0'; - key_text k(fk); + *bufend = '\0'; ib_foreign_warn(m_trx, DB_CANNOT_ADD_CONSTRAINT, create_name, "%s table %s with foreign key %s " "constraint failed. Referenced table " "%s not found in the data dictionary.", - operation, create_name, k.str(), buf); - return (DB_CANNOT_ADD_CONSTRAINT); + operation, create_name, + key_text(fk).str(), buf); + return DB_CANNOT_ADD_CONSTRAINT; } /* Don't allow foreign keys on partitioned tables yet. */ @@ -12595,7 +12620,6 @@ create_table_info_t::create_foreign_keys() success = find_col(foreign->referenced_table, ref_column_names + j); if (!success) { - key_text k(fk); ib_foreign_warn( m_trx, DB_CANNOT_ADD_CONSTRAINT, @@ -12604,9 +12628,9 @@ create_table_info_t::create_foreign_keys() "constraint failed. " "Column %s was not found.", operation, create_name, - k.str(), ref_column_names[j]); - - return (DB_CANNOT_ADD_CONSTRAINT); + key_text(fk).str(), + ref_column_names[j]); + return DB_CANNOT_ADD_CONSTRAINT; } } ++j; @@ -12626,16 +12650,15 @@ create_table_info_t::create_foreign_keys() &err_index); if (!index) { - key_text k(fk); foreign_push_index_error( - m_trx, operation, create_name, k.str(), + m_trx, operation, create_name, + key_text(fk).str(), column_names, index_error, err_col, err_index, foreign->referenced_table); - - return (DB_CANNOT_ADD_CONSTRAINT); + return DB_CANNOT_ADD_CONSTRAINT; } } else { - ut_a(m_trx->check_foreigns == FALSE); + ut_a(!m_trx->check_foreigns); index = NULL; } @@ -12672,7 +12695,6 @@ create_table_info_t::create_foreign_keys() NULL if the column is not allowed to be NULL! */ - key_text k(fk); ib_foreign_warn( m_trx, DB_CANNOT_ADD_CONSTRAINT, @@ -12683,9 +12705,9 @@ create_table_info_t::create_foreign_keys() "but column '%s' is defined as " "NOT NULL.", operation, create_name, - k.str(), col_name); + key_text(fk).str(), col_name); - return (DB_CANNOT_ADD_CONSTRAINT); + return DB_CANNOT_ADD_CONSTRAINT; } } } @@ -13533,7 +13555,7 @@ int ha_innobase::delete_table(const char *name) if (!table && lower_case_table_names == 1 && is_partition(norm_name)) { IF_WIN(normalize_table_name_c_low(norm_name, name, false), - innobase_casedn_str(norm_name)); + my_casedn_str(system_charset_info, norm_name)); table= dict_sys.load_table(n, DICT_ERR_IGNORE_DROP); } #endif @@ -13805,10 +13827,10 @@ err_exit: @param[in,out] trx InnoDB data dictionary transaction @param[in] from old table name @param[in] to new table name -@param[in] use_fk whether to enforce FOREIGN KEY +@param[in] fk how to handle FOREIGN KEY @return DB_SUCCESS or error code */ static dberr_t innobase_rename_table(trx_t *trx, const char *from, - const char *to, bool use_fk) + const char *to, rename_fk fk) { dberr_t error; char norm_to[FN_REFLEN]; @@ -13826,7 +13848,7 @@ static dberr_t innobase_rename_table(trx_t *trx, const char *from, ut_ad(trx->will_lock); - error = row_rename_table_for_mysql(norm_from, norm_to, trx, use_fk); + error = row_rename_table_for_mysql(norm_from, norm_to, trx, fk); if (error != DB_SUCCESS) { if (error == DB_TABLE_NOT_FOUND @@ -13840,7 +13862,8 @@ static dberr_t innobase_rename_table(trx_t *trx, const char *from, case name, including the partition separator "P" */ strcpy(par_case_name, norm_from); - innobase_casedn_str(par_case_name); + my_casedn_str(system_charset_info, + par_case_name); #else /* On Windows platfrom, check whether there exists table name in @@ -13851,7 +13874,8 @@ static dberr_t innobase_rename_table(trx_t *trx, const char *from, #endif /* _WIN32 */ trx_start_if_not_started(trx, true); error = row_rename_table_for_mysql( - par_case_name, norm_to, trx, false); + par_case_name, norm_to, trx, + RENAME_IGNORE_FK); } } @@ -14047,7 +14071,8 @@ int ha_innobase::truncate() if (error == DB_SUCCESS) { - error= innobase_rename_table(trx, ib_table->name.m_name, temp_name, false); + error= innobase_rename_table(trx, ib_table->name.m_name, temp_name, + RENAME_REBUILD); if (error == DB_SUCCESS) error= trx->drop_table(*ib_table); } @@ -14245,7 +14270,8 @@ ha_innobase::rename_table( row_mysql_lock_data_dictionary(trx); if (error == DB_SUCCESS) { - error = innobase_rename_table(trx, from, to, true); + error = innobase_rename_table(trx, from, to, + RENAME_ALTER_COPY); } DEBUG_SYNC(thd, "after_innobase_rename_table"); @@ -14288,7 +14314,7 @@ ha_innobase::rename_table( my_error(ER_TABLE_EXISTS_ERROR, MYF(0), to); error = DB_ERROR; } else if (error == DB_LOCK_WAIT_TIMEOUT) { - my_error(ER_LOCK_WAIT_TIMEOUT, MYF(0), to); + my_error(ER_LOCK_WAIT_TIMEOUT, MYF(0)); error = DB_LOCK_WAIT; } @@ -16264,6 +16290,7 @@ ha_innobase::external_lock( case F_UNLCK: DEBUG_SYNC_C("ha_innobase_end_statement"); m_mysql_has_locked = false; + ut_a(trx->n_mysql_tables_in_use); if (--trx->n_mysql_tables_in_use) { break; @@ -21011,25 +21038,6 @@ const char* SET_TRANSACTION_MSG = const char* INNODB_PARAMETERS_MSG = "Please refer to https://mariadb.com/kb/en/library/innodb-system-variables/"; -/********************************************************************** -Converts an identifier from my_charset_filename to UTF-8 charset. -@return result string length, as returned by strconvert() */ -uint -innobase_convert_to_filename_charset( -/*=================================*/ - char* to, /* out: converted identifier */ - const char* from, /* in: identifier to convert */ - ulint len) /* in: length of 'to', in bytes */ -{ - uint errors; - CHARSET_INFO* cs_to = &my_charset_filename; - CHARSET_INFO* cs_from = system_charset_info; - - return(static_cast(strconvert( - cs_from, from, uint(strlen(from)), - cs_to, to, static_cast(len), &errors))); -} - /********************************************************************** Converts an identifier from my_charset_filename to UTF-8 charset. @return result string length, as returned by strconvert() */ diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc index 3d070ad5693..798c90133d3 100644 --- a/storage/innobase/handler/handler0alter.cc +++ b/storage/innobase/handler/handler0alter.cc @@ -30,6 +30,7 @@ Smart ALTER TABLE #include #include #include +#include /* Include necessary InnoDB headers */ #include "btr0sea.h" @@ -3230,6 +3231,9 @@ innobase_get_foreign_key_info( ulint num_fk = 0; Alter_info* alter_info = ha_alter_info->alter_info; const CHARSET_INFO* cs = thd_charset(trx->mysql_thd); + char db_name[MAX_DATABASE_NAME_LEN + 1]; + char t_name[MAX_TABLE_NAME_LEN + 1]; + static_assert(MAX_TABLE_NAME_LEN == MAX_DATABASE_NAME_LEN, ""); DBUG_ENTER("innobase_get_foreign_key_info"); @@ -3294,14 +3298,15 @@ innobase_get_foreign_key_info( add_fk[num_fk] = dict_mem_foreign_create(); + LEX_CSTRING t = innodb_convert_name(cs, fk_key->ref_table, + t_name); + LEX_CSTRING d = fk_key->ref_db.str + ? innodb_convert_name(cs, fk_key->ref_db, db_name) + : LEX_CSTRING{table->name.m_name, table->name.dblen()}; dict_sys.lock(SRW_LOCK_CALL); - referenced_table_name = dict_get_referenced_table( - table->name.m_name, - LEX_STRING_WITH_LEN(fk_key->ref_db), - LEX_STRING_WITH_LEN(fk_key->ref_table), - &referenced_table, - add_fk[num_fk]->heap, cs); + referenced_table_name = dict_table_lookup( + d, t, &referenced_table, add_fk[num_fk]->heap); /* Test the case when referenced_table failed to open, if trx->check_foreigns is not set, we should @@ -4449,13 +4454,15 @@ declared as NOT NULL @param n_drop_fk number of constraints that are being dropped @param col_name modified column name @param new_field_flags Modified field flags +@param strict_mode Whether the sql_mode is strict @retval true Not allowed (will call my_error()) @retval false Allowed */ static bool check_foreigns_nullability(const dict_table_t *user_table, dict_foreign_t **drop_fk, ulint n_drop_fk, - const char *col_name, uint32_t new_field_flags) + const char *col_name, uint32_t new_field_flags, + bool strict_mode) { ut_ad(dict_sys.locked()); @@ -4467,7 +4474,7 @@ bool check_foreigns_nullability(const dict_table_t *user_table, if (innobase_dropping_foreign(foreign, drop_fk, n_drop_fk)) continue; - if (foreign->on_update_cascade_null(col_name)) + if (strict_mode && foreign->on_update_cascade_null(col_name)) goto non_null_error; if (foreign->type & (foreign->DELETE_SET_NULL | @@ -4489,7 +4496,7 @@ non_null_error: { for (dict_foreign_t *foreign : user_table->referenced_set) { - if (foreign->on_update_cascade_not_null(col_name)) + if (strict_mode && foreign->on_update_cascade_not_null(col_name)) { char display_name[FN_REFLEN]; const int dblen= int(table_name_t(const_cast(foreign-> @@ -4591,6 +4598,7 @@ column that is being dropped or modified to NOT NULL. @param user_table InnoDB table as it is before the ALTER operation @param drop_fk constraints being dropped @param n_drop_fk number of constraints that are being dropped +@param strict_mode Whether the strict sql_mode is set @retval true Not allowed (will call my_error()) @retval false Allowed */ @@ -4602,7 +4610,8 @@ innobase_check_foreigns( const TABLE* old_table, const dict_table_t* user_table, dict_foreign_t** drop_fk, - ulint n_drop_fk) + ulint n_drop_fk, + bool strict_mode) { for (Field** fp = old_table->field; *fp; fp++) { ut_ad(!(*fp)->real_maybe_null() @@ -4627,7 +4636,8 @@ innobase_check_foreigns( if (check_foreigns_nullability(user_table, drop_fk, n_drop_fk, (*fp)->field_name.str, - it->flags)) { + it->flags, + strict_mode)) { return true; } } @@ -6665,7 +6675,8 @@ acquire_lock: if (new_clustered) { if (innobase_check_foreigns( ha_alter_info, old_table, - user_table, ctx->drop_fk, ctx->num_to_drop_fk)) { + user_table, ctx->drop_fk, ctx->num_to_drop_fk, + thd_is_strict_mode(ctx->trx->mysql_thd))) { new_clustered_failed: DBUG_ASSERT(ctx->trx != ctx->prebuilt->trx); ctx->trx->rollback(); @@ -10429,10 +10440,12 @@ commit_try_rebuild( char* old_name= mem_heap_strdup(ctx->heap, user_table->name.m_name); dberr_t error = row_rename_table_for_mysql(user_table->name.m_name, - ctx->tmp_name, trx, false); + ctx->tmp_name, trx, + RENAME_REBUILD); if (error == DB_SUCCESS) { error = row_rename_table_for_mysql( - rebuilt_table->name.m_name, old_name, trx, false); + rebuilt_table->name.m_name, old_name, trx, + RENAME_REBUILD); if (error == DB_SUCCESS) { /* The statistics for the surviving indexes will be re-inserted in alter_stats_rebuild(). */ @@ -11049,6 +11062,37 @@ commit_cache_norebuild( dict_index_remove_from_cache(index->table, index); } + if (ctx->num_to_add_index) { + for (dict_foreign_t* foreign: ctx->new_table->foreign_set) { + if (foreign->foreign_table == ctx->new_table + && !foreign->foreign_index) { + foreign->foreign_index = + dict_foreign_find_index( + foreign->foreign_table, + nullptr, + foreign->foreign_col_names, + foreign->n_fields, nullptr, + /*check_charsets=*/TRUE, + /*check_null=*/FALSE, + nullptr, nullptr, nullptr); + } + } + for (dict_foreign_t* foreign: ctx->new_table->referenced_set) { + if (foreign->referenced_table == ctx->new_table + && !foreign->referenced_index) { + foreign->referenced_index = + dict_foreign_find_index( + foreign->referenced_table, + nullptr, + foreign->referenced_col_names, + foreign->n_fields, nullptr, + /*check_charsets=*/TRUE, + /*check_null=*/FALSE, + nullptr, nullptr, nullptr); + } + } + } + fts_clear_all(ctx->old_table); if (!ctx->is_instant()) { diff --git a/storage/innobase/include/dict0dict.h b/storage/innobase/include/dict0dict.h index 97b37524512..97568c61997 100644 --- a/storage/innobase/include/dict0dict.h +++ b/storage/innobase/include/dict0dict.h @@ -55,22 +55,6 @@ inline size_t dict_get_db_name_len(const char *name) } -/*********************************************************************//** -Open a table from its database and table name, this is currently used by -foreign constraint parser to get the referenced table. -@return complete table name with database and table name, allocated from -heap memory passed in */ -char* -dict_get_referenced_table( -/*======================*/ - const char* name, /*!< in: foreign key table name */ - const char* database_name, /*!< in: table db name */ - ulint database_name_len,/*!< in: db name length */ - const char* table_name, /*!< in: table name */ - ulint table_name_len, /*!< in: table name length */ - dict_table_t** table, /*!< out: table object or NULL */ - mem_heap_t* heap, /*!< in: heap memory */ - CHARSET_INFO* from_cs); /*!< in: table name charset */ /*********************************************************************//** Frees a foreign key struct. */ void diff --git a/storage/innobase/include/dict0mem.h b/storage/innobase/include/dict0mem.h index 1e952eb5292..ffc26510679 100644 --- a/storage/innobase/include/dict0mem.h +++ b/storage/innobase/include/dict0mem.h @@ -420,7 +420,7 @@ void dict_mem_foreign_table_name_lookup_set( /*===================================*/ dict_foreign_t* foreign, /*!< in/out: foreign struct */ - ibool do_alloc); /*!< in: is an alloc needed */ + bool do_alloc); /*!< in: is an alloc needed */ /**********************************************************************//** Sets the referenced_table_name_lookup pointer based on the value of diff --git a/storage/innobase/include/dict0types.h b/storage/innobase/include/dict0types.h index ec50e8cd951..85eed8d416c 100644 --- a/storage/innobase/include/dict0types.h +++ b/storage/innobase/include/dict0types.h @@ -110,7 +110,7 @@ struct table_name_t table_name_t(char* name) : m_name(name) {} /** @return the end of the schema name */ - const char* dbend() const + const char* dbend() const noexcept { const char* sep = strchr(m_name, '/'); ut_ad(sep); @@ -118,11 +118,19 @@ struct table_name_t } /** @return the length of the schema name, in bytes */ - size_t dblen() const { return size_t(dbend() - m_name); } + size_t dblen() const noexcept + { + const char *end= dbend(); + return UNIV_LIKELY(end != nullptr) ? size_t(end - m_name) : 0; + } /** Determine the filename-safe encoded table name. @return the filename-safe encoded table name */ - const char* basename() const { return dbend() + 1; } + const char* basename() const noexcept + { + const char *end= dbend(); + return UNIV_LIKELY(end != nullptr) ? end + 1 : nullptr; + } /** The start of the table basename suffix for partitioned tables */ static const char part_suffix[4]; diff --git a/storage/innobase/include/ha_prototypes.h b/storage/innobase/include/ha_prototypes.h index 96ce0cfe783..098986febdf 100644 --- a/storage/innobase/include/ha_prototypes.h +++ b/storage/innobase/include/ha_prototypes.h @@ -40,6 +40,8 @@ class Field; struct dict_table_t; struct dict_foreign_t; struct table_name_t; +struct mem_block_info_t; +typedef struct mem_block_info_t mem_heap_t; // JAN: TODO missing features: #undef MYSQL_FT_INIT_EXT @@ -156,33 +158,6 @@ const char* innobase_basename( const char* path_name); -/******************************************************************//** -Converts an identifier to a table name. */ -void -innobase_convert_from_table_id( -/*===========================*/ - CHARSET_INFO* cs, /*!< in: the 'from' character set */ - char* to, /*!< out: converted identifier */ - const char* from, /*!< in: identifier to convert */ - ulint len); /*!< in: length of 'to', in bytes; should - be at least 5 * strlen(to) + 1 */ -/******************************************************************//** -Converts an identifier to UTF-8. */ -void -innobase_convert_from_id( -/*=====================*/ - CHARSET_INFO* cs, /*!< in: the 'from' character set */ - char* to, /*!< out: converted identifier */ - const char* from, /*!< in: identifier to convert */ - ulint len); /*!< in: length of 'to', in bytes; - should be at least 3 * strlen(to) + 1 */ -/******************************************************************//** -Makes all characters in a NUL-terminated UTF-8 string lower case. */ -void -innobase_casedn_str( -/*================*/ - char* a); /*!< in/out: string to put in lower case */ - #ifdef WITH_WSREP ulint wsrep_innobase_mysql_sort(int mysql_type, uint charset_number, unsigned char* str, ulint str_length, @@ -370,15 +345,6 @@ innobase_next_autoinc( MY_ATTRIBUTE((pure, warn_unused_result)); /********************************************************************** -Converts an identifier from my_charset_filename to UTF-8 charset. */ -uint -innobase_convert_to_system_charset( -/*===============================*/ - char* to, /* out: converted identifier */ - const char* from, /* in: identifier to convert */ - ulint len, /* in: length of 'to', in bytes */ - uint* errors); /* out: error return */ -/********************************************************************** Check if the length of the identifier exceeds the maximum allowed. The input to this function is an identifier in charset my_charset_filename. return true when length of identifier is too long. */ @@ -398,14 +364,13 @@ innobase_convert_to_system_charset( ulint len, /* in: length of 'to', in bytes */ uint* errors); /* out: error return */ -/********************************************************************** -Converts an identifier from my_charset_filename to UTF-8 charset. */ -uint -innobase_convert_to_filename_charset( -/*=================================*/ - char* to, /* out: converted identifier */ - const char* from, /* in: identifier to convert */ - ulint len); /* in: length of 'to', in bytes */ +/** Convert a schema or table name to InnoDB (and file system) format. +@param cs source character set +@param name name encoded in cs +@param buf output buffer (MAX_TABLE_NAME_LEN + 1 bytes) +@return the converted string (within buf) */ +LEX_CSTRING innodb_convert_name(CHARSET_INFO *cs, LEX_CSTRING name, char *buf) + noexcept; /** Report that a table cannot be decrypted. @param thd connection context @@ -460,6 +425,16 @@ void destroy_background_thd(MYSQL_THD thd); void innobase_reset_background_thd(MYSQL_THD); +/** Open a table based on a database and table name. +@param db schema name +@param name table name within the schema +@param table table +@param heap memory heap for allocating a converted name +@return InnoDB format table name with database and table name, +allocated from heap */ +char *dict_table_lookup(LEX_CSTRING db, LEX_CSTRING name, + dict_table_t **table, mem_heap_t *heap) noexcept; + #ifdef WITH_WSREP /** Append table-level exclusive key. @param thd MySQL thread handle diff --git a/storage/innobase/include/lock0lock.h b/storage/innobase/include/lock0lock.h index c996e5f8227..a604b5ef7b5 100644 --- a/storage/innobase/include/lock0lock.h +++ b/storage/innobase/include/lock0lock.h @@ -869,7 +869,7 @@ public: @retval DB_DEADLOCK if trx->lock.was_chosen_as_deadlock_victim was set @retval DB_LOCK_WAIT if the lock was canceled */ template - static dberr_t cancel(trx_t *trx, lock_t *lock); + dberr_t cancel(trx_t *trx, lock_t *lock) noexcept; /** Note that a record lock wait started */ inline void wait_start(); @@ -924,7 +924,7 @@ public: void prdt_page_free_from_discard(const page_id_t id, bool all= false); /** Cancel possible lock waiting for a transaction */ - static void cancel_lock_wait_for_trx(trx_t *trx); + inline void cancel_lock_wait_for_trx(trx_t *trx) noexcept; #ifdef WITH_WSREP /** Cancel lock waiting for a wsrep BF abort. */ static void cancel_lock_wait_for_wsrep_bf_abort(trx_t *trx); diff --git a/storage/innobase/include/row0mysql.h b/storage/innobase/include/row0mysql.h index 8cbeed7d297..63858f25f02 100644 --- a/storage/innobase/include/row0mysql.h +++ b/storage/innobase/include/row0mysql.h @@ -370,6 +370,15 @@ row_import_tablespace_for_mysql( row_prebuilt_t* prebuilt) /*!< in: prebuilt struct in MySQL */ MY_ATTRIBUTE((nonnull, warn_unused_result)); +enum rename_fk { + /** ignore FOREIGN KEY constraints */ + RENAME_IGNORE_FK= 0, + /** Rename a table as part of a native table-rebuilding DDL operation */ + RENAME_REBUILD, + /** Rename as part of ALTER TABLE...ALGORITHM=COPY */ + RENAME_ALTER_COPY +}; + /*********************************************************************//** Renames a table for MySQL. @return error code or DB_SUCCESS */ @@ -379,7 +388,7 @@ row_rename_table_for_mysql( const char* old_name, /*!< in: old table name */ const char* new_name, /*!< in: new table name */ trx_t* trx, /*!< in/out: transaction */ - bool use_fk) /*!< in: whether to parse and enforce + rename_fk fk) /*!< in: how to handle FOREIGN KEY constraints */ MY_ATTRIBUTE((nonnull, warn_unused_result)); diff --git a/storage/innobase/include/small_vector.h b/storage/innobase/include/small_vector.h index d28a36184b8..2acdc49f668 100644 --- a/storage/innobase/include/small_vector.h +++ b/storage/innobase/include/small_vector.h @@ -31,14 +31,14 @@ protected: small_vector_base()= delete; small_vector_base(void *small, size_t small_size) : BeginX(small), Capacity(Size_T(small_size)) {} - ATTRIBUTE_COLD void grow_by_1(void *small, size_t element_size); + ATTRIBUTE_COLD void grow_by_1(void *small, size_t element_size) noexcept; public: - size_t size() const { return Size; } - size_t capacity() const { return Capacity; } - bool empty() const { return !Size; } - void clear() { Size= 0; } + size_t size() const noexcept { return Size; } + size_t capacity() const noexcept { return Capacity; } + bool empty() const noexcept { return !Size; } + void clear() noexcept { Size= 0; } protected: - void set_size(size_t N) { Size= Size_T(N); } + void set_size(size_t N) noexcept { Size= Size_T(N); } }; template @@ -49,7 +49,7 @@ class small_vector : public small_vector_base using small_vector_base::set_size; - void grow_if_needed() + void grow_if_needed() noexcept { if (unlikely(size() >= capacity())) grow_by_1(small, sizeof *small); @@ -60,38 +60,67 @@ public: { TRASH_ALLOC(small, sizeof small); } - ~small_vector() + ~small_vector() noexcept { if (small != begin()) my_free(begin()); MEM_MAKE_ADDRESSABLE(small, sizeof small); } + void fake_defined() const noexcept + { + ut_ad(empty()); + MEM_MAKE_DEFINED(small, sizeof small); + } + void make_undefined() const noexcept { MEM_UNDEFINED(small, sizeof small); } + + bool is_small() const noexcept { return small == BeginX; } + + void deep_clear() noexcept + { + if (!is_small()) + { + my_free(BeginX); + BeginX= small; + Capacity= N; + } + ut_ad(capacity() == N); + set_size(0); + } + using iterator= T *; using const_iterator= const T *; using reverse_iterator= std::reverse_iterator; using reference= T &; using const_reference= const T&; - iterator begin() { return static_cast(BeginX); } - const_iterator begin() const { return static_cast(BeginX); } - iterator end() { return begin() + size(); } - const_iterator end() const { return begin() + size(); } + iterator begin() noexcept { return static_cast(BeginX); } + const_iterator begin() const noexcept + { return static_cast(BeginX); } + iterator end() noexcept { return begin() + size(); } + const_iterator end() const noexcept { return begin() + size(); } - reverse_iterator rbegin() { return reverse_iterator(end()); } - reverse_iterator rend() { return reverse_iterator(begin()); } + reverse_iterator rbegin() noexcept { return reverse_iterator(end()); } + reverse_iterator rend() noexcept { return reverse_iterator(begin()); } - reference operator[](size_t i) { assert(i < size()); return begin()[i]; } - const_reference operator[](size_t i) const + reference operator[](size_t i) noexcept + { assert(i < size()); return begin()[i]; } + const_reference operator[](size_t i) const noexcept { return const_cast(*this)[i]; } - void erase(const_iterator S, const_iterator E) + void erase(const_iterator S, const_iterator E) noexcept { set_size(std::move(const_cast(E), end(), const_cast(S)) - begin()); } - void emplace_back(T &&arg) + void emplace_back(T &&arg) noexcept + { + grow_if_needed(); + ::new (end()) T(arg); + set_size(size() + 1); + } + void emplace_back(T &arg) noexcept { grow_if_needed(); ::new (end()) T(arg); diff --git a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h index 72d8ebaece3..bca858ca409 100644 --- a/storage/innobase/include/srv0srv.h +++ b/storage/innobase/include/srv0srv.h @@ -407,6 +407,7 @@ extern ulong srv_buf_dump_status_frequency; # ifdef UNIV_PFS_THREAD extern mysql_pfs_key_t page_cleaner_thread_key; +extern mysql_pfs_key_t page_encrypt_thread_key; extern mysql_pfs_key_t trx_rollback_clean_thread_key; extern mysql_pfs_key_t thread_pool_thread_key; diff --git a/storage/innobase/include/trx0trx.h b/storage/innobase/include/trx0trx.h index 4af53053b77..7e36806c569 100644 --- a/storage/innobase/include/trx0trx.h +++ b/storage/innobase/include/trx0trx.h @@ -32,10 +32,10 @@ Created 3/26/1996 Heikki Tuuri #include "que0types.h" #include "mem0mem.h" #include "trx0xa.h" -#include "ut0vec.h" #include "fts0fts.h" #include "read0types.h" #include "ilist.h" +#include "small_vector.h" #include "row0merge.h" #include @@ -671,14 +671,14 @@ public: { ut_ad(!mutex_is_owner()); mutex.wr_lock(); - ut_d(assert(!mutex_owner.exchange(pthread_self(), - std::memory_order_relaxed))); + assert(!mutex_owner.exchange(pthread_self(), + std::memory_order_relaxed)); } /** Release the mutex */ void mutex_unlock() { - ut_d(assert(mutex_owner.exchange(0, std::memory_order_relaxed) == - pthread_self())); + assert(mutex_owner.exchange(0, std::memory_order_relaxed) == + pthread_self()); mutex.wr_unlock(); } #ifndef SUX_LOCK_GENERIC @@ -910,12 +910,10 @@ public: ulint n_autoinc_rows; /*!< no. of AUTO-INC rows required for an SQL statement. This is useful for multi-row INSERTs */ - ib_vector_t* autoinc_locks; /* AUTOINC locks held by this - transaction. Note that these are - also in the lock list trx_locks. This - vector needs to be freed explicitly - when the trx instance is destroyed. - Protected by lock_sys.latch. */ + typedef small_vector autoinc_lock_vector; + /** AUTO_INCREMENT locks held by this transaction; a subset of trx_locks, + protected by lock_sys.latch. */ + autoinc_lock_vector autoinc_locks; /*------------------------------*/ bool read_only; /*!< true if transaction is flagged as a READ-ONLY transaction. @@ -1112,7 +1110,7 @@ public: ut_ad(!lock.wait_lock); ut_ad(UT_LIST_GET_LEN(lock.trx_locks) == 0); ut_ad(lock.table_locks.empty()); - ut_ad(!autoinc_locks || ib_vector_is_empty(autoinc_locks)); + ut_ad(autoinc_locks.empty()); ut_ad(UT_LIST_GET_LEN(lock.evicted_tables) == 0); ut_ad(!dict_operation); ut_ad(!apply_online_log); diff --git a/storage/innobase/lock/lock0lock.cc b/storage/innobase/lock/lock0lock.cc index 5a6857678fc..4601fb4394d 100644 --- a/storage/innobase/lock/lock0lock.cc +++ b/storage/innobase/lock/lock0lock.cc @@ -984,13 +984,14 @@ lock_rec_get_prev( ut_ad(!in_lock->is_table()); const page_id_t id{in_lock->un_member.rec_lock.page_id}; hash_cell_t *cell= lock_sys.hash_get(in_lock->type_mode).cell_get(id.fold()); + lock_t *prev_lock= nullptr; for (lock_t *lock= lock_sys_t::get_first(*cell, id); lock != in_lock; lock= lock_rec_get_next_on_page(lock)) if (lock_rec_get_nth_bit(lock, heap_no)) - return lock; + prev_lock= lock; - return nullptr; + return prev_lock; } /*============= FUNCTIONS FOR ANALYZING RECORD LOCK QUEUE ================*/ @@ -2232,7 +2233,7 @@ end_loop: if (wait_lock) { abort_wait: - lock_sys_t::cancel(trx, wait_lock); + lock_sys.cancel(trx, wait_lock); lock_sys.deadlock_check(); } @@ -2302,7 +2303,7 @@ static void lock_grant(lock_t *lock) dict_table_t *table= lock->un_member.tab_lock.table; ut_ad(!table->autoinc_trx); table->autoinc_trx= trx; - ib_vector_push(trx->autoinc_locks, &lock); + trx->autoinc_locks.emplace_back(lock); } DBUG_PRINT("ib_lock", ("wait for trx " TRX_ID_FMT " ends", trx->id)); @@ -3646,7 +3647,7 @@ lock_t *lock_table_create(dict_table_t *table, unsigned type_mode, trx_t *trx, ut_ad(!table->autoinc_trx); table->autoinc_trx = trx; - ib_vector_push(trx->autoinc_locks, &lock); + trx->autoinc_locks.emplace_back(lock); goto allocated; } @@ -3695,79 +3696,45 @@ allocated: return(lock); } -/*************************************************************//** -Pops autoinc lock requests from the transaction's autoinc_locks. We -handle the case where there are gaps in the array and they need to -be popped off the stack. */ -UNIV_INLINE -void -lock_table_pop_autoinc_locks( -/*=========================*/ - trx_t* trx) /*!< in/out: transaction that owns the AUTOINC locks */ +/** Release a granted AUTO_INCREMENT lock. +@param lock AUTO_INCREMENT lock +@param trx transaction that owns the lock */ +static void lock_table_remove_autoinc_lock(lock_t *lock, trx_t *trx) noexcept { - ut_ad(!ib_vector_is_empty(trx->autoinc_locks)); + ut_ad(lock->type_mode == (LOCK_AUTO_INC | LOCK_TABLE)); + lock_sys.assert_locked(*lock->un_member.tab_lock.table); + ut_ad(trx->mutex_is_owner()); - /* Skip any gaps, gaps are NULL lock entries in the - trx->autoinc_locks vector. */ + auto begin= trx->autoinc_locks.begin(), end= trx->autoinc_locks.end(), i=end; + ut_ad(begin != end); + if (*--i == lock) + { + /* Normally, the last acquired lock is released first, in order to + avoid unnecessary traversal of trx->autoinc_locks, which + only stores granted locks. */ - do { - ib_vector_pop(trx->autoinc_locks); + /* We remove the last lock, as well as any nullptr entries + immediately preceding it, which might have been created by the + "else" branch below, or by lock_cancel_waiting_and_release(). */ + while (begin != i && !i[-1]) i--; + trx->autoinc_locks.erase(i, end); + } + else + { + ut_a(*i); + /* Clear the lock when it is not the last one. */ + while (begin != i) + { + if (*--i == lock) + { + *i= nullptr; + return; + } + } - if (ib_vector_is_empty(trx->autoinc_locks)) { - return; - } - - } while (*(lock_t**) ib_vector_get_last(trx->autoinc_locks) == NULL); -} - -/*************************************************************//** -Removes an autoinc lock request from the transaction's autoinc_locks. */ -UNIV_INLINE -void -lock_table_remove_autoinc_lock( -/*===========================*/ - lock_t* lock, /*!< in: table lock */ - trx_t* trx) /*!< in/out: transaction that owns the lock */ -{ - ut_ad(lock->type_mode == (LOCK_AUTO_INC | LOCK_TABLE)); - lock_sys.assert_locked(*lock->un_member.tab_lock.table); - ut_ad(trx->mutex_is_owner()); - - auto s = ib_vector_size(trx->autoinc_locks); - ut_ad(s); - - /* With stored functions and procedures the user may drop - a table within the same "statement". This special case has - to be handled by deleting only those AUTOINC locks that were - held by the table being dropped. */ - - lock_t* autoinc_lock = *static_cast( - ib_vector_get(trx->autoinc_locks, --s)); - - /* This is the default fast case. */ - - if (autoinc_lock == lock) { - lock_table_pop_autoinc_locks(trx); - } else { - /* The last element should never be NULL */ - ut_a(autoinc_lock != NULL); - - /* Handle freeing the locks from within the stack. */ - - while (s) { - autoinc_lock = *static_cast( - ib_vector_get(trx->autoinc_locks, --s)); - - if (autoinc_lock == lock) { - void* null_var = NULL; - ib_vector_set(trx->autoinc_locks, s, &null_var); - return; - } - } - - /* Must find the autoinc lock. */ - ut_error; - } + /* The lock must exist. */ + ut_error; + } } /*************************************************************//** @@ -3799,14 +3766,7 @@ lock_table_remove_low( ut_ad((table->autoinc_trx == trx) == !lock->is_waiting()); if (table->autoinc_trx == trx) { - table->autoinc_trx = NULL; - /* The locks must be freed in the reverse order from - the one in which they were acquired. This is to avoid - traversing the AUTOINC lock vector unnecessarily. - - We only store locks that were granted in the - trx->autoinc_locks vector (see lock_table_create() - and lock_grant()). */ + table->autoinc_trx = nullptr; lock_table_remove_autoinc_lock(lock, trx); } @@ -6443,49 +6403,36 @@ lock_clust_rec_read_check_and_lock_alt( return(err); } -/*******************************************************************//** -Check if a transaction holds any autoinc locks. -@return TRUE if the transaction holds any AUTOINC locks. */ -static -ibool -lock_trx_holds_autoinc_locks( -/*=========================*/ - const trx_t* trx) /*!< in: transaction */ -{ - ut_a(trx->autoinc_locks != NULL); - - return(!ib_vector_is_empty(trx->autoinc_locks)); -} - /** Release all AUTO_INCREMENT locks of the transaction. */ static void lock_release_autoinc_locks(trx_t *trx) { { + auto begin= trx->autoinc_locks.begin(), end= trx->autoinc_locks.end(); + ut_ad(begin != end); LockMutexGuard g{SRW_LOCK_CALL}; mysql_mutex_lock(&lock_sys.wait_mutex); trx->mutex_lock(); - auto autoinc_locks= trx->autoinc_locks; - ut_a(autoinc_locks); /* We release the locks in the reverse order. This is to avoid searching the vector for the element to delete at the lower level. See (lock_table_remove_low()) for details. */ - while (ulint size= ib_vector_size(autoinc_locks)) + do { - lock_t *lock= *static_cast - (ib_vector_get(autoinc_locks, size - 1)); + lock_t *lock= *--end; ut_ad(lock->type_mode == (LOCK_AUTO_INC | LOCK_TABLE)); lock_table_dequeue(lock, true); lock_trx_table_locks_remove(lock); } + while (begin != end); } mysql_mutex_unlock(&lock_sys.wait_mutex); trx->mutex_unlock(); + trx->autoinc_locks.clear(); } /** Cancel a waiting lock request and release possibly waiting transactions */ template -void lock_cancel_waiting_and_release(lock_t *lock) +static void lock_cancel_waiting_and_release(lock_t *lock) noexcept { lock_sys.assert_locked(*lock); mysql_mutex_assert_owner(&lock_sys.wait_mutex); @@ -6502,8 +6449,18 @@ void lock_cancel_waiting_and_release(lock_t *lock) { if (lock->type_mode == (LOCK_AUTO_INC | LOCK_TABLE)) { - ut_ad(trx->autoinc_locks); - ib_vector_remove(trx->autoinc_locks, lock); + /* This is similar to lock_table_remove_autoinc_lock() */ + auto begin= trx->autoinc_locks.begin(), end= trx->autoinc_locks.end(); + ut_ad(begin != end); + if (*--end == lock) + trx->autoinc_locks.erase(end, end + 1); + else + while (begin != end) + if (*--end == lock) + { + *end= nullptr; + break; + } } lock_table_dequeue(lock, true); /* Remove the lock from table lock vector too. */ @@ -6519,18 +6476,18 @@ void lock_cancel_waiting_and_release(lock_t *lock) trx->mutex_unlock(); } -void lock_sys_t::cancel_lock_wait_for_trx(trx_t *trx) +inline void lock_sys_t::cancel_lock_wait_for_trx(trx_t *trx) noexcept { - lock_sys.wr_lock(SRW_LOCK_CALL); - mysql_mutex_lock(&lock_sys.wait_mutex); + wr_lock(SRW_LOCK_CALL); + mysql_mutex_lock(&wait_mutex); if (lock_t *lock= trx->lock.wait_lock) { /* check if victim is still waiting */ if (lock->is_waiting()) lock_cancel_waiting_and_release(lock); } - lock_sys.wr_unlock(); - mysql_mutex_unlock(&lock_sys.wait_mutex); + wr_unlock(); + mysql_mutex_unlock(&wait_mutex); } #ifdef WITH_WSREP @@ -6554,10 +6511,10 @@ void lock_sys_t::cancel_lock_wait_for_wsrep_bf_abort(trx_t *trx) @retval DB_DEADLOCK if trx->lock.was_chosen_as_deadlock_victim was set @retval DB_LOCK_WAIT if the lock was canceled */ template -dberr_t lock_sys_t::cancel(trx_t *trx, lock_t *lock) +dberr_t lock_sys_t::cancel(trx_t *trx, lock_t *lock) noexcept { DEBUG_SYNC_C("lock_sys_t_cancel_enter"); - mysql_mutex_assert_owner(&lock_sys.wait_mutex); + mysql_mutex_assert_owner(&wait_mutex); ut_ad(trx->state == TRX_STATE_ACTIVE); /* trx->lock.wait_lock may be changed by other threads as long as we are not holding lock_sys.latch. @@ -6565,27 +6522,27 @@ dberr_t lock_sys_t::cancel(trx_t *trx, lock_t *lock) So, trx->lock.wait_lock==lock does not necessarily hold, but both pointers should be valid, because other threads cannot assign trx->lock.wait_lock=nullptr (or invalidate *lock) while we are - holding lock_sys.wait_mutex. Also, the type of trx->lock.wait_lock + holding wait_mutex. Also, the type of trx->lock.wait_lock (record or table lock) cannot be changed by other threads. So, it is - safe to call lock->is_table() while not holding lock_sys.latch. If - we have to release and reacquire lock_sys.wait_mutex, we must reread + safe to call lock->is_table() while not holding latch. If + we have to release and reacquire wait_mutex, we must reread trx->lock.wait_lock. We must also reread trx->lock.wait_lock after - lock_sys.latch acquiring, as it can be changed to not-null in lock moving - functions even if we hold lock_sys.wait_mutex. */ + latch acquiring, as it can be changed to not-null in lock moving + functions even if we hold wait_mutex. */ dberr_t err= DB_SUCCESS; /* This would be too large for a memory transaction, except in the DB_DEADLOCK case, which was already tested in lock_trx_handle_wait(). */ if (lock->is_table()) { - if (!lock_sys.rd_lock_try()) + if (!rd_lock_try()) { - mysql_mutex_unlock(&lock_sys.wait_mutex); - lock_sys.rd_lock(SRW_LOCK_CALL); - mysql_mutex_lock(&lock_sys.wait_mutex); + mysql_mutex_unlock(&wait_mutex); + rd_lock(SRW_LOCK_CALL); + mysql_mutex_lock(&wait_mutex); lock= trx->lock.wait_lock; - /* Even if waiting lock was cancelled while lock_sys.wait_mutex was - unlocked, we need to return deadlock error if transaction was chosen - as deadlock victim to rollback it */ + /* Even if the waiting lock was cancelled while we did not hold + wait_mutex, we need to return deadlock error if the transaction + was chosen as deadlock victim to be rolled back. */ if (check_victim && trx->lock.was_chosen_as_deadlock_victim) err= DB_DEADLOCK; else if (lock) @@ -6596,10 +6553,10 @@ dberr_t lock_sys_t::cancel(trx_t *trx, lock_t *lock) /* This function is invoked from the thread which executes the transaction. Table locks are requested before record locks. Some other transaction can't change trx->lock.wait_lock from table to record for the - current transaction at this point, because the current transaction has not - requested record locks yet. There is no need to move any table locks by - other threads. And trx->lock.wait_lock can't be set to null while we are - holding lock_sys.wait_mutex. That's why there is no need to reload + current transaction at this point, because the current transaction has + not requested record locks yet. There is no need to move any table locks + by other threads. And trx->lock.wait_lock can't be set to null while we + are holding wait_mutex. That's why there is no need to reload trx->lock.wait_lock here. */ ut_ad(lock == trx->lock.wait_lock); resolve_table_lock: @@ -6607,11 +6564,11 @@ resolve_table_lock: if (!table->lock_mutex_trylock()) { /* The correct latching order is: - lock_sys.latch, table->lock_latch, lock_sys.wait_mutex. - Thus, we must release lock_sys.wait_mutex for a blocking wait. */ - mysql_mutex_unlock(&lock_sys.wait_mutex); + latch, table->lock_latch, wait_mutex. + Thus, we must release wait_mutex for a blocking wait. */ + mysql_mutex_unlock(&wait_mutex); table->lock_mutex_lock(); - mysql_mutex_lock(&lock_sys.wait_mutex); + mysql_mutex_lock(&wait_mutex); /* Cache trx->lock.wait_lock under the corresponding latches. */ lock= trx->lock.wait_lock; if (!lock) @@ -6638,20 +6595,20 @@ resolve_table_lock: retreat: table->lock_mutex_unlock(); } - lock_sys.rd_unlock(); + rd_unlock(); } else { /* To prevent the record lock from being moved between pages - during a page split or merge, we must hold exclusive lock_sys.latch. */ - if (!lock_sys.wr_lock_try()) + during a page split or merge, we must hold exclusive latch. */ + if (!wr_lock_try()) { - mysql_mutex_unlock(&lock_sys.wait_mutex); - lock_sys.wr_lock(SRW_LOCK_CALL); - mysql_mutex_lock(&lock_sys.wait_mutex); + mysql_mutex_unlock(&wait_mutex); + wr_lock(SRW_LOCK_CALL); + mysql_mutex_lock(&wait_mutex); /* Cache trx->lock.wait_lock under the corresponding latches. */ lock= trx->lock.wait_lock; - /* Even if waiting lock was cancelled while lock_sys.wait_mutex was + /* Even if waiting lock was cancelled while wait_mutex was unlocked, we need to return deadlock error if transaction was chosen as deadlock victim to rollback it */ if (check_victim && trx->lock.was_chosen_as_deadlock_victim) @@ -6675,13 +6632,13 @@ resolve_record_lock: rpl.rpl_parallel_optimistic_xa_lsu_off */ err= DB_LOCK_WAIT; } - lock_sys.wr_unlock(); + wr_unlock(); } return err; } -template dberr_t lock_sys_t::cancel(trx_t *, lock_t *); +template dberr_t lock_sys_t::cancel(trx_t *, lock_t *) noexcept; /*********************************************************************//** Unlocks AUTO_INC type locks that were possibly reserved by a trx. This @@ -6703,7 +6660,7 @@ lock_unlock_table_autoinc( ut_ad(trx_state == TRX_STATE_ACTIVE || trx_state == TRX_STATE_PREPARED || trx_state == TRX_STATE_NOT_STARTED); - if (lock_trx_holds_autoinc_locks(trx)) + if (!trx->autoinc_locks.empty()) lock_release_autoinc_locks(trx); } @@ -6733,7 +6690,7 @@ dberr_t lock_trx_handle_wait(trx_t *trx) err= DB_DEADLOCK; /* Cache trx->lock.wait_lock to avoid unnecessary atomic variable load */ else if (lock_t *wait_lock= trx->lock.wait_lock) - err= lock_sys_t::cancel(trx, wait_lock); + err= lock_sys.cancel(trx, wait_lock); lock_sys.deadlock_check(); mysql_mutex_unlock(&lock_sys.wait_mutex); return err; @@ -7197,7 +7154,7 @@ static lock_t *Deadlock::check_and_resolve(trx_t *trx, lock_t *wait_lock) return wait_lock; if (wait_lock) - lock_sys_t::cancel(trx, wait_lock); + lock_sys.cancel(trx, wait_lock); lock_sys.deadlock_check(); return reinterpret_cast(-1); diff --git a/storage/innobase/mtr/mtr0mtr.cc b/storage/innobase/mtr/mtr0mtr.cc index 310e509074d..ab3d1a2f76a 100644 --- a/storage/innobase/mtr/mtr0mtr.cc +++ b/storage/innobase/mtr/mtr0mtr.cc @@ -1794,14 +1794,14 @@ void mtr_t::free(const fil_space_t &space, uint32_t offset) m_log.close(log_write(id, nullptr)); } -void small_vector_base::grow_by_1(void *small, size_t element_size) +void small_vector_base::grow_by_1(void *small, size_t element_size) noexcept { const size_t cap= Capacity*= 2, s= cap * element_size; void *new_begin; if (BeginX == small) { new_begin= my_malloc(PSI_NOT_INSTRUMENTED, s, MYF(0)); - memcpy(new_begin, BeginX, size() * element_size); + memcpy(new_begin, BeginX, s / 2); TRASH_FREE(small, size() * element_size); } else diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc index 24d18930c32..0fe6073fc3d 100644 --- a/storage/innobase/os/os0file.cc +++ b/storage/innobase/os/os0file.cc @@ -1569,8 +1569,8 @@ bool os_file_set_size(const char *name, os_file_t file, os_offset_t size, if (is_sparse) { bool success = !ftruncate(file, size); if (!success) { - sql_print_error("InnoDB: ftruncate of file %s" - " to %llu bytes failed with error %d", + sql_print_error("InnoDB: ftruncate of file %s to %" + PRIu64 " bytes failed with error %d", name, size, errno); } return success; @@ -1608,7 +1608,7 @@ bool os_file_set_size(const char *name, os_file_t file, os_offset_t size, case 0: return true; default: - sql_print_error("InnoDB: preallocating %llu" + sql_print_error("InnoDB: preallocating %" PRIu64 " bytes for file %s failed with error %d", size, name, err); /* fall through */ diff --git a/storage/innobase/row/row0ins.cc b/storage/innobase/row/row0ins.cc index 4df909afb27..620fee86594 100644 --- a/storage/innobase/row/row0ins.cc +++ b/storage/innobase/row/row0ins.cc @@ -484,7 +484,9 @@ row_ins_cascade_calc_update_vec( const upd_field_t* parent_ufield = &parent_update->fields[j]; - if (parent_ufield->field_no == parent_field_no) { + if (parent_ufield->field_no == parent_field_no + && !(parent_ufield->new_val.type.prtype + & DATA_VIRTUAL)) { ulint min_size; const dict_col_t* col; diff --git a/storage/innobase/row/row0mysql.cc b/storage/innobase/row/row0mysql.cc index b51f3b54900..8affaea272f 100644 --- a/storage/innobase/row/row0mysql.cc +++ b/storage/innobase/row/row0mysql.cc @@ -211,6 +211,14 @@ row_mysql_read_blob_ref( *len = mach_read_from_n_little_endian(ref, col_len - 8); + if (!*len) { + /* Field_blob::store() if (!length) would encode both + the length and the pointer in the same area. An empty + string must be a valid (nonnull) pointer in the + collation functions that cmp_data() may invoke. */ + return ref; + } + memcpy(&data, ref + col_len - 8, sizeof data); return(data); @@ -2524,7 +2532,7 @@ row_rename_table_for_mysql( const char* old_name, /*!< in: old table name */ const char* new_name, /*!< in: new table name */ trx_t* trx, /*!< in/out: transaction */ - bool use_fk) /*!< in: whether to parse and enforce + rename_fk fk) /*!< in: how to handle FOREIGN KEY constraints */ { dict_table_t* table = NULL; @@ -2549,6 +2557,8 @@ row_rename_table_for_mysql( old_is_tmp = dict_table_t::is_temporary_name(old_name); new_is_tmp = dict_table_t::is_temporary_name(new_name); + ut_ad(fk != RENAME_IGNORE_FK || !new_is_tmp); + table = dict_table_open_on_name(old_name, true, DICT_ERR_IGNORE_FK_NOKEY); @@ -2578,7 +2588,7 @@ row_rename_table_for_mysql( memcpy(par_case_name, old_name, strlen(old_name)); par_case_name[strlen(old_name)] = 0; - innobase_casedn_str(par_case_name); + my_casedn_str(system_charset_info, par_case_name); #else /* On Windows platfrom, check whether there exists table name in @@ -2608,10 +2618,9 @@ row_rename_table_for_mysql( << TROUBLESHOOTING_MSG; goto funct_exit; - - } else if (use_fk && !old_is_tmp && new_is_tmp) { - /* MySQL is doing an ALTER TABLE command and it renames the - original table to a temporary table name. We want to preserve + } else if (fk == RENAME_ALTER_COPY && !old_is_tmp && new_is_tmp) { + /* Non-native ALTER TABLE is renaming the + original table to a temporary name. We want to preserve the original foreign key constraint definitions despite the name change. An exception is those constraints for which the ALTER TABLE contained DROP FOREIGN KEY .*/ @@ -2655,7 +2664,7 @@ row_rename_table_for_mysql( goto rollback_and_exit; } - if (!new_is_tmp) { + if (/* fk == RENAME_IGNORE_FK || */ !new_is_tmp) { /* Rename all constraints. */ char new_table_name[MAX_TABLE_NAME_LEN + 1]; char old_table_utf8[MAX_TABLE_NAME_LEN + 1]; @@ -2829,7 +2838,7 @@ row_rename_table_for_mysql( err = dict_load_foreigns( new_name, nullptr, trx->id, !old_is_tmp || trx->check_foreigns, - use_fk + fk == RENAME_ALTER_COPY ? DICT_ERR_IGNORE_NONE : DICT_ERR_IGNORE_FK_NOKEY, fk_tables); diff --git a/storage/innobase/trx/trx0trx.cc b/storage/innobase/trx/trx0trx.cc index 830e9e73d92..510a87e0833 100644 --- a/storage/innobase/trx/trx0trx.cc +++ b/storage/innobase/trx/trx0trx.cc @@ -170,6 +170,8 @@ struct TrxFactory { allocated object. trx_t objects are allocated by ut_zalloc_nokey() in Pool::Pool() which would not call the constructors of the trx_t members. */ + new(&trx->autoinc_locks) trx_t::autoinc_lock_vector(); + new(&trx->mod_tables) trx_mod_tables_t(); new(&trx->lock.table_locks) lock_list(); @@ -232,6 +234,8 @@ struct TrxFactory { trx->mutex_destroy(); + trx->autoinc_locks.~small_vector(); + trx->mod_tables.~trx_mod_tables_t(); ut_ad(!trx->read_view.is_open()); @@ -334,21 +338,12 @@ trx_t *trx_create() trx->assert_freed(); - mem_heap_t* heap; - ib_alloc_t* alloc; - /* We just got trx from pool, it should be non locking */ ut_ad(!trx->will_lock); ut_ad(!trx->rw_trx_hash_pins); DBUG_LOG("trx", "Create: " << trx); - heap = mem_heap_create(sizeof(ib_vector_t) + sizeof(void*) * 8); - - alloc = ib_heap_allocator_create(heap); - - trx->autoinc_locks = ib_vector_create(alloc, sizeof(void**), 4); - ut_ad(trx->mod_tables.empty()); ut_ad(trx->lock.n_rec_locks == 0); ut_ad(trx->lock.set_nth_bit_calls == 0); @@ -364,6 +359,7 @@ trx_t *trx_create() /** Free the memory to trx_pools */ void trx_t::free() { + autoinc_locks.fake_defined(); #ifdef HAVE_MEM_CHECK if (xid.is_null()) MEM_MAKE_DEFINED(&xid, sizeof xid); @@ -372,6 +368,7 @@ void trx_t::free() sizeof xid.data - (xid.gtrid_length + xid.bqual_length)); #endif MEM_CHECK_DEFINED(this, sizeof *this); + autoinc_locks.make_undefined(); ut_ad(!n_mysql_tables_in_use); ut_ad(!mysql_log_file_name); @@ -390,14 +387,7 @@ void trx_t::free() trx_sys.rw_trx_hash.put_pins(this); mysql_thd= nullptr; - // FIXME: We need to avoid this heap free/alloc for each commit. - if (autoinc_locks) - { - ut_ad(ib_vector_is_empty(autoinc_locks)); - /* We allocated a dedicated heap for the vector. */ - ib_vector_free(autoinc_locks); - autoinc_locks= NULL; - } + autoinc_locks.deep_clear(); MEM_NOACCESS(&skip_lock_inheritance_and_n_ref, sizeof skip_lock_inheritance_and_n_ref); @@ -495,7 +485,7 @@ inline void trx_t::release_locks() lock_release(this); ut_ad(!lock.n_rec_locks); ut_ad(UT_LIST_GET_LEN(lock.trx_locks) == 0); - ut_ad(ib_vector_is_empty(autoinc_locks)); + ut_ad(autoinc_locks.empty()); mem_heap_empty(lock.lock_heap); } @@ -927,7 +917,7 @@ trx_start_low( trx->wsrep = wsrep_on(trx->mysql_thd); #endif /* WITH_WSREP */ - ut_a(ib_vector_is_empty(trx->autoinc_locks)); + ut_a(trx->autoinc_locks.empty()); ut_a(trx->lock.table_locks.empty()); /* No other thread can access this trx object through rw_trx_hash, diff --git a/storage/myisam/mi_check.c b/storage/myisam/mi_check.c index e46dc35f861..dff5fcdbcb6 100644 --- a/storage/myisam/mi_check.c +++ b/storage/myisam/mi_check.c @@ -3429,9 +3429,9 @@ static int sort_get_next_record(MI_SORT_PARAM *sort_param) { if (!searching) mi_check_print_info(param, - "Found block with impossible length %u at %s; Skipped", - block_info.block_len+ (uint) (block_info.filepos-pos), - llstr(pos,llbuff)); + "Found block with impossible length %lu at %s; Skipped", + block_info.block_len + (unsigned long) (block_info.filepos-pos), + llstr(pos, llbuff)); if (found_record) goto try_next; searching=1; diff --git a/storage/spider/ha_spider.cc b/storage/spider/ha_spider.cc index 84c6dc33770..b1df83de162 100644 --- a/storage/spider/ha_spider.cc +++ b/storage/spider/ha_spider.cc @@ -199,7 +199,6 @@ int ha_spider::open( DBUG_PRINT("info",("spider this=%p", this)); dup_key_idx = (uint) -1; - conn_kinds = SPIDER_CONN_KIND_MYSQL; table->file->get_no_parts("", &part_num); if (part_num) { @@ -580,22 +579,7 @@ int ha_spider::check_access_kind_for_connection( int error_num, roop_count; DBUG_ENTER("ha_spider::check_access_kind_for_connection"); DBUG_PRINT("info",("spider this=%p", this)); - conn_kinds = 0; - switch (wide_handler->sql_command) - { - case SQLCOM_UPDATE: - case SQLCOM_UPDATE_MULTI: - case SQLCOM_DELETE: - case SQLCOM_DELETE_MULTI: - default: - conn_kinds |= SPIDER_CONN_KIND_MYSQL; - for (roop_count = 0; roop_count < (int) share->link_count; roop_count++) - { - conn_kind[roop_count] = SPIDER_CONN_KIND_MYSQL; - } - break; - } - if ((error_num = spider_check_trx_and_get_conn(thd, this, TRUE))) + if ((error_num= spider_check_trx_and_get_conn(thd, this))) { DBUG_RETURN(error_num); } @@ -911,7 +895,7 @@ int ha_spider::external_lock( } } - if ((error_num= spider_check_trx_and_get_conn(thd, this, FALSE))) + if ((error_num= spider_check_trx_and_get_conn(thd, this))) DBUG_RETURN(error_num); if (!partition_handler || !partition_handler->handlers) { @@ -951,9 +935,6 @@ int ha_spider::reset() THD *thd = ha_thd(); SPIDER_TRX *tmp_trx, *trx_bak; SPIDER_CONDITION *tmp_cond; -/* - char first_byte, first_byte_bak; -*/ backup_error_status(); DBUG_ENTER("ha_spider::reset"); DBUG_PRINT("info",("spider this=%p", this)); @@ -1032,8 +1013,6 @@ int ha_spider::reset() for (roop_count = share->link_count - 1; roop_count >= 0; roop_count--) { result_list.update_sqls[roop_count].length(0); - - conn_kind[roop_count] = SPIDER_CONN_KIND_MYSQL; } result_list.bulk_update_mode = 0; result_list.bulk_update_size = 0; @@ -1059,7 +1038,6 @@ int ha_spider::reset() result_list.use_union = FALSE; result_list.use_both_key = FALSE; pt_clone_last_searcher = NULL; - conn_kinds = SPIDER_CONN_KIND_MYSQL; use_index_merge = FALSE; init_rnd_handler = FALSE; if (multi_range_keys) @@ -4451,7 +4429,7 @@ int ha_spider::rnd_next( DBUG_RETURN(error_num); use_pre_call = FALSE; } - if ((error_num= spider_check_trx_and_get_conn(ha_thd(), this, FALSE))) + if ((error_num= spider_check_trx_and_get_conn(ha_thd(), this))) DBUG_RETURN(error_num); DBUG_RETURN(rnd_next_internal(buf)); } @@ -4984,8 +4962,7 @@ int ha_spider::info( pthread_mutex_lock(&share->sts_mutex); if (difftime(tmp_time, share->sts_get_time) >= sts_interval) { - if ((error_num = spider_check_trx_and_get_conn(ha_thd(), this, - FALSE))) + if ((error_num= spider_check_trx_and_get_conn(ha_thd(), this))) { pthread_mutex_unlock(&share->sts_mutex); if (!share->sts_init) @@ -5522,7 +5499,7 @@ int ha_spider::check_crd() } if (crd_mode == 3) crd_mode = 1; - if ((error_num = spider_check_trx_and_get_conn(ha_thd(), this, FALSE))) + if ((error_num= spider_check_trx_and_get_conn(ha_thd(), this))) { DBUG_RETURN(check_error_mode(error_num)); } @@ -6664,7 +6641,7 @@ int ha_spider::truncate() DBUG_RETURN(ER_SPIDER_READ_ONLY_NUM); } wide_handler->sql_command = SQLCOM_TRUNCATE; - if ((error_num = spider_check_trx_and_get_conn(thd, this, FALSE))) + if ((error_num= spider_check_trx_and_get_conn(thd, this))) { DBUG_RETURN(error_num); } @@ -10203,8 +10180,7 @@ int ha_spider::append_lock_tables_list() if (!(wide_handler->trx = spider_get_trx(ha_thd(), TRUE, &error_num))) DBUG_RETURN(error_num); - if ((error_num = spider_check_trx_and_get_conn(wide_handler->trx->thd, this, - FALSE))) + if ((error_num = spider_check_trx_and_get_conn(wide_handler->trx->thd, this))) { DBUG_RETURN(error_num); } diff --git a/storage/spider/ha_spider.h b/storage/spider/ha_spider.h index 76bef1294c9..e87e8657dcf 100644 --- a/storage/spider/ha_spider.h +++ b/storage/spider/ha_spider.h @@ -60,8 +60,6 @@ public: const char *mem_calc_file_name; ulong mem_calc_line_no; ulonglong *connection_ids; - uint conn_kinds; - uint *conn_kind; char *conn_keys_first_ptr; char **conn_keys; SPIDER_CONN **conns; diff --git a/storage/spider/mysql-test/spider/bugfix/r/mdev_27438.result b/storage/spider/mysql-test/spider/bugfix/r/mdev_27438.result new file mode 100644 index 00000000000..7a30b0d27db --- /dev/null +++ b/storage/spider/mysql-test/spider/bugfix/r/mdev_27438.result @@ -0,0 +1,6 @@ +install soname 'ha_spider'; +CREATE TABLE t1 (a INT) ENGINE=Innodb; +SET SESSION debug_dbug="+d,crash_commit_after_log"; +INSERT INTO t1 VALUES (1); +Got one of the listed errors +drop table t1; diff --git a/storage/spider/mysql-test/spider/bugfix/r/mdev_27438_spider_table.result b/storage/spider/mysql-test/spider/bugfix/r/mdev_27438_spider_table.result new file mode 100644 index 00000000000..a3fc1de5767 --- /dev/null +++ b/storage/spider/mysql-test/spider/bugfix/r/mdev_27438_spider_table.result @@ -0,0 +1,25 @@ +install soname 'ha_spider'; +set spider_same_server_link= 1; +CREATE SERVER srv FOREIGN DATA WRAPPER mysql +OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root'); +CREATE TABLE t1 (a INT); +create table t2 (a int) ENGINE=Spider +COMMENT='WRAPPER "mysql", srv "srv",TABLE "t1"'; +INSERT INTO t2 VALUES (1); +SET SESSION debug_dbug="+d,crash_commit_after_log"; +INSERT INTO t2 VALUES (2); +Got one of the listed errors +call mtr.add_suppression(".*\\[ERROR\\] mariadbd: Table './test/t1' is marked as crashed and should be repaired"); +call mtr.add_suppression(".*\\[Warning\\] Checking table: './test/t1'"); +set spider_same_server_link= 1; +select * from t2; +a +1 +2 +Warnings: +Error 1034 1 client is using or hasn't closed the table properly +Error 1034 Table is fixed +drop server srv; +drop table t1, t2; +Warnings: +Warning 1620 Plugin is busy and will be uninstalled on shutdown diff --git a/storage/spider/mysql-test/spider/bugfix/r/mdev_34849.result b/storage/spider/mysql-test/spider/bugfix/r/mdev_34849.result new file mode 100644 index 00000000000..9433dd7f679 --- /dev/null +++ b/storage/spider/mysql-test/spider/bugfix/r/mdev_34849.result @@ -0,0 +1,24 @@ +# +# MDEV-34849 SIGSEGV in server_mysql_real_connect, spider_db_connect, __strcmp_evex and __strnlen_evex, ASAN heap-use-after-free in spider_db_connect on INSERT +# +INSTALL SONAME 'ha_spider'; +CREATE TABLE t1 (c INT) ENGINE=Spider; +CREATE TABLE t2 (c INT) ENGINE=Spider; +SELECT * FROM t2; +ERROR HY000: Unable to connect to foreign data source: localhost +set @old_table_open_cache=@@global.table_open_cache; +SET GLOBAL table_open_cache=0; +Warnings: +Warning 1292 Truncated incorrect table_open_cache value: '0' +set autocommit=0; +/* 1 */ INSERT INTO t1 VALUES (0); +ERROR HY000: Unable to connect to foreign data source: localhost +/* 2 */ INSERT INTO t2 VALUES (0); +ERROR HY000: Unable to connect to foreign data source: localhost +set global spider_connect_error_interval=0; +/* 3 */ INSERT INTO t1 VALUES (0); +ERROR HY000: Unable to connect to foreign data source: localhost +drop table t1, t2; +set global table_open_cache=@old_table_open_cache; +Warnings: +Warning 1620 Plugin is busy and will be uninstalled on shutdown diff --git a/storage/spider/mysql-test/spider/bugfix/r/mdev_35326.result b/storage/spider/mysql-test/spider/bugfix/r/mdev_35326.result new file mode 100644 index 00000000000..41481447a6c --- /dev/null +++ b/storage/spider/mysql-test/spider/bugfix/r/mdev_35326.result @@ -0,0 +1,14 @@ +for master_1 +for child2 +for child3 +CREATE TABLE t (c INT) ENGINE=Spider; +CREATE PROCEDURE p() CONTAINS SQL READS SQL DATA SELECT * FROM t INTO OUTFILE 'foo.txt'; +Warnings: +Warning 1287 ' INTO FROM...' instead +CALL p(); +ERROR HY000: Unable to connect to foreign data source: localhost +drop procedure p; +drop table t; +for master_1 +for child2 +for child3 diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_27438.test b/storage/spider/mysql-test/spider/bugfix/t/mdev_27438.test new file mode 100644 index 00000000000..e60331d07bb --- /dev/null +++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_27438.test @@ -0,0 +1,22 @@ +--source include/have_debug.inc +# Valgrind does not work well with test that crashes the server +--source include/not_valgrind.inc +install soname 'ha_spider'; +CREATE TABLE t1 (a INT) ENGINE=Innodb; + +# crash the server. +--let $expect_file_name= `select regexp_replace(@@tmpdir, '^.*/','')` +--let $expect_file_name= $MYSQLTEST_VARDIR/tmp/$expect_file_name.expect +--exec echo wait > $expect_file_name +SET SESSION debug_dbug="+d,crash_commit_after_log"; +--error 2006,2013,2026 +INSERT INTO t1 VALUES (1); + +# restart the server +--exec echo restart >> $expect_file_name +--enable_reconnect +--source include/wait_until_connected_again.inc + +drop table t1; +--disable_query_log +--source ../../include/clean_up_spider.inc diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_27438_spider_table.test b/storage/spider/mysql-test/spider/bugfix/t/mdev_27438_spider_table.test new file mode 100644 index 00000000000..18b37e373f4 --- /dev/null +++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_27438_spider_table.test @@ -0,0 +1,38 @@ +--source include/have_debug.inc +# Valgrind does not work well with test that crashes the server +--source include/not_valgrind.inc + +# Same as spider/bugfix.mdev_27438, but actually using a spider table. +install soname 'ha_spider'; +set spider_same_server_link= 1; +evalp CREATE SERVER srv FOREIGN DATA WRAPPER mysql +OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test',user 'root'); + +CREATE TABLE t1 (a INT); +create table t2 (a int) ENGINE=Spider +COMMENT='WRAPPER "mysql", srv "srv",TABLE "t1"'; +INSERT INTO t2 VALUES (1); + +# crash the server. +--let $expect_file_name= `select regexp_replace(@@tmpdir, '^.*/','')` +--let $expect_file_name= $MYSQLTEST_VARDIR/tmp/$expect_file_name.expect +--exec echo wait > $expect_file_name +SET SESSION debug_dbug="+d,crash_commit_after_log"; +--error 2006,2013,2026 +INSERT INTO t2 VALUES (2); + +# restart the server +--exec echo restart >> $expect_file_name +--enable_reconnect +--source include/wait_until_connected_again.inc + +call mtr.add_suppression(".*\\[ERROR\\] mariadbd: Table './test/t1' is marked as crashed and should be repaired"); +call mtr.add_suppression(".*\\[Warning\\] Checking table: './test/t1'"); +set spider_same_server_link= 1; +--disable_ps_protocol +select * from t2; +--enable_ps_protocol +drop server srv; +drop table t1, t2; +--disable_query_log +--source ../../include/clean_up_spider.inc diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_34849.test b/storage/spider/mysql-test/spider/bugfix/t/mdev_34849.test new file mode 100644 index 00000000000..4890abf4c7d --- /dev/null +++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_34849.test @@ -0,0 +1,52 @@ +--echo # +--echo # MDEV-34849 SIGSEGV in server_mysql_real_connect, spider_db_connect, __strcmp_evex and __strnlen_evex, ASAN heap-use-after-free in spider_db_connect on INSERT +--echo # + +INSTALL SONAME 'ha_spider'; + +CREATE TABLE t1 (c INT) ENGINE=Spider; +CREATE TABLE t2 (c INT) ENGINE=Spider; + +# So that t2 is inserted into spider_init_error_tables and in INSERT +# INTO t2 we go into failure mode in spider_get_share() +--error 1429 +SELECT * FROM t2; + +# Resets the table cache so that the next two queries will call +# ha_spider::open() on t1 and t2 respectively +set @old_table_open_cache=@@global.table_open_cache; +SET GLOBAL table_open_cache=0; + +# This causes trx_ha->wait_for_reusing to remain false during the +# (non-)rollback at the end of the first INSERT INTO t1 statement, so +# that the second INSERT INTO t1 enters the branch in +# spider_check_trx_and_get_conn() that does not update spider fields +# including NULLing its associated connections. +set autocommit=0; + +# Misses the table cache when opening the table. Spider then opens the +# table so that the next INSERT INTO t1 causes a table cache hit and +# skips the call to open table with spider +--error ER_CONNECT_TO_FOREIGN_DATA_SOURCE +/* 1 */ INSERT INTO t1 VALUES (0); + +# Spider opens the table and creates a t2 share, assigns it to +# conn->queued_connect_share, and frees the t2 share on failure +--error ER_CONNECT_TO_FOREIGN_DATA_SOURCE +/* 2 */ INSERT INTO t2 VALUES (0); + +# So that the final INSERT INTO t1 will decide not to return the same +# error in spider_db_connect(), and move onto using the freed share +set global spider_connect_error_interval=0; + +# Skips call to ha_spider::open(), so it does not create a t1 share +# nor reassign it to conn->queued_connect_share, causing it to remain +# the freed t2 share, and using the share results in segv +--error ER_CONNECT_TO_FOREIGN_DATA_SOURCE +/* 3 */ INSERT INTO t1 VALUES (0); + +drop table t1, t2; + +set global table_open_cache=@old_table_open_cache; +--disable_query_log +--source ../../include/clean_up_spider.inc diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_35326.test b/storage/spider/mysql-test/spider/bugfix/t/mdev_35326.test new file mode 100644 index 00000000000..06e16fecd96 --- /dev/null +++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_35326.test @@ -0,0 +1,23 @@ +--disable_query_log +--disable_result_log +--source ../../t/test_init.inc +--enable_result_log +--enable_query_log + +let $MYSQLD_DATADIR= `select @@datadir`; + +CREATE TABLE t (c INT) ENGINE=Spider; +--disable_ps_protocol +CREATE PROCEDURE p() CONTAINS SQL READS SQL DATA SELECT * FROM t INTO OUTFILE 'foo.txt'; +--enable_ps_protocol +--error ER_CONNECT_TO_FOREIGN_DATA_SOURCE +CALL p(); +remove_file $MYSQLD_DATADIR/test/foo.txt; +drop procedure p; +drop table t; + +--disable_query_log +--disable_result_log +--source ../../t/test_deinit.inc +--enable_result_log +--enable_query_log diff --git a/storage/spider/spd_conn.cc b/storage/spider/spd_conn.cc index 5fe027bb733..fb77a2af787 100644 --- a/storage/spider/spd_conn.cc +++ b/storage/spider/spd_conn.cc @@ -108,7 +108,6 @@ const uchar *spider_conn_get_key( auto conn= static_cast(conn_); DBUG_ENTER("spider_conn_get_key"); *length = conn->conn_key_length; - DBUG_PRINT("info",("spider conn_kind=%u", conn->conn_kind)); #ifdef DBUG_TRACE spider_print_keys(conn->conn_key, conn->conn_key_length); #endif @@ -397,7 +396,6 @@ SPIDER_CONN *spider_create_conn( ha_spider *spider, int link_idx, int base_link_idx, - uint conn_kind, int *error_num ) { int *need_mon; @@ -561,7 +559,6 @@ SPIDER_CONN *spider_create_conn( conn->semi_trx_isolation_chk = FALSE; conn->semi_trx_chk = FALSE; conn->link_idx = base_link_idx; - conn->conn_kind = conn_kind; conn->conn_need_mon = need_mon; if (spider) conn->need_mon = &spider->need_mons[base_link_idx]; @@ -648,13 +645,11 @@ SPIDER_CONN *spider_get_conn( ha_spider *spider, bool another, bool thd_chg, - uint conn_kind, int *error_num ) { SPIDER_CONN *conn = NULL; int base_link_idx = link_idx; DBUG_ENTER("spider_get_conn"); - DBUG_PRINT("info",("spider conn_kind=%u", conn_kind)); if (spider) link_idx = spider->conn_link_idx[base_link_idx]; @@ -693,7 +688,8 @@ SPIDER_CONN *spider_get_conn( pthread_mutex_unlock(&spider_conn_mutex); if (spider_param_max_connections()) { /* enable connection pool */ - conn = spider_get_conn_from_idle_connection(share, link_idx, conn_key, spider, conn_kind, base_link_idx, error_num); + conn= spider_get_conn_from_idle_connection( + share, link_idx, conn_key, spider, base_link_idx, error_num); /* failed get conn, goto error */ if (!conn) goto error; @@ -702,8 +698,8 @@ SPIDER_CONN *spider_get_conn( else { /* did not enable conncetion pool , create_conn */ DBUG_PRINT("info",("spider create new conn")); - if (!(conn = spider_create_conn(share, spider, link_idx, - base_link_idx, conn_kind, error_num))) + if (!(conn= spider_create_conn(share, spider, link_idx, + base_link_idx, error_num))) goto error; *conn->conn_key = *conn_key; if (spider) @@ -727,8 +723,8 @@ SPIDER_CONN *spider_get_conn( } else { DBUG_PRINT("info",("spider create new conn")); /* conn_recycle_strict = 0 and conn_recycle_mode = 0 or 2 */ - if (!(conn = spider_create_conn(share, spider, link_idx, base_link_idx, - conn_kind, error_num))) + if (!(conn= spider_create_conn(share, spider, link_idx, base_link_idx, + error_num))) goto error; *conn->conn_key = *conn_key; if (spider) @@ -872,18 +868,12 @@ int spider_check_and_get_casual_read_conn( if (conn->casual_read_current_id > 63) conn->casual_read_current_id = 2; } - char first_byte_bak = *spider->conn_keys[link_idx]; - *spider->conn_keys[link_idx] = - '0' + spider->result_list.casual_read[link_idx]; if (!(spider->conns[link_idx]= spider_get_conn( spider->share, link_idx, spider->conn_keys[link_idx], - spider->wide_handler->trx, spider, FALSE, TRUE, - SPIDER_CONN_KIND_MYSQL, &error_num))) + spider->wide_handler->trx, spider, FALSE, TRUE, &error_num))) { - *spider->conn_keys[link_idx] = first_byte_bak; DBUG_RETURN(error_num); } - *spider->conn_keys[link_idx] = first_byte_bak; spider->conns[link_idx]->casual_read_base_conn = conn; spider_check_and_set_autocommit(thd, spider->conns[link_idx], NULL); DBUG_RETURN(0); @@ -2974,12 +2964,6 @@ void *spider_bg_sts_action( if (spider.search_link_idx < 0) { spider_trx_set_link_idx_for_all(&spider); -/* - spider.search_link_idx = spider_conn_next_link_idx( - thd, share->link_statuses, share->access_balances, - spider.conn_link_idx, spider.search_link_idx, share->link_count, - SPIDER_LINK_STATUS_OK); -*/ spider.search_link_idx = spider_conn_first_link_idx(thd, share->link_statuses, share->access_balances, spider.conn_link_idx, share->link_count, SPIDER_LINK_STATUS_OK); @@ -2992,9 +2976,8 @@ void *spider_bg_sts_action( if (!conns[spider.search_link_idx]) { spider_get_conn(share, spider.search_link_idx, - share->conn_keys[spider.search_link_idx], - trx, &spider, FALSE, FALSE, SPIDER_CONN_KIND_MYSQL, - &error_num); + share->conn_keys[spider.search_link_idx], trx, + &spider, FALSE, FALSE, &error_num); conns[spider.search_link_idx]->error_mode = 0; spider.search_link_idx = -1; } @@ -3260,9 +3243,8 @@ void *spider_bg_crd_action( if (!conns[spider.search_link_idx]) { spider_get_conn(share, spider.search_link_idx, - share->conn_keys[spider.search_link_idx], - trx, &spider, FALSE, FALSE, SPIDER_CONN_KIND_MYSQL, - &error_num); + share->conn_keys[spider.search_link_idx], trx, + &spider, FALSE, FALSE, &error_num); conns[spider.search_link_idx]->error_mode = 0; spider.search_link_idx = -1; } @@ -3803,7 +3785,6 @@ SPIDER_CONN* spider_get_conn_from_idle_connection( int link_idx, char *conn_key, ha_spider *spider, - uint conn_kind, int base_link_idx, int *error_num ) @@ -3891,7 +3872,8 @@ SPIDER_CONN* spider_get_conn_from_idle_connection( if (ip_port_conn) pthread_mutex_unlock(&ip_port_conn->mutex); DBUG_PRINT("info",("spider create new conn")); - if (!(conn = spider_create_conn(share, spider, link_idx, base_link_idx, conn_kind, error_num))) + if (!(conn= spider_create_conn(share, spider, link_idx, base_link_idx, + error_num))) DBUG_RETURN(conn); *conn->conn_key = *conn_key; if (spider) diff --git a/storage/spider/spd_conn.h b/storage/spider/spd_conn.h index d9741edccb5..f8859365a66 100644 --- a/storage/spider/spd_conn.h +++ b/storage/spider/spd_conn.h @@ -124,7 +124,6 @@ SPIDER_CONN *spider_create_conn( ha_spider *spider, int link_id, int base_link_id, - uint conn_kind, int *error_num ); @@ -136,7 +135,6 @@ SPIDER_CONN *spider_get_conn( ha_spider *spider, bool another, bool thd_chg, - uint conn_kind, int *error_num ); @@ -437,7 +435,6 @@ SPIDER_CONN* spider_get_conn_from_idle_connection int link_idx, char *conn_key, ha_spider *spider, - uint conn_kind, int base_link_idx, int *error_num ); diff --git a/storage/spider/spd_copy_tables.cc b/storage/spider/spd_copy_tables.cc index 36858708361..59670486c7f 100644 --- a/storage/spider/spd_copy_tables.cc +++ b/storage/spider/spd_copy_tables.cc @@ -495,11 +495,10 @@ int spider_udf_get_copy_tgt_conns( while (table_conn) { share = table_conn->share; - if ( - !(table_conn->conn = spider_get_conn( - share, 0, share->conn_keys[0], trx, NULL, FALSE, FALSE, - SPIDER_CONN_KIND_MYSQL, &error_num)) - ) { + if (!(table_conn->conn= + spider_get_conn(share, 0, share->conn_keys[0], trx, NULL, + FALSE, FALSE, &error_num))) + { my_error(ER_CONNECT_TO_FOREIGN_DATA_SOURCE, MYF(0), share->server_names[0]); DBUG_RETURN(ER_CONNECT_TO_FOREIGN_DATA_SOURCE); } @@ -706,8 +705,8 @@ int spider_udf_bg_copy_exec_sql( long long spider_copy_tables_body( UDF_INIT *initid, UDF_ARGS *args, - char *is_null, - char *error + unsigned char *is_null, + unsigned char *error ) { int error_num, roop_count, all_link_cnt = 0, use_table_charset; SPIDER_COPY_TABLES *copy_tables = NULL; diff --git a/storage/spider/spd_db_conn.cc b/storage/spider/spd_db_conn.cc index b8549072dcd..b60961eccd4 100644 --- a/storage/spider/spd_db_conn.cc +++ b/storage/spider/spd_db_conn.cc @@ -73,7 +73,7 @@ int spider_db_connect( THD* thd = current_thd; longlong connect_retry_interval; DBUG_ENTER("spider_db_connect"); - DBUG_ASSERT(conn->conn_kind != SPIDER_CONN_KIND_MYSQL || conn->need_mon); + DBUG_ASSERT(conn->need_mon); DBUG_PRINT("info",("spider link_idx=%d", link_idx)); DBUG_PRINT("info",("spider conn=%p", conn)); @@ -220,7 +220,6 @@ void spider_db_disconnect( ) { DBUG_ENTER("spider_db_disconnect"); DBUG_PRINT("info",("spider conn=%p", conn)); - DBUG_PRINT("info",("spider conn->conn_kind=%u", conn->conn_kind)); if (conn->db_conn->is_connected()) { conn->db_conn->disconnect(); diff --git a/storage/spider/spd_db_include.h b/storage/spider/spd_db_include.h index 2d85d2fb62a..19d2e77a9e6 100644 --- a/storage/spider/spd_db_include.h +++ b/storage/spider/spd_db_include.h @@ -164,8 +164,6 @@ typedef st_spider_result SPIDER_RESULT; #define SPIDER_SQL_LOP_CHK_PRM_PRF_STR "spider_lc_" #define SPIDER_SQL_LOP_CHK_PRM_PRF_LEN (sizeof(SPIDER_SQL_LOP_CHK_PRM_PRF_STR) - 1) -#define SPIDER_CONN_KIND_MYSQL (1 << 0) - #define SPIDER_SQL_TYPE_SELECT_SQL (1 << 0) #define SPIDER_SQL_TYPE_INSERT_SQL (1 << 1) #define SPIDER_SQL_TYPE_UPDATE_SQL (1 << 2) diff --git a/storage/spider/spd_db_mysql.cc b/storage/spider/spd_db_mysql.cc index f1ad282c2ae..aa91a6963a4 100644 --- a/storage/spider/spd_db_mysql.cc +++ b/storage/spider/spd_db_mysql.cc @@ -7405,7 +7405,7 @@ int spider_mbase_share::discover_table_structure( int *need_mon= &need_mon_deref; if (!(conn = spider_get_conn( spider_share, 0, spider_share->conn_keys[roop_count], trx, NULL, FALSE, - FALSE, SPIDER_CONN_KIND_MYSQL, &error_num)) + FALSE, &error_num)) ) { DBUG_RETURN(error_num); } diff --git a/storage/spider/spd_direct_sql.cc b/storage/spider/spd_direct_sql.cc index 9534037b3bf..d8a3ce01c58 100644 --- a/storage/spider/spd_direct_sql.cc +++ b/storage/spider/spd_direct_sql.cc @@ -429,7 +429,6 @@ SPIDER_CONN *spider_udf_direct_sql_create_conn( conn->semi_trx_isolation = -2; conn->semi_trx_isolation_chk = FALSE; conn->semi_trx_chk = FALSE; - conn->conn_kind = SPIDER_CONN_KIND_MYSQL; if (mysql_mutex_init(spd_key_mutex_mta_conn, &conn->mta_conn_mutex, MY_MUTEX_INIT_FAST)) @@ -574,7 +573,6 @@ SPIDER_CONN *spider_udf_direct_sql_get_conn( conn->queued_ping = FALSE; DBUG_PRINT("info",("spider conn=%p", conn)); - DBUG_PRINT("info",("spider conn->conn_kind=%u", conn->conn_kind)); DBUG_RETURN(conn); error: @@ -1299,8 +1297,8 @@ void spider_udf_free_direct_sql_alloc( long long spider_direct_sql_body( UDF_INIT *initid, UDF_ARGS *args, - char *is_null, - char *error, + unsigned char *is_null, + unsigned char *error, my_bool bg ) { int error_num, roop_count; diff --git a/storage/spider/spd_include.h b/storage/spider/spd_include.h index 2617585a53f..9038879b8ce 100644 --- a/storage/spider/spd_include.h +++ b/storage/spider/spd_include.h @@ -592,7 +592,6 @@ typedef struct st_spider_conn_loop_check SPIDER_CONN_LOOP_CHECK; /* database connection */ typedef struct st_spider_conn { - uint conn_kind; char *conn_key; uint conn_key_length; my_hash_value_type conn_key_hash_value; @@ -936,6 +935,10 @@ typedef struct st_spider_transaction uint trx_ha_reuse_count; XID_STATE internal_xid_state; SPIDER_CONN *join_trx_top; + /* + Assigned from the global variable `spider_thread_id', which + starts from 1 and increments + */ ulonglong spider_thread_id; ulonglong trx_conn_adjustment; uint locked_connections; @@ -1062,10 +1065,6 @@ typedef struct st_spider_share MEM_ROOT mem_root; -/* - volatile bool auto_increment_init; - volatile ulonglong auto_increment_lclval; -*/ ha_statistics stat; longlong static_records_for_status; @@ -1541,7 +1540,14 @@ typedef struct st_spider_trx_ha */ uint *conn_link_idx; uchar *conn_can_fo; - /* TODO: document */ + /* + TODO: better documentation of this field. + + By assigning true to wait_for_reusing, in + spider_check_trx_and_get_conn the fields of the spider handler + will be updated using the trx, as well as some other small + behavioural differences there. + */ bool wait_for_reusing; } SPIDER_TRX_HA; diff --git a/storage/spider/spd_ping_table.cc b/storage/spider/spd_ping_table.cc index 7867f535cc2..e891e4d54f6 100644 --- a/storage/spider/spd_ping_table.cc +++ b/storage/spider/spd_ping_table.cc @@ -644,11 +644,9 @@ SPIDER_CONN *spider_get_ping_table_tgt_conn( ) { SPIDER_CONN *conn; DBUG_ENTER("spider_get_ping_table_tgt_conn"); - if ( - !(conn = spider_get_conn( - share, 0, share->conn_keys[0], trx, NULL, FALSE, FALSE, - SPIDER_CONN_KIND_MYSQL, error_num)) - ) { + if (!(conn= spider_get_conn(share, 0, share->conn_keys[0], trx, NULL, FALSE, + FALSE, error_num))) + { my_error(ER_CONNECT_TO_FOREIGN_DATA_SOURCE, MYF(0), share->server_names[0]); *error_num = ER_CONNECT_TO_FOREIGN_DATA_SOURCE; @@ -1067,8 +1065,8 @@ int spider_ping_table_cache_compare( long long spider_ping_table_body( UDF_INIT *initid, UDF_ARGS *args, - char *is_null, - char *error + unsigned char *is_null, + unsigned char *error ) { int error_num = 0, link_idx, flags, full_mon_count, current_mon_count, success_count, fault_count, tmp_error_num = 0; diff --git a/storage/spider/spd_table.cc b/storage/spider/spd_table.cc index d4f715d9e78..07526105275 100644 --- a/storage/spider/spd_table.cc +++ b/storage/spider/spd_table.cc @@ -4354,8 +4354,6 @@ SPIDER_SHARE *spider_get_share( double crd_interval; int crd_mode; int crd_sync; - char first_byte; - int semi_table_lock_conn; int search_link_idx; uint sql_command = thd_sql_command(thd); SPIDER_Open_tables_backup open_tables_backup; @@ -4550,13 +4548,6 @@ SPIDER_SHARE *spider_get_share( pthread_mutex_unlock(&share->mutex); } - semi_table_lock_conn = spider_param_semi_table_lock_connection(thd, - share->semi_table_lock_conn); - if (semi_table_lock_conn) - first_byte = '0' + - spider_param_semi_table_lock(thd, share->semi_table_lock); - else - first_byte = '0'; if (!(spider->wide_handler->trx = spider_get_trx(thd, TRUE, error_num))) { @@ -4637,7 +4628,6 @@ SPIDER_SHARE *spider_get_share( &spider->conn_link_idx, sizeof(uint) * share->link_count, &spider->conn_can_fo, sizeof(uchar) * share->link_bitmap_size, &spider->connection_ids, sizeof(ulonglong) * share->link_count, - &spider->conn_kind, sizeof(uint) * share->link_count, &spider->db_request_id, sizeof(ulonglong) * share->link_count, &spider->db_request_phase, sizeof(uchar) * share->link_bitmap_size, &spider->need_mons, sizeof(int) * share->link_count, @@ -4666,11 +4656,9 @@ SPIDER_SHARE *spider_get_share( for (roop_count = 0; roop_count < (int) share->link_count; roop_count++) { spider->conn_keys[roop_count] = tmp_name; - *tmp_name = first_byte; tmp_name += share->conn_keys_lengths[roop_count] + 1; result_list->upd_tmp_tbl_prms[roop_count].init(); result_list->upd_tmp_tbl_prms[roop_count].field_count = 1; - spider->conn_kind[roop_count] = SPIDER_CONN_KIND_MYSQL; } spider_trx_set_link_idx_for_all(spider); @@ -4725,7 +4713,6 @@ SPIDER_SHARE *spider_get_share( !(spider->conns[roop_count] = spider_get_conn(share, roop_count, spider->conn_keys[roop_count], spider->wide_handler->trx, spider, FALSE, TRUE, - SPIDER_CONN_KIND_MYSQL, error_num)) ) { if ( @@ -5016,14 +5003,6 @@ SPIDER_SHARE *spider_get_share( pthread_mutex_unlock(&share->mutex); } - semi_table_lock_conn = spider_param_semi_table_lock_connection(thd, - share->semi_table_lock_conn); - if (semi_table_lock_conn) - first_byte = '0' + - spider_param_semi_table_lock(thd, share->semi_table_lock); - else - first_byte = '0'; - spider->share = share; if (!(spider->wide_handler->trx = spider_get_trx(thd, TRUE, error_num))) { @@ -5092,7 +5071,6 @@ SPIDER_SHARE *spider_get_share( &spider->conn_link_idx, sizeof(uint) * share->link_count, &spider->conn_can_fo, sizeof(uchar) * share->link_bitmap_size, &spider->connection_ids, sizeof(ulonglong) * share->link_count, - &spider->conn_kind, sizeof(uint) * share->link_count, &spider->db_request_id, sizeof(ulonglong) * share->link_count, &spider->db_request_phase, sizeof(uchar) * share->link_bitmap_size, &spider->need_mons, sizeof(int) * share->link_count, @@ -5118,11 +5096,9 @@ SPIDER_SHARE *spider_get_share( for (roop_count = 0; roop_count < (int) share->link_count; roop_count++) { spider->conn_keys[roop_count] = tmp_name; - *tmp_name = first_byte; tmp_name += share->conn_keys_lengths[roop_count] + 1; result_list->upd_tmp_tbl_prms[roop_count].init(); result_list->upd_tmp_tbl_prms[roop_count].field_count = 1; - spider->conn_kind[roop_count] = SPIDER_CONN_KIND_MYSQL; } spider_trx_set_link_idx_for_all(spider); @@ -5174,7 +5150,6 @@ SPIDER_SHARE *spider_get_share( !(spider->conns[roop_count] = spider_get_conn(share, roop_count, spider->conn_keys[roop_count], spider->wide_handler->trx, spider, FALSE, TRUE, - SPIDER_CONN_KIND_MYSQL, error_num)) ) { if ( @@ -5780,11 +5755,9 @@ int spider_open_all_tables( } /* create conn */ - if ( - !(conn = spider_get_conn( - &tmp_share, 0, tmp_share.conn_keys[0], trx, NULL, FALSE, FALSE, - SPIDER_CONN_KIND_MYSQL, &error_num)) - ) { + if (!(conn= spider_get_conn(&tmp_share, 0, tmp_share.conn_keys[0], trx, + NULL, FALSE, FALSE, &error_num))) + { spider_sys_index_end(table_tables); spider_close_sys_table(thd, table_tables, &open_tables_backup, TRUE); @@ -5878,11 +5851,9 @@ int spider_open_all_tables( } /* create another conn */ - if ( - (!(conn = spider_get_conn( - &tmp_share, 0, tmp_share.conn_keys[0], trx, spider, TRUE, FALSE, - SPIDER_CONN_KIND_MYSQL, &error_num))) - ) { + if ((!(conn= spider_get_conn(&tmp_share, 0, tmp_share.conn_keys[0], trx, + spider, TRUE, FALSE, &error_num)))) + { spider_free_tmp_dbton_handler(spider); spider_free(trx, share, MYF(0)); delete spider; @@ -8833,9 +8804,8 @@ void *spider_table_bg_sts_action( if (!conns[spider->search_link_idx]) { spider_get_conn(share, spider->search_link_idx, - share->conn_keys[spider->search_link_idx], - trx, spider, FALSE, FALSE, SPIDER_CONN_KIND_MYSQL, - &error_num); + share->conn_keys[spider->search_link_idx], trx, + spider, FALSE, FALSE, &error_num); if (conns[spider->search_link_idx]) { conns[spider->search_link_idx]->error_mode = 0; @@ -8979,9 +8949,8 @@ void *spider_table_bg_crd_action( if (!conns[spider->search_link_idx]) { spider_get_conn(share, spider->search_link_idx, - share->conn_keys[spider->search_link_idx], - trx, spider, FALSE, FALSE, SPIDER_CONN_KIND_MYSQL, - &error_num); + share->conn_keys[spider->search_link_idx], trx, + spider, FALSE, FALSE, &error_num); if (conns[spider->search_link_idx]) { conns[spider->search_link_idx]->error_mode = 0; diff --git a/storage/spider/spd_trx.cc b/storage/spider/spd_trx.cc index 878c702cc48..3eede8462dd 100644 --- a/storage/spider/spd_trx.cc +++ b/storage/spider/spd_trx.cc @@ -40,6 +40,10 @@ extern struct charset_info_st *spd_charset_utf8mb3_bin; extern handlerton *spider_hton_ptr; extern SPIDER_DBTON spider_dbton[SPIDER_DBTON_SIZE]; pthread_mutex_t spider_thread_id_mutex; +/* + Starts from 1 and increment by 1 whenever a new SPIDER_TRX is + created. +*/ ulonglong spider_thread_id; #ifdef HAVE_PSI_INTERFACE @@ -2521,7 +2525,17 @@ int spider_internal_xa_commit_by_xid( SPIDER_Open_tables_backup open_tables_backup; bool table_xa_opened = FALSE; bool table_xa_member_opened = FALSE; + bool created_tmp_thd = FALSE; DBUG_ENTER("spider_internal_xa_commit_by_xid"); + if (!thd) + { + if (!(thd = spider_create_tmp_thd())) + { + error_num = HA_ERR_OUT_OF_MEM; + goto error; + } + created_tmp_thd= TRUE; + } /* select status @@ -2648,13 +2662,11 @@ int spider_internal_xa_commit_by_xid( goto error; } - if ( - !(conn = spider_get_conn( - &tmp_share, 0, tmp_share.conn_keys[0], trx, NULL, FALSE, FALSE, - SPIDER_CONN_KIND_MYSQL, &error_num)) && - (force_commit == 0 || - (force_commit == 1 && error_num != ER_XAER_NOTA)) - ) { + if (!(conn= spider_get_conn(&tmp_share, 0, tmp_share.conn_keys[0], trx, + NULL, FALSE, FALSE, &error_num)) && + (force_commit == 0 || + (force_commit == 1 && error_num != ER_XAER_NOTA))) + { spider_sys_index_end(table_xa_member); spider_free_tmp_share_alloc(&tmp_share); free_root(&mem_root, MYF(0)); @@ -2721,6 +2733,8 @@ xa_delete: goto error; spider_close_sys_table(thd, table_xa, &open_tables_backup, TRUE); table_xa_opened = FALSE; + if (created_tmp_thd) + spider_free_tmp_thd(thd); DBUG_RETURN(0); error: @@ -2729,6 +2743,8 @@ error: if (table_xa_member_opened) spider_close_sys_table(thd, table_xa_member, &open_tables_backup, TRUE); error_open_table: + if (created_tmp_thd) + spider_free_tmp_thd(thd); DBUG_RETURN(error_num); } @@ -2753,7 +2769,17 @@ int spider_internal_xa_rollback_by_xid( SPIDER_Open_tables_backup open_tables_backup; bool table_xa_opened = FALSE; bool table_xa_member_opened = FALSE; + bool created_tmp_thd= FALSE; DBUG_ENTER("spider_internal_xa_rollback_by_xid"); + if (!thd) + { + if (!(thd = spider_create_tmp_thd())) + { + error_num = HA_ERR_OUT_OF_MEM; + goto error; + } + created_tmp_thd= TRUE; + } /* select status @@ -2878,13 +2904,11 @@ int spider_internal_xa_rollback_by_xid( goto error; } - if ( - !(conn = spider_get_conn( - &tmp_share, 0, tmp_share.conn_keys[0], trx, NULL, FALSE, FALSE, - SPIDER_CONN_KIND_MYSQL, &error_num)) && - (force_commit == 0 || - (force_commit == 1 && error_num != ER_XAER_NOTA)) - ) { + if (!(conn= spider_get_conn(&tmp_share, 0, tmp_share.conn_keys[0], trx, + NULL, FALSE, FALSE, &error_num)) && + (force_commit == 0 || + (force_commit == 1 && error_num != ER_XAER_NOTA))) + { spider_sys_index_end(table_xa_member); spider_free_tmp_share_alloc(&tmp_share); free_root(&mem_root, MYF(0)); @@ -2951,6 +2975,8 @@ xa_delete: goto error; spider_close_sys_table(thd, table_xa, &open_tables_backup, TRUE); table_xa_opened = FALSE; + if (created_tmp_thd) + spider_free_tmp_thd(thd); DBUG_RETURN(0); error: @@ -2959,6 +2985,8 @@ error: if (table_xa_member_opened) spider_close_sys_table(thd, table_xa_member, &open_tables_backup, TRUE); error_open_table: + if (created_tmp_thd) + spider_free_tmp_thd(thd); DBUG_RETURN(error_num); } @@ -3167,6 +3195,12 @@ int spider_rollback( conn->db_conn->reset_lock_table_hash(); } + /* + We do (almost) nothing if the following two conditions are both met: + + * This is just the end of a statement, not an explicit rollback. + * The autocommit is OFF or we are in an explicit transaction. + */ if (all || (!thd_test_options(thd, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))) { if (trx->trx_start) @@ -3283,15 +3317,12 @@ int spider_xa_commit_by_xid( DBUG_ENTER("spider_xa_commit_by_xid"); if (!(trx = spider_get_trx(thd, TRUE, &error_num))) - goto error_get_trx; + DBUG_RETURN(error_num); - if ((error_num = spider_internal_xa_commit_by_xid(thd, trx, xid))) - goto error; + error_num = spider_internal_xa_commit_by_xid(thd, trx, xid); - DBUG_RETURN(0); - -error: -error_get_trx: + if (!thd) + spider_free_trx(trx, FALSE); DBUG_RETURN(error_num); } @@ -3305,15 +3336,12 @@ int spider_xa_rollback_by_xid( DBUG_ENTER("spider_xa_rollback_by_xid"); if (!(trx = spider_get_trx(thd, TRUE, &error_num))) - goto error_get_trx; + DBUG_RETURN(error_num); - if ((error_num = spider_internal_xa_rollback_by_xid(thd, trx, xid))) - goto error; + error_num = spider_internal_xa_rollback_by_xid(thd, trx, xid); - DBUG_RETURN(0); - -error: -error_get_trx: + if (!thd) + spider_free_trx(trx, FALSE); DBUG_RETURN(error_num); } @@ -3382,18 +3410,161 @@ int spider_end_trx( DBUG_RETURN(error_num); } +/* + Report a table error. + + The error_msg requires two format params, db name and table name. +*/ +static int spider_report_table_error(ha_spider *spider, + int error_num, const char *error_msg) +{ + TABLE *table = spider->get_table(); + TABLE_SHARE *table_share = table->s; + char *db = (char *) my_alloca( + table_share->db.length + 1 + table_share->table_name.length + 1); + if (!db) + { + my_error(HA_ERR_OUT_OF_MEM, MYF(0)); + return HA_ERR_OUT_OF_MEM; + } + char *table_name = db + table_share->db.length + 1; + memcpy(db, table_share->db.str, table_share->db.length); + db[table_share->db.length] = '\0'; + memcpy(table_name, table_share->table_name.str, + table_share->table_name.length); + table_name[table_share->table_name.length] = '\0'; + my_printf_error(error_num, error_msg, MYF(0), db, table_name); + my_afree(db); + return error_num; +} + +/* Only called from spider_check_trx_and_get_conn. */ +static int spider_trx_update(THD *thd, ha_spider *spider, SPIDER_TRX *trx) +{ + int search_link_idx, roop_count; + SPIDER_SHARE *share = spider->share; + DBUG_ENTER("spider_trx_update"); + DBUG_PRINT("info", ("spider next trx")); + spider->trx_conn_adjustment = trx->trx_conn_adjustment; + if ( + spider->spider_thread_id != trx->spider_thread_id || + spider->search_link_query_id != thd->query_id + ) { + search_link_idx = spider_conn_first_link_idx(thd, + share->link_statuses, share->access_balances, spider->conn_link_idx, + share->link_count, SPIDER_LINK_STATUS_OK); + if (search_link_idx == -1) + DBUG_RETURN(spider_report_table_error(spider, + ER_SPIDER_ALL_LINKS_FAILED_NUM, + ER_SPIDER_ALL_LINKS_FAILED_STR)); + else if (search_link_idx == -2) + { + my_error(HA_ERR_OUT_OF_MEM, MYF(0)); + DBUG_RETURN(HA_ERR_OUT_OF_MEM); + } + spider->search_link_idx = search_link_idx; + spider->search_link_query_id = thd->query_id; + } + spider->spider_thread_id = trx->spider_thread_id; + + for (roop_count = 0; roop_count < (int) share->link_count; roop_count++) + { + spider->conns[roop_count] = NULL; + } + DBUG_RETURN(0); +} + +/* + Only called from spider_check_trx_and_get_conn + + TODO: this function comes from a refactoring, and the from_if param + is true iff the call is from the "if" branch, for lack of a better + name. This needs to be further understood and explained or removed + accordingly. +*/ +static int spider_trx_get_conn(ha_spider *spider, SPIDER_TRX *trx, + bool from_if) +{ + int roop_count, error_num; + bool search_link_idx_is_checked = FALSE; + SPIDER_CONN *conn; + SPIDER_SHARE *share = spider->share; + DBUG_ENTER("spider_trx_get_conn"); + for ( + roop_count = spider_conn_link_idx_next(share->link_statuses, + spider->conn_link_idx, -1, share->link_count, + SPIDER_LINK_STATUS_RECOVERY); + roop_count < (int) share->link_count; + roop_count = spider_conn_link_idx_next(share->link_statuses, + spider->conn_link_idx, roop_count, share->link_count, + SPIDER_LINK_STATUS_RECOVERY) + ) { + if (roop_count == spider->search_link_idx) + search_link_idx_is_checked = TRUE; + if ((conn= spider->conns[roop_count])) + { + /* TODO: do we need the check for !from_if here? */ + if (!from_if) + conn->error_mode&= spider->error_mode; + if (conn->queued_connect) + conn->queued_connect_share= share; + } + else if (!(conn = + spider_get_conn(share, roop_count, + spider->conn_keys[roop_count], trx, + spider, FALSE, TRUE, + &error_num))) + { + if ( + share->monitoring_kind[roop_count] && + spider->need_mons[roop_count] + ) { + error_num = spider_ping_table_mon_from_table( + trx, + trx->thd, + share, + roop_count, + (uint32) share->monitoring_sid[roop_count], + share->table_name, + share->table_name_length, + spider->conn_link_idx[roop_count], + NULL, + 0, + share->monitoring_kind[roop_count], + share->monitoring_limit[roop_count], + share->monitoring_flag[roop_count], + TRUE + ); + } + DBUG_PRINT("info",("spider get conn error")); + /* + Flag for another update (trx->spider_thread_id is at least + 1, causing the next check spider->spider_thread_id != + trx->spider_thread_id to return true). + + TODO: do we need the check for from_if here? + */ + if (from_if) + spider->spider_thread_id = 0; + DBUG_RETURN(error_num); + } + else + conn->error_mode &= spider->error_mode; + } + if (!search_link_idx_is_checked) + DBUG_RETURN(spider_report_table_error(spider, + ER_SPIDER_LINK_MON_JUST_NG_NUM, + ER_SPIDER_LINK_MON_JUST_NG_STR)); + DBUG_RETURN(0); +} + int spider_check_trx_and_get_conn( THD *thd, - ha_spider *spider, - bool use_conn_kind + ha_spider *spider ) { - int error_num, roop_count, search_link_idx; + int error_num; SPIDER_TRX *trx; SPIDER_SHARE *share = spider->share; - SPIDER_CONN *conn; - char first_byte, first_byte_bak; - int semi_table_lock_conn = spider_param_semi_table_lock_connection(thd, - share->semi_table_lock_conn); DBUG_ENTER("spider_check_trx_and_get_conn"); if (!(trx = spider_get_trx(thd, TRUE, &error_num))) { @@ -3408,233 +3579,21 @@ int spider_check_trx_and_get_conn( if (!trx_ha || trx_ha->wait_for_reusing) spider_trx_set_link_idx_for_all(spider); - if (semi_table_lock_conn) - first_byte = '0' + - spider_param_semi_table_lock(thd, share->semi_table_lock); - else - first_byte = '0'; - DBUG_PRINT("info",("spider semi_table_lock_conn = %d", - semi_table_lock_conn)); - DBUG_PRINT("info",("spider semi_table_lock = %d", - spider_param_semi_table_lock(thd, share->semi_table_lock))); - DBUG_PRINT("info",("spider first_byte = %d", first_byte)); if ( !trx_ha || trx_ha->wait_for_reusing || trx->spider_thread_id != spider->spider_thread_id || trx->trx_conn_adjustment != spider->trx_conn_adjustment || - first_byte != *spider->conn_keys[0] || share->link_statuses[spider->conn_link_idx[spider->search_link_idx]] == SPIDER_LINK_STATUS_NG ) { - DBUG_PRINT("info",(first_byte != *spider->conn_keys[0] ? - "spider change conn type" : trx != spider->wide_handler->trx ? - "spider change thd" : "spider next trx")); - spider->wide_handler->trx = trx; - spider->trx_conn_adjustment = trx->trx_conn_adjustment; - if ( - spider->spider_thread_id != trx->spider_thread_id || - spider->search_link_query_id != thd->query_id - ) { - search_link_idx = spider_conn_first_link_idx(thd, - share->link_statuses, share->access_balances, spider->conn_link_idx, - share->link_count, SPIDER_LINK_STATUS_OK); - if (search_link_idx == -1) - { - TABLE *table = spider->get_table(); - TABLE_SHARE *table_share = table->s; - char *db = (char *) my_alloca( - table_share->db.length + 1 + table_share->table_name.length + 1); - if (!db) - { - my_error(HA_ERR_OUT_OF_MEM, MYF(0)); - DBUG_RETURN(HA_ERR_OUT_OF_MEM); - } - char *table_name = db + table_share->db.length + 1; - memcpy(db, table_share->db.str, table_share->db.length); - db[table_share->db.length] = '\0'; - memcpy(table_name, table_share->table_name.str, - table_share->table_name.length); - table_name[table_share->table_name.length] = '\0'; - my_printf_error(ER_SPIDER_ALL_LINKS_FAILED_NUM, - ER_SPIDER_ALL_LINKS_FAILED_STR, MYF(0), db, table_name); - my_afree(db); - DBUG_RETURN(ER_SPIDER_ALL_LINKS_FAILED_NUM); - } else if (search_link_idx == -2) - { - my_error(HA_ERR_OUT_OF_MEM, MYF(0)); - DBUG_RETURN(HA_ERR_OUT_OF_MEM); - } - spider->search_link_idx = search_link_idx; - spider->search_link_query_id = thd->query_id; - } - spider->spider_thread_id = trx->spider_thread_id; - - first_byte_bak = *spider->conn_keys[0]; - *spider->conn_keys[0] = first_byte; - for (roop_count = 0; roop_count < (int) share->link_count; roop_count++) - { - spider->conns[roop_count]= NULL; - } - bool search_link_idx_is_checked = FALSE; - for ( - roop_count = spider_conn_link_idx_next(share->link_statuses, - spider->conn_link_idx, -1, share->link_count, - SPIDER_LINK_STATUS_RECOVERY); - roop_count < (int) share->link_count; - roop_count = spider_conn_link_idx_next(share->link_statuses, - spider->conn_link_idx, roop_count, share->link_count, - SPIDER_LINK_STATUS_RECOVERY) - ) { - uint tgt_conn_kind = (use_conn_kind ? spider->conn_kind[roop_count] : - SPIDER_CONN_KIND_MYSQL); - if (roop_count == spider->search_link_idx) - search_link_idx_is_checked = TRUE; - if ( - tgt_conn_kind == SPIDER_CONN_KIND_MYSQL && - !spider->conns[roop_count] - ) { - *spider->conn_keys[roop_count] = first_byte; - if ( - !(conn = - spider_get_conn(share, roop_count, - spider->conn_keys[roop_count], trx, - spider, FALSE, TRUE, - use_conn_kind ? spider->conn_kind[roop_count] : - SPIDER_CONN_KIND_MYSQL, - &error_num)) - ) { - if ( - share->monitoring_kind[roop_count] && - spider->need_mons[roop_count] - ) { - error_num = spider_ping_table_mon_from_table( - trx, - trx->thd, - share, - roop_count, - (uint32) share->monitoring_sid[roop_count], - share->table_name, - share->table_name_length, - spider->conn_link_idx[roop_count], - NULL, - 0, - share->monitoring_kind[roop_count], - share->monitoring_limit[roop_count], - share->monitoring_flag[roop_count], - TRUE - ); - } - DBUG_PRINT("info",("spider get conn error")); - *spider->conn_keys[0] = first_byte_bak; - spider->spider_thread_id = 0; - DBUG_RETURN(error_num); - } - conn->error_mode &= spider->error_mode; - } - } - if (!search_link_idx_is_checked) - { - TABLE *table = spider->get_table(); - TABLE_SHARE *table_share = table->s; - char *db = (char *) my_alloca( - table_share->db.length + 1 + table_share->table_name.length + 1); - if (!db) - { - my_error(HA_ERR_OUT_OF_MEM, MYF(0)); - DBUG_RETURN(HA_ERR_OUT_OF_MEM); - } - char *table_name = db + table_share->db.length + 1; - memcpy(db, table_share->db.str, table_share->db.length); - db[table_share->db.length] = '\0'; - memcpy(table_name, table_share->table_name.str, - table_share->table_name.length); - table_name[table_share->table_name.length] = '\0'; - my_printf_error(ER_SPIDER_LINK_MON_JUST_NG_NUM, - ER_SPIDER_LINK_MON_JUST_NG_STR, MYF(0), db, table_name); - my_afree(db); - DBUG_RETURN(ER_SPIDER_LINK_MON_JUST_NG_NUM); - } - } else { - DBUG_PRINT("info",("spider link_status = %ld", - share->link_statuses[spider->conn_link_idx[spider->search_link_idx]])); - bool search_link_idx_is_checked = FALSE; - for ( - roop_count = spider_conn_link_idx_next(share->link_statuses, - spider->conn_link_idx, -1, share->link_count, - SPIDER_LINK_STATUS_RECOVERY); - roop_count < (int) share->link_count; - roop_count = spider_conn_link_idx_next(share->link_statuses, - spider->conn_link_idx, roop_count, share->link_count, - SPIDER_LINK_STATUS_RECOVERY) - ) { - if (roop_count == spider->search_link_idx) - search_link_idx_is_checked = TRUE; - - conn= spider->conns[roop_count]; - - if (!conn) - { - DBUG_PRINT("info",("spider get conn %d", roop_count)); - if ( - !(conn = - spider_get_conn(share, roop_count, - spider->conn_keys[roop_count], trx, - spider, FALSE, TRUE, - use_conn_kind ? spider->conn_kind[roop_count] : - SPIDER_CONN_KIND_MYSQL, - &error_num)) - ) { - if ( - share->monitoring_kind[roop_count] && - spider->need_mons[roop_count] - ) { - error_num = spider_ping_table_mon_from_table( - trx, - trx->thd, - share, - roop_count, - (uint32) share->monitoring_sid[roop_count], - share->table_name, - share->table_name_length, - spider->conn_link_idx[roop_count], - NULL, - 0, - share->monitoring_kind[roop_count], - share->monitoring_limit[roop_count], - share->monitoring_flag[roop_count], - TRUE - ); - } - DBUG_PRINT("info",("spider get conn error")); - DBUG_RETURN(error_num); - } - } - conn->error_mode &= spider->error_mode; - } - if (!search_link_idx_is_checked) - { - TABLE *table = spider->get_table(); - TABLE_SHARE *table_share = table->s; - char *db = (char *) my_alloca( - table_share->db.length + 1 + table_share->table_name.length + 1); - if (!db) - { - my_error(HA_ERR_OUT_OF_MEM, MYF(0)); - DBUG_RETURN(HA_ERR_OUT_OF_MEM); - } - char *table_name = db + table_share->db.length + 1; - memcpy(db, table_share->db.str, table_share->db.length); - db[table_share->db.length] = '\0'; - memcpy(table_name, table_share->table_name.str, - table_share->table_name.length); - table_name[table_share->table_name.length] = '\0'; - my_printf_error(ER_SPIDER_LINK_MON_JUST_NG_NUM, - ER_SPIDER_LINK_MON_JUST_NG_STR, MYF(0), db, table_name); - my_afree(db); - DBUG_RETURN(ER_SPIDER_LINK_MON_JUST_NG_NUM); - } + if ((error_num= spider_trx_update(thd, spider, trx))) + DBUG_RETURN(error_num); + if ((error_num= spider_trx_get_conn(spider, trx, true))) + DBUG_RETURN(error_num); } + else if ((error_num= spider_trx_get_conn(spider, trx, false))) + DBUG_RETURN(error_num); spider->set_first_link_idx(); DBUG_RETURN(spider_create_trx_ha(trx, spider, trx_ha)); } diff --git a/storage/spider/spd_trx.h b/storage/spider/spd_trx.h index 2055a49717e..93b03fcec21 100644 --- a/storage/spider/spd_trx.h +++ b/storage/spider/spd_trx.h @@ -227,11 +227,7 @@ int spider_end_trx( SPIDER_CONN *conn ); -int spider_check_trx_and_get_conn( - THD *thd, - ha_spider *spider, - bool use_conn_kind -); +int spider_check_trx_and_get_conn(THD *thd, ha_spider *spider); THD *spider_create_tmp_thd(); diff --git a/storage/spider/spd_udf.cc b/storage/spider/spd_udf.cc index 511f0d0083a..28908ffd5d0 100644 --- a/storage/spider/spd_udf.cc +++ b/storage/spider/spd_udf.cc @@ -22,8 +22,8 @@ extern "C" { long long spider_direct_sql( UDF_INIT *initid, UDF_ARGS *args, - char *is_null, - char *error + unsigned char *is_null, + unsigned char *error ) { return spider_direct_sql_body(initid, args, is_null, error, FALSE); } @@ -45,8 +45,8 @@ void spider_direct_sql_deinit( long long spider_bg_direct_sql( UDF_INIT *initid, UDF_ARGS *args, - char *is_null, - char *error + unsigned char *is_null, + unsigned char *error ) { return spider_direct_sql_bg_end(initid); } @@ -67,8 +67,8 @@ void spider_bg_direct_sql_deinit( void spider_bg_direct_sql_clear( UDF_INIT *initid, - char *is_null, - char *error + unsigned char *is_null, + unsigned char *error ) { spider_direct_sql_bg_start(initid); } @@ -76,8 +76,8 @@ void spider_bg_direct_sql_clear( void spider_bg_direct_sql_add( UDF_INIT *initid, UDF_ARGS *args, - char *is_null, - char *error + unsigned char *is_null, + unsigned char *error ) { spider_direct_sql_body(initid, args, is_null, error, TRUE); } @@ -85,8 +85,8 @@ void spider_bg_direct_sql_add( long long spider_ping_table( UDF_INIT *initid, UDF_ARGS *args, - char *is_null, - char *error + unsigned char *is_null, + unsigned char *error ) { return spider_ping_table_body(initid, args, is_null, error); } @@ -108,8 +108,8 @@ void spider_ping_table_deinit( long long spider_flush_table_mon_cache( UDF_INIT *initid, UDF_ARGS *args, - char *is_null, - char *error + unsigned char *is_null, + unsigned char *error ) { return spider_flush_table_mon_cache_body(); } @@ -130,8 +130,8 @@ void spider_flush_table_mon_cache_deinit( long long spider_copy_tables( UDF_INIT *initid, UDF_ARGS *args, - char *is_null, - char *error + unsigned char *is_null, + unsigned char *error ) { return spider_copy_tables_body(initid, args, is_null, error); } diff --git a/storage/spider/spd_udf.h b/storage/spider/spd_udf.h index bb9f1ce252b..ccd3ae83b7d 100644 --- a/storage/spider/spd_udf.h +++ b/storage/spider/spd_udf.h @@ -16,8 +16,8 @@ long long spider_direct_sql_body( UDF_INIT *initid, UDF_ARGS *args, - char *is_null, - char *error, + unsigned char *is_null, + unsigned char *error, my_bool bg ); @@ -43,8 +43,8 @@ long long spider_direct_sql_bg_end( long long spider_ping_table_body( UDF_INIT *initid, UDF_ARGS *args, - char *is_null, - char *error + unsigned char *is_null, + unsigned char *error ); my_bool spider_ping_table_init_body( @@ -62,8 +62,8 @@ long long spider_flush_table_mon_cache_body(); long long spider_copy_tables_body( UDF_INIT *initid, UDF_ARGS *args, - char *is_null, - char *error + unsigned char *is_null, + unsigned char *error ); my_bool spider_copy_tables_init_body( diff --git a/strings/ctype.c b/strings/ctype.c index a0b51c20b10..81b757310f8 100644 --- a/strings/ctype.c +++ b/strings/ctype.c @@ -846,6 +846,8 @@ my_string_repertoire_8bit(CHARSET_INFO *cs, const char *str, size_t length) const char *strend; if ((cs->state & MY_CS_NONASCII) && length > 0) return MY_REPERTOIRE_UNICODE30; + if (!str) // Avoid UBSAN nullptr-with-offset + return MY_REPERTOIRE_ASCII; for (strend= str + length; str < strend; str++) { if (((uchar) *str) > 0x7F) diff --git a/strings/strcoll.inl b/strings/strcoll.inl index a70009991df..962b1dc8505 100644 --- a/strings/strcoll.inl +++ b/strings/strcoll.inl @@ -252,12 +252,14 @@ MY_FUNCTION_NAME(strnncoll)(CHARSET_INFO *cs __attribute__((unused)), 0 >0 "a" is a prefix of "b", so "a" is smaller. >0 0 "b" is a prefix of "a", check b_is_prefix. >0 >0 Two weights were scanned, check weight difference. + + Note: weights can be zero and positive (never negative). */ if (!a_wlen) - return b_wlen ? -b_weight : 0; + return b_wlen ? -1 : 0; if (!b_wlen) - return b_is_prefix ? 0 : a_weight; + return b_is_prefix ? 0 : +1; if ((res= (a_weight - b_weight))) return res; diff --git a/win/packaging/heidisql.cmake b/win/packaging/heidisql.cmake index f745eeb060b..157e5517594 100644 --- a/win/packaging/heidisql.cmake +++ b/win/packaging/heidisql.cmake @@ -1,6 +1,6 @@ -SET(HEIDISQL_BASE_NAME "HeidiSQL_12.8_32_Portable") +SET(HEIDISQL_BASE_NAME "HeidiSQL_12.10_32_Portable") SET(HEIDISQL_ZIP "${HEIDISQL_BASE_NAME}.zip") -SET(HEIDISQL_URL "http://www.heidisql.com/downloads/releases/${HEIDISQL_ZIP}") +SET(HEIDISQL_URL "https://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})