mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 02:51:44 +01:00
edc89f7511
- Added --verbose to BUILD scripts to get make to write out compile commands. - Detect if AM_EXTRA_MAKEFLAGS=VERBOSE=1 was used with build scripts. - Don't write warnings about replication variables when doing bootstrap. - Fixed that mysql_cond_wait() and mysql_cond_timedwait() will report original source file in case of errors. - Ignore some compiler warnings BUILD/FINISH.sh: Detect if AM_EXTRA_MAKEFLAGS=VERBOSE=1 or --verbose was used BUILD/SETUP.sh: Added --verbose to print out the full compile lines Updated help message client/mysqltest.cc: Fixed that one can use 'replace' with cat_file cmake/configure.pl: If --verbose is used, get make to write out compile commands debian/dist/Debian/rules: Added $AM_EXTRA_MAKEFLAGS to get VERBOSE=1 on buildbot builds debian/dist/Ubuntu/rules: Added $AM_EXTRA_MAKEFLAGS to get VERBOSE=1 on buildbot builds include/my_pthread.h: Made set_timespec_time_nsec() more portable. include/mysql/psi/mysql_thread.h: Fixed that mysql_cond_wait() and mysql_cond_timedwait() will report original source file in case of errors. mysql-test/suite/innodb/r/auto_increment_dup.result: Fixed wrong DBUG_SYNC mysql-test/suite/innodb/t/auto_increment_dup.test: Fixed wrong DBUG_SYNC mysql-test/suite/perfschema/include/upgrade_check.inc: Make test more portable for changes in *.sql files mysql-test/suite/perfschema/r/pfs_upgrade.result: Updated test results mysql-test/valgrind.supp: Ignore running Aria checkpoint thread scripts/mysqlaccess.sh: Changed reference of bugs database Ensure that also client-server group is read. sql/handler.cc: Added missing syncpoint sql/mysqld.cc: Don't write warnings about replication variables when doing bootstrap sql/mysqld.h: Don't write warnings about replication variables when doing bootstrap sql/rpl_rli.cc: Don't write warnings about replication variables when doing bootstrap sql/sql_insert.cc: Don't mask SERVER_SHUTDOWN in insert_delayed This is done to be able to distingush between shutdown and interrupt errors support-files/compiler_warnings.supp: Ignore some compiler warnings in xtradb,innobase, oqgraph, yassl, string3.h
51 lines
1.2 KiB
Text
51 lines
1.2 KiB
Text
##########################################################################
|
|
# LP bug #1035225 / MySQL bug #66301: INSERT ... ON DUPLICATE KEY UPDATE +
|
|
# innodb_autoinc_lock_mode=1 is broken
|
|
##########################################################################
|
|
|
|
--source include/have_innodb.inc
|
|
--source include/have_debug_sync.inc
|
|
|
|
--disable_warnings
|
|
drop table if exists t1;
|
|
--enable_warnings
|
|
|
|
CREATE TABLE t1(
|
|
id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
|
|
k INT,
|
|
c CHAR(1),
|
|
UNIQUE KEY(k)) ENGINE=InnoDB;
|
|
|
|
--enable_info
|
|
|
|
--connect(con1, localhost, root)
|
|
--connect(con2, localhost, root)
|
|
|
|
--connection con1
|
|
|
|
--echo #
|
|
--echo # Connection 1
|
|
--echo #
|
|
SET DEBUG_SYNC='ha_write_row_end SIGNAL continue2 WAIT_FOR continue1';
|
|
--send INSERT INTO t1(k) VALUES (1), (2), (3) ON DUPLICATE KEY UPDATE c='1'
|
|
|
|
--connection con2
|
|
--echo #
|
|
--echo # Connection 2
|
|
--echo #
|
|
SET DEBUG_SYNC='ha_write_row_start WAIT_FOR continue2';
|
|
SET DEBUG_SYNC='after_mysql_insert SIGNAL continue1';
|
|
INSERT INTO t1(k) VALUES (2), (4), (5) ON DUPLICATE KEY UPDATE c='2';
|
|
|
|
--connection con1
|
|
--reap
|
|
--disable_info
|
|
SET DEBUG_SYNC='RESET';
|
|
SELECT * FROM t1 ORDER BY k;
|
|
|
|
--disconnect con1
|
|
--disconnect con2
|
|
|
|
--connection default
|
|
|
|
DROP TABLE t1;
|