summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorunknown <monty@narttu.mysql.fi>2003-03-18 03:19:20 +0200
committerunknown <monty@narttu.mysql.fi>2003-03-18 03:19:20 +0200
commitf3a5ccf53ebf86a775fa0190e41edf5ae4dc1ac3 (patch)
treeda8cf393b1fa3a8b2096289ccb606a372e734759 /strings
parent71dabe96446df03a5e2db34a536ea22624aa22cd (diff)
parent321cbe2d9aeb7299e8cc569a47a47b4b27b89cd0 (diff)
downloadmariadb-git-f3a5ccf53ebf86a775fa0190e41edf5ae4dc1ac3.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.c2
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"