portability fixes for mysql-test

mysql-test/r/mysqld--help.result:
  that's default to number of CPUs
mysql-test/suite/archive/discover.test:
  move_file uses rename(2), which may end up
  with "Invalid cross-device link"
mysql-test/suite/archive/partition_archive.test:
  on Solaris the error message is different

6 files changed, 62 insertions, 18 deletions

diff --git a/mysql-test/r/mysqld--help,win.rdiff b/mysql-test/r/mysqld--help,win.rdiff
index cd39445f3e6..24719fce917 100644
--- a/mysql-test/r/mysqld--help,win.rdiff
+++ b/mysql-test/r/mysqld--help,win.rdiff
@@ -1,6 +1,6 @@
 --- mysql-test/r/mysqld--help.result	2012-09-08 22:22:06 +0000
 +++ mysql-test/r/mysqld--help.result	2012-10-01 14:03:59 +0000
-@@ -244,7 +244,6 @@
+@@ -248,7 +248,6 @@
   The number of segments in a key cache
   -L, --language=name Client error messages in given language. May be given as
   a full path. Deprecated. Use --lc-messages-dir instead.
@@ -8,7 +8,7 @@
   --lc-messages=name  Set the language used for the error messages.
   -L, --lc-messages-dir=name 
   Directory where error messages are
-@@ -440,6 +439,7 @@
+@@ -443,6 +442,7 @@
   NULLS_UNEQUAL (default behavior for 4.1 and later),
   NULLS_EQUAL (emulate 4.0 behavior), and NULLS_IGNORED
   --myisam-use-mmap   Use memory mapping for reading and writing MyISAM tables
@@ -16,7 +16,7 @@
   --net-buffer-length=# 
   Buffer length for TCP/IP and socket communication
   --net-read-timeout=# 
-@@ -707,6 +707,9 @@
+@@ -710,6 +710,9 @@
   files within specified directory
   --server-id=#       Uniquely identifies the server instance in the community
   of replication partners
@@ -26,7 +26,7 @@
   --show-slave-auth-info 
   Show user and password in SHOW SLAVE HOSTS on this
   master.
-@@ -774,6 +777,10 @@
+@@ -777,6 +780,10 @@
   Log slow queries to given log file. Defaults logging to
   'hostname'-slow.log. Must be enabled to activate other
   slow log options
@@ -37,7 +37,7 @@
   --socket=name       Socket file to use for connection
   --sort-buffer-size=# 
   Each thread that needs to do a sort allocates a buffer of
-@@ -782,6 +789,7 @@
+@@ -785,6 +792,7 @@
   for the complete list of valid sql modes
   --stack-trace       Print a symbolic stack trace on failure
   (Defaults to on; use --skip-stack-trace to disable.)
@@ -45,7 +45,35 @@
   --stored-program-cache=# 
   The soft upper limit for number of cached stored routines
   for one connection.
-@@ -822,8 +830,8 @@
+@@ -817,25 +825,11 @@
+  values are COMMIT or ROLLBACK.
+  --thread-cache-size=# 
+  How many threads we should keep in a cache for reuse
+- --thread-pool-idle-timeout=# 
+- Timeout in seconds for an idle thread in the thread
+- pool.Worker thread will be shut down after timeout
+  --thread-pool-max-threads=# 
+  Maximum allowed number of worker threads in the thread
+  pool
+- --thread-pool-oversubscribe=# 
+- How many additional active worker threads in a group are
+- allowed.
+- --thread-pool-size=# 
+- Number of thread groups in the pool. This parameter is
+- roughly equivalent to maximum number of concurrently
+- executing threads (threads in a waiting state do not
+- count as executing).
+- --thread-pool-stall-limit=# 
+- Maximum query execution time in milliseconds,before an
+- executing non-yielding thread is considered stalled.If a
+- worker thread is stalled, additional worker thread may be
+- created to handle remaining clients.
++ --thread-pool-min-threads=# 
++ Minimum number of threads in the thread pool.
+  --thread-stack=#    The stack size for each thread
+  --time-format=name  The TIME format (ignored)
+  --timed-mutexes     Specify whether to time mutexes (only InnoDB mutexes are
+@@ -844,8 +838,8 @@
   size, MySQL will automatically convert it to an on-disk
   MyISAM or Aria table
   -t, --tmpdir=name   Path for temporary files. Several paths may be specified,
@@ -56,7 +84,7 @@
   --transaction-alloc-block-size=# 
   Allocation block size for transactions to be stored in
   binary log
-@@ -923,7 +931,6 @@ key-cache-age-threshold 300
+@@ -949,7 +943,6 @@
  key-cache-block-size 1024
  key-cache-division-limit 100
  key-cache-segments 0
@@ -64,7 +92,7 @@
  lc-messages en_US
  lc-messages-dir MYSQL_SHAREDIR/
  lc-time-names en_US
-@@ -986,6 +993,7 @@ myisam-repair-threads 1
+@@ -1012,6 +1005,7 @@
  myisam-sort-buffer-size 8388608
  myisam-stats-method nulls_unequal
  myisam-use-mmap FALSE
@@ -72,7 +100,7 @@
  net-buffer-length 16384
  net-read-timeout 30
  net-retry-count 10
-@@ -1051,6 +1059,8 @@ safe-user-create FALSE
+@@ -1077,6 +1071,8 @@
  secure-auth FALSE
  secure-file-priv (No default value)
  server-id 0
@@ -81,7 +109,7 @@
  show-slave-auth-info FALSE
  skip-grant-tables TRUE
  skip-name-resolve FALSE
-@@ -1067,6 +1077,7 @@ slave-transaction-retries 10
+@@ -1093,6 +1089,7 @@
  slave-type-conversions 
  slow-launch-time 2
  slow-query-log FALSE
@@ -89,4 +117,15 @@
  sort-buffer-size 2097152
  sql-mode 
  stack-trace TRUE
-
+@@ -1109,10 +1106,8 @@
+ table-open-cache 400
+ tc-heuristic-recover COMMIT
+ thread-cache-size 0
+-thread-pool-idle-timeout 60
+ thread-pool-max-threads 500
+-thread-pool-oversubscribe 3
+-thread-pool-stall-limit 500
++thread-pool-min-threads 1
+ thread-stack 294912
+ time-format %H:%i:%s
+ timed-mutexes FALSE
diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result
index e5edb963ca9..2a551b1175e 100644
--- a/mysql-test/r/mysqld--help.result
+++ b/mysql-test/r/mysqld--help.result
@@ -1112,7 +1112,6 @@ thread-cache-size 0
 thread-pool-idle-timeout 60
 thread-pool-max-threads 500
 thread-pool-oversubscribe 3
-thread-pool-size 4
 thread-pool-stall-limit 500
 thread-stack 294912
 time-format %H:%i:%s
diff --git a/mysql-test/suite/archive/discover.test b/mysql-test/suite/archive/discover.test
index 75668baafbf..0b7e521185d 100644
--- a/mysql-test/suite/archive/discover.test
+++ b/mysql-test/suite/archive/discover.test
@@ -53,7 +53,9 @@ rename table t2 to t0;
 --echo #
 copy_file $mysqld_datadir/test/t1.ARZ $MYSQL_TMP_DIR/t1.ARZ;
 alter table t1 modify a int default 5;
-move_file $MYSQL_TMP_DIR/t1.ARZ $mysqld_datadir/test/t1.ARZ;
+remove_file $mysqld_datadir/test/t1.ARZ;
+copy_file $MYSQL_TMP_DIR/t1.ARZ $mysqld_datadir/test/t1.ARZ;
+remove_file $MYSQL_TMP_DIR/t1.ARZ;
 show create table t1;
 
 --echo #
diff --git a/mysql-test/suite/archive/partition_archive.test b/mysql-test/suite/archive/partition_archive.test
index e4cc39ff097..be2abeada73 100644
--- a/mysql-test/suite/archive/partition_archive.test
+++ b/mysql-test/suite/archive/partition_archive.test
@@ -47,7 +47,7 @@ engine=archive
 partition by list (a)
 (partition p0 values in (1), partition p1 values in (2));
 insert into t1 values (1), (2);
---replace_regex /#sql-[0-9a-f_]+/#sql-temporary/
+--replace_regex /#sql-[0-9a-f_]+/#sql-temporary/ /Not owner/Operation not permitted/
 --error ER_CANT_CREATE_TABLE
 create index inx on t1 (a);
 alter table t1 add partition (partition p2 values in (3));
diff --git a/mysql-test/suite/plugins/t/show_all_plugins.test b/mysql-test/suite/plugins/t/show_all_plugins.test
index dcc0fb09bd3..1beca12b52c 100644
--- a/mysql-test/suite/plugins/t/show_all_plugins.test
+++ b/mysql-test/suite/plugins/t/show_all_plugins.test
@@ -8,15 +8,19 @@ show status like '%libraries%';
 #--sorted_result
 #select * from information_schema.all_plugins;
 #show status like '%libraries%';
-select * from information_schema.all_plugins where plugin_library='ha_example.so';
+--replace_result .dll .so
+eval select * from information_schema.all_plugins where plugin_library='$HA_EXAMPLE_SO';
 show status like '%libraries%';
 --sorted_result
-show plugins soname 'ha_example.so';
+--replace_result .dll .so
+eval show plugins soname '$HA_EXAMPLE_SO';
 show status like '%libraries%';
 --sorted_result
+--replace_result .dll .so
 show plugins soname like '%example%';
 show status like '%libraries%';
 --sorted_result
-show plugins soname where library = 'ha_example.so';
+--replace_result .dll .so
+eval show plugins soname where library = '$HA_EXAMPLE_SO';
 select variable_value > 10 from information_schema.global_status where variable_name like '%libraries%';
 
diff --git a/mysql-test/t/mysqld--help.test b/mysql-test/t/mysqld--help.test
index d1b68192250..0f3df10ea70 100644
--- a/mysql-test/t/mysqld--help.test
+++ b/mysql-test/t/mysqld--help.test
@@ -20,7 +20,7 @@ perl;
   # their paths may vary:
   @skipvars=qw/basedir open-files-limit general-log-file log plugin-dir
                log-slow-queries pid-file slow-query-log-file log-basename
-               datadir slave-load-tmpdir tmpdir socket/;
+               datadir slave-load-tmpdir tmpdir socket thread-pool-size/;
 
   # Plugins which may or may not be there:
   @plugins=qw/innodb ndb archive blackhole federated partition ndbcluster