plug.in:

two MYSQL_PLUGIN_ACTIONS() merged
my_getsystime.c:
  typos fixed


mysys/my_getsystime.c:
  typos fixed
storage/maria/plug.in:
  two MYSQL_PLUGIN_ACTIONS() merged

mysys/my_getsystime.c

@@ -108,8 +108,8 @@ ulonglong my_micro_time()
   if (query_performance_frequency)
   {
     QueryPerformanceCounter((LARGE_INTEGER*) &newtime);
-    newtime= ((new_time / query_performance_frequency * 10000000) +
-              (new_time % query_performance_frequency * 10000000 /
+    newtime= ((newtime / query_performance_frequency * 10000000) +
+              (newtime % query_performance_frequency * 10000000 /
                query_performance_frequency));
   }
   else
@@ -161,8 +161,8 @@ ulonglong my_micro_time_and_time(time_t *time_arg)
   if (query_performance_frequency)
   {
     QueryPerformanceCounter((LARGE_INTEGER*) &newtime);
-    newtime= ((new_time / query_performance_frequency * 10000000) +
-              (new_time % query_performance_frequency * 10000000 /
+    newtime= ((newtime / query_performance_frequency * 10000000) +
+              (newtime % query_performance_frequency * 10000000 /
                query_performance_frequency));
   }
   else

storage/maria/plug.in

@@ -1,13 +1,13 @@
 MYSQL_STORAGE_ENGINE(maria,, [Maria Storage Engine],
         [Traditional transactional MySQL tables], [max,max-no-ndb])
 MYSQL_PLUGIN_DIRECTORY(maria,  [storage/maria])
-MYSQL_PLUGIN_ACTIONS(maria, [AC_CONFIG_FILES(storage/maria/unittest/Makefile)])
 MYSQL_PLUGIN_STATIC(maria,     [libmaria.a])
 # Maria will probably go first into max builds, not all builds,
 # so we don't declare it mandatory.
 MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(maria, [ha_maria.cc])
 
 MYSQL_PLUGIN_ACTIONS(maria,  [
+AC_CONFIG_FILES(storage/maria/unittest/Makefile)
 AC_ARG_WITH(maria-tmp-tables,
     AC_HELP_STRING([--with-maria-tmp-tables],[Use Maria for internal temporary tables]),
     [with_maria_tmp_tables=$withval],
@@ -18,5 +18,4 @@ if test "$with_maria_tmp_tables" = "yes"
 then
   AC_DEFINE([USE_MARIA_FOR_TMP_TABLES], [1], [Maria is used for internal temporary tables])
 fi
-
 ])