mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-26 00:34:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
46713 commits 2777 branches 343 tags 1.6 GiB
Commit graph

913 commits

Author SHA1 Message Date
unknown
c68cfa6f70 BUG#27818 comedy of errors 
sql/share/errmsg.txt:
  BUG#27818 upgrading from 5.1.16 to 5.1.17 gives wrong error message about fixing internal tables; as of 5.1.10, it is recommended to use mysql_upgrade.
 2007-04-19 18:58:32 +02:00
unknown
023ae2a040 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


client/mysqldump.c:
  Auto merged
mysql-test/r/rpl_packet.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/rpl_packet.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.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
storage/innobase/handler/ha_innodb.cc:
  Auto merged
mysql-test/r/create.result:
  SCCS merged
mysql-test/t/create.test:
  merging
mysql-test/t/disabled.def:
  merging
sql/events.cc:
  merging
sql/sql_parse.cc:
  SCCS merged
 2007-04-07 14:59:53 +05:00
unknown
a36054f420 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  vajra.(none):/opt/local/work/mysql-5.1-c1


mysql-test/r/events_bugs.result:
  Auto merged
mysql-test/r/events_scheduling.result:
  Auto merged
mysql-test/t/events.test:
  Auto merged
mysql-test/t/events_scheduling.test:
  Auto merged
sql/event_data_objects.h:
  Auto merged
sql/event_db_repository.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
mysql-test/r/events.result:
  e
  Use local.
mysql-test/r/events_restart_phase1.result:
  Use local
mysql-test/r/events_time_zone.result:
  SCCS merged
mysql-test/t/events_restart_phase1.test:
  Use local
sql/event_data_objects.cc:
  Use local
sql/event_db_repository.cc:
  Manual merge.
sql/event_queue.cc:
  Manual merge.
sql/events.cc:
  Manual merge.
 2007-04-05 15:49:46 +04:00
unknown
fa1d637e89 A set of changes aiming to make the Event Scheduler more user-friendly 
when there are no up-to-date system tables to support it:
 - initialize the scheduler before reporting "Ready for connections".
   This ensures that warnings, if any, are printed before "Ready for
   connections", and this message is not mangled.
 - do not abort the scheduler if there are no system tables
 - check the tables once at start up, remember the status and disable
   the scheduler if the tables are not up to date.
   If one attempts to use the scheduler with bad tables,
   issue an error message.
 - clean up the behaviour of the module under LOCK TABLES and pre-locking
   mode
 - make sure implicit commit of Events DDL works as expected.
 - add more tests


Collateral clean ups in the events code.

This patch fixes Bug#23631 Events: SHOW VARIABLES doesn't work 
when mysql.event is damaged


mysql-test/r/events.result:
  Update results.
mysql-test/r/events_bugs.result:
  Update results.
mysql-test/r/events_restart_phase1.result:
  Update results.
mysql-test/r/events_restart_phase2.result:
  Update results.
mysql-test/r/events_restart_phase3.result:
  Update results.
mysql-test/r/events_scheduling.result:
  Update results.
mysql-test/r/events_time_zone.result:
  Update results.
mysql-test/t/events.test:
  Add new tests for tampering with mysql.event and some more
  tests for sub-statements, LOCK TABLES mode and pre-locking.
mysql-test/t/events_bugs.test:
  Move the non-concurrent part of test for Bug 16420 to this file.
mysql-test/t/events_restart_phase1.test:
  Rewrite events_restart_* tests to take into account that now
  we check mysql.event table only once, at server startup.
mysql-test/t/events_restart_phase2.test:
  Rewrite events_restart_* tests to take into account that now
  we check mysql.event table only once, at server startup.
mysql-test/t/events_restart_phase3.test:
  Rewrite events_restart_* tests to take into account that now
  we check mysql.event table only once, at server startup.
mysql-test/t/events_scheduling.test:
  Add more coverage for event_scheduler global variable.
mysql-test/t/events_time_zone.test:
  Move the non-concurrent part of the tests for Bug 16420 to 
  events_bugs.test
sql/event_data_objects.cc:
  Move update_timing_fields functionality to Event_db_repository.
  Make loading of events from a table record more robust to tampering
  with the table - now we do not check mysql.event on every table open.
sql/event_data_objects.h:
  Cleanup.
sql/event_db_repository.cc:
  Now Event_db_repository is responsible for table I/O only.
  All the logic of events DDL is handled outside, in Events class please
  refer to the added test coverage to see how this change affected
  the behavior of Event Scheduler.
  Dependency on sp_head.h and sp.h removed.
  Make this module robust to tweaks with mysql.event table.
  Move check_system_tables from events.cc to this file
sql/event_db_repository.h:
  Cleanup declarations (remove unused ones, change return type to bool
  from int).
sql/event_queue.cc:
  Update to adapt to the new start up scheme of the Event Scheduler.
sql/event_queue.h:
  Cleanup declarations.
sql/event_scheduler.cc:
  Make all the error messages uniform:
  [SEVERITY] Event Scheduler: [user][schema.event] message
  Using append_identifier for error logging was an overkill - we may 
  need it only if the system character set may have NUL (null character)
  as part of a valid identifier, this is currently never the case, 
  whereas additional quoting did not look nice in the log.
sql/event_scheduler.h:
  Cleanup the headers.
sql/events.cc:
  Use a different start up procedure of Event Scheduler:
  - at start up, try to check the system tables first.
  If they are not up-to-date, disable the scheduler.
  - try to load all the active events. In case of a load error, abort
  start up.
  - do not parse an event on start up. Parsing only gives some information
  about event validity, but far not all.
  Consolidate the business logic of Events DDL in this module.
  Now opt_event_scheduler may change after start up and thus is protected
  by LOCK_event_metadata mutex.
sql/events.h:
  Use all-static-data-members approach to implement Singleton pattern.
sql/mysqld.cc:
  New invocation scheme of Events. Move some logic to events.cc.
  Initialize the scheduler before reporting "Ready for connections".
sql/set_var.cc:
  Clean up sys_var_thd_sql_mode::symbolic_mode_representation
  to work with a LEX_STRING.
  Move more logic related to @@events_scheduler global variable to Events
  module.
sql/set_var.h:
  Update declarations.
sql/share/errmsg.txt:
  If someone tampered with mysql.event table after the server has
  started we no longer give him/her a complete report what was actually 
  broken. Do not send the user to look at the error log in such case,
  as there is nothing there (check_table_intact is not executed).
sql/sp_head.cc:
  Update to a new declaration of 
  sys_var_thd_sql_mode::symbolic_mode_representation
sql/sql_db.cc:
  New invocation scheme of Events module.
sql/sql_parse.cc:
  Move more logic to Events module. Make sure that we are consistent
  in the way access rights are checked for Events DDL: always
  after committing the current transaction and checking the system tables.
sql/sql_show.cc:
  Update to the new declarations of 
  sys_var_thd_sql_mode::symbolic_mode_representation
sql/sql_test.cc:
  New invocation scheme of events.
sql/table.cc:
  mysql.event is a system table.
  Update check_table_intact to be concurrent, more verbose, and less smart.
sql/table.h:
  Add a helper method.
mysql-test/r/events_trans.result:
  New BitKeeper file ``mysql-test/r/events_trans.result''
mysql-test/t/events_trans.test:
  New BitKeeper file ``mysql-test/t/events_trans.test'':
  test cases for Event Scheduler that require a transactional
  storage engine.
 2007-04-05 15:24:34 +04:00
unknown
b4fab0eb94 Merge mysql.com:/home/hf/work/23675/my51-23675 
into  mysql.com:/home/hf/work/my_mrg/my51-my_mrg


sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/share/errmsg.txt:
  merging
 2007-04-04 14:04:05 +05:00
unknown
93e11dce94 Bug #23675 Partitions: possible security breach via alter 
now we return different error message if user doesn't have
SELECT grants


mysql-test/r/partition_grant.result:
  test result
mysql-test/t/partition_grant.test:
  testcase
sql/mysql_priv.h:
  no_errors parameter added to check_single_table_access()
sql/partition_info.cc:
  access rights control added to the print_no_partition()
sql/share/errmsg.txt:
  message added
sql/sql_base.cc:
  no_errors parameter added to check_single_table_access()
sql/sql_parse.cc:
  no_errors parameter added to check_single_table_access()
 2007-04-04 14:01:47 +05:00
unknown
fe074a726f Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte 
client/mysqldump.c:
  fixed typo
include/mysql_com.h:
  added new constants SYSTEM_CHARSET_MBMAXLEN, NAME_CHAR_LEN, USERNAME_CHAR_LENGTH
  increased NAME_LEN, USERNAME_LENGTH
mysql-test/r/create.result:
  result fix
mysql-test/r/grant.result:
  result fix
mysql-test/r/mysql.result:
  result fix
mysql-test/r/sp.result:
  result fix
mysql-test/t/create.test:
  test case
mysql-test/t/grant.test:
  test case
sql/events.cc:
  NAME_LEN is replaced with NAME_CHAR_LEN
sql/item_strfunc.h:
  fixed calculation of max_length
sql/mysql_priv.h:
  check_string_length function is replaced with check_string_byte_length
  added new function check_string_char_length
sql/sp.cc:
  NAME_LEN is replaced with NAME_CHAR_LEN
sql/sp_head.cc:
  NAME_LEN is replaced with NAME_CHAR_LEN
sql/sp_head.h:
  changed parameter of 'check_routine_name' function
sql/sql_class.cc:
  NAME_LEN is replaced with NAME_CHAR_LEN
sql/share/errmsg.txt:
  increased argument lengths according to new constants
sql/sql_parse.cc:
  removed unnecessary checks
  added function 'check_string_char_length'
sql/sql_plugin.cc:
  check that name is not longer than NAME_CHAR_LEN symbols
sql/sql_show.cc:
  NAME_LEN is replaced with NAME_CHAR_LEN
sql/sql_table.cc:
  check that key name is not longer than NAME_LEN symbols
sql/sql_udf.cc:
  check that udf name is not longer than NAME_CHAR_LEN symbols
sql/sql_yacc.yy:
  check that user name is not longer than USERNAME_CHAR_LENGTH symbols
sql/table.cc:
  check that db or table or column name is not longer than NAME_LEN symbols
storage/innobase/handler/ha_innodb.cc:
  removed unnecessary multiplication
tests/mysql_client_test.c:
  NAME_LEN is replaced with NAME_CHAR_LEN
 2007-04-03 16:13:27 +05:00
unknown
7b1bfbb77a Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime


mysql-test/r/events_bugs.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/t/events.test:
  Auto merged
sql/event_data_objects.cc:
  Auto merged
sql/event_data_objects.h:
  Auto merged
sql/event_db_repository.h:
  Auto merged
sql/event_queue.cc:
  Auto merged
sql/events.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_servers.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
mysql-test/r/events.result:
  Manual merge.
sql/event_db_repository.cc:
  Manual merge.
sql/sql_parse.cc:
  Manual merge.
 2007-04-03 14:34:37 +04:00
unknown
2c86b5ad16 Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 
into  romeo.(none):/home/bk/w3464-mysql-5.1-new-rpl


client/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/rpl_injector.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/r/ctype_cp932_binlog_stm.result:
  Manual merge
  ,
mysql-test/r/flush_block_commit_notembedded.result:
  Manual merge
mysql-test/r/rpl_000015.result:
  Manual merge
mysql-test/r/rpl_change_master.result:
  Manual merge
mysql-test/r/rpl_deadlock_innodb.result:
  Manual merge
mysql-test/r/rpl_flushlog_loop.result:
  Manual merge
  ,
mysql-test/r/rpl_loaddata.result:
  manual merge
mysql-test/r/rpl_loaddata_s.result:
  manual merge
  ,
mysql-test/r/rpl_log_pos.result:
  manual merge
mysql-test/r/rpl_ndb_charset.result:
  manual merge
mysql-test/r/rpl_ndb_log.result:
  manual merge
  ,
mysql-test/r/rpl_ndb_multi.result:
  manual merge
mysql-test/r/rpl_rbr_to_sbr.result:
  manual merge
mysql-test/r/rpl_rotate_logs.result:
  Manual merge
mysql-test/r/rpl_row_basic_11bugs.result:
  Manual merge
mysql-test/r/rpl_row_charset.result:
  Manual merge
mysql-test/r/rpl_row_create_table.result:
  Manual merge
mysql-test/r/rpl_row_delayed_ins.result:
  Manual merge
mysql-test/r/rpl_row_drop.result:
  Manual merge
mysql-test/r/rpl_row_flsh_tbls.result:
  Manual merge
mysql-test/r/rpl_row_inexist_tbl.result:
  Manual merge
mysql-test/r/rpl_row_log.result:
  Manual merge
mysql-test/r/rpl_row_log_innodb.result:
  Manual merge
mysql-test/r/rpl_row_max_relay_size.result:
  Manual merge
mysql-test/r/rpl_row_reset_slave.result:
  Manual merge
mysql-test/r/rpl_row_until.result:
  Manual merge
mysql-test/r/rpl_server_id1.result:
  Manual merge
mysql-test/r/rpl_server_id2.result:
  Manual merge
mysql-test/r/rpl_sp.result:
  Manual merge
mysql-test/r/rpl_stm_charset.result:
  Manual merge
mysql-test/r/rpl_stm_flsh_tbls.result:
  Manual merge
mysql-test/r/rpl_stm_log.result:
  Manual merge
mysql-test/r/rpl_stm_max_relay_size.result:
  Manual merge
mysql-test/r/rpl_stm_multi_query.result:
  Manual merge
mysql-test/r/rpl_stm_reset_slave.result:
  Manual merge
mysql-test/r/rpl_stm_until.result:
  Manual merge
mysql-test/r/rpl_switch_stm_row_mixed.result:
  Manual merge
mysql-test/r/rpl_truncate_2myisam.result:
  Manual merge
mysql-test/r/rpl_truncate_3innodb.result:
  Manual merge
mysql-test/r/rpl_truncate_7ndb.result:
  Manual merge
mysql-test/r/user_var-binlog.result:
  Manual merge
mysql-test/t/binlog_row_mix_innodb_myisam.test:
  Manual merge
mysql-test/extra/binlog_tests/binlog.test:
  Binlog position change.
mysql-test/extra/binlog_tests/binlog_insert_delayed.test:
  Binlog position change.
mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
  Binlog position change.
mysql-test/extra/binlog_tests/ctype_ucs_binlog.test:
  Binlog position change.
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Binlog position change.
mysql-test/extra/rpl_tests/rpl_deadlock.test:
  Binlog position change.
mysql-test/extra/rpl_tests/rpl_log.test:
  Binlog position change.
mysql-test/extra/rpl_tests/rpl_multi_query.test:
  Binlog position change.
mysql-test/extra/rpl_tests/rpl_row_charset.test:
  Binlog position change.
mysql-test/extra/rpl_tests/rpl_stm_charset.test:
  Binlog position change.
mysql-test/include/show_binlog_events.inc:
  Binlog position change.
mysql-test/r/binlog_row_binlog.result:
  Result change
mysql-test/r/binlog_row_ctype_ucs.result:
  Result change
mysql-test/r/binlog_row_insert_select.result:
  Result change
mysql-test/r/binlog_row_mix_innodb_myisam.result:
  Result change
mysql-test/r/binlog_stm_binlog.result:
  Result change
mysql-test/r/binlog_stm_ctype_ucs.result:
  Result change
mysql-test/r/binlog_stm_insert_select.result:
  Result change
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
  Result change
mysql-test/r/ctype_cp932_binlog_row.result:
  Result change
mysql-test/t/binlog_stm_mix_innodb_myisam.test:
  Binlog position change.
mysql-test/t/ctype_cp932_binlog_stm.test:
  Binlog position change.
mysql-test/t/mysqlbinlog.test:
  Binlog position change.
mysql-test/t/mysqlbinlog2.test:
  Binlog position change.
mysql-test/t/rpl_loaddata_s.test:
  Binlog position change.
mysql-test/t/rpl_log_pos.test:
  Binlog position change.
mysql-test/t/rpl_row_basic_11bugs.test:
  Binlog position change.
mysql-test/t/rpl_row_create_table.test:
  Binlog position change.
mysql-test/t/rpl_row_flsh_tbls.test:
  Binlog position change.
mysql-test/t/rpl_row_mysqlbinlog.test:
  Binlog position change.
mysql-test/t/rpl_sp.test:
  Binlog position change.
mysql-test/t/rpl_stm_flsh_tbls.test:
  Binlog position change.
mysql-test/t/rpl_switch_stm_row_mixed.test:
  Binlog position change.
mysql-test/t/user_var-binlog.test:
  Binlog position change.
sql/share/errmsg.txt:
  Merging error messages
 2007-03-29 21:38:03 +02:00
unknown
adaf162bc2 WL#3464: Add replication event to denote gap in replication 
Adding an event that can be used to denote that an incident occured
on the master. The event can be used to denote a gap in the replication
stream, but can also be used to denote other incidents.

In addition, the injector interface is extended with functions to
generate an incident event. The function will also rotate the binary
log after generating an incident event to get a fresh binary log.


client/Makefile.am:
  Adding file rpl_constants.h with constants for replication.
mysql-test/extra/binlog_tests/binlog.test:
  Binlog position change
mysql-test/extra/binlog_tests/binlog_insert_delayed.test:
  Binlog position change
mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
  Binlog position change
mysql-test/extra/binlog_tests/ctype_ucs_binlog.test:
  Binlog position change
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Binlog position change
mysql-test/extra/rpl_tests/rpl_deadlock.test:
  Binlog position change
mysql-test/extra/rpl_tests/rpl_log.test:
  Binlog position change
mysql-test/extra/rpl_tests/rpl_multi_query.test:
  Binlog position change
mysql-test/extra/rpl_tests/rpl_row_charset.test:
  Binlog position change
mysql-test/extra/rpl_tests/rpl_row_sp002.test:
  Binlog position change
mysql-test/extra/rpl_tests/rpl_row_sp003.test:
  Binlog position change
mysql-test/extra/rpl_tests/rpl_stm_charset.test:
  Binlog position change
mysql-test/include/show_binlog_events.inc:
  Binlog position change
mysql-test/r/binlog_row_binlog.result:
  Result change
mysql-test/r/binlog_row_ctype_ucs.result:
  Result change
mysql-test/r/binlog_row_insert_select.result:
  Result change
mysql-test/r/binlog_row_mix_innodb_myisam.result:
  Result change
mysql-test/r/binlog_stm_binlog.result:
  Result change
mysql-test/r/binlog_stm_ctype_ucs.result:
  Result change
mysql-test/r/binlog_stm_insert_select.result:
  Result change
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
  Result change
mysql-test/r/ctype_cp932_binlog_row.result:
  Result change
mysql-test/r/ctype_cp932_binlog_stm.result:
  Result change
mysql-test/r/flush_block_commit_notembedded.result:
  Result change
mysql-test/r/rpl_000015.result:
  Result change
mysql-test/r/rpl_change_master.result:
  Result change
mysql-test/r/rpl_deadlock_innodb.result:
  Result change
mysql-test/r/rpl_flushlog_loop.result:
  Result change
mysql-test/r/rpl_loaddata.result:
  Result change
mysql-test/r/rpl_loaddata_s.result:
  Result change
mysql-test/r/rpl_log_pos.result:
  Result change
mysql-test/r/rpl_ndb_charset.result:
  Result change
mysql-test/r/rpl_ndb_log.result:
  Result change
mysql-test/r/rpl_ndb_multi.result:
  Result change
mysql-test/r/rpl_rbr_to_sbr.result:
  Result change
mysql-test/r/rpl_rotate_logs.result:
  Result change
mysql-test/r/rpl_row_basic_11bugs.result:
  Result change
mysql-test/r/rpl_row_charset.result:
  Result change
mysql-test/r/rpl_row_create_table.result:
  Result change
mysql-test/r/rpl_row_delayed_ins.result:
  Result change
mysql-test/r/rpl_row_drop.result:
  Result change
mysql-test/r/rpl_row_flsh_tbls.result:
  Result change
mysql-test/r/rpl_row_inexist_tbl.result:
  Result change
mysql-test/r/rpl_row_log.result:
  Result change
mysql-test/r/rpl_row_log_innodb.result:
  Result change
mysql-test/r/rpl_row_max_relay_size.result:
  Result change
mysql-test/r/rpl_row_reset_slave.result:
  Result change
mysql-test/r/rpl_row_until.result:
  Result change
mysql-test/r/rpl_server_id1.result:
  Result change
mysql-test/r/rpl_server_id2.result:
  Result change
mysql-test/r/rpl_sp.result:
  Result change
mysql-test/r/rpl_stm_charset.result:
  Result change
mysql-test/r/rpl_stm_flsh_tbls.result:
  Result change
mysql-test/r/rpl_stm_log.result:
  Result change
mysql-test/r/rpl_stm_max_relay_size.result:
  Result change
mysql-test/r/rpl_stm_multi_query.result:
  Result change
mysql-test/r/rpl_stm_reset_slave.result:
  Result change
mysql-test/r/rpl_stm_until.result:
  Result change
mysql-test/r/rpl_switch_stm_row_mixed.result:
  Result change
mysql-test/r/rpl_truncate_2myisam.result:
  Result change
mysql-test/r/rpl_truncate_3innodb.result:
  Result change
mysql-test/r/rpl_truncate_7ndb.result:
  Result change
mysql-test/r/user_var-binlog.result:
  Result change
mysql-test/t/binlog_row_mix_innodb_myisam.test:
  Binlog position change
mysql-test/t/binlog_stm_mix_innodb_myisam.test:
  Binlog position change
mysql-test/t/ctype_cp932_binlog_stm.test:
  Binlog position change
mysql-test/t/mysqlbinlog.test:
  Binlog position change
mysql-test/t/mysqlbinlog2.test:
  Binlog position change
mysql-test/t/rpl_loaddata_s.test:
  Binlog position change
mysql-test/t/rpl_log_pos.test:
  Binlog position change
mysql-test/t/rpl_row_basic_11bugs.test:
  Binlog position change
mysql-test/t/rpl_row_create_table.test:
  Binlog position change
mysql-test/t/rpl_row_flsh_tbls.test:
  Binlog position change
mysql-test/t/rpl_row_mysqlbinlog.test:
  Binlog position change
mysql-test/t/rpl_sp.test:
  Binlog position change
mysql-test/t/rpl_stm_flsh_tbls.test:
  Binlog position change
mysql-test/t/rpl_switch_stm_row_mixed.test:
  Binlog position change
mysql-test/t/user_var-binlog.test:
  Binlog position change
sql/Makefile.am:
  Adding file rpl_constants.h with constants for replication.
sql/log_event.cc:
  Changing prototype for read_str() to be const-correct and changing code to match that.
  Adding incident log event.
sql/log_event.h:
  Adding incident log event.
sql/rpl_injector.cc:
  Adding support for generating incidents into the binary log.
sql/rpl_injector.h:
  Adding support for generating incidents into the binary log.
sql/share/errmsg.txt:
  Adding new error message to indicate an incident.
sql/sql_parse.cc:
  Adding code to generate an incident log event just before executing a REPLACE
  if the variable "incident_database_resync_on_replace" is set.
mysql-test/r/rpl_incident.result:
  New BitKeeper file ``mysql-test/r/rpl_incident.result''
mysql-test/t/rpl_incident.test:
  New BitKeeper file ``mysql-test/t/rpl_incident.test''
sql/rpl_constants.h:
  New BitKeeper file ``sql/rpl_constants.h''
 2007-03-29 20:31:09 +02:00
unknown
fce7280591 Fix spelling (recursivity -> recursion) 
mysql-test/r/events.result:
  Fix spelling.
mysql-test/r/events_bugs.result:
  Fix spelling.
mysql-test/r/ps.result:
  Fix spelling.
mysql-test/t/events.test:
  Fix spelling.
mysql-test/t/events_bugs.test:
  Fix spelling.
mysql-test/t/ps.test:
  Fix spelling.
sql/sql_yacc.yy:
  Fix spelling.
sql/share/errmsg.txt:
  Fix spelling.
 2007-03-27 22:15:51 +04:00
unknown
b2d3dddef5 Change module prefix in error messages: SCHEDULER -> Event Scheduler, 
to not collide with the recently introduced thread scheduler module.


mysql-test/r/events.result:
  Update test results with new error texts (SCHEDULER -> Event Scheduler,
  grammar).
sql/event_data_objects.cc:
  SCHEDULER -> Event Scheduler.
sql/event_queue.cc:
  SCHEDULER -> Event Scheduler.
sql/event_scheduler.cc:
  SCHEDULER -> Event Scheduler.
sql/events.cc:
  SCHEDULER -> Event Scheduler.
sql/share/errmsg.txt:
  SCHEDULER -> Event Scheduler. Fix English grammar.
 2007-03-23 19:14:08 +03:00
unknown
e9bb08ac0c Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime


include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/events_scheduling.result:
  Auto merged
BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
  Auto merged
BitKeeper/deleted/.del-mysql_create_system_tables.sh:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/events_scheduling.test:
  Auto merged
mysql-test/t/grant_cache.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
scripts/mysql_system_tables_fix.sql:
  Auto merged
sql/event_db_repository.cc:
  Auto merged
sql/event_queue.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_help.cc:
  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_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/tztime.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/ha_myisam.h:
  Auto merged
mysql-test/r/skip_grants.result:
  Manualmerge.
mysql-test/r/sp.result:
  Manualmerge.
mysql-test/t/skip_grants.test:
  Manualmerge.
mysql-test/t/sp.test:
  Manualmerge.
sql/event_data_objects.cc:
  Manualmerge.
 2007-03-20 00:42:11 +03:00
unknown
086fba7627 BUG#16420: Events: timestamps become UTC 
BUG#26429: SHOW CREATE EVENT is incorrect for an event that
           STARTS NOW()
BUG#26431: Impossible to re-create an event from backup if its
           STARTS clause is in the past
WL#3698: Events: execution in local time zone

The problem was that local times specified by the user in AT, STARTS
and ENDS of CREATE EVENT/ALTER EVENT statement were converted to UTC,
and the original time zone was forgotten.  This way, event scheduler
couldn't honor Daylight Saving Time shifts, and times shown to the
user were also in UTC.  Additionally, CREATE EVENT didn't allow times
in the past, thus preventing straightforward event restoration from
old backups.

This patch reworks event scheduler time computations, performing them
in the time zone associated with the event.  Also it allows times to
be in the past.

The patch adds time_zone column to mysql.event table.

NOTE: The patch is almost final, but the bug#9953 should be pushed
first.


client/mysqldump.c:
  Before every CREATE EVENT, output its time zone.
mysql-test/include/wait_condition.inc:
  Add optional $wait_timeout parameter.
mysql-test/lib/init_db.sql:
  Add time_zone column.
mysql-test/r/events.result:
  Update result.
mysql-test/r/events_bugs.result:
  Update result.
mysql-test/r/events_grant.result:
  Update result.
mysql-test/r/events_restart_phase1.result:
  Update result.
mysql-test/r/events_scheduling.result:
  Update result.
mysql-test/r/mysqldump.result:
  Update result.
mysql-test/r/ps.result:
  Update result.
mysql-test/r/system_mysql_db.result:
  Update result.
mysql-test/t/events.test:
  Remove STARTS from the result, as it depends on current time.
mysql-test/t/events_bugs.test:
  Time in the past is no longer an error.
mysql-test/t/events_restart_phase1.test:
  Fill new column 'time_zone' in mysql.event.
mysql-test/t/events_scheduling.test:
  Cleanup: disable event scheduler.
scripts/mysql_create_system_tables.sh:
  Add new column 'time_zone' to mysql.event.
scripts/mysql_fix_privilege_tables.sql:
  Add new column 'time_zone' to mysql.event.
sql/event_data_objects.cc:
  The essence of the change is the following:
   - for internal times use my_time_t instead of TIME.  Assignment and
     comparison is done now on plain numbers.
   - in init_execute_at(), init_starts(), init_ends() convert given time
     to number of seconds since Epoch (aka Unix time, in UTC).
   - handle time_zone field loading and storing.
   - in get_next_time(), Unix time is converted back to event time zone,
     interval is added, and the result is converted to UTC again.
   - fix Event_timed::get_create_event() to report STARTS and ENDS.
   - before executing the event body we set thread time zone to the
     event time zone.
sql/event_data_objects.h:
  Add time_zone member to Event_basic class.
  
  Store internal times in my_time_t (number of seconds since Epoch),
  rather than in broken down TIME structure.
sql/event_db_repository.cc:
  Add time_zone column handling.
  
  Give a warning and do not create an event if its execution time is in
  the past, and ON COMPLETION NOT PRESERVE is set, because such an event
  should be dropped by that time.  Also, do not allow ALTER EVENT to
  set execution time in the past when ON COMPLETION NOT PRESERVE is set.
sql/event_db_repository.h:
  Add enum member for new time zone column.
sql/event_queue.cc:
  Replace handling of broken down times with simple handling of
  my_time_t.
sql/event_queue.h:
  Store internal times in my_time_t (number of seconds since Epoch),
  rather than in broken down TIME structure.
sql/event_scheduler.cc:
  Add TODO comment.
sql/events.cc:
  Send time_zone column for SHOW CREATE EVENT.
sql/share/errmsg.txt:
  Update error message, and add two more errors.
sql/sql_show.cc:
  Add TIME_ZONE column to the output of SHOW EVENTS.
mysql-test/r/events_time_zone.result:
  BitKeeper file /home/tomash/src/mysql_ab/mysql-5.1-wl3698/mysql-test/r/events_time_zone.result
mysql-test/t/events_time_zone.test:
  BitKeeper file /home/tomash/src/mysql_ab/mysql-5.1-wl3698/mysql-test/t/events_time_zone.test
 2007-03-16 17:31:07 +03:00
unknown
0ea47f3ed4 BUG#9953: CONVERT_TZ requires mysql.time_zone_name to be locked 
The problem was that some facilities (like CONVERT_TZ() function or
server HELP statement) may require implicit access to some tables in
'mysql' database.  This access was done by ordinary means of adding
such tables to the list of tables the query is going to open.
However, if we issued LOCK TABLES before that, we would get "table
was not locked" error trying to open such implicit tables.

The solution is to treat certain tables as MySQL system tables, like
we already do for mysql.proc.  Such tables may be opened for reading
at any moment regardless of any locks in effect.  The cost of this is
that system table may be locked for writing only together with other
system tables, it is disallowed to lock system tables for writing and
have any other lock on any other table.

After this patch the following tables are treated as MySQL system
tables:
  mysql.help_category
  mysql.help_keyword
  mysql.help_relation
  mysql.help_topic
  mysql.proc (it already was)
  mysql.time_zone
  mysql.time_zone_leap_second
  mysql.time_zone_name
  mysql.time_zone_transition
  mysql.time_zone_transition_type

These tables are now opened with open_system_tables_for_read() and
closed with close_system_tables(), or one table may be opened with
open_system_table_for_update() and closed with close_thread_tables()
(the latter is used for mysql.proc table, which is updated as part of
normal MySQL server operation).  These functions may be used when
some tables were opened and locked already.

NOTE: online update of time zone tables is not possible during
replication, because there's no time zone cache flush neither on LOCK
TABLES, nor on FLUSH TABLES, so the master may serve stale time zone
data from cache, while on slave updated data will be loaded from the
time zone tables.


mysql-test/r/help.result:
  Update result.
mysql-test/r/lock.result:
  Update result.
mysql-test/r/sp-error.result:
  Update result.
mysql-test/r/timezone2.result:
  Add result for bug#9953: CONVERT_TZ requires mysql.time_zone_name
  to be locked.
mysql-test/r/view.result:
  Update result: use table t3 rather than utilize MySQL system table.
mysql-test/t/help.test:
  Test that we can use HELP even under LOCK TABLES.
mysql-test/t/lock.test:
  Test LOCK TABLE on system tables.
mysql-test/t/timezone2.test:
  Add test case for bug#9953: CONVERT_TZ requires mysql.time_zone_name
  to be locked.
mysql-test/t/view.test:
  Update test: use table t3 rather that utilize MySQL system table.
sql/handler.h:
  Fix comment for 'count' parameter of check_if_locking_is_allowed().
  Add 'current' and 'system_count' parameters.
sql/item_create.cc:
  We no longer have LEX::add_time_zone_tables_to_query_tables().
sql/item_timefunc.cc:
  We no longer have LEX::time_zone_tables_used, so
  Item_func_convert_tz::fix_fields() became the same as base
  Item_date_func::fix_fields().
  
  my_tz_find() no longer takes table list, but takes THD pointer now.
sql/item_timefunc.h:
  Remove dead field and method.
sql/lock.cc:
  Pass values for 'current' and 'system_count' to
  check_if_locking_is_allowed().
sql/log_event.cc:
  We no longer have my_tz_find_with_opening_tz_tables(), its functions is
  performed by my_tz_find().
sql/mysql_priv.h:
  Add functions to work with MySQL system tables.
sql/set_var.cc:
  my_tz_find() no longer takes table list, but takes THD pointer now.
sql/sp.cc:
  Remove close_proc_table().  Use close_system_tables() instead.
  
  Use open_system_tables_for_read() and open_system_table_for_update().
sql/sp.h:
  Remove close_proc_table() declaration.
sql/sql_base.cc:
  Add implementation of open_system_tables_for_read(),
  close_system_tables(), open_system_table_for_update().
sql/sql_help.cc:
  Operate on MySQL system tables mysql.help_* with
  open_system_tables_for_read() and close_system_tables() to allow the
  usage of HELP statement under LOCK TABLES.
sql/sql_lex.cc:
  Remove LEX::time_zone_tables_used and
  LEX::add_time_zone_tables_to_query_tables() which are no longer used.
sql/sql_lex.h:
  Remove LEX::time_zone_tables_used and
  LEX::add_time_zone_tables_to_query_tables() which are no longer used.
sql/sql_parse.cc:
  Remove references to LEX::time_zone_tables_used and
  my_tz_check_n_skip_implicit_tables() which are no longer used.
sql/sql_show.cc:
  Use close_system_tables() instead of removed close_proc_table().
sql/sql_view.cc:
  LEX::time_zone_tables_used is no longer there.
sql/sql_yacc.yy:
  LEX::add_time_zone_tables_to_query_tables() is no longer there.
sql/table.cc:
  Add more tables that should be treated as MySQL system tables.
sql/share/errmsg.txt:
  Change the error message, as now we allow write-locking of several
  system tables if not mixed with ordinary tables.
sql/tztime.cc:
  Do not add time zone tables to the list of query tables in
  tz_init_table_list().
  
  Remove fake_time_zone_tables_list and my_tz_get_tables_list().
  
  In my_tz_init(), open mysql.time_zone_leap_second with
  simple_open_n_lock_tables(), but pass time zone name to my_tz_find(),
  which will open and close time zone tables as necessary.
  
  In tz_load_from_open_tables() do not call table->use_all_columns(), as
  this was already done in open_system_tables_for_read().
  
  my_tz_find() takes THD pointer instead of table list, and calls
  open_system_tables_for_read() and close_system_tables() as necessary.
  
  Remove my_tz_find_with_opening_tz_tables().
sql/tztime.h:
  Remove declarations of my_tz_get_table_list(),
  my_tz_find_with_opening_tz_tables(), fake_time_zone_tables_list,
  definition of my_tz_check_n_skip_implicit_tables().
  Update prototype for my_tz_find().
storage/csv/ha_tina.cc:
  Add new parameters to check_if_locking_is_allowed().
storage/csv/ha_tina.h:
  Add new parameters to check_if_locking_is_allowed().
storage/myisam/ha_myisam.cc:
  Add new parameters to check_if_locking_is_allowed().  In this
  function we count system tables.  If there are system tables, but
  there are also non-system tables, we report an error.
storage/myisam/ha_myisam.h:
  Add new parameters to check_if_locking_is_allowed().
 2007-03-09 13:12:31 +03:00
unknown
32ff1a2d6e Extend the max length of second format specifier to max length 
200 allowing it to print paths a little better
 2007-02-23 18:07:08 +01:00
unknown
fd8d108c5b Merge pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my50-comp_err_checksum 
into  pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my51-comp_err_checksum


sql/share/errmsg.txt:
  Auto merged
 2007-02-22 17:54:07 +01:00
unknown
bac1c946ce Bug#24617 Typo in Czech translation 
sql/share/errmsg.txt:
  Add the missing "d"
 2007-02-22 17:53:41 +01:00
unknown
c36e2c2332 Bug #26571 Different format specifiers in errmsg.txt 
- Add check of format specifiers in error message strings
- Update error message text accordingly to be equal between all translations


extra/Makefile.am:
  comp_err uses my_cheksum, link with zlib
extra/comp_err.c:
  Add check of format specifiers in error message strings
sql/share/errmsg.txt:
  Update error messages after checks
  ---
  Remove the newly added space in error message, should not be there
 2007-02-22 16:41:51 +01:00
unknown
56dd63a7ac Update error message to make sure all error strings for same error 
uses the same format specifiers
 2007-02-15 11:21:55 +01:00
unknown
a043cd152d Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1


BUILD/SETUP.sh:
  Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_row_basic.test:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/delayed.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/insert_select.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/ndb_index_unique.test:
  Auto merged
mysql-test/t/rpl_row_create_table.test:
  Auto merged
mysql-test/t/rpl_sp.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/type_binary.test:
  Auto merged
mysql-test/t/type_varchar.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/rpl_sp.result:
  Manual merge
mysql-test/t/ndb_update.test:
  Manual merge
sql/share/errmsg.txt:
  Manual merge
 2007-01-22 19:18:22 +02:00
unknown
b4f80eedf3 Give warnings for unused objects 
Changed error message to be compatible with old error file
Added new error message for new DUP_ENTRY syntax


BUILD/SETUP.sh:
  Give warnings for unused objects
mysql-test/extra/binlog_tests/insert_select-binlog.test:
  Changed to use new error message
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Changed to use new error message
mysql-test/extra/rpl_tests/rpl_auto_increment.test:
  Changed to use new error message
mysql-test/extra/rpl_tests/rpl_foreign_key.test:
  Changed to use new error message
mysql-test/extra/rpl_tests/rpl_insert_id.test:
  Changed to use new error message
mysql-test/extra/rpl_tests/rpl_insert_id_pk.test:
  Changed to use new error message
mysql-test/extra/rpl_tests/rpl_loaddata.test:
  Changed to use new error message
mysql-test/extra/rpl_tests/rpl_row_basic.test:
  Changed to use new error message
mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test:
  Changed to use new error message
mysql-test/extra/rpl_tests/rpl_trig004.test:
  Changed to use new error message
mysql-test/include/mix1.inc:
  Changed to use new error message
mysql-test/include/mix2.inc:
  Changed to use new error message
mysql-test/include/ps_modify.inc:
  Changed to use new error message
mysql-test/include/query_cache.inc:
  Changed to use new error message
mysql-test/include/varchar.inc:
  Changed to use new error message
mysql-test/r/create.result:
  Changed to use new error message
mysql-test/r/rpl_sp.result:
  Changed to use new error message
mysql-test/r/sp.result:
  Changed to use new error message
mysql-test/r/view.result:
  Changed to use new error message
mysql-test/t/auto_increment.test:
  Changed to use new error message
mysql-test/t/create.test:
  Changed to use new error message
mysql-test/t/create_select_tmp.test:
  Changed to use new error message
mysql-test/t/ctype_utf8.test:
  Changed to use new error message
mysql-test/t/delayed.test:
  Changed to use new error message
mysql-test/t/heap.test:
  Changed to use new error message
mysql-test/t/heap_btree.test:
  Changed to use new error message
mysql-test/t/heap_hash.test:
  Changed to use new error message
mysql-test/t/innodb.test:
  Changed to use new error message
mysql-test/t/insert_select.test:
  Changed to use new error message
mysql-test/t/insert_update.test:
  Changed to use new error message
mysql-test/t/join_outer.test:
  Changed to use new error message
mysql-test/t/key.test:
  Changed to use new error message
mysql-test/t/merge.test:
  Changed to use new error message
mysql-test/t/myisam.test:
  Changed to use new error message
mysql-test/t/ndb_charset.test:
  Changed to use new error message
mysql-test/t/ndb_index_unique.test:
  Changed to use new error message
mysql-test/t/ndb_insert.test:
  Changed to use new error message
mysql-test/t/ndb_replace.test:
  Changed to use new error message
mysql-test/t/ndb_update.test:
  Changed to use new error message
mysql-test/t/replace.test:
  Changed to use new error message
mysql-test/t/rpl_err_ignoredtable.test:
  Changed to use new error message
mysql-test/t/rpl_row_create_table.test:
  Changed to use new error message
mysql-test/t/rpl_skip_error-slave.opt:
  Changed to use new error message
mysql-test/t/rpl_sp.test:
  Changed to use new error message
mysql-test/t/show_check.test:
  Changed to use new error message
mysql-test/t/sp-error.test:
  Changed to use new error message
mysql-test/t/sp.test:
  Changed to use new error message
mysql-test/t/sp_trans.test:
  Changed to use new error message
mysql-test/t/temp_table.test:
  Changed to use new error message
mysql-test/t/type_binary.test:
  Changed to use new error message
mysql-test/t/type_bit.test:
  Changed to use new error message
mysql-test/t/type_bit_innodb.test:
  Changed to use new error message
mysql-test/t/type_blob.test:
  Changed to use new error message
mysql-test/t/type_varchar.test:
  Changed to use new error message
mysql-test/t/view.test:
  Changed to use new error message
sql/handler.cc:
  ER_DUP_ENTRY -> ER_DUP_ENTRY_WITH_KEY_NAME
sql/share/errmsg.txt:
  Changed error message to be compatible with old error file
  Added new error message for new DUP_ENTRY syntax
sql/sql_table.cc:
  ER_DUP_ENTRY -> ER_DUP_ENTRY_WITH_KEY_NAME
sql-bench/example:
  Example file for how to run tests
 2007-01-22 18:42:52 +02:00
unknown
61430c77a4 Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51 
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51


BUILD/check-cpu:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/type_enum.result:
  Auto merged
mysql-test/r/udf.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/mysqladmin.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/type_enum.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
mysys/my_read.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
server-tools/instance-manager/Makefile.am:
  Auto merged
sql/event_queue.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/federated/ha_federated.cc:
  Auto merged
server-tools/instance-manager/instance.cc:
  Use remote (global 5.1 version)
sql/unireg.cc:
  Use remote (5.1 global version)
mysql-test/t/trigger.test:
  Manual merge
server-tools/instance-manager/guardian.cc:
  Manual merge
 2007-01-18 08:30:35 -07:00
unknown
efa5ba55a5 errmsg update from Stefan. 2007-01-17 15:01:28 -05:00
unknown
c97f7e7cb9 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint


include/my_global.h:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/mysqladmin.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/mysqlbug.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
Makefile.am:
  manual merge
mysql-test/t/trigger.test:
  manual merge
strings/ctype-extra.c:
  manual merge
 2007-01-11 09:43:44 -05:00
unknown
cbff25d04a Merge mysql.com:/d2/hf/clean/my51-clean 
into  mysql.com:/d2/hf/common/my51-common


libmysqld/Makefile.am:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_insert.cc:
  Auto merged
BitKeeper/deleted/.del-ps_not_windows.test:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
 2006-12-31 12:41:42 +04:00
unknown
84d0cda44c Merge mysql.com:/d2/hf/clean/my50-clean 
into  mysql.com:/d2/hf/common/my50-common


mysql-test/mysql-test-run.pl:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
 2006-12-31 12:39:20 +04:00
unknown
f7f69043ac Merge siva.hindu.god:/usr/home/tim/m/bk/g50 
into  siva.hindu.god:/usr/home/tim/m/bk/50


Makefile.am:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
include/config-win.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/mysql.h:
  Auto merged
include/typelib.h:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysys/default.c:
  Auto merged
mysys/my_wincond.c:
  Auto merged
mysys/typelib.c:
  Auto merged
server-tools/instance-manager/guardian.cc:
  Auto merged
server-tools/instance-manager/instance.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/share/charsets/hebrew.xml:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
strings/conf_to_src.c:
  Auto merged
vio/viossl.c:
  Auto merged
 2006-12-26 22:28:28 -07:00
unknown
6e84e11da5 Merge siva.hindu.god:/usr/home/tim/m/bk/g51 
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/mrg51-dec26


Makefile.am:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
configure.in:
  Auto merged
client/mysqltest.c:
  Auto merged
include/config-win.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/mysql.h:
  Auto merged
include/typelib.h:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/type_timestamp.result:
  Auto merged
mysql-test/r/warnings.result:
  Auto merged
mysys/default.c:
  Auto merged
mysys/my_wincond.c:
  Auto merged
mysys/typelib.c:
  Auto merged
server-tools/instance-manager/Makefile.am:
  Auto merged
server-tools/instance-manager/guardian.cc:
  Auto merged
server-tools/instance-manager/instance.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/share/charsets/hebrew.xml:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/federated/ha_federated.cc:
  Auto merged
strings/conf_to_src.c:
  Auto merged
vio/viossl.c:
  Auto merged
sql/field.h:
  Manual merge
sql/log_event.cc:
  Manual merge
 2006-12-26 16:49:10 -07: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
4dfab457ff Merge polly.local:/tmp/maint/bug24037/my50-bug24037 
into  polly.local:/tmp/maint/bug24037/my51-bug24037


strings/ctype-extra.c:
  Auto merged
 2006-12-22 16:14:57 +03:00
unknown
48213dd093 Merge polly.local:/tmp/maint/bug24037/my41-bug24037 
into  polly.local:/tmp/maint/bug24037/my50-bug24037


strings/conf_to_src.c:
  Auto merged
strings/ctype-extra.c:
  Auto merged
 2006-12-22 16:08:10 +03:00
unknown
ee37cf0bb9 Fix for the bug #24037 "Lossy Hebrew to Unicode conversion". 
Added definitions for the following Hebrew characters as specified by the ISO/IEC 8859-8:1999:

LEFT-TO-RIGHT MARK (LRM)
RIGHT-TO-LEFT MARK (RLM)


sql/share/charsets/hebrew.xml:
  Added definitions for the following Hebrew characters as specified by the ISO/IEC 8859-8:1999:
  
  LEFT-TO-RIGHT MARK (LRM)
  RIGHT-TO-LEFT MARK (RLM)
strings/conf_to_src.c:
  Added a warning comment in the generated C source file.
strings/ctype-extra.c:
  Re-generated from sql/share/charsets/hebrew.xml
mysql-test/r/ctype_hebrew.result:
  Added the test case for bug #24037 "Lossy Hebrew to Unicode conversion"
mysql-test/t/ctype_hebrew.test:
  Added the test case for bug #24037 "Lossy Hebrew to Unicode conversion"
 2006-12-22 15:30:37 +03:00
unknown
00080b90f7 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-arch-wl3031-merge


mysql-test/lib/init_db.sql:
  Auto merged
mysql-test/r/1st.result:
  Auto merged
mysql-test/r/connect.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/r/mysqlcheck.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/system_mysql_db.result:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/federated/ha_federated.cc:
  Auto merged
mysql-test/r/sp.result:
  WL# 3031
  
  More fun with error codes. These error codes vary in the result files because new error codes have been added
mysql-test/r/sp_gis.result:
  WL# 3031
  
  More fun with error codes. These error codes vary in the result files because new error codes have been added
 2006-12-08 22:30:18 -05:00
unknown
ab4c37dcce Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/embt/my51-embt


libmysqld/lib_sql.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/include/federated.inc:
  Auto merged
mysql-test/t/flush_block_commit.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysql-test/t/status.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
mysql-test/r/flush_block_commit.result:
  SCCS merged
 2006-12-08 15:49:43 +04:00
unknown
1f695dbf7d Apply malff@weblab.(none) fix for bug 24736 directly to 
mysql-5.1-build tree, in order to get it into mysql-5.1
faster.  See comments from Marc's original push for
patch details.
 2006-12-04 11:38:40 -07:00
unknown
dea988a048 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint


BitKeeper/etc/collapsed:
  auto-union
BitKeeper/etc/ignore:
  auto-union
Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
extra/yassl/taocrypt/include/algebra.hpp:
  Auto merged
include/Makefile.am:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/lib/mtr_io.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/parser.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/parser.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/system_mysql_db_fix30020.test:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_handler.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-common/my_time.c:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
mysql-test/r/sp.result:
  Manual merge
mysql-test/r/udf.result:
  Manual merge
mysql-test/t/events_bugs.test:
  Manual merge
sql/share/errmsg.txt:
  Manual merge
support-files/mysql.spec.sh:
  Manual merge
 2006-12-04 19:11:55 +01:00
unknown
b92081cdea Bug#24736: UDF functions parsed as Stored Functions 
Before this fix, a call to a User Defined Function (UDF) could,
under some circumstances, be interpreted as a call to a Stored function
instead. This occurred if a native function was invoked in the parameters
for the UDF, as in "select my_udf(abs(x))".

The root cause of this defect is the introduction, by the fix for Bug 21809,
of st_select_lex::udf_list, and it's usage in the parser in sql_yacc.yy
in the rule function_call_generic (in 5.1).

While the fix itself for Bug 21809 is correct in 5.0, the code change
merged into the 5.1 release created the issue, because the calls in 5.1 to :
- lex->current_select->udf_list.push_front(udf)
- lex->current_select->udf_list.pop()
are not balanced in case of native functions, causing the udf_list,
which is really a stack, to be out of sync with the internal stack
maintained by the bison parser.

Instead of moving the call to udf_list.pop(), which would have fixed the
symptom, this patch goes further and removes the need for udf_list.

This is motivated by two reasons:

a) Maintaining a stack in the MySQL code in sync with the stack maintained
internally in sql_yacc.cc (not .yy) is extremely dependent of the
implementation of yacc/bison, and extremely difficult to maintain.
It's also totally dependent of the structure of the grammar, and has a risk
to break with regression defects each time the grammar itself is changed.

b) The previous code did report construct like "foo(expr AS name)" as
syntax errors (ER_PARSER_ERROR), which is incorrect, and misleading.
The syntax is perfectly valid, as this expression is valid when "foo" is
a UDF. Whether this syntax is legal or not depends of the semantic of "foo".

With this change:

a) There is only one stack (in bison), and no List<udf_func> to maintain.

b) "foo(expr AS name)", when used incorrectly, is reported as semantic error:
- ER_WRONG_PARAMETERS_TO_NATIVE_FCT (for native functions)
- ER_WRONG_PARAMETERS_TO_STORED_FCT (for stored functions)
This is achieved by the changes implemented in item_create.cc


mysql-test/r/parser.result:
  New tests
mysql-test/r/udf.result:
  New tests
mysql-test/t/parser.test:
  New tests
mysql-test/t/udf.test:
  New tests
sql/item_create.cc:
  Semantic checks for named parameters, as in "foo(expr AS name)".
sql/share/errmsg.txt:
  New error message
sql/sql_lex.cc:
  Remove usage of udf_list.
sql/sql_lex.h:
  Remove usage of udf_list.
sql/sql_yacc.yy:
  Remove usage of udf_list.
 2006-12-01 19:16:03 -07:00
unknown
4e72191ce9 WL# 3031 
Backport of functionality in private 5.2 tree. 

Added new language to parser, new mysql.servers table and associated code
to be used by the federated storage engine to allow central connection information
per WL entry.


libmysqld/Makefile.am:
  WL# 3031
  
  Added sql_servers.cc to libmysqld Makefile.am
mysql-test/lib/init_db.sql:
  WL# 3031
  
  Added mysql.servers creation to init_db.sql, which is in turn called by mysql-test-run.pl
scripts/mysql_create_system_tables.sh:
  WL# 3031
  
  Added mysql.servers table creation to script called by non-perl mysql-test-run
sql/Makefile.am:
  WL# 3031
  
  Added sql_servers source and headers to Makefile.am to be built
sql/lex.h:
  WL# 3031
  
  Added tokens needed for SERVERS scheme
sql/mysql_priv.h:
  WL #3031
  
  Added sql_servers.h to mysql_priv.h so mysqld.cc and other code can link with sql_servers code
sql/mysqld.cc:
  WL# 3031
  
  Added servers_free and servers_init to mysqld
sql/sql_lex.cc:
  WL# 3031
  
  Added lex->server_options parameter initialisation
sql/sql_lex.h:
  WL #3031
  
  Added SQLCOM commands needed for sql_server actions
sql/sql_parse.cc:
  WL# 3031
  
  Added switch actions for new SQLCOM sql_server actions
sql/sql_yacc.yy:
  WL #3031
  
  Added tokens needed for sql_servers, CREATE/DROP/ALTER server functionality
sql/share/errmsg.txt:
  WL# 3031
  
  Added two new errors to errormsg.sys
storage/federated/ha_federated.cc:
  WL #3031
  
  Modified federated storage engine to use new connection scheme (servers 
  table) if connection string only specifies connection name vs. complete
  URL
storage/federated/ha_federated.h:
  WL# 3031
  
  Added new share members needed for connection scheme
sql/sql_servers.cc:
  WL #3031
  
  sql_servers.cc - all methods required for manipulating mysql.servers table
  to work with federated new connection scheme (CREATE/ALTER/DROP SERVER ...)
sql/sql_servers.h:
  WL #3031
  
  New header file for sql_servers functionality
mysql-test/r/federated_server.result:
  WL #3031
  
  New test results for testing new connection scheme
sql/sql_yacc.yy.bak:
  WL #3031
  
  Added tokens and definitions required for new CREATE/ALTER/DROP SERVER
  for sql_servers functionality. See WL for details.
mysql-test/t/federated_server.test:
  WL #3031
  
  New test for testing CREATE/ALTER/DROP SERVER, as well as testing that
  federated works with both tradition connection scheme as well as new
  connection scheme.
 2006-12-01 19:47:45 -05:00
unknown
02818a0020 Merge ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj 
into  ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log.h:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
  Auto merged
storage/ndb/src/common/transporter/TCP_Transporter.cpp:
  Auto merged
BitKeeper/deleted/.del-OSE_Receiver.cpp:
  Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
storage/ndb/src/common/util/File.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
storage/ndb/tools/restore/restore_main.cpp:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
 2006-12-01 11:35:05 +08:00
unknown
418fd54843 Bug#18239 (Possible to overload internal functions with stored functions) 
Bug#21025 (misleading error message when creating functions named 'x', or 'y')
Bug#22619 (Spaces considered harmful)

This change contains a fix to report warnings or errors, and multiple tests
cases.

Before this fix, name collisions between:
- Native functions
- User Defined Functions
- Stored Functions
were not systematically reported, leading to confusing behavior.

I) Native / User Defined Function

Before this fix, is was possible to create a UDF named "foo", with the same
name as a native function "foo", but it was impossible to invoke the UDF,
since the syntax "foo()" always refer to the native function.
After this fix, creating a UDF fails with an error if there is a name
collision with a native function.

II) Native / Stored Function

Before this fix, is was possible to create a SF named "db.foo", with the same
name as a native function "foo", but this was confusing since the syntax
"foo()" would refer to the native function. To refer to the Stored Function,
the user had to use the "db.foo()" syntax.
After this fix, creating a Stored Function reports a warning if there is a
name collision with a native function.

III) User Defined Function / Stored Function

Before this fix, creating a User Defined Function "foo" and a Stored Function
"db.foo" are mutually exclusive operations. Whenever the second function is
created, an error is reported. However, the test suite did not cover this
behavior.
After this fix, the  behavior is unchanged, and is now covered by test cases.

Note that the code change in this patch depends on the fix for Bug 21114.


mysql-test/r/sp.result:
  New test cases.
mysql-test/r/udf.result:
  New test cases.
mysql-test/t/sp.test:
  New test cases.
mysql-test/t/udf.test:
  New test cases.
sql/sql_lex.cc:
  Name collisions with native functions.
sql/sql_lex.h:
  Name collisions with native functions.
sql/sql_yacc.yy:
  Name collisions with native functions.
sql/share/errmsg.txt:
  Name collisions with native functions.
mysql-test/r/sp_gis.result:
  New test cases.
mysql-test/t/sp_gis.test:
  New test cases.
 2006-11-14 19:34:16 -07:00
unknown
298aff1267 Merge mysql.com:/home/hf/work/embt/my50-embt 
into  mysql.com:/home/hf/work/embt/my51-embt


libmysqld/lib_sql.cc:
  Auto merged
BitKeeper/deleted/.del-bdb.result:
  Auto merged
BitKeeper/deleted/.del-bdb.test:
  Auto merged
mysql-test/r/insert_select.result:
  Auto merged
mysql-test/r/join.result:
  Auto merged
mysql-test/t/backup.test:
  Auto merged
mysql-test/t/delayed.test:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysql-test/t/status.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  merging
mysql-test/r/flush_block_commit.result:
  SCCS merged
mysql-test/r/insert.result:
  merging
mysql-test/t/innodb.test:
  merging
mysql-test/t/insert.test:
  merging
sql/share/errmsg.txt:
  merging
 2006-11-13 20:16:46 +04:00
unknown
ea1f7e4b56 several fixes to make tests pass in embedded-server mode 
libmysqld/lib_sql.cc:
  check for bootstrap added
mysql-test/include/federated.inc:
  disabled in embedded
mysql-test/mysql-test-run.pl:
  we disable ssh in embedded server
mysql-test/r/bdb.result:
  part moved to bdb_notembedded as it uses binlog
mysql-test/r/flush_block_commit.result:
  part moved to flush_block_commit_notembedded
mysql-test/r/insert.result:
  part moved to insert_notembedded as delayed works differently in embedded server
mysql-test/r/insert_select.result:
  part moved to insert_notembedded as GRANTS usually disabled in embedded server
mysql-test/r/join.result:
  access rights hidden in result
mysql-test/t/backup.test:
  now available in embedded server
mysql-test/t/bdb.test:
  part moved to bdb_notembedded as it uses binlog
mysql-test/t/delayed.test:
  code trimmed
mysql-test/t/execution_constants.test:
  skipped in embedded-server mode
mysql-test/t/flush_block_commit.test:
  moved to flush_block_commit_notembedded
mysql-test/t/information_schema_db.test:
  skipped in embedded-server
mysql-test/t/innodb.test:
  directories replaced to be embedded-server compliant
mysql-test/t/insert.test:
  part moved to insert_notembedded
mysql-test/t/insert_select.test:
  part moved to insert_notembedded
mysql-test/t/join.test:
  access rights hidden
mysql-test/t/status.test:
  skipped in embedded server
mysql-test/t/trigger.test:
  directories replaced to be embedded-server compliant
sql/item_strfunc.cc:
  extra contexts not needed whan access checks disabled
sql/share/errmsg.txt:
  bigger paths reserved to prevent test's fails
mysql-test/r/bdb_notembedded.result:
  ***MISSING WEAVE***
mysql-test/r/flush_block_commit_notembedded.result:
  added
mysql-test/r/insert_notembedded.result:
  added
mysql-test/t/bdb_notembedded.test:
  ***MISSING WEAVE***
mysql-test/t/flush_block_commit_notembedded.test:
  added
mysql-test/t/insert_notembedded.test:
  added
 2006-11-13 20:06:45 +04:00
unknown
384407aaeb Bug#21114 (Foreign key creation fails to table with name format) 
Due to the complexity of this change, everything is documented in WL#3565

This patch is the third iteration, it takes into account the comments
received to date.


mysql-test/r/func_math.result:
  Improved test coverage
mysql-test/r/view.result:
  Name collision, x() is a geometry native in function
mysql-test/t/func_math.test:
  Improved test coverage
mysql-test/t/view.test:
  Name collision, x() is a geometry native in function
sql/item_create.cc:
  Revised the create_func implementation
sql/item_create.h:
  Revised the create_func implementation
sql/item_geofunc.h:
  Explicit Item allocation in the thread memory pool.
sql/lex.h:
  Removed function parsing from the lexical parser
sql/lex_symbol.h:
  Removed function parsing from the lexical parser
sql/mysql_priv.h:
  Server initialization and shutdown
sql/mysqld.cc:
  Server initialization and shutdown
sql/share/errmsg.txt:
  New error messages
sql/sql_yacc.yy:
  Removed function parsing from the lexical parser
tests/mysql_client_test.c:
  Spaces are no longer significant for function calls
mysql-test/include/parser_bug21114.inc:
  New tests
mysql-test/r/parser.result:
  New tests
mysql-test/r/parser_bug21114_innodb.result:
  New tests
mysql-test/t/parser.test:
  New tests
mysql-test/t/parser_bug21114_innodb.test:
  New tests
 2006-11-02 11:01:53 -07:00
unknown
5aa81b561e Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  mysql.com:/home/cps/mysql/devel/5.1-rename-bug


mysql-test/r/log_tables.result:
  Auto merged
mysql-test/t/log_tables.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/log.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_rename.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
sql/log.cc:
  manual merge
sql/share/errmsg.txt:
  manual merge
sql/sql_table.cc:
  manual merge
 2006-10-24 17:00:23 +04:00
unknown
9438b98519 Fix for Bug #17544 "Cannot do atomic log rotate", 
Bug #21785 "Server crashes after rename of the log table" and
Bug #21966 "Strange warnings on create like/repair of the log
            tables"

According to the patch, from now on, one should use RENAME to
perform a log table rotation (this should also be reflected in
the manual).

Here is a sample:

use mysql;
CREATE TABLE IF NOT EXISTS general_log2 LIKE general_log;
RENAME TABLE general_log TO general_log_backup, general_log2 TO general_log;

The rules for Rename of the log tables are following:
      IF   1. Log tables are enabled
      AND  2. Rename operates on the log table and nothing is being
              renamed to the log table.
      DO   3. Throw an error message.
      ELSE 4. Perform rename.
 
The very RENAME query will go the the old (backup) table. This is
consistent with the behavoiur we have with binlog ROTATE LOGS
statement.

Other problems, which are solved by the patch are:

1) Now REPAIR of the log table is exclusive operation (as it should be), this
   also eliminates lock-related warnings. and
2) CREATE LIKE TABLE now usese usual read lock on the source table rather
   then name lock, which is too restrictive. This way we get rid of another
   log table-related warning, which occured because of the above fact
   (as a side-effect, name lock resulted in a warning).


mysql-test/r/log_tables.result:
  update result file
mysql-test/t/log_tables.test:
  Add tests for the bugs
sql/handler.cc:
  update comment
sql/handler.h:
  update function to reflect changes in log tables
  locking logic.
sql/lock.cc:
  Now we allow locking of the log tables for "privileged" threads
  Privileged thread must explicitly close and lock log tables. This
  is required for admin operations such as REPAIR.
sql/log.cc:
  Changes to the file:
  1) Add checks for table schema. It's more important now,
     as we allow rename of the log tables. Since we should
     check for schema when writing to a log table.
     E.g. if one created a table with one-only comlumn and
     renamed it to general_log, the server should cope with
     it.
  2) refactor LOGGER::flush(), so that we can now use the same
     machinery as we use in FLUSH LOGS in other statements:
     whenever we have to perform  a serious operation on the log
     tables, we have to
     (a) lock logger, which blocks other concurrent statements (such 
     as selects) (b) close logs. Then perform an
     exclusive operation, c) reenable logs and d) unlock logger.
  3) Add a function to check if a given table is a log table.
  4) Add support for "privileged" thread
  5) merge is_[general/slow]_log_table_enabled() into one function.
  6) Add new function: reopen _log_tables, which reopens the tables,
     which were enabled (after temporary close, required for admin
     operation)
sql/log.h:
  1) add a new call close_n_lock_tables(). Now we use it instead of
     LOGGER::flush() in FLUSH LOGS implementation.
  2) add a prototype for the function to check if a given
     table is a log table;
  3) add privileged table flag to table logger
  4) merge is_[general/slow]_log_table_enabled()
     into one function.
sql/mysql_priv.h:
  move log table defines to log.h
sql/sql_delete.cc:
  use new function check_if_log_table() instead of direct strcmp
sql/sql_rename.cc:
  Traverse the list of tables in mysql_rename_tables
  to make sure that log tables are processed correctly
  (that is, according to the rules specified in the
  main CS comment)
sql/sql_table.cc:
  1) mysql_admin_table() should disable logs if it performs
     exclusive admin operation on a log table. This way we
     also eliminate warning on REPAIR of the log table.
  2) mysql_create_like_table should read-lock the source table
     instead getting name lock on it. Name lock is too restrictive
     in this case.
sql/share/errmsg.txt:
  Add a new error message for rename of the log tables
sql/table.cc:
  use new function instead of direct strcmp.
  change my_strcasecmp() -> strcmp(), when
  comparing system db and table names
storage/csv/ha_tina.cc:
  update function to reflect changes in log tables
  locking logic.
storage/myisam/ha_myisam.cc:
  update function to reflect changes in log tables
  locking logic.
 2006-10-13 17:26:46 +04:00
unknown
3def506b9d ndb - fixed for BUG#15021, binlog_index table become inconsistent if errors during purge of binlogs. 
if EMFILE error occured while purging binary logs, stop purging logs and report error message to user.


mysys/my_open.c:
  report EMFILE error when opening file failed.
sql/log.cc:
  report EMFILE error when purging logs, and stop purging logs when EMFILE error occured.
sql/log.h:
  added LOG_INFO_EMFILE error number.
sql/share/errmsg.txt:
  added EMFILE error message for purging binary logs.
sql/sql_repl.cc:
  added EMFILE error message.
sql/table.cc:
  report EMFILE error.
 2006-10-13 12:48:05 +08:00
unknown
c34940a078 Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge


include/my_sys.h:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
 2006-10-10 21:59:23 +02:00
unknown
b5ae1184d7 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  may.pils.ru:/home/svoj/devel/bk/mysql-5.1-engines


sql/sql_update.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
mysql-test/r/windows.result:
  Use remote.
mysql-test/t/windows.test:
  Use remote.
 2006-10-08 15:32:00 +05:00