Skip to content

Commit 9133b54

Browse files
paranoiqparanoiq
committed
Some 8.0.33/34 fixes
1 parent 843677c commit 9133b54

File tree

8 files changed

+52
-14
lines changed

8 files changed

+52
-14
lines changed

‎sources/Platform/Features/MysqlFeatures.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2382,6 +2382,7 @@ class MysqlFeatures extends FeaturesList
23822382
[MysqlVariable::NDB_LOG_ORIG, self::MIN, self::MAX],
23832383
[MysqlVariable::NDB_LOG_TRANSACTION_COMPRESSION, 80031, self::MAX],
23842384
[MysqlVariable::NDB_LOG_TRANSACTION_COMPRESSION_LEVEL_ZSTD, 80031, self::MAX],
2385+
[MysqlVariable::NDB_LOG_TRANSACTION_DEPENDENCY, 80033, self::MAX],
23852386
[MysqlVariable::NDB_LOG_TRANSACTION_ID, self::MIN, self::MAX],
23862387
[MysqlVariable::NDB_LOG_UPDATE_AS_WRITE, self::MIN, self::MAX],
23872388
[MysqlVariable::NDB_LOG_UPDATE_MINIMAL, 50636, 50699],
@@ -2712,7 +2713,7 @@ class MysqlFeatures extends FeaturesList
27122713

27132714
/** @var array<EntityType::*, int> */
27142715
public array $maxLengths = [
2715-
EntityType::GENERAL => 64, // default
2716+
EntityType::GENERAL => 65535, // limit unknown, but bigger than 64
27162717
EntityType::SCHEMA => 64,
27172718
EntityType::TABLE => 64,
27182719
EntityType::VIEW => 64,

‎sources/Sql/Ddl/Table/Option/StorageEngine.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ public function __construct(string $value)
4848
public const NDBCLUSTER = 'ndbcluster';
4949
public const NDBINFO = 'ndbinfo';
5050

51+
// HeatWave (secondary engine)
52+
public const RAPID = 'rapid';
53+
5154
// Percona
5255
public const TOKUDB = 'TokuDB';
5356
public const XTRADB = 'XtraDB';
@@ -80,7 +83,7 @@ public function __construct(string $value)
8083
'aria' => self::ARIA,
8184
'berkeleydb' => self::BERKELEYDB,
8285
'blackhole' => self::BLACKHOLE,
83-
'columnstrore' => self::COLUMN_STORE,
86+
'columnstore' => self::COLUMN_STORE,
8487
'csv' => self::CSV,
8588
'falcon' => self::FALCON,
8689
'federated' => self::FEDERATED,

‎sources/Sql/MysqlVariable.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -733,6 +733,7 @@ class MysqlVariable extends SqlEnum
733733
public const NDB_LOG_TRANSACTION_ID = 'ndb_log_transaction_id';
734734
public const NDB_LOG_TRANSACTION_COMPRESSION = 'ndb_log_transaction_compression';
735735
public const NDB_LOG_TRANSACTION_COMPRESSION_LEVEL_ZSTD = 'ndb_log_transaction_compression_level_zstd';
736+
public const NDB_LOG_TRANSACTION_DEPENDENCY = 'ndb_log_transaction_dependency';
736737
public const NDB_LOG_UPDATE_AS_WRITE = 'ndb_log_update_as_write';
737738
public const NDB_LOG_UPDATE_MINIMAL = 'ndb_log_update_minimal';
738739
public const NDB_LOG_UPDATED_ONLY = 'ndb_log_updated_only';

‎tests/Mysql/Data/IgnoredErrors.php‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ trait IgnoredErrors
3535
'ER_TRUNCATED_WRONG_VALUE', // e.g. adding column without default value
3636
'ER_TRUNCATED_WRONG_VALUE_FOR_FIELD',
3737
'ER_TOO_MANY_KEY_PARTS', // to do: detect multi-column index when not explicitly spatial
38+
'ER_BAD_FIELD_ERROR',
3839
];
3940

4041
/** @var list<string> */
@@ -114,7 +115,6 @@ trait IgnoredErrors
114115
'ER_CANT_CREATE_TABLE',
115116
// columns
116117
'ER_DUP_FIELDNAME',
117-
'ER_BAD_FIELD_ERROR',
118118
'ER_CANT_REMOVE_ALL_FIELDS',
119119
'ER_DEPENDENT_BY_GENERATED_COLUMN',
120120
'ER_UNSUPPORTED_ACTION_ON_GENERATED_COLUMN',
@@ -262,6 +262,7 @@ trait IgnoredErrors
262262
'ER_TRG_IN_WRONG_SCHEMA',
263263
// locking
264264
'ER_WRONG_LOCK_OF_SYSTEM_TABLE',
265+
'ER_USER_LOCK_OVERLONG_NAME',
265266
// routines
266267
'ER_UDF_EXISTS',
267268
'ER_SP_DOES_NOT_EXIST',
@@ -540,6 +541,7 @@ trait IgnoredErrors
540541
'ER_VIEW_CHECK_FAILED',
541542
'ER_UNABLE_TO_COLLECT_LOG_STATUS',
542543
'ER_ADMIN_WRONG_MRG_TABLE',
544+
'ER_SECONDARY_ENGINE',
543545
'ER_SECONDARY_ENGINE_DDL',
544546
'ER_CRASHED_ON_USAGE',
545547
'ER_AUTOINC_READ_FAILED',
@@ -783,6 +785,24 @@ trait IgnoredErrors
783785
'ER_SLAVE_CHANNEL_SQL_SKIP_COUNTER',
784786
'ER_BINLOG_FATAL_ERROR',
785787
'ER_TEMP_TABLE_PREVENTS_SWITCH_SESSION_BINLOG_FORMAT',
788+
'ER_REPLICA_CONFIGURATION',
789+
'ER_CONNECTION_METADATA',
790+
'ER_BAD_REPLICA',
791+
'ER_REPLICA_CHANNEL_DOES_NOT_EXIST',
792+
'ER_REPLICA_CHANNEL_SQL_SKIP_COUNTER',
793+
'ER_REPLICA_SQL_THREAD_MUST_STOP',
794+
'ER_REPLICA_AM_INIT_REPOSITORY',
795+
'ER_REPLICA_CHANNEL_MUST_STOP',
796+
'ER_REPLICA_CHANNEL_OPERATION_NOT_ALLOWED',
797+
'ER_BAD_REPLICA_AUTO_POSITION',
798+
'ER_REPLICA_IGNORE_SERVER_IDS',
799+
'ER_REPLICA_MAX_CHANNELS_EXCEEDED',
800+
'ER_REPLICA_MULTIPLE_CHANNELS_CMD',
801+
'ER_REPLICA_CHANNEL_SQL_THREAD_MUST_STOP',
802+
'ER_REPLICA_CHANNEL_IO_THREAD_MUST_STOP',
803+
'ER_CANT_RESET_SOURCE',
804+
'ER_RESET_SOURCE_TO_VALUE_OUT_OF_RANGE',
805+
'ER_CANNOT_PURGE_BINLOG_WITH_BACKUP_LOCK',
786806
'3',
787807
// group replication
788808
'ER_GROUP_REPLICATION_CONFIGURATION',
@@ -889,6 +909,7 @@ trait IgnoredErrors
889909
'ER_NOT_VALID_PASSWORD',
890910
'ER_PASSWORD_NO_MATCH',
891911
'ER_READ_ONLY_MODE',
912+
'ER_CANT_CHANGE_SYS_VAR_IN_READ_ONLY_MODE',
892913
'ER_UNKNOWN_AUTHID',
893914
'ER_RENAME_ROLE',
894915
'ER_ROLE_NOT_GRANTED',
@@ -910,6 +931,7 @@ trait IgnoredErrors
910931
'ER_CANNOT_GRANT_SYSTEM_PRIV_TO_MANDATORY_ROLE',
911932
'ER_CMD_NEED_SUPER',
912933
'ER_MISSING_CURRENT_PASSWORD',
934+
'ER_VALIDATE_PASSWORD_INSUFFICIENT_CHANGED_CHARACTERS',
913935
];
914936

915937
}

‎tests/Mysql/Data/KnownFailures.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1134,6 +1134,16 @@ trait KnownFailures
11341134
"SET PERSIST test_component.str_sys_var = 'test';" => Valid::YES,
11351135
"RESET PERSIST test_component.bool_sys_var;" => Valid::YES,
11361136
"SET PERSIST_ONLY test_component.bool_sys_var = 12;" => Valid::YES,
1137+
"RESET PERSIST test_component.bool_ro_sys_var;" => Valid::YES,
1138+
"SET PERSIST test_component.bool_ro_sys_var = OFF;" => Valid::YES,
1139+
"SET PERSIST test_component.bool_sys_var = OFF;" => Valid::YES,
1140+
"SELECT @@test_component.str_sys_var_default;" => Valid::YES,
1141+
"SET GLOBAL test_component.str_sys_var_default=something;" => Valid::YES,
1142+
"SET GLOBAL test_component.str_sys_var_default=\"dictionary.txt\";",
1143+
"SET GLOBAL test_server_telemetry_traces.callsite_context_keys=';source_file;source_line;;';" => Valid::YES,
1144+
1145+
"SET GLOBAL test_server_telemetry_traces.application_context_keys='client_id;root_id;parent_id;id';" => Valid::YES,
1146+
"SET GLOBAL test_server_telemetry_traces.trace_key='activate';" => Valid::YES,
11371147
];
11381148

11391149
}

‎tests/Mysql/MysqlTest.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
use RecursiveIteratorIterator;
99
use SplFileInfo;
1010
use SqlFtw\Formatter\Formatter;
11-
use SqlFtw\Platform\ClientSideExtension;
1211
use SqlFtw\Platform\Platform;
1312
use SqlFtw\Session\Session;
1413
use SqlFtw\Tests\Mysql\Data\TestSkips;

‎tests/Mysql/MysqlTestFilter.php‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,16 @@ class MysqlTestFilter
3030
{
3131

3232
public const MYSQL_TEST_SUITE_COMMANDS = [
33-
'append_file', 'assert', 'break', 'cat_file', 'change_user', 'character_set', 'chdir', 'chmod', 'close OUT', 'closehandle',
33+
'append_file', 'assert', 'break', 'cat_file', 'change_user', 'character_set', 'chdir', 'chmod', 'close OUT', 'close\\(', 'closehandle',
3434
'connect', 'CONNECT', 'copy_file', 'dec', 'DEC', 'die', 'diff_files', 'dirty_close', 'disable_abort_on_error',
3535
'disable_async_client', 'disable_connect_log', 'disable_info', 'disable_metadata', 'disable_parsing',
3636
'disable_ps_protocol', 'disable_query_log', 'disable_reconnect', 'disable_result_log', 'disable_session_track_info',
3737
'disable_testcase', 'disable_warnings', 'disconnect', 'DISCONNECT', 'echo', 'ECHO', 'enable_abort_on_error', 'enable_async_client',
3838
'enable_connect_log', 'enable_info', 'enable_metadata', 'enable_parsing', 'enable_ps_protocol', 'enable_query_log',
3939
'enable_reconnect', 'enable_result_log', 'enable_session_track_info', 'enable_testcase', 'enable_warnings',
4040
'END_OF_PROCEDURE', 'eof', 'EOF', 'ERROR_LOG', 'eval', 'EVAL', 'exec', 'exec_in_background', 'EXECUTE_STEP', 'exit', 'expecterror',
41-
'expr', 'file_exists', 'force', 'horizontal_results', 'ibdata2', 'inc', 'INC', 'let', 'LET', 'list_files',
42-
'lowercase_result', 'mkdir', 'move_file', 'my', 'mysqlx', /*'open',*/ 'open OUT', 'output', 'partially_sorted_result', 'perl',
41+
'expr', 'file_exists', 'for my', 'force', 'horizontal_results', 'ibdata2', 'inc', 'INC', 'let', 'LET', 'list_files',
42+
'lowercase_result', 'mkdir', 'move_file', 'my', 'mysqlx', /*'open',*/ 'open OUT', 'open\\(', 'output', 'partially_sorted_result', 'perl',
4343
'print', 'PROCEDURE', 'query', 'query_attributes', 'read', 'real_sleep', 'reap', 'REAP', 'REAp', 'recvresult', 'remove_file',
4444
'remove_files_wildcard', 'replace_column', 'replace_numeric_round', 'replace_regex', 'replace_result',
4545
'reset_connection', 'result_format', 'rmdir', 'save_master_pos', 'SCRIPT', 'secret', 'send_eval', 'send_quit',
@@ -48,6 +48,8 @@ class MysqlTestFilter
4848
'wait_for_slave_to_stop', 'write_file',
4949
// some params
5050
'create-schema', '-uroot', '--password', 'silent', 'concurrency', 'iterations', '--commit=1',
51+
// labels
52+
'END_OF_PERL',
5153
];
5254

5355
private string $commands;

‎tests/debugger.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@
3232
FormattersDogma::register();
3333

3434
Dumper::$hiddenFields[] = 'sql';
35-
Dumper::$hiddenFields[] = 'maxLengths';
3635
Dumper::$doNotTraverse[] = Parser::class;
37-
Dumper::$doNotTraverse[] = Assert::class . '::validCommands';
38-
Dumper::$doNotTraverse[] = InvalidTokenException::class . '::tokens';
39-
Dumper::$doNotTraverse[] = Platform::class . '::nonReserved';
40-
Dumper::$doNotTraverse[] = Platform::class . '::operators';
41-
Dumper::$doNotTraverse[] = Platform::class . '::preparableCommands';
42-
Dumper::$doNotTraverse[] = Platform::class . '::reserved';
36+
Dumper::$doNotTraverse[] = Assert::class . '::$validCommands';
37+
Dumper::$doNotTraverse[] = InvalidTokenException::class . '::$tokens';
38+
Dumper::$doNotTraverse[] = Platform::class . '::$nonReserved';
39+
Dumper::$doNotTraverse[] = Platform::class . '::$operators';
40+
Dumper::$doNotTraverse[] = Platform::class . '::$preparableCommands';
41+
Dumper::$doNotTraverse[] = Platform::class . '::$reserved';
42+
Dumper::$doNotTraverse[] = TokenList::class . '::$maxLengths';
4343
Dumper::$namespaceReplacements['~SqlFtw\\\\Parser\\\\(.*)~'] = '..\1';
4444
Dumper::$namespaceReplacements['~SqlFtw\\\\Formatter\\\\(.*)~'] = '..\1';
4545
Dumper::$namespaceReplacements['~SqlFtw\\\\Sql\\\\(.*)~'] = '..\1';

0 commit comments

Comments
 (0)