From 2a5f8d940c941131ea25c37d136b5f3516c91ae5 Mon Sep 17 00:00:00 2001 From: Daniel Bartholomew Date: Tue, 11 May 2021 14:50:25 -0400 Subject: [PATCH 1/4] bump the VERSION --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 498eca0a..4fa25281 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,7 +36,7 @@ SET(CC_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) SET(CPACK_PACKAGE_VERSION_MAJOR 3) SET(CPACK_PACKAGE_VERSION_MINOR 1) -SET(CPACK_PACKAGE_VERSION_PATCH 13) +SET(CPACK_PACKAGE_VERSION_PATCH 14) SET(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") MATH(EXPR MARIADB_PACKAGE_VERSION_ID "${CPACK_PACKAGE_VERSION_MAJOR} * 10000 + ${CPACK_PACKAGE_VERSION_MINOR} * 100 + From c59637757fcda7cbc1410d327cdb1999d760864a Mon Sep 17 00:00:00 2001 From: Georg Richter Date: Tue, 8 Jun 2021 17:52:42 +0200 Subject: [PATCH 2/4] travis fix --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2753ddc4..a4e2a142 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ matrix: - env: DB=mariadb:10.4 - env: DB=mariadb:10.5 - env: DB=mariadb:10.5 MAXSCALE_VERSION=2.5.3 MAXSCALE_TEST_DISABLE=true - - env: DB=build:10.6 + - env: DB=mariadb:10.6 - env: SERVER_BRANCH=10.2 - env: SERVER_BRANCH=10.2 TEST_OPTION=--ps-protocol - env: SERVER_BRANCH=10.3 From aca697e5a1a32c95074a190eeebe43bbd8409eff Mon Sep 17 00:00:00 2001 From: Georg Richter Date: Wed, 9 Jun 2021 07:29:56 +0200 Subject: [PATCH 3/4] Travis test fixes Since 10.6 server returns utf8mb3 for character set (and it will change to utf8mb4), so we use strncmp to check the character set returned by server. --- unittest/libmariadb/basic-t.c | 2 +- unittest/libmariadb/charset.c | 6 +++--- unittest/libmariadb/connection.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/unittest/libmariadb/basic-t.c b/unittest/libmariadb/basic-t.c index c22e6c2b..87bff9a9 100644 --- a/unittest/libmariadb/basic-t.c +++ b/unittest/libmariadb/basic-t.c @@ -310,7 +310,7 @@ static int use_utf8(MYSQL *my) while ((row= mysql_fetch_row(res)) != NULL) { - FAIL_IF(strcmp(row[0], "utf8"), "wrong character set"); + FAIL_IF(strncmp(row[0], "utf8", 4), "wrong character set"); } FAIL_IF(mysql_errno(my), mysql_error(my)); mysql_free_result(res); diff --git a/unittest/libmariadb/charset.c b/unittest/libmariadb/charset.c index 898b6dad..e998f796 100644 --- a/unittest/libmariadb/charset.c +++ b/unittest/libmariadb/charset.c @@ -569,9 +569,9 @@ static int test_bug30472(MYSQL *mysql) 2) new character set is different from the original one. */ - FAIL_UNLESS(strcmp(character_set_name_2, "utf8") == 0, "cs_name != utf8"); - FAIL_UNLESS(strcmp(character_set_client_2, "utf8") == 0, "cs_client != utf8"); - FAIL_UNLESS(strcmp(character_set_results_2, "utf8") == 0, "cs_result != ut8"); + FAIL_UNLESS(strncmp(character_set_name_2, "utf8", 4) == 0, "cs_name != utf8"); + FAIL_UNLESS(strncmp(character_set_client_2, "utf8", 4) == 0, "cs_client != utf8"); + FAIL_UNLESS(strncmp(character_set_results_2, "utf8", 4) == 0, "cs_result != ut8"); FAIL_UNLESS(strcmp(collation_connnection_2, "utf8_general_ci") == 0, "collation != utf8_general_ci"); diag("%s %s", character_set_name_1, character_set_name_2); diff --git a/unittest/libmariadb/connection.c b/unittest/libmariadb/connection.c index 0da10cbe..b0381baf 100644 --- a/unittest/libmariadb/connection.c +++ b/unittest/libmariadb/connection.c @@ -981,7 +981,7 @@ static int test_sess_track_db(MYSQL *mysql) printf("# SESSION_TRACK_VARIABLES: %*.*s\n", (int)len, (int)len, data); } while (!mysql_session_track_get_next(mysql, SESSION_TRACK_SYSTEM_VARIABLES, &data, &len)); diag("charset: %s", mysql->charset->csname); - FAIL_IF(strcmp(mysql->charset->csname, "utf8"), "Expected charset 'utf8'"); + FAIL_IF(strncmp(mysql->charset->csname, "utf8", 4), "Expected charset 'utf8'"); rc= mysql_query(mysql, "SET NAMES latin1"); check_mysql_rc(rc, mysql); From 2fce72ba34e44db97b080f852db96076bd81aba4 Mon Sep 17 00:00:00 2001 From: Georg Richter Date: Thu, 10 Jun 2021 17:21:51 +0200 Subject: [PATCH 4/4] Updated mysqld_error.h --- include/mysqld_error.h | 143 ++++++++++++++++++++++++++++++++++------- 1 file changed, 121 insertions(+), 22 deletions(-) diff --git a/include/mysqld_error.h b/include/mysqld_error.h index 6a42ffcf..04ec2da3 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -1,8 +1,6 @@ -/* Autogenerated file, please don't edit - branch: 10.2 - revision id: 01a4eb8f761eb669fe2ae5139c73a7434b141a8f - */ +/* Autogenerated file, please don't edit */ +#ifndef ER_ERROR_FIRST #define ER_ERROR_FIRST 1000 #define ER_HASHCHK 1000 #define ER_NISAMCHK 1001 @@ -80,7 +78,7 @@ #define ER_BLOB_USED_AS_KEY 1073 #define ER_TOO_BIG_FIELDLENGTH 1074 #define ER_WRONG_AUTO_KEY 1075 -#define ER_UNUSED_9 1076 +#define ER_BINLOG_CANT_DELETE_GTID_DOMAIN 1076 #define ER_NORMAL_SHUTDOWN 1077 #define ER_GOT_SIGNAL 1078 #define ER_SHUTDOWN_COMPLETE 1079 @@ -105,7 +103,7 @@ #define ER_NO_UNIQUE_LOGFILE 1098 #define ER_TABLE_NOT_LOCKED_FOR_WRITE 1099 #define ER_TABLE_NOT_LOCKED 1100 -#define ER_BLOB_CANT_HAVE_DEFAULT 1101 +#define ER_UNUSED_17 1101 #define ER_WRONG_DB_NAME 1102 #define ER_WRONG_TABLE_NAME 1103 #define ER_TOO_BIG_SELECT 1104 @@ -491,7 +489,7 @@ #define ER_PARTITION_WRONG_NO_PART_ERROR 1484 #define ER_PARTITION_WRONG_NO_SUBPART_ERROR 1485 #define ER_WRONG_EXPR_IN_PARTITION_FUNC_ERROR 1486 -#define ER_NO_CONST_EXPR_IN_RANGE_OR_LIST_ERROR 1487 +#define ER_NOT_CONSTANT_EXPRESSION 1487 #define ER_FIELD_NOT_FOUND_PART_ERROR 1488 #define ER_LIST_OF_FIELDS_ONLY_IN_HASH_ERROR 1489 #define ER_INCONSISTENT_PARTITION_INFO_ERROR 1490 @@ -510,7 +508,7 @@ #define ER_UNIQUE_KEY_NEED_ALL_FIELDS_IN_PF 1503 #define ER_NO_PARTS_ERROR 1504 #define ER_PARTITION_MGMT_ON_NONPARTITIONED 1505 -#define ER_FOREIGN_KEY_ON_PARTITIONED 1506 +#define ER_FEATURE_NOT_SUPPORTED_WITH_PARTITIONING 1506 #define ER_DROP_PARTITION_NON_EXISTENT 1507 #define ER_DROP_LAST_PARTITION 1508 #define ER_COALESCE_ONLY_ON_HASH_PARTITION 1509 @@ -811,7 +809,7 @@ #define ER_MTS_RESET_WORKERS 1804 #define ER_COL_COUNT_DOESNT_MATCH_CORRUPTED_V2 1805 #define ER_SLAVE_SILENT_RETRY_TRANSACTION 1806 -#define ER_DISCARD_FK_CHECKS_RUNNING 1807 +#define ER_UNUSED_22 1807 #define ER_TABLE_SCHEMA_MISMATCH 1808 #define ER_TABLE_IN_SYSTEM_TABLESPACE 1809 #define ER_IO_READ_ERROR 1810 @@ -962,7 +960,7 @@ #define ER_STATEMENT_TIMEOUT 1969 #define ER_SUBQUERIES_NOT_SUPPORTED 1970 #define ER_SET_STATEMENT_NOT_SUPPORTED 1971 -#define ER_UNUSED_17 1972 +#define ER_UNUSED_9 1972 #define ER_USER_CREATE_EXISTS 1973 #define ER_USER_DROP_EXISTS 1974 #define ER_ROLE_CREATE_EXISTS 1975 @@ -972,7 +970,8 @@ #define ER_KILL_QUERY_DENIED_ERROR 1979 #define ER_NO_EIS_FOR_FIELD 1980 #define ER_WARN_AGGFUNC_DEPENDENCE 1981 -#define ER_ERROR_LAST_SECTION_2 1981 +#define WARN_INNODB_PARTITION_OPTION_IGNORED 1982 +#define ER_ERROR_LAST_SECTION_2 1982 /* New section */ @@ -1113,14 +1112,114 @@ #define ER_ISOLATION_LEVEL_WITH_CONSISTENT_SNAPSHOT 4062 #define ER_UNSUPPORTED_COLLATION 4063 #define ER_METADATA_INCONSISTENCY 4064 -#define ER_KEY_CREATE_DURING_ALTER 4065 -#define ER_SK_POPULATE_DURING_ALTER 4066 -#define ER_CF_DIFFERENT 4067 -#define ER_RDB_STATUS_GENERAL 4068 -#define ER_RDB_STATUS_MSG 4069 -#define ER_NET_OK_PACKET_TOO_LARGE 4070 -#define ER_RDB_TTL_UNSUPPORTED 4071 -#define ER_RDB_TTL_COL_FORMAT 4072 -#define ER_RDB_TTL_DURATION_FORMAT 4073 -#define ER_PER_INDEX_CF_DEPRECATED 4074 -#define ER_ERROR_LAST 4074 +#define ER_CF_DIFFERENT 4065 +#define ER_RDB_TTL_DURATION_FORMAT 4066 +#define ER_RDB_STATUS_GENERAL 4067 +#define ER_RDB_STATUS_MSG 4068 +#define ER_RDB_TTL_UNSUPPORTED 4069 +#define ER_RDB_TTL_COL_FORMAT 4070 +#define ER_PER_INDEX_CF_DEPRECATED 4071 +#define ER_KEY_CREATE_DURING_ALTER 4072 +#define ER_SK_POPULATE_DURING_ALTER 4073 +#define ER_SUM_FUNC_WITH_WINDOW_FUNC_AS_ARG 4074 +#define ER_NET_OK_PACKET_TOO_LARGE 4075 +#define ER_GEOJSON_EMPTY_COORDINATES 4076 +#define ER_MYROCKS_CANT_NOPAD_COLLATION 4077 +#define ER_ILLEGAL_PARAMETER_DATA_TYPES2_FOR_OPERATION 4078 +#define ER_ILLEGAL_PARAMETER_DATA_TYPE_FOR_OPERATION 4079 +#define ER_WRONG_PARAMCOUNT_TO_CURSOR 4080 +#define ER_UNKNOWN_STRUCTURED_VARIABLE 4081 +#define ER_ROW_VARIABLE_DOES_NOT_HAVE_FIELD 4082 +#define ER_END_IDENTIFIER_DOES_NOT_MATCH 4083 +#define ER_SEQUENCE_RUN_OUT 4084 +#define ER_SEQUENCE_INVALID_DATA 4085 +#define ER_SEQUENCE_INVALID_TABLE_STRUCTURE 4086 +#define ER_SEQUENCE_ACCESS_ERROR 4087 +#define ER_SEQUENCE_BINLOG_FORMAT 4088 +#define ER_NOT_SEQUENCE 4089 +#define ER_NOT_SEQUENCE2 4090 +#define ER_UNKNOWN_SEQUENCES 4091 +#define ER_UNKNOWN_VIEW 4092 +#define ER_WRONG_INSERT_INTO_SEQUENCE 4093 +#define ER_SP_STACK_TRACE 4094 +#define ER_PACKAGE_ROUTINE_IN_SPEC_NOT_DEFINED_IN_BODY 4095 +#define ER_PACKAGE_ROUTINE_FORWARD_DECLARATION_NOT_DEFINED 4096 +#define ER_COMPRESSED_COLUMN_USED_AS_KEY 4097 +#define ER_UNKNOWN_COMPRESSION_METHOD 4098 +#define ER_WRONG_NUMBER_OF_VALUES_IN_TVC 4099 +#define ER_FIELD_REFERENCE_IN_TVC 4100 +#define ER_WRONG_TYPE_FOR_PERCENTILE_FUNC 4101 +#define ER_ARGUMENT_NOT_CONSTANT 4102 +#define ER_ARGUMENT_OUT_OF_RANGE 4103 +#define ER_WRONG_TYPE_OF_ARGUMENT 4104 +#define ER_NOT_AGGREGATE_FUNCTION 4105 +#define ER_INVALID_AGGREGATE_FUNCTION 4106 +#define ER_INVALID_VALUE_TO_LIMIT 4107 +#define ER_INVISIBLE_NOT_NULL_WITHOUT_DEFAULT 4108 +#define ER_UPDATE_INFO_WITH_SYSTEM_VERSIONING 4109 +#define ER_VERS_FIELD_WRONG_TYPE 4110 +#define ER_VERS_ENGINE_UNSUPPORTED 4111 +#define ER_UNUSED_23 4112 +#define ER_PARTITION_WRONG_TYPE 4113 +#define WARN_VERS_PART_FULL 4114 +#define WARN_VERS_PARAMETERS 4115 +#define ER_VERS_DROP_PARTITION_INTERVAL 4116 +#define ER_UNUSED_25 4117 +#define WARN_VERS_PART_NON_HISTORICAL 4118 +#define ER_VERS_ALTER_NOT_ALLOWED 4119 +#define ER_VERS_ALTER_ENGINE_PROHIBITED 4120 +#define ER_VERS_RANGE_PROHIBITED 4121 +#define ER_CONFLICTING_FOR_SYSTEM_TIME 4122 +#define ER_VERS_TABLE_MUST_HAVE_COLUMNS 4123 +#define ER_VERS_NOT_VERSIONED 4124 +#define ER_MISSING 4125 +#define ER_VERS_PERIOD_COLUMNS 4126 +#define ER_PART_WRONG_VALUE 4127 +#define ER_VERS_WRONG_PARTS 4128 +#define ER_VERS_NO_TRX_ID 4129 +#define ER_VERS_ALTER_SYSTEM_FIELD 4130 +#define ER_DROP_VERSIONING_SYSTEM_TIME_PARTITION 4131 +#define ER_VERS_DB_NOT_SUPPORTED 4132 +#define ER_VERS_TRT_IS_DISABLED 4133 +#define ER_VERS_DUPLICATE_ROW_START_END 4134 +#define ER_VERS_ALREADY_VERSIONED 4135 +#define ER_UNUSED_24 4136 +#define ER_VERS_NOT_SUPPORTED 4137 +#define ER_VERS_TRX_PART_HISTORIC_ROW_NOT_SUPPORTED 4138 +#define ER_INDEX_FILE_FULL 4139 +#define ER_UPDATED_COLUMN_ONLY_ONCE 4140 +#define ER_EMPTY_ROW_IN_TVC 4141 +#define ER_VERS_QUERY_IN_PARTITION 4142 +#define ER_KEY_DOESNT_SUPPORT 4143 +#define ER_ALTER_OPERATION_TABLE_OPTIONS_NEED_REBUILD 4144 +#define ER_BACKUP_LOCK_IS_ACTIVE 4145 +#define ER_BACKUP_NOT_RUNNING 4146 +#define ER_BACKUP_WRONG_STAGE 4147 +#define ER_BACKUP_STAGE_FAILED 4148 +#define ER_BACKUP_UNKNOWN_STAGE 4149 +#define ER_USER_IS_BLOCKED 4150 +#define ER_ACCOUNT_HAS_BEEN_LOCKED 4151 +#define ER_PERIOD_TEMPORARY_NOT_ALLOWED 4152 +#define ER_PERIOD_TYPES_MISMATCH 4153 +#define ER_MORE_THAN_ONE_PERIOD 4154 +#define ER_PERIOD_FIELD_WRONG_ATTRIBUTES 4155 +#define ER_PERIOD_NOT_FOUND 4156 +#define ER_PERIOD_COLUMNS_UPDATED 4157 +#define ER_PERIOD_CONSTRAINT_DROP 4158 +#define ER_TOO_LONG_KEYPART 4159 +#define ER_TOO_LONG_DATABASE_COMMENT 4160 +#define ER_UNKNOWN_DATA_TYPE 4161 +#define ER_UNKNOWN_OPERATOR 4162 +#define ER_WARN_HISTORY_ROW_START_TIME 4163 +#define ER_PART_STARTS_BEYOND_INTERVAL 4164 +#define ER_GALERA_REPLICATION_NOT_SUPPORTED 4165 +#define ER_LOAD_INFILE_CAPABILITY_DISABLED 4166 +#define ER_NO_SECURE_TRANSPORTS_CONFIGURED 4167 +#define ER_SLAVE_IGNORED_SHARED_TABLE 4168 +#define ER_NO_AUTOINCREMENT_WITH_UNIQUE 4169 +#define ER_KEY_CONTAINS_PERIOD_FIELDS 4170 +#define ER_KEY_CANT_HAVE_WITHOUT_OVERLAPS 4171 +#define ER_NOT_ALLOWED_IN_THIS_CONTEXT 4172 +#define ER_DATA_WAS_COMMITED_UNDER_ROLLBACK 4173 +#define ER_ERROR_LAST 4173 +#endif /* ER_ERROR_FIRST */