From e03d5bdca67f4527330ab9fc7016f15ca771d23e Mon Sep 17 00:00:00 2001 From: "heikki@rescue." <> Date: Thu, 5 Sep 2002 14:22:51 +0300 Subject: [PATCH 1/2] ha_innodb.cc: Fix a typo in last night's push --- BitKeeper/etc/logging_ok | 1 + sql/ha_innodb.cc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index f754b8d3750..0db8ff5c22e 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -78,3 +78,4 @@ zak@balfor.local zak@linux.local zgreant@mysql.com heikki@work.mysql.com +heikki@rescue. diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 13c83d48471..7b8afe7b8fe 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -1669,7 +1669,7 @@ ha_innobase::write_row( introduced only in version 4.0.4 */ if (incremented_auto_inc_counter) { - dict_autoinc_decrement(prebuilt->table); + dict_table_autoinc_decrement(prebuilt->table); } if (incremented_auto_inc_for_stat) { From 15ad3ee8069b5ed9c2fa4c8b10ef2fee611c0ae9 Mon Sep 17 00:00:00 2001 From: "jani@rhols221.adsl.netsonic.fi" <> Date: Thu, 5 Sep 2002 14:22:52 +0300 Subject: [PATCH 2/2] Fixed a bug in my_getopt and mysqld.cc --- Docs/manual.texi | 4 ++++ mysys/my_getopt.c | 2 +- sql/mysqld.cc | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Docs/manual.texi b/Docs/manual.texi index 2b93bac418b..3ee4fa7ac44 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -50386,6 +50386,10 @@ each individual 4.0.x release. @itemize @bullet @item +Fixed a bug in my_getopt; --set-variable syntax didn't work for +those options that didn't have a valid variable in my_option struct. +This affected at least @code{default-table-type} option. +@item Fixed a bug that caused @code{REPAIR TABLE} to fail on tables with duplicates in a unique key. @item diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c index f72511c3014..494e7ac559c 100644 --- a/mysys/my_getopt.c +++ b/mysys/my_getopt.c @@ -275,7 +275,7 @@ int handle_options(int *argc, char ***argv, return EXIT_AMBIGUOUS_OPTION; } } - if (must_be_var && !optp->value) + if (must_be_var && optp->var_type == GET_NO_ARG) { if (my_getopt_print_errors) fprintf(stderr, "%s: option '%s' cannot take an argument\n", diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 9895897ec0d..0bdc9b86878 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3000,7 +3000,7 @@ struct my_option my_long_options[] = REQUIRED_ARG, 0, 0, 0, 0, 0, 0 }, {"default-table-type", OPT_TABLE_TYPE, "Set the default table type for tables", 0, 0, - 0, GET_NO_ARG, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, + 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"delay-key-write", OPT_DELAY_KEY_WRITE, "Type of DELAY_KEY_WRITE", 0,0,0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0}, {"delay-key-write-for-all-tables", OPT_DELAY_KEY_WRITE_ALL,