diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-09-12 18:40:01 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-09-12 18:40:01 +0200 |
| commit | e246077bcf5fc22a381ee8591a441eb345a4a2af (patch) | |
| tree | 0c1a6ec6c3f3ab37645d71f9b0dae45e2083f543 /storage | |
| parent | fa5baa12bcd1d1a152d358f2bb8e1f6e17590d46 (diff) | |
| download | mariadb-git-e246077bcf5fc22a381ee8591a441eb345a4a2af.tar.gz | |
rename maria to aria
Diffstat (limited to 'storage')
25 files changed, 332 insertions, 330 deletions
diff --git a/storage/maria/CMakeLists.txt b/storage/maria/CMakeLists.txt index 12bd3d063b5..5f88f08ccd4 100644 --- a/storage/maria/CMakeLists.txt +++ b/storage/maria/CMakeLists.txt @@ -23,7 +23,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib ${CMAKE_SOURCE_DIR}/sql ${CMAKE_SOURCE_DIR}/regex ${CMAKE_SOURCE_DIR}/extra/yassl/include) -SET(MARIA_SOURCES ma_init.c ma_open.c ma_extra.c ma_info.c ma_rkey.c +SET(ARIA_SOURCES ma_init.c ma_open.c ma_extra.c ma_info.c ma_rkey.c ma_rnext.c ma_rnext_same.c ma_search.c ma_page.c ma_key_recover.c ma_key.c ma_locking.c ma_state.c @@ -48,50 +48,50 @@ SET(MARIA_SOURCES ma_init.c ma_open.c ma_extra.c ma_info.c ma_rkey.c ha_maria.h maria_def.h ma_recovery_util.c ma_servicethread.c ) -MYSQL_STORAGE_ENGINE(MARIA) +MYSQL_STORAGE_ENGINE(ARIA) IF(NOT SOURCE_SUBLIBS) - ADD_DEPENDENCIES(maria GenError) + ADD_DEPENDENCIES(aria GenError) -ADD_EXECUTABLE(maria_ftdump maria_ftdump.c) -TARGET_LINK_LIBRARIES(maria_ftdump maria myisam mysys dbug strings zlib wsock32) +ADD_EXECUTABLE(aria_ftdump maria_ftdump.c) +TARGET_LINK_LIBRARIES(aria_ftdump aria myisam mysys dbug strings zlib wsock32) -ADD_EXECUTABLE(maria_chk maria_chk.c) -TARGET_LINK_LIBRARIES(maria_chk maria myisam mysys dbug strings zlib wsock32) +ADD_EXECUTABLE(aria_chk maria_chk.c) +TARGET_LINK_LIBRARIES(aria_chk aria myisam mysys dbug strings zlib wsock32) -ADD_EXECUTABLE(maria_read_log maria_read_log.c) -TARGET_LINK_LIBRARIES(maria_read_log maria myisam mysys dbug strings zlib wsock32) +ADD_EXECUTABLE(aria_read_log maria_read_log.c) +TARGET_LINK_LIBRARIES(aria_read_log aria myisam mysys dbug strings zlib wsock32) -ADD_EXECUTABLE(maria_pack maria_pack.c) -TARGET_LINK_LIBRARIES(maria_pack maria myisam mysys dbug strings zlib wsock32) +ADD_EXECUTABLE(aria_pack maria_pack.c) +TARGET_LINK_LIBRARIES(aria_pack aria myisam mysys dbug strings zlib wsock32) -ADD_EXECUTABLE(maria_dump_log ma_loghandler.c unittest/ma_loghandler_examples.c) -TARGET_LINK_LIBRARIES(maria_dump_log maria myisam mysys dbug strings zlib wsock32) -SET_TARGET_PROPERTIES(maria_dump_log PROPERTIES COMPILE_FLAGS "-DMARIA_DUMP_LOG") +ADD_EXECUTABLE(aria_dump_log ma_loghandler.c unittest/ma_loghandler_examples.c) +TARGET_LINK_LIBRARIES(aria_dump_log aria myisam mysys dbug strings zlib wsock32) +SET_TARGET_PROPERTIES(aria_dump_log PROPERTIES COMPILE_FLAGS "-DMARIA_DUMP_LOG") ADD_EXECUTABLE(ma_test1 ma_test1.c) -TARGET_LINK_LIBRARIES(ma_test1 maria myisam mysys dbug strings zlib wsock32) +TARGET_LINK_LIBRARIES(ma_test1 aria myisam mysys dbug strings zlib wsock32) ADD_EXECUTABLE(ma_test2 ma_test2.c) -TARGET_LINK_LIBRARIES(ma_test2 maria myisam mysys dbug strings zlib wsock32) +TARGET_LINK_LIBRARIES(ma_test2 aria myisam mysys dbug strings zlib wsock32) ADD_EXECUTABLE(ma_test3 ma_test3.c) -TARGET_LINK_LIBRARIES(ma_test3 maria myisam mysys dbug strings zlib wsock32) +TARGET_LINK_LIBRARIES(ma_test3 aria myisam mysys dbug strings zlib wsock32) ADD_EXECUTABLE(ma_rt_test ma_rt_test.c) -TARGET_LINK_LIBRARIES(ma_rt_test maria myisam mysys dbug strings zlib wsock32) +TARGET_LINK_LIBRARIES(ma_rt_test aria myisam mysys dbug strings zlib wsock32) ADD_EXECUTABLE(ma_sp_test ma_sp_test.c) -TARGET_LINK_LIBRARIES(ma_sp_test maria myisam mysys dbug strings zlib wsock32) +TARGET_LINK_LIBRARIES(ma_sp_test aria myisam mysys dbug strings zlib wsock32) IF(EMBED_MANIFESTS) - MYSQL_EMBED_MANIFEST("maria_ftdump" "asInvoker") - MYSQL_EMBED_MANIFEST("maria_chk" "asInvoker") - MYSQL_EMBED_MANIFEST("maria_read_log" "asInvoker") - MYSQL_EMBED_MANIFEST("maria_pack" "asInvoker") + MYSQL_EMBED_MANIFEST("aria_ftdump" "asInvoker") + MYSQL_EMBED_MANIFEST("aria_chk" "asInvoker") + MYSQL_EMBED_MANIFEST("aria_read_log" "asInvoker") + MYSQL_EMBED_MANIFEST("aria_pack" "asInvoker") ENDIF(EMBED_MANIFESTS) -INSTALL(TARGETS maria_ftdump maria_chk maria_read_log maria_pack maria_dump_log +INSTALL(TARGETS aria_ftdump aria_chk aria_read_log aria_pack aria_dump_log DESTINATION bin COMPONENT runtime) ENDIF(NOT SOURCE_SUBLIBS) diff --git a/storage/maria/Makefile.am b/storage/maria/Makefile.am index fe674fb2837..a1fe37fc396 100644 --- a/storage/maria/Makefile.am +++ b/storage/maria/Makefile.am @@ -27,44 +27,47 @@ LDADD = DEFS = @DEFS@ -# "." is needed first because tests in unittest need libmaria +# "." is needed first because tests in unittest need libaria SUBDIRS = . unittest EXTRA_DIST = ma_test_all.sh ma_test_all.res ma_test_big.sh \ ma_ft_stem.c CMakeLists.txt plug.in ma_test_recovery pkgdata_DATA = -pkglib_LIBRARIES = libmaria.a -bin_PROGRAMS = maria_chk maria_pack maria_ftdump maria_read_log \ - maria_dump_log -maria_chk_DEPENDENCIES= $(LIBRARIES) +pkglib_LIBRARIES = libaria.a +bin_PROGRAMS = aria_chk aria_pack aria_ftdump aria_read_log \ + aria_dump_log +aria_chk_DEPENDENCIES= $(LIBRARIES) # Only reason to link with libmyisam.a here is that it's where some fulltext -# pieces are (but soon we'll remove fulltext dependencies from Maria). +# pieces are (but soon we'll remove fulltext dependencies from Aria). # For now, it imposes that storage/myisam be built before storage/maria. -maria_chk_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmaria.a \ +aria_chk_SOURCES= maria_chk.c +aria_chk_LDADD= @CLIENT_EXTRA_LDFLAGS@ libaria.a \ $(top_builddir)/storage/myisam/libmyisam.a \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/dbug/libdbug.a \ $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ -maria_pack_DEPENDENCIES=$(LIBRARIES) -maria_pack_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmaria.a \ +aria_pack_SOURCES= maria_pack.c +aria_pack_DEPENDENCIES=$(LIBRARIES) +aria_pack_LDADD= @CLIENT_EXTRA_LDFLAGS@ libaria.a \ $(top_builddir)/storage/myisam/libmyisam.a \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/dbug/libdbug.a \ $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ -maria_read_log_DEPENDENCIES=$(LIBRARIES) -maria_read_log_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmaria.a \ +aria_read_log_SOURCES= maria_read_log.c +aria_read_log_DEPENDENCIES=$(LIBRARIES) +aria_read_log_LDADD= @CLIENT_EXTRA_LDFLAGS@ libaria.a \ $(top_builddir)/storage/myisam/libmyisam.a \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/dbug/libdbug.a \ $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ -maria_dump_log_DEPENDENCIES=$(LIBRARIES) ma_loghandler.c -maria_dump_log_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmaria.a \ +aria_dump_log_DEPENDENCIES=$(LIBRARIES) ma_loghandler.c +aria_dump_log_LDADD= @CLIENT_EXTRA_LDFLAGS@ libaria.a \ $(top_builddir)/storage/myisam/libmyisam.a \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/dbug/libdbug.a \ $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ -maria_dump_log_SOURCES= ma_loghandler.c unittest/ma_loghandler_examples.c -maria_dump_log_CPPFLAGS= -DMARIA_DUMP_LOG +aria_dump_log_SOURCES= ma_loghandler.c unittest/ma_loghandler_examples.c +aria_dump_log_CPPFLAGS= -DMARIA_DUMP_LOG noinst_PROGRAMS = ma_test1 ma_test2 ma_test3 ma_rt_test ma_sp_test noinst_HEADERS = maria_def.h ma_rt_index.h ma_rt_key.h ma_rt_mbr.h \ ma_sp_defs.h ma_fulltext.h ma_ftdefs.h ma_ft_test1.h \ @@ -76,44 +79,45 @@ noinst_HEADERS = maria_def.h ma_rt_index.h ma_rt_key.h ma_rt_mbr.h \ ma_key_recover.h ma_recovery_util.h \ ma_servicethread.h ma_test1_DEPENDENCIES= $(LIBRARIES) -ma_test1_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmaria.a \ +ma_test1_LDADD= @CLIENT_EXTRA_LDFLAGS@ libaria.a \ $(top_builddir)/storage/myisam/libmyisam.a \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/dbug/libdbug.a \ $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ ma_test2_DEPENDENCIES= $(LIBRARIES) -ma_test2_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmaria.a \ +ma_test2_LDADD= @CLIENT_EXTRA_LDFLAGS@ libaria.a \ $(top_builddir)/storage/myisam/libmyisam.a \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/dbug/libdbug.a \ $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ ma_test3_DEPENDENCIES= $(LIBRARIES) -ma_test3_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmaria.a \ +ma_test3_LDADD= @CLIENT_EXTRA_LDFLAGS@ libaria.a \ $(top_builddir)/storage/myisam/libmyisam.a \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/dbug/libdbug.a \ $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ #ma_ft_test1_DEPENDENCIES= $(LIBRARIES) #ma_ft_eval_DEPENDENCIES= $(LIBRARIES) -maria_ftdump_DEPENDENCIES= $(LIBRARIES) -maria_ftdump_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmaria.a \ +aria_ftdump_SOURCES= maria_ftdump.c +aria_ftdump_DEPENDENCIES= $(LIBRARIES) +aria_ftdump_LDADD= @CLIENT_EXTRA_LDFLAGS@ libaria.a \ $(top_builddir)/storage/myisam/libmyisam.a \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/dbug/libdbug.a \ $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ ma_rt_test_DEPENDENCIES= $(LIBRARIES) -ma_rt_test_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmaria.a \ +ma_rt_test_LDADD= @CLIENT_EXTRA_LDFLAGS@ libaria.a \ $(top_builddir)/storage/myisam/libmyisam.a \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/dbug/libdbug.a \ $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ ma_sp_test_DEPENDENCIES= $(LIBRARIES) -ma_sp_test_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmaria.a \ +ma_sp_test_LDADD= @CLIENT_EXTRA_LDFLAGS@ libaria.a \ $(top_builddir)/storage/myisam/libmyisam.a \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/dbug/libdbug.a \ $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ -libmaria_a_SOURCES = ma_init.c ma_open.c ma_extra.c ma_info.c ma_rkey.c \ +libaria_a_SOURCES = ma_init.c ma_open.c ma_extra.c ma_info.c ma_rkey.c \ ma_rnext.c ma_rnext_same.c \ ma_search.c ma_page.c ma_key_recover.c ma_key.c \ ma_locking.c ma_state.c \ @@ -137,7 +141,7 @@ libmaria_a_SOURCES = ma_init.c ma_open.c ma_extra.c ma_info.c ma_rkey.c \ ma_checkpoint.c ma_recovery.c ma_commit.c \ ma_pagecrc.c ma_recovery_util.c \ ha_maria.cc ma_servicethread.c -CLEANFILES = test?.MA? FT?.MA? isam.log ma_test_all ma_rt_test.MA? sp_test.MA? maria_log_control maria_log.0000* +CLEANFILES = test?.MA? FT?.MA? isam.log ma_test_all ma_rt_test.MA? sp_test.MA? aria_log_control aria_log.0000* SUFFIXES = .sh diff --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc index 95ddde42e07..8dd6b33190e 100644 --- a/storage/maria/ha_maria.cc +++ b/storage/maria/ha_maria.cc @@ -144,7 +144,7 @@ static void update_log_file_size(MYSQL_THD thd, static MYSQL_SYSVAR_ULONG(block_size, maria_block_size, PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY, - "Block size to be used for MARIA index pages.", 0, 0, + "Block size to be used for Aria index pages.", 0, 0, MARIA_KEY_BLOCK_LENGTH, MARIA_MIN_KEY_BLOCK_LENGTH, MARIA_MAX_KEY_BLOCK_LENGTH, MARIA_MIN_KEY_BLOCK_LENGTH); @@ -184,7 +184,7 @@ static MYSQL_SYSVAR_ULONG(log_file_size, log_file_size, static MYSQL_SYSVAR_ENUM(group_commit, maria_group_commit, PLUGIN_VAR_RQCMDARG, - "Specifies maria group commit mode. " + "Specifies Aria group commit mode. " "Possible values are \"none\" (no group commit), " "\"hard\" (with waiting to actual commit), " "\"soft\" (no wait for commit (DANGEROUS!!!))", @@ -197,12 +197,12 @@ static MYSQL_SYSVAR_ULONG(group_commit_interval, maria_group_commit_interval, " 0 stands for no waiting" " for other threads to come and do a commit in \"hard\" mode and no" " sync()/commit at all in \"soft\" mode. Option has only an effect" - " if maria_group_commit is used", + " if aria_group_commit is used", NULL, update_maria_group_commit_interval, 0, 0, UINT_MAX, 1); static MYSQL_SYSVAR_ENUM(log_purge_type, log_purge_type, PLUGIN_VAR_RQCMDARG, - "Specifies how maria transactional log will be purged. " + "Specifies how aria transactional log will be purged. " "Possible values of name are \"immediate\", \"external\" " "and \"at_flush\"", NULL, NULL, TRANSLOG_PURGE_IMMIDIATE, @@ -224,7 +224,7 @@ static MYSQL_SYSVAR_ULONG(pagecache_age_threshold, static MYSQL_SYSVAR_ULONGLONG(pagecache_buffer_size, pagecache_buffer_size, PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY, - "The size of the buffer used for index blocks for Maria tables. " + "The size of the buffer used for index blocks for Aria tables. " "Increase this to get better index handling (for all reads and " "multiple writes) to as much as you can afford.", 0, 0, KEY_CACHE_SIZE, MALLOC_OVERHEAD, ~(ulong) 0, IO_SIZE); @@ -241,7 +241,7 @@ static MYSQL_SYSVAR_ENUM(recover, maria_recover_options, PLUGIN_VAR_OPCMDARG, NULL, NULL, HA_RECOVER_DEFAULT, &maria_recover_typelib); static MYSQL_THDVAR_ULONG(repair_threads, PLUGIN_VAR_RQCMDARG, - "Number of threads to use when repairing maria tables. The value of 1 " + "Number of threads to use when repairing Aria tables. The value of 1 " "disables parallel repair.", 0, 0, 1, 1, ~0L, 1); @@ -251,7 +251,7 @@ static MYSQL_THDVAR_ULONG(sort_buffer_size, PLUGIN_VAR_RQCMDARG, 0, 0, 128L*1024L*1024L, 4, ~0L, 1); static MYSQL_THDVAR_ENUM(stats_method, PLUGIN_VAR_RQCMDARG, - "Specifies how maria index statistics collection code should treat " + "Specifies how Aria index statistics collection code should treat " "NULLs. Possible values are \"nulls_unequal\", \"nulls_equal\", " "and \"nulls_ignored\".", 0, 0, 0, &maria_stats_method_typelib); @@ -269,7 +269,7 @@ static my_bool use_maria_for_temp_tables= 0; static MYSQL_SYSVAR_BOOL(used_for_temp_tables, use_maria_for_temp_tables, PLUGIN_VAR_READONLY | PLUGIN_VAR_NOCMDOPT, - "Whether temporary tables should be MyISAM or Maria", 0, 0, + "Whether temporary tables should be MyISAM or Aria", 0, 0, 1); /***************************************************************************** @@ -1464,7 +1464,7 @@ int ha_maria::repair(THD *thd, HA_CHECK *param, bool do_optimize) if (file->dfile.file == -1) { sql_print_information("Retrying repair of: '%s' failed. " - "Please try REPAIR EXTENDED or maria_chk", + "Please try REPAIR EXTENDED or aria_chk", table->s->path.str); DBUG_RETURN(HA_ADMIN_FAILED); } @@ -3199,7 +3199,7 @@ static my_bool translog_callback_delete_all(const char *directory, /** - Helper function for option maria-force-start-after-recovery-failures. + Helper function for option aria-force-start-after-recovery-failures. Deletes logs if too many failures. Otherwise, increments the counter of failures in the control file. Notice how this has to be called _before_ translog_init() (if log is @@ -3215,9 +3215,9 @@ static int mark_recovery_start(const char* log_dir) DBUG_ENTER("mark_recovery_start"); if (unlikely(maria_recover_options == HA_RECOVER_NONE)) ma_message_no_user(ME_JUST_WARNING, "Please consider using option" - " --maria-recover[=...] to automatically check and" + " --aria-recover[=...] to automatically check and" " repair tables when logs are removed by option" - " --maria-force-start-after-recovery-failures=#"); + " --aria-force-start-after-recovery-failures=#"); if (recovery_failures >= force_start_after_recovery_failures) { /* @@ -3243,9 +3243,9 @@ static int mark_recovery_start(const char* log_dir) /** - Helper function for option maria-force-start-after-recovery-failures. + Helper function for option aria-force-start-after-recovery-failures. Records in the control file that recovery was a success, so that it's not - counted for maria-force-start-after-recovery-failures. + counted for aria-force-start-after-recovery-failures. */ static int mark_recovery_success(void) @@ -3525,25 +3525,25 @@ static void update_log_file_size(MYSQL_THD thd, static SHOW_VAR status_variables[]= { - {"Maria_pagecache_blocks_not_flushed", (char*) &maria_pagecache_var.global_blocks_changed, SHOW_LONG_NOFLUSH}, - {"Maria_pagecache_blocks_unused", (char*) &maria_pagecache_var.blocks_unused, SHOW_LONG_NOFLUSH}, - {"Maria_pagecache_blocks_used", (char*) &maria_pagecache_var.blocks_used, SHOW_LONG_NOFLUSH}, - {"Maria_pagecache_read_requests", (char*) &maria_pagecache_var.global_cache_r_requests, SHOW_LONGLONG}, - {"Maria_pagecache_reads", (char*) &maria_pagecache_var.global_cache_read, SHOW_LONGLONG}, - {"Maria_pagecache_write_requests", (char*) &maria_pagecache_var.global_cache_w_requests, SHOW_LONGLONG}, - {"Maria_pagecache_writes", (char*) &maria_pagecache_var.global_cache_write, SHOW_LONGLONG}, - {"Maria_transaction_log_syncs", (char*) &translog_syncs, SHOW_LONGLONG}, + {"Aria_pagecache_blocks_not_flushed", (char*) &maria_pagecache_var.global_blocks_changed, SHOW_LONG_NOFLUSH}, + {"Aria_pagecache_blocks_unused", (char*) &maria_pagecache_var.blocks_unused, SHOW_LONG_NOFLUSH}, + {"Aria_pagecache_blocks_used", (char*) &maria_pagecache_var.blocks_used, SHOW_LONG_NOFLUSH}, + {"Aria_pagecache_read_requests", (char*) &maria_pagecache_var.global_cache_r_requests, SHOW_LONGLONG}, + {"Aria_pagecache_reads", (char*) &maria_pagecache_var.global_cache_read, SHOW_LONGLONG}, + {"Aria_pagecache_write_requests", (char*) &maria_pagecache_var.global_cache_w_requests, SHOW_LONGLONG}, + {"Aria_pagecache_writes", (char*) &maria_pagecache_var.global_cache_write, SHOW_LONGLONG}, + {"Aria_transaction_log_syncs", (char*) &translog_syncs, SHOW_LONGLONG}, {NullS, NullS, SHOW_LONG} }; struct st_mysql_storage_engine maria_storage_engine= { MYSQL_HANDLERTON_INTERFACE_VERSION }; -mysql_declare_plugin(maria) +mysql_declare_plugin(aria) { MYSQL_STORAGE_ENGINE_PLUGIN, &maria_storage_engine, - "MARIA", + "Aria", "Monty Program Ab", "Crash-safe tables with MyISAM heritage", PLUGIN_LICENSE_GPL, @@ -3555,12 +3555,12 @@ mysql_declare_plugin(maria) NULL } mysql_declare_plugin_end; -maria_declare_plugin(maria) +maria_declare_plugin(aria) { MYSQL_STORAGE_ENGINE_PLUGIN, &maria_storage_engine, - "MARIA", - "MySQL AB", + "Aria", + "Monty Program Ab", "Crash-safe tables with MyISAM heritage", PLUGIN_LICENSE_GPL, ha_maria_init, /* Plugin Init */ diff --git a/storage/maria/ha_maria.h b/storage/maria/ha_maria.h index 6402571f043..09e59435c2a 100644 --- a/storage/maria/ha_maria.h +++ b/storage/maria/ha_maria.h @@ -53,7 +53,7 @@ public: ~ha_maria() {} handler *clone(MEM_ROOT *mem_root); const char *table_type() const - { return "MARIA"; } + { return "Aria"; } const char *index_type(uint key_number); const char **bas_ext() const; ulonglong table_flags() const diff --git a/storage/maria/ma_check.c b/storage/maria/ma_check.c index ed3a7a46344..b21935d6ba3 100644 --- a/storage/maria/ma_check.c +++ b/storage/maria/ma_check.c @@ -2518,7 +2518,7 @@ int maria_repair(HA_CHECK *param, register MARIA_HA *info, start_records= share->state.state.records; if (!(param->testflag & T_SILENT)) { - printf("- recovering (with keycache) MARIA-table '%s'\n",name); + printf("- recovering (with keycache) Aria-table '%s'\n",name); printf("Data records: %s\n", llstr(start_records, llbuff)); } @@ -3003,7 +3003,7 @@ int maria_sort_index(HA_CHECK *param, register MARIA_HA *info, char *name) DBUG_RETURN(0); if (!(param->testflag & T_SILENT)) - printf("- Sorting index for MARIA-table '%s'\n",name); + printf("- Sorting index for Aria-table '%s'\n",name); if (protect_against_repair_crash(info, param, FALSE)) DBUG_RETURN(1); @@ -3235,7 +3235,7 @@ static my_bool maria_zerofill_index(HA_CHECK *param, MARIA_HA *info, DBUG_ENTER("maria_zerofill_index"); if (!(param->testflag & T_SILENT)) - printf("- Zerofilling index for MARIA-table '%s'\n",name); + printf("- Zerofilling index for Aria-table '%s'\n",name); /* Go through the index file */ for (pos= share->base.keystart, page= (ulonglong) (pos / block_size); @@ -3327,7 +3327,7 @@ static my_bool maria_zerofill_data(HA_CHECK *param, MARIA_HA *info, DBUG_RETURN(0); if (!(param->testflag & T_SILENT)) - printf("- Zerofilling data for MARIA-table '%s'\n",name); + printf("- Zerofilling data for Aria-table '%s'\n",name); /* Go through the record file */ for (page= 1, pos= block_size; @@ -3586,7 +3586,7 @@ int maria_repair_by_sort(HA_CHECK *param, register MARIA_HA *info, start_records= share->state.state.records; if (!(param->testflag & T_SILENT)) { - printf("- recovering (with sort) MARIA-table '%s'\n",name); + printf("- recovering (with sort) Aria-table '%s'\n",name); printf("Data records: %s\n", llstr(start_records,llbuff)); } @@ -4091,7 +4091,7 @@ int maria_repair_parallel(HA_CHECK *param, register MARIA_HA *info, start_records= share->state.state.records; if (!(param->testflag & T_SILENT)) { - printf("- parallel recovering (with sort) MARIA-table '%s'\n",name); + printf("- parallel recovering (with sort) Aria-table '%s'\n",name); printf("Data records: %s\n", llstr(start_records, llbuff)); } @@ -5683,7 +5683,7 @@ static int sort_delete_record(MARIA_SORT_PARAM *sort_param) _ma_check_print_error(param, "Recover aborted; Can't run standard recovery on " "compressed tables with errors in data-file. " - "Use 'maria_chk --safe-recover' to fix it"); + "Use 'aria_chk --safe-recover' to fix it"); DBUG_RETURN(1); } @@ -6125,7 +6125,7 @@ void _ma_update_auto_increment_key(HA_CHECK *param, MARIA_HA *info, } if (!(param->testflag & T_SILENT) && !(param->testflag & T_REP)) - printf("Updating MARIA file: %s\n", param->isam_file_name); + printf("Updating Aria file: %s\n", param->isam_file_name); /* We have to use an allocated buffer instead of info->rec_buff as _ma_put_key_in_record() may use info->rec_buff @@ -6766,7 +6766,7 @@ static void _ma_check_print_not_visible_error(HA_CHECK *param, TrID used_trid) { _ma_check_print_warning(param, "Found row with transaction id %s but no " - "maria_control_file was used or specified. " + "aria_control_file was used or specified. " "The table may be corrupted", llstr(used_trid, buff)); } @@ -6774,7 +6774,7 @@ static void _ma_check_print_not_visible_error(HA_CHECK *param, TrID used_trid) { _ma_check_print_error(param, "Found row with transaction id %s when max " - "transaction id according to maria_control_file " + "transaction id according to aria_control_file " "is %s", llstr(used_trid, buff), llstr(param->max_trid, buff2)); diff --git a/storage/maria/ma_check_standalone.h b/storage/maria/ma_check_standalone.h index 9b30c96089f..8cda285bb99 100644 --- a/storage/maria/ma_check_standalone.h +++ b/storage/maria/ma_check_standalone.h @@ -64,7 +64,7 @@ void _ma_check_print_warning(HA_CHECK *param, const char *fmt,...) if (!param->warning_printed && !param->error_printed) { if (param->testflag & T_SILENT) - fprintf(stderr,"%s: MARIA file %s\n",my_progname_short, + fprintf(stderr,"%s: Aria file %s\n",my_progname_short, param->isam_file_name); param->out_flag|= O_DATA_LOST; } @@ -90,7 +90,7 @@ void _ma_check_print_error(HA_CHECK *param, const char *fmt,...) if (!param->warning_printed && !param->error_printed) { if (param->testflag & T_SILENT) - fprintf(stderr,"%s: MARIA file %s\n",my_progname_short,param->isam_file_name); + fprintf(stderr,"%s: Aria file %s\n",my_progname_short,param->isam_file_name); param->out_flag|= O_DATA_LOST; } param->error_printed|=1; diff --git a/storage/maria/ma_checkpoint.h b/storage/maria/ma_checkpoint.h index 69645c6bcda..126f8111a23 100644 --- a/storage/maria/ma_checkpoint.h +++ b/storage/maria/ma_checkpoint.h @@ -89,4 +89,4 @@ static inline LSN lsn_read_non_atomic_32(const volatile LSN *x) @param sentence text to write */ #define ma_message_no_user(level, sentence) \ - my_printf_error(HA_ERR_GENERIC, "Maria engine: %s", MYF(level), sentence) + my_printf_error(HA_ERR_GENERIC, "Aria engine: %s", MYF(level), sentence) diff --git a/storage/maria/ma_control_file.c b/storage/maria/ma_control_file.c index ac246f09337..6f9018885e9 100644 --- a/storage/maria/ma_control_file.c +++ b/storage/maria/ma_control_file.c @@ -234,7 +234,7 @@ static int lock_control_file(const char *name) { if (retry == 0) my_printf_error(HA_ERR_INITIALIZATION, - "Can't lock maria control file '%s' for exclusive use, " + "Can't lock aria control file '%s' for exclusive use, " "error: %d. Will retry for %d seconds", 0, name, my_errno, MARIA_MAX_CONTROL_FILE_LOCK_RETRY); if (retry++ > MARIA_MAX_CONTROL_FILE_LOCK_RETRY) @@ -372,14 +372,14 @@ CONTROL_FILE_ERROR ma_control_file_open(my_bool create_if_missing, CF_MAGIC_STRING, CF_MAGIC_STRING_SIZE)) { error= CONTROL_FILE_BAD_MAGIC_STRING; - errmsg= "Missing valid id at start of file. File is not a valid maria control file"; + errmsg= "Missing valid id at start of file. File is not a valid aria control file"; goto err; } if (buffer[CF_VERSION_OFFSET] > CONTROL_FILE_VERSION) { error= CONTROL_FILE_BAD_VERSION; - sprintf(errmsg_buff, "File is from a future maria system: %d. Current version is: %d", + sprintf(errmsg_buff, "File is from a future aria system: %d. Current version is: %d", (int) buffer[CF_VERSION_OFFSET], CONTROL_FILE_VERSION); errmsg= errmsg_buff; goto err; @@ -402,7 +402,7 @@ CONTROL_FILE_ERROR ma_control_file_open(my_bool create_if_missing, { error= CONTROL_FILE_WRONG_BLOCKSIZE; sprintf(errmsg_buff, - "Block size in control file (%u) is different than given maria_block_size: %u", + "Block size in control file (%u) is different than given aria_block_size: %u", new_block_size, (uint) maria_block_size); errmsg= errmsg_buff; goto err; @@ -445,7 +445,7 @@ ok: err: if (print_error) my_printf_error(HA_ERR_INITIALIZATION, - "Got error '%s' when trying to use maria control file " + "Got error '%s' when trying to use aria control file " "'%s'", 0, errmsg, name); ma_control_file_end(); /* will unlock file if needed */ DBUG_RETURN(error); diff --git a/storage/maria/ma_control_file.h b/storage/maria/ma_control_file.h index 4cb5527620d..f828ae69c6d 100644 --- a/storage/maria/ma_control_file.h +++ b/storage/maria/ma_control_file.h @@ -21,7 +21,7 @@ #ifndef _ma_control_file_h #define _ma_control_file_h -#define CONTROL_FILE_BASE_NAME "maria_log_control" +#define CONTROL_FILE_BASE_NAME "aria_log_control" /* Major version for control file. Should only be changed when doing big changes that made the new control file incompatible with all diff --git a/storage/maria/ma_create.c b/storage/maria/ma_create.c index 6886dc8f291..9cf042ed21e 100644 --- a/storage/maria/ma_create.c +++ b/storage/maria/ma_create.c @@ -653,7 +653,7 @@ int maria_create(const char *name, enum data_file_type datafile_type, if (info_length > 65535) { my_printf_error(HA_WRONG_CREATE_OPTION, - "Maria table '%s' has too many columns and/or " + "Aria table '%s' has too many columns and/or " "indexes and/or unique constraints.", MYF(0), name + dirname_length(name)); my_errno= HA_WRONG_CREATE_OPTION; @@ -841,7 +841,7 @@ int maria_create(const char *name, enum data_file_type datafile_type, */ if (_ma_test_if_reopen(filename)) { - my_printf_error(0, "MARIA table '%s' is in use " + my_printf_error(0, "Aria table '%s' is in use " "(most likely by a MERGE table). Try FLUSH TABLES.", MYF(0), name + dirname_length(name)); my_errno= HA_ERR_TABLE_EXIST; diff --git a/storage/maria/ma_loghandler.c b/storage/maria/ma_loghandler.c index d5651422aaf..dc99554a08d 100644 --- a/storage/maria/ma_loghandler.c +++ b/storage/maria/ma_loghandler.c @@ -909,7 +909,7 @@ char *translog_filename_by_fileno(uint32 file_no, char *path) DBUG_ASSERT(file_no <= 0xfffffff); /* log_descriptor.directory is already formated */ - end= strxmov(path, log_descriptor.directory, "maria_log.0000000", NullS); + end= strxmov(path, log_descriptor.directory, "aria_log.0000000", NullS); length= (uint) (int10_to_str(file_no, buff, 10) - buff); strmov(end - length +1, buff); @@ -1219,7 +1219,7 @@ my_bool translog_read_file_header(LOGHANDLER_FILE_INFO *desc, File file) DBUG_RETURN(1); } translog_interpret_file_header(desc, page_buff); - DBUG_PRINT("info", ("timestamp: %llu maria ver: %lu mysql ver: %lu " + DBUG_PRINT("info", ("timestamp: %llu aria ver: %lu mysql ver: %lu " "server id %lu page size %lu file number %lu " "max lsn: (%lu,0x%lx)", (ulonglong) desc->timestamp, @@ -3470,7 +3470,7 @@ static my_bool translog_truncate_log(TRANSLOG_ADDRESS addr) /** Applies function 'callback' to all files (in a directory) which - name looks like a log's name (maria_log.[0-9]{7}). + name looks like a log's name (aria_log.[0-9]{7}). If 'callback' returns TRUE this interrupts the walk and returns TRUE. Otherwise FALSE is returned after processing all log files. It cannot just use log_descriptor.directory because that may not yet have @@ -3496,7 +3496,7 @@ my_bool translog_walk_filenames(const char *directory, for (i= 0; i < dirp->number_off_files; i++) { char *file= dirp->dir_entry[i].name; - if (strncmp(file, "maria_log.", 10) == 0 && + if (strncmp(file, "aria_log.", 10) == 0 && file[10] >= '0' && file[10] <= '9' && file[11] >= '0' && file[11] <= '9' && file[12] >= '0' && file[12] <= '9' && @@ -3727,7 +3727,7 @@ my_bool translog_init_with_table(const char *directory, my_bool pageok; DBUG_PRINT("info", ("log found...")); /* - TODO: scan directory for maria_log.XXXXXXXX files and find + TODO: scan directory for aria_log.XXXXXXXX files and find highest XXXXXXXX & set logs_found TODO: check that last checkpoint within present log addresses space @@ -8864,13 +8864,13 @@ void translog_soft_sync_end(void) #ifdef MARIA_DUMP_LOG #include <my_getopt.h> extern void translog_example_table_init(); -static const char *load_default_groups[]= { "maria_dump_log",0 }; +static const char *load_default_groups[]= { "aria_dump_log",0 }; static void get_options(int *argc,char * * *argv); #ifndef DBUG_OFF #if defined(__WIN__) -const char *default_dbug_option= "d:t:i:O,\\maria_dump_log.trace"; +const char *default_dbug_option= "d:t:i:O,\\aria_dump_log.trace"; #else -const char *default_dbug_option= "d:t:i:o,/tmp/maria_dump_log.trace"; +const char *default_dbug_option= "d:t:i:o,/tmp/aria_dump_log.trace"; #endif #endif static ulonglong opt_offset; @@ -8927,7 +8927,7 @@ static void usage(void) puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,"); puts("and you are welcome to modify and redistribute it under the GPL license\n"); - puts("Dump content of maria log pages."); + puts("Dump content of aria log pages."); VOID(printf("\nUsage: %s -f file OPTIONS\n", my_progname_short)); my_print_help(my_long_options); print_defaults("my", load_default_groups); @@ -8984,7 +8984,7 @@ static void dump_header_page(uchar *buff) translog_interpret_file_header(&desc, buff); printf(" This can be header page:\n" " Timestamp: %s\n" - " Maria log version: %lu\n" + " Aria log version: %lu\n" " Server version: %lu\n" " Server id %lu\n" " Page size %lu\n", diff --git a/storage/maria/ma_recovery.c b/storage/maria/ma_recovery.c index b4fe96ae168..f15318cb4f3 100644 --- a/storage/maria/ma_recovery.c +++ b/storage/maria/ma_recovery.c @@ -211,12 +211,12 @@ int maria_recovery_from_log(void) maria_in_recovery= TRUE; #ifdef EXTRA_DEBUG - fn_format(name_buff, "maria_recovery.trace", maria_data_root, "", MYF(0)); + fn_format(name_buff, "aria_recovery.trace", maria_data_root, "", MYF(0)); trace_file= my_fopen(name_buff, O_WRONLY|O_APPEND|O_CREAT, MYF(MY_WME)); #else trace_file= NULL; /* no trace file for being fast */ #endif - tprint(trace_file, "TRACE of the last MARIA recovery from mysqld\n"); + tprint(trace_file, "TRACE of the last Aria recovery from mysqld\n"); DBUG_ASSERT(maria_pagecache->inited); res= maria_apply_log(LSN_IMPOSSIBLE, LSN_IMPOSSIBLE, MARIA_LOG_APPLY, trace_file, TRUE, TRUE, TRUE, &warnings_count); @@ -508,14 +508,14 @@ end: if (!trace_file) fputc('\n', stderr); my_message(HA_ERR_INITIALIZATION, - "Maria recovery failed. Please run maria_chk -r on all maria " - "tables and delete all maria_log.######## files", MYF(0)); + "Aria recovery failed. Please run aria_chk -r on all Aria " + "tables and delete all aria_log.######## files", MYF(0)); } procent_printed= 0; /* We don't cleanly close tables if we hit some error (may corrupt them by flushing some wrong blocks made from wrong REDOs). It also leaves their - open_count>0, which ensures that --maria-recover, if used, will try to + open_count>0, which ensures that --aria-recover, if used, will try to repair them. */ DBUG_RETURN(error); @@ -672,7 +672,7 @@ prototype_redo_exec_hook(INCOMPLETE_LOG) failure in _ma_apply_redo_insert_row_head_or_tail(): new data page is created whereas rownr is not 0). So when the server disables logging for ALTER TABLE or CREATE SELECT, it - logs LOGREC_INCOMPLETE_LOG to warn maria_read_log and then the user. + logs LOGREC_INCOMPLETE_LOG to warn aria_read_log and then the user. Another issue is that replaying of DDLs is not correct enough to work if there was a crash during a DDL (see comment in execution of @@ -892,7 +892,7 @@ prototype_redo_exec_hook(REDO_RENAME_TABLE) new_name); /* Here is why we skip CREATE/DROP/RENAME when doing a recovery from - ha_maria (whereas we do when called from maria_read_log). Consider: + ha_maria (whereas we do when called from aria_read_log). Consider: CREATE TABLE t; RENAME TABLE t to u; DROP TABLE u; @@ -912,8 +912,8 @@ prototype_redo_exec_hook(REDO_RENAME_TABLE) crash. We however sync files and directories at each file rename. The SQL layer is anyway not crash-safe for DDLs (except the repartioning-related ones). - We replay DDLs in maria_read_log to be able to recreate tables from - scratch. It means that "maria_read_log -a" should not be used on a + We replay DDLs in aria_read_log to be able to recreate tables from + scratch. It means that "aria_read_log -a" should not be used on a database which just crashed during a DDL. And also ALTER TABLE does not log insertions of records into the temporary table, so replaying may fail (grep for INCOMPLETE_LOG in files). @@ -1317,7 +1317,7 @@ static int new_table(uint16 sid, const char *name, LSN lsn_of_file_id) if (maria_is_crashed(info)) { eprint(tracef, "Table '%s' is crashed, skipping it. Please repair it with" - " maria_chk -r", share->open_file_name.str); + " aria_chk -r", share->open_file_name.str); recovery_found_crashed_tables++; error= -1; /* not fatal, try with other tables */ goto end; @@ -1976,7 +1976,7 @@ prototype_redo_exec_hook(IMPORTED_TABLE) return 1; } name= (char *)log_record_buffer.str; - tprint(tracef, "Table '%s' was imported (auto-zerofilled) in this Maria instance\n", name); + tprint(tracef, "Table '%s' was imported (auto-zerofilled) in this Aria instance\n", name); return 0; } diff --git a/storage/maria/ma_sort.c b/storage/maria/ma_sort.c index 387563ebaac..5c36c2fba75 100644 --- a/storage/maria/ma_sort.c +++ b/storage/maria/ma_sort.c @@ -154,7 +154,7 @@ int _ma_create_index_by_sort(MARIA_SORT_PARAM *info, my_bool no_messages, keys < (uint) maxbuffer) { _ma_check_print_error(info->sort_info->param, - "maria_sort_buffer_size is too small"); + "aria_sort_buffer_size is too small"); goto err; } } @@ -178,7 +178,7 @@ int _ma_create_index_by_sort(MARIA_SORT_PARAM *info, my_bool no_messages, } if (memavl < MIN_SORT_MEMORY) { - _ma_check_print_error(info->sort_info->param, "Maria sort buffer" + _ma_check_print_error(info->sort_info->param, "Aria sort buffer" " too small"); /* purecov: tested */ goto err; /* purecov: tested */ } @@ -377,7 +377,7 @@ pthread_handler_t _ma_thr_find_all_keys(void *arg) keys < maxbuffer) { _ma_check_print_error(sort_param->sort_info->param, - "maria_sort_buffer_size is too small"); + "aria_sort_buffer_size is too small"); goto err; } } @@ -405,7 +405,7 @@ pthread_handler_t _ma_thr_find_all_keys(void *arg) if (memavl < MIN_SORT_MEMORY) { _ma_check_print_error(sort_param->sort_info->param, - "Maria sort buffer too small"); + "Aria sort buffer too small"); goto err; /* purecov: tested */ } diff --git a/storage/maria/ma_test_force_start.pl b/storage/maria/ma_test_force_start.pl index 7ab8190a738..8148b2f212b 100755 --- a/storage/maria/ma_test_force_start.pl +++ b/storage/maria/ma_test_force_start.pl @@ -6,7 +6,7 @@ use warnings; my $usage= <<EOF; This program tests that the options ---maria-force-start-after-recovery-failures --maria-recover work as +--aria-force-start-after-recovery-failures --aria-recover work as expected. It has to be run from directory mysql-test, and works with non-debug and debug binaries. @@ -43,7 +43,7 @@ my $error_log_name= "./var/log/master.err"; my @cmd_output; my $whatever; # garbage data $ENV{MTR_VERSION} = 1; # MTR2 does not have --start-and-exit -my $base_server_cmd= "perl mysql-test-run.pl --mysqld=--maria-force-start-after-recovery-failures=$force_after --suite=maria maria.maria-recover ";
+my $base_server_cmd= "perl mysql-test-run.pl --mysqld=--aria-force-start-after-recovery-failures=$force_after --suite=maria maria.maria-recover ";
if ($^O =~ /^mswin/i) { print <<EOF; @@ -101,7 +101,7 @@ open(FILE, ">", $sql_name) or die; # sort_get_next_record() whose failure itself does not cause a retry. print FILE "create table t1 (a varchar(1000)". - ($corrupt_index ? ", index(a)" : "") .") engine=maria;\n"; + ($corrupt_index ? ", index(a)" : "") .") engine=aria;\n"; print FILE <<EOF; insert into t1 values("ThursdayMorningsMarket"); # If Recovery executes REDO_INDEX_NEW_PAGE it will overwrite our @@ -109,7 +109,7 @@ insert into t1 values("ThursdayMorningsMarket"); # create_rename_lsn using OPTIMIZE TABLE. This also makes sure to put # the pages on disk, so that we can corrupt them. optimize table t1; -# mark table open, so that --maria-recover repairs it +# mark table open, so that --aria-recover repairs it insert into t1 select concat(a,'b') from t1 limit 1; EOF close FILE; @@ -123,7 +123,7 @@ kill_server(9); print "ruining " . ($corrupt_index ? "first page of keys" : "bitmap page") . - " in table to test maria-recover\n"; + " in table to test aria-recover\n"; open(FILE, "+<", "./var/master-data/test/t1.$corrupt_file") or die; $whatever= ("\xAB" x 100); sysseek (FILE, $corrupt_index ? 8192 : (8192-100-100), 0) or die; @@ -131,7 +131,7 @@ syswrite (FILE, $whatever) or die; close FILE; print "ruining log to make recovery fail; mysqld should fail the $force_after first restarts\n"; -open(FILE, "+<", "./var/tmp/maria_log.00000001") or die; +open(FILE, "+<", "./var/tmp/aria_log.00000001") or die; $whatever= ("\xAB" x 8192); sysseek (FILE, 99, 0) or die; syswrite (FILE, $whatever) or die; @@ -148,8 +148,8 @@ for($i= 1; $i <= $force_after; $i= $i + 1) open(FILE, "<", $error_log_name) or die; @cmd_output= <FILE>; close FILE; - die unless grep(/\[ERROR\] mysqld(.exe)*: Maria engine: log initialization failed/, @cmd_output); - die unless grep(/\[ERROR\] Plugin 'MARIA' init function returned error./, @cmd_output); + die unless grep(/\[ERROR\] mysqld(.exe)*: Aria engine: log initialization failed/, @cmd_output); + die unless grep(/\[ERROR\] Plugin 'Aria' init function returned error./, @cmd_output); print "failed - ok\n"; } @@ -160,13 +160,13 @@ die if $?; open(FILE, "<", $error_log_name) or die; @cmd_output= <FILE>; close FILE; -die unless grep(/\[Warning\] mysqld(.exe)*: Maria engine: removed all logs after [\d]+ consecutive failures of recovery from logs/, @cmd_output); -die unless grep(/\[ERROR\] mysqld(.exe)*: File '.*tmp.maria_log.00000001' not found \(Errcode: 2\)/, @cmd_output); +die unless grep(/\[Warning\] mysqld(.exe)*: Aria engine: removed all logs after [\d]+ consecutive failures of recovery from logs/, @cmd_output); +die unless grep(/\[ERROR\] mysqld(.exe)*: File '.*tmp.aria_log.00000001' not found \(Errcode: 2\)/, @cmd_output); print "success - ok\n"; open(FILE, ">", $sql_name) or die; print FILE <<EOF; -set global maria_recover=normal; +set global aria_recover=normal; insert into t1 values('aaa'); EOF close FILE; diff --git a/storage/maria/maria_chk.c b/storage/maria/maria_chk.c index 18426e468cd..aba5efaf7ef 100644 --- a/storage/maria/maria_chk.c +++ b/storage/maria/maria_chk.c @@ -36,7 +36,7 @@ SET_STACK_SIZE(9000) /* Minimum stack size for program */ static uint decode_bits; static char **default_argv; -static const char *load_default_groups[]= { "maria_chk", 0 }; +static const char *load_default_groups[]= { "aria_chk", 0 }; static const char *set_collation_name, *opt_tmpdir, *opt_log_dir; static CHARSET_INFO *set_collation; static int stopwords_inited= 0; @@ -80,8 +80,8 @@ static const char *bitmap_description[]= }; static const char *maria_stats_method_str="nulls_unequal"; -static char default_open_errmsg[]= "%d when opening MARIA-table '%s'"; -static char default_close_errmsg[]= "%d when closing MARIA-table '%s'"; +static char default_open_errmsg[]= "%d when opening Aria table '%s'"; +static char default_close_errmsg[]= "%d when closing Aria table '%s'"; static void get_options(int *argc,char * * *argv); static void print_version(void); @@ -181,7 +181,7 @@ end: char buff[22],buff2[22]; if (!(check_param.testflag & T_SILENT) || check_param.testflag & T_INFO) puts("\n---------"); - printf("\nTotal of all %d MARIA-files:\nData records: %9s Deleted blocks: %9s\n",check_param.total_files,llstr(check_param.total_records,buff), + printf("\nTotal of all %d Aria-files:\nData records: %9s Deleted blocks: %9s\n",check_param.total_files,llstr(check_param.total_records,buff), llstr(check_param.total_deleted,buff2)); } free_defaults(default_argv); @@ -266,7 +266,7 @@ static struct my_option my_long_options[] = "Print statistics information about table that is checked.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, {"keys-used", 'k', - "Tell MARIA to update only some specific keys. # is a bit mask of which keys to use. This can be used to get faster inserts.", + "Tell Aria to update only some specific keys. # is a bit mask of which keys to use. This can be used to get faster inserts.", &check_param.keys_in_use, &check_param.keys_in_use, 0, GET_ULL, REQUIRED_ARG, -1, 0, 0, 0, 0, 0}, @@ -278,7 +278,7 @@ static struct my_option my_long_options[] = "Path for log files.", (char**) &opt_log_dir, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"max-record-length", OPT_MAX_RECORD_LENGTH, - "Skip rows bigger than this if maria_chk can't allocate memory to hold it", + "Skip rows bigger than this if aria_chk can't allocate memory to hold it", &check_param.max_record_length, &check_param.max_record_length, 0, GET_ULL, REQUIRED_ARG, LONGLONG_MAX, 0, LONGLONG_MAX, 0, 0, 0}, @@ -324,7 +324,7 @@ static struct my_option my_long_options[] = "Change the value of a variable. Please note that this option is deprecated; you can set variables directly with --variable-name=value.", 0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"silent", 's', - "Only print errors. One can use two -s to make maria_chk very silent.", + "Only print errors. One can use two -s to make aria_chk very silent.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, #ifndef DBUG_OFF #ifdef SAFEMALLOC @@ -353,7 +353,7 @@ static struct my_option my_long_options[] = "properly closed'", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, {"unpack", 'u', - "Unpack file packed with mariapack.", + "Unpack file packed with ariapack.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, {"verbose", 'v', "Print more information. This can be used with --description and --check. Use many -v for more verbosity!", @@ -400,7 +400,7 @@ static struct my_option my_long_options[] = { "ft_max_word_len", OPT_FT_MAX_WORD_LEN, "", &ft_max_word_len, &ft_max_word_len, 0, GET_ULONG, REQUIRED_ARG, HA_FT_MAXCHARLEN, 10, HA_FT_MAXCHARLEN, 0, 1, 0}, - { "maria_ft_stopword_file", OPT_FT_STOPWORD_FILE, + { "aria_ft_stopword_file", OPT_FT_STOPWORD_FILE, "Use stopwords from this file instead of built-in list.", (char**) &ft_stopword_file, (char**) &ft_stopword_file, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, @@ -436,7 +436,7 @@ static void usage(void) print_version(); puts("By Monty, for your professional use"); puts("This software comes with NO WARRANTY: see the PUBLIC for details.\n"); - puts("Description, check and repair of MARIA tables."); + puts("Description, check and repair of Aria tables."); puts("Used without options all tables on the command will be checked for errors"); printf("Usage: %s [OPTIONS] tables[.MAI]\n", my_progname_short); printf("\nGlobal options:\n"); @@ -460,10 +460,10 @@ static void usage(void) #endif printf(", they will be used\n\ in a round-robin fashion.\n\ - --require-control-file Abort if we can't find/read the maria_log_control\n\ + --require-control-file Abort if we can't find/read the aria_log_control\n\ file\n\ -s, --silent Only print errors. One can use two -s to make\n\ - maria_chk very silent.\n\ + aria_chk very silent.\n\ -v, --verbose Print more information. This can be used with\n\ --description and --check. Use many -v for more verbosity.\n\ -V, --version Print version and exit.\n\ @@ -472,10 +472,10 @@ static void usage(void) puts(" --start-check-pos=# Start reading file at given offset.\n"); #endif - puts("Check options (check is the default action for maria_chk):\n\ + puts("Check options (check is the default action for aria_chk):\n\ -c, --check Check table for errors.\n\ -e, --extend-check Check the table VERY throughly. Only use this in\n\ - extreme cases as maria_chk should normally be able to\n\ + extreme cases as aria_chk should normally be able to\n\ find out if the table is ok even without this switch.\n\ -F, --fast Check only tables that haven't been closed properly.\n\ -C, --check-only-changed\n\ @@ -497,11 +497,11 @@ static void usage(void) Normally this will also find a lot of garbage rows;\n\ Don't use this option if you are not totally desperate.\n\ -f, --force Overwrite old temporary files.\n\ - -k, --keys-used=# Tell MARIA to update only some specific keys. # is a\n\ + -k, --keys-used=# Tell Aria to update only some specific keys. # is a\n\ bit mask of which keys to use. This can be used to\n\ get faster inserts.\n\ --max-record-length=#\n\ - Skip rows bigger than this if maria_chk can't allocate\n\ + Skip rows bigger than this if aria_chk can't allocate\n\ memory to hold it.\n\ -r, --recover Can fix almost anything except unique keys that aren't\n\ unique.\n\ @@ -515,18 +515,18 @@ static void usage(void) handle a couple of cases where '-r' reports that it\n\ can't fix the data file.\n\ --transaction-log Log repair command to transaction log. This is needed\n\ - if one wants to use the maria_read_log to repeat the \n\ + if one wants to use the aria_read_log to repeat the \n\ repair\n\ --character-sets-dir=...\n\ Directory where character sets are.\n\ --set-collation=name\n\ Change the collation used by the index.\n\ -q, --quick Faster repair by not modifying the data file.\n\ - One can give a second '-q' to force maria_chk to\n\ + One can give a second '-q' to force aria_chk to\n\ modify the original datafile in case of duplicate keys.\n\ NOTE: Tables where the data file is currupted can't be\n\ fixed with this option.\n\ - -u, --unpack Unpack file packed with mariapack.\n\ + -u, --unpack Unpack file packed with ariapack.\n\ "); puts("Other actions:\n\ @@ -771,7 +771,7 @@ get_one_option(int optid, check_param.testflag|= T_UPDATE_STATE; break; case '#': - DBUG_SET_INITIAL(argument ? argument : "d:t:o,/tmp/maria_chk.trace"); + DBUG_SET_INITIAL(argument ? argument : "d:t:o,/tmp/aria_chk.trace"); opt_debug= 1; break; case OPT_SKIP_SAFEMALLOC: @@ -935,7 +935,7 @@ static int maria_chk(HA_CHECK *param, char *filename) _ma_check_print_error(param,"'%s' doesn't have a correct index definition. You need to recreate it before you can do a repair",filename); break; case HA_ERR_NOT_A_TABLE: - _ma_check_print_error(param,"'%s' is not a MARIA-table",filename); + _ma_check_print_error(param,"'%s' is not a Aria table",filename); break; case HA_ERR_CRASHED_ON_USAGE: _ma_check_print_error(param,"'%s' is marked as crashed",filename); @@ -944,10 +944,10 @@ static int maria_chk(HA_CHECK *param, char *filename) _ma_check_print_error(param,"'%s' is marked as crashed after last repair",filename); break; case HA_ERR_OLD_FILE: - _ma_check_print_error(param,"'%s' is a old type of MARIA-table", filename); + _ma_check_print_error(param,"'%s' is a old type of Aria table", filename); break; case HA_ERR_NEW_FILE: - _ma_check_print_error(param,"'%s' uses new features not supported by this version of the MARIA library", filename); + _ma_check_print_error(param,"'%s' uses new features not supported by this version of the Aria library", filename); break; case HA_ERR_END_OF_FILE: _ma_check_print_error(param,"Couldn't read complete header from '%s'", filename); @@ -963,7 +963,7 @@ static int maria_chk(HA_CHECK *param, char *filename) filename); break; default: - _ma_check_print_error(param,"%d when opening MARIA-table '%s'", + _ma_check_print_error(param,"%d when opening Aria table '%s'", my_errno,filename); break; } @@ -1030,10 +1030,10 @@ static int maria_chk(HA_CHECK *param, char *filename) if (!need_to_check) { if (!(param->testflag & T_SILENT) || param->testflag & T_INFO) - printf("MARIA file: %s is already checked\n",filename); + printf("Aria file: %s is already checked\n",filename); if (maria_close(info)) { - _ma_check_print_error(param,"%d when closing MARIA-table '%s'", + _ma_check_print_error(param,"%d when closing Aria table '%s'", my_errno,filename); DBUG_RETURN(1); } @@ -1060,7 +1060,7 @@ static int maria_chk(HA_CHECK *param, char *filename) if (maria_recreate_table(param, &info,filename)) { VOID(fprintf(stderr, - "MARIA-table '%s' is not fixed because of errors\n", + "Aria table '%s' is not fixed because of errors\n", filename)); return(-1); } @@ -1253,7 +1253,7 @@ static int maria_chk(HA_CHECK *param, char *filename) else if ((param->testflag & T_CHECK) || !(param->testflag & T_AUTO_INC)) { if (!(param->testflag & T_VERY_SILENT) || param->testflag & T_INFO) - printf("Checking MARIA file: %s\n",filename); + printf("Checking Aria file: %s\n",filename); if (!(param->testflag & T_SILENT)) printf("Data records: %7s Deleted blocks: %7s\n", llstr(info->state->records,llbuff), @@ -1369,7 +1369,7 @@ end2: if (param->testflag & (T_REP_ANY | T_SORT_RECORDS | T_SORT_INDEX)) { VOID(fprintf(stderr, - "MARIA-table '%s' is not fixed because of errors\n", + "Aria table '%s' is not fixed because of errors\n", filename)); if (param->testflag & T_REP_ANY) VOID(fprintf(stderr, @@ -1378,13 +1378,13 @@ end2: else if (!(param->error_printed & 2) && !(param->testflag & T_FORCE_CREATE)) VOID(fprintf(stderr, - "MARIA-table '%s' is corrupted\nFix it using switch \"-r\" or \"-o\"\n", + "Aria table '%s' is corrupted\nFix it using switch \"-r\" or \"-o\"\n", filename)); } else if (param->warning_printed && ! (param->testflag & (T_REP_ANY | T_SORT_RECORDS | T_SORT_INDEX | T_FORCE_CREATE))) - VOID(fprintf(stderr, "MARIA-table '%s' is usable but should be fixed\n", + VOID(fprintf(stderr, "Aria table '%s' is usable but should be fixed\n", filename)); VOID(fflush(stderr)); DBUG_RETURN(error); @@ -1415,7 +1415,7 @@ static void descript(HA_CHECK *param, register MARIA_HA *info, char *name) DBUG_VOID_RETURN; } - printf("MARIA file: %s\n",name); + printf("Aria file: %s\n",name); printf("Record format: %s\n", record_formats[share->data_file_type]); printf("Crashsafe: %s\n", share->base.born_transactional ? "yes" : "no"); @@ -1745,7 +1745,7 @@ static int maria_sort_records(HA_CHECK *param, } if (!(param->testflag & T_SILENT)) { - printf("- Sorting records for MARIA-table '%s'\n",name); + printf("- Sorting records for Aria table '%s'\n",name); if (write_info) printf("Data records: %9s Deleted: %9s\n", llstr(info->state->records,llbuff), @@ -1988,7 +1988,7 @@ static my_bool write_log_record(HA_CHECK *param) { if (write_log_record_for_repair(param, info)) _ma_check_print_error(param, "%d when writing log record for" - " MARIA-table '%s'", my_errno, + " Aria table '%s'", my_errno, param->isam_file_name); else if (maria_close(info)) _ma_check_print_error(param, default_close_errmsg, my_errno, diff --git a/storage/maria/maria_ftdump.c b/storage/maria/maria_ftdump.c index 895bbf85b0f..870d07fa96e 100644 --- a/storage/maria/maria_ftdump.c +++ b/storage/maria/maria_ftdump.c @@ -263,7 +263,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), static void usage() { - printf("Use: maria_ft_dump <table_name> <index_num>\n"); + printf("Use: aria_ft_dump <table_name> <index_num>\n"); my_print_help(my_long_options); my_print_variables(my_long_options); NETWARE_SET_SCREEN_MODE(1); diff --git a/storage/maria/maria_pack.c b/storage/maria/maria_pack.c index 167d0af3078..29f8bedff44 100644 --- a/storage/maria/maria_pack.c +++ b/storage/maria/maria_pack.c @@ -197,7 +197,7 @@ static struct st_file_buffer file_buffer; static QUEUE queue; static HUFF_COUNTS *global_count; static char zero_string[]={0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; -static const char *load_default_groups[]= { "mariapack",0 }; +static const char *load_default_groups[]= { "ariapack",0 }; /* The main program */ @@ -238,7 +238,7 @@ int main(int argc, char **argv) } } if (ok && isamchk_neaded && !silent) - puts("Remember to run maria_chk -rq on compressed tables"); + puts("Remember to run aria_chk -rq on compressed tables"); VOID(fflush(stdout)); VOID(fflush(stderr)); free_defaults(default_argv); @@ -306,11 +306,11 @@ static void usage(void) puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,"); puts("and you are welcome to modify and redistribute it under the GPL license\n"); - puts("Pack a MARIA-table to take much less space."); - puts("Keys are not updated, you must run maria_chk -rq on the index (.MAI) file"); + puts("Pack a Aria-table to take much less space."); + puts("Keys are not updated, you must run aria_chk -rq on the index (.MAI) file"); puts("afterwards to update the keys."); puts("You should give the .MAI file as the filename argument."); - puts("To unpack a packed table, run maria_chk -u on the table"); + puts("To unpack a packed table, run aria_chk -u on the table"); VOID(printf("\nUsage: %s [OPTIONS] filename...\n", my_progname)); my_print_help(my_long_options); @@ -359,7 +359,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), silent= 0; break; case '#': - DBUG_PUSH(argument ? argument : "d:t:o,/tmp/maria_pack.trace"); + DBUG_PUSH(argument ? argument : "d:t:o,/tmp/aria_pack.trace"); break; case 'V': print_version(); @@ -2990,7 +2990,7 @@ static int save_state(MARIA_HA *isam_file,PACK_MRG_INFO *mrg, } /* If there are no disabled indexes, keep key_file_length value from - original file so "maria_chk -rq" can use this value (this is necessary + original file so "aria_chk -rq" can use this value (this is necessary because index size cannot be easily calculated for fulltext keys) */ maria_clear_all_keys_active(share->state.key_map); diff --git a/storage/maria/maria_read_log.c b/storage/maria/maria_read_log.c index 98bc638c77f..de45eb0bcb6 100644 --- a/storage/maria/maria_read_log.c +++ b/storage/maria/maria_read_log.c @@ -20,13 +20,13 @@ #define LOG_FLAGS 0 -static const char *load_default_groups[]= { "maria_read_log",0 }; +static const char *load_default_groups[]= { "aria_read_log",0 }; static void get_options(int *argc,char * * *argv); #ifndef DBUG_OFF #if defined(__WIN__) -const char *default_dbug_option= "d:t:O,\\maria_read_log.trace"; +const char *default_dbug_option= "d:t:O,\\aria_read_log.trace"; #else -const char *default_dbug_option= "d:t:o,/tmp/maria_read_log.trace"; +const char *default_dbug_option= "d:t:o,/tmp/aria_read_log.trace"; #endif #endif /* DBUG_OFF */ static my_bool opt_display_only, opt_apply, opt_apply_undo, opt_silent; @@ -53,7 +53,7 @@ int main(int argc, char **argv) if (maria_init()) { - fprintf(stderr, "Can't init Maria engine (%d)\n", errno); + fprintf(stderr, "Can't init Aria engine (%d)\n", errno); goto err; } maria_block_size= 0; /* Use block size from file */ @@ -134,7 +134,7 @@ int main(int argc, char **argv) opt_apply_undo= 0; } - fprintf(stdout, "TRACE of the last maria_read_log\n"); + fprintf(stdout, "TRACE of the last aria_read_log\n"); if (maria_apply_log(lsn, opt_end_lsn, opt_apply ? MARIA_LOG_APPLY : (opt_check ? MARIA_LOG_CHECK : MARIA_LOG_DISPLAY_HEADER), opt_silent ? NULL : stdout, @@ -192,7 +192,7 @@ static struct my_option my_long_options[] = {"display-only", 'd', "display brief info read from records' header", &opt_display_only, &opt_display_only, 0, GET_BOOL, NO_ARG,0, 0, 0, 0, 0, 0}, - {"maria-log-dir-path", 'l', + {"aria-log-dir-path", 'l', "Path to the directory where to store transactional log", (uchar **) &maria_data_root, (uchar **) &maria_data_root, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, @@ -249,10 +249,10 @@ static void usage(void) puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,"); puts("and you are welcome to modify and redistribute it under the GPL license\n"); - puts("Display and apply log records from a MARIA transaction log"); + puts("Display and apply log records from a Aria transaction log"); puts("found in the current directory (for now)"); #ifndef IDENTICAL_PAGES_AFTER_RECOVERY - puts("\nNote: Maria is compiled without -DIDENTICAL_PAGES_AFTER_RECOVERY\n" + puts("\nNote: Aria is compiled without -DIDENTICAL_PAGES_AFTER_RECOVERY\n" "which means that the table files are not byte-to-byte identical to\n" "files created during normal execution. This should be ok, except for\n" "test scripts that tries to compare files before and after recovery."); diff --git a/storage/maria/plug.in b/storage/maria/plug.in index 686c8361a87..008d82250c8 100644 --- a/storage/maria/plug.in +++ b/storage/maria/plug.in @@ -1,21 +1,19 @@ -MYSQL_STORAGE_ENGINE(maria,, [Maria Storage Engine], +MYSQL_STORAGE_ENGINE(aria,, [Aria Storage Engine], [Crash-safe tables with MyISAM heritage], [default,max,max-no-ndb]) -MYSQL_PLUGIN_DIRECTORY(maria, [storage/maria]) -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_DIRECTORY(aria, [storage/maria]) +MYSQL_PLUGIN_STATIC(aria, [libaria.a]) +MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(aria, [ha_maria.cc]) -MYSQL_PLUGIN_ACTIONS(maria, [ +MYSQL_PLUGIN_ACTIONS(aria, [ # 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], - [with_maria_tmp_tables=yes] +AC_ARG_WITH(aria-tmp-tables, + AC_HELP_STRING([--with-aria-tmp-tables],[Use Aria for internal temporary tables]), + [with_aria_tmp_tables=$withval], + [with_aria_tmp_tables=yes] ) -if test "$with_maria_tmp_tables" = "yes" +if test "$with_aria_tmp_tables" = "yes" then - AC_DEFINE([USE_MARIA_FOR_TMP_TABLES], [1], [Maria is used for internal temporary tables]) + AC_DEFINE([USE_MARIA_FOR_TMP_TABLES], [1], [Aria is used for internal temporary tables]) fi ]) diff --git a/storage/maria/unittest/Makefile.am b/storage/maria/unittest/Makefile.am index 28c75a06b29..b5bc8587066 100644 --- a/storage/maria/unittest/Makefile.am +++ b/storage/maria/unittest/Makefile.am @@ -20,9 +20,9 @@ INCLUDES = @ZLIB_INCLUDES@ -I$(top_builddir)/include \ EXTRA_DIST= ma_test_all-t CMakeLists.txt \ ma_test_recovery.pl ma_test_recovery.expected # Only reason to link with libmyisam.a here is that it's where some fulltext -# pieces are (but soon we'll remove fulltext dependencies from Maria). +# pieces are (but soon we'll remove fulltext dependencies from Aria). LDADD= $(top_builddir)/unittest/mytap/libmytap.a \ - $(top_builddir)/storage/maria/libmaria.a \ + $(top_builddir)/storage/maria/libaria.a \ $(top_builddir)/storage/myisam/libmyisam.a \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/dbug/libdbug.a \ @@ -108,8 +108,8 @@ ma_pagecache_rwconsist2_1k_t_CPPFLAGS = -DTEST_PAGE_SIZE=1024 # the generic lock manager may not be used in the end and lockman1-t crashes, # and lockman2-t takes at least quarter an hour, # so we don't build lockman-t and lockman1-t and lockman2-t -CLEANFILES = maria_log_control page_cache_test_file_1 \ - maria_log.???????? +CLEANFILES = aria_log_control page_cache_test_file_1 \ + aria_log.???????? # Don't update the files from bitkeeper %::SCCS/s.% diff --git a/storage/maria/unittest/ma_control_file-t.c b/storage/maria/unittest/ma_control_file-t.c index 6702e4deb2f..164ea284f31 100644 --- a/storage/maria/unittest/ma_control_file-t.c +++ b/storage/maria/unittest/ma_control_file-t.c @@ -13,7 +13,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* Unit test of the control file module of the Maria engine WL#3234 */ +/* Unit test of the control file module of the Aria engine WL#3234 */ /* Note that it is not possible to test the durability of the write (can't @@ -24,11 +24,11 @@ #include <my_sys.h> #include <tap.h> -#ifndef WITH_MARIA_STORAGE_ENGINE +#ifndef WITH_ARIA_STORAGE_ENGINE /* - If Maria is not compiled in, normally we don't come to building this test. + If Aria is not compiled in, normally we don't come to building this test. */ -#error "Maria engine is not compiled in, test cannot be built" +#error "Aria engine is not compiled in, test cannot be built" #endif #include "maria.h" @@ -547,7 +547,7 @@ static struct my_option my_long_options[] = static void version(void) { printf("ma_control_file_test: unit test for the control file " - "module of the Maria storage engine. Ver 1.0 \n"); + "module of the Aria storage engine. Ver 1.0 \n"); } static my_bool diff --git a/storage/maria/unittest/ma_maria_log_cleanup.c b/storage/maria/unittest/ma_maria_log_cleanup.c index 7c78bf3a1a4..6eeb0c6856a 100644 --- a/storage/maria/unittest/ma_maria_log_cleanup.c +++ b/storage/maria/unittest/ma_maria_log_cleanup.c @@ -38,7 +38,7 @@ my_bool maria_log_remove() for (i= 0; i < dirp->number_off_files; i++) { char *file= dirp->dir_entry[i].name; - if (strncmp(file, "maria_log.", 10) == 0 && + if (strncmp(file, "aria_log.", 10) == 0 && file[10] >= '0' && file[10] <= '9' && file[11] >= '0' && file[11] <= '9' && file[12] >= '0' && file[12] <= '9' && diff --git a/storage/maria/unittest/ma_test_all-t b/storage/maria/unittest/ma_test_all-t index 8e52f42b483..0b11daf7f98 100755 --- a/storage/maria/unittest/ma_test_all-t +++ b/storage/maria/unittest/ma_test_all-t @@ -20,7 +20,7 @@ $opt_number_of_tests= 0; $opt_run_tests= undef(); my $maria_path; # path to "storage/maria" -my $maria_exe_path; # path to executables (ma_test1, maria_chk etc) +my $maria_exe_path; # path to executables (ma_test1, aria_chk etc) my $my_progname= $0; $my_progname=~ s/.*[\/]//; my $runtime_error= 0; # Return 1 if error(s) occur during run @@ -146,7 +146,7 @@ sub run_tests # clean-up # - unlink <*.TMD maria_log*>; # Delete temporary files + unlink <*.TMD aria_log*>; # Delete temporary files # # Run tests @@ -280,38 +280,38 @@ sub run_check_tests for ($i= 0; defined($ma_test1_opt[$i]); $i++) { - unlink <maria_log_control maria_log.*>; + unlink <aria_log_control aria_log.*>; ok("$maria_exe_path/ma_test1$suffix $silent $ma_test1_opt[$i][0] $row_type", $verbose, $i + 1); - ok("$maria_exe_path/maria_chk$suffix $ma_test1_opt[$i][1] test1", + ok("$maria_exe_path/aria_chk$suffix $ma_test1_opt[$i][1] test1", $verbose, $i + 1); } # # These tests are outside the loops. Make sure to include them in # nr_tests manually # - ok("$maria_exe_path/maria_pack$suffix --force -s test1", $verbose, 0); - ok("$maria_exe_path/maria_chk$suffix -ess test1", $verbose, 0); + ok("$maria_exe_path/aria_pack$suffix --force -s test1", $verbose, 0); + ok("$maria_exe_path/aria_chk$suffix -ess test1", $verbose, 0); for ($i= 0; defined($ma_test2_opt[$i]); $i++) { - unlink <maria_log_control maria_log.*>; + unlink <aria_log_control aria_log.*>; ok("$maria_exe_path/ma_test2$suffix $silent $ma_test2_opt[$i][0] $row_type", $verbose, $i + 1); - ok("$maria_exe_path/maria_chk$suffix $ma_test2_opt[$i][1] test2", + ok("$maria_exe_path/aria_chk$suffix $ma_test2_opt[$i][1] test2", $verbose, $i + 1); } for ($i= 0; defined($ma_rt_test_opt[$i]); $i++) { - unlink <maria_log_control maria_log.*>; + unlink <aria_log_control aria_log.*>; ok("$maria_exe_path/ma_rt_test$suffix $silent $ma_rt_test_opt[$i][0] $row_type", $verbose, $i + 1); - ok("$maria_exe_path/maria_chk$suffix $ma_rt_test_opt[$i][1] rt_test", + ok("$maria_exe_path/aria_chk$suffix $ma_rt_test_opt[$i][1] rt_test", $verbose, $i + 1); } - unlink <maria_log_control maria_log.*>; + unlink <aria_log_control aria_log.*>; return 0; } @@ -327,34 +327,34 @@ sub run_repair_tests() my @t= ($NEW_TEST, "$maria_exe_path/ma_test1$suffix $silent --checksum $row_type", - "$maria_exe_path/maria_chk$suffix -se test1", - "$maria_exe_path/maria_chk$suffix --silent -re --transaction-log test1", - "$maria_exe_path/maria_chk$suffix -rs test1", - "$maria_exe_path/maria_chk$suffix -se test1", - "$maria_exe_path/maria_chk$suffix -rqs test1", - "$maria_exe_path/maria_chk$suffix -se test1", - "$maria_exe_path/maria_chk$suffix -rs --correct-checksum test1", - "$maria_exe_path/maria_chk$suffix -se test1", - "$maria_exe_path/maria_chk$suffix -rqs --correct-checksum test1", - "$maria_exe_path/maria_chk$suffix -se test1", - "$maria_exe_path/maria_chk$suffix -ros --correct-checksum test1", - "$maria_exe_path/maria_chk$suffix -se test1", - "$maria_exe_path/maria_chk$suffix -rqos --correct-checksum test1", - "$maria_exe_path/maria_chk$suffix -se test1", - "$maria_exe_path/maria_chk$suffix -sz test1", - "$maria_exe_path/maria_chk$suffix -se test1", + "$maria_exe_path/aria_chk$suffix -se test1", + "$maria_exe_path/aria_chk$suffix --silent -re --transaction-log test1", + "$maria_exe_path/aria_chk$suffix -rs test1", + "$maria_exe_path/aria_chk$suffix -se test1", + "$maria_exe_path/aria_chk$suffix -rqs test1", + "$maria_exe_path/aria_chk$suffix -se test1", + "$maria_exe_path/aria_chk$suffix -rs --correct-checksum test1", + "$maria_exe_path/aria_chk$suffix -se test1", + "$maria_exe_path/aria_chk$suffix -rqs --correct-checksum test1", + "$maria_exe_path/aria_chk$suffix -se test1", + "$maria_exe_path/aria_chk$suffix -ros --correct-checksum test1", + "$maria_exe_path/aria_chk$suffix -se test1", + "$maria_exe_path/aria_chk$suffix -rqos --correct-checksum test1", + "$maria_exe_path/aria_chk$suffix -se test1", + "$maria_exe_path/aria_chk$suffix -sz test1", + "$maria_exe_path/aria_chk$suffix -se test1", "$maria_exe_path/ma_test2$suffix $silent -c -d1 $row_type", - "$maria_exe_path/maria_chk$suffix -s --parallel-recover test2", - "$maria_exe_path/maria_chk$suffix -se test2", - "$maria_exe_path/maria_chk$suffix -s --parallel-recover --quick test2", - "$maria_exe_path/maria_chk$suffix -se test2", + "$maria_exe_path/aria_chk$suffix -s --parallel-recover test2", + "$maria_exe_path/aria_chk$suffix -se test2", + "$maria_exe_path/aria_chk$suffix -s --parallel-recover --quick test2", + "$maria_exe_path/aria_chk$suffix -se test2", "$maria_exe_path/ma_test2$suffix $silent -c $row_type", - "$maria_exe_path/maria_chk$suffix -se test2", - "$maria_exe_path/maria_chk$suffix -sr test2", - "$maria_exe_path/maria_chk$suffix -se test2", + "$maria_exe_path/aria_chk$suffix -se test2", + "$maria_exe_path/aria_chk$suffix -sr test2", + "$maria_exe_path/aria_chk$suffix -se test2", "$maria_exe_path/ma_test2$suffix $silent -c -t4 -b32768 $row_type", - "$maria_exe_path/maria_chk$suffix -s --zerofill test1", - "$maria_exe_path/maria_chk$suffix -se test1" + "$maria_exe_path/aria_chk$suffix -s --zerofill test1", + "$maria_exe_path/aria_chk$suffix -se test1" ); return &count_tests(\@t) if ($count); @@ -373,48 +373,48 @@ sub run_pack_tests() my @t= ($NEW_TEST, "$maria_exe_path/ma_test1$suffix $silent --checksum $row_type", - "$maria_exe_path/maria_pack$suffix --force -s test1", - "$maria_exe_path/maria_chk$suffix -ess test1", - "$maria_exe_path/maria_chk$suffix -rqs test1", - "$maria_exe_path/maria_chk$suffix -es test1", - "$maria_exe_path/maria_chk$suffix -rs test1", - "$maria_exe_path/maria_chk$suffix -es test1", - "$maria_exe_path/maria_chk$suffix -rus test1", - "$maria_exe_path/maria_chk$suffix -es test1", + "$maria_exe_path/aria_pack$suffix --force -s test1", + "$maria_exe_path/aria_chk$suffix -ess test1", + "$maria_exe_path/aria_chk$suffix -rqs test1", + "$maria_exe_path/aria_chk$suffix -es test1", + "$maria_exe_path/aria_chk$suffix -rs test1", + "$maria_exe_path/aria_chk$suffix -es test1", + "$maria_exe_path/aria_chk$suffix -rus test1", + "$maria_exe_path/aria_chk$suffix -es test1", $NEW_TEST, "$maria_exe_path/ma_test1$suffix $silent --checksum $row_type", - "$maria_exe_path/maria_pack$suffix --force -s test1", - "$maria_exe_path/maria_chk$suffix -rus --safe-recover test1", - "$maria_exe_path/maria_chk$suffix -es test1", + "$maria_exe_path/aria_pack$suffix --force -s test1", + "$maria_exe_path/aria_chk$suffix -rus --safe-recover test1", + "$maria_exe_path/aria_chk$suffix -es test1", $NEW_TEST, "$maria_exe_path/ma_test1$suffix $silent --checksum -S $row_type", - "$maria_exe_path/maria_chk$suffix -se test1", - "$maria_exe_path/maria_chk$suffix -ros test1", - "$maria_exe_path/maria_chk$suffix -rqs test1", - "$maria_exe_path/maria_chk$suffix -se test1", + "$maria_exe_path/aria_chk$suffix -se test1", + "$maria_exe_path/aria_chk$suffix -ros test1", + "$maria_exe_path/aria_chk$suffix -rqs test1", + "$maria_exe_path/aria_chk$suffix -se test1", $NEW_TEST, - "$maria_exe_path/maria_pack$suffix --force -s test1", - "$maria_exe_path/maria_chk$suffix -rqs test1", - "$maria_exe_path/maria_chk$suffix -es test1", - "$maria_exe_path/maria_chk$suffix -rus test1", - "$maria_exe_path/maria_chk$suffix -es test1", + "$maria_exe_path/aria_pack$suffix --force -s test1", + "$maria_exe_path/aria_chk$suffix -rqs test1", + "$maria_exe_path/aria_chk$suffix -es test1", + "$maria_exe_path/aria_chk$suffix -rus test1", + "$maria_exe_path/aria_chk$suffix -es test1", $NEW_TEST, "$maria_exe_path/ma_test2$suffix $silent -c -d1 $row_type", - "$maria_exe_path/maria_chk$suffix -s --parallel-recover test2", - "$maria_exe_path/maria_chk$suffix -se test2", - "$maria_exe_path/maria_chk$suffix -s --unpack --parallel-recover test2", - "$maria_exe_path/maria_chk$suffix -se test2", - "$maria_exe_path/maria_pack$suffix --force -s test1", - "$maria_exe_path/maria_chk$suffix -s --unpack --parallel-recover test2", - "$maria_exe_path/maria_chk$suffix -se test2", + "$maria_exe_path/aria_chk$suffix -s --parallel-recover test2", + "$maria_exe_path/aria_chk$suffix -se test2", + "$maria_exe_path/aria_chk$suffix -s --unpack --parallel-recover test2", + "$maria_exe_path/aria_chk$suffix -se test2", + "$maria_exe_path/aria_pack$suffix --force -s test1", + "$maria_exe_path/aria_chk$suffix -s --unpack --parallel-recover test2", + "$maria_exe_path/aria_chk$suffix -se test2", $NEW_TEST, "$maria_exe_path/ma_test1$suffix $silent -c $row_type", "cp test1.MAD test2.MAD", "cp test1.MAI test2.MAI", - "$maria_exe_path/maria_pack$suffix --force -s --join=test3 test1 test2", - "$maria_exe_path/maria_chk -s test3", - "$maria_exe_path/maria_chk -s --safe-recover test3", - "$maria_exe_path/maria_chk -s test3" + "$maria_exe_path/aria_pack$suffix --force -s --join=test3 test1 test2", + "$maria_exe_path/aria_chk -s test3", + "$maria_exe_path/aria_chk -s --safe-recover test3", + "$maria_exe_path/aria_chk -s test3" ); return &count_tests(\@t) if ($count); @@ -435,7 +435,7 @@ sub run_tests_on_warnings_and_errors ok("$maria_exe_path/ma_test2$suffix $silent -L -K -W -P -S -R1 -m500", $verbose, 0); - ok("$maria_exe_path/maria_chk$suffix -sm test2", $verbose, 0); + ok("$maria_exe_path/aria_chk$suffix -sm test2", $verbose, 0); # ma_test2$suffix $silent -L -K -R1 -m2000 ; Should give error 135\n # In the following a failure is a success and success is a failure $com= "$maria_exe_path/ma_test2$suffix $silent -L -K -R1 -m2000 "; @@ -443,15 +443,15 @@ sub run_tests_on_warnings_and_errors ok($com, $verbose, 0, 1); ok("cat ma_test2_message.txt", $verbose, 0); ok("grep \"Error: 135\" ma_test2_message.txt > /dev/null", $verbose, 0); - # maria_exe_path/maria_chk$suffix -sm test2 will warn that + # maria_exe_path/aria_chk$suffix -sm test2 will warn that # Datafile is almost full - ok("$maria_exe_path/maria_chk$suffix -sm test2 >ma_test2_message.txt 2>&1", + ok("$maria_exe_path/aria_chk$suffix -sm test2 >ma_test2_message.txt 2>&1", $verbose, 0); ok("cat ma_test2_message.txt", $verbose, 0); ok("grep \"warning: Datafile is almost full\" ma_test2_message.txt>/dev/null", $verbose, 0); unlink <ma_test2_message.txt>; - ok("$maria_exe_path/maria_chk$suffix -ssm test2", $verbose, 0); + ok("$maria_exe_path/aria_chk$suffix -ssm test2", $verbose, 0); return 0; } @@ -480,31 +480,31 @@ sub run_tests_on_clrs my @t= ($NEW_TEST, "$maria_exe_path/ma_test2$suffix -s -L -K -W -P -M -T -c -b -t2 -A1", - "cp maria_log_control tmp", - "$maria_exe_path/maria_read_log$suffix -a -s", - "$maria_exe_path/maria_chk$suffix -s -e test2", - "cp tmp/maria_log_control .", + "cp aria_log_control tmp", + "$maria_exe_path/aria_read_log$suffix -a -s", + "$maria_exe_path/aria_chk$suffix -s -e test2", + "cp tmp/aria_log_control .", "rm test2.MA?", - "$maria_exe_path/maria_read_log$suffix -a -s", - "$maria_exe_path/maria_chk$suffix -s -e test2", + "$maria_exe_path/aria_read_log$suffix -a -s", + "$maria_exe_path/aria_chk$suffix -s -e test2", "rm test2.MA?", $NEW_TEST, "$maria_exe_path/ma_test2$suffix -s -L -K -W -P -M -T -c -b -t2 -A1", - "$maria_exe_path/maria_read_log$suffix -a -s", - "$maria_exe_path/maria_chk$suffix -s -e test2", + "$maria_exe_path/aria_read_log$suffix -a -s", + "$maria_exe_path/aria_chk$suffix -s -e test2", "rm test2.MA?", - "$maria_exe_path/maria_read_log$suffix -a -s", - "$maria_exe_path/maria_chk$suffix -e -s test2", + "$maria_exe_path/aria_read_log$suffix -a -s", + "$maria_exe_path/aria_chk$suffix -e -s test2", "rm test2.MA?", $NEW_TEST, "$maria_exe_path/ma_test2$suffix -s -L -K -W -P -M -T -c -b32768 -t4 -A1", - "$maria_exe_path/maria_read_log$suffix -a -s", - "$maria_exe_path/maria_chk$suffix -es test2", - "$maria_exe_path/maria_read_log$suffix -a -s", - "$maria_exe_path/maria_chk$suffix -es test2", + "$maria_exe_path/aria_read_log$suffix -a -s", + "$maria_exe_path/aria_chk$suffix -es test2", + "$maria_exe_path/aria_read_log$suffix -a -s", + "$maria_exe_path/aria_chk$suffix -es test2", "rm test2.MA?", - "$maria_exe_path/maria_read_log$suffix -a -s", - "$maria_exe_path/maria_chk$suffix -es test2", + "$maria_exe_path/aria_read_log$suffix -a -s", + "$maria_exe_path/aria_chk$suffix -es test2", "rm test2.MA?" ); @@ -666,7 +666,7 @@ sub run_test_bunch { if ($clear && @$t[$i] eq $NEW_TEST) { - unlink <maria_log.* maria_log_control>; + unlink <aria_log.* aria_log_control>; } if (@$t[$i] ne $NEW_TEST) { @@ -686,7 +686,7 @@ $my_progname version $VER Description: -Run various Maria related tests. Typically used via make test as a unittest. +Run various Aria related tests. Typically used via make test as a unittest. Options --help Show this help and exit. diff --git a/storage/maria/unittest/ma_test_loghandler_pagecache-t.c b/storage/maria/unittest/ma_test_loghandler_pagecache-t.c index bfbba5407c1..1644aa4885c 100644 --- a/storage/maria/unittest/ma_test_loghandler_pagecache-t.c +++ b/storage/maria/unittest/ma_test_loghandler_pagecache-t.c @@ -31,7 +31,7 @@ static const char *default_dbug_option; #define LOG_FILE_SIZE (1024L*1024L*1024L + 1024L*1024L*512) #define LOG_FLAGS 0 -static char *first_translog_file= (char*)"maria_log.00000001"; +static char *first_translog_file= (char*)"aria_log.00000001"; static char *file1_name= (char*)"page_cache_test_file_1"; static PAGECACHE_FILE file1; diff --git a/storage/maria/unittest/ma_test_recovery.pl b/storage/maria/unittest/ma_test_recovery.pl index 130ab4131fe..d9be82f4e58 100755 --- a/storage/maria/unittest/ma_test_recovery.pl +++ b/storage/maria/unittest/ma_test_recovery.pl @@ -17,7 +17,7 @@ $opt_abort_on_error=0; my $silent= "-s"; my $maria_path; # path to "storage/maria" -my $maria_exe_path; # path to executables (ma_test1, maria_chk etc) +my $maria_exe_path; # path to executables (ma_test1, aria_chk etc) my $tmp= "./tmp"; my $my_progname= $0; my $suffix; @@ -74,7 +74,7 @@ sub main { mkdir $tmp; } - print "MARIA RECOVERY TESTS\n"; + print "ARIA RECOVERY TESTS\n"; # To not flood the screen, we redirect all the commands below to a text file # and just give a final error if their output is not as expected @@ -98,7 +98,7 @@ sub main foreach my $prog (@t) { - unlink <maria_log.* maria_log_control>; + unlink <aria_log.* aria_log_control>; my $prog_no_suffix= $prog; $prog_no_suffix=~ s/$suffix// if ($suffix); print MY_LOG "TEST WITH $prog_no_suffix\n"; @@ -113,11 +113,11 @@ sub main { die("can't guess table name"); } - $com= "$maria_exe_path/maria_chk$suffix -dvv $table "; + $com= "$maria_exe_path/aria_chk$suffix -dvv $table "; $com.= "| grep -v \"Creation time:\" | grep -v \"file length\" | grep -v \"LSNs:\" | grep -v \"UUID:\""; - $com.= "> $tmp/maria_chk_message.good.txt 2>&1"; + $com.= "> $tmp/aria_chk_message.good.txt 2>&1"; my_exec($com); - my $checksum= my_exec("$maria_exe_path/maria_chk$suffix -dss $table"); + my $checksum= my_exec("$maria_exe_path/aria_chk$suffix -dss $table"); move("$table.MAD", "$tmp/$table-good.MAD") || die "Can't move $table.MAD to $tmp/$table-good.MAD\n"; move("$table.MAI", "$tmp/$table-good.MAI") || @@ -181,7 +181,7 @@ sub main } $commit_run_args= $t2[$k + 1]; $abort_run_args= $t2[$k + 2]; - unlink <maria_log.* maria_log_control>; + unlink <aria_log.* aria_log_control>; my $prog_no_suffix= $prog; $prog_no_suffix=~ s/$suffix// if ($suffix); print MY_LOG "TEST WITH $prog_no_suffix $commit_run_args (commit at end)\n"; @@ -196,17 +196,17 @@ sub main { die("can't guess table name"); } - $com= "$maria_exe_path/maria_chk$suffix -dvv $table "; + $com= "$maria_exe_path/aria_chk$suffix -dvv $table "; $com.= "| grep -v \"Creation time:\" | grep -v \"file length\" | grep -v \"LSNs:\" | grep -v \"UUID:\" "; - $com.= "> $tmp/maria_chk_message.good.txt 2>&1"; + $com.= "> $tmp/aria_chk_message.good.txt 2>&1"; $res= my_exec($com); print MY_LOG $res; - $checksum= my_exec("$maria_exe_path/maria_chk$suffix -dss $table"); + $checksum= my_exec("$maria_exe_path/aria_chk$suffix -dss $table"); move("$table.MAD", "$tmp/$table-good.MAD") || die "Can't move $table.MAD to $tmp/$table-good.MAD\n"; move("$table.MAI", "$tmp/$table-good.MAI") || die "Can't move $table.MAI to $tmp/$table-good.MAI\n"; - unlink <maria_log.* maria_log_control>; + unlink <aria_log.* aria_log_control>; print MY_LOG "TEST WITH $prog_no_suffix $abort_run_args$test_undo[$j] (additional aborted work)\n"; $res= my_exec("$maria_exe_path/$prog $abort_run_args$test_undo[$j]"); print MY_LOG $res; @@ -216,10 +216,10 @@ sub main die "Can't copy $table.MAI to $tmp/$table-before_undo.MAI\n"; # The lines below seem unneeded, will be removed soon - # We have to copy and restore logs, as running maria_read_log will - # change the maria_control_file - # rm -f $tmp/maria_log.* $tmp/maria_log_control - # cp $maria_path/maria_log* $tmp + # We have to copy and restore logs, as running aria_read_log will + # change the aria_control_file + # rm -f $tmp/aria_log.* $tmp/aria_log_control + # cp $maria_path/aria_log* $tmp if ($test_undo[$j] != 3) { apply_log($table, "shouldchangelog"); # should undo aborted work @@ -246,13 +246,13 @@ sub main print MY_LOG $res; print MY_LOG "testing applying of CLRs to recreate table\n"; unlink <$table.MA?>; - # cp $tmp/maria_log* $maria_path #unneeded + # cp $tmp/aria_log* $maria_path #unneeded apply_log($table, "shouldnotchangelog"); check_table_is_same($table, $checksum); $res= physical_cmp($table, "$tmp/$table-after_undo"); print MY_LOG $res; } - unlink <$table.* $tmp/$table* $tmp/maria_chk_*.txt $tmp/maria_read_log_$table.txt>; + unlink <$table.* $tmp/$table* $tmp/aria_chk_*.txt $tmp/aria_read_log_$table.txt>; } } } @@ -263,7 +263,7 @@ sub main } close(MY_LOG); - # also note that maria_chk -dvv shows differences for ma_test2 in UNDO phase, + # also note that aria_chk -dvv shows differences for ma_test2 in UNDO phase, # this is normal: removing records does not shrink the data/key file, # does not put back the "analyzed,optimized keys"(etc) index state. `diff -b $maria_path/unittest/ma_test_recovery.expected $tmp/ma_test_recovery.output`; @@ -296,29 +296,29 @@ sub check_table_is_same print "checking if table $table has changed\n"; } - $com= "$maria_exe_path/maria_chk$suffix -dvv $table | grep -v \"Creation time:\" "; - $com.= "| grep -v \"file length\" | grep -v \"LSNs:\" | grep -v \"UUID:\" > $tmp/maria_chk_message.txt 2>&1"; + $com= "$maria_exe_path/aria_chk$suffix -dvv $table | grep -v \"Creation time:\" "; + $com.= "| grep -v \"file length\" | grep -v \"LSNs:\" | grep -v \"UUID:\" > $tmp/aria_chk_message.txt 2>&1"; $res= `$com`; print MY_LOG $res; - $res= `$maria_exe_path/maria_chk$suffix -ss -e --read-only $table`; + $res= `$maria_exe_path/aria_chk$suffix -ss -e --read-only $table`; print MY_LOG $res; - $checksum2= `$maria_exe_path/maria_chk$suffix -dss $table`; + $checksum2= `$maria_exe_path/aria_chk$suffix -dss $table`; if ("$checksum" ne "$checksum2") { print MY_LOG "checksum differs for $table before and after recovery\n"; return 1; } - $com= "diff $tmp/maria_chk_message.good.txt $tmp/maria_chk_message.txt "; - $com.= "> $tmp/maria_chk_diff.txt || true"; + $com= "diff $tmp/aria_chk_message.good.txt $tmp/aria_chk_message.txt "; + $com.= "> $tmp/aria_chk_diff.txt || true"; $res= `$com`; print MY_LOG $res; - if (-s "$tmp/maria_chk_diff.txt") + if (-s "$tmp/aria_chk_diff.txt") { - print MY_LOG "Differences in maria_chk -dvv, recovery not yet perfect !\n"; + print MY_LOG "Differences in aria_chk -dvv, recovery not yet perfect !\n"; print MY_LOG "========DIFF START=======\n"; - open(MY_FILE, "<$tmp/maria_chk_diff.txt") || die "Can't open file maria_chk_diff.txt\n"; + open(MY_FILE, "<$tmp/aria_chk_diff.txt") || die "Can't open file aria_chk_diff.txt\n"; while (<MY_FILE>) { print MY_LOG $_; @@ -346,13 +346,13 @@ sub apply_log print MY_LOG "bad argument '$shouldchangelog'\n"; return 1; } - foreach (<maria_log.*>) + foreach (<aria_log.*>) { $log_md5.= md5_conv($_); } print MY_LOG "applying log\n"; - my_exec("$maria_exe_path/maria_read_log$suffix -a > $tmp/maria_read_log_$table.txt"); - foreach (<maria_log.*>) + my_exec("$maria_exe_path/aria_read_log$suffix -a > $tmp/aria_read_log_$table.txt"); + foreach (<aria_log.*>) { $log_md5_2.= md5_conv($_); } @@ -360,13 +360,13 @@ sub apply_log { if ("$shouldchangelog" eq "shouldnotchangelog") { - print MY_LOG "maria_read_log should not have modified the log\n"; + print MY_LOG "aria_read_log should not have modified the log\n"; return 1; } } elsif ("$shouldchangelog" eq "shouldchangelog") { - print MY_LOG "maria_read_log should have modified the log\n"; + print MY_LOG "aria_read_log should have modified the log\n"; return 1; } } @@ -415,7 +415,7 @@ sub physical_cmp # save original tables to restore them later copy("$table.MAD", "$tmp/before_zerofill$table_no.MAD") || die(); copy("$table.MAI", "$tmp/before_zerofill$table_no.MAI") || die(); - $com= "$maria_exe_path/maria_chk$suffix -ss --zerofill-keep-lsn $table"; + $com= "$maria_exe_path/aria_chk$suffix -ss --zerofill-keep-lsn $table"; $res= `$com`; print MY_LOG $res; $table_no= $table_no + 1; @@ -467,7 +467,7 @@ $my_progname version $VER Description: -Run various maria recovery tests and print the results +Run various Aria recovery tests and print the results Options --help Show this help and exit. |