Merge of Myisam changes into Maria.

First step: ha_maria moves to storage/maria.


BitKeeper/deleted/.del-ft_maria.c:
  Delete: storage/maria/ft_maria.c
storage/maria/ha_maria.h:
  Rename: sql/ha_maria.h -> storage/maria/ha_maria.h
storage/maria/ha_maria.cc:
  Rename: sql/ha_maria.cc -> storage/maria/ha_maria.cc
libmysqld/Makefile.am:
  ha_maria moves to other dir (like myisam has)
sql/Makefile.am:
  ha_maria moves to other dir (like myisam has)
sql/mysqld.cc:
  ha_maria moves to other dir (like myisam has)
storage/maria/Makefile.am:
  I delete ft_maria.c like ft_myisam.c has
storage/maria/ma_test_all.sh:
  -l option is removed (no MyISAM log in Maria), maria_log is removed too.

libmysqld/Makefile.am

@@ -46,7 +46,7 @@ noinst_HEADERS =	embedded_priv.h emb_qcache.h
 sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \
 	ha_heap.cc ha_myisam.cc ha_myisammrg.cc \
 	ha_innodb.cc ha_berkeley.cc ha_federated.cc ha_ndbcluster.cc \
-	ha_ndbcluster_binlog.cc ha_partition.cc ha_maria.cc\
+	ha_ndbcluster_binlog.cc ha_partition.cc \
 	handler.cc sql_handler.cc \
 	hostname.cc init.cc password.c \
 	item.cc item_buff.cc item_cmpfunc.cc item_create.cc \

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_maria.h\
+			ha_ndbcluster_tables.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 \
@@ -89,7 +89,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_maria.cc\
+			ha_federated.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 \

sql/mysqld.cc

@@ -28,7 +28,7 @@
 
 #include "ha_myisam.h"
 #ifdef WITH_MARIA_STORAGE_ENGINE
-#include "ha_maria.h"
+#include "../storage/maria/ha_maria.h"
 #endif
 
 #ifdef HAVE_ROW_BASED_REPLICATION

storage/maria/Makefile.am

@@ -53,7 +53,7 @@ libmaria_a_SOURCES =	ma_init.c ma_open.c ma_extra.c ma_info.c ma_rkey.c \
 			ma_delete_table.c ma_rename.c  ma_check.c \
 			ma_keycache.c ma_preload.c ma_ft_parser.c \
 			ma_ft_update.c ma_ft_boolean_search.c \
-			ma_ft_nlq_search.c ft_maria.c ma_sort.c \
+			ma_ft_nlq_search.c ma_sort.c \
 			ma_rt_index.c ma_rt_key.c ma_rt_mbr.c ma_rt_split.c \
 			ma_sp_key.c \
 			ma_control_file.c

storage/maria/ft_maria.c

@@ -1,49 +0,0 @@
-/* Copyright (C) 2006 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-/* Written by Sergei A. Golubchik, who has a shared copyright to this code */
-
-/*
-  This function is for interface functions between fulltext and maria
-*/
-
-#include "ma_ftdefs.h"
-
-FT_INFO *maria_ft_init_search(uint flags, void *info, uint keynr,
-			      byte *query, uint query_len, CHARSET_INFO *cs,
-			      byte *record)
-{
-  FT_INFO *res;
-  if (flags & FT_BOOL)
-    res= maria_ft_init_boolean_search((MARIA_HA *) info, keynr, query,
-				      query_len, cs);
-  else
-    res= maria_ft_init_nlq_search((MARIA_HA *) info, keynr, query, query_len,
-				  flags, record);
-  return res;
-}
-
-const struct _ft_vft _ma_ft_vft_nlq = {
-  maria_ft_nlq_read_next, maria_ft_nlq_find_relevance,
-  maria_ft_nlq_close_search, maria_ft_nlq_get_relevance,
-  maria_ft_nlq_reinit_search
-};
-const struct _ft_vft _ma_ft_vft_boolean = {
-  maria_ft_boolean_read_next, maria_ft_boolean_find_relevance,
-  maria_ft_boolean_close_search, maria_ft_boolean_get_relevance,
-  maria_ft_boolean_reinit_search
-};
-

storage/maria/ma_test_all.sh

@@ -134,10 +134,8 @@ echo "ma_test2$suffix $silent -L -K -R1 -m2000 ;  Should give error 135"
 ./ma_test2$suffix $silent -m10000 -e16384 -E16384 -K -L
 ./maria_chk$suffix -sm test2
 
-./ma_test2$suffix $silent -L -K -W -P -m50 -l
-./maria_log$suffix
-./ma_test2$suffix $silent -L -K -W -P -m50 -l -b100
-./maria_log$suffix
+./ma_test2$suffix $silent -L -K -W -P -m50
+./ma_test2$suffix $silent -L -K -W -P -m50 -b100
 time ./ma_test2$suffix $silent
 time ./ma_test2$suffix $silent -K -B
 time ./ma_test2$suffix $silent -L -B