1. 10 Jan, 2007 1 commit
  2. 05 Jan, 2007 2 commits
    • unknown's avatar
      Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build · 6f3343ee
      unknown authored
      into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
      
      
      scripts/make_binary_distribution.sh:
        Auto merged
      6f3343ee
    • unknown's avatar
      mysql.spec.sh, make_binary_distribution.sh: · 7fb6aa34
      unknown authored
        Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
        correct "libgcc.a" path is returned for the 32/64 bit architecture
      
      
      scripts/make_binary_distribution.sh:
        Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
        correct "libgcc.a" path is returned for the 32/64 bit architecture
      support-files/mysql.spec.sh:
        Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
        correct "libgcc.a" path is returned for the 32/64 bit architecture
      7fb6aa34
  3. 04 Jan, 2007 4 commits
  4. 02 Jan, 2007 11 commits
  5. 01 Jan, 2007 10 commits
    • unknown's avatar
      Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build · 0f09b9ce
      unknown authored
      into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
      
      
      innobase/buf/buf0buf.c:
        Auto merged
      innobase/dict/dict0dict.c:
        Auto merged
      innobase/fil/fil0fil.c:
        Auto merged
      innobase/ha/ha0ha.c:
        Auto merged
      innobase/include/hash0hash.h:
        Auto merged
      innobase/lock/lock0lock.c:
        Auto merged
      innobase/log/log0recv.c:
        Auto merged
      0f09b9ce
    • unknown's avatar
      Many files: · 19a33e08
      unknown authored
        Renamed hash_create() not to clash with imap using embedded server (bug#13859)
      
      
      innobase/buf/buf0buf.c:
        Renamed hash_create() not to clash with imap using embedded server (bug#13859)
      innobase/dict/dict0dict.c:
        Renamed hash_create() not to clash with imap using embedded server (bug#13859)
      innobase/fil/fil0fil.c:
        Renamed hash_create() not to clash with imap using embedded server (bug#13859)
      innobase/ha/ha0ha.c:
        Renamed hash_create() not to clash with imap using embedded server (bug#13859)
      innobase/ha/hash0hash.c:
        Renamed hash_create() not to clash with imap using embedded server (bug#13859)
      innobase/include/hash0hash.h:
        Renamed hash_create() not to clash with imap using embedded server (bug#13859)
      innobase/lock/lock0lock.c:
        Renamed hash_create() not to clash with imap using embedded server (bug#13859)
      innobase/log/log0recv.c:
        Renamed hash_create() not to clash with imap using embedded server (bug#13859)
      innobase/thr/thr0loc.c:
        Renamed hash_create() not to clash with imap using embedded server (bug#13859)
      19a33e08
    • unknown's avatar
      mysqld.cc, configure.in: · 690404db
      unknown authored
        Don't use thread priority by default on Mac OS X (bug#18526)
      
      
      configure.in:
        Don't use thread priority by default on Mac OS X (bug#18526)
      sql/mysqld.cc:
        Don't use thread priority by default on Mac OS X (bug#18526)
      690404db
    • unknown's avatar
      configure.in: · 6c2883fc
      unknown authored
        Build "mysqld_error.h" even if configured --withouth-server (bug#21265)
      
      
      configure.in:
        Build "mysqld_error.h" even if configured --withouth-server (bug#21265)
      6c2883fc
    • unknown's avatar
      Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build · 4a090b18
      unknown authored
      into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
      
      
      configure.in:
        Auto merged
      4a090b18
    • unknown's avatar
      configure.in: · 190a79c7
      unknown authored
        Don't build server when configured --without-server (bug#23973)
      
      
      configure.in:
        Don't build server when configured --without-server (bug#23973)
      190a79c7
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · ec08ea70
      unknown authored
      into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
      
      
      ec08ea70
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · efe0db3f
      unknown authored
      into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build
      
      
      efe0db3f
    • unknown's avatar
      Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build · e809f913
      unknown authored
      into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
      
      
      BUILD/check-cpu:
        Auto merged
      scripts/mysql_secure_installation.sh:
        Auto merged
      e809f913
    • unknown's avatar
      mysql_secure_installation.sh: · 6d0387a7
      unknown authored
        Portable handling of "echo" without newline (bug#24605)
      check-cpu:
        In developer script safe to use "printf", not "echo -n"
      
      
      BUILD/check-cpu:
        In developer script safe to use "printf", not "echo -n"
      scripts/mysql_secure_installation.sh:
        Portable handling of "echo" without newline (bug#24605)
      6d0387a7
  6. 31 Dec, 2006 5 commits
    • unknown's avatar
      Merge mysql.com:/d2/hf/clean/my50-clean · 84d0cda4
      unknown authored
      into  mysql.com:/d2/hf/common/my50-common
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      84d0cda4
    • unknown's avatar
      Merge mysql.com:/d2/hf/clean/my41-clean · 62576974
      unknown authored
      into  mysql.com:/d2/hf/common/my41-common
      
      
      sql/item_func.cc:
        Auto merged
      62576974
    • unknown's avatar
      Merge mysql.com:/d2/hf/common/my41-common · 44e02393
      unknown authored
      into  mysql.com:/d2/hf/common/my50-common
      
      
      libmysqld/lib_sql.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      44e02393
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · 27ecbeec
      unknown authored
      into  mysql.com:/home/kent/bk/main/mysql-5.0
      
      
      myisam/mi_check.c:
        Auto merged
      myisam/mi_dynrec.c:
        Auto merged
      myisam/mi_packrec.c:
        Auto merged
      myisam/mi_range.c:
        Auto merged
      myisam/mi_test1.c:
        Auto merged
      myisam/mi_write.c:
        Auto merged
      myisam/rt_split.c:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      27ecbeec
    • unknown's avatar
      my_strtoll10-x86.s: · e2765a84
      unknown authored
        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
      e2765a84
  7. 28 Dec, 2006 3 commits
  8. 27 Dec, 2006 2 commits
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 655650f5
      unknown authored
      into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
      
      
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      ndb/src/ndbapi/NdbTransaction.cpp:
        Auto merged
      ndb/src/ndbapi/Ndbif.cpp:
        Auto merged
      ndb/test/ndbapi/testBasic.cpp:
        Auto merged
      ndb/test/ndbapi/testIndex.cpp:
        Auto merged
      655650f5
    • unknown's avatar
      Merge xiphis.org:/home/antony/work2/mysql-5.0-engines · 5d68cff0
      unknown authored
      into  xiphis.org:/home/antony/work2/mysql-5.0-engines-merge
      
      
      myisam/mi_check.c:
        Auto merged
      myisam/mi_dynrec.c:
        Auto merged
      myisam/mi_packrec.c:
        Auto merged
      myisam/mi_range.c:
        Auto merged
      myisam/mi_test1.c:
        Auto merged
      myisam/mi_write.c:
        Auto merged
      myisam/rt_split.c:
        Auto merged
      sql/ha_federated.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      5d68cff0
  9. 26 Dec, 2006 2 commits
    • unknown's avatar
      lock_multi disabled · bf075d82
      unknown authored
      
      mysql-test/t/lock_multi.test:
        doesn't work in embedded server
      bf075d82
    • unknown's avatar
      BUG#25048 - ERROR 126 : Incorrect key file for table '.XXXX.MYI'; try to · f63d8c8d
      unknown authored
                  repair it
      
      Multi-table delete that is optimized with QUICK_RANGE reports table
      corruption.
      
      DELETE statement must not use KEYREAD optimization, and sets
      table->no_keyread to 1. This was ignored in QUICK_RANGE optimization.
      
      With this fix QUICK_RANGE optimization honors table->no_keyread
      value and does not enable KEYREAD when it is requested.
      
      
      mysql-test/r/index_merge.result:
        Fixed a test case according to fix for bug#25048.
      mysql-test/r/index_merge_ror.result:
        A test case for bug#25048.
      mysql-test/t/index_merge_ror.test:
        A test case for bug#25048.
      sql/opt_range.cc:
        Do not use key read when head->no_keyread is set.
      f63d8c8d