diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-10-19 14:16:15 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-10-19 14:16:15 +0200 |
| commit | c6ccd3f34693198883d905b98638db49ea6e6a76 (patch) | |
| tree | ca49772d376816b7d08173489e9eae4447eef0d7 /storage/xtradb/include/ut0lst.h | |
| parent | f0c6576b85a57ec82fd911f73cce7c99683b378c (diff) | |
| parent | 4f907dc75b44bca9d9f3c293e7ada0911645837d (diff) | |
| download | mariadb-git-c6ccd3f34693198883d905b98638db49ea6e6a76.tar.gz | |
Merge XtraDB from Percona-server-5.1.51-12 into MariaDB.
Diffstat (limited to 'storage/xtradb/include/ut0lst.h')
| -rw-r--r-- | storage/xtradb/include/ut0lst.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/xtradb/include/ut0lst.h b/storage/xtradb/include/ut0lst.h index 4305f6571b5..245dfc226c3 100644 --- a/storage/xtradb/include/ut0lst.h +++ b/storage/xtradb/include/ut0lst.h @@ -269,10 +269,10 @@ do { \ TYPE* ut_list_node_313; \ \ if ((BASE).start) \ - (BASE).start = (void*)((char*)((BASE).start) \ + (BASE).start = (void*)((byte*)((BASE).start) \ + (((void*)((BASE).start) > (void*)FADDR)?FOFFSET:BOFFSET));\ if ((BASE).end) \ - (BASE).end = (void*)((char*)((BASE).end) \ + (BASE).end = (void*)((byte*)((BASE).end) \ + (((void*)((BASE).end) > (void*)FADDR)?FOFFSET:BOFFSET));\ \ ut_list_node_313 = (BASE).start; \ @@ -280,10 +280,10 @@ do { \ for (ut_list_i_313 = (BASE).count; ut_list_i_313--; ) { \ ut_a(ut_list_node_313); \ if ((ut_list_node_313->NAME).prev) \ - (ut_list_node_313->NAME).prev = (void*)((char*)((ut_list_node_313->NAME).prev) \ + (ut_list_node_313->NAME).prev = (void*)((byte*)((ut_list_node_313->NAME).prev)\ + (((void*)((ut_list_node_313->NAME).prev) > (void*)FADDR)?FOFFSET:BOFFSET));\ if ((ut_list_node_313->NAME).next) \ - (ut_list_node_313->NAME).next = (void *)((char*)((ut_list_node_313->NAME).next) \ + (ut_list_node_313->NAME).next = (void*)((byte*)((ut_list_node_313->NAME).next)\ + (((void*)((ut_list_node_313->NAME).next)> (void*)FADDR)?FOFFSET:BOFFSET));\ ut_list_node_313 = (ut_list_node_313->NAME).next; \ } \ |