merge

5 files changed, 31 insertions, 31 deletions

diff --git a/mysql-test/include/have_32bit.inc b/mysql-test/include/have_32bit.inc
deleted file mode 100644
index 66684fb5325..00000000000
--- a/mysql-test/include/have_32bit.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-# Created by Horst Hunger     2008-04-15
-# see also have_64bit.inc
-
---disable_query_log
---disable_warnings
-let $save = `SELECT @@global.sort_buffer_size`;
-SET @@global.sort_buffer_size = 4294967296;
-let $mach32 = `SELECT @@global.sort_buffer_size <= 4294967295`;
-eval SET @@global.sort_buffer_size = $save;
---enable_warnings
---enable_query_log
-if (!$mach32)
-{
-  skip Need a 32 bit machine/binary;
-}
-
diff --git a/mysql-test/include/have_32bit_ulong.inc b/mysql-test/include/have_32bit_ulong.inc
new file mode 100644
index 00000000000..0323b8a9888
--- /dev/null
+++ b/mysql-test/include/have_32bit_ulong.inc
@@ -0,0 +1,16 @@
+# Created by Horst Hunger     2008-04-15
+# see also have_64bit_ulong.inc
+
+--disable_query_log
+--disable_warnings
+let $save = `SELECT @@pseudo_thread_id`;
+SET @@pseudo_thread_id = 4294967296;
+let $mach32 = `SELECT @@pseudo_thread_id <= 4294967295`;
+eval SET @@pseudo_thread_id = $save;
+--enable_warnings
+--enable_query_log
+if (!$mach32)
+{
+  skip Need a 32 bit unsigned long;
+}
+
diff --git a/mysql-test/include/have_64bit.inc b/mysql-test/include/have_64bit.inc
deleted file mode 100644
index cbba5e1d338..00000000000
--- a/mysql-test/include/have_64bit.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-# Created by Horst Hunger       2008-04-15
-# see also have_32bit.inc
-
---disable_query_log
-let $save = `SELECT @@session.sort_buffer_size`;
-SET @@session.sort_buffer_size = 4294967296;
-let $mach64 = `SELECT @@session.sort_buffer_size > 4294967295`;
-eval SET @@session.sort_buffer_size = $save;
---enable_query_log
-if (!$mach64)
-{
-  skip Need a 64 binary ;
-}
-
diff --git a/mysql-test/include/have_64bit_ulong.inc b/mysql-test/include/have_64bit_ulong.inc
new file mode 100644
index 00000000000..529ab225e4f
--- /dev/null
+++ b/mysql-test/include/have_64bit_ulong.inc
@@ -0,0 +1,14 @@
+# Created by Horst Hunger       2008-04-15
+# see also have_32bit_ulong.inc
+
+--disable_query_log
+let $save = `SELECT @@pseudo_thread_id`;
+SET @@pseudo_thread_id = 4294967296;
+let $mach64 = `SELECT @@pseudo_thread_id > 4294967295`;
+eval SET @@pseudo_thread_id = $save;
+--enable_query_log
+if (!$mach64)
+{
+  skip Need a 64 unsigned long ;
+}
+
diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql
index 1248e72f3b9..a690ca4b334 100644
--- a/mysql-test/include/mtr_warnings.sql
+++ b/mysql-test/include/mtr_warnings.sql
@@ -159,7 +159,7 @@ INSERT INTO global_suppressions VALUES
  /* innodb foreign key tests that fail in ALTER or RENAME produce this */
  ("InnoDB: Error: in ALTER TABLE `test`.`t[123]`"),
  ("InnoDB: Error: in RENAME TABLE table `test`.`t1`"),
- ("InnoDB: Error: table `test`.`t[123]` does not exist in the InnoDB internal"),
+ ("InnoDB: Error: table `test`.`t[123]` .*does not exist in the InnoDB internal"),
 
  /*
    BUG#32080 - Excessive warnings on Solaris: setrlimit could not