Portability fix for AIX

include/my_sys.h:
  Removed redefine of alloca with GCC

3 files changed, 5 insertions, 11 deletions

diff --git a/include/my_sys.h b/include/my_sys.h
index 61395114a5d..fd201d39183 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -145,22 +145,18 @@ extern my_string my_strdup(const char *from,myf MyFlags);
 #define CALLER_INFO         /* nothing */
 #define ORIG_CALLER_INFO    /* nothing */
 #endif
+
 #ifdef HAVE_ALLOCA
-#ifdef  __GNUC__
-/* Remove any previous definitions.  */
-#undef  alloca
-#define alloca(size)   __builtin_alloca (size)
-#else /* xlc */
-#ifdef _AIX
- #pragma alloca
+#if defined(_AIX) && !defined(__GNUC__)
+#pragma alloca
 #endif /* _AIX */
-#endif /* __GNUC__  */
 #define my_alloca(SZ) alloca((size_t) (SZ))
 #define my_afree(PTR) {}
 #else
 #define my_alloca(SZ) my_malloc(SZ,MYF(0))
 #define my_afree(PTR) my_free(PTR,MYF(MY_WME))
 #endif /* HAVE_ALLOCA */
+
 #ifdef MSDOS
 #ifdef __ZTC__
 void * __CDECL halloc(long count,size_t length);
diff --git a/mysql-test/r/bigint.result b/mysql-test/r/bigint.result
index 46ce0fda2c1..169ab041ed9 100644
--- a/mysql-test/r/bigint.result
+++ b/mysql-test/r/bigint.result
@@ -10,6 +10,4 @@ a
 a
 18446744073709551615
 a
-18446744073709551615
-a
 18446744073709551614
diff --git a/mysql-test/t/bigint.test b/mysql-test/t/bigint.test
index 6470b6f6a30..cd2fadc7f29 100644
--- a/mysql-test/t/bigint.test
+++ b/mysql-test/t/bigint.test
@@ -10,7 +10,7 @@ create table t1 (a bigint unsigned not null, primary key(a));
 insert into t1 values (18446744073709551615), (0xFFFFFFFFFFFFFFFE);
 select * from t1;
 select * from t1 where a=18446744073709551615;
-select * from t1 where a='18446744073709551615';
+#select * from t1 where a='18446744073709551615';
 delete from t1 where a=18446744073709551615;
 select * from t1;
 drop table t1;