Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or mysql-test/t/*myisam*.

However there were three new tests mysql-test/suite/parts/t/partition*myisam.test, of which I make here
copies for Maria.

mysql-test/suite/funcs_1/t/innodb_storedproc.test

@@ -1,13 +0,0 @@
-#### suite/funcs_1/t/innodb_storedproc.test
-#
-
-# This test cannot be used for the embedded server because we check here
-# privileges.
---source include/not_embedded.inc
-
---source include/have_innodb.inc
-let $engine_type= innodb;
-
---source suite/funcs_1/storedproc/load_sp_tb.inc
-
---source suite/funcs_1/storedproc/storedproc_master.inc

mysql-test/suite/funcs_1/t/memory_storedproc.test

@@ -1,13 +0,0 @@
-#### suite/funcs_1/t/memory_storedproc.test
-#
-
-# This test cannot be used for the embedded server because we check here
-# privileges.
---source include/not_embedded.inc
-
-SET @@session.sql_mode = 'NO_ENGINE_SUBSTITUTION';
-let $engine_type= memory;
-
---source suite/funcs_1/storedproc/load_sp_tb.inc
-
---source suite/funcs_1/storedproc/storedproc_master.inc

mysql-test/suite/funcs_1/t/myisam_storedproc.test

@@ -1,13 +0,0 @@
-#### suite/funcs_1/t/myisam_storedproc.test
-#
-
-# This test cannot be used for the embedded server because we check here
-# privileges.
---source include/not_embedded.inc
-
-SET @@session.sql_mode = 'NO_ENGINE_SUBSTITUTION';
-let $engine_type= myisam;
-
---source suite/funcs_1/storedproc/load_sp_tb.inc
-
---source suite/funcs_1/storedproc/storedproc_master.inc

mysql-test/suite/funcs_1/t/ndb_storedproc.test

@@ -1,13 +0,0 @@
-#### suite/funcs_1/t/ndb_storedproc.test
-#
-
-# This test cannot be used for the embedded server because we check here
-# privileges.
---source include/not_embedded.inc
-
---source include/have_ndb.inc
-let $engine_type= ndb;
-
---source suite/funcs_1/storedproc/load_sp_tb.inc
-
---source suite/funcs_1/storedproc/storedproc_master.inc

mysql-test/suite/funcs_1/t/ndb_trig_0102.test.moved

@@ -1,16 +0,0 @@
-#### suite/funcs_1/t/ndb_triggers.test
-
-# ndb tables should be used
-#
-# 1. Check if ndb is available
---source include/have_ndb.inc
-# 2. Set $engine_type
-let $engine_type= ndb;
-
-# Create some objects needed in many testcases
-USE test;
---source suite/funcs_1/include/ndb_tb3.inc
-
---source suite/funcs_1/triggers/triggers_0102.inc
-DROP TABLE test.tb3;
-

mysql-test/suite/funcs_1/t/ndb_trig_03.test.moved

@@ -1,16 +0,0 @@
-#### suite/funcs_1/t/ndb_triggers.test
-
-# NDB tables should be used
-#
-# 1. Check if NDB is available
---source include/have_ndb.inc
-# 2. Set $engine_type
-let $engine_type= ndb;
-
-# Create some objects needed in many testcases
-USE test;
---source suite/funcs_1/include/ndb_tb3.inc
-
---source suite/funcs_1/triggers/triggers_03.inc
-DROP TABLE test.tb3;
-

mysql-test/suite/funcs_1/t/ndb_trig_0407.test.moved

@@ -1,16 +0,0 @@
-#### suite/funcs_1/t/ndb_triggers.test
-
-# ndb tables should be used
-#
-# 1. Check if ndb is available
---source include/have_ndb.inc
-# 2. Set $engine_type
-let $engine_type= ndb;
-
-# Create some objects needed in many testcases
-USE test;
---source suite/funcs_1/include/ndb_tb3.inc
-
---source suite/funcs_1/triggers/triggers_0407.inc
-DROP TABLE test.tb3;
-

mysql-test/suite/funcs_1/t/ndb_trig_08.test.moved

@@ -1,16 +0,0 @@
-#### suite/funcs_1/t/ndb_triggers.test
-
-# ndb tables should be used
-#
-# 1. Check if ndb is available
---source include/have_ndb.inc
-# 2. Set $engine_type
-let $engine_type= ndb;
-
-# Create some objects needed in many testcases
-USE test;
---source suite/funcs_1/include/ndb_tb3.inc
-
---source suite/funcs_1/triggers/triggers_08.inc
-DROP TABLE test.tb3;
-

mysql-test/suite/funcs_1/t/ndb_trig_09.test.moved

@@ -1,16 +0,0 @@
-#### suite/funcs_1/t/ndb_triggers.test
-
-# ndb tables should be used
-#
-# 1. Check if ndb is available
---source include/have_ndb.inc
-# 2. Set $engine_type
-let $engine_type= ndb;
-
-# Create some objects needed in many testcases
-USE test;
---source suite/funcs_1/include/ndb_tb3.inc
-
---source suite/funcs_1/triggers/triggers_09.inc
-DROP TABLE test.tb3;
-

mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test.moved

@@ -1,16 +0,0 @@
-#### suite/funcs_1/t/ndb_triggers.test
-
-# ndb tables should be used
-#
-# 1. Check if ndb is available
---source include/have_ndb.inc
-# 2. Set $engine_type
-let $engine_type= ndb;
-
-# Create some objects needed in many testcases
-USE test;
---source suite/funcs_1/include/ndb_tb3.inc
-
---source suite/funcs_1/triggers/triggers_1011ext.inc
-DROP TABLE test.tb3;
-