database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

* Updated auto_increment_xxx_func.result to reflect the changes

Browse Source 
made by https://bugs.launchpad.net/codership-mysql/+bug/587170

* Fix for some compiler errors/warnings.
This commit is contained in:
Nirbhay Choubey
2013-12-10 22:11:42 -05:00
parent e1ed3dcebf
commit 48e83ba6f7
8 changed files with 44 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mysql-test/suite/sys_vars/r/auto_increment_increment_func.result
View File

@@ -142,8 +142,8 @@ id name
116 Record_10 116 Record_10
117 Record_11 117 Record_11
119 Record_12 119 Record_12
121 Record_13 120 Record_13
123 Record_14 121 Record_14
## Changing column's datatype to BigInt and verifying variable's behavior ## ## Changing column's datatype to BigInt and verifying variable's behavior ##
ALTER table t1 MODIFY id BIGINT NOT NULL auto_increment; ALTER table t1 MODIFY id BIGINT NOT NULL auto_increment;
INSERT into t1(name) values('Record_15'); INSERT into t1(name) values('Record_15');
@@ -159,10 +159,10 @@ id name
116 Record_10 116 Record_10
117 Record_11 117 Record_11
119 Record_12 119 Record_12
121 Record_13 120 Record_13
123 Record_14 121 Record_14
125 Record_15 122 Record_15
127 Record_16 123 Record_16
'#--------------------FN_DYNVARS_001_07-------------------------#' '#--------------------FN_DYNVARS_001_07-------------------------#'
## Verifying behavior of variable with negative value ## ## Verifying behavior of variable with negative value ##
SET @@auto_increment_increment = -10; SET @@auto_increment_increment = -10;
@@ -181,12 +181,12 @@ id name
116 Record_10 116 Record_10
117 Record_11 117 Record_11
119 Record_12 119 Record_12
121 Record_13 120 Record_13
123 Record_14 121 Record_14
125 Record_15 122 Record_15
127 Record_16 123 Record_16
128 Record_17 124 Record_17
129 Record_18 125 Record_18
## Disconnecting test_con2 ## ## Disconnecting test_con2 ##
## Dropping table t1 ## ## Dropping table t1 ##
DROP table if exists t1; DROP table if exists t1;

44
mysql-test/suite/sys_vars/r/auto_increment_offset_func.result
View File

@@ -144,8 +144,8 @@ id name
125 Record_12 125 Record_12
134 Record_13 134 Record_13
140 Record_14 140 Record_14
150 Record_15 141 Record_15
160 Record_16 142 Record_16
## Changing datatype of column id with primary key to BigInt ## ## Changing datatype of column id with primary key to BigInt ##
ALTER table t1 modify id BIGINT NOT NULL auto_increment; ALTER table t1 modify id BIGINT NOT NULL auto_increment;
INSERT into t1(name) values('Record_17'); INSERT into t1(name) values('Record_17');
@@ -166,10 +166,10 @@ id name
125 Record_12 125 Record_12
134 Record_13 134 Record_13
140 Record_14 140 Record_14
150 Record_15 141 Record_15
160 Record_16 142 Record_16
170 Record_17 143 Record_17
180 Record_18 144 Record_18
'#--------------------FN_DYNVARS_002_07-------------------------#' '#--------------------FN_DYNVARS_002_07-------------------------#'
## Assigning -ve value to variable ## ## Assigning -ve value to variable ##
SET @@auto_increment_offset = -10; SET @@auto_increment_offset = -10;
@@ -196,12 +196,12 @@ id name
125 Record_12 125 Record_12
134 Record_13 134 Record_13
140 Record_14 140 Record_14
150 Record_15 141 Record_15
160 Record_16 142 Record_16
170 Record_17 143 Record_17
180 Record_18 144 Record_18
181 Record_17 145 Record_17
191 Record_18 146 Record_18
## Assigning value that is out of range of variable ## ## Assigning value that is out of range of variable ##
SET @@auto_increment_offset = 65536; SET @@auto_increment_offset = 65536;
Warnings: Warnings:
@@ -229,16 +229,16 @@ id name
125 Record_12 125 Record_12
134 Record_13 134 Record_13
140 Record_14 140 Record_14
150 Record_15 141 Record_15
160 Record_16 142 Record_16
170 Record_17 143 Record_17
180 Record_18 144 Record_18
181 Record_17 145 Record_17
191 Record_18 146 Record_18
199 Record_17 147 Record_17
209 Record_18 148 Record_18
219 Record_19 149 Record_19
229 Record_20 150 Record_20
## No effect of auto_increment_offset since value of this variable is greater ## ## No effect of auto_increment_offset since value of this variable is greater ##
## than auto_increment_increment ## ## than auto_increment_increment ##
## Dropping table ## ## Dropping table ##

3
mysys/my_delete.c
View File

@@ -150,4 +150,5 @@ error:
my_osmaperr(last_error); my_osmaperr(last_error);
DBUG_RETURN(-1); DBUG_RETURN(-1);
} }
#endif #endif

2
sql/mysqld.cc
View File

@@ -4464,8 +4464,10 @@ will be ignored as the --log-bin option is not defined.");
if (wsrep_before_SE()) if (wsrep_before_SE())
{ {
#ifndef EMBEDDED_LIBRARY
set_ports(); // this is also called in network_init() later but we need set_ports(); // this is also called in network_init() later but we need
// to know mysqld_port now - lp:1071882 // to know mysqld_port now - lp:1071882
#endif /* !EMBEDDED_LIBRARY */
wsrep_init_startup(true); wsrep_init_startup(true);
} }
} }

2
sql/sql_parse.cc
View File

@@ -8193,7 +8193,7 @@ void wsrep_write_rbr_buf(
FILE *of= fopen(filename, "wb"); FILE *of= fopen(filename, "wb");
if (of) if (of)
{ {
fwrite (rbr_buf, buf_len, 1, of); (void) fwrite (rbr_buf, buf_len, 1, of);
fclose(of); fclose(of);
} }
else else

2
sql/wsrep_mysqld.h
View File

@@ -285,7 +285,7 @@ extern wsrep_seqno_t wsrep_locked_seqno;
WSREP_LOG(sql_print_information, "cluster conflict due to %s for threads:",\ WSREP_LOG(sql_print_information, "cluster conflict due to %s for threads:",\
(bf_abort) ? "high priority abort" : "certification failure" \ (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"); \ if (victim_thd) WSREP_LOG_CONFLICT_THD(victim_thd, "Victim thread"); \
} }

4
storage/innobase/ut/ut0ut.c
View File

@@ -554,7 +554,7 @@ ut_print_namel(
trx ? trx->mysql_thd : NULL, trx ? trx->mysql_thd : NULL,
table_id); 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 ? (size_t) len
: sizeof buf; : sizeof buf;
size_t size = fread(buf, 1, maxs, src); size_t size = fread(buf, 1, maxs, src);
fwrite(buf, 1, size, dest); (void) fwrite(buf, 1, size, dest);
len -= (long) size; len -= (long) size;
if (size < maxs) { if (size < maxs) {
break; break;

2
storage/xtradb/buf/buf0buf.c
View File

@@ -2537,7 +2537,9 @@ loop:
rw_lock_s_unlock(&buf_pool->page_hash_latch); rw_lock_s_unlock(&buf_pool->page_hash_latch);
} }
#if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG
loop2: loop2:
#endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */
if (block && buf_pool_watch_is_sentinel(buf_pool, &block->page)) { if (block && buf_pool_watch_is_sentinel(buf_pool, &block->page)) {
mutex_exit(block_mutex); mutex_exit(block_mutex);
block = NULL; block = NULL;