mirror of
https://github.com/MariaDB/server.git
synced 2025-02-02 12:01:42 +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
835 lines
26 KiB
C
835 lines
26 KiB
C
/* Copyright (C) 2000-2006 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 */
|
||
|
||
/* Create a MyISAM table */
|
||
|
||
#include "ftdefs.h"
|
||
#include "sp_defs.h"
|
||
|
||
#if defined(MSDOS) || defined(__WIN__)
|
||
#ifdef __WIN__
|
||
#include <fcntl.h>
|
||
#else
|
||
#include <process.h> /* Prototype for getpid */
|
||
#endif
|
||
#endif
|
||
#include <m_ctype.h>
|
||
|
||
/*
|
||
** Old options is used when recreating database, from isamchk
|
||
*/
|
||
|
||
int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
|
||
uint columns, MI_COLUMNDEF *recinfo,
|
||
uint uniques, MI_UNIQUEDEF *uniquedefs,
|
||
MI_CREATE_INFO *ci,uint flags)
|
||
{
|
||
register uint i,j;
|
||
File dfile,file;
|
||
int errpos,save_errno, create_mode= O_RDWR | O_TRUNC;
|
||
myf create_flag;
|
||
uint fields,length,max_key_length,packed,pointer,real_length_diff,
|
||
key_length,info_length,key_segs,options,min_key_length_skip,
|
||
base_pos,long_varchar_count,varchar_length,
|
||
max_key_block_length,unique_key_parts,fulltext_keys,offset;
|
||
ulong reclength, real_reclength,min_pack_length;
|
||
char filename[FN_REFLEN],linkname[FN_REFLEN], *linkname_ptr;
|
||
ulong pack_reclength;
|
||
ulonglong tot_length,max_rows, tmp;
|
||
enum en_fieldtype type;
|
||
MYISAM_SHARE share;
|
||
MI_KEYDEF *keydef,tmp_keydef;
|
||
MI_UNIQUEDEF *uniquedef;
|
||
HA_KEYSEG *keyseg,tmp_keyseg;
|
||
MI_COLUMNDEF *rec;
|
||
ulong *rec_per_key_part;
|
||
my_off_t key_root[MI_MAX_POSSIBLE_KEY],key_del[MI_MAX_KEY_BLOCK_SIZE];
|
||
MI_CREATE_INFO tmp_create_info;
|
||
DBUG_ENTER("mi_create");
|
||
DBUG_PRINT("enter", ("keys: %u columns: %u uniques: %u flags: %u",
|
||
keys, columns, uniques, flags));
|
||
|
||
if (!ci)
|
||
{
|
||
bzero((char*) &tmp_create_info,sizeof(tmp_create_info));
|
||
ci=&tmp_create_info;
|
||
}
|
||
|
||
if (keys + uniques > MI_MAX_KEY || columns == 0)
|
||
{
|
||
DBUG_RETURN(my_errno=HA_WRONG_CREATE_OPTION);
|
||
}
|
||
LINT_INIT(dfile);
|
||
LINT_INIT(file);
|
||
errpos=0;
|
||
options=0;
|
||
bzero((byte*) &share,sizeof(share));
|
||
|
||
if (flags & HA_DONT_TOUCH_DATA)
|
||
{
|
||
if (!(ci->old_options & HA_OPTION_TEMP_COMPRESS_RECORD))
|
||
options=ci->old_options &
|
||
(HA_OPTION_COMPRESS_RECORD | HA_OPTION_PACK_RECORD |
|
||
HA_OPTION_READ_ONLY_DATA | HA_OPTION_CHECKSUM |
|
||
HA_OPTION_TMP_TABLE | HA_OPTION_DELAY_KEY_WRITE);
|
||
else
|
||
options=ci->old_options &
|
||
(HA_OPTION_CHECKSUM | HA_OPTION_TMP_TABLE | HA_OPTION_DELAY_KEY_WRITE);
|
||
}
|
||
|
||
if (ci->reloc_rows > ci->max_rows)
|
||
ci->reloc_rows=ci->max_rows; /* Check if wrong parameter */
|
||
|
||
if (!(rec_per_key_part=
|
||
(ulong*) my_malloc((keys + uniques)*MI_MAX_KEY_SEG*sizeof(long),
|
||
MYF(MY_WME | MY_ZEROFILL))))
|
||
DBUG_RETURN(my_errno);
|
||
|
||
/* Start by checking fields and field-types used */
|
||
|
||
reclength=varchar_length=long_varchar_count=packed=
|
||
min_pack_length=pack_reclength=0;
|
||
for (rec=recinfo, fields=0 ;
|
||
fields != columns ;
|
||
rec++,fields++)
|
||
{
|
||
reclength+=rec->length;
|
||
if ((type=(enum en_fieldtype) rec->type) != FIELD_NORMAL &&
|
||
type != FIELD_CHECK)
|
||
{
|
||
packed++;
|
||
if (type == FIELD_BLOB)
|
||
{
|
||
share.base.blobs++;
|
||
if (pack_reclength != INT_MAX32)
|
||
{
|
||
if (rec->length == 4+mi_portable_sizeof_char_ptr)
|
||
pack_reclength= INT_MAX32;
|
||
else
|
||
pack_reclength+=(1 << ((rec->length-mi_portable_sizeof_char_ptr)*8)); /* Max blob length */
|
||
}
|
||
}
|
||
else if (type == FIELD_SKIP_PRESPACE ||
|
||
type == FIELD_SKIP_ENDSPACE)
|
||
{
|
||
if (pack_reclength != INT_MAX32)
|
||
pack_reclength+= rec->length > 255 ? 2 : 1;
|
||
min_pack_length++;
|
||
}
|
||
else if (type == FIELD_VARCHAR)
|
||
{
|
||
varchar_length+= rec->length-1; /* Used for min_pack_length */
|
||
packed--;
|
||
pack_reclength++;
|
||
min_pack_length++;
|
||
/* We must test for 257 as length includes pack-length */
|
||
if (test(rec->length >= 257))
|
||
{
|
||
long_varchar_count++;
|
||
pack_reclength+= 2; /* May be packed on 3 bytes */
|
||
}
|
||
}
|
||
else if (type != FIELD_SKIP_ZERO)
|
||
{
|
||
min_pack_length+=rec->length;
|
||
packed--; /* Not a pack record type */
|
||
}
|
||
}
|
||
else /* FIELD_NORMAL */
|
||
min_pack_length+=rec->length;
|
||
}
|
||
if ((packed & 7) == 1)
|
||
{ /* Bad packing, try to remove a zero-field */
|
||
while (rec != recinfo)
|
||
{
|
||
rec--;
|
||
if (rec->type == (int) FIELD_SKIP_ZERO && rec->length == 1)
|
||
{
|
||
rec->type=(int) FIELD_NORMAL;
|
||
packed--;
|
||
min_pack_length++;
|
||
break;
|
||
}
|
||
}
|
||
}
|
||
|
||
if (packed || (flags & HA_PACK_RECORD))
|
||
options|=HA_OPTION_PACK_RECORD; /* Must use packed records */
|
||
/* We can't use checksum with static length rows */
|
||
if (!(options & HA_OPTION_PACK_RECORD))
|
||
options&= ~HA_OPTION_CHECKSUM;
|
||
if (!(options & (HA_OPTION_PACK_RECORD | HA_OPTION_COMPRESS_RECORD)))
|
||
min_pack_length+= varchar_length;
|
||
if (flags & HA_CREATE_TMP_TABLE)
|
||
{
|
||
options|= HA_OPTION_TMP_TABLE;
|
||
create_mode|= O_EXCL | O_NOFOLLOW;
|
||
}
|
||
if (flags & HA_CREATE_CHECKSUM || (options & HA_OPTION_CHECKSUM))
|
||
{
|
||
options|= HA_OPTION_CHECKSUM;
|
||
min_pack_length++;
|
||
}
|
||
if (flags & HA_CREATE_DELAY_KEY_WRITE)
|
||
options|= HA_OPTION_DELAY_KEY_WRITE;
|
||
|
||
packed=(packed+7)/8;
|
||
if (pack_reclength != INT_MAX32)
|
||
pack_reclength+= reclength+packed +
|
||
test(test_all_bits(options, HA_OPTION_CHECKSUM | HA_PACK_RECORD));
|
||
min_pack_length+=packed;
|
||
|
||
if (!ci->data_file_length && ci->max_rows)
|
||
{
|
||
if (pack_reclength == INT_MAX32 ||
|
||
(~(ulonglong) 0)/ci->max_rows < (ulonglong) pack_reclength)
|
||
ci->data_file_length= ~(ulonglong) 0;
|
||
else
|
||
ci->data_file_length=(ulonglong) ci->max_rows*pack_reclength;
|
||
}
|
||
else if (!ci->max_rows)
|
||
ci->max_rows=(ha_rows) (ci->data_file_length/(min_pack_length +
|
||
((options & HA_OPTION_PACK_RECORD) ?
|
||
3 : 0)));
|
||
|
||
if (options & (HA_OPTION_COMPRESS_RECORD | HA_OPTION_PACK_RECORD))
|
||
pointer=mi_get_pointer_length(ci->data_file_length,myisam_data_pointer_size);
|
||
else
|
||
pointer=mi_get_pointer_length(ci->max_rows,myisam_data_pointer_size);
|
||
if (!(max_rows=(ulonglong) ci->max_rows))
|
||
max_rows= ((((ulonglong) 1 << (pointer*8)) -1) / min_pack_length);
|
||
|
||
|
||
real_reclength=reclength;
|
||
if (!(options & (HA_OPTION_COMPRESS_RECORD | HA_OPTION_PACK_RECORD)))
|
||
{
|
||
if (reclength <= pointer)
|
||
reclength=pointer+1; /* reserve place for delete link */
|
||
}
|
||
else
|
||
reclength+= long_varchar_count; /* We need space for varchar! */
|
||
|
||
max_key_length=0; tot_length=0 ; key_segs=0;
|
||
fulltext_keys=0;
|
||
max_key_block_length=0;
|
||
share.state.rec_per_key_part=rec_per_key_part;
|
||
share.state.key_root=key_root;
|
||
share.state.key_del=key_del;
|
||
if (uniques)
|
||
{
|
||
max_key_block_length= myisam_block_size;
|
||
max_key_length= MI_UNIQUE_HASH_LENGTH + pointer;
|
||
}
|
||
|
||
for (i=0, keydef=keydefs ; i < keys ; i++ , keydef++)
|
||
{
|
||
|
||
share.state.key_root[i]= HA_OFFSET_ERROR;
|
||
min_key_length_skip=length=real_length_diff=0;
|
||
key_length=pointer;
|
||
if (keydef->flag & HA_SPATIAL)
|
||
{
|
||
#ifdef HAVE_SPATIAL
|
||
/* BAR TODO to support 3D and more dimensions in the future */
|
||
uint sp_segs=SPDIMS*2;
|
||
keydef->flag=HA_SPATIAL;
|
||
|
||
if (flags & HA_DONT_TOUCH_DATA)
|
||
{
|
||
/*
|
||
called by myisamchk - i.e. table structure was taken from
|
||
MYI file and SPATIAL key *does have* additional sp_segs keysegs.
|
||
keydef->seg here points right at the GEOMETRY segment,
|
||
so we only need to decrease keydef->keysegs.
|
||
(see recreate_table() in mi_check.c)
|
||
*/
|
||
keydef->keysegs-=sp_segs-1;
|
||
}
|
||
|
||
for (j=0, keyseg=keydef->seg ; (int) j < keydef->keysegs ;
|
||
j++, keyseg++)
|
||
{
|
||
if (keyseg->type != HA_KEYTYPE_BINARY &&
|
||
keyseg->type != HA_KEYTYPE_VARBINARY1 &&
|
||
keyseg->type != HA_KEYTYPE_VARBINARY2)
|
||
{
|
||
my_errno=HA_WRONG_CREATE_OPTION;
|
||
goto err;
|
||
}
|
||
}
|
||
keydef->keysegs+=sp_segs;
|
||
key_length+=SPLEN*sp_segs;
|
||
length++; /* At least one length byte */
|
||
min_key_length_skip+=SPLEN*2*SPDIMS;
|
||
#else
|
||
my_errno= HA_ERR_UNSUPPORTED;
|
||
goto err;
|
||
#endif /*HAVE_SPATIAL*/
|
||
}
|
||
else if (keydef->flag & HA_FULLTEXT)
|
||
{
|
||
keydef->flag=HA_FULLTEXT | HA_PACK_KEY | HA_VAR_LENGTH_KEY;
|
||
options|=HA_OPTION_PACK_KEYS; /* Using packed keys */
|
||
|
||
for (j=0, keyseg=keydef->seg ; (int) j < keydef->keysegs ;
|
||
j++, keyseg++)
|
||
{
|
||
if (keyseg->type != HA_KEYTYPE_TEXT &&
|
||
keyseg->type != HA_KEYTYPE_VARTEXT1 &&
|
||
keyseg->type != HA_KEYTYPE_VARTEXT2)
|
||
{
|
||
my_errno=HA_WRONG_CREATE_OPTION;
|
||
goto err;
|
||
}
|
||
if (!(keyseg->flag & HA_BLOB_PART) &&
|
||
(keyseg->type == HA_KEYTYPE_VARTEXT1 ||
|
||
keyseg->type == HA_KEYTYPE_VARTEXT2))
|
||
{
|
||
/* Make a flag that this is a VARCHAR */
|
||
keyseg->flag|= HA_VAR_LENGTH_PART;
|
||
/* Store in bit_start number of bytes used to pack the length */
|
||
keyseg->bit_start= ((keyseg->type == HA_KEYTYPE_VARTEXT1)?
|
||
1 : 2);
|
||
}
|
||
}
|
||
|
||
fulltext_keys++;
|
||
key_length+= HA_FT_MAXBYTELEN+HA_FT_WLEN;
|
||
length++; /* At least one length byte */
|
||
min_key_length_skip+=HA_FT_MAXBYTELEN;
|
||
real_length_diff=HA_FT_MAXBYTELEN-FT_MAX_WORD_LEN_FOR_SORT;
|
||
}
|
||
else
|
||
{
|
||
/* Test if prefix compression */
|
||
if (keydef->flag & HA_PACK_KEY)
|
||
{
|
||
/* Can't use space_compression on number keys */
|
||
if ((keydef->seg[0].flag & HA_SPACE_PACK) &&
|
||
keydef->seg[0].type == (int) HA_KEYTYPE_NUM)
|
||
keydef->seg[0].flag&= ~HA_SPACE_PACK;
|
||
|
||
/* Only use HA_PACK_KEY when first segment is a variable length key */
|
||
if (!(keydef->seg[0].flag & (HA_SPACE_PACK | HA_BLOB_PART |
|
||
HA_VAR_LENGTH_PART)))
|
||
{
|
||
/* pack relative to previous key */
|
||
keydef->flag&= ~HA_PACK_KEY;
|
||
keydef->flag|= HA_BINARY_PACK_KEY | HA_VAR_LENGTH_KEY;
|
||
}
|
||
else
|
||
{
|
||
keydef->seg[0].flag|=HA_PACK_KEY; /* for easyer intern test */
|
||
keydef->flag|=HA_VAR_LENGTH_KEY;
|
||
options|=HA_OPTION_PACK_KEYS; /* Using packed keys */
|
||
}
|
||
}
|
||
if (keydef->flag & HA_BINARY_PACK_KEY)
|
||
options|=HA_OPTION_PACK_KEYS; /* Using packed keys */
|
||
|
||
if (keydef->flag & HA_AUTO_KEY && ci->with_auto_increment)
|
||
share.base.auto_key=i+1;
|
||
for (j=0, keyseg=keydef->seg ; j < keydef->keysegs ; j++, keyseg++)
|
||
{
|
||
/* numbers are stored with high by first to make compression easier */
|
||
switch (keyseg->type) {
|
||
case HA_KEYTYPE_SHORT_INT:
|
||
case HA_KEYTYPE_LONG_INT:
|
||
case HA_KEYTYPE_FLOAT:
|
||
case HA_KEYTYPE_DOUBLE:
|
||
case HA_KEYTYPE_USHORT_INT:
|
||
case HA_KEYTYPE_ULONG_INT:
|
||
case HA_KEYTYPE_LONGLONG:
|
||
case HA_KEYTYPE_ULONGLONG:
|
||
case HA_KEYTYPE_INT24:
|
||
case HA_KEYTYPE_UINT24:
|
||
case HA_KEYTYPE_INT8:
|
||
keyseg->flag|= HA_SWAP_KEY;
|
||
break;
|
||
case HA_KEYTYPE_VARTEXT1:
|
||
case HA_KEYTYPE_VARTEXT2:
|
||
case HA_KEYTYPE_VARBINARY1:
|
||
case HA_KEYTYPE_VARBINARY2:
|
||
if (!(keyseg->flag & HA_BLOB_PART))
|
||
{
|
||
/* Make a flag that this is a VARCHAR */
|
||
keyseg->flag|= HA_VAR_LENGTH_PART;
|
||
/* Store in bit_start number of bytes used to pack the length */
|
||
keyseg->bit_start= ((keyseg->type == HA_KEYTYPE_VARTEXT1 ||
|
||
keyseg->type == HA_KEYTYPE_VARBINARY1) ?
|
||
1 : 2);
|
||
}
|
||
break;
|
||
default:
|
||
break;
|
||
}
|
||
if (keyseg->flag & HA_SPACE_PACK)
|
||
{
|
||
DBUG_ASSERT(!(keyseg->flag & HA_VAR_LENGTH_PART));
|
||
keydef->flag |= HA_SPACE_PACK_USED | HA_VAR_LENGTH_KEY;
|
||
options|=HA_OPTION_PACK_KEYS; /* Using packed keys */
|
||
length++; /* At least one length byte */
|
||
min_key_length_skip+=keyseg->length;
|
||
if (keyseg->length >= 255)
|
||
{ /* prefix may be 3 bytes */
|
||
min_key_length_skip+=2;
|
||
length+=2;
|
||
}
|
||
}
|
||
if (keyseg->flag & (HA_VAR_LENGTH_PART | HA_BLOB_PART))
|
||
{
|
||
DBUG_ASSERT(!test_all_bits(keyseg->flag,
|
||
(HA_VAR_LENGTH_PART | HA_BLOB_PART)));
|
||
keydef->flag|=HA_VAR_LENGTH_KEY;
|
||
length++; /* At least one length byte */
|
||
options|=HA_OPTION_PACK_KEYS; /* Using packed keys */
|
||
min_key_length_skip+=keyseg->length;
|
||
if (keyseg->length >= 255)
|
||
{ /* prefix may be 3 bytes */
|
||
min_key_length_skip+=2;
|
||
length+=2;
|
||
}
|
||
}
|
||
key_length+= keyseg->length;
|
||
if (keyseg->null_bit)
|
||
{
|
||
key_length++;
|
||
options|=HA_OPTION_PACK_KEYS;
|
||
keyseg->flag|=HA_NULL_PART;
|
||
keydef->flag|=HA_VAR_LENGTH_KEY | HA_NULL_PART_KEY;
|
||
}
|
||
}
|
||
} /* if HA_FULLTEXT */
|
||
key_segs+=keydef->keysegs;
|
||
if (keydef->keysegs > MI_MAX_KEY_SEG)
|
||
{
|
||
my_errno=HA_WRONG_CREATE_OPTION;
|
||
goto err;
|
||
}
|
||
/*
|
||
key_segs may be 0 in the case when we only want to be able to
|
||
add on row into the table. This can happen with some DISTINCT queries
|
||
in MySQL
|
||
*/
|
||
if ((keydef->flag & (HA_NOSAME | HA_NULL_PART_KEY)) == HA_NOSAME &&
|
||
key_segs)
|
||
share.state.rec_per_key_part[key_segs-1]=1L;
|
||
length+=key_length;
|
||
keydef->block_length= (uint16) MI_BLOCK_SIZE(length-real_length_diff,
|
||
pointer,MI_MAX_KEYPTR_SIZE);
|
||
if (keydef->block_length > MI_MAX_KEY_BLOCK_LENGTH ||
|
||
length >= MI_MAX_KEY_BUFF)
|
||
{
|
||
my_errno=HA_WRONG_CREATE_OPTION;
|
||
goto err;
|
||
}
|
||
set_if_bigger(max_key_block_length,keydef->block_length);
|
||
keydef->keylength= (uint16) key_length;
|
||
keydef->minlength= (uint16) (length-min_key_length_skip);
|
||
keydef->maxlength= (uint16) length;
|
||
|
||
if (length > max_key_length)
|
||
max_key_length= length;
|
||
tot_length+= (max_rows/(ulong) (((uint) keydef->block_length-5)/
|
||
(length*2)))*
|
||
(ulong) keydef->block_length;
|
||
}
|
||
for (i=max_key_block_length/MI_MIN_KEY_BLOCK_LENGTH ; i-- ; )
|
||
key_del[i]=HA_OFFSET_ERROR;
|
||
|
||
unique_key_parts=0;
|
||
offset=reclength-uniques*MI_UNIQUE_HASH_LENGTH;
|
||
for (i=0, uniquedef=uniquedefs ; i < uniques ; i++ , uniquedef++)
|
||
{
|
||
uniquedef->key=keys+i;
|
||
unique_key_parts+=uniquedef->keysegs;
|
||
share.state.key_root[keys+i]= HA_OFFSET_ERROR;
|
||
tot_length+= (max_rows/(ulong) (((uint) myisam_block_size-5)/
|
||
((MI_UNIQUE_HASH_LENGTH + pointer)*2)))*
|
||
(ulong) myisam_block_size;
|
||
}
|
||
keys+=uniques; /* Each unique has 1 key */
|
||
key_segs+=uniques; /* Each unique has 1 key seg */
|
||
|
||
base_pos=(MI_STATE_INFO_SIZE + keys * MI_STATE_KEY_SIZE +
|
||
max_key_block_length/MI_MIN_KEY_BLOCK_LENGTH*
|
||
MI_STATE_KEYBLOCK_SIZE+
|
||
key_segs*MI_STATE_KEYSEG_SIZE);
|
||
info_length=base_pos+(uint) (MI_BASE_INFO_SIZE+
|
||
keys * MI_KEYDEF_SIZE+
|
||
uniques * MI_UNIQUEDEF_SIZE +
|
||
(key_segs + unique_key_parts)*HA_KEYSEG_SIZE+
|
||
columns*MI_COLUMNDEF_SIZE);
|
||
DBUG_PRINT("info", ("info_length: %u", info_length));
|
||
/* There are only 16 bits for the total header length. */
|
||
if (info_length > 65535)
|
||
{
|
||
my_printf_error(0, "MyISAM table '%s' has too many columns and/or "
|
||
"indexes and/or unique constraints.",
|
||
MYF(0), name + dirname_length(name));
|
||
my_errno= HA_WRONG_CREATE_OPTION;
|
||
goto err;
|
||
}
|
||
|
||
bmove(share.state.header.file_version,(byte*) myisam_file_magic,4);
|
||
ci->old_options=options| (ci->old_options & HA_OPTION_TEMP_COMPRESS_RECORD ?
|
||
HA_OPTION_COMPRESS_RECORD |
|
||
HA_OPTION_TEMP_COMPRESS_RECORD: 0);
|
||
mi_int2store(share.state.header.options,ci->old_options);
|
||
mi_int2store(share.state.header.header_length,info_length);
|
||
mi_int2store(share.state.header.state_info_length,MI_STATE_INFO_SIZE);
|
||
mi_int2store(share.state.header.base_info_length,MI_BASE_INFO_SIZE);
|
||
mi_int2store(share.state.header.base_pos,base_pos);
|
||
share.state.header.language= (ci->language ?
|
||
ci->language : default_charset_info->number);
|
||
share.state.header.max_block_size=max_key_block_length/MI_MIN_KEY_BLOCK_LENGTH;
|
||
|
||
share.state.dellink = HA_OFFSET_ERROR;
|
||
share.state.process= (ulong) getpid();
|
||
share.state.unique= (ulong) 0;
|
||
share.state.update_count=(ulong) 0;
|
||
share.state.version= (ulong) time((time_t*) 0);
|
||
share.state.sortkey= (ushort) ~0;
|
||
share.state.auto_increment=ci->auto_increment;
|
||
share.options=options;
|
||
share.base.rec_reflength=pointer;
|
||
/* Get estimate for index file length (this may be wrong for FT keys) */
|
||
tmp= (tot_length + max_key_block_length * keys *
|
||
MI_INDEX_BLOCK_MARGIN) / MI_MIN_KEY_BLOCK_LENGTH;
|
||
/*
|
||
use maximum of key_file_length we calculated and key_file_length value we
|
||
got from MYI file header (see also myisampack.c:save_state)
|
||
*/
|
||
share.base.key_reflength=
|
||
mi_get_pointer_length(max(ci->key_file_length,tmp),3);
|
||
share.base.keys= share.state.header.keys= keys;
|
||
share.state.header.uniques= uniques;
|
||
share.state.header.fulltext_keys= fulltext_keys;
|
||
mi_int2store(share.state.header.key_parts,key_segs);
|
||
mi_int2store(share.state.header.unique_key_parts,unique_key_parts);
|
||
|
||
mi_set_all_keys_active(share.state.key_map, keys);
|
||
share.base.keystart = share.state.state.key_file_length=
|
||
MY_ALIGN(info_length, myisam_block_size);
|
||
share.base.max_key_block_length=max_key_block_length;
|
||
share.base.max_key_length=ALIGN_SIZE(max_key_length+4);
|
||
share.base.records=ci->max_rows;
|
||
share.base.reloc= ci->reloc_rows;
|
||
share.base.reclength=real_reclength;
|
||
share.base.pack_reclength=reclength+ test(options & HA_OPTION_CHECKSUM);
|
||
share.base.max_pack_length=pack_reclength;
|
||
share.base.min_pack_length=min_pack_length;
|
||
share.base.pack_bits=packed;
|
||
share.base.fields=fields;
|
||
share.base.pack_fields=packed;
|
||
#ifdef USE_RAID
|
||
share.base.raid_type=ci->raid_type;
|
||
share.base.raid_chunks=ci->raid_chunks;
|
||
share.base.raid_chunksize=ci->raid_chunksize;
|
||
#endif
|
||
|
||
/* max_data_file_length and max_key_file_length are recalculated on open */
|
||
if (options & HA_OPTION_TMP_TABLE)
|
||
share.base.max_data_file_length=(my_off_t) ci->data_file_length;
|
||
|
||
share.base.min_block_length=
|
||
(share.base.pack_reclength+3 < MI_EXTEND_BLOCK_LENGTH &&
|
||
! share.base.blobs) ?
|
||
max(share.base.pack_reclength,MI_MIN_BLOCK_LENGTH) :
|
||
MI_EXTEND_BLOCK_LENGTH;
|
||
if (! (flags & HA_DONT_TOUCH_DATA))
|
||
share.state.create_time= (long) time((time_t*) 0);
|
||
|
||
pthread_mutex_lock(&THR_LOCK_myisam);
|
||
|
||
if (ci->index_file_name)
|
||
{
|
||
if (options & HA_OPTION_TMP_TABLE)
|
||
{
|
||
char *path;
|
||
/* chop off the table name, tempory tables use generated name */
|
||
if ((path= strrchr(ci->index_file_name, FN_LIBCHAR)))
|
||
*path= '\0';
|
||
fn_format(filename, name, ci->index_file_name, MI_NAME_IEXT,
|
||
MY_REPLACE_DIR | MY_UNPACK_FILENAME);
|
||
}
|
||
else
|
||
fn_format(filename, ci->index_file_name, "",
|
||
MI_NAME_IEXT, MY_UNPACK_FILENAME);
|
||
fn_format(linkname, name, "", MI_NAME_IEXT, MY_UNPACK_FILENAME);
|
||
linkname_ptr= linkname;
|
||
/*
|
||
Don't create the table if the link or file exists to ensure that one
|
||
doesn't accidently destroy another table.
|
||
*/
|
||
create_flag=0;
|
||
}
|
||
else
|
||
{
|
||
fn_format(filename,name,"",MI_NAME_IEXT,(4+ (flags & HA_DONT_TOUCH_DATA) ?
|
||
32 : 0));
|
||
linkname_ptr=0;
|
||
/* Replace the current file */
|
||
create_flag=MY_DELETE_OLD;
|
||
}
|
||
|
||
/*
|
||
If a MRG_MyISAM table is in use, the mapped MyISAM tables are open,
|
||
but no entry is made in the table cache for them.
|
||
A TRUNCATE command checks for the table in the cache only and could
|
||
be fooled to believe, the table is not open.
|
||
Pull the emergency brake in this situation. (Bug #8306)
|
||
*/
|
||
if (test_if_reopen(filename))
|
||
{
|
||
my_printf_error(0, "MyISAM table '%s' is in use "
|
||
"(most likely by a MERGE table). Try FLUSH TABLES.",
|
||
MYF(0), name + dirname_length(name));
|
||
goto err;
|
||
}
|
||
|
||
if ((file= my_create_with_symlink(linkname_ptr, filename, 0, create_mode,
|
||
MYF(MY_WME | create_flag))) < 0)
|
||
goto err;
|
||
errpos=1;
|
||
|
||
if (!(flags & HA_DONT_TOUCH_DATA))
|
||
{
|
||
#ifdef USE_RAID
|
||
if (share.base.raid_type)
|
||
{
|
||
(void) fn_format(filename,name,"",MI_NAME_DEXT,2+4);
|
||
if ((dfile=my_raid_create(filename, 0, create_mode,
|
||
share.base.raid_type,
|
||
share.base.raid_chunks,
|
||
share.base.raid_chunksize,
|
||
MYF(MY_WME | MY_RAID))) < 0)
|
||
goto err;
|
||
}
|
||
else
|
||
#endif
|
||
{
|
||
if (ci->data_file_name)
|
||
{
|
||
if (options & HA_OPTION_TMP_TABLE)
|
||
{
|
||
char *path;
|
||
/* chop off the table name, tempory tables use generated name */
|
||
if ((path= strrchr(ci->data_file_name, FN_LIBCHAR)))
|
||
*path= '\0';
|
||
fn_format(filename, name, ci->data_file_name, MI_NAME_DEXT,
|
||
MY_REPLACE_DIR | MY_UNPACK_FILENAME);
|
||
}
|
||
else
|
||
fn_format(filename, ci->data_file_name, "",
|
||
MI_NAME_DEXT, MY_UNPACK_FILENAME);
|
||
fn_format(linkname, name, "", MI_NAME_DEXT, MY_UNPACK_FILENAME);
|
||
linkname_ptr= linkname;
|
||
create_flag= 0;
|
||
}
|
||
else
|
||
{
|
||
fn_format(filename,name,"",MI_NAME_DEXT,4);
|
||
linkname_ptr=0;
|
||
create_flag=MY_DELETE_OLD;
|
||
}
|
||
if ((dfile=
|
||
my_create_with_symlink(linkname_ptr, filename, 0, create_mode,
|
||
MYF(MY_WME | create_flag))) < 0)
|
||
goto err;
|
||
}
|
||
errpos=3;
|
||
}
|
||
|
||
DBUG_PRINT("info", ("write state info and base info"));
|
||
if (mi_state_info_write(file, &share.state, 2) ||
|
||
mi_base_info_write(file, &share.base))
|
||
goto err;
|
||
#ifndef DBUG_OFF
|
||
if ((uint) my_tell(file,MYF(0)) != base_pos+ MI_BASE_INFO_SIZE)
|
||
{
|
||
uint pos=(uint) my_tell(file,MYF(0));
|
||
DBUG_PRINT("warning",("base_length: %d != used_length: %d",
|
||
base_pos+ MI_BASE_INFO_SIZE, pos));
|
||
}
|
||
#endif
|
||
|
||
/* Write key and keyseg definitions */
|
||
DBUG_PRINT("info", ("write key and keyseg definitions"));
|
||
for (i=0 ; i < share.base.keys - uniques; i++)
|
||
{
|
||
uint sp_segs=(keydefs[i].flag & HA_SPATIAL) ? 2*SPDIMS : 0;
|
||
|
||
if (mi_keydef_write(file, &keydefs[i]))
|
||
goto err;
|
||
for (j=0 ; j < keydefs[i].keysegs-sp_segs ; j++)
|
||
if (mi_keyseg_write(file, &keydefs[i].seg[j]))
|
||
goto err;
|
||
#ifdef HAVE_SPATIAL
|
||
for (j=0 ; j < sp_segs ; j++)
|
||
{
|
||
HA_KEYSEG sseg;
|
||
sseg.type=SPTYPE;
|
||
sseg.language= 7; /* Binary */
|
||
sseg.null_bit=0;
|
||
sseg.bit_start=0;
|
||
sseg.bit_end=0;
|
||
sseg.bit_length= 0;
|
||
sseg.bit_pos= 0;
|
||
sseg.length=SPLEN;
|
||
sseg.null_pos=0;
|
||
sseg.start=j*SPLEN;
|
||
sseg.flag= HA_SWAP_KEY;
|
||
if (mi_keyseg_write(file, &sseg))
|
||
goto err;
|
||
}
|
||
#endif
|
||
}
|
||
/* Create extra keys for unique definitions */
|
||
offset=reclength-uniques*MI_UNIQUE_HASH_LENGTH;
|
||
bzero((char*) &tmp_keydef,sizeof(tmp_keydef));
|
||
bzero((char*) &tmp_keyseg,sizeof(tmp_keyseg));
|
||
for (i=0; i < uniques ; i++)
|
||
{
|
||
tmp_keydef.keysegs=1;
|
||
tmp_keydef.flag= HA_UNIQUE_CHECK;
|
||
tmp_keydef.block_length= (uint16)myisam_block_size;
|
||
tmp_keydef.keylength= MI_UNIQUE_HASH_LENGTH + pointer;
|
||
tmp_keydef.minlength=tmp_keydef.maxlength=tmp_keydef.keylength;
|
||
tmp_keyseg.type= MI_UNIQUE_HASH_TYPE;
|
||
tmp_keyseg.length= MI_UNIQUE_HASH_LENGTH;
|
||
tmp_keyseg.start= offset;
|
||
offset+= MI_UNIQUE_HASH_LENGTH;
|
||
if (mi_keydef_write(file,&tmp_keydef) ||
|
||
mi_keyseg_write(file,(&tmp_keyseg)))
|
||
goto err;
|
||
}
|
||
|
||
/* Save unique definition */
|
||
DBUG_PRINT("info", ("write unique definitions"));
|
||
for (i=0 ; i < share.state.header.uniques ; i++)
|
||
{
|
||
HA_KEYSEG *keyseg_end;
|
||
keyseg= uniquedefs[i].seg;
|
||
if (mi_uniquedef_write(file, &uniquedefs[i]))
|
||
goto err;
|
||
for (keyseg= uniquedefs[i].seg, keyseg_end= keyseg+ uniquedefs[i].keysegs;
|
||
keyseg < keyseg_end;
|
||
keyseg++)
|
||
{
|
||
switch (keyseg->type) {
|
||
case HA_KEYTYPE_VARTEXT1:
|
||
case HA_KEYTYPE_VARTEXT2:
|
||
case HA_KEYTYPE_VARBINARY1:
|
||
case HA_KEYTYPE_VARBINARY2:
|
||
if (!(keyseg->flag & HA_BLOB_PART))
|
||
{
|
||
keyseg->flag|= HA_VAR_LENGTH_PART;
|
||
keyseg->bit_start= ((keyseg->type == HA_KEYTYPE_VARTEXT1 ||
|
||
keyseg->type == HA_KEYTYPE_VARBINARY1) ?
|
||
1 : 2);
|
||
}
|
||
break;
|
||
default:
|
||
break;
|
||
}
|
||
if (mi_keyseg_write(file, keyseg))
|
||
goto err;
|
||
}
|
||
}
|
||
DBUG_PRINT("info", ("write field definitions"));
|
||
for (i=0 ; i < share.base.fields ; i++)
|
||
if (mi_recinfo_write(file, &recinfo[i]))
|
||
goto err;
|
||
|
||
#ifndef DBUG_OFF
|
||
if ((uint) my_tell(file,MYF(0)) != info_length)
|
||
{
|
||
uint pos= (uint) my_tell(file,MYF(0));
|
||
DBUG_PRINT("warning",("info_length: %d != used_length: %d",
|
||
info_length, pos));
|
||
}
|
||
#endif
|
||
|
||
/* Enlarge files */
|
||
DBUG_PRINT("info", ("enlarge to keystart: %lu", (ulong) share.base.keystart));
|
||
if (my_chsize(file,(ulong) share.base.keystart,0,MYF(0)))
|
||
goto err;
|
||
|
||
if (! (flags & HA_DONT_TOUCH_DATA))
|
||
{
|
||
#ifdef USE_RELOC
|
||
if (my_chsize(dfile,share.base.min_pack_length*ci->reloc_rows,0,MYF(0)))
|
||
goto err;
|
||
#endif
|
||
errpos=2;
|
||
if (my_close(dfile,MYF(0)))
|
||
goto err;
|
||
}
|
||
errpos=0;
|
||
pthread_mutex_unlock(&THR_LOCK_myisam);
|
||
if (my_close(file,MYF(0)))
|
||
goto err;
|
||
my_free((char*) rec_per_key_part,MYF(0));
|
||
DBUG_RETURN(0);
|
||
|
||
err:
|
||
pthread_mutex_unlock(&THR_LOCK_myisam);
|
||
save_errno=my_errno;
|
||
switch (errpos) {
|
||
case 3:
|
||
VOID(my_close(dfile,MYF(0)));
|
||
/* fall through */
|
||
case 2:
|
||
/* QQ: T<>nu should add a call to my_raid_delete() here */
|
||
if (! (flags & HA_DONT_TOUCH_DATA))
|
||
my_delete_with_symlink(fn_format(filename,name,"",MI_NAME_DEXT,2+4),
|
||
MYF(0));
|
||
/* fall through */
|
||
case 1:
|
||
VOID(my_close(file,MYF(0)));
|
||
if (! (flags & HA_DONT_TOUCH_DATA))
|
||
my_delete_with_symlink(fn_format(filename,name,"",MI_NAME_IEXT,2+4),
|
||
MYF(0));
|
||
}
|
||
my_free((char*) rec_per_key_part, MYF(0));
|
||
DBUG_RETURN(my_errno=save_errno); /* return the fatal errno */
|
||
}
|
||
|
||
|
||
uint mi_get_pointer_length(ulonglong file_length, uint def)
|
||
{
|
||
DBUG_ASSERT(def >= 2 && def <= 7);
|
||
if (file_length) /* If not default */
|
||
{
|
||
#ifdef NOT_YET_READY_FOR_8_BYTE_POINTERS
|
||
if (file_length >= (longlong) 1 << 56)
|
||
def=8;
|
||
#endif
|
||
if (file_length >= (longlong) 1 << 48)
|
||
def=7;
|
||
if (file_length >= (longlong) 1 << 40)
|
||
def=6;
|
||
else if (file_length >= (longlong) 1 << 32)
|
||
def=5;
|
||
else if (file_length >= (1L << 24))
|
||
def=4;
|
||
else if (file_length >= (1L << 16))
|
||
def=3;
|
||
else
|
||
def=2;
|
||
}
|
||
return def;
|
||
}
|