diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-03-18 03:19:20 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-03-18 03:19:20 +0200 |
| commit | 21b0873a3ce5ee079b120199eb0423bdcff78c22 (patch) | |
| tree | da8cf393b1fa3a8b2096289ccb606a372e734759 /strings | |
| parent | 53bb7b6801d19a275933b4ec8308823699c30fbd (diff) | |
| parent | cf97cbd1db762c443aa3c1412f3e788559aaa5dd (diff) | |
| download | mariadb-git-21b0873a3ce5ee079b120199eb0423bdcff78c22.tar.gz | |
Merge with 3.23 to get fix for halloween problem on Update of InnoDB tables
innobase/row/row0mysql.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
sql/key.cc:
Auto merged
configure.in:
Merge with 3.23
mysql-test/r/innodb.result:
Merge with 3.23
mysql-test/t/innodb.test:
Merge with 3.23
strings/strto.c:
Merge with 3.23
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/strto.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/strings/strto.c b/strings/strto.c index c98b19a7e67..bd0c8e38fde 100644 --- a/strings/strto.c +++ b/strings/strto.c @@ -35,6 +35,8 @@ it can be compiled with the UNSIGNED and/or LONGLONG flag set */ +#define strtoll glob_strtoll /* Fix for True64 */ + #include <my_global.h> #include "m_string.h" #include "m_ctype.h" |