diff options
| author | unknown <monty@tik.mysql.fi> | 2001-06-11 15:01:28 +0300 |
|---|---|---|
| committer | unknown <monty@tik.mysql.fi> | 2001-06-11 15:01:28 +0300 |
| commit | 765940cb3abccdbfe9e43f2c1116d1e96eb27ae9 (patch) | |
| tree | 22274a6ce372c9763e3a9527f8e8dc0cb5548381 /sql/sql_table.cc | |
| parent | 14289d42edec950a6cc9f3db1e242cf8595e207d (diff) | |
| download | mariadb-git-765940cb3abccdbfe9e43f2c1116d1e96eb27ae9.tar.gz | |
Changed compare in MyISAM to use my_pread()
Fixed that @VAR shows all decimals
Fixed problem with FLUSH TABLES and LOCK TABLE
CREATE ... SELECT now creates keys later
Reset AUTO_INCREMENT order if droping AUTO_INCREMENT key
Docs/manual.texi:
Added MySQL/PostgreSQL comparison
isam/_dynrec.c:
Fixed wrong compare (not used in MySQL)
myisam/mi_dynrec.c:
Fixed wrong compare (not used in MySQL).
Changed compare to use my_pread()
myisam/mi_packrec.c:
cleanup
mysql-test/r/alter_table.result:
Added test for ALTER TABLE
mysql-test/r/variables.result:
Added test for variables with REAL values.
mysql-test/t/alter_table.test:
Added test for ALTER TABLE
mysql-test/t/variables.test:
Added test for variables with REAL values.
mysys/my_pread.c:
Cleanup
sql-bench/Makefile.am:
removed extra \
sql-bench/README:
Fixed typo.
sql/item_func.cc:
Fixed that @VAR shows all decimals
sql/share/swedish/errmsg.OLD:
update
sql/sql_base.cc:
Fixed problem with FLUSH TABLES and LOCK TABLE
sql/sql_insert.cc:
CREATE ... SELECT now creates keys later
sql/sql_table.cc:
Reset AUTO_INCREMENT order if droping AUTO_INCREMENT key.
BitKeeper/etc/ignore:
Added sql-bench/graph-compare-results to the ignore list
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 3fa2bc5d9d3..207f9dd324d 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -1233,7 +1233,16 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name, { if (drop->type == Alter_drop::COLUMN && !my_strcasecmp(field->field_name, drop->name)) + { + /* Reset auto_increment value if it was dropped */ + if (MTYP_TYPENR(field->unireg_check) == Field::NEXT_NUMBER && + !(create_info->used_fields & HA_CREATE_USED_AUTO)) + { + create_info->auto_increment_value=0; + create_info->used_fields|=HA_CREATE_USED_AUTO; + } break; + } } if (drop) { |