Bug#14737559 BZR JOIN PLUGIN TREES INTO INTERNAL/PLUGIN

Part three:
Fix some search paths.

cmake/install_layout.cmake

@@ -104,7 +104,10 @@ ENDIF()
 # just use if(INSTALL_PLUGINTESTDIR).
 # The plugin must set its own install path for tests
 #
-FILE(GLOB plugin_tests ${CMAKE_SOURCE_DIR}/plugin/*/tests)
+FILE(GLOB plugin_tests
+  ${CMAKE_SOURCE_DIR}/plugin/*/tests
+  ${CMAKE_SOURCE_DIR}/internal/plugin/*/tests
+)
 
 #
 # STANDALONE layout

cmake/plugin.cmake

@@ -39,6 +39,7 @@ MACRO(PLUGIN_APPEND_COLLECTIONS plugin)
       GET_FILENAME_COMPONENT(fname ${cfile} NAME)
       FILE(APPEND ${CMAKE_SOURCE_DIR}/mysql-test/collections/${fname} "${contents}")
       FILE(APPEND ${fcopied} "${fname}\n")
+      MESSAGE(STATUS "Appended ${cfile}")
     ENDFOREACH()
   ENDIF()
 ENDMACRO()

mysql-test/lib/mtr_cases.pm

@@ -295,6 +295,7 @@ sub collect_one_suite($)
 			      "storage/*/mtr",
 			      # Look in plugin specific suite dir
 			      "plugin/$suite/tests",
+			      "internal/plugin/$suite/tests",
 			     ],
 			     [$suite, "mtr"], ($suite =~ /^i_/));
       return unless $suitedir;

mysql-test/mysql-test-run.pl

@@ -459,6 +459,7 @@ sub main {
 
   # Also read from any plugin local or suite specific plugin.defs
   for (glob "$basedir/plugin/*/tests/mtr/plugin.defs".
+            " $basedir/internal/plugin/*/tests/mtr/plugin.defs".
             " suite/*/plugin.defs") {
     read_plugin_defs($_);
   }