postmerge fix

BUILD/SETUP.sh:
  postmerge changes
configure.in:
  postmerge changes
mysql-test/r/ps_maria.result:
  changed result according last MyISAM test changes

5 files changed, 28 insertions, 11 deletions

diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh
index 5efa42e4619..754883bb20b 100755
--- a/BUILD/SETUP.sh
+++ b/BUILD/SETUP.sh
@@ -141,7 +141,6 @@ base_configs="--prefix=$prefix --enable-assembler "
 base_configs="$base_configs --with-extra-charsets=complex "
 base_configs="$base_configs --enable-thread-safe-client --with-readline "
 base_configs="$base_configs --with-big-tables"
-base_configs="$base_configs --with-maria-storage-engine"
 
 # we need local-infile in all binaries for rpl000001
 # if you need to disable local-infile in the client, write a build script
diff --git a/configure.in b/configure.in
index 90ca6c69587..d4905ff7c44 100644
--- a/configure.in
+++ b/configure.in
@@ -2252,13 +2252,14 @@ MYSQL_PLUGIN_ACTIONS(ndbcluster,[MYSQL_SETUP_NDBCLUSTER])
 
 MYSQL_STORAGE_ENGINE(partition, partition, [Partition Support],
         [MySQL Partitioning Support], [max,max-no-ndb])
+MYSQL_STORAGE_ENGINE(maria,maria, [Maria Storage Engine],
+        [Traditional transactional MySQL tables])
+MYSQL_PLUGIN_DIRECTORY(maria,  [storage/maria])
+MYSQL_PLUGIN_STATIC(maria,     [libmaria.a])
+MYSQL_PLUGIN_MANDATORY(maria)
 
 dnl -- ndbcluster requires partition to be enabled
 MYSQL_PLUGIN_DEPENDS(ndbcluster, [partition])
-MYSQL_STORAGE_ENGINE(maria,,,,,,storage/maria,,
- \$(top_builddir)/storage/maria/libmaria.a, [
-  AC_CONFIG_FILES(storage/maria/Makefile)
-])
 
 MYSQL_CONFIGURE_PLUGINS([none])
 
diff --git a/mysql-test/r/ps_maria.result b/mysql-test/r/ps_maria.result
index a5cb3050dcb..00e32cf8fce 100644
--- a/mysql-test/r/ps_maria.result
+++ b/mysql-test/r/ps_maria.result
@@ -1777,7 +1777,7 @@ Table	Create Table
 t5	CREATE TABLE `t5` (
   `const01` bigint(1) NOT NULL DEFAULT '0',
   `param01` bigint(20) DEFAULT NULL,
-  `const02` decimal(2,1) unsigned NOT NULL DEFAULT '0.0',
+  `const02` decimal(2,1) NOT NULL DEFAULT '0.0',
   `param02` decimal(65,30) DEFAULT NULL,
   `const03` double NOT NULL DEFAULT '0',
   `param03` double DEFAULT NULL,
@@ -1807,7 +1807,7 @@ select * from t5 ;
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
 def	test	t5	t5	const01	const01	8	1	1	N	32769	0	63
 def	test	t5	t5	param01	param01	8	20	1	Y	32768	0	63
-def	test	t5	t5	const02	const02	246	3	3	N	33	1	63
+def	test	t5	t5	const02	const02	246	4	3	N	1	1	63
 def	test	t5	t5	param02	param02	246	67	32	Y	0	30	63
 def	test	t5	t5	const03	const03	5	17	1	N	32769	31	63
 def	test	t5	t5	param03	param03	5	23	1	Y	32768	31	63
diff --git a/sql/Makefile.am b/sql/Makefile.am
index eec7209bf50..1c4a2ec5402 100644
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -52,7 +52,7 @@ noinst_HEADERS =	item.h item_func.h item_sum.h item_cmpfunc.h \
 			ha_heap.h ha_myisam.h ha_myisammrg.h ha_partition.h \
 			ha_innodb.h  ha_berkeley.h ha_federated.h \
 			ha_ndbcluster.h ha_ndbcluster_binlog.h \
-			ha_ndbcluster_tables.h \
+			ha_ndbcluster_tables.h ha_maria.h\
 			opt_range.h protocol.h rpl_tblmap.h \
 			log.h sql_show.h rpl_rli.h \
 			sql_select.h structs.h table.h sql_udf.h hash_filo.h \
@@ -88,7 +88,7 @@ mysqld_SOURCES =	sql_lex.cc sql_handler.cc sql_partition.cc \
 		   	records.cc filesort.cc handler.cc \
 			ha_heap.cc ha_myisam.cc ha_myisammrg.cc \
 			ha_partition.cc ha_innodb.cc ha_berkeley.cc \
-			ha_federated.cc \
+			ha_federated.cc ha_maria.cc\
                         ha_ndbcluster.cc ha_ndbcluster_binlog.cc \
 			sql_db.cc sql_table.cc sql_rename.cc sql_crypt.cc \
 			sql_load.cc mf_iocache.cc field_conv.cc sql_show.cc \
diff --git a/sql/ha_maria.cc b/sql/ha_maria.cc
index 46324d0b188..740dfa85a23 100644
--- a/sql/ha_maria.cc
+++ b/sql/ha_maria.cc
@@ -63,13 +63,16 @@ TYPELIB maria_stats_method_typelib=
 static handler *maria_create_handler(TABLE_SHARE * table);
 
 /* MARIA handlerton */
+static const char maria_hton_name[]= "MARIA";
+static const char maria_hton_comment[]=
+  "Transactional storage engine, optimized for long running transactions";
 
 handlerton maria_hton=
 {
   MYSQL_HANDLERTON_INTERFACE_VERSION,
-  "MARIA",
+  maria_hton_name,
   SHOW_OPTION_YES,
-  "Transactional storage engine, optimized for long running transactions",
+  maria_hton_comment,
   DB_TYPE_MARIA,
   ha_maria_init,
   0,                                            /* slot */
@@ -1834,3 +1837,17 @@ bool ha_maria::check_if_incompatible_data(HA_CREATE_INFO *info,
     return COMPATIBLE_DATA_NO;
   return COMPATIBLE_DATA_YES;
 }
+
+mysql_declare_plugin(maria)
+{
+  MYSQL_STORAGE_ENGINE_PLUGIN,
+  &maria_hton,
+  maria_hton_name,
+  "MySQL AB",
+  maria_hton_comment,
+  NULL, /* Plugin Init */
+  NULL, /* Plugin Deinit */
+  0x0100, /* 1.0 */
+  0
+}
+mysql_declare_plugin_end;