summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2003-12-16 13:20:17 +0200
committerunknown <monty@mysql.com>2003-12-16 13:20:17 +0200
commit3357bc7ea31aa3432394d0a1a17c1b9b37547897 (patch)
tree7caf9e264c5defe6995ae178452a829c4064f97c /strings
parent38df192ed993ac8758f379e0402a8a8466e637a2 (diff)
downloadmariadb-git-3357bc7ea31aa3432394d0a1a17c1b9b37547897.tar.gz
Portability fixes (mostly test suite)
Make ENGINE= an alias for TYPE= (Compabiltiy with 4.1) Fix when using symlinked data files and realpath() is not working client/mysqltest.c: Copied mysqltest from 4.1 and modified this to compile in 4.0 This was needed to get replace_columns to work. include/my_sys.h: Stop compiler warnings about alloca on freebsd myisam/mi_check.c: Fix when using symlinked data files and realpath() is not working mysql-test/r/handler.result: test engine= mysql-test/r/rpl_max_relay_size.result: Use replace_columns to replace some 'not constant' columns mysql-test/r/rpl_rotate_logs.result: Use replace_columns to replace some 'not constant' columns mysql-test/r/rpl_trunc_binlog.result: Use replace_columns to replace some 'not constant' columns mysql-test/t/handler.test: test engine= mysql-test/t/rpl_log_pos.test: Use replace_columns to replace some 'not constant' columns mysql-test/t/rpl_max_relay_size.test: Use replace_columns to replace some 'not constant' columns mysql-test/t/rpl_rotate_logs.test: Use replace_columns to replace some 'not constant' columns mysql-test/t/rpl_trunc_binlog.test: Use replace_columns to replace some 'not constant' columns mysys/my_symlink.c: More debugging sql/lex.h: Make ENGINE= an alias for TYPE= sql/mysqld.cc: Code cleanup strings/strto.c: Fix for True64 strings/strtoll.c: Fix for True64 strings/strtoull.c: Remove not needed include file
Diffstat (limited to 'strings')
-rw-r--r--strings/strto.c2
-rw-r--r--strings/strtoll.c3
-rw-r--r--strings/strtoull.c1
3 files changed, 2 insertions, 4 deletions
diff --git a/strings/strto.c b/strings/strto.c
index bd0c8e38fde..c98b19a7e67 100644
--- a/strings/strto.c
+++ b/strings/strto.c
@@ -35,8 +35,6 @@
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"
diff --git a/strings/strtoll.c b/strings/strtoll.c
index 8d0ba21d576..b0b4ef328fc 100644
--- a/strings/strtoll.c
+++ b/strings/strtoll.c
@@ -16,8 +16,9 @@
/* This is defines strtoll() if neaded */
+#define strtoll glob_strtoll /* Fix for True64 */
+
#include <my_global.h>
-#include <m_string.h>
#if !defined(HAVE_STRTOLL) && defined(HAVE_LONG_LONG)
#define USE_LONGLONG
#include "strto.c"
diff --git a/strings/strtoull.c b/strings/strtoull.c
index 25201e546ce..f4f3ce19bf7 100644
--- a/strings/strtoull.c
+++ b/strings/strtoull.c
@@ -17,7 +17,6 @@
/* This is defines strtoull() */
#include <my_global.h>
-#include <m_string.h>
#if !defined(HAVE_STRTOULL) && defined(HAVE_LONG_LONG)
#define USE_UNSIGNED
#define USE_LONGLONG