Motivation and Context

Failing test:

---------
1) db_table_adminTest: Get_current_table
 Test  tests/unit/db_table_adminTest.php:testGet_current_table
Failed asserting that two arrays are identical.
- Expected | + Actual
@@ @@
e107_name varchar(100) NOT NULL DEFAULT '',\n
e107_value text NOT NULL,\n
PRIMARY KEY (e107_name)\n
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;'
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;'
1 => 'e107_core'
2 => 'e107_name varchar(100) NOT NULL DEFAULT '',\n
e107_value text NOT NULL,\n
PRIMARY KEY (e107_name)'
-        3 => 'MyISAM DEFAULT CHARSET=utf8'
+        3 => 'MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci'
)
)
#1  /__w/e107/e107/e107_tests/tests/unit/db_table_adminTest.php:355
#2  /__w/e107/e107/e107_tests/vendor/bin/codecept:120

Description

https://jira.mariadb.org/browse/MDEV-29446 changes the output of SHOW CREATE TABLE, which MySQL and MariaDB 10.2 and older do not do.

To tolerate the new behavior, this change strips the COLLATE clause from the SHOW CREATE TABLE output to ignore it.

Fixes: #4912

How Has This Been Tested?

Test modified

Types of Changes

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Performance enhancement (non-breaking change which improves efficiency)
• Code cleanup (non-breaking change which makes code smaller or more readable)
• Breaking change (fix or feature that would cause existing functionality to change)
• Documentation (a change to man pages or other documentation)

Checklist

• My code adheres to the e107 code style standard.
• I have read the contributing document.
• I have added tests to cover my changes.
• All new and existing tests pass.