diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-10-28 19:04:23 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-10-28 19:04:23 +0200 |
| commit | 8e7ebfbce89a472b3c5a6c30e6de101e567a8218 (patch) | |
| tree | 9f9950feb45222c7df4f37c841f4af593ec75ee5 /storage/xtradb/include/ut0lst.h | |
| parent | 3bdede3c67032345ca5f71dd53ca308377dc2398 (diff) | |
| parent | 7c24e8d54d1d41374b7836e3273e7e5eaf22e2c4 (diff) | |
| download | mariadb-git-8e7ebfbce89a472b3c5a6c30e6de101e567a8218.tar.gz | |
5.2 merge
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; \ } \ |