diff options
| -rw-r--r-- | mysql-test/suite/sys_vars/r/auto_increment_increment_func.result | 24 | ||||
| -rw-r--r-- | mysql-test/suite/sys_vars/r/auto_increment_offset_func.result | 44 | ||||
| -rw-r--r-- | mysys/my_delete.c | 3 | ||||
| -rw-r--r-- | sql/mysqld.cc | 2 | ||||
| -rw-r--r-- | sql/sql_parse.cc | 2 | ||||
| -rw-r--r-- | sql/wsrep_mysqld.h | 2 | ||||
| -rw-r--r-- | storage/innobase/ut/ut0ut.c | 4 | ||||
| -rw-r--r-- | storage/xtradb/buf/buf0buf.c | 2 |
8 files changed, 44 insertions, 39 deletions
diff --git a/mysql-test/suite/sys_vars/r/auto_increment_increment_func.result b/mysql-test/suite/sys_vars/r/auto_increment_increment_func.result index df3ca1ab093..a7ce4e99e20 100644 --- a/mysql-test/suite/sys_vars/r/auto_increment_increment_func.result +++ b/mysql-test/suite/sys_vars/r/auto_increment_increment_func.result @@ -142,8 +142,8 @@ id name 116 Record_10 117 Record_11 119 Record_12 -121 Record_13 -123 Record_14 +120 Record_13 +121 Record_14 ## Changing column's datatype to BigInt and verifying variable's behavior ## ALTER table t1 MODIFY id BIGINT NOT NULL auto_increment; INSERT into t1(name) values('Record_15'); @@ -159,10 +159,10 @@ id name 116 Record_10 117 Record_11 119 Record_12 -121 Record_13 -123 Record_14 -125 Record_15 -127 Record_16 +120 Record_13 +121 Record_14 +122 Record_15 +123 Record_16 '#--------------------FN_DYNVARS_001_07-------------------------#' ## Verifying behavior of variable with negative value ## SET @@auto_increment_increment = -10; @@ -181,12 +181,12 @@ id name 116 Record_10 117 Record_11 119 Record_12 -121 Record_13 -123 Record_14 -125 Record_15 -127 Record_16 -128 Record_17 -129 Record_18 +120 Record_13 +121 Record_14 +122 Record_15 +123 Record_16 +124 Record_17 +125 Record_18 ## Disconnecting test_con2 ## ## Dropping table t1 ## DROP table if exists t1; diff --git a/mysql-test/suite/sys_vars/r/auto_increment_offset_func.result b/mysql-test/suite/sys_vars/r/auto_increment_offset_func.result index d2b5b828c04..58ecf95dae3 100644 --- a/mysql-test/suite/sys_vars/r/auto_increment_offset_func.result +++ b/mysql-test/suite/sys_vars/r/auto_increment_offset_func.result @@ -144,8 +144,8 @@ id name 125 Record_12 134 Record_13 140 Record_14 -150 Record_15 -160 Record_16 +141 Record_15 +142 Record_16 ## Changing datatype of column id with primary key to BigInt ## ALTER table t1 modify id BIGINT NOT NULL auto_increment; INSERT into t1(name) values('Record_17'); @@ -166,10 +166,10 @@ id name 125 Record_12 134 Record_13 140 Record_14 -150 Record_15 -160 Record_16 -170 Record_17 -180 Record_18 +141 Record_15 +142 Record_16 +143 Record_17 +144 Record_18 '#--------------------FN_DYNVARS_002_07-------------------------#' ## Assigning -ve value to variable ## SET @@auto_increment_offset = -10; @@ -196,12 +196,12 @@ id name 125 Record_12 134 Record_13 140 Record_14 -150 Record_15 -160 Record_16 -170 Record_17 -180 Record_18 -181 Record_17 -191 Record_18 +141 Record_15 +142 Record_16 +143 Record_17 +144 Record_18 +145 Record_17 +146 Record_18 ## Assigning value that is out of range of variable ## SET @@auto_increment_offset = 65536; Warnings: @@ -229,16 +229,16 @@ id name 125 Record_12 134 Record_13 140 Record_14 -150 Record_15 -160 Record_16 -170 Record_17 -180 Record_18 -181 Record_17 -191 Record_18 -199 Record_17 -209 Record_18 -219 Record_19 -229 Record_20 +141 Record_15 +142 Record_16 +143 Record_17 +144 Record_18 +145 Record_17 +146 Record_18 +147 Record_17 +148 Record_18 +149 Record_19 +150 Record_20 ## No effect of auto_increment_offset since value of this variable is greater ## ## than auto_increment_increment ## ## Dropping table ## diff --git a/mysys/my_delete.c b/mysys/my_delete.c index f5737ea66e0..881bcad9459 100644 --- a/mysys/my_delete.c +++ b/mysys/my_delete.c @@ -150,4 +150,5 @@ error: my_osmaperr(last_error); DBUG_RETURN(-1); } -#endif
\ No newline at end of file +#endif + diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 451269fcf56..849ceb1db39 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4464,8 +4464,10 @@ will be ignored as the --log-bin option is not defined."); if (wsrep_before_SE()) { +#ifndef EMBEDDED_LIBRARY set_ports(); // this is also called in network_init() later but we need // to know mysqld_port now - lp:1071882 +#endif /* !EMBEDDED_LIBRARY */ wsrep_init_startup(true); } } diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 21eb62149ca..e8e5d79b370 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -8193,7 +8193,7 @@ void wsrep_write_rbr_buf( FILE *of= fopen(filename, "wb"); if (of) { - fwrite (rbr_buf, buf_len, 1, of); + (void) fwrite (rbr_buf, buf_len, 1, of); fclose(of); } else diff --git a/sql/wsrep_mysqld.h b/sql/wsrep_mysqld.h index 37e72123c59..619711cc4b0 100644 --- a/sql/wsrep_mysqld.h +++ b/sql/wsrep_mysqld.h @@ -285,7 +285,7 @@ extern wsrep_seqno_t wsrep_locked_seqno; WSREP_LOG(sql_print_information, "cluster conflict due to %s for threads:",\ (bf_abort) ? "high priority abort" : "certification failure" \ ); \ - if (bf_thd) WSREP_LOG_CONFLICT_THD(bf_thd, "Winning thread"); \ + if (bf_thd != NULL) WSREP_LOG_CONFLICT_THD(bf_thd, "Winning thread"); \ if (victim_thd) WSREP_LOG_CONFLICT_THD(victim_thd, "Victim thread"); \ } diff --git a/storage/innobase/ut/ut0ut.c b/storage/innobase/ut/ut0ut.c index 699af1fcaa1..8b9501ee8bc 100644 --- a/storage/innobase/ut/ut0ut.c +++ b/storage/innobase/ut/ut0ut.c @@ -554,7 +554,7 @@ ut_print_namel( trx ? trx->mysql_thd : NULL, table_id); - fwrite(buf, 1, bufend - buf, f); + (void) fwrite(buf, 1, bufend - buf, f); } /**********************************************************************//** @@ -575,7 +575,7 @@ ut_copy_file( ? (size_t) len : sizeof buf; size_t size = fread(buf, 1, maxs, src); - fwrite(buf, 1, size, dest); + (void) fwrite(buf, 1, size, dest); len -= (long) size; if (size < maxs) { break; diff --git a/storage/xtradb/buf/buf0buf.c b/storage/xtradb/buf/buf0buf.c index f06fd4abfb1..f6d995068c1 100644 --- a/storage/xtradb/buf/buf0buf.c +++ b/storage/xtradb/buf/buf0buf.c @@ -2537,7 +2537,9 @@ loop: rw_lock_s_unlock(&buf_pool->page_hash_latch); } +#if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG loop2: +#endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */ if (block && buf_pool_watch_is_sentinel(buf_pool, &block->page)) { mutex_exit(block_mutex); block = NULL; |