mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 12:32:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
53919 commits 2784 branches 343 tags 1.6 GiB
Commit graph

538 commits

Author SHA1 Message Date
unknown
74fa02e80c Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my41-bug23721 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my50-bug23721


BitKeeper/deleted/.del-collapsed~fbec3523369aae99:
  Delete: BitKeeper/etc/collapsed
BUILD/check-cpu:
  Auto merged
BitKeeper/etc/collapsed:
  'Auto converge'
 2007-01-17 13:24:20 -05:00
unknown
63cb7acee2 Bug#23721: compile fails: check-cpu mishandles cpu flags with \ 
hyphen in it (like ds-cpl).

convert illegal chars in cpu flags to '_' for variable assignment


BUILD/check-cpu:
  convert illegal chars in cpu flags to '_' for variable assignment
 2007-01-17 13:22:50 -05:00
unknown
4d106e4c98 Post-merge cleanup and fix minor BUILD/... "="-equality syntax 
error.


BUILD/SETUP.sh:
  Use POSIX "=" equality shell test.
mysql-test/r/view.result:
  Revert year drift.
 2007-01-07 12:21:42 -05:00
unknown
fabd038473 Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build


BUILD/check-cpu:
  Auto merged
client/mysql_upgrade.c:
  Auto merged
BitKeeper/deleted/.del-mysys.vcproj~40a49d09c4184822:
  Auto merged
 2007-01-01 05:37:55 +01:00
unknown
ec08ea7058 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
 2007-01-01 05:35:10 +01:00
unknown
e809f9133e Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build


BUILD/check-cpu:
  Auto merged
scripts/mysql_secure_installation.sh:
  Auto merged
 2007-01-01 05:31:23 +01:00
unknown
6d0387a704 mysql_secure_installation.sh: 
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)
 2007-01-01 05:30:31 +01:00
unknown
f3e4ce926d Merge mysql.com:/home/kent/bk/main/mysql-5.0 
into  mysql.com:/home/kent/bk/main/mysql-5.1


BUILD/Makefile.am:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~10:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~11:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~12:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~13:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~14:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~15:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~2f6eabb2f69cb33d:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~2:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~3:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~4ef559bc8b4695f7:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~4:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~5:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~6:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~7:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~84669765249a4bad:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~8:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~9:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~c20dcd005f596740:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~dd682cce1d53c0b4:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~2:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~ab5c84d46412dc2e:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~e5b911533dad2713:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~ead19441cc5ff35c:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~f87185e232d7c4f:
  Auto merged
BitKeeper/deleted/.del-Makefile.in:
  Auto merged
BitKeeper/deleted/.del-ReadMe.txt~573b1e4ebab241e1:
  Auto merged
BitKeeper/deleted/.del-build-vs71.bat:
  Auto merged
BitKeeper/deleted/.del-build-vs8.bat:
  Auto merged
BitKeeper/deleted/.del-configure.js:
  Auto merged
BitKeeper/deleted/.del-copy_mysql_files.bat~f6878eeb80173de9:
  Auto merged
BitKeeper/deleted/.del-ha_berkeley.cc:
  Auto merged
BitKeeper/deleted/.del-ha_berkeley.h:
  Auto merged
BitKeeper/deleted/.del-make_win_bin_dist:
  Auto merged
BitKeeper/deleted/.del-make_win_src_distribution.sh~f80d8fca44e4e5f1:
  Auto merged
BitKeeper/deleted/.del-my_create_tables.c~c121a0c4c427ebb:
  Auto merged
BitKeeper/deleted/.del-mysql_explain_log.sh~5ddc62808e16bd57:
  Auto merged
BitKeeper/deleted/.del-mysql_thr.c~20772782813d1274:
  Auto merged
BitKeeper/deleted/.del-mysql_upgrade.sh~826da969ccf96ef:
  Auto merged
BitKeeper/deleted/.del-mysqlmanager.c~e97636d71145a0b:
  Auto merged
BitKeeper/deleted/.del-prepare~773a10a535120a7e:
  Auto merged
BitKeeper/deleted/.del-print-limit-table~b8e808031daa3758:
  Auto merged
BitKeeper/deleted/.del-sql_manager.h:
  Auto merged
BitKeeper/deleted/.del-thr_test.c~70fc0971c72f2a95:
  Auto merged
Docs/Makefile.am:
  Auto merged
Docs/generate-text-files.pl:
  Auto merged
client/Makefile.am:
  Auto merged
client/client_priv.h:
  Auto merged
client/mysqladmin.cc:
  Auto merged
client/mysqlimport.c:
  Auto merged
client/mysqlshow.c:
  Auto merged
dbug/Makefile.am:
  Auto merged
extra/Makefile.am:
  Auto merged
extra/yassl/taocrypt/benchmark/Makefile.am:
  Auto merged
extra/yassl/taocrypt/test/Makefile.am:
  Auto merged
include/Makefile.am:
  Auto merged
include/my_time.h:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
libmysqld/embedded_priv.h:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/install_test_db.sh:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_io.pl:
  Auto merged
mysql-test/lib/mtr_match.pl:
  Auto merged
mysql-test/lib/mtr_misc.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/lib/mtr_timer.pl:
  Auto merged
mysql-test/ndb/ndbcluster.sh:
  Auto merged
mysys/Makefile.am:
  Auto merged
mysys/my_gethostbyname.c:
  Auto merged
mysys/my_getopt.c:
  Auto merged
mysys/my_handler.c:
  Auto merged
regex/Makefile.am:
  Auto merged
scripts/Makefile.am:
  Auto merged
scripts/fill_func_tables.sh:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/mysql_convert_table_format.sh:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_fix_privilege_tables.sh:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
server-tools/instance-manager/IMService.cpp:
  Auto merged
server-tools/instance-manager/WindowsService.cpp:
  Auto merged
server-tools/instance-manager/listener.cc:
  Auto merged
server-tools/instance-manager/log.cc:
  Auto merged
server-tools/instance-manager/log.h:
  Auto merged
server-tools/instance-manager/manager.cc:
  Auto merged
server-tools/instance-manager/messages.cc:
  Auto merged
server-tools/instance-manager/mysql_connection.cc:
  Auto merged
server-tools/instance-manager/mysqlmanager.cc:
  Auto merged
server-tools/instance-manager/options.cc:
  Auto merged
server-tools/instance-manager/options.h:
  Auto merged
server-tools/instance-manager/portability.h:
  Auto merged
server-tools/instance-manager/priv.cc:
  Auto merged
server-tools/instance-manager/protocol.cc:
  Auto merged
server-tools/instance-manager/protocol.h:
  Auto merged
server-tools/instance-manager/thread_registry.cc:
  Auto merged
server-tools/instance-manager/thread_registry.h:
  Auto merged
server-tools/instance-manager/user_map.cc:
  Auto merged
server-tools/instance-manager/user_map.h:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/discover.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/hostname.cc:
  Auto merged
sql/init.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_geofunc.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/item_uniq.cc:
  Auto merged
sql/key.cc:
  Auto merged
sql/lex_symbol.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/my_decimal.cc:
  Auto merged
sql/my_decimal.h:
  Auto merged
sql/my_lock.c:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/password.c:
  Auto merged
sql/procedure.h:
  Auto merged
sql/protocol.h:
  Auto merged
sql/records.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/spatial.h:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_analyse.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_crypt.cc:
  Auto merged
sql/sql_cursor.cc:
  Auto merged
sql/sql_do.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_manager.cc:
  Auto merged
sql/sql_map.cc:
  Auto merged
sql/sql_olap.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_rename.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged
sql-bench/Makefile.am:
  Auto merged
sql-bench/as3ap.sh:
  Auto merged
sql-bench/bench-count-distinct.sh:
  Auto merged
sql-bench/bench-init.pl.sh:
  Auto merged
sql-bench/compare-results.sh:
  Auto merged
sql-bench/copy-db.sh:
  Auto merged
sql-bench/crash-me.sh:
  Auto merged
sql-bench/run-all-tests.sh:
  Auto merged
sql-bench/server-cfg.sh:
  Auto merged
sql-bench/test-ATIS.sh:
  Auto merged
sql-bench/test-alter-table.sh:
  Auto merged
sql-bench/test-big-tables.sh:
  Auto merged
sql-bench/test-connect.sh:
  Auto merged
sql-bench/test-create.sh:
  Auto merged
sql-bench/test-insert.sh:
  Auto merged
sql-bench/test-select.sh:
  Auto merged
sql-bench/test-transactions.sh:
  Auto merged
sql-bench/test-wisconsin.sh:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/structs.h:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/time.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
sql/unireg.h:
  Auto merged
storage/federated/ha_federated.cc:
  Auto merged
storage/heap/Makefile.am:
  Auto merged
storage/heap/_check.c:
  Auto merged
storage/heap/_rectest.c:
  Auto merged
storage/heap/ha_heap.cc:
  Auto merged
storage/heap/ha_heap.h:
  Auto merged
storage/heap/heapdef.h:
  Auto merged
storage/heap/hp_block.c:
  Auto merged
storage/heap/hp_clear.c:
  Auto merged
storage/heap/hp_close.c:
  Auto merged
storage/heap/hp_create.c:
  Auto merged
storage/heap/hp_delete.c:
  Auto merged
storage/heap/hp_extra.c:
  Auto merged
storage/heap/hp_hash.c:
  Auto merged
storage/heap/hp_info.c:
  Auto merged
storage/heap/hp_open.c:
  Auto merged
storage/heap/hp_panic.c:
  Auto merged
storage/heap/hp_rename.c:
  Auto merged
storage/heap/hp_rfirst.c:
  Auto merged
storage/heap/hp_rkey.c:
  Auto merged
storage/heap/hp_rlast.c:
  Auto merged
storage/heap/hp_rnext.c:
  Auto merged
storage/heap/hp_rprev.c:
  Auto merged
storage/heap/hp_rrnd.c:
  Auto merged
storage/heap/hp_rsame.c:
  Auto merged
storage/heap/hp_scan.c:
  Auto merged
storage/heap/hp_static.c:
  Auto merged
storage/heap/hp_test1.c:
  Auto merged
storage/heap/hp_test2.c:
  Auto merged
storage/heap/hp_update.c:
  Auto merged
storage/heap/hp_write.c:
  Auto merged
storage/innobase/Makefile.am:
  Auto merged
storage/innobase/btr/Makefile.am:
  Auto merged
storage/innobase/buf/Makefile.am:
  Auto merged
storage/innobase/data/Makefile.am:
  Auto merged
storage/innobase/dict/Makefile.am:
  Auto merged
storage/innobase/dyn/Makefile.am:
  Auto merged
storage/innobase/eval/Makefile.am:
  Auto merged
storage/innobase/fil/Makefile.am:
  Auto merged
storage/innobase/fsp/Makefile.am:
  Auto merged
storage/innobase/fut/Makefile.am:
  Auto merged
storage/innobase/ha/Makefile.am:
  Auto merged
storage/innobase/ibuf/Makefile.am:
  Auto merged
storage/innobase/lock/Makefile.am:
  Auto merged
storage/innobase/log/Makefile.am:
  Auto merged
storage/innobase/mach/Makefile.am:
  Auto merged
storage/innobase/mem/Makefile.am:
  Auto merged
storage/innobase/mtr/Makefile.am:
  Auto merged
storage/innobase/os/Makefile.am:
  Auto merged
storage/innobase/page/Makefile.am:
  Auto merged
storage/innobase/pars/Makefile.am:
  Auto merged
storage/innobase/que/Makefile.am:
  Auto merged
storage/innobase/read/Makefile.am:
  Auto merged
storage/innobase/rem/Makefile.am:
  Auto merged
storage/innobase/row/Makefile.am:
  Auto merged
storage/innobase/srv/Makefile.am:
  Auto merged
storage/innobase/sync/Makefile.am:
  Auto merged
storage/innobase/thr/Makefile.am:
  Auto merged
storage/innobase/trx/Makefile.am:
  Auto merged
storage/innobase/usr/Makefile.am:
  Auto merged
storage/innobase/ut/Makefile.am:
  Auto merged
storage/myisam/Makefile.am:
  Auto merged
storage/myisam/ft_boolean_search.c:
  Auto merged
storage/myisam/ft_eval.c:
  Auto merged
storage/myisam/ft_nlq_search.c:
  Auto merged
storage/myisam/ft_parser.c:
  Auto merged
storage/myisam/ft_static.c:
  Auto merged
storage/myisam/ft_stem.c:
  Auto merged
storage/myisam/ft_stopwords.c:
  Auto merged
storage/myisam/ft_test1.c:
  Auto merged
storage/myisam/ft_test1.h:
  Auto merged
storage/myisam/ft_update.c:
  Auto merged
storage/myisam/ftdefs.h:
  Auto merged
storage/myisam/fulltext.h:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/ha_myisam.h:
  Auto merged
storage/myisam/mi_cache.c:
  Auto merged
storage/myisam/mi_changed.c:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_checksum.c:
  Auto merged
storage/myisam/mi_close.c:
  Auto merged
storage/myisam/mi_create.c:
  Auto merged
storage/myisam/mi_dbug.c:
  Auto merged
storage/myisam/mi_delete.c:
  Auto merged
storage/myisam/mi_delete_all.c:
  Auto merged
storage/myisam/mi_delete_table.c:
  Auto merged
storage/myisam/mi_dynrec.c:
  Auto merged
storage/myisam/mi_extra.c:
  Auto merged
storage/myisam/mi_info.c:
  Auto merged
storage/myisam/mi_key.c:
  Auto merged
storage/myisam/mi_locking.c:
  Auto merged
storage/myisam/mi_log.c:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/myisam/mi_packrec.c:
  Auto merged
storage/myisam/mi_page.c:
  Auto merged
storage/myisam/mi_panic.c:
  Auto merged
storage/myisam/mi_preload.c:
  Auto merged
storage/myisam/mi_range.c:
  Auto merged
storage/myisam/mi_rename.c:
  Auto merged
storage/myisam/mi_rfirst.c:
  Auto merged
storage/myisam/mi_rkey.c:
  Auto merged
storage/myisam/mi_rlast.c:
  Auto merged
storage/myisam/mi_rnext.c:
  Auto merged
storage/myisam/mi_rnext_same.c:
  Auto merged
storage/myisam/mi_rprev.c:
  Auto merged
storage/myisam/mi_rrnd.c:
  Auto merged
storage/myisam/mi_rsame.c:
  Auto merged
storage/myisam/mi_rsamepos.c:
  Auto merged
storage/myisam/mi_scan.c:
  Auto merged
storage/myisam/mi_search.c:
  Auto merged
storage/myisam/mi_static.c:
  Auto merged
storage/myisam/mi_statrec.c:
  Auto merged
storage/myisam/mi_test1.c:
  Auto merged
storage/myisam/mi_test2.c:
  Auto merged
storage/myisam/mi_test3.c:
  Auto merged
storage/myisam/mi_unique.c:
  Auto merged
storage/myisam/mi_update.c:
  Auto merged
storage/myisam/mi_write.c:
  Auto merged
storage/myisam/myisam_ftdump.c:
  Auto merged
storage/myisam/myisamdef.h:
  Auto merged
storage/myisam/myisamlog.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/myisam/rt_index.c:
  Auto merged
storage/myisam/rt_index.h:
  Auto merged
storage/myisam/rt_key.h:
  Auto merged
storage/myisam/rt_mbr.c:
  Auto merged
storage/myisam/rt_mbr.h:
  Auto merged
storage/myisam/rt_split.c:
  Auto merged
storage/myisam/rt_test.c:
  Auto merged
storage/myisam/sort.c:
  Auto merged
storage/myisam/sp_defs.h:
  Auto merged
storage/myisam/sp_test.c:
  Auto merged
storage/myisammrg/Makefile.am:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
storage/myisammrg/ha_myisammrg.h:
  Auto merged
storage/myisammrg/myrg_close.c:
  Auto merged
storage/myisammrg/myrg_create.c:
  Auto merged
storage/myisammrg/myrg_def.h:
  Auto merged
storage/myisammrg/myrg_delete.c:
  Auto merged
storage/myisammrg/myrg_extra.c:
  Auto merged
storage/myisammrg/myrg_info.c:
  Auto merged
storage/myisammrg/myrg_locking.c:
  Auto merged
storage/myisammrg/myrg_open.c:
  Auto merged
storage/myisammrg/myrg_panic.c:
  Auto merged
storage/myisammrg/myrg_queue.c:
  Auto merged
storage/myisammrg/myrg_range.c:
  Auto merged
storage/myisammrg/myrg_rfirst.c:
  Auto merged
storage/myisammrg/myrg_rkey.c:
  Auto merged
storage/myisammrg/myrg_rlast.c:
  Auto merged
storage/myisammrg/myrg_rnext.c:
  Auto merged
storage/myisammrg/myrg_rnext_same.c:
  Auto merged
storage/myisammrg/myrg_rprev.c:
  Auto merged
storage/myisammrg/myrg_rrnd.c:
  Auto merged
storage/myisammrg/myrg_rsame.c:
  Auto merged
storage/myisammrg/myrg_static.c:
  Auto merged
storage/myisammrg/myrg_update.c:
  Auto merged
storage/myisammrg/myrg_write.c:
  Auto merged
storage/ndb/Makefile.am:
  Auto merged
storage/ndb/config/common.mk.am:
  Auto merged
storage/ndb/config/type_kernel.mk.am:
  Auto merged
storage/ndb/config/type_mgmapiclient.mk.am:
  Auto merged
storage/ndb/config/type_ndbapi.mk.am:
  Auto merged
storage/ndb/config/type_ndbapiclient.mk.am:
  Auto merged
storage/ndb/config/type_ndbapitest.mk.am:
  Auto merged
storage/ndb/config/type_ndbapitools.mk.am:
  Auto merged
storage/ndb/config/type_util.mk.am:
  Auto merged
storage/ndb/docs/Makefile.am:
  Auto merged
storage/ndb/include/Makefile.am:
  Auto merged
storage/ndb/include/kernel/kernel_config_parameters.h:
  Auto merged
storage/ndb/include/kernel/signaldata/CntrStart.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/ReadConfig.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/UpgradeStartup.hpp:
  Auto merged
storage/ndb/include/logger/FileLogHandler.hpp:
  Auto merged
storage/ndb/include/ndb_net.h:
  Auto merged
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
storage/ndb/include/mgmapi/mgmapi_config_parameters_debug.h:
  Auto merged
storage/ndb/include/util/ConfigValues.hpp:
  Auto merged
storage/ndb/include/util/File.hpp:
  Auto merged
storage/ndb/include/util/Vector.hpp:
  Auto merged
storage/ndb/src/Makefile.am:
  Auto merged
storage/ndb/src/common/Makefile.am:
  Auto merged
storage/ndb/src/common/debugger/Makefile.am:
  Auto merged
storage/ndb/src/common/debugger/signaldata/CntrStart.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/Makefile.am:
  Auto merged
storage/ndb/src/common/debugger/signaldata/ReadNodesConf.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/print.awk:
  Auto merged
storage/ndb/src/common/logger/FileLogHandler.cpp:
  Auto merged
storage/ndb/src/common/logger/Makefile.am:
  Auto merged
storage/ndb/src/common/mgmcommon/Makefile.am:
  Auto merged
storage/ndb/src/common/transporter/Makefile.am:
  Auto merged
storage/ndb/src/common/util/Bitmask.cpp:
  Auto merged
storage/ndb/src/common/util/ConfigValues.cpp:
  Auto merged
storage/ndb/src/common/util/File.cpp:
  Auto merged
storage/ndb/src/common/util/Makefile.am:
  Auto merged
storage/ndb/src/common/util/new.cpp:
  Auto merged
storage/ndb/src/common/util/testConfigValues/testConfigValues.cpp:
  Auto merged
storage/ndb/src/cw/Makefile.am:
  Auto merged
storage/ndb/src/cw/cpcd/Makefile.am:
  Auto merged
storage/ndb/src/kernel/blocks/Makefile.am:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Makefile.am:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Master_AddTable.sfl:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Slave_AddTable.sfl:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/error/Makefile.am:
  Auto merged
storage/ndb/src/kernel/vm/Makefile.am:
  Auto merged
storage/ndb/src/mgmapi/Makefile.am:
  Auto merged
storage/ndb/src/mgmapi/mgmapi_configuration.cpp:
  Auto merged
storage/ndb/src/mgmclient/Makefile.am:
  Auto merged
storage/ndb/src/mgmsrv/Makefile.am:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/ndbapi/Makefile.am:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
storage/ndb/test/Makefile.am:
  Auto merged
storage/ndb/test/ndbapi/Makefile.am:
  Auto merged
storage/ndb/test/ndbapi/bank/Makefile.am:
  Auto merged
storage/ndb/test/ndbapi/testBasic.cpp:
  Auto merged
storage/ndb/test/ndbapi/testIndex.cpp:
  Auto merged
storage/ndb/test/run-test/Makefile.am:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/src/Makefile.am:
  Auto merged
storage/ndb/test/tools/Makefile.am:
  Auto merged
storage/ndb/tools/Makefile.am:
  Auto merged
strings/Makefile.am:
  Auto merged
strings/ctype-extra.c:
  Auto merged
tests/Makefile.am:
  Auto merged
vio/Makefile.am:
  Auto merged
BitKeeper/deleted/.del-colspec-fix.pl~6c78d3332330b19e:
  Auto merged
BitKeeper/deleted/.del-docbook-fixup.pl~46cf3bdef147084e:
  Auto merged
BitKeeper/deleted/.del-docbook-prefix.pl~876c7d33c68c224a:
  Auto merged
BitKeeper/deleted/.del-docbook-split~be931c3922898d0:
  Auto merged
BitKeeper/deleted/.del-make-docbook~ccac1eb717e92ac9:
  Auto merged
BitKeeper/deleted/.del-make-makefile~39fd454b487126e8:
  Auto merged
BitKeeper/deleted/.del-test-make-manual-de~33cad2886311b8a:
  Auto merged
BitKeeper/deleted/.del-test-make-manual~5da458f958a424ec:
  Auto merged
BitKeeper/deleted/.del-xwf~76b97805d9146b80:
  Auto merged
server-tools/instance-manager/listener.h:
  SCCS merged
server-tools/instance-manager/manager.h:
  SCCS merged
server-tools/instance-manager/mysql_connection.h:
  SCCS merged
server-tools/instance-manager/priv.h:
  SCCS merged
storage/ndb/src/kernel/blocks/dblqh/Makefile.am:
  SCCS merged
 2006-12-31 01:32:21 +01:00
unknown
e2765a84b1 my_strtoll10-x86.s: 
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
 2006-12-31 01:02:27 +01:00
unknown
4dabfa5de7 Merge mysql.com:/home/kent/bk/main/mysql-5.0 
into  mysql.com:/home/kent/bk/main/mysql-5.1


BUILD/Makefile.am:
  Auto merged
BitKeeper/deleted/.del-ArrayFifoList.hpp~7036ae04dd7e7bd2:
  Auto merged
BitKeeper/deleted/.del-ArrayList.hpp~44695d09b1a02179:
  Auto merged
BitKeeper/deleted/.del-DbtupLCP.cpp~855b1ed3fbc86a42:
  Auto merged
BitKeeper/deleted/.del-DbtupSystemRestart.cpp~15b54d7e4e75d2d:
  Auto merged
BitKeeper/deleted/.del-DbtupUndoLog.cpp~5a2ef6e86b1404e9:
  Auto merged
Makefile.am:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~2:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~ab5c84d46412dc2e:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~abb265028eb9b6a7:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~e5b911533dad2713:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~ead19441cc5ff35c:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~f87185e232d7c4f:
  Auto merged
BitKeeper/deleted/.del-Makefile.in:
  Auto merged
BitKeeper/deleted/.del-MemoryChannelOSE.hpp:
  Auto merged
BitKeeper/deleted/.del-MetaData.cpp~146ae9865dd35829:
  Auto merged
BitKeeper/deleted/.del-MetaData.hpp~538342afcd8ac53c:
  Auto merged
BitKeeper/deleted/.del-NdbCondition.c~ad83464328ab37af:
  Auto merged
BitKeeper/deleted/.del-NdbCondition.c~ee56562abdd718cf:
  Auto merged
BitKeeper/deleted/.del-NdbConditionOSE.h~455dd2c29c2e6344:
  Auto merged
BitKeeper/deleted/.del-NdbDaemon.c~3b8101f376b28df:
  Auto merged
BitKeeper/deleted/.del-NdbEnv.c~207f9ce9754c9e8a:
  Auto merged
BitKeeper/deleted/.del-NdbEnv.c~bb6fe7572d45288a:
  Auto merged
BitKeeper/deleted/.del-NdbErrHnd.cpp:
  Auto merged
BitKeeper/deleted/.del-NdbHost.c~2c29816c77396d7b:
  Auto merged
BitKeeper/deleted/.del-NdbHost.c~cf18d6b3c825180c:
  Auto merged
BitKeeper/deleted/.del-NdbMem.c~6285b159985d46da:
  Auto merged
BitKeeper/deleted/.del-NdbMem.c~6c2b317c1ce230ab:
  Auto merged
BitKeeper/deleted/.del-NdbMem_SoftOse.cpp~9c61e311ec168d44:
  Auto merged
BitKeeper/deleted/.del-NdbMutex.c~768131269bccca10:
  Auto merged
BitKeeper/deleted/.del-NdbMutex.c~f4bdd19be08b84ab:
  Auto merged
BitKeeper/deleted/.del-NdbOut.cpp~8caa99a0d729540c:
  Auto merged
BitKeeper/deleted/.del-NdbSleep.c~b643ea3e7103eb62:
  Auto merged
BitKeeper/deleted/.del-NdbSleep.c~b88fbc5b140de10d:
  Auto merged
BitKeeper/deleted/.del-NdbTCP.c~1e9f416992352f6d:
  Auto merged
BitKeeper/deleted/.del-NdbTCP.c~b09cdcbef3ea2c57:
  Auto merged
BitKeeper/deleted/.del-NdbThread.c~2fe1fa5f47801772:
  Auto merged
BitKeeper/deleted/.del-NdbThread.c~fe71a67b5c3a4724:
  Auto merged
BitKeeper/deleted/.del-NdbTick.c~aa6385567216509d:
  Auto merged
BitKeeper/deleted/.del-NdbTick.c~b76feba2cf1493d1:
  Auto merged
BitKeeper/deleted/.del-OSE_Receiver.cpp:
  Auto merged
BitKeeper/deleted/.del-OSE_Receiver.hpp:
  Auto merged
BitKeeper/deleted/.del-OSE_Signals.hpp:
  Auto merged
BitKeeper/deleted/.del-OSE_Transporter.cpp:
  Auto merged
BitKeeper/deleted/.del-OSE_Transporter.hpp:
  Auto merged
BitKeeper/deleted/.del-TraceNdbApi.hpp~7a7f0ae5b70358bc:
  Auto merged
BitKeeper/deleted/.del-VerifyNdbApi.hpp~f417f78f7cd05935:
  Auto merged
BitKeeper/deleted/.del-bcd.h~81fbfcc1530534da:
  Auto merged
BitKeeper/deleted/.del-config-os2.h~a16b51851ddd317b:
  Auto merged
BitKeeper/deleted/.del-dbGenerator.c~7509c19f70cad0bf:
  Auto merged
BitKeeper/deleted/.del-dbGenerator.h~63f1aeb98260bcb7:
  Auto merged
BitKeeper/deleted/.del-dbGenerator.h~e1aaa6725999d458:
  Auto merged
BitKeeper/deleted/.del-dbPopulate.c~5dcff1c99783d83b:
  Auto merged
BitKeeper/deleted/.del-dbPopulate.h~229a894b59d4da73:
  Auto merged
BitKeeper/deleted/.del-ha_berkeley.cc:
  Auto merged
BitKeeper/deleted/.del-ha_berkeley.h:
  Auto merged
BitKeeper/deleted/.del-localDbPrepare.c~33a2c46afc8fac9a:
  Auto merged
BitKeeper/deleted/.del-macros.h~58097d584e29b5df:
  Auto merged
BitKeeper/deleted/.del-macros.h~742871fab0681964:
  Auto merged
BitKeeper/deleted/.del-mainGenerator.c~2d1c8016f72b2517:
  Auto merged
BitKeeper/deleted/.del-mainPopulate.c~37def9a44980b8ec:
  Auto merged
BitKeeper/deleted/.del-mgmapi_logevent.cpp~f1e7cf3e70edc4:
  Auto merged
BitKeeper/deleted/.del-mmslist.cpp:
  Auto merged
BitKeeper/deleted/.del-my_lread.c:
  Auto merged
BitKeeper/deleted/.del-my_lwrite.c:
  Auto merged
BitKeeper/deleted/.del-my_os2cond.c~e3b520af1c371bb5:
  Auto merged
BitKeeper/deleted/.del-my_os2dirsrch.c~4e2479b2abb2eb5a:
  Auto merged
BitKeeper/deleted/.del-my_os2dirsrch.h~5011cbc657537d0:
  Auto merged
BitKeeper/deleted/.del-my_os2dlfcn.c~6d94b488717683dd:
  Auto merged
BitKeeper/deleted/.del-my_os2dlfcn.h0~eae8edb8555eff87:
  Auto merged
BitKeeper/deleted/.del-my_os2file64.c~251fb8a1e950c31b:
  Auto merged
BitKeeper/deleted/.del-my_os2thread.c~65dca991548cec2a:
  Auto merged
BitKeeper/deleted/.del-my_os2tls.c~58ade7a0f70ad5ea:
  Auto merged
BitKeeper/deleted/.del-mysqlmanager-pwgen.c~d8f5f91ec54432b9:
  Auto merged
BitKeeper/deleted/.del-mysqlmanager.c~e97636d71145a0b:
  Auto merged
BitKeeper/deleted/.del-mysqlmanagerc.c~4f6e3499e68508f6:
  Auto merged
BitKeeper/deleted/.del-ndb_error.hpp~24468bb7f20a0b41:
  Auto merged
BitKeeper/deleted/.del-ndb_error.hpp~45a2fef922beae3:
  Auto merged
BitKeeper/deleted/.del-ndb_schema.hpp~de9c21185d6bfe4e:
  Auto merged
BitKeeper/deleted/.del-ndbapi_async.cpp~319189569fb659ec:
  Auto merged
BitKeeper/deleted/.del-ndbapi_async1.cpp~2995dac9b963a0d:
  Auto merged
BitKeeper/deleted/.del-ndbapi_event.cpp~c5d949802966180:
  Auto merged
BitKeeper/deleted/.del-ndbapi_retries.cpp~7301496d8c1c310a:
  Auto merged
BitKeeper/deleted/.del-ndbapi_scan.cpp~14ed2aa9a5d9e597:
  Auto merged
BitKeeper/deleted/.del-ndbapi_simple.cpp~80962179f3c2f5b8:
  Auto merged
BitKeeper/deleted/.del-ndbapi_simple_index.cpp~4b95a4d71808b5b6:
  Auto merged
BitKeeper/deleted/.del-print-limit-table~b8e808031daa3758:
  Auto merged
BitKeeper/deleted/.del-raid.cc~488f5fa6538394e1:
  Auto merged
BitKeeper/deleted/.del-raid.h~2d2503a66b128ac6:
  Auto merged
BitKeeper/deleted/.del-raid2.c~fe7aea5fb4b9748c:
  Auto merged
BitKeeper/deleted/.del-sql_manager.h:
  Auto merged
BitKeeper/deleted/.del-testData.h~696038ea2623a90b:
  Auto merged
BitKeeper/deleted/.del-testData.h~898b71d7c639319e:
  Auto merged
BitKeeper/deleted/.del-testDefinitions.h~f18a4553579a3725:
  Auto merged
BitKeeper/deleted/.del-userHandle.h~3275bb415e1ca2c2:
  Auto merged
BitKeeper/deleted/.del-userHandle.h~ec22dc7a7ed2f81b:
  Auto merged
BitKeeper/deleted/.del-userInterface.cpp~82ee612ab14b3d48:
  Auto merged
BitKeeper/deleted/.del-userInterface.c~92a20032f7d1e91:
  Auto merged
BitKeeper/deleted/.del-userInterface.h~1f76ad2f28b283fd:
  Auto merged
BitKeeper/deleted/.del-userInterface.h~49139f029bbdaabc:
  Auto merged
BitKeeper/deleted/.del-userTransaction.c~438012ecc761b776:
  Auto merged
BitKeeper/deleted/.del-userTransaction.c~f50661b4f54b0bdd:
  Auto merged
BitKeeper/deleted/.del-utv.h~f64af026b9705ebb:
  Auto merged
BitKeeper/deleted/.del-vcdrfunc.h~85803875180684cd:
  Auto merged
BitKeeper/deleted/.del-waiter.cpp~b188e4bfddf2cf98:
  Auto merged
Docs/Makefile.am:
  Auto merged
client/Makefile.am:
  Auto merged
client/client_priv.h:
  Auto merged
client/get_password.c:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysql_upgrade.c:
  Auto merged
client/mysqladmin.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqlcheck.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
client/mysqlshow.c:
  Auto merged
client/mysqltest.c:
  Auto merged
dbug/Makefile.am:
  Auto merged
extra/Makefile.am:
  Auto merged
extra/comp_err.c:
  Auto merged
extra/perror.c:
  Auto merged
extra/replace.c:
  Auto merged
extra/resolveip.c:
  Auto merged
include/Makefile.am:
  Auto merged
include/base64.h:
  Auto merged
include/config-netware.h:
  Auto merged
include/config-win.h:
  Auto merged
include/decimal.h:
  Auto merged
include/errmsg.h:
  Auto merged
include/ft_global.h:
  Auto merged
include/heap.h:
  Auto merged
include/m_ctype.h:
  Auto merged
include/m_string.h:
  Auto merged
include/my_base.h:
  Auto merged
include/my_bitmap.h:
  Auto merged
include/my_dbug.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_net.h:
  Auto merged
include/my_no_pthread.h:
  Auto merged
include/my_nosys.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/my_time.h:
  Auto merged
include/my_tree.h:
  Auto merged
include/my_xml.h:
  Auto merged
include/myisam.h:
  Auto merged
include/myisammrg.h:
  Auto merged
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
include/mysys_err.h:
  Auto merged
include/queues.h:
  Auto merged
include/thr_alarm.h:
  Auto merged
include/thr_lock.h:
  Auto merged
include/violite.h:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
libmysqld/emb_qcache.cc:
  Auto merged
libmysqld/embedded_priv.h:
  Auto merged
libmysqld/examples/Makefile.am:
  Auto merged
libmysqld/libmysqld.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysys/Makefile.am:
  Auto merged
mysys/array.c:
  Auto merged
mysys/base64.c:
  Auto merged
mysys/charset-def.c:
  Auto merged
mysys/default.c:
  Auto merged
mysys/default_modify.c:
  Auto merged
mysys/errors.c:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/mf_dirname.c:
  Auto merged
mysys/mf_format.c:
  Auto merged
mysys/mf_iocache.c:
  Auto merged
mysys/mf_iocache2.c:
  Auto merged
mysys/mf_keycache.c:
  Auto merged
mysys/mf_pack.c:
  Auto merged
mysys/mf_path.c:
  Auto merged
mysys/mf_tempdir.c:
  Auto merged
mysys/mf_tempfile.c:
  Auto merged
mysys/my_access.c:
  Auto merged
mysys/my_alloc.c:
  Auto merged
mysys/my_append.c:
  Auto merged
mysys/my_bit.c:
  Auto merged
mysys/my_bitmap.c:
  Auto merged
mysys/my_clock.c:
  Auto merged
mysys/my_compress.c:
  Auto merged
mysys/my_copy.c:
  Auto merged
mysys/my_create.c:
  Auto merged
mysys/my_dup.c:
  Auto merged
mysys/my_error.c:
  Auto merged
mysys/my_file.c:
  Auto merged
mysys/my_gethostbyname.c:
  Auto merged
mysys/my_getopt.c:
  Auto merged
mysys/my_getwd.c:
  Auto merged
mysys/my_handler.c:
  Auto merged
mysys/my_init.c:
  Auto merged
mysys/my_lib.c:
  Auto merged
mysys/my_lock.c:
  Auto merged
mysys/my_malloc.c:
  Auto merged
mysys/my_mkdir.c:
  Auto merged
mysys/my_mmap.c:
  Auto merged
mysys/my_net.c:
  Auto merged
mysys/my_once.c:
  Auto merged
mysys/my_open.c:
  Auto merged
mysys/my_pread.c:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/my_redel.c:
  Auto merged
mysys/my_rename.c:
  Auto merged
mysys/my_seek.c:
  Auto merged
mysys/my_sleep.c:
  Auto merged
mysys/my_static.c:
  Auto merged
mysys/my_symlink2.c:
  Auto merged
mysys/my_thr_init.c:
  Auto merged
mysys/mysys_priv.h:
  Auto merged
mysys/ptr_cmp.c:
  Auto merged
mysys/queues.c:
  Auto merged
mysys/safemalloc.c:
  Auto merged
mysys/string.c:
  Auto merged
mysys/test_dir.c:
  Auto merged
mysys/testhash.c:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
mysys/thr_lock.c:
  Auto merged
mysys/thr_mutex.c:
  Auto merged
regex/Makefile.am:
  Auto merged
scripts/Makefile.am:
  Auto merged
server-tools/instance-manager/Makefile.am:
  Auto merged
server-tools/instance-manager/buffer.cc:
  Auto merged
server-tools/instance-manager/command.cc:
  Auto merged
server-tools/instance-manager/command.h:
  Auto merged
server-tools/instance-manager/commands.cc:
  Auto merged
server-tools/instance-manager/commands.h:
  Auto merged
server-tools/instance-manager/guardian.cc:
  Auto merged
server-tools/instance-manager/guardian.h:
  Auto merged
server-tools/instance-manager/instance.cc:
  Auto merged
server-tools/instance-manager/instance.h:
  Auto merged
server-tools/instance-manager/instance_map.cc:
  Auto merged
server-tools/instance-manager/instance_map.h:
  Auto merged
server-tools/instance-manager/instance_options.cc:
  Auto merged
server-tools/instance-manager/instance_options.h:
  Auto merged
server-tools/instance-manager/listener.cc:
  Auto merged
server-tools/instance-manager/listener.h:
  Auto merged
server-tools/instance-manager/log.cc:
  Auto merged
server-tools/instance-manager/log.h:
  Auto merged
server-tools/instance-manager/manager.cc:
  Auto merged
server-tools/instance-manager/manager.h:
  Auto merged
server-tools/instance-manager/messages.cc:
  Auto merged
server-tools/instance-manager/mysql_connection.cc:
  Auto merged
server-tools/instance-manager/mysql_connection.h:
  Auto merged
server-tools/instance-manager/mysql_manager_error.h:
  Auto merged
server-tools/instance-manager/mysqlmanager.cc:
  Auto merged
server-tools/instance-manager/options.cc:
  Auto merged
server-tools/instance-manager/options.h:
  Auto merged
server-tools/instance-manager/parse.cc:
  Auto merged
server-tools/instance-manager/parse.h:
  Auto merged
server-tools/instance-manager/parse_output.cc:
  Auto merged
server-tools/instance-manager/parse_output.h:
  Auto merged
server-tools/instance-manager/priv.cc:
  Auto merged
server-tools/instance-manager/priv.h:
  Auto merged
server-tools/instance-manager/protocol.cc:
  Auto merged
server-tools/instance-manager/protocol.h:
  Auto merged
server-tools/instance-manager/thread_registry.cc:
  Auto merged
server-tools/instance-manager/thread_registry.h:
  Auto merged
server-tools/instance-manager/user_map.cc:
  Auto merged
server-tools/instance-manager/user_map.h:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/discover.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/hostname.cc:
  Auto merged
sql/init.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_geofunc.cc:
  Auto merged
sql/item_geofunc.h:
  Auto merged
sql/item_row.cc:
  Auto merged
sql/item_row.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/item_uniq.cc:
  Auto merged
sql/key.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/lex_symbol.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/my_decimal.cc:
  Auto merged
sql/my_decimal.h:
  Auto merged
sql/my_lock.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/parse_file.cc:
  Auto merged
sql/parse_file.h:
  Auto merged
sql/password.c:
  Auto merged
sql/procedure.h:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/protocol.h:
  Auto merged
sql/records.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp.h:
  Auto merged
sql/sp_cache.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/spatial.cc:
  Auto merged
sql/spatial.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_analyse.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_bitmap.h:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_cache.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_crypt.cc:
  Auto merged
sql/sql_cursor.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_do.cc:
  Auto merged
sql/sql_error.cc:
  Auto merged
sql/sql_error.h:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_manager.cc:
  Auto merged
sql/sql_map.cc:
  Auto merged
sql/sql_olap.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_rename.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged
sql/sql_string.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_trigger.h:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql-bench/Makefile.am:
  Auto merged
sql-bench/as3ap.sh:
  Auto merged
sql-bench/bench-count-distinct.sh:
  Auto merged
sql-bench/bench-init.pl.sh:
  Auto merged
sql-bench/compare-results.sh:
  Auto merged
sql-bench/copy-db.sh:
  Auto merged
sql/share/charsets/Index.xml:
  Auto merged
sql/share/charsets/cp1250.xml:
  Auto merged
sql/sql_view.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/stacktrace.c:
  Auto merged
sql/stacktrace.h:
  Auto merged
sql/strfunc.cc:
  Auto merged
sql/structs.h:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/time.cc:
  Auto merged
sql/tztime.cc:
  Auto merged
sql/tztime.h:
  Auto merged
sql/udf_example.c:
  Auto merged
sql/unireg.cc:
  Auto merged
sql/unireg.h:
  Auto merged
sql-bench/crash-me.sh:
  Auto merged
sql-bench/run-all-tests.sh:
  Auto merged
sql-bench/server-cfg.sh:
  Auto merged
sql-bench/test-ATIS.sh:
  Auto merged
sql-bench/test-alter-table.sh:
  Auto merged
sql-bench/test-big-tables.sh:
  Auto merged
sql-bench/test-connect.sh:
  Auto merged
sql-bench/test-create.sh:
  Auto merged
sql-bench/test-insert.sh:
  Auto merged
sql-bench/test-select.sh:
  Auto merged
sql-bench/test-transactions.sh:
  Auto merged
sql-bench/test-wisconsin.sh:
  Auto merged
sql-common/client.c:
  Auto merged
sql-common/my_time.c:
  Auto merged
storage/archive/ha_archive.cc:
  Auto merged
storage/archive/ha_archive.h:
  Auto merged
storage/blackhole/ha_blackhole.cc:
  Auto merged
storage/blackhole/ha_blackhole.h:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
storage/csv/ha_tina.h:
  Auto merged
storage/example/ha_example.cc:
  Auto merged
storage/example/ha_example.h:
  Auto merged
storage/federated/ha_federated.cc:
  Auto merged
storage/federated/ha_federated.h:
  Auto merged
storage/heap/Makefile.am:
  Auto merged
storage/heap/_check.c:
  Auto merged
storage/heap/_rectest.c:
  Auto merged
storage/heap/ha_heap.cc:
  Auto merged
storage/heap/ha_heap.h:
  Auto merged
storage/heap/heapdef.h:
  Auto merged
storage/heap/hp_block.c:
  Auto merged
storage/heap/hp_clear.c:
  Auto merged
storage/heap/hp_close.c:
  Auto merged
storage/heap/hp_create.c:
  Auto merged
storage/heap/hp_delete.c:
  Auto merged
storage/heap/hp_extra.c:
  Auto merged
storage/heap/hp_hash.c:
  Auto merged
storage/heap/hp_info.c:
  Auto merged
storage/heap/hp_open.c:
  Auto merged
storage/heap/hp_panic.c:
  Auto merged
storage/heap/hp_rename.c:
  Auto merged
storage/heap/hp_rfirst.c:
  Auto merged
storage/heap/hp_rkey.c:
  Auto merged
storage/heap/hp_rlast.c:
  Auto merged
storage/heap/hp_rnext.c:
  Auto merged
storage/heap/hp_rprev.c:
  Auto merged
storage/heap/hp_rrnd.c:
  Auto merged
storage/heap/hp_rsame.c:
  Auto merged
storage/heap/hp_scan.c:
  Auto merged
storage/heap/hp_static.c:
  Auto merged
storage/heap/hp_test1.c:
  Auto merged
storage/heap/hp_test2.c:
  Auto merged
storage/heap/hp_update.c:
  Auto merged
storage/heap/hp_write.c:
  Auto merged
storage/innobase/Makefile.am:
  Auto merged
storage/innobase/btr/Makefile.am:
  Auto merged
storage/innobase/buf/Makefile.am:
  Auto merged
storage/innobase/data/Makefile.am:
  Auto merged
storage/innobase/dict/Makefile.am:
  Auto merged
storage/innobase/dyn/Makefile.am:
  Auto merged
storage/innobase/eval/Makefile.am:
  Auto merged
storage/innobase/fil/Makefile.am:
  Auto merged
storage/innobase/fsp/Makefile.am:
  Auto merged
storage/innobase/fut/Makefile.am:
  Auto merged
storage/innobase/ha/Makefile.am:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
storage/innobase/handler/ha_innodb.h:
  Auto merged
storage/innobase/ibuf/Makefile.am:
  Auto merged
storage/innobase/lock/Makefile.am:
  Auto merged
storage/innobase/log/Makefile.am:
  Auto merged
storage/innobase/mach/Makefile.am:
  Auto merged
storage/innobase/mem/Makefile.am:
  Auto merged
storage/innobase/mtr/Makefile.am:
  Auto merged
storage/innobase/os/Makefile.am:
  Auto merged
storage/innobase/page/Makefile.am:
  Auto merged
storage/innobase/pars/Makefile.am:
  Auto merged
storage/innobase/que/Makefile.am:
  Auto merged
storage/innobase/read/Makefile.am:
  Auto merged
storage/innobase/rem/Makefile.am:
  Auto merged
storage/innobase/row/Makefile.am:
  Auto merged
storage/innobase/srv/Makefile.am:
  Auto merged
storage/innobase/sync/Makefile.am:
  Auto merged
storage/innobase/thr/Makefile.am:
  Auto merged
storage/innobase/trx/Makefile.am:
  Auto merged
storage/innobase/usr/Makefile.am:
  Auto merged
storage/innobase/ut/Makefile.am:
  Auto merged
storage/myisam/Makefile.am:
  Auto merged
storage/myisam/ft_boolean_search.c:
  Auto merged
storage/myisam/ft_eval.c:
  Auto merged
storage/myisam/ft_eval.h:
  Auto merged
storage/myisam/ft_nlq_search.c:
  Auto merged
storage/myisam/ft_parser.c:
  Auto merged
storage/myisam/ft_static.c:
  Auto merged
storage/myisam/ft_stem.c:
  Auto merged
storage/myisam/ft_stopwords.c:
  Auto merged
storage/myisam/ft_test1.c:
  Auto merged
storage/myisam/ft_test1.h:
  Auto merged
storage/myisam/ft_update.c:
  Auto merged
storage/myisam/ftdefs.h:
  Auto merged
storage/myisam/fulltext.h:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/ha_myisam.h:
  Auto merged
storage/myisam/mi_cache.c:
  Auto merged
storage/myisam/mi_changed.c:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_checksum.c:
  Auto merged
storage/myisam/mi_close.c:
  Auto merged
storage/myisam/mi_create.c:
  Auto merged
storage/myisam/mi_dbug.c:
  Auto merged
storage/myisam/mi_delete.c:
  Auto merged
storage/myisam/mi_delete_all.c:
  Auto merged
storage/myisam/mi_delete_table.c:
  Auto merged
storage/myisam/mi_dynrec.c:
  Auto merged
storage/myisam/mi_extra.c:
  Auto merged
storage/myisam/mi_info.c:
  Auto merged
storage/myisam/mi_key.c:
  Auto merged
storage/myisam/mi_keycache.c:
  Auto merged
storage/myisam/mi_locking.c:
  Auto merged
storage/myisam/mi_log.c:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/myisam/mi_packrec.c:
  Auto merged
storage/myisam/mi_page.c:
  Auto merged
storage/myisam/mi_panic.c:
  Auto merged
storage/myisam/mi_preload.c:
  Auto merged
storage/myisam/mi_range.c:
  Auto merged
storage/myisam/mi_rename.c:
  Auto merged
storage/myisam/mi_rfirst.c:
  Auto merged
storage/myisam/mi_rkey.c:
  Auto merged
storage/myisam/mi_rlast.c:
  Auto merged
storage/myisam/mi_rnext.c:
  Auto merged
storage/myisam/mi_rnext_same.c:
  Auto merged
storage/myisam/mi_rprev.c:
  Auto merged
storage/myisam/mi_rrnd.c:
  Auto merged
storage/myisam/mi_rsame.c:
  Auto merged
storage/myisam/mi_rsamepos.c:
  Auto merged
storage/myisam/mi_scan.c:
  Auto merged
storage/myisam/mi_search.c:
  Auto merged
storage/myisam/mi_static.c:
  Auto merged
storage/myisam/mi_statrec.c:
  Auto merged
storage/myisam/mi_test1.c:
  Auto merged
storage/myisam/mi_test2.c:
  Auto merged
storage/myisam/mi_test3.c:
  Auto merged
storage/myisam/mi_unique.c:
  Auto merged
storage/myisam/mi_update.c:
  Auto merged
storage/myisam/mi_write.c:
  Auto merged
storage/myisam/myisam_ftdump.c:
  Auto merged
storage/myisam/myisamchk.c:
  Auto merged
storage/myisam/myisamdef.h:
  Auto merged
storage/myisam/myisamlog.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/myisam/rt_index.c:
  Auto merged
storage/myisam/rt_index.h:
  Auto merged
storage/myisam/rt_key.c:
  Auto merged
storage/myisam/rt_key.h:
  Auto merged
storage/myisam/rt_mbr.c:
  Auto merged
storage/myisam/rt_mbr.h:
  Auto merged
storage/myisam/rt_split.c:
  Auto merged
storage/myisam/rt_test.c:
  Auto merged
storage/myisam/sort.c:
  Auto merged
storage/myisam/sp_defs.h:
  Auto merged
storage/myisam/sp_key.c:
  Auto merged
storage/myisam/sp_test.c:
  Auto merged
storage/myisammrg/Makefile.am:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
storage/myisammrg/ha_myisammrg.h:
  Auto merged
storage/myisammrg/myrg_close.c:
  Auto merged
storage/myisammrg/myrg_create.c:
  Auto merged
storage/myisammrg/myrg_def.h:
  Auto merged
storage/myisammrg/myrg_delete.c:
  Auto merged
storage/myisammrg/myrg_extra.c:
  Auto merged
storage/myisammrg/myrg_info.c:
  Auto merged
storage/myisammrg/myrg_locking.c:
  Auto merged
storage/myisammrg/myrg_open.c:
  Auto merged
storage/myisammrg/myrg_panic.c:
  Auto merged
storage/myisammrg/myrg_queue.c:
  Auto merged
storage/myisammrg/myrg_range.c:
  Auto merged
storage/myisammrg/myrg_rfirst.c:
  Auto merged
storage/myisammrg/myrg_rkey.c:
  Auto merged
storage/myisammrg/myrg_rlast.c:
  Auto merged
storage/myisammrg/myrg_rnext.c:
  Auto merged
storage/myisammrg/myrg_rnext_same.c:
  Auto merged
storage/myisammrg/myrg_rprev.c:
  Auto merged
storage/myisammrg/myrg_rrnd.c:
  Auto merged
storage/myisammrg/myrg_rsame.c:
  Auto merged
storage/myisammrg/myrg_static.c:
  Auto merged
storage/myisammrg/myrg_update.c:
  Auto merged
storage/myisammrg/myrg_write.c:
  Auto merged
storage/ndb/include/debugger/DebuggerNames.hpp:
  Auto merged
storage/ndb/include/debugger/EventLogger.hpp:
  Auto merged
storage/ndb/include/debugger/GrepError.hpp:
  Auto merged
storage/ndb/include/debugger/SignalLoggerManager.hpp:
  Auto merged
storage/ndb/include/ndb_constants.h:
  Auto merged
storage/ndb/include/ndb_global.h.in:
  Auto merged
storage/ndb/include/ndb_init.h:
  Auto merged
storage/ndb/include/ndb_types.h.in:
  Auto merged
storage/ndb/include/ndb_version.h.in:
  Auto merged
storage/ndb/include/editline/editline.h:
  Auto merged
storage/ndb/include/kernel/AttributeDescriptor.hpp:
  Auto merged
storage/ndb/include/kernel/AttributeHeader.hpp:
  Auto merged
storage/ndb/include/kernel/AttributeList.hpp:
  Auto merged
storage/ndb/include/kernel/BlockNumbers.h:
  Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
storage/ndb/include/kernel/GrepEvent.hpp:
  Auto merged
storage/ndb/include/kernel/Interpreter.hpp:
  Auto merged
storage/ndb/include/kernel/LogLevel.hpp:
  Auto merged
storage/ndb/include/kernel/NodeBitmask.hpp:
  Auto merged
storage/ndb/include/kernel/NodeInfo.hpp:
  Auto merged
storage/ndb/include/kernel/NodeState.hpp:
  Auto merged
storage/ndb/include/kernel/RefConvert.hpp:
  Auto merged
storage/ndb/include/kernel/kernel_types.h:
  Auto merged
storage/ndb/include/kernel/ndb_limits.h:
  Auto merged
storage/ndb/include/kernel/signaldata/AbortAll.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/AccFrag.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/AccLock.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/AccScan.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/AccSizeAltReq.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/AlterIndx.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/AlterTab.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/AlterTable.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/AlterTrig.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/ApiBroadcast.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/ApiRegSignalData.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/ApiVersion.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/ArbitSignalData.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/AttrInfo.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/BackupContinueB.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/BackupImpl.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/BackupSignalData.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/BlockCommitOrd.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/BuildIndx.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/CheckNodeGroups.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/CloseComReqConf.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/CmInit.hpp:
  Auto merged
storage/ndb/include/kernel/trigger_definitions.h:
  Auto merged
storage/ndb/include/kernel/signaldata/CmRegSignalData.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/CmvmiCfgConf.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/CntrMasterConf.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/CntrMasterReq.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/ConfigParamId.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/ContinueFragmented.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/CopyActive.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/CopyFrag.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/CopyGCIReq.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/CreateEvnt.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/CreateFrag.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/CreateFragmentation.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/CreateIndx.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/CreateTab.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/CreateTable.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/CreateTrig.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DiAddTab.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DiGetNodes.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DictLock.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DictSchemaInfo.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DictSizeAltReq.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DictStart.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DihAddFrag.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DihContinueB.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DihSizeAltReq.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DihStartTab.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DihSwitchReplica.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DisconnectRep.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DropIndx.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DropTab.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DropTabFile.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DropTable.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DropTrig.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/EmptyLcp.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/EndTo.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/EventReport.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/EventSubscribeReq.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/ExecFragReq.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/FailRep.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/FireTrigOrd.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/FsAppendReq.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/FsCloseReq.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/FsConf.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/FsOpenReq.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/FsReadWriteReq.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/FsRef.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/FsRemoveReq.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/GCPSave.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/GetTabInfo.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/GetTableId.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/GrepImpl.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/HotSpareRep.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/IndxAttrInfo.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/IndxKeyInfo.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/InvalidateNodeLCPConf.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/InvalidateNodeLCPReq.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/KeyInfo.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/LCP.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/ListTables.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/LqhFrag.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/LqhKey.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/LqhSizeAltReq.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/LqhTransConf.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/ManagementServer.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/MasterGCP.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/MasterLCP.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/NFCompleteRep.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/NdbSttor.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/NdbfsContinueB.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/NextScan.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/NodeFailRep.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/NodeStateSignalData.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/PackedSignal.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/PrepDropTab.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/PrepFailReqRef.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/ReadNodesConf.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/RelTabMem.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/RepImpl.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/ResumeReq.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/ScanFrag.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/ScanTab.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/SetLogLevelOrd.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/SetVarReq.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/SignalData.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/SignalDataPrint.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/SignalDroppedRep.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/SrFragidConf.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/StartFragReq.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/StartInfo.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/StartMe.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/StartOrd.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/StartPerm.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/StartRec.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/StartTo.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/StopMe.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/StopPerm.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/StopReq.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/SumaImpl.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/SystemError.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/TamperOrd.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/TcCommit.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/TcContinueB.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/TcHbRep.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/TcIndx.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/TcKeyConf.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/TcKeyFailConf.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/TcKeyRef.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/TcKeyReq.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/TcRollbackRep.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/TcSizeAltReq.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/TestOrd.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/TransIdAI.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/TrigAttrInfo.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/TupCommit.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/TupFrag.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/TupKey.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/TupSizeAltReq.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/TuxBound.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/TuxContinueB.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/TuxMaint.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/TuxSizeAltReq.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/UpdateTo.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/UtilDelete.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/UtilExecute.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/UtilLock.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/UtilPrepare.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/UtilRelease.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/UtilSequence.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/WaitGCP.hpp:
  Auto merged
storage/ndb/include/logger/ConsoleLogHandler.hpp:
  Auto merged
storage/ndb/include/logger/FileLogHandler.hpp:
  Auto merged
storage/ndb/include/logger/LogHandler.hpp:
  Auto merged
storage/ndb/include/logger/Logger.hpp:
  Auto merged
storage/ndb/include/logger/SysLogHandler.hpp:
  Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
  Auto merged
storage/ndb/include/mgmapi/mgmapi_debug.h:
  Auto merged
storage/ndb/include/mgmapi/ndb_logevent.h:
  Auto merged
storage/ndb/include/mgmapi/ndbd_exit_codes.h:
  Auto merged
storage/ndb/include/mgmcommon/ConfigRetriever.hpp:
  Auto merged
storage/ndb/include/mgmcommon/IPCConfig.hpp:
  Auto merged
storage/ndb/include/mgmcommon/MgmtErrorReporter.hpp:
  Auto merged
storage/ndb/include/ndbapi/Ndb.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbApi.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbBlob.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbError.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbEventOperation.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbIndexOperation.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbPool.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbRecAttr.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbReceiver.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbScanFilter.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
storage/ndb/include/ndbapi/ndb_cluster_connection.hpp:
  Auto merged
storage/ndb/include/ndbapi/ndb_opt_defaults.h:
  Auto merged
storage/ndb/include/ndbapi/ndbapi_limits.h:
  Auto merged
storage/ndb/include/ndbapi/ndberror.h:
  Auto merged
storage/ndb/include/newtonapi/dba.h:
  Auto merged
storage/ndb/include/newtonapi/defs/pcn_types.h:
  Auto merged
storage/ndb/include/portlib/NdbCondition.h:
  Auto merged
storage/ndb/include/portlib/NdbConfig.h:
  Auto merged
storage/ndb/include/portlib/NdbDaemon.h:
  Auto merged
storage/ndb/include/portlib/NdbEnv.h:
  Auto merged
storage/ndb/include/portlib/NdbHost.h:
  Auto merged
storage/ndb/include/portlib/NdbMain.h:
  Auto merged
storage/ndb/include/portlib/NdbMem.h:
  Auto merged
storage/ndb/include/portlib/NdbMutex.h:
  Auto merged
storage/ndb/include/portlib/NdbSleep.h:
  Auto merged
storage/ndb/include/portlib/NdbTCP.h:
  Auto merged
storage/ndb/include/portlib/NdbThread.h:
  Auto merged
storage/ndb/include/portlib/NdbTick.h:
  Auto merged
storage/ndb/include/portlib/PortDefs.h:
  Auto merged
storage/ndb/include/portlib/prefetch.h:
  Auto merged
storage/ndb/include/transporter/TransporterCallback.hpp:
  Auto merged
storage/ndb/include/transporter/TransporterDefinitions.hpp:
  Auto merged
storage/ndb/include/transporter/TransporterRegistry.hpp:
  Auto merged
storage/ndb/include/util/BaseString.hpp:
  Auto merged
storage/ndb/include/util/Bitmask.hpp:
  Auto merged
storage/ndb/include/util/File.hpp:
  Auto merged
storage/ndb/include/util/InputStream.hpp:
  Auto merged
storage/ndb/include/util/NdbAutoPtr.hpp:
  Auto merged
storage/ndb/include/util/NdbOut.hpp:
  Auto merged
storage/ndb/include/util/NdbSqlUtil.hpp:
  Auto merged
storage/ndb/include/util/OutputStream.hpp:
  Auto merged
storage/ndb/include/util/Parser.hpp:
  Auto merged
storage/ndb/include/util/Properties.hpp:
  Auto merged
storage/ndb/include/util/SimpleProperties.hpp:
  Auto merged
storage/ndb/include/util/SocketAuthenticator.hpp:
  Auto merged
storage/ndb/include/util/SocketClient.hpp:
  Auto merged
storage/ndb/include/util/SocketServer.hpp:
  Auto merged
storage/ndb/include/util/UtilBuffer.hpp:
  Auto merged
storage/ndb/include/util/Vector.hpp:
  Auto merged
storage/ndb/include/util/basestring_vsnprintf.h:
  Auto merged
storage/ndb/include/util/md5_hash.hpp:
  Auto merged
storage/ndb/include/util/ndb_opts.h:
  Auto merged
storage/ndb/include/util/random.h:
  Auto merged
storage/ndb/include/util/socket_io.h:
  Auto merged
storage/ndb/include/util/uucode.h:
  Auto merged
storage/ndb/include/util/version.h:
  Auto merged
storage/ndb/src/common/debugger/BlockNames.cpp:
  Auto merged
storage/ndb/src/common/debugger/DebuggerNames.cpp:
  Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/common/debugger/GrepError.cpp:
  Auto merged
storage/ndb/src/common/debugger/SignalLoggerManager.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/AccLock.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/AlterIndx.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/AlterTab.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/AlterTable.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/AlterTrig.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/BackupImpl.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/CloseComReqConf.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/ContinueB.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/CopyGCI.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/CreateEvnt.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/CreateFragmentation.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/CreateIndx.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/CreateTrig.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/DihContinueB.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/DihSwitchReplicaReq.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/DisconnectRep.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/DropIndx.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/DropTab.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/DropTrig.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/FailRep.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/FireTrigOrd.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/FsAppendReq.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/FsCloseReq.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/FsConf.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/FsOpenReq.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/FsReadWriteReq.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/FsRef.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/GCPSave.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/IndxAttrInfo.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/IndxKeyInfo.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/LCP.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/LqhFrag.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/LqhKey.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/LqhTrans.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/MasterLCP.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/NFCompleteRep.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/NdbSttor.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/NdbfsContinueB.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/PackedSignal.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/PrepDropTab.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/PrepFailReqRef.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/ScanFrag.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/ScanTab.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/SignalDroppedRep.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/StartRec.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/SystemError.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/TcIndx.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/TcKeyConf.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/TcKeyRef.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/TcKeyReq.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/TcRollbackRep.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/TrigAttrInfo.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/TupCommit.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/TupKey.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/TuxMaint.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/UtilDelete.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/UtilExecute.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/UtilLock.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/UtilPrepare.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/UtilSequence.cpp:
  Auto merged
storage/ndb/src/common/logger/ConsoleLogHandler.cpp:
  Auto merged
storage/ndb/src/common/logger/FileLogHandler.cpp:
  Auto merged
storage/ndb/src/common/logger/LogHandler.cpp:
  Auto merged
storage/ndb/src/common/logger/LogHandlerList.cpp:
  Auto merged
storage/ndb/src/common/logger/LogHandlerList.hpp:
  Auto merged
storage/ndb/src/common/logger/Logger.cpp:
  Auto merged
storage/ndb/src/common/logger/SysLogHandler.cpp:
  Auto merged
storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.cpp:
  Auto merged
storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.hpp:
  Auto merged
storage/ndb/src/common/logger/loggertest/LoggerUnitTest.cpp:
  Auto merged
storage/ndb/src/common/logger/loggertest/LoggerUnitTest.hpp:
  Auto merged
storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
storage/ndb/src/common/mgmcommon/IPCConfig.cpp:
  Auto merged
storage/ndb/src/common/mgmcommon/printConfig/printConfig.cpp:
  Auto merged
storage/ndb/src/common/portlib/NdbCondition.c:
  Auto merged
storage/ndb/src/common/portlib/NdbConfig.c:
  Auto merged
storage/ndb/src/common/portlib/NdbDaemon.c:
  Auto merged
storage/ndb/src/common/portlib/NdbEnv.c:
  Auto merged
storage/ndb/src/common/portlib/NdbHost.c:
  Auto merged
storage/ndb/src/common/portlib/NdbMem.c:
  Auto merged
storage/ndb/src/common/portlib/NdbMutex.c:
  Auto merged
storage/ndb/src/common/portlib/NdbPortLibTest.cpp:
  Auto merged
storage/ndb/src/common/portlib/NdbSleep.c:
  Auto merged
storage/ndb/src/common/portlib/NdbTCP.cpp:
  Auto merged
storage/ndb/src/common/portlib/NdbThread.c:
  Auto merged
storage/ndb/src/common/portlib/NdbTick.c:
  Auto merged
storage/ndb/src/common/portlib/memtest.c:
  Auto merged
storage/ndb/src/common/portlib/mmstest.cpp:
  Auto merged
storage/ndb/src/common/portlib/munmaptest.cpp:
  Auto merged
storage/ndb/src/common/portlib/win32/NdbCondition.c:
  Auto merged
storage/ndb/src/common/portlib/win32/NdbDaemon.c:
  Auto merged
storage/ndb/src/common/portlib/win32/NdbEnv.c:
  Auto merged
storage/ndb/src/common/portlib/win32/NdbHost.c:
  Auto merged
storage/ndb/src/common/portlib/win32/NdbMem.c:
  Auto merged
storage/ndb/src/common/portlib/win32/NdbMutex.c:
  Auto merged
storage/ndb/src/common/portlib/win32/NdbSleep.c:
  Auto merged
storage/ndb/src/common/portlib/win32/NdbTCP.c:
  Auto merged
storage/ndb/src/common/portlib/win32/NdbThread.c:
  Auto merged
storage/ndb/src/common/portlib/win32/NdbTick.c:
  Auto merged
storage/ndb/src/common/transporter/Packer.cpp:
  Auto merged
storage/ndb/src/common/transporter/Packer.hpp:
  Auto merged
storage/ndb/src/common/transporter/SCI_Transporter.cpp:
  Auto merged
storage/ndb/src/common/transporter/SCI_Transporter.hpp:
  Auto merged
storage/ndb/src/common/transporter/SHM_Buffer.hpp:
  Auto merged
storage/ndb/src/common/transporter/SHM_Transporter.cpp:
  Auto merged
storage/ndb/src/common/transporter/SHM_Transporter.hpp:
  Auto merged
storage/ndb/src/common/transporter/SHM_Transporter.unix.cpp:
  Auto merged
storage/ndb/src/common/transporter/SHM_Transporter.win32.cpp:
  Auto merged
storage/ndb/src/common/transporter/SendBuffer.cpp:
  Auto merged
storage/ndb/src/common/transporter/SendBuffer.hpp:
  Auto merged
storage/ndb/src/common/transporter/TCP_Transporter.cpp:
  Auto merged
storage/ndb/src/common/transporter/TCP_Transporter.hpp:
  Auto merged
storage/ndb/src/common/transporter/Transporter.cpp:
  Auto merged
storage/ndb/src/common/transporter/Transporter.hpp:
  Auto merged
storage/ndb/src/common/transporter/TransporterInternalDefinitions.hpp:
  Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
storage/ndb/src/common/transporter/basictest/basicTransporterTest.cpp:
  Auto merged
storage/ndb/src/common/transporter/buddy.cpp:
  Auto merged
storage/ndb/src/common/transporter/buddy.hpp:
  Auto merged
storage/ndb/src/common/transporter/failoverSCI/failoverSCI.cpp:
  Auto merged
storage/ndb/src/common/transporter/perftest/perfTransporterTest.cpp:
  Auto merged
storage/ndb/src/common/transporter/priotest/prioSCI/prioSCI.cpp:
  Auto merged
storage/ndb/src/common/transporter/priotest/prioSHM/prioSHM.cpp:
  Auto merged
storage/ndb/src/common/transporter/priotest/prioTCP/prioTCP.cpp:
  Auto merged
storage/ndb/src/common/transporter/priotest/prioTransporterTest.cpp:
  Auto merged
storage/ndb/src/common/transporter/priotest/prioTransporterTest.hpp:
  Auto merged
storage/ndb/src/common/util/BaseString.cpp:
  Auto merged
storage/ndb/src/common/util/File.cpp:
  Auto merged
storage/ndb/src/common/util/InputStream.cpp:
  Auto merged
storage/ndb/src/common/util/NdbOut.cpp:
  Auto merged
storage/ndb/src/common/util/NdbSqlUtil.cpp:
  Auto merged
storage/ndb/src/common/util/OutputStream.cpp:
  Auto merged
storage/ndb/src/common/util/Parser.cpp:
  Auto merged
storage/ndb/src/common/util/Properties.cpp:
  Auto merged
storage/ndb/src/common/util/SimpleProperties.cpp:
  Auto merged
storage/ndb/src/common/util/SocketAuthenticator.cpp:
  Auto merged
storage/ndb/src/common/util/SocketClient.cpp:
  Auto merged
storage/ndb/src/common/util/SocketServer.cpp:
  Auto merged
storage/ndb/src/common/util/basestring_vsnprintf.c:
  Auto merged
storage/ndb/src/common/util/md5_hash.cpp:
  Auto merged
storage/ndb/src/common/util/ndb_init.c:
  Auto merged
storage/ndb/src/common/util/random.c:
  Auto merged
storage/ndb/src/common/util/socket_io.cpp:
  Auto merged
storage/ndb/src/common/util/strdup.c:
  Auto merged
storage/ndb/src/common/util/filetest/FileUnitTest.cpp:
  Auto merged
storage/ndb/src/common/util/filetest/FileUnitTest.hpp:
  Auto merged
storage/ndb/src/common/util/testProperties/testProperties.cpp:
  Auto merged
storage/ndb/src/common/util/testSimpleProperties/sp_test.cpp:
  Auto merged
storage/ndb/src/common/util/uucode.c:
  Auto merged
storage/ndb/src/common/util/version.c:
  Auto merged
storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.cpp:
  Auto merged
storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.h:
  Auto merged
storage/ndb/src/cw/cpcc-win32/C++/NdbControls.cpp:
  Auto merged
storage/ndb/src/cw/cpcc-win32/C++/StdAfx.cpp:
  Auto merged
storage/ndb/src/cw/cpcc-win32/C++/StdAfx.h:
  Auto merged
storage/ndb/src/cw/cpcc-win32/C++/TreeView.cpp:
  Auto merged
storage/ndb/src/cw/cpcc-win32/C++/TreeView.h:
  Auto merged
storage/ndb/src/cw/cpcc-win32/C++/resource.h:
  Auto merged
storage/ndb/src/cw/cpcd/APIService.cpp:
  Auto merged
storage/ndb/src/cw/cpcd/APIService.hpp:
  Auto merged
storage/ndb/src/cw/cpcd/CPCD.cpp:
  Auto merged
storage/ndb/src/cw/cpcd/CPCD.hpp:
  Auto merged
storage/ndb/src/cw/cpcd/Monitor.cpp:
  Auto merged
storage/ndb/src/cw/cpcd/Process.cpp:
  Auto merged
storage/ndb/src/cw/cpcd/common.cpp:
  Auto merged
storage/ndb/src/cw/cpcd/common.hpp:
  Auto merged
storage/ndb/src/cw/cpcd/main.cpp:
  Auto merged
storage/ndb/src/cw/test/socketclient/socketClientTest.cpp:
  Auto merged
storage/ndb/src/cw/util/ClientInterface.cpp:
  Auto merged
storage/ndb/src/cw/util/ClientInterface.hpp:
  Auto merged
storage/ndb/src/cw/util/SocketRegistry.cpp:
  Auto merged
storage/ndb/src/cw/util/SocketRegistry.hpp:
  Auto merged
storage/ndb/src/cw/util/SocketService.cpp:
  Auto merged
storage/ndb/src/cw/util/SocketService.hpp:
  Auto merged
storage/ndb/src/kernel/SimBlockList.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/mutexes.hpp:
  Auto merged
storage/ndb/src/kernel/main.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/FsBuffer.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/read.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/SchemaFile.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/Sysfile.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/AttributeOffset.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFileTest/AsyncFileTest.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/Filename.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/Filename.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/MemoryChannelTest/MemoryChannelTest.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/Pool.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/timer.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/suma/SumaInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/trix/Trix.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/trix/Trix.hpp:
  Auto merged
storage/ndb/src/kernel/error/ErrorHandlingMacros.hpp:
  Auto merged
storage/ndb/src/kernel/error/ErrorReporter.cpp:
  Auto merged
storage/ndb/src/kernel/error/ErrorReporter.hpp:
  Auto merged
storage/ndb/src/kernel/error/TimeModule.cpp:
  Auto merged
storage/ndb/src/kernel/error/TimeModule.hpp:
  Auto merged
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
  Auto merged
storage/ndb/src/kernel/vm/Array.hpp:
  Auto merged
storage/ndb/src/kernel/vm/ArrayPool.hpp:
  Auto merged
storage/ndb/src/kernel/vm/CArray.hpp:
  Auto merged
storage/ndb/src/kernel/vm/Callback.hpp:
  Auto merged
storage/ndb/src/kernel/vm/ClusterConfiguration.cpp:
  Auto merged
storage/ndb/src/kernel/vm/ClusterConfiguration.hpp:
  Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Configuration.hpp:
  Auto merged
storage/ndb/src/kernel/vm/DLFifoList.hpp:
  Auto merged
storage/ndb/src/kernel/vm/DLHashTable.hpp:
  Auto merged
storage/ndb/src/kernel/vm/DLHashTable2.hpp:
  Auto merged
storage/ndb/src/kernel/vm/DLList.hpp:
  Auto merged
storage/ndb/src/kernel/vm/DataBuffer.hpp:
  Auto merged
storage/ndb/src/kernel/vm/Emulator.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Emulator.hpp:
  Auto merged
storage/ndb/src/kernel/vm/FastScheduler.cpp:
  Auto merged
storage/ndb/src/kernel/vm/FastScheduler.hpp:
  Auto merged
storage/ndb/src/kernel/vm/GlobalData.hpp:
  Auto merged
storage/ndb/src/kernel/vm/KeyDescriptor.hpp:
  Auto merged
storage/ndb/src/kernel/vm/KeyTable.hpp:
  Auto merged
storage/ndb/src/kernel/vm/KeyTable2.hpp:
  Auto merged
storage/ndb/src/kernel/vm/LongSignal.hpp:
  Auto merged
storage/ndb/src/kernel/vm/Mutex.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Mutex.hpp:
  Auto merged
storage/ndb/src/kernel/vm/Prio.hpp:
  Auto merged
storage/ndb/src/kernel/vm/RequestTracker.hpp:
  Auto merged
storage/ndb/src/kernel/vm/SLList.hpp:
  Auto merged
storage/ndb/src/kernel/vm/SafeCounter.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SafeCounter.hpp:
  Auto merged
storage/ndb/src/kernel/vm/SectionReader.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SectionReader.hpp:
  Auto merged
storage/ndb/src/kernel/vm/SignalCounter.hpp:
  Auto merged
storage/ndb/src/kernel/vm/SimBlockList.hpp:
  Auto merged
storage/ndb/src/kernel/vm/SimplePropertiesSection.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  Auto merged
storage/ndb/src/kernel/vm/SuperPool.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SuperPool.hpp:
  Auto merged
storage/ndb/src/kernel/vm/ThreadConfig.cpp:
  Auto merged
storage/ndb/src/kernel/vm/ThreadConfig.hpp:
  Auto merged
storage/ndb/src/kernel/vm/TimeQueue.cpp:
  Auto merged
storage/ndb/src/kernel/vm/TimeQueue.hpp:
  Auto merged
storage/ndb/src/kernel/vm/TransporterCallback.cpp:
  Auto merged
storage/ndb/src/kernel/vm/VMSignal.cpp:
  Auto merged
storage/ndb/src/kernel/vm/VMSignal.hpp:
  Auto merged
storage/ndb/src/kernel/vm/WaitQueue.hpp:
  Auto merged
storage/ndb/src/kernel/vm/WatchDog.cpp:
  Auto merged
storage/ndb/src/kernel/vm/WatchDog.hpp:
  Auto merged
storage/ndb/src/kernel/vm/al_test/arrayListTest.cpp:
  Auto merged
storage/ndb/src/kernel/vm/al_test/arrayPoolTest.cpp:
  Auto merged
storage/ndb/src/kernel/vm/al_test/main.cpp:
  Auto merged
storage/ndb/src/kernel/vm/ndbd_malloc.cpp:
  Auto merged
storage/ndb/src/kernel/vm/ndbd_malloc.hpp:
  Auto merged
storage/ndb/src/kernel/vm/pc.hpp:
  Auto merged
storage/ndb/src/kernel/vm/testCopy/rr.cpp:
  Auto merged
storage/ndb/src/kernel/vm/testCopy/testCopy.cpp:
  Auto merged
storage/ndb/src/kernel/vm/testDataBuffer/testDataBuffer.cpp:
  Auto merged
storage/ndb/src/kernel/vm/testLongSig/testLongSig.cpp:
  Auto merged
storage/ndb/src/kernel/vm/testSimplePropertiesSection/test.cpp:
  Auto merged
storage/ndb/src/kernel/vm/testSuperPool.cpp:
  Auto merged
storage/ndb/src/mgmapi/LocalConfig.cpp:
  Auto merged
storage/ndb/src/mgmapi/LocalConfig.hpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi_configuration.hpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi_internal.h:
  Auto merged
storage/ndb/src/mgmapi/ndb_logevent.cpp:
  Auto merged
storage/ndb/src/mgmapi/ndb_logevent.hpp:
  Auto merged
storage/ndb/src/mgmapi/test/keso.c:
  Auto merged
storage/ndb/src/mgmapi/test/mgmSrvApi.cpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmclient/main.cpp:
  Auto merged
storage/ndb/src/mgmclient/ndb_mgmclient.hpp:
  Auto merged
storage/ndb/src/mgmclient/ndb_mgmclient.h:
  Auto merged
storage/ndb/src/mgmclient/test_cpcd/test_cpcd.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Config.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Config.hpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.hpp:
  Auto merged
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged
storage/ndb/src/mgmsrv/InitConfigFileParser.hpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvrConfig.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.hpp:
  Auto merged
storage/ndb/src/mgmsrv/SignalQueue.cpp:
  Auto merged
storage/ndb/src/mgmsrv/SignalQueue.hpp:
  Auto merged
storage/ndb/src/mgmsrv/convertStrToInt.cpp:
  Auto merged
storage/ndb/src/mgmsrv/convertStrToInt.hpp:
  Auto merged
storage/ndb/src/mgmsrv/main.cpp:
  Auto merged
storage/ndb/src/mgmsrv/mkconfig/mkconfig.cpp:
  Auto merged
storage/ndb/src/ndbapi/API.hpp:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.hpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.cpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.hpp:
  Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbApiSignal.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbApiSignal.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbBlobImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbErrorOut.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbEventOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbIndexOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbLinHash.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbOperationExec.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbOperationInt.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbOperationScan.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbOperationSearch.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbPool.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbPoolImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbPoolImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbReceiver.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanFilter.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransactionScan.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbUtil.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbUtil.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbWaiter.hpp:
  Auto merged
storage/ndb/src/ndbapi/Ndberr.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndblist.cpp:
  Auto merged
storage/ndb/src/ndbapi/ObjectMap.hpp:
  Auto merged
storage/ndb/src/ndbapi/SignalSender.cpp:
  Auto merged
storage/ndb/src/ndbapi/SignalSender.hpp:
  Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
storage/ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
storage/ndb/src/ndbapi/signal-sender/SignalSender.cpp:
  Auto merged
storage/ndb/src/ndbapi/signal-sender/SignalSender.hpp:
  Auto merged
storage/ndb/test/include/CpcClient.hpp:
  Auto merged
storage/ndb/test/include/HugoAsynchTransactions.hpp:
  Auto merged
storage/ndb/test/include/HugoCalculator.hpp:
  Auto merged
storage/ndb/test/include/HugoOperations.hpp:
  Auto merged
storage/ndb/test/include/HugoTransactions.hpp:
  Auto merged
storage/ndb/test/include/NDBT.hpp:
  Auto merged
storage/ndb/test/include/NDBT_DataSet.hpp:
  Auto merged
storage/ndb/test/include/NDBT_DataSetTransaction.hpp:
  Auto merged
storage/ndb/test/include/NDBT_Error.hpp:
  Auto merged
storage/ndb/test/include/NDBT_Output.hpp:
  Auto merged
storage/ndb/test/include/NDBT_ResultRow.hpp:
  Auto merged
storage/ndb/test/include/NDBT_ReturnCodes.h:
  Auto merged
storage/ndb/test/include/NDBT_Stats.hpp:
  Auto merged
storage/ndb/test/include/NDBT_Table.hpp:
  Auto merged
storage/ndb/test/include/NDBT_Tables.hpp:
  Auto merged
storage/ndb/test/include/NDBT_Test.hpp:
  Auto merged
storage/ndb/test/include/NdbBackup.hpp:
  Auto merged
storage/ndb/test/include/NdbConfig.hpp:
  Auto merged
storage/ndb/test/include/NdbGrep.hpp:
  Auto merged
storage/ndb/test/include/NdbRestarter.hpp:
  Auto merged
storage/ndb/test/include/NdbRestarts.hpp:
  Auto merged
storage/ndb/test/include/NdbSchemaCon.hpp:
  Auto merged
storage/ndb/test/include/NdbSchemaOp.hpp:
  Auto merged
storage/ndb/test/include/NdbTest.hpp:
  Auto merged
storage/ndb/test/include/NdbTimer.hpp:
  Auto merged
storage/ndb/test/include/TestNdbEventOperation.hpp:
  Auto merged
storage/ndb/test/include/UtilTransactions.hpp:
  Auto merged
storage/ndb/test/include/getarg.h:
  Auto merged
storage/ndb/test/ndbapi/InsertRecs.cpp:
  Auto merged
storage/ndb/test/ndbapi/ScanFilter.hpp:
  Auto merged
storage/ndb/test/ndbapi/ScanFunctions.hpp:
  Auto merged
storage/ndb/test/ndbapi/ScanInterpretTest.hpp:
  Auto merged
storage/ndb/test/ndbapi/TraceNdbApi.cpp:
  Auto merged
storage/ndb/test/ndbapi/VerifyNdbApi.cpp:
  Auto merged
storage/ndb/test/ndbapi/acid.cpp:
  Auto merged
storage/ndb/test/ndbapi/acid2.cpp:
  Auto merged
storage/ndb/test/ndbapi/adoInsertRecs.cpp:
  Auto merged
storage/ndb/test/ndbapi/asyncGenerator.cpp:
  Auto merged
storage/ndb/test/ndbapi/benchronja.cpp:
  Auto merged
storage/ndb/test/ndbapi/bulk_copy.cpp:
  Auto merged
storage/ndb/test/ndbapi/cdrserver.cpp:
  Auto merged
storage/ndb/test/ndbapi/celloDb.cpp:
  Auto merged
storage/ndb/test/ndbapi/create_all_tabs.cpp:
  Auto merged
storage/ndb/test/ndbapi/create_tab.cpp:
  Auto merged
storage/ndb/test/ndbapi/drop_all_tabs.cpp:
  Auto merged
storage/ndb/test/ndbapi/flexAsynch.cpp:
  Auto merged
storage/ndb/test/ndbapi/flexBench.cpp:
  Auto merged
storage/ndb/test/ndbapi/flexHammer.cpp:
  Auto merged
storage/ndb/test/ndbapi/flexScan.cpp:
  Auto merged
storage/ndb/test/ndbapi/flexTT.cpp:
  Auto merged
storage/ndb/test/ndbapi/flexTimedAsynch.cpp:
  Auto merged
storage/ndb/test/ndbapi/flex_bench_mysql.cpp:
  Auto merged
storage/ndb/test/ndbapi/index.cpp:
  Auto merged
storage/ndb/test/ndbapi/index2.cpp:
  Auto merged
storage/ndb/test/ndbapi/initronja.cpp:
  Auto merged
storage/ndb/test/ndbapi/interpreterInTup.cpp:
  Auto merged
storage/ndb/test/ndbapi/mainAsyncGenerator.cpp:
  Auto merged
storage/ndb/test/ndbapi/msa.cpp:
  Auto merged
storage/ndb/test/ndbapi/ndb_async1.cpp:
  Auto merged
storage/ndb/test/ndbapi/ndb_async2.cpp:
  Auto merged
storage/ndb/test/ndbapi/ndb_user_populate.cpp:
  Auto merged
storage/ndb/test/ndbapi/ndb_user_transaction.cpp:
  Auto merged
storage/ndb/test/ndbapi/ndb_user_transaction2.cpp:
  Auto merged
storage/ndb/test/ndbapi/ndb_user_transaction3.cpp:
  Auto merged
storage/ndb/test/ndbapi/ndb_user_transaction4.cpp:
  Auto merged
storage/ndb/test/ndbapi/ndb_user_transaction5.cpp:
  Auto merged
storage/ndb/test/ndbapi/ndb_user_transaction6.cpp:
  Auto merged
storage/ndb/test/ndbapi/restarter.cpp:
  Auto merged
storage/ndb/test/ndbapi/restarter2.cpp:
  Auto merged
storage/ndb/test/ndbapi/restarts.cpp:
  Auto merged
storage/ndb/test/ndbapi/size.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBackup.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBasic.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBasicAsynch.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
storage/ndb/test/ndbapi/testDataBuffers.cpp:
  Auto merged
storage/ndb/test/ndbapi/testDeadlock.cpp:
  Auto merged
storage/ndb/test/ndbapi/testDict.cpp:
  Auto merged
storage/ndb/test/ndbapi/testGrepVerify.cpp:
  Auto merged
storage/ndb/test/ndbapi/testIndex.cpp:
  Auto merged
storage/ndb/test/ndbapi/testInterpreter.cpp:
  Auto merged
storage/ndb/test/ndbapi/testMgm.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/ndbapi/testOIBasic.cpp:
  Auto merged
storage/ndb/test/ndbapi/testOperations.cpp:
  Auto merged
storage/ndb/test/ndbapi/testOrderedIndex.cpp:
  Auto merged
storage/ndb/test/ndbapi/testPartitioning.cpp:
  Auto merged
storage/ndb/test/ndbapi/testReadPerf.cpp:
  Auto merged
storage/ndb/test/ndbapi/bank/Bank.cpp:
  Auto merged
storage/ndb/test/ndbapi/bank/Bank.hpp:
  Auto merged
storage/ndb/test/ndbapi/bank/BankLoad.cpp:
  Auto merged
storage/ndb/test/ndbapi/bank/bankCreator.cpp:
  Auto merged
storage/ndb/test/ndbapi/bank/bankMakeGL.cpp:
  Auto merged
storage/ndb/test/ndbapi/bank/bankSumAccounts.cpp:
  Auto merged
storage/ndb/test/ndbapi/bank/bankTimer.cpp:
  Auto merged
storage/ndb/test/ndbapi/bank/bankTransactionMaker.cpp:
  Auto merged
storage/ndb/test/ndbapi/bank/bankValidateAllGLs.cpp:
  Auto merged
storage/ndb/test/ndbapi/bank/testBank.cpp:
  Auto merged
storage/ndb/test/ndbapi/bench/asyncGenerator.cpp:
  Auto merged
storage/ndb/test/ndbapi/bench/dbGenerator.h:
  Auto merged
storage/ndb/test/ndbapi/bench/dbPopulate.cpp:
  Auto merged
storage/ndb/test/ndbapi/bench/dbPopulate.h:
  Auto merged
storage/ndb/test/ndbapi/bench/macros.h:
  Auto merged
storage/ndb/test/ndbapi/bench/mainAsyncGenerator.cpp:
  Auto merged
storage/ndb/test/ndbapi/bench/mainPopulate.cpp:
  Auto merged
storage/ndb/test/ndbapi/bench/ndb_async1.cpp:
  Auto merged
storage/ndb/test/ndbapi/bench/ndb_async2.cpp:
  Auto merged
storage/ndb/test/ndbapi/testRestartGci.cpp:
  Auto merged
storage/ndb/test/ndbapi/testSRBank.cpp:
  Auto merged
storage/ndb/test/ndbapi/testScan.cpp:
  Auto merged
storage/ndb/test/ndbapi/testScanInterpreter.cpp:
  Auto merged
storage/ndb/test/ndbapi/testScanPerf.cpp:
  Auto merged
storage/ndb/test/ndbapi/testSystemRestart.cpp:
  Auto merged
storage/ndb/test/ndbapi/testTimeout.cpp:
  Auto merged
storage/ndb/test/ndbapi/testTransactions.cpp:
  Auto merged
storage/ndb/test/ndbapi/test_event.cpp:
  Auto merged
storage/ndb/test/ndbapi/test_event_merge.cpp:
  Auto merged
storage/ndb/test/ndbapi/test_event_multi_table.cpp:
  Auto merged
storage/ndb/test/ndbapi/userInterface.cpp:
  Auto merged
storage/ndb/test/ndbapi/bench/ndb_error.hpp:
  Auto merged
storage/ndb/test/ndbapi/bench/ndb_schema.hpp:
  Auto merged
storage/ndb/test/ndbapi/bench/ndb_user_transaction.cpp:
  Auto merged
storage/ndb/test/ndbapi/bench/ndb_user_transaction2.cpp:
  Auto merged
storage/ndb/test/ndbapi/bench/ndb_user_transaction3.cpp:
  Auto merged
storage/ndb/test/ndbapi/bench/ndb_user_transaction4.cpp:
  Auto merged
storage/ndb/test/ndbapi/bench/ndb_user_transaction5.cpp:
  Auto merged
storage/ndb/test/ndbapi/bench/ndb_user_transaction6.cpp:
  Auto merged
storage/ndb/test/ndbapi/bench/testData.h:
  Auto merged
storage/ndb/test/ndbapi/bench/testDefinitions.h:
  Auto merged
storage/ndb/test/ndbapi/bench/userInterface.cpp:
  Auto merged
storage/ndb/test/ndbapi/bench/userInterface.h:
  Auto merged
storage/ndb/test/newtonapi/basic_test/basic/basic.cpp:
  Auto merged
storage/ndb/test/newtonapi/basic_test/bulk_read/br_test.cpp:
  Auto merged
storage/ndb/test/newtonapi/basic_test/common.cpp:
  Auto merged
storage/ndb/test/newtonapi/basic_test/common.hpp:
  Auto merged
storage/ndb/test/newtonapi/basic_test/ptr_binding/ptr_binding_test.cpp:
  Auto merged
storage/ndb/test/newtonapi/basic_test/too_basic.cpp:
  Auto merged
storage/ndb/test/newtonapi/perf_test/perf.cpp:
  Auto merged
storage/ndb/test/odbc/SQL99_test/SQL99_test.cpp:
  Auto merged
storage/ndb/test/odbc/SQL99_test/SQL99_test.h:
  Auto merged
storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE.cpp:
  Auto merged
storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE_HDBC.cpp:
  Auto merged
storage/ndb/test/odbc/client/NDBT_SQLConnect.cpp:
  Auto merged
storage/ndb/test/odbc/client/NDBT_SQLPrepare.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLAllocEnvTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLAllocHandleTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLAllocHandleTest_bf.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLBindColTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLBindParameterTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLCancelTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLCloseCursorTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLColAttributeTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLColAttributeTest1.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLColAttributeTest3.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLConnectTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLCopyDescTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLDescribeColTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLDisconnectTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLDriverConnectTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLEndTranTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLErrorTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLExecDirectTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLExecuteTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLFetchScrollTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLFetchTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLFreeHandleTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLFreeStmtTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLGetConnectAttrTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLGetCursorNameTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLGetDataTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLGetDescFieldTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLGetDescRecTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLGetDiagFieldTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLGetDiagRecSimpleTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLGetDiagRecTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLGetEnvAttrTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLGetFunctionsTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLGetInfoTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLGetStmtAttrTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLGetTypeInfoTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLMoreResultsTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLNumResultColsTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLParamDataTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLPrepareTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLPutDataTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLRowCountTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLSetConnectAttrTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLSetCursorNameTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLSetDescFieldTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLSetDescRecTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLSetEnvAttrTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLSetStmtAttrTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLTablesTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/SQLTransactTest.cpp:
  Auto merged
storage/ndb/test/odbc/client/common.hpp:
  Auto merged
storage/ndb/test/odbc/client/main.cpp:
  Auto merged
storage/ndb/test/odbc/driver/testOdbcDriver.cpp:
  Auto merged
storage/ndb/test/odbc/test_compiler/test_compiler.cpp:
  Auto merged
storage/ndb/test/run-test/main.cpp:
  Auto merged
storage/ndb/test/run-test/run-test.hpp:
  Auto merged
storage/ndb/test/src/CpcClient.cpp:
  Auto merged
storage/ndb/test/src/HugoAsynchTransactions.cpp:
  Auto merged
storage/ndb/test/src/HugoCalculator.cpp:
  Auto merged
storage/ndb/test/src/HugoOperations.cpp:
  Auto merged
storage/ndb/test/src/HugoTransactions.cpp:
  Auto merged
storage/ndb/test/src/NDBT_Error.cpp:
  Auto merged
storage/ndb/test/src/NDBT_Output.cpp:
  Auto merged
storage/ndb/test/src/NDBT_ResultRow.cpp:
  Auto merged
storage/ndb/test/src/NDBT_ReturnCodes.cpp:
  Auto merged
storage/ndb/test/src/NDBT_Table.cpp:
  Auto merged
storage/ndb/test/src/NDBT_Tables.cpp:
  Auto merged
storage/ndb/test/src/NDBT_Test.cpp:
  Auto merged
storage/ndb/test/src/NdbBackup.cpp:
  Auto merged
storage/ndb/test/src/NdbConfig.cpp:
  Auto merged
storage/ndb/test/src/NdbGrep.cpp:
  Auto merged
storage/ndb/test/src/NdbRestarter.cpp:
  Auto merged
storage/ndb/test/src/NdbRestarts.cpp:
  Auto merged
storage/ndb/test/src/NdbSchemaCon.cpp:
  Auto merged
storage/ndb/test/src/NdbSchemaOp.cpp:
  Auto merged
storage/ndb/test/src/UtilTransactions.cpp:
  Auto merged
storage/ndb/test/tools/copy_tab.cpp:
  Auto merged
storage/ndb/test/tools/cpcc.cpp:
  Auto merged
storage/ndb/test/tools/create_index.cpp:
  Auto merged
storage/ndb/test/tools/hugoCalculator.cpp:
  Auto merged
storage/ndb/test/tools/hugoFill.cpp:
  Auto merged
storage/ndb/test/tools/hugoLoad.cpp:
  Auto merged
storage/ndb/test/tools/hugoLockRecords.cpp:
  Auto merged
storage/ndb/test/tools/hugoPkDelete.cpp:
  Auto merged
storage/ndb/test/tools/hugoPkRead.cpp:
  Auto merged
storage/ndb/test/tools/hugoPkReadRecord.cpp:
  Auto merged
storage/ndb/test/tools/hugoPkUpdate.cpp:
  Auto merged
storage/ndb/test/tools/hugoScanRead.cpp:
  Auto merged
storage/ndb/test/tools/hugoScanUpdate.cpp:
  Auto merged
storage/ndb/test/tools/restart.cpp:
  Auto merged
storage/ndb/test/tools/transproxy.cpp:
  Auto merged
storage/ndb/test/tools/verify_index.cpp:
  Auto merged
storage/ndb/tools/delete_all.cpp:
  Auto merged
storage/ndb/tools/desc.cpp:
  Auto merged
storage/ndb/tools/drop_index.cpp:
  Auto merged
storage/ndb/tools/drop_tab.cpp:
  Auto merged
storage/ndb/tools/listTables.cpp:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
storage/ndb/tools/ndb_test_platform.cpp:
  Auto merged
storage/ndb/tools/ndbsql.cpp:
  Auto merged
storage/ndb/tools/restore/Restore.cpp:
  Auto merged
storage/ndb/tools/restore/Restore.hpp:
  Auto merged
storage/ndb/tools/restore/consumer.cpp:
  Auto merged
storage/ndb/tools/restore/consumer.hpp:
  Auto merged
storage/ndb/tools/restore/consumer_printer.cpp:
  Auto merged
storage/ndb/tools/restore/consumer_printer.hpp:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
storage/ndb/tools/restore/consumer_restore.hpp:
  Auto merged
storage/ndb/tools/restore/consumer_restorem.cpp:
  Auto merged
storage/ndb/tools/restore/restore_main.cpp:
  Auto merged
storage/ndb/tools/select_all.cpp:
  Auto merged
storage/ndb/tools/select_count.cpp:
  Auto merged
storage/ndb/tools/waiter.cpp:
  Auto merged
strings/Makefile.am:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-cp932.c:
  Auto merged
strings/ctype-euc_kr.c:
  Auto merged
strings/ctype-eucjpms.c:
  Auto merged
strings/ctype-gb2312.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-latin1.c:
  Auto merged
strings/ctype-mb.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
strings/ctype-ujis.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
strings/ctype-win1250ch.c:
  Auto merged
strings/ctype.c:
  Auto merged
strings/decimal.c:
  Auto merged
strings/strxnmov.c:
  Auto merged
strings/xml.c:
  Auto merged
tests/Makefile.am:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
vio/Makefile.am:
  Auto merged
vio/vio.c:
  Auto merged
vio/viosocket.c:
  Auto merged
vio/viossl.c:
  Auto merged
vio/viosslfactories.c:
  Auto merged
zlib/Makefile.am:
  Auto merged
 2006-12-23 20:20:40 +01:00
unknown
6b0853a398 Many files: 
Changed header to GPL version 2 only


BUILD/Makefile.am:
  Changed header to GPL version 2 only
Docs/Makefile.am:
  Changed header to GPL version 2 only
Makefile.am:
  Changed header to GPL version 2 only
SSL/Makefile.am:
  Changed header to GPL version 2 only
bdb/Makefile.in:
  Changed header to GPL version 2 only
client/Makefile.am:
  Changed header to GPL version 2 only
client/client_priv.h:
  Changed header to GPL version 2 only
client/completion_hash.cc:
  Changed header to GPL version 2 only
client/completion_hash.h:
  Changed header to GPL version 2 only
client/get_password.c:
  Changed header to GPL version 2 only
client/my_readline.h:
  Changed header to GPL version 2 only
client/mysql.cc:
  Changed header to GPL version 2 only
client/mysql_upgrade.c:
  Changed header to GPL version 2 only
client/mysqladmin.cc:
  Changed header to GPL version 2 only
client/mysqlbinlog.cc:
  Changed header to GPL version 2 only
client/mysqlcheck.c:
  Changed header to GPL version 2 only
client/mysqldump.c:
  Changed header to GPL version 2 only
client/mysqlimport.c:
  Changed header to GPL version 2 only
client/mysqlmanager-pwgen.c:
  Changed header to GPL version 2 only
client/mysqlmanagerc.c:
  Changed header to GPL version 2 only
client/mysqlshow.c:
  Changed header to GPL version 2 only
client/mysqltest.c:
  Changed header to GPL version 2 only
client/readline.cc:
  Changed header to GPL version 2 only
client/sql_string.cc:
  Changed header to GPL version 2 only
client/sql_string.h:
  Changed header to GPL version 2 only
cmd-line-utils/Makefile.am:
  Changed header to GPL version 2 only
dbug/Makefile.am:
  Changed header to GPL version 2 only
extra/Makefile.am:
  Changed header to GPL version 2 only
extra/charset2html.c:
  Changed header to GPL version 2 only
extra/comp_err.c:
  Changed header to GPL version 2 only
extra/innochecksum.c:
  Changed header to GPL version 2 only
extra/my_print_defaults.c:
  Changed header to GPL version 2 only
extra/mysql_waitpid.c:
  Changed header to GPL version 2 only
extra/perror.c:
  Changed header to GPL version 2 only
extra/replace.c:
  Changed header to GPL version 2 only
extra/resolve_stack_dump.c:
  Changed header to GPL version 2 only
extra/resolveip.c:
  Changed header to GPL version 2 only
heap/Makefile.am:
  Changed header to GPL version 2 only
heap/_check.c:
  Changed header to GPL version 2 only
heap/_rectest.c:
  Changed header to GPL version 2 only
heap/heapdef.h:
  Changed header to GPL version 2 only
heap/hp_block.c:
  Changed header to GPL version 2 only
heap/hp_clear.c:
  Changed header to GPL version 2 only
heap/hp_close.c:
  Changed header to GPL version 2 only
heap/hp_create.c:
  Changed header to GPL version 2 only
heap/hp_delete.c:
  Changed header to GPL version 2 only
heap/hp_extra.c:
  Changed header to GPL version 2 only
heap/hp_hash.c:
  Changed header to GPL version 2 only
heap/hp_info.c:
  Changed header to GPL version 2 only
heap/hp_open.c:
  Changed header to GPL version 2 only
heap/hp_panic.c:
  Changed header to GPL version 2 only
heap/hp_rename.c:
  Changed header to GPL version 2 only
heap/hp_rfirst.c:
  Changed header to GPL version 2 only
heap/hp_rkey.c:
  Changed header to GPL version 2 only
heap/hp_rlast.c:
  Changed header to GPL version 2 only
heap/hp_rnext.c:
  Changed header to GPL version 2 only
heap/hp_rprev.c:
  Changed header to GPL version 2 only
heap/hp_rrnd.c:
  Changed header to GPL version 2 only
heap/hp_rsame.c:
  Changed header to GPL version 2 only
heap/hp_scan.c:
  Changed header to GPL version 2 only
heap/hp_static.c:
  Changed header to GPL version 2 only
heap/hp_test1.c:
  Changed header to GPL version 2 only
heap/hp_test2.c:
  Changed header to GPL version 2 only
heap/hp_update.c:
  Changed header to GPL version 2 only
heap/hp_write.c:
  Changed header to GPL version 2 only
include/Makefile.am:
  Changed header to GPL version 2 only
include/base64.h:
  Changed header to GPL version 2 only
include/config-netware.h:
  Changed header to GPL version 2 only
include/config-os2.h:
  Changed header to GPL version 2 only
include/config-win.h:
  Changed header to GPL version 2 only
include/decimal.h:
  Changed header to GPL version 2 only
include/errmsg.h:
  Changed header to GPL version 2 only
include/ft_global.h:
  Changed header to GPL version 2 only
include/hash.h:
  Changed header to GPL version 2 only
include/heap.h:
  Changed header to GPL version 2 only
include/keycache.h:
  Changed header to GPL version 2 only
include/m_ctype.h:
  Changed header to GPL version 2 only
include/m_string.h:
  Changed header to GPL version 2 only
include/md5.h:
  Changed header to GPL version 2 only
include/my_aes.h:
  Changed header to GPL version 2 only
include/my_alarm.h:
  Changed header to GPL version 2 only
include/my_alloc.h:
  Changed header to GPL version 2 only
include/my_base.h:
  Changed header to GPL version 2 only
include/my_bitmap.h:
  Changed header to GPL version 2 only
include/my_dbug.h:
  Changed header to GPL version 2 only
include/my_dir.h:
  Changed header to GPL version 2 only
include/my_getopt.h:
  Changed header to GPL version 2 only
include/my_global.h:
  Changed header to GPL version 2 only
include/my_handler.h:
  Changed header to GPL version 2 only
include/my_libwrap.h:
  Changed header to GPL version 2 only
include/my_list.h:
  Changed header to GPL version 2 only
include/my_net.h:
  Changed header to GPL version 2 only
include/my_no_pthread.h:
  Changed header to GPL version 2 only
include/my_nosys.h:
  Changed header to GPL version 2 only
include/my_pthread.h:
  Changed header to GPL version 2 only
include/my_sys.h:
  Changed header to GPL version 2 only
include/my_time.h:
  Changed header to GPL version 2 only
include/my_tree.h:
  Changed header to GPL version 2 only
include/my_user.h:
  Changed header to GPL version 2 only
include/my_xml.h:
  Changed header to GPL version 2 only
include/myisam.h:
  Changed header to GPL version 2 only
include/myisammrg.h:
  Changed header to GPL version 2 only
include/myisampack.h:
  Changed header to GPL version 2 only
include/mysql.h:
  Changed header to GPL version 2 only
include/mysql_com.h:
  Changed header to GPL version 2 only
include/mysql_embed.h:
  Changed header to GPL version 2 only
include/mysql_time.h:
  Changed header to GPL version 2 only
include/mysys_err.h:
  Changed header to GPL version 2 only
include/queues.h:
  Changed header to GPL version 2 only
include/raid.h:
  Changed header to GPL version 2 only
include/rijndael.h:
  Changed header to GPL version 2 only
include/sha1.h:
  Changed header to GPL version 2 only
include/sql_common.h:
  Changed header to GPL version 2 only
include/sslopt-case.h:
  Changed header to GPL version 2 only
include/sslopt-longopts.h:
  Changed header to GPL version 2 only
include/sslopt-vars.h:
  Changed header to GPL version 2 only
include/t_ctype.h:
  Changed header to GPL version 2 only
include/thr_alarm.h:
  Changed header to GPL version 2 only
include/thr_lock.h:
  Changed header to GPL version 2 only
include/typelib.h:
  Changed header to GPL version 2 only
include/violite.h:
  Changed header to GPL version 2 only
innobase/Makefile.am:
  Changed header to GPL version 2 only
innobase/btr/Makefile.am:
  Changed header to GPL version 2 only
innobase/buf/Makefile.am:
  Changed header to GPL version 2 only
innobase/data/Makefile.am:
  Changed header to GPL version 2 only
innobase/dict/Makefile.am:
  Changed header to GPL version 2 only
innobase/dyn/Makefile.am:
  Changed header to GPL version 2 only
innobase/eval/Makefile.am:
  Changed header to GPL version 2 only
innobase/fil/Makefile.am:
  Changed header to GPL version 2 only
innobase/fsp/Makefile.am:
  Changed header to GPL version 2 only
innobase/fut/Makefile.am:
  Changed header to GPL version 2 only
innobase/ha/Makefile.am:
  Changed header to GPL version 2 only
innobase/ibuf/Makefile.am:
  Changed header to GPL version 2 only
innobase/include/Makefile.am:
  Changed header to GPL version 2 only
innobase/lock/Makefile.am:
  Changed header to GPL version 2 only
innobase/log/Makefile.am:
  Changed header to GPL version 2 only
innobase/mach/Makefile.am:
  Changed header to GPL version 2 only
innobase/mem/Makefile.am:
  Changed header to GPL version 2 only
innobase/mtr/Makefile.am:
  Changed header to GPL version 2 only
innobase/os/Makefile.am:
  Changed header to GPL version 2 only
innobase/page/Makefile.am:
  Changed header to GPL version 2 only
innobase/pars/Makefile.am:
  Changed header to GPL version 2 only
innobase/que/Makefile.am:
  Changed header to GPL version 2 only
innobase/read/Makefile.am:
  Changed header to GPL version 2 only
innobase/rem/Makefile.am:
  Changed header to GPL version 2 only
innobase/row/Makefile.am:
  Changed header to GPL version 2 only
innobase/srv/Makefile.am:
  Changed header to GPL version 2 only
innobase/sync/Makefile.am:
  Changed header to GPL version 2 only
innobase/thr/Makefile.am:
  Changed header to GPL version 2 only
innobase/trx/Makefile.am:
  Changed header to GPL version 2 only
innobase/usr/Makefile.am:
  Changed header to GPL version 2 only
innobase/ut/Makefile.am:
  Changed header to GPL version 2 only
libmysql/client_settings.h:
  Changed header to GPL version 2 only
libmysqld/Makefile.am:
  Changed header to GPL version 2 only
libmysqld/emb_qcache.cc:
  Changed header to GPL version 2 only
libmysqld/emb_qcache.h:
  Changed header to GPL version 2 only
libmysqld/embedded_priv.h:
  Changed header to GPL version 2 only
libmysqld/examples/Makefile.am:
  Changed header to GPL version 2 only
libmysqld/libmysqld.c:
  Changed header to GPL version 2 only
man/Makefile.am:
  Changed header to GPL version 2 only
myisam/Makefile.am:
  Changed header to GPL version 2 only
myisam/ft_boolean_search.c:
  Changed header to GPL version 2 only
myisam/ft_eval.c:
  Changed header to GPL version 2 only
myisam/ft_eval.h:
  Changed header to GPL version 2 only
myisam/ft_nlq_search.c:
  Changed header to GPL version 2 only
myisam/ft_parser.c:
  Changed header to GPL version 2 only
myisam/ft_static.c:
  Changed header to GPL version 2 only
myisam/ft_stem.c:
  Changed header to GPL version 2 only
myisam/ft_stopwords.c:
  Changed header to GPL version 2 only
myisam/ft_test1.c:
  Changed header to GPL version 2 only
myisam/ft_test1.h:
  Changed header to GPL version 2 only
myisam/ft_update.c:
  Changed header to GPL version 2 only
myisam/ftdefs.h:
  Changed header to GPL version 2 only
myisam/fulltext.h:
  Changed header to GPL version 2 only
myisam/mi_cache.c:
  Changed header to GPL version 2 only
myisam/mi_changed.c:
  Changed header to GPL version 2 only
myisam/mi_check.c:
  Changed header to GPL version 2 only
myisam/mi_checksum.c:
  Changed header to GPL version 2 only
myisam/mi_close.c:
  Changed header to GPL version 2 only
myisam/mi_create.c:
  Changed header to GPL version 2 only
myisam/mi_dbug.c:
  Changed header to GPL version 2 only
myisam/mi_delete.c:
  Changed header to GPL version 2 only
myisam/mi_delete_all.c:
  Changed header to GPL version 2 only
myisam/mi_delete_table.c:
  Changed header to GPL version 2 only
myisam/mi_dynrec.c:
  Changed header to GPL version 2 only
myisam/mi_extra.c:
  Changed header to GPL version 2 only
myisam/mi_info.c:
  Changed header to GPL version 2 only
myisam/mi_key.c:
  Changed header to GPL version 2 only
myisam/mi_keycache.c:
  Changed header to GPL version 2 only
myisam/mi_locking.c:
  Changed header to GPL version 2 only
myisam/mi_log.c:
  Changed header to GPL version 2 only
myisam/mi_open.c:
  Changed header to GPL version 2 only
myisam/mi_packrec.c:
  Changed header to GPL version 2 only
myisam/mi_page.c:
  Changed header to GPL version 2 only
myisam/mi_panic.c:
  Changed header to GPL version 2 only
myisam/mi_preload.c:
  Changed header to GPL version 2 only
myisam/mi_range.c:
  Changed header to GPL version 2 only
myisam/mi_rename.c:
  Changed header to GPL version 2 only
myisam/mi_rfirst.c:
  Changed header to GPL version 2 only
myisam/mi_rkey.c:
  Changed header to GPL version 2 only
myisam/mi_rlast.c:
  Changed header to GPL version 2 only
myisam/mi_rnext.c:
  Changed header to GPL version 2 only
myisam/mi_rnext_same.c:
  Changed header to GPL version 2 only
myisam/mi_rprev.c:
  Changed header to GPL version 2 only
myisam/mi_rrnd.c:
  Changed header to GPL version 2 only
myisam/mi_rsame.c:
  Changed header to GPL version 2 only
myisam/mi_rsamepos.c:
  Changed header to GPL version 2 only
myisam/mi_scan.c:
  Changed header to GPL version 2 only
myisam/mi_search.c:
  Changed header to GPL version 2 only
myisam/mi_static.c:
  Changed header to GPL version 2 only
myisam/mi_statrec.c:
  Changed header to GPL version 2 only
myisam/mi_test1.c:
  Changed header to GPL version 2 only
myisam/mi_test2.c:
  Changed header to GPL version 2 only
myisam/mi_test3.c:
  Changed header to GPL version 2 only
myisam/mi_unique.c:
  Changed header to GPL version 2 only
myisam/mi_update.c:
  Changed header to GPL version 2 only
myisam/mi_write.c:
  Changed header to GPL version 2 only
myisam/myisam_ftdump.c:
  Changed header to GPL version 2 only
myisam/myisamchk.c:
  Changed header to GPL version 2 only
myisam/myisamdef.h:
  Changed header to GPL version 2 only
myisam/myisamlog.c:
  Changed header to GPL version 2 only
myisam/myisampack.c:
  Changed header to GPL version 2 only
myisam/rt_index.c:
  Changed header to GPL version 2 only
myisam/rt_index.h:
  Changed header to GPL version 2 only
myisam/rt_key.c:
  Changed header to GPL version 2 only
myisam/rt_key.h:
  Changed header to GPL version 2 only
myisam/rt_mbr.c:
  Changed header to GPL version 2 only
myisam/rt_mbr.h:
  Changed header to GPL version 2 only
myisam/rt_split.c:
  Changed header to GPL version 2 only
myisam/rt_test.c:
  Changed header to GPL version 2 only
myisam/sort.c:
  Changed header to GPL version 2 only
myisam/sp_defs.h:
  Changed header to GPL version 2 only
myisam/sp_key.c:
  Changed header to GPL version 2 only
myisam/sp_test.c:
  Changed header to GPL version 2 only
myisammrg/Makefile.am:
  Changed header to GPL version 2 only
myisammrg/myrg_close.c:
  Changed header to GPL version 2 only
myisammrg/myrg_create.c:
  Changed header to GPL version 2 only
myisammrg/myrg_def.h:
  Changed header to GPL version 2 only
myisammrg/myrg_delete.c:
  Changed header to GPL version 2 only
myisammrg/myrg_extra.c:
  Changed header to GPL version 2 only
myisammrg/myrg_info.c:
  Changed header to GPL version 2 only
myisammrg/myrg_locking.c:
  Changed header to GPL version 2 only
myisammrg/myrg_open.c:
  Changed header to GPL version 2 only
myisammrg/myrg_panic.c:
  Changed header to GPL version 2 only
myisammrg/myrg_queue.c:
  Changed header to GPL version 2 only
myisammrg/myrg_range.c:
  Changed header to GPL version 2 only
myisammrg/myrg_rfirst.c:
  Changed header to GPL version 2 only
myisammrg/myrg_rkey.c:
  Changed header to GPL version 2 only
myisammrg/myrg_rlast.c:
  Changed header to GPL version 2 only
myisammrg/myrg_rnext.c:
  Changed header to GPL version 2 only
myisammrg/myrg_rnext_same.c:
  Changed header to GPL version 2 only
myisammrg/myrg_rprev.c:
  Changed header to GPL version 2 only
myisammrg/myrg_rrnd.c:
  Changed header to GPL version 2 only
myisammrg/myrg_rsame.c:
  Changed header to GPL version 2 only
myisammrg/myrg_static.c:
  Changed header to GPL version 2 only
myisammrg/myrg_update.c:
  Changed header to GPL version 2 only
myisammrg/myrg_write.c:
  Changed header to GPL version 2 only
mysql-test/Makefile.am:
  Changed header to GPL version 2 only
mysys/Makefile.am:
  Changed header to GPL version 2 only
mysys/array.c:
  Changed header to GPL version 2 only
mysys/base64.c:
  Changed header to GPL version 2 only
mysys/charset-def.c:
  Changed header to GPL version 2 only
mysys/charset.c:
  Changed header to GPL version 2 only
mysys/checksum.c:
  Changed header to GPL version 2 only
mysys/default.c:
  Changed header to GPL version 2 only
mysys/default_modify.c:
  Changed header to GPL version 2 only
mysys/errors.c:
  Changed header to GPL version 2 only
mysys/hash.c:
  Changed header to GPL version 2 only
mysys/list.c:
  Changed header to GPL version 2 only
mysys/make-conf.c:
  Changed header to GPL version 2 only
mysys/md5.c:
  Changed header to GPL version 2 only
mysys/mf_brkhant.c:
  Changed header to GPL version 2 only
mysys/mf_cache.c:
  Changed header to GPL version 2 only
mysys/mf_dirname.c:
  Changed header to GPL version 2 only
mysys/mf_fn_ext.c:
  Changed header to GPL version 2 only
mysys/mf_format.c:
  Changed header to GPL version 2 only
mysys/mf_getdate.c:
  Changed header to GPL version 2 only
mysys/mf_iocache.c:
  Changed header to GPL version 2 only
mysys/mf_iocache2.c:
  Changed header to GPL version 2 only
mysys/mf_keycache.c:
  Changed header to GPL version 2 only
mysys/mf_keycaches.c:
  Changed header to GPL version 2 only
mysys/mf_loadpath.c:
  Changed header to GPL version 2 only
mysys/mf_pack.c:
  Changed header to GPL version 2 only
mysys/mf_path.c:
  Changed header to GPL version 2 only
mysys/mf_qsort.c:
  Changed header to GPL version 2 only
mysys/mf_qsort2.c:
  Changed header to GPL version 2 only
mysys/mf_radix.c:
  Changed header to GPL version 2 only
mysys/mf_same.c:
  Changed header to GPL version 2 only
mysys/mf_sort.c:
  Changed header to GPL version 2 only
mysys/mf_soundex.c:
  Changed header to GPL version 2 only
mysys/mf_strip.c:
  Changed header to GPL version 2 only
mysys/mf_tempdir.c:
  Changed header to GPL version 2 only
mysys/mf_tempfile.c:
  Changed header to GPL version 2 only
mysys/mf_unixpath.c:
  Changed header to GPL version 2 only
mysys/mf_util.c:
  Changed header to GPL version 2 only
mysys/mf_wcomp.c:
  Changed header to GPL version 2 only
mysys/mf_wfile.c:
  Changed header to GPL version 2 only
mysys/mulalloc.c:
  Changed header to GPL version 2 only
mysys/my_access.c:
  Changed header to GPL version 2 only
mysys/my_aes.c:
  Changed header to GPL version 2 only
mysys/my_alarm.c:
  Changed header to GPL version 2 only
mysys/my_alloc.c:
  Changed header to GPL version 2 only
mysys/my_append.c:
  Changed header to GPL version 2 only
mysys/my_bit.c:
  Changed header to GPL version 2 only
mysys/my_bitmap.c:
  Changed header to GPL version 2 only
mysys/my_chsize.c:
  Changed header to GPL version 2 only
mysys/my_clock.c:
  Changed header to GPL version 2 only
mysys/my_compress.c:
  Changed header to GPL version 2 only
mysys/my_conio.c:
  Changed header to GPL version 2 only
mysys/my_copy.c:
  Changed header to GPL version 2 only
mysys/my_crc32.c:
  Changed header to GPL version 2 only
mysys/my_create.c:
  Changed header to GPL version 2 only
mysys/my_delete.c:
  Changed header to GPL version 2 only
mysys/my_div.c:
  Changed header to GPL version 2 only
mysys/my_dup.c:
  Changed header to GPL version 2 only
mysys/my_error.c:
  Changed header to GPL version 2 only
mysys/my_file.c:
  Changed header to GPL version 2 only
mysys/my_fopen.c:
  Changed header to GPL version 2 only
mysys/my_fstream.c:
  Changed header to GPL version 2 only
mysys/my_gethostbyname.c:
  Changed header to GPL version 2 only
mysys/my_gethwaddr.c:
  Changed header to GPL version 2 only
mysys/my_getopt.c:
  Changed header to GPL version 2 only
mysys/my_getpagesize.c:
  Changed header to GPL version 2 only
mysys/my_getsystime.c:
  Changed header to GPL version 2 only
mysys/my_getwd.c:
  Changed header to GPL version 2 only
mysys/my_handler.c:
  Changed header to GPL version 2 only
mysys/my_init.c:
  Changed header to GPL version 2 only
mysys/my_largepage.c:
  Changed header to GPL version 2 only
mysys/my_lib.c:
  Changed header to GPL version 2 only
mysys/my_libwrap.c:
  Changed header to GPL version 2 only
mysys/my_lock.c:
  Changed header to GPL version 2 only
mysys/my_lockmem.c:
  Changed header to GPL version 2 only
mysys/my_lread.c:
  Changed header to GPL version 2 only
mysys/my_lwrite.c:
  Changed header to GPL version 2 only
mysys/my_malloc.c:
  Changed header to GPL version 2 only
mysys/my_messnc.c:
  Changed header to GPL version 2 only
mysys/my_mkdir.c:
  Changed header to GPL version 2 only
mysys/my_mmap.c:
  Changed header to GPL version 2 only
mysys/my_net.c:
  Changed header to GPL version 2 only
mysys/my_netware.c:
  Changed header to GPL version 2 only
mysys/my_new.cc:
  Changed header to GPL version 2 only
mysys/my_once.c:
  Changed header to GPL version 2 only
mysys/my_open.c:
  Changed header to GPL version 2 only
mysys/my_os2cond.c:
  Changed header to GPL version 2 only
mysys/my_os2dirsrch.c:
  Changed header to GPL version 2 only
mysys/my_os2dirsrch.h:
  Changed header to GPL version 2 only
mysys/my_os2dlfcn.c:
  Changed header to GPL version 2 only
mysys/my_os2dlfcn.h0:
  Changed header to GPL version 2 only
mysys/my_os2file64.c:
  Changed header to GPL version 2 only
mysys/my_os2thread.c:
  Changed header to GPL version 2 only
mysys/my_os2tls.c:
  Changed header to GPL version 2 only
mysys/my_port.c:
  Changed header to GPL version 2 only
mysys/my_pread.c:
  Changed header to GPL version 2 only
mysys/my_pthread.c:
  Changed header to GPL version 2 only
mysys/my_quick.c:
  Changed header to GPL version 2 only
mysys/my_read.c:
  Changed header to GPL version 2 only
mysys/my_realloc.c:
  Changed header to GPL version 2 only
mysys/my_redel.c:
  Changed header to GPL version 2 only
mysys/my_rename.c:
  Changed header to GPL version 2 only
mysys/my_seek.c:
  Changed header to GPL version 2 only
mysys/my_semaphore.c:
  Changed header to GPL version 2 only
mysys/my_sleep.c:
  Changed header to GPL version 2 only
mysys/my_static.c:
  Changed header to GPL version 2 only
mysys/my_static.h:
  Changed header to GPL version 2 only
mysys/my_symlink.c:
  Changed header to GPL version 2 only
mysys/my_symlink2.c:
  Changed header to GPL version 2 only
mysys/my_sync.c:
  Changed header to GPL version 2 only
mysys/my_thr_init.c:
  Changed header to GPL version 2 only
mysys/my_wincond.c:
  Changed header to GPL version 2 only
mysys/my_windac.c:
  Changed header to GPL version 2 only
mysys/my_winthread.c:
  Changed header to GPL version 2 only
mysys/my_write.c:
  Changed header to GPL version 2 only
mysys/mysys_priv.h:
  Changed header to GPL version 2 only
mysys/ptr_cmp.c:
  Changed header to GPL version 2 only
mysys/queues.c:
  Changed header to GPL version 2 only
mysys/raid.cc:
  Changed header to GPL version 2 only
mysys/raid2.c:
  Changed header to GPL version 2 only
mysys/rijndael.c:
  Changed header to GPL version 2 only
mysys/safemalloc.c:
  Changed header to GPL version 2 only
mysys/sha1.c:
  Changed header to GPL version 2 only
mysys/string.c:
  Changed header to GPL version 2 only
mysys/test_charset.c:
  Changed header to GPL version 2 only
mysys/test_dir.c:
  Changed header to GPL version 2 only
mysys/test_fn.c:
  Changed header to GPL version 2 only
mysys/test_xml.c:
  Changed header to GPL version 2 only
mysys/testhash.c:
  Changed header to GPL version 2 only
mysys/thr_alarm.c:
  Changed header to GPL version 2 only
mysys/thr_lock.c:
  Changed header to GPL version 2 only
mysys/thr_mutex.c:
  Changed header to GPL version 2 only
mysys/thr_rwlock.c:
  Changed header to GPL version 2 only
mysys/tree.c:
  Changed header to GPL version 2 only
mysys/typelib.c:
  Changed header to GPL version 2 only
ndb/include/debugger/DebuggerNames.hpp:
  Changed header to GPL version 2 only
ndb/include/debugger/EventLogger.hpp:
  Changed header to GPL version 2 only
ndb/include/debugger/GrepError.hpp:
  Changed header to GPL version 2 only
ndb/include/debugger/SignalLoggerManager.hpp:
  Changed header to GPL version 2 only
ndb/include/editline/editline.h:
  Changed header to GPL version 2 only
ndb/include/kernel/AttributeDescriptor.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/AttributeHeader.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/AttributeList.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/BlockNumbers.h:
  Changed header to GPL version 2 only
ndb/include/kernel/GlobalSignalNumbers.h:
  Changed header to GPL version 2 only
ndb/include/kernel/GrepEvent.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/Interpreter.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/LogLevel.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/NodeBitmask.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/NodeInfo.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/NodeState.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/RefConvert.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/kernel_types.h:
  Changed header to GPL version 2 only
ndb/include/kernel/ndb_limits.h:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/AbortAll.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/AccFrag.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/AccLock.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/AccScan.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/AccSizeAltReq.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/AlterIndx.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/AlterTab.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/AlterTable.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/AlterTrig.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/ApiBroadcast.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/ApiRegSignalData.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/ApiVersion.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/ArbitSignalData.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/trigger_definitions.h:
  Changed header to GPL version 2 only
ndb/include/ndb_constants.h:
  Changed header to GPL version 2 only
ndb/include/ndb_global.h.in:
  Changed header to GPL version 2 only
ndb/include/ndb_init.h:
  Changed header to GPL version 2 only
ndb/include/ndb_types.h.in:
  Changed header to GPL version 2 only
ndb/include/ndb_version.h.in:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/AttrInfo.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/BackupContinueB.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/BackupImpl.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/BackupSignalData.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/BlockCommitOrd.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/BuildIndx.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/CheckNodeGroups.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/CloseComReqConf.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/CmInit.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/CmRegSignalData.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/CmvmiCfgConf.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/CntrMasterConf.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/CntrMasterReq.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/ConfigParamId.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/ContinueFragmented.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/CopyActive.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/CopyFrag.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/CopyGCIReq.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/CreateEvnt.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/CreateFrag.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/CreateFragmentation.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/CreateIndx.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/CreateTab.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/CreateTable.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/CreateTrig.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/DiAddTab.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/DiGetNodes.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/DictLock.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/DictSchemaInfo.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/DictSizeAltReq.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/DictStart.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/DihAddFrag.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/DihContinueB.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/DihSizeAltReq.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/DihStartTab.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/DihSwitchReplica.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/DisconnectRep.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/DropIndx.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/DropTab.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/DropTabFile.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/DropTable.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/DropTrig.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/EmptyLcp.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/EndTo.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/EventReport.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/EventSubscribeReq.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/ExecFragReq.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/FailRep.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/FireTrigOrd.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/FsAppendReq.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/FsCloseReq.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/FsConf.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/FsOpenReq.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/FsReadWriteReq.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/FsRef.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/FsRemoveReq.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/GCPSave.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/GetTabInfo.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/GetTableId.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/GrepImpl.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/HotSpareRep.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/IndxAttrInfo.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/IndxKeyInfo.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/InvalidateNodeLCPConf.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/InvalidateNodeLCPReq.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/KeyInfo.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/LCP.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/ListTables.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/LqhFrag.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/LqhKey.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/LqhSizeAltReq.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/LqhTransConf.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/ManagementServer.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/MasterGCP.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/MasterLCP.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/NFCompleteRep.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/NdbSttor.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/NdbfsContinueB.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/NextScan.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/NodeFailRep.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/NodeStateSignalData.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/PackedSignal.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/PrepDropTab.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/PrepFailReqRef.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/ReadNodesConf.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/RelTabMem.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/RepImpl.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/ResumeReq.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/ScanFrag.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/ScanTab.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/SetLogLevelOrd.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/SetVarReq.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/SignalData.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/SignalDataPrint.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/SignalDroppedRep.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/SrFragidConf.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/StartFragReq.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/StartInfo.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/StartMe.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/StartOrd.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/StartPerm.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/StartRec.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/StartTo.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/StopMe.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/StopPerm.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/StopReq.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/SumaImpl.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/SystemError.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/TamperOrd.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/TcCommit.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/TcContinueB.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/TcHbRep.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/TcIndx.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/TcKeyConf.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/TcKeyFailConf.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/TcKeyRef.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/TcKeyReq.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/TcRollbackRep.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/TcSizeAltReq.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/TestOrd.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/TransIdAI.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/TrigAttrInfo.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/TupCommit.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/TupFrag.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/TupKey.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/TupSizeAltReq.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/TuxBound.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/TuxContinueB.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/TuxMaint.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/TuxSizeAltReq.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/UpdateTo.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/UtilDelete.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/UtilExecute.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/UtilLock.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/UtilPrepare.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/UtilRelease.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/UtilSequence.hpp:
  Changed header to GPL version 2 only
ndb/include/kernel/signaldata/WaitGCP.hpp:
  Changed header to GPL version 2 only
ndb/include/logger/ConsoleLogHandler.hpp:
  Changed header to GPL version 2 only
ndb/include/logger/FileLogHandler.hpp:
  Changed header to GPL version 2 only
ndb/include/logger/LogHandler.hpp:
  Changed header to GPL version 2 only
ndb/include/logger/Logger.hpp:
  Changed header to GPL version 2 only
ndb/include/logger/SysLogHandler.hpp:
  Changed header to GPL version 2 only
ndb/include/mgmapi/mgmapi.h:
  Changed header to GPL version 2 only
ndb/include/mgmapi/mgmapi_debug.h:
  Changed header to GPL version 2 only
ndb/include/mgmapi/ndb_logevent.h:
  Changed header to GPL version 2 only
ndb/include/mgmapi/ndbd_exit_codes.h:
  Changed header to GPL version 2 only
ndb/include/mgmcommon/ConfigRetriever.hpp:
  Changed header to GPL version 2 only
ndb/include/mgmcommon/IPCConfig.hpp:
  Changed header to GPL version 2 only
ndb/include/mgmcommon/MgmtErrorReporter.hpp:
  Changed header to GPL version 2 only
ndb/include/ndbapi/Ndb.hpp:
  Changed header to GPL version 2 only
ndb/include/ndbapi/NdbApi.hpp:
  Changed header to GPL version 2 only
ndb/include/ndbapi/NdbBlob.hpp:
  Changed header to GPL version 2 only
ndb/include/ndbapi/NdbDictionary.hpp:
  Changed header to GPL version 2 only
ndb/include/ndbapi/NdbError.hpp:
  Changed header to GPL version 2 only
ndb/include/ndbapi/NdbEventOperation.hpp:
  Changed header to GPL version 2 only
ndb/include/ndbapi/NdbIndexOperation.hpp:
  Changed header to GPL version 2 only
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Changed header to GPL version 2 only
ndb/include/ndbapi/NdbOperation.hpp:
  Changed header to GPL version 2 only
ndb/include/ndbapi/NdbPool.hpp:
  Changed header to GPL version 2 only
ndb/include/ndbapi/NdbRecAttr.hpp:
  Changed header to GPL version 2 only
ndb/include/ndbapi/NdbReceiver.hpp:
  Changed header to GPL version 2 only
ndb/include/ndbapi/NdbScanFilter.hpp:
  Changed header to GPL version 2 only
ndb/include/ndbapi/NdbScanOperation.hpp:
  Changed header to GPL version 2 only
ndb/include/ndbapi/NdbTransaction.hpp:
  Changed header to GPL version 2 only
ndb/include/ndbapi/ndb_cluster_connection.hpp:
  Changed header to GPL version 2 only
ndb/include/ndbapi/ndb_opt_defaults.h:
  Changed header to GPL version 2 only
ndb/include/ndbapi/ndbapi_limits.h:
  Changed header to GPL version 2 only
ndb/include/ndbapi/ndberror.h:
  Changed header to GPL version 2 only
ndb/include/newtonapi/dba.h:
  Changed header to GPL version 2 only
ndb/include/newtonapi/defs/pcn_types.h:
  Changed header to GPL version 2 only
ndb/include/portlib/NdbCondition.h:
  Changed header to GPL version 2 only
ndb/include/portlib/NdbConfig.h:
  Changed header to GPL version 2 only
ndb/include/portlib/NdbDaemon.h:
  Changed header to GPL version 2 only
ndb/include/portlib/NdbEnv.h:
  Changed header to GPL version 2 only
ndb/include/portlib/NdbHost.h:
  Changed header to GPL version 2 only
ndb/include/portlib/NdbMain.h:
  Changed header to GPL version 2 only
ndb/include/portlib/NdbMem.h:
  Changed header to GPL version 2 only
ndb/include/portlib/NdbMutex.h:
  Changed header to GPL version 2 only
ndb/include/portlib/NdbSleep.h:
  Changed header to GPL version 2 only
ndb/include/portlib/NdbTCP.h:
  Changed header to GPL version 2 only
ndb/include/portlib/NdbThread.h:
  Changed header to GPL version 2 only
ndb/include/portlib/NdbTick.h:
  Changed header to GPL version 2 only
ndb/include/portlib/PortDefs.h:
  Changed header to GPL version 2 only
ndb/include/portlib/prefetch.h:
  Changed header to GPL version 2 only
ndb/include/transporter/TransporterCallback.hpp:
  Changed header to GPL version 2 only
ndb/include/transporter/TransporterDefinitions.hpp:
  Changed header to GPL version 2 only
ndb/include/transporter/TransporterRegistry.hpp:
  Changed header to GPL version 2 only
ndb/include/util/BaseString.hpp:
  Changed header to GPL version 2 only
ndb/include/util/Bitmask.hpp:
  Changed header to GPL version 2 only
ndb/include/util/File.hpp:
  Changed header to GPL version 2 only
ndb/include/util/InputStream.hpp:
  Changed header to GPL version 2 only
ndb/include/util/NdbAutoPtr.hpp:
  Changed header to GPL version 2 only
ndb/include/util/NdbOut.hpp:
  Changed header to GPL version 2 only
ndb/include/util/NdbSqlUtil.hpp:
  Changed header to GPL version 2 only
ndb/include/util/OutputStream.hpp:
  Changed header to GPL version 2 only
ndb/include/util/Parser.hpp:
  Changed header to GPL version 2 only
ndb/include/util/Properties.hpp:
  Changed header to GPL version 2 only
ndb/include/util/SimpleProperties.hpp:
  Changed header to GPL version 2 only
ndb/include/util/SocketAuthenticator.hpp:
  Changed header to GPL version 2 only
ndb/include/util/SocketClient.hpp:
  Changed header to GPL version 2 only
ndb/include/util/SocketServer.hpp:
  Changed header to GPL version 2 only
ndb/include/util/UtilBuffer.hpp:
  Changed header to GPL version 2 only
ndb/include/util/Vector.hpp:
  Changed header to GPL version 2 only
ndb/include/util/basestring_vsnprintf.h:
  Changed header to GPL version 2 only
ndb/include/util/md5_hash.hpp:
  Changed header to GPL version 2 only
ndb/include/util/ndb_opts.h:
  Changed header to GPL version 2 only
ndb/include/util/random.h:
  Changed header to GPL version 2 only
ndb/include/util/socket_io.h:
  Changed header to GPL version 2 only
ndb/include/util/uucode.h:
  Changed header to GPL version 2 only
ndb/include/util/version.h:
  Changed header to GPL version 2 only
ndb/ndbapi-examples/mgmapi_logevent_example/mgmapi_logevent.cpp:
  Changed header to GPL version 2 only
ndb/ndbapi-examples/ndbapi_async_example/ndbapi_async.cpp:
  Changed header to GPL version 2 only
ndb/ndbapi-examples/ndbapi_async_example1/ndbapi_async1.cpp:
  Changed header to GPL version 2 only
ndb/ndbapi-examples/ndbapi_event_example/ndbapi_event.cpp:
  Changed header to GPL version 2 only
ndb/ndbapi-examples/ndbapi_retries_example/ndbapi_retries.cpp:
  Changed header to GPL version 2 only
ndb/ndbapi-examples/ndbapi_scan_example/ndbapi_scan.cpp:
  Changed header to GPL version 2 only
ndb/ndbapi-examples/ndbapi_simple_example/ndbapi_simple.cpp:
  Changed header to GPL version 2 only
ndb/ndbapi-examples/ndbapi_simple_index_example/ndbapi_simple_index.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/BlockNames.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/DebuggerNames.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/EventLogger.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/GrepError.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/SignalLoggerManager.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/AccLock.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/AlterIndx.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/AlterTab.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/AlterTable.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/AlterTrig.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/BackupImpl.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/BackupSignalData.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/CloseComReqConf.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/ContinueB.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/CopyGCI.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/CreateEvnt.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/CreateFragmentation.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/CreateIndx.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/CreateTrig.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/DihContinueB.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/DihSwitchReplicaReq.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/DisconnectRep.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/DropIndx.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/DropTab.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/DropTrig.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/FailRep.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/FireTrigOrd.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/FsAppendReq.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/FsCloseReq.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/FsConf.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/FsOpenReq.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/FsReadWriteReq.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/FsRef.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/GCPSave.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/IndxAttrInfo.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/IndxKeyInfo.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/LCP.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/LqhFrag.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/LqhKey.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/LqhTrans.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/MasterLCP.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/NFCompleteRep.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/NdbSttor.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/NdbfsContinueB.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/PackedSignal.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/PrepDropTab.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/PrepFailReqRef.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/ScanFrag.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/ScanTab.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/SignalDroppedRep.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/SignalNames.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/StartRec.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/SumaImpl.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/SystemError.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/TcIndx.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/TcKeyConf.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/TcKeyRef.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/TcKeyReq.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/TcRollbackRep.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/TrigAttrInfo.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/TupCommit.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/TupKey.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/TuxMaint.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/UtilDelete.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/UtilExecute.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/UtilLock.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/UtilPrepare.cpp:
  Changed header to GPL version 2 only
ndb/src/common/debugger/signaldata/UtilSequence.cpp:
  Changed header to GPL version 2 only
ndb/src/common/logger/ConsoleLogHandler.cpp:
  Changed header to GPL version 2 only
ndb/src/common/logger/FileLogHandler.cpp:
  Changed header to GPL version 2 only
ndb/src/common/logger/LogHandler.cpp:
  Changed header to GPL version 2 only
ndb/src/common/logger/LogHandlerList.cpp:
  Changed header to GPL version 2 only
ndb/src/common/logger/LogHandlerList.hpp:
  Changed header to GPL version 2 only
ndb/src/common/logger/Logger.cpp:
  Changed header to GPL version 2 only
ndb/src/common/logger/SysLogHandler.cpp:
  Changed header to GPL version 2 only
ndb/src/common/logger/listtest/LogHandlerListUnitTest.cpp:
  Changed header to GPL version 2 only
ndb/src/common/logger/listtest/LogHandlerListUnitTest.hpp:
  Changed header to GPL version 2 only
ndb/src/common/logger/loggertest/LoggerUnitTest.cpp:
  Changed header to GPL version 2 only
ndb/src/common/logger/loggertest/LoggerUnitTest.hpp:
  Changed header to GPL version 2 only
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Changed header to GPL version 2 only
ndb/src/common/mgmcommon/IPCConfig.cpp:
  Changed header to GPL version 2 only
ndb/src/common/mgmcommon/printConfig/printConfig.cpp:
  Changed header to GPL version 2 only
ndb/src/common/portlib/NdbCondition.c:
  Changed header to GPL version 2 only
ndb/src/common/portlib/NdbConfig.c:
  Changed header to GPL version 2 only
ndb/src/common/portlib/NdbDaemon.c:
  Changed header to GPL version 2 only
ndb/src/common/portlib/NdbEnv.c:
  Changed header to GPL version 2 only
ndb/src/common/portlib/NdbHost.c:
  Changed header to GPL version 2 only
ndb/src/common/portlib/NdbMem.c:
  Changed header to GPL version 2 only
ndb/src/common/portlib/NdbMutex.c:
  Changed header to GPL version 2 only
ndb/src/common/portlib/NdbPortLibTest.cpp:
  Changed header to GPL version 2 only
ndb/src/common/portlib/NdbSleep.c:
  Changed header to GPL version 2 only
ndb/src/common/portlib/NdbTCP.cpp:
  Changed header to GPL version 2 only
ndb/src/common/portlib/NdbThread.c:
  Changed header to GPL version 2 only
ndb/src/common/portlib/NdbTick.c:
  Changed header to GPL version 2 only
ndb/src/common/portlib/memtest.c:
  Changed header to GPL version 2 only
ndb/src/common/portlib/mmslist.cpp:
  Changed header to GPL version 2 only
ndb/src/common/portlib/mmstest.cpp:
  Changed header to GPL version 2 only
ndb/src/common/portlib/munmaptest.cpp:
  Changed header to GPL version 2 only
ndb/src/common/portlib/old_dirs/ose/NdbCondition.c:
  Changed header to GPL version 2 only
ndb/src/common/portlib/old_dirs/ose/NdbConditionOSE.h:
  Changed header to GPL version 2 only
ndb/src/common/portlib/old_dirs/ose/NdbEnv.c:
  Changed header to GPL version 2 only
ndb/src/common/portlib/old_dirs/ose/NdbHost.c:
  Changed header to GPL version 2 only
ndb/src/common/portlib/old_dirs/ose/NdbMem.c:
  Changed header to GPL version 2 only
ndb/src/common/portlib/old_dirs/ose/NdbMem_SoftOse.cpp:
  Changed header to GPL version 2 only
ndb/src/common/portlib/old_dirs/ose/NdbMutex.c:
  Changed header to GPL version 2 only
ndb/src/common/portlib/old_dirs/ose/NdbOut.cpp:
  Changed header to GPL version 2 only
ndb/src/common/portlib/old_dirs/ose/NdbSleep.c:
  Changed header to GPL version 2 only
ndb/src/common/portlib/old_dirs/ose/NdbTCP.c:
  Changed header to GPL version 2 only
ndb/src/common/portlib/old_dirs/ose/NdbThread.c:
  Changed header to GPL version 2 only
ndb/src/common/portlib/old_dirs/ose/NdbTick.c:
  Changed header to GPL version 2 only
ndb/src/common/portlib/old_dirs/win32/NdbCondition.c:
  Changed header to GPL version 2 only
ndb/src/common/portlib/old_dirs/win32/NdbDaemon.c:
  Changed header to GPL version 2 only
ndb/src/common/portlib/old_dirs/win32/NdbEnv.c:
  Changed header to GPL version 2 only
ndb/src/common/portlib/old_dirs/win32/NdbHost.c:
  Changed header to GPL version 2 only
ndb/src/common/portlib/old_dirs/win32/NdbMem.c:
  Changed header to GPL version 2 only
ndb/src/common/portlib/old_dirs/win32/NdbMutex.c:
  Changed header to GPL version 2 only
ndb/src/common/portlib/old_dirs/win32/NdbSleep.c:
  Changed header to GPL version 2 only
ndb/src/common/portlib/old_dirs/win32/NdbTCP.c:
  Changed header to GPL version 2 only
ndb/src/common/portlib/old_dirs/win32/NdbThread.c:
  Changed header to GPL version 2 only
ndb/src/common/portlib/old_dirs/win32/NdbTick.c:
  Changed header to GPL version 2 only
ndb/src/common/portlib/win32/NdbCondition.c:
  Changed header to GPL version 2 only
ndb/src/common/portlib/win32/NdbDaemon.c:
  Changed header to GPL version 2 only
ndb/src/common/portlib/win32/NdbEnv.c:
  Changed header to GPL version 2 only
ndb/src/common/portlib/win32/NdbHost.c:
  Changed header to GPL version 2 only
ndb/src/common/portlib/win32/NdbMem.c:
  Changed header to GPL version 2 only
ndb/src/common/portlib/win32/NdbMutex.c:
  Changed header to GPL version 2 only
ndb/src/common/portlib/win32/NdbSleep.c:
  Changed header to GPL version 2 only
ndb/src/common/portlib/win32/NdbTCP.c:
  Changed header to GPL version 2 only
ndb/src/common/portlib/win32/NdbThread.c:
  Changed header to GPL version 2 only
ndb/src/common/portlib/win32/NdbTick.c:
  Changed header to GPL version 2 only
ndb/src/common/transporter/OSE_Receiver.cpp:
  Changed header to GPL version 2 only
ndb/src/common/transporter/OSE_Receiver.hpp:
  Changed header to GPL version 2 only
ndb/src/common/transporter/OSE_Signals.hpp:
  Changed header to GPL version 2 only
ndb/src/common/transporter/OSE_Transporter.cpp:
  Changed header to GPL version 2 only
ndb/src/common/transporter/OSE_Transporter.hpp:
  Changed header to GPL version 2 only
ndb/src/common/transporter/Packer.cpp:
  Changed header to GPL version 2 only
ndb/src/common/transporter/Packer.hpp:
  Changed header to GPL version 2 only
ndb/src/common/transporter/SCI_Transporter.cpp:
  Changed header to GPL version 2 only
ndb/src/common/transporter/SCI_Transporter.hpp:
  Changed header to GPL version 2 only
ndb/src/common/transporter/SHM_Buffer.hpp:
  Changed header to GPL version 2 only
ndb/src/common/transporter/SHM_Transporter.cpp:
  Changed header to GPL version 2 only
ndb/src/common/transporter/SHM_Transporter.hpp:
  Changed header to GPL version 2 only
ndb/src/common/transporter/SHM_Transporter.unix.cpp:
  Changed header to GPL version 2 only
ndb/src/common/transporter/SHM_Transporter.win32.cpp:
  Changed header to GPL version 2 only
ndb/src/common/transporter/SendBuffer.cpp:
  Changed header to GPL version 2 only
ndb/src/common/transporter/SendBuffer.hpp:
  Changed header to GPL version 2 only
ndb/src/common/transporter/TCP_Transporter.cpp:
  Changed header to GPL version 2 only
ndb/src/common/transporter/TCP_Transporter.hpp:
  Changed header to GPL version 2 only
ndb/src/common/transporter/Transporter.cpp:
  Changed header to GPL version 2 only
ndb/src/common/transporter/Transporter.hpp:
  Changed header to GPL version 2 only
ndb/src/common/transporter/TransporterInternalDefinitions.hpp:
  Changed header to GPL version 2 only
ndb/src/common/transporter/TransporterRegistry.cpp:
  Changed header to GPL version 2 only
ndb/src/common/transporter/basictest/basicTransporterTest.cpp:
  Changed header to GPL version 2 only
ndb/src/common/transporter/buddy.cpp:
  Changed header to GPL version 2 only
ndb/src/common/transporter/buddy.hpp:
  Changed header to GPL version 2 only
ndb/src/common/transporter/failoverSCI/failoverSCI.cpp:
  Changed header to GPL version 2 only
ndb/src/common/transporter/perftest/perfTransporterTest.cpp:
  Changed header to GPL version 2 only
ndb/src/common/transporter/priotest/prioSCI/prioSCI.cpp:
  Changed header to GPL version 2 only
ndb/src/common/transporter/priotest/prioSHM/prioSHM.cpp:
  Changed header to GPL version 2 only
ndb/src/common/transporter/priotest/prioTCP/prioTCP.cpp:
  Changed header to GPL version 2 only
ndb/src/common/transporter/priotest/prioTransporterTest.cpp:
  Changed header to GPL version 2 only
ndb/src/common/transporter/priotest/prioTransporterTest.hpp:
  Changed header to GPL version 2 only
ndb/src/common/util/BaseString.cpp:
  Changed header to GPL version 2 only
ndb/src/common/util/File.cpp:
  Changed header to GPL version 2 only
ndb/src/common/util/InputStream.cpp:
  Changed header to GPL version 2 only
ndb/src/common/util/NdbErrHnd.cpp:
  Changed header to GPL version 2 only
ndb/src/common/util/NdbOut.cpp:
  Changed header to GPL version 2 only
ndb/src/common/util/NdbSqlUtil.cpp:
  Changed header to GPL version 2 only
ndb/src/common/util/OutputStream.cpp:
  Changed header to GPL version 2 only
ndb/src/common/util/Parser.cpp:
  Changed header to GPL version 2 only
ndb/src/common/util/Properties.cpp:
  Changed header to GPL version 2 only
ndb/src/common/util/SimpleProperties.cpp:
  Changed header to GPL version 2 only
ndb/src/common/util/SocketAuthenticator.cpp:
  Changed header to GPL version 2 only
ndb/src/common/util/SocketClient.cpp:
  Changed header to GPL version 2 only
ndb/src/common/util/SocketServer.cpp:
  Changed header to GPL version 2 only
ndb/src/common/util/basestring_vsnprintf.c:
  Changed header to GPL version 2 only
ndb/src/common/util/filetest/FileUnitTest.cpp:
  Changed header to GPL version 2 only
ndb/src/common/util/filetest/FileUnitTest.hpp:
  Changed header to GPL version 2 only
ndb/src/common/util/md5_hash.cpp:
  Changed header to GPL version 2 only
ndb/src/common/util/ndb_init.c:
  Changed header to GPL version 2 only
ndb/src/common/util/random.c:
  Changed header to GPL version 2 only
ndb/src/common/util/socket_io.cpp:
  Changed header to GPL version 2 only
ndb/src/common/util/strdup.c:
  Changed header to GPL version 2 only
ndb/src/common/util/testProperties/testProperties.cpp:
  Changed header to GPL version 2 only
ndb/src/common/util/testSimpleProperties/sp_test.cpp:
  Changed header to GPL version 2 only
ndb/src/common/util/uucode.c:
  Changed header to GPL version 2 only
ndb/src/common/util/version.c:
  Changed header to GPL version 2 only
ndb/src/cw/cpcc-win32/C++/CPC_GUI.cpp:
  Changed header to GPL version 2 only
ndb/src/cw/cpcc-win32/C++/CPC_GUI.h:
  Changed header to GPL version 2 only
ndb/src/cw/cpcc-win32/C++/NdbControls.cpp:
  Changed header to GPL version 2 only
ndb/src/cw/cpcc-win32/C++/StdAfx.cpp:
  Changed header to GPL version 2 only
ndb/src/cw/cpcc-win32/C++/StdAfx.h:
  Changed header to GPL version 2 only
ndb/src/cw/cpcc-win32/C++/TreeView.cpp:
  Changed header to GPL version 2 only
ndb/src/cw/cpcc-win32/C++/TreeView.h:
  Changed header to GPL version 2 only
ndb/src/cw/cpcc-win32/C++/resource.h:
  Changed header to GPL version 2 only
ndb/src/cw/cpcd/APIService.cpp:
  Changed header to GPL version 2 only
ndb/src/cw/cpcd/APIService.hpp:
  Changed header to GPL version 2 only
ndb/src/cw/cpcd/CPCD.cpp:
  Changed header to GPL version 2 only
ndb/src/cw/cpcd/CPCD.hpp:
  Changed header to GPL version 2 only
ndb/src/cw/cpcd/Monitor.cpp:
  Changed header to GPL version 2 only
ndb/src/cw/cpcd/Process.cpp:
  Changed header to GPL version 2 only
ndb/src/cw/cpcd/common.cpp:
  Changed header to GPL version 2 only
ndb/src/cw/cpcd/common.hpp:
  Changed header to GPL version 2 only
ndb/src/cw/cpcd/main.cpp:
  Changed header to GPL version 2 only
ndb/src/cw/test/socketclient/socketClientTest.cpp:
  Changed header to GPL version 2 only
ndb/src/cw/util/ClientInterface.cpp:
  Changed header to GPL version 2 only
ndb/src/cw/util/ClientInterface.hpp:
  Changed header to GPL version 2 only
ndb/src/cw/util/SocketRegistry.cpp:
  Changed header to GPL version 2 only
ndb/src/cw/util/SocketRegistry.hpp:
  Changed header to GPL version 2 only
ndb/src/cw/util/SocketService.cpp:
  Changed header to GPL version 2 only
ndb/src/cw/util/SocketService.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/SimBlockList.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/backup/Backup.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/backup/Backup.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/backup/BackupFormat.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/backup/FsBuffer.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/backup/read.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/mutexes.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/main.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbdict/SchemaFile.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbdih/Sysfile.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbtup/AttributeOffset.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbtup/DbtupLCP.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbtup/DbtupUndoLog.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbutil/DbUtil.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/dbutil/DbUtil.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/ndbfs/AsyncFileTest/AsyncFileTest.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/ndbfs/CircularIndex.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/ndbfs/CircularIndex.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/ndbfs/Filename.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/ndbfs/Filename.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/ndbfs/MemoryChannel.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/ndbfs/MemoryChannelOSE.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/ndbfs/MemoryChannelTest/MemoryChannelTest.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/ndbfs/Pool.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/ndbfs/VoidFs.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/qmgr/timer.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/suma/Suma.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/suma/Suma.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/suma/SumaInit.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/trix/Trix.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/blocks/trix/Trix.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/error/ErrorHandlingMacros.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/error/ErrorReporter.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/error/ErrorReporter.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/error/TimeModule.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/error/TimeModule.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/error/ndbd_exit_codes.c:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/Array.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/ArrayFifoList.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/ArrayList.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/ArrayPool.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/CArray.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/Callback.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/ClusterConfiguration.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/ClusterConfiguration.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/Configuration.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/Configuration.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/DLFifoList.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/DLHashTable.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/DLHashTable2.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/DLList.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/DataBuffer.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/Emulator.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/Emulator.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/FastScheduler.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/FastScheduler.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/GlobalData.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/KeyDescriptor.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/KeyTable.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/KeyTable2.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/LongSignal.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/MetaData.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/MetaData.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/Mutex.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/Mutex.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/Prio.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/RequestTracker.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/SLList.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/SafeCounter.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/SafeCounter.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/SectionReader.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/SectionReader.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/SignalCounter.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/SimBlockList.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/SimplePropertiesSection.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/SimulatedBlock.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/SimulatedBlock.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/SuperPool.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/SuperPool.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/ThreadConfig.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/ThreadConfig.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/TimeQueue.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/TimeQueue.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/TransporterCallback.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/VMSignal.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/VMSignal.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/WaitQueue.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/WatchDog.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/WatchDog.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/al_test/arrayListTest.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/al_test/arrayPoolTest.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/al_test/main.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/ndbd_malloc.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/ndbd_malloc.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/pc.hpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/testCopy/rr.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/testCopy/testCopy.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/testDataBuffer/testDataBuffer.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/testLongSig/testLongSig.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/testSimplePropertiesSection/test.cpp:
  Changed header to GPL version 2 only
ndb/src/kernel/vm/testSuperPool.cpp:
  Changed header to GPL version 2 only
ndb/src/mgmapi/LocalConfig.cpp:
  Changed header to GPL version 2 only
ndb/src/mgmapi/LocalConfig.hpp:
  Changed header to GPL version 2 only
ndb/src/mgmapi/mgmapi.cpp:
  Changed header to GPL version 2 only
ndb/src/mgmapi/mgmapi_configuration.hpp:
  Changed header to GPL version 2 only
ndb/src/mgmapi/mgmapi_internal.h:
  Changed header to GPL version 2 only
ndb/src/mgmapi/ndb_logevent.cpp:
  Changed header to GPL version 2 only
ndb/src/mgmapi/ndb_logevent.hpp:
  Changed header to GPL version 2 only
ndb/src/mgmapi/test/keso.c:
  Changed header to GPL version 2 only
ndb/src/mgmapi/test/mgmSrvApi.cpp:
  Changed header to GPL version 2 only
ndb/src/mgmclient/CommandInterpreter.cpp:
  Changed header to GPL version 2 only
ndb/src/mgmclient/main.cpp:
  Changed header to GPL version 2 only
ndb/src/mgmclient/ndb_mgmclient.hpp:
  Changed header to GPL version 2 only
ndb/src/mgmclient/ndb_mgmclient.h:
  Changed header to GPL version 2 only
ndb/src/mgmclient/test_cpcd/test_cpcd.cpp:
  Changed header to GPL version 2 only
ndb/src/mgmsrv/Config.cpp:
  Changed header to GPL version 2 only
ndb/src/mgmsrv/Config.hpp:
  Changed header to GPL version 2 only
ndb/src/mgmsrv/ConfigInfo.cpp:
  Changed header to GPL version 2 only
ndb/src/mgmsrv/ConfigInfo.hpp:
  Changed header to GPL version 2 only
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Changed header to GPL version 2 only
ndb/src/mgmsrv/InitConfigFileParser.hpp:
  Changed header to GPL version 2 only
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Changed header to GPL version 2 only
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Changed header to GPL version 2 only
ndb/src/mgmsrv/MgmtSrvrConfig.cpp:
  Changed header to GPL version 2 only
ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp:
  Changed header to GPL version 2 only
ndb/src/mgmsrv/Services.cpp:
  Changed header to GPL version 2 only
ndb/src/mgmsrv/Services.hpp:
  Changed header to GPL version 2 only
ndb/src/mgmsrv/SignalQueue.cpp:
  Changed header to GPL version 2 only
ndb/src/mgmsrv/SignalQueue.hpp:
  Changed header to GPL version 2 only
ndb/src/mgmsrv/convertStrToInt.cpp:
  Changed header to GPL version 2 only
ndb/src/mgmsrv/convertStrToInt.hpp:
  Changed header to GPL version 2 only
ndb/src/mgmsrv/main.cpp:
  Changed header to GPL version 2 only
ndb/src/mgmsrv/mkconfig/mkconfig.cpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/API.hpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/ClusterMgr.cpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/ClusterMgr.hpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/DictCache.cpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/DictCache.hpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/Ndb.cpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/NdbApiSignal.cpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/NdbApiSignal.hpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/NdbBlob.cpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/NdbBlobImpl.hpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/NdbDictionary.cpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/NdbErrorOut.cpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/NdbEventOperation.cpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/NdbEventOperationImpl.hpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/NdbImpl.hpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/NdbIndexOperation.cpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/NdbLinHash.hpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/NdbOperation.cpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/NdbOperationDefine.cpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/NdbOperationExec.cpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/NdbOperationInt.cpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/NdbOperationScan.cpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/NdbOperationSearch.cpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/NdbPool.cpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/NdbPoolImpl.cpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/NdbPoolImpl.hpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/NdbRecAttr.cpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/NdbReceiver.cpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/NdbScanFilter.cpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/NdbScanOperation.cpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/NdbTransaction.cpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/NdbTransactionScan.cpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/NdbUtil.cpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/NdbUtil.hpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/NdbWaiter.hpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/Ndberr.cpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/Ndbif.cpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/Ndbinit.cpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/Ndblist.cpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/ObjectMap.hpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/SignalSender.cpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/SignalSender.hpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/TransporterFacade.cpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/TransporterFacade.hpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/ndb_cluster_connection_impl.hpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/ndberror.c:
  Changed header to GPL version 2 only
ndb/src/ndbapi/signal-sender/SignalSender.cpp:
  Changed header to GPL version 2 only
ndb/src/ndbapi/signal-sender/SignalSender.hpp:
  Changed header to GPL version 2 only
ndb/test/include/CpcClient.hpp:
  Changed header to GPL version 2 only
ndb/test/include/HugoAsynchTransactions.hpp:
  Changed header to GPL version 2 only
ndb/test/include/HugoCalculator.hpp:
  Changed header to GPL version 2 only
ndb/test/include/HugoOperations.hpp:
  Changed header to GPL version 2 only
ndb/test/include/HugoTransactions.hpp:
  Changed header to GPL version 2 only
ndb/test/include/NDBT.hpp:
  Changed header to GPL version 2 only
ndb/test/include/NDBT_DataSet.hpp:
  Changed header to GPL version 2 only
ndb/test/include/NDBT_DataSetTransaction.hpp:
  Changed header to GPL version 2 only
ndb/test/include/NDBT_Error.hpp:
  Changed header to GPL version 2 only
ndb/test/include/NDBT_Output.hpp:
  Changed header to GPL version 2 only
ndb/test/include/NDBT_ResultRow.hpp:
  Changed header to GPL version 2 only
ndb/test/include/NDBT_ReturnCodes.h:
  Changed header to GPL version 2 only
ndb/test/include/NDBT_Stats.hpp:
  Changed header to GPL version 2 only
ndb/test/include/NDBT_Table.hpp:
  Changed header to GPL version 2 only
ndb/test/include/NDBT_Tables.hpp:
  Changed header to GPL version 2 only
ndb/test/include/NDBT_Test.hpp:
  Changed header to GPL version 2 only
ndb/test/include/NdbBackup.hpp:
  Changed header to GPL version 2 only
ndb/test/include/NdbConfig.hpp:
  Changed header to GPL version 2 only
ndb/test/include/NdbGrep.hpp:
  Changed header to GPL version 2 only
ndb/test/include/NdbRestarter.hpp:
  Changed header to GPL version 2 only
ndb/test/include/NdbRestarts.hpp:
  Changed header to GPL version 2 only
ndb/test/include/NdbSchemaCon.hpp:
  Changed header to GPL version 2 only
ndb/test/include/NdbSchemaOp.hpp:
  Changed header to GPL version 2 only
ndb/test/include/NdbTest.hpp:
  Changed header to GPL version 2 only
ndb/test/include/NdbTimer.hpp:
  Changed header to GPL version 2 only
ndb/test/include/TestNdbEventOperation.hpp:
  Changed header to GPL version 2 only
ndb/test/include/UtilTransactions.hpp:
  Changed header to GPL version 2 only
ndb/test/include/getarg.h:
  Changed header to GPL version 2 only
ndb/test/ndbapi/InsertRecs.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/ScanFilter.hpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/ScanFunctions.hpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/ScanInterpretTest.hpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/TraceNdbApi.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/VerifyNdbApi.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/acid.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/acid2.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/adoInsertRecs.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/asyncGenerator.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/benchronja.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/bulk_copy.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/cdrserver.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/celloDb.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/create_all_tabs.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/create_tab.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/drop_all_tabs.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/flexAsynch.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/flexBench.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/flexHammer.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/flexScan.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/flexTT.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/flexTimedAsynch.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/flex_bench_mysql.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/index.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/index2.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/initronja.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/interpreterInTup.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/mainAsyncGenerator.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/msa.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/ndb_async1.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/ndb_async2.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/ndb_user_populate.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/ndb_user_transaction.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/ndb_user_transaction2.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/ndb_user_transaction3.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/ndb_user_transaction4.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/ndb_user_transaction5.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/ndb_user_transaction6.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/restarter.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/restarter2.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/restarts.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/size.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/testBackup.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/testBasic.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/testBasicAsynch.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/testBlobs.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/testDataBuffers.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/testDeadlock.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/testDict.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/testGrepVerify.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/testIndex.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/testInterpreter.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/testMgm.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/testNdbApi.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/testNodeRestart.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/testOIBasic.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/testOperations.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/testOrderedIndex.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/testPartitioning.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/testReadPerf.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/testRestartGci.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/testSRBank.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/testScan.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/testScanInterpreter.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/testScanPerf.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/testSystemRestart.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/bank/Bank.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/bank/Bank.hpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/bank/BankLoad.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/bank/bankCreator.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/bank/bankMakeGL.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/bank/bankSumAccounts.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/bank/bankTimer.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/bank/bankTransactionMaker.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/bank/bankValidateAllGLs.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/bank/testBank.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/bench/asyncGenerator.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/bench/dbGenerator.h:
  Changed header to GPL version 2 only
ndb/test/ndbapi/bench/dbPopulate.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/bench/dbPopulate.h:
  Changed header to GPL version 2 only
ndb/test/ndbapi/bench/macros.h:
  Changed header to GPL version 2 only
ndb/test/ndbapi/bench/mainAsyncGenerator.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/bench/mainPopulate.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/bench/ndb_async1.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/bench/ndb_async2.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/bench/ndb_error.hpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/bench/ndb_schema.hpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/bench/ndb_user_transaction.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/bench/ndb_user_transaction2.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/bench/ndb_user_transaction3.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/bench/ndb_user_transaction4.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/bench/ndb_user_transaction5.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/bench/ndb_user_transaction6.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/bench/testData.h:
  Changed header to GPL version 2 only
ndb/test/ndbapi/bench/testDefinitions.h:
  Changed header to GPL version 2 only
ndb/test/ndbapi/bench/userInterface.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/bench/userInterface.h:
  Changed header to GPL version 2 only
ndb/test/ndbapi/old_dirs/acid2/TraceNdbApi.hpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/old_dirs/acid2/VerifyNdbApi.hpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/old_dirs/lmc-bench/async-src/include/dbGenerator.h:
  Changed header to GPL version 2 only
ndb/test/ndbapi/old_dirs/lmc-bench/async-src/include/testData.h:
  Changed header to GPL version 2 only
ndb/test/ndbapi/old_dirs/lmc-bench/async-src/include/userInterface.h:
  Changed header to GPL version 2 only
ndb/test/ndbapi/old_dirs/lmc-bench/async-src/user/macros.h:
  Changed header to GPL version 2 only
ndb/test/ndbapi/old_dirs/lmc-bench/async-src/user/ndb_error.hpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/old_dirs/lmc-bench/include/ndb_schema.hpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/old_dirs/lmc-bench/include/testDefinitions.h:
  Changed header to GPL version 2 only
ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/dbGenerator.c:
  Changed header to GPL version 2 only
ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/dbGenerator.h:
  Changed header to GPL version 2 only
ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/mainGenerator.c:
  Changed header to GPL version 2 only
ndb/test/ndbapi/old_dirs/lmc-bench/src/include/testData.h:
  Changed header to GPL version 2 only
ndb/test/ndbapi/old_dirs/lmc-bench/src/include/userInterface.h:
  Changed header to GPL version 2 only
ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/dbPopulate.c:
  Changed header to GPL version 2 only
ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/dbPopulate.h:
  Changed header to GPL version 2 only
ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/mainPopulate.c:
  Changed header to GPL version 2 only
ndb/test/ndbapi/old_dirs/lmc-bench/src/user/localDbPrepare.c:
  Changed header to GPL version 2 only
ndb/test/ndbapi/old_dirs/lmc-bench/src/user/macros.h:
  Changed header to GPL version 2 only
ndb/test/ndbapi/old_dirs/lmc-bench/src/user/ndb_error.hpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/userHandle.h:
  Changed header to GPL version 2 only
ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/userInterface.c:
  Changed header to GPL version 2 only
ndb/test/ndbapi/old_dirs/lmc-bench/src/user/userHandle.h:
  Changed header to GPL version 2 only
ndb/test/ndbapi/old_dirs/lmc-bench/src/user/userInterface.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/old_dirs/lmc-bench/src/user/userTransaction.c:
  Changed header to GPL version 2 only
ndb/test/ndbapi/testTimeout.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/testTransactions.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/test_event.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/test_event_merge.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/test_event_multi_table.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/userInterface.cpp:
  Changed header to GPL version 2 only
ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/userTransaction.c:
  Changed header to GPL version 2 only
ndb/test/ndbapi/old_dirs/vw_test/bcd.h:
  Changed header to GPL version 2 only
ndb/test/ndbapi/old_dirs/vw_test/utv.h:
  Changed header to GPL version 2 only
ndb/test/ndbapi/old_dirs/vw_test/vcdrfunc.h:
  Changed header to GPL version 2 only
ndb/test/newtonapi/basic_test/basic/basic.cpp:
  Changed header to GPL version 2 only
ndb/test/newtonapi/basic_test/bulk_read/br_test.cpp:
  Changed header to GPL version 2 only
ndb/test/newtonapi/basic_test/common.cpp:
  Changed header to GPL version 2 only
ndb/test/newtonapi/basic_test/common.hpp:
  Changed header to GPL version 2 only
ndb/test/newtonapi/basic_test/ptr_binding/ptr_binding_test.cpp:
  Changed header to GPL version 2 only
ndb/test/newtonapi/basic_test/too_basic.cpp:
  Changed header to GPL version 2 only
ndb/test/newtonapi/perf_test/perf.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/SQL99_test/SQL99_test.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/SQL99_test/SQL99_test.h:
  Changed header to GPL version 2 only
ndb/test/odbc/client/NDBT_ALLOCHANDLE.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/NDBT_ALLOCHANDLE_HDBC.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/NDBT_SQLConnect.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/NDBT_SQLPrepare.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLAllocEnvTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLAllocHandleTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLAllocHandleTest_bf.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLBindColTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLBindParameterTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLCancelTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLCloseCursorTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLColAttributeTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLColAttributeTest1.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLColAttributeTest2.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLColAttributeTest3.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLConnectTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLCopyDescTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLDescribeColTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLDisconnectTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLDriverConnectTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLEndTranTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLErrorTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLExecDirectTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLExecuteTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLFetchScrollTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLFetchTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLFreeHandleTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLFreeStmtTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLGetConnectAttrTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLGetCursorNameTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLGetDataTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLGetDescFieldTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLGetDescRecTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLGetDiagFieldTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLGetDiagRecSimpleTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLGetDiagRecTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLGetEnvAttrTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLGetFunctionsTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLGetInfoTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLGetStmtAttrTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLGetTypeInfoTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLMoreResultsTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLNumResultColsTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLParamDataTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLPrepareTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLPutDataTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLRowCountTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLSetConnectAttrTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLSetCursorNameTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLSetDescFieldTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLSetDescRecTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLSetEnvAttrTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLSetStmtAttrTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLTablesTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/SQLTransactTest.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/common.hpp:
  Changed header to GPL version 2 only
ndb/test/odbc/client/main.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/driver/testOdbcDriver.cpp:
  Changed header to GPL version 2 only
ndb/test/odbc/test_compiler/test_compiler.cpp:
  Changed header to GPL version 2 only
ndb/test/run-test/main.cpp:
  Changed header to GPL version 2 only
ndb/test/run-test/run-test.hpp:
  Changed header to GPL version 2 only
ndb/test/src/CpcClient.cpp:
  Changed header to GPL version 2 only
ndb/test/src/HugoAsynchTransactions.cpp:
  Changed header to GPL version 2 only
ndb/test/src/HugoCalculator.cpp:
  Changed header to GPL version 2 only
ndb/test/src/HugoOperations.cpp:
  Changed header to GPL version 2 only
ndb/test/src/HugoTransactions.cpp:
  Changed header to GPL version 2 only
ndb/test/src/NDBT_Error.cpp:
  Changed header to GPL version 2 only
ndb/test/src/NDBT_Output.cpp:
  Changed header to GPL version 2 only
ndb/test/src/NDBT_ResultRow.cpp:
  Changed header to GPL version 2 only
ndb/test/src/NDBT_ReturnCodes.cpp:
  Changed header to GPL version 2 only
ndb/test/src/NDBT_Table.cpp:
  Changed header to GPL version 2 only
ndb/test/src/NDBT_Tables.cpp:
  Changed header to GPL version 2 only
ndb/test/src/NDBT_Test.cpp:
  Changed header to GPL version 2 only
ndb/test/src/NdbBackup.cpp:
  Changed header to GPL version 2 only
ndb/test/src/NdbConfig.cpp:
  Changed header to GPL version 2 only
ndb/test/src/NdbGrep.cpp:
  Changed header to GPL version 2 only
ndb/test/src/NdbRestarter.cpp:
  Changed header to GPL version 2 only
ndb/test/src/NdbRestarts.cpp:
  Changed header to GPL version 2 only
ndb/test/src/NdbSchemaCon.cpp:
  Changed header to GPL version 2 only
ndb/test/src/NdbSchemaOp.cpp:
  Changed header to GPL version 2 only
ndb/test/src/UtilTransactions.cpp:
  Changed header to GPL version 2 only
ndb/test/tools/copy_tab.cpp:
  Changed header to GPL version 2 only
ndb/test/tools/cpcc.cpp:
  Changed header to GPL version 2 only
ndb/test/tools/create_index.cpp:
  Changed header to GPL version 2 only
ndb/test/tools/hugoCalculator.cpp:
  Changed header to GPL version 2 only
ndb/test/tools/hugoFill.cpp:
  Changed header to GPL version 2 only
ndb/test/tools/hugoLoad.cpp:
  Changed header to GPL version 2 only
ndb/test/tools/hugoLockRecords.cpp:
  Changed header to GPL version 2 only
ndb/test/tools/hugoPkDelete.cpp:
  Changed header to GPL version 2 only
ndb/test/tools/hugoPkRead.cpp:
  Changed header to GPL version 2 only
ndb/test/tools/hugoPkReadRecord.cpp:
  Changed header to GPL version 2 only
ndb/test/tools/hugoPkUpdate.cpp:
  Changed header to GPL version 2 only
ndb/test/tools/hugoScanRead.cpp:
  Changed header to GPL version 2 only
ndb/test/tools/hugoScanUpdate.cpp:
  Changed header to GPL version 2 only
ndb/test/tools/old_dirs/waiter/waiter.cpp:
  Changed header to GPL version 2 only
ndb/test/tools/restart.cpp:
  Changed header to GPL version 2 only
ndb/test/tools/transproxy.cpp:
  Changed header to GPL version 2 only
ndb/test/tools/verify_index.cpp:
  Changed header to GPL version 2 only
ndb/tools/delete_all.cpp:
  Changed header to GPL version 2 only
ndb/tools/desc.cpp:
  Changed header to GPL version 2 only
ndb/tools/drop_index.cpp:
  Changed header to GPL version 2 only
ndb/tools/drop_tab.cpp:
  Changed header to GPL version 2 only
ndb/tools/listTables.cpp:
  Changed header to GPL version 2 only
ndb/tools/ndb_config.cpp:
  Changed header to GPL version 2 only
ndb/tools/ndb_test_platform.cpp:
  Changed header to GPL version 2 only
ndb/tools/ndbsql.cpp:
  Changed header to GPL version 2 only
ndb/tools/restore/Restore.cpp:
  Changed header to GPL version 2 only
ndb/tools/restore/Restore.hpp:
  Changed header to GPL version 2 only
ndb/tools/restore/consumer.cpp:
  Changed header to GPL version 2 only
ndb/tools/restore/consumer.hpp:
  Changed header to GPL version 2 only
ndb/tools/restore/consumer_printer.cpp:
  Changed header to GPL version 2 only
ndb/tools/restore/consumer_printer.hpp:
  Changed header to GPL version 2 only
ndb/tools/restore/consumer_restore.cpp:
  Changed header to GPL version 2 only
ndb/tools/restore/consumer_restore.hpp:
  Changed header to GPL version 2 only
ndb/tools/select_all.cpp:
  Changed header to GPL version 2 only
ndb/tools/select_count.cpp:
  Changed header to GPL version 2 only
ndb/tools/waiter.cpp:
  Changed header to GPL version 2 only
ndb/tools/restore/consumer_restorem.cpp:
  Changed header to GPL version 2 only
ndb/tools/restore/restore_main.cpp:
  Changed header to GPL version 2 only
netware/mysql_fix_privilege_tables.pl:
  Changed header to GPL version 2 only
netware/mysql_secure_installation.pl:
  Changed header to GPL version 2 only
os2/Makefile.am:
  Changed header to GPL version 2 only
os2/include/Makefile.am:
  Changed header to GPL version 2 only
os2/include/sys/Makefile.am:
  Changed header to GPL version 2 only
pstack/Makefile.am:
  Changed header to GPL version 2 only
regex/Makefile.am:
  Changed header to GPL version 2 only
scripts/Makefile.am:
  Changed header to GPL version 2 only
scripts/fill_help_tables.sh:
  Changed header to GPL version 2 only
scripts/mysql_config.sh:
  Changed header to GPL version 2 only
scripts/mysql_secure_installation.sh:
  Changed header to GPL version 2 only
server-tools/instance-manager/Makefile.am:
  Changed header to GPL version 2 only
server-tools/instance-manager/buffer.cc:
  Changed header to GPL version 2 only
server-tools/instance-manager/buffer.h:
  Changed header to GPL version 2 only
server-tools/instance-manager/command.cc:
  Changed header to GPL version 2 only
server-tools/instance-manager/command.h:
  Changed header to GPL version 2 only
server-tools/instance-manager/commands.cc:
  Changed header to GPL version 2 only
server-tools/instance-manager/commands.h:
  Changed header to GPL version 2 only
server-tools/instance-manager/guardian.cc:
  Changed header to GPL version 2 only
server-tools/instance-manager/guardian.h:
  Changed header to GPL version 2 only
server-tools/instance-manager/instance.cc:
  Changed header to GPL version 2 only
server-tools/instance-manager/instance.h:
  Changed header to GPL version 2 only
server-tools/instance-manager/instance_map.cc:
  Changed header to GPL version 2 only
server-tools/instance-manager/instance_map.h:
  Changed header to GPL version 2 only
server-tools/instance-manager/instance_options.cc:
  Changed header to GPL version 2 only
server-tools/instance-manager/instance_options.h:
  Changed header to GPL version 2 only
server-tools/instance-manager/listener.cc:
  Changed header to GPL version 2 only
server-tools/instance-manager/listener.h:
  Changed header to GPL version 2 only
server-tools/instance-manager/log.cc:
  Changed header to GPL version 2 only
server-tools/instance-manager/log.h:
  Changed header to GPL version 2 only
server-tools/instance-manager/manager.cc:
  Changed header to GPL version 2 only
server-tools/instance-manager/manager.h:
  Changed header to GPL version 2 only
server-tools/instance-manager/messages.cc:
  Changed header to GPL version 2 only
server-tools/instance-manager/messages.h:
  Changed header to GPL version 2 only
server-tools/instance-manager/mysql_connection.cc:
  Changed header to GPL version 2 only
server-tools/instance-manager/mysql_connection.h:
  Changed header to GPL version 2 only
server-tools/instance-manager/mysql_manager_error.h:
  Changed header to GPL version 2 only
server-tools/instance-manager/mysqlmanager.cc:
  Changed header to GPL version 2 only
server-tools/instance-manager/options.cc:
  Changed header to GPL version 2 only
server-tools/instance-manager/options.h:
  Changed header to GPL version 2 only
server-tools/instance-manager/parse.cc:
  Changed header to GPL version 2 only
server-tools/instance-manager/parse.h:
  Changed header to GPL version 2 only
server-tools/instance-manager/parse_output.cc:
  Changed header to GPL version 2 only
server-tools/instance-manager/parse_output.h:
  Changed header to GPL version 2 only
server-tools/instance-manager/priv.cc:
  Changed header to GPL version 2 only
server-tools/instance-manager/priv.h:
  Changed header to GPL version 2 only
server-tools/instance-manager/protocol.cc:
  Changed header to GPL version 2 only
server-tools/instance-manager/protocol.h:
  Changed header to GPL version 2 only
server-tools/instance-manager/thread_registry.cc:
  Changed header to GPL version 2 only
server-tools/instance-manager/thread_registry.h:
  Changed header to GPL version 2 only
server-tools/instance-manager/user_map.cc:
  Changed header to GPL version 2 only
server-tools/instance-manager/user_map.h:
  Changed header to GPL version 2 only
sql/Makefile.am:
  Changed header to GPL version 2 only
sql/client_settings.h:
  Changed header to GPL version 2 only
sql/custom_conf.h:
  Changed header to GPL version 2 only
sql/derror.cc:
  Changed header to GPL version 2 only
sql/des_key_file.cc:
  Changed header to GPL version 2 only
sql/discover.cc:
  Changed header to GPL version 2 only
sql/field.cc:
  Changed header to GPL version 2 only
sql/field.h:
  Changed header to GPL version 2 only
sql/field_conv.cc:
  Changed header to GPL version 2 only
sql/filesort.cc:
  Changed header to GPL version 2 only
sql/frm_crypt.cc:
  Changed header to GPL version 2 only
sql/gen_lex_hash.cc:
  Changed header to GPL version 2 only
sql/gstream.cc:
  Changed header to GPL version 2 only
sql/gstream.h:
  Changed header to GPL version 2 only
sql/ha_archive.cc:
  Changed header to GPL version 2 only
sql/ha_archive.h:
  Changed header to GPL version 2 only
sql/ha_berkeley.cc:
  Changed header to GPL version 2 only
sql/ha_berkeley.h:
  Changed header to GPL version 2 only
sql/ha_blackhole.cc:
  Changed header to GPL version 2 only
sql/ha_blackhole.h:
  Changed header to GPL version 2 only
sql/ha_federated.cc:
  Changed header to GPL version 2 only
sql/ha_federated.h:
  Changed header to GPL version 2 only
sql/ha_heap.cc:
  Changed header to GPL version 2 only
sql/ha_heap.h:
  Changed header to GPL version 2 only
sql/ha_innodb.cc:
  Changed header to GPL version 2 only
sql/ha_innodb.h:
  Changed header to GPL version 2 only
sql/ha_myisam.cc:
  Changed header to GPL version 2 only
sql/ha_myisam.h:
  Changed header to GPL version 2 only
sql/ha_myisammrg.cc:
  Changed header to GPL version 2 only
sql/ha_myisammrg.h:
  Changed header to GPL version 2 only
sql/ha_ndbcluster.cc:
  Changed header to GPL version 2 only
sql/ha_ndbcluster.h:
  Changed header to GPL version 2 only
sql/handler.cc:
  Changed header to GPL version 2 only
sql/handler.h:
  Changed header to GPL version 2 only
sql/hash_filo.cc:
  Changed header to GPL version 2 only
sql/hash_filo.h:
  Changed header to GPL version 2 only
sql/hostname.cc:
  Changed header to GPL version 2 only
sql/init.cc:
  Changed header to GPL version 2 only
sql/item.cc:
  Changed header to GPL version 2 only
sql/item.h:
  Changed header to GPL version 2 only
sql/item_buff.cc:
  Changed header to GPL version 2 only
sql/item_cmpfunc.cc:
  Changed header to GPL version 2 only
sql/item_cmpfunc.h:
  Changed header to GPL version 2 only
sql/item_create.cc:
  Changed header to GPL version 2 only
sql/item_create.h:
  Changed header to GPL version 2 only
sql/item_func.cc:
  Changed header to GPL version 2 only
sql/item_func.h:
  Changed header to GPL version 2 only
sql/item_geofunc.cc:
  Changed header to GPL version 2 only
sql/item_geofunc.h:
  Changed header to GPL version 2 only
sql/item_row.cc:
  Changed header to GPL version 2 only
sql/item_row.h:
  Changed header to GPL version 2 only
sql/item_strfunc.cc:
  Changed header to GPL version 2 only
sql/item_strfunc.h:
  Changed header to GPL version 2 only
sql/item_subselect.cc:
  Changed header to GPL version 2 only
sql/item_subselect.h:
  Changed header to GPL version 2 only
sql/item_sum.cc:
  Changed header to GPL version 2 only
sql/item_sum.h:
  Changed header to GPL version 2 only
sql/item_timefunc.cc:
  Changed header to GPL version 2 only
sql/item_timefunc.h:
  Changed header to GPL version 2 only
sql/item_uniq.cc:
  Changed header to GPL version 2 only
sql/item_uniq.h:
  Changed header to GPL version 2 only
sql/key.cc:
  Changed header to GPL version 2 only
sql/lex.h:
  Changed header to GPL version 2 only
sql/lex_symbol.h:
  Changed header to GPL version 2 only
sql/lock.cc:
  Changed header to GPL version 2 only
sql/log.cc:
  Changed header to GPL version 2 only
sql/log_event.cc:
  Changed header to GPL version 2 only
sql/log_event.h:
  Changed header to GPL version 2 only
sql/matherr.c:
  Changed header to GPL version 2 only
sql/mf_iocache.cc:
  Changed header to GPL version 2 only
sql/my_decimal.cc:
  Changed header to GPL version 2 only
sql/my_decimal.h:
  Changed header to GPL version 2 only
sql/my_lock.c:
  Changed header to GPL version 2 only
sql/mysql_priv.h:
  Changed header to GPL version 2 only
sql/mysqld.cc:
  Changed header to GPL version 2 only
sql/mysqld_suffix.h:
  Changed header to GPL version 2 only
sql/net_serv.cc:
  Changed header to GPL version 2 only
sql/opt_range.cc:
  Changed header to GPL version 2 only
sql/opt_range.h:
  Changed header to GPL version 2 only
sql/opt_sum.cc:
  Changed header to GPL version 2 only
sql/parse_file.cc:
  Changed header to GPL version 2 only
sql/parse_file.h:
  Changed header to GPL version 2 only
sql/password.c:
  Changed header to GPL version 2 only
sql/procedure.cc:
  Changed header to GPL version 2 only
sql/procedure.h:
  Changed header to GPL version 2 only
sql/protocol.cc:
  Changed header to GPL version 2 only
sql/protocol.h:
  Changed header to GPL version 2 only
sql/records.cc:
  Changed header to GPL version 2 only
sql/repl_failsafe.cc:
  Changed header to GPL version 2 only
sql/repl_failsafe.h:
  Changed header to GPL version 2 only
sql/set_var.cc:
  Changed header to GPL version 2 only
sql/set_var.h:
  Changed header to GPL version 2 only
sql/slave.cc:
  Changed header to GPL version 2 only
sql/slave.h:
  Changed header to GPL version 2 only
sql/sp.cc:
  Changed header to GPL version 2 only
sql/sp.h:
  Changed header to GPL version 2 only
sql/sp_cache.cc:
  Changed header to GPL version 2 only
sql/sp_cache.h:
  Changed header to GPL version 2 only
sql/sp_head.cc:
  Changed header to GPL version 2 only
sql/sp_head.h:
  Changed header to GPL version 2 only
sql/sp_pcontext.cc:
  Changed header to GPL version 2 only
sql/sp_pcontext.h:
  Changed header to GPL version 2 only
sql/sp_rcontext.cc:
  Changed header to GPL version 2 only
sql/sp_rcontext.h:
  Changed header to GPL version 2 only
sql/spatial.cc:
  Changed header to GPL version 2 only
sql/spatial.h:
  Changed header to GPL version 2 only
sql/sql_acl.cc:
  Changed header to GPL version 2 only
sql/sql_acl.h:
  Changed header to GPL version 2 only
sql/sql_analyse.cc:
  Changed header to GPL version 2 only
sql/sql_analyse.h:
  Changed header to GPL version 2 only
sql/sql_array.h:
  Changed header to GPL version 2 only
sql/sql_base.cc:
  Changed header to GPL version 2 only
sql/sql_bitmap.h:
  Changed header to GPL version 2 only
sql/sql_cache.cc:
  Changed header to GPL version 2 only
sql/sql_cache.h:
  Changed header to GPL version 2 only
sql/sql_class.cc:
  Changed header to GPL version 2 only
sql/sql_class.h:
  Changed header to GPL version 2 only
sql/sql_client.cc:
  Changed header to GPL version 2 only
sql/sql_crypt.cc:
  Changed header to GPL version 2 only
sql/sql_crypt.h:
  Changed header to GPL version 2 only
sql/sql_cursor.cc:
  Changed header to GPL version 2 only
sql/sql_cursor.h:
  Changed header to GPL version 2 only
sql/sql_db.cc:
  Changed header to GPL version 2 only
sql/sql_delete.cc:
  Changed header to GPL version 2 only
sql/sql_derived.cc:
  Changed header to GPL version 2 only
sql/sql_do.cc:
  Changed header to GPL version 2 only
sql/sql_error.cc:
  Changed header to GPL version 2 only
sql/sql_error.h:
  Changed header to GPL version 2 only
sql/sql_handler.cc:
  Changed header to GPL version 2 only
sql/sql_help.cc:
  Changed header to GPL version 2 only
sql/sql_insert.cc:
  Changed header to GPL version 2 only
sql/sql_lex.cc:
  Changed header to GPL version 2 only
sql/sql_lex.h:
  Changed header to GPL version 2 only
sql/sql_list.cc:
  Changed header to GPL version 2 only
sql/sql_list.h:
  Changed header to GPL version 2 only
sql/sql_load.cc:
  Changed header to GPL version 2 only
sql/sql_locale.cc:
  Changed header to GPL version 2 only
sql/sql_manager.cc:
  Changed header to GPL version 2 only
sql/sql_manager.h:
  Changed header to GPL version 2 only
sql/sql_map.cc:
  Changed header to GPL version 2 only
sql/sql_map.h:
  Changed header to GPL version 2 only
sql/sql_olap.cc:
  Changed header to GPL version 2 only
sql/sql_parse.cc:
  Changed header to GPL version 2 only
sql/sql_prepare.cc:
  Changed header to GPL version 2 only
sql/sql_rename.cc:
  Changed header to GPL version 2 only
sql/sql_repl.cc:
  Changed header to GPL version 2 only
sql/sql_repl.h:
  Changed header to GPL version 2 only
sql/sql_select.cc:
  Changed header to GPL version 2 only
sql/sql_select.h:
  Changed header to GPL version 2 only
sql/sql_show.cc:
  Changed header to GPL version 2 only
sql/sql_sort.h:
  Changed header to GPL version 2 only
sql/sql_state.c:
  Changed header to GPL version 2 only
sql/sql_string.cc:
  Changed header to GPL version 2 only
sql/sql_string.h:
  Changed header to GPL version 2 only
sql/sql_table.cc:
  Changed header to GPL version 2 only
sql/sql_test.cc:
  Changed header to GPL version 2 only
sql/sql_trigger.cc:
  Changed header to GPL version 2 only
sql/sql_trigger.h:
  Changed header to GPL version 2 only
sql/sql_udf.cc:
  Changed header to GPL version 2 only
sql/sql_udf.h:
  Changed header to GPL version 2 only
sql/sql_union.cc:
  Changed header to GPL version 2 only
sql/sql_update.cc:
  Changed header to GPL version 2 only
sql-bench/Makefile.am:
  Changed header to GPL version 2 only
sql-bench/as3ap.sh:
  Changed header to GPL version 2 only
sql-bench/bench-count-distinct.sh:
  Changed header to GPL version 2 only
sql-bench/bench-init.pl.sh:
  Changed header to GPL version 2 only
sql-bench/compare-results.sh:
  Changed header to GPL version 2 only
sql-bench/copy-db.sh:
  Changed header to GPL version 2 only
sql-bench/crash-me.sh:
  Changed header to GPL version 2 only
sql-bench/print-limit-table:
  Changed header to GPL version 2 only
sql-bench/run-all-tests.sh:
  Changed header to GPL version 2 only
sql/examples/ha_example.cc:
  Changed header to GPL version 2 only
sql/examples/ha_example.h:
  Changed header to GPL version 2 only
sql/examples/ha_tina.cc:
  Changed header to GPL version 2 only
sql/examples/ha_tina.h:
  Changed header to GPL version 2 only
sql/share/Makefile.am:
  Changed header to GPL version 2 only
sql/share/charsets/Index.xml:
  Changed header to GPL version 2 only
sql/share/charsets/armscii8.xml:
  Changed header to GPL version 2 only
sql/share/charsets/ascii.xml:
  Changed header to GPL version 2 only
sql/share/charsets/cp1250.xml:
  Changed header to GPL version 2 only
sql/share/charsets/cp1251.xml:
  Changed header to GPL version 2 only
sql/share/charsets/cp1256.xml:
  Changed header to GPL version 2 only
sql/share/charsets/cp1257.xml:
  Changed header to GPL version 2 only
sql/share/charsets/cp850.xml:
  Changed header to GPL version 2 only
sql/share/charsets/cp852.xml:
  Changed header to GPL version 2 only
sql/share/charsets/cp866.xml:
  Changed header to GPL version 2 only
sql/share/charsets/dec8.xml:
  Changed header to GPL version 2 only
sql/share/charsets/geostd8.xml:
  Changed header to GPL version 2 only
sql/share/charsets/greek.xml:
  Changed header to GPL version 2 only
sql/share/charsets/hebrew.xml:
  Changed header to GPL version 2 only
sql/share/charsets/hp8.xml:
  Changed header to GPL version 2 only
sql/share/charsets/keybcs2.xml:
  Changed header to GPL version 2 only
sql/share/charsets/koi8r.xml:
  Changed header to GPL version 2 only
sql/share/charsets/koi8u.xml:
  Changed header to GPL version 2 only
sql/share/charsets/latin1.xml:
  Changed header to GPL version 2 only
sql/share/charsets/latin2.xml:
  Changed header to GPL version 2 only
sql/share/charsets/latin5.xml:
  Changed header to GPL version 2 only
sql/share/charsets/latin7.xml:
  Changed header to GPL version 2 only
sql/share/charsets/macce.xml:
  Changed header to GPL version 2 only
sql/share/charsets/macroman.xml:
  Changed header to GPL version 2 only
sql/share/charsets/swe7.xml:
  Changed header to GPL version 2 only
sql/sql_view.cc:
  Changed header to GPL version 2 only
sql/sql_view.h:
  Changed header to GPL version 2 only
sql/sql_yacc.yy:
  Changed header to GPL version 2 only
sql/stacktrace.c:
  Changed header to GPL version 2 only
sql/stacktrace.h:
  Changed header to GPL version 2 only
sql/strfunc.cc:
  Changed header to GPL version 2 only
sql/structs.h:
  Changed header to GPL version 2 only
sql/table.cc:
  Changed header to GPL version 2 only
sql/table.h:
  Changed header to GPL version 2 only
sql/thr_malloc.cc:
  Changed header to GPL version 2 only
sql/time.cc:
  Changed header to GPL version 2 only
sql/tzfile.h:
  Changed header to GPL version 2 only
sql/tztime.cc:
  Changed header to GPL version 2 only
sql/tztime.h:
  Changed header to GPL version 2 only
sql/udf_example.c:
  Changed header to GPL version 2 only
sql/uniques.cc:
  Changed header to GPL version 2 only
sql/unireg.cc:
  Changed header to GPL version 2 only
sql/unireg.h:
  Changed header to GPL version 2 only
sql-bench/server-cfg.sh:
  Changed header to GPL version 2 only
sql-bench/test-ATIS.sh:
  Changed header to GPL version 2 only
sql-bench/test-alter-table.sh:
  Changed header to GPL version 2 only
sql-bench/test-big-tables.sh:
  Changed header to GPL version 2 only
sql-bench/test-connect.sh:
  Changed header to GPL version 2 only
sql-bench/test-create.sh:
  Changed header to GPL version 2 only
sql-bench/test-insert.sh:
  Changed header to GPL version 2 only
sql-bench/test-select.sh:
  Changed header to GPL version 2 only
sql-bench/test-transactions.sh:
  Changed header to GPL version 2 only
sql-bench/test-wisconsin.sh:
  Changed header to GPL version 2 only
sql-common/Makefile.am:
  Changed header to GPL version 2 only
sql-common/client.c:
  Changed header to GPL version 2 only
sql-common/my_time.c:
  Changed header to GPL version 2 only
sql-common/my_user.c:
  Changed header to GPL version 2 only
sql-common/pack.c:
  Changed header to GPL version 2 only
strings/Makefile.am:
  Changed header to GPL version 2 only
strings/bchange.c:
  Changed header to GPL version 2 only
strings/bcmp.c:
  Changed header to GPL version 2 only
strings/bcopy-duff.c:
  Changed header to GPL version 2 only
strings/bfill.c:
  Changed header to GPL version 2 only
strings/bmove.c:
  Changed header to GPL version 2 only
strings/bmove512.c:
  Changed header to GPL version 2 only
strings/bmove_upp-sparc.s:
  Changed header to GPL version 2 only
strings/bmove_upp.c:
  Changed header to GPL version 2 only
strings/bzero.c:
  Changed header to GPL version 2 only
strings/conf_to_src.c:
  Changed header to GPL version 2 only
strings/ctype-big5.c:
  Changed header to GPL version 2 only
strings/ctype-bin.c:
  Changed header to GPL version 2 only
strings/ctype-cp932.c:
  Changed header to GPL version 2 only
strings/ctype-czech.c:
  Changed header to GPL version 2 only
strings/ctype-euc_kr.c:
  Changed header to GPL version 2 only
strings/ctype-eucjpms.c:
  Changed header to GPL version 2 only
strings/ctype-gb2312.c:
  Changed header to GPL version 2 only
strings/ctype-gbk.c:
  Changed header to GPL version 2 only
strings/ctype-latin1.c:
  Changed header to GPL version 2 only
strings/ctype-mb.c:
  Changed header to GPL version 2 only
strings/ctype-simple.c:
  Changed header to GPL version 2 only
strings/ctype-sjis.c:
  Changed header to GPL version 2 only
strings/ctype-tis620.c:
  Changed header to GPL version 2 only
strings/ctype-uca.c:
  Changed header to GPL version 2 only
strings/ctype-ucs2.c:
  Changed header to GPL version 2 only
strings/ctype-ujis.c:
  Changed header to GPL version 2 only
strings/ctype-utf8.c:
  Changed header to GPL version 2 only
strings/ctype-win1250ch.c:
  Changed header to GPL version 2 only
strings/ctype.c:
  Changed header to GPL version 2 only
strings/decimal.c:
  Changed header to GPL version 2 only
strings/do_ctype.c:
  Changed header to GPL version 2 only
strings/int2str.c:
  Changed header to GPL version 2 only
strings/is_prefix.c:
  Changed header to GPL version 2 only
strings/llstr.c:
  Changed header to GPL version 2 only
strings/longlong2str-x86.s:
  Changed header to GPL version 2 only
strings/longlong2str.c:
  Changed header to GPL version 2 only
strings/longlong2str_asm.c:
  Changed header to GPL version 2 only
strings/macros.asm:
  Changed header to GPL version 2 only
strings/memcmp.c:
  Changed header to GPL version 2 only
strings/memcpy.c:
  Changed header to GPL version 2 only
strings/memset.c:
  Changed header to GPL version 2 only
strings/my_strtoll10-x86.s:
  Changed header to GPL version 2 only
strings/my_strtoll10.c:
  Changed header to GPL version 2 only
strings/my_vsnprintf.c:
  Changed header to GPL version 2 only
strings/ptr_cmp.asm:
  Changed header to GPL version 2 only
strings/r_strinstr.c:
  Changed header to GPL version 2 only
strings/str2int.c:
  Changed header to GPL version 2 only
strings/str_alloc.c:
  Changed header to GPL version 2 only
strings/str_test.c:
  Changed header to GPL version 2 only
strings/strappend-sparc.s:
  Changed header to GPL version 2 only
strings/strappend.c:
  Changed header to GPL version 2 only
strings/strcat.c:
  Changed header to GPL version 2 only
strings/strcend.c:
  Changed header to GPL version 2 only
strings/strchr.c:
  Changed header to GPL version 2 only
strings/strcmp.c:
  Changed header to GPL version 2 only
strings/strcont.c:
  Changed header to GPL version 2 only
strings/strend-sparc.s:
  Changed header to GPL version 2 only
strings/strend.c:
  Changed header to GPL version 2 only
strings/strfill.c:
  Changed header to GPL version 2 only
strings/strings-not-used.h:
  Changed header to GPL version 2 only
strings/strings-x86.s:
  Changed header to GPL version 2 only
strings/strings.asm:
  Changed header to GPL version 2 only
strings/strinstr-sparc.s:
  Changed header to GPL version 2 only
strings/strinstr.c:
  Changed header to GPL version 2 only
strings/strlen.c:
  Changed header to GPL version 2 only
strings/strmake-sparc.s:
  Changed header to GPL version 2 only
strings/strmake.c:
  Changed header to GPL version 2 only
strings/strmov-sparc.s:
  Changed header to GPL version 2 only
strings/strmov.c:
  Changed header to GPL version 2 only
strings/strnlen.c:
  Changed header to GPL version 2 only
strings/strnmov-sparc.s:
  Changed header to GPL version 2 only
strings/strnmov.c:
  Changed header to GPL version 2 only
strings/strrchr.c:
  Changed header to GPL version 2 only
strings/strstr-sparc.s:
  Changed header to GPL version 2 only
strings/strstr.c:
  Changed header to GPL version 2 only
strings/strto.c:
  Changed header to GPL version 2 only
strings/strtol.c:
  Changed header to GPL version 2 only
strings/strtoll.c:
  Changed header to GPL version 2 only
strings/strtoul.c:
  Changed header to GPL version 2 only
strings/strtoull.c:
  Changed header to GPL version 2 only
strings/strxmov-sparc.s:
  Changed header to GPL version 2 only
strings/strxmov.asm:
  Changed header to GPL version 2 only
strings/strxmov.c:
  Changed header to GPL version 2 only
strings/strxnmov.c:
  Changed header to GPL version 2 only
strings/t_ctype.h:
  Changed header to GPL version 2 only
strings/udiv.c:
  Changed header to GPL version 2 only
strings/xml.c:
  Changed header to GPL version 2 only
support-files/MacOSX/Makefile.am:
  Changed header to GPL version 2 only
support-files/Makefile.am:
  Changed header to GPL version 2 only
support-files/MySQL-shared-compat.spec.sh:
  Changed header to GPL version 2 only
tests/Makefile.am:
  Changed header to GPL version 2 only
tests/connect_test.c:
  Changed header to GPL version 2 only
tests/deadlock_test.c:
  Changed header to GPL version 2 only
tests/insert_test.c:
  Changed header to GPL version 2 only
tests/list_test.c:
  Changed header to GPL version 2 only
tests/mysql_client_test.c:
  Changed header to GPL version 2 only
tests/select_test.c:
  Changed header to GPL version 2 only
tests/showdb_test.c:
  Changed header to GPL version 2 only
tests/ssl_test.c:
  Changed header to GPL version 2 only
tests/thread_test.c:
  Changed header to GPL version 2 only
tools/Makefile.am:
  Changed header to GPL version 2 only
tools/mysqlmanager.c:
  Changed header to GPL version 2 only
vio/Makefile.am:
  Changed header to GPL version 2 only
vio/test-ssl.c:
  Changed header to GPL version 2 only
vio/test-sslclient.c:
  Changed header to GPL version 2 only
vio/test-sslserver.c:
  Changed header to GPL version 2 only
vio/vio.c:
  Changed header to GPL version 2 only
vio/vio_priv.h:
  Changed header to GPL version 2 only
vio/viosocket.c:
  Changed header to GPL version 2 only
vio/viossl.c:
  Changed header to GPL version 2 only
vio/viosslfactories.c:
  Changed header to GPL version 2 only
vio/viotest-ssl.c:
  Changed header to GPL version 2 only
win/Makefile.am:
  Changed header to GPL version 2 only
zlib/Makefile.am:
  Changed header to GPL version 2 only
 2006-12-23 20:17:15 +01:00
unknown
bbb9ba7647 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work


BUILD/check-cpu:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/query_cache_notembedded.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/rpl000017.test:
  change from 5.0 does not apply here anymore
mysql-test/t/rpl_000015.test:
  after-merge fix
 2006-12-20 17:52:59 +01:00
unknown
c4b4bd6982 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work


BUILD/check-cpu:
  Auto merged
 2006-12-20 17:43:45 +01:00
unknown
cdd5a353c4 BUG#20061 build script can not detect my cpu 
BUILD/check-cpu:
  add a handful of Celeroni and automatic fallback to uname if /proc/cpuinfo is there but we don't understand the information in it
 2006-12-20 17:42:44 +01:00
unknown
f00257ddd0 Fixed compiler warnings detected by option -Wshadow and -Wunused: 
- Removed not used variables and functions
- Added #ifdef around code that is not used
- Renamed variables and functions to avoid conflicts
- Removed some not used arguments

Fixed some class/struct warnings in ndb
Added define IS_LONGDATA() to simplify code in libmysql.c

I did run gcov on the changes and added 'purecov' comments on almost all lines that was not just variable name changes


BUILD/SETUP.sh:
  Added printing of unused functions and variables.
  Made it easy to test compiling with -Wshadow
BUILD/compile-pentium-gcov:
  Added warnings
  Mark binary with -gcov
client/mysql.cc:
  Fixed warnings found with gcc -Wshadow
client/mysql_upgrade.c:
  Fixed warnings found with gcc -Wshadow
client/mysqlbinlog.cc:
  Fixed warnings found with gcc -Wshadow
client/mysqldump.c:
  Fixed warnings found with gcc -Wshadow
client/mysqltest.c:
  Fixed warnings found with gcc -Wshadow
client/sql_string.cc:
  Fixed warnings found with gcc -Wshadow
  Merged with sql/sql_string.cc
client/sql_string.h:
  Fixed warnings found with gcc -Wshadow
  Merged with sql/sql_string.h
cmd-line-utils/readline/display.c:
  Fixed compiler warning
cmd-line-utils/readline/histexpand.c:
  Fixed warnings found with gcc -Wshadow
cmd-line-utils/readline/input.c:
  Fixed warnings found with gcc -Wshadow
cmd-line-utils/readline/text.c:
  Fixed warnings found with gcc -Wshadow
cmd-line-utils/readline/vi_mode.c:
  Fixed warnings found with gcc -Wshadow
dbug/dbug_analyze.c:
  Fixed warnings found with gcc -Wshadow
extra/my_print_defaults.c:
  Prefixed defaults_extra_file and defaults_group_suffix with 'my' to avoid conflicts with similar named local variables
extra/yassl/include/buffer.hpp:
  Fixed compiler warnings
extra/yassl/include/crypto_wrapper.hpp:
  Fixed compiler warnings
extra/yassl/include/yassl_imp.hpp:
  Fixed compiler warnings
extra/yassl/include/yassl_int.hpp:
  Fixed compiler warnings
extra/yassl/src/crypto_wrapper.cpp:
  Fixed compiler warnings
extra/yassl/taocrypt/benchmark/benchmark.cpp:
  Fixed warnings found with gcc -Wshadow
extra/yassl/taocrypt/include/algebra.hpp:
  Fixed compiler warnings
extra/yassl/taocrypt/include/des.hpp:
  Fixed compiler warnings
extra/yassl/taocrypt/include/hash.hpp:
  Fixed compiler warnings
extra/yassl/taocrypt/include/hmac.hpp:
  Fixed compiler warnings
extra/yassl/taocrypt/include/modarith.hpp:
  Fixed compiler warnings
extra/yassl/taocrypt/include/modes.hpp:
  Fixed compiler warnings
extra/yassl/taocrypt/include/rsa.hpp:
  Fixed compiler warnings
extra/yassl/taocrypt/mySTL/list.hpp:
  Fixed compiler warnings
extra/yassl/taocrypt/src/aes.cpp:
  Fixed compiler warnings
extra/yassl/taocrypt/src/algebra.cpp:
  Fixed compiler warnings
extra/yassl/taocrypt/src/asn.cpp:
  Fixed compiler warnings
extra/yassl/taocrypt/test/test.cpp:
  Fixed compiler warnings
extra/yassl/testsuite/testsuite.cpp:
  Fixed compiler warnings
include/m_ctype.h:
  Fixed warnings found with gcc -Wshadow
include/my_pthread.h:
  Fixed warnings found with gcc -Wshadow
include/my_sys.h:
  Fixed warnings found with gcc -Wshadow
include/my_time.h:
  Fixed warnings found with gcc -Wshadow
include/mysql.h:
  Fixed warnings found with gcc -Wshadow
  Added define IS_LONGDATA() to simplify code in libmysql.c
libmysql/libmysql.c:
  Fixed warnings found with gcc -Wshadow
  (Mostly replaced bind -> my_bind and time -> my_time)
libmysqld/lib_sql.cc:
  Removed not used variables and labels
myisam/ft_boolean_search.c:
  Fixed warnings found with gcc -Wshadow
myisam/mi_open.c:
  Fixed warnings found with gcc -Wshadow
myisam/mi_search.c:
  Fixed warnings found with gcc -Wshadow
myisam/mi_unique.c:
  Fixed compiler warning
myisam/myisampack.c:
  Fixed warnings found with gcc -Wshadow
myisam/rt_index.c:
  Remove not used variables
myisam/sort.c:
  Fixed warnings found with gcc -Wshadow
mysql-test/r/mysqlcheck.result:
  Remove databases and tables possible left by previous test
mysql-test/r/mysqltest.result:
  New test results
mysql-test/t/mysql.test:
  Coverage tests
mysql-test/t/mysqlbinlog.test:
  Coverage tests
mysql-test/t/mysqlcheck.test:
  Remove databases and tables possible left by previous test
mysql-test/t/mysqltest.test:
  Coverage tests
mysys/default.c:
  Prefixed defaults_file, defaults_group_suffix and defaults_extra_file with 'my' to avoid conflicts with local variables in some functions
mysys/mf_iocache2.c:
  Fixed warnings found with gcc -Wshadow
mysys/mf_keycache.c:
  Fixed warnings found with gcc -Wshadow
mysys/my_bitmap.c:
  Fixed warnings found with gcc -Wshadow
mysys/sha1.c:
  Fixed warnings found with gcc -Wshadow
ndb/include/kernel/signaldata/ArbitSignalData.hpp:
  Fixed compiler warning
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  Fixed compiler warnings
ndb/include/ndbapi/NdbReceiver.hpp:
  Fixed warnings found with gcc -Wshadow
ndb/include/transporter/TransporterDefinitions.hpp:
  Fixed compiler warning
ndb/include/util/InputStream.hpp:
  Fixed compiler warning
ndb/include/util/OutputStream.hpp:
  Fixed compiler warning
ndb/include/util/SimpleProperties.hpp:
  Fixed compiler warning
ndb/include/util/SocketAuthenticator.hpp:
  Fixed compiler warning
ndb/include/util/SocketServer.hpp:
  Fixed compiler warning
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Fixed warnings found with gcc -Wshadow
ndb/src/common/portlib/NdbTick.c:
  Fixed warnings found with gcc -Wshadow
ndb/src/common/transporter/SHM_Transporter.cpp:
  Fixed warnings found with gcc -Wshadow
ndb/src/common/transporter/TCP_Transporter.cpp:
  Fixed warnings found with gcc -Wshadow
ndb/src/common/transporter/TCP_Transporter.hpp:
  Fixed compiler warning
ndb/src/common/transporter/Transporter.cpp:
  Removed not used variable
ndb/src/common/transporter/TransporterRegistry.cpp:
  Removed not used variable
ndb/src/common/util/Bitmask.cpp:
  Moved function to avoid warnings of not used function
ndb/src/common/util/ConfigValues.cpp:
  Fixed warnings found with gcc -Wshadow
ndb/src/common/util/File.cpp:
  Fixed warnings found with gcc -Wshadow
ndb/src/common/util/Properties.cpp:
  Fixed warnings found with gcc -Wshadow
ndb/src/common/util/SocketClient.cpp:
  Fixed wrong return value
ndb/src/common/util/random.c:
  Fixed warnings found with gcc -Wshadow
ndb/src/common/util/socket_io.cpp:
  Fixed warnings found with gcc -Wshadow
ndb/src/cw/cpcd/APIService.cpp:
  Removed not used variable
ndb/src/cw/cpcd/main.cpp:
  Removed not used variables
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Fixed compiler warnings
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Removed not used variables
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Fixed compiler warnings
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Fixed compiler warnings
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Fixed compiler warnings
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Removed not used variables
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Fixed compiler warnings
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Fixed compiler warnings
ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  Removed not used variable
ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp:
  Removed not used variables
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  Removed not used variables
ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp:
  Removed not used variables
ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
  Fixed compiler warnings
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Removed not used variables
ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp:
  Fixed compiler warnings
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Fixed compiler warnings
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Removed not used variables
ndb/src/kernel/blocks/suma/Suma.cpp:
  Removed not used variables
ndb/src/kernel/blocks/suma/Suma.hpp:
  Fixed compiler warnings
ndb/src/kernel/vm/MetaData.hpp:
  Fixed compiler warnings
ndb/src/mgmapi/LocalConfig.cpp:
  Fixed warnings found with gcc -Wshadow
ndb/src/mgmapi/mgmapi.cpp:
  Fixed warnings found with gcc -Wshadow
ndb/src/mgmclient/CommandInterpreter.cpp:
  Removed not used variables
ndb/src/mgmsrv/ConfigInfo.cpp:
  Fixed warnings found with gcc -Wshadow
  Removed not used variables
ndb/src/mgmsrv/ConfigInfo.hpp:
  Fixed warnings found with gcc -Wshadow
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Prefixed defaults_file, defaults_group_suffix and defaults_extra_file with 'my' to avoid conflicts with local variables in some functions
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Removed not used variables and functions
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Fixed compiler warnings
ndb/src/mgmsrv/Services.cpp:
  Removed not used variables and functions
ndb/src/mgmsrv/main.cpp:
  Removed not used variable
ndb/src/ndbapi/ClusterMgr.hpp:
  Fixed compiler warnings
ndb/src/ndbapi/Ndb.cpp:
  Removed not used variables
ndb/src/ndbapi/NdbBlob.cpp:
  Removed not used variables
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Removed not used variables
ndb/src/ndbapi/NdbIndexOperation.cpp:
  Removed not used variables
ndb/src/ndbapi/NdbOperationDefine.cpp:
  Removed not used variables
ndb/src/ndbapi/NdbOperationExec.cpp:
  Removed not used variables
ndb/src/ndbapi/NdbOperationSearch.cpp:
  Removed not used variables
ndb/src/ndbapi/NdbScanFilter.cpp:
  Fixed compiler warning
ndb/src/ndbapi/NdbScanOperation.cpp:
  Removed not used variables
ndb/src/ndbapi/SignalSender.cpp:
  Removed not used variables
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Removed not used variable
ndb/tools/delete_all.cpp:
  Removed not used variable
ndb/tools/desc.cpp:
  Removed not used variable
ndb/tools/drop_index.cpp:
  Removed not used variable
ndb/tools/drop_tab.cpp:
  Removed not used variable
ndb/tools/listTables.cpp:
  Removed not used variable
ndb/tools/ndb_config.cpp:
  Fixed warnings found with gcc -Wshadow
  Added missing puts(desc)
ndb/tools/restore/Restore.hpp:
  Changed delimiter to define instead of static variable, as the static variable caused a LOT of compiler warnings
  Fixed compiler warning
ndb/tools/restore/consumer.hpp:
  Fixed compiler warning
ndb/tools/restore/restore_main.cpp:
  Fixed compiler warnings
ndb/tools/select_all.cpp:
  Removed not used variables
ndb/tools/select_count.cpp:
  Removed not used variable
server-tools/instance-manager/commands.h:
  Fixed compiler warnings
server-tools/instance-manager/guardian.cc:
  Fixed compiler warnings
server-tools/instance-manager/instance_options.cc:
  Removed not used variables
server-tools/instance-manager/mysql_connection.cc:
  Fixed compiler warnings
server-tools/instance-manager/options.cc:
  Fixed compiler warnings
server-tools/instance-manager/options.h:
  Fixed compiler warnings
server-tools/instance-manager/parse.cc:
  Removed not used variable
server-tools/instance-manager/user_map.cc:
  Fixed compiler warnings
server-tools/instance-manager/user_map.h:
  Fixed compiler warnings
sql/field.cc:
  Fixed compiler warnings
sql/field.h:
  Fixed compiler warnings
sql/filesort.cc:
  Fixed compiler warnings
sql/ha_archive.cc:
  Removed table and share arguments from get_share() / free_share() to get rid of compiler warnings
sql/ha_archive.h:
  Removed table and share arguments from get_share() / free_share() to get rid of compiler warnings
sql/ha_federated.cc:
  Fixed compiler warnings
sql/ha_heap.cc:
  Fixed compiler warnings
sql/ha_myisam.cc:
  Fixed compiler warnings
sql/ha_myisammrg.cc:
  Fixed compiler warnings
sql/ha_ndbcluster.cc:
  Fixed compiler warnings
sql/handler.cc:
  Fixed compiler warnings
sql/item.cc:
  Fixed compiler warnings
sql/item.h:
  Fixed compiler warnings
  new_item() -> clone_item(), to avoid a lot of warnings with variable 'new_item'
  el() -> element_index()
sql/item_cmpfunc.cc:
  Fixed compiler warnings
sql/item_cmpfunc.h:
  Fixed compiler warnings
sql/item_func.cc:
  Fixed compiler warnings
sql/item_geofunc.cc:
  Fixed compiler warnings
sql/item_row.h:
  Fixed compiler warnings
sql/item_strfunc.cc:
  Fixed compiler warnings
sql/item_subselect.cc:
  Fixed compiler warnings
sql/item_subselect.h:
  Fixed compiler warnings
sql/item_sum.cc:
  Fixed compiler warnings
sql/item_timefunc.cc:
  Fixed compiler warnings
sql/log.cc:
  Fixed compiler warnings
  More comments
  Added #ifdef HAVE_REPLICATION
sql/log_event.cc:
  Fixed compiler warnings
sql/log_event.h:
  Fixed compiler warnings
sql/mysql_priv.h:
  query_id -> global_query_id, to avoid a lot of clashes with function and class variables
  start_time -> server_start_time
sql/mysqld.cc:
  Fixed compiler warnings:
  - Removed not used variables
  - Added #ifndef EMBEDDED_LIBRARY
  - Fixed shadow warnings
sql/net_serv.cc:
  Fixed compiler warnings
sql/opt_range.cc:
  range -> last_range to avoid shadow warnings
  Removed not used function print_rowid()
sql/opt_range.h:
  range -> last_range to avoid shadow warnings
sql/password.c:
  Fixed compiler warnings
sql/protocol.cc:
  Fixed compiler warnings
sql/repl_failsafe.cc:
  Fixed compiler warnings
sql/set_var.cc:
  Fixed compiler warnings
sql/set_var.h:
  type() -> show_type()
  Fixed compiler warnings
sql/slave.cc:
  Fixed compiler warnings
sql/sp_head.cc:
  Fixed compiler warnings
sql/sp_head.h:
  Fixed compiler warnings
sql/spatial.cc:
  Fixed compiler warnings
sql/spatial.h:
  length() -> geom_length() to avoid compiler warnings
  wkb_end -> wkb_last to avoid compiler warnings with local variables named 'wkb_end'
sql/sql_cache.h:
  Fixed compiler warnings
sql/sql_class.cc:
  Fixed compiler warnings
sql/sql_class.h:
  log -> log_xid() to avoid compiler warnings
  Fixed shadow compiler warnings
sql/sql_derived.cc:
  Removed not used variable
sql/sql_insert.cc:
  Fixed compiler warnings
sql/sql_lex.cc:
  Fixed compiler warnings
sql/sql_lex.h:
  res -> saved_error to make the meaning of the variable clear and avoid shadow warnings
sql/sql_load.cc:
  Fixed compiler warnings
sql/sql_parse.cc:
  Fixed compiler warnings
sql/sql_prepare.cc:
  Fixed compiler warnings
sql/sql_select.cc:
  Fixed compiler warnings
sql/sql_show.cc:
  Fixed compiler warnings
sql/sql_string.cc:
  Fixed compiler warnings
sql/sql_string.h:
  Fixed compiler warnings
sql/sql_table.cc:
  Fixed compiler warnings
sql/sql_trigger.cc:
  Fixed compiler warnings
sql/sql_trigger.h:
  table -> trigger_table to avoid warnings from local variables
sql/sql_union.cc:
  Fixed compiler warnings
  (mainly res -> saved_error)
sql-common/client.c:
  Removed not used variable
sql-common/my_time.c:
  Removed not used variable
  time -> my_time
sql/sql_update.cc:
  Removed not used variable
sql/sql_view.cc:
  Removed not used variable
sql/sql_yacc.yy:
  Removed not used variable
sql/table.cc:
  Removed not used variable
sql/tztime.cc:
  Removed not used variable
sql/unireg.cc:
  Removed not used variable
strings/ctype-bin.c:
  mblen -> mb_len to avoid compiler warnings with local variable mblen
strings/ctype-cp932.c:
  Fixed compiler warnings
strings/ctype-eucjpms.c:
  Fixed compiler warnings
strings/ctype-mb.c:
  mblen -> mb_len to avoid compiler warnings with local variable mblen
strings/ctype-simple.c:
  mblen -> mb_len to avoid compiler warnings with local variable mblen
  exp -> exponent
strings/ctype-sjis.c:
  Fixed compiler warnings
strings/ctype-uca.c:
  mblen -> mb_len to avoid compiler warnings with local variable mblen
strings/ctype-ujis.c:
  Fixed compiler warnings
strings/ctype-utf8.c:
  Fixed compiler warnings
strings/decimal.c:
  Fixed compiler warnings
strings/my_vsnprintf.c:
  Added comment
strings/strtod.c:
  Fixed compiler warnings
tests/mysql_client_test.c:
  Fixed compiler warnings
  (Biggest part of patch is to not get a conflict with global function 'bind')
 2006-12-15 00:51:37 +02:00
unknown
ffd7d6bf37 More fully disable ccache when not compatible with gcov. 
This helps on systems where `which gcc` really points to ccache.


BUILD/compile-pentium-gcov:
  More fully disable ccache when not compatible with gcov.
 2006-11-28 22:31:05 +01:00
unknown
c1477a3f20 Removed compiler warnings 
Ensure that my_size_t is always unsigned (to get predictiable results from system to system)
Removed some %lld, as these are not portable


BUILD/FINISH.sh:
  Remove configure files from storage engines (as some of them may be old versions and may cause conflicts)
client/mysqldump.c:
  Removed compiler warning
client/mysqlslap.c:
  Removed compiler warning
client/mysqltest.c:
  Removed compiler warning
cmd-line-utils/readline/bind.c:
  Removed compiler warning
cmd-line-utils/readline/histfile.c:
  Removed compiler warning
include/my_global.h:
  Ensure that my_size_t is always unsigned (to get predictiable results from system to system)
  Moved my_offset_t here from parse_file.h
sql/event_data_objects.cc:
  Removed compiler warning
sql/event_scheduler.cc:
  Removed compiler warning
sql/field.h:
  Removed compiler warning
sql/ha_ndbcluster_binlog.cc:
  Removed compiler warning
sql/ha_partition.cc:
  Removed compiler warning
sql/item_strfunc.cc:
  Removed compiler warning
sql/log_event.cc:
  Removed compiler warning
sql/mysqld.cc:
  Removed compiler warning
sql/parse_file.h:
  Moved my_offset_t to my_global.h
sql/rpl_utility.cc:
  Removed compiler warning
sql/sql_binlog.cc:
  Removed compiler warning
sql/sql_cache.cc:
  Removed compiler warning
sql/tztime.cc:
  Removed compiler warning
storage/archive/ha_archive.cc:
  Removed compiler warning
  Removed %lld as it's not portable
storage/heap/hp_write.c:
  Removed compiler warning
storage/innobase/os/os0file.c:
  Removed compiler warning
storage/myisam/myisampack.c:
  Removed compiler warning
storage/myisammrg/myrg_rkey.c:
  Removed compiler warning
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
  Use my_offsetof instead of offsetof to get rid of compiler warnings
storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
  Removed compiler warning
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Removed compiler warning
  Note: Someone from NDB team should check this fix!
storage/ndb/src/kernel/vm/Rope.cpp:
  Removed compiler warning
storage/ndb/src/mgmapi/mgmapi.cpp:
  Removed compiler warning
storage/ndb/src/ndbapi/Ndb.cpp:
  Removed compiler warning
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Removed compiler warning
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Removed compiler warning
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Removed compiler warning
storage/ndb/src/ndbapi/Ndblist.cpp:
  Removed compiler warning
 2006-11-27 18:16:08 +02:00
unknown
14decc4fbc Remove compiler warnings 
(Mostly in DBUG_PRINT() and unused arguments)
Fixed bug in query cache when used with traceing (--with-debug)
Fixed memory leak in mysqldump
Removed warnings from mysqltest scripts (replaced -- with #)


BitKeeper/etc/ignore:
  added mysql-test/r/*.warnings
BUILD/SETUP.sh:
  Don't build with BDB as default
client/client_priv.h:
  Added OPT_DEBUG_INFO
client/mysqlbinlog.cc:
  Fixed compiler warning
client/mysqldump.c:
  Removed compiler warnings
  Added option --debug-info to detect memory leaks
  Fixed memory leak
  Don't backup cluster replication tables (if used with 5.1)
cmd-line-utils/readline/bind.c:
  Fixed compiler warning
cmd-line-utils/readline/chardefs.h:
  Fixed compiler warning
cmd-line-utils/readline/complete.c:
  Fixed compiler warning
cmd-line-utils/readline/display.c:
  Fixed compiler warning
cmd-line-utils/readline/histexpand.c:
  Fixed compiler warning
cmd-line-utils/readline/input.c:
  Fixed compiler warning
cmd-line-utils/readline/isearch.c:
  Fixed compiler warning
cmd-line-utils/readline/kill.c:
  Fixed compiler warning
cmd-line-utils/readline/macro.c:
  Fixed compiler warning
cmd-line-utils/readline/misc.c:
  Fixed compiler warning
cmd-line-utils/readline/nls.c:
  Fixed compiler warning
cmd-line-utils/readline/readline.c:
  Fixed compiler warning
cmd-line-utils/readline/rltty.c:
  Fixed compiler warning
cmd-line-utils/readline/search.c:
  Fixed compiler warning
cmd-line-utils/readline/terminal.c:
  Fixed compiler warning
cmd-line-utils/readline/text.c:
  Fixed compiler warning
cmd-line-utils/readline/tilde.c:
  Fixed compiler warning
cmd-line-utils/readline/undo.c:
  Fixed compiler warning
cmd-line-utils/readline/util.c:
  Fixed compiler warning
cmd-line-utils/readline/vi_mode.c:
  Fixed compiler warning
dbug/dbug_analyze.c:
  Fixed compiler warning
extra/yassl/src/ssl.cpp:
  Fixed compiler warning
extra/yassl/testsuite/testsuite.cpp:
  Fixed compiler warning
heap/_check.c:
  Fixed compiler warning
heap/hp_delete.c:
  Fixed compiler warning
heap/hp_hash.c:
  Fixed compiler warning
heap/hp_open.c:
  Fixed compiler warning
heap/hp_rkey.c:
  Fixed compiler warning
heap/hp_rrnd.c:
  Fixed compiler warning
heap/hp_write.c:
  Fixed compiler warning
libmysql/libmysql.c:
  Fixed compiler warning
libmysqld/libmysqld.c:
  Fixed compiler warning
myisam/mi_close.c:
  Fixed compiler warning
myisam/mi_delete.c:
  Fixed compiler warning
myisam/mi_dynrec.c:
  Fixed compiler warning
myisam/mi_keycache.c:
  Fixed compiler warning
myisam/mi_page.c:
  Fixed compiler warning
myisam/mi_statrec.c:
  Fixed compiler warning
myisam/mi_test2.c:
  Fixed compiler warning
myisam/mi_write.c:
  Fixed compiler warning
myisam/myisampack.c:
  Fixed compiler warning
myisammrg/myrg_extra.c:
  Fixed compiler warning
mysql-test/mysql-test-run.pl:
  Remove .reject, .progress, .log and .warnings flag at start
  cluster -> mysql database (for 5.1)
mysql-test/include/federated.inc:
  Remove mysqltest warnings
mysql-test/include/sp-vars.inc:
  Remove mysqltest warnings
mysql-test/mysql-test-run.sh:
  Fix so that 'make test' works again
  Remove .reject, .progress .log and .warnings files at startup
mysql-test/r/ctype_cp1250_ch.result:
  Drop used tables at startup
mysql-test/t/create.test:
  Remove mysqltest warnings
mysql-test/t/csv.test:
  Remove mysqltest warnings
mysql-test/t/ctype_collate.test:
  Remove mysqltest warnings
mysql-test/t/ctype_cp1250_ch.test:
  Drop used tables at startup
mysql-test/t/ctype_ucs.test:
  Remove mysqltest warnings
mysql-test/t/func_sapdb.test:
  Remove mysqltest warnings
mysql-test/t/func_str.test:
  Remove mysqltest warnings
mysql-test/t/grant.test:
  Remove mysqltest warnings
mysql-test/t/greedy_optimizer.test:
  Remove mysqltest warnings
mysql-test/t/group_min_max.test:
  Remove mysqltest warnings
mysql-test/t/innodb.test:
  Remove mysqltest warnings
mysql-test/t/join.test:
  Remove mysqltest warnings
mysql-test/t/limit.test:
  Remove mysqltest warnings
mysql-test/t/null.test:
  Remove mysqltest warnings
mysql-test/t/select.test:
  Remove mysqltest warnings
mysql-test/t/sp-prelocking.test:
  Remove mysqltest warnings
mysql-test/t/strict.test:
  Remove mysqltest warnings
mysql-test/t/subselect.test:
  Remove mysqltest warnings
mysql-test/t/type_newdecimal.test:
  Remove mysqltest warnings
mysql-test/t/view_grant.test:
  Remove mysqltest warnings
mysys/default.c:
  Fixed compiler warning
mysys/hash.c:
  Fixed compiler warning
mysys/list.c:
  Fixed compiler warning
mysys/mf_iocache.c:
  Fixed compiler warning
mysys/mf_keycache.c:
  Fixed compiler warning
mysys/mf_keycaches.c:
  Fixed compiler warning
mysys/my_alloc.c:
  Fixed compiler warning
mysys/my_dup.c:
  Fixed compiler warning
mysys/my_fopen.c:
  Fixed compiler warning
mysys/my_fstream.c:
  Fixed compiler warning
mysys/my_getwd.c:
  Fixed compiler warning
mysys/my_handler.c:
  Fixed compiler warning
  Added missing enums in switch
mysys/my_lib.c:
  Fixed compiler warning
mysys/my_lread.c:
  Fixed compiler warning
mysys/my_lwrite.c:
  Fixed compiler warning
mysys/my_malloc.c:
  Fixed compiler warning
mysys/my_pread.c:
  Fixed compiler warning
mysys/my_read.c:
  Fixed compiler warning
mysys/my_realloc.c:
  Fixed compiler warning
mysys/my_seek.c:
  Fixed compiler warning
mysys/my_write.c:
  Fixed compiler warning
mysys/safemalloc.c:
  Fixed compiler warning
mysys/thr_lock.c:
  Fixed compiler warning
mysys/tree.c:
  Fixed compiler warning
mysys/typelib.c:
  Fixed compiler warning
ndb/include/logger/LogHandler.hpp:
  Changed SetErrorStr() to take const char* to remove compiler warnings (as many arguments to this are const strings)
ndb/include/ndb_global.h.in:
  Added LINT_SET_PTR macro to be able to remove some compiler warnings
ndb/include/util/InputStream.hpp:
  Fixed compiler warning
ndb/include/util/OutputStream.hpp:
  Fixed compiler warning
ndb/include/util/SimpleProperties.hpp:
  Fixed compiler warning
ndb/src/common/debugger/EventLogger.cpp:
  remove if on 'signal' as this is a function pointer and is always true
ndb/src/common/debugger/signaldata/BackupSignalData.cpp:
  Add missing enums
ndb/src/common/logger/LogHandler.cpp:
  Changed SetErrorStr() to take const char* to remove compiler warnings (as many arguments to this are const strings)
ndb/src/common/portlib/NdbMutex.c:
  Fixed compiler warning
ndb/src/common/portlib/NdbThread.c:
  Fixed compiler warning
ndb/src/common/transporter/Transporter.cpp:
  Swapped arguments to remove compiler warnings
ndb/src/cw/cpcd/CPCD.hpp:
  Fixed compiler warning
ndb/src/kernel/blocks/backup/Backup.cpp:
  Fixed compiler warning
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Fixed compiler warning
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Fixed compiler warning
ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp:
  Fixed compiler warning
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Added missing enums
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Fixed compiler warning
ndb/src/kernel/error/ErrorReporter.cpp:
  Fixed compiler warning
ndb/src/kernel/error/ErrorReporter.hpp:
  Fixed compiler warning
ndb/src/kernel/error/ndbd_exit_codes.c:
  Fixed compiler warning
ndb/src/kernel/vm/TransporterCallback.cpp:
  Fixed compiler warning
ndb/src/mgmapi/mgmapi.cpp:
  Fixed compiler warning
ndb/src/mgmclient/CommandInterpreter.cpp:
  Fixed compiler warning
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Fixed compiler warning
ndb/src/mgmsrv/Services.cpp:
  Fixed compiler warning
ndb/src/ndbapi/ClusterMgr.cpp:
  Fixed compiler warning
ndb/src/ndbapi/DictCache.cpp:
  Fixed compiler warning
ndb/src/ndbapi/Ndb.cpp:
  Fixed compiler warning
ndb/src/ndbapi/NdbOperationDefine.cpp:
  Fixed compiler warning
ndb/src/ndbapi/NdbOperationExec.cpp:
  Fixed compiler warning
ndb/src/ndbapi/NdbOperationInt.cpp:
  Fixed compiler warning
ndb/src/ndbapi/NdbOperationSearch.cpp:
  Fixed compiler warning
ndb/src/ndbapi/NdbTransaction.cpp:
  Fixed compiler warning
ndb/src/ndbapi/Ndbif.cpp:
  Fixed compiler warning
ndb/src/ndbapi/Ndbinit.cpp:
  Fixed compiler warning
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Fixed compiler warning
ndb/tools/drop_index.cpp:
  Fixed compiler warning
ndb/tools/drop_tab.cpp:
  Fixed compiler warning
ndb/tools/ndb_config.cpp:
  Fixed compiler warning
regex/regexec.c:
  Fixed compiler warning
server-tools/instance-manager/mysql_connection.cc:
  Fixed compiler warning
sql/Makefile.am:
  Fix for bison 1.875, which adds an attribute statement that gcc 4.1.0 can't parse
sql/filesort.cc:
  Fixed compiler warning
sql/ha_archive.cc:
  Fixed compiler warning
sql/ha_federated.cc:
  Fixed compiler warning
sql/ha_federated.h:
  Fixed compiler warning
sql/ha_innodb.cc:
  Fixed compiler warning
sql/ha_myisam.cc:
  Fixed compiler warning
sql/ha_myisammrg.cc:
  Fixed compiler warning
sql/ha_ndbcluster.cc:
  Fixed compiler warning
sql/handler.cc:
  Fixed compiler warning
sql/item_cmpfunc.cc:
  Fixed compiler warning
sql/item_subselect.cc:
  Fixed compiler warning
sql/item_timefunc.cc:
  Fixed compiler warning
sql/log_event.cc:
  Fixed compiler warning
sql/mysqld.cc:
  Fixed compiler warning
sql/net_serv.cc:
  Fixed compiler warning
sql/opt_range.cc:
  Fixed compiler warning
  Formated DBUG statements to be as rest of code
sql/slave.cc:
  Fixed compiler warning
sql/sql_acl.cc:
  Fixed compiler warning
sql/sql_cache.cc:
  Fixed compiler warning
  Fixed bug in query cache when used with DBUG traceing
sql/sql_class.cc:
  Fixed compiler warning
sql/sql_class.h:
  Fixed compiler warning
sql/sql_delete.cc:
  Fixed compiler warning
sql/sql_parse.cc:
  Fixed compiler warning
  Hack to fix my_sprintf() strings with %b
sql/sql_prepare.cc:
  Fixed compiler warning
  Hack to fix my_sprintf() strings with %b
sql/sql_repl.cc:
  Fixed compiler warning
sql/sql_select.cc:
  Fixed compiler warning
sql/sql_update.cc:
  Fixed compiler warning
sql/sql_view.cc:
  Fixed compiler warning
sql/strfunc.cc:
  Fixed compiler warning
sql-common/client.c:
  Fixed compiler warning
sql-common/my_time.c:
  Fixed compiler warning
sql/table.cc:
  Fixed compiler warning
sql/tztime.cc:
  Fixed compiler warning
sql/unireg.cc:
  Fixed compiler warning
strings/decimal.c:
  Fixed compiler warning
tests/mysql_client_test.c:
  Fixed compiler warning
vio/viosocket.c:
  Fixed compiler warning
vio/viossl.c:
  Fixed compiler warning
vio/viosslfactories.c:
  Fixed compiler warning
 2006-11-20 22:42:06 +02:00
unknown
0b3eee81df Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-lex-string


BUILD/SETUP.sh:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
sql/item_timefunc.cc:
  Manual merge.
sql/mysqld.cc:
  Manual merge.
sql/mysqld.cc.rej:
  manual merge
 2006-11-16 14:38:45 +02:00
unknown
da032b99eb Fix a typo in SETUP.sh 
BUILD/SETUP.sh:
  Fix a typo.
 2006-11-06 11:30:54 +03:00
unknown
990b106b63 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-lex-string


BUILD/SETUP.sh:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/events.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/events.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/sql_parse.cc:
  remove_escape() function removed. Manual merge.
sql/table.cc:
  Manually merged. Old line removed.
tests/mysql_client_test.c:
  Manually merged. test_status position now last.
sql/sql_parse.cc.rej:
  undefined
sql/table.cc.rej:
  undefined
tests/mysql_client_test.c.rej:
  undefined
 2006-10-17 19:54:44 +03:00
unknown
e94087c5dd Changed several char* to LEX_STRING*. 
BUILD/SETUP.sh:
  Added check for CCACHE_DISABLE. If set, do not
  use ccache at all.
BUILD/compile-pentium-gcov:
  Moved CCACHE_DISABLE up before going into SETUP.sh.
  
  Added debug_extra_flags to extra_flags.
mysql-test/r/create.result:
  Added tests for incorrect database names.
mysql-test/r/ctype_create.result:
  Added tests for incorrect alter database names.
mysql-test/r/events.result:
  Added tests for incorrect database names.
mysql-test/r/grant.result:
  Output changed to capital letters.
mysql-test/t/alter_table.test:
  Removed extra empty line
mysql-test/t/create.test:
  Added tests for incorrect database names.
mysql-test/t/ctype_create.test:
  Added tests for incorrect name handling
mysql-test/t/events.test:
  Added tests for incorrect database names.
sql/item_timefunc.cc:
  Added dummy case to avoid compiler warning.
sql/mysql_priv.h:
  Changed argument from char pointer to LEX_STRING pointer.
sql/mysqld.cc:
  Added a missing component from struct.
sql/sql_class.h:
  Added function LEX_STRING_make that sets the string and length.
sql/sql_db.cc:
  Changed several char pointers to lex_strings.
sql/sql_lex.cc:
  name is now LEX_STRING
sql/sql_lex.h:
  Changed name to LEX_STRING.
sql/sql_parse.cc:
  Changed several char pointers to lex_strings.
  
  db_length needed a trick, because in old client protocol there
  was an extra char zero added to the string.
  
  check_db_name() now takes LEX_STRING pointer as an argument.
  
  Changed remove_escape() to take LEX_STRING pointer as an argument.
  
  Removed COM_CREATE_DB and COM_DROP_DB. These are obsolete.
sql/sql_table.cc:
  char* -> LEX_STRING*
sql/sql_yacc.yy:
  Changed char* -> LEX_STRING*
sql/table.cc:
  check_db_name() now takes LEX_STRING* as argument instead of char*.
  
  Optimized code a bit.
tests/mysql_client_test.c:
  Added test for (short) status.
  
  After defining out (ifdef) COM_DROP_DB and COM_CREATE_DB
  in mysqld.cc mysql_client_test needed to be informed that
  failing in recognizing these commands is not fatal error
  anymore.
 2006-10-16 19:57:33 +03:00
unknown
e7a27b6a58 Merge brian@dib.tangent.org:/export/home/brian/mysql/gnu-5.1 
into  zim.(none):/home/brian/mysql/merge-5.1


BUILD/check-cpu:
  merge
 2006-09-13 22:09:05 -07:00
unknown
1f696801d4 This fixes support for building mysql on Solaris with GNU tools. 
BUILD/check-cpu:
  Simple Solaris support
BUILD/compile-solaris-sparc:
  Cleanup of Solars support
BUILD/compile-solaris-sparc-debug:
  Cleanup of solaris support
 2006-09-13 22:09:04 -07:00
unknown
ec2512cf18 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
 2006-09-05 15:05:52 +02:00
unknown
fbf2bc183a Merge maint2.mysql.com:/data/localhome/tsmith/bk/g51 
into  maint2.mysql.com:/data/localhome/tsmith/bk/51


client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
include/config-netware.h:
  Auto merged
include/mysql_com.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/partition.result:
  Auto merged
mysql-test/r/partition_mgm.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/innodb_mysql.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/innobase/btr/btr0btr.c:
  Auto merged
storage/innobase/buf/buf0buf.c:
  Auto merged
storage/innobase/dict/dict0dict.c:
  Auto merged
storage/innobase/fil/fil0fil.c:
  Auto merged
storage/innobase/fsp/fsp0fsp.c:
  Auto merged
storage/innobase/include/btr0cur.ic:
  Auto merged
storage/innobase/include/buf0buf.ic:
  Auto merged
storage/innobase/log/log0log.c:
  Auto merged
storage/innobase/log/log0recv.c:
  Auto merged
storage/innobase/os/os0file.c:
  Auto merged
storage/innobase/row/row0sel.c:
  Auto merged
storage/innobase/srv/srv0start.c:
  Auto merged
storage/innobase/ut/ut0dbg.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
BUILD/check-cpu:
  Manual merge
storage/innobase/row/row0mysql.c:
  Manual merge
 2006-09-04 23:05:17 +02:00
unknown
16de51bc07 Merge moonbone.local:/home/evgen/bk-trees/mysql-5.1-opt 
into  moonbone.local:/work/tmp_merge-5.1-mysql


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/r/view.result:
  SCCS merged
mysql-test/t/view.test:
  SCCS merged
 2006-09-01 14:08:38 +04:00
unknown
2c4a003e9f Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2006-09-01 10:20:35 +02:00
unknown
b128cfa851 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  moonbone.local:/work/tmp_merge-5.1-opt-mysql


sql/ha_innodb.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
 2006-08-31 12:14:27 +04:00
unknown
5373a7ec0a Merge maint2.mysql.com:/data/localhome/tsmith/bk/g50 
into  maint2.mysql.com:/data/localhome/tsmith/bk/50


sql-common/client.c:
  Auto merged
sql/item_func.h:
  Auto merged
BUILD/check-cpu:
  Manual merge
 2006-08-31 00:01:43 +02:00
unknown
6d48c8c703 Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/50 
into  maint2.mysql.com:/data/localhome/tsmith/bk/bfx/51


mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
BUILD/SETUP.sh:
  SCCS merged
BUILD/check-cpu:
  Manual merge.
 2006-08-30 23:20:01 +02:00
unknown
4e16868d88 Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/41 
into  maint2.mysql.com:/data/localhome/tsmith/bk/bfx/50


BUILD/SETUP.sh:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
BUILD/check-cpu:
  Manual merge.
 2006-08-30 23:14:29 +02:00
unknown
71583c893a portability fix in BUILD/* for solaris 2006-08-30 21:24:09 +02:00
unknown
4321eb12fa Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/40 
into  maint2.mysql.com:/data/localhome/tsmith/bk/bfx/41


BUILD/SETUP.sh:
  SCCS merged
 2006-08-30 20:04:33 +02:00
unknown
72341d49ed Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2006-08-30 08:24:45 +02:00
unknown
15ede69561 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
 2006-08-29 22:56:23 +02:00
unknown
f57382196b Merge moonbone.local:/work/tmp_merge-5.0-mysql 
into  moonbone.local:/work/tmp_merge-5.1-opt-mysql


BUILD/check-cpu:
  Auto merged
include/config-netware.h:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/join_outer.result:
  Auto merged
mysql-test/r/ndb_condition_pushdown.result:
  Auto merged
mysql-test/r/range.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/r/user_var.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/range.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
storage/innobase/btr/btr0btr.c:
  Auto merged
storage/innobase/buf/buf0buf.c:
  Auto merged
storage/innobase/dict/dict0dict.c:
  Auto merged
storage/innobase/fil/fil0fil.c:
  Auto merged
storage/innobase/fsp/fsp0fsp.c:
  Auto merged
storage/innobase/include/buf0buf.ic:
  Auto merged
storage/innobase/log/log0log.c:
  Auto merged
storage/innobase/log/log0recv.c:
  Auto merged
storage/innobase/os/os0file.c:
  Auto merged
storage/innobase/row/row0sel.c:
  Auto merged
storage/innobase/srv/srv0start.c:
  Auto merged
storage/innobase/ut/ut0dbg.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
client/mysqltest.c:
  Manual merge
mysql-test/r/innodb_mysql.result:
  Manual merge
mysql-test/t/innodb_mysql.test:
  Manual merge
mysql-test/t/join_outer.test:
  Manual merge
sql/item_cmpfunc.cc:
  Manual merge
sql/mysql_priv.h:
  Manual merge
sql/opt_range.cc:
  Manual merge
sql/sql_base.cc:
  Manual merge
storage/innobase/include/btr0cur.ic:
  Manual merge
storage/innobase/row/row0mysql.c:
  Manual merge
 2006-08-29 18:58:50 +04:00
unknown
06707e20bc minor portability fix in SETUP.sh 2006-08-29 01:13:06 +02:00
unknown
e454fb0c9d Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zim.(none):/home/brian/mysql/arch-5.1


BUILD/compile-alpha-cxx:
  Auto merged
BUILD/compile-alpha-debug:
  Auto merged
BUILD/compile-dist:
  Auto merged
BUILD/compile-ia64-debug-max:
  Auto merged
CMakeLists.txt:
  Auto merged
client/mysql.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
BUILD/FINISH.sh:
  Innodbase config still needed.
 2006-08-25 14:07:30 -07:00
unknown
fb47d6581b This patch removes need for a innodb to have its own configure. 
BitKeeper/deleted/.del-configure.in:
  Delete: storage/innobase/configure.in
BUILD/FINISH.sh:
  Removed work for Innodb's configure
BUILD/autorun.sh:
  Removed pieces for Innodb's build
storage/innobase/Makefile.am:
  Removed ib_config.h needs
storage/innobase/include/Makefile.i:
  Expanded includes.
storage/innobase/include/univ.i:
  Removed ib_config need
storage/innobase/plug.in:
  Added support taken from configure.in for building Innodb
 2006-08-23 13:59:16 -07:00
unknown
239c28be85 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb


sql/sql_show.cc:
  Auto merged
 2006-08-22 10:24:58 +02:00
unknown
2d76647976 Many files: 
Deleted config/ac-macros/ha_berkeley.m4
  Removed more referenses to bdb


BitKeeper/deleted/.del-ha_berkeley.m4:
  Delete: config/ac-macros/ha_berkeley.m4
BUILD/FINISH.sh:
  Removed more referenses to bdb
BUILD/compile-alpha-cxx:
  Removed more referenses to bdb
BUILD/compile-alpha-debug:
  Removed more referenses to bdb
BUILD/compile-dist:
  Removed more referenses to bdb
BUILD/compile-ia64-debug-max:
  Removed more referenses to bdb
CMakeLists.txt:
  Removed more referenses to bdb
Makefile.am:
  Removed more referenses to bdb
libmysqld/lib_sql.cc:
  Removed more referenses to bdb
sql/mysql_priv.h:
  Removed more referenses to bdb
storage/ndb/config/win-prg.am:
  Removed more referenses to bdb
storage/ndb/test/run-test/ndb-autotest.sh:
  Removed more referenses to bdb
support-files/my-huge.cnf.sh:
  Removed more referenses to bdb
support-files/my-large.cnf.sh:
  Removed more referenses to bdb
support-files/my-medium.cnf.sh:
  Removed more referenses to bdb
 2006-08-21 15:34:29 +02:00
unknown
b470b3ab87 Major changes are plug.in files created for almost all storage engines. A few stray BDB references removed. 
storage/blackhole/plug.in:
  BitKeeper file /home/brian/mysql/arch-5.1/storage/blackhole/plug.in
storage/heap/plug.in:
  BitKeeper file /home/brian/mysql/arch-5.1/storage/heap/plug.in
storage/myisam/plug.in:
  BitKeeper file /home/brian/mysql/arch-5.1/storage/myisam/plug.in
storage/myisammrg/plug.in:
  BitKeeper file /home/brian/mysql/arch-5.1/storage/myisammrg/plug.in
storage/federated/ha_federated.h:
  Rename: sql/ha_federated.h -> storage/federated/ha_federated.h
BUILD/FINISH.sh:
  Stray BDB reference
BUILD/autorun.sh:
  Stray bdb reference
BUILD/compile-alpha-cxx:
  Stray bdb reference
BUILD/compile-alpha-debug:
  Stray bdb reference
BUILD/compile-dist:
  Stray BDB Reference
BUILD/compile-ia64-debug-max:
  Stray BDB reference
configure.in:
  All plugin code is now in plug.in files. Few tricky exceptions left.
sql/CMakeLists.txt:
  Removed federated references
sql/Makefile.am:
  Removed federated references
sql/mysql_priv.h:
  stray bdb reference
storage/example/ha_example.cc:
  Enabled all of mysql include
storage/federated/ha_federated.cc:
  Added plugin defs
storage/csv/plug.in:
  New BitKeeper file ``storage/csv/plug.in''
storage/federated/Makefile.am:
  New BitKeeper file ``storage/federated/Makefile.am''
storage/federated/plug.in:
  New BitKeeper file ``storage/federated/plug.in''
storage/innobase/plug.in:
  New BitKeeper file ``storage/innobase/plug.in''
storage/ndb/plug.in:
  New BitKeeper file ``storage/ndb/plug.in''
 2006-08-18 21:19:19 -07:00
unknown
1cf6bc4bfc Merge perch.ndb.mysql.com:/home/jonas/src/51-clean 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


mysql-test/r/ndb_lock.result:
  Auto merged
mysql-test/t/ndb_lock.test:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
mysql-test/t/disabled.def:
  SCCS merged
sql/ha_ndbcluster.cc:
  e
  merge
 2006-08-17 19:49:00 +02:00
unknown
abd3a43b9f Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/mgmapi/ndb_logevent.cpp:
  Auto merged
storage/ndb/test/ndbapi/testIndex.cpp:
  Auto merged
storage/ndb/test/ndbapi/testSystemRestart.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  merge
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  merge
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge
 2006-08-14 14:11:51 +02:00
unknown
4a8c861c05 Fix for check_cpu to work correctly on MacOSX/Intel. 2006-08-10 17:35:21 +03:00
unknown
21bb4f9465 First stage removeal of BDB. 
BitKeeper/deleted/.del-CMakeLists.txt:
  Delete: storage/bdb/CMakeLists.txt
BitKeeper/deleted/.del-LICENSE:
  Delete: storage/bdb/LICENSE
BitKeeper/deleted/.del-Makefile.in:
  Delete: storage/bdb/Makefile.in
BitKeeper/deleted/.del-compile-pentium-debug-no-bdb:
  Delete: BUILD/compile-pentium-debug-no-bdb
BUILD/Makefile.am:
  Remove dropped file
configure.in:
  Remove berkely from configure.
BUILD/compile-dist:
  Remove option to build bdb
BUILD/compile-solaris-sparc-purify:
  Remove option for bdb build
libmysqld/Makefile.am:
  Remove option for bdb build
sql/Makefile.am:
  Remove bdb build
 2006-08-09 17:33:08 -07:00
unknown
f3606fa846 Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-work
 2006-08-02 09:13:43 +02:00
unknown
753651c1db ndb - 
Make possible to build both debug/release from compile-ndb-autotest


BUILD/compile-ndb-autotest:
  Make possible to build both debug/release from compile-ndb-autotest
 2006-08-02 09:08:21 +02:00
unknown
cd80d12035 Merge perch.ndb.mysql.com:/home/jonas/src/41-jonas 
into  perch.ndb.mysql.com:/home/jonas/src/50-work
 2006-08-02 08:28:48 +02:00
unknown
36daa4d971 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1


BitKeeper/etc/ignore:
  auto-union
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
 2006-06-28 20:03:46 +03:00
unknown
e4f4f9dfa5 Added -DHAVE_MUTEX_THREAD_ONLY to fix that bdb doesn't crash with "unable to initialize mutex" 
BitKeeper/etc/ignore:
  added *.gcno
 2006-06-28 17:23:54 +03:00
unknown
35c871434b Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 
into  perch.ndb.mysql.com:/home/jonas/src/41-jonas
 2006-06-28 08:35:09 +02:00
unknown
16f9e5140b Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
 2006-06-21 14:36:50 +02:00
unknown
df67a2a888 Merge perch.ndb.mysql.com:/home/jonas/src/50-jonas 
into  perch.ndb.mysql.com:/home/jonas/src/51-jonas


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
 2006-06-21 09:27:47 +02:00
unknown
f357736b41 Merge perch.ndb.mysql.com:/home/jonas/src/41-jonas 
into  perch.ndb.mysql.com:/home/jonas/src/50-jonas


ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
 2006-06-21 09:22:16 +02:00
unknown
0feec183b2 ndb autotest - 
add BUILD/compile-ndb-autotest to simplify building autotest on different mysql versions


BUILD/compile-ndb-autotest:
  New BitKeeper file ``BUILD/compile-ndb-autotest''
 2006-06-21 09:20:55 +02:00
unknown
a25fc95dd9 Merge 
sql/item_func.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
storage/ndb/Makefile.am:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
BUILD/compile-dist:
  SCCS merged
netware/Makefile.am:
  SCCS merged
netware/BUILD/compile-netware-END:
  SCCS merged
 2006-06-20 11:11:18 +02:00
unknown
81202460be Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new


ndb/Makefile.am:
  Auto merged
 2006-06-17 15:42:24 +02:00
unknown
4d366600b8 Makefile.am: 
Avoid error message trying 'windoze-dsp' in obsolete directory
compile-dist:
  Avoid error message for target 'distclean' and no Makefile


BUILD/compile-dist:
  Avoid error message for target 'distclean' and no Makefile
ndb/Makefile.am:
  Avoid error message trying 'windoze-dsp' in obsolete directory
 2006-06-17 15:37:23 +02:00
unknown
7f19b1cc05 Added --pipe option for faster compile 
Changed error to be more descriptive when you are refering to a not existing key
Fixed core dump in view test and changed to better error message


BUILD/compile-pentium64-debug-max:
  Added --pipe option for faster compile
  (This changset was missing in the tree I used to rebuild a new 5.1 tree)
BUILD/compile-pentium64-debug:
  Added --pipe option for faster compile
  (This changset was missing in the tree I used to rebuild a new 5.1 tree)
mysql-test/include/common-tests.inc:
  Changed error to be more descriptive
mysql-test/r/compress.result:
  Changed error to be more descriptive
mysql-test/r/explain.result:
  Changed error to be more descriptive
mysql-test/r/key_cache.result:
  Changed error to be more descriptive
mysql-test/r/preload.result:
  Changed error to be more descriptive
mysql-test/r/select.result:
  Changed error to be more descriptive
mysql-test/r/ssl.result:
  Changed error to be more descriptive
mysql-test/r/ssl_compress.result:
  Changed error to be more descriptive
mysql-test/r/view.result:
  Changed error to be more descriptive
mysql-test/t/disabled.def:
  Disable im_instance_conf and im_options  until Bug#20294 (Instance manager test im_instance_conf fails randomly) is fixed
mysql-test/t/explain.test:
  Changed error to be more descriptive
mysql-test/t/select.test:
  Changed error to be more descriptive
mysql-test/t/view.test:
  Changed error to be more descriptive
sql/share/errmsg.txt:
  Fix that ER_KEY_DOES_NOT_EXISTS has same SQLSTATE as ER_KEY_COLUMN_DOES_NOT_EXISTS
sql/sql_base.cc:
  Fixed core dump in view test
  Changed to correct error message that also shows the name of the faulty table
BUILD/compile-pentium64:
  New BitKeeper file ``BUILD/compile-pentium64''
 2006-06-06 20:21:36 +03:00
unknown
a3687d58f0 Merge mysql.com:/usr/local/mysql/mysql-5.0-gcov 
into  mysql.com:/usr/local/mysql/mysql-5.1-new
 2006-05-24 09:23:45 +02:00
unknown
bd578562f2 Fix BUILD/compile-pentium-gcov 
BUILD/compile-pentium-gcov:
  Add -max options for gcov, fix yassl and BDB builds, disable ccache which
  is incompatible with gcc profiling output.
 2006-05-22 17:15:49 +02:00
unknown
5b5a5bef92 Change from --wioth-yassl to --with-ssl 2006-05-19 13:20:35 +02:00
unknown
5c5c5e7501 BUG#18818 configure: No longer finds OpenSSL on Mac OS X 
- Implement new switch --with-ssl to configure used for both bundled yaSSL or OpenSSL


BitKeeper/deleted/.del-yassl.m4~e55e55c1e863abaf:
  Delete: config/ac-macros/yassl.m4
BitKeeper/deleted/.del-openssl.m4~41cebd0ba8281769:
  Delete: config/ac-macros/openssl.m4
BUILD/SETUP.sh:
  Use switch --with-ssl to configure
BUILD/compile-pentium-debug-openssl:
  Use switch --with-ssl to configure
BUILD/compile-pentium-debug-yassl:
  Use switch --with-ssl to configure
configure.in:
  Change to use the MYSQL_CHECK_SSL macro from ssl.m4
config/ac-macros/ssl.m4:
  New BitKeeper file ``config/ac-macros/ssl.m4''
 2006-05-17 13:59:37 +02:00
unknown
6e50ee2a99 Fix InnoDB building on MacOSX when autorun.sh is used 
BUILD/autorun.sh:
  Add libtoolize/glibtoolize hook for InnoDB auto-stuff too
 2006-05-09 16:24:57 +03:00
unknown
484e89dfb6 typo fixed 2006-05-08 18:14:39 -04:00
unknown
2cd14794ce innodb also need libtoolize 2006-05-08 18:02:05 -04:00
unknown
7d318ad975 bootstrap is not using BUILD/autorun.sh :( 2006-05-08 17:10:04 -04:00
unknown
f5babf1f46 autorun.sh: 
autotool-ize plugins before the main source tree


BUILD/autorun.sh:
  autotool-ize plugins before the main source tree
 2006-05-08 16:50:29 -04:00
unknown
fa15fbf347 WL#3201 post-review fixups 
end plugin/module naming schizophrenia
  fixup shell code and m4 macro comments
  cmakelists.txt included in EXTRA_DIST


BUILD/SETUP.sh:
  change module -> plugin
config/ac-macros/plugins.m4:
  change module -> plugin
  rename some macros
  fixup comments
  alter shell code to use similar 'test "X$var" = Xfoo"' which autoconf generates
configure.in:
  change module -> plugin
  move plugin mandatory declarations near rest of plugin declaration
storage/archive/Makefile.am:
  cmakelists.txt needed in EXTRA_DIST
storage/blackhole/Makefile.am:
  cmakelists.txt needed in EXTRA_DIST
storage/csv/Makefile.am:
  cmakelists.txt needed in EXTRA_DIST
storage/example/Makefile.am:
  cmakelists.txt needed in EXTRA_DIST
 2006-05-01 21:33:09 -07:00
unknown
1260bc8873 Merge xiphis.org:/home/antony/work2/wl3201.3 
into  xiphis.org:/home/antony/work2/wl3201.merge


BUILD/SETUP.sh:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/partition_info.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/archive/ha_archive.cc:
  Auto merged
storage/archive/ha_archive.h:
  Auto merged
storage/example/ha_example.cc:
  Auto merged
Makefile.am:
  Merge for WL#3201, some post-merge fixes will be required.
configure.in:
  Merge for WL#3201
plugin/Makefile.am:
  Merge for WL#3201
storage/innobase/Makefile.am:
  Merge for WL#3201
 2006-04-24 13:36:15 -07:00
unknown
73a66e27e6 Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826


configure.in:
  Auto merged
dbug/dbug.c:
  Auto merged
include/my_sys.h:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/partition_info.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
BUILD/SETUP.sh:
  manual merge
BUILD/compile-pentium-debug-max:
  manual merge
sql/ha_ndbcluster.cc:
  manual merge
sql/ha_ndbcluster.h:
  manual merge
sql/ha_partition.cc:
  manual merge
sql/ha_partition.h:
  manual merge
sql/handler.h:
  manual merge
sql/share/errmsg.txt:
  manual merge
sql/sql_table.cc:
  manual merge
sql/unireg.cc:
  manual merge
 2006-04-19 21:22:35 -04:00
unknown
83583111ca WL#3201 
" Configure support for server plugins "


storage/blackhole/ha_blackhole.h:
  Rename: sql/ha_blackhole.h -> storage/blackhole/ha_blackhole.h
BitKeeper/deleted/.del-storage.m4~24bf2fffdaa328ad:
  Delete: config/ac-macros/storage.m4
BitKeeper/deleted/.del-ha_archive.m4~a07fac7110b39294:
  Delete: config/ac-macros/ha_archive.m4
BitKeeper/deleted/.del-ha_blackhole.m4~8ed06eb91f6420ed:
  Delete: config/ac-macros/ha_blackhole.m4
BitKeeper/deleted/.del-ha_example.m4~1dfb268163297708:
  Delete: config/ac-macros/ha_example.m4
BitKeeper/deleted/.del-ha_federated.m4~7acddd58286acfd6:
  Delete: config/ac-macros/ha_federated.m4
BitKeeper/deleted/.del-ha_innodb.m4~6f141fb5b80c1f39:
  Delete: config/ac-macros/ha_innodb.m4
BitKeeper/deleted/.del-ha_partition.m4~bc57067550be5f89:
  Delete: config/ac-macros/ha_partition.m4
BitKeeper/deleted/.del-ha_tina.m4~f658506ebbc113ca:
  Delete: config/ac-macros/ha_tina.m4
BitKeeper/deleted/.del-handlerton.cc.in~377156e7b06067cc:
  Delete: sql/handlerton.cc.in
BitKeeper/deleted/.del-handlerton-win.cc~322a7e59507976df:
  Delete: sql/handlerton-win.cc
BUILD/SETUP.sh:
  WL#3201
    Changes in configure arguments
Makefile.am:
  WL#3201
    changes in build subst names
config/ac-macros/ha_berkeley.m4:
  WL#3201
    remove unused variable
    Makefile is always made
config/ac-macros/ha_ndbcluster.m4:
  WL#3201
    remove unused variables
    Split big macro
configure.in:
  WL#3201
    out with storage.m4, in with plugins.m4
    change how plugins are declared
    include makefiles, remove handlerton.cc, add sql_builtin.cc
include/mysql/plugin.h:
  WL#3201
    support static and dynamic build - MYSQL_DYNAMIC_PLUGIN
libmysqld/Makefile.am:
  WL#3201
    Storage engine files still left in sql subdir are not conditionally
    compiled. Should move them out soon,
plugin/Makefile.am:
  WL#3201
    update makefile
plugin/fulltext/Makefile.am:
  WL#3201
    update makefile
plugin/fulltext/plugin_example.c:
  WL#3201
    change to mysql_declare_plugin macro
sql/Makefile.am:
  WL#3201
    Storage engine files still left in sql subdir are not conditionally
    compiled. Should move them out soon,
sql/ha_berkeley.cc:
  WL#3201
    make into a plugin
    conditionally compile content
sql/ha_federated.cc:
  WL#3201
    make into a plugin
    conditionally compile content
sql/ha_heap.cc:
  WL#3201
    make into a plugin
sql/ha_innodb.cc:
  WL#3201
    make into a plugin
    conditionally compile content
sql/ha_myisam.cc:
  WL#3201
    make into a plugin
sql/ha_myisammrg.cc:
  WL#3201
    make into a plugin
sql/ha_ndbcluster.cc:
  WL#3201
    make into a plugin
    conditionally compile content
sql/ha_ndbcluster_binlog.cc:
  WL#3201
    make into a plugin
    conditionally compile content
sql/ha_partition.cc:
  WL#3201
    make into a plugin
    conditionally compile content
sql/handler.cc:
  WL#3201
    Simplify how storage engines are found by db_type
    (hopefully we can get rid of it soon)
    Code cleanup
sql/handler.h:
  WL#3201
    new DB_TYPE_FIRST_DYNAMIC
    new func ha_finalize_handlerton()
    remove ha_register_builtin_plugins()
sql/log.cc:
  WL#3201
    make into a plugin
sql/mysqld.cc:
  WL#3201
    remove ha_register_builtin_plugins()
    alter init order so that storage engines are initialized before first use
sql/partition_info.cc:
  WL#3201
    conditionally compile content
sql/sql_delete.cc:
  WL#3201
    conditionally include ha_innodb.h
sql/sql_plugin.cc:
  WL#3201
    All compiled in plugins are in mysqld_builtins[]
    add funcs for plugin finalization
    install builtin plugins on initialization
sql/sql_show.cc:
  WL#3201
    Fix to use plugin_foreach()
sql/sql_yacc.yy:
  WL#3201
    SHOW FULL PLUGIN
storage/archive/Makefile.am:
  WL#3201
    setup as plugin makefile
storage/archive/ha_archive.cc:
  WL#3201
    Convert into a plugin
storage/archive/ha_archive.h:
  WL#3201
    azlib.h now in local dir
storage/blackhole/ha_blackhole.cc:
  WL#3201
    convert into a plugin
storage/csv/Makefile.am:
  WL#3201
    setup as plugin makefile
storage/csv/ha_tina.cc:
  WL#3201
    remove conditional compilation on MYSQL_PLUGIN
    mysql_declare_plugin macro change
storage/example/Makefile.am:
  WL#3201
    fix as new-style plugin makefile
storage/example/ha_example.cc:
  WL#3201
    remove conditional compilation on MYSQL_PLUGIN
    mysql_declare_plugin macro change
storage/innobase/Makefile.am:
  WL#3201
    Lets make life easier and reduce innodb into a single library file
config/ac-macros/plugins.m4:
  New BitKeeper file ``config/ac-macros/plugins.m4''
sql/sql_builtin.cc.in:
  New BitKeeper file ``sql/sql_builtin.cc.in''
storage/blackhole/Makefile.am:
  New BitKeeper file ``storage/blackhole/Makefile.am''
 2006-04-13 13:49:29 -07:00
unknown
c323e60c46 Merge mysql.com:/home/jimw/my/mysql-5.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-kill-sql-bench


Makefile.am:
  Resolve conflict
configure.in:
  Resolve conflict
 2006-04-13 10:37:57 -07:00
unknown
0544ed4204 Remove sql-bench from the server repository -- it is being maintained 
in a distinct mysql-bench repository. Also add a new --benchdir option
to mysql-test-run.pl so the location of the mysql-bench repository can
be specified. The default location is adjacent to the source tree.


BitKeeper/deleted/.del-Access.crash-me~bb457ec282d939b6:
  Delete: sql-bench/Comments/Access.crash-me
BitKeeper/deleted/.del-Adabas.crash-me~ce88ba1a540971ac:
  Delete: sql-bench/Comments/Adabas.crash-me
BitKeeper/deleted/.del-Empress.crash-me~bdaff0c68ce10f02:
  Delete: sql-bench/Comments/Empress.crash-me
BitKeeper/deleted/.del-FrontBase.benchmark~217041ef18274c2e:
  Delete: sql-bench/Comments/FrontBase.benchmark
BitKeeper/deleted/.del-Informix.crash-me~51ab5b717cefe74:
  Delete: sql-bench/Comments/Informix.crash-me
BitKeeper/deleted/.del-interbase~cdad59622b4d6f3:
  Delete: sql-bench/Comments/interbase
BitKeeper/deleted/.del-mysql.benchmark~4d8729c0937456fc:
  Delete: sql-bench/Comments/mysql.benchmark
BitKeeper/deleted/.del-aircraft.txt~15e4de7ab37c92d3:
  Delete: sql-bench/Data/ATIS/aircraft.txt
BitKeeper/deleted/.del-airline.txt~a79f8eadf853f2c8:
  Delete: sql-bench/Data/ATIS/airline.txt
BitKeeper/deleted/.del-airport.txt~59c78514130e1f45:
  Delete: sql-bench/Data/ATIS/airport.txt
BitKeeper/deleted/.del-airport_service.txt~6ee6d5b852b3e38:
  Delete: sql-bench/Data/ATIS/airport_service.txt
BitKeeper/deleted/.del-city.txt~d96dd6d073344d2e:
  Delete: sql-bench/Data/ATIS/city.txt
BitKeeper/deleted/.del-postgres.benchmark~4d30890732b784a:
  Delete: sql-bench/Comments/postgres.benchmark
BitKeeper/deleted/.del-postgres.crash-me~eacac145c3e30f17:
  Delete: sql-bench/Comments/postgres.crash-me
BitKeeper/deleted/.del-class_of_service.txt~21f6b9848b8c76d:
  Delete: sql-bench/Data/ATIS/class_of_service.txt
BitKeeper/deleted/.del-code_description.txt~f9117373e438b0e2:
  Delete: sql-bench/Data/ATIS/code_description.txt
BitKeeper/deleted/.del-compound_class.txt~d4a2f1b7f96340b9:
  Delete: sql-bench/Data/ATIS/compound_class.txt
BitKeeper/deleted/.del-connect_leg.txt~f97b6e94e108bb36:
  Delete: sql-bench/Data/ATIS/connect_leg.txt
BitKeeper/deleted/.del-date_day.txt~4e9a282fcf54cfd8:
  Delete: sql-bench/Data/ATIS/date_day.txt
BitKeeper/deleted/.del-day_name.txt~f813b215955d894c:
  Delete: sql-bench/Data/ATIS/day_name.txt
BitKeeper/deleted/.del-dual_carrier.txt~a7dd776224fbd92b:
  Delete: sql-bench/Data/ATIS/dual_carrier.txt
BitKeeper/deleted/.del-fare.txt~ea0652f490bc24a6:
  Delete: sql-bench/Data/ATIS/fare.txt
BitKeeper/deleted/.del-fconnection.txt~e0ef6a8b5560a713:
  Delete: sql-bench/Data/ATIS/fconnection.txt
BitKeeper/deleted/.del-flight.txt~e5065423760e99eb:
  Delete: sql-bench/Data/ATIS/flight.txt
BitKeeper/deleted/.del-flight_class.txt~1801101474c29098:
  Delete: sql-bench/Data/ATIS/flight_class.txt
BitKeeper/deleted/.del-flight_day.txt~76868d6d265d441e:
  Delete: sql-bench/Data/ATIS/flight_day.txt
BitKeeper/deleted/.del-flight_fare.txt~d7322593c8530487:
  Delete: sql-bench/Data/ATIS/flight_fare.txt
BitKeeper/deleted/.del-food_service.txt~66d95a150c28458:
  Delete: sql-bench/Data/ATIS/food_service.txt
BitKeeper/deleted/.del-ground_service.txt~1087e477e86e84c:
  Delete: sql-bench/Data/ATIS/ground_service.txt
BitKeeper/deleted/.del-month_name.txt~4c44f7a323d57d92:
  Delete: sql-bench/Data/ATIS/month_name.txt
BitKeeper/deleted/.del-restrict_carrier.txt~925b5492f3f9cba3:
  Delete: sql-bench/Data/ATIS/restrict_carrier.txt
BitKeeper/deleted/.del-restrict_class.txt~2f741bf0ea498f84:
  Delete: sql-bench/Data/ATIS/restrict_class.txt
BitKeeper/deleted/.del-restriction.txt~6ae208924617784a:
  Delete: sql-bench/Data/ATIS/restriction.txt
BitKeeper/deleted/.del-state.txt~9dd470ce14075b90:
  Delete: sql-bench/Data/ATIS/state.txt
BitKeeper/deleted/.del-stop.txt~31fb564e1f415e34:
  Delete: sql-bench/Data/ATIS/stop.txt
BitKeeper/deleted/.del-stop1.txt~f09ba164ad44a288:
  Delete: sql-bench/Data/ATIS/stop1.txt
BitKeeper/deleted/.del-time_interval.txt~a1def62e267a59b2:
  Delete: sql-bench/Data/ATIS/time_interval.txt
BitKeeper/deleted/.del-ATIS-access_odbc-win98-cmp-access,mysql~f3640493299135a:
  Delete: sql-bench/Results-win32/ATIS-access_odbc-win98-cmp-access,mysql
BitKeeper/deleted/.del-ATIS-db2_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~6460fdae8a234607:
  Delete: sql-bench/Results-win32/ATIS-db2_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-ATIS-informix_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~845a0538cc1d2a2a:
  Delete: sql-bench/Results-win32/ATIS-informix_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-onek.data~6cd1edaf596a7f7:
  Delete: sql-bench/Data/Wisconsin/onek.data
BitKeeper/deleted/.del-tenk.data~6aeaebdd534e458e:
  Delete: sql-bench/Data/Wisconsin/tenk.data
BitKeeper/deleted/.del-time_zone.txt~4171f9ca732f65c0:
  Delete: sql-bench/Data/ATIS/time_zone.txt
BitKeeper/deleted/.del-transport.txt~fa4ca40735f8354c:
  Delete: sql-bench/Data/ATIS/transport.txt
BitKeeper/deleted/.del-ATIS-ms-sql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~92849dce40fc3f90:
  Delete: sql-bench/Results-win32/ATIS-ms-sql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-ATIS-mysql-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~d575a91f113311db:
  Delete: sql-bench/Results-win32/ATIS-mysql-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-ATIS-mysql-win98-cmp-access,mysql~e8dda6ccf744e9b5:
  Delete: sql-bench/Results-win32/ATIS-mysql-win98-cmp-access,mysql
BitKeeper/deleted/.del-ATIS-mysql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~29550a64a25f238d:
  Delete: sql-bench/Results-win32/ATIS-mysql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-ATIS-oracle_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~3550d5fb3894052b:
  Delete: sql-bench/Results-win32/ATIS-oracle_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-ATIS-solid_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~77f2d5b7dd1ee1f5:
  Delete: sql-bench/Results-win32/ATIS-solid_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-ATIS-sybase_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~c1ee40e8e006ee8a:
  Delete: sql-bench/Results-win32/ATIS-sybase_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-RUN-access_odbc-win98-cmp-access,mysql~65bb7f664ea75940:
  Delete: sql-bench/Results-win32/RUN-access_odbc-win98-cmp-access,mysql
BitKeeper/deleted/.del-RUN-db2_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~854fc9dfffef9c12:
  Delete: sql-bench/Results-win32/RUN-db2_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-RUN-informix_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~35963ad67156029c:
  Delete: sql-bench/Results-win32/RUN-informix_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-RUN-ms-sql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~c6648f0cc50580b:
  Delete: sql-bench/Results-win32/RUN-ms-sql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-RUN-mysql-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~c6c3cf12f7c94e91:
  Delete: sql-bench/Results-win32/RUN-mysql-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-RUN-mysql-win98-cmp-access,mysql~bee08e42a9db024c:
  Delete: sql-bench/Results-win32/RUN-mysql-win98-cmp-access,mysql
BitKeeper/deleted/.del-RUN-mysql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~5588df8cee1c7f79:
  Delete: sql-bench/Results-win32/RUN-mysql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-RUN-oracle_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~e5adba3eea4b4238:
  Delete: sql-bench/Results-win32/RUN-oracle_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-RUN-solid_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~f9910ea3c3814861:
  Delete: sql-bench/Results-win32/RUN-solid_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-RUN-sybase_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~1ab9437b139d4e01:
  Delete: sql-bench/Results-win32/RUN-sybase_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-alter-table-access_odbc-win98-cmp-access,mysql~d22b47893fb6b878:
  Delete: sql-bench/Results-win32/alter-table-access_odbc-win98-cmp-access,mysql
BitKeeper/deleted/.del-alter-table-db2_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~c093c1852127aa2b:
  Delete: sql-bench/Results-win32/alter-table-db2_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-alter-table-informix_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~ce25b78f2417bb07:
  Delete: sql-bench/Results-win32/alter-table-informix_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-alter-table-ms-sql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~ac0f0aba28d6b570:
  Delete: sql-bench/Results-win32/alter-table-ms-sql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-alter-table-mysql-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~c07d53a5f3aaeae2:
  Delete: sql-bench/Results-win32/alter-table-mysql-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-alter-table-mysql-win98-cmp-access,mysql~aef60113997bdd7f:
  Delete: sql-bench/Results-win32/alter-table-mysql-win98-cmp-access,mysql
BitKeeper/deleted/.del-alter-table-mysql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~9c8a649ed09a166f:
  Delete: sql-bench/Results-win32/alter-table-mysql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-alter-table-oracle_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~e1a4030f1b4b1d80:
  Delete: sql-bench/Results-win32/alter-table-oracle_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-alter-table-solid_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~eaa3cb3093591b71:
  Delete: sql-bench/Results-win32/alter-table-solid_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-alter-table-sybase_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~8649b870cdf3bdbe:
  Delete: sql-bench/Results-win32/alter-table-sybase_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-big-tables-access_odbc-win98-cmp-access,mysql~1c065cababc3ce3a:
  Delete: sql-bench/Results-win32/big-tables-access_odbc-win98-cmp-access,mysql
BitKeeper/deleted/.del-big-tables-db2_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~6d8c394f74cd4f87:
  Delete: sql-bench/Results-win32/big-tables-db2_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-big-tables-informix_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~1fcac6f1bbc11bd5:
  Delete: sql-bench/Results-win32/big-tables-informix_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-big-tables-ms-sql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~fe3de91fb98ac53a:
  Delete: sql-bench/Results-win32/big-tables-ms-sql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-big-tables-mysql-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~e614c4382249eb36:
  Delete: sql-bench/Results-win32/big-tables-mysql-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-big-tables-mysql-win98-cmp-access,mysql~9355ba8a86c60803:
  Delete: sql-bench/Results-win32/big-tables-mysql-win98-cmp-access,mysql
BitKeeper/deleted/.del-big-tables-mysql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~8836803f5814cdb4:
  Delete: sql-bench/Results-win32/big-tables-mysql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-big-tables-oracle_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~a8ca47f8d4938a5:
  Delete: sql-bench/Results-win32/big-tables-oracle_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-big-tables-solid_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~95c17531cd04597:
  Delete: sql-bench/Results-win32/big-tables-solid_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-big-tables-sybase_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~79aa5c4229ac2a54:
  Delete: sql-bench/Results-win32/big-tables-sybase_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-connect-access_odbc-win98-cmp-access,mysql~3fceb657fb175eff:
  Delete: sql-bench/Results-win32/connect-access_odbc-win98-cmp-access,mysql
BitKeeper/deleted/.del-connect-db2_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~7f9c11978e6fbdfe:
  Delete: sql-bench/Results-win32/connect-db2_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-connect-informix_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~94fc13d92e1c3fd:
  Delete: sql-bench/Results-win32/connect-informix_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-connect-ms-sql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~27738719fee99842:
  Delete: sql-bench/Results-win32/connect-ms-sql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-connect-mysql-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~50d3e0ae11bc8885:
  Delete: sql-bench/Results-win32/connect-mysql-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-connect-mysql-win98-cmp-access,mysql~af5ead655cbb4ab:
  Delete: sql-bench/Results-win32/connect-mysql-win98-cmp-access,mysql
BitKeeper/deleted/.del-connect-mysql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~46c24614cbf5761f:
  Delete: sql-bench/Results-win32/connect-mysql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-connect-oracle_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~55c2711c36dfede5:
  Delete: sql-bench/Results-win32/connect-oracle_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-connect-solid_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~b6eafe91e867d39b:
  Delete: sql-bench/Results-win32/connect-solid_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-connect-sybase_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~f0d02f24e3ad10fa:
  Delete: sql-bench/Results-win32/connect-sybase_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-create-access_odbc-win98-cmp-access,mysql~4ef69855662496a8:
  Delete: sql-bench/Results-win32/create-access_odbc-win98-cmp-access,mysql
BitKeeper/deleted/.del-create-db2_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~b33dfc00d34d87ec:
  Delete: sql-bench/Results-win32/create-db2_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-create-informix_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~fe251460d092f0d8:
  Delete: sql-bench/Results-win32/create-informix_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-create-ms-sql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~17b4546c2b66065c:
  Delete: sql-bench/Results-win32/create-ms-sql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-create-mysql-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~5bcbfc4be09ddb06:
  Delete: sql-bench/Results-win32/create-mysql-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-create-mysql-win98-cmp-access,mysql~c12a01f01cf5ba30:
  Delete: sql-bench/Results-win32/create-mysql-win98-cmp-access,mysql
BitKeeper/deleted/.del-create-mysql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~6aa79e1f667bb274:
  Delete: sql-bench/Results-win32/create-mysql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-create-oracle_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~24ce4e6198123d5e:
  Delete: sql-bench/Results-win32/create-oracle_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-create-solid_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~453eb2b4a5b53af9:
  Delete: sql-bench/Results-win32/create-solid_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-create-sybase_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~395b455d9ef7f4:
  Delete: sql-bench/Results-win32/create-sybase_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-insert-access_odbc-win98-cmp-access,mysql~fc9adc049c6adabd:
  Delete: sql-bench/Results-win32/insert-access_odbc-win98-cmp-access,mysql
BitKeeper/deleted/.del-insert-db2_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~d926cccd5a7d062c:
  Delete: sql-bench/Results-win32/insert-db2_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-insert-informix_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~2eca65f5baf638a4:
  Delete: sql-bench/Results-win32/insert-informix_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-insert-ms-sql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~d80aabb5d9bb8a05:
  Delete: sql-bench/Results-win32/insert-ms-sql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-insert-mysql-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~cd7489e3b45870c:
  Delete: sql-bench/Results-win32/insert-mysql-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-insert-mysql-win98-cmp-access,mysql~52ef0ddfd580252:
  Delete: sql-bench/Results-win32/insert-mysql-win98-cmp-access,mysql
BitKeeper/deleted/.del-insert-mysql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~e7d65567662dd9:
  Delete: sql-bench/Results-win32/insert-mysql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-insert-oracle_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~ce5012e433105830:
  Delete: sql-bench/Results-win32/insert-oracle_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-insert-solid_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~a0c13214b06f94e5:
  Delete: sql-bench/Results-win32/insert-solid_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-insert-sybase_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~4d1f539fc4d401b8:
  Delete: sql-bench/Results-win32/insert-sybase_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-select-access_odbc-win98-cmp-access,mysql~de1140d430fbf8ea:
  Delete: sql-bench/Results-win32/select-access_odbc-win98-cmp-access,mysql
BitKeeper/deleted/.del-select-db2_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~837cbd5eb7885009:
  Delete: sql-bench/Results-win32/select-db2_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-select-informix_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~1ed637acc6ced16a:
  Delete: sql-bench/Results-win32/select-informix_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-select-ms-sql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~31a4cd5d9f3fa6da:
  Delete: sql-bench/Results-win32/select-ms-sql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-select-mysql-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~bbaee458e784fb02:
  Delete: sql-bench/Results-win32/select-mysql-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-select-mysql-win98-cmp-access,mysql~65a07b39539f5f81:
  Delete: sql-bench/Results-win32/select-mysql-win98-cmp-access,mysql
BitKeeper/deleted/.del-select-mysql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~251faab981990cd2:
  Delete: sql-bench/Results-win32/select-mysql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-select-oracle_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~524aca6526618e51:
  Delete: sql-bench/Results-win32/select-oracle_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-select-solid_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~f6a1ce829a2cd309:
  Delete: sql-bench/Results-win32/select-solid_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-wisconsin-access_odbc-win98-cmp-access,mysql~adc3a040e9570f10:
  Delete: sql-bench/Results-win32/wisconsin-access_odbc-win98-cmp-access,mysql
BitKeeper/deleted/.del-wisconsin-db2_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~7ffa0dd37d5ccd28:
  Delete: sql-bench/Results-win32/wisconsin-db2_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-wisconsin-informix_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~e022e2b23e2e748c:
  Delete: sql-bench/Results-win32/wisconsin-informix_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-wisconsin-ms-sql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~33e15b4892f20135:
  Delete: sql-bench/Results-win32/wisconsin-ms-sql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-wisconsin-mysql-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~bec8c7f8274a4856:
  Delete: sql-bench/Results-win32/wisconsin-mysql-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-wisconsin-mysql-win98-cmp-access,mysql~2e4512a2a33998c9:
  Delete: sql-bench/Results-win32/wisconsin-mysql-win98-cmp-access,mysql
BitKeeper/deleted/.del-wisconsin-mysql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~48e3985caa8f19d:
  Delete: sql-bench/Results-win32/wisconsin-mysql_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-wisconsin-oracle_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~6d1ca2a1e562a3c9:
  Delete: sql-bench/Results-win32/wisconsin-oracle_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-ATIS-Adabas-Linux_2.0.35_i686-cmp-adabas,mysql~e92bd2a1a4e633:
  Delete: sql-bench/Results/ATIS-Adabas-Linux_2.0.35_i686-cmp-adabas,mysql
BitKeeper/deleted/.del-ATIS-AdabasD-Linux_2.0.35_i686-cmp-adabasd,mysql~442894a5f1918af1:
  Delete: sql-bench/Results/ATIS-AdabasD-Linux_2.0.35_i686-cmp-adabasd,mysql
BitKeeper/deleted/.del-ATIS-frontbase-Linux_2.2.14_my_SMP_i686-cmp-frontbase,mysql~8fe4954bfaca6502:
  Delete: sql-bench/Results/ATIS-frontbase-Linux_2.2.14_my_SMP_i686-cmp-frontbase,mysql
BitKeeper/deleted/.del-ATIS-msql-Linux_2.2.10_i686-cmp-msql,mysql~af10f7cbc54ea3a:
  Delete: sql-bench/Results/ATIS-msql-Linux_2.2.10_i686-cmp-msql,mysql
BitKeeper/deleted/.del-ATIS-mysql-HP_UX_B.10.20_9000_778~99d77d3d153a51c2:
  Delete: sql-bench/Results/ATIS-mysql-HP_UX_B.10.20_9000_778
BitKeeper/deleted/.del-ATIS-mysql-Linux_2.0.35_i686-cmp-adabas,mysql~c63fc2fa7e3d02d1:
  Delete: sql-bench/Results/ATIS-mysql-Linux_2.0.35_i686-cmp-adabas,mysql
BitKeeper/deleted/.del-wisconsin-solid_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase~305f7cfc79aff3be:
  Delete: sql-bench/Results-win32/wisconsin-solid_odbc-NT_4.0-cmp-db2,informix,ms-sql,mysql,oracle,solid,sybase
BitKeeper/deleted/.del-ATIS-mysql-Linux_2.0.36_i686-cmp-mysql,pg,solid~20ec68b7771323d4:
  Delete: sql-bench/Results/ATIS-mysql-Linux_2.0.36_i686-cmp-mysql,pg,solid
BitKeeper/deleted/.del-ATIS-mysql-Linux_2.2.10_i686-cmp-msql,mysql~7c73a8eb856b9408:
  Delete: sql-bench/Results/ATIS-mysql-Linux_2.2.10_i686-cmp-msql,mysql
BitKeeper/deleted/.del-ATIS-mysql-Linux_2.2.16_SMP_alpha~b52cdd166c25d07:
  Delete: sql-bench/Results/ATIS-mysql-Linux_2.2.16_SMP_alpha
BitKeeper/deleted/.del-ATIS-mysql-Linux_2.2.1_i686-cmp-adabas,mysql~1ff82b62cff11171:
  Delete: sql-bench/Results/ATIS-mysql-Linux_2.2.1_i686-cmp-adabas,mysql
BitKeeper/deleted/.del-ATIS-mysql-Linux_2.4.0_64GB_SMP_i686~99be21d010d05671:
  Delete: sql-bench/Results/ATIS-mysql-Linux_2.4.0_64GB_SMP_i686
BitKeeper/deleted/.del-ATIS-mysql-Linux_2.4.16_64GB_SMP_i686~315fbbd917d87b9:
  Delete: sql-bench/Results/ATIS-mysql-Linux_2.4.16_64GB_SMP_i686
BitKeeper/deleted/.del-ATIS-mysql-Linux_2.4.4_SMP_alpha~9fe4132f71f4d40d:
  Delete: sql-bench/Results/ATIS-mysql-Linux_2.4.4_SMP_alpha
BitKeeper/deleted/.del-ATIS-mysql-NT_4.0~a6935fe6b593884f:
  Delete: sql-bench/Results/ATIS-mysql-NT_4.0
BitKeeper/deleted/.del-ATIS-mysql-SunOS_5.5.1_sun4u~dfb4c5f6b6db3b49:
  Delete: sql-bench/Results/ATIS-mysql-SunOS_5.5.1_sun4u
BitKeeper/deleted/.del-ATIS-mysql-SunOS_5.7_sun4m~f5b3b906efab7c92:
  Delete: sql-bench/Results/ATIS-mysql-SunOS_5.7_sun4m
BitKeeper/deleted/.del-ATIS-mysql-SunOS_5.7_sun4u~be0d9789776c5ed7:
  Delete: sql-bench/Results/ATIS-mysql-SunOS_5.7_sun4u
BitKeeper/deleted/.del-ATIS-mysql-SunOS_5.8_sun4u~443e17fb4bd09be8:
  Delete: sql-bench/Results/ATIS-mysql-SunOS_5.8_sun4u
BitKeeper/deleted/.del-ATIS-mysql-win98~3f505a36bd73685:
  Delete: sql-bench/Results/ATIS-mysql-win98
BitKeeper/deleted/.del-ATIS-mysql_fast-Linux_2.2.10_i686-cmp-msql,mysql~5a53d7ace908a675:
  Delete: sql-bench/Results/ATIS-mysql_fast-Linux_2.2.10_i686-cmp-msql,mysql
BitKeeper/deleted/.del-ATIS-mysql_odbc-win98~a59be86edb75da78:
  Delete: sql-bench/Results/ATIS-mysql_odbc-win98
BitKeeper/deleted/.del-ATIS-oracle-Linux_2.0.36_i686-cmp-mysql,oracle~cb97c4da6fe97a93:
  Delete: sql-bench/Results/ATIS-oracle-Linux_2.0.36_i686-cmp-mysql,oracle
BitKeeper/deleted/.del-ATIS-oracle_fast-Linux_2.0.36_i686-cmp-mysql,oracle~2c78defdd05c19fd:
  Delete: sql-bench/Results/ATIS-oracle_fast-Linux_2.0.36_i686-cmp-mysql,oracle
BitKeeper/deleted/.del-ATIS-pg-Linux_2.0.36_i686-cmp-mysql,pg,solid~3d89aca09b912aa4:
  Delete: sql-bench/Results/ATIS-pg-Linux_2.0.36_i686-cmp-mysql,pg,solid
BitKeeper/deleted/.del-ATIS-pg-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg~b030f97867fa4b57:
  Delete: sql-bench/Results/ATIS-pg-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-ATIS-pg_fast-Linux_2.0.36_i686-cmp-mysql,pg,solid~e51a1b8588136948:
  Delete: sql-bench/Results/ATIS-pg_fast-Linux_2.0.36_i686-cmp-mysql,pg,solid
BitKeeper/deleted/.del-ATIS-pg_fast-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg~53500617b9cf40f4:
  Delete: sql-bench/Results/ATIS-pg_fast-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-ATIS-solid-Linux_2.0.36_i686-cmp-mysql,pg,solid~349a54b8d4522f42:
  Delete: sql-bench/Results/ATIS-solid-Linux_2.0.36_i686-cmp-mysql,pg,solid
BitKeeper/deleted/.del-RUN-Adabas-Linux_2.0.35_i686-cmp-adabas,mysql~94902a555b622558:
  Delete: sql-bench/Results/RUN-Adabas-Linux_2.0.35_i686-cmp-adabas,mysql
BitKeeper/deleted/.del-RUN-frontbase-Linux_2.2.14_my_SMP_i686-cmp-frontbase,mysql~d05ed4f74d5a2238:
  Delete: sql-bench/Results/RUN-frontbase-Linux_2.2.14_my_SMP_i686-cmp-frontbase,mysql
BitKeeper/deleted/.del-RUN-msql-Linux_2.2.10_i686-cmp-msql,mysql~62e1375dfc4b360:
  Delete: sql-bench/Results/RUN-msql-Linux_2.2.10_i686-cmp-msql,mysql
BitKeeper/deleted/.del-RUN-mysql-HP_UX_B.10.20_9000_778~a3472aecd32a4729:
  Delete: sql-bench/Results/RUN-mysql-HP_UX_B.10.20_9000_778
BitKeeper/deleted/.del-RUN-mysql-Linux_2.0.35_i686-cmp-adabas,mysql~35b46ebbfdcb9c93:
  Delete: sql-bench/Results/RUN-mysql-Linux_2.0.35_i686-cmp-adabas,mysql
BitKeeper/deleted/.del-RUN-mysql-Linux_2.0.36_i686-cmp-mysql,pg,solid~b07630f1b74e4d98:
  Delete: sql-bench/Results/RUN-mysql-Linux_2.0.36_i686-cmp-mysql,pg,solid
BitKeeper/deleted/.del-RUN-mysql-Linux_2.2.10_i686-cmp-msql,mysql~8ef9e5442d6984be:
  Delete: sql-bench/Results/RUN-mysql-Linux_2.2.10_i686-cmp-msql,mysql
BitKeeper/deleted/.del-RUN-mysql-Linux_2.2.16_SMP_alpha~70cdf49ef31bf150:
  Delete: sql-bench/Results/RUN-mysql-Linux_2.2.16_SMP_alpha
BitKeeper/deleted/.del-RUN-mysql-Linux_2.2.1_i686-cmp-adabas,mysql~11e47194a9a44732:
  Delete: sql-bench/Results/RUN-mysql-Linux_2.2.1_i686-cmp-adabas,mysql
BitKeeper/deleted/.del-RUN-mysql-Linux_2.4.0_64GB_SMP_i686~59c650992b3b5439:
  Delete: sql-bench/Results/RUN-mysql-Linux_2.4.0_64GB_SMP_i686
BitKeeper/deleted/.del-RUN-mysql-Linux_2.4.16_64GB_SMP_i686~a326ae0a947e8907:
  Delete: sql-bench/Results/RUN-mysql-Linux_2.4.16_64GB_SMP_i686
BitKeeper/deleted/.del-RUN-mysql-Linux_2.4.4_SMP_alpha~3003859ba3f32620:
  Delete: sql-bench/Results/RUN-mysql-Linux_2.4.4_SMP_alpha
BitKeeper/deleted/.del-RUN-mysql-NT_4.0~b37cb36e88ef4ed1:
  Delete: sql-bench/Results/RUN-mysql-NT_4.0
BitKeeper/deleted/.del-RUN-mysql-SunOS_5.5.1_sun4u~afbba182428e20df:
  Delete: sql-bench/Results/RUN-mysql-SunOS_5.5.1_sun4u
BitKeeper/deleted/.del-RUN-mysql-SunOS_5.7_sun4m~fddf3d3742a299b:
  Delete: sql-bench/Results/RUN-mysql-SunOS_5.7_sun4m
BitKeeper/deleted/.del-RUN-mysql-SunOS_5.7_sun4u~86e1dc0e25a8b8f:
  Delete: sql-bench/Results/RUN-mysql-SunOS_5.7_sun4u
BitKeeper/deleted/.del-RUN-mysql-SunOS_5.8_sun4u~392b6a62a417b6ae:
  Delete: sql-bench/Results/RUN-mysql-SunOS_5.8_sun4u
BitKeeper/deleted/.del-RUN-mysql-win98~ed3fe1907dedf8e1:
  Delete: sql-bench/Results/RUN-mysql-win98
BitKeeper/deleted/.del-RUN-mysql_fast-Linux_2.2.10_i686-cmp-msql,mysql~ec77ef2a21cd2f91:
  Delete: sql-bench/Results/RUN-mysql_fast-Linux_2.2.10_i686-cmp-msql,mysql
BitKeeper/deleted/.del-RUN-mysql_odbc-win98~8ebc5d1b267bafb2:
  Delete: sql-bench/Results/RUN-mysql_odbc-win98
BitKeeper/deleted/.del-RUN-oracle-Linux_2.0.36_i686-cmp-mysql,oracle~6029da5a90dd60ab:
  Delete: sql-bench/Results/RUN-oracle-Linux_2.0.36_i686-cmp-mysql,oracle
BitKeeper/deleted/.del-RUN-oracle_fast-Linux_2.0.36_i686-cmp-mysql,oracle~2d89df0c87ff371f:
  Delete: sql-bench/Results/RUN-oracle_fast-Linux_2.0.36_i686-cmp-mysql,oracle
BitKeeper/deleted/.del-RUN-pg-Linux_2.0.36_i686-cmp-mysql,pg,solid~efed8b4e2d954513:
  Delete: sql-bench/Results/RUN-pg-Linux_2.0.36_i686-cmp-mysql,pg,solid
BitKeeper/deleted/.del-RUN-pg-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg~1be8875a68b6b037:
  Delete: sql-bench/Results/RUN-pg-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-RUN-pg_fast-Linux_2.0.36_i686-cmp-mysql,pg,solid~600d532546f2b572:
  Delete: sql-bench/Results/RUN-pg_fast-Linux_2.0.36_i686-cmp-mysql,pg,solid
BitKeeper/deleted/.del-RUN-pg_fast-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg~2ac3d3d136e516bf:
  Delete: sql-bench/Results/RUN-pg_fast-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-RUN-solid-Linux_2.0.36_i686-cmp-mysql,pg,solid~4ee71323c2139220:
  Delete: sql-bench/Results/RUN-solid-Linux_2.0.36_i686-cmp-mysql,pg,solid
BitKeeper/deleted/.del-alter-table-Adabas-Linux_2.0.35_i686-cmp-adabas,mysql~5290aabd82aa68e3:
  Delete: sql-bench/Results/alter-table-Adabas-Linux_2.0.35_i686-cmp-adabas,mysql
BitKeeper/deleted/.del-alter-table-AdabasD-Linux_2.0.35_i686-cmp-adabasd,mysql~874002116923758f:
  Delete: sql-bench/Results/alter-table-AdabasD-Linux_2.0.35_i686-cmp-adabasd,mysql
BitKeeper/deleted/.del-alter-table-frontbase-Linux_2.2.14_my_SMP_i686-cmp-frontbase,mysql~c2153d9b70bc72e:
  Delete: sql-bench/Results/alter-table-frontbase-Linux_2.2.14_my_SMP_i686-cmp-frontbase,mysql
BitKeeper/deleted/.del-alter-table-msql-Linux_2.2.10_i686-cmp-msql,mysql~ccc2918e3e87de90:
  Delete: sql-bench/Results/alter-table-msql-Linux_2.2.10_i686-cmp-msql,mysql
BitKeeper/deleted/.del-alter-table-mysql-HP_UX_B.10.20_9000_778~81c128f3fe000f9:
  Delete: sql-bench/Results/alter-table-mysql-HP_UX_B.10.20_9000_778
BitKeeper/deleted/.del-alter-table-mysql-Linux_2.0.35_i686-cmp-adabas,mysql~fa0239597119372b:
  Delete: sql-bench/Results/alter-table-mysql-Linux_2.0.35_i686-cmp-adabas,mysql
BitKeeper/deleted/.del-alter-table-mysql-Linux_2.0.36_i686-cmp-mysql,pg,solid~51ae1cd2edebbe7d:
  Delete: sql-bench/Results/alter-table-mysql-Linux_2.0.36_i686-cmp-mysql,pg,solid
BitKeeper/deleted/.del-alter-table-mysql-Linux_2.2.10_i686-cmp-msql,mysql~6f7cd759ed489bd7:
  Delete: sql-bench/Results/alter-table-mysql-Linux_2.2.10_i686-cmp-msql,mysql
BitKeeper/deleted/.del-alter-table-mysql-Linux_2.2.16_SMP_alpha~7cc192b0834a4038:
  Delete: sql-bench/Results/alter-table-mysql-Linux_2.2.16_SMP_alpha
BitKeeper/deleted/.del-alter-table-mysql-Linux_2.2.1_i686-cmp-adabas,mysql~511826ed45ffe8f9:
  Delete: sql-bench/Results/alter-table-mysql-Linux_2.2.1_i686-cmp-adabas,mysql
BitKeeper/deleted/.del-alter-table-mysql-Linux_2.4.0_64GB_SMP_i686~a37794066069af64:
  Delete: sql-bench/Results/alter-table-mysql-Linux_2.4.0_64GB_SMP_i686
BitKeeper/deleted/.del-alter-table-mysql-Linux_2.4.16_64GB_SMP_i686~64c3d83a5a4ae98f:
  Delete: sql-bench/Results/alter-table-mysql-Linux_2.4.16_64GB_SMP_i686
BitKeeper/deleted/.del-alter-table-mysql-Linux_2.4.4_SMP_alpha~5255af9a5ab466ae:
  Delete: sql-bench/Results/alter-table-mysql-Linux_2.4.4_SMP_alpha
BitKeeper/deleted/.del-alter-table-mysql-NT_4.0~5d3ab68c4994128b:
  Delete: sql-bench/Results/alter-table-mysql-NT_4.0
BitKeeper/deleted/.del-alter-table-mysql-SunOS_5.5.1_sun4u~9d7e75667fcb29ec:
  Delete: sql-bench/Results/alter-table-mysql-SunOS_5.5.1_sun4u
BitKeeper/deleted/.del-alter-table-mysql-SunOS_5.7_sun4m~2e33be7cc2979840:
  Delete: sql-bench/Results/alter-table-mysql-SunOS_5.7_sun4m
BitKeeper/deleted/.del-alter-table-mysql-SunOS_5.7_sun4u~ce74c2f623d3bb3:
  Delete: sql-bench/Results/alter-table-mysql-SunOS_5.7_sun4u
BitKeeper/deleted/.del-alter-table-mysql-SunOS_5.8_sun4u~acec523136e781ca:
  Delete: sql-bench/Results/alter-table-mysql-SunOS_5.8_sun4u
BitKeeper/deleted/.del-alter-table-mysql-win98~ab9684a2b429211e:
  Delete: sql-bench/Results/alter-table-mysql-win98
BitKeeper/deleted/.del-alter-table-mysql_fast-Linux_2.2.10_i686-cmp-msql,mysql~538627661a199cff:
  Delete: sql-bench/Results/alter-table-mysql_fast-Linux_2.2.10_i686-cmp-msql,mysql
BitKeeper/deleted/.del-alter-table-mysql_odbc-win98~dda4d95beacdda97:
  Delete: sql-bench/Results/alter-table-mysql_odbc-win98
BitKeeper/deleted/.del-alter-table-oracle-Linux_2.0.36_i686-cmp-mysql,oracle~c29737148bd279bb:
  Delete: sql-bench/Results/alter-table-oracle-Linux_2.0.36_i686-cmp-mysql,oracle
BitKeeper/deleted/.del-alter-table-oracle_fast-Linux_2.0.36_i686-cmp-mysql,oracle~301fafaab11ba656:
  Delete: sql-bench/Results/alter-table-oracle_fast-Linux_2.0.36_i686-cmp-mysql,oracle
BitKeeper/deleted/.del-alter-table-pg-Linux_2.0.36_i686-cmp-mysql,pg,solid~bde11ba48bf8478b:
  Delete: sql-bench/Results/alter-table-pg-Linux_2.0.36_i686-cmp-mysql,pg,solid
BitKeeper/deleted/.del-alter-table-pg-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg~c38836e848368fda:
  Delete: sql-bench/Results/alter-table-pg-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-alter-table-pg_fast-Linux_2.0.36_i686-cmp-mysql,pg,solid~a8299da49808998c:
  Delete: sql-bench/Results/alter-table-pg_fast-Linux_2.0.36_i686-cmp-mysql,pg,solid
BitKeeper/deleted/.del-alter-table-pg_fast-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg~f6f633dab6c20ba4:
  Delete: sql-bench/Results/alter-table-pg_fast-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-alter-table-solid-Linux_2.0.36_i686-cmp-mysql,pg,solid~3b53b31dd0c8fee5:
  Delete: sql-bench/Results/alter-table-solid-Linux_2.0.36_i686-cmp-mysql,pg,solid
BitKeeper/deleted/.del-big-tables-Adabas-Linux_2.0.35_i686-cmp-adabas,mysql~6840935a2089b3de:
  Delete: sql-bench/Results/big-tables-Adabas-Linux_2.0.35_i686-cmp-adabas,mysql
BitKeeper/deleted/.del-big-tables-frontbase-Linux_2.2.14_my_SMP_i686-cmp-frontbase,mysql~22d5cdb6dbdd59da:
  Delete: sql-bench/Results/big-tables-frontbase-Linux_2.2.14_my_SMP_i686-cmp-frontbase,mysql
BitKeeper/deleted/.del-big-tables-msql-Linux_2.2.10_i686-cmp-msql,mysql~a9c5dd96855d55c:
  Delete: sql-bench/Results/big-tables-msql-Linux_2.2.10_i686-cmp-msql,mysql
BitKeeper/deleted/.del-big-tables-mysql-HP_UX_B.10.20_9000_778~ca173309375a3dac:
  Delete: sql-bench/Results/big-tables-mysql-HP_UX_B.10.20_9000_778
BitKeeper/deleted/.del-big-tables-mysql-Linux_2.0.35_i686-cmp-adabas,mysql~ab3cc8438d8e7370:
  Delete: sql-bench/Results/big-tables-mysql-Linux_2.0.35_i686-cmp-adabas,mysql
BitKeeper/deleted/.del-big-tables-mysql-Linux_2.0.36_i686-cmp-mysql,pg,solid~cb8a32316137cf8d:
  Delete: sql-bench/Results/big-tables-mysql-Linux_2.0.36_i686-cmp-mysql,pg,solid
BitKeeper/deleted/.del-big-tables-mysql-Linux_2.2.10_i686-cmp-msql,mysql~fbb71f81fc0f0a8:
  Delete: sql-bench/Results/big-tables-mysql-Linux_2.2.10_i686-cmp-msql,mysql
BitKeeper/deleted/.del-big-tables-mysql-Linux_2.2.16_SMP_alpha~2ee81c9b26bab375:
  Delete: sql-bench/Results/big-tables-mysql-Linux_2.2.16_SMP_alpha
BitKeeper/deleted/.del-big-tables-mysql-Linux_2.2.1_i686-cmp-adabas,mysql~b8f1289f69f8053e:
  Delete: sql-bench/Results/big-tables-mysql-Linux_2.2.1_i686-cmp-adabas,mysql
BitKeeper/deleted/.del-big-tables-mysql-Linux_2.4.0_64GB_SMP_i686~af848bbe536498e3:
  Delete: sql-bench/Results/big-tables-mysql-Linux_2.4.0_64GB_SMP_i686
BitKeeper/deleted/.del-big-tables-mysql-Linux_2.4.16_64GB_SMP_i686~568eabe7958599fe:
  Delete: sql-bench/Results/big-tables-mysql-Linux_2.4.16_64GB_SMP_i686
BitKeeper/deleted/.del-big-tables-mysql-Linux_2.4.4_SMP_alpha~c37784c19f9492d9:
  Delete: sql-bench/Results/big-tables-mysql-Linux_2.4.4_SMP_alpha
BitKeeper/deleted/.del-big-tables-mysql-NT_4.0~b2a29b0b3838e2c0:
  Delete: sql-bench/Results/big-tables-mysql-NT_4.0
BitKeeper/deleted/.del-big-tables-mysql-SunOS_5.5.1_sun4u~7d7b6c0bf58b9b79:
  Delete: sql-bench/Results/big-tables-mysql-SunOS_5.5.1_sun4u
BitKeeper/deleted/.del-big-tables-mysql-SunOS_5.7_sun4m~2487c35a8fb6c2c7:
  Delete: sql-bench/Results/big-tables-mysql-SunOS_5.7_sun4m
BitKeeper/deleted/.del-big-tables-mysql-SunOS_5.7_sun4u~ebc379b231312bbe:
  Delete: sql-bench/Results/big-tables-mysql-SunOS_5.7_sun4u
BitKeeper/deleted/.del-big-tables-mysql-SunOS_5.8_sun4u~ed47e6abb618412b:
  Delete: sql-bench/Results/big-tables-mysql-SunOS_5.8_sun4u
BitKeeper/deleted/.del-big-tables-mysql-win98~cf6133ef1eabab0:
  Delete: sql-bench/Results/big-tables-mysql-win98
BitKeeper/deleted/.del-big-tables-mysql_fast-Linux_2.2.10_i686-cmp-msql,mysql~db491cf46385914d:
  Delete: sql-bench/Results/big-tables-mysql_fast-Linux_2.2.10_i686-cmp-msql,mysql
BitKeeper/deleted/.del-big-tables-mysql_odbc-win98~21acff849389336f:
  Delete: sql-bench/Results/big-tables-mysql_odbc-win98
BitKeeper/deleted/.del-big-tables-oracle-Linux_2.0.36_i686-cmp-mysql,oracle~9c838829d0ea5ced:
  Delete: sql-bench/Results/big-tables-oracle-Linux_2.0.36_i686-cmp-mysql,oracle
BitKeeper/deleted/.del-big-tables-oracle_fast-Linux_2.0.36_i686-cmp-mysql,oracle~29e603e8899269b2:
  Delete: sql-bench/Results/big-tables-oracle_fast-Linux_2.0.36_i686-cmp-mysql,oracle
BitKeeper/deleted/.del-big-tables-pg-Linux_2.0.36_i686-cmp-mysql,pg,solid~5c8d37e194a54236:
  Delete: sql-bench/Results/big-tables-pg-Linux_2.0.36_i686-cmp-mysql,pg,solid
BitKeeper/deleted/.del-big-tables-pg-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg~5cf62715e9715066:
  Delete: sql-bench/Results/big-tables-pg-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-big-tables-pg_fast-Linux_2.0.36_i686-cmp-mysql,pg,solid~6170bade4e184d8:
  Delete: sql-bench/Results/big-tables-pg_fast-Linux_2.0.36_i686-cmp-mysql,pg,solid
BitKeeper/deleted/.del-big-tables-pg_fast-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg~126a0afb2c471bfc:
  Delete: sql-bench/Results/big-tables-pg_fast-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-big-tables-solid-Linux_2.0.36_i686-cmp-mysql,pg,solid~7071ff0b9ae77888:
  Delete: sql-bench/Results/big-tables-solid-Linux_2.0.36_i686-cmp-mysql,pg,solid
BitKeeper/deleted/.del-connect-Adabas-Linux_2.0.35_i686-cmp-adabas,mysql~db5313a35bb9b7f9:
  Delete: sql-bench/Results/connect-Adabas-Linux_2.0.35_i686-cmp-adabas,mysql
BitKeeper/deleted/.del-connect-frontbase-Linux_2.2.14_my_SMP_i686-cmp-frontbase,mysql~61676bd9c073f7fd:
  Delete: sql-bench/Results/connect-frontbase-Linux_2.2.14_my_SMP_i686-cmp-frontbase,mysql
BitKeeper/deleted/.del-connect-msql-Linux_2.2.10_i686-cmp-msql,mysql~5b9f60756fd8f911:
  Delete: sql-bench/Results/connect-msql-Linux_2.2.10_i686-cmp-msql,mysql
BitKeeper/deleted/.del-connect-mysql-HP_UX_B.10.20_9000_778~a1e538e24db4bb1c:
  Delete: sql-bench/Results/connect-mysql-HP_UX_B.10.20_9000_778
BitKeeper/deleted/.del-connect-mysql-Linux_2.0.35_i686-cmp-adabas,mysql~db113f639769f768:
  Delete: sql-bench/Results/connect-mysql-Linux_2.0.35_i686-cmp-adabas,mysql
BitKeeper/deleted/.del-connect-mysql-Linux_2.0.36_i686-cmp-mysql,pg,solid~8da27469bc2fb160:
  Delete: sql-bench/Results/connect-mysql-Linux_2.0.36_i686-cmp-mysql,pg,solid
BitKeeper/deleted/.del-connect-mysql-Linux_2.2.10_i686-cmp-msql,mysql~cdc59ceceaf911fa:
  Delete: sql-bench/Results/connect-mysql-Linux_2.2.10_i686-cmp-msql,mysql
BitKeeper/deleted/.del-connect-mysql-Linux_2.2.16_SMP_alpha~aaec79ca1156a08a:
  Delete: sql-bench/Results/connect-mysql-Linux_2.2.16_SMP_alpha
BitKeeper/deleted/.del-connect-mysql-Linux_2.2.1_i686-cmp-adabas,mysql~89cc5af048bd639b:
  Delete: sql-bench/Results/connect-mysql-Linux_2.2.1_i686-cmp-adabas,mysql
BitKeeper/deleted/.del-connect-mysql-Linux_2.4.0_64GB_SMP_i686~5120b0673110924:
  Delete: sql-bench/Results/connect-mysql-Linux_2.4.0_64GB_SMP_i686
BitKeeper/deleted/.del-connect-mysql-Linux_2.4.16_64GB_SMP_i686~75f6059f6c9dba3c:
  Delete: sql-bench/Results/connect-mysql-Linux_2.4.16_64GB_SMP_i686
BitKeeper/deleted/.del-connect-mysql-Linux_2.4.4_SMP_alpha~89d632a1ac9a6b5:
  Delete: sql-bench/Results/connect-mysql-Linux_2.4.4_SMP_alpha
BitKeeper/deleted/.del-connect-mysql-NT_4.0~38e24bdd3be11952:
  Delete: sql-bench/Results/connect-mysql-NT_4.0
BitKeeper/deleted/.del-connect-mysql-SunOS_5.5.1_sun4u~a9493110fe62e0b1:
  Delete: sql-bench/Results/connect-mysql-SunOS_5.5.1_sun4u
BitKeeper/deleted/.del-connect-mysql-SunOS_5.7_sun4m~4dfb6b3d571ddbad:
  Delete: sql-bench/Results/connect-mysql-SunOS_5.7_sun4m
BitKeeper/deleted/.del-connect-mysql-SunOS_5.7_sun4u~c67beb9e9d2cf32e:
  Delete: sql-bench/Results/connect-mysql-SunOS_5.7_sun4u
BitKeeper/deleted/.del-connect-mysql-SunOS_5.8_sun4u~b843f0f83243241:
  Delete: sql-bench/Results/connect-mysql-SunOS_5.8_sun4u
BitKeeper/deleted/.del-connect-mysql-win98~3717948fdaeece0e:
  Delete: sql-bench/Results/connect-mysql-win98
BitKeeper/deleted/.del-connect-mysql_fast-Linux_2.2.10_i686-cmp-msql,mysql~c1e45c134fb0c6:
  Delete: sql-bench/Results/connect-mysql_fast-Linux_2.2.10_i686-cmp-msql,mysql
BitKeeper/deleted/.del-connect-mysql_odbc-win98~62020e7f60ca155b:
  Delete: sql-bench/Results/connect-mysql_odbc-win98
BitKeeper/deleted/.del-connect-oracle-Linux_2.0.36_i686-cmp-mysql,oracle~ac92c49fb3587f32:
  Delete: sql-bench/Results/connect-oracle-Linux_2.0.36_i686-cmp-mysql,oracle
BitKeeper/deleted/.del-connect-pg-Linux_2.0.36_i686-cmp-mysql,pg,solid~d518bd07b04f5b01:
  Delete: sql-bench/Results/connect-pg-Linux_2.0.36_i686-cmp-mysql,pg,solid
BitKeeper/deleted/.del-connect-pg-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg~4591ef76c9e60c9d:
  Delete: sql-bench/Results/connect-pg-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-connect-pg_fast-Linux_2.0.36_i686-cmp-mysql,pg,solid~f06b093a1aa4ff35:
  Delete: sql-bench/Results/connect-pg_fast-Linux_2.0.36_i686-cmp-mysql,pg,solid
BitKeeper/deleted/.del-connect-pg_fast-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg~568fd44bd76dfc6f:
  Delete: sql-bench/Results/connect-pg_fast-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-connect-solid-Linux_2.0.36_i686-cmp-mysql,pg,solid~4984dfca3ef56ece:
  Delete: sql-bench/Results/connect-solid-Linux_2.0.36_i686-cmp-mysql,pg,solid
BitKeeper/deleted/.del-create-Adabas-Linux_2.0.35_i686-cmp-adabas,mysql~c2970764e968682a:
  Delete: sql-bench/Results/create-Adabas-Linux_2.0.35_i686-cmp-adabas,mysql
BitKeeper/deleted/.del-create-frontbase-Linux_2.2.14_my_SMP_i686-cmp-frontbase,mysql~1eb70c89b45b81ca:
  Delete: sql-bench/Results/create-frontbase-Linux_2.2.14_my_SMP_i686-cmp-frontbase,mysql
BitKeeper/deleted/.del-create-msql-Linux_2.2.10_i686-cmp-msql,mysql~edee1dbef9553fce:
  Delete: sql-bench/Results/create-msql-Linux_2.2.10_i686-cmp-msql,mysql
BitKeeper/deleted/.del-create-mysql-HP_UX_B.10.20_9000_778~9ba93e8aace282f8:
  Delete: sql-bench/Results/create-mysql-HP_UX_B.10.20_9000_778
BitKeeper/deleted/.del-create-mysql-Linux_2.0.35_i686-cmp-adabas,mysql~2380da175449191a:
  Delete: sql-bench/Results/create-mysql-Linux_2.0.35_i686-cmp-adabas,mysql
BitKeeper/deleted/.del-create-mysql-Linux_2.0.36_i686-cmp-mysql,pg,solid~66db97b8e6de6956:
  Delete: sql-bench/Results/create-mysql-Linux_2.0.36_i686-cmp-mysql,pg,solid
BitKeeper/deleted/.del-create-mysql-Linux_2.2.10_i686-cmp-msql,mysql~645c83b795615b50:
  Delete: sql-bench/Results/create-mysql-Linux_2.2.10_i686-cmp-msql,mysql
BitKeeper/deleted/.del-create-mysql-Linux_2.2.16_SMP_alpha~14f7146539c3894:
  Delete: sql-bench/Results/create-mysql-Linux_2.2.16_SMP_alpha
BitKeeper/deleted/.del-create-mysql-Linux_2.2.1_i686-cmp-adabas,mysql~3dbefde519d2fe7c:
  Delete: sql-bench/Results/create-mysql-Linux_2.2.1_i686-cmp-adabas,mysql
BitKeeper/deleted/.del-create-mysql-Linux_2.4.0_64GB_SMP_i686~99efec8ad04ae89e:
  Delete: sql-bench/Results/create-mysql-Linux_2.4.0_64GB_SMP_i686
BitKeeper/deleted/.del-create-mysql-Linux_2.4.16_64GB_SMP_i686~3d16d9031a504bc1:
  Delete: sql-bench/Results/create-mysql-Linux_2.4.16_64GB_SMP_i686
BitKeeper/deleted/.del-create-mysql-Linux_2.4.4_SMP_alpha~e5194a6b13b856d2:
  Delete: sql-bench/Results/create-mysql-Linux_2.4.4_SMP_alpha
BitKeeper/deleted/.del-create-mysql-NT_4.0~b3acc3d0a2d6f9d9:
  Delete: sql-bench/Results/create-mysql-NT_4.0
BitKeeper/deleted/.del-create-mysql-SunOS_5.5.1_sun4u~bbb5de66fc56de7b:
  Delete: sql-bench/Results/create-mysql-SunOS_5.5.1_sun4u
BitKeeper/deleted/.del-create-mysql-SunOS_5.7_sun4m~b0ff2a8562097d63:
  Delete: sql-bench/Results/create-mysql-SunOS_5.7_sun4m
BitKeeper/deleted/.del-create-mysql-SunOS_5.7_sun4u~7ee13bfcafeab498:
  Delete: sql-bench/Results/create-mysql-SunOS_5.7_sun4u
BitKeeper/deleted/.del-create-mysql-SunOS_5.8_sun4u~59d3098ed93d40f3:
  Delete: sql-bench/Results/create-mysql-SunOS_5.8_sun4u
BitKeeper/deleted/.del-create-mysql-win98~e1d695d45ef2d0c:
  Delete: sql-bench/Results/create-mysql-win98
BitKeeper/deleted/.del-create-mysql_fast-Linux_2.2.10_i686-cmp-msql,mysql~c4faee34856851cb:
  Delete: sql-bench/Results/create-mysql_fast-Linux_2.2.10_i686-cmp-msql,mysql
BitKeeper/deleted/.del-create-mysql_odbc-win98~601a99c5e6348c0c:
  Delete: sql-bench/Results/create-mysql_odbc-win98
BitKeeper/deleted/.del-create-oracle-Linux_2.0.36_i686-cmp-mysql,oracle~e115689b8cc73378:
  Delete: sql-bench/Results/create-oracle-Linux_2.0.36_i686-cmp-mysql,oracle
BitKeeper/deleted/.del-create-oracle_fast-Linux_2.0.36_i686-cmp-mysql,oracle~bf450a6242fd0667:
  Delete: sql-bench/Results/create-oracle_fast-Linux_2.0.36_i686-cmp-mysql,oracle
BitKeeper/deleted/.del-create-pg-Linux_2.0.36_i686-cmp-mysql,pg,solid~3d947822c9d126ad:
  Delete: sql-bench/Results/create-pg-Linux_2.0.36_i686-cmp-mysql,pg,solid
BitKeeper/deleted/.del-create-pg-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg~a362ce64c2eaede9:
  Delete: sql-bench/Results/create-pg-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-create-pg_fast-Linux_2.0.36_i686-cmp-mysql,pg,solid~c79bf4084081ea70:
  Delete: sql-bench/Results/create-pg_fast-Linux_2.0.36_i686-cmp-mysql,pg,solid
BitKeeper/deleted/.del-create-pg_fast-Linux_2.2.14_my_SMP_i686-crashed~84bcc3931507a54b:
  Delete: sql-bench/Results/create-pg_fast-Linux_2.2.14_my_SMP_i686-crashed
BitKeeper/deleted/.del-create-pg_fast-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg~4eb5a8d4ec1e87f3:
  Delete: sql-bench/Results/create-pg_fast-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-create-solid-Linux_2.0.36_i686-cmp-mysql,pg,solid~fc92c9b657c058a5:
  Delete: sql-bench/Results/create-solid-Linux_2.0.36_i686-cmp-mysql,pg,solid
BitKeeper/deleted/.del-insert-Adabas-Linux_2.0.35_i686-cmp-adabas,mysql~c411901fbeb0f872:
  Delete: sql-bench/Results/insert-Adabas-Linux_2.0.35_i686-cmp-adabas,mysql
BitKeeper/deleted/.del-insert-frontbase-Linux_2.2.14_my_SMP_i686-cmp-frontbase,mysql~18e410adac84ea04:
  Delete: sql-bench/Results/insert-frontbase-Linux_2.2.14_my_SMP_i686-cmp-frontbase,mysql
BitKeeper/deleted/.del-insert-msql-Linux_2.2.10_i686-cmp-msql,mysql~53d8b6be20f6ca92:
  Delete: sql-bench/Results/insert-msql-Linux_2.2.10_i686-cmp-msql,mysql
BitKeeper/deleted/.del-insert-mysql-HP_UX_B.10.20_9000_778~c1dc0211819193a4:
  Delete: sql-bench/Results/insert-mysql-HP_UX_B.10.20_9000_778
BitKeeper/deleted/.del-insert-mysql-Linux_2.0.35_i686-cmp-adabas,mysql~ecd1a95d10fdd9e:
  Delete: sql-bench/Results/insert-mysql-Linux_2.0.35_i686-cmp-adabas,mysql
BitKeeper/deleted/.del-insert-mysql-Linux_2.0.36_i686-cmp-mysql,pg,solid~2092625178d751fe:
  Delete: sql-bench/Results/insert-mysql-Linux_2.0.36_i686-cmp-mysql,pg,solid
BitKeeper/deleted/.del-insert-mysql-Linux_2.2.10_i686-cmp-msql,mysql~a0420d7e1cb49cd:
  Delete: sql-bench/Results/insert-mysql-Linux_2.2.10_i686-cmp-msql,mysql
BitKeeper/deleted/.del-insert-mysql-Linux_2.2.16_SMP_alpha~8376549c28db6e1b:
  Delete: sql-bench/Results/insert-mysql-Linux_2.2.16_SMP_alpha
BitKeeper/deleted/.del-insert-mysql-Linux_2.2.1_i686-cmp-adabas,mysql~5ce02dfcb05e552a:
  Delete: sql-bench/Results/insert-mysql-Linux_2.2.1_i686-cmp-adabas,mysql
BitKeeper/deleted/.del-insert-mysql-Linux_2.4.0_64GB_SMP_i686~4eaf16cd96aa5659:
  Delete: sql-bench/Results/insert-mysql-Linux_2.4.0_64GB_SMP_i686
BitKeeper/deleted/.del-insert-mysql-Linux_2.4.16_64GB_SMP_i686~58b5ab2783e8bed8:
  Delete: sql-bench/Results/insert-mysql-Linux_2.4.16_64GB_SMP_i686
BitKeeper/deleted/.del-insert-mysql-Linux_2.4.4_SMP_alpha~618312e541c41bf:
  Delete: sql-bench/Results/insert-mysql-Linux_2.4.4_SMP_alpha
BitKeeper/deleted/.del-insert-mysql-NT_4.0~2da89ac977203b64:
  Delete: sql-bench/Results/insert-mysql-NT_4.0
BitKeeper/deleted/.del-insert-mysql-SunOS_5.5.1_sun4u~8a9ae41f9a79f79:
  Delete: sql-bench/Results/insert-mysql-SunOS_5.5.1_sun4u
BitKeeper/deleted/.del-insert-mysql-SunOS_5.7_sun4m~3f1912de8939606e:
  Delete: sql-bench/Results/insert-mysql-SunOS_5.7_sun4m
BitKeeper/deleted/.del-insert-mysql-SunOS_5.7_sun4u~78efa132c6e252b9:
  Delete: sql-bench/Results/insert-mysql-SunOS_5.7_sun4u
BitKeeper/deleted/.del-insert-mysql-SunOS_5.8_sun4u~54610b5db9b7be0f:
  Delete: sql-bench/Results/insert-mysql-SunOS_5.8_sun4u
BitKeeper/deleted/.del-insert-mysql-win98~bbf7e244641d4003:
  Delete: sql-bench/Results/insert-mysql-win98
BitKeeper/deleted/.del-insert-mysql_fast-Linux_2.2.10_i686-cmp-msql,mysql~a4814074b474fc72:
  Delete: sql-bench/Results/insert-mysql_fast-Linux_2.2.10_i686-cmp-msql,mysql
BitKeeper/deleted/.del-insert-mysql_odbc-win98~52247fd8f94874c1:
  Delete: sql-bench/Results/insert-mysql_odbc-win98
BitKeeper/deleted/.del-insert-oracle-Linux_2.0.36_i686-cmp-mysql,oracle~7dbd79fec1e7e1b1:
  Delete: sql-bench/Results/insert-oracle-Linux_2.0.36_i686-cmp-mysql,oracle
BitKeeper/deleted/.del-insert-oracle_fast-Linux_2.0.36_i686-cmp-mysql,oracle~b1fda485df498a58:
  Delete: sql-bench/Results/insert-oracle_fast-Linux_2.0.36_i686-cmp-mysql,oracle
BitKeeper/deleted/.del-insert-pg-Linux_2.0.36_i686-cmp-mysql,pg,solid~d124baae1c17a384:
  Delete: sql-bench/Results/insert-pg-Linux_2.0.36_i686-cmp-mysql,pg,solid
BitKeeper/deleted/.del-insert-pg-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg~b93a767f8d81ba33:
  Delete: sql-bench/Results/insert-pg-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-insert-pg_fast-Linux_2.0.36_i686-cmp-mysql,pg,solid~a70aae8c2950405c:
  Delete: sql-bench/Results/insert-pg_fast-Linux_2.0.36_i686-cmp-mysql,pg,solid
BitKeeper/deleted/.del-insert-pg_fast-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg~10c38322f8bc83f:
  Delete: sql-bench/Results/insert-pg_fast-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-insert-solid-Linux_2.0.36_i686-cmp-mysql,pg,solid~eb25bd34abfb3f3e:
  Delete: sql-bench/Results/insert-solid-Linux_2.0.36_i686-cmp-mysql,pg,solid
BitKeeper/deleted/.del-select-Adabas-Linux_2.0.35_i686-cmp-adabas,mysql~26e212f592aecc3a:
  Delete: sql-bench/Results/select-Adabas-Linux_2.0.35_i686-cmp-adabas,mysql
BitKeeper/deleted/.del-select-frontbase-Linux_2.2.14_my_SMP_i686-cmp-frontbase,mysql~ebd8a4e44a0acf:
  Delete: sql-bench/Results/select-frontbase-Linux_2.2.14_my_SMP_i686-cmp-frontbase,mysql
BitKeeper/deleted/.del-select-msql-Linux_2.2.10_i686-cmp-msql,mysql~4fd08d95716e1d7e:
  Delete: sql-bench/Results/select-msql-Linux_2.2.10_i686-cmp-msql,mysql
BitKeeper/deleted/.del-select-mysql-HP_UX_B.10.20_9000_778~f9b106ee9ff6b3d7:
  Delete: sql-bench/Results/select-mysql-HP_UX_B.10.20_9000_778
BitKeeper/deleted/.del-select-mysql-Linux_2.0.35_i686-cmp-adabas,mysql~e48d4b0a3b15a56d:
  Delete: sql-bench/Results/select-mysql-Linux_2.0.35_i686-cmp-adabas,mysql
BitKeeper/deleted/.del-select-mysql-Linux_2.0.36_i686-cmp-mysql,pg,solid~195a8803a505d0e6:
  Delete: sql-bench/Results/select-mysql-Linux_2.0.36_i686-cmp-mysql,pg,solid
BitKeeper/deleted/.del-select-mysql-Linux_2.2.10_i686-cmp-msql,mysql~15cf41773458fdee:
  Delete: sql-bench/Results/select-mysql-Linux_2.2.10_i686-cmp-msql,mysql
BitKeeper/deleted/.del-select-mysql-Linux_2.2.16_SMP_alpha~d02b2891a4964e60:
  Delete: sql-bench/Results/select-mysql-Linux_2.2.16_SMP_alpha
BitKeeper/deleted/.del-select-mysql-Linux_2.2.1_i686-cmp-adabas,mysql~40d76ff0c6abd440:
  Delete: sql-bench/Results/select-mysql-Linux_2.2.1_i686-cmp-adabas,mysql
BitKeeper/deleted/.del-select-mysql-Linux_2.4.0_64GB_SMP_i686~90c8074428c8a9bc:
  Delete: sql-bench/Results/select-mysql-Linux_2.4.0_64GB_SMP_i686
BitKeeper/deleted/.del-select-mysql-Linux_2.4.16_64GB_SMP_i686~bf28885bfc7cc742:
  Delete: sql-bench/Results/select-mysql-Linux_2.4.16_64GB_SMP_i686
BitKeeper/deleted/.del-select-mysql-Linux_2.4.4_SMP_alpha~feb1610a86f00654:
  Delete: sql-bench/Results/select-mysql-Linux_2.4.4_SMP_alpha
BitKeeper/deleted/.del-select-mysql-NT_4.0~68e53f4d285f6c8:
  Delete: sql-bench/Results/select-mysql-NT_4.0
BitKeeper/deleted/.del-select-mysql-SunOS_5.5.1_sun4u~c9a1a498a052e268:
  Delete: sql-bench/Results/select-mysql-SunOS_5.5.1_sun4u
BitKeeper/deleted/.del-select-mysql-SunOS_5.7_sun4m~98faf6c7bb382fe:
  Delete: sql-bench/Results/select-mysql-SunOS_5.7_sun4m
BitKeeper/deleted/.del-select-mysql-SunOS_5.7_sun4u~632c92971c61e34a:
  Delete: sql-bench/Results/select-mysql-SunOS_5.7_sun4u
BitKeeper/deleted/.del-select-mysql-SunOS_5.8_sun4u~b4d7791617c9c130:
  Delete: sql-bench/Results/select-mysql-SunOS_5.8_sun4u
BitKeeper/deleted/.del-select-mysql-win98~6c82dc82a2bd76ba:
  Delete: sql-bench/Results/select-mysql-win98
BitKeeper/deleted/.del-select-mysql_fast-Linux_2.2.10_i686-cmp-msql,mysql~3f6a1a0d769f89e3:
  Delete: sql-bench/Results/select-mysql_fast-Linux_2.2.10_i686-cmp-msql,mysql
BitKeeper/deleted/.del-select-mysql_odbc-win98~bc95f67bab05b1bf:
  Delete: sql-bench/Results/select-mysql_odbc-win98
BitKeeper/deleted/.del-select-oracle-Linux_2.0.36_i686-cmp-mysql,oracle~de20213816f2cf80:
  Delete: sql-bench/Results/select-oracle-Linux_2.0.36_i686-cmp-mysql,oracle
BitKeeper/deleted/.del-select-oracle_fast-Linux_2.0.36_i686-cmp-mysql,oracle~81512da61e0cb2dc:
  Delete: sql-bench/Results/select-oracle_fast-Linux_2.0.36_i686-cmp-mysql,oracle
BitKeeper/deleted/.del-select-pg-Linux_2.0.36_i686-cmp-mysql,pg,solid~ea1dfd1a49ff576c:
  Delete: sql-bench/Results/select-pg-Linux_2.0.36_i686-cmp-mysql,pg,solid
BitKeeper/deleted/.del-select-pg-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg~fa83673053168348:
  Delete: sql-bench/Results/select-pg-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-select-pg_fast-Linux_2.0.36_i686-cmp-mysql,pg,solid~79f7792e1422b43f:
  Delete: sql-bench/Results/select-pg_fast-Linux_2.0.36_i686-cmp-mysql,pg,solid
BitKeeper/deleted/.del-select-pg_fast-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg~4a06e51b297d5570:
  Delete: sql-bench/Results/select-pg_fast-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-select-solid-Linux_2.0.36_i686-cmp-mysql,pg,solid~987c920c779705cf:
  Delete: sql-bench/Results/select-solid-Linux_2.0.36_i686-cmp-mysql,pg,solid
BitKeeper/deleted/.del-transactions-mysql-Linux_2.4.16_64GB_SMP_i686~3cf318d85adcc5cb:
  Delete: sql-bench/Results/transactions-mysql-Linux_2.4.16_64GB_SMP_i686
BitKeeper/deleted/.del-transactions-mysql-Linux_2.4.4_SMP_alpha~3c3606d8f979f51:
  Delete: sql-bench/Results/transactions-mysql-Linux_2.4.4_SMP_alpha
BitKeeper/deleted/.del-wisconsin-Adabas-Linux_2.0.35_i686-cmp-adabas,mysql~8489f0f6c0c7d18c:
  Delete: sql-bench/Results/wisconsin-Adabas-Linux_2.0.35_i686-cmp-adabas,mysql
BitKeeper/deleted/.del-wisconsin-frontbase-Linux_2.2.14_my_SMP_i686-cmp-frontbase,mysql~d1d359e3c9dda9db:
  Delete: sql-bench/Results/wisconsin-frontbase-Linux_2.2.14_my_SMP_i686-cmp-frontbase,mysql
BitKeeper/deleted/.del-wisconsin-msql-Linux_2.2.10_i686-cmp-msql,mysql~d1dc6e639d4779e1:
  Delete: sql-bench/Results/wisconsin-msql-Linux_2.2.10_i686-cmp-msql,mysql
BitKeeper/deleted/.del-wisconsin-mysql-HP_UX_B.10.20_9000_778~718acc72754fba97:
  Delete: sql-bench/Results/wisconsin-mysql-HP_UX_B.10.20_9000_778
BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.0.35_i686-cmp-adabas,mysql~e89ae8dfa5378f09:
  Delete: sql-bench/Results/wisconsin-mysql-Linux_2.0.35_i686-cmp-adabas,mysql
BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.0.36_i686-cmp-mysql,pg,solid~acc67b004dc75f98:
  Delete: sql-bench/Results/wisconsin-mysql-Linux_2.0.36_i686-cmp-mysql,pg,solid
BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.2.10_i686-cmp-msql,mysql~fc6765479b4b64cd:
  Delete: sql-bench/Results/wisconsin-mysql-Linux_2.2.10_i686-cmp-msql,mysql
BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.2.16_SMP_alpha~8f9745c884aa92f4:
  Delete: sql-bench/Results/wisconsin-mysql-Linux_2.2.16_SMP_alpha
BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.2.1_i686-cmp-adabas,mysql~9c79427e739c735d:
  Delete: sql-bench/Results/wisconsin-mysql-Linux_2.2.1_i686-cmp-adabas,mysql
BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.4.0_64GB_SMP_i686~7a02185b13c0b44e:
  Delete: sql-bench/Results/wisconsin-mysql-Linux_2.4.0_64GB_SMP_i686
BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.4.16_64GB_SMP_i686~e32f769c6188dd2:
  Delete: sql-bench/Results/wisconsin-mysql-Linux_2.4.16_64GB_SMP_i686
BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.4.4_SMP_alpha~8b2f917fc876fc7a:
  Delete: sql-bench/Results/wisconsin-mysql-Linux_2.4.4_SMP_alpha
BitKeeper/deleted/.del-wisconsin-mysql-NT_4.0~283629367e086581:
  Delete: sql-bench/Results/wisconsin-mysql-NT_4.0
BitKeeper/deleted/.del-wisconsin-mysql-SunOS_5.5.1_sun4u~379705afa2e12378:
  Delete: sql-bench/Results/wisconsin-mysql-SunOS_5.5.1_sun4u
BitKeeper/deleted/.del-wisconsin-mysql-SunOS_5.7_sun4m~580e8050e43e0005:
  Delete: sql-bench/Results/wisconsin-mysql-SunOS_5.7_sun4m
BitKeeper/deleted/.del-wisconsin-mysql-SunOS_5.7_sun4u~f27927f8c64ea8ad:
  Delete: sql-bench/Results/wisconsin-mysql-SunOS_5.7_sun4u
BitKeeper/deleted/.del-wisconsin-mysql-SunOS_5.8_sun4u~c6dc13908e90176f:
  Delete: sql-bench/Results/wisconsin-mysql-SunOS_5.8_sun4u
BitKeeper/deleted/.del-wisconsin-mysql-win98~795461eba3514b47:
  Delete: sql-bench/Results/wisconsin-mysql-win98
BitKeeper/deleted/.del-wisconsin-mysql_fast-Linux_2.2.10_i686-cmp-msql,mysql~488787578358cc35:
  Delete: sql-bench/Results/wisconsin-mysql_fast-Linux_2.2.10_i686-cmp-msql,mysql
BitKeeper/deleted/.del-wisconsin-mysql_odbc-win98~5bbc39935723fc64:
  Delete: sql-bench/Results/wisconsin-mysql_odbc-win98
BitKeeper/deleted/.del-wisconsin-oracle-Linux_2.0.36_i686-cmp-mysql,oracle~6daa8be9afd8d66b:
  Delete: sql-bench/Results/wisconsin-oracle-Linux_2.0.36_i686-cmp-mysql,oracle
BitKeeper/deleted/.del-wisconsin-oracle_fast-Linux_2.0.36_i686-cmp-mysql,oracle~1778869029501916:
  Delete: sql-bench/Results/wisconsin-oracle_fast-Linux_2.0.36_i686-cmp-mysql,oracle
BitKeeper/deleted/.del-wisconsin-pg-Linux_2.0.36_i686-cmp-mysql,pg,solid~c031bfc63e5e5f2e:
  Delete: sql-bench/Results/wisconsin-pg-Linux_2.0.36_i686-cmp-mysql,pg,solid
BitKeeper/deleted/.del-wisconsin-pg-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg~604f493a45201ad9:
  Delete: sql-bench/Results/wisconsin-pg-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-wisconsin-pg_fast-Linux_2.0.36_i686-cmp-mysql,pg,solid~ffdea7edff6f4fbe:
  Delete: sql-bench/Results/wisconsin-pg_fast-Linux_2.0.36_i686-cmp-mysql,pg,solid
BitKeeper/deleted/.del-wisconsin-pg_fast-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg~ebdeb628338b7b51:
  Delete: sql-bench/Results/wisconsin-pg_fast-Linux_2.4.2_64GB_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-wisconsin-solid-Linux_2.0.36_i686-cmp-mysql,pg,solid~f1c97174bd9c7f51:
  Delete: sql-bench/Results/wisconsin-solid-Linux_2.0.36_i686-cmp-mysql,pg,solid
BitKeeper/deleted/.del-.cvsignore~ed869f4c40f3d576:
  Delete: sql-bench/.cvsignore
BitKeeper/deleted/.del-ChangeLog~c7abb5abd266ca5b:
  Delete: sql-bench/ChangeLog
BitKeeper/deleted/.del-Makefile.am~7b07da85b2e9375:
  Delete: sql-bench/Makefile.am
BitKeeper/deleted/.del-README~b1aa0c1bf9f5eb5e:
  Delete: sql-bench/README
BitKeeper/deleted/.del-TODO~cac6d7a63c426ae5:
  Delete: sql-bench/TODO
BitKeeper/deleted/.del-as3ap.sh~f54eebbd8d34c9b6:
  Delete: sql-bench/as3ap.sh
BitKeeper/deleted/.del-bench-count-distinct.sh~a92f174271a831d7:
  Delete: sql-bench/bench-count-distinct.sh
BitKeeper/deleted/.del-bench-init.pl.sh~db41ef36a289736c:
  Delete: sql-bench/bench-init.pl.sh
BitKeeper/deleted/.del-compare-results.sh~a9e26e2644c694b3:
  Delete: sql-bench/compare-results.sh
BitKeeper/deleted/.del-copy-db.sh~e8116afb93144ccd:
  Delete: sql-bench/copy-db.sh
BitKeeper/deleted/.del-crash-me.sh~2fa881d0b40339c8:
  Delete: sql-bench/crash-me.sh
BitKeeper/deleted/.del-example.bat~22d0170bccf0f030:
  Delete: sql-bench/example.bat
BitKeeper/deleted/.del-graph-compare-results.sh~7e4e28b3591b4542:
  Delete: sql-bench/graph-compare-results.sh
BitKeeper/deleted/.del-innotest1.sh~aa36bce09ca783c7:
  Delete: sql-bench/innotest1.sh
BitKeeper/deleted/.del-innotest1a.sh~c64f4610ae1e26fe:
  Delete: sql-bench/innotest1a.sh
BitKeeper/deleted/.del-innotest1b.sh~aafd0819ae84da7b:
  Delete: sql-bench/innotest1b.sh
BitKeeper/deleted/.del-innotest2.sh~9c14df528285603:
  Delete: sql-bench/innotest2.sh
BitKeeper/deleted/.del-innotest2a.sh~e01d016a7cafdc0b:
  Delete: sql-bench/innotest2a.sh
BitKeeper/deleted/.del-innotest2b.sh~7b99ece835e8dff3:
  Delete: sql-bench/innotest2b.sh
BitKeeper/deleted/.del-print-limit-table~b8e808031daa3758:
  Delete: sql-bench/print-limit-table
BitKeeper/deleted/.del-pwd.bat~9b64050849abf51:
  Delete: sql-bench/pwd.bat
BitKeeper/deleted/.del-run-all-tests.sh~41d6da1cf211ee95:
  Delete: sql-bench/run-all-tests.sh
BitKeeper/deleted/.del-server-cfg.sh~556b3a2b6a11dcce:
  Delete: sql-bench/server-cfg.sh
BitKeeper/deleted/.del-test-ATIS.sh~e8ebff7086c95773:
  Delete: sql-bench/test-ATIS.sh
BitKeeper/deleted/.del-test-alter-table.sh~eba6cfa9972fcced:
  Delete: sql-bench/test-alter-table.sh
BitKeeper/deleted/.del-test-big-tables.sh~5b1b0c5fb623565a:
  Delete: sql-bench/test-big-tables.sh
BitKeeper/deleted/.del-test-connect.sh~382a728c949ee075:
  Delete: sql-bench/test-connect.sh
BitKeeper/deleted/.del-test-create.sh~f9a1ea38c191b17a:
  Delete: sql-bench/test-create.sh
BitKeeper/deleted/.del-test-insert.sh~893bfac9dedb79a7:
  Delete: sql-bench/test-insert.sh
BitKeeper/deleted/.del-test-select.sh~6d5cc770acf11be6:
  Delete: sql-bench/test-select.sh
BitKeeper/deleted/.del-test-transactions.sh~c1c892f10c40caf:
  Delete: sql-bench/test-transactions.sh
BitKeeper/deleted/.del-test-wisconsin.sh~c0b86821b5f95f26:
  Delete: sql-bench/test-wisconsin.sh
BitKeeper/deleted/.del-Adabas.cfg~343ed4e7f8b02111:
  Delete: sql-bench/limits/Adabas.cfg
BitKeeper/deleted/.del-Informix.cfg~b94188e1ececb51b:
  Delete: sql-bench/limits/Informix.cfg
BitKeeper/deleted/.del-uname.bat~a6d933d2ee9314c:
  Delete: sql-bench/uname.bat
BitKeeper/deleted/.del-access.cfg~5239ea3655b7bba0:
  Delete: sql-bench/limits/access.cfg
BitKeeper/deleted/.del-access_odbc.cfg~34b4cf0eda56c4b1:
  Delete: sql-bench/limits/access_odbc.cfg
BitKeeper/deleted/.del-db2.cfg~711099b4d7906959:
  Delete: sql-bench/limits/db2.cfg
BitKeeper/deleted/.del-empress.cfg~1f97f34d6560a499:
  Delete: sql-bench/limits/empress.cfg
BitKeeper/deleted/.del-frontbase.cfg~71369e9c002696e:
  Delete: sql-bench/limits/frontbase.cfg
BitKeeper/deleted/.del-interbase-dialect1.cfg~659206b5b9a11036:
  Delete: sql-bench/limits/interbase-dialect1.cfg
BitKeeper/deleted/.del-interbase-dialect3.cfg~46277bdfc74c667a:
  Delete: sql-bench/limits/interbase-dialect3.cfg
BitKeeper/deleted/.del-interbase-superserver.cfg~22501198689243b0:
  Delete: sql-bench/limits/interbase-superserver.cfg
BitKeeper/deleted/.del-interbase.cfg~c6951a0376cc6ff3:
  Delete: sql-bench/limits/interbase.cfg
BitKeeper/deleted/.del-mimer.cfg~234e6c1c3c47b612:
  Delete: sql-bench/limits/mimer.cfg
BitKeeper/deleted/.del-ms-sql.cfg~1907964264d2786a:
  Delete: sql-bench/limits/ms-sql.cfg
BitKeeper/deleted/.del-ms-sql65.cfg~6b9bc3c460dbee05:
  Delete: sql-bench/limits/ms-sql65.cfg
BitKeeper/deleted/.del-msql.cfg~52710b12932cceb9:
  Delete: sql-bench/limits/msql.cfg
BitKeeper/deleted/.del-mysql-3.22.cfg~e706f26a161175cd:
  Delete: sql-bench/limits/mysql-3.22.cfg
BitKeeper/deleted/.del-mysql-3.23.cfg~3cf9d6be54b77a3c:
  Delete: sql-bench/limits/mysql-3.23.cfg
BitKeeper/deleted/.del-mysql-4.0.cfg~6c9d63c85b5ef574:
  Delete: sql-bench/limits/mysql-4.0.cfg
BitKeeper/deleted/.del-mysql-4.1.cfg~b6c5e74aefc99e3c:
  Delete: sql-bench/limits/mysql-4.1.cfg
BitKeeper/deleted/.del-mysql.cfg~9cab20a8771b93cf:
  Delete: sql-bench/limits/mysql.cfg
BitKeeper/deleted/.del-oracle.cfg~affab21af8f438fd:
  Delete: sql-bench/limits/oracle.cfg
BitKeeper/deleted/.del-pg.cfg~db59cf39a5d417be:
  Delete: sql-bench/limits/pg.cfg
BitKeeper/deleted/.del-solid-nt4.cfg~cca779f0c9e29d31:
  Delete: sql-bench/limits/solid-nt4.cfg
BitKeeper/deleted/.del-solid.cfg~5ae0e4342eadb0fb:
  Delete: sql-bench/limits/solid.cfg
BitKeeper/deleted/.del-sybase.cfg~c4636b12767b3f14:
  Delete: sql-bench/limits/sybase.cfg
BitKeeper/deleted/.del-test-alpha-ccc~1d7b807aec2c6bf9:
  Delete: BUILD/test-alpha-ccc
Makefile.am:
  @bench_dirs@ removed, just list mysql-test directly
VC++Files/copy_mysql_files.bat:
  Deal with sql-bench being removed
configure.in:
  Deal with sql-bench being removed
mysql-test/mysql-test-run.pl:
  Allow directory of mysql-bench to be specified with a new --benchdir
  option, and default to looking adjacent to the source tree.
scripts/make_binary_distribution.sh:
  Deal with sql-bench being removed
scripts/make_win_src_distribution.sh:
  Deal with sql-bench being removed
scripts/mysql_install_db.sh:
  Deal with sql-bench being removed
support-files/mysql.spec.sh:
  Deal with sql-bench being removed
 2006-04-13 10:34:46 -07:00
unknown
c566f9a25f fixes for 'make dist' and 'make distcheck' 
BUILD/compile-dist:
  fixes for 'make dist' and 'make distcheck'
  include yassl in "dist"
Makefile.am:
  fixes for 'make dist' and 'make distcheck'
  remove double-listing of everything in SUBDIRS and DIST_SUBDIRS
  remove @yassl_dir@, it belongs to extra/Makefile.am
  specify --basedir for mysql_install_db, in case builddir (where mysql_install_db is)
  differs from srcdir (where mysql_fix_privilege_tables.sql is)
config/ac-macros/yassl.m4:
  fixes for 'make dist' and 'make distcheck'
  create Makefile's only if yassl is used
  yassl_dir must not include /
config/ac-macros/zlib.m4:
  fixes for 'make dist' and 'make distcheck'
  create Makefile only if zlib is used
configure.in:
  fixes for 'make dist' and 'make distcheck'
  create Makefile only if a feature is enabled
  storage engine dirs must not include /
  automatically disable readline/libedit/sql-bench if source dir is missing
extra/Makefile.am:
  fixes for 'make dist' and 'make distcheck'
  remove SUBDIR/DIST_SUBDIR hack
libmysql_r/Makefile.am:
  fixes for 'make dist' and 'make distcheck'
  when symlinking all files from libmysql/ take into account that
  srcdir != builddir
libmysqld/Makefile.am:
  fixes for 'make dist' and 'make distcheck'
  remove fragile promiscuous search for object files
  if .o file is not where we look for it - extract it from the library
mysql-test/ndb/Makefile.am:
  fixes for 'make dist' and 'make distcheck'
  ndbcluster script is not a "source"
  don't forget to cleanup
plugin/Makefile.am:
  fixes for 'make dist' and 'make distcheck'
  include plugin/fulltext/configure.in template in the distribution
storage/Makefile.am:
  fixes for 'make dist' and 'make distcheck'
  remove SUBDIRS/DIST_SUBDIRS hack
storage/ndb/Makefile.am:
  fixes for 'make dist' and 'make distcheck'
  force common.mk.am out of DIST_COMMON (which is otherwise an
  auto-generated list of Makefile's sources) because it's listed
  indirectly in EXTRA_DIST, and with bk -r get, a file cannot be copied
  twice.
 2006-04-12 14:08:24 +02:00
unknown
bcb8188758 Implement --warning-mode in SETUP.sh. The value of the 
argument can be either "pedantic" or "old" (actually, or anything
else). In case of "pedantic" mode, use -ansi -pedantic compilation
flags. Fix the build to compile in pedantic mode. (Version 3 of
the patch, with after-review fixes)


BUILD/SETUP.sh:
  Implement --warning-mode in SETUP.sh. The value of the
  argument can be either "pedantic" or "old" (actually, or anything
  else). In case of "pedantic" mode, use -ansi -pedantic compilation
  flags.
BUILD/compile-pentium-debug-max-no-embedded:
  Rename base_max_configs to base_no_embedded_configs
BUILD/compile-pentium-debug-max:
  Use double quotes around $@
BUILD/compile-pentium-valgrind-max:
  Pass command line arguments to SETUP.sh. Allows calling
  compile-pentium-valgrind-max --warning-mode=pedantic
include/my_global.h:
  Remove an unnecessary ifdef: -pedantic hides the system-wide
  definition of ulong on Linux. In case there is no -pedantic, 
  the system-wide definition is available and HAVE_ULONG is defined
  by configure.
 2006-04-07 02:25:59 +04:00
unknown
d99350842a Remove dead code from BUILD/ scripts: $debug_extra_warnings is 
never defined.
It was used at some point to add -Wuninitialized to debug flags, 
but not any more. If there is still need to add -Wunitialized,
it can be added directly to $global_warnings.


BUILD/compile-amd64-debug-max-no-ndb:
  Remove a no-op.
BUILD/compile-amd64-debug-max:
  Remove a no-op.
BUILD/compile-darwin-mwcc:
  Remove a no-op.
BUILD/compile-pentium-debug-max-no-embedded:
  Remove a no-op.
BUILD/compile-pentium-debug-max-no-ndb:
  Remove a no-op.
BUILD/compile-pentium-debug-max:
  Remove a no-op.
BUILD/compile-pentium-debug-openssl:
  Remove a no-op.
BUILD/compile-pentium-debug-yassl:
  Remove a no-op.
BUILD/compile-pentium-debug:
  Remove a no-op.
BUILD/compile-pentium-mysqlfs-debug:
  Remove a no-op.
BUILD/compile-pentium-valgrind-max:
  Remove a no-op.
BUILD/compile-pentium64-debug-max:
  Remove a no-op.
BUILD/compile-pentium64-debug:
  Remove a no-op.
BUILD/compile-pentium64-valgrind-max:
  Remove a no-op.
BUILD/compile-ppc-debug-max-no-ndb:
  Remove a no-op.
BUILD/compile-ppc-debug-max:
  Remove a no-op.
BUILD/compile-ppc-debug:
  Remove a no-op.
 2006-04-05 17:50:33 +04:00
unknown
fb4bd32a37 Remove dead code from BUILD/ scripts. 
BUILD/SETUP.sh:
  Remove dead options.
BUILD/compile-amd64-debug-max-no-ndb:
  Remove dead options.
BUILD/compile-amd64-debug-max:
  Remove dead options.
BUILD/compile-amd64-max:
  Remove dead options.
BUILD/compile-darwin-mwcc:
  Remove dead options.
BUILD/compile-pentium-debug-max-no-embedded:
  Remove dead options.
BUILD/compile-pentium-debug-max-no-ndb:
  Remove dead options.
BUILD/compile-pentium-debug-max:
  Remove dead options.
BUILD/compile-pentium-icc-valgrind-max:
  Remove dead options.
BUILD/compile-pentium-max:
  Remove dead options.
BUILD/compile-pentium-valgrind-max:
  Remove dead options. There is no ISAM any more.
BUILD/compile-pentium64-debug-max:
  Remove dead options.
BUILD/compile-pentium64-valgrind-max:
  Remove dead options. There is no ISAM any more.
BUILD/compile-ppc-debug-max-no-ndb:
  Remove dead options.
BUILD/compile-ppc-debug-max:
  Remove dead options.
BUILD/compile-ppc-max:
  Remove dead options.
 2006-04-05 16:50:12 +04:00
unknown
e22f7abac9 include example storage engines in max build 2006-04-03 11:51:57 -07:00
unknown
150d8d3564 Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new 
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826


configure.in:
  Auto merged
BUILD/SETUP.sh:
  Auto merged
include/my_dbug.h:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/ha_partition.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/partition_info.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/ndb_partition_key.result:
  manual merge
mysql-test/t/ndb_partition_key.test:
  manual merge
sql/ha_partition.cc:
  manual merge
 2006-04-01 16:31:53 -05:00
unknown
8505322d1b Merge neptunus.(none):/home/msvensson/mysql/bug18310/my50-bug18310 
into  neptunus.(none):/home/msvensson/mysql/bug18310/my51-bug18310


BUILD/SETUP.sh:
  Auto merged
 2006-03-21 11:24:15 +01:00
unknown
9cccdf4df4 Use yaSSL as default for BUILD/* scripts 2006-03-21 11:21:52 +01:00
unknown
e254606f0b WL #2826: Sixth step, made it work with test cases 
BUILD/SETUP.sh:
  Fixed BUILD scripts
BUILD/compile-pentium-debug-max:
  Fixed BUILD scripts
sql/ha_partition.cc:
  Need to handle states differently when creating handler files
sql/mysql_priv.h:
  Some error inject fixes
sql/mysqld.cc:
  Some error inject fixes
sql/set_var.cc:
  Some error inject fixes
sql/sql_partition.cc:
  Fixing a bug with generate partition syntax
  A number of fixes
sql/sql_table.cc:
  Fix a few bugs
sql/table.cc:
  fix
 2006-02-03 12:05:29 -05:00
unknown
520dffb520 WL 2826: First step in error handling of ALTER TABLE for partitioning 
BUILD/SETUP.sh:
  Add possibility for BUILD scripts to add error inject flag
BUILD/compile-pentium-debug-max:
  Add error inject flag to this script
configure.in:
  Add handling of --with-error-inject in configure script
sql/ha_ndbcluster.cc:
  Add possibility to rename handler file
sql/ha_ndbcluster.h:
  Add possibility to rename handler file
sql/ha_partition.cc:
  Add possibility to rename handler file
sql/ha_partition.h:
  Add possibility to rename handler file
sql/handler.h:
  Add possibility to rename handler file
sql/mysql_priv.h:
  Add error inject macros
sql/mysqld.cc:
  Add error inject system variables
sql/set_var.cc:
  Add error inject system variables
sql/sql_class.h:
  Add error inject system variables
sql/sql_table.cc:
  Start modifying code for introducing table log, Step 1
sql/unireg.cc:
  Add rename flag to handler file call
sql/sql_partition.cc:
  Changes to ADD/DROP/CHANGE partitions
 2006-02-01 10:06:07 +01:00
unknown
015157fd9b Fix for the test failure of binlog_row_ctype_cp932. Note that since we pushed row-based replication, 
"make test" != "mysql-test-run && mysql-test-run --ps-protocol". "make test" is what should be used;
had it been, the failure would have been noticed earlier. Putting back cxx flags I had by accident removed.
Disclaimer: 5.1-new is in a sorry state: log_tables and some ndb* fail, mysqlslap test crashes randomly in a row-based replication assertion (sql_class.cc:2207). 


BUILD/SETUP.sh:
  Putting back flags which I, by accident, removed during the push of row-based replication (I had removed
  them in my tree because they cause tens of wrong warnings with my gcc4.0.0, and committed that by accident).
mysql-test/r/binlog_row_ctype_cp932.result:
  result update (people should run "make test" now, it tests row-based replication too).
 2006-01-23 22:17:12 +01:00
unknown
4777b9ae49 revert change to SETUP.sh which went through with my push of WL#1034 
BUILD/SETUP.sh:
  go back to -01 and reporting usage of uninitialized variables
 2006-01-12 11:51:34 +01:00
unknown
bb0b7f5dda WL #1034 (Internal CRON) 
merge before push


BUILD/SETUP.sh:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp.h:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/tztime.cc:
  Auto merged
libmysqld/Makefile.am:
  manual merge
mysql-test/r/information_schema.result:
  manual merge
sql/share/errmsg.txt:
  manual merge
sql/sp_head.cc:
  manual merge
sql/sql_lex.h:
  manual merge
sql/sql_yacc.yy:
  manual merge
 2006-01-10 21:02:19 +01:00
unknown
d30410d31b New amd64 no-ndb build script. 
BUILD/compile-amd64-debug-max-no-ndb:
  New no-ndb amd64 build script.
 2005-12-30 08:06:00 -08:00
unknown
09346e6e2d WL#1012: All changes as one single changeset. 
This includes both code and test cases.


BitKeeper/deleted/.del-ctype_ucs_binlog.result~280d136b1a0bcf17:
  Delete: mysql-test/r/ctype_ucs_binlog.result
BitKeeper/deleted/.del-rpl_delete_all.result~7c050d592614b3f:
  Delete: mysql-test/r/rpl_delete_all.result
BitKeeper/deleted/.del-rpl000013-slave.opt~18266ad8a2403e8d:
  Delete: mysql-test/t/rpl000013-slave.opt
BitKeeper/deleted/.del-rpl_delete_all.test~700a1490277780e0:
  Delete: mysql-test/t/rpl_delete_all.test
mysql-test/extra/binlog_tests/binlog.test:
  Import patch wl1012.patch
mysql-test/extra/binlog_tests/blackhole.test:
  Import patch wl1012.patch
mysql-test/extra/binlog_tests/ctype_cp932.test:
  Import patch wl1012.patch
mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
  Import patch wl1012.patch
mysql-test/extra/binlog_tests/ctype_ucs_binlog.test:
  Import patch wl1012.patch
mysql-test/extra/binlog_tests/drop_temp_table.test:
  Import patch wl1012.patch
mysql-test/extra/binlog_tests/insert_select-binlog.test:
  Import patch wl1012.patch
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Import patch wl1012.patch
mysql-test/extra/rpl_tests/rpl_ddl.test:
  Import patch wl1012.patch
mysql-test/extra/rpl_tests/rpl_deadlock.test:
  Import patch wl1012.patch
mysql-test/extra/rpl_tests/rpl_err_ignoredtable.test:
  Import patch wl1012.patch
mysql-test/extra/rpl_tests/rpl_flsh_tbls.test:
  Import patch wl1012.patch
mysql-test/extra/rpl_tests/rpl_loaddata_m.test:
  Import patch wl1012.patch
mysql-test/extra/rpl_tests/rpl_log.test:
  Import patch wl1012.patch
mysql-test/extra/rpl_tests/rpl_max_relay_size.test:
  Import patch wl1012.patch
mysql-test/extra/rpl_tests/rpl_multi_query.test:
  Import patch wl1012.patch
mysql-test/extra/rpl_tests/rpl_reset_slave.test:
  Import patch wl1012.patch
mysql-test/extra/rpl_tests/rpl_stm_000001.test:
  Import patch wl1012.patch
mysql-test/extra/rpl_tests/rpl_stm_EE_err.test:
  Import patch wl1012.patch
mysql-test/extra/rpl_tests/rpl_stm_charset.test:
  Import patch wl1012.patch
mysql-test/extra/rpl_tests/rpl_user_variables.test:
  Import patch wl1012.patch
mysql-test/r/binlog_stm_binlog.result:
  Import patch wl1012.patch
mysql-test/r/binlog_stm_blackhole.result:
  Import patch wl1012.patch
mysql-test/r/binlog_stm_ctype_cp932.result:
  Import patch wl1012.patch
mysql-test/r/binlog_stm_ctype_ucs.result:
  Import patch wl1012.patch
mysql-test/r/binlog_stm_drop_tmp_tbl.result:
  Import patch wl1012.patch
mysql-test/r/binlog_stm_insert_select.result:
  Import patch wl1012.patch
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
  Import patch wl1012.patch
mysql-test/r/rpl_000012.result:
  Import patch wl1012.patch
mysql-test/r/rpl_000015.result:
  Import patch wl1012.patch
mysql-test/r/rpl_deadlock_innodb.result:
  Import patch wl1012.patch
mysql-test/r/rpl_flushlog_loop.result:
  Import patch wl1012.patch
mysql-test/r/rpl_loaddata_s.result:
  Import patch wl1012.patch
mysql-test/r/rpl_stm_000001.result:
  Import patch wl1012.patch
mysql-test/r/rpl_stm_EE_err.result:
  Import patch wl1012.patch
mysql-test/r/rpl_stm_charset.result:
  Import patch wl1012.patch
mysql-test/r/rpl_stm_ddl.result:
  Import patch wl1012.patch
mysql-test/r/rpl_stm_err_ignoredtable.result:
  Import patch wl1012.patch
mysql-test/r/rpl_stm_flsh_tbls.result:
  Import patch wl1012.patch
mysql-test/r/rpl_stm_loaddata_m.result:
  Import patch wl1012.patch
mysql-test/r/rpl_stm_log.result:
  Import patch wl1012.patch
mysql-test/r/rpl_stm_max_relay_size.result:
  Import patch wl1012.patch
mysql-test/r/rpl_stm_multi_query.result:
  Import patch wl1012.patch
mysql-test/r/rpl_stm_mystery22.result:
  Import patch wl1012.patch
mysql-test/r/rpl_stm_reset_slave.result:
  Import patch wl1012.patch
mysql-test/r/rpl_stm_rewrt_db.result:
  Import patch wl1012.patch
mysql-test/r/rpl_stm_sp.result:
  Import patch wl1012.patch
mysql-test/r/rpl_stm_timezone.result:
  Import patch wl1012.patch
mysql-test/r/rpl_stm_until.result:
  Import patch wl1012.patch
mysql-test/r/rpl_stm_user_variables.result:
  Import patch wl1012.patch
mysql-test/r/rpl_stm_view.result:
  Import patch wl1012.patch
mysql-test/t/binlog_row_binlog-master.opt:
  Import patch wl1012.patch
mysql-test/t/rpl_000012.test:
  Import patch wl1012.patch
mysql-test/t/rpl_000015-slave.sh:
  Import patch wl1012.patch
mysql-test/t/rpl_000015.slave-mi:
  Import patch wl1012.patch
mysql-test/t/rpl_000015.test:
  Import patch wl1012.patch
mysql-test/t/rpl_deadlock_innodb-slave.opt:
  Import patch wl1012.patch
mysql-test/t/rpl_flushlog_loop-master.opt:
  Import patch wl1012.patch
mysql-test/t/rpl_flushlog_loop-master.sh:
  Import patch wl1012.patch
mysql-test/t/rpl_flushlog_loop-slave.opt:
  Import patch wl1012.patch
mysql-test/t/rpl_flushlog_loop-slave.sh:
  Import patch wl1012.patch
mysql-test/t/rpl_flushlog_loop.test:
  Import patch wl1012.patch
mysql-test/t/rpl_loaddata_s-slave.opt:
  Import patch wl1012.patch
mysql-test/t/rpl_loaddata_s.test:
  Import patch wl1012.patch
mysql-test/t/rpl_stm_000001-slave.opt:
  Import patch wl1012.patch
mysql-test/t/rpl_stm_err_ignoredtable-slave.opt:
  Import patch wl1012.patch
mysql-test/t/rpl_stm_loaddata_m-master.opt:
  Import patch wl1012.patch
mysql-test/t/rpl_stm_log-master.opt:
  Import patch wl1012.patch
mysql-test/t/rpl_stm_log-slave.opt:
  Import patch wl1012.patch
mysql-test/t/rpl_stm_mystery22.test:
  Import patch wl1012.patch
mysql-test/t/rpl_stm_rewrt_db-slave.opt:
  Import patch wl1012.patch
mysql-test/t/rpl_stm_rewrt_db.test:
  Import patch wl1012.patch
mysql-test/t/rpl_stm_sp-master.opt:
  Import patch wl1012.patch
mysql-test/t/rpl_stm_sp-slave.opt:
  Import patch wl1012.patch
mysql-test/t/rpl_stm_sp.test:
  Import patch wl1012.patch
mysql-test/t/rpl_stm_timezone-master.opt:
  Import patch wl1012.patch
mysql-test/t/rpl_stm_timezone-slave.opt:
  Import patch wl1012.patch
BUILD/SETUP.sh:
  Import patch wl1012.patch
Makefile.am:
  Import patch wl1012.patch
mysql-test/t/rpl_stm_timezone.test:
  Import patch wl1012.patch
mysql-test/t/rpl_stm_until.test:
  Import patch wl1012.patch
mysql-test/t/rpl_stm_view.test:
  Import patch wl1012.patch
client/Makefile.am:
  Import patch wl1012.patch
client/client_priv.h:
  Import patch wl1012.patch
client/mysqlbinlog.cc:
  Import patch wl1012.patch
configure.in:
  Import patch wl1012.patch
include/Makefile.am:
  Import patch wl1012.patch
include/base64.h:
  Import patch wl1012.patch
include/config-win.h:
  Import patch wl1012.patch
include/my_base.h:
  Import patch wl1012.patch
include/my_global.h:
  Import patch wl1012.patch
mysql-test/Makefile.am:
  Import patch wl1012.patch
mysql-test/mysql-test-run.pl:
  Import patch wl1012.patch
mysql-test/mysql-test-run.sh:
  Import patch wl1012.patch
mysql-test/r/date_formats.result:
  Import patch wl1012.patch
mysql-test/r/flush_block_commit.result:
  Import patch wl1012.patch
mysql-test/r/innodb.result:
  Import patch wl1012.patch
mysql-test/r/rpl000017.result:
  Import patch wl1012.patch
mysql-test/r/rpl_change_master.result:
  Import patch wl1012.patch
mysql-test/r/rpl_commit_after_flush.result:
  Import patch wl1012.patch
mysql-test/r/rpl_create_database.result:
  Import patch wl1012.patch
mysql-test/r/rpl_do_grant.result:
  Import patch wl1012.patch
mysql-test/r/rpl_loaddata.result:
  Import patch wl1012.patch
mysql-test/r/rpl_log_pos.result:
  Import patch wl1012.patch
mysql-test/r/rpl_multi_delete.result:
  Import patch wl1012.patch
mysql-test/r/rpl_multi_update.result:
  Import patch wl1012.patch
mysql-test/r/rpl_openssl.result:
  Import patch wl1012.patch
mysql-test/r/rpl_replicate_do.result:
  Import patch wl1012.patch
mysql-test/r/rpl_rotate_logs.result:
  Import patch wl1012.patch
mysql-test/r/rpl_server_id1.result:
  Import patch wl1012.patch
mysql-test/r/rpl_server_id2.result:
  Import patch wl1012.patch
mysql-test/r/rpl_temporary.result:
  Import patch wl1012.patch
mysql-test/r/user_var-binlog.result:
  Import patch wl1012.patch
mysql-test/t/create_select_tmp.test:
  Import patch wl1012.patch
mysql-test/t/date_formats.test:
  Import patch wl1012.patch
mysql-test/t/disabled.def:
  Import patch wl1012.patch
mysql-test/t/innodb.test:
  Import patch wl1012.patch
mysql-test/t/mysqlbinlog.test:
  Import patch wl1012.patch
mysql-test/t/mysqlbinlog2.test:
  Import patch wl1012.patch
mysql-test/t/rpl000002.test:
  Import patch wl1012.patch
mysql-test/t/rpl000006.test:
  Import patch wl1012.patch
mysql-test/t/rpl000013.test:
  Import patch wl1012.patch
mysql-test/t/rpl000017.test:
  Import patch wl1012.patch
mysql-test/t/rpl_auto_increment.test:
  Import patch wl1012.patch
mysql-test/t/rpl_change_master.test:
  Import patch wl1012.patch
mysql-test/t/rpl_commit_after_flush.test:
  Import patch wl1012.patch
mysql-test/t/rpl_create_database.test:
  Import patch wl1012.patch
mysql-test/t/rpl_do_grant.test:
  Import patch wl1012.patch
mysql-test/t/rpl_drop.test:
  Import patch wl1012.patch
mysql-test/t/rpl_empty_master_crash.test:
  Import patch wl1012.patch
mysql-test/t/rpl_failed_optimize.test:
  Import patch wl1012.patch
mysql-test/t/rpl_heap.test:
  Import patch wl1012.patch
mysql-test/t/rpl_insert_id.test:
  Import patch wl1012.patch
mysql-test/t/rpl_insert_ignore.test:
  Import patch wl1012.patch
mysql-test/t/rpl_loaddata.test:
  Import patch wl1012.patch
mysql-test/t/rpl_log_pos.test:
  Import patch wl1012.patch
mysql-test/t/rpl_multi_delete.test:
  Import patch wl1012.patch
mysql-test/t/rpl_multi_update.test:
  Import patch wl1012.patch
mysql-test/t/rpl_multi_update2.test:
  Import patch wl1012.patch
mysql-test/t/rpl_multi_update3.test:
  Import patch wl1012.patch
mysql-test/t/rpl_openssl.test:
  Import patch wl1012.patch
mysql-test/t/rpl_redirect.test:
  Import patch wl1012.patch
mysql-test/t/rpl_relayrotate.test:
  Import patch wl1012.patch
mysql-test/t/rpl_replicate_do.test:
  Import patch wl1012.patch
mysql-test/t/rpl_rotate_logs.test:
  Import patch wl1012.patch
mysql-test/t/rpl_server_id1.test:
  Import patch wl1012.patch
mysql-test/t/rpl_sp_effects.test:
  Import patch wl1012.patch
mysql-test/t/rpl_temporary.test:
  Import patch wl1012.patch
mysql-test/t/rpl_trigger.test:
  Import patch wl1012.patch
mysql-test/t/sp.test:
  Import patch wl1012.patch
mysql-test/t/user_var-binlog.test:
  Import patch wl1012.patch
mysys/Makefile.am:
  Import patch wl1012.patch
mysys/base64.c:
  Import patch wl1012.patch
sql/Makefile.am:
  Import patch wl1012.patch
sql/ha_innodb.cc:
  Import patch wl1012.patch
sql/ha_innodb.h:
  Import patch wl1012.patch
sql/ha_partition.cc:
  Import patch wl1012.patch
sql/handler.cc:
  Import patch wl1012.patch
sql/handler.h:
  Import patch wl1012.patch
sql/item_sum.cc:
  Import patch wl1012.patch
sql/log.cc:
  Import patch wl1012.patch
sql/log_event.cc:
  Import patch wl1012.patch
sql/log_event.h:
  Import patch wl1012.patch
sql/mysql_priv.h:
  Import patch wl1012.patch
sql/mysqld.cc:
  Import patch wl1012.patch
sql/rpl_filter.h:
  Import patch wl1012.patch
sql/set_var.cc:
  Import patch wl1012.patch
sql/share/errmsg.txt:
  Import patch wl1012.patch
sql/slave.cc:
  Import patch wl1012.patch
sql/slave.h:
  Import patch wl1012.patch
sql/sp.cc:
  Import patch wl1012.patch
sql/sp_head.cc:
  Import patch wl1012.patch
sql/sql_acl.cc:
  Import patch wl1012.patch
sql/sql_base.cc:
  Import patch wl1012.patch
sql/sql_class.cc:
  Import patch wl1012.patch
sql/sql_class.h:
  Import patch wl1012.patch
sql/sql_delete.cc:
  Import patch wl1012.patch
sql/sql_insert.cc:
  Import patch wl1012.patch
sql/sql_lex.h:
  Import patch wl1012.patch
sql/sql_list.h:
  Import patch wl1012.patch
sql/sql_load.cc:
  Import patch wl1012.patch
sql/sql_parse.cc:
  Import patch wl1012.patch
sql/sql_plugin.cc:
  Import patch wl1012.patch
sql/sql_rename.cc:
  Import patch wl1012.patch
sql/sql_repl.h:
  Import patch wl1012.patch
sql/sql_select.cc:
  Import patch wl1012.patch
sql/sql_show.cc:
  Import patch wl1012.patch
sql/sql_table.cc:
  Import patch wl1012.patch
sql/sql_udf.cc:
  Import patch wl1012.patch
sql/sql_union.cc:
  Import patch wl1012.patch
sql/sql_update.cc:
  Import patch wl1012.patch
sql/sql_yacc.yy:
  Import patch wl1012.patch
sql/table.cc:
  Import patch wl1012.patch
sql/table.h:
  Import patch wl1012.patch
storage/innobase/include/lock0lock.h:
  Import patch wl1012.patch
storage/innobase/include/row0mysql.h:
  Import patch wl1012.patch
storage/innobase/include/row0vers.h:
  Import patch wl1012.patch
storage/innobase/lock/lock0lock.c:
  Import patch wl1012.patch
storage/innobase/row/row0mysql.c:
  Import patch wl1012.patch
storage/innobase/row/row0sel.c:
  Import patch wl1012.patch
storage/innobase/row/row0vers.c:
  Import patch wl1012.patch
 2005-12-22 06:39:02 +01:00
unknown
a5ecdebac3 Merge 
configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/r/ndb_multi.result:
  Auto merged
mysql-test/r/skip_name_resolve.result:
  Auto merged
mysql-test/r/type_time.result:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
mysql-test/t/ndb_multi.test:
  Auto merged
mysql-test/t/skip_name_resolve.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
storage/ndb/src/ndbapi/NdbImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
zlib/Makefile.am:
  Auto merged
 2005-12-18 18:11:19 +01:00
unknown
a3a5df43a5 Makefile.am: 
Added 5.0 specific build scripts


BUILD/Makefile.am:
  Added 5.0 specific build scripts
 2005-12-18 15:07:58 +01:00
unknown
de1c06b9a2 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0


BUILD/Makefile.am:
  Auto merged
 2005-12-18 15:02:13 +01:00
unknown
aa6d8551f8 Merge 2005-12-18 14:55:05 +01:00
unknown
e97a4a4a17 Makefile.am: 
Adjusted listing of files to put into source TAR
 2005-12-18 14:51:19 +01:00
unknown
b67555d5d4 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl1034 
into lmy004.:/work/mysql-5.1-tt-copy-works


libmysqld/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/table.cc:
  Auto merged
 2005-12-14 12:15:48 +01:00
unknown
4d891eb91c WL1034 update for latest 5.1 sources 
BUILD/SETUP.sh:
  for now no optimizations in debug build - get rid of "value optimized out"
 2005-12-02 13:07:02 +01:00
unknown
fc289724bb check-cpu: 
Add XEON detection (fix)


BUILD/check-cpu:
  Add XEON detection (fix)
 2005-11-30 09:57:40 +01:00
unknown
e040ac612f Compile more stuff during make dist to detect more errors already during bootstrap. 2005-11-25 10:48:42 +01:00
unknown
36dd2cf625 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.1-new


sql/lock.cc:
  Auto merged
 2005-11-21 15:31:12 -08:00
unknown
533194971a BUG #14524 
Post-review fixes to original changeset http://lists.mysql.com/internals/32422


BUILD/SETUP.sh:
  BUG #14524
  
  Added flags to no-ndb build script to include archive.
mysql-test/r/partition.result:
  BUG #14524 
  
  Post review mods to test results
mysql-test/t/partition.test:
  BUG #14524
  
  Post review mods to test
sql/ha_partition.cc:
  BUG# 14524
  
  Post review modifications to code - removed if, just pass m_no_locks
 2005-11-21 15:21:04 -08:00
unknown
41de6f9a7c Merge mysql.com:/home/mysql_src/mysql-5.0 
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0 (not all files are good,
I'll fix; I'll ask some devs to check their part)


BitKeeper/etc/ignore:
  auto-union
include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/myisam/mi_key.c:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
configure.in:
  merge
mysql-test/r/ps_1general.result:
  merge ("ul", will fix)
sql/examples/ha_tina.cc:
  merge
sql/ha_innodb.cc:
  merge
sql/handler.h:
  merge
sql/log.cc:
  merge
sql/set_var.cc:
  merge
sql/share/errmsg.txt:
  merge (bad, will fix)
sql/sql_show.cc:
  merge (bad, will fix)
sql/sql_yacc.yy:
  merge
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  merge
 2005-11-18 16:38:01 +01:00
unknown
2d4711a1b2 unneeded files 
BitKeeper/deleted/.del-compile-sap-debug~d5408f42e7872e6e:
  Delete: BUILD/compile-sap-debug
BitKeeper/deleted/.del-compile-sap~a5a15ffc19b27505:
  Delete: BUILD/compile-sap
 2005-11-11 10:54:01 +01:00
unknown
50f48187f2 Fix for BUG#14703 "Valgrind error when inserting 0 into a BIT column (like in type_bit.test)": 
test "length" first (otherwise when "length" is 0, the *from invalid access still triggers a Valgrind warning).
I wrote to the Valgrind authors in case this is something fixable in Valgrind (normally the
decision to issue a warning is based on the simulated CPU condition code, which should not be undefined here).


BUILD/compile-pentium64-valgrind-max:
  putting this script in sync with compile-pentium-valgrind-max, otherwise we didn't have the federated engine compiled in.
mysql-test/r/read_only.result:
  result update
sql/field.cc:
  To avoid a Valgrind warning running the type_bit test: test "length" first (otherwise when "length" is 0, the *from invalid access still triggers a Valgrind warning).
 2005-11-07 16:18:46 +01:00
unknown
2361720c98 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1


BUILD/FINISH.sh:
  Auto merged
BitKeeper/deleted/.del-makefilewin.i~5c8479dcb8a455b2:
  Auto merged
BitKeeper/deleted/.del-makefilewin~13888739357b3025:
  Auto merged
BitKeeper/deleted/.del-makefilewin~14f24a4a173e2fcd:
  Auto merged
BitKeeper/deleted/.del-makefilewin~15e9e5c9e8fa870b:
  Auto merged
BitKeeper/deleted/.del-makefilewin~1c53f31b88dd36e:
  Auto merged
BitKeeper/deleted/.del-makefilewin~1dbc058d76ebf1db:
  Auto merged
BitKeeper/deleted/.del-makefilewin~2e0407fe123f8365:
  Auto merged
BitKeeper/deleted/.del-makefilewin~2fc379bd4065c995:
  Auto merged
BitKeeper/deleted/.del-makefilewin~389ee2dcf79afb79:
  Auto merged
BitKeeper/deleted/.del-makefilewin~4d139e182457e553:
  Auto merged
BitKeeper/deleted/.del-makefilewin~5104767c73775697:
  Auto merged
BitKeeper/deleted/.del-makefilewin~608ed49dcd88e0f7:
  Auto merged
BitKeeper/deleted/.del-makefilewin~63acd666293282a:
  Auto merged
BitKeeper/deleted/.del-makefilewin~6ba64863bce3d0b8:
  Auto merged
BitKeeper/deleted/.del-makefilewin~72a64128bacce71b:
  Auto merged
BitKeeper/deleted/.del-makefilewin~78000390c783b1c5:
  Auto merged
BitKeeper/deleted/.del-makefilewin~7a9d7d5a42bbfaf5:
  Auto merged
Makefile.am:
  Auto merged
BitKeeper/deleted/.del-makefilewin~a40ea12eebdd6ef0:
  Auto merged
BitKeeper/deleted/.del-makefilewin~aeea7c82f21f7cf5:
  Auto merged
BitKeeper/deleted/.del-makefilewin~b643e38d8da389ac:
  Auto merged
BitKeeper/deleted/.del-makefilewin~c7b621c745e5de95:
  Auto merged
BitKeeper/deleted/.del-makefilewin~c8273a47b90f52bb:
  Auto merged
BitKeeper/deleted/.del-makefilewin~d1a9d1f7d33fcb73:
  Auto merged
BitKeeper/deleted/.del-makefilewin~d37b6b303348c871:
  Auto merged
BitKeeper/deleted/.del-makefilewin~d90f35fdc3f2ee5f:
  Auto merged
BitKeeper/deleted/.del-makefilewin~dc4b8ad5ea53bd:
  Auto merged
BitKeeper/deleted/.del-makefilewin~dea10ec1c94f7be:
  Auto merged
BitKeeper/deleted/.del-makefilewin~ef3a208fa0e9b0db:
  Auto merged
BitKeeper/deleted/.del-makefilewin~f1e3b890aa1c9ea3:
  Auto merged
BitKeeper/deleted/.del-makefilewin~f4b7b99a887b7de:
  Auto merged
BitKeeper/deleted/.del-makefilewin~fdda94ad32fa9e34:
  Auto merged
BitKeeper/deleted/.del-my_cnf~977f69858affc57b:
  Auto merged
BitKeeper/etc/config:
  Auto merged
VC++Files/libmysqld/libmysqld.dsp:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Auto merged
client/mysqltest.c:
  Auto merged
include/Makefile.am:
  Auto merged
include/base64.h:
  Auto merged
include/my_base.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/r/ndb_condition_pushdown.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysys/Makefile.am:
  Auto merged
mysys/base64.c:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_berkeley.h:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
storage/heap/_check.c:
  Auto merged
storage/heap/hp_create.c:
  Auto merged
storage/innobase/include/Makefile.am:
  Auto merged
storage/innobase/include/rem0rec.h:
  Auto merged
storage/innobase/include/rem0rec.ic:
  Auto merged
storage/innobase/row/row0ins.c:
  Auto merged
storage/innobase/row/row0upd.c:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_delete.c:
  Auto merged
storage/myisam/mi_rkey.c:
  Auto merged
storage/myisam/mi_rnext_same.c:
  Auto merged
storage/myisam/mi_search.c:
  Auto merged
storage/myisam/mi_write.c:
  Auto merged
storage/myisam/myisamchk.c:
  Auto merged
storage/myisam/myisamdef.h:
  Auto merged
storage/myisam/sort.c:
  Auto merged
storage/myisammrg/myrg_queue.c:
  Auto merged
storage/ndb/config/type_util.mk.am:
  Auto merged
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  Auto merged
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
storage/ndb/include/mgmapi/ndbd_exit_codes.h:
  Auto merged
storage/ndb/include/transporter/TransporterCallback.hpp:
  Auto merged
storage/ndb/src/common/mgmcommon/IPCConfig.cpp:
  Auto merged
storage/ndb/src/common/transporter/SHM_Transporter.cpp:
  Auto merged
storage/ndb/src/common/transporter/SHM_Transporter.hpp:
  Auto merged
storage/ndb/src/common/transporter/SHM_Transporter.unix.cpp:
  Auto merged
storage/ndb/src/common/transporter/SHM_Transporter.win32.cpp:
  Auto merged
storage/ndb/src/common/transporter/Transporter.hpp:
  Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
storage/ndb/src/common/util/Makefile.am:
  Auto merged
storage/ndb/src/common/util/Parser.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
  Auto merged
storage/ndb/src/kernel/vm/FastScheduler.cpp:
  Auto merged
storage/ndb/src/kernel/vm/TransporterCallback.cpp:
  Auto merged
storage/ndb/src/kernel/vm/VMSignal.hpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBackup.cpp:
  Auto merged
storage/ndb/test/ndbapi/testOperations.cpp:
  Auto merged
storage/ndb/test/src/HugoCalculator.cpp:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
BUILD/SETUP.sh:
  manual merge
configure.in:
  manual merge
mysql-test/r/alter_table.result:
  manual merge
sql/handler.cc:
  manual merge
sql/mysql_priv.h:
  manual merge
sql/records.cc:
  manual merge
sql/share/errmsg.txt:
  manual merge
sql/sql_table.cc:
  manual merge
  Fix labels
sql/sql_update.cc:
  manual merge
sql/table.cc:
  manual merge
sql/unireg.cc:
  manual merge
storage/ndb/config/type_ndbapi.mk.am:
  manual merge
 2005-11-05 01:32:55 +02:00
unknown
8a4c773a7b Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp


mysql-test/mysql-test-run.sh:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.result:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.test:
  Auto merged
Makefile.am:
  Merged from 4.1
 2005-11-03 15:01:04 +02:00
unknown
1484d54821 Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1


Makefile.am:
  Merged from 4.0
mysql-test/mysql-test-run.sh:
  Merged from 4.0
 2005-11-03 13:02:05 +02:00
unknown
9a71442067 Added new build script for pentium64. 2005-11-03 11:19:06 +02:00
unknown
d76d9dcded Use --with-openssl instead of --with-yassl for now 
BUILD/SETUP.sh:
  Use --with-openssl instead of --with-yassl for now
  (We need to fix that libmysqlclient_r links with a -PIC compiled yassl library before enabling yassl)
 2005-11-02 15:45:25 +02:00
unknown
a9b6631888 Build max builds with --yassl instead of openssl 
BUILD/SETUP.sh:
  Build with --yassl instead of openssl
 2005-11-02 14:57:18 +02:00
unknown
2dcc6cbea3 Add missing return 
Compile max with --yassl instead of --with-openssl


sql/table.cc:
  Add missing return
BUILD/SETUP.sh:
  Compile max with --yassl instead of --with-openssl
 2005-11-01 21:57:24 +02:00
unknown
8b1a32aead Merge mysql.com:/home/mysql_src/mysql-4.1 
into  mysql.com:/home/mysql_src/mysql-5.0;
a very bad automerge (issues with non-ascii chars), plus some hard conflicts I'll fix by hand in a next cset


BitKeeper/deleted/.del-compile-pentium64-valgrind-max:
  Delete: BUILD/compile-pentium64-valgrind-max
BitKeeper/etc/config:
  Auto merged
sql/log.cc:
  Auto merged
sql/slave.h:
  Auto merged
client/mysqltest.c:
  manual merge
mysql-test/r/subselect.result:
  manual merge
mysql-test/t/subselect.test:
  manual merge
sql/log_event.cc:
  manual merge
sql/log_event.h:
  manual merge
sql/slave.cc:
  manual merge
sql/sql_yacc.yy:
  manual merge
 2005-10-12 21:58:02 +02:00
unknown
61dfc3347f merge 2005-10-12 13:31:48 +02:00
unknown
c2621f3dcb Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0


BUILD/SETUP.sh:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/information_schema_inno.result:
  Auto merged
mysql-test/r/multi_statement.result:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/temp_table.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/information_schema_inno.test:
  Auto merged
mysql-test/t/multi_statement.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/temp_table.test:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/structs.h:
  Auto merged
sql/table.h:
  Auto merged
strings/decimal.c:
  Auto merged
sql/sql_parse.cc:
  manual merge
sql/sql_prepare.cc:
  manual merge
sql/table.cc:
  manual merge
 2005-10-08 03:37:23 +03:00
unknown
c807724f36 Review of code pushed since last 5.0 pull: 
Ensure that ccache is also used for C programs
mysql: Ensure that 'delimiter' works the same way in batch mode as in normal mode
mysqldump: Change to use ;; (instead of //) as a stored procedure/trigger delimiter
Fixed test cases by adding missing DROP's and rename views to be of type 'v#'
Removed MY_UNIX_PATH from fn_format()
Removed current_db_used from TABLE_LIST
Removed usage of 'current_thd' in Item_splocal
Removed some compiler warnings
A bit faster longlong2str code



BUILD/FINISH.sh:
  Ensure that ccache is also used for C programs
BUILD/SETUP.sh:
  Ensure that ccache is also used for C programs
client/mysql.cc:
  More debugging
  Ensure that 'delimiter' works the same way in batch mode as in normal mode.
  Compare 'delimiter' command case-insensitive.
  The above fixes the delimiter bugs so that we can now use ;; as a trigger/SP function delimiter in mysqldump.
client/mysqldump.c:
  Indentation fixes
  Use ;; as a delmimiter for stored procedures and triggers instead of //
client/mysqltest.c:
  Indentation fixes
include/my_sys.h:
  Remove not needed MY_UNIX_PATH parameter
mysql-test/r/alter_table.result:
  Better to reuse mysqltest database (test didn't properly delete mysqltest1 at start)
mysql-test/r/func_str.result:
  More testing of CONV() (to ensure that longlong2str() works correctly)
mysql-test/r/information_schema.result:
  Drop all used tables and views
  Rename view tables to 'v#' to ensure that if this test fails, not a lot of other test fails
mysql-test/r/information_schema_inno.result:
  Drop all used tables
mysql-test/r/multi_statement.result:
  Drop used tables
mysql-test/r/mysql.result:
  Add error messages to result
mysql-test/r/mysqldump.result:
  ;; is now used as SP/trigger delimiter
mysql-test/r/mysqlshow.result:
  Drop used tables
mysql-test/r/temp_table.result:
  Drop used views
  Rename views to v#
mysql-test/t/alter_table.test:
  Better to reuse mysqltest database (test didn't properly delete mysqltest1 at start)
mysql-test/t/func_str.test:
  More testing of CONV() (to ensure that longlong2str() works correctly)
mysql-test/t/information_schema.test:
  Drop all used tables and views
  Rename view tables to 'v#' to ensure that if this test fails, not a lot of other test fails
mysql-test/t/information_schema_inno.test:
  Drop all used tables
mysql-test/t/multi_statement.test:
  Drop used tables
mysql-test/t/mysql.test:
  Add error messages to result
mysql-test/t/mysqlshow.test:
  Drop used tables
mysql-test/t/temp_table.test:
  Drop used views
  Rename views to v#
mysys/mf_format.c:
  Remove not needed MY_UNIX_PATH parameter
  (This goes against how fn_format() is supposed to work and also conflicts with other options like MY_RETURN_REAL_PATH)
sql/ha_federated.cc:
  Removed extra empty line
sql/item.cc:
  Use 'str_value' instead of 'str_value_ptr' to hold result for Item_splocal
  Remove some calls to 'thd' in Item_splocal by making 'thd' a class variable
  One doesn't have to set 'null_value' when calling 'is_null()'
sql/item.h:
  Add THD as a class variable to Item_splocal
  Use 'str_value' instead of 'str_value_ptr' to hold temp result
  Fixed bug in Item_hex when used in CAST()
sql/item_func.cc:
  Optimize new code
sql/log_event.cc:
  Move 'to_unix_path()' out of fn_format()
sql/opt_range.cc:
  Simplify code
sql/sp_head.cc:
  Ensure that Item_splocal has thd set before we call '->this_item()'
sql/sql_class.cc:
  Return error if Statement::insert() fails in either hash_insert()
sql/sql_parse.cc:
  Remove 'current_db_used' as we can trivially check if db table qualifier was used without this.
  Simplify code
sql/sql_prepare.cc:
  Use enum instead of const int, to avoid ugly code for VC++
sql/structs.h:
  Remove compiler warnings when using STRING_WITH_LEN() with constant strings.
sql/table.cc:
  Fixed indentation
sql/table.h:
  Remove not needed current_db_used
strings/decimal.c:
  Simplify code
strings/longlong2str-x86.s:
  A bit faster longlong2str.
  (Took some ideas from Peter Gulutzan's code)
strings/my_strtoll10.c:
  Simplify code for MetroWerks compiler
 2005-10-06 17:54:43 +03:00
unknown
d04832d195 Merge 
BitKeeper/etc/ignore:
  auto-union
BUILD/autorun.sh:
  Auto merged
BitKeeper/deleted/.del-bdb.vcproj~ed8534936e40cefb:
  Auto merged
BitKeeper/deleted/.del-heap.vcproj~70c0cc1d680a51c1:
  Auto merged
BitKeeper/deleted/.del-innobase.vcproj~71e1de81f11138bf:
  Auto merged
BitKeeper/deleted/.del-myisam.vcproj~32bb9e4a163fcb5a:
  Auto merged
BitKeeper/deleted/.del-myisammrg.vcproj~6534e59acbfbb63:
  Auto merged
BitKeeper/deleted/.del-mysqld.vcproj~703886a28862bb2:
  Auto merged
Makefile.am:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_global.h:
  Auto merged
include/mysql_com.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/ndb_alter_table.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysys/default.c:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_berkeley.h:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
sql/unireg.cc:
  Auto merged
storage/innobase/buf/buf0buf.c:
  Auto merged
storage/innobase/buf/buf0flu.c:
  Auto merged
storage/innobase/data/data0data.c:
  Auto merged
storage/innobase/dict/dict0dict.c:
  Auto merged
storage/innobase/include/btr0btr.h:
  Auto merged
storage/innobase/include/data0type.ic:
  Auto merged
storage/innobase/include/dict0dict.h:
  Auto merged
storage/innobase/include/dict0mem.h:
  Auto merged
storage/innobase/include/mem0mem.h:
  Auto merged
storage/innobase/include/mem0mem.ic:
  Auto merged
storage/innobase/include/os0file.h:
  Auto merged
storage/innobase/include/row0mysql.h:
  Auto merged
storage/innobase/include/trx0trx.h:
  Auto merged
storage/innobase/include/ut0mem.h:
  Auto merged
storage/innobase/mem/mem0mem.c:
  Auto merged
storage/innobase/os/os0file.c:
  Auto merged
storage/innobase/os/os0proc.c:
  Auto merged
storage/innobase/rem/rem0rec.c:
  Auto merged
storage/innobase/row/row0ins.c:
  Auto merged
storage/innobase/row/row0mysql.c:
  Auto merged
storage/innobase/srv/srv0start.c:
  Auto merged
storage/innobase/trx/trx0sys.c:
  Auto merged
storage/innobase/trx/trx0trx.c:
  Auto merged
storage/innobase/ut/ut0mem.c:
  Auto merged
storage/myisam/ft_boolean_search.c:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_dbug.c:
  Auto merged
storage/myisam/mi_delete.c:
  Auto merged
storage/myisam/mi_delete_all.c:
  Auto merged
storage/myisam/mi_key.c:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/myisam/mi_rkey.c:
  Auto merged
storage/myisam/mi_search.c:
  Auto merged
storage/myisam/mi_test1.c:
  Auto merged
storage/myisam/mi_update.c:
  Auto merged
storage/myisam/mi_write.c:
  Auto merged
storage/myisam/myisamchk.c:
  Auto merged
storage/myisam/myisamdef.h:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/myisam/sp_key.c:
  Auto merged
storage/myisammrg/myrg_rkey.c:
  Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
storage/ndb/include/kernel/signaldata/ApiVersion.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/EventReport.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/StopReq.hpp:
  Auto merged
storage/ndb/include/mgmapi/ndb_logevent.h:
  Auto merged
storage/ndb/include/ndbapi/NdbBlob.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbIndexOperation.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbRecAttr.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
storage/ndb/src/common/util/SimpleProperties.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/mgmapi/ndb_logevent.cpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Config.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Config.hpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged
storage/ndb/src/mgmsrv/InitConfigFileParser.hpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvrConfig.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.hpp:
  Auto merged
storage/ndb/src/mgmsrv/main.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbApiSignal.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbApiSignal.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbUtil.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbUtil.hpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndblist.cpp:
  Auto merged
storage/ndb/src/ndbapi/ObjectMap.hpp:
  Auto merged
storage/ndb/test/include/NDBT_Test.hpp:
  Auto merged
storage/ndb/test/ndbapi/bank/BankLoad.cpp:
  Auto merged
storage/ndb/test/ndbapi/testOIBasic.cpp:
  Auto merged
storage/ndb/test/src/HugoCalculator.cpp:
  Auto merged
storage/ndb/test/src/NDBT_Test.cpp:
  Auto merged
storage/ndb/test/src/NdbBackup.cpp:
  Auto merged
storage/ndb/test/src/NdbRestarts.cpp:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
storage/ndb/tools/restore/Restore.cpp:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
configure.in:
  merge
BUILD/SETUP.sh:
  merge
BitKeeper/deleted/.del-mysql.sln~f2120278f8a437be:
  SCCS merged
libmysqld/Makefile.am:
  merge
sql/ha_ndbcluster.cc:
  merge
sql/handler.h:
  merge
sql/mysqld.cc:
  merge
sql/opt_range.cc:
  merge
sql/slave.cc:
  merge
sql/slave.h:
  e
  merge
sql/sql_parse.cc:
  merge
sql/table.cc:
  merge
sql/examples/ha_tina.cc:
  merge
sql/examples/ha_tina.h:
  merge
sql/share/errmsg.txt:
  merge
storage/ndb/include/ndbapi/Ndb.hpp:
  merge
storage/ndb/src/common/debugger/EventLogger.cpp:
  merge
storage/ndb/src/kernel/blocks/dbdict/Makefile.am:
  merge
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  merge
storage/ndb/src/ndbapi/Ndbinit.cpp:
  SCCS merged
 2005-10-06 10:54:07 +02:00
unknown
3410309f26 Revert 
BUILD/SETUP.sh:
  Remove -ansi
 2005-10-05 14:37:42 +02:00
unknown
e484fdf5bf Revert 
BUILD/SETUP.sh:
  Remov -ansi flag
 2005-10-05 14:35:41 +02:00
unknown
91f2db942f Importing BUILD/compile-pentium64-valgrind-max from 5.0 (unchanged), and speeding up 'bk citool' for me 
BitKeeper/etc/config:
  speed up 'bk citool' for me
BUILD/compile-pentium64-valgrind-max:
  New BitKeeper file ``BUILD/compile-pentium64-valgrind-max''
 2005-10-04 22:24:04 +02:00
unknown
ee6e983c5c Move -ansi from global_warnings to cxx_warnings 2005-10-04 14:42:02 +02:00
unknown
19dffd265e Move -ansi flag from global_warnings to cxx_warnings 
BUILD/SETUP.sh:
  ansi glags should only be set for C++ compilation
 2005-10-03 16:24:47 +02:00
unknown
f3c622356f Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release


BUILD/SETUP.sh:
  Auto merged
client/mysql.cc:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/des_key_file.cc:
  Auto merged
 2005-09-30 16:37:02 +02:00
unknown
2f9e42f7eb New flags for new max-no-ndb build script to get a build that has 
everything except NDB


BUILD/SETUP.sh:
  Added base_max_no_ndb_configs so I can get a max-type build sans NDB for faster builds.
BUILD/compile-pentium-debug-max-no-ndb:
  new script to compile a max-type build sans NDB
BUILD/compile-ppc-debug-max-no-ndb:
  new script to build a max-type build sans NDB
 2005-09-29 13:45:39 -07:00
unknown
9a8482f69b Add -ansi flag when building with gcc 
BUILD/SETUP.sh:
  Add -ansi flag, make gcc not allow "C++ comments in C"
 2005-09-29 10:30:20 +02:00
unknown
ea599a0032 BUG #13511 Wrong patch pushed, fixing. 
BUILD/SETUP.sh:
  BUG #13511, wrong patch pushed, fixing.
 2005-09-28 08:04:08 -07:00
unknown
7a19e76c54 BUG #13511 
Fixed SETUP.sh to not overwrite prefix_configs, making 'make install' 
install in "/"


BUILD/SETUP.sh:
  BUG #13511
  
  test -n is for testing if a FILE is zero length! Plus, if the value is zero,
  we don't want to set it to that value, we want to leave it as it was 
  already set. We _want_ to set it _if_ it is _not_ zero. Changed to "! -z",
  which is for testing strings.
 2005-09-26 18:51:27 -07:00
unknown
f679e33cf9 Fixed a typo in handler.cc if CSV was built. I also added CSV to the default MAX builds so that more people test it. 
BUILD/SETUP.sh:
  Adding CVS engine to default max builds.
sql/handler.cc:
  Fixed typo
 2005-09-20 15:26:10 -07:00
unknown
0031af0685 Brian's "he is too lazy to commit this so Eric is going to have to do it" environmental variable hack for prefix. This allows you to just set a prefix in your profile which will be used in all of your builds. AKA you can be even lazier(!) about calling BUILD scripts. Don't blame Eric, Brian borrowed his keyboard. 
BUILD/SETUP.sh:
  Added option to set environmental variable in case you are lazy about setting prefix (ala Brian)
BUILD/autorun.sh:
  Change of syntax
 2005-09-16 18:10:36 -07:00
unknown
8a71b36dc0 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zim.(none):/home/brian/mysql/partition-5.1


BitKeeper/etc/config:
  Auto merged
Makefile.am:
  Auto merged
VC++Files/sql/mysqld.vcproj:
  Auto merged
configure.in:
  Auto merged
extra/perror.c:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysys/Makefile.am:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/examples/ha_tina.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/unireg.h:
  Auto merged
storage/innobase/lock/lock0lock.c:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_search.c:
  Auto merged
storage/myisam/myisamchk.c:
  Auto merged
storage/myisam/myisamlog.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
 2005-09-02 16:07:02 -07:00
unknown
824c6cf9c3 Fixed partition push so that it now compiles. The sinclude directory was not added which means that though the code was in the tree, it never actually compiled. I did make sure that it compiles, but there are no tests to really test functionality at this point. 
BUILD/SETUP.sh:
  Added partition engine to default max builds.
config/ac-macros/ha_partition.m4:
  Fixed spacing issue
configure.in:
  Added sinclude for partition rules
 2005-09-02 16:01:26 -07:00
unknown
7cbc039c9e Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


configure.in:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
scripts/Makefile.am:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/examples/ha_tina.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/myisam/mi_extra.c:
  Auto merged
storage/ndb/include/kernel/signaldata/FsRef.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
sql/sql_acl.cc:
  Merge 5.0 -> 5.1
storage/ndb/src/kernel/blocks/dbdih/Makefile.am:
  Merge 5.0 -> 5.1
 2005-09-02 08:59:59 +02:00
unknown
944666ef1d Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug12526/my50-bug12526
 2005-09-01 14:09:23 +02:00
unknown
e4cfbaed51 Bug #12717 yassl: Crashes in "integer.cpp" when compiled with icc 
- Temporary fix, disable x86 assembler.


BUILD/compile-pentium-icc:
  Cleanup build script for icc
extra/yassl/taocrypt/include/misc.hpp:
  Disable x86 assembler  when compiling with icc
BUILD/compile-pentium-icc-yassl:
  New BitKeeper file ``BUILD/compile-pentium-icc-yassl''
 2005-09-01 14:07:45 +02:00
unknown
5c0dc1ace8 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1


BitKeeper/deleted/.del-Grep.cpp~ad798e9ae519d667:
  Auto merged
BitKeeper/deleted/.del-Grep.hpp~b05e3af6cfabe387:
  Auto merged
BitKeeper/deleted/.del-GrepInit.cpp~df28ab3a892455fd:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~f73be89578d3b6cc:
  Auto merged
BitKeeper/deleted/.del-Makefile~b293ae88e4394490:
  Auto merged
BitKeeper/deleted/.del-Makefile~e0b7d67078f0fae0:
  Auto merged
BitKeeper/deleted/.del-grep_systab_test.cpp~c7305578bec8cb62:
  Auto merged
BitKeeper/etc/config:
  Auto merged
config/ac-macros/ha_ndbcluster.m4:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
BitKeeper/deleted/.del-testGrep.cpp~2106eb0a6bf2a1b5:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysys/Makefile.am:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_berkeley.h:
  Auto merged
sql/ha_heap.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/heap/hp_delete.c:
  Auto merged
storage/innobase/btr/btr0pcur.c:
  Auto merged
storage/innobase/btr/btr0sea.c:
  Auto merged
storage/innobase/include/read0read.h:
  Auto merged
storage/innobase/include/srv0srv.h:
  Auto merged
storage/innobase/include/trx0trx.h:
  Auto merged
storage/innobase/include/univ.i:
  Auto merged
storage/innobase/lock/lock0lock.c:
  Auto merged
storage/innobase/read/read0read.c:
  Auto merged
storage/innobase/row/row0ins.c:
  Auto merged
storage/innobase/row/row0sel.c:
  Auto merged
storage/innobase/row/row0umod.c:
  Auto merged
storage/innobase/row/row0upd.c:
  Auto merged
storage/innobase/srv/srv0srv.c:
  Auto merged
storage/innobase/srv/srv0start.c:
  Auto merged
storage/innobase/trx/trx0trx.c:
  Auto merged
storage/myisam/ft_boolean_search.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/myisammrg/myrg_static.c:
  Auto merged
storage/ndb/include/kernel/AttributeDescriptor.hpp:
  Auto merged
storage/ndb/include/kernel/BlockNumbers.h:
  Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
storage/ndb/include/kernel/kernel_types.h:
  Auto merged
storage/ndb/include/kernel/signaldata/AlterTable.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
storage/ndb/include/portlib/NdbTCP.h:
  Auto merged
storage/ndb/src/common/debugger/BlockNames.cpp:
  Auto merged
storage/ndb/src/common/logger/LogHandler.cpp:
  Auto merged
storage/ndb/src/common/portlib/NdbTCP.cpp:
  Auto merged
storage/ndb/src/common/portlib/win32/NdbTCP.c:
  Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
storage/ndb/src/kernel/Makefile.am:
  Auto merged
storage/ndb/src/kernel/SimBlockList.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/Makefile.am:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.cpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
storage/ndb/tools/Makefile.am:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Manual 5.0 - 5.1 merge
configure.in:
  Manual 5.0 - 5.1 merge
sql/mysql_priv.h:
  Manual 5.0 - 5.1 merge
sql/share/errmsg.txt:
  Manual 5.0 - 5.1 merge
sql/sql_base.cc:
  Manual 5.0 - 5.1 merge
sql/sql_prepare.cc:
  Manual 5.0 - 5.1 merge
storage/ndb/src/common/util/version.c:
  Manual 5.0 - 5.1 merge
storage/ndb/src/kernel/blocks/dblqh/Makefile.am:
  Manual 5.0 - 5.1 merge
 2005-08-25 13:11:38 -04:00
unknown
b2344cd5f9 added file missing from release to EXTRA_DIST list (bug# 12733) 2005-08-22 22:13:56 +02:00
unknown
f2cc5f25eb Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/mysql-5.0
 2005-08-16 18:39:16 -07:00
unknown
bb65b80014 Adding support for opteron optimization in build files. 2005-07-20 22:52:15 -07:00
unknown
8707870dd9 merge 
BUILD/autorun.sh:
  Auto merged
BitKeeper/deleted/.del-var:
  Delete: mysql-test/var
BitKeeper/etc/config:
  Auto merged
configure.in:
  Auto merged
mysql-test/r/information_schema_db.result:
  Auto merged
mysys/Makefile.am:
  Auto merged
mysys/default.c:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_berkeley.h:
  Auto merged
sql/ha_federated.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_bitmap.h:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/examples/ha_tina.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_create.c:
  Auto merged
storage/myisam/mi_delete.c:
  Auto merged
storage/myisam/mi_extra.c:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/myisam/mi_preload.c:
  Auto merged
storage/myisam/mi_rsame.c:
  Auto merged
storage/myisam/mi_rsamepos.c:
  Auto merged
storage/myisam/mi_search.c:
  Auto merged
storage/myisam/mi_update.c:
  Auto merged
storage/myisam/mi_write.c:
  Auto merged
storage/myisam/myisamchk.c:
  Auto merged
storage/myisam/myisamdef.h:
  Auto merged
storage/myisam/myisamlog.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/myisam/sort.c:
  Auto merged
storage/ndb/src/common/portlib/NdbMutex.c:
  Auto merged
storage/ndb/src/common/portlib/NdbThread.c:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
 2005-07-19 21:56:10 +02:00
unknown
c682570431 Fix BUILD/autorun.sh to really bail out on error. 
BUILD/autorun.sh:
  Make exit on error actually work.
 2005-07-18 21:33:05 +04:00
unknown
48995b9ab8 Added federated to max base test. 
BUILD/SETUP.sh:
  Added federated to base_max tests.
 2005-07-15 17:36:20 -07:00
unknown
ba52e741de Removed dead options, fixed pentium script to no longer ask for isam (its not included in 5.0). 
BUILD/SETUP.sh:
  Removed dead options, added blackhole option
BUILD/compile-pentium-debug-max-no-embedded:
  Updated option to remove unused option
 2005-07-15 11:15:44 -07:00
unknown
e4be45da93 Merge 
BitKeeper/etc/logging_ok:
  auto-union
BUILD/autorun.sh:
  Auto merged
BitKeeper/etc/config:
  Auto merged
Makefile.am:
  Auto merged
include/my_bitmap.h:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysys/Makefile.am:
  Auto merged
mysys/default.c:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/heap/Makefile.am:
  Auto merged
storage/heap/hp_hash.c:
  Auto merged
storage/innobase/btr/btr0btr.c:
  Auto merged
storage/innobase/btr/btr0cur.c:
  Auto merged
storage/innobase/configure.in:
  Auto merged
storage/innobase/fil/fil0fil.c:
  Auto merged
storage/innobase/ibuf/ibuf0ibuf.c:
  Auto merged
storage/innobase/include/os0file.h:
  Auto merged
storage/innobase/include/page0cur.h:
  Auto merged
storage/innobase/include/row0mysql.h:
  Auto merged
storage/innobase/include/srv0srv.h:
  Auto merged
storage/innobase/include/trx0trx.h:
  Auto merged
storage/innobase/include/trx0trx.ic:
  Auto merged
storage/innobase/lock/lock0lock.c:
  Auto merged
storage/innobase/log/log0recv.c:
  Auto merged
storage/innobase/os/os0file.c:
  Auto merged
storage/innobase/page/page0cur.c:
  Auto merged
storage/innobase/page/page0page.c:
  Auto merged
storage/innobase/rem/rem0rec.c:
  Auto merged
storage/innobase/row/row0mysql.c:
  Auto merged
storage/innobase/row/row0sel.c:
  Auto merged
storage/innobase/row/row0upd.c:
  Auto merged
storage/innobase/srv/srv0srv.c:
  Auto merged
storage/innobase/trx/trx0trx.c:
  Auto merged
storage/innobase/trx/trx0undo.c:
  Auto merged
storage/myisam/Makefile.am:
  Auto merged
storage/myisam/mi_create.c:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/myisam/mi_packrec.c:
  Auto merged
storage/myisam/mi_unique.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/myisammrg/Makefile.am:
  Auto merged
storage/ndb/include/mgmcommon/ConfigRetriever.hpp:
  Auto merged
storage/ndb/include/transporter/TransporterDefinitions.hpp:
  Auto merged
storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/mgmsrv/main.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/test/ndbapi/create_tab.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
configure.in:
  merge
mysql-test/t/disabled.def:
  merge
mysys/my_bitmap.c:
  SCCS merged
sql/ha_federated.cc:
  merge
sql/ha_innodb.cc:
  merge
sql/ha_ndbcluster.cc:
  merge
sql/mysqld.cc:
  e
  merge
sql/sql_insert.cc:
  merge
sql/sql_lex.h:
  merge
sql/sql_load.cc:
  merge
sql/sql_select.cc:
  merge
  e
  C
sql/sql_update.cc:
  merge
sql/table.cc:
  merge
 2005-07-12 20:01:22 +02:00
unknown
9603529881 Added a test for glibtoolize so that the autoconf tools that come installed on OSX will work fine (so no need to replace them). 
BUILD/autorun.sh:
  Added a test for glibtoolize. This will fix issues with compiling on OSX
 2005-07-11 09:52:19 -07:00
unknown
05aa70c416 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/src/ndbapi/DictCache.cpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.hpp:
  Auto merged
 2005-06-07 06:50:50 +02:00
unknown
6f1db965ad merge 2005-06-07 12:44:00 +10:00
unknown
2da5ba707f Fix BUILD/check-cpu for powerpc 
BUILD/check-cpu:
  fix for powerpc linux
 2005-06-06 10:56:20 +10:00
unknown
84f89641cf Merge 
BitKeeper/etc/logging_ok:
  auto-union
libmysqld/Makefile.am:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
sql/sql_bitmap.h:
  merge
 2005-06-04 19:26:35 +02:00
unknown
32c9799596 Merge mysql.com:/home/hartmut/projects/mysql/dev/4.1 
into mysql.com:/home/hartmut/projects/mysql/dev/5.0
 2005-06-03 19:15:16 +02:00
unknown
fcb3be9f63 check-cpu fixes/improvements (Bug #11065) 
- support additional platforms (OpenBSD, Darwin)
    - make use of /proc/cpuinfo CPU flag information
      (needed to distinguish EMT64 Xeons from normal ones)
    - chose the right CPU related options depending on 
      GCC version and target architecture
    - check if the chosen CPU type is actually supported
      by the GCC version , fallback to CPUs predecessor
      until test compile succeeds
 2005-06-03 11:21:43 +02:00