diff options
| author | unknown <ingo@mysql.com> | 2005-06-24 19:47:18 +0200 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2005-06-24 19:47:18 +0200 |
| commit | 2e6d41d13202d7c7756e502592340295af1684eb (patch) | |
| tree | afb4dd093ca8e3fdf8832f455c54e2b835bf00f8 /include | |
| parent | be3d7091703c73686e4d6097734245a40151c276 (diff) | |
| parent | a7e66efc2cc37b8ca32868ac8c8e3e3c05675e48 (diff) | |
| download | mariadb-git-2e6d41d13202d7c7756e502592340295af1684eb.tar.gz | |
Bug#10178 - failure to find a row in heap table by concurrent UPDATEs
Bug#10568 - Function 'LAST_DAY(date)' does not return NULL for invalid argument.
Manual merge.
include/my_global.h:
Auto merged
mysql-test/t/heap_hash.test:
Auto merged
sql/ha_heap.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
mysql-test/r/func_time.result:
Manual merge.
Used local for the backported fix for Bug#10568.
mysql-test/r/heap_hash.result:
Bug#10178 - failure to find a row in heap table by concurrent UPDATEs
Manual merge.
mysql-test/t/func_time.test:
Manual merge.
Used local for the backported fix for Bug#10568.
sql/ha_heap.cc:
Bug#10178 - failure to find a row in heap table by concurrent UPDATEs
Manual merge.
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/my_global.h b/include/my_global.h index 04d33be38b4..22ec6dfffd3 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -295,10 +295,8 @@ C_MODE_END #include <alloca.h> #endif #ifdef HAVE_ATOMIC_ADD -#if defined(__ia64__) #define new my_arg_new #define need_to_restore_new 1 -#endif C_MODE_START #include <asm/atomic.h> C_MODE_END |