From d2b8d744d9f9ab32478416885d7929ad00d3b276 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 11 Apr 2006 16:45:10 +0300 Subject: Added storage/maria (based on MyISAM). WL#3245 Moved things into ft_global.h, my_handler.h and myisamchk.h to allow MyISAM and Maria to share code and defines Rename of not properly renamed functions in MyISAM and my_handler.c Renamed some MI_ defines to HA_ to allow MyISAM and Maria to share Added maria variables to mysqld.cc and set_var.cc Fixed compiler warnings BitKeeper/etc/ignore: added storage/maria/*.MAI BUILD/SETUP.sh: Compile maria by default BitKeeper/triggers/post-commit: No public maria emails. Mark changesets emails with 'maria' configure.in: Add maria include/ft_global.h: Move defines needed by maria and MyISAM here include/keycache.h: Add support for default key_cache if cache not found include/my_base.h: Add invalidator_by_filename include/my_handler.h: Remove duplicate header files Add defines that are typical for handlers (MyISAM and Maria) include/myisam.h: Move things to my_handler.h to allow Maria and MyISAM to share things (Some things needed to be shared to allow sharing of HA_CHECK structure) libmysqld/Makefile.am: Added ha_maria.cc mysys/mf_keycaches.c: Added default value for multi_key_cache_search mysys/my_handler.c: mi_compare_text -> ha_compare_text Removed compiler warnings sql/ha_myisam.cc: MI_CHECK -> HA_CHECK MI_MAX_KEY_LENGTH -> HA_MAX_KEY_LENGTH sql/ha_myisam.h: MI_CHECK -> HA_CHECK MI_MAX_KEY_LENGTH -> HA_MAX_KEY_LENGTH sql/ha_myisammrg.h: MI_CHECK -> HA_CHECK MI_MAX_KEY_LENGTH -> HA_MAX_KEY_LENGTH sql/handler.h: Added MARIA Added inclusion of my_handler.h sql/item_func.h: Remove duplicate include sql/mysql_priv.h: Added maria variables sql/mysqld.cc: Added maria sql/set_var.cc: Added maria status variables sql/set_var.h: Added maria sql/sql_class.h: Added maria status variables sql/sql_sort.h: Remove duplicate BUFFPEK struct storage/Makefile.am: Added maria storage/csv/ha_tina.cc: Removed compiler warning storage/myisam/Makefile.am: Added ft_myisam.c storage/myisam/ft_boolean_search.c: mi_compare_text -> ha_compare_text MI_MAX_KEY_BUFF -> HA_MAX_KEY_BUFF Remove compiler warnings storage/myisam/ft_nlq_search.c: mi_compare_text -> ha_compare_text storage/myisam/ft_parser.c: mi_compare_text -> ha_compare_text storage/myisam/ft_static.c: Move ft_init_search() to ft_myisam.c to make ft_static.c independent of MyISAM storage/myisam/ft_stopwords.c: mi_compare_text -> ha_compare_text storage/myisam/ft_update.c: mi_compare_text -> ha_compare_text storage/myisam/fulltext.h: Move things to ft_global.h to allow to share more things between MyISAM and Maria storage/myisam/mi_check.c: MI_CHECK -> HA_CHECK storage/myisam/mi_create.c: MI_MAX_POSSIBLE_KEY -> HA_MAX_POSSIBLE_KEY MI_MAX_KEY_BLOCK_SIZE -> HA_MAX_KEY_BLOCK_SIZE MI_MAX_KEY_SEG -> HA_MAX_KEY_SEG MI_MAX_KEY_BUFF -> HA_MAX_KEY_BUFF storage/myisam/mi_delete.c: MI_MAX_KEY_BUFF -> HA_MAX_KEY_BUFF storage/myisam/mi_delete_all.c: Remove not used variable storage/myisam/mi_dynrec.c: _my_calc_total_blob_length -> _mi_calc_total_blob_length storage/myisam/mi_key.c: _my_store_blob_length -> _mi_store_blob_length storage/myisam/mi_log.c: _my_calc_total_blob_length -> _mi_calc_total_blob_length storage/myisam/mi_open.c: MI_MAX_POSSIBLE_KEY -> HA_MAX_POSSIBLE_KEY MI_MAX_KEY_SEG -> HA_MAX_KEY_SEG MI_MAX_KEY_BUFF -> HA_MAX_KEY_BUFF my_n_base_info_read -> mi_n_base_info_read storage/myisam/mi_packrec.c: Made read_pack_length static _my_store_blob_length -> _mi_store_blob_length Remove not used variable storage/myisam/mi_range.c: MI_MAX_KEY_BUFF -> HA_MAX_KEY_BUFF storage/myisam/mi_search.c: MI_MAX_KEY_BUFF -> HA_MAX_KEY_BUFF storage/myisam/mi_test1.c: MI_MAX_KEY_LENGTH -> HA_MAX_KEY_LENGTH storage/myisam/mi_test2.c: Fixed compiler warning storage/myisam/mi_unique.c: Fixed compiler warning mi_compare_text -> ha_compare_text storage/myisam/mi_update.c: MI_MAX_KEY_BUFF -> HA_MAX_KEY_BUFF storage/myisam/mi_write.c: Rename of defines and functions storage/myisam/myisamchk.c: Rename of defines and functions storage/myisam/myisamdef.h: Remove tabs Indentation fixes (Large changes as I did run indent-ex on the file) Move some things to myisamchk.h Added missing functions that gave compiler warnings storage/myisam/myisamlog.c: Rename of defines and functions storage/myisam/myisampack.c: Remove compiler warning storage/myisam/rt_index.c: Rename of defines and functions storage/myisam/sort.c: Rename of defines, functions and structures config/ac-macros/ha_maria.m4: New BitKeeper file ``config/ac-macros/ha_maria.m4'' include/maria.h: New BitKeeper file ``include/maria.h'' include/myisamchk.h: New BitKeeper file ``include/myisamchk.h'' libmysqld/ha_maria.cc: New BitKeeper file ``libmysqld/ha_maria.cc'' mysql-test/include/have_maria.inc: New BitKeeper file ``mysql-test/include/have_maria.inc'' mysql-test/r/have_maria.require: New BitKeeper file ``mysql-test/r/have_maria.require'' mysql-test/r/maria.result: New BitKeeper file ``mysql-test/r/maria.result'' mysql-test/r/ps_maria.result: New BitKeeper file ``mysql-test/r/ps_maria.result'' mysql-test/t/maria.test: New BitKeeper file ``mysql-test/t/maria.test'' mysql-test/t/ps_maria.test: New BitKeeper file ``mysql-test/t/ps_maria.test'' sql/ha_maria.cc: New BitKeeper file ``sql/ha_maria.cc'' sql/ha_maria.h: New BitKeeper file ``sql/ha_maria.h'' storage/maria/Makefile.am: New BitKeeper file ``storage/maria/Makefile.am'' storage/maria/cmakelists.txt: New BitKeeper file ``storage/maria/cmakelists.txt'' storage/maria/ft_maria.c: New BitKeeper file ``storage/maria/ft_maria.c'' storage/maria/ma_cache.c: New BitKeeper file ``storage/maria/ma_cache.c'' storage/maria/ma_changed.c: New BitKeeper file ``storage/maria/ma_changed.c'' storage/maria/ma_check.c: New BitKeeper file ``storage/maria/ma_check.c'' storage/maria/ma_checksum.c: New BitKeeper file ``storage/maria/ma_checksum.c'' storage/maria/ma_close.c: New BitKeeper file ``storage/maria/ma_close.c'' storage/maria/ma_create.c: New BitKeeper file ``storage/maria/ma_create.c'' storage/maria/ma_dbug.c: New BitKeeper file ``storage/maria/ma_dbug.c'' storage/maria/ma_delete.c: New BitKeeper file ``storage/maria/ma_delete.c'' storage/maria/ma_delete_all.c: New BitKeeper file ``storage/maria/ma_delete_all.c'' storage/maria/ma_delete_table.c: New BitKeeper file ``storage/maria/ma_delete_table.c'' storage/maria/ma_dynrec.c: New BitKeeper file ``storage/maria/ma_dynrec.c'' storage/maria/ma_extra.c: New BitKeeper file ``storage/maria/ma_extra.c'' storage/maria/ma_ft_boolean_search.c: New BitKeeper file ``storage/maria/ma_ft_boolean_search.c'' storage/maria/ma_ft_eval.c: New BitKeeper file ``storage/maria/ma_ft_eval.c'' storage/maria/ma_ft_eval.h: New BitKeeper file ``storage/maria/ma_ft_eval.h'' storage/maria/ma_ft_nlq_search.c: New BitKeeper file ``storage/maria/ma_ft_nlq_search.c'' storage/maria/ma_ft_parser.c: New BitKeeper file ``storage/maria/ma_ft_parser.c'' storage/maria/ma_ft_stem.c: New BitKeeper file ``storage/maria/ma_ft_stem.c'' storage/maria/ma_ft_test1.c: New BitKeeper file ``storage/maria/ma_ft_test1.c'' storage/maria/ma_ft_test1.h: New BitKeeper file ``storage/maria/ma_ft_test1.h'' storage/maria/ma_ft_update.c: New BitKeeper file ``storage/maria/ma_ft_update.c'' storage/maria/ma_ftdefs.h: New BitKeeper file ``storage/maria/ma_ftdefs.h'' storage/maria/ma_fulltext.h: New BitKeeper file ``storage/maria/ma_fulltext.h'' storage/maria/ma_info.c: New BitKeeper file ``storage/maria/ma_info.c'' storage/maria/ma_init.c: New BitKeeper file ``storage/maria/ma_init.c'' storage/maria/ma_key.c: New BitKeeper file ``storage/maria/ma_key.c'' storage/maria/ma_keycache.c: New BitKeeper file ``storage/maria/ma_keycache.c'' storage/maria/ma_locking.c: New BitKeeper file ``storage/maria/ma_locking.c'' storage/maria/ma_log.c: New BitKeeper file ``storage/maria/ma_log.c'' storage/maria/ma_open.c: New BitKeeper file ``storage/maria/ma_open.c'' storage/maria/ma_packrec.c: New BitKeeper file ``storage/maria/ma_packrec.c'' storage/maria/ma_page.c: New BitKeeper file ``storage/maria/ma_page.c'' storage/maria/ma_panic.c: New BitKeeper file ``storage/maria/ma_panic.c'' storage/maria/ma_preload.c: New BitKeeper file ``storage/maria/ma_preload.c'' storage/maria/ma_range.c: New BitKeeper file ``storage/maria/ma_range.c'' storage/maria/ma_rename.c: New BitKeeper file ``storage/maria/ma_rename.c'' storage/maria/ma_rfirst.c: New BitKeeper file ``storage/maria/ma_rfirst.c'' storage/maria/ma_rkey.c: New BitKeeper file ``storage/maria/ma_rkey.c'' storage/maria/ma_rlast.c: New BitKeeper file ``storage/maria/ma_rlast.c'' storage/maria/ma_rnext.c: New BitKeeper file ``storage/maria/ma_rnext.c'' storage/maria/ma_rnext_same.c: New BitKeeper file ``storage/maria/ma_rnext_same.c'' storage/maria/ma_rprev.c: New BitKeeper file ``storage/maria/ma_rprev.c'' storage/maria/ma_rrnd.c: New BitKeeper file ``storage/maria/ma_rrnd.c'' storage/maria/ma_rsame.c: New BitKeeper file ``storage/maria/ma_rsame.c'' storage/maria/ma_rsamepos.c: New BitKeeper file ``storage/maria/ma_rsamepos.c'' storage/maria/ma_rt_index.c: New BitKeeper file ``storage/maria/ma_rt_index.c'' storage/maria/ma_rt_index.h: New BitKeeper file ``storage/maria/ma_rt_index.h'' storage/maria/ma_rt_key.c: New BitKeeper file ``storage/maria/ma_rt_key.c'' storage/maria/ma_rt_key.h: New BitKeeper file ``storage/maria/ma_rt_key.h'' storage/maria/ma_rt_mbr.c: New BitKeeper file ``storage/maria/ma_rt_mbr.c'' storage/maria/ma_rt_mbr.h: New BitKeeper file ``storage/maria/ma_rt_mbr.h'' storage/maria/ma_rt_split.c: New BitKeeper file ``storage/maria/ma_rt_split.c'' storage/maria/ma_rt_test.c: New BitKeeper file ``storage/maria/ma_rt_test.c'' storage/maria/ma_scan.c: New BitKeeper file ``storage/maria/ma_scan.c'' storage/maria/ma_search.c: New BitKeeper file ``storage/maria/ma_search.c'' storage/maria/ma_sort.c: New BitKeeper file ``storage/maria/ma_sort.c'' storage/maria/ma_sp_defs.h: New BitKeeper file ``storage/maria/ma_sp_defs.h'' storage/maria/ma_sp_key.c: New BitKeeper file ``storage/maria/ma_sp_key.c'' storage/maria/ma_sp_test.c: New BitKeeper file ``storage/maria/ma_sp_test.c'' storage/maria/ma_static.c: New BitKeeper file ``storage/maria/ma_static.c'' storage/maria/ma_statrec.c: New BitKeeper file ``storage/maria/ma_statrec.c'' storage/maria/ma_test1.c: New BitKeeper file ``storage/maria/ma_test1.c'' storage/maria/ma_test2.c: New BitKeeper file ``storage/maria/ma_test2.c'' storage/maria/ma_test3.c: New BitKeeper file ``storage/maria/ma_test3.c'' storage/maria/ma_test_all.sh: New BitKeeper file ``storage/maria/ma_test_all.sh'' storage/maria/ma_unique.c: New BitKeeper file ``storage/maria/ma_unique.c'' storage/maria/ma_update.c: New BitKeeper file ``storage/maria/ma_update.c'' storage/maria/ma_write.c: New BitKeeper file ``storage/maria/ma_write.c'' storage/maria/maria_chk.c: New BitKeeper file ``storage/maria/maria_chk.c'' storage/maria/maria_def.h: New BitKeeper file ``storage/maria/maria_def.h'' storage/maria/maria_ftdump.c: New BitKeeper file ``storage/maria/maria_ftdump.c'' storage/maria/maria_log.c: New BitKeeper file ``storage/maria/maria_log.c'' storage/maria/maria_pack.c: New BitKeeper file ``storage/maria/maria_pack.c'' storage/maria/maria_rename.sh: New BitKeeper file ``storage/maria/maria_rename.sh'' storage/maria/test_pack: New BitKeeper file ``storage/maria/test_pack'' storage/myisam/ft_myisam.c: New BitKeeper file ``storage/myisam/ft_myisam.c'' --- .bzrignore | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to '.bzrignore') diff --git a/.bzrignore b/.bzrignore index 4b6b0411a47..2969dfab09c 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1759,3 +1759,16 @@ vio/viotest.cpp zlib/*.ds? zlib/*.vcproj mysql-test/r/*.log +storage/maria/ma_test1 +storage/maria/ma_test2 +storage/maria/ma_test3 +storage/maria/maria_ftdump +storage/maria/ma_sp_test +storage/maria/ma_rt_test +storage/maria/maria_log +storage/maria/maria_pack +storage/maria/maria_chk +storage/maria/ma_test_all +storage/maria/maria.log +storage/maria/*.MAD +storage/maria/*.MAI -- cgit v1.2.1 From 7412f0fa0cd498f06fe04966a6f6161e8b32d0a2 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 26 Jan 2007 13:32:02 +0200 Subject: After merge fixes Removed compiler warnings Fixed clashing function name in maria Disable maria tests from MySQL level for now BitKeeper/deleted/.del-ha_maria.cc: Rename: libmysqld/ha_maria.cc -> BitKeeper/deleted/.del-ha_maria.cc BitKeeper/etc/ignore: added libmysqld/ha_maria.cc --- added storage/maria/unittest/maria_control unittest/maria_control --- added *.Tpo --- added unittest/page_cache_test_file_1 --- added unittest/pagecache_debug.log --- added unittest/mysys/mf_pagecache_consist_1k-t-big unittest/mysys/mf_pagecache_consist_1kHC-t-big unittest/mysys/mf_pagecache_consist_1kRD-t-big unittest/mysys/mf_pagecache_consist_1kWR-t-big unittest/mysys/mf_pagecache_consist_64k-t-big unittest/mysys/mf_pagecache_consist_64kHC-t-big unittest/mysys/mf_pagecache_consist_64kRD-t-big unittest/mysys/mf_pagecache_consist_64kWR-t-big --- added unittest/mysys/mf_pagecache_single_64k-t-big Makefile.am: Don't run 'test-unit' by default (takes too long time) client/mysqldump.c: Fixed compiler warning include/lf.h: Remove compiler warnings about not used require_pins constant include/pagecache.h: LSN should be of type ulonglong (This fixes some compiler warnings) mysql-test/r/events_logs_tests.result: Make test predictable mysql-test/r/view.result: Make test results predictable mysql-test/t/disabled.def: Disable maria tests for a while mysql-test/t/events_logs_tests.test: Make test predictable mysql-test/t/view.test: Make test results predictable mysys/lf_alloc-pin.c: #warning ->QQ mysys/lf_hash.c: #warning ->QQ Removed compiler warnings mysys/mf_pagecache.c: Removed compiler warnings mysys/my_rename.c: Removed compiler warnings plugin/daemon_example/daemon_example.c: Remove compiler warning sql/ha_ndbcluster.cc: Remove compiler warning sql/udf_example.c: Remove compiler warning storage/maria/lockman.c: Changed #warnings to QQ comment Removed compiler warnings storage/maria/ma_blockrec.c: Removed compiler warnings storage/maria/ma_check.c: After merge fixes storage/maria/ma_key.c: After merge fixes storage/maria/ma_packrec.c: After merge fixes storage/maria/ma_rkey.c: After merge fixes storage/maria/ma_sort.c: After merge fixes storage/maria/ma_sp_defs.h: Rename clashing function name storage/maria/ma_sp_key.c: Rename clashing function name storage/maria/ma_test_all.res: New test results storage/maria/ma_unique.c: Fixed compiler warning storage/maria/tablockman.c: #warning -> QQ storage/maria/tablockman.h: #warning -> QQ storage/maria/trnman.c: #warning -> QQ storage/maria/unittest/lockman2-t.c: Removed compiler warnings storage/maria/unittest/ma_control_file-t.c: Removed warning for 'maria_control' file not found storage/maria/unittest/trnman-t.c: Removed compiler warnings storage/ndb/src/mgmapi/mgmapi.cpp: Remove compiler warnings unittest/mysys/mf_pagecache_consist.c: Removed compiler warnings unittest/mysys/my_atomic-t.c: Removed compiler warnings --- .bzrignore | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to '.bzrignore') diff --git a/.bzrignore b/.bzrignore index bd7941f77ab..7dd012950d8 100644 --- a/.bzrignore +++ b/.bzrignore @@ -2946,3 +2946,18 @@ win/vs71cache.txt win/vs8cache.txt zlib/*.ds? zlib/*.vcproj +libmysqld/ha_maria.cc +storage/maria/unittest/maria_control +unittest/maria_control +*.Tpo +unittest/page_cache_test_file_1 +unittest/pagecache_debug.log +unittest/mysys/mf_pagecache_consist_1k-t-big +unittest/mysys/mf_pagecache_consist_1kHC-t-big +unittest/mysys/mf_pagecache_consist_1kRD-t-big +unittest/mysys/mf_pagecache_consist_1kWR-t-big +unittest/mysys/mf_pagecache_consist_64k-t-big +unittest/mysys/mf_pagecache_consist_64kHC-t-big +unittest/mysys/mf_pagecache_consist_64kRD-t-big +unittest/mysys/mf_pagecache_consist_64kWR-t-big +unittest/mysys/mf_pagecache_single_64k-t-big -- cgit v1.2.1 From 0abffa05a60e3fccb31a81828fdc99986ce4b7c5 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 5 Apr 2007 14:38:05 +0300 Subject: Fixed that maria.test works BUILD/SETUP.sh: Update from 5.1 include/maria.h: Moved structs into size order mysql-test/include/varchar.inc: Fixed error numbers (as in 5.1) mysql-test/mysql-test-run.pl: Updated from 5.1 Create a dummy mysql.err file if using --valgrind --debug mysql-test/lib/init_db.sql: Update from 5.1 mysql-test/lib/mtr_cases.pl: Update from 5.1 mysql-test/lib/mtr_diff.pl: Update from 5.1 mysql-test/lib/mtr_gcov.pl: Update from 5.1 mysql-test/lib/mtr_gprof.pl: Update from 5.1 mysql-test/lib/mtr_im.pl: Update from 5.1 mysql-test/lib/mtr_io.pl: Update from 5.1 mysql-test/lib/mtr_match.pl: Update from 5.1 mysql-test/lib/mtr_misc.pl: Update from 5.1 mysql-test/lib/mtr_process.pl: Update from 5.1 mysql-test/lib/mtr_report.pl: Update from 5.1 mysql-test/lib/mtr_stress.pl: Update from 5.1 mysql-test/lib/mtr_timer.pl: Update from 5.1 mysql-test/lib/mtr_unique.pl: Update from 5.1 mysql-test/r/maria.result: Updated results. The reason for the new results are: - Maria doesn't support REPAIR TABLE or OPTIMIZE table yet - Some statistics information is different, so MySQL prefers index reads instead of table scans - No support for concurrent writes in the default BLOCK_RECORD mode - No support for different KEY_BLOCK sizes (will not be fixed) mysql-test/t/disabled.def: Enable maria test mysql-test/t/maria.test: No support for concurrent writes in the default BLOCK_RECORD mode No support for different KEY_BLOCK sizes (will not be fixed) mysql-test/t/myisam.test: Fix to be able to run with --extern mysql-test/t/query_cache_notembedded.test: Fix to be able to run with --extern sql/filesort.cc: Fixed compiler warning sql/handler.cc: Use new error message (as in 5.1) sql/share/errmsg.txt: Update error messages (as in 5.1) sql/slave.cc: Fixed compiler warning sql/slave.h: Fixed compiler warning sql/sql_table.cc: Fixed compiler warning storage/maria/ha_maria.cc: Added better scan_time() Disble REPAIR on BLOCK_RECORD tables Added rnd_end() to free memory after scan Don't pack numerical primary keys Don't allow fast alter table if row type changes storage/maria/ha_maria.h: Added get_row_type(), scan_time() and rnd_end() BitKeeper/etc/ignore: Added storage/maria/unittest/mf_pagecache_consist_1k-t-big storage/maria/unittest/mf_pagecache_consist_1kHC-t-big storage/maria/unittest/mf_pagecache_consist_1kRD-t-big storage/maria/unittest/mf_pagecache_consist_1kWR-t-big storage/maria/unittest/mf_pagecache_consist_64k-t-big storage/maria/unittest/mf_pagecache_consist_64kHC-t-big storage/maria/unittest/mf_pagecache_consist_64kRD-t-big storage/maria/unittest/mf_pagecache_consist_64kWR-t-big storage/maria/unittest/mf_pagecache_single_64k-t-big to the ignore list storage/maria/ma_bitmap.c: Fixed some bugs found with maria.test Added more DBUG_PRINT and some more comments storage/maria/ma_blockrec.c: Fixed some bugs found with maria.test Simplified code More comments storage/maria/ma_blockrec.h: Added DBUG_ASSERT() storage/maria/ma_check.c: Don't check record data links with block_records Update state.changed properly storage/maria/ma_checksum.c: Fixed bug in checksum handling (only first field was calculated) storage/maria/ma_create.c: Set rec->fill_length properly Added extra testing needed for BLOCK_RECORD Fixed bug in unlock of not locked mutex Fixed memory leak storage/maria/ma_delete.c: Update state.changed storage/maria/ma_delete_all.c: Update state.changed storage/maria/ma_extra.c: Disable caching of rows if we are using BLOCK_RECORD (scan_init will enable caching of rows when using BLOCK_RECORD) storage/maria/ma_info.c: Added data_file_type storage/maria/ma_search.c: Fixed bug with signed bytes storage/maria/ma_test2.c: Fixed wrong pointer handling (caused crash on 64 bit machines) storage/maria/ma_write.c: Added DBUG_ statements storage/maria/maria_def.h: Added STATE_NOT_OPTIMIZED_ROWS storage/myisam/mi_create.c: Fixed bug with unlocking of not locked mutex (in case of error condition) storage/myisam/mi_test2.c: Fixed wrong pointer handling (caused crash on 64 bit machines) --- .bzrignore | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to '.bzrignore') diff --git a/.bzrignore b/.bzrignore index 7dd012950d8..6f579b34311 100644 --- a/.bzrignore +++ b/.bzrignore @@ -2961,3 +2961,12 @@ unittest/mysys/mf_pagecache_consist_64kHC-t-big unittest/mysys/mf_pagecache_consist_64kRD-t-big unittest/mysys/mf_pagecache_consist_64kWR-t-big unittest/mysys/mf_pagecache_single_64k-t-big +storage/maria/unittest/mf_pagecache_consist_1k-t-big +storage/maria/unittest/mf_pagecache_consist_1kHC-t-big +storage/maria/unittest/mf_pagecache_consist_1kRD-t-big +storage/maria/unittest/mf_pagecache_consist_1kWR-t-big +storage/maria/unittest/mf_pagecache_consist_64k-t-big +storage/maria/unittest/mf_pagecache_consist_64kHC-t-big +storage/maria/unittest/mf_pagecache_consist_64kRD-t-big +storage/maria/unittest/mf_pagecache_consist_64kWR-t-big +storage/maria/unittest/mf_pagecache_single_64k-t-big -- cgit v1.2.1 From 6686a3ee53e7260047a2737b854f400f6847b452 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 19 Apr 2007 18:48:36 +0300 Subject: After merge fixes Read blocks through page cache in check_block_record() Don't read first bitmap on ma_open() Don't require that a files block_size is equal to maria_block_size, if page cache is not setup yet. Changed ma_test1, ma_test2, maria_chk and maria_pack to always create a page cache. The above fixes so that ma_test_all now works again BitKeeper/etc/ignore: added storage/maria/unittest/ma_pagecache_consist_1k-t-big storage/maria/unittest/ma_pagecache_consist_1kHC-t-big storage/maria/unittest/ma_pagecache_consist_1kRD-t-big storage/maria/unittest/ma_pagecache_consist_1kWR-t-big storage/maria/unittest/ma_pagecache_consist_64k-t-big storage/maria/unittest/ma_pagecache_consist_64kHC-t-big storage/maria/unittest/ma_pagecache_consist_64kRD-t-big storage/maria/unittest/ma_pagecache_consist_64kWR-t-big storage/maria/unittest/ma_pagecache_single_64k-t-big include/maria.h: Added MARIA_MIN_PAGE_CACHE_SIZE include/pagecache.h: Filedescriptors should be of type File storage/maria/ma_bitmap.c: After merge fixes Create dummy bitmap on startup (can't read first bitmap becasue page cache may not be set up yet) storage/maria/ma_blockrec.c: After merge fixes storage/maria/ma_check.c: Use page cache to read rows-in-block rows. Don't initialize page cache; It's now done in maria_chk storage/maria/ma_dynrec.c: Trivial code reorganization storage/maria/ma_open.c: Don't give error for conflicting block size if page cache is not initalized. (Needed for maria_chk to be able to work on tables with different page sizes) After merge fixes storage/maria/ma_page.c: Fix compiler warning Remove net needed asserts (Guranteed by ma_create()) storage/maria/ma_pagecache.c: Allow one to create a page cache with just one block (For trivail scan of table) Trivial code simplication storage/maria/ma_test1.c: Always create a page cache (Maria now requires a page cache to work) storage/maria/ma_test2.c: Always create a page cache (Maria now requires a page cache to work) storage/maria/maria_chk.c: Remove command line options --maria_block_size and --pagecache_block_size. Set the global maria_block_size from the data file. This allows maria_chk to work with tables of different block sizes. Simply DESCRIPT handling; Allows us to remove one indentation level in maria_chk(). Always initialize page cache if we are doing check/repair. (Most of the patch is reindentation of the code) storage/maria/maria_def.h: After merge fix storage/maria/maria_pack.c: Set maria_block_size based on the files block_size. Initalize page cache (needed for getting rows-in-blocks to works) --- .bzrignore | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to '.bzrignore') diff --git a/.bzrignore b/.bzrignore index cd469d20721..0c52723de3c 100644 --- a/.bzrignore +++ b/.bzrignore @@ -2989,3 +2989,12 @@ win/vs71cache.txt win/vs8cache.txt zlib/*.ds? zlib/*.vcproj +storage/maria/unittest/ma_pagecache_consist_1k-t-big +storage/maria/unittest/ma_pagecache_consist_1kHC-t-big +storage/maria/unittest/ma_pagecache_consist_1kRD-t-big +storage/maria/unittest/ma_pagecache_consist_1kWR-t-big +storage/maria/unittest/ma_pagecache_consist_64k-t-big +storage/maria/unittest/ma_pagecache_consist_64kHC-t-big +storage/maria/unittest/ma_pagecache_consist_64kRD-t-big +storage/maria/unittest/ma_pagecache_consist_64kWR-t-big +storage/maria/unittest/ma_pagecache_single_64k-t-big -- cgit v1.2.1 From ffe437be41918062a8936c6d7cc6235cccf84d2e Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 4 Jun 2007 14:07:18 +0300 Subject: Fixed that ma_test_all works with -T (simple transaction/logging support) Some fixes from Sanja BitKeeper/etc/ignore: added storage/maria/maria_log.* include/pagecache.h: Always have enum PAGECACHE_EMPTY_PAGE available (Simpler code) storage/maria/ma_bitmap.c: Reset 'debugging' bitmap when creating new one (fixes valgrind warning) storage/maria/ma_blockrec.c: Removed duplicate (wrong) initialization Reset not initialized variable storage/maria/ma_check.c: Use right page type (Patch from Sanja) storage/maria/ma_init.c: Reset logging in maria_end() (Fixes memory leak) storage/maria/ma_loghandler.c: Add missing copyright header Added checking of duplicate calls or calls without init to translog_destroy() Don't lock mutex before destroying them (not needed as you can't use a destroyed mutex anyway) storage/maria/ma_pagecache.c: Added extra page type text Trivial indentation fixes storage/maria/ma_test1.c: Added transaction setup (Patch from Sanja) storage/maria/ma_test2.c: Added transaction setup (Patch from Sanja) --- .bzrignore | 2 ++ 1 file changed, 2 insertions(+) (limited to '.bzrignore') diff --git a/.bzrignore b/.bzrignore index 0c52723de3c..40623790bc6 100644 --- a/.bzrignore +++ b/.bzrignore @@ -2998,3 +2998,5 @@ storage/maria/unittest/ma_pagecache_consist_64kHC-t-big storage/maria/unittest/ma_pagecache_consist_64kRD-t-big storage/maria/unittest/ma_pagecache_consist_64kWR-t-big storage/maria/unittest/ma_pagecache_single_64k-t-big +storage/maria/maria_control +storage/maria/maria_log.* -- cgit v1.2.1 From c548715c46a351a8c859da873db488c8f1b9c224 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 15 Jun 2007 01:45:55 +0300 Subject: Fixed LSN codding to allow code all relative LSN independed on "distance". Added support for test record descriptors to avoid interfere woth real record descriptors. Fixed descriptor of pseudofixed length record length, now it is length of record passed from/to client of the loghandler. BitKeeper/etc/ignore: Added storage/maria/unittest/ma_test_loghandler_long-t-big to the ignore list storage/maria/ma_init.c: Removed loghandler_init call because it is present in translog_init() storage/maria/ma_loghandler.c: Fixed LSN codding to allow code all relative LSN independed on "distance". Added support for test record descriptors to avoid interfere woth real record descriptors. Fixed length of LOGREC_REDO_INSERT_ROW_TAIL. Fixed descriptor of pseudofixed length record length, now it is length of record passed from/to client of the loghandler. storage/maria/ma_loghandler.h: Added support for test record descriptors to avoid interfere woth real record descriptors. storage/maria/unittest/Makefile.am: Made new test for log with reference over 63 files. Layout fixed. storage/maria/unittest/ma_test_loghandler-t.c: Added support for test record descriptors to avoid interfere woth real record descriptors. storage/maria/unittest/ma_test_loghandler_multigroup-t.c: Added support for test record descriptors to avoid interfere woth real record descriptors. storage/maria/unittest/ma_test_loghandler_multithread-t.c: Added support for test record descriptors to avoid interfere woth real record descriptors. storage/maria/unittest/ma_test_loghandler_pagecache-t.c: Added support for test record descriptors to avoid interfere woth real record descriptors. --- .bzrignore | 1 + 1 file changed, 1 insertion(+) (limited to '.bzrignore') diff --git a/.bzrignore b/.bzrignore index 40623790bc6..e4b60deec56 100644 --- a/.bzrignore +++ b/.bzrignore @@ -3000,3 +3000,4 @@ storage/maria/unittest/ma_pagecache_consist_64kWR-t-big storage/maria/unittest/ma_pagecache_single_64k-t-big storage/maria/maria_control storage/maria/maria_log.* +storage/maria/unittest/ma_test_loghandler_long-t-big -- cgit v1.2.1 From ef7a757b7c09f65207e6f30619a32533c27f400f Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 1 Jul 2007 20:45:01 +0300 Subject: After merge fixes BitKeeper/etc/ignore: added storage/maria/maria_read_log support-files/compiler_warnings.supp: Ignore function used when debugging (can be called from gdb) --- .bzrignore | 1 + 1 file changed, 1 insertion(+) (limited to '.bzrignore') diff --git a/.bzrignore b/.bzrignore index e4b60deec56..cb4056778cf 100644 --- a/.bzrignore +++ b/.bzrignore @@ -3001,3 +3001,4 @@ storage/maria/unittest/ma_pagecache_single_64k-t-big storage/maria/maria_control storage/maria/maria_log.* storage/maria/unittest/ma_test_loghandler_long-t-big +storage/maria/maria_read_log -- cgit v1.2.1 From f7b766c029e087900792fa4abd60330f681f20ff Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 29 Aug 2007 09:03:10 +0300 Subject: Added maria_commit() and maria_begin() to be used with external tests Now ma_test1 -M -T and ma_test2 -M -T produces readable, applyable logs Note: The .MAD file is not binary identical after applying redo compare to a an original file. (This is becasue we don't have full information which function called PURGE_REDO_BLOCKS). To verify if a file was correctly applied, we now instead compare row checksums BitKeeper/etc/ignore: added storage/maria/tmp/* include/maria.h: Added maria_commit() and maria_begin() to be used with external tests storage/maria/ha_maria.cc: Ensure maria_def. is read in C mode storage/maria/ma_blockrec.c: Fixed redo handling. _ma_apply_redo_purge_blocks() updated to handle any number of purged blocks Removed code to make data file idenitcal after redo (can't easily be done). See changeset comments Now ma_test1 -M -T and ma_test2 -M -T produces readable, applyable logs storage/maria/ma_commit.c: More DBUG statements Moved variable declaration to start of function (portability fix) Added helper functions 'maria_commit()' and 'maria_begin()' storage/maria/ma_loghandler.c: Fixed wrong REDO_PURGE_BLOCKS initialization storage/maria/ma_recovery.c: Added UNDO_ROW_UPDATE Removed wrong setting of lsn (there was no lsn at the used position) Fixed REDO_PURGE_BLOCKS to handle any number of blocks storage/maria/ma_test1.c: Added transaction support (via maria_begin() & maria_commit()) to get a log that can be applied with maria_read_log storage/maria/ma_test2.c: Added transaction support (via maria_begin() & maria_commit()) to get a log that can be applied with maria_read_log storage/maria/ma_test_recovery: Create temporary files in maria/tmp Verify files with checksums instead of byte comparisons storage/maria/maria_chk.c: When using with -dss we only get filename, records and checksum. This is useful to do a quick comparision if a files is identical to another one. storage/maria/maria_def.h: Added ma_commit() storage/maria/maria_read_log.c: Added --help --- .bzrignore | 3 +++ 1 file changed, 3 insertions(+) (limited to '.bzrignore') diff --git a/.bzrignore b/.bzrignore index bcdb50c37b4..396d3920e39 100644 --- a/.bzrignore +++ b/.bzrignore @@ -3045,3 +3045,6 @@ win/vs71cache.txt win/vs8cache.txt zlib/*.ds? zlib/*.vcproj +maria_log_control +storage/maria/tmp/* +storage/maria/tmp/* -- cgit v1.2.1 From 6f296a01ac39f7d10774fd3d93b5633f31ce99c7 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 27 Sep 2007 20:00:40 +0300 Subject: Fixed merge problems. BitKeeper/etc/ignore: Added libmysql_r/client_settings.h libmysqld/scheduler.cc libmysqld/sql_connect.cc libmysqld/sql_tablespace.cc to the ignore list --- .bzrignore | 4 ++++ 1 file changed, 4 insertions(+) (limited to '.bzrignore') diff --git a/.bzrignore b/.bzrignore index 6001873606c..18b01f4714a 100644 --- a/.bzrignore +++ b/.bzrignore @@ -3056,3 +3056,7 @@ win/vs71cache.txt win/vs8cache.txt zlib/*.ds? zlib/*.vcproj +libmysql_r/client_settings.h +libmysqld/scheduler.cc +libmysqld/sql_connect.cc +libmysqld/sql_tablespace.cc -- cgit v1.2.1 From 47d484153f57b6852a69cdf6f6defa3b610ef6c5 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 12 Oct 2007 10:22:49 +0200 Subject: make maria more pluggable mysql-test/r/maria.result: test for maria variables mysql-test/t/maria.test: test for maria variables BitKeeper/etc/ignore: Added sql/link_sources ylwrap libmysql_r/link_sources to the ignore list sql/sql_delete.cc: fix incorrect check storage/maria/ha_maria.cc: maria status and pagecache variables --- .bzrignore | 3 +++ 1 file changed, 3 insertions(+) (limited to '.bzrignore') diff --git a/.bzrignore b/.bzrignore index 18b01f4714a..5bdb136c0c6 100644 --- a/.bzrignore +++ b/.bzrignore @@ -3060,3 +3060,6 @@ libmysql_r/client_settings.h libmysqld/scheduler.cc libmysqld/sql_connect.cc libmysqld/sql_tablespace.cc +sql/link_sources +ylwrap +libmysql_r/link_sources -- cgit v1.2.1 From ebf7ab7bce003093745337be43cd6107726aa0fb Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 4 Dec 2007 23:23:42 +0200 Subject: Added error HA_ERR_FILE_TOO_SHORT to be used when files are shorter than expected (by my_read/my_pread) Added debugger hook _my_dbug_put_break_here() that is called if we get a CRC that matches --debug-crc-break (my_crc_dbug_break) Fixed REDO_REPAIR to use all repair modes (repair, repair_by_sort, repair_paralell REDO_REPAIR now also logs used key map Fixed some bugs in REDO logging of key pages Better error messages from maria_read_log Added my_readwrite_flags to init_pagecache() to be able to get better error messages and simplify code. Don't allow pagecaches with less than 8 blocks (Causes strange crashes) Added EXTRA_DEBUG_KEY_CHANGES. When this is defined some REDO_INDEX entries contains page checksums (these are calculated and checked in DBUG mode, ignored otherwise) Fixed bug in ma_pagecache unit tests that caused program to sometimes fail Added some missing calls to MY_INIT() that caused some unit tests to fail Fixed that TRUNCATE works properly on temporary MyISAM files Updates some result files to new table checksums results (checksum when NULL fields are ignored) perl test-insert can be replayed with maria_read_log! sql/share/Makefile.am: Change mode to -rw-rw-r-- BitKeeper/etc/ignore: added storage/maria/unittest/page_cache_test_file_1 storage/maria/unittest/pagecache_debug.log include/maria.h: Added maria_tmpdir include/my_base.h: Added error HA_ERR_FILE_TOO_SHORT include/my_sys.h: Added variable my_crc_dbug_check Added function my_dbug_put_break_here() include/myisamchk.h: Added org_key_map (Needed for writing REDO record for REPAIR) mysql-test/r/innodb.result: Updated to new checksum algorithm (NULL ignored) mysql-test/r/mix2_myisam.result: Updated to new checksum algorithm (NULL ignored) mysql-test/r/myisam.result: Updated to new checksum algorithm (NULL ignored) mysql-test/t/myisam.test: Added used table mysys/checksum.c: Added DBUG for checksum results Added debugger hook so that _my_dbug_put_break_here() is called if we get matching CRC mysys/lf_alloc-pin.c: Fixed compiler warning mysys/my_handler.c: Added new error message mysys/my_init.c: If my_progname is not given, use 'unknown' form my_progname_short Added debugger function my_debug_put_break_here() mysys/my_pread.c: In case of too short file when MY_NABP or MY_FNABP is specified, give error HA_ERR_FILE_TO_SHORT mysys/my_read.c: In case of too short file when MY_NABP or MY_FNABP is specified, give error HA_ERR_FILE_TO_SHORT sql/mysqld.cc: Added debug option --debug-crc-break sql/sql_parse.cc: Trivial optimization storage/maria/ha_maria.cc: Renamed variable to be more logical Ensure that param.testflag is correct when calling repair Added extra argument to init_pagecache Set default value for maria_tempdir storage/maria/ma_blockrec.c: Test for HA_ERR_FILE_TOO_SHORT instead for -1 storage/maria/ma_cache.c: Test for HA_ERR_FILE_TOO_SHORT instead for -1 storage/maria/ma_check.c: Set param->testflag to match how repair is run (needed for REDO logging) Simple optimization Moved flag if page is node from pagelength to keypage-flag byte Log used key map in REDO log. storage/maria/ma_delete.c: Remember previous UNDO entry when writing undo (for future CLR records) Moved flag if page is node from pagelength to keypage-flag byte Fixed some bugs in redo logging Added CRC for some translog REDO_INDEX entries storage/maria/ma_dynrec.c: Test for HA_ERR_FILE_TOO_SHORT instead for -1 storage/maria/ma_ft_update.c: Fixed call to _ma_store_page_used() storage/maria/ma_key_recover.c: Added CRC for some translog REDO_INDEX entries Removed not needed pagecache_write() in _ma_apply_redo_index() storage/maria/ma_locking.c: Test for HA_ERR_FILE_TOO_SHORT instead for -1 storage/maria/ma_loghandler.c: Added used key map to REDO_REPAIR_TABLE storage/maria/ma_loghandler.h: Added operation for checksum of key pages storage/maria/ma_open.c: Allocate storage for undo lsn pointers storage/maria/ma_pagecache.c: Remove not needed include file Change logging to use fd: for file descritors as other code Added my_readwrite_flags to init_pagecache() to be able to get better error messages for maria_chk/maria_read_log Don't allow pagecaches with less than 8 blocks Remove wrong DBUG_ASSERT() storage/maria/ma_pagecache.h: Added readwrite_flags storage/maria/ma_recovery.c: Better error messages for maria_read_log: - Added eprint() for printing error messages - Print extra \n before error message if we are printing %0 %10 ... Added used key_map to REDO_REPAIR log entry More DBUG Call same repair method that was used by mysqld storage/maria/ma_rt_index.c: Moved flag if page is node from pagelength to keypage-flag byte storage/maria/ma_rt_key.c: Fixed call to _ma_store_page_used() storage/maria/ma_rt_split.c: Moved flag if page is node from pagelength to keypage-flag byte storage/maria/ma_static.c: Added maria_tmpdir storage/maria/ma_test1.c: Updated call to init_pagecache() storage/maria/ma_test2.c: Updated call to init_pagecache() storage/maria/ma_test3.c: Updated call to init_pagecache() storage/maria/ma_write.c: Removed #ifdef NOT_YET Moved flag if page is node from pagelength to keypage-flag byte Fixed bug in _ma_log_del_prefix() storage/maria/maria_chk.c: Fixed wrong min limit for page_buffer_size Updated call to init_pagecache() storage/maria/maria_def.h: Added EXTRA_DEBUG_KEY_CHANGES. When this is defined some REDO_INDEX entries contains page checksums Moved flag if page is node from pagelength to keypage-flag byte storage/maria/maria_ftdump.c: Updated call to init_pagecache() storage/maria/maria_pack.c: Updated call to init_pagecache() Reset share->state.create_rename_lsn & share->state.is_of_horizon storage/maria/maria_read_log.c: Better error messages Added --tmpdir option (needed to set temporary directory for REDO_REPAIR) Added --start-from-lsn Changed option for --display-only to 'd' (wanted to use -o for 'offset') storage/maria/unittest/lockman2-t.c: Added missing call to MY_INIT() storage/maria/unittest/ma_pagecache_consist.c: Updated call to init_pagecache() storage/maria/unittest/ma_pagecache_single.c: Fixed bug that caused program to sometimes fail Added some DBUG_ASSERTS() Changed some calls to malloc()/free() to my_malloc()/my_free() Create extra file to expose original hard-to-find bug storage/maria/unittest/ma_test_loghandler-t.c: Updated call to init_pagecache() storage/maria/unittest/ma_test_loghandler_first_lsn-t.c: Updated call to init_pagecache() storage/maria/unittest/ma_test_loghandler_max_lsn-t.c: Updated call to init_pagecache() storage/maria/unittest/ma_test_loghandler_multigroup-t.c: Updated call to init_pagecache() storage/maria/unittest/ma_test_loghandler_multithread-t.c: Updated call to init_pagecache() storage/maria/unittest/ma_test_loghandler_noflush-t.c: Updated call to init_pagecache() storage/maria/unittest/ma_test_loghandler_pagecache-t.c: Updated call to init_pagecache() storage/maria/unittest/ma_test_loghandler_purge-t.c: Updated call to init_pagecache() storage/maria/unittest/test_file.c: Changed malloc()/free() to my_malloc()/my_free() Fixed memory leak Changd logic a bit while trying to find bug in reset_file() storage/maria/unittest/trnman-t.c: Added missing call to MY_INIT() storage/myisam/mi_cache.c: Test for HA_ERR_FILE_TOO_SHORT instead for -1 storage/myisam/mi_create.c: Removed O_EXCL to get TRUNCATE to work for temporary files storage/myisam/mi_dynrec.c: Test for HA_ERR_FILE_TOO_SHORT instead for -1 storage/myisam/mi_locking.c: Test for HA_ERR_FILE_TOO_SHORT instead for -1 mysql-test/r/old-mode.result: New BitKeeper file ``mysql-test/r/old-mode.result'' mysql-test/t/old-mode-master.opt: New BitKeeper file ``mysql-test/t/old-mode-master.opt'' mysql-test/t/old-mode.test: New BitKeeper file ``mysql-test/t/old-mode.test'' --- .bzrignore | 2 ++ 1 file changed, 2 insertions(+) (limited to '.bzrignore') diff --git a/.bzrignore b/.bzrignore index 5bdb136c0c6..acbf0040063 100644 --- a/.bzrignore +++ b/.bzrignore @@ -3063,3 +3063,5 @@ libmysqld/sql_tablespace.cc sql/link_sources ylwrap libmysql_r/link_sources +storage/maria/unittest/page_cache_test_file_1 +storage/maria/unittest/pagecache_debug.log -- cgit v1.2.1 From 4140f76f4e50a0497c8d325fef7e255bb5cf4e68 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 28 Dec 2007 00:15:29 +0100 Subject: after merge include/mysql/plugin.h: move declarations after merge mysql-test/r/change_user.result: more tests mysql-test/t/change_user.test: more tests mysys/my_getopt.c: remove wrong code BitKeeper/etc/ignore: Added libmysqld/sql_profile.cc to the ignore list --- .bzrignore | 1 + 1 file changed, 1 insertion(+) (limited to '.bzrignore') diff --git a/.bzrignore b/.bzrignore index fcafdf8915a..872ea62058e 100644 --- a/.bzrignore +++ b/.bzrignore @@ -3066,3 +3066,4 @@ win/vs8cache.txt ylwrap zlib/*.ds? zlib/*.vcproj +libmysqld/sql_profile.cc -- cgit v1.2.1 From ce8de7afdffd46507f000048a17722f81eec7688 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 10 Jan 2008 13:21:53 +0100 Subject: Windows fixes -new option WITH_MARIA_STORAGE_ENGINE for config.js -correct build errors -build test executables -downport changes for atomic functions from 5.2 -remove LOCK_uuid_generator from C++ files to avoid linker errors -new function my_uuid2str() BitKeeper/deleted/.del-x86-msvc.h: Delete: include/atomic/x86-msvc.h CMakeLists.txt: Windows fixes: -New option WITH_MARIA_STORAGE_ENGINE -Add unit tests include/Makefile.am: replace x86-msvc.h with generic-msvc.h include/config-win.h: my_chmod() support include/my_atomic.h: Downport my_atomic from 5.2 tree include/my_bit.h: Correct unresolved symbol errors on Windows include/my_pthread.h: pthread_mutex_unlock now returns 0 (was void previously) defined PTHREAD_STACK_MIN include/my_sys.h: New function my_uuid2str() define MY_UUID_STRING_LENGTH include/atomic/nolock.h: Downport my_atomic from 5.2 tree libmysqld/CMakeLists.txt: New option WITH_MARIA_STORAGE_ENGINE mysys/CMakeLists.txt: Add missing files mysys/lf_dynarray.c: Fix compiler errors on Windows mysys/my_getncpus.c: Windows port mysys/my_uuid.c: Windows fixes: there is no random() on Windows, use ANSI rand() New function my_uuid2str() mysys/my_winthread.c: Downport from 5.2 tree -Call my_thread_end() before pthread_exit() -Avoid crash if pthread_create is called with NULL attributes sql/CMakeLists.txt: Link mysqld with Maria storage engine sql/item_func.cc: Remove LOCK_uuid_generator from C++ to avoid linker errors. Use dedicated mutex for short uuids sql/item_strfunc.cc: Use my_uuid() and my_uuid2str() functions from mysys. sql/item_strfunc.h: Define MY_UUID_STRING_LENGTH in my_sys.h sql/mysql_priv.h: LOCK_uuid_generator must be declared as extern "C" sql/mysqld.cc: Init and destroy LOCK_uuid_short mutex storage/maria/CMakeLists.txt: -Use the same source files as in Makefile.am -Build test binaries storage/maria/ha_maria.cc: snprintf->my_snprintf storage/maria/lockman.c: Fix compiler error on Windows storage/maria/ma_check.c: Fix compiler error on Windows storage/maria/ma_loghandler.c: Fix compile errors my_open()/my_sync() do not work for directories on Windows storage/maria/ma_recovery.c: Fix compile error on Windows storage/maria/ma_test2.c: Rename variable to avoid naming conflict with Microsoft C runtime function storage/maria/ma_test3.c: Fix build errors on Windows storage/maria/tablockman.c: Fix build errors on Windows storage/maria/unittest/Makefile.am: Add CMakeLists.txt storage/maria/unittest/ma_pagecache_consist.c: Fix build errors on Windows remove loop from get_len() storage/maria/unittest/ma_pagecache_single.c: Fix build errors on Windows storage/maria/unittest/ma_test_loghandler-t.c: Windows fixes -Avoid division by 0 in expressions like x/(RAND_MAX/y), where y is larger than RAND_MAX(==0x7fff on Windows) storage/maria/unittest/ma_test_loghandler_multigroup-t.c: Windows fixes -Avoid division by 0 in expressions like x/(RAND_MAX/y), where y is larger than RAND_MAX(==0x7fff on Windows) -remove loop in get_len() storage/maria/unittest/ma_test_loghandler_multithread-t.c: Windows fixes -Avoid division by 0 in expressions like x/(RAND_MAX/y), where y is larger than RAND_MAX(==0x7fff on Windows) -remove loop in get_len() storage/maria/unittest/ma_test_loghandler_noflush-t.c: Fix build errors on Windows storage/maria/unittest/test_file.c: Correct the code to get file size on Windows. stat() information can be outdated and thus cannot be trusted. On Vista,stat() returns file size=0 until the file is closed at the first time. storage/myisam/CMakeLists.txt: Fix compiler errors on Windows Build test executables storage/myisam/mi_test2.c: Rename variable to avoid naming conflict with Microsoft C runtime function storage/myisam/mi_test3.c: Fix build errors on Windows strings/CMakeLists.txt: Add missing file unittest/unit.pl: Windows: downport unittest changes from 5.2 bk tree unittest/mysys/Makefile.am: Windows: downport unittest changes from 5.2 bk tree unittest/mysys/my_atomic-t.c: Windows: downport unittest changes from 5.2 bk tree unittest/mytap/Makefile.am: Windows: downport unittest changes from 5.2 bk tree unittest/mytap/tap.c: Windows: downport unittest changes from 5.2 bk tree win/configure.js: Add WITH_MARIA_STORAGE_ENGINE configure option unittest/mytap/CMakeLists.txt: Add missing file unittest/mysys/CMakeLists.txt: Add missing file storage/maria/unittest/CMakeLists.txt: Add missing file BitKeeper/etc/ignore: Added comments maria-win.patch to the ignore list include/atomic/generic-msvc.h: Implement atomic operations with MSVC intrinsics --- .bzrignore | 5 +++++ 1 file changed, 5 insertions(+) (limited to '.bzrignore') diff --git a/.bzrignore b/.bzrignore index 872ea62058e..135d0a66fbf 100644 --- a/.bzrignore +++ b/.bzrignore @@ -3067,3 +3067,8 @@ ylwrap zlib/*.ds? zlib/*.vcproj libmysqld/sql_profile.cc +*.dll +*.ilk +*.exp +comments +maria-win.patch -- cgit v1.2.1 From 5cca615cafe821ac37354bafc8057b08ca998f62 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 21 Jan 2008 22:03:24 +0200 Subject: Allow index on 'CHAR(0) NULL' columns Fixed error in Maria when using table with only CHAR(0) fields Fixed valgrind warning BitKeeper/etc/ignore: added storage/maria/maria_dump_log mysql-test/r/maria.result: Testing of table with char(0) mysql-test/t/maria.test: Testing of table with char(0) sql/sql_table.cc: Allow index on 'CHAR(0) NULL' columns storage/maria/ma_create.c: Allow creation of table with 0 record data (for example CHAR(0)) storage/maria/ma_pagecrc.c: Fixed valgrind warning --- .bzrignore | 1 + 1 file changed, 1 insertion(+) (limited to '.bzrignore') diff --git a/.bzrignore b/.bzrignore index 135d0a66fbf..3b65e8d24e4 100644 --- a/.bzrignore +++ b/.bzrignore @@ -3072,3 +3072,4 @@ libmysqld/sql_profile.cc *.exp comments maria-win.patch +storage/maria/maria_dump_log -- cgit v1.2.1 From 71eb292f37b25c11fd3d041d38d3397d7ce8ccb7 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 29 Jan 2008 15:26:04 +0100 Subject: storage/maria/unittest/ma_test_all-t 1. reasonable defaults for maria_path 2. reasonable TAP-compatible output in non-verbose mode unittest/Makefile.am remove maria_path hack BitKeeper/etc/ignore@1.269 added maria_log.00000* ma_test_recovery.output test?.MA? BitKeeper/etc/ignore: added maria_log.00000* ma_test_recovery.output test?.MA? storage/maria/unittest/ma_test_all-t: 1. reasonable defaults for maria_path 2. reasonable TAP-compatible output in non-verbose mode unittest/Makefile.am: remove maria_path hack --- .bzrignore | 3 +++ 1 file changed, 3 insertions(+) (limited to '.bzrignore') diff --git a/.bzrignore b/.bzrignore index 3b65e8d24e4..9c60fecca1c 100644 --- a/.bzrignore +++ b/.bzrignore @@ -3073,3 +3073,6 @@ libmysqld/sql_profile.cc comments maria-win.patch storage/maria/maria_dump_log +maria_log.00000* +ma_test_recovery.output +test?.MA? -- cgit v1.2.1 From 7a0a32232014c43d93c195b0537154323234d2f7 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 3 Feb 2008 23:14:23 +0100 Subject: ignore: added dbug/tests BitKeeper/etc/ignore: added dbug/tests --- .bzrignore | 1 + 1 file changed, 1 insertion(+) (limited to '.bzrignore') diff --git a/.bzrignore b/.bzrignore index 9c60fecca1c..01d027f2889 100644 --- a/.bzrignore +++ b/.bzrignore @@ -3076,3 +3076,4 @@ storage/maria/maria_dump_log maria_log.00000* ma_test_recovery.output test?.MA? +dbug/tests -- cgit v1.2.1 From df843c4ce26e2c5d152098302b209252c712382e Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 21 Feb 2008 02:45:02 +0200 Subject: Fixed problems with ma_test2 and mi_test2 on high-byte-first system Fixed bug in ma_test2 when last row in table is deleted Fixed that ma_test_recovery.pl works on Solaris (by using digest instead of md5sum) Fixed some compiler warnings generated by the Forte compiler dbug/dbug.c: Added cast to get rid of compiler warning mysys/lf_alloc-pin.c: Added cast to get rid of compiler warning mysys/my_bitmap.c: Removed impossible DBUG_ASSERT()'s to get rid of compiler warnings mysys/my_compress.c: Removed wrong cast to get rid of compiler warning storage/maria/lockman.c: Added cast to get rid of compiler warning storage/maria/ma_open.c: Added fix from MyISAM to allocate space in key buffer for nod pointer storage/maria/ma_recovery.c: Fixed initialization that caused compiler warning storage/maria/ma_rsame.c: More DBUG_PRINT storage/maria/ma_scan.c: Better comment storage/maria/ma_statrec.c: More DBUG_PRINT and comments Fixed indentation BitKeeper/etc/ignore: added storage/maria/unittest/tmp/* storage/maria/ma_test2.c: Fixed bug that caused maria_rsame() to fail if test removed last row Fixed wrong usage of longget(); Should be uint4korr() storage/maria/unittest/ma_test_recovery.pl: Use md5sum or digest to calculate md5. This allows this script to be run on Linux and Solaris storage/myisam/mi_test2.c: Fixed wrong usage of longget(); Should be uint4korr() strings/ctype.c: Added casts to get rid of compiler warnings sql-bench/myisam.cnf: New BitKeeper file ``sql-bench/myisam.cnf'' --- .bzrignore | 1 + 1 file changed, 1 insertion(+) (limited to '.bzrignore') diff --git a/.bzrignore b/.bzrignore index 01d027f2889..eb0e6681b38 100644 --- a/.bzrignore +++ b/.bzrignore @@ -3077,3 +3077,4 @@ maria_log.00000* ma_test_recovery.output test?.MA? dbug/tests +storage/maria/unittest/tmp/* -- cgit v1.2.1 From 3651e3285d11c42a77e332009155b96132e5ba6e Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 1 Apr 2008 17:57:30 +0300 Subject: Merge of changes in MyISAM since December 16 -> April 1 Fixes bugs: Bug#28837 MyISAM storage engine error (134) doing delete with self-join Bug#31277 myisamchk --unpack corrupts table Bug#4692 DISABLE/ENABLE KEYS waste a space Bug#31305 myisam tables crash when they are near capacity BitKeeper/etc/ignore: added unittest/tmp/* mysql-test/r/maria.result: Moved missing tests from myisam.test to maria.test mysql-test/t/maria.test: Moved missing tests from myisam.test to maria.test storage/maria/ha_maria.cc: Merge of changes in MyISAM since December 16 -> April 1 Fixes bug in self join (Bug#28837: MyISAM storage engine error (134) doing delete with self-join) storage/maria/ha_maria.h: Merge of changes in MyISAM since December 16 -> April 1 storage/maria/ma_blockrec.c: Merge of changes in MyISAM since December 16 -> April 1 Fixes bug in self join (Bug#28837: MyISAM storage engine error (134) doing delete with self-join) The problem is that we may be using a cached key page with old information. Versioning will fix this storage/maria/ma_check.c: Merge of changes in MyISAM since December 16 -> April 1 This fixes a problem with pack_reclength not beeing big enough (Bug #31277 myisamchk --unpack corrupts table) BUG#4692 - DISABLE/ENABLE KEYS waste a space storage/maria/ma_delete.c: Indentation fixes storage/maria/ma_dynrec.c: Merge of changes in MyISAM since December 16 -> April 1 Fixes Bug#31305 myisam tables crash when they are near capacity. (This uses a simpler fix than in MyISAM by remembering the length of the current row) storage/maria/ma_ft_boolean_search.c: Merge of all changes from myisam/ft_boolean_search.c (This file had not been kept up to date) storage/maria/ma_open.c: Merge of changes in MyISAM since December 16 -> April 1 Calculate default_rec_buff_size more exact to be sure it's always big enough storage/maria/ma_packrec.c: Merge of changes in MyISAM since December 16 -> April 1 Update default_rec_buff_size to be big enough to hold one packed row Related to Bug#31277 myisamchk --unpack corrupts table storage/maria/ma_rnext_same.c: Indentation fixes storage/maria/ma_rt_index.c: Merge of changes in MyISAM since December 16 -> April 1 storage/maria/ma_rt_mbr.c: Merge of changes in MyISAM since December 16 -> April 1 (Added comment) storage/maria/ma_search.c: Merge of changes in MyISAM since December 16 -> April 1 (Added comment) storage/maria/ma_sort.c: Merge of changes in MyISAM since December 16 -> April 1 storage/maria/ma_statrec.c: Indentation fixes storage/maria/ma_test2.c: Indentation fixes storage/maria/maria_chk.c: Indentation fixes storage/maria/maria_pack.c: Merge of changes in MyISAM since December 16 -> April 1 --- .bzrignore | 1 + 1 file changed, 1 insertion(+) (limited to '.bzrignore') diff --git a/.bzrignore b/.bzrignore index eb0e6681b38..09d0ffdffe4 100644 --- a/.bzrignore +++ b/.bzrignore @@ -3078,3 +3078,4 @@ ma_test_recovery.output test?.MA? dbug/tests storage/maria/unittest/tmp/* +unittest/tmp/* -- cgit v1.2.1 From 2d64cd05e1b9cd3b76368af7db34335b88bea248 Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Mon, 2 Jun 2008 10:45:41 +0300 Subject: Cleanup & Ignore .bzrignore: Removed duplicated entires Added missing files and directories Added ignoring of extensions of temporary files under windows --- .bzrignore | 1289 ++---------------------------------------------------------- 1 file changed, 31 insertions(+), 1258 deletions(-) (limited to '.bzrignore') diff --git a/.bzrignore b/.bzrignore index 7cc06b8bc13..79c08ee98de 100644 --- a/.bzrignore +++ b/.bzrignore @@ -37,6 +37,9 @@ *.user *.vcproj *.vcproj.cmake +*.dsp +*.Po +*.Plo */*.dir/* */*_pure_*warnings */.deps @@ -90,6 +93,9 @@ BitKeeper/post-commit-manual BitKeeper/tmp/* BitKeeper/tmp/bkr3sAHD BitKeeper/tmp/gone +BitKeeper/tmp +BitKeeper/log +BitKeeper/etc/SCCS CMakeFiles/* COPYING COPYING.LIB @@ -151,7 +157,6 @@ Makefile.in Makefile.in' PENDING/* TAGS -VC++Files/client/mysql_amd64.dsp ac_available_languages_fragment acinclude.m4 aclocal.m4 @@ -160,6 +165,7 @@ autom4te-2.53.cache/* autom4te-2.53.cache/output.0 autom4te-2.53.cache/requests autom4te-2.53.cache/traces.0 +autom4te.cache autom4te.cache/* autom4te.cache/output.0 autom4te.cache/requests @@ -172,37 +178,9 @@ bdb/build_unix/* bdb/build_vxworks/db.h bdb/build_vxworks/db_int.h bdb/build_win32/db.h -bdb/build_win32/db_archive.dsp -bdb/build_win32/db_checkpoint.dsp bdb/build_win32/db_config.h bdb/build_win32/db_cxx.h -bdb/build_win32/db_deadlock.dsp -bdb/build_win32/db_dll.dsp -bdb/build_win32/db_dump.dsp bdb/build_win32/db_int.h -bdb/build_win32/db_java.dsp -bdb/build_win32/db_load.dsp -bdb/build_win32/db_perf.dsp -bdb/build_win32/db_printlog.dsp -bdb/build_win32/db_recover.dsp -bdb/build_win32/db_stat.dsp -bdb/build_win32/db_static.dsp -bdb/build_win32/db_tcl.dsp -bdb/build_win32/db_test.dsp -bdb/build_win32/db_upgrade.dsp -bdb/build_win32/db_verify.dsp -bdb/build_win32/ex_access.dsp -bdb/build_win32/ex_btrec.dsp -bdb/build_win32/ex_env.dsp -bdb/build_win32/ex_lock.dsp -bdb/build_win32/ex_mpool.dsp -bdb/build_win32/ex_tpcb.dsp -bdb/build_win32/excxx_access.dsp -bdb/build_win32/excxx_btrec.dsp -bdb/build_win32/excxx_env.dsp -bdb/build_win32/excxx_lock.dsp -bdb/build_win32/excxx_mpool.dsp -bdb/build_win32/excxx_tpcb.dsp bdb/build_win32/include.tcl bdb/build_win32/libdb.def bdb/build_win32/libdb.rc @@ -315,48 +293,7 @@ build_tags.sh client/#mysql.cc# client/*.ds? client/*.vcproj -client/.deps/base64.Po -client/.deps/completion_hash.Po -client/.deps/dummy.Po -client/.deps/mf_tempdir.Po -client/.deps/my_bit.Po -client/.deps/my_bitmap.Po -client/.deps/my_getsystime.Po -client/.deps/my_new.Po -client/.deps/my_user.Po -client/.deps/my_vle.Po -client/.deps/mysql.Po -client/.deps/mysql_upgrade.Po -client/.deps/mysqladmin.Po -client/.deps/mysqlbinlog.Po -client/.deps/mysqlcheck.Po -client/.deps/mysqldump.Po -client/.deps/mysqlimport.Po -client/.deps/mysqlshow.Po -client/.deps/mysqlslap.Po -client/.deps/mysqltest.Po -client/.deps/readline.Po -client/.deps/sql_string.Po client/.libs -prune -client/.libs/lt-mysql -client/.libs/lt-mysqladmin -client/.libs/lt-mysqlbinlog -client/.libs/lt-mysqlcheck -client/.libs/lt-mysqldump -client/.libs/lt-mysqlimport -client/.libs/lt-mysqlshow -client/.libs/lt-mysqlslap -client/.libs/lt-mysqltest -client/.libs/mysql -client/.libs/mysql_upgrade -client/.libs/mysqladmin -client/.libs/mysqlbinlog -client/.libs/mysqlcheck -client/.libs/mysqldump -client/.libs/mysqlimport -client/.libs/mysqlshow -client/.libs/mysqlslap -client/.libs/mysqltest client/completion_hash.cpp client/decimal.c client/insert_test @@ -403,66 +340,8 @@ client_debug/* client_release/* client_test cmake_install.cmake -cmd-line-utils/libedit/.deps/chared.Po -cmd-line-utils/libedit/.deps/common.Po -cmd-line-utils/libedit/.deps/el.Po -cmd-line-utils/libedit/.deps/emacs.Po -cmd-line-utils/libedit/.deps/fcns.Po -cmd-line-utils/libedit/.deps/fgetln.Po -cmd-line-utils/libedit/.deps/help.Po -cmd-line-utils/libedit/.deps/hist.Po -cmd-line-utils/libedit/.deps/history.Po -cmd-line-utils/libedit/.deps/key.Po -cmd-line-utils/libedit/.deps/map.Po -cmd-line-utils/libedit/.deps/parse.Po -cmd-line-utils/libedit/.deps/prompt.Po -cmd-line-utils/libedit/.deps/read.Po -cmd-line-utils/libedit/.deps/readline.Po -cmd-line-utils/libedit/.deps/refresh.Po -cmd-line-utils/libedit/.deps/search.Po -cmd-line-utils/libedit/.deps/sig.Po -cmd-line-utils/libedit/.deps/strlcat.Po -cmd-line-utils/libedit/.deps/strlcpy.Po -cmd-line-utils/libedit/.deps/term.Po -cmd-line-utils/libedit/.deps/tokenizer.Po -cmd-line-utils/libedit/.deps/tty.Po -cmd-line-utils/libedit/.deps/unvis.Po -cmd-line-utils/libedit/.deps/vi.Po -cmd-line-utils/libedit/.deps/vis.Po cmd-line-utils/libedit/common.h cmd-line-utils/libedit/makelist -cmd-line-utils/readline/.deps/bind.Po -cmd-line-utils/readline/.deps/callback.Po -cmd-line-utils/readline/.deps/compat.Po -cmd-line-utils/readline/.deps/complete.Po -cmd-line-utils/readline/.deps/display.Po -cmd-line-utils/readline/.deps/funmap.Po -cmd-line-utils/readline/.deps/histexpand.Po -cmd-line-utils/readline/.deps/histfile.Po -cmd-line-utils/readline/.deps/history.Po -cmd-line-utils/readline/.deps/histsearch.Po -cmd-line-utils/readline/.deps/input.Po -cmd-line-utils/readline/.deps/isearch.Po -cmd-line-utils/readline/.deps/keymaps.Po -cmd-line-utils/readline/.deps/kill.Po -cmd-line-utils/readline/.deps/macro.Po -cmd-line-utils/readline/.deps/mbutil.Po -cmd-line-utils/readline/.deps/misc.Po -cmd-line-utils/readline/.deps/nls.Po -cmd-line-utils/readline/.deps/parens.Po -cmd-line-utils/readline/.deps/readline.Po -cmd-line-utils/readline/.deps/rltty.Po -cmd-line-utils/readline/.deps/savestring.Po -cmd-line-utils/readline/.deps/search.Po -cmd-line-utils/readline/.deps/shell.Po -cmd-line-utils/readline/.deps/signals.Po -cmd-line-utils/readline/.deps/terminal.Po -cmd-line-utils/readline/.deps/text.Po -cmd-line-utils/readline/.deps/tilde.Po -cmd-line-utils/readline/.deps/undo.Po -cmd-line-utils/readline/.deps/util.Po -cmd-line-utils/readline/.deps/vi_mode.Po -cmd-line-utils/readline/.deps/xmalloc.Po comments comon.h comp_err/*.ds? @@ -488,11 +367,6 @@ cscope.po.out db-*.*.* dbug/*.ds? dbug/*.vcproj -dbug/.deps/dbug.Po -dbug/.deps/dbug_analyze.Po -dbug/.deps/factorial.Po -dbug/.deps/my_main.Po -dbug/.deps/sanity.Po dbug/dbug_analyze dbug/example*.r dbug/factorial @@ -509,15 +383,6 @@ emacs.h examples/*.ds? examples/*.vcproj examples/udf_example/udf_example.def -extra/.deps/charset2html.Po -extra/.deps/comp_err.Po -extra/.deps/innochecksum.Po -extra/.deps/my_print_defaults.Po -extra/.deps/mysql_waitpid.Po -extra/.deps/perror.Po -extra/.deps/replace.Po -extra/.deps/resolve_stack_dump.Po -extra/.deps/resolveip.Po extra/charset2html extra/comp_err extra/created_include_files @@ -534,54 +399,8 @@ extra/resolve_stack_dump extra/resolveip extra/sql_state.h extra/tztime.cc -extra/yassl/src/.deps/buffer.Plo -extra/yassl/src/.deps/cert_wrapper.Plo -extra/yassl/src/.deps/crypto_wrapper.Plo -extra/yassl/src/.deps/handshake.Plo -extra/yassl/src/.deps/lock.Plo -extra/yassl/src/.deps/log.Plo -extra/yassl/src/.deps/socket_wrapper.Plo -extra/yassl/src/.deps/ssl.Plo -extra/yassl/src/.deps/template_instnt.Plo -extra/yassl/src/.deps/timer.Plo -extra/yassl/src/.deps/yassl_error.Plo -extra/yassl/src/.deps/yassl_imp.Plo -extra/yassl/src/.deps/yassl_int.Plo -extra/yassl/taocrypt/benchmark/.deps/benchmark-benchmark.Po extra/yassl/taocrypt/benchmark/benchmark -extra/yassl/taocrypt/src/.deps/libtaocrypt_la-aes.Plo -extra/yassl/taocrypt/src/.deps/libtaocrypt_la-aestables.Plo -extra/yassl/taocrypt/src/.deps/libtaocrypt_la-algebra.Plo -extra/yassl/taocrypt/src/.deps/libtaocrypt_la-arc4.Plo -extra/yassl/taocrypt/src/.deps/libtaocrypt_la-asn.Plo -extra/yassl/taocrypt/src/.deps/libtaocrypt_la-bftables.Plo -extra/yassl/taocrypt/src/.deps/libtaocrypt_la-blowfish.Plo -extra/yassl/taocrypt/src/.deps/libtaocrypt_la-coding.Plo -extra/yassl/taocrypt/src/.deps/libtaocrypt_la-des.Plo -extra/yassl/taocrypt/src/.deps/libtaocrypt_la-dh.Plo -extra/yassl/taocrypt/src/.deps/libtaocrypt_la-dsa.Plo -extra/yassl/taocrypt/src/.deps/libtaocrypt_la-file.Plo -extra/yassl/taocrypt/src/.deps/libtaocrypt_la-hash.Plo -extra/yassl/taocrypt/src/.deps/libtaocrypt_la-integer.Plo -extra/yassl/taocrypt/src/.deps/libtaocrypt_la-md2.Plo -extra/yassl/taocrypt/src/.deps/libtaocrypt_la-md4.Plo -extra/yassl/taocrypt/src/.deps/libtaocrypt_la-md5.Plo -extra/yassl/taocrypt/src/.deps/libtaocrypt_la-misc.Plo -extra/yassl/taocrypt/src/.deps/libtaocrypt_la-random.Plo -extra/yassl/taocrypt/src/.deps/libtaocrypt_la-ripemd.Plo -extra/yassl/taocrypt/src/.deps/libtaocrypt_la-rsa.Plo -extra/yassl/taocrypt/src/.deps/libtaocrypt_la-sha.Plo -extra/yassl/taocrypt/src/.deps/libtaocrypt_la-template_instnt.Plo -extra/yassl/taocrypt/src/.deps/libtaocrypt_la-tftables.Plo -extra/yassl/taocrypt/src/.deps/libtaocrypt_la-twofish.Plo -extra/yassl/taocrypt/test/.deps/test-test.Po extra/yassl/taocrypt/test/test -extra/yassl/testsuite/.deps/testsuite-client.Po -extra/yassl/testsuite/.deps/testsuite-echoclient.Po -extra/yassl/testsuite/.deps/testsuite-echoserver.Po -extra/yassl/testsuite/.deps/testsuite-server.Po -extra/yassl/testsuite/.deps/testsuite-test.Po -extra/yassl/testsuite/.deps/testsuite-testsuite.Po extra/yassl/testsuite/testsuite fcns.c fcns.h @@ -646,130 +465,6 @@ lib_release/* libmysql/*.c libmysql/*.ds? libmysql/*.vcproj -libmysql/.deps/array.Plo -libmysql/.deps/bchange.Plo -libmysql/.deps/bcmp.Plo -libmysql/.deps/bmove.Plo -libmysql/.deps/bmove_upp.Plo -libmysql/.deps/charset-def.Plo -libmysql/.deps/charset.Plo -libmysql/.deps/client.Plo -libmysql/.deps/conf_to_src.Po -libmysql/.deps/ctype-big5.Plo -libmysql/.deps/ctype-bin.Plo -libmysql/.deps/ctype-cp932.Plo -libmysql/.deps/ctype-czech.Plo -libmysql/.deps/ctype-euc_kr.Plo -libmysql/.deps/ctype-eucjpms.Plo -libmysql/.deps/ctype-extra.Plo -libmysql/.deps/ctype-gb2312.Plo -libmysql/.deps/ctype-gbk.Plo -libmysql/.deps/ctype-latin1.Plo -libmysql/.deps/ctype-mb.Plo -libmysql/.deps/ctype-simple.Plo -libmysql/.deps/ctype-sjis.Plo -libmysql/.deps/ctype-tis620.Plo -libmysql/.deps/ctype-uca.Plo -libmysql/.deps/ctype-ucs2.Plo -libmysql/.deps/ctype-ujis.Plo -libmysql/.deps/ctype-utf8.Plo -libmysql/.deps/ctype-win1250ch.Plo -libmysql/.deps/ctype.Plo -libmysql/.deps/dbug.Plo -libmysql/.deps/default.Plo -libmysql/.deps/default_modify.Plo -libmysql/.deps/errmsg.Plo -libmysql/.deps/errors.Plo -libmysql/.deps/get_password.Plo -libmysql/.deps/hash.Plo -libmysql/.deps/int2str.Plo -libmysql/.deps/is_prefix.Plo -libmysql/.deps/libmysql.Plo -libmysql/.deps/list.Plo -libmysql/.deps/llstr.Plo -libmysql/.deps/longlong2str.Plo -libmysql/.deps/manager.Plo -libmysql/.deps/md5.Plo -libmysql/.deps/mf_cache.Plo -libmysql/.deps/mf_dirname.Plo -libmysql/.deps/mf_fn_ext.Plo -libmysql/.deps/mf_format.Plo -libmysql/.deps/mf_iocache.Plo -libmysql/.deps/mf_iocache2.Plo -libmysql/.deps/mf_loadpath.Plo -libmysql/.deps/mf_pack.Plo -libmysql/.deps/mf_path.Plo -libmysql/.deps/mf_tempfile.Plo -libmysql/.deps/mf_unixpath.Plo -libmysql/.deps/mf_wcomp.Plo -libmysql/.deps/mulalloc.Plo -libmysql/.deps/my_alloc.Plo -libmysql/.deps/my_chsize.Plo -libmysql/.deps/my_compress.Plo -libmysql/.deps/my_create.Plo -libmysql/.deps/my_delete.Plo -libmysql/.deps/my_div.Plo -libmysql/.deps/my_error.Plo -libmysql/.deps/my_file.Plo -libmysql/.deps/my_fopen.Plo -libmysql/.deps/my_fstream.Plo -libmysql/.deps/my_gethostbyname.Plo -libmysql/.deps/my_getopt.Plo -libmysql/.deps/my_getwd.Plo -libmysql/.deps/my_init.Plo -libmysql/.deps/my_lib.Plo -libmysql/.deps/my_malloc.Plo -libmysql/.deps/my_messnc.Plo -libmysql/.deps/my_net.Plo -libmysql/.deps/my_once.Plo -libmysql/.deps/my_open.Plo -libmysql/.deps/my_port.Plo -libmysql/.deps/my_pread.Plo -libmysql/.deps/my_pthread.Plo -libmysql/.deps/my_read.Plo -libmysql/.deps/my_realloc.Plo -libmysql/.deps/my_rename.Plo -libmysql/.deps/my_seek.Plo -libmysql/.deps/my_sleep.Plo -libmysql/.deps/my_static.Plo -libmysql/.deps/my_strtoll10.Plo -libmysql/.deps/my_symlink.Plo -libmysql/.deps/my_thr_init.Plo -libmysql/.deps/my_time.Plo -libmysql/.deps/my_vsnprintf.Plo -libmysql/.deps/my_write.Plo -libmysql/.deps/net.Plo -libmysql/.deps/pack.Plo -libmysql/.deps/password.Plo -libmysql/.deps/safemalloc.Plo -libmysql/.deps/sha1.Plo -libmysql/.deps/str2int.Plo -libmysql/.deps/str_alloc.Plo -libmysql/.deps/strcend.Plo -libmysql/.deps/strcont.Plo -libmysql/.deps/strend.Plo -libmysql/.deps/strfill.Plo -libmysql/.deps/string.Plo -libmysql/.deps/strinstr.Plo -libmysql/.deps/strmake.Plo -libmysql/.deps/strmov.Plo -libmysql/.deps/strnlen.Plo -libmysql/.deps/strnmov.Plo -libmysql/.deps/strtod.Plo -libmysql/.deps/strtoll.Plo -libmysql/.deps/strtoull.Plo -libmysql/.deps/strxmov.Plo -libmysql/.deps/strxnmov.Plo -libmysql/.deps/thr_mutex.Plo -libmysql/.deps/typelib.Plo -libmysql/.deps/vio.Plo -libmysql/.deps/viosocket.Plo -libmysql/.deps/viossl.Plo -libmysql/.deps/viosslfactories.Plo -libmysql/.deps/xml.Plo -libmysql/.libs/libmysqlclient.lai -libmysql/.libs/libmysqlclient.so.15 -libmysql/.libs/libmysqlclient.so.15.0.0 libmysql/conf_to_src libmysql/debug/libmysql.exp libmysql/libmysql.ver @@ -782,130 +477,6 @@ libmysql/release/libmysql.exp libmysql/vio_priv.h libmysql/viosocket.o.6WmSJk libmysql_r/*.c -libmysql_r/.deps/array.Plo -libmysql_r/.deps/bchange.Plo -libmysql_r/.deps/bcmp.Plo -libmysql_r/.deps/bmove.Plo -libmysql_r/.deps/bmove_upp.Plo -libmysql_r/.deps/charset-def.Plo -libmysql_r/.deps/charset.Plo -libmysql_r/.deps/client.Plo -libmysql_r/.deps/conf_to_src.Po -libmysql_r/.deps/ctype-big5.Plo -libmysql_r/.deps/ctype-bin.Plo -libmysql_r/.deps/ctype-cp932.Plo -libmysql_r/.deps/ctype-czech.Plo -libmysql_r/.deps/ctype-euc_kr.Plo -libmysql_r/.deps/ctype-eucjpms.Plo -libmysql_r/.deps/ctype-extra.Plo -libmysql_r/.deps/ctype-gb2312.Plo -libmysql_r/.deps/ctype-gbk.Plo -libmysql_r/.deps/ctype-latin1.Plo -libmysql_r/.deps/ctype-mb.Plo -libmysql_r/.deps/ctype-simple.Plo -libmysql_r/.deps/ctype-sjis.Plo -libmysql_r/.deps/ctype-tis620.Plo -libmysql_r/.deps/ctype-uca.Plo -libmysql_r/.deps/ctype-ucs2.Plo -libmysql_r/.deps/ctype-ujis.Plo -libmysql_r/.deps/ctype-utf8.Plo -libmysql_r/.deps/ctype-win1250ch.Plo -libmysql_r/.deps/ctype.Plo -libmysql_r/.deps/dbug.Plo -libmysql_r/.deps/default.Plo -libmysql_r/.deps/default_modify.Plo -libmysql_r/.deps/errmsg.Plo -libmysql_r/.deps/errors.Plo -libmysql_r/.deps/get_password.Plo -libmysql_r/.deps/hash.Plo -libmysql_r/.deps/int2str.Plo -libmysql_r/.deps/is_prefix.Plo -libmysql_r/.deps/libmysql.Plo -libmysql_r/.deps/list.Plo -libmysql_r/.deps/llstr.Plo -libmysql_r/.deps/longlong2str.Plo -libmysql_r/.deps/manager.Plo -libmysql_r/.deps/md5.Plo -libmysql_r/.deps/mf_cache.Plo -libmysql_r/.deps/mf_dirname.Plo -libmysql_r/.deps/mf_fn_ext.Plo -libmysql_r/.deps/mf_format.Plo -libmysql_r/.deps/mf_iocache.Plo -libmysql_r/.deps/mf_iocache2.Plo -libmysql_r/.deps/mf_loadpath.Plo -libmysql_r/.deps/mf_pack.Plo -libmysql_r/.deps/mf_path.Plo -libmysql_r/.deps/mf_tempfile.Plo -libmysql_r/.deps/mf_unixpath.Plo -libmysql_r/.deps/mf_wcomp.Plo -libmysql_r/.deps/mulalloc.Plo -libmysql_r/.deps/my_alloc.Plo -libmysql_r/.deps/my_chsize.Plo -libmysql_r/.deps/my_compress.Plo -libmysql_r/.deps/my_create.Plo -libmysql_r/.deps/my_delete.Plo -libmysql_r/.deps/my_div.Plo -libmysql_r/.deps/my_error.Plo -libmysql_r/.deps/my_file.Plo -libmysql_r/.deps/my_fopen.Plo -libmysql_r/.deps/my_fstream.Plo -libmysql_r/.deps/my_gethostbyname.Plo -libmysql_r/.deps/my_getopt.Plo -libmysql_r/.deps/my_getwd.Plo -libmysql_r/.deps/my_init.Plo -libmysql_r/.deps/my_lib.Plo -libmysql_r/.deps/my_malloc.Plo -libmysql_r/.deps/my_messnc.Plo -libmysql_r/.deps/my_net.Plo -libmysql_r/.deps/my_once.Plo -libmysql_r/.deps/my_open.Plo -libmysql_r/.deps/my_port.Plo -libmysql_r/.deps/my_pread.Plo -libmysql_r/.deps/my_pthread.Plo -libmysql_r/.deps/my_read.Plo -libmysql_r/.deps/my_realloc.Plo -libmysql_r/.deps/my_rename.Plo -libmysql_r/.deps/my_seek.Plo -libmysql_r/.deps/my_sleep.Plo -libmysql_r/.deps/my_static.Plo -libmysql_r/.deps/my_strtoll10.Plo -libmysql_r/.deps/my_symlink.Plo -libmysql_r/.deps/my_thr_init.Plo -libmysql_r/.deps/my_time.Plo -libmysql_r/.deps/my_vsnprintf.Plo -libmysql_r/.deps/my_write.Plo -libmysql_r/.deps/net.Plo -libmysql_r/.deps/pack.Plo -libmysql_r/.deps/password.Plo -libmysql_r/.deps/safemalloc.Plo -libmysql_r/.deps/sha1.Plo -libmysql_r/.deps/str2int.Plo -libmysql_r/.deps/str_alloc.Plo -libmysql_r/.deps/strcend.Plo -libmysql_r/.deps/strcont.Plo -libmysql_r/.deps/strend.Plo -libmysql_r/.deps/strfill.Plo -libmysql_r/.deps/string.Plo -libmysql_r/.deps/strinstr.Plo -libmysql_r/.deps/strmake.Plo -libmysql_r/.deps/strmov.Plo -libmysql_r/.deps/strnlen.Plo -libmysql_r/.deps/strnmov.Plo -libmysql_r/.deps/strtod.Plo -libmysql_r/.deps/strtoll.Plo -libmysql_r/.deps/strtoull.Plo -libmysql_r/.deps/strxmov.Plo -libmysql_r/.deps/strxnmov.Plo -libmysql_r/.deps/thr_mutex.Plo -libmysql_r/.deps/typelib.Plo -libmysql_r/.deps/vio.Plo -libmysql_r/.deps/viosocket.Plo -libmysql_r/.deps/viossl.Plo -libmysql_r/.deps/viosslfactories.Plo -libmysql_r/.deps/xml.Plo -libmysql_r/.libs/libmysqlclient_r.lai -libmysql_r/.libs/libmysqlclient_r.so.15 -libmysql_r/.libs/libmysqlclient_r.so.15.0.0 libmysql_r/acconfig.h libmysql_r/client_settings.h libmysql_r/conf_to_src @@ -915,123 +486,6 @@ libmysql_r/mysys_priv.h libmysql_r/vio_priv.h libmysqld/*.ds? libmysqld/*.vcproj -libmysqld/.deps/client.Po -libmysqld/.deps/derror.Po -libmysqld/.deps/discover.Po -libmysqld/.deps/emb_qcache.Po -libmysqld/.deps/errmsg.Po -libmysqld/.deps/event_data_objects.Po -libmysqld/.deps/event_db_repository.Po -libmysqld/.deps/event_queue.Po -libmysqld/.deps/event_scheduler.Po -libmysqld/.deps/events.Po -libmysqld/.deps/field.Po -libmysqld/.deps/field_conv.Po -libmysqld/.deps/filesort.Po -libmysqld/.deps/get_password.Po -libmysqld/.deps/gstream.Po -libmysqld/.deps/ha_berkeley.Po -libmysqld/.deps/ha_federated.Po -libmysqld/.deps/ha_heap.Po -libmysqld/.deps/ha_innodb.Po -libmysqld/.deps/ha_myisam.Po -libmysqld/.deps/ha_myisammrg.Po -libmysqld/.deps/ha_ndbcluster.Po -libmysqld/.deps/ha_ndbcluster_binlog.Po -libmysqld/.deps/ha_partition.Po -libmysqld/.deps/handler.Po -libmysqld/.deps/hash_filo.Po -libmysqld/.deps/hostname.Po -libmysqld/.deps/init.Po -libmysqld/.deps/item.Po -libmysqld/.deps/item_buff.Po -libmysqld/.deps/item_cmpfunc.Po -libmysqld/.deps/item_create.Po -libmysqld/.deps/item_func.Po -libmysqld/.deps/item_geofunc.Po -libmysqld/.deps/item_row.Po -libmysqld/.deps/item_strfunc.Po -libmysqld/.deps/item_subselect.Po -libmysqld/.deps/item_sum.Po -libmysqld/.deps/item_timefunc.Po -libmysqld/.deps/item_uniq.Po -libmysqld/.deps/item_xmlfunc.Po -libmysqld/.deps/key.Po -libmysqld/.deps/lib_sql.Po -libmysqld/.deps/libmysql.Po -libmysqld/.deps/libmysqld.Po -libmysqld/.deps/lock.Po -libmysqld/.deps/log.Po -libmysqld/.deps/log_event.Po -libmysqld/.deps/my_decimal.Po -libmysqld/.deps/my_time.Po -libmysqld/.deps/my_user.Po -libmysqld/.deps/net_serv.Po -libmysqld/.deps/opt_range.Po -libmysqld/.deps/opt_sum.Po -libmysqld/.deps/pack.Po -libmysqld/.deps/parse_file.Po -libmysqld/.deps/partition_info.Po -libmysqld/.deps/password.Po -libmysqld/.deps/procedure.Po -libmysqld/.deps/protocol.Po -libmysqld/.deps/records.Po -libmysqld/.deps/rpl_filter.Po -libmysqld/.deps/rpl_injector.Po -libmysqld/.deps/set_var.Po -libmysqld/.deps/sp.Po -libmysqld/.deps/sp_cache.Po -libmysqld/.deps/sp_head.Po -libmysqld/.deps/sp_pcontext.Po -libmysqld/.deps/sp_rcontext.Po -libmysqld/.deps/spatial.Po -libmysqld/.deps/sql_acl.Po -libmysqld/.deps/sql_analyse.Po -libmysqld/.deps/sql_base.Po -libmysqld/.deps/sql_builtin.Po -libmysqld/.deps/sql_cache.Po -libmysqld/.deps/sql_class.Po -libmysqld/.deps/sql_crypt.Po -libmysqld/.deps/sql_cursor.Po -libmysqld/.deps/sql_db.Po -libmysqld/.deps/sql_delete.Po -libmysqld/.deps/sql_derived.Po -libmysqld/.deps/sql_do.Po -libmysqld/.deps/sql_error.Po -libmysqld/.deps/sql_handler.Po -libmysqld/.deps/sql_help.Po -libmysqld/.deps/sql_insert.Po -libmysqld/.deps/sql_lex.Po -libmysqld/.deps/sql_list.Po -libmysqld/.deps/sql_load.Po -libmysqld/.deps/sql_manager.Po -libmysqld/.deps/sql_map.Po -libmysqld/.deps/sql_parse.Po -libmysqld/.deps/sql_partition.Po -libmysqld/.deps/sql_plugin.Po -libmysqld/.deps/sql_prepare.Po -libmysqld/.deps/sql_rename.Po -libmysqld/.deps/sql_select.Po -libmysqld/.deps/sql_show.Po -libmysqld/.deps/sql_state.Po -libmysqld/.deps/sql_string.Po -libmysqld/.deps/sql_table.Po -libmysqld/.deps/sql_tablespace.Po -libmysqld/.deps/sql_test.Po -libmysqld/.deps/sql_trigger.Po -libmysqld/.deps/sql_udf.Po -libmysqld/.deps/sql_union.Po -libmysqld/.deps/sql_update.Po -libmysqld/.deps/sql_view.Po -libmysqld/.deps/sql_yacc.Po -libmysqld/.deps/stacktrace.Po -libmysqld/.deps/strfunc.Po -libmysqld/.deps/table.Po -libmysqld/.deps/thr_malloc.Po -libmysqld/.deps/time.Po -libmysqld/.deps/tztime.Po -libmysqld/.deps/uniques.Po -libmysqld/.deps/unireg.Po libmysqld/backup_dir libmysqld/client.c libmysqld/client_settings.h @@ -1049,11 +503,6 @@ libmysqld/event_queue.cc libmysqld/event_scheduler.cc libmysqld/event_timed.cc libmysqld/events.cc -libmysqld/examples/.deps/completion_hash.Po -libmysqld/examples/.deps/mysql.Po -libmysqld/examples/.deps/mysql_client_test.Po -libmysqld/examples/.deps/mysqltest.Po -libmysqld/examples/.deps/readline.Po libmysqld/examples/client_test.c libmysqld/examples/client_test.cc libmysqld/examples/completion_hash.cc @@ -1295,7 +744,6 @@ mysql-test/*.vcproj mysql-test/.DS_Store mysql-test/funcs_1.log mysql-test/funcs_1.tar -mysql-test/gmon.out mysql-test/install_test_db mysql-test/lib/init_db.sql mysql-test/mtr @@ -1426,120 +874,6 @@ mysqlserver/*.vcproj mysys/#mf_iocache.c# mysys/*.ds? mysys/*.vcproj -mysys/.deps/array.Po -mysys/.deps/base64.Po -mysys/.deps/charset-def.Po -mysys/.deps/charset.Po -mysys/.deps/checksum.Po -mysys/.deps/default.Po -mysys/.deps/default_modify.Po -mysys/.deps/errors.Po -mysys/.deps/hash.Po -mysys/.deps/list.Po -mysys/.deps/md5.Po -mysys/.deps/mf_brkhant.Po -mysys/.deps/mf_cache.Po -mysys/.deps/mf_dirname.Po -mysys/.deps/mf_fn_ext.Po -mysys/.deps/mf_format.Po -mysys/.deps/mf_getdate.Po -mysys/.deps/mf_iocache.Po -mysys/.deps/mf_iocache2.Po -mysys/.deps/mf_keycache.Po -mysys/.deps/mf_keycaches.Po -mysys/.deps/mf_loadpath.Po -mysys/.deps/mf_pack.Po -mysys/.deps/mf_path.Po -mysys/.deps/mf_qsort.Po -mysys/.deps/mf_qsort2.Po -mysys/.deps/mf_radix.Po -mysys/.deps/mf_same.Po -mysys/.deps/mf_sort.Po -mysys/.deps/mf_strip.Po -mysys/.deps/mf_tempdir.Po -mysys/.deps/mf_tempfile.Po -mysys/.deps/mf_unixpath.Po -mysys/.deps/mf_wcomp.Po -mysys/.deps/mf_wfile.Po -mysys/.deps/mulalloc.Po -mysys/.deps/my_access.Po -mysys/.deps/my_aes.Po -mysys/.deps/my_alarm.Po -mysys/.deps/my_alloc.Po -mysys/.deps/my_append.Po -mysys/.deps/my_atomic.Po -mysys/.deps/my_bit.Po -mysys/.deps/my_bitmap.Po -mysys/.deps/my_chsize.Po -mysys/.deps/my_clock.Po -mysys/.deps/my_compress.Po -mysys/.deps/my_copy.Po -mysys/.deps/my_crc32.Po -mysys/.deps/my_create.Po -mysys/.deps/my_delete.Po -mysys/.deps/my_div.Po -mysys/.deps/my_dup.Po -mysys/.deps/my_error.Po -mysys/.deps/my_file.Po -mysys/.deps/my_fopen.Po -mysys/.deps/my_fstream.Po -mysys/.deps/my_gethostbyname.Po -mysys/.deps/my_gethwaddr.Po -mysys/.deps/my_getncpus.Po -mysys/.deps/my_getopt.Po -mysys/.deps/my_getsystime.Po -mysys/.deps/my_getwd.Po -mysys/.deps/my_handler.Po -mysys/.deps/my_init.Po -mysys/.deps/my_largepage.Po -mysys/.deps/my_lib.Po -mysys/.deps/my_libwrap.Po -mysys/.deps/my_lock.Po -mysys/.deps/my_lockmem.Po -mysys/.deps/my_lread.Po -mysys/.deps/my_lwrite.Po -mysys/.deps/my_malloc.Po -mysys/.deps/my_memmem.Po -mysys/.deps/my_messnc.Po -mysys/.deps/my_mkdir.Po -mysys/.deps/my_mmap.Po -mysys/.deps/my_net.Po -mysys/.deps/my_netware.Po -mysys/.deps/my_new.Po -mysys/.deps/my_once.Po -mysys/.deps/my_open.Po -mysys/.deps/my_port.Po -mysys/.deps/my_pread.Po -mysys/.deps/my_pthread.Po -mysys/.deps/my_quick.Po -mysys/.deps/my_read.Po -mysys/.deps/my_realloc.Po -mysys/.deps/my_redel.Po -mysys/.deps/my_rename.Po -mysys/.deps/my_seek.Po -mysys/.deps/my_semaphore.Po -mysys/.deps/my_sleep.Po -mysys/.deps/my_static.Po -mysys/.deps/my_symlink.Po -mysys/.deps/my_symlink2.Po -mysys/.deps/my_sync.Po -mysys/.deps/my_thr_init.Po -mysys/.deps/my_vle.Po -mysys/.deps/my_windac.Po -mysys/.deps/my_write.Po -mysys/.deps/ptr_cmp.Po -mysys/.deps/queues.Po -mysys/.deps/rijndael.Po -mysys/.deps/safemalloc.Po -mysys/.deps/sha1.Po -mysys/.deps/string.Po -mysys/.deps/thr_alarm.Po -mysys/.deps/thr_lock.Po -mysys/.deps/thr_mutex.Po -mysys/.deps/thr_rwlock.Po -mysys/.deps/tree.Po -mysys/.deps/trie.Po -mysys/.deps/typelib.Po mysys/charset2html mysys/getopt.c mysys/getopt1.c @@ -1682,48 +1016,16 @@ ndb/lib/libNEWTON_BASICTEST_COMMON.so ndb/lib/libREP_API.so ndb/lib/libndbclient.so ndb/lib/libndbclient_extra.so -ndb/src/common/debugger/libtrace.dsp -ndb/src/common/debugger/signaldata/libsignaldataprint.dsp -ndb/src/common/logger/liblogger.dsp -ndb/src/common/mgmcommon/libmgmsrvcommon.dsp ndb/src/common/mgmcommon/printConfig/*.d -ndb/src/common/portlib/libportlib.dsp -ndb/src/common/transporter/libtransporter.dsp -ndb/src/common/util/libgeneral.dsp ndb/src/common/util/testBitmask.cpp ndb/src/cw/cpcd/ndb_cpcd ndb/src/dummy.cpp -ndb/src/kernel/blocks/backup/libbackup.dsp ndb/src/kernel/blocks/backup/restore/ndb_restore -ndb/src/kernel/blocks/cmvmi/libcmvmi.dsp -ndb/src/kernel/blocks/dbacc/libdbacc.dsp -ndb/src/kernel/blocks/dbdict/libdbdict.dsp -ndb/src/kernel/blocks/dbdih/libdbdih.dsp -ndb/src/kernel/blocks/dblqh/libdblqh.dsp -ndb/src/kernel/blocks/dbtc/libdbtc.dsp -ndb/src/kernel/blocks/dbtup/libdbtup.dsp -ndb/src/kernel/blocks/dbtux/libdbtux.dsp -ndb/src/kernel/blocks/dbutil/libdbutil.dsp -ndb/src/kernel/blocks/grep/libgrep.dsp -ndb/src/kernel/blocks/ndbcntr/libndbcntr.dsp -ndb/src/kernel/blocks/ndbfs/libndbfs.dsp -ndb/src/kernel/blocks/qmgr/libqmgr.dsp -ndb/src/kernel/blocks/suma/libsuma.dsp -ndb/src/kernel/blocks/trix/libtrix.dsp -ndb/src/kernel/error/liberror.dsp ndb/src/kernel/ndbd -ndb/src/kernel/ndbd.dsp -ndb/src/kernel/vm/libkernel.dsp ndb/src/libndb.ver -ndb/src/libndbclient.dsp -ndb/src/mgmapi/libmgmapi.dsp -ndb/src/mgmclient/libndbmgmclient.dsp ndb/src/mgmclient/ndb_mgm -ndb/src/mgmclient/ndb_mgm.dsp ndb/src/mgmclient/test_cpcd/*.d ndb/src/mgmsrv/ndb_mgmd -ndb/src/mgmsrv/ndb_mgmd.dsp -ndb/src/ndbapi/libndbapi.dsp ndb/test/ndbapi/bank/bankCreator ndb/test/ndbapi/bank/bankMakeGL ndb/test/ndbapi/bank/bankSumAccounts @@ -1736,15 +1038,12 @@ ndb/test/ndbapi/create_tab ndb/test/ndbapi/drop_all_tabs ndb/test/ndbapi/flexAsynch ndb/test/ndbapi/flexBench -ndb/test/ndbapi/flexBench.dsp ndb/test/ndbapi/flexHammer ndb/test/ndbapi/flexTT ndb/test/ndbapi/testBackup ndb/test/ndbapi/testBasic -ndb/test/ndbapi/testBasic.dsp ndb/test/ndbapi/testBasicAsynch ndb/test/ndbapi/testBlobs -ndb/test/ndbapi/testBlobs.dsp ndb/test/ndbapi/testDataBuffers ndb/test/ndbapi/testDeadlock ndb/test/ndbapi/testDict @@ -1757,7 +1056,6 @@ ndb/test/ndbapi/testOperations ndb/test/ndbapi/testRestartGci ndb/test/ndbapi/testSRBank ndb/test/ndbapi/testScan -ndb/test/ndbapi/testScan.dsp ndb/test/ndbapi/testScanInterpreter ndb/test/ndbapi/testScanPerf ndb/test/ndbapi/testSystemRestart @@ -1765,7 +1063,6 @@ ndb/test/ndbapi/testTimeout ndb/test/ndbapi/testTransactions ndb/test/ndbapi/test_event ndb/test/run-test/atrt -ndb/test/src/libNDBT.dsp ndb/test/tools/copy_tab ndb/test/tools/create_index ndb/test/tools/hugoCalculator @@ -1783,23 +1080,15 @@ ndb/test/tools/restart ndb/test/tools/verify_index ndb/tools/ndb_config ndb/tools/ndb_delete_all -ndb/tools/ndb_delete_all.dsp ndb/tools/ndb_desc -ndb/tools/ndb_desc.dsp ndb/tools/ndb_drop_index -ndb/tools/ndb_drop_index.dsp ndb/tools/ndb_drop_table -ndb/tools/ndb_drop_table.dsp ndb/tools/ndb_restore ndb/tools/ndb_select_all -ndb/tools/ndb_select_all.dsp ndb/tools/ndb_select_count -ndb/tools/ndb_select_count.dsp ndb/tools/ndb_show_tables -ndb/tools/ndb_show_tables.dsp ndb/tools/ndb_test_platform ndb/tools/ndb_waiter -ndb/tools/ndb_waiter.dsp ndbcluster-1186 ndbcluster-1186/SCCS ndbcluster-1186/config.ini @@ -1813,40 +1102,15 @@ ndbcluster-1186/ndb_3.pid ndbcluster-1186/ndb_3_cluster.log ndbcluster-1186/ndb_3_out.log ndbcluster-1186/ndbcluster.pid -netware/.deps/libmysqlmain.Po -netware/.deps/my_manage.Po -netware/.deps/mysql_install_db.Po -netware/.deps/mysql_test_run.Po -netware/.deps/mysqld_safe.Po netware/init_db.sql netware/libmysql.imp netware/test_db.sql pack_isam/*.ds? perror/*.ds? perror/*.vcproj -plugin/fulltext/.deps/mypluglib_la-plugin_example.Plo -plugin/fulltext/.libs/mypluglib.lai -plugin/fulltext/.libs/mypluglib.so.0 -plugin/fulltext/.libs/mypluglib.so.0.0.0 -pstack/.deps/bucomm.Po -pstack/.deps/debug.Po -pstack/.deps/filemode.Po -pstack/.deps/ieee.Po -pstack/.deps/linuxthreads.Po -pstack/.deps/pstack.Po -pstack/.deps/rddbg.Po -pstack/.deps/stabs.Po pull.log regex/*.ds? regex/*.vcproj -regex/.deps/debug.Po -regex/.deps/main.Po -regex/.deps/regcomp.Po -regex/.deps/regerror.Po -regex/.deps/regexec.Po -regex/.deps/regfree.Po -regex/.deps/reginit.Po -regex/.deps/split.Po regex/re repl-tests/test-repl-ts/repl-timestamp.master.reject repl-tests/test-repl/foo-dump-slave.master. @@ -1891,28 +1155,6 @@ scripts/mysqlhotcopy scripts/mysqlhotcopy.sh.rej scripts/safe_mysqld select_test -server-tools/instance-manager/.deps/buffer.Po -server-tools/instance-manager/.deps/command.Po -server-tools/instance-manager/.deps/commands.Po -server-tools/instance-manager/.deps/guardian.Po -server-tools/instance-manager/.deps/instance.Po -server-tools/instance-manager/.deps/instance_map.Po -server-tools/instance-manager/.deps/instance_options.Po -server-tools/instance-manager/.deps/liboptions_la-options.Plo -server-tools/instance-manager/.deps/liboptions_la-priv.Plo -server-tools/instance-manager/.deps/listener.Po -server-tools/instance-manager/.deps/log.Po -server-tools/instance-manager/.deps/manager.Po -server-tools/instance-manager/.deps/messages.Po -server-tools/instance-manager/.deps/mysql_connection.Po -server-tools/instance-manager/.deps/mysqlmanager.Po -server-tools/instance-manager/.deps/net_serv.Po -server-tools/instance-manager/.deps/parse.Po -server-tools/instance-manager/.deps/parse_output.Po -server-tools/instance-manager/.deps/protocol.Po -server-tools/instance-manager/.deps/thread_registry.Po -server-tools/instance-manager/.deps/user_management_commands.Po -server-tools/instance-manager/.deps/user_map.Po server-tools/instance-manager/buffer.cpp server-tools/instance-manager/client.c server-tools/instance-manager/client_settings.h @@ -1970,140 +1212,10 @@ sql-bench/test-wisconsin sql/*.cpp sql/*.ds? sql/*.vcproj -sql/.deps/client.Po -sql/.deps/derror.Po -sql/.deps/des_key_file.Po -sql/.deps/discover.Po -sql/.deps/event_data_objects.Po -sql/.deps/event_db_repository.Po -sql/.deps/event_queue.Po -sql/.deps/event_scheduler.Po -sql/.deps/events.Po -sql/.deps/field.Po -sql/.deps/field_conv.Po -sql/.deps/filesort.Po -sql/.deps/gen_lex_hash.Po -sql/.deps/gstream.Po -sql/.deps/ha_berkeley.Po -sql/.deps/ha_federated.Po -sql/.deps/ha_heap.Po -sql/.deps/ha_innodb.Po -sql/.deps/ha_myisam.Po -sql/.deps/ha_myisammrg.Po -sql/.deps/ha_ndbcluster.Po -sql/.deps/ha_ndbcluster_binlog.Po -sql/.deps/ha_partition.Po -sql/.deps/handler.Po -sql/.deps/hash_filo.Po -sql/.deps/hostname.Po -sql/.deps/init.Po -sql/.deps/item.Po -sql/.deps/item_buff.Po -sql/.deps/item_cmpfunc.Po -sql/.deps/item_create.Po -sql/.deps/item_func.Po -sql/.deps/item_geofunc.Po -sql/.deps/item_row.Po -sql/.deps/item_strfunc.Po -sql/.deps/item_subselect.Po -sql/.deps/item_sum.Po -sql/.deps/item_timefunc.Po -sql/.deps/item_uniq.Po -sql/.deps/item_xmlfunc.Po -sql/.deps/key.Po -sql/.deps/lock.Po -sql/.deps/log.Po -sql/.deps/log_event.Po -sql/.deps/mf_iocache.Po -sql/.deps/mini_client_errors.Po -sql/.deps/my_decimal.Po -sql/.deps/my_lock.Po -sql/.deps/my_time.Po -sql/.deps/my_user.Po -sql/.deps/mysql_tzinfo_to_sql.Po -sql/.deps/mysqld.Po -sql/.deps/net_serv.Po -sql/.deps/opt_range.Po -sql/.deps/opt_sum.Po -sql/.deps/pack.Po -sql/.deps/parse_file.Po -sql/.deps/partition_info.Po -sql/.deps/password.Po -sql/.deps/procedure.Po -sql/.deps/protocol.Po -sql/.deps/records.Po -sql/.deps/repl_failsafe.Po -sql/.deps/rpl_filter.Po -sql/.deps/rpl_injector.Po -sql/.deps/rpl_tblmap.Po -sql/.deps/set_var.Po -sql/.deps/slave.Po -sql/.deps/sp.Po -sql/.deps/sp_cache.Po -sql/.deps/sp_head.Po -sql/.deps/sp_pcontext.Po -sql/.deps/sp_rcontext.Po -sql/.deps/spatial.Po -sql/.deps/sql_acl.Po -sql/.deps/sql_analyse.Po -sql/.deps/sql_base.Po -sql/.deps/sql_binlog.Po -sql/.deps/sql_builtin.Po -sql/.deps/sql_cache.Po -sql/.deps/sql_class.Po -sql/.deps/sql_client.Po -sql/.deps/sql_crypt.Po -sql/.deps/sql_cursor.Po -sql/.deps/sql_db.Po -sql/.deps/sql_delete.Po -sql/.deps/sql_derived.Po -sql/.deps/sql_do.Po -sql/.deps/sql_error.Po -sql/.deps/sql_handler.Po -sql/.deps/sql_help.Po -sql/.deps/sql_insert.Po -sql/.deps/sql_lex.Po -sql/.deps/sql_list.Po -sql/.deps/sql_load.Po -sql/.deps/sql_manager.Po -sql/.deps/sql_map.Po -sql/.deps/sql_olap.Po -sql/.deps/sql_parse.Po -sql/.deps/sql_partition.Po -sql/.deps/sql_plugin.Po -sql/.deps/sql_prepare.Po -sql/.deps/sql_rename.Po -sql/.deps/sql_repl.Po -sql/.deps/sql_select.Po -sql/.deps/sql_show.Po -sql/.deps/sql_state.Po -sql/.deps/sql_string.Po -sql/.deps/sql_table.Po -sql/.deps/sql_tablespace.Po -sql/.deps/sql_test.Po -sql/.deps/sql_trigger.Po -sql/.deps/sql_udf.Po -sql/.deps/sql_union.Po -sql/.deps/sql_update.Po -sql/.deps/sql_view.Po -sql/.deps/sql_yacc.Po -sql/.deps/stacktrace.Po -sql/.deps/strfunc.Po -sql/.deps/table.Po -sql/.deps/thr_malloc.Po -sql/.deps/time.Po -sql/.deps/tztime.Po -sql/.deps/udf_example.Plo -sql/.deps/uniques.Po -sql/.deps/unireg.Po sql/.gdbinit -sql/.libs/udf_example.lai -sql/.libs/udf_example.so.0 -sql/.libs/udf_example.so.0.0.0 sql/client.c sql/f.c sql/gen_lex_hash -sql/gmon.out sql/handlerton.cc sql/lex_hash.h sql/link_sources @@ -2126,13 +1238,33 @@ sql/new.cc sql/pack.c sql/safe_to_cache_query.txt sql/share/*.sys -sql/share/charsets/gmon.out sql/share/fixerrmsg.pl -sql/share/gmon.out sql/share/iso639-2.txt sql/share/mysql -sql/share/norwegian-ny/errmsg.sys -sql/share/norwegian/errmsg.sys +sql/share/czech/ +sql/share/danish/ +sql/share/dutch/ +sql/share/english/ +sql/share/estonian/ +sql/share/french/ +sql/share/german/ +sql/share/greek/ +sql/share/hungarian/ +sql/share/italian/ +sql/share/japanese/ +sql/share/japanese-sjis/ +sql/share/korean/ +sql/share/norwegian/ +sql/share/norwegian-ny/ +sql/share/polish/ +sql/share/portuguese/ +sql/share/romanian/ +sql/share/russian/ +sql/share/serbian/ +sql/share/slovak/ +sql/share/spanish/ +sql/share/swedish/ +sql/share/ukrainian/ sql/sql_builtin.cc sql/sql_select.cc.orig sql/sql_yacc.cc @@ -2152,12 +1284,6 @@ stamp-h2.in stamp-h3 stamp-h4 start_mysqld.sh -storage/archive/.deps/archive_test-archive_test.Po -storage/archive/.deps/archive_test-azio.Po -storage/archive/.deps/ha_archive_la-azio.Plo -storage/archive/.deps/ha_archive_la-ha_archive.Plo -storage/archive/.deps/libarchive_a-azio.Po -storage/archive/.deps/libarchive_a-ha_archive.Po storage/archive/archive_reader storage/archive/archive_test storage/bdb/*.ds? @@ -2179,44 +1305,14 @@ storage/bdb/build_vxworks/db_int.h storage/bdb/build_vxworks/dbdemo/dbdemo.c storage/bdb/build_vxworks/dbdemo/dbdemo20.wpj storage/bdb/build_vxworks/dbdemo/dbdemo22.wpj -storage/bdb/build_win32/*.dsp storage/bdb/build_win32/*.h storage/bdb/build_win32/db.h -storage/bdb/build_win32/db_archive.dsp -storage/bdb/build_win32/db_checkpoint.dsp storage/bdb/build_win32/db_config.h storage/bdb/build_win32/db_cxx.h -storage/bdb/build_win32/db_deadlock.dsp -storage/bdb/build_win32/db_dll.dsp -storage/bdb/build_win32/db_dump.dsp storage/bdb/build_win32/db_int.h -storage/bdb/build_win32/db_java.dsp -storage/bdb/build_win32/db_load.dsp -storage/bdb/build_win32/db_perf.dsp -storage/bdb/build_win32/db_printlog.dsp -storage/bdb/build_win32/db_recover.dsp -storage/bdb/build_win32/db_stat.dsp -storage/bdb/build_win32/db_static.dsp -storage/bdb/build_win32/db_tcl.dsp -storage/bdb/build_win32/db_test.dsp -storage/bdb/build_win32/db_upgrade.dsp -storage/bdb/build_win32/db_verify.dsp -storage/bdb/build_win32/ex_access.dsp -storage/bdb/build_win32/ex_btrec.dsp -storage/bdb/build_win32/ex_env.dsp -storage/bdb/build_win32/ex_lock.dsp -storage/bdb/build_win32/ex_mpool.dsp -storage/bdb/build_win32/ex_tpcb.dsp -storage/bdb/build_win32/excxx_access.dsp -storage/bdb/build_win32/excxx_btrec.dsp -storage/bdb/build_win32/excxx_env.dsp -storage/bdb/build_win32/excxx_lock.dsp -storage/bdb/build_win32/excxx_mpool.dsp -storage/bdb/build_win32/excxx_tpcb.dsp storage/bdb/build_win32/include.tcl storage/bdb/build_win32/libdb.def storage/bdb/build_win32/libdb.rc -storage/bdb/build_win64/*.dsp storage/bdb/build_win64/*.dsw storage/bdb/build_win64/*.h storage/bdb/db/crdel_auto.c @@ -2318,38 +1414,6 @@ storage/bdb/test/include.tcl storage/bdb/test/logtrack.list storage/bdb/txn/txn_auto.c storage/bdb/txn/txn_autop.c -storage/blackhole/.deps/ha_blackhole_la-ha_blackhole.Plo -storage/blackhole/.deps/libblackhole_a-ha_blackhole.Po -storage/csv/.deps/ha_csv_la-ha_tina.Plo -storage/csv/.deps/libcsv_a-ha_tina.Po -storage/example/.deps/ha_example_la-ha_example.Plo -storage/example/.deps/libexample_a-ha_example.Po -storage/heap/.deps/_check.Po -storage/heap/.deps/_rectest.Po -storage/heap/.deps/hp_block.Po -storage/heap/.deps/hp_clear.Po -storage/heap/.deps/hp_close.Po -storage/heap/.deps/hp_create.Po -storage/heap/.deps/hp_delete.Po -storage/heap/.deps/hp_extra.Po -storage/heap/.deps/hp_hash.Po -storage/heap/.deps/hp_info.Po -storage/heap/.deps/hp_open.Po -storage/heap/.deps/hp_panic.Po -storage/heap/.deps/hp_rename.Po -storage/heap/.deps/hp_rfirst.Po -storage/heap/.deps/hp_rkey.Po -storage/heap/.deps/hp_rlast.Po -storage/heap/.deps/hp_rnext.Po -storage/heap/.deps/hp_rprev.Po -storage/heap/.deps/hp_rrnd.Po -storage/heap/.deps/hp_rsame.Po -storage/heap/.deps/hp_scan.Po -storage/heap/.deps/hp_static.Po -storage/heap/.deps/hp_test1.Po -storage/heap/.deps/hp_test2.Po -storage/heap/.deps/hp_update.Po -storage/heap/.deps/hp_write.Po storage/heap/hp_test1 storage/heap/hp_test2 storage/innobase/autom4te-2.53.cache/* @@ -2360,94 +1424,13 @@ storage/innobase/autom4te.cache/* storage/innobase/autom4te.cache/output.0 storage/innobase/autom4te.cache/requests storage/innobase/autom4te.cache/traces.0 -storage/innobase/btr/.deps/btr0btr.Po -storage/innobase/btr/.deps/btr0cur.Po -storage/innobase/btr/.deps/btr0pcur.Po -storage/innobase/btr/.deps/btr0sea.Po -storage/innobase/buf/.deps/buf0buf.Po -storage/innobase/buf/.deps/buf0flu.Po -storage/innobase/buf/.deps/buf0lru.Po -storage/innobase/buf/.deps/buf0rea.Po storage/innobase/configure.lineno storage/innobase/conftest.s1 storage/innobase/conftest.subs -storage/innobase/data/.deps/data0data.Po -storage/innobase/data/.deps/data0type.Po -storage/innobase/dict/.deps/dict0boot.Po -storage/innobase/dict/.deps/dict0crea.Po -storage/innobase/dict/.deps/dict0dict.Po -storage/innobase/dict/.deps/dict0load.Po -storage/innobase/dict/.deps/dict0mem.Po -storage/innobase/dyn/.deps/dyn0dyn.Po -storage/innobase/eval/.deps/eval0eval.Po -storage/innobase/eval/.deps/eval0proc.Po -storage/innobase/fil/.deps/fil0fil.Po -storage/innobase/fsp/.deps/fsp0fsp.Po -storage/innobase/fut/.deps/fut0fut.Po -storage/innobase/fut/.deps/fut0lst.Po -storage/innobase/ha/.deps/ha0ha.Po -storage/innobase/ha/.deps/hash0hash.Po storage/innobase/ib_config.h storage/innobase/ib_config.h.in -storage/innobase/ibuf/.deps/ibuf0ibuf.Po -storage/innobase/lock/.deps/lock0lock.Po -storage/innobase/log/.deps/log0log.Po -storage/innobase/log/.deps/log0recv.Po -storage/innobase/mach/.deps/mach0data.Po -storage/innobase/mem/.deps/mem0mem.Po -storage/innobase/mem/.deps/mem0pool.Po storage/innobase/mkinstalldirs -storage/innobase/mtr/.deps/mtr0log.Po -storage/innobase/mtr/.deps/mtr0mtr.Po -storage/innobase/os/.deps/os0file.Po -storage/innobase/os/.deps/os0proc.Po -storage/innobase/os/.deps/os0sync.Po -storage/innobase/os/.deps/os0thread.Po -storage/innobase/page/.deps/page0cur.Po -storage/innobase/page/.deps/page0page.Po -storage/innobase/pars/.deps/lexyy.Po -storage/innobase/pars/.deps/pars0grm.Po -storage/innobase/pars/.deps/pars0opt.Po -storage/innobase/pars/.deps/pars0pars.Po -storage/innobase/pars/.deps/pars0sym.Po -storage/innobase/que/.deps/que0que.Po -storage/innobase/read/.deps/read0read.Po -storage/innobase/rem/.deps/rem0cmp.Po -storage/innobase/rem/.deps/rem0rec.Po -storage/innobase/row/.deps/row0ins.Po -storage/innobase/row/.deps/row0mysql.Po -storage/innobase/row/.deps/row0purge.Po -storage/innobase/row/.deps/row0row.Po -storage/innobase/row/.deps/row0sel.Po -storage/innobase/row/.deps/row0uins.Po -storage/innobase/row/.deps/row0umod.Po -storage/innobase/row/.deps/row0undo.Po -storage/innobase/row/.deps/row0upd.Po -storage/innobase/row/.deps/row0vers.Po -storage/innobase/srv/.deps/srv0que.Po -storage/innobase/srv/.deps/srv0srv.Po -storage/innobase/srv/.deps/srv0start.Po storage/innobase/stamp-h1 -storage/innobase/sync/.deps/sync0arr.Po -storage/innobase/sync/.deps/sync0rw.Po -storage/innobase/sync/.deps/sync0sync.Po -storage/innobase/thr/.deps/thr0loc.Po -storage/innobase/trx/.deps/trx0purge.Po -storage/innobase/trx/.deps/trx0rec.Po -storage/innobase/trx/.deps/trx0roll.Po -storage/innobase/trx/.deps/trx0rseg.Po -storage/innobase/trx/.deps/trx0sys.Po -storage/innobase/trx/.deps/trx0trx.Po -storage/innobase/trx/.deps/trx0undo.Po -storage/innobase/usr/.deps/usr0sess.Po -storage/innobase/ut/.deps/ut0byte.Po -storage/innobase/ut/.deps/ut0dbg.Po -storage/innobase/ut/.deps/ut0list.Po -storage/innobase/ut/.deps/ut0mem.Po -storage/innobase/ut/.deps/ut0rnd.Po -storage/innobase/ut/.deps/ut0ut.Po -storage/innobase/ut/.deps/ut0vec.Po -storage/innobase/ut/.deps/ut0wqueue.Po storage/maria/*.MAD storage/maria/*.MAI storage/maria/ma_rt_test @@ -2489,67 +1472,6 @@ storage/maria/unittest/mf_pagecache_single_64k-t-big storage/maria/unittest/page_cache_test_file_1 storage/maria/unittest/pagecache_debug.log storage/maria/unittest/tmp/* -storage/myisam/.deps/ft_boolean_search.Po -storage/myisam/.deps/ft_nlq_search.Po -storage/myisam/.deps/ft_parser.Po -storage/myisam/.deps/ft_static.Po -storage/myisam/.deps/ft_stopwords.Po -storage/myisam/.deps/ft_update.Po -storage/myisam/.deps/mi_cache.Po -storage/myisam/.deps/mi_changed.Po -storage/myisam/.deps/mi_check.Po -storage/myisam/.deps/mi_checksum.Po -storage/myisam/.deps/mi_close.Po -storage/myisam/.deps/mi_create.Po -storage/myisam/.deps/mi_dbug.Po -storage/myisam/.deps/mi_delete.Po -storage/myisam/.deps/mi_delete_all.Po -storage/myisam/.deps/mi_delete_table.Po -storage/myisam/.deps/mi_dynrec.Po -storage/myisam/.deps/mi_extra.Po -storage/myisam/.deps/mi_info.Po -storage/myisam/.deps/mi_key.Po -storage/myisam/.deps/mi_keycache.Po -storage/myisam/.deps/mi_locking.Po -storage/myisam/.deps/mi_log.Po -storage/myisam/.deps/mi_open.Po -storage/myisam/.deps/mi_packrec.Po -storage/myisam/.deps/mi_page.Po -storage/myisam/.deps/mi_panic.Po -storage/myisam/.deps/mi_preload.Po -storage/myisam/.deps/mi_range.Po -storage/myisam/.deps/mi_rename.Po -storage/myisam/.deps/mi_rfirst.Po -storage/myisam/.deps/mi_rkey.Po -storage/myisam/.deps/mi_rlast.Po -storage/myisam/.deps/mi_rnext.Po -storage/myisam/.deps/mi_rnext_same.Po -storage/myisam/.deps/mi_rprev.Po -storage/myisam/.deps/mi_rrnd.Po -storage/myisam/.deps/mi_rsame.Po -storage/myisam/.deps/mi_rsamepos.Po -storage/myisam/.deps/mi_scan.Po -storage/myisam/.deps/mi_search.Po -storage/myisam/.deps/mi_static.Po -storage/myisam/.deps/mi_statrec.Po -storage/myisam/.deps/mi_test1.Po -storage/myisam/.deps/mi_test2.Po -storage/myisam/.deps/mi_test3.Po -storage/myisam/.deps/mi_unique.Po -storage/myisam/.deps/mi_update.Po -storage/myisam/.deps/mi_write.Po -storage/myisam/.deps/myisam_ftdump.Po -storage/myisam/.deps/myisamchk.Po -storage/myisam/.deps/myisamlog.Po -storage/myisam/.deps/myisampack.Po -storage/myisam/.deps/rt_index.Po -storage/myisam/.deps/rt_key.Po -storage/myisam/.deps/rt_mbr.Po -storage/myisam/.deps/rt_split.Po -storage/myisam/.deps/rt_test.Po -storage/myisam/.deps/sort.Po -storage/myisam/.deps/sp_key.Po -storage/myisam/.deps/sp_test.Po storage/myisam/FT1.MYD storage/myisam/FT1.MYI storage/myisam/ft_dump @@ -2575,27 +1497,6 @@ storage/myisam/test1.MYD storage/myisam/test1.MYI storage/myisam/test2.MYD storage/myisam/test2.MYI -storage/myisammrg/.deps/myrg_close.Po -storage/myisammrg/.deps/myrg_create.Po -storage/myisammrg/.deps/myrg_delete.Po -storage/myisammrg/.deps/myrg_extra.Po -storage/myisammrg/.deps/myrg_info.Po -storage/myisammrg/.deps/myrg_locking.Po -storage/myisammrg/.deps/myrg_open.Po -storage/myisammrg/.deps/myrg_panic.Po -storage/myisammrg/.deps/myrg_queue.Po -storage/myisammrg/.deps/myrg_range.Po -storage/myisammrg/.deps/myrg_rfirst.Po -storage/myisammrg/.deps/myrg_rkey.Po -storage/myisammrg/.deps/myrg_rlast.Po -storage/myisammrg/.deps/myrg_rnext.Po -storage/myisammrg/.deps/myrg_rnext_same.Po -storage/myisammrg/.deps/myrg_rprev.Po -storage/myisammrg/.deps/myrg_rrnd.Po -storage/myisammrg/.deps/myrg_rsame.Po -storage/myisammrg/.deps/myrg_static.Po -storage/myisammrg/.deps/myrg_update.Po -storage/myisammrg/.deps/myrg_write.Po storage/ndb/bin/DbAsyncGenerator storage/ndb/bin/DbCreate storage/ndb/bin/acid @@ -2731,53 +1632,21 @@ storage/ndb/ndbapi-examples/ndbapi_scan/ndbapi_scan storage/ndb/ndbapi-examples/ndbapi_simple/ndbapi_simple storage/ndb/ndbapi-examples/ndbapi_simple_dual/ndbapi_simple_dual storage/ndb/ndbapi-examples/ndbapi_simple_index/ndbapi_simple_index -storage/ndb/src/common/debugger/libtrace.dsp -storage/ndb/src/common/debugger/signaldata/libsignaldataprint.dsp -storage/ndb/src/common/logger/liblogger.dsp -storage/ndb/src/common/mgmcommon/libmgmsrvcommon.dsp storage/ndb/src/common/mgmcommon/printConfig/*.d -storage/ndb/src/common/portlib/libportlib.dsp -storage/ndb/src/common/transporter/libtransporter.dsp -storage/ndb/src/common/util/libgeneral.dsp storage/ndb/src/common/util/testBitmask.cpp storage/ndb/src/cw/cpcd/ndb_cpcd storage/ndb/src/dummy.cpp -storage/ndb/src/kernel/blocks/backup/libbackup.dsp storage/ndb/src/kernel/blocks/backup/ndb_print_backup_file storage/ndb/src/kernel/blocks/backup/restore/ndb_restore -storage/ndb/src/kernel/blocks/cmvmi/libcmvmi.dsp -storage/ndb/src/kernel/blocks/dbacc/libdbacc.dsp -storage/ndb/src/kernel/blocks/dbdict/libdbdict.dsp storage/ndb/src/kernel/blocks/dbdict/ndb_print_schema_file -storage/ndb/src/kernel/blocks/dbdih/libdbdih.dsp storage/ndb/src/kernel/blocks/dbdih/ndb_print_sys_file -storage/ndb/src/kernel/blocks/dblqh/libdblqh.dsp -storage/ndb/src/kernel/blocks/dbtc/libdbtc.dsp -storage/ndb/src/kernel/blocks/dbtup/libdbtup.dsp storage/ndb/src/kernel/blocks/dbtup/test_varpage -storage/ndb/src/kernel/blocks/dbtux/libdbtux.dsp -storage/ndb/src/kernel/blocks/dbutil/libdbutil.dsp -storage/ndb/src/kernel/blocks/grep/libgrep.dsp storage/ndb/src/kernel/blocks/ndb_print_file -storage/ndb/src/kernel/blocks/ndbcntr/libndbcntr.dsp -storage/ndb/src/kernel/blocks/ndbfs/libndbfs.dsp -storage/ndb/src/kernel/blocks/qmgr/libqmgr.dsp -storage/ndb/src/kernel/blocks/suma/libsuma.dsp -storage/ndb/src/kernel/blocks/trix/libtrix.dsp -storage/ndb/src/kernel/error/liberror.dsp storage/ndb/src/kernel/ndbd -storage/ndb/src/kernel/ndbd.dsp -storage/ndb/src/kernel/vm/libkernel.dsp storage/ndb/src/libndb.ver -storage/ndb/src/libndbclient.dsp -storage/ndb/src/mgmapi/libmgmapi.dsp -storage/ndb/src/mgmclient/libndbmgmclient.dsp storage/ndb/src/mgmclient/ndb_mgm -storage/ndb/src/mgmclient/ndb_mgm.dsp storage/ndb/src/mgmclient/test_cpcd/*.d storage/ndb/src/mgmsrv/ndb_mgmd -storage/ndb/src/mgmsrv/ndb_mgmd.dsp -storage/ndb/src/ndbapi/libndbapi.dsp storage/ndb/src/ndbapi/ndberror_check storage/ndb/test/ndbapi/DbAsyncGenerator storage/ndb/test/ndbapi/DbCreate @@ -2793,17 +1662,14 @@ storage/ndb/test/ndbapi/create_tab storage/ndb/test/ndbapi/drop_all_tabs storage/ndb/test/ndbapi/flexAsynch storage/ndb/test/ndbapi/flexBench -storage/ndb/test/ndbapi/flexBench.dsp storage/ndb/test/ndbapi/flexHammer storage/ndb/test/ndbapi/flexTT storage/ndb/test/ndbapi/ndbapi_slow_select storage/ndb/test/ndbapi/testBackup storage/ndb/test/ndbapi/testBasic -storage/ndb/test/ndbapi/testBasic.dsp storage/ndb/test/ndbapi/testBasicAsynch storage/ndb/test/ndbapi/testBitfield storage/ndb/test/ndbapi/testBlobs -storage/ndb/test/ndbapi/testBlobs.dsp storage/ndb/test/ndbapi/testDataBuffers storage/ndb/test/ndbapi/testDeadlock storage/ndb/test/ndbapi/testDict @@ -2821,7 +1687,6 @@ storage/ndb/test/ndbapi/testReadPerf storage/ndb/test/ndbapi/testRestartGci storage/ndb/test/ndbapi/testSRBank storage/ndb/test/ndbapi/testScan -storage/ndb/test/ndbapi/testScan.dsp storage/ndb/test/ndbapi/testScanInterpreter storage/ndb/test/ndbapi/testScanPerf storage/ndb/test/ndbapi/testSystemRestart @@ -2830,7 +1695,6 @@ storage/ndb/test/ndbapi/testTransactions storage/ndb/test/ndbapi/test_event storage/ndb/test/ndbapi/test_event_merge storage/ndb/test/run-test/atrt -storage/ndb/test/src/libNDBT.dsp storage/ndb/test/tools/copy_tab storage/ndb/test/tools/create_index storage/ndb/test/tools/hugoCalculator @@ -2850,83 +1714,17 @@ storage/ndb/test/tools/restart storage/ndb/test/tools/verify_index storage/ndb/tools/ndb_config storage/ndb/tools/ndb_delete_all -storage/ndb/tools/ndb_delete_all.dsp storage/ndb/tools/ndb_desc -storage/ndb/tools/ndb_desc.dsp storage/ndb/tools/ndb_drop_index -storage/ndb/tools/ndb_drop_index.dsp storage/ndb/tools/ndb_drop_table -storage/ndb/tools/ndb_drop_table.dsp storage/ndb/tools/ndb_restore storage/ndb/tools/ndb_select_all -storage/ndb/tools/ndb_select_all.dsp storage/ndb/tools/ndb_select_count -storage/ndb/tools/ndb_select_count.dsp storage/ndb/tools/ndb_show_tables -storage/ndb/tools/ndb_show_tables.dsp storage/ndb/tools/ndb_test_platform storage/ndb/tools/ndb_waiter -storage/ndb/tools/ndb_waiter.dsp strings/*.ds? strings/*.vcproj -strings/.deps/bchange.Po -strings/.deps/bcmp.Po -strings/.deps/bfill.Po -strings/.deps/bmove.Po -strings/.deps/bmove512.Po -strings/.deps/bmove_upp.Po -strings/.deps/conf_to_src.Po -strings/.deps/ctype-big5.Po -strings/.deps/ctype-bin.Po -strings/.deps/ctype-cp932.Po -strings/.deps/ctype-czech.Po -strings/.deps/ctype-euc_kr.Po -strings/.deps/ctype-eucjpms.Po -strings/.deps/ctype-extra.Po -strings/.deps/ctype-gb2312.Po -strings/.deps/ctype-gbk.Po -strings/.deps/ctype-latin1.Po -strings/.deps/ctype-mb.Po -strings/.deps/ctype-simple.Po -strings/.deps/ctype-sjis.Po -strings/.deps/ctype-tis620.Po -strings/.deps/ctype-uca.Po -strings/.deps/ctype-ucs2.Po -strings/.deps/ctype-ujis.Po -strings/.deps/ctype-utf8.Po -strings/.deps/ctype-win1250ch.Po -strings/.deps/ctype.Po -strings/.deps/decimal.Po -strings/.deps/int2str.Po -strings/.deps/is_prefix.Po -strings/.deps/llstr.Po -strings/.deps/longlong2str.Po -strings/.deps/longlong2str_asm.Po -strings/.deps/my_strchr.Po -strings/.deps/my_strtoll10.Po -strings/.deps/my_vsnprintf.Po -strings/.deps/r_strinstr.Po -strings/.deps/str2int.Po -strings/.deps/str_alloc.Po -strings/.deps/strappend.Po -strings/.deps/strcend.Po -strings/.deps/strcont.Po -strings/.deps/strend.Po -strings/.deps/strfill.Po -strings/.deps/strinstr.Po -strings/.deps/strmake.Po -strings/.deps/strmov.Po -strings/.deps/strnlen.Po -strings/.deps/strnmov.Po -strings/.deps/strstr.Po -strings/.deps/strtod.Po -strings/.deps/strtol.Po -strings/.deps/strtoll.Po -strings/.deps/strtoul.Po -strings/.deps/strtoull.Po -strings/.deps/strxmov.Po -strings/.deps/strxnmov.Po -strings/.deps/xml.Po strings/conf_to_src strings/ctype_autoconf.c strings/ctype_extra_sources.c @@ -3014,14 +1812,7 @@ test?.MA? test_xml tests/*.ds? tests/*.vcproj -tests/.deps/dummy.Po -tests/.deps/insert_test.Po -tests/.deps/mysql_client_test.Po -tests/.deps/select_test.Po -tests/.deps/thread_test.Po tests/.libs -prune -tests/.libs/lt-mysql_client_test -tests/.libs/mysql_client_test tests/bug25714 tests/client_test tests/connect_test @@ -3037,16 +1828,8 @@ tools/mysqlmngd tools/mysqltestmanager tools/mysys_priv.h unittest/examples/*.t -unittest/examples/.deps/no_plan-t.Po -unittest/examples/.deps/simple-t.Po -unittest/examples/.deps/skip-t.Po -unittest/examples/.deps/skip_all-t.Po -unittest/examples/.deps/todo-t.Po unittest/maria_control unittest/mysys/*.t -unittest/mysys/.deps/base64-t.Po -unittest/mysys/.deps/bitmap-t.Po -unittest/mysys/.deps/my_atomic-t.Po unittest/mysys/mf_pagecache_consist_1k-t-big unittest/mysys/mf_pagecache_consist_1kHC-t-big unittest/mysys/mf_pagecache_consist_1kRD-t-big @@ -3056,9 +1839,7 @@ unittest/mysys/mf_pagecache_consist_64kHC-t-big unittest/mysys/mf_pagecache_consist_64kRD-t-big unittest/mysys/mf_pagecache_consist_64kWR-t-big unittest/mysys/mf_pagecache_single_64k-t-big -unittest/mytap/.deps/tap.Po unittest/mytap/t/*.t -unittest/mytap/t/.deps/basic-t.Po unittest/page_cache_test_file_1 unittest/pagecache_debug.log unittest/tmp/* @@ -3066,14 +1847,6 @@ unittest/unit vi.h vio/*.ds? vio/*.vcproj -vio/.deps/dummy.Po -vio/.deps/test-ssl.Po -vio/.deps/test-sslclient.Po -vio/.deps/test-sslserver.Po -vio/.deps/vio.Po -vio/.deps/viosocket.Po -vio/.deps/viossl.Po -vio/.deps/viosslfactories.Po vio/test-ssl vio/test-sslclient vio/test-sslserver -- cgit v1.2.1 From 52cb0c24a6a6674ee17c4bb86fa02527043ed90f Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Thu, 26 Jun 2008 08:18:28 +0300 Subject: Added versioning of Maria index Store max_trid in index file as state.create_trid. This is used to pack all transids in the index pages relative to max possible transid for file. Enable versioning for transactional tables with index. Tables with an auto-increment key, rtree or fulltext keys are not versioned. Changed info->lastkey to type MARIA_KEY. Removed info->lastkey_length as this is now part of info->lastkey Renamed old info->lastkey to info->lastkey_buff Use exact key lenghts for keys, not USE_WHOLE_KEY For partial key searches, use SEARCH_PART_KEY When searching to insert new key on page, use SEARCH_INSERT to mark that key has rowid Changes done in a lot of files: - Modified functions to use MARIA_KEY instead of key pointer and key length - Use keyinfo->root_lock instead of share->key_root_lock[keynr] - Simplify code by using local variable keyinfo instead if share->keyinfo[i] - Added #fdef EXTERNAL_LOCKING around removed state elements - HA_MAX_KEY_BUFF -> MARIA_MAX_KEY_BUFF (to reserve space for transid) - Changed type of 'nextflag' to uint32 to ensure all SEARCH_xxx flags fits into it .bzrignore: Added missing temporary directory extra/Makefile.am: comp_err is now deleted on make distclean include/maria.h: Added structure MARIA_KEY, which is used for intern key objects in Maria. Changed functions to take MARIA_KEY as an argument instead of pointer to packed key. Changed some functions that always return true or false to my_bool. Added virtual function make_key() to avoid if in _ma_make_key() Moved rw_lock_t for locking trees from share->key_root_lock to MARIA_KEYDEF. This makes usage of the locks simpler and faster include/my_base.h: Added HA_RTREE_INDEX flag to mark rtree index. Used for easier checks in ma_check() Added SEARCH_INSERT to be used when inserting new keys Added SEARCH_PART_KEY for partial searches Added SEARCH_USER_KEY_HAS_TRANSID to be used when key we use for searching in btree has a TRANSID Added SEARCH_PAGE_KEY_HAS_TRANSID to be used when key we found in btree has a transid include/my_handler.h: Make next_flag 32 bit to make sure we can handle all SEARCH_ bits mysql-test/include/maria_empty_logs.inc: Read and restore current database; Don't assume we are using mysqltest. Don't log use databasename to log. Using this include should not cause any result changes. mysql-test/r/maria-gis-rtree-dynamic.result: Updated results after adding some check table commands to help pinpoint errors mysql-test/r/maria-mvcc.result: New tests mysql-test/r/maria-purge.result: New result after adding removal of logs mysql-test/r/maria-recovery-big.result: maria_empty_logs doesn't log 'use mysqltest' anymore mysql-test/r/maria-recovery-bitmap.result: maria_empty_logs doesn't log 'use mysqltest' anymore mysql-test/r/maria-recovery-rtree-ft.result: maria_empty_logs doesn't log 'use mysqltest' anymore mysql-test/r/maria-recovery.result: maria_empty_logs doesn't log 'use mysqltest' anymore mysql-test/r/maria.result: New tests mysql-test/r/variables-big.result: Don't log id as it's not predictable mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result: Updated results to new binlog results. (Test has not been run in a long time as it requires --big) mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt: Moved file to ndb replication test directory mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test: Fixed wrong path to included tests mysql-test/t/maria-gis-rtree-dynamic.test: Added some check table commands to help pinpoint errors mysql-test/t/maria-mvcc.test: New tests mysql-test/t/maria-purge.test: Remove logs to make test results predictable mysql-test/t/maria.test: New tests for some possible problems mysql-test/t/variables-big.test: Don't log id as it's not predictable mysys/my_handler.c: Updated function comment to reflect old code Changed nextflag to be uint32 to ensure we can have flags > 16 bit Changed checking if we are in insert with NULL keys as next_flag can now include additional bits that have to be ignored. Added SEARCH_INSERT flag to be used when inserting new keys in btree. This flag tells us the that the keys includes row position and it's thus safe to remove SEARCH_FIND Added comparision of transid. This is only done if the keys actually have a transid, which is indicated by nextflag mysys/my_lock.c: Fixed wrong test (Found by Guilhem) scripts/Makefile.am: Ensure that test programs are deleted by make clean sql/rpl_rli.cc: Moved assignment order to fix compiler warning storage/heap/hp_write.c: Add SEARCH_INSERT to signal ha_key_cmp that we we should also compare rowid for keys storage/maria/Makefile.am: Remove also maria log files when doing make distclean storage/maria/ha_maria.cc: Use 'file->start_state' as default state for transactional tables without versioning At table unlock, set file->state to point to live state. (Needed for information schema to pick up right number of rows) In ha_maria::implicit_commit() move all locked (ie open) tables to new transaction. This is needed to ensure ha_maria->info doesn't point to a deleted history event. Disable concurrent inserts for insert ... select and table changes with subqueries if statement based replication as this would cause wrong results on slave storage/maria/ma_blockrec.c: Updated comment storage/maria/ma_check.c: Compact key pages (removes transid) when doing --zerofill Check that 'page_flag' on key pages contains KEYPAGE_FLAG_HAS_TRANSID if there is a single key on the page with a transid Modified functions to use MARIA_KEY instead of key pointer and key length Use new interface to _ma_rec_pos(), _ma_dpointer(), _ma_ft_del(), ma_update_state_lsn() Removed not needed argument from get_record_for_key() Fixed that we check doesn't give errors for RTREE; We now treath these like SPATIAL Remove some SPATIAL specific code where the virtual functions can handle this in a general manner Use info->lastkey_buff instead of info->lastkey _ma_dpos() -> _ma_row_pos_from_key() _ma_make_key() -> keyinfo->make_key() _ma_print_key() -> _ma_print_keydata() _ma_move_key() -> ma_copy_copy() Add SEARCH_INSERT to signal ha_key_cmp that we we should also compare rowid for keys Ensure that data on page doesn't overwrite page checksum position Use DBUG_DUMP_KEY instead of DBUG_DUMP Use exact key lengths instead of USE_WHOLE_KEY to ha_key_cmp() Fixed check if rowid points outside of BLOCK_RECORD data file Use info->lastkey_buff instead of key on stack in some safe places Added #fdef EXTERNAL_LOCKING around removed state elements storage/maria/ma_close.c: Use keyinfo->root_lock instead of share->key_root_lock[keynr] storage/maria/ma_create.c: Removed assert that is already checked in maria_init() Force transactinal tables to be of type BLOCK_RECORD Fixed wrong usage of HA_PACK_RECORD (should be HA_OPTION_PACK_RECORD) Mark keys that uses HA_KEY_ALG_RTREE with HA_RTREE_INDEX for easier handling of these in ma_check Store max_trid in index file as state.create_trid. This is used to pack all transids in the index pages relative to max possible transid for file. storage/maria/ma_dbug.c: Changed _ma_print_key() to use MARIA_KEY storage/maria/ma_delete.c: Modified functions to use MARIA_KEY instead of key pointer and key length info->lastkey2-> info->lastkey_buff2 Added SEARCH_INSERT to signal ha_key_cmp that we we should also compare rowid for keys Use new interface for get_key(), _ma_get_last_key() and others _ma_dpos() -> ma_row_pos_from_key() Simplify setting of prev_key in del() Ensure that KEYPAGE_FLAG_HAS_TRANSID is set in page_flag if key page has transid Treath key pages that may have a transid as if keys would be of variable length storage/maria/ma_delete_all.c: Reset history state if maria_delete_all_rows() are called Update parameters to _ma_update_state_lsns() call storage/maria/ma_extra.c: Store and restore info->lastkey storage/maria/ma_ft_boolean_search.c: Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_ft_nlq_search.c: Modified functions to use MARIA_KEY instead of key pointer and key length Use lastkey_buff2 instead of info->lastkey+info->s->base.max_key_length (same thing) storage/maria/ma_ft_update.c: Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_ftdefs.h: Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_fulltext.h: Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_init.c: Check if blocksize is legal (Moved test here from ma_open()) storage/maria/ma_key.c: Added functions for storing/reading of transid Modified functions to use MARIA_KEY instead of key pointer and key length Moved _ma_sp_make_key() out of _ma_make_key() as we now use keyinfo->make_key to create keys Add transid to keys if table is versioned Added _ma_copy_key() storage/maria/ma_key_recover.c: Add logging of page_flag (holds information if there are keys with transid on page) Changed DBUG_PRINT("info" -> DBUG_PRINT("redo" as the redo logging can be quite extensive Added lots of DBUG_PRINT() Added support for index page operations: KEY_OP_SET_PAGEFLAG and KEY_OP_COMPACT_PAGE storage/maria/ma_key_recover.h: Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_locking.c: Added new arguments to _ma_update_state_lsns_sub() storage/maria/ma_loghandler.c: Fixed all logging of LSN to look similar in DBUG log Changed if (left != 0) to if (left) as the later is used also later in the code storage/maria/ma_loghandler.h: Added new index page operations storage/maria/ma_open.c: Removed allocated "state_dummy" and instead use share->state.common for transactional tables that are not versioned This is needed to not get double increments of state.records (one in ma_write.c and on when log is written) Changed info->lastkey to MARIA_KEY type Removed resetting of MARIA_HA variables that have 0 as default value (as info is zerofilled) Enable versioning for transactional tables with index. Tables with an auto-increment key, rtree or fulltext keys are not versioned. Check on open that state.create_trid is correct Extend share->base.max_key_length in case of transactional table so that it can hold transid Removed 4.0 compatible fulltext key mode as this is not relevant for Maria Removed old and wrong #ifdef ENABLE_WHEN_WE_HAVE_TRANS_ROW_ID code block Initialize all new virtual function pointers Removed storing of state->unique, state->process and store state->create_trid instead storage/maria/ma_page.c: Added comment to describe key page structure Added functions to compact key page and log the compact operation storage/maria/ma_range.c: Modified functions to use MARIA_KEY instead of key pointer and key length Use SEARCH_PART_KEY indicator instead of USE_WHOLE_KEY to detect if we are doing a part key search Added handling of pages with transid storage/maria/ma_recovery.c: Don't assert if table we opened are not transactional. This may be a table which has been changed from transactional to not transactinal Added new arguments to _ma_update_state_lsns() storage/maria/ma_rename.c: Added new arguments to _ma_update_state_lsns() storage/maria/ma_rkey.c: Modified functions to use MARIA_KEY instead of key pointer and key length Don't use USE_WHOLE_KEY, use real length of key Use share->row_is_visible() to test if row is visible Moved search_flag == HA_READ_KEY_EXACT out of 'read-next-row' loop as this only need to be tested once Removed test if last_used_keyseg != 0 as this is always true storage/maria/ma_rnext.c: Modified functions to use MARIA_KEY instead of key pointer and key length Simplify code by using local variable keyinfo instead if share->keyinfo[i] Use share->row_is_visible() to test if row is visible storage/maria/ma_rnext_same.c: Modified functions to use MARIA_KEY instead of key pointer and key length lastkey2 -> lastkey_buff2 storage/maria/ma_rprev.c: Modified functions to use MARIA_KEY instead of key pointer and key length Simplify code by using local variable keyinfo instead if share->keyinfo[i] Use share->row_is_visible() to test if row is visible storage/maria/ma_rsame.c: Updated comment Simplify code by using local variable keyinfo instead if share->keyinfo[i] Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_rsamepos.c: Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_rt_index.c: Modified functions to use MARIA_KEY instead of key pointer and key length Use better variable names Removed not needed casts _ma_dpos() -> _ma_row_pos_from_key() Use info->last_rtree_keypos to save position to key instead of info->int_keypos Simplify err: condition Changed return type for maria_rtree_insert() to my_bool as we are only intressed in ok/fail from this function storage/maria/ma_rt_index.h: Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_rt_key.c: Modified functions to use MARIA_KEY instead of key pointer and key length Simplify maria_rtree_add_key by combining idenitcal code and removing added_len storage/maria/ma_rt_key.h: Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_rt_mbr.c: Changed type of 'nextflag' to uint32 Added 'to' argument to RT_PAGE_MBR_XXX functions to more clearly see which variables changes value storage/maria/ma_rt_mbr.h: Changed type of 'nextflag' to uint32 storage/maria/ma_rt_split.c: Modified functions to use MARIA_KEY instead of key pointer and key length key_length -> key_data_length to catch possible errors storage/maria/ma_rt_test.c: Fixed wrong comment Reset recinfo to avoid valgrind varnings Fixed wrong argument to create_record() that caused test to fail storage/maria/ma_search.c: Modified functions to use MARIA_KEY instead of key pointer and key length Added support of keys with optional trid Test for SEARCH_PART_KEY instead of USE_WHOLE_KEY to detect part key reads _ma_dpos() -> _ma_row_pos_from_key() If there may be keys with transid on the page, have _ma_bin_search() call _ma_seq_search() Add _ma_skip_xxx() functions to quickly step over keys (faster than calling get_key() in most cases as we don't have to copy key data) Combine similar code at end of _ma_get_binary_pack_key() Removed not used function _ma_move_key() In _ma_search_next() don't call _ma_search() if we aren't on a nod page. Update info->cur_row.trid with trid for found key Removed some not needed casts Added _ma_trid_from_key() Use MARIA_SHARE instead of MARIA_HA as arguments to _ma_rec_pos(), _ma_dpointer() and _ma_xxx_keypos_to_recpos() to make functions faster and smaller storage/maria/ma_sort.c: Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_sp_defs.h: _ma_sp_make_key() now fills in and returns (MARIA_KEY *) value storage/maria/ma_sp_key.c: _ma_sp_make_key() now fills in and returns (MARIA_KEY *) value Don't test sizeof(double), test against 8 as we are using float8store() Use mi_float8store() instead of doing swap of value (same thing but faster) storage/maria/ma_state.c: maria_versioning() now only calls _ma_block_get_status() if table supports versioning Added _ma_row_visible_xxx() functions for different occasions When emptying history, set info->state to point to the first history event. storage/maria/ma_state.h: Added _ma_row_visible_xxx() prototypes storage/maria/ma_static.c: Indentation changes storage/maria/ma_statrec.c: Fixed arguments to _ma_dpointer() and _ma_rec_pos() storage/maria/ma_test1.c: Call init_thr_lock() if we have versioning storage/maria/ma_test2.c: Call init_thr_lock() if we have versioning storage/maria/ma_unique.c: Modified functions to use MARIA_KEY storage/maria/ma_update.c: Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_write.c: Modified functions to use MARIA_KEY instead of key pointer and key length Simplify code by using local variable keyinfo instead if share->keyinfo[i] In _ma_enlarge_root(), mark in page_flag if new key has transid _ma_dpos() -> _ma_row_pos_from_key() Changed return type of _ma_ck_write_tree() to my_bool as we are only testing if result is true or not Moved 'reversed' to outside block as area was used later storage/maria/maria_chk.c: Added error if trying to sort with HA_BINARY_PACK_KEY Use new interface to get_key() and _ma_dpointer() _ma_dpos() -> _ma_row_pos_from_key() storage/maria/maria_def.h: Modified functions to use MARIA_KEY instead of key pointer and key length Added 'common' to MARIA_SHARE->state for storing state for transactional tables without versioning Added create_trid to MARIA_SHARE Removed not used state variables 'process' and 'unique' Added defines for handling TRID's in index pages Changed to use MARIA_SHARE instead of MARIA_HA for some functions Added 'have_versioning' flag if table supports versioning Moved key_root_lock from MARIA_SHARE to MARIA_KEYDEF Changed last_key to be of type MARIA_KEY. Removed lastkey_length lastkey -> lastkey_buff, lastkey2 -> lastkey_buff2 Added _ma_get_used_and_nod_with_flag() for faster access to page data when page_flag is read Added DBUG_DUMP_KEY for easier DBUG_DUMP of a key Changed 'nextflag' and assocaited variables to uint32 storage/maria/maria_ftdump.c: lastkey -> lastkey_buff storage/maria/trnman.c: Fixed wrong initialization of min_read_from and max_commit_trid Added trnman_get_min_safe_trid() storage/maria/unittest/ma_test_all-t: Added --start-from storage/myisam/mi_check.c: Added SEARCH_INSERT, as ha_key_cmp() needs it when doing key comparision for inserting key on page in rowid order storage/myisam/mi_delete.c: Added SEARCH_INSERT, as ha_key_cmp() needs it when doing key comparision for inserting key on page in rowid order storage/myisam/mi_range.c: Updated comment storage/myisam/mi_write.c: Added SEARCH_INSERT, as ha_key_cmp() needs it when doing key comparision for inserting key on page in rowid order storage/myisam/rt_index.c: Fixed wrong parameter to rtree_get_req() which could cause crash --- .bzrignore | 1 + 1 file changed, 1 insertion(+) (limited to '.bzrignore') diff --git a/.bzrignore b/.bzrignore index 79c08ee98de..c8ce3fc8db5 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1448,6 +1448,7 @@ storage/maria/maria_log storage/maria/maria_log.* storage/maria/maria_pack storage/maria/maria_read_log +storage/maria/tmp storage/maria/tmp/* storage/maria/unittest/ma_pagecache_consist_1k-t-big storage/maria/unittest/ma_pagecache_consist_1kHC-t-big -- cgit v1.2.1 From 2611d3c002df6b37250a996752398c7262d6d8a3 Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Wed, 18 Mar 2009 04:15:20 +0200 Subject: Ignore generated file event-config.h --- .bzrignore | 1 + 1 file changed, 1 insertion(+) (limited to '.bzrignore') diff --git a/.bzrignore b/.bzrignore index d4bbf9a4ebf..eeab335d0be 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1902,3 +1902,4 @@ sql/share/spanish sql/share/swedish sql/share/ukrainian libmysqld/examples/mysqltest.cc +extra/libevent/event-config.h -- cgit v1.2.1 From 8be051d7031f8787920f48827e35535151486d98 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 9 Jun 2009 14:21:26 +0200 Subject: XtraDB after-merge fix: Fix building from storage/xtradb/ instead of storage/innodb/ .bzrignore: XtraDB compiles innodb in storage/xtradb instead of storage/innobase CMakeLists.txt: Take InnoDB code from storage/xtradb/ instead of storage/innobase/ libmysqld/CMakeLists.txt: Take InnoDB code from storage/xtradb/ instead of storage/innobase/ storage/innobase/plug.in.disabled: Disable building old InnoDB from storage/innobase/ directory. We will keep the files around to avoid getting merge conflicts for every MySQL upstream change to InnoDB. storage/xtradb/CMakeLists.txt: Take InnoDB code from storage/xtradb/ instead of storage/innobase/ storage/xtradb/COPYING: Remove not needed file from XtraDB. storage/xtradb/Makefile.am: Take InnoDB code from storage/xtradb/ instead of storage/innobase/ storage/xtradb/Makefile.in: Remove not needed file from XtraDB. storage/xtradb/handler/ha_innodb.cc: Take InnoDB code from storage/xtradb/ instead of storage/innobase/ storage/xtradb/plug.in: Take InnoDB code from storage/xtradb/ instead of storage/innobase/ storage/xtradb/row/row0ins.c: Take InnoDB code from storage/xtradb/ instead of storage/innobase/ --- .bzrignore | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to '.bzrignore') diff --git a/.bzrignore b/.bzrignore index eeab335d0be..aeccd0cd0c0 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1442,6 +1442,21 @@ storage/innobase/ib_config.h storage/innobase/ib_config.h.in storage/innobase/mkinstalldirs storage/innobase/stamp-h1 +storage/xtradb/autom4te-2.53.cache/* +storage/xtradb/autom4te-2.53.cache/output.0 +storage/xtradb/autom4te-2.53.cache/requests +storage/xtradb/autom4te-2.53.cache/traces.0 +storage/xtradb/autom4te.cache/* +storage/xtradb/autom4te.cache/output.0 +storage/xtradb/autom4te.cache/requests +storage/xtradb/autom4te.cache/traces.0 +storage/xtradb/configure.lineno +storage/xtradb/conftest.s1 +storage/xtradb/conftest.subs +storage/xtradb/ib_config.h +storage/xtradb/ib_config.h.in +storage/xtradb/mkinstalldirs +storage/xtradb/stamp-h1 storage/maria/*.MAD storage/maria/*.MAI storage/maria/ma_rt_test -- cgit v1.2.1 From 4102605fba3edab2935b7b1d46b7c7569bd889e7 Mon Sep 17 00:00:00 2001 From: Sergey Petrunia Date: Thu, 25 Jun 2009 14:05:53 +0400 Subject: MWL#17: Table elimination - Moved table elimination code to sql/opt_table_elimination.cc - Added comments .bzrignore: MWL#17: Table elimination - Moved table elimination code to sql/opt_table_elimination.cc libmysqld/Makefile.am: MWL#17: Table elimination - Moved table elimination code to sql/opt_table_elimination.cc sql/CMakeLists.txt: MWL#17: Table elimination - Moved table elimination code to sql/opt_table_elimination.cc sql/Makefile.am: MWL#17: Table elimination - Moved table elimination code to sql/opt_table_elimination.cc --- .bzrignore | 1 + 1 file changed, 1 insertion(+) (limited to '.bzrignore') diff --git a/.bzrignore b/.bzrignore index 392572a3f24..5c944d0d9fa 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1905,3 +1905,4 @@ sql/share/swedish sql/share/ukrainian libmysqld/examples/mysqltest.cc extra/libevent/event-config.h +libmysqld/opt_table_elimination.cc -- cgit v1.2.1 From 60c4f0f87bff0d37388de27970e9cb0e6ed64c4a Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Fri, 30 Oct 2009 20:51:46 +0200 Subject: Added ignore for symlinked build file --- .bzrignore | 1 + 1 file changed, 1 insertion(+) (limited to '.bzrignore') diff --git a/.bzrignore b/.bzrignore index 258a16fdeca..d2a1ce94f70 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1921,3 +1921,4 @@ sql/share/ukrainian libmysqld/examples/mysqltest.cc extra/libevent/event-config.h libmysqld/opt_table_elimination.cc +libmysqld/ha_federatedx.cc -- cgit v1.2.1 From e9839d8fd0ca485af9f59961cc7e49d2a21bfad9 Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Mon, 30 Nov 2009 01:16:14 +0200 Subject: Ignore temporary directory --- .bzrignore | 1 + 1 file changed, 1 insertion(+) (limited to '.bzrignore') diff --git a/.bzrignore b/.bzrignore index d2a1ce94f70..5ca7d801284 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1922,3 +1922,4 @@ libmysqld/examples/mysqltest.cc extra/libevent/event-config.h libmysqld/opt_table_elimination.cc libmysqld/ha_federatedx.cc +tmp -- cgit v1.2.1 From c40d3e746b24b2973817943b108886b36c5d31d0 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 22 Dec 2009 14:50:20 +0100 Subject: Ignore new pbxt symlinks. --- .bzrignore | 3 +++ 1 file changed, 3 insertions(+) (limited to '.bzrignore') diff --git a/.bzrignore b/.bzrignore index e3cb25a09c9..73826984b17 100644 --- a/.bzrignore +++ b/.bzrignore @@ -666,6 +666,9 @@ libmysqld/time.cc libmysqld/tztime.cc libmysqld/uniques.cc libmysqld/unireg.cc +libmysqld/discover_xt.cc +libmysqld/ha_pbxt.cc +libmysqld/myxt_xt.cc libmysqltest/*.ds? libmysqltest/*.vcproj libmysqltest/mytest.c -- cgit v1.2.1 From e9bce6c9d4bde35306b845e22e9b5ada69c4512f Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Fri, 29 Jan 2010 20:42:22 +0200 Subject: Patch set contributed by Alex Budovski (MCA) Fix for Bug#31173: mysqlslap.exe crashes if called without any parameters .bzrignore: Fixed .bzrignore rules. Many were simply not ignoring what they were meant to. client/mysqlslap.c: Fixed bug for Bug#31173: mysqlslap.exe crashes if called without any parameters The original patch could cause memory leaks and odd problems depending on how connection was made. This code ensures that all mysql_options() are set for each mysql_real_connect(). (This patch by Monty) mysys/my_thr_init.c: Fixed multiply-initialized critical section on Windows, due to code incorrectly checking the wrong field in an attempt to prevent multiple-initialization. sql-common/client.c: Don't use shared memory if it's not set (for example after failed mysql_real_connect). Ensure that mysql_close() resets all resources so that it's safe to call it twice. (Patch by monty, related to Bug#31173: mysqlslap.exe crashes if called without any parameters) sql/CMakeLists.txt: Added page fault counters for SHOW PROFILE on Windows. sql/mysqld.cc: Fixed attempt to set a NULL event. The code now only sets the event if appropriate (i.e. shared memory is being used) sql/sql_profile.cc: Added page fault counters for SHOW PROFILE on Windows. sql/sql_profile.h: Added page fault counters for SHOW PROFILE on Windows. sql/udf_example.def: Some cleanup functions were not exported from udf_example.dll, causing them to never be executed, and as a result multiple-initialization of kernel objects occurred and resources were not being freed correctly. storage/maria/ma_close.c: Condition variable share->key_del_cond was never being destroyed, while its containing heap block was being freed in maria_close(), leaking kernel resources. --- .bzrignore | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to '.bzrignore') diff --git a/.bzrignore b/.bzrignore index 73826984b17..34e7c1cd1c1 100644 --- a/.bzrignore +++ b/.bzrignore @@ -40,15 +40,15 @@ *.dsp *.Po *.Plo -*/*.dir/* +*.dir/ */*_pure_*warnings */.deps */.libs/* */.pure -*/debug/* -*/minsizerel/* -*/release/* -*/relwithdebinfo/* +debug/ +MinSizeRel/ +Release/ +RelWithDebInfo/ *~ .*.swp ./CMakeCache.txt @@ -96,7 +96,7 @@ BitKeeper/tmp/gone BitKeeper/tmp BitKeeper/log BitKeeper/etc/SCCS -CMakeFiles/* +CMakeFiles/ COPYING COPYING.LIB Docs/#manual.texi# -- cgit v1.2.1 From e0bb2f90a2c765f323604892593d74ed8bc7080a Mon Sep 17 00:00:00 2001 From: Sergey Petrunya Date: Tue, 16 Feb 2010 00:53:06 +0300 Subject: Subquery optimization backport: - Factor out subquery code into sql/opt_subselect.{h,cc} - Stop using the term "confluent" (was used due to misreading the dictionary) --- .bzrignore | 4 ++++ 1 file changed, 4 insertions(+) (limited to '.bzrignore') diff --git a/.bzrignore b/.bzrignore index d2a1ce94f70..9625cb43c69 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1922,3 +1922,7 @@ libmysqld/examples/mysqltest.cc extra/libevent/event-config.h libmysqld/opt_table_elimination.cc libmysqld/ha_federatedx.cc +libmysqld/multi_range_read.cc +libmysqld/opt_index_cond_pushdown.cc +libmysqld/opt_subselect.cc +libmysqld/sql_join_cache.cc -- cgit v1.2.1 From 291fd9698340f3d83ff096542720f7335cb078d2 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Mon, 29 Mar 2010 17:13:53 +0200 Subject: pluggable auth with plugin examples Makefile.am: add new API files to the check_abi rule, remove duplicates client/CMakeLists.txt: now a client can use dlopen too client/Makefile.am: be csh-friendly include/my_global.h: add dummy plugs for dlopen and co. for the code that needs them to work in static builds mysys/Makefile.am: be csh-friendly plugin/auth/dialog.c: typo fixed --- .bzrignore | 3 +++ 1 file changed, 3 insertions(+) (limited to '.bzrignore') diff --git a/.bzrignore b/.bzrignore index 6fd772740b1..85fc5d0a607 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1931,3 +1931,6 @@ client/rpl_filter.cc client/rpl_filter.h client/sql_list.cc client/sql_list.h +libmysqld/client_plugin.c +sql/client_plugin.c +*.dgcov -- cgit v1.2.1 From e24e1668bc112afe4b4f6b3dc4d5b8d10635f60b Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 8 Apr 2010 14:10:05 +0200 Subject: MWL#43 CREATE TABLE options (by Sanja) Docs/sp-imp-spec.txt: New sql_mode added. include/my_base.h: Flag in frm of create options. libmysqld/CMakeLists.txt: New files added. libmysqld/Makefile.am: New files added. mysql-test/r/events_bugs.result: New sql_mode added. mysql-test/r/information_schema.result: New sql_mode added. mysql-test/r/sp.result: New sql_mode added. mysql-test/r/system_mysql_db.result: New sql_mode added. mysql-test/suite/funcs_1/r/is_columns_mysql.result: New sql_mode added. mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result: New sql_mode added. mysql-test/t/events_bugs.test: New sql_mode added. mysql-test/t/sp.test: New sql_mode added. scripts/mysql_system_tables.sql: New sql_mode added. scripts/mysql_system_tables_fix.sql: New sql_mode added. sql/CMakeLists.txt: New files added. sql/Makefile.am: New files added. sql/event_db_repository.cc: New sql_mode added. sql/field.cc: Create options support added. sql/field.h: Create options support added. sql/ha_partition.cc: Create options support added. sql/handler.cc: Create options support added. sql/handler.h: Create options support added. sql/log_event.h: New sql_mode added. sql/mysql_priv.h: New sql_mode added. sql/mysqld.cc: New sql_mode added. sql/share/errmsg.txt: New error messages added. sql/sp.cc: New sql_mode added. sql/sp_head.cc: Create options support added. sql/sql_class.cc: Create options support added. Debug added. sql/sql_class.h: Create options support added. sql/sql_insert.cc: my_safe_a* moved to mysqld_priv.h sql/sql_lex.h: Create options support added. sql/sql_parse.cc: Create options support added. sql/sql_show.cc: Create options support added. sql/sql_table.cc: Create options support added. sql/sql_view.cc: New sql_mode added. sql/sql_yacc.yy: Create options support added. sql/structs.h: Create options support added. sql/table.cc: Create options support added. sql/table.h: Create options support added. sql/unireg.cc: Create options support added. storage/example/ha_example.cc: Create options example. storage/example/ha_example.h: Create options example. storage/pbxt/src/discover_xt.cc: Create options support added. --- .bzrignore | 1 + 1 file changed, 1 insertion(+) (limited to '.bzrignore') diff --git a/.bzrignore b/.bzrignore index 85fc5d0a607..e2d1b9633db 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1934,3 +1934,4 @@ client/sql_list.h libmysqld/client_plugin.c sql/client_plugin.c *.dgcov +libmysqld/create_options.cc -- cgit v1.2.1 From 6659ad49fef7adf8fdf4db78403bbb45accc169b Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Thu, 13 May 2010 14:00:53 +0300 Subject: Fixes after last merge of MySQL 5.1 - INSERT with RAND() doesn't require row based logging again - Some bugs fixed in opt_range() where we table->key_read was wrongly used .bzrignore: Ignore new xtstat binary mysql-test/r/index_merge_myisam.result: Update results (old result was wrong) mysql-test/suite/binlog/r/binlog_stm_binlog.result: Added drop table first mysql-test/suite/binlog/r/binlog_stm_unsafe_warning.result: Added test for when RAND() requires row based logging mysql-test/suite/binlog/t/binlog_stm_binlog.test: Added drop table first mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test: Added test for when RAND() requires row based logging scripts/make_binary_distribution.sh: Removed type from last commit sql/item_create.cc: Don't require row based logging when using RAND() with INSERT sql/opt_range.cc: Revert wrong patch from Oracle: - As QUICK_RANGE_SELECT uses it's own 'file' handler to the tables, one can't use 'table->key_read' as a flag to detect if index only read (keyread) is used or not - Don't set keyread if keyread is already enabled - Don't disable key read, if we didn't enable it ourselves - Simplify code (and ensure that we do proper cleanup of index only read) sql/opt_range.h: Added flags to detect if the range optimizer enabled index only read (key read) or not sql/opt_sum.cc: Use our more optimized macros sql/sql_lex.h: Added 'readable' function to check if we are in a sub query function or not (not normal query or sub query in FROM clause) sql/sql_select.cc: Use our more optimized keyread macros Added ASSERTS early Simplify code on eliminate_item_equal() Fixed that substitute_for_best_equal_field() doesn't core dump in case of out of memory conditions. Removed not needed test for 'field->maybe_null()' Replaced master_unit()->item with is_subquery_function() (More readable) sql/sql_update.cc: Use our more optimized keyread macros sql/table.cc: Use our more optimized keyread macros sql/table.h: Use separate functions to enable/disable Index only reads - Safer, more readable, better logging and faster. --- .bzrignore | 1 + 1 file changed, 1 insertion(+) (limited to '.bzrignore') diff --git a/.bzrignore b/.bzrignore index 34e7c1cd1c1..a5358590417 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1927,3 +1927,4 @@ libmysqld/opt_table_elimination.cc libmysqld/ha_federatedx.cc tmp libmysqld/debug_sync.cc +storage/pbxt/bin/xtstat -- cgit v1.2.1 From ecbcddc03dc298ea1e6c0aa1a120bd0b4b04b3fd Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Fri, 16 Jul 2010 10:33:01 +0300 Subject: Improved speed of thr_alarm from O(N) to O(1). thr_alarm is used to handle timeouts and kill of connections. Fixed compiler warnings. queues.h and queues.c are now based on the UNIREG code and thus made BSD. Fix code to use new queue() interface. This mostly affects how you access elements in the queue. If USE_NET_CLEAR is not set, don't clear connection from unexpected characters. This should give a speed up when doing a lot of fast queries. Fixed some code in ma_ft_boolean_search.c that had not made it from myisam/ft_boolean_search.c include/queues.h: Use UNIREG code base (BSD) Changed init_queue() to take all initialization arguments. New interface to access elements in queue include/thr_alarm.h: Changed to use time_t instead of ulong (portability) Added index_in_queue, to be able to remove random element from queue in O(1) mysys/queues.c: Use UNIREG code base (BSD) init_queue() and reinit_queue() now takes more initialization arguments. (No need for init_queue_ex() anymore) Now one can tell queue_insert() to store in the element a pointer to where element is in queue. This allows one to remove elements from queue in O(1) instead of O(N) mysys/thr_alarm.c: Use new option in queue() to allow fast removal of elements. Do less inside LOCK_alarm mutex. This should give a major speed up of thr_alarm usage when there is many threads sql/create_options.cc: Fixed wrong printf sql/event_queue.cc: Use new queue interface() sql/filesort.cc: Use new queue interface() sql/ha_partition.cc: Use new queue interface() sql/ha_partition.h: Fixed compiler warning sql/item_cmpfunc.cc: Fixed compiler warning sql/item_subselect.cc: Use new queue interface() Removed not used variable sql/net_serv.cc: If USE_NET_CLEAR is not set, don't clear connection from unexpected characters. This should give a speed up when doing a lot of fast queries at the disadvantage that if there is a bug in the client protocol the connection will be dropped instead of being unnoticed. sql/opt_range.cc: Use new queue interface() Fixed compiler warnings sql/uniques.cc: Use new queue interface() storage/maria/ma_ft_boolean_search.c: Copy code from myisam/ft_boolean_search.c Use new queue interface() storage/maria/ma_ft_nlq_search.c: Use new queue interface() storage/maria/ma_sort.c: Use new queue interface() storage/maria/maria_pack.c: Use new queue interface() Use queue_fix() instead of own loop to fix queue. storage/myisam/ft_boolean_search.c: Use new queue interface() storage/myisam/ft_nlq_search.c: Use new queue interface() storage/myisam/mi_test_all.sh: Remove temporary file from last run storage/myisam/myisampack.c: Use new queue interface() Use queue_fix() instead of own loop to fix queue. storage/myisam/sort.c: Use new queue interface() storage/myisammrg/myrg_queue.c: Use new queue interface() storage/myisammrg/myrg_rnext.c: Use new queue interface() storage/myisammrg/myrg_rnext_same.c: Use new queue interface() storage/myisammrg/myrg_rprev.c: Use new queue interface() --- .bzrignore | 1 + 1 file changed, 1 insertion(+) (limited to '.bzrignore') diff --git a/.bzrignore b/.bzrignore index f2bc6d0e483..a38e39107f1 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1940,3 +1940,4 @@ sql/client_plugin.c *.dgcov libmysqld/create_options.cc storage/pbxt/bin/xtstat +libmysqld/sql_expression_cache.cc -- cgit v1.2.1 From 909e4eb08d7ea38cf09575756cff79648e326fd5 Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Wed, 18 Aug 2010 10:52:57 +0300 Subject: Added verbose mode to recovery More DBUG Added convert-debug-for-diff Added missing (from last push) federated test case .bzrignore: Ignore generated files mysql-test/README: Updated documentation for --extern mysql-test/suite/federated/federated_bug_32426.result: Added test for federatedx mysql-test/suite/federated/federated_bug_32426.test: Added test for federatedx scripts/Makefile.am: Added convert-debug-for-diff scripts/convert-debug-for-diff.sh: Added script for converting sql/log.cc: Added DBUG sql/mysqld.cc: Added DBUG storage/maria/ma_recovery.c: If verbose, write dirty pages (for debugging) storage/maria/ma_static.c: Added verbose mode to recovery storage/maria/maria_def.h: Added verbose mode to recovery storage/maria/maria_read_log.c: Added verbose mode to recovery --- .bzrignore | 2 ++ 1 file changed, 2 insertions(+) (limited to '.bzrignore') diff --git a/.bzrignore b/.bzrignore index a5358590417..9a01b642787 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1928,3 +1928,5 @@ libmysqld/ha_federatedx.cc tmp libmysqld/debug_sync.cc storage/pbxt/bin/xtstat +mysql-test/mtr_command +scripts/convert-debug-for-diff -- cgit v1.2.1 From e246077bcf5fc22a381ee8591a441eb345a4a2af Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sun, 12 Sep 2010 18:40:01 +0200 Subject: rename maria to aria --- .bzrignore | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to '.bzrignore') diff --git a/.bzrignore b/.bzrignore index dd569894167..d450bb9594a 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1470,15 +1470,15 @@ storage/maria/ma_test1 storage/maria/ma_test2 storage/maria/ma_test3 storage/maria/ma_test_all -storage/maria/maria.log -storage/maria/maria_chk -storage/maria/maria_control -storage/maria/maria_dump_log -storage/maria/maria_ftdump -storage/maria/maria_log -storage/maria/maria_log.* -storage/maria/maria_pack -storage/maria/maria_read_log +storage/maria/aria.log +storage/maria/aria_chk +storage/maria/aria_control +storage/maria/aria_dump_log +storage/maria/aria_ftdump +storage/maria/aria_log +storage/maria/aria_log.* +storage/maria/aria_pack +storage/maria/aria_read_log storage/maria/tmp storage/maria/tmp/* storage/maria/unittest/ma_pagecache_consist_1k-t-big -- cgit v1.2.1