- developers - lists.mariadb.org

[Maria-developers] BUILD ERROR
by Laketra Musa 11 Dec '15

11 Dec '15

Hi, I was Building mariadb on Mac OS X and got this error: [ 81%] Built target pfs_misc-t [ 81%] Built target pfs_timer-t [ 81%] Built target pfs_user-oom-t [ 81%] Built target sphinx [ 83%] Built target spider [ 83%] Built target test_sql_discovery [ 84%] Built target tokuportability_static_conv [ 84%] Built target tokuportability_static [ 84%] Built target logformat [ 84%] Built target generate_log_code [ 84%] Built target make_tdb [ 84%] Built target install_tdb_h [ 84%] Building CXX object storage/tokudb/ft-index/src/CMakeFiles/tokudb_static_conv.dir/ydb.cc.o In file included from /Users/osiris/Desktop/server/storage/tokudb/ft-index/src/ydb.cc:97: /Users/osiris/Desktop/server/build/storage/tokudb/ft-index/buildheader/db.h:323:1: error: empty struct has size 0 in C, size 1 in C++ [-Werror,-Wextern-c-compat] struct __toku_db_lsn { ^ In file included from /Users/osiris/Desktop/server/storage/tokudb/ft-index/src/ydb.cc:107: In file included from /Users/osiris/Desktop/server/storage/tokudb/ft-index/ft/ft-flusher.h:94: In file included from /Users/osiris/Desktop/server/storage/tokudb/ft-index/ft/ft-internal.h:103: In file included from /Users/osiris/Desktop/server/storage/tokudb/ft-index/ft/node.h:91: In file included from /Users/osiris/Desktop/server/storage/tokudb/ft-index/ft/bndata.h:93: In file included from /Users/osiris/Desktop/server/storage/tokudb/ft-index/util/dmt.h:731: /Users/osiris/Desktop/server/storage/tokudb/ft-index/util/dmt.cc:925:9: error: nonnull parameter 'outlen' will evaluate to 'true' on first encounter [-Werror,-Wpointer-bool-conversion] if (outlen) { ~~ ^~~~~~ /Users/osiris/Desktop/server/storage/tokudb/ft-index/util/dmt.cc:935:9: error: nonnull parameter 'outlen' will evaluate to 'true' on first encounter [-Werror,-Wpointer-bool-conversion] if (outlen) { ~~ ^~~~~~ /Users/osiris/Desktop/server/storage/tokudb/ft-index/util/dmt.cc:945:9: error: nonnull parameter 'outlen' will evaluate to 'true' on first encounter [-Werror,-Wpointer-bool-conversion] if (outlen) { ~~ ^~~~~~ /Users/osiris/Desktop/server/storage/tokudb/ft-index/util/dmt.cc:955:9: error: nonnull parameter 'outlen' will evaluate to 'true' on first encounter [-Werror,-Wpointer-bool-conversion] if (outlen) { ~~ ^~~~~~ 5 errors generated. make[2]: *** [storage/tokudb/ft-index/src/CMakeFiles/tokudb_static_conv.dir/ydb.cc.o] Error 1 make[1]: *** [storage/tokudb/ft-index/src/CMakeFiles/tokudb_static_conv.dir/all] Error 2 make: *** [all] Error 2 How can I fix this please?

3 2

[Maria-developers] PR#129 - 'truncate table' make server crash in sharding&ha configuration when wrapper is oracle
by Sergey Vojtovich 10 Dec '15

10 Dec '15

Hi Kentoku, we got new pull request for Spider. Could you suggest what should we do about it? What license should be requested for Spider contributions? PR: https://github.com/MariaDB/server/pull/129 MDEV: https://mariadb.atlassian.net/browse/MDEV-9254 Thanks, Sergey

1 0

Re: [Maria-developers] [Commits] 6c19f0b: MDEV-9172 - Analyze patches for IBM System z
by Sergei Golubchik 09 Dec '15

09 Dec '15

Hi, Sergey! On Nov 27, Sergey Vojtovich wrote: > revision-id: 6c19f0b0eb0600c276f8681673dc768d542d3bd3 (mariadb-10.1.9-8-g6c19f0b) > parent(s): 3c0e9d31b3e6494931deb09f5c93b05a96df8471 > committer: Sergey Vojtovich > timestamp: 2015-11-27 13:58:30 +0400 > message: > > MDEV-9172 - Analyze patches for IBM System z > > Extended my_timer_cycles() to support s390. > Some compiler tunings for RHEL/SLES RPM packages on s390. > > diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake > index 8c79ec2..75ce57e 100644 > --- a/cmake/build_configurations/mysql_release.cmake > +++ b/cmake/build_configurations/mysql_release.cmake > @@ -154,6 +154,25 @@ IF(UNIX) > SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}") > ENDIF() > > + # IBM Z flags > + IF(CMAKE_SYSTEM_PROCESSOR MATCHES "s390x") > + IF(RPM MATCHES "(rhel|centos)6" OR RPM MATCHES "(suse|sles)11") > + SET(z_flags "-funroll-loops -march=z9-109 -mtune=z10 ") > + ELSEIF(RPM MATCHES "(rhel|centos)7" OR RPM MATCHES "(suse|sles)12") > + SET(z_flags "-funroll-loops -march=z196 -mtune=zEC12 ") > + ELSE() > + SET(z_flags "") > + ENDIF() Does MariaDB compile and work without these flags? > diff --git a/mysys/my_rdtsc.c b/mysys/my_rdtsc.c > index 82e5609..4228973 100644 > --- a/mysys/my_rdtsc.c > +++ b/mysys/my_rdtsc.c > @@ -249,6 +249,13 @@ ulonglong my_timer_cycles(void) > clock_gettime(CLOCK_SGI_CYCLE, &tp); > return (ulonglong) tp.tv_sec * 1000000000 + (ulonglong) tp.tv_nsec; > } > +#elif defined(__GNUC__) && defined(__s390__) > + /* covers both s390 and s390x */ > + { > + ulonglong result; > + __asm__ __volatile__ ("stck %0" : "=Q" (result) : : "cc"); I cannot really review that :) If you've checked the documentation and tested it and whatever, then let's push it. > + return result; > + } > #elif defined(HAVE_SYS_TIMES_H) && defined(HAVE_GETHRTIME) Regards, Sergei Chief Architect MariaDB and security(a)mariadb.org -- Vote for my Percona Live 2016 talks: https://www.percona.com/live/data-performance-conference-2016/sessions/mari… https://www.percona.com/live/data-performance-conference-2016/sessions/mari…

2 1

[Maria-developers] Unsubscribe
by Abdul Hakeem 06 Dec '15

06 Dec '15

1 0

Re: [Maria-developers] [Commits] bde705f: MDEV-7050: MySQL#74603 - Assertion `comma_length > 0' failed in mysql_prepare_create_table
by Sergei Golubchik 06 Dec '15

06 Dec '15

Hi, Jan! On Dec 02, Jan Lindström wrote: > revision-id: bde705fdaec49ab495eafcd18c609970a2566cb7 (mariadb-5.5.46-10-gbde705f) > parent(s): 13ad179c96ee8c8c4043806b8575c851e3676f0d > committer: Jan Lindström > timestamp: 2015-12-02 17:53:28 +0200 > message: > > MDEV-7050: MySQL#74603 - Assertion `comma_length > 0' failed in mysql_prepare_create_table > > Too short buffer was used for ENUM comma buffer. > > --- > mysql-test/r/create.result | 20 ++++++++++++++++++++ > mysql-test/t/create.test | 21 +++++++++++++++++++++ > sql/sql_table.cc | 2 +- > 3 files changed, 42 insertions(+), 1 deletion(-) > > diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result > index 8dd3cc8..2da3460 100644 > --- a/mysql-test/r/create.result > +++ b/mysql-test/r/create.result > @@ -2477,3 +2477,23 @@ t1 CREATE TABLE `t1` ( > `c` char(32) AS (convert(cast(n as char), char)) PERSISTENT > ) ENGINE=MyISAM DEFAULT CHARSET=latin1 > drop table t1; > +DROP DATABASE test; > +CREATE DATABASE test; > +USE test; > +SET character_set_filesystem=filename; > +SET @session_start_value=@@character_set_filesystem; > +SET @@session.collation_server=@session_start_value; > +create table t0(a ENUM('','')); > +Warnings: > +Note 1291 Column 'a' has duplicated value '' in ENUM > +DROP DATABASE test; > +CREATE DATABASE test; > +USE test; > +create table t0(a ENUM('','')); > +Warnings: > +Note 1291 Column 'a' has duplicated value '' in ENUM > +DROP TABLE t0; > +SET @@session.collation_server = latin1_swedish_ci; > +DROP DATABASE test; > +CREATE DATABASE test; > +USE test; You could do with a simpler test case. This one worked for me: set @@session.collation_server=filename; create table t1(a enum('','')); drop table t1; set @@session.collation_server=default; > diff --git a/sql/sql_table.cc b/sql/sql_table.cc > index 6e589e2..6ce46ad 100644 > --- a/sql/sql_table.cc > +++ b/sql/sql_table.cc > @@ -2986,7 +2986,7 @@ mysql_prepare_create_table(THD *thd, HA_CREATE_INFO *create_info, > sql_field->interval_list); > List_iterator<String> int_it(sql_field->interval_list); > String conv, *tmp; > - char comma_buf[4]; /* 4 bytes for utf32 */ > + char comma_buf[8]; /* 4*2 bytes for utf32 */ incorrect comment, must be char comma_buf[5]; /* 5 bytes for 'filename' charset */ and please, add an assert: DBUG_ASSERT(sizeof(comma_buf) >= cs->mbmaxlen); > int comma_length= cs->cset->wc_mb(cs, ',', (uchar*) comma_buf, > (uchar*) comma_buf + > sizeof(comma_buf)); There's another bug, while 5 and the assert might not be working for you. I'll attach the patch with the fix. Feel free to push it, it must be pushed before your bugfix. Or wait for me to, as you like. Just tell me what you choose. Regards, Sergei Chief Architect MariaDB and security(a)mariadb.org -- Vote for my Percona Live 2016 talks: https://www.percona.com/live/data-performance-conference-2016/sessions/mari… https://www.percona.com/live/data-performance-conference-2016/sessions/mari…

1 0

[Maria-developers] Error Compiling MariaDB with clang on Mac Os X
by Vicențiu Ciorbaru 04 Dec '15

04 Dec '15

Hi Sergei, While working on features for 10.2 I've encountered a problem when compiling MariaDB as a Debug build. According to your change on commit 29dd634a4c0b9c3579cf9d318ed64d748d848b1d dbug: correct trace for DBUG_RETURN(func()); This causes a small problem, in two places within the codebase. One is in the myisam storage engine and one in the maria storage engine. Within thr_find_all_keys, there is a hack with goto statements and using DBUG_ENTER after my_thread_init(). /Users/cvicentiu/Workspace/MariaDB/storage/myisam/sort.c:352:5: error: cannot jump from this goto statement to its label goto err; ^ /Users/cvicentiu/Workspace/MariaDB/storage/myisam/sort.c:355:5: note: jump bypasses initialization of variable with __attribute__((cleanup)) DBUG_ENTER("thr_find_all_keys"); ^ /Users/cvicentiu/Workspace/MariaDB/include/my_dbug.h:74:47: note: expanded from macro 'DBUG_ENTER' #define DBUG_ENTER(a) struct _db_stack_frame_ _db_stack_frame_ __attribute__((cleanup(_db_return_))); \ In the current code state, the attribute_cleanup callback does not make sense if my_thread_init() fails and forces the goto err; Technically, it is undefined behaviour, as we're jumping within the block that has the variables defined, without initialising it. The sensible thing to do is to refactor the block that has DBUG_ENTER into a separate function and decoupling the error cleanup from the my_thread_init() call. I've looked at that code and have seen that much of the logic is redundant during the cleanup part. I can refactor it to fix the problem, but I'm looking for input on your side if you're ok with me doing that. I've also found a bug in that same code in the error checking that I can fix. Regards, Vicentiu

2 1

[Maria-developers] [MDEV-7122] Questions regarding code history
by Vicențiu Ciorbaru 04 Dec '15

04 Dec '15

Hi Sergey! I've been investigating MDEV-7122. I'm still quite a ways to go before I can understand all the underlying bits of logic. I need a little help regarding a change that you've committed a while back. Do you know (remember) why you've placed DBUG_ASSERT(0) in the commit: a1b4eadf89a3940b80a6ed0eadd15ba456c2fa7a BUG#868908: Crash in check_simple_equality() with semijoin + materialization + prepared statement - Part2: safety and code cleanup To me, it feels like it's some leftover debugging code, but it would be good to get your input on this. @@ -4182,6 +4183,8 @@ bool subselect_hash_sj_engine::init(List<Item> *tmp_columns, uint subquery_id) */ if (tmp_table->s->keys == 0) { + //fprintf(stderr, "Q: %s\n", current_thd->query()); + DBUG_ASSERT(0); Obviously we should also get rid of the commented fprintf statement. After trying to debug this by just looking at the adjacent function calls and logic, I've come to the conclusion that I need to actually understand the code methodically. This is what I am actually doing right now, starting from the parser, all the way to how this particular query is executed. Expect more questions from me on this topic. Thanks, Vicentiu

1 0

[Maria-developers] The compile errors on Linux on Power
by Lixun Peng 04 Dec '15

04 Dec '15

Hi everyone, Recently I want to test MariaDB 10.1.9 on Linux on Power8. *But GCC will report following errors:* [ 52%] Building CXX object > storage/innobase/CMakeFiles/innobase.dir/api/api0api.cc.o > In file included from > /root/mariadb-10.1.9/storage/innobase/include/ut0ut.h:36, > from > /root/mariadb-10.1.9/storage/innobase/include/univ.i:636, > from > /root/mariadb-10.1.9/storage/innobase/api/api0api.cc:27: > /root/mariadb-10.1.9/storage/innobase/include/os0sync.h:521:4: error: > #error "Unsupported platform" > [ 52%] Building CXX object > storage/archive/CMakeFiles/archive.dir/ha_archive.cc.o > In file included from > /root/mariadb-10.1.9/storage/innobase/include/sync0sync.h:837, > from > /root/mariadb-10.1.9/storage/innobase/include/mem0mem.h:34, > from > /root/mariadb-10.1.9/storage/innobase/include/data0data.h:33, > from > /root/mariadb-10.1.9/storage/innobase/include/que0que.h:30, > from > /root/mariadb-10.1.9/storage/innobase/include/api0misc.h:32, > from > /root/mariadb-10.1.9/storage/innobase/api/api0api.cc:38: > /root/mariadb-10.1.9/storage/innobase/include/sync0sync.ic: In function > ‘lock_word_t ib_mutex_test_and_set(ib_mutex_t*)’: > /root/mariadb-10.1.9/storage/innobase/include/sync0sync.ic:85: error: > ‘os_atomic_test_and_set’ was not declared in this scope > /root/mariadb-10.1.9/storage/innobase/include/sync0sync.ic: In function > ‘void mutex_reset_lock_word(ib_mutex_t*)’: > /root/mariadb-10.1.9/storage/innobase/include/sync0sync.ic:113: error: > ‘os_atomic_clear’ was not declared in this scope > make[2]: *** [storage/innobase/CMakeFiles/innobase.dir/api/api0api.cc.o] > Error 1 > make[1]: *** [storage/innobase/CMakeFiles/innobase.dir/all] Error 2 > make[1]: *** Waiting for unfinished jobs.... I found the problem is: *storage/innobase/include/sync0sync.ic* > ib_mutex_test_and_set( > /*==================*/ > ib_mutex_t* mutex) /*!< in: mutex */ > { > #if defined(HAVE_ATOMIC_BUILTINS) > return(os_atomic_test_and_set(&mutex->lock_word)); > #else *storage/innobase/include/os0sync.h* > #if defined(__powerpc__) || defined(__aarch64__) > /* > os_atomic_test_and_set_byte_release() should imply a release barrier > before > setting, and a full barrier after. But __sync_lock_test_and_set() is only > documented as an aquire barrier. So on PowerPC we need to add the full > barrier explicitly. */ > # define os_atomic_test_and_set_byte_release(ptr, new_val) \ > do { __sync_lock_release(ptr); \ > __sync_synchronize(); } while (0) > #else Only HAVE_IB_GCC_ATOMIC_TEST_AND_SET or IB_STRONG_MEMORY_MODEL will enable codes about os_atomic_test_and_set() and os_atomic_clear(). But on my Power8 environment, HAVE_ATOMIC_BUILTINS is defined, HAVE_IB_GCC_ATOMIC_TEST_AND_SET and IB_STRONG_MEMORY_MODEL are not defined. So in sync0sync.ic, os_atomic_test_and_set() is used, but in os0sync.h, os_atomic_test_and_set() is not defined. Does anybody know how to solve this problem? I'm not familiar with Power. Thanks, Lixun -- Staff Database Engineer @ Alibaba Cloud Computing Oracle ACE for MySQL Phone: +86 18658156856 (Hangzhou) Blog: http://www.penglixun.com

2 2

[Maria-developers] Voting for some MariaDB Server related submissions for Percona Live
by Colin Charles 03 Dec '15

03 Dec '15

Hi all, It turns out that what is considered to be the largest conference for those interested in the MySQL world, nowadays called the Percona Live Data Performance Conference, is requiring the community to vote on submissions that they would like to hear. Only after voting, will those with a certain threshold (not published) be sent to the next level for the program committee to vote on. Its clear that you *do not* have to be attending the event, but you do need to register to vote. I’m sure all of us would appreciate your votes. The people below offering talks are Sergei Golubchik, Sergei Petrunia, Michael “Monty” Widenius, Gerry Narvaja, Serge Frezefond, Anders Karlsson, and me, Colin Charles. Thanking you all in advance! cheers, -colin Using and Managing MariaDB https://www.percona.com/live/data-performance-conference-2016/sessions/comp… MariaDB 10.1 - What's New? (*** includes Monty himself! ***) https://www.percona.com/live/data-performance-conference-2016/sessions/mari… Databases in the Hosted Cloud https://www.percona.com/live/data-performance-conference-2016/sessions/data… Best Practices for MySQL High Availability https://www.percona.com/live/data-performance-conference-2016/sessions/best… Choosing a MySQL HA solution today https://www.percona.com/live/data-performance-conference-2016/sessions/choo… MariaDB/MySQL security essentials https://www.percona.com/live/data-performance-conference-2016/sessions/mari… The MySQL Server Ecosystem in 2016 https://www.percona.com/live/data-performance-conference-2016/sessions/mysq… MariaDB Connectors: Fast and Smart with the new protocol optimizations https://www.percona.com/live/data-performance-conference-2016/sessions/mari… MariaDB 10.1 Security: Validation, Authentication, Encryption https://www.percona.com/live/data-performance-conference-2016/sessions/mari… Window functions in MariaDB https://www.percona.com/live/data-performance-conference-2016/sessions/wind… Exploring MariaDB Query Optimizer with ANALYZE for statements https://www.percona.com/live/data-performance-conference-2016/sessions/expl… Window functions in MariaDB https://www.percona.com/live/data-performance-conference-2016/sessions/wind… Exploring MariaDB Query Optimizer with ANALYZE for statements https://www.percona.com/live/data-performance-conference-2016/sessions/expl… The MariaDB CONNECT Storage Engine to simplify heterogeneous data access https://www.percona.com/live/data-performance-conference-2016/sessions/mari… Low Impact Monitoring https://www.percona.com/live/data-performance-conference-2016/sessions/low-… MariaDB on Power8: https://www.percona.com/live/data-performance-conference-2016/sessions/ibm-… The good and bad on datatypes in different database systems: https://www.percona.com/live/data-performance-conference-2016/sessions/migr… Character sets and Collations explained: https://www.percona.com/live/data-performance-conference-2016/sessions/char… -- Colin Charles, http://bytebot.net/blog/ twitter: @bytebot | skype: colincharles "First they ignore you, then they laugh at you, then they fight you, then you win." -- Mohandas Gandhi

1 0

Re: [Maria-developers] [Commits] be25be4: MDEV-8827 Duplicate key with auto increment
by Jan Lindström 30 Nov '15

30 Nov '15

Ok to push. On Mon, Nov 30, 2015 at 6:45 PM, <serg(a)mariadb.org> wrote: > revision-id: be25be4b1aaf65593d67498c2f30a99fd254ea15 > (mariadb-10.1.8-71-gbe25be4) > parent(s): cf8cb9ebd810a46154f99a73045b53a6913b6eb6 > committer: Sergei Golubchik > timestamp: 2015-11-30 17:45:23 +0100 > message: > > MDEV-8827 Duplicate key with auto increment > > fix innodb auto-increment handling > three bugs: > 1. innobase_next_autoinc treated the case of current<offset incorrectly > 2. ha_innobase::get_auto_increment didn't recalculate current when > increment changed > 3. ha_innobase::get_auto_increment didn't pass offset down to > innobase_next_autoinc > > --- > mysql-test/suite/innodb/r/innodb-autoinc.result | 16 ++++++++++++++-- > mysql-test/suite/innodb/t/innodb-autoinc.test | 3 ++- > storage/innobase/handler/ha_innodb.cc | 16 +++++++--------- > storage/xtradb/handler/ha_innodb.cc | 16 +++++++--------- > 4 files changed, 30 insertions(+), 21 deletions(-) > > diff --git a/mysql-test/suite/innodb/r/innodb-autoinc.result > b/mysql-test/suite/innodb/r/innodb-autoinc.result > index 6ac8bb5..ddca468 100644 > --- a/mysql-test/suite/innodb/r/innodb-autoinc.result > +++ b/mysql-test/suite/innodb/r/innodb-autoinc.result > @@ -567,7 +567,7 @@ Variable_name Value > auto_increment_increment 65535 > auto_increment_offset 65535 > INSERT INTO t1 VALUES (NULL),(NULL); > -ERROR 22003: Out of range value for column 'c1' at row 1 > +ERROR HY000: Failed to read auto-increment value from storage engine > SELECT * FROM t1; > c1 > 1 > @@ -641,6 +641,18 @@ PRIMARY KEY (m)) ENGINE = InnoDB; > INSERT INTO t2 (n,o) VALUES > (1 , 'true'), (1 , 'false'), (2 , 'true'), (2 , 'false'), (3 , 'true'), > (3 , 'false'), (4 , 'true'), (4 , 'false'), (5 , 'true'), (5 , 'false'); > +SELECT * FROM t2; > +m n o > +1 1 TRUE > +2 1 FALSE > +3 2 TRUE > +4 2 FALSE > +5 3 TRUE > +6 3 FALSE > +7 4 TRUE > +8 4 FALSE > +9 5 TRUE > +10 5 FALSE > SHOW CREATE TABLE t2; > Table Create Table > t2 CREATE TABLE `t2` ( > @@ -648,7 +660,7 @@ t2 CREATE TABLE `t2` ( > `n` int(10) unsigned NOT NULL, > `o` enum('FALSE','TRUE') DEFAULT NULL, > PRIMARY KEY (`m`) > -) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=latin1 > +) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=latin1 > INSERT INTO t1 (b,c) SELECT n,o FROM t2 ; > SHOW CREATE TABLE t1; > Table Create Table > diff --git a/mysql-test/suite/innodb/t/innodb-autoinc.test > b/mysql-test/suite/innodb/t/innodb-autoinc.test > index ab708e8..dd4c4ae 100644 > --- a/mysql-test/suite/innodb/t/innodb-autoinc.test > +++ b/mysql-test/suite/innodb/t/innodb-autoinc.test > @@ -349,7 +349,7 @@ INSERT INTO t1 VALUES (18446744073709551610); #-- 2^64 > - 2 > SELECT * FROM t1; > SET @@SESSION.AUTO_INCREMENT_INCREMENT=1152921504606846976, > @@SESSION.AUTO_INCREMENT_OFFSET=1152921504606846976; > SHOW VARIABLES LIKE "auto_inc%"; > ---error 167 > +--error 1467 > INSERT INTO t1 VALUES (NULL),(NULL); > SELECT * FROM t1; > DROP TABLE t1; > @@ -401,6 +401,7 @@ CREATE TABLE t2 ( > INSERT INTO t2 (n,o) VALUES > (1 , 'true'), (1 , 'false'), (2 , 'true'), (2 , 'false'), (3 , 'true'), > (3 , 'false'), (4 , 'true'), (4 , 'false'), (5 , 'true'), (5 , 'false'); > +SELECT * FROM t2; > SHOW CREATE TABLE t2; > INSERT INTO t1 (b,c) SELECT n,o FROM t2 ; > SHOW CREATE TABLE t1; > diff --git a/storage/innobase/handler/ha_innodb.cc > b/storage/innobase/handler/ha_innodb.cc > index daa649a..bf86071 100644 > --- a/storage/innobase/handler/ha_innodb.cc > +++ b/storage/innobase/handler/ha_innodb.cc > @@ -2283,10 +2283,11 @@ innobase_next_autoinc( > if (next_value == 0) { > ulonglong next; > > - if (current > offset) { > + if (current >= offset) { > next = (current - offset) / step; > } else { > - next = (offset - current) / step; > + next = 0; > + block -= step; > } > > ut_a(max_value > next); > @@ -15542,10 +15543,7 @@ ha_innobase::get_auto_increment( > > current = *first_value; > > - /* If the increment step of the auto increment column > - decreases then it is not affecting the immediate > - next value in the series. */ > - if (prebuilt->autoinc_increment > increment) { > + if (prebuilt->autoinc_increment != increment) { > > WSREP_DEBUG("autoinc decrease: %llu -> %llu\n" > "THD: %ld, current: %llu, autoinc: > %llu", > @@ -15553,13 +15551,13 @@ ha_innobase::get_auto_increment( > increment, > thd_get_thread_id(ha_thd()), > current, autoinc); > - if (!wsrep_on(ha_thd())) > + if (!wsrep_auto_increment_control || > !wsrep_on(ha_thd())) > { > - current = autoinc - prebuilt->autoinc_increment; > + current = autoinc - > prebuilt->autoinc_increment; > } > > current = innobase_next_autoinc( > - current, 1, increment, 1, col_max_value); > + current, 1, increment, offset, > col_max_value); > > dict_table_autoinc_initialize(prebuilt->table, > current); > > diff --git a/storage/xtradb/handler/ha_innodb.cc > b/storage/xtradb/handler/ha_innodb.cc > index 4aa5457..6659989 100644 > --- a/storage/xtradb/handler/ha_innodb.cc > +++ b/storage/xtradb/handler/ha_innodb.cc > @@ -2556,10 +2556,11 @@ innobase_next_autoinc( > if (next_value == 0) { > ulonglong next; > > - if (current > offset) { > + if (current >= offset) { > next = (current - offset) / step; > } else { > - next = (offset - current) / step; > + next = 0; > + block -= step; > } > > ut_a(max_value > next); > @@ -16178,10 +16179,7 @@ ha_innobase::get_auto_increment( > > current = *first_value; > > - /* If the increment step of the auto increment column > - decreases then it is not affecting the immediate > - next value in the series. */ > - if (prebuilt->autoinc_increment > increment) { > + if (prebuilt->autoinc_increment != increment) { > > WSREP_DEBUG("autoinc decrease: %llu -> %llu\n" > "THD: %ld, current: %llu, autoinc: > %llu", > @@ -16189,13 +16187,13 @@ ha_innobase::get_auto_increment( > increment, > thd_get_thread_id(ha_thd()), > current, autoinc); > - if (!wsrep_on(ha_thd())) > + if (!wsrep_auto_increment_control || > !wsrep_on(ha_thd())) > { > - current = autoinc - prebuilt->autoinc_increment; > + current = autoinc - > prebuilt->autoinc_increment; > } > > current = innobase_next_autoinc( > - current, 1, increment, 1, col_max_value); > + current, 1, increment, offset, > col_max_value); > > dict_table_autoinc_initialize(prebuilt->table, > current); > > _______________________________________________ > commits mailing list > commits(a)mariadb.org > https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits

1 0