Merge bk-internal.mysql.com:/home/bk/mysql-maria

into  mysql.com:/home/my/mysql-maria


storage/maria/maria_read_log.c:
  Auto merged

BUILD/compile-dist

@@ -50,6 +50,7 @@ fi
   --with-blackhole-storage-engine \
   --with-csv-storage-engine \
   --with-example-storage-engine \
+  --with-maria-storage-engine \
   --with-federated-storage-engine \
   --with-innodb \
   --with-ssl \

storage/maria/Makefile.am

@@ -61,7 +61,7 @@ noinst_HEADERS =	maria_def.h ma_rt_index.h ma_rt_key.h ma_rt_mbr.h \
 			ma_ft_eval.h trnman.h lockman.h tablockman.h \
 			ma_control_file.h ha_maria.h ma_blockrec.h \
 			ma_loghandler.h ma_loghandler_lsn.h ma_pagecache.h \
-			ma_recovery.h ma_commit.h
+			ma_recovery.h ma_commit.h trnman_public.h
 ma_test1_DEPENDENCIES=	$(LIBRARIES)
 ma_test1_LDADD=		@CLIENT_EXTRA_LDFLAGS@ libmaria.a \
                         $(top_builddir)/storage/myisam/libmyisam.a \

storage/maria/maria_read_log.c

@@ -171,8 +171,8 @@ get_one_option(int optid __attribute__((unused)),
   case '#':
     DBUG_SET_INITIAL(argument ? argument : default_dbug_option);
     break;
-  }
 #endif
+  }
   return 0;
 }