diff options
author | Michael Widenius <monty@askmonty.org> | 2012-10-04 23:52:11 +0300 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2012-10-04 23:52:11 +0300 |
commit | ea6a4eef3a43d916d43bef24165e16906b98a8de (patch) | |
tree | 41a06315ba4c4c3237eeb9aebe4b30e4d880890b /sql/handler.cc | |
parent | b722aebdf4cd73be88e2ae6768dce05276f52076 (diff) | |
download | mariadb-git-ea6a4eef3a43d916d43bef24165e16906b98a8de.tar.gz |
Fixed issues found by buildbot & valgrind:
- Wrong thd uses in Item_subselect, could lead to crash
- Inititalize uninitialized variable in new autoincrement handling code
sql/handler.cc:
More DBUG_PRINT
sql/item_subselect.cc:
Wrong thd uses in Item_subselect, could lead to crash
storage/innobase/handler/ha_innodb.cc:
Initialize variable needed by upper level. This only happens when auto-increment value wraps over.
storage/xtradb/handler/ha_innodb.cc:
Initialize variable needed by upper level. This only happens when auto-increment value wraps over.
Diffstat (limited to 'sql/handler.cc')
-rw-r--r-- | sql/handler.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index b06aa4255fd..8891b29138c 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -2621,7 +2621,8 @@ int handler::update_auto_increment() if (unlikely(nr == ULONGLONG_MAX)) DBUG_RETURN(HA_ERR_AUTOINC_ERANGE); - DBUG_PRINT("info",("auto_increment: %lu", (ulong) nr)); + DBUG_PRINT("info",("auto_increment: %llu nb_reserved_values: %llu", + nr, nb_reserved_values)); /* Store field without warning (Warning will be printed by insert) */ save_count_cuted_fields= thd->count_cuted_fields; |