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
736 lines
20 KiB
C
736 lines
20 KiB
C
/* Copyright (C) 2001-2005 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; 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 */
|
|
|
|
/* Written by Sergei A. Golubchik, who has a shared copyright to this code */
|
|
|
|
/* TODO: add caching - pre-read several index entries at once */
|
|
|
|
#define FT_CORE
|
|
#include "ftdefs.h"
|
|
|
|
/* search with boolean queries */
|
|
|
|
static double _wghts[11]=
|
|
{
|
|
0.131687242798354,
|
|
0.197530864197531,
|
|
0.296296296296296,
|
|
0.444444444444444,
|
|
0.666666666666667,
|
|
1.000000000000000,
|
|
1.500000000000000,
|
|
2.250000000000000,
|
|
3.375000000000000,
|
|
5.062500000000000,
|
|
7.593750000000000};
|
|
static double *wghts=_wghts+5; /* wghts[i] = 1.5**i */
|
|
|
|
static double _nwghts[11]=
|
|
{
|
|
-0.065843621399177,
|
|
-0.098765432098766,
|
|
-0.148148148148148,
|
|
-0.222222222222222,
|
|
-0.333333333333334,
|
|
-0.500000000000000,
|
|
-0.750000000000000,
|
|
-1.125000000000000,
|
|
-1.687500000000000,
|
|
-2.531250000000000,
|
|
-3.796875000000000};
|
|
static double *nwghts=_nwghts+5; /* nwghts[i] = -0.5*1.5**i */
|
|
|
|
#define FTB_FLAG_TRUNC 1
|
|
/* At most one of the following flags can be set */
|
|
#define FTB_FLAG_YES 2
|
|
#define FTB_FLAG_NO 4
|
|
#define FTB_FLAG_WONLY 8
|
|
|
|
typedef struct st_ftb_expr FTB_EXPR;
|
|
struct st_ftb_expr
|
|
{
|
|
FTB_EXPR *up;
|
|
uint flags;
|
|
/* ^^^^^^^^^^^^^^^^^^ FTB_{EXPR,WORD} common section */
|
|
my_off_t docid[2];
|
|
float weight;
|
|
float cur_weight;
|
|
LIST *phrase; /* phrase words */
|
|
uint yesses; /* number of "yes" words matched */
|
|
uint nos; /* number of "no" words matched */
|
|
uint ythresh; /* number of "yes" words in expr */
|
|
uint yweaks; /* number of "yes" words for scan only */
|
|
};
|
|
|
|
typedef struct st_ftb_word
|
|
{
|
|
FTB_EXPR *up;
|
|
uint flags;
|
|
/* ^^^^^^^^^^^^^^^^^^ FTB_{EXPR,WORD} common section */
|
|
my_off_t docid[2]; /* for index search and for scan */
|
|
my_off_t key_root;
|
|
MI_KEYDEF *keyinfo;
|
|
float weight;
|
|
uint ndepth;
|
|
uint len;
|
|
uchar off;
|
|
byte word[1];
|
|
} FTB_WORD;
|
|
|
|
typedef struct st_ft_info
|
|
{
|
|
struct _ft_vft *please;
|
|
MI_INFO *info;
|
|
CHARSET_INFO *charset;
|
|
FTB_EXPR *root;
|
|
FTB_WORD **list;
|
|
MEM_ROOT mem_root;
|
|
QUEUE queue;
|
|
TREE no_dupes;
|
|
my_off_t lastpos;
|
|
uint keynr;
|
|
uchar with_scan;
|
|
enum { UNINITIALIZED, READY, INDEX_SEARCH, INDEX_DONE } state;
|
|
} FTB;
|
|
|
|
static int FTB_WORD_cmp(my_off_t *v, FTB_WORD *a, FTB_WORD *b)
|
|
{
|
|
int i;
|
|
|
|
/* if a==curdoc, take it as a < b */
|
|
if (v && a->docid[0] == *v)
|
|
return -1;
|
|
|
|
/* ORDER BY docid, ndepth DESC */
|
|
i=CMP_NUM(a->docid[0], b->docid[0]);
|
|
if (!i)
|
|
i=CMP_NUM(b->ndepth,a->ndepth);
|
|
return i;
|
|
}
|
|
|
|
static int FTB_WORD_cmp_list(CHARSET_INFO *cs, FTB_WORD **a, FTB_WORD **b)
|
|
{
|
|
/* ORDER BY word DESC, ndepth DESC */
|
|
int i= mi_compare_text(cs, (uchar*) (*b)->word+1,(*b)->len-1,
|
|
(uchar*) (*a)->word+1,(*a)->len-1,0,0);
|
|
if (!i)
|
|
i=CMP_NUM((*b)->ndepth,(*a)->ndepth);
|
|
return i;
|
|
}
|
|
|
|
static void _ftb_parse_query(FTB *ftb, byte **start, byte *end,
|
|
FTB_EXPR *up, uint depth, byte *up_quot)
|
|
{
|
|
byte res;
|
|
FTB_PARAM param;
|
|
FT_WORD w;
|
|
FTB_WORD *ftbw;
|
|
FTB_EXPR *ftbe;
|
|
FT_WORD *phrase_word;
|
|
LIST *phrase_list;
|
|
uint extra=HA_FT_WLEN+ftb->info->s->rec_reflength; /* just a shortcut */
|
|
|
|
if (ftb->state != UNINITIALIZED)
|
|
return;
|
|
|
|
param.prev=' ';
|
|
param.quot= up_quot;
|
|
while ((res=ft_get_word(ftb->charset,start,end,&w,¶m)))
|
|
{
|
|
int r=param.plusminus;
|
|
float weight= (float) (param.pmsign ? nwghts : wghts)[(r>5)?5:((r<-5)?-5:r)];
|
|
switch (res) {
|
|
case 1: /* word found */
|
|
ftbw=(FTB_WORD *)alloc_root(&ftb->mem_root,
|
|
sizeof(FTB_WORD) +
|
|
(param.trunc ? MI_MAX_KEY_BUFF :
|
|
w.len*ftb->charset->mbmaxlen+extra));
|
|
ftbw->len=w.len+1;
|
|
ftbw->flags=0;
|
|
ftbw->off=0;
|
|
if (param.yesno>0) ftbw->flags|=FTB_FLAG_YES;
|
|
if (param.yesno<0) ftbw->flags|=FTB_FLAG_NO;
|
|
if (param.trunc) ftbw->flags|=FTB_FLAG_TRUNC;
|
|
ftbw->weight=weight;
|
|
ftbw->up=up;
|
|
ftbw->docid[0]=ftbw->docid[1]=HA_OFFSET_ERROR;
|
|
ftbw->ndepth= (param.yesno<0) + depth;
|
|
ftbw->key_root=HA_OFFSET_ERROR;
|
|
memcpy(ftbw->word+1, w.pos, w.len);
|
|
ftbw->word[0]=w.len;
|
|
if (param.yesno > 0) up->ythresh++;
|
|
queue_insert(& ftb->queue, (byte *)ftbw);
|
|
ftb->with_scan|=(param.trunc & FTB_FLAG_TRUNC);
|
|
case 4: /* not indexed word (stopword or too short/long) */
|
|
if (! up_quot) break;
|
|
phrase_word= (FT_WORD *)alloc_root(&ftb->mem_root, sizeof(FT_WORD));
|
|
phrase_list= (LIST *)alloc_root(&ftb->mem_root, sizeof(LIST));
|
|
phrase_word->pos= w.pos;
|
|
phrase_word->len= w.len;
|
|
phrase_list->data= (void *)phrase_word;
|
|
up->phrase= list_add(up->phrase, phrase_list);
|
|
break;
|
|
case 2: /* left bracket */
|
|
ftbe=(FTB_EXPR *)alloc_root(&ftb->mem_root, sizeof(FTB_EXPR));
|
|
ftbe->flags=0;
|
|
if (param.yesno>0) ftbe->flags|=FTB_FLAG_YES;
|
|
if (param.yesno<0) ftbe->flags|=FTB_FLAG_NO;
|
|
ftbe->weight=weight;
|
|
ftbe->up=up;
|
|
ftbe->ythresh=ftbe->yweaks=0;
|
|
ftbe->docid[0]=ftbe->docid[1]=HA_OFFSET_ERROR;
|
|
ftbe->phrase= NULL;
|
|
if (param.quot) ftb->with_scan|=2;
|
|
if (param.yesno > 0) up->ythresh++;
|
|
_ftb_parse_query(ftb, start, end, ftbe, depth+1, param.quot);
|
|
param.quot=0;
|
|
break;
|
|
case 3: /* right bracket */
|
|
if (up_quot) up->phrase= list_reverse(up->phrase);
|
|
return;
|
|
}
|
|
}
|
|
return;
|
|
}
|
|
|
|
static int _ftb_no_dupes_cmp(void* not_used __attribute__((unused)),
|
|
const void *a,const void *b)
|
|
{
|
|
return CMP_NUM((*((my_off_t*)a)), (*((my_off_t*)b)));
|
|
}
|
|
|
|
/* returns 1 if the search was finished (must-word wasn't found) */
|
|
static int _ft2_search(FTB *ftb, FTB_WORD *ftbw, my_bool init_search)
|
|
{
|
|
int r;
|
|
int subkeys=1;
|
|
my_bool can_go_down;
|
|
MI_INFO *info=ftb->info;
|
|
uint off, extra=HA_FT_WLEN+info->s->base.rec_reflength;
|
|
byte *lastkey_buf=ftbw->word+ftbw->off;
|
|
LINT_INIT(off);
|
|
|
|
LINT_INIT(off);
|
|
if (ftbw->flags & FTB_FLAG_TRUNC)
|
|
lastkey_buf+=ftbw->len;
|
|
|
|
if (init_search)
|
|
{
|
|
ftbw->key_root=info->s->state.key_root[ftb->keynr];
|
|
ftbw->keyinfo=info->s->keyinfo+ftb->keynr;
|
|
|
|
r=_mi_search(info, ftbw->keyinfo, (uchar*) ftbw->word, ftbw->len,
|
|
SEARCH_FIND | SEARCH_BIGGER, ftbw->key_root);
|
|
}
|
|
else
|
|
{
|
|
r=_mi_search(info, ftbw->keyinfo, (uchar*) lastkey_buf,
|
|
USE_WHOLE_KEY, SEARCH_BIGGER, ftbw->key_root);
|
|
}
|
|
|
|
can_go_down=(!ftbw->off && (init_search || (ftbw->flags & FTB_FLAG_TRUNC)));
|
|
/* Skip rows inserted by concurrent insert */
|
|
while (!r)
|
|
{
|
|
if (can_go_down)
|
|
{
|
|
/* going down ? */
|
|
off=info->lastkey_length-extra;
|
|
subkeys=ft_sintXkorr(info->lastkey+off);
|
|
}
|
|
if (subkeys<0 || info->lastpos < info->state->data_file_length)
|
|
break;
|
|
r= _mi_search_next(info, ftbw->keyinfo, info->lastkey,
|
|
info->lastkey_length,
|
|
SEARCH_BIGGER, ftbw->key_root);
|
|
}
|
|
|
|
if (!r && !ftbw->off)
|
|
{
|
|
r= mi_compare_text(ftb->charset,
|
|
info->lastkey+1,
|
|
info->lastkey_length-extra-1,
|
|
(uchar*) ftbw->word+1,
|
|
ftbw->len-1,
|
|
(my_bool) (ftbw->flags & FTB_FLAG_TRUNC),0);
|
|
}
|
|
|
|
if (r) /* not found */
|
|
{
|
|
if (!ftbw->off || !(ftbw->flags & FTB_FLAG_TRUNC))
|
|
{
|
|
ftbw->docid[0]=HA_OFFSET_ERROR;
|
|
if ((ftbw->flags & FTB_FLAG_YES) && ftbw->up->up==0)
|
|
{
|
|
/*
|
|
This word MUST BE present in every document returned,
|
|
so we can stop the search right now
|
|
*/
|
|
ftb->state=INDEX_DONE;
|
|
return 1; /* search is done */
|
|
}
|
|
else
|
|
return 0;
|
|
}
|
|
|
|
/* going up to the first-level tree to continue search there */
|
|
_mi_dpointer(info, (uchar*) (lastkey_buf+HA_FT_WLEN), ftbw->key_root);
|
|
ftbw->key_root=info->s->state.key_root[ftb->keynr];
|
|
ftbw->keyinfo=info->s->keyinfo+ftb->keynr;
|
|
ftbw->off=0;
|
|
return _ft2_search(ftb, ftbw, 0);
|
|
}
|
|
|
|
/* matching key found */
|
|
memcpy(lastkey_buf, info->lastkey, info->lastkey_length);
|
|
if (lastkey_buf == ftbw->word)
|
|
ftbw->len=info->lastkey_length-extra;
|
|
|
|
/* going down ? */
|
|
if (subkeys<0)
|
|
{
|
|
/*
|
|
yep, going down, to the second-level tree
|
|
TODO here: subkey-based optimization
|
|
*/
|
|
ftbw->off=off;
|
|
ftbw->key_root=info->lastpos;
|
|
ftbw->keyinfo=& info->s->ft2_keyinfo;
|
|
r=_mi_search_first(info, ftbw->keyinfo, ftbw->key_root);
|
|
DBUG_ASSERT(r==0); /* found something */
|
|
memcpy(lastkey_buf+off, info->lastkey, info->lastkey_length);
|
|
}
|
|
ftbw->docid[0]=info->lastpos;
|
|
return 0;
|
|
}
|
|
|
|
static void _ftb_init_index_search(FT_INFO *ftb)
|
|
{
|
|
int i;
|
|
FTB_WORD *ftbw;
|
|
|
|
if ((ftb->state != READY && ftb->state !=INDEX_DONE) ||
|
|
ftb->keynr == NO_SUCH_KEY)
|
|
return;
|
|
ftb->state=INDEX_SEARCH;
|
|
|
|
for (i=ftb->queue.elements; i; i--)
|
|
{
|
|
ftbw=(FTB_WORD *)(ftb->queue.root[i]);
|
|
|
|
if (ftbw->flags & FTB_FLAG_TRUNC)
|
|
{
|
|
/*
|
|
special treatment for truncation operator
|
|
1. there are some (besides this) +words
|
|
| no need to search in the index, it can never ADD new rows
|
|
| to the result, and to remove half-matched rows we do scan anyway
|
|
2. -trunc*
|
|
| same as 1.
|
|
3. in 1 and 2, +/- need not be on the same expr. level,
|
|
but can be on any upper level, as in +word +(trunc1* trunc2*)
|
|
4. otherwise
|
|
| We have to index-search for this prefix.
|
|
| It may cause duplicates, as in the index (sorted by <word,docid>)
|
|
| <aaaa,row1>
|
|
| <aabb,row2>
|
|
| <aacc,row1>
|
|
| Searching for "aa*" will find row1 twice...
|
|
*/
|
|
FTB_EXPR *ftbe;
|
|
for (ftbe=(FTB_EXPR*)ftbw;
|
|
ftbe->up && !(ftbe->up->flags & FTB_FLAG_TRUNC);
|
|
ftbe->up->flags|= FTB_FLAG_TRUNC, ftbe=ftbe->up)
|
|
{
|
|
if (ftbe->flags & FTB_FLAG_NO || /* 2 */
|
|
ftbe->up->ythresh - ftbe->up->yweaks >1) /* 1 */
|
|
{
|
|
FTB_EXPR *top_ftbe=ftbe->up;
|
|
ftbw->docid[0]=HA_OFFSET_ERROR;
|
|
for (ftbe=(FTB_EXPR *)ftbw;
|
|
ftbe != top_ftbe && !(ftbe->flags & FTB_FLAG_NO);
|
|
ftbe=ftbe->up)
|
|
ftbe->up->yweaks++;
|
|
ftbe=0;
|
|
break;
|
|
}
|
|
}
|
|
if (!ftbe)
|
|
continue;
|
|
/* 4 */
|
|
if (!is_tree_inited(& ftb->no_dupes))
|
|
init_tree(& ftb->no_dupes,0,0,sizeof(my_off_t),
|
|
_ftb_no_dupes_cmp,0,0,0);
|
|
else
|
|
reset_tree(& ftb->no_dupes);
|
|
}
|
|
|
|
ftbw->off=0; /* in case of reinit */
|
|
if (_ft2_search(ftb, ftbw, 1))
|
|
return;
|
|
}
|
|
queue_fix(& ftb->queue);
|
|
}
|
|
|
|
|
|
FT_INFO * ft_init_boolean_search(MI_INFO *info, uint keynr, byte *query,
|
|
uint query_len, CHARSET_INFO *cs)
|
|
{
|
|
FTB *ftb;
|
|
FTB_EXPR *ftbe;
|
|
uint res;
|
|
|
|
if (!(ftb=(FTB *)my_malloc(sizeof(FTB), MYF(MY_WME))))
|
|
return 0;
|
|
ftb->please= (struct _ft_vft *) & _ft_vft_boolean;
|
|
ftb->state=UNINITIALIZED;
|
|
ftb->info=info;
|
|
ftb->keynr=keynr;
|
|
ftb->charset=cs;
|
|
DBUG_ASSERT(keynr==NO_SUCH_KEY || cs == info->s->keyinfo[keynr].seg->charset);
|
|
ftb->with_scan=0;
|
|
ftb->lastpos=HA_OFFSET_ERROR;
|
|
bzero(& ftb->no_dupes, sizeof(TREE));
|
|
|
|
init_alloc_root(&ftb->mem_root, 1024, 1024);
|
|
|
|
/*
|
|
Hack: instead of init_queue, we'll use reinit queue to be able
|
|
to alloc queue with alloc_root()
|
|
*/
|
|
res=ftb->queue.max_elements=1+query_len/2;
|
|
if (!(ftb->queue.root=
|
|
(byte **)alloc_root(&ftb->mem_root, (res+1)*sizeof(void*))))
|
|
goto err;
|
|
reinit_queue(& ftb->queue, res, 0, 0,
|
|
(int (*)(void*,byte*,byte*))FTB_WORD_cmp, 0);
|
|
if (!(ftbe=(FTB_EXPR *)alloc_root(&ftb->mem_root, sizeof(FTB_EXPR))))
|
|
goto err;
|
|
ftbe->weight=1;
|
|
ftbe->flags=FTB_FLAG_YES;
|
|
ftbe->nos=1;
|
|
ftbe->up=0;
|
|
ftbe->ythresh=ftbe->yweaks=0;
|
|
ftbe->docid[0]=ftbe->docid[1]=HA_OFFSET_ERROR;
|
|
ftbe->phrase= NULL;
|
|
ftb->root=ftbe;
|
|
_ftb_parse_query(ftb, &query, query+query_len, ftbe, 0, NULL);
|
|
ftb->list=(FTB_WORD **)alloc_root(&ftb->mem_root,
|
|
sizeof(FTB_WORD *)*ftb->queue.elements);
|
|
memcpy(ftb->list, ftb->queue.root+1, sizeof(FTB_WORD *)*ftb->queue.elements);
|
|
qsort2(ftb->list, ftb->queue.elements, sizeof(FTB_WORD *),
|
|
(qsort2_cmp)FTB_WORD_cmp_list, ftb->charset);
|
|
if (ftb->queue.elements<2) ftb->with_scan &= ~FTB_FLAG_TRUNC;
|
|
ftb->state=READY;
|
|
return ftb;
|
|
err:
|
|
free_root(& ftb->mem_root, MYF(0));
|
|
my_free((gptr)ftb,MYF(0));
|
|
return 0;
|
|
}
|
|
|
|
|
|
/*
|
|
Checks if given buffer matches phrase list.
|
|
|
|
SYNOPSIS
|
|
_ftb_check_phrase()
|
|
s0 start of buffer
|
|
e0 end of buffer
|
|
phrase broken into list phrase
|
|
cs charset info
|
|
|
|
RETURN VALUE
|
|
1 is returned if phrase found, 0 else.
|
|
*/
|
|
|
|
static int _ftb_check_phrase(const byte *s0, const byte *e0,
|
|
LIST *phrase, CHARSET_INFO *cs)
|
|
{
|
|
FT_WORD h_word;
|
|
const byte *h_start= s0;
|
|
DBUG_ENTER("_ftb_strstr");
|
|
DBUG_ASSERT(phrase);
|
|
|
|
while (ft_simple_get_word(cs, (byte **)&h_start, e0, &h_word, FALSE))
|
|
{
|
|
FT_WORD *n_word;
|
|
LIST *phrase_element= phrase;
|
|
const byte *h_start1= h_start;
|
|
for (;;)
|
|
{
|
|
n_word= (FT_WORD *)phrase_element->data;
|
|
if (my_strnncoll(cs, (const uchar *) h_word.pos, h_word.len,
|
|
(const uchar *) n_word->pos, n_word->len))
|
|
break;
|
|
if (! (phrase_element= phrase_element->next))
|
|
DBUG_RETURN(1);
|
|
if (! ft_simple_get_word(cs, (byte **)&h_start1, e0, &h_word, FALSE))
|
|
DBUG_RETURN(0);
|
|
}
|
|
}
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
|
|
static void _ftb_climb_the_tree(FTB *ftb, FTB_WORD *ftbw, FT_SEG_ITERATOR *ftsi_orig)
|
|
{
|
|
FT_SEG_ITERATOR ftsi;
|
|
FTB_EXPR *ftbe;
|
|
float weight=ftbw->weight;
|
|
int yn=ftbw->flags, ythresh, mode=(ftsi_orig != 0);
|
|
my_off_t curdoc=ftbw->docid[mode];
|
|
|
|
for (ftbe=ftbw->up; ftbe; ftbe=ftbe->up)
|
|
{
|
|
ythresh = ftbe->ythresh - (mode ? 0 : ftbe->yweaks);
|
|
if (ftbe->docid[mode] != curdoc)
|
|
{
|
|
ftbe->cur_weight=0;
|
|
ftbe->yesses=ftbe->nos=0;
|
|
ftbe->docid[mode]=curdoc;
|
|
}
|
|
if (ftbe->nos)
|
|
break;
|
|
if (yn & FTB_FLAG_YES)
|
|
{
|
|
weight /= ftbe->ythresh;
|
|
ftbe->cur_weight += weight;
|
|
if ((int) ++ftbe->yesses == ythresh)
|
|
{
|
|
yn=ftbe->flags;
|
|
weight=ftbe->cur_weight*ftbe->weight;
|
|
if (mode && ftbe->phrase)
|
|
{
|
|
int not_found=1;
|
|
|
|
memcpy(&ftsi, ftsi_orig, sizeof(ftsi));
|
|
while (_mi_ft_segiterator(&ftsi) && not_found)
|
|
{
|
|
if (!ftsi.pos)
|
|
continue;
|
|
not_found = ! _ftb_check_phrase(ftsi.pos, ftsi.pos+ftsi.len,
|
|
ftbe->phrase, ftb->charset);
|
|
}
|
|
if (not_found) break;
|
|
} /* ftbe->quot */
|
|
}
|
|
else
|
|
break;
|
|
}
|
|
else
|
|
if (yn & FTB_FLAG_NO)
|
|
{
|
|
/*
|
|
NOTE: special sort function of queue assures that all
|
|
(yn & FTB_FLAG_NO) != 0
|
|
events for every particular subexpression will
|
|
"auto-magically" happen BEFORE all the
|
|
(yn & FTB_FLAG_YES) != 0 events. So no
|
|
already matched expression can become not-matched again.
|
|
*/
|
|
++ftbe->nos;
|
|
break;
|
|
}
|
|
else
|
|
{
|
|
if (ftbe->ythresh)
|
|
weight/=3;
|
|
ftbe->cur_weight += weight;
|
|
if ((int) ftbe->yesses < ythresh)
|
|
break;
|
|
if (!(yn & FTB_FLAG_WONLY))
|
|
yn= ((int) ftbe->yesses++ == ythresh) ? ftbe->flags : FTB_FLAG_WONLY ;
|
|
weight*= ftbe->weight;
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
int ft_boolean_read_next(FT_INFO *ftb, char *record)
|
|
{
|
|
FTB_EXPR *ftbe;
|
|
FTB_WORD *ftbw;
|
|
MI_INFO *info=ftb->info;
|
|
my_off_t curdoc;
|
|
|
|
if (ftb->state != INDEX_SEARCH && ftb->state != INDEX_DONE)
|
|
return -1;
|
|
|
|
/* black magic ON */
|
|
if ((int) _mi_check_index(info, ftb->keynr) < 0)
|
|
return my_errno;
|
|
if (_mi_readinfo(info, F_RDLCK, 1))
|
|
return my_errno;
|
|
/* black magic OFF */
|
|
|
|
if (!ftb->queue.elements)
|
|
return my_errno=HA_ERR_END_OF_FILE;
|
|
|
|
/* Attention!!! Address of a local variable is used here! See err: label */
|
|
ftb->queue.first_cmp_arg=(void *)&curdoc;
|
|
|
|
while (ftb->state == INDEX_SEARCH &&
|
|
(curdoc=((FTB_WORD *)queue_top(& ftb->queue))->docid[0]) !=
|
|
HA_OFFSET_ERROR)
|
|
{
|
|
while (curdoc == (ftbw=(FTB_WORD *)queue_top(& ftb->queue))->docid[0])
|
|
{
|
|
_ftb_climb_the_tree(ftb, ftbw, 0);
|
|
|
|
/* update queue */
|
|
_ft2_search(ftb, ftbw, 0);
|
|
queue_replaced(& ftb->queue);
|
|
}
|
|
|
|
ftbe=ftb->root;
|
|
if (ftbe->docid[0]==curdoc && ftbe->cur_weight>0 &&
|
|
ftbe->yesses>=(ftbe->ythresh-ftbe->yweaks) && !ftbe->nos)
|
|
{
|
|
/* curdoc matched ! */
|
|
if (is_tree_inited(&ftb->no_dupes) &&
|
|
tree_insert(&ftb->no_dupes, &curdoc, 0,
|
|
ftb->no_dupes.custom_arg)->count >1)
|
|
/* but it managed already to get past this line once */
|
|
continue;
|
|
|
|
info->lastpos=curdoc;
|
|
/* Clear all states, except that the table was updated */
|
|
info->update&= (HA_STATE_CHANGED | HA_STATE_ROW_CHANGED);
|
|
|
|
if (!(*info->read_record)(info,curdoc,record))
|
|
{
|
|
info->update|= HA_STATE_AKTIV; /* Record is read */
|
|
if (ftb->with_scan && ft_boolean_find_relevance(ftb,record,0)==0)
|
|
continue; /* no match */
|
|
my_errno=0;
|
|
goto err;
|
|
}
|
|
goto err;
|
|
}
|
|
}
|
|
ftb->state=INDEX_DONE;
|
|
my_errno=HA_ERR_END_OF_FILE;
|
|
err:
|
|
ftb->queue.first_cmp_arg=(void *)0;
|
|
return my_errno;
|
|
}
|
|
|
|
|
|
float ft_boolean_find_relevance(FT_INFO *ftb, byte *record, uint length)
|
|
{
|
|
FT_WORD word;
|
|
FTB_WORD *ftbw;
|
|
FTB_EXPR *ftbe;
|
|
FT_SEG_ITERATOR ftsi, ftsi2;
|
|
const byte *end;
|
|
my_off_t docid=ftb->info->lastpos;
|
|
|
|
if (docid == HA_OFFSET_ERROR)
|
|
return -2.0;
|
|
if (!ftb->queue.elements)
|
|
return 0;
|
|
|
|
if (ftb->state != INDEX_SEARCH && docid <= ftb->lastpos)
|
|
{
|
|
FTB_EXPR *x;
|
|
uint i;
|
|
|
|
for (i=0; i < ftb->queue.elements; i++)
|
|
{
|
|
ftb->list[i]->docid[1]=HA_OFFSET_ERROR;
|
|
for (x=ftb->list[i]->up; x; x=x->up)
|
|
x->docid[1]=HA_OFFSET_ERROR;
|
|
}
|
|
}
|
|
|
|
ftb->lastpos=docid;
|
|
|
|
if (ftb->keynr==NO_SUCH_KEY)
|
|
_mi_ft_segiterator_dummy_init(record, length, &ftsi);
|
|
else
|
|
_mi_ft_segiterator_init(ftb->info, ftb->keynr, record, &ftsi);
|
|
memcpy(&ftsi2, &ftsi, sizeof(ftsi));
|
|
|
|
while (_mi_ft_segiterator(&ftsi))
|
|
{
|
|
if (!ftsi.pos)
|
|
continue;
|
|
|
|
end=ftsi.pos+ftsi.len;
|
|
while (ft_simple_get_word(ftb->charset, (byte **) &ftsi.pos,
|
|
(byte *) end, &word, TRUE))
|
|
{
|
|
int a, b, c;
|
|
for (a=0, b=ftb->queue.elements, c=(a+b)/2; b-a>1; c=(a+b)/2)
|
|
{
|
|
ftbw=ftb->list[c];
|
|
if (mi_compare_text(ftb->charset, (uchar*) word.pos, word.len,
|
|
(uchar*) ftbw->word+1, ftbw->len-1,
|
|
(my_bool) (ftbw->flags&FTB_FLAG_TRUNC),0) >0)
|
|
b=c;
|
|
else
|
|
a=c;
|
|
}
|
|
for (; c>=0; c--)
|
|
{
|
|
ftbw=ftb->list[c];
|
|
if (mi_compare_text(ftb->charset, (uchar*) word.pos, word.len,
|
|
(uchar*) ftbw->word+1,ftbw->len-1,
|
|
(my_bool) (ftbw->flags&FTB_FLAG_TRUNC),0))
|
|
break;
|
|
if (ftbw->docid[1] == docid)
|
|
continue;
|
|
ftbw->docid[1]=docid;
|
|
_ftb_climb_the_tree(ftb, ftbw, &ftsi2);
|
|
}
|
|
}
|
|
}
|
|
|
|
ftbe=ftb->root;
|
|
if (ftbe->docid[1]==docid && ftbe->cur_weight>0 &&
|
|
ftbe->yesses>=ftbe->ythresh && !ftbe->nos)
|
|
{ /* row matched ! */
|
|
return ftbe->cur_weight;
|
|
}
|
|
else
|
|
{ /* match failed ! */
|
|
return 0.0;
|
|
}
|
|
}
|
|
|
|
|
|
void ft_boolean_close_search(FT_INFO *ftb)
|
|
{
|
|
if (is_tree_inited(& ftb->no_dupes))
|
|
{
|
|
delete_tree(& ftb->no_dupes);
|
|
}
|
|
free_root(& ftb->mem_root, MYF(0));
|
|
my_free((gptr)ftb,MYF(0));
|
|
}
|
|
|
|
|
|
float ft_boolean_get_relevance(FT_INFO *ftb)
|
|
{
|
|
return ftb->root->cur_weight;
|
|
}
|
|
|
|
|
|
void ft_boolean_reinit_search(FT_INFO *ftb)
|
|
{
|
|
_ftb_init_index_search(ftb);
|
|
}
|
|
|