mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
e2765a84b1
Corrected spelling in copyright text Makefile.am: Don't update the files from BitKeeper Many files: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header Many files: Added GPL copyright text Removed files: Docs/Support/colspec-fix.pl Docs/Support/docbook-fixup.pl Docs/Support/docbook-prefix.pl Docs/Support/docbook-split Docs/Support/make-docbook Docs/Support/make-makefile Docs/Support/test-make-manual Docs/Support/test-make-manual-de Docs/Support/xwf CMakeLists.txt: Added GPL copyright text bdb/CMakeLists.txt: Added GPL copyright text client/CMakeLists.txt: Added GPL copyright text dbug/CMakeLists.txt: Added GPL copyright text extra/CMakeLists.txt: Added GPL copyright text extra/yassl/CMakeLists.txt: Added GPL copyright text extra/yassl/taocrypt/CMakeLists.txt: Added GPL copyright text heap/CMakeLists.txt: Added GPL copyright text innobase/CMakeLists.txt: Added GPL copyright text libmysql/CMakeLists.txt: Added GPL copyright text myisam/CMakeLists.txt: Added GPL copyright text myisammrg/CMakeLists.txt: Added GPL copyright text mysys/CMakeLists.txt: Added GPL copyright text regex/CMakeLists.txt: Added GPL copyright text server-tools/CMakeLists.txt: Added GPL copyright text server-tools/instance-manager/CMakeLists.txt: Added GPL copyright text sql/CMakeLists.txt: Added GPL copyright text sql/examples/CMakeLists.txt: Added GPL copyright text strings/CMakeLists.txt: Added GPL copyright text tests/CMakeLists.txt: Added GPL copyright text vio/CMakeLists.txt: Added GPL copyright text zlib/CMakeLists.txt: Added GPL copyright text VC++Files/copy_mysql_files.bat: Added GPL copyright text extra/yassl/src/make.bat: Added GPL copyright text extra/yassl/taocrypt/benchmark/make.bat: Added GPL copyright text extra/yassl/taocrypt/src/make.bat: Added GPL copyright text extra/yassl/taocrypt/test/make.bat: Added GPL copyright text extra/yassl/testsuite/make.bat: Added GPL copyright text Docs/Support/generate-text-files.pl: Added GPL copyright text VC++Files/prepare: Added GPL copyright text VC++Files/test1/mysql_thr.c: Added GPL copyright text VC++Files/thr_test/thr_test.c: Added GPL copyright text include/help_end.h: Added GPL copyright text include/help_start.h: Added GPL copyright text mysql-test/install_test_db.sh: Added GPL copyright text mysql-test/my_create_tables.c: Added GPL copyright text mysql-test/ndb/ndbcluster.sh: Added GPL copyright text scripts/fill_func_tables.sh: Added GPL copyright text scripts/fill_help_tables.sh: Added GPL copyright text scripts/mysql_create_system_tables.sh: Added GPL copyright text scripts/mysql_install_db.sh: Added GPL copyright text scripts/mysql_upgrade_shell.sh: Added GPL copyright text server-tools/instance-manager/IMService.cpp: Added GPL copyright text server-tools/instance-manager/IMService.h: Added GPL copyright text server-tools/instance-manager/WindowsService.cpp: Added GPL copyright text server-tools/instance-manager/WindowsService.h: Added GPL copyright text server-tools/instance-manager/portability.h: Added GPL copyright text strings/ctype-extra.c: Added GPL copyright text strings/dump_map.c: Added GPL copyright text strings/uca-dump.c: Added GPL copyright text strings/utr11-dump.c: Added GPL copyright text win/build-vs71.bat: Added GPL copyright text win/build-vs8.bat: Added GPL copyright text win/build-vs8_x64.bat: Added GPL copyright text win/configure.js: Added GPL copyright text mysql-test/lib/mtr_cases.pl: Added GPL copyright text mysql-test/lib/mtr_diff.pl: Added GPL copyright text mysql-test/lib/mtr_gcov.pl: Added GPL copyright text mysql-test/lib/mtr_gprof.pl: Added GPL copyright text mysql-test/lib/mtr_im.pl: Added GPL copyright text mysql-test/lib/mtr_io.pl: Added GPL copyright text mysql-test/lib/mtr_match.pl: Added GPL copyright text mysql-test/lib/mtr_misc.pl: Added GPL copyright text mysql-test/lib/mtr_process.pl: Added GPL copyright text mysql-test/lib/mtr_report.pl: Added GPL copyright text mysql-test/lib/mtr_stress.pl: Added GPL copyright text mysql-test/lib/mtr_timer.pl: Added GPL copyright text mysql-test/lib/mtr_unique.pl: Added GPL copyright text strings/my_strtoll10-x86.s: Corrected spelling in copyright text BUILD/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header Docs/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header SSL/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header bdb/Makefile.in: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header client/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header client/client_priv.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header client/completion_hash.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header client/mysqladmin.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header client/mysqlimport.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header client/mysqlshow.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header dbug/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header extra/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header heap/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header heap/_check.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header heap/_rectest.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header heap/heapdef.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header heap/hp_block.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header heap/hp_clear.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header heap/hp_close.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header heap/hp_create.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header heap/hp_delete.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header heap/hp_extra.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header heap/hp_hash.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header heap/hp_info.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header heap/hp_open.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header heap/hp_panic.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header heap/hp_rename.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header heap/hp_rfirst.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header heap/hp_rkey.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header heap/hp_rlast.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header heap/hp_rnext.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header heap/hp_rprev.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header heap/hp_rrnd.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header heap/hp_rsame.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header heap/hp_scan.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header heap/hp_static.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header heap/hp_test1.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header heap/hp_test2.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header heap/hp_update.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header heap/hp_write.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header include/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header include/my_aes.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header include/my_getopt.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header include/my_handler.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header include/my_time.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header include/mysql_time.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header include/rijndael.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header include/sha1.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header include/sql_common.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header libmysql/client_settings.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header libmysqld/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header libmysqld/emb_qcache.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header libmysqld/embedded_priv.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header man/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/ft_boolean_search.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/ft_eval.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/ft_nlq_search.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/ft_parser.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/ft_static.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/ft_stem.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/ft_stopwords.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/ft_test1.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/ft_test1.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/ft_update.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/ftdefs.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/fulltext.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_cache.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_changed.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_check.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_checksum.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_close.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_create.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_dbug.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_delete.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_delete_all.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_delete_table.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_dynrec.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_extra.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_info.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_key.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_locking.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_log.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_open.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_packrec.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_page.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_panic.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_preload.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_range.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_rename.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_rfirst.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_rkey.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_rlast.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_rnext.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_rnext_same.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_rprev.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_rrnd.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_rsame.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_rsamepos.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_scan.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_search.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_static.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_statrec.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_test1.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_test2.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_test3.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_unique.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_update.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/mi_write.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/myisam_ftdump.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/myisamdef.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/myisamlog.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/myisampack.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/rt_index.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/rt_index.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/rt_key.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/rt_mbr.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/rt_mbr.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/rt_split.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/rt_test.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/sort.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/sp_defs.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisam/sp_test.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisammrg/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisammrg/myrg_close.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisammrg/myrg_create.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisammrg/myrg_def.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisammrg/myrg_delete.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisammrg/myrg_extra.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisammrg/myrg_info.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisammrg/myrg_locking.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisammrg/myrg_open.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisammrg/myrg_panic.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisammrg/myrg_queue.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisammrg/myrg_range.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisammrg/myrg_rfirst.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisammrg/myrg_rkey.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisammrg/myrg_rlast.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisammrg/myrg_rnext.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisammrg/myrg_rnext_same.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisammrg/myrg_rprev.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisammrg/myrg_rrnd.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisammrg/myrg_rsame.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisammrg/myrg_static.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisammrg/myrg_update.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header myisammrg/myrg_write.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header mysql-test/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header mysys/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header mysys/my_aes.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header mysys/my_gethostbyname.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header mysys/my_gethwaddr.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header mysys/my_getopt.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header mysys/my_getsystime.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header mysys/my_handler.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header mysys/my_port.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header mysys/my_semaphore.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header mysys/rijndael.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header mysys/sha1.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header os2/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header os2/ReadMe.txt: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header os2/include/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header os2/include/sys/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header pstack/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header regex/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header scripts/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header scripts/mysql_config.sh: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header server-tools/instance-manager/listener.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header server-tools/instance-manager/listener.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header server-tools/instance-manager/log.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header server-tools/instance-manager/log.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header server-tools/instance-manager/manager.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header server-tools/instance-manager/manager.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header server-tools/instance-manager/messages.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header server-tools/instance-manager/messages.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header server-tools/instance-manager/mysql_connection.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header server-tools/instance-manager/mysql_connection.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header server-tools/instance-manager/mysqlmanager.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header server-tools/instance-manager/options.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header server-tools/instance-manager/options.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header server-tools/instance-manager/priv.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header server-tools/instance-manager/priv.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header server-tools/instance-manager/protocol.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header server-tools/instance-manager/protocol.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header server-tools/instance-manager/thread_registry.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header server-tools/instance-manager/thread_registry.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header server-tools/instance-manager/user_map.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header server-tools/instance-manager/user_map.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql-bench/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql-bench/as3ap.sh: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql-bench/bench-count-distinct.sh: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql-bench/bench-init.pl.sh: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql-bench/compare-results.sh: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql-bench/copy-db.sh: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql-bench/crash-me.sh: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql-bench/print-limit-table: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql-bench/run-all-tests.sh: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql-bench/server-cfg.sh: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql-bench/test-ATIS.sh: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql-bench/test-alter-table.sh: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql-bench/test-big-tables.sh: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql-bench/test-connect.sh: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql-bench/test-create.sh: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql-bench/test-insert.sh: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql-bench/test-select.sh: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql-bench/test-transactions.sh: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql-bench/test-wisconsin.sh: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql-common/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql-common/my_time.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/client_settings.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/custom_conf.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/derror.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/des_key_file.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/discover.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/field.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/field.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/filesort.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/frm_crypt.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/gen_lex_hash.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/gstream.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/ha_berkeley.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/ha_berkeley.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/ha_heap.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/ha_heap.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/ha_myisam.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/ha_myisam.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/ha_myisammrg.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/ha_myisammrg.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/handler.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/handler.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/hash_filo.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/hash_filo.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/hostname.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/init.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/item.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/item.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/item_buff.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/item_cmpfunc.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/item_create.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/item_func.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/item_geofunc.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/item_strfunc.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/item_sum.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/item_timefunc.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/item_uniq.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/item_uniq.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/key.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/lex_symbol.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/lock.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/log_event.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/matherr.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/mf_iocache.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/my_decimal.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/my_decimal.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/my_lock.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/opt_range.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/opt_range.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/password.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/procedure.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/procedure.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/protocol.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/records.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/repl_failsafe.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/repl_failsafe.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/set_var.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/spatial.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/sql_acl.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/sql_analyse.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/sql_analyse.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/sql_base.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/sql_cache.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/sql_class.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/sql_class.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/sql_client.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/sql_crypt.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/sql_crypt.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/sql_cursor.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/sql_cursor.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/sql_do.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/sql_insert.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/sql_lex.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/sql_lex.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/sql_list.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/sql_load.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/sql_manager.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/sql_manager.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/sql_map.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/sql_map.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/sql_olap.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/sql_rename.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/sql_repl.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/sql_repl.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/sql_select.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/sql_select.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/sql_test.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/sql_udf.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/sql_update.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/structs.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/table.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/table.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/thr_malloc.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/time.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/unireg.cc: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header sql/unireg.h: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header strings/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header strings/bmove_upp-sparc.s: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header strings/macros.asm: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header strings/ptr_cmp.asm: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header strings/strappend-sparc.s: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header strings/strend-sparc.s: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header strings/strings.asm: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header strings/strinstr-sparc.s: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header strings/strmake-sparc.s: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header strings/strmov-sparc.s: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header strings/strnmov-sparc.s: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header strings/strstr-sparc.s: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header strings/strxmov-sparc.s: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header strings/strxmov.asm: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header support-files/MacOSX/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header support-files/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header tests/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header tests/deadlock_test.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header tools/mysqlmanager.c: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header vio/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header win/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header innobase/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header innobase/ibuf/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header innobase/include/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header innobase/os/Makefile.am: Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header Adjusted year(s) in copyright header ndb/include/Makefile.am: Added GPL copyright text ndb/src/common/debugger/Makefile.am: Added GPL copyright text ndb/src/common/debugger/signaldata/Makefile.am: Added GPL copyright text ndb/src/common/logger/Makefile.am: Added GPL copyright text ndb/src/common/mgmcommon/Makefile.am: Added GPL copyright text ndb/src/common/transporter/Makefile.am: Added GPL copyright text ndb/src/common/util/Makefile.am: Added GPL copyright text ndb/src/cw/cpcd/Makefile.am: Added GPL copyright text ndb/src/kernel/Makefile.am: Added GPL copyright text ndb/src/kernel/blocks/backup/Makefile.am: Added GPL copyright text ndb/src/kernel/blocks/cmvmi/Makefile.am: Added GPL copyright text ndb/src/kernel/blocks/dbacc/Makefile.am: Added GPL copyright text ndb/src/kernel/blocks/dbdict/Makefile.am: Added GPL copyright text ndb/src/kernel/blocks/dbdih/Makefile.am: Added GPL copyright text ndb/src/kernel/blocks/dblqh/Makefile.am: Added GPL copyright text ndb/src/kernel/blocks/dbtc/Makefile.am: Added GPL copyright text ndb/src/kernel/blocks/dbtup/Makefile.am: Added GPL copyright text ndb/src/kernel/blocks/dbtux/Makefile.am: Added GPL copyright text ndb/src/kernel/blocks/dbutil/Makefile.am: Added GPL copyright text ndb/src/kernel/blocks/ndbcntr/Makefile.am: Added GPL copyright text ndb/src/kernel/blocks/ndbfs/Makefile.am: Added GPL copyright text ndb/src/kernel/blocks/qmgr/Makefile.am: Added GPL copyright text ndb/src/kernel/blocks/suma/Makefile.am: Added GPL copyright text ndb/src/kernel/blocks/trix/Makefile.am: Added GPL copyright text ndb/src/kernel/error/Makefile.am: Added GPL copyright text ndb/src/kernel/vm/Makefile.am: Added GPL copyright text ndb/src/mgmapi/Makefile.am: Added GPL copyright text ndb/src/mgmclient/Makefile.am: Added GPL copyright text ndb/src/mgmsrv/Makefile.am: Added GPL copyright text ndb/src/ndbapi/Makefile.am: Added GPL copyright text ndb/test/ndbapi/Makefile.am: Added GPL copyright text ndb/test/ndbapi/bank/Makefile.am: Added GPL copyright text ndb/test/run-test/Makefile.am: Added GPL copyright text ndb/test/src/Makefile.am: Added GPL copyright text ndb/test/tools/Makefile.am: Added GPL copyright text ndb/tools/Makefile.am: Added GPL copyright text scripts/make_binary_distribution.sh: Added GPL copyright text scripts/make_sharedlib_distribution.sh: Added GPL copyright text scripts/make_win_bin_dist: Added GPL copyright text scripts/make_win_src_distribution.sh: Added GPL copyright text scripts/mysql_convert_table_format.sh: Added GPL copyright text scripts/mysql_explain_log.sh: Added GPL copyright text scripts/mysql_find_rows.sh: Added GPL copyright text scripts/mysql_fix_privilege_tables.sh: Added GPL copyright text scripts/mysql_zap.sh: Added GPL copyright text scripts/mysqlbug.sh: Added GPL copyright text BitKeeper/deleted/.del-colspec-fix.pl: Delete: Docs/Support/colspec-fix.pl BitKeeper/deleted/.del-docbook-fixup.pl: Delete: Docs/Support/docbook-fixup.pl BitKeeper/deleted/.del-docbook-prefix.pl: Delete: Docs/Support/docbook-prefix.pl BitKeeper/deleted/.del-docbook-split: Delete: Docs/Support/docbook-split BitKeeper/deleted/.del-make-docbook: Delete: Docs/Support/make-docbook BitKeeper/deleted/.del-make-makefile: Delete: Docs/Support/make-makefile BitKeeper/deleted/.del-test-make-manual-de: Delete: Docs/Support/test-make-manual-de BitKeeper/deleted/.del-test-make-manual: Delete: Docs/Support/test-make-manual BitKeeper/deleted/.del-xwf: Delete: Docs/Support/xwf Makefile.am: Don't update the files from BitKeeper extra/yassl/Makefile.am: Don't update the files from BitKeeper extra/yassl/taocrypt/Makefile.am: Don't update the files from BitKeeper extra/yassl/taocrypt/benchmark/Makefile.am: Don't update the files from BitKeeper extra/yassl/taocrypt/test/Makefile.am: Don't update the files from BitKeeper innobase/btr/Makefile.am: Don't update the files from BitKeeper innobase/buf/Makefile.am: Don't update the files from BitKeeper innobase/data/Makefile.am: Don't update the files from BitKeeper innobase/dict/Makefile.am: Don't update the files from BitKeeper innobase/dyn/Makefile.am: Don't update the files from BitKeeper innobase/eval/Makefile.am: Don't update the files from BitKeeper innobase/fil/Makefile.am: Don't update the files from BitKeeper innobase/fsp/Makefile.am: Don't update the files from BitKeeper innobase/fut/Makefile.am: Don't update the files from BitKeeper innobase/ha/Makefile.am: Don't update the files from BitKeeper innobase/lock/Makefile.am: Don't update the files from BitKeeper innobase/log/Makefile.am: Don't update the files from BitKeeper innobase/mach/Makefile.am: Don't update the files from BitKeeper innobase/mem/Makefile.am: Don't update the files from BitKeeper innobase/mtr/Makefile.am: Don't update the files from BitKeeper innobase/page/Makefile.am: Don't update the files from BitKeeper innobase/pars/Makefile.am: Don't update the files from BitKeeper innobase/que/Makefile.am: Don't update the files from BitKeeper innobase/read/Makefile.am: Don't update the files from BitKeeper innobase/rem/Makefile.am: Don't update the files from BitKeeper innobase/row/Makefile.am: Don't update the files from BitKeeper innobase/srv/Makefile.am: Don't update the files from BitKeeper innobase/sync/Makefile.am: Don't update the files from BitKeeper innobase/thr/Makefile.am: Don't update the files from BitKeeper innobase/trx/Makefile.am: Don't update the files from BitKeeper innobase/usr/Makefile.am: Don't update the files from BitKeeper innobase/ut/Makefile.am: Don't update the files from BitKeeper libmysql/Makefile.am: Don't update the files from BitKeeper libmysql_r/Makefile.am: Don't update the files from BitKeeper ndb/Makefile.am: Don't update the files from BitKeeper ndb/docs/Makefile.am: Don't update the files from BitKeeper ndb/src/Makefile.am: Don't update the files from BitKeeper ndb/src/common/Makefile.am: Don't update the files from BitKeeper ndb/src/common/portlib/Makefile.am: Don't update the files from BitKeeper ndb/src/cw/Makefile.am: Don't update the files from BitKeeper ndb/src/kernel/blocks/Makefile.am: Don't update the files from BitKeeper ndb/test/Makefile.am: Don't update the files from BitKeeper pstack/aout/Makefile.am: Don't update the files from BitKeeper server-tools/Makefile.am: Don't update the files from BitKeeper zlib/Makefile.am: Don't update the files from BitKeeper ndb/config/common.mk.am: Added GPL copyright text ndb/config/type_kernel.mk.am: Added GPL copyright text ndb/config/type_mgmapiclient.mk.am: Added GPL copyright text ndb/config/type_ndbapi.mk.am: Added GPL copyright text ndb/config/type_ndbapiclient.mk.am: Added GPL copyright text ndb/config/type_ndbapitest.mk.am: Added GPL copyright text ndb/config/type_ndbapitools.mk.am: Added GPL copyright text ndb/config/type_util.mk.am: Added GPL copyright text ndb/include/kernel/kernel_config_parameters.h: Added GPL copyright text ndb/include/kernel/signaldata/CntrStart.hpp: Added GPL copyright text ndb/include/kernel/signaldata/ReadConfig.hpp: Added GPL copyright text ndb/include/kernel/signaldata/UpgradeStartup.hpp: Added GPL copyright text ndb/include/mgmapi/mgmapi_config_parameters.h: Added GPL copyright text ndb/include/mgmapi/mgmapi_config_parameters_debug.h: Added GPL copyright text ndb/include/ndb_net.h: Added GPL copyright text ndb/include/util/ConfigValues.hpp: Added GPL copyright text ndb/src/common/debugger/signaldata/CntrStart.cpp: Added GPL copyright text ndb/src/common/debugger/signaldata/ReadNodesConf.cpp: Added GPL copyright text ndb/src/common/debugger/signaldata/print.awk: Added GPL copyright text ndb/src/common/util/Bitmask.cpp: Added GPL copyright text ndb/src/common/util/ConfigValues.cpp: Added GPL copyright text ndb/src/common/util/new.cpp: Added GPL copyright text ndb/src/common/util/testConfigValues/testConfigValues.cpp: Added GPL copyright text ndb/src/kernel/blocks/dbdict/Master_AddTable.sfl: Added GPL copyright text ndb/src/kernel/blocks/dbdict/Slave_AddTable.sfl: Added GPL copyright text ndb/src/mgmapi/mgmapi_configuration.cpp: Added GPL copyright text
1082 lines
27 KiB
C
1082 lines
27 KiB
C
/* Copyright (C) 2002-2006 MySQL AB & Ramil Kalimullin
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
#include "myisamdef.h"
|
|
|
|
#ifdef HAVE_RTREE_KEYS
|
|
|
|
#include "rt_index.h"
|
|
#include "rt_key.h"
|
|
#include "rt_mbr.h"
|
|
|
|
#define REINSERT_BUFFER_INC 10
|
|
#define PICK_BY_AREA
|
|
/*#define PICK_BY_PERIMETER*/
|
|
|
|
typedef struct st_page_level
|
|
{
|
|
uint level;
|
|
my_off_t offs;
|
|
} stPageLevel;
|
|
|
|
typedef struct st_page_list
|
|
{
|
|
ulong n_pages;
|
|
ulong m_pages;
|
|
stPageLevel *pages;
|
|
} stPageList;
|
|
|
|
|
|
/*
|
|
Find next key in r-tree according to search_flag recursively
|
|
|
|
NOTES
|
|
Used in rtree_find_first() and rtree_find_next()
|
|
|
|
RETURN
|
|
-1 Error
|
|
0 Found
|
|
1 Not found
|
|
*/
|
|
|
|
static int rtree_find_req(MI_INFO *info, MI_KEYDEF *keyinfo, uint search_flag,
|
|
uint nod_cmp_flag, my_off_t page, int level)
|
|
{
|
|
uchar *k;
|
|
uchar *last;
|
|
uint nod_flag;
|
|
int res;
|
|
uchar *page_buf;
|
|
int k_len;
|
|
uint *saved_key = (uint*) (info->rtree_recursion_state) + level;
|
|
|
|
if (!(page_buf = (uchar*)my_alloca((uint)keyinfo->block_length)))
|
|
{
|
|
my_errno = HA_ERR_OUT_OF_MEM;
|
|
return -1;
|
|
}
|
|
if (!_mi_fetch_keypage(info, keyinfo, page, DFLT_INIT_HITS, page_buf, 0))
|
|
goto err1;
|
|
nod_flag = mi_test_if_nod(page_buf);
|
|
|
|
k_len = keyinfo->keylength - info->s->base.rec_reflength;
|
|
|
|
if(info->rtree_recursion_depth >= level)
|
|
{
|
|
k = page_buf + *saved_key;
|
|
}
|
|
else
|
|
{
|
|
k = rt_PAGE_FIRST_KEY(page_buf, nod_flag);
|
|
}
|
|
last = rt_PAGE_END(page_buf);
|
|
|
|
for (; k < last; k = rt_PAGE_NEXT_KEY(k, k_len, nod_flag))
|
|
{
|
|
if (nod_flag)
|
|
{
|
|
/* this is an internal node in the tree */
|
|
if (!(res = rtree_key_cmp(keyinfo->seg, info->first_mbr_key, k,
|
|
info->last_rkey_length, nod_cmp_flag)))
|
|
{
|
|
switch ((res = rtree_find_req(info, keyinfo, search_flag, nod_cmp_flag,
|
|
_mi_kpos(nod_flag, k), level + 1)))
|
|
{
|
|
case 0: /* found - exit from recursion */
|
|
*saved_key = k - page_buf;
|
|
goto ok;
|
|
case 1: /* not found - continue searching */
|
|
info->rtree_recursion_depth = level;
|
|
break;
|
|
default: /* error */
|
|
case -1:
|
|
goto err1;
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
/* this is a leaf */
|
|
if (!rtree_key_cmp(keyinfo->seg, info->first_mbr_key, k,
|
|
info->last_rkey_length, search_flag))
|
|
{
|
|
uchar *after_key = rt_PAGE_NEXT_KEY(k, k_len, nod_flag);
|
|
info->lastpos = _mi_dpos(info, 0, after_key);
|
|
info->lastkey_length = k_len + info->s->base.rec_reflength;
|
|
memcpy(info->lastkey, k, info->lastkey_length);
|
|
info->rtree_recursion_depth = level;
|
|
*saved_key = last - page_buf;
|
|
|
|
if (after_key < last)
|
|
{
|
|
info->int_keypos = info->buff;
|
|
info->int_maxpos = info->buff + (last - after_key);
|
|
memcpy(info->buff, after_key, last - after_key);
|
|
info->buff_used = 0;
|
|
}
|
|
else
|
|
{
|
|
info->buff_used = 1;
|
|
}
|
|
|
|
res = 0;
|
|
goto ok;
|
|
}
|
|
}
|
|
}
|
|
info->lastpos = HA_OFFSET_ERROR;
|
|
my_errno = HA_ERR_KEY_NOT_FOUND;
|
|
res = 1;
|
|
|
|
ok:
|
|
my_afree((byte*)page_buf);
|
|
return res;
|
|
|
|
err1:
|
|
my_afree((byte*)page_buf);
|
|
info->lastpos = HA_OFFSET_ERROR;
|
|
return -1;
|
|
}
|
|
|
|
|
|
/*
|
|
Find first key in r-tree according to search_flag condition
|
|
|
|
SYNOPSIS
|
|
rtree_find_first()
|
|
info Handler to MyISAM file
|
|
uint keynr Key number to use
|
|
key Key to search for
|
|
key_length Length of 'key'
|
|
search_flag Bitmap of flags how to do the search
|
|
|
|
RETURN
|
|
-1 Error
|
|
0 Found
|
|
1 Not found
|
|
*/
|
|
|
|
int rtree_find_first(MI_INFO *info, uint keynr, uchar *key, uint key_length,
|
|
uint search_flag)
|
|
{
|
|
my_off_t root;
|
|
uint nod_cmp_flag;
|
|
MI_KEYDEF *keyinfo = info->s->keyinfo + keynr;
|
|
|
|
if ((root = info->s->state.key_root[keynr]) == HA_OFFSET_ERROR)
|
|
{
|
|
my_errno= HA_ERR_END_OF_FILE;
|
|
return -1;
|
|
}
|
|
|
|
/*
|
|
Save searched key, include data pointer.
|
|
The data pointer is required if the search_flag contains MBR_DATA.
|
|
*/
|
|
memcpy(info->first_mbr_key, key, keyinfo->keylength);
|
|
info->last_rkey_length = key_length;
|
|
|
|
info->rtree_recursion_depth = -1;
|
|
info->buff_used = 1;
|
|
|
|
nod_cmp_flag = ((search_flag & (MBR_EQUAL | MBR_WITHIN)) ?
|
|
MBR_WITHIN : MBR_INTERSECT);
|
|
return rtree_find_req(info, keyinfo, search_flag, nod_cmp_flag, root, 0);
|
|
}
|
|
|
|
|
|
/*
|
|
Find next key in r-tree according to search_flag condition
|
|
|
|
SYNOPSIS
|
|
rtree_find_next()
|
|
info Handler to MyISAM file
|
|
uint keynr Key number to use
|
|
search_flag Bitmap of flags how to do the search
|
|
|
|
RETURN
|
|
-1 Error
|
|
0 Found
|
|
1 Not found
|
|
*/
|
|
|
|
int rtree_find_next(MI_INFO *info, uint keynr, uint search_flag)
|
|
{
|
|
my_off_t root;
|
|
uint nod_cmp_flag;
|
|
MI_KEYDEF *keyinfo = info->s->keyinfo + keynr;
|
|
|
|
if (info->update & HA_STATE_DELETED)
|
|
return rtree_find_first(info, keynr, info->lastkey, info->lastkey_length,
|
|
search_flag);
|
|
|
|
if (!info->buff_used)
|
|
{
|
|
uchar *key= info->int_keypos;
|
|
|
|
while (key < info->int_maxpos)
|
|
{
|
|
if (!rtree_key_cmp(keyinfo->seg, info->first_mbr_key, key,
|
|
info->last_rkey_length, search_flag))
|
|
{
|
|
uchar *after_key = key + keyinfo->keylength;
|
|
|
|
info->lastpos= _mi_dpos(info, 0, after_key);
|
|
memcpy(info->lastkey, key, info->lastkey_length);
|
|
|
|
if (after_key < info->int_maxpos)
|
|
info->int_keypos= after_key;
|
|
else
|
|
info->buff_used= 1;
|
|
return 0;
|
|
}
|
|
key+= keyinfo->keylength;
|
|
}
|
|
}
|
|
if ((root = info->s->state.key_root[keynr]) == HA_OFFSET_ERROR)
|
|
{
|
|
my_errno= HA_ERR_END_OF_FILE;
|
|
return -1;
|
|
}
|
|
|
|
nod_cmp_flag = ((search_flag & (MBR_EQUAL | MBR_WITHIN)) ?
|
|
MBR_WITHIN : MBR_INTERSECT);
|
|
return rtree_find_req(info, keyinfo, search_flag, nod_cmp_flag, root, 0);
|
|
}
|
|
|
|
|
|
/*
|
|
Get next key in r-tree recursively
|
|
|
|
NOTES
|
|
Used in rtree_get_first() and rtree_get_next()
|
|
|
|
RETURN
|
|
-1 Error
|
|
0 Found
|
|
1 Not found
|
|
*/
|
|
|
|
static int rtree_get_req(MI_INFO *info, MI_KEYDEF *keyinfo, uint key_length,
|
|
my_off_t page, int level)
|
|
{
|
|
uchar *k;
|
|
uchar *last;
|
|
uint nod_flag;
|
|
int res;
|
|
uchar *page_buf;
|
|
uint k_len;
|
|
uint *saved_key = (uint*) (info->rtree_recursion_state) + level;
|
|
|
|
if (!(page_buf = (uchar*)my_alloca((uint)keyinfo->block_length)))
|
|
return -1;
|
|
if (!_mi_fetch_keypage(info, keyinfo, page, DFLT_INIT_HITS, page_buf, 0))
|
|
goto err1;
|
|
nod_flag = mi_test_if_nod(page_buf);
|
|
|
|
k_len = keyinfo->keylength - info->s->base.rec_reflength;
|
|
|
|
if(info->rtree_recursion_depth >= level)
|
|
{
|
|
k = page_buf + *saved_key;
|
|
if (!nod_flag)
|
|
{
|
|
/* Only leaf pages contain data references. */
|
|
/* Need to check next key with data reference. */
|
|
k = rt_PAGE_NEXT_KEY(k, k_len, nod_flag);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
k = rt_PAGE_FIRST_KEY(page_buf, nod_flag);
|
|
}
|
|
last = rt_PAGE_END(page_buf);
|
|
|
|
for (; k < last; k = rt_PAGE_NEXT_KEY(k, k_len, nod_flag))
|
|
{
|
|
if (nod_flag)
|
|
{
|
|
/* this is an internal node in the tree */
|
|
switch ((res = rtree_get_req(info, keyinfo, key_length,
|
|
_mi_kpos(nod_flag, k), level + 1)))
|
|
{
|
|
case 0: /* found - exit from recursion */
|
|
*saved_key = k - page_buf;
|
|
goto ok;
|
|
case 1: /* not found - continue searching */
|
|
info->rtree_recursion_depth = level;
|
|
break;
|
|
default:
|
|
case -1: /* error */
|
|
goto err1;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
/* this is a leaf */
|
|
uchar *after_key = rt_PAGE_NEXT_KEY(k, k_len, nod_flag);
|
|
info->lastpos = _mi_dpos(info, 0, after_key);
|
|
info->lastkey_length = k_len + info->s->base.rec_reflength;
|
|
memcpy(info->lastkey, k, info->lastkey_length);
|
|
|
|
info->rtree_recursion_depth = level;
|
|
*saved_key = k - page_buf;
|
|
|
|
if (after_key < last)
|
|
{
|
|
info->int_keypos = (uchar*)saved_key;
|
|
memcpy(info->buff, page_buf, keyinfo->block_length);
|
|
info->int_maxpos = rt_PAGE_END(info->buff);
|
|
info->buff_used = 0;
|
|
}
|
|
else
|
|
{
|
|
info->buff_used = 1;
|
|
}
|
|
|
|
res = 0;
|
|
goto ok;
|
|
}
|
|
}
|
|
info->lastpos = HA_OFFSET_ERROR;
|
|
my_errno = HA_ERR_KEY_NOT_FOUND;
|
|
res = 1;
|
|
|
|
ok:
|
|
my_afree((byte*)page_buf);
|
|
return res;
|
|
|
|
err1:
|
|
my_afree((byte*)page_buf);
|
|
info->lastpos = HA_OFFSET_ERROR;
|
|
return -1;
|
|
}
|
|
|
|
|
|
/*
|
|
Get first key in r-tree
|
|
|
|
RETURN
|
|
-1 Error
|
|
0 Found
|
|
1 Not found
|
|
*/
|
|
|
|
int rtree_get_first(MI_INFO *info, uint keynr, uint key_length)
|
|
{
|
|
my_off_t root;
|
|
MI_KEYDEF *keyinfo = info->s->keyinfo + keynr;
|
|
|
|
if ((root = info->s->state.key_root[keynr]) == HA_OFFSET_ERROR)
|
|
{
|
|
my_errno= HA_ERR_END_OF_FILE;
|
|
return -1;
|
|
}
|
|
|
|
info->rtree_recursion_depth = -1;
|
|
info->buff_used = 1;
|
|
|
|
return rtree_get_req(info, &keyinfo[keynr], key_length, root, 0);
|
|
}
|
|
|
|
|
|
/*
|
|
Get next key in r-tree
|
|
|
|
RETURN
|
|
-1 Error
|
|
0 Found
|
|
1 Not found
|
|
*/
|
|
|
|
int rtree_get_next(MI_INFO *info, uint keynr, uint key_length)
|
|
{
|
|
my_off_t root;
|
|
MI_KEYDEF *keyinfo = info->s->keyinfo + keynr;
|
|
|
|
if (!info->buff_used)
|
|
{
|
|
uint k_len = keyinfo->keylength - info->s->base.rec_reflength;
|
|
/* rt_PAGE_NEXT_KEY(info->int_keypos) */
|
|
uchar *key = info->buff + *(int*)info->int_keypos + k_len +
|
|
info->s->base.rec_reflength;
|
|
/* rt_PAGE_NEXT_KEY(key) */
|
|
uchar *after_key = key + k_len + info->s->base.rec_reflength;
|
|
|
|
info->lastpos = _mi_dpos(info, 0, after_key);
|
|
info->lastkey_length = k_len + info->s->base.rec_reflength;
|
|
memcpy(info->lastkey, key, k_len + info->s->base.rec_reflength);
|
|
|
|
*(int*)info->int_keypos = key - info->buff;
|
|
if (after_key >= info->int_maxpos)
|
|
{
|
|
info->buff_used = 1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
else
|
|
{
|
|
if ((root = info->s->state.key_root[keynr]) == HA_OFFSET_ERROR)
|
|
{
|
|
my_errno= HA_ERR_END_OF_FILE;
|
|
return -1;
|
|
}
|
|
|
|
return rtree_get_req(info, &keyinfo[keynr], key_length, root, 0);
|
|
}
|
|
}
|
|
|
|
|
|
/*
|
|
Choose non-leaf better key for insertion
|
|
*/
|
|
|
|
#ifdef PICK_BY_PERIMETER
|
|
static uchar *rtree_pick_key(MI_INFO *info, MI_KEYDEF *keyinfo, uchar *key,
|
|
uint key_length, uchar *page_buf, uint nod_flag)
|
|
{
|
|
double increase;
|
|
double best_incr = DBL_MAX;
|
|
double perimeter;
|
|
double best_perimeter;
|
|
uchar *best_key;
|
|
uchar *k = rt_PAGE_FIRST_KEY(page_buf, nod_flag);
|
|
uchar *last = rt_PAGE_END(page_buf);
|
|
|
|
LINT_INIT(best_perimeter);
|
|
LINT_INIT(best_key);
|
|
|
|
for (; k < last; k = rt_PAGE_NEXT_KEY(k, key_length, nod_flag))
|
|
{
|
|
if ((increase = rtree_perimeter_increase(keyinfo->seg, k, key, key_length,
|
|
&perimeter)) == -1)
|
|
return NULL;
|
|
if ((increase < best_incr)||
|
|
(increase == best_incr && perimeter < best_perimeter))
|
|
{
|
|
best_key = k;
|
|
best_perimeter= perimeter;
|
|
best_incr = increase;
|
|
}
|
|
}
|
|
return best_key;
|
|
}
|
|
|
|
#endif /*PICK_BY_PERIMETER*/
|
|
|
|
#ifdef PICK_BY_AREA
|
|
static uchar *rtree_pick_key(MI_INFO *info, MI_KEYDEF *keyinfo, uchar *key,
|
|
uint key_length, uchar *page_buf, uint nod_flag)
|
|
{
|
|
double increase;
|
|
double best_incr = DBL_MAX;
|
|
double area;
|
|
double best_area;
|
|
uchar *best_key;
|
|
uchar *k = rt_PAGE_FIRST_KEY(page_buf, nod_flag);
|
|
uchar *last = rt_PAGE_END(page_buf);
|
|
|
|
LINT_INIT(best_area);
|
|
LINT_INIT(best_key);
|
|
|
|
for (; k < last; k = rt_PAGE_NEXT_KEY(k, key_length, nod_flag))
|
|
{
|
|
/* The following is safe as -1.0 is an exact number */
|
|
if ((increase = rtree_area_increase(keyinfo->seg, k, key, key_length,
|
|
&area)) == -1.0)
|
|
return NULL;
|
|
/* The following should be safe, even if we compare doubles */
|
|
if (increase < best_incr)
|
|
{
|
|
best_key = k;
|
|
best_area = area;
|
|
best_incr = increase;
|
|
}
|
|
else
|
|
{
|
|
/* The following should be safe, even if we compare doubles */
|
|
if ((increase == best_incr) && (area < best_area))
|
|
{
|
|
best_key = k;
|
|
best_area = area;
|
|
best_incr = increase;
|
|
}
|
|
}
|
|
}
|
|
return best_key;
|
|
}
|
|
|
|
#endif /*PICK_BY_AREA*/
|
|
|
|
/*
|
|
Go down and insert key into tree
|
|
|
|
RETURN
|
|
-1 Error
|
|
0 Child was not split
|
|
1 Child was split
|
|
*/
|
|
|
|
static int rtree_insert_req(MI_INFO *info, MI_KEYDEF *keyinfo, uchar *key,
|
|
uint key_length, my_off_t page, my_off_t *new_page,
|
|
int ins_level, int level)
|
|
{
|
|
uchar *k;
|
|
uint nod_flag;
|
|
uchar *page_buf;
|
|
int res;
|
|
|
|
if (!(page_buf = (uchar*)my_alloca((uint)keyinfo->block_length +
|
|
MI_MAX_KEY_BUFF)))
|
|
{
|
|
my_errno = HA_ERR_OUT_OF_MEM;
|
|
return -1;
|
|
}
|
|
if (!_mi_fetch_keypage(info, keyinfo, page, DFLT_INIT_HITS, page_buf, 0))
|
|
goto err1;
|
|
nod_flag = mi_test_if_nod(page_buf);
|
|
|
|
if ((ins_level == -1 && nod_flag) || /* key: go down to leaf */
|
|
(ins_level > -1 && ins_level > level)) /* branch: go down to ins_level */
|
|
{
|
|
if ((k = rtree_pick_key(info, keyinfo, key, key_length, page_buf,
|
|
nod_flag)) == NULL)
|
|
goto err1;
|
|
switch ((res = rtree_insert_req(info, keyinfo, key, key_length,
|
|
_mi_kpos(nod_flag, k), new_page, ins_level, level + 1)))
|
|
{
|
|
case 0: /* child was not split */
|
|
{
|
|
rtree_combine_rect(keyinfo->seg, k, key, k, key_length);
|
|
if (_mi_write_keypage(info, keyinfo, page, DFLT_INIT_HITS, page_buf))
|
|
goto err1;
|
|
goto ok;
|
|
}
|
|
case 1: /* child was split */
|
|
{
|
|
uchar *new_key = page_buf + keyinfo->block_length + nod_flag;
|
|
/* set proper MBR for key */
|
|
if (rtree_set_key_mbr(info, keyinfo, k, key_length,
|
|
_mi_kpos(nod_flag, k)))
|
|
goto err1;
|
|
/* add new key for new page */
|
|
_mi_kpointer(info, new_key - nod_flag, *new_page);
|
|
if (rtree_set_key_mbr(info, keyinfo, new_key, key_length, *new_page))
|
|
goto err1;
|
|
res = rtree_add_key(info, keyinfo, new_key, key_length,
|
|
page_buf, new_page);
|
|
if (_mi_write_keypage(info, keyinfo, page, DFLT_INIT_HITS, page_buf))
|
|
goto err1;
|
|
goto ok;
|
|
}
|
|
default:
|
|
case -1: /* error */
|
|
{
|
|
goto err1;
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
res = rtree_add_key(info, keyinfo, key, key_length, page_buf, new_page);
|
|
if (_mi_write_keypage(info, keyinfo, page, DFLT_INIT_HITS, page_buf))
|
|
goto err1;
|
|
goto ok;
|
|
}
|
|
|
|
ok:
|
|
my_afree((byte*)page_buf);
|
|
return res;
|
|
|
|
err1:
|
|
my_afree((byte*)page_buf);
|
|
return -1;
|
|
}
|
|
|
|
|
|
/*
|
|
Insert key into the tree
|
|
|
|
RETURN
|
|
-1 Error
|
|
0 Root was not split
|
|
1 Root was split
|
|
*/
|
|
|
|
static int rtree_insert_level(MI_INFO *info, uint keynr, uchar *key,
|
|
uint key_length, int ins_level)
|
|
{
|
|
my_off_t old_root;
|
|
MI_KEYDEF *keyinfo = info->s->keyinfo + keynr;
|
|
int res;
|
|
my_off_t new_page;
|
|
|
|
if ((old_root = info->s->state.key_root[keynr]) == HA_OFFSET_ERROR)
|
|
{
|
|
int res;
|
|
|
|
if ((old_root = _mi_new(info, keyinfo, DFLT_INIT_HITS)) == HA_OFFSET_ERROR)
|
|
return -1;
|
|
info->buff_used = 1;
|
|
mi_putint(info->buff, 2, 0);
|
|
res = rtree_add_key(info, keyinfo, key, key_length, info->buff, NULL);
|
|
if (_mi_write_keypage(info, keyinfo, old_root, DFLT_INIT_HITS, info->buff))
|
|
return 1;
|
|
info->s->state.key_root[keynr] = old_root;
|
|
return res;
|
|
}
|
|
|
|
switch ((res = rtree_insert_req(info, keyinfo, key, key_length,
|
|
old_root, &new_page, ins_level, 0)))
|
|
{
|
|
case 0: /* root was not split */
|
|
{
|
|
break;
|
|
}
|
|
case 1: /* root was split, grow a new root */
|
|
{
|
|
uchar *new_root_buf;
|
|
my_off_t new_root;
|
|
uchar *new_key;
|
|
uint nod_flag = info->s->base.key_reflength;
|
|
|
|
if (!(new_root_buf = (uchar*)my_alloca((uint)keyinfo->block_length +
|
|
MI_MAX_KEY_BUFF)))
|
|
{
|
|
my_errno = HA_ERR_OUT_OF_MEM;
|
|
return -1;
|
|
}
|
|
|
|
mi_putint(new_root_buf, 2, nod_flag);
|
|
if ((new_root = _mi_new(info, keyinfo, DFLT_INIT_HITS)) ==
|
|
HA_OFFSET_ERROR)
|
|
goto err1;
|
|
|
|
new_key = new_root_buf + keyinfo->block_length + nod_flag;
|
|
|
|
_mi_kpointer(info, new_key - nod_flag, old_root);
|
|
if (rtree_set_key_mbr(info, keyinfo, new_key, key_length, old_root))
|
|
goto err1;
|
|
if (rtree_add_key(info, keyinfo, new_key, key_length, new_root_buf, NULL)
|
|
== -1)
|
|
goto err1;
|
|
_mi_kpointer(info, new_key - nod_flag, new_page);
|
|
if (rtree_set_key_mbr(info, keyinfo, new_key, key_length, new_page))
|
|
goto err1;
|
|
if (rtree_add_key(info, keyinfo, new_key, key_length, new_root_buf, NULL)
|
|
== -1)
|
|
goto err1;
|
|
if (_mi_write_keypage(info, keyinfo, new_root,
|
|
DFLT_INIT_HITS, new_root_buf))
|
|
goto err1;
|
|
info->s->state.key_root[keynr] = new_root;
|
|
|
|
my_afree((byte*)new_root_buf);
|
|
break;
|
|
err1:
|
|
my_afree((byte*)new_root_buf);
|
|
return -1;
|
|
}
|
|
default:
|
|
case -1: /* error */
|
|
{
|
|
break;
|
|
}
|
|
}
|
|
return res;
|
|
}
|
|
|
|
|
|
/*
|
|
Insert key into the tree - interface function
|
|
|
|
RETURN
|
|
-1 Error
|
|
0 OK
|
|
*/
|
|
|
|
int rtree_insert(MI_INFO *info, uint keynr, uchar *key, uint key_length)
|
|
{
|
|
return (!key_length ||
|
|
(rtree_insert_level(info, keynr, key, key_length, -1) == -1)) ? -1 : 0;
|
|
}
|
|
|
|
|
|
/*
|
|
Fill reinsert page buffer
|
|
|
|
RETURN
|
|
-1 Error
|
|
0 OK
|
|
*/
|
|
|
|
static int rtree_fill_reinsert_list(stPageList *ReinsertList, my_off_t page,
|
|
int level)
|
|
{
|
|
if (ReinsertList->n_pages == ReinsertList->m_pages)
|
|
{
|
|
ReinsertList->m_pages += REINSERT_BUFFER_INC;
|
|
if (!(ReinsertList->pages = (stPageLevel*)my_realloc((gptr)ReinsertList->pages,
|
|
ReinsertList->m_pages * sizeof(stPageLevel), MYF(MY_ALLOW_ZERO_PTR))))
|
|
goto err1;
|
|
}
|
|
/* save page to ReinsertList */
|
|
ReinsertList->pages[ReinsertList->n_pages].offs = page;
|
|
ReinsertList->pages[ReinsertList->n_pages].level = level;
|
|
ReinsertList->n_pages++;
|
|
return 0;
|
|
|
|
err1:
|
|
return -1;
|
|
}
|
|
|
|
|
|
/*
|
|
Go down and delete key from the tree
|
|
|
|
RETURN
|
|
-1 Error
|
|
0 Deleted
|
|
1 Not found
|
|
2 Empty leaf
|
|
*/
|
|
|
|
static int rtree_delete_req(MI_INFO *info, MI_KEYDEF *keyinfo, uchar *key,
|
|
uint key_length, my_off_t page, uint *page_size,
|
|
stPageList *ReinsertList, int level)
|
|
{
|
|
uchar *k;
|
|
uchar *last;
|
|
ulong i;
|
|
uint nod_flag;
|
|
uchar *page_buf;
|
|
int res;
|
|
|
|
if (!(page_buf = (uchar*)my_alloca((uint)keyinfo->block_length)))
|
|
{
|
|
my_errno = HA_ERR_OUT_OF_MEM;
|
|
return -1;
|
|
}
|
|
if (!_mi_fetch_keypage(info, keyinfo, page, DFLT_INIT_HITS, page_buf, 0))
|
|
goto err1;
|
|
nod_flag = mi_test_if_nod(page_buf);
|
|
|
|
k = rt_PAGE_FIRST_KEY(page_buf, nod_flag);
|
|
last = rt_PAGE_END(page_buf);
|
|
|
|
for (i = 0; k < last; k = rt_PAGE_NEXT_KEY(k, key_length, nod_flag), ++i)
|
|
{
|
|
if (nod_flag)
|
|
{
|
|
/* not leaf */
|
|
if (!rtree_key_cmp(keyinfo->seg, key, k, key_length, MBR_WITHIN))
|
|
{
|
|
switch ((res = rtree_delete_req(info, keyinfo, key, key_length,
|
|
_mi_kpos(nod_flag, k), page_size, ReinsertList, level + 1)))
|
|
{
|
|
case 0: /* deleted */
|
|
{
|
|
/* test page filling */
|
|
if (*page_size + key_length >= rt_PAGE_MIN_SIZE(keyinfo->block_length))
|
|
{
|
|
/* OK */
|
|
if (rtree_set_key_mbr(info, keyinfo, k, key_length,
|
|
_mi_kpos(nod_flag, k)))
|
|
goto err1;
|
|
if (_mi_write_keypage(info, keyinfo, page,
|
|
DFLT_INIT_HITS, page_buf))
|
|
goto err1;
|
|
}
|
|
else
|
|
{
|
|
/* too small: delete key & add it descendant to reinsert list */
|
|
if (rtree_fill_reinsert_list(ReinsertList, _mi_kpos(nod_flag, k),
|
|
level + 1))
|
|
goto err1;
|
|
rtree_delete_key(info, page_buf, k, key_length, nod_flag);
|
|
if (_mi_write_keypage(info, keyinfo, page,
|
|
DFLT_INIT_HITS, page_buf))
|
|
goto err1;
|
|
*page_size = mi_getint(page_buf);
|
|
}
|
|
|
|
goto ok;
|
|
}
|
|
case 1: /* not found - continue searching */
|
|
{
|
|
break;
|
|
}
|
|
case 2: /* vacuous case: last key in the leaf */
|
|
{
|
|
rtree_delete_key(info, page_buf, k, key_length, nod_flag);
|
|
if (_mi_write_keypage(info, keyinfo, page,
|
|
DFLT_INIT_HITS, page_buf))
|
|
goto err1;
|
|
*page_size = mi_getint(page_buf);
|
|
res = 0;
|
|
goto ok;
|
|
}
|
|
default: /* error */
|
|
case -1:
|
|
{
|
|
goto err1;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
/* leaf */
|
|
if (!rtree_key_cmp(keyinfo->seg, key, k, key_length, MBR_EQUAL | MBR_DATA))
|
|
{
|
|
rtree_delete_key(info, page_buf, k, key_length, nod_flag);
|
|
*page_size = mi_getint(page_buf);
|
|
if (*page_size == 2)
|
|
{
|
|
/* last key in the leaf */
|
|
res = 2;
|
|
if (_mi_dispose(info, keyinfo, page, DFLT_INIT_HITS))
|
|
goto err1;
|
|
}
|
|
else
|
|
{
|
|
res = 0;
|
|
if (_mi_write_keypage(info, keyinfo, page, DFLT_INIT_HITS, page_buf))
|
|
goto err1;
|
|
}
|
|
goto ok;
|
|
}
|
|
}
|
|
}
|
|
res = 1;
|
|
|
|
ok:
|
|
my_afree((byte*)page_buf);
|
|
return res;
|
|
|
|
err1:
|
|
my_afree((byte*)page_buf);
|
|
return -1;
|
|
}
|
|
|
|
|
|
/*
|
|
Delete key - interface function
|
|
|
|
RETURN
|
|
-1 Error
|
|
0 Deleted
|
|
*/
|
|
|
|
int rtree_delete(MI_INFO *info, uint keynr, uchar *key, uint key_length)
|
|
{
|
|
uint page_size;
|
|
stPageList ReinsertList;
|
|
my_off_t old_root;
|
|
MI_KEYDEF *keyinfo = info->s->keyinfo + keynr;
|
|
|
|
if ((old_root = info->s->state.key_root[keynr]) == HA_OFFSET_ERROR)
|
|
{
|
|
my_errno= HA_ERR_END_OF_FILE;
|
|
return -1;
|
|
}
|
|
|
|
ReinsertList.pages = NULL;
|
|
ReinsertList.n_pages = 0;
|
|
ReinsertList.m_pages = 0;
|
|
|
|
switch (rtree_delete_req(info, keyinfo, key, key_length, old_root,
|
|
&page_size, &ReinsertList, 0))
|
|
{
|
|
case 2:
|
|
{
|
|
info->s->state.key_root[keynr] = HA_OFFSET_ERROR;
|
|
return 0;
|
|
}
|
|
case 0:
|
|
{
|
|
uint nod_flag;
|
|
ulong i;
|
|
for (i = 0; i < ReinsertList.n_pages; ++i)
|
|
{
|
|
uchar *page_buf;
|
|
uint nod_flag;
|
|
uchar *k;
|
|
uchar *last;
|
|
|
|
if (!(page_buf = (uchar*)my_alloca((uint)keyinfo->block_length)))
|
|
{
|
|
my_errno = HA_ERR_OUT_OF_MEM;
|
|
goto err1;
|
|
}
|
|
if (!_mi_fetch_keypage(info, keyinfo, ReinsertList.pages[i].offs,
|
|
DFLT_INIT_HITS, page_buf, 0))
|
|
goto err1;
|
|
nod_flag = mi_test_if_nod(page_buf);
|
|
k = rt_PAGE_FIRST_KEY(page_buf, nod_flag);
|
|
last = rt_PAGE_END(page_buf);
|
|
for (; k < last; k = rt_PAGE_NEXT_KEY(k, key_length, nod_flag))
|
|
{
|
|
if (rtree_insert_level(info, keynr, k, key_length,
|
|
ReinsertList.pages[i].level) == -1)
|
|
{
|
|
my_afree((byte*)page_buf);
|
|
goto err1;
|
|
}
|
|
}
|
|
my_afree((byte*)page_buf);
|
|
if (_mi_dispose(info, keyinfo, ReinsertList.pages[i].offs,
|
|
DFLT_INIT_HITS))
|
|
goto err1;
|
|
}
|
|
if (ReinsertList.pages)
|
|
my_free((byte*) ReinsertList.pages, MYF(0));
|
|
|
|
/* check for redundant root (not leaf, 1 child) and eliminate */
|
|
if ((old_root = info->s->state.key_root[keynr]) == HA_OFFSET_ERROR)
|
|
goto err1;
|
|
if (!_mi_fetch_keypage(info, keyinfo, old_root, DFLT_INIT_HITS,
|
|
info->buff, 0))
|
|
goto err1;
|
|
nod_flag = mi_test_if_nod(info->buff);
|
|
page_size = mi_getint(info->buff);
|
|
if (nod_flag && (page_size == 2 + key_length + nod_flag))
|
|
{
|
|
my_off_t new_root = _mi_kpos(nod_flag,
|
|
rt_PAGE_FIRST_KEY(info->buff, nod_flag));
|
|
if (_mi_dispose(info, keyinfo, old_root, DFLT_INIT_HITS))
|
|
goto err1;
|
|
info->s->state.key_root[keynr] = new_root;
|
|
}
|
|
info->update= HA_STATE_DELETED;
|
|
return 0;
|
|
|
|
err1:
|
|
return -1;
|
|
}
|
|
case 1: /* not found */
|
|
{
|
|
my_errno = HA_ERR_KEY_NOT_FOUND;
|
|
return -1;
|
|
}
|
|
default:
|
|
case -1: /* error */
|
|
{
|
|
return -1;
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
/*
|
|
Estimate number of suitable keys in the tree
|
|
|
|
RETURN
|
|
estimated value
|
|
*/
|
|
|
|
ha_rows rtree_estimate(MI_INFO *info, uint keynr, uchar *key,
|
|
uint key_length, uint flag)
|
|
{
|
|
MI_KEYDEF *keyinfo = info->s->keyinfo + keynr;
|
|
my_off_t root;
|
|
uint i = 0;
|
|
uchar *k;
|
|
uchar *last;
|
|
uint nod_flag;
|
|
uchar *page_buf;
|
|
uint k_len;
|
|
double area = 0;
|
|
ha_rows res = 0;
|
|
|
|
if (flag & MBR_DISJOINT)
|
|
return info->state->records;
|
|
|
|
if ((root = info->s->state.key_root[keynr]) == HA_OFFSET_ERROR)
|
|
return HA_POS_ERROR;
|
|
if (!(page_buf = (uchar*)my_alloca((uint)keyinfo->block_length)))
|
|
return HA_POS_ERROR;
|
|
if (!_mi_fetch_keypage(info, keyinfo, root, DFLT_INIT_HITS, page_buf, 0))
|
|
goto err1;
|
|
nod_flag = mi_test_if_nod(page_buf);
|
|
|
|
k_len = keyinfo->keylength - info->s->base.rec_reflength;
|
|
|
|
k = rt_PAGE_FIRST_KEY(page_buf, nod_flag);
|
|
last = rt_PAGE_END(page_buf);
|
|
|
|
for (; k < last; k = rt_PAGE_NEXT_KEY(k, k_len, nod_flag), ++i)
|
|
{
|
|
if (nod_flag)
|
|
{
|
|
double k_area = rtree_rect_volume(keyinfo->seg, k, key_length);
|
|
|
|
/* The following should be safe, even if we compare doubles */
|
|
if (k_area == 0)
|
|
{
|
|
if (flag & (MBR_CONTAIN | MBR_INTERSECT))
|
|
{
|
|
area += 1;
|
|
}
|
|
else if (flag & (MBR_WITHIN | MBR_EQUAL))
|
|
{
|
|
if (!rtree_key_cmp(keyinfo->seg, key, k, key_length, MBR_WITHIN))
|
|
area += 1;
|
|
}
|
|
else
|
|
goto err1;
|
|
}
|
|
else
|
|
{
|
|
if (flag & (MBR_CONTAIN | MBR_INTERSECT))
|
|
{
|
|
area += rtree_overlapping_area(keyinfo->seg, key, k, key_length) /
|
|
k_area;
|
|
}
|
|
else if (flag & (MBR_WITHIN | MBR_EQUAL))
|
|
{
|
|
if (!rtree_key_cmp(keyinfo->seg, key, k, key_length, MBR_WITHIN))
|
|
area += rtree_rect_volume(keyinfo->seg, key, key_length) /
|
|
k_area;
|
|
}
|
|
else
|
|
goto err1;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if (!rtree_key_cmp(keyinfo->seg, key, k, key_length, flag))
|
|
++res;
|
|
}
|
|
}
|
|
if (nod_flag)
|
|
{
|
|
if (i)
|
|
res = (ha_rows) (area / i * info->state->records);
|
|
else
|
|
res = HA_POS_ERROR;
|
|
}
|
|
|
|
my_afree((byte*)page_buf);
|
|
return res;
|
|
|
|
err1:
|
|
my_afree((byte*)page_buf);
|
|
return HA_POS_ERROR;
|
|
}
|
|
|
|
#endif /*HAVE_RTREE_KEYS*/
|
|
|