diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-07-03 11:55:36 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-07-03 11:55:36 +0300 |
| commit | 2373397e13d4004816b61df38a234906eb361e0d (patch) | |
| tree | 4e483a8cee2c75d62005137058f7fc6cf866aaf7 /include | |
| parent | 582d23a188c03568e0a6b2638e1b643ad9c6b714 (diff) | |
| download | mariadb-git-2373397e13d4004816b61df38a234906eb361e0d.tar.gz | |
Cleaner implementation if INSERT ... SELECT with same tables
Tests cleanup (put drop database first in tests)
client/mysql.cc:
Cleanup of code in last pull
include/config-win.h:
Remove HAVE_CHSIZE on windows as it's not 64 bit clean
include/my_global.h:
Portability fix
mysql-test/r/drop.result:
Clean up results
mysql-test/r/flush.result:
Clean up results
mysql-test/r/grant_cache.result:
Clean up results
mysql-test/r/innodb.result:
Clean up results
mysql-test/r/insert_select.result:
Clean up results
mysql-test/r/merge.result:
Clean up results
mysql-test/r/query_cache.result:
Clean up results
mysql-test/t/drop.test:
Clean up tests
mysql-test/t/flush.test:
Clean up tests
mysql-test/t/grant_cache.test:
Clean up tests
mysql-test/t/innodb.test:
Clean up tests
mysql-test/t/insert_select.test:
Added more tests
mysql-test/t/merge.test:
Test of bug 515
mysql-test/t/query_cache.test:
Clean up tests
mysql-test/t/symlink.test:
Clean up tests
sql/mysql_priv.h:
Cleaner implementation if INSERT ... SELECT with same tables
sql/sql_lex.h:
Cleaner implementation if INSERT ... SELECT with same tables
sql/sql_list.h:
Indentation cleanup
sql/sql_parse.cc:
Cleaner implementation if INSERT ... SELECT with same tables
sql/sql_yacc.yy:
Cleaner implementation if INSERT ... SELECT with same tables
Diffstat (limited to 'include')
| -rw-r--r-- | include/config-win.h | 1 | ||||
| -rw-r--r-- | include/my_global.h | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/config-win.h b/include/config-win.h index 096c00e4574..69020636893 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -246,7 +246,6 @@ inline double ulonglong2double(ulonglong value) #define HAVE_PERROR #define HAVE_VFPRINT -#define HAVE_CHSIZE /* System has chsize() function */ #define HAVE_RENAME /* Have rename() as function */ #define HAVE_BINARY_STREAMS /* Have "b" flag in streams */ #define HAVE_LONG_JMP /* Have long jump function */ diff --git a/include/my_global.h b/include/my_global.h index 03f4db1b5ab..673e5a22868 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -893,8 +893,11 @@ typedef union { double v; long m[2]; } doubleget_union; -#define doubleget(V,M) { ((doubleget_union *)&V)->m[0] = *((long*) M); \ - ((doubleget_union *)&V)->m[1] = *(((long*) M)+1); } +#define doubleget(V,M) \ +{ doubleget_union _tmp; \ + _tmp.m[0] = *((long*)(M)); \ + _tmp.m[1] = *(((long*) (M))+1); \ + (V) = _tmp.v; } #define doublestore(T,V) { *((long *) T) = ((doubleget_union *)&V)->m[0]; \ *(((long *) T)+1) = ((doubleget_union *)&V)->m[1]; } #define float4get(V,M) { *((long *) &(V)) = *((long*) (M)); } |