Below is the list of changes that have just been committed into a local
4.1 repository of marko. When marko does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.2085 05/03/07 12:03:33 marko@stripped +16 -0
InnoDB: Portability fixes for warnings reported on IA-64 Windows
innobase/ut/ut0ut.c
1.28 05/03/07 12:03:27 marko@stripped +1 -1
Make implicit type conversion explicit
innobase/trx/trx0sys.c
1.31 05/03/07 12:03:27 marko@stripped +2 -1
Declare trx_sys_mysql_bin_log_pos_high and
trx_sys_mysql_bin_log_pos_low with a matching data type
innobase/row/row0sel.c
1.66 05/03/07 12:03:27 marko@stripped +4 -4
Portability fix: Use %p for printing pointers
innobase/row/row0mysql.c
1.89 05/03/07 12:03:27 marko@stripped +6 -6
Make implicit type conversions explicit
innobase/rem/rem0cmp.c
1.23 05/03/07 12:03:27 marko@stripped +8 -5
Make implicit type conversions explicit
innobase/os/os0thread.c
1.27 05/03/07 12:03:27 marko@stripped +2 -2
Add DWORD casts for Windows
innobase/os/os0sync.c
1.24 05/03/07 12:03:27 marko@stripped +2 -2
Add DWORD casts for Windows
innobase/os/os0file.c
1.99 05/03/07 12:03:26 marko@stripped +11 -11
Add DWORD casts for Windows
innobase/mem/mem0dbg.c
1.17 05/03/07 12:03:26 marko@stripped +1 -1
Portability fix: Use %p for printing pointers
innobase/include/pars0sym.h
1.4 05/03/07 12:03:26 marko@stripped +1 -1
Remove implicit type conversion
innobase/include/pars0pars.h
1.7 05/03/07 12:03:26 marko@stripped +1 -1
Remove implicit type conversion
innobase/include/page0page.ic
1.7 05/03/07 12:03:26 marko@stripped +4 -4
Portability fix: Use %p for printing pointers
innobase/include/mem0mem.ic
1.11 05/03/07 12:03:26 marko@stripped +1 -1
Remove implicit type conversion
innobase/eval/eval0proc.c
1.2 05/03/07 12:03:26 marko@stripped +1 -1
Declare loop_var_value with a matching data type.
innobase/dict/dict0dict.c
1.61 05/03/07 12:03:26 marko@stripped +3 -2
Properly cast the arguments of toupper()
innobase/buf/buf0lru.c
1.21 05/03/07 12:03:26 marko@stripped +3 -3
Portability fix: Use %p for printing pointers
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: marko
# Host: hundin.mysql.fi
# Root: /home/marko/mysql-4.1
--- 1.20/innobase/buf/buf0lru.c Fri Nov 26 00:09:24 2004
+++ 1.21/innobase/buf/buf0lru.c Mon Mar 7 12:03:26 2005
@@ -877,11 +877,11 @@
(ulong) block->offset);
if (buf_page_hash_get(block->space, block->offset)) {
fprintf(stderr,
-"InnoDB: From hash table we find block %lx of %lu %lu which is not %lx\n",
- (ulong) buf_page_hash_get(block->space, block->offset),
+"InnoDB: From hash table we find block %p of %lu %lu which is not %p\n",
+ buf_page_hash_get(block->space, block->offset),
(ulong) buf_page_hash_get(block->space, block->offset)->space,
(ulong) buf_page_hash_get(block->space, block->offset)->offset,
- (ulong) block);
+ block);
}
#ifdef UNIV_DEBUG
--- 1.60/innobase/dict/dict0dict.c Mon Feb 28 11:59:40 2005
+++ 1.61/innobase/dict/dict0dict.c Mon Mar 7 12:03:26 2005
@@ -2292,8 +2292,9 @@
/* Outside quotes: look for the keyword. */
ulint i;
for (i = 0; string[i]; i++) {
- if (toupper((ulint)(ptr[i]))
- != toupper((ulint)(string[i]))) {
+ if (toupper((int)(unsigned char)(ptr[i]))
+ != toupper((int)(unsigned char)
+ (string[i]))) {
goto nomatch;
}
}
--- 1.1/innobase/eval/eval0proc.c Sat Feb 17 14:19:00 2001
+++ 1.2/innobase/eval/eval0proc.c Mon Mar 7 12:03:26 2005
@@ -161,7 +161,7 @@
{
for_node_t* node;
que_node_t* parent;
- int loop_var_value;
+ lint loop_var_value;
ut_ad(thr);
--- 1.10/innobase/include/mem0mem.ic Thu Oct 7 20:50:24 2004
+++ 1.11/innobase/include/mem0mem.ic Mon Mar 7 12:03:26 2005
@@ -606,7 +606,7 @@
char* dst;
char* d;
const char* s = str;
- int len = strlen(str) + 3;
+ size_t len = strlen(str) + 3;
/* calculate the number of quote characters in the string */
while((s = strchr(s, q)) != NULL) {
s++;
--- 1.6/innobase/include/page0page.ic Fri Jul 30 17:02:05 2004
+++ 1.7/innobase/include/page0page.ic Mon Mar 7 12:03:26 2005
@@ -484,10 +484,10 @@
"InnoDB: Next record offset is nonsensical %lu in record at offset %lu\n",
(ulong)offs, (ulong)(rec - page));
fprintf(stderr,
-"\nInnoDB: rec address %lx, first buffer frame %lx\n"
-"InnoDB: buffer pool high end %lx, buf fix count %lu\n",
- (ulong)rec, (ulong)buf_pool->frame_zero,
- (ulong)buf_pool->high_end,
+"\nInnoDB: rec address %p, first buffer frame %p\n"
+"InnoDB: buffer pool high end %p, buf fix count %lu\n",
+ rec, buf_pool->frame_zero,
+ buf_pool->high_end,
(ulong)buf_block_align(rec)->buf_fix_count);
buf_page_print(page);
--- 1.6/innobase/include/pars0pars.h Mon May 17 14:40:25 2004
+++ 1.7/innobase/include/pars0pars.h Mon Mar 7 12:03:26 2005
@@ -414,7 +414,7 @@
/* Struct used to denote a reserved word in a parsing tree */
struct pars_res_word_struct{
- ulint code; /* the token code for the reserved word from
+ int code; /* the token code for the reserved word from
pars0grm.h */
};
--- 1.3/innobase/include/pars0sym.h Mon May 17 14:40:25 2004
+++ 1.4/innobase/include/pars0sym.h Mon Mar 7 12:03:26 2005
@@ -152,7 +152,7 @@
parser */
const char* sql_string;
/* SQL string to parse */
- int string_len;
+ size_t string_len;
/* SQL string length */
int next_char_pos;
/* position of the next character in
--- 1.16/innobase/mem/mem0dbg.c Fri Jun 25 19:47:03 2004
+++ 1.17/innobase/mem/mem0dbg.c Mon Mar 7 12:03:26 2005
@@ -445,7 +445,7 @@
&& (mem_block_get_len(block) > UNIV_PAGE_SIZE)) {
fprintf(stderr,
-"InnoDB: Error: mem block %lx length %lu > UNIV_PAGE_SIZE\n", (ulong) block,
+"InnoDB: Error: mem block %p length %lu > UNIV_PAGE_SIZE\n", block,
(ulong) mem_block_get_len(block));
/* error */
--- 1.98/innobase/os/os0file.c Thu Mar 3 17:49:12 2005
+++ 1.99/innobase/os/os0file.c Mon Mar 7 12:03:26 2005
@@ -2042,8 +2042,8 @@
ut_ad(buf);
ut_ad(n > 0);
- low = offset;
- high = offset_high;
+ low = (DWORD) offset;
+ high = (DWORD) offset_high;
/* Protect the seek / read operation with a mutex */
i = ((ulint) file) % OS_FILE_N_SEEK_MUTEXES;
@@ -2059,7 +2059,7 @@
goto error_handling;
}
- ret = ReadFile(file, buf, n, &len, NULL);
+ ret = ReadFile(file, buf, (DWORD) n, &len, NULL);
os_mutex_exit(os_file_seek_mutexes[i]);
@@ -2145,8 +2145,8 @@
ut_ad(buf);
ut_ad(n > 0);
- low = offset;
- high = offset_high;
+ low = (DWORD) offset;
+ high = (DWORD) offset_high;
/* Protect the seek / read operation with a mutex */
i = ((ulint) file) % OS_FILE_N_SEEK_MUTEXES;
@@ -2162,7 +2162,7 @@
goto error_handling;
}
- ret = ReadFile(file, buf, n, &len, NULL);
+ ret = ReadFile(file, buf, (DWORD) n, &len, NULL);
os_mutex_exit(os_file_seek_mutexes[i]);
@@ -2231,8 +2231,8 @@
ut_ad(buf);
ut_ad(n > 0);
retry:
- low = offset;
- high = offset_high;
+ low = (DWORD) offset;
+ high = (DWORD) offset_high;
/* Protect the seek / write operation with a mutex */
i = ((ulint) file) % OS_FILE_N_SEEK_MUTEXES;
@@ -2259,7 +2259,7 @@
return(FALSE);
}
- ret = WriteFile(file, buf, n, &len, NULL);
+ ret = WriteFile(file, buf, (DWORD) n, &len, NULL);
/* Always do fsync to reduce the probability that when the OS crashes,
a database page is only partially physically written to disk. */
@@ -3244,7 +3244,7 @@
#ifdef WIN_ASYNC_IO
ibool retval;
BOOL ret = TRUE;
- DWORD len = n;
+ DWORD len = (DWORD) n;
void* dummy_mess1;
void* dummy_mess2;
ulint dummy_type;
@@ -4091,7 +4091,7 @@
if (os_n_file_reads == os_n_file_reads_old) {
avg_bytes_read = 0.0;
} else {
- avg_bytes_read = os_bytes_read_since_printout /
+ avg_bytes_read = (double) os_bytes_read_since_printout /
(os_n_file_reads - os_n_file_reads_old);
}
--- 1.23/innobase/os/os0sync.c Mon May 17 14:40:26 2004
+++ 1.24/innobase/os/os0sync.c Mon Mar 7 12:03:27 2005
@@ -361,7 +361,7 @@
ut_a(event);
if (time != OS_SYNC_INFINITE_TIME) {
- err = WaitForSingleObject(event->handle, time / 1000);
+ err = WaitForSingleObject(event->handle, (DWORD) time / 1000);
} else {
err = WaitForSingleObject(event->handle, INFINITE);
}
@@ -408,7 +408,7 @@
ut_a(native_event_array);
ut_a(n > 0);
- index = WaitForMultipleObjects(n, native_event_array,
+ index = WaitForMultipleObjects((DWORD) n, native_event_array,
FALSE, /* Wait for any 1 event */
INFINITE); /* Infinite wait time
limit */
--- 1.26/innobase/os/os0thread.c Thu May 27 12:03:14 2004
+++ 1.27/innobase/os/os0thread.c Mon Mar 7 12:03:27 2005
@@ -100,7 +100,7 @@
{
#ifdef __WIN__
os_thread_t thread;
- ulint win_thread_id;
+ DWORD win_thread_id;
os_mutex_enter(os_sync_mutex);
os_thread_count++;
@@ -253,7 +253,7 @@
ulint tm) /* in: time in microseconds */
{
#ifdef __WIN__
- Sleep(tm / 1000);
+ Sleep((DWORD) tm / 1000);
#elif defined(__NETWARE__)
delay(tm / 1000);
#else
--- 1.22/innobase/rem/rem0cmp.c Fri Dec 17 18:35:05 2004
+++ 1.23/innobase/rem/rem0cmp.c Mon Mar 7 12:03:27 2005
@@ -321,7 +321,9 @@
&& dtype_get_charset_coll(cur_type->prtype) !=
data_mysql_latin1_swedish_charset_coll)) {
- return(cmp_whole_field(cur_type, data1, len1, data2, len2));
+ return(cmp_whole_field(cur_type,
+ data1, (unsigned) len1,
+ data2, (unsigned) len2));
}
/* Compare then the fields */
@@ -527,8 +529,9 @@
ret = cmp_whole_field(
cur_type,
- dfield_get_data(dtuple_field), dtuple_f_len,
- rec_b_ptr, rec_f_len);
+ dfield_get_data(dtuple_field),
+ (unsigned) dtuple_f_len,
+ rec_b_ptr, (unsigned) rec_f_len);
if (ret != 0) {
cur_bytes = 0;
@@ -851,8 +854,8 @@
data_mysql_latin1_swedish_charset_coll)) {
ret = cmp_whole_field(cur_type,
- rec1_b_ptr, rec1_f_len,
- rec2_b_ptr, rec2_f_len);
+ rec1_b_ptr, (unsigned) rec1_f_len,
+ rec2_b_ptr, (unsigned) rec2_f_len);
if (ret != 0) {
cur_bytes = 0;
--- 1.88/innobase/row/row0mysql.c Sun Feb 13 21:05:10 2005
+++ 1.89/innobase/row/row0mysql.c Mon Mar 7 12:03:27 2005
@@ -745,7 +745,7 @@
trx->op_info = "";
- return(err);
+ return((int) err);
}
que_thr_stop_for_mysql_no_error(thr, trx);
@@ -839,7 +839,7 @@
trx->op_info = "";
- return(err);
+ return((int) err);
}
que_thr_stop_for_mysql_no_error(thr, trx);
@@ -954,7 +954,7 @@
trx->op_info = "";
- return(err);
+ return((int) err);
}
que_thr_stop_for_mysql_no_error(thr, trx);
@@ -1202,7 +1202,7 @@
trx->op_info = "";
- return(err);
+ return((int) err);
}
que_thr_stop_for_mysql_no_error(thr, trx);
@@ -1367,7 +1367,7 @@
}
else {
int status;
- int namelen = strlen(table->name);
+ int namelen = (int) strlen(table->name);
char* old_name = mem_strdupl(table->name, namelen);
/* replace "rsql" with "#sql" */
old_name[ptr - table->name + 1] = '#';
@@ -1857,7 +1857,7 @@
trx_free_for_background(trx);
- return(error);
+ return((int) error);
}
/*************************************************************************
--- 1.65/innobase/row/row0sel.c Tue Mar 1 20:45:38 2005
+++ 1.66/innobase/row/row0sel.c Mon Mar 7 12:03:27 2005
@@ -3326,10 +3326,10 @@
ut_print_timestamp(stderr);
buf_page_print(buf_frame_align(rec));
fprintf(stderr,
-"\nInnoDB: rec address %lx, first buffer frame %lx\n"
-"InnoDB: buffer pool high end %lx, buf block fix count %lu\n",
- (ulong)rec, (ulong)buf_pool->frame_zero,
- (ulong)buf_pool->high_end,
+"\nInnoDB: rec address %p, first buffer frame %p\n"
+"InnoDB: buffer pool high end %p, buf block fix count %lu\n",
+ rec, buf_pool->frame_zero,
+ buf_pool->high_end,
(ulong)buf_block_align(rec)->buf_fix_count);
fprintf(stderr,
"InnoDB: Index corruption: rec offs %lu next offs %lu, page no %lu,\n"
--- 1.30/innobase/trx/trx0sys.c Thu Jun 24 00:52:46 2004
+++ 1.31/innobase/trx/trx0sys.c Mon Mar 7 12:03:27 2005
@@ -666,7 +666,8 @@
{
trx_sysf_t* sys_header;
mtr_t mtr;
- ulong trx_sys_mysql_bin_log_pos_high, trx_sys_mysql_bin_log_pos_low;
+ ulint trx_sys_mysql_bin_log_pos_high;
+ ulint trx_sys_mysql_bin_log_pos_low;
mtr_start(&mtr);
--- 1.27/innobase/ut/ut0ut.c Fri Jan 28 21:48:58 2005
+++ 1.28/innobase/ut/ut0ut.c Mon Mar 7 12:03:27 2005
@@ -428,7 +428,7 @@
len < (long) sizeof buf ? (size_t) len : sizeof buf;
size_t size = fread(buf, 1, maxs, src);
fwrite(buf, 1, size, dest);
- len -= size;
+ len -= (long) size;
if (size < maxs) {
break;
}
| Thread |
|---|
| • bk commit into 4.1 tree (marko:1.2085) | Marko Mäkelä | 7 Mar |
