diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-09-28 20:43:56 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-09-28 20:43:56 -0400 |
| commit | c916085e271cd049537b1e07b36cd060c44750bd (patch) | |
| tree | 337ddfcd033174143cf9bd08e6ba50174459d7ff /sql/ha_partition.cc | |
| parent | 023366e6eb68edca3858c32e7492788e047d927a (diff) | |
| parent | f1afc003eefe0aafd3e070c7453d9e029d8445a8 (diff) | |
| download | mariadb-git-c916085e271cd049537b1e07b36cd060c44750bd.tar.gz | |
bzr merge -rtag:mariadb-10.0.14 maria/10.0/
Diffstat (limited to 'sql/ha_partition.cc')
| -rw-r--r-- | sql/ha_partition.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index 788254bcc3f..e53d8bace6f 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -8595,8 +8595,7 @@ void ha_partition::get_auto_increment(ulonglong offset, ulonglong increment, ulonglong first_value_part, max_first_value; handler **file= m_file; first_value_part= max_first_value= *first_value; - /* Must lock and find highest value among all partitions. */ - lock_auto_increment(); + /* Must find highest value among all partitions. */ do { /* Only nb_desired_values = 1 makes sense */ @@ -8607,7 +8606,6 @@ void ha_partition::get_auto_increment(ulonglong offset, ulonglong increment, *first_value= first_value_part; /* log that the error was between table/partition handler */ sql_print_error("Partition failed to reserve auto_increment value"); - unlock_auto_increment(); DBUG_VOID_RETURN; } DBUG_PRINT("info", ("first_value_part: %lu", (ulong) first_value_part)); @@ -8615,7 +8613,6 @@ void ha_partition::get_auto_increment(ulonglong offset, ulonglong increment, } while (*(++file)); *first_value= max_first_value; *nb_reserved_values= 1; - unlock_auto_increment(); } else { |