bk commit into 4.1 tree (tnurnberg:1.2468) BUG#19025

[Tatjana A Nuernberg]

Below is the list of changes that have just been committed into a local
4.1 repository of azundris. When azundris does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2468 06/04/22 16:03:04 tnurnberg@stripped +7 -0
  Bug#19025 4.1 mysqldump doesn't correctly dump "auto_increment = [int]"
  
  mysqldump / SHOW CREATE TABLE will show the NEXT available value for
  the PK, rather than the *first* one that was available (that named in
  the original CREATE TABLE ... AUTO_INCREMENT = ... statement).
   
  This should produce correct and robust behaviour for the obvious use
  cases -- when no data were inserted, then we'll produce a statement
  featuring the same value the original CREATE TABLE had; if we dump
  with values, INSERTing the values on the target machine should set the
  correct next_ID anyway (and if not, we'll still have our AUTO_INCREMENT =
  ... to do that). Lastly, just the CREATE statement (with no data) for
  a table that saw inserts would still result in a table that new values
  could safely be inserted to).
  
  There seems to be no robust way however to see whether the next_ID
  field is > 1 because it was set to something else with CREATE TABLE
  ... AUTO_INCREMENT = ..., or because there is an AUTO_INCREMENT column
  in  the table (but no initial value was set with AUTO_INCREMENT = ...)
  and then one or more rows were INSERTed, counting up next_ID. This
  means that in both cases, we'll generate an AUTO_INCREMENT =
  ... clause in SHOW CREATE TABLE / mysqldump.  As we also show info on,
  say, charsets even if the user did not explicitly give that info in
  their own CREATE TABLE, this shouldn't be an issue.
  
  As per above, the next_ID will be affected by any INSERTs that have
  taken place, though.  This /should/ result in correct and robust
  behaviour, but it may look non-intuitive to some users if they CREATE
  TABLE ... AUTO_INCREMENT = 1000 and later (after some INSERTs) have
  SHOW CREATE TABLE give them a different value (say, CREATE TABLE
  ... AUTO_INCREMENT = 1006), so the docs should possibly feature a
  caveat to that effect.
  
  It's not very intuitive the way it works now (with the fix), but it's
  *correct*.  We're not storing the original value anyway, if we wanted
  that, we'd have to change on-disk representation?
  
  If we do dump/load cycles with empty DBs, nothing will change.  This
  changeset includes an additional test case that proves that tables
  with rows will create the same next_ID for AUTO_INCREMENT = ... across
  dump/restore cycles.
  
  Confirmed by support as likely solution for client's problem.

  mysql-test/t/auto_increment_dump_restore.test
    1.1 06/04/22 16:02:55 tnurnberg@stripped +141 -0
    Prove that the SHOW CREATE TABLE (AUTO_INCREMENT=...) mechanism has closure
    (as in, survives dump/restore cycles).

  mysql-test/t/auto_increment_dump.test
    1.1 06/04/22 16:02:55 tnurnberg@stripped +103 -0
    tests whether mysqldump/"SHOW CREATE TABLE" include a per-table
    AUTO_INCREMENT=... claus where applicable (that is, a NextID > 1
    exists on an AUTO_INCREMENT column).

  mysql-test/r/auto_increment_dump_restore.result
    1.1 06/04/22 16:02:55 tnurnberg@stripped +122 -0
    Prove that the SHOW CREATE TABLE (AUTO_INCREMENT=...) mechanism has closure
    (as in, survives dump/restore cycles).

  mysql-test/t/auto_increment_dump_restore.test
    1.0 06/04/22 16:02:55 tnurnberg@stripped +0 -0
    BitKeeper file /home/mysql-4.1-19025/mysql-test/t/auto_increment_dump_restore.test

  mysql-test/t/auto_increment_dump.test
    1.0 06/04/22 16:02:55 tnurnberg@stripped +0 -0
    BitKeeper file /home/mysql-4.1-19025/mysql-test/t/auto_increment_dump.test

  mysql-test/r/auto_increment_dump_restore.result
    1.0 06/04/22 16:02:55 tnurnberg@stripped +0 -0
    BitKeeper file /home/mysql-4.1-19025/mysql-test/r/auto_increment_dump_restore.result

  mysql-test/r/auto_increment_dump.result
    1.1 06/04/22 16:02:53 tnurnberg@stripped +87 -0
    tests whether mysqldump/"SHOW CREATE TABLE" include a per-table
    AUTO_INCREMENT=... claus where applicable (that is, a NextID > 1
    exists on an AUTO_INCREMENT column).

  sql/sql_show.cc
    1.207 06/04/22 16:02:53 tnurnberg@stripped +18 -0
    Add AUTO_INCREMENT=... to output of SHOW CREATE TABLE if there is an
    AUTO_INCREMENT column, and NEXT_ID > 1 (the default).  We must not print
    the clause for engines that do not support this as it would break the
    import of dumps, but as of this writing, the test for whether
    AUTO_INCREMENT columns are allowed and wether AUTO_INCREMENT=...
    is supported is identical, !(file->table_flags() & HA_NO_AUTO_INCREMENT))
    Because of that, we do not explicitly test for the feature,
    but may extrapolate its existence from that of an AUTO_INCREMENT column.

  mysql-test/r/symlink.result
    1.20 06/04/22 16:02:53 tnurnberg@stripped +2 -2
    test adapted to the new SHOW CREATE TABLE (AUTO_INCREMENT=...) syntax.

  mysql-test/r/auto_increment_dump.result
    1.0 06/04/22 16:02:53 tnurnberg@stripped +0 -0
    BitKeeper file /home/mysql-4.1-19025/mysql-test/r/auto_increment_dump.result

  mysql-test/r/gis-rtree.result
    1.12 06/04/22 16:02:52 tnurnberg@stripped +1 -1
    test adapted to the new SHOW CREATE TABLE (AUTO_INCREMENT=...) syntax.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tnurnberg
# Host:	salvation.intern.azundris.com
# Root:	/home/mysql-4.1-19025

--- 1.206/sql/sql_show.cc	2005-11-01 20:48:53 +01:00
+++ 1.207/sql/sql_show.cc	2006-04-22 16:02:53 +02:00
@@ -1480,6 +1480,24 @@
       packet->append(" ENGINE=", 8);
     packet->append(file->table_type());
     
+    /*
+      Add AUTO_INCREMENT=... if there is an AUTO_INCREMENT column,
+      and NEXT_ID > 1 (the default).  We must not print the clause
+      for engines that do not support this as it would break the
+      import of dumps, but as of this writing, the test for whether
+      AUTO_INCREMENT columns are allowed and wether AUTO_INCREMENT=...
+      is supported is identical, !(file->table_flags() & HA_NO_AUTO_INCREMENT))
+      Because of that, we do not explicitly test for the feature,
+      but may extrapolate its existence from that of an AUTO_INCREMENT column.
+    */
+
+    if(create_info.auto_increment_value > 1)
+    {
+      packet->append(" AUTO_INCREMENT=", 16);
+      end= longlong10_to_str(create_info.auto_increment_value, buff,10);
+      packet->append(buff, (uint) (end - buff));
+    }
+    
     if (table->table_charset &&
 	!(thd->variables.sql_mode & MODE_MYSQL323) &&
 	!(thd->variables.sql_mode & MODE_MYSQL40))

--- 1.19/mysql-test/r/symlink.result	2005-03-03 21:36:25 +01:00
+++ 1.20/mysql-test/r/symlink.result	2006-04-22 16:02:53 +02:00
@@ -40,7 +40,7 @@
   `b` char(16) NOT NULL default '',
   `c` int(11) NOT NULL default '0',
   PRIMARY KEY  (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='TEST_DIR/var/tmp/' INDEX
DIRECTORY='TEST_DIR/var/run/'
+) ENGINE=MyISAM AUTO_INCREMENT=16725 DEFAULT CHARSET=latin1 DATA
DIRECTORY='TEST_DIR/var/tmp/' INDEX DIRECTORY='TEST_DIR/var/run/'
 alter table t9 rename t8, add column d int not null;
 alter table t8 rename t7;
 rename table t7 to t9;
@@ -62,7 +62,7 @@
   `c` int(11) NOT NULL default '0',
   `d` int(11) NOT NULL default '0',
   PRIMARY KEY  (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='TEST_DIR/var/tmp/' INDEX
DIRECTORY='TEST_DIR/var/run/'
+) ENGINE=MyISAM AUTO_INCREMENT=16725 DEFAULT CHARSET=latin1 DATA
DIRECTORY='TEST_DIR/var/tmp/' INDEX DIRECTORY='TEST_DIR/var/run/'
 drop database mysqltest;
 create table t1 (a int not null) engine=myisam;
 show create table t1;

--- 1.11/mysql-test/r/gis-rtree.result	2005-08-09 18:29:38 +02:00
+++ 1.12/mysql-test/r/gis-rtree.result	2006-04-22 16:02:52 +02:00
@@ -294,7 +294,7 @@
   `g` geometry NOT NULL default '',
   PRIMARY KEY  (`fid`),
   SPATIAL KEY `g` (`g`(32))
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM AUTO_INCREMENT=101 DEFAULT CHARSET=latin1
 SELECT count(*) FROM t2;
 count(*)
 100
--- New file ---
+++ mysql-test/r/auto_increment_dump.result	06/04/22 16:02:53
DROP TABLE IF EXISTS `t1`;
SET SQL_WARNINGS=1;
CREATE TABLE `t1` (
t1_name VARCHAR(255) DEFAULT NULL,
t1_id INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
KEY (t1_name),
PRIMARY KEY (t1_id)
) AUTO_INCREMENT = 1000;
SHOW CREATE TABLE `t1`;
Table	Create Table
t1	CREATE TABLE `t1` (
  `t1_name` varchar(255) default NULL,
  `t1_id` int(10) unsigned NOT NULL auto_increment,
  PRIMARY KEY  (`t1_id`),
  KEY `t1_name` (`t1_name`)
) ENGINE=MyISAM AUTO_INCREMENT=1000 DEFAULT CHARSET=latin1
DROP TABLE `t1`;
CREATE TABLE `t1` (
t1_name VARCHAR(255) DEFAULT NULL,
t1_id INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
KEY (t1_name),
PRIMARY KEY (t1_id)
) AUTO_INCREMENT = 1000;
INSERT INTO t1 (t1_name) VALUES('bla');
INSERT INTO t1 (t1_name) VALUES('bla');
INSERT INTO t1 (t1_name) VALUES('bla');
SELECT * from t1;
t1_name	t1_id
bla	1000
bla	1001
bla	1002
SHOW CREATE TABLE `t1`;
Table	Create Table
t1	CREATE TABLE `t1` (
  `t1_name` varchar(255) default NULL,
  `t1_id` int(10) unsigned NOT NULL auto_increment,
  PRIMARY KEY  (`t1_id`),
  KEY `t1_name` (`t1_name`)
) ENGINE=MyISAM AUTO_INCREMENT=1003 DEFAULT CHARSET=latin1
DROP TABLE `t1`;
CREATE TABLE `t1` (
t1_id INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
t1_name VARCHAR(255) DEFAULT NULL,
PRIMARY KEY (t1_id)
) AUTO_INCREMENT = 1;
SHOW CREATE TABLE `t1`;
Table	Create Table
t1	CREATE TABLE `t1` (
  `t1_id` int(10) unsigned NOT NULL auto_increment,
  `t1_name` varchar(255) default NULL,
  PRIMARY KEY  (`t1_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE `t1`;
CREATE TABLE `t1` (
t1_id INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
t1_name VARCHAR(255) DEFAULT NULL,
PRIMARY KEY (t1_id)
);
INSERT INTO t1 (t1_name) VALUES('bla');
INSERT INTO t1 (t1_name) VALUES('bla');
INSERT INTO t1 (t1_name) VALUES('bla');
SELECT * from t1;
t1_id	t1_name
1	bla
2	bla
3	bla
SHOW CREATE TABLE `t1`;
Table	Create Table
t1	CREATE TABLE `t1` (
  `t1_id` int(10) unsigned NOT NULL auto_increment,
  `t1_name` varchar(255) default NULL,
  PRIMARY KEY  (`t1_id`)
) ENGINE=MyISAM AUTO_INCREMENT=4 DEFAULT CHARSET=latin1
DROP TABLE `t1`;
CREATE TABLE `t1` (
t1_id INT(10) UNSIGNED NOT NULL,
t1_name VARCHAR(255) DEFAULT NULL,
PRIMARY KEY (t1_id)
);
SHOW CREATE TABLE `t1`;
Table	Create Table
t1	CREATE TABLE `t1` (
  `t1_id` int(10) unsigned NOT NULL default '0',
  `t1_name` varchar(255) default NULL,
  PRIMARY KEY  (`t1_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE `t1`;

--- New file ---
+++ mysql-test/r/auto_increment_dump_restore.result	06/04/22 16:02:55
USE test;
DROP TABLE IF EXISTS `t1`;
---------------------------------------------------------------------------------
CREATE TABLE `t1` (
t1_name VARCHAR(255) DEFAULT NULL,
t1_id INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
KEY (t1_name),
PRIMARY KEY (t1_id)
) AUTO_INCREMENT = 1000 DEFAULT CHARSET=latin1;
SHOW CREATE TABLE `t1`;
Table	Create Table
t1	CREATE TABLE `t1` (
  `t1_name` varchar(255) default NULL,
  `t1_id` int(10) unsigned NOT NULL auto_increment,
  PRIMARY KEY  (`t1_id`),
  KEY `t1_name` (`t1_name`)
) ENGINE=MyISAM AUTO_INCREMENT=1000 DEFAULT CHARSET=latin1
DROP TABLE `t1`;
SHOW CREATE TABLE `t1`;
Table	Create Table
t1	CREATE TABLE `t1` (
  `t1_name` varchar(255) default NULL,
  `t1_id` int(10) unsigned NOT NULL auto_increment,
  PRIMARY KEY  (`t1_id`),
  KEY `t1_name` (`t1_name`)
) ENGINE=MyISAM AUTO_INCREMENT=1000 DEFAULT CHARSET=latin1
DROP TABLE `t1`;
---------------------------------------------------------------------------------
CREATE TABLE `t1` (
t1_name VARCHAR(255) DEFAULT NULL,
t1_id INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
KEY (t1_name),
PRIMARY KEY (t1_id)
) AUTO_INCREMENT = 1000 DEFAULT CHARSET=latin1;
INSERT INTO t1 (t1_name) VALUES('bla');
INSERT INTO t1 (t1_name) VALUES('bla');
INSERT INTO t1 (t1_name) VALUES('bla');
SELECT * from t1;
t1_name	t1_id
bla	1000
bla	1001
bla	1002
SHOW CREATE TABLE `t1`;
Table	Create Table
t1	CREATE TABLE `t1` (
  `t1_name` varchar(255) default NULL,
  `t1_id` int(10) unsigned NOT NULL auto_increment,
  PRIMARY KEY  (`t1_id`),
  KEY `t1_name` (`t1_name`)
) ENGINE=MyISAM AUTO_INCREMENT=1003 DEFAULT CHARSET=latin1
DROP TABLE `t1`;
SELECT * from t1;
t1_name	t1_id
bla	1000
bla	1001
bla	1002
SHOW CREATE TABLE `t1`;
Table	Create Table
t1	CREATE TABLE `t1` (
  `t1_name` varchar(255) default NULL,
  `t1_id` int(10) unsigned NOT NULL auto_increment,
  PRIMARY KEY  (`t1_id`),
  KEY `t1_name` (`t1_name`)
) ENGINE=MyISAM AUTO_INCREMENT=1003 DEFAULT CHARSET=latin1
DROP TABLE `t1`;
---------------------------------------------------------------------------------
CREATE TABLE `t1` (
t1_id INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
t1_name VARCHAR(255) DEFAULT NULL,
PRIMARY KEY (t1_id)
) AUTO_INCREMENT = 1 DEFAULT CHARSET=latin1;
SHOW CREATE TABLE `t1`;
Table	Create Table
t1	CREATE TABLE `t1` (
  `t1_id` int(10) unsigned NOT NULL auto_increment,
  `t1_name` varchar(255) default NULL,
  PRIMARY KEY  (`t1_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE `t1`;
SHOW CREATE TABLE `t1`;
Table	Create Table
t1	CREATE TABLE `t1` (
  `t1_id` int(10) unsigned NOT NULL auto_increment,
  `t1_name` varchar(255) default NULL,
  PRIMARY KEY  (`t1_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE `t1`;
---------------------------------------------------------------------------------
CREATE TABLE `t1` (
t1_id INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
t1_name VARCHAR(255) DEFAULT NULL,
PRIMARY KEY (t1_id)
) DEFAULT CHARSET=latin1;
INSERT INTO t1 (t1_name) VALUES('bla');
INSERT INTO t1 (t1_name) VALUES('bla');
INSERT INTO t1 (t1_name) VALUES('bla');
SELECT * from t1;
t1_id	t1_name
1	bla
2	bla
3	bla
SHOW CREATE TABLE `t1`;
Table	Create Table
t1	CREATE TABLE `t1` (
  `t1_id` int(10) unsigned NOT NULL auto_increment,
  `t1_name` varchar(255) default NULL,
  PRIMARY KEY  (`t1_id`)
) ENGINE=MyISAM AUTO_INCREMENT=4 DEFAULT CHARSET=latin1
DROP TABLE `t1`;
SELECT * from t1;
t1_id	t1_name
1	bla
2	bla
3	bla
SHOW CREATE TABLE `t1`;
Table	Create Table
t1	CREATE TABLE `t1` (
  `t1_id` int(10) unsigned NOT NULL auto_increment,
  `t1_name` varchar(255) default NULL,
  PRIMARY KEY  (`t1_id`)
) ENGINE=MyISAM AUTO_INCREMENT=4 DEFAULT CHARSET=latin1
DROP TABLE `t1`;

--- New file ---
+++ mysql-test/t/auto_increment_dump.test	06/04/22 16:02:55
#
# Test of whether auto_increment=... shows in mysqldump / show create table
# Bug #19025
#

--disable_warnings
DROP TABLE IF EXISTS `t1`;
--enable_warnings
SET SQL_WARNINGS=1;



# table sets initial next_id, then INSERTs count up
# SHOW CREATE TABLE should show original next_id

CREATE TABLE `t1` (
    t1_name VARCHAR(255) DEFAULT NULL,
    t1_id INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
    KEY (t1_name),
    PRIMARY KEY (t1_id)
) AUTO_INCREMENT = 1000;

SHOW CREATE TABLE `t1`;

DROP TABLE `t1`;



# table sets initial next_id, then INSERTs count up
# SHOW CREATE TABLE should show original next_id + number of INSERTs

CREATE TABLE `t1` (
    t1_name VARCHAR(255) DEFAULT NULL,
    t1_id INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
    KEY (t1_name),
    PRIMARY KEY (t1_id)
) AUTO_INCREMENT = 1000;

INSERT INTO t1 (t1_name) VALUES('bla');
INSERT INTO t1 (t1_name) VALUES('bla');
INSERT INTO t1 (t1_name) VALUES('bla');

SELECT * from t1;

SHOW CREATE TABLE `t1`;

DROP TABLE `t1`;




# table sets initial next_id to 1, no INSERTs count up
# SHOW CREATE TABLE should optimize away AUTO_INCREMENT = ...

CREATE TABLE `t1` (
    t1_id INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
    t1_name VARCHAR(255) DEFAULT NULL,
    PRIMARY KEY (t1_id)
) AUTO_INCREMENT = 1;

SHOW CREATE TABLE `t1`;

DROP TABLE `t1`;



# table sets no initial next_id, then INSERTs count up
# SHOW CREATE TABLE will produce harmless AUTO_INCREMENT = ...
# this is unavoidable as the original AUTO_INCREMENT = ...
# value is not made persistant and we can't later find out
# whether a next_id > 1 was created by AUTO_INCREMENT = >1,
# INSERTs, or a combination of both.

CREATE TABLE `t1` (
    t1_id INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
    t1_name VARCHAR(255) DEFAULT NULL,
    PRIMARY KEY (t1_id)
);

INSERT INTO t1 (t1_name) VALUES('bla');
INSERT INTO t1 (t1_name) VALUES('bla');
INSERT INTO t1 (t1_name) VALUES('bla');

SELECT * from t1;

SHOW CREATE TABLE `t1`;

DROP TABLE `t1`;



# table sets no initial next_id, no INSERTs count up
# SHOW CREATE TABLE should optimize away AUTO_INCREMENT = ...

CREATE TABLE `t1` (
    t1_id INT(10) UNSIGNED NOT NULL,
    t1_name VARCHAR(255) DEFAULT NULL,
    PRIMARY KEY (t1_id)
);

SHOW CREATE TABLE `t1`;

DROP TABLE `t1`;

--- New file ---
+++ mysql-test/t/auto_increment_dump_restore.test	06/04/22 16:02:55
#
# Test of whether auto_increment=... produces correct behaviour throug
# several dump/restore cycles.
# Bug #19025
#

# Embedded server doesn't support external clients
--source include/not_embedded.inc

--disable_warnings
USE test;
DROP TABLE IF EXISTS `t1`;
--enable_warnings




# table sets initial next_id, then INSERTs count up
# SHOW CREATE TABLE should show original next_id

--echo ---------------------------------------------------------------------------------

CREATE TABLE `t1` (
    t1_name VARCHAR(255) DEFAULT NULL,
    t1_id INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
    KEY (t1_name),
    PRIMARY KEY (t1_id)
) AUTO_INCREMENT = 1000 DEFAULT CHARSET=latin1;

SHOW CREATE TABLE `t1`;

# dump table
--exec $MYSQL_DUMP --skip-comments test t1 > $MYSQLTEST_VARDIR/tmp/bug19025.sql
DROP TABLE `t1`;

# reload table
--exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/bug19025.sql

SHOW CREATE TABLE `t1`;

DROP TABLE `t1`;



# table sets initial next_id, then INSERTs count up
# SHOW CREATE TABLE should show original next_id + number of INSERTs

--echo ---------------------------------------------------------------------------------

CREATE TABLE `t1` (
    t1_name VARCHAR(255) DEFAULT NULL,
    t1_id INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
    KEY (t1_name),
    PRIMARY KEY (t1_id)
) AUTO_INCREMENT = 1000 DEFAULT CHARSET=latin1;

INSERT INTO t1 (t1_name) VALUES('bla');
INSERT INTO t1 (t1_name) VALUES('bla');
INSERT INTO t1 (t1_name) VALUES('bla');

SELECT * from t1;

SHOW CREATE TABLE `t1`;

# dump table
--exec $MYSQL_DUMP --skip-comments test t1 > $MYSQLTEST_VARDIR/tmp/bug19025.sql
DROP TABLE `t1`;

# reload table
--exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/bug19025.sql

SELECT * from t1;

SHOW CREATE TABLE `t1`;

DROP TABLE `t1`;




# table sets initial next_id to 1, no INSERTs count up
# SHOW CREATE TABLE should optimize away AUTO_INCREMENT = ...

--echo ---------------------------------------------------------------------------------

CREATE TABLE `t1` (
    t1_id INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
    t1_name VARCHAR(255) DEFAULT NULL,
    PRIMARY KEY (t1_id)
) AUTO_INCREMENT = 1 DEFAULT CHARSET=latin1;

SHOW CREATE TABLE `t1`;

# dump table
--exec $MYSQL_DUMP --skip-comments test t1 > $MYSQLTEST_VARDIR/tmp/bug19025.sql
DROP TABLE `t1`;

# reload table
--exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/bug19025.sql

SHOW CREATE TABLE `t1`;

DROP TABLE `t1`;



# table sets no initial next_id, then INSERTs count up
# SHOW CREATE TABLE will produce harmless AUTO_INCREMENT = ...
# this is unavoidable as the original AUTO_INCREMENT = ...
# value is not made persistant and we can't later find out
# whether a next_id > 1 was created by AUTO_INCREMENT = >1,
# INSERTs, or a combination of both.

--echo ---------------------------------------------------------------------------------

CREATE TABLE `t1` (
    t1_id INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
    t1_name VARCHAR(255) DEFAULT NULL,
    PRIMARY KEY (t1_id)
) DEFAULT CHARSET=latin1;

INSERT INTO t1 (t1_name) VALUES('bla');
INSERT INTO t1 (t1_name) VALUES('bla');
INSERT INTO t1 (t1_name) VALUES('bla');

SELECT * from t1;

SHOW CREATE TABLE `t1`;

# dump table
--exec $MYSQL_DUMP --skip-comments test t1 > $MYSQLTEST_VARDIR/tmp/bug19025.sql
DROP TABLE `t1`;

# reload table
--exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/bug19025.sql

SELECT * from t1;

SHOW CREATE TABLE `t1`;

DROP TABLE `t1`;