WL#3270 "Maria - cleanups of inherited MyISAM functionality"

Removing the "external lock" functionality from Maria (as two separate processes wanting to share a table
should not only my_lock() the data and index files but also the log files, and share memory
(as the latest data is in the page cache), it sounds useless to feature this).
Removing the MyISAM logging from Maria (as REDO logging will be done differently).


BitKeeper/deleted/.del-maria_log.c~1fb295a18c3f5d4c:
  Delete: storage/maria/maria_log.c
BitKeeper/deleted/.del-ma_log.c~4a44ec11d547772f:
  Delete: storage/maria/ma_log.c
include/maria.h:
  unneeded
storage/maria/Makefile.am:
  log removed
storage/maria/ma_check.c:
  external locking removed
storage/maria/ma_close.c:
  log removed
storage/maria/ma_delete.c:
  log removed
storage/maria/ma_delete_all.c:
  log removed. Unused var.
storage/maria/ma_dynrec.c:
  external locking removed
storage/maria/ma_extra.c:
  log removed
storage/maria/ma_init.c:
  log removed
storage/maria/ma_locking.c:
  external locking removed, log removed
storage/maria/ma_open.c:
  external locking removed, log removed
storage/maria/ma_static.c:
  log removed
storage/maria/ma_statrec.c:
  external locking removed
storage/maria/ma_test2.c:
  log removed
storage/maria/ma_test3.c:
  log removed
storage/maria/ma_update.c:
  log removed
storage/maria/ma_write.c:
  external locking removed, log removed
storage/maria/maria_chk.c:
  external locking removed
storage/maria/maria_def.h:
  log removed, maria_pid unused.
storage/maria/maria_pack.c:
  fixes for warnings (where pointers are like ulong and so %u is not enough).

1 files changed, 2 insertions, 9 deletions

diff --git a/storage/maria/ma_test3.c b/storage/maria/ma_test3.c
index bfb2c93a95f..d2fe8d90cf6 100644
--- a/storage/maria/ma_test3.c
+++ b/storage/maria/ma_test3.c
@@ -41,7 +41,7 @@
 
 
 const char *filename= "test3";
-uint tests=10,forks=10,key_cacheing=0,use_log=0;
+uint tests=10,forks=10,key_cacheing=0;
 
 static void get_options(int argc, char *argv[]);
 void start_test(int id);
@@ -127,9 +127,6 @@ static void get_options(int argc, char **argv)
 
   while (--argc >0 && *(pos = *(++argv)) == '-' ) {
     switch(*++pos) {
-    case 'l':
-      use_log=1;
-      break;
     case 'f':
       forks=atoi(++pos);
       break;
@@ -140,7 +137,7 @@ static void get_options(int argc, char **argv)
       key_cacheing=1;
       break;
     case 'A':				/* All flags */
-      use_log=key_cacheing=1;
+      key_cacheing=1;
       break;
    case '?':
     case 'I':
@@ -169,8 +166,6 @@ void start_test(int id)
   MARIA_INFO isam_info;
   MARIA_HA *file,*file1,*file2=0,*lock;
 
-  if (use_log)
-    maria_logging(1);
   if (!(file1=maria_open(filename,O_RDWR,HA_OPEN_WAIT_IF_LOCKED)) ||
       !(file2=maria_open(filename,O_RDWR,HA_OPEN_WAIT_IF_LOCKED)))
   {
@@ -214,8 +209,6 @@ void start_test(int id)
 
   maria_close(file1);
   maria_close(file2);
-  if (use_log)
-    maria_logging(0);
   if (error)
   {
     printf("%2d: Aborted\n",id); fflush(stdout);