Commit 9b2e0127 authored by unknown's avatar unknown
Browse files

Fix for bug #25993: mysqldump crashes with merge table and -c option 

  
opt_complete_insert was improperly used by accident.
Use complete_insert flag instead.


client/mysqldump.c:
  Fix for bug #25993: mysqldump crashes with merge table and -c option
    - use complete_insert instead of opt_complete_insert.
mysql-test/r/mysqldump.result:
  Fix for bug #25993: mysqldump crashes with merge table and -c option
    - test result.
mysql-test/t/mysqldump.test:
  Fix for bug #25993: mysqldump crashes with merge table and -c option
    - test case.
parent 139c950f

client/mysqldump.c

+3 −3
Original line number Diff line number Diff line
@@ -1857,7 +1857,7 @@ static uint get_table_structure(char *table, char *db, char *table_type, 
      dynstr_append_checked(&insert_pat, insert_option);

      dynstr_append_checked(&insert_pat, "INTO ");

      dynstr_append_checked(&insert_pat, result_table);

      if (opt_complete_insert)

      if (complete_insert)

        dynstr_append_checked(&insert_pat, " (");

      else

      {
@@ -1881,7 +1881,7 @@ static uint get_table_structure(char *table, char *db, char *table_type, 
          dynstr_append_checked(&insert_pat, ", ");

      }

      init=1;

      if (opt_complete_insert)

      if (complete_insert)

        dynstr_append_checked(&insert_pat,

                      quote_name(row[SHOW_FIELDNAME], name_buff, 0));

      if (!opt_no_create_info)
@@ -2039,7 +2039,7 @@ static uint get_table_structure(char *table, char *db, char *table_type, 
      check_io(sql_file);

    }

  }

  if (opt_complete_insert)

  if (complete_insert)

  {

    dynstr_append_checked(&insert_pat, ") VALUES ");

    if (!extended_insert)

mysql-test/r/mysqldump.result

+47 −0
Original line number Diff line number Diff line
@@ -3212,6 +3212,53 @@ CREATE TABLE t1(a int); 
INSERT INTO t1 VALUES (1), (2);

mysqldump: Input filename or options too long: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

DROP TABLE t1;

CREATE TABLE t2 (a int);

CREATE TABLE t3 (a int);

CREATE TABLE t1 (a int) ENGINE=merge UNION=(t2, t3);



/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;

/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;

/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;

/*!40101 SET NAMES utf8 */;

/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;

/*!40103 SET TIME_ZONE='+00:00' */;

/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;

/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;

/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;

/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;

DROP TABLE IF EXISTS `t1`;

CREATE TABLE `t1` (

  `a` int(11) default NULL

) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 UNION=(`t2`,`t3`);

DROP TABLE IF EXISTS `t2`;

CREATE TABLE `t2` (

  `a` int(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1;



LOCK TABLES `t2` WRITE;

/*!40000 ALTER TABLE `t2` DISABLE KEYS */;

/*!40000 ALTER TABLE `t2` ENABLE KEYS */;

UNLOCK TABLES;

DROP TABLE IF EXISTS `t3`;

CREATE TABLE `t3` (

  `a` int(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1;



LOCK TABLES `t3` WRITE;

/*!40000 ALTER TABLE `t3` DISABLE KEYS */;

/*!40000 ALTER TABLE `t3` ENABLE KEYS */;

UNLOCK TABLES;

/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;



/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;

/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;

/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;

/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;

/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;

/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;

/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;



DROP TABLE t1, t2, t3;

#

# End of 5.0 tests

#

mysql-test/t/mysqldump.test

+10 −0
Original line number Diff line number Diff line
@@ -1453,6 +1453,16 @@ INSERT INTO t1 VALUES (1), (2); 


DROP TABLE t1;



#

# Bug #25993: crashe with a merge table and -c

#



CREATE TABLE t2 (a int);

CREATE TABLE t3 (a int);

CREATE TABLE t1 (a int) ENGINE=merge UNION=(t2, t3);

--exec $MYSQL_DUMP --skip-comments -c test

DROP TABLE t1, t2, t3;



--echo #

--echo # End of 5.0 tests

--echo #