Branch: refs/heads/QA_4_8 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 31b40f71bb71b36d80ea153b5b011530c93ffc07 https://github.com/phpmyadmin/phpmyadmin/commit/31b40f71bb71b36d80ea153b5b0… Author: Vincent Milum Jr <git(a)darkain.com> Date: 2019-02-15 (Fri, 02 February 2019) -02:00 Changed paths: M libraries/classes/DatabaseInterface.php M libraries/classes/Dbi/DbiMysqli.php M libraries/classes/InsertEdit.php M libraries/classes/Navigation/Nodes/NodeDatabase.php M libraries/classes/Rte/Triggers.php M libraries/classes/Sql.php M libraries/classes/Util.php M libraries/dbi/dbi_dummy.inc.php Log Message: ----------- Fix for SYSTEM VERSIONED tables #14514, #14515, and #14516 (#14536) Fixes #14514 Fixes #14515 Possible fix for #14516 #14514 Tables which enable the new MariaDB 10.3 versioning show up as "SYSTEM VERSIONED" instead of "BASE TABLE" inside of information schema. This patch now checks for both, so these new table types don't incorrectly display as views. #14515 MariaDB 10.3 also supports INVISIBLE columns, which is optionally paired with SYSTEM VERSIONED tabled (or implemented separately). This patch helps handle this new column attribute. #14516 This patch cannot be fully tested and verified with current MariaDB builds. Version 10.3.9 (currently unreleased) corrects an issue with column information for SYSTEM VERSIONED columns that this patch relies on. https://jira.mariadb.org/browse/MDEV-16804 - the reason for checking with preg_match instead of adding to the list is because there are now combined "extra" information for columns, such as INVISIBLE columns. Just matching entire strings also has a bug with these other "extra" parameters. Signed-off-by: Vincent Milum Jr <git(a)darkain.com> Signed-off-by: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> (cherry picked from commit 3f6e360a4ed89b3c0cff649b626f646d49401567) Signed-off-by: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com>