Maria - merging recent changes done to MyISAM into Maria.

Plus compiler warnings, and a fix to the pagecache unit tests for IA64


include/maria.h:
  merging MyISAM into Maria
include/myisam.h:
  post-merge fixes
mysql-test/r/maria.result:
  merging MyISAM into Maria
mysql-test/t/maria.test:
  merging MyISAM into Maria
sql/mysqld.cc:
  post-merge fixes
storage/maria/ha_maria.cc:
  merging MyISAM into Maria
storage/maria/ha_maria.h:
  merging MyISAM into Maria
storage/maria/ma_check.c:
  merging MyISAM into Maria
storage/maria/ma_open.c:
  merging MyISAM into Maria
storage/maria/ma_packrec.c:
  merging MyISAM into Maria
storage/maria/ma_range.c:
  merging MyISAM into Maria
storage/maria/ma_sort.c:
  merging MyISAM into Maria
storage/maria/maria_def.h:
  merging MyISAM into Maria
storage/maria/maria_pack.c:
  merging MyISAM into Maria
storage/maria/plug.in:
  merging MyISAM into Maria
storage/myisam/myisamdef.h:
  merging MyISAM into Maria
storage/myisam/myisampack.c:
  fix for compiler warnings
unittest/mysys/mf_pagecache_consist.c:
  this sets the stack size lower than the minimum on IA64, we remove it
  (it made the test fail)
unittest/mysys/mf_pagecache_single.c:
  this sets the stack size lower than the minimum on IA64, we remove it
  (it made the test fail)

2 files changed, 0 insertions, 16 deletions

diff --git a/unittest/mysys/mf_pagecache_consist.c b/unittest/mysys/mf_pagecache_consist.c
index f7724222a09..95c2135edad 100755
--- a/unittest/mysys/mf_pagecache_consist.c
+++ b/unittest/mysys/mf_pagecache_consist.c
@@ -332,14 +332,6 @@ int main(int argc, char **argv __attribute__((unused)))
     exit(1);
   }
 
-#ifndef pthread_attr_setstacksize		/* void return value */
-  if ((error= pthread_attr_setstacksize(&thr_attr, 65536L)))
-  {
-    fprintf(stderr,"Got error: %d from pthread_attr_setstacksize (errno: %d)\n",
-	    error,errno);
-    exit(1);
-  }
-#endif
 #ifdef HAVE_THR_SETCONCURRENCY
   VOID(thr_setconcurrency(2));
 #endif
diff --git a/unittest/mysys/mf_pagecache_single.c b/unittest/mysys/mf_pagecache_single.c
index 49ecd2986ab..9c467343156 100644
--- a/unittest/mysys/mf_pagecache_single.c
+++ b/unittest/mysys/mf_pagecache_single.c
@@ -511,14 +511,6 @@ int main(int argc, char **argv __attribute__((unused)))
     exit(1);
   }
 
-#ifndef pthread_attr_setstacksize		/* void return value */
-  if ((error= pthread_attr_setstacksize(&thr_attr, 65536L)))
-  {
-    fprintf(stderr,"Got error: %d from pthread_attr_setstacksize (errno: %d)\n",
-	    error,errno);
-    exit(1);
-  }
-#endif
 #ifdef HAVE_THR_SETCONCURRENCY
   VOID(thr_setconcurrency(2));
 #endif