Bug#35208605: Mysqldump table with virtual column wrong syntax

The fact that some columns aren't printed in the INSERT statements
generated by mysqldump wasn't taken into account when deciding on
printing the commas for the INSERT VALUES list.
Fixed by having a special flag if a column is already printed or not
instead of deciding based on column index.

Test cases added to cover all kinds of virtual columns.

Change-Id: I55484c3a795a4ad18b24c0691b2def9a04306e7a

Author: gkodinov

client/mysqldump.cc

@@ -3902,6 +3902,7 @@ static void dump_table(char *table, char *db) {
     while ((row = mysql_fetch_row(res))) {
       uint i;
       ulong *lengths = mysql_fetch_lengths(res);
+      bool first_column = true;
       rownr++;
       if (!extended_insert && !opt_xml) {
         fputs(insert_pat.str, md_result_file);
@@ -3940,9 +3941,10 @@ static void dump_table(char *table, char *db) {
                 ? 1
                 : 0;
         if (extended_insert && !opt_xml) {
-          if (i == 0)
+          if (first_column) {
             dynstr_set_checked(&extended_row, "(");
-          else
+            first_column = false;
+          } else
             dynstr_append_checked(&extended_row, ",");
 
           if (row[i]) {

mysql-test/r/mysqldump_bugs.result

@@ -202,4 +202,31 @@ CREATE TABLE `wl13292` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE wl13292;
+#
+# Bug#35208605: Mysqldump table with virtual column wrong syntax
+#
+CREATE DATABASE b35208605;
+USE b35208605;
+CREATE TABLE x1 (c0 BLOB AS ('a') VIRTUAL, c1 INT);
+INSERT INTO x1(c1) VALUES (1);
+CREATE TABLE x2 (c1 INT, c0 BLOB AS ('a') VIRTUAL);
+INSERT INTO x2(c1) VALUES (1);
+CREATE TABLE x3 (c0 BLOB AS ('a') VIRTUAL INVISIBLE, c1 INT);
+INSERT INTO x3(c1) VALUES (1);
+CREATE TABLE x4 (c1 INT, c0 BLOB AS ('a') VIRTUAL INVISIBLE);
+INSERT INTO x4(c1) VALUES (1);
+CREATE TABLE x5 (c0 BLOB AS ('a') STORED, c1 INT);
+INSERT INTO x5(c1) VALUES (1);
+CREATE TABLE x6 (c1 INT, c0 BLOB AS ('a') STORED);
+INSERT INTO x6(c1) VALUES (1);
+CREATE TABLE x7 (c0 BLOB AS ('a') STORED INVISIBLE, c1 INT);
+INSERT INTO x7(c1) VALUES (1);
+CREATE TABLE x8 (c1 INT, c0 BLOB AS ('a') STORED INVISIBLE);
+INSERT INTO x8(c1) VALUES (1);
+# Test: all INSERTs must be valid SQL
+DROP TABLE x1,x2,x3,x4,x5,x6,x7,x8;
+# Test: Must apply OK
+DROP TABLE x1,x2,x3,x4,x5,x6,x7,x8;
+USE test;
+DROP DATABASE b35208605;
 # End of 8.0 tests

mysql-test/t/mysqldump_bugs.test

@@ -133,6 +133,40 @@ CREATE TABLE wl13292(a INT PRIMARY KEY);
 
 DROP TABLE wl13292;
 
+--echo #
+--echo # Bug#35208605: Mysqldump table with virtual column wrong syntax
+--echo #
+
+CREATE DATABASE b35208605;
+USE b35208605;
+CREATE TABLE x1 (c0 BLOB AS ('a') VIRTUAL, c1 INT);
+INSERT INTO x1(c1) VALUES (1);
+CREATE TABLE x2 (c1 INT, c0 BLOB AS ('a') VIRTUAL);
+INSERT INTO x2(c1) VALUES (1);
+CREATE TABLE x3 (c0 BLOB AS ('a') VIRTUAL INVISIBLE, c1 INT);
+INSERT INTO x3(c1) VALUES (1);
+CREATE TABLE x4 (c1 INT, c0 BLOB AS ('a') VIRTUAL INVISIBLE);
+INSERT INTO x4(c1) VALUES (1);
+CREATE TABLE x5 (c0 BLOB AS ('a') STORED, c1 INT);
+INSERT INTO x5(c1) VALUES (1);
+CREATE TABLE x6 (c1 INT, c0 BLOB AS ('a') STORED);
+INSERT INTO x6(c1) VALUES (1);
+CREATE TABLE x7 (c0 BLOB AS ('a') STORED INVISIBLE, c1 INT);
+INSERT INTO x7(c1) VALUES (1);
+CREATE TABLE x8 (c1 INT, c0 BLOB AS ('a') STORED INVISIBLE);
+INSERT INTO x8(c1) VALUES (1);
+
+--echo # Test: all INSERTs must be valid SQL
+--exec $MYSQL_DUMP --skip-comments --compact --result-file=$MYSQLTEST_VARDIR/tmp/b35208605.sql b35208605 2>&1
+DROP TABLE x1,x2,x3,x4,x5,x6,x7,x8;
+--echo # Test: Must apply OK
+--exec $MYSQL b35208605 < $MYSQLTEST_VARDIR/tmp/b35208605.sql 2>&1
+
+DROP TABLE x1,x2,x3,x4,x5,x6,x7,x8;
+USE test;
+DROP DATABASE b35208605;
+remove_file $MYSQLTEST_VARDIR/tmp/b35208605.sql;
+
 
 --echo # End of 8.0 tests