into trift2.:/MySQL/M51/push-5.1
BitKeeper/deleted/.del-CMakeLists.txt~2eb9019b:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~86a68ea1:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~99a50df6:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~ef945345:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~fdec1f01:
Auto merged
dbug/CMakeLists.txt:
Auto merged
tests/CMakeLists.txt:
Auto merged
zlib/CMakeLists.txt:
Auto merged
client/CMakeLists.txt:
Will be re-applied using "patch".
libmysql/CMakeLists.txt:
Will be re-applied using "patch".
mysys/CMakeLists.txt:
Will be re-applied using "patch".
sql/CMakeLists.txt:
Will be re-applied using "patch".
into mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build
BitKeeper/deleted/.del-CMakeLists.txt~13:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~14:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~3:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~8:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~9:
Auto merged
scripts/make_win_bin_dist:
SCCS merged
Aligned client library build and use with the Unix version when it
comes to what source to include directly in the builds, and what
libraries to link with (bug#30118).
Also reviewed, corrected and made more clear when static or dynamic
Thread Local Storage is to be used. Some code duplication was removed,
and some redundant library usage were removed, reducing the risk of
incorrect TLS usage.
client/CMakeLists.txt:
- Removed code duplication by moving build of "mysqlclient" to
the "libmysql" directory
- Link clients with the new "mysqlclient_notls", to protect for
the case the clients use more than the client API, and access
thread data directly.
- Synced explicit target addition of sources with Unix.
dbug/CMakeLists.txt:
No need to set CXX flags, no C++ code
libmysql/CMakeLists.txt:
- Aligned more with Unix version when it comes to included source files
- Build both DLL and static library in this directory
- Produce separe static TLS version of the static client library, for
use when building clients in this build that might access TLS
storage directly.
mysys/CMakeLists.txt:
We only have to build the static TLS version, as no clients are
linking directly with the "mysys" library.
scripts/make_win_bin_dist:
Ajusted paths to new "mysqlclient.lib" location in source tree
sql/CMakeLists.txt:
Removed duplicate "ha_blackhole.cc" in file listing
Removed explicit link to "dbug.lib" not needed
Link with the static TLS "mysqlclient_notls"
tests/CMakeLists.txt:
Removed explicit link to "dbug", "mysys", "yassl", "taocrypt" and
"zlib" not needed.
Added explicit source addition "../mysys/my_memmem.c".
No need for setting CXX flags, no C++ code.
Use the static TLS "mysqlclient_notls" for linkage.
zlib/CMakeLists.txt:
No need for a dynamic TLS version of this library, no access to thread
storage is done from it. Also no need to define MYSQL_CLIENT, not used,
or __WIN32__ that is handled by the library header without this define.
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
BitKeeper/deleted/.del-CMakeLists.txt~1:
Auto merged
CMakeLists.txt:
Auto merged
configure.in:
Auto merged
sql/sql_parse.cc:
Auto merged
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
mysql-test/include/mix1.inc:
Auto merged
mysql-test/r/innodb_mysql.result:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
which does not work. Removing these attempted privileges makes
this identical to option 5 so remove it completely. The spirit
of the program appears to be aimed at database privileges, so do
not add another option for granting global privileges as it may
be unexpected. Fixes bug#14618 (same as previous patch, this
time applied to -maint tree).
scripts/mysql_setpermission.sh:
Option 6 tries to apply global privileges at the database
level which does not work - remove it.
into mysql.com:/home/kent/bk/config_h/mysql-5.1-build
config/ac-macros/misc.m4:
Auto merged
configure.in:
Auto merged
include/Makefile.am:
Auto merged
mysql-test/std_data/cacert.pem:
Auto merged
mysql-test/std_data/client-cert.pem:
Auto merged
mysql-test/std_data/client-key.pem:
Auto merged
mysql-test/std_data/server-cert.pem:
Auto merged
mysql-test/std_data/server-key.pem:
Auto merged
mysys/my_pthread.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6:
Auto merged
Post-review fix, if 'logger' can't be found, and --syslog is requested, exit with error message instead of fall back to logging to error file.
scripts/mysqld_safe.sh:
Post-review fix, if 'logger' can't be found, and --syslog is requested, exit with error message instead of fall back to logging to error file.
to "my_config.h". Not to pollute the top directory, and to get more control
over what is included. Made the include path for "libedit" pick up its own
"config.h" first.
config/ac-macros/misc.m4:
aclocal in automake 1.8 can't handle AC_REQUIRE on
a user macro defined in the same included file.
cmd-line-utils/libedit/Makefile.am:
Changed include path so that current directory is taken first, as there
is a "config.h" there with the same name as the one in top "include".
configure.in:
Generate "config.h" directly into "include", don't pollute top directory
include/Makefile.am:
Copy "config.h" from current directory to "my_config.h", added note in
the make file why there are two identical files with different name.
scripts/make_binary_distribution.sh:
Removed copy of "config.h" from top directory, it is in "include" in a
source tree.
Don't use syslog by default; user will have to request it explicitly with the --syslog option.
Use "sed -u" to get unbuffered output from sed, if it's supported.
Otherwise, don't use sed at all - don't strip the timestamp from mysqld messages.
Also, add new --syslog-tag=FOO option, which adds "-FOO" to the tag used when logging messages to syslog (i.e., mysqld-FOO or mysqld_safe-FOO)
Also, explicitly mention where log messages are going, so user can more easily find them.
Also, check if 'logger' is in the PATH, and log to the error log file if it can't be found.
into production.mysql.com:/usersnfs/jperkin/bk/bug-28585-5.1
scripts/make_binary_distribution.sh:
Auto merged
scripts/mysql_install_db.sh:
Merge changes from 5.0
- make the 'dist-hook' from top-level Makefile work again.
- we can find my_print_defaults from --basedir by parsing command
line arguments prior to running my_print_defaults.
- take advantage of additional command line parsing and allow the
--no-defaults etc arguments to work anywhere rather than having
to be the first argument.
- find SQL files either from binary archive or source install.
- consolidate and tidy code and error messages.
scripts/mysql_install_db.sh:
Consolidate error messages.
5.1.20 -> 5.1.21 upgrades.
We generate mysql_fix_privilege.sql file, which contains SQL
statements required to upgrade the system database. This script
is generated by concatenation of mysql_system_tables.sql and
mysql_system_tables_fix.sql.
The problem was that
- in order to create general_log and slow_log tables we use
stored programs in mysql_system_tables.sql;
- we upgrade mysql.proc table in mysql_system_tables_fix.sql;
So, if mysql.proc table needs to be upgraded, stored procedures
can not be used in mysql_system_tables.sql.
In other words, in mysql_system_tables.sql stored programs must
not be used because they may be unavailable at this point.
The fix is to use dynamic SQL instead of stored programs.
There is no test case for this bug because our test suite
is not suitable for such test cases. system_mysql_db_fix* test
cases play with the database "test". Here we need to modify
the system database and we can not do that in the test suite.
scripts/mysql_system_tables.sql:
Use dynamic SQL instead of stored programs.
available and reduce the chance of failure. This should fix bug#28585
which is caused by the script being quite random in how it finds files it
requires and not giving very good feedback to the user about what went
wrong.
Also update make_binary_distribution so that it provides the correct path
to the required SQL scripts when generating mysql_install_db. The script
only previously worked because of the permissive behaviour which looked
around the current working directory before the "correct" location. This
could lead to severe problems if the user happened to run the script from
a location which contained older or even broken copies of the SQL scripts.
We now require either a complete binary release (and the mysql_install_db
script ran from inside the extracted archive), or an installed compiled
tree, as this is the only way we can be sure everything that we need is
available and ready to run.
While working on this fix, also clean up the mysql_install_db script a lot
to make it simpler, easier to read, and hopefully less prone to bugs in
the future.
scripts/make_binary_distribution.sh:
SQL files live in ./share not ./support-files in binary distribution.
scripts/mysql_install_db.sh:
Use a consistent shell indentation style.
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
configure.in:
Auto merged
libmysql/libmysql.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/field.cc:
Auto merged
into trift2.:/MySQL/M51/bug21023-25486-5.1
mysql-test/Makefile.am:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
support-files/Makefile.am:
SCCS merged
Fixing bug#21023: "mysql-stress-test.pl" missing in builds
mysql-test/Makefile.am:
Ensure "mysql-stress-test.pl" is handled by "make install" in the "mysql-test" directory.
This should get the script into the result tree of a RPM build.
Fixing bug#21023.
scripts/make_binary_distribution.sh:
Copy "mysql-test/mysql-stress-test.pl" into a binary distribution ("tar.gz" and derived formats).
Fixing bug#21023.
into maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
client/mysqldump.c:
Auto merged
mysql-test/lib/mtr_cases.pl:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/suite/binlog/r/binlog_multi_engine.result:
Auto merged
mysql-test/suite/binlog/t/binlog_multi_engine.test:
Auto merged
mysql-test/suite/ndb/r/ndb_read_multi_range.result:
Auto merged
mysql-test/suite/ndb/r/ndb_sp.result:
Auto merged
mysql-test/suite/ndb/r/ndb_trigger.result:
Auto merged
mysql-test/suite/ndb/r/ps_7ndb.result:
Auto merged
mysql-test/suite/ndb/t/loaddata_autocom_ndb.test:
Auto merged
mysql-test/suite/ndb/t/ndb_alter_table.test:
Auto merged
mysql-test/suite/ndb/t/ndb_alter_table2.test:
Auto merged
mysql-test/suite/ndb/t/ndb_alter_table3.test:
Auto merged
mysql-test/suite/ndb/t/ndb_autodiscover.test:
Auto merged
mysql-test/suite/ndb/t/ndb_autodiscover2.test:
Auto merged
mysql-test/suite/ndb/t/ndb_autodiscover3.test:
Auto merged
mysql-test/suite/ndb/t/ndb_basic.test:
Auto merged
mysql-test/suite/ndb/t/ndb_binlog_ddl_multi.test:
Auto merged
mysql-test/suite/ndb/t/ndb_binlog_log_bin.test:
Auto merged
mysql-test/suite/ndb/t/ndb_binlog_multi.test:
Auto merged
mysql-test/suite/ndb/t/ndb_bitfield.test:
Auto merged
mysql-test/suite/ndb/t/ndb_blob.test:
Auto merged
mysql-test/suite/ndb/t/ndb_blob_partition.test:
Auto merged
mysql-test/suite/ndb/t/ndb_cache.test:
Auto merged
mysql-test/suite/ndb/t/ndb_cache2.test:
Auto merged
mysql-test/suite/ndb/t/ndb_cache_multi.test:
Auto merged
mysql-test/suite/ndb/t/ndb_cache_multi2.test:
Auto merged
mysql-test/suite/ndb/t/ndb_charset.test:
Auto merged
mysql-test/suite/ndb/t/ndb_condition_pushdown.test:
Auto merged
mysql-test/suite/ndb/t/ndb_config.test:
Auto merged
mysql-test/suite/ndb/t/ndb_config2.test:
Auto merged
mysql-test/suite/ndb/t/ndb_cursor.test:
Auto merged
mysql-test/suite/ndb/t/ndb_database.test:
Auto merged
mysql-test/suite/ndb/t/ndb_dd_alter.test:
Auto merged
mysql-test/suite/ndb/t/ndb_dd_backuprestore.test:
Auto merged
mysql-test/suite/ndb/t/ndb_dd_basic.test:
Auto merged
mysql-test/suite/ndb/t/ndb_dd_ddl.test:
Auto merged
mysql-test/suite/ndb/t/ndb_dd_disk2memory.test:
Auto merged
mysql-test/suite/ndb/t/ndb_dd_dump.test:
Auto merged
mysql-test/suite/ndb/t/ndb_dd_sql_features.test:
Auto merged
mysql-test/suite/ndb/t/ndb_gis.test:
Auto merged
mysql-test/suite/ndb/t/ndb_index.test:
Auto merged
mysql-test/suite/ndb/t/ndb_index_ordered.test:
Auto merged
mysql-test/suite/ndb/t/ndb_index_unique.test:
Auto merged
mysql-test/suite/ndb/t/ndb_insert.test:
Auto merged
mysql-test/suite/ndb/t/ndb_limit.test:
Auto merged
mysql-test/suite/ndb/t/ndb_loaddatalocal.test:
Auto merged
mysql-test/suite/ndb/t/ndb_lock.test:
Auto merged
mysql-test/suite/ndb/t/ndb_minmax.test:
Auto merged
mysql-test/suite/ndb/t/ndb_multi.test:
Auto merged
mysql-test/suite/ndb/t/ndb_partition_error.test:
Auto merged
mysql-test/suite/ndb/t/ndb_partition_key.test:
Auto merged
mysql-test/suite/ndb/t/ndb_partition_list.test:
Auto merged
mysql-test/suite/ndb/t/ndb_partition_range.test:
Auto merged
mysql-test/suite/ndb/t/ndb_read_multi_range.test:
Auto merged
mysql-test/suite/ndb/t/ndb_rename.test:
Auto merged
mysql-test/suite/ndb/t/ndb_replace.test:
Auto merged
mysql-test/suite/ndb/t/ndb_restore.test:
Auto merged
mysql-test/suite/ndb/t/ndb_restore_partition.test:
Auto merged
mysql-test/suite/ndb/t/ndb_restore_print.test:
Auto merged
mysql-test/suite/ndb/t/ndb_row_format.test:
Auto merged
mysql-test/suite/ndb/t/ndb_single_user.test:
Auto merged
mysql-test/suite/ndb/t/ndb_sp.test:
Auto merged
mysql-test/suite/ndb/t/ndb_subquery.test:
Auto merged
mysql-test/suite/ndb/t/ndb_temporary.test:
Auto merged
mysql-test/suite/ndb/t/ndb_transaction.test:
Auto merged
mysql-test/suite/ndb/t/ndb_trigger.test:
Auto merged
mysql-test/suite/ndb/t/ndb_truncate.test:
Auto merged
mysql-test/suite/ndb/t/ndb_types.test:
Auto merged
mysql-test/suite/ndb/t/ndb_update.test:
Auto merged
mysql-test/suite/ndb/t/ndb_view.test:
Auto merged
mysql-test/suite/ndb/t/ndbapi.test:
Auto merged
mysql-test/suite/ndb/t/ps_7ndb.test:
Auto merged
mysql-test/suite/ndb/t/strict_autoinc_5ndb.test:
Auto merged
mysql-test/suite/rpl/r/rpl_events.result:
Auto merged
mysql-test/suite/rpl/r/rpl_replicate_do.result:
Auto merged
mysql-test/suite/rpl/r/rpl_row_UUID.result:
Auto merged
mysql-test/suite/rpl/r/rpl_sp.result:
Auto merged
mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result:
Auto merged
mysql-test/suite/rpl/r/rpl_trigger.result:
Auto merged
mysql-test/suite/rpl/r/rpl_view.result:
Auto merged
mysql-test/suite/rpl_ndb/r/rpl_ndb_UUID.result:
Auto merged
mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_advance.result:
Auto merged
mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_commit_afterflush.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_advance.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans.test:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb-master.opt:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/Makefile.am:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.h:
Auto merged
mysql-test/t/disabled.def:
manual merge
(Will need to follow up with moving a few test cases around post-merge)
- BUG#11986: Stored routines and triggers can fail if the code
has a non-ascii symbol
- BUG#16291: mysqldump corrupts string-constants with non-ascii-chars
- BUG#19443: INFORMATION_SCHEMA does not support charsets properly
- BUG#21249: Character set of SP-var can be ignored
- BUG#25212: Character set of string constant is ignored (stored routines)
- BUG#25221: Character set of string constant is ignored (triggers)
There were a few general problems that caused these bugs:
1. Character set information of the original (definition) query for views,
triggers, stored routines and events was lost.
2. mysqldump output query in client character set, which can be
inappropriate to encode definition-query.
3. INFORMATION_SCHEMA used strings with mixed encodings to display object
definition;
1. No query-definition-character set.
In order to compile query into execution code, some extra data (such as
environment variables or the database character set) is used. The problem
here was that this context was not preserved. So, on the next load it can
differ from the original one, thus the result will be different.
The context contains the following data:
- client character set;
- connection collation (character set and collation);
- collation of the owner database;
The fix is to store this context and use it each time we parse (compile)
and execute the object (stored routine, trigger, ...).
2. Wrong mysqldump-output.
The original query can contain several encodings (by means of character set
introducers). The problem here was that we tried to convert original query
to the mysqldump-client character set.
Moreover, we stored queries in different character sets for different
objects (views, for one, used UTF8, triggers used original character set).
The solution is
- to store definition queries in the original character set;
- to change SHOW CREATE statement to output definition query in the
binary character set (i.e. without any conversion);
- introduce SHOW CREATE TRIGGER statement;
- to dump special statements to switch the context to the original one
before dumping and restore it afterwards.
Note, in order to preserve the database collation at the creation time,
additional ALTER DATABASE might be used (to temporary switch the database
collation back to the original value). In this case, ALTER DATABASE
privilege will be required. This is a backward-incompatible change.
3. INFORMATION_SCHEMA showed non-UTF8 strings
The fix is to generate UTF8-query during the parsing, store it in the object
and show it in the INFORMATION_SCHEMA.
Basically, the idea is to create a copy of the original query convert it to
UTF8. Character set introducers are removed and all text literals are
converted to UTF8.
This UTF8 query is intended to provide user-readable output. It must not be
used to recreate the object. Specialized SHOW CREATE statements should be
used for this.
The reason for this limitation is the following: the original query can
contain symbols from several character sets (by means of character set
introducers).
Example:
- original query:
CREATE VIEW v1 AS SELECT _cp1251 'Hello' AS c1;
- UTF8 query (for INFORMATION_SCHEMA):
CREATE VIEW v1 AS SELECT 'Hello' AS c1;
client/mysqldump.c:
Set original character set and collation before dumping definition query.
include/my_sys.h:
Move out-parameter to the end of list.
mysql-test/lib/mtr_report.pl:
Ignore server-warnings during the test case.
mysql-test/r/create.result:
Update result file.
mysql-test/r/ctype_cp932_binlog_stm.result:
Update result file.
mysql-test/r/events.result:
Update result file.
mysql-test/r/events_bugs.result:
Update result file.
mysql-test/r/events_grant.result:
Update result file.
mysql-test/r/func_in.result:
Update result file.
mysql-test/r/gis.result:
Update result file.
mysql-test/r/grant.result:
Update result file.
mysql-test/r/information_schema.result:
Update result file.
mysql-test/r/information_schema_db.result:
Update result file.
mysql-test/r/lowercase_view.result:
Update result file.
mysql-test/r/mysqldump.result:
Update result file.
mysql-test/r/ndb_sp.result:
Update result file.
mysql-test/r/ps.result:
Update result file.
mysql-test/r/rpl_replicate_do.result:
Update result file.
mysql-test/r/rpl_sp.result:
Update result file.
mysql-test/r/rpl_trigger.result:
Update result file.
mysql-test/r/rpl_view.result:
Update result file.
mysql-test/r/show_check.result:
Update result file.
mysql-test/r/skip_grants.result:
Update result file.
mysql-test/r/sp-destruct.result:
Update result file.
mysql-test/r/sp-error.result:
Update result file.
mysql-test/r/sp-security.result:
Update result file.
mysql-test/r/sp.result:
Update result file.
mysql-test/r/sql_mode.result:
Update result file.
mysql-test/r/system_mysql_db.result:
Update result file.
mysql-test/r/temp_table.result:
Update result file.
mysql-test/r/trigger-compat.result:
Update result file.
mysql-test/r/trigger-grant.result:
Update result file.
mysql-test/r/trigger.result:
Update result file.
mysql-test/r/view.result:
Update result file.
mysql-test/r/view_grant.result:
Update result file.
mysql-test/t/events.test:
Update test case (new columns added).
mysql-test/t/information_schema.test:
Update test case (new columns added).
mysql-test/t/show_check.test:
Test case for SHOW CREATE TRIGGER in prepared statements and
stored routines.
mysql-test/t/sp-destruct.test:
Update test case (new columns added).
mysql-test/t/sp.test:
Update test case (new columns added).
mysql-test/t/view.test:
Update test.
mysys/charset.c:
Move out-parameter to the end of list.
scripts/mysql_system_tables.sql:
Add new columns to mysql.proc and mysql.event.
scripts/mysql_system_tables_fix.sql:
Add new columns to mysql.proc and mysql.event.
sql/event_data_objects.cc:
Support new attributes for events.
sql/event_data_objects.h:
Support new attributes for events.
sql/event_db_repository.cc:
Support new attributes for events.
sql/event_db_repository.h:
Support new attributes for events.
sql/events.cc:
Add new columns to SHOW CREATE event resultset.
sql/mysql_priv.h:
1. Introduce Object_creation_ctx;
2. Introduce SHOW CREATE TRIGGER;
3. Introduce auxilary functions.
sql/sp.cc:
Add support for new store routines attributes.
sql/sp_head.cc:
Add support for new store routines attributes.
sql/sp_head.h:
Add support for new store routines attributes.
sql/sql_lex.cc:
Generate UTF8-body on parsing/lexing.
sql/sql_lex.h:
1. Generate UTF8-body on parsing/lexing.
2. Introduce SHOW CREATE TRIGGER.
sql/sql_parse.cc:
Introduce SHOW CREATE TRIGGER.
sql/sql_partition.cc:
Update parse_sql().
sql/sql_prepare.cc:
Update parse_sql().
sql/sql_show.cc:
Support new attributes for views
sql/sql_trigger.cc:
Support new attributes for views
sql/sql_trigger.h:
Support new attributes for views
sql/sql_view.cc:
Support new attributes for views
sql/sql_yacc.yy:
1. Add SHOW CREATE TRIGGER statement.
2. Generate UTF8-body for views, stored routines, triggers and events.
sql/table.cc:
Introduce Object_creation_ctx.
sql/table.h:
Introduce Object_creation_ctx.
sql/share/errmsg.txt:
Add new errors.
mysql-test/include/ddl_i18n.check_events.inc:
Aux file for test suite.
mysql-test/include/ddl_i18n.check_sp.inc:
Aux file for test suite.
mysql-test/include/ddl_i18n.check_triggers.inc:
Aux file for test suite.
mysql-test/include/ddl_i18n.check_views.inc:
Aux file for test suite.
mysql-test/include/have_cp1251.inc:
Aux file for test suite.
mysql-test/include/have_cp866.inc:
Aux file for test suite.
mysql-test/include/have_koi8r.inc:
Aux file for test suite.
mysql-test/include/have_utf8.inc:
Aux file for test suite.
mysql-test/r/ddl_i18n_koi8r.result:
Result file.
mysql-test/r/ddl_i18n_utf8.result:
Result file.
mysql-test/r/have_cp1251.require:
Aux file for test suite.
mysql-test/r/have_cp866.require:
Aux file for test suite.
mysql-test/r/have_koi8r.require:
Aux file for test suite.
mysql-test/r/have_utf8.require:
Aux file for test suite.
mysql-test/t/ddl_i18n_koi8r.test:
Complete koi8r test case for the CS patch.
mysql-test/t/ddl_i18n_utf8.test:
Complete utf8 test case for the CS patch.
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
include/my_global.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
strings/strtod.c:
Auto merged
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
configure.in:
Auto merged
include/my_global.h:
Auto merged
sql/item_func.cc:
Auto merged
strings/strtod.c:
Auto merged
into trift2.:/MySQL/M51/bug26609-5.1
Makefile.am:
Manual merge: Include the "row_lock" suite in the "test-bt" target.
scripts/make_binary_distribution.sh:
Manual merge: Include the additional test suites in the binary package.
Include all the additional test suites in the binary packages ("tar.gz").
This is the tar.gz part of the fixes for bug#26609; for RPMs it is already done.
scripts/make_binary_distribution.sh:
Include all the additional test suites (for now: "funcs_1", "funcs_2", "row_lock")
in the binary packages ("tar.gz").
Take them "as is", without any file filtering (except for the BK subdirectories "SCCS").
This is the tar.gz part of the fixes for bug#26609; for RPMs it is already done.
Use this opportunity to correct the language in some comments.
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
configure.in:
Auto merged
mysql-test/r/strict.result:
Auto merged
mysql-test/r/type_datetime.result:
Auto merged
mysql-test/t/type_datetime.test:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
- Add test for upgrading from 5.1.17 - it's a beta but anyway
good to have a check oif upgrading new system tables for 5.1
- Always put the "originator" column after "comment" to get correct
order of columns in "events" table
scripts/mysql_system_tables_fix.sql:
Make sure the "originator" column ands up after "comment" to get
correct order of the columns in event table
mysql-test/t/system_mysql_db_fix50117-master.opt:
New BitKeeper file ``mysql-test/t/system_mysql_db_fix50117-master.opt''
mysql-test/t/system_mysql_db_fix50117.test:
New BitKeeper file ``mysql-test/t/system_mysql_db_fix50117.test''
- The SQL commands used by mysql_upgrade are written to be run
with sql_mode set to '' - thus the scripts should change sql_mode
for the session to make sure the SQL is legal.
mysql-test/r/mysql_upgrade.result:
Update test result
mysql-test/t/mysql_upgrade.test:
The SQL commands used by mysql_upgrade are written to be run
with sql_mode set to '' - thus the scripts should change sql_mode
for the session to make sure the SQL is legal.
scripts/mysql_system_tables_fix.sql:
Set sql_mode to '' before running the SQL commands
to fix system tables - backport from 5.1
into siva.hindu.god:/home/tsmith/m/bk/maint/50
mysql-test/r/type_datetime.result:
Auto merged
mysql-test/t/outfile.test:
Auto merged
mysql-test/t/type_datetime.test:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/my_decimal.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
Ensure the balanced use of 'x' guards in string comparisons also in the new 5.1 lines.
scripts/make_win_bin_dist:
After-merge fix:
Ensure the balanced use of 'x' guards in string comparisons also in the new 5.1 lines.
Several string comparisons could never yield true because they had an 'x' guard
added to the variable but not to the constant value. Fix that by guarding both sides.
scripts/make_win_bin_dist:
Fix bug#27833 "Bourne shell string comparison issue in scripts/make_win_bin_dist":
Several string comparisons could never yield true because they had an 'x' guard
added to the variable but not to the constant value. Fix that by guarding both sides.
Use this occasion to apply some corrections to the comments and the usage text.
Also, ensure the ".pdb" file is always optional.
into xiphis.org:/home/antony/work2/mysql-5.1-engines.merge
include/my_global.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
storage/innobase/handler/ha_innodb.cc:
manual change to new api
mysqld_safe.sh: Overhaul the logging design, to allow logging
mysqld messages to syslog. Add --syslog and --skip-syslog
arguments for mysqld_safe.
scripts/mysqld_safe.sh:
Overhaul the logging design, to allow logging mysqld messages to syslog.
Add two new options: --syslog and --skip-syslog. --syslog is the default,
unless --log-error is also specified.
If --log-error is specified (for mysqld_safe, mysqld, server, etc. - any
group which mysqld_safe checks for arguments), then syslog is turned off.
This is because mysqld will get the --log-error argument and log to a file
anyways, which will be confusing to the user. If the user requests both
--syslog and --log-error, a warning is printed (to mysqld_safe's stderr and
to syslog), and we then behave as if --skip-syslog had been specified.
Also, logging messages have been normalized somewhat: mysqld_safe now always
prefixes messages with '<TIMESTAMP> mysqld_safe '. All messages go to the
the console (stdout or stderr, depending on if it's a notice or an error) and
to (the error log OR syslog).
Also, a few cleanups while I'm here.
(here: "scripts/mysql_fix_privilege_tables{.sql,_sql.c}"). Important for cross-builds.
scripts/Makefile.am:
Generated files like "mysql_fix_privilege_tables{.sql,_sql.c}" should survive
a "make clean", this is essential for cross-builds.
So move them from "CLEANFILES" to "DISTCLEANFILES".
source tarball, this is essential for cross builds, like for NetWare.
scripts/Makefile.am:
On a fast build machine, both the source (mysql_fix_privilege_tables.sql)
and the generated file (mysql_fix_privilege_tables_sql.c) may have identical timestamps
(granularity is one second only, may be too coarse).
If that happens, the Makefile rule will fire, and "comp_sql" will be built and called -
which fails in a cross build, like for NetWare.
Prevent that by sleeping for 5 (five) seconds, this will ensure a time difference.
into trift2.:/MySQL/M51/mysql-5.1
libmysqld/Makefile.am:
Auto merged
netware/Makefile.am:
Auto merged
scripts/Makefile.am:
Auto merged
BitKeeper/deleted/.del-Makefile.am~2:
Auto merged
client/Makefile.am:
Merge does not fit - to be done manually.
client/Makefile.am:
"Makefile" command lines must start with a tab, not with blanks.
libmysqld/Makefile.am:
"Makefile" command lines must start with a tab, not with blanks.
netware/Makefile.am:
"Makefile" command lines must start with a tab, not with blanks.
scripts/Makefile.am:
"Makefile" command lines must start with a tab, not with blanks.
win/Makefile.am:
After a backslash (to mark a continuation line) there must not be a trailing blank.
scripts/Makefile.am:
Necessary change for cross-builds (like we do for NetWare):
Generate "mysql_fix_privilege_tables_sql.c" during Bootstrap and include it in
the source tarball which is created via "make dist".
scripts/mysql_install_db.sh: don't fail if --skip-XXX is not recognized
mysql-test/mysql-test-run.pl:
another mysqld --help fix
scripts/mysql_install_db.sh:
don't fail if --skip-XXX is not recognized
Recognize the --no-defaults, --defaults-file and --defaults-extra-file
options. Treat old --config-file argument as if --defaults-extra-file
had been specified instead.
Plus a few other defaults-related cleanups.
extra/my_print_defaults.c:
Make help text more accurate regarding how --config-file, --defaults-file, and --defaults-extra-file should be used. Flag --config-file as deprecated.
mysys/default.c:
Always print a newline after listing the default files, even if
--defaults-file= was set (in my_print_default_files()).
scripts/mysqld_multi.sh:
Recognize --no-defaults, --defaults-file and --defaults-extra-file options.
Treat old --config-file argument as if --defaults-extra-file had been specified
instead.
Improve find_groups() method, to honor --defaults-file, etc.
A few random drive-by cleanups, while I'm here.
Disable broken quoting of extra arguments; proper fix requires using eval and lots more quoting throughout the script
scripts/mysql_install_db.sh:
Disable broken quoting of extra arguments; proper fix requires using eval and lots more quoting throughout the script
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
scripts/mysql_system_tables_fix.sql:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
Fix "make distcheck"
scripts/CMakeLists.txt:
Add "name of struct" as first arg to comp_sql
scripts/comp_sql.c:
Add "name of struct" as first arg to comp_sql
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
Makefile.am:
Auto merged
client/mysql_upgrade.c:
Auto merged
sql/mysql_priv.h:
Auto merged
tests/mysql_client_test.c:
Auto merged
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
client/mysql_upgrade.c:
Auto merged
mysql-test/r/mysql_upgrade.result:
Auto merged
mysql-test/t/mysql_upgrade.test:
Auto merged
client/mysql_upgrade.c:
Add defines for WEXITSTATUS
Pass arguments on command line instead of --defaults-file=<temp file>
mysql-test/r/mysql_upgrade.result:
When testing that mysql_upgrade detect if mysqlcheck fails, use an option that
is used on all platforms.
mysql-test/t/mysql_upgrade.test:
When testing that mysql_upgrade detect if mysqlcheck fails, use an option that
is used on all platforms.
scripts/comp_sql.c:
Some compilers have a max string length, insert a newline at
every 512th char in long strings
client/mysql_upgrade.c:
Windows fix
scripts/CMakeLists.txt:
Fix problems with CMakeList causing build to fail
scripts/comp_sql.c:
Improve comp_sql.c to generate output file with shorter strings
Add "two liner" to mysqld --bootstrap that allows
wo write scripts that can be run both by mysql and mysqld --bootstrap
Remove duplicate create of MySQL system tables
mysql-test/r/mysql_upgrade.result:
Update mysql_upgrade.result for new tables in 5.1
scripts/mysql_system_tables.sql:
Use "delimiter ;;" to make it possible to run the script
both with "mysql" and "mysqld --bootstrap"
scripts/mysql_system_tables_fix.sql:
Remove duplicate stored procedure for creating slow_log
and general_log.
Remove duplicate CREATE of ndb_binlog_index.
Those are already defined in mysql_system_tables.sql
sql/sql_parse.cc:
Make "mysqld --bootstrap skip lines startig with "delimiter"
thus making it possible to write sql scripts containing
stored procedures that can be executed both with "mysql" and
"mysqld --bootstrap"
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
scripts/Makefile.am:
Auto merged
sql/mysql_priv.h:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~1:
Auto merged
client/mysql_upgrade.c:
Use remote
mysql-test/r/mysql_upgrade.result:
Use remote
Makefile.am:
Merge "build scripts/ a little earlier"
include/my_global.h:
Merge
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
BitKeeper/etc/ignore:
auto-union
CMakeLists.txt:
Auto merged
Makefile.am:
Auto merged
include/my_global.h:
Auto merged
sql/mysql_priv.h:
Auto merged
- Improve mysql_upgrade and add comments describing it's logic
- Don't look for mysql and mysqlcheck randomly, use dir where mysql_upgrade
was started from
- Don't look for mysql_fix_privilege_tables.sql randomly, compile
in the mysql_fix_privilege_tables.sql file and use that to upgrade
the system tables of MySQL
- Check for any unexpected error returned from runnning the mysql_fix_privilege_tables SQL
- Fix bug#26639, bug#24248 and bug#25405
BitKeeper/etc/ignore:
Added scripts/comp_sql scripts/mysql_fix_privilege_tables_sql.c to the ignore list
CMakeLists.txt:
Build files also in scripts/
Makefile.am:
Build scripts/ a little earlier to make
the scripts/mysql_fix_privilege_tables_sql.c file available
when client/ is built
client/mysql_upgrade.c:
Updated version of mysql_upgrade with comments and logical functions
include/my_global.h:
Move IF_WIN macro to my_global.h fr from sql/mysql_priv.h
mysql-test/r/mysql_upgrade.result:
Update result
mysql-test/t/mysql_upgrade.test:
Add more tests for different bugs related to mysql_upgrade
scripts/Makefile.am:
Build comp_sql and mysql_fix_privilege_tables_sql.c
sql/mysql_priv.h:
Move IF_WIN macro to my_global.h fr from sql/mysql_priv.h
scripts/CMakeLists.txt:
New BitKeeper file ``scripts/CMakeLists.txt''
scripts/comp_sql.c:
New BitKeeper file ``scripts/comp_sql.c''
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-configure.in.rej:
Auto merged
configure.in:
Auto merged
sql/item.h:
Auto merged
sql/sql_select.cc:
Auto merged
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
mysql-test/mysql-test-run.pl:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
scripts/mysql_system_tables.sql:
Manual merge
scripts/mysql_system_tables_data.sql:
Manual merge
- Allow mysql_install_db to be run a second time in the same
datadir to create and fill any missing system tables
scripts/mysql_install_db.sh:
Remove check that dissallowed running mysql_install_db a second time
in same directory
scripts/mysql_system_tables.sql:
Save information about if tables db and user already existed
scripts/mysql_system_tables_data.sql:
Fill tables db and user with initial data if tables
didn't already exist.
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
CMakeLists.txt:
Auto merged
mysql-test/r/mysqlbinlog.result:
Auto merged
mysql-test/t/mysqlbinlog.test:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
scripts/make_win_bin_dist:
Auto merged
sql/set_var.cc:
Auto merged
support-files/mysql.spec.sh:
merge fix
into mysql.com:/home/kent/bk/sotest/mysql-5.1-build
BitKeeper/deleted/.del-SETUP.sh.rej:
Auto merged
BitKeeper/deleted/.del-configure.in.rej:
Auto merged
BitKeeper/deleted/.del-my_global.h.rej:
Auto merged
BitKeeper/deleted/.del-my_pthread.h.rej:
Auto merged
BitKeeper/deleted/.del-thr_alarm.c.rej:
Auto merged
config/ac-macros/zlib.m4:
Auto merged
configure.in:
Auto merged
zlib/Makefile.am:
Auto merged
scripts/make_binary_distribution.sh:
SCCS merged
Only require the more recent zlibCompileFlags() when
building the server, client zlib don't need it.
Makefile.am:
Always build the bundled zlib static only
configure.in:
Look for dlopen() even if --with-mysqld-ldflags constains "-static",
as this is not the same as the flag to "ld", it just informs
"libtool" to link static with libraries created part of the build,
even if there exists shared versions.
make_binary_distribution.sh:
Real "mysqlmanager" executable might be in ".libs"
configure.in:
Look for dlopen() even if --with-mysqld-ldflags constains "-static",
as this is not the same as the flag to "ld", it just informs
"libtool" to link static with libraries created part of the build,
even if there exists shared versions.
config/ac-macros/zlib.m4:
Only require the more recent zlibCompileFlags() when
building the server, client zlib don't need it.
scripts/make_binary_distribution.sh:
Real "mysqlmanager" executable might be in ".libs"
zlib/Makefile.am:
Always build the bundled zlib static only
CMakeLists.txt:
use correct runtime library for RelWithDebugInfo target and always generate .map files
scripts/make_win_bin_dist:
use RelWithDebInfo target output if exists, include copy mysqld and mysqlmanager debug info in distribution
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
client/client_priv.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/rpl_deadlock_innodb.result:
Auto merged
mysql-test/r/rpl_flushlog_loop.result:
Auto merged
mysql-test/r/rpl_known_bugs_detection.result:
Auto merged
mysql-test/r/rpl_ndb_basic.result:
Auto merged
mysql-test/r/rpl_ndb_extraCol.result:
Auto merged
mysql-test/r/rpl_ndb_sync.result:
Auto merged
mysql-test/r/rpl_rbr_to_sbr.result:
Auto merged
mysql-test/r/rpl_row_inexist_tbl.result:
Auto merged
mysql-test/r/rpl_row_max_relay_size.result:
Auto merged
mysql-test/r/rpl_row_tabledefs_2myisam.result:
Auto merged
mysql-test/r/rpl_row_tabledefs_3innodb.result:
Auto merged
mysql-test/r/rpl_stm_max_relay_size.result:
Auto merged
mysql-test/r/rpl_stm_until.result:
Auto merged
mysql-test/r/sp-code.result:
Auto merged
mysql-test/r/type_datetime.result:
Auto merged
mysql-test/t/mysqlbinlog.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/lex.h:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/gis.result:
Merge 5.0->5.1
mysql-test/r/rpl_000015.result:
Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_change_master.result:
Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_loaddata.result:
Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_log_pos.result:
Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_ndb_log.result:
Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_rotate_logs.result:
Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_row_log.result:
Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_row_log_innodb.result:
Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_row_reset_slave.result:
Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_row_until.result:
Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_server_id1.result:
Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_server_id2.result:
Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_stm_log.result:
Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_stm_reset_slave.result:
Merge after adding new column to SHOW SLAVE STATUS
mysql-test/t/gis.test:
Merge 5.0->5.1
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/type_datetime.result:
Auto merged
sql/field.h:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/gis.result:
SCCS merged
mysql-test/t/gis.test:
SCCS merged
This patch changes test to remove Windows-specific limitations and potential
rounding errors in the calculation of a UDF.
Also corrects a minor merge conflict.
mysql-test/include/rpl_udf.inc:
WL#3629 - Replication of Invocation and Invoked Features
This patch changes test to remove Windows-specific results by replacing the
library name in the SELECT from mysql.func to "UDF_LIB" to allow for the
differences in platform (.so vs .dll).
The patch also changes the function body of myfuncsql_double to a calculation
that does not result in potential rounding errors from the test data.
mysql-test/r/rpl_udf.result:
WL#3629 - Replication of Invocation and Invoked Features
This patch changes the result file for the test to match the new expected
values for the SELECT from mysql.func and the return of myfuncsql_double.
scripts/mysql_system_tables_fix.sql:
WL#3629 - Replication of Invocation and Invoked Features
This patch corrects a merge error encountered in a previous merge. The
column originator should be listed before time_zone in mysql.event.
- Copy all *.MY* files from std_data/, we have some .MYD and .MYI
files from 4.1 there
5.0 version of make_win_bin_dist copies everything in std_data/
scripts/make_win_bin_dist:
Copy all *.MY* files from std_data/, we have some .MYD and .MYI
files from 4.1 there
5.0 version of make_win_bin_dist copies everything in std_data/
into mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl
mysql-test/t/events.test:
Auto merged
sql/event_queue.cc:
Auto merged
sql/events.cc:
Auto merged
sql/lex.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
WL#3629 : Replication of Invocation and Invoked Features
Manual merge prior to pushing patches.
BitKeeper/deleted/.del-mysql_create_system_tables.sh:
WL#3629 : Replication of Invocation and Invoked Features
Manual merge prior to pushing patches.
mysql-test/r/events.result:
WL#3629 : Replication of Invocation and Invoked Features
Manual merge prior to pushing patches.
mysql-test/r/events_grant.result:
WL#3629 : Replication of Invocation and Invoked Features
Manual merge prior to pushing patches.
mysql-test/r/events_restart_phase1.result:
WL#3629 : Replication of Invocation and Invoked Features
Manual merge prior to pushing patches.
mysql-test/r/system_mysql_db.result:
WL#3629 : Replication of Invocation and Invoked Features
Manual merge prior to pushing patches.
mysql-test/t/events_restart_phase1.test:
WL#3629 : Replication of Invocation and Invoked Features
Manual merge prior to pushing patches.
scripts/mysql_system_tables.sql:
WL#3629 : Replication of Invocation and Invoked Features
Manual merge prior to pushing patches.
scripts/mysql_system_tables_fix.sql:
WL#3629 : Replication of Invocation and Invoked Features
Manual merge prior to pushing patches.
sql/event_data_objects.cc:
WL#3629 : Replication of Invocation and Invoked Features
Manual merge prior to pushing patches.
sql/event_data_objects.h:
WL#3629 : Replication of Invocation and Invoked Features
Manual merge prior to pushing patches.
sql/event_db_repository.cc:
WL#3629 : Replication of Invocation and Invoked Features
Manual merge prior to pushing patches.
sql/event_db_repository.h:
WL#3629 : Replication of Invocation and Invoked Features
Manual merge prior to pushing patches.
sql/sql_udf.cc:
WL#3629 : Replication of Invocation and Invoked Features
Manual merge prior to pushing patches.
This patch corrects errors that occurred in a local manual merge as a result
of updating the local repository and includes changes necessary to correct
problems found during the recalculation of next execution of events in RBR.
mysql-test/include/rpl_events.inc:
WL#3629 - Replication of Invocation and Invoked Features
This patch changes the rpl_events test to be more comprehensive in catching
errors as a result of RBR. Changes include clarification of SELECTs with
WHERE clauses and synchronization with master and slave.
mysql-test/r/rpl_events.result:
WL#3629 - Replication of Invocation and Invoked Features
This patch changes the results for the rpl_events test to accomodate the changes
in the test.
scripts/mysql_system_tables.sql:
WL#3629 - Replication of Invocation and Invoked Features
This patch adds the originator column and a new enum value to the mysql.event table.
This change was necessary to accomodate changes as a result of other patches.
sql/event_data_objects.cc:
WL#3629 - Replication of Invocation and Invoked Features
This patch corrects an error in merging that occurred during manual merge.
The status check was changed to include either ENABLED or DISABLED in the
gate to change the status to SLAVESIDE_DISABLED for events replicated to
the slave.
This patch also includes an update to correct a problem encountered during
testing after the local merge. The update_timing_fields method is replicating
the timing changes in RBR to the slave thereby over writing the change to the
status column in the process. This code includes a check to turn off the next
binlog event if in RBR.
sql/event_queue.cc:
WL#3629 - Replication of Invocation and Invoked Features
This patch corrects an error in merging that occurred during manual merge.
The code was corrected to include both types of disabled status enums
(DISABLED, SLAVESIDE_DISABLED) in the create_event and update_event methods.
sql/sql_show.cc:
WL#3629 - Replication of Invocation and Invoked Features
This patch corrects an error in merging that occurred during manual merge.
It corrects the order in which the originator column appears in the show
structures. The error caused incorrect output on SHOW EVENTS commands.
into mysql_cab_desk.:C:/source/c++/mysql-5.1_WL_3629
BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
Auto merged
BitKeeper/deleted/.del-mysql_create_system_tables.sh:
Auto merged
scripts/mysql_system_tables_fix.sql:
Auto merged
sql/event_data_objects.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/event_data_objects.h:
Manual merge.
sql/event_queue.cc:
Manual merge.
sql/events.cc:
Manual merge.
into trift2.:/MySQL/M51/push-5.1
BUILD/check-cpu:
Auto merged
BitKeeper/deleted/.del-libmysqld.vcproj~a75d5b9a5967dea0:
Auto merged
BitKeeper/deleted/.del-make_win_bin_dist:
Auto merged
BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547:
Auto merged
BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb:
Auto merged
BitKeeper/deleted/.del-mysqldemb.vcproj~54c64d55ccc51a7c:
Auto merged
BitKeeper/deleted/.del-mysys.vcproj~40a49d09c4184822:
Auto merged
BitKeeper/deleted/.del-vio.vcproj~b7c21b4e2d6a9b85:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
BitKeeper/deleted/.del-fill_func_tables.sh:
Auto merged
BitKeeper/deleted/.del-fill_help_tables.sh:
Auto merged
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
BitKeeper/deleted/.del-fill_func_tables.sh:
Auto merged
BitKeeper/deleted/.del-fill_help_tables.sh:
Auto merged
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
include/my_global.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/help.result:
Auto merged
mysql-test/t/help.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
scripts/mysql_system_tables.sql:
Add time_zone to the list of mysql.event columns.
scripts/mysql_system_tables_fix.sql:
Update after a bad merge: now mysql_system_tables_fix contains
only alter definitions, no CREATE definitions (single definition
source approach that was implemented by Magnus).
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-comp_err.vcproj~45c167ae5ddd5a96:
Auto merged
BitKeeper/deleted/.del-gen_lex_hash.vcproj~544be6b6:
Auto merged
BitKeeper/deleted/.del-heap.vcproj~4382203ba03f4038:
Auto merged
BitKeeper/deleted/.del-myTest.vcproj~dba5adc4fad3c06:
Auto merged
BitKeeper/deleted/.del-my_print_defaults.vcproj~c8aa2bd86e13c3f9:
Auto merged
BitKeeper/deleted/.del-myisam_ftdump.vcproj~409c19b0274b7f8e:
Auto merged
BitKeeper/deleted/.del-myisamchk.vcproj~982ebe5673e58fb6:
Auto merged
BitKeeper/deleted/.del-myisamlog.vcproj~daa6596ea386e5a7:
Auto merged
BitKeeper/deleted/.del-myisampack.vcproj~3f7d4ec0cb56a9a0:
Auto merged
BitKeeper/deleted/.del-mysql.vcproj~f7bfe13a8836eea0:
Auto merged
BitKeeper/deleted/.del-mysql_client_test.vcproj~22188dcd372bc9de:
Auto merged
BitKeeper/deleted/.del-mysql_upgrade.vcproj~54815b7265120589:
Auto merged
BitKeeper/deleted/.del-mysqladmin.vcproj~178fa55cba442d50:
Auto merged
BitKeeper/deleted/.del-mysqlbinlog.vcproj~b2a5b1868f5d6596:
Auto merged
BitKeeper/deleted/.del-mysqlcheck.vcproj~7022581c8b8a7ea2:
Auto merged
BitKeeper/deleted/.del-mysqlclient.vcproj~e78a73e31368a44a:
Auto merged
BitKeeper/deleted/.del-mysqlimport.vcproj~5a30228ef641c081:
Auto merged
BitKeeper/deleted/.del-mysqlshow.vcproj~797d4fa322faa148:
Auto merged
BitKeeper/deleted/.del-mysqltest.vcproj~21878840704179ef:
Auto merged
BitKeeper/deleted/.del-perror.vcproj~86ad9dc660a048ad:
Auto merged
BitKeeper/deleted/.del-regex.vcproj~9dea9caafa801b26:
Auto merged
BitKeeper/deleted/.del-replace.vcproj~9620b1ced86e527a:
Auto merged
BitKeeper/deleted/.del-strings.vcproj~6d1126ae59e4bf82:
Auto merged
BitKeeper/deleted/.del-test1.vcproj~c474b4614c67e2d2:
Auto merged
BitKeeper/deleted/.del-test_libmysqld.vcproj~fb301d42d5c4e6f4:
Auto merged
BitKeeper/deleted/.del-thr_test.vcproj~fc0e15c1e6880160:
Auto merged
BitKeeper/deleted/.del-vio.vcproj~b7c21b4e2d6a9b85:
Auto merged
BitKeeper/deleted/.del-zlib.vcproj~9b1a681d56dae190:
Auto merged
extra/yassl/taocrypt/taocrypt.vcproj:
Auto merged
extra/yassl/yassl.vcproj:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/delayed.result:
Auto merged
mysql-test/r/loaddata.result:
Auto merged
mysql-test/r/merge.result:
Auto merged
mysql-test/t/delayed.test:
Auto merged
mysql-test/t/init_connect.test:
Auto merged
mysql-test/t/loaddata.test:
Auto merged
mysql-test/t/merge.test:
Auto merged
netware/Makefile.am:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.vcproj:
Auto merged
mysql-test/install_test_db.sh:
SCCS merged
No need to set LICENSE or USE_SYMDIR from project files
make_win_bin_dist:
Changed location of SQL initialization files to be "share/"
scripts/make_win_bin_dist:
Changed location of SQL initialization files to be "share/"
VC++Files/libmysqld/libmysqld.vcproj:
No need to set LICENSE or USE_SYMDIR from project files
VC++Files/mysqldemb/mysqldemb.vcproj:
No need to set LICENSE or USE_SYMDIR from project files
VC++Files/mysys/mysys.vcproj:
No need to set LICENSE or USE_SYMDIR from project files
VC++Files/sql/mysqld.vcproj:
No need to set LICENSE or USE_SYMDIR from project files
VC++Files/vio/vio.vcproj:
No need to set LICENSE or USE_SYMDIR from project files
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.
Removed accidently added my_winsem.c
make_win_bin_dist:
Corrected test for relwithdebinfo target
mysql.sln:
Specify that comp_err depends on zlib
VC++Files/mysys/mysys.vcproj:
Removed accidently added my_winsem.c
VC++Files/mysql.sln:
Specify that comp_err depends on zlib
scripts/make_win_bin_dist:
Corrected test for relwithdebinfo target
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/bdb/bdb.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/client/mysql.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/client/mysql_upgrade.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/client/mysqladmin.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/client/mysqlclient.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/client/mysqldump.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/client/mysqlimport.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/client/mysqlshow.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/client/mysqltest.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/comp_err/comp_err.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/dbug/dbug.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/heap/heap.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/innobase/innobase.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/libmysql/libmysql.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/libmysqld/examples/test_libmysqld.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/libmysqld/libmysqld.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/libmysqltest/myTest.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/my_print_defaults/my_print_defaults.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/myisam/myisam.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/myisam_ftdump/myisam_ftdump.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/myisamchk/myisamchk.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/myisamlog/myisamlog.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/myisammrg/myisammrg.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/myisampack/myisampack.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/mysql.sln:
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/mysqlbinlog/mysqlbinlog.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/mysqlcheck/mysqlcheck.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/mysqldemb/mysqldemb.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/mysqlserver/mysqlserver.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/mysys/mysys.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/perror/perror.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/regex/regex.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/replace/replace.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/sql/gen_lex_hash.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/sql/mysqld.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/strings/strings.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/test1/test1.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/tests/mysql_client_test.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/thr_test/thr_test.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/vio/vio.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
VC++Files/zlib/zlib.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
extra/yassl/taocrypt/taocrypt.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
extra/yassl/yassl.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
ndb/src/cw/cpcc-win32/C++/CPC_GUI.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
scripts/make_win_bin_dist:
Major cleanup of old Visual Studio project files, aligning engines etc
server-tools/instance-manager/mysqlmanager.vcproj:
Major cleanup of old Visual Studio project files, aligning engines etc
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
mysql-test/mysql-test-run.pl:
Auto merged
netware/Makefile.am:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/mysql_priv.h:
Auto merged
tests/Makefile.am:
Auto merged
mysql-test/install_test_db.sh:
Manual merge
sql/sql_acl.h:
Manual merge
- Support both "release" and "relwithdebinfo" targets
- Copy ".pdb" and ".pdb" files for the server and instance manager
- Removed the examples directory, unsupported
- Handle both old and new builds in the same script, "-debug" and "-nt"
extensions, directory "data" and "share" in different location
scripts/make_win_bin_dist:
- Support both "release" and "relwithdebinfo" targets
- Copy ".pdb" and ".pdb" files for the server and instance manager
- Removed the examples directory, unsupported
- Handle both old and new builds in the same script, "-debug" and "-nt"
extensions, directory "data" and "share" in different location
- Build sql files for netware from the mysql_system_tables*.sq files
- Fix comments about mysql_create_system_tables.sh
- Use mysql_install_db.sh to create system tables for mysql_test-run-shell
- Fix mysql-test-run.pl to also look in share/mysql for the msyql_system*.sql files
Changeset coded today by Magnus Svensson, just the application to 5.0.38 is by Joerg Bruehe.
BitKeeper/deleted/.del-init_db.sql~e2b8d0c8390e8023:
Delete: netware/init_db.sql
BitKeeper/deleted/.del-test_db.sql:
Delete: netware/test_db.sql
BitKeeper/etc/ignore:
Added netware/init_db.sql netware/test_db.sql to the ignore list
mysql-test/install_test_db.sh:
Use mysql_install_db from install_test_db(which is used by mysql-test-run-shell)
to install the system tables
mysql-test/mysql-test-run.pl:
Look for the mysql_system_tables*.sql also in share/mysql
netware/Makefile.am:
Build netware/init_db.sql and netware/test_db.sql from
the sources in scripts/msyql_system_tables*.sql
scripts/make_binary_distribution.sh:
netware/init_db.sql and netware/test_db.sql are now built by the Makefiles
from the scripts/mysql_system_tables*.sql files
sql/mysql_priv.h:
Update comment remindging to update the MySQL system table definitions
when adding a new SQL_MODE
sql/sql_acl.h:
Update comment reminding to update the MySQL System tables
when changing the ACL defines
- Build sql files for netware from the mysql_system_tables*.sq files
- Fix comments about mysql_create_system_tables.sh
- Use mysql_install_db.sh to create system tables for mysql_test-run-shell
- Fix mysql-test-run.pl to also look in share/mysql for the msyql_system*.sql files
BitKeeper/deleted/.del-init_db.sql~e2b8d0c8390e8023:
Rename: netware/init_db.sql -> BitKeeper/deleted/.del-init_db.sql~e2b8d0c8390e8023
BitKeeper/deleted/.del-test_db.sql:
Rename: netware/test_db.sql -> BitKeeper/deleted/.del-test_db.sql
BitKeeper/etc/ignore:
Added netware/init_db.sql netware/test_db.sql to the ignore list
mysql-test/install_test_db.sh:
Use mysql_install_db from install_test_db(which is used bu mysql-test-run-shell)
to install the system tables
mysql-test/mysql-test-run.pl:
Look for the mysql_system_tables*.sql also in share/mysql
netware/Makefile.am:
Build netware/init_db.sql and netware/test_db.sql from
the sources in scripts/msyql_system_tables*.sql
scripts/make_binary_distribution.sh:
netware/init_db.sql and netware/test_db.sql are now built by the Makefiles
from the scripts/mysql_system_tables*.sql files
sql/mysql_priv.h:
Update comment remindging to update the MySQL system table definitions
when adding a new SQL_MODE
sql/sql_acl.h:
Update comment reminding to update the MySQL System tables
when changing the ACL defines
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
This changeset adds replication of events and user-defined functions.
There are several bug reports involved in this change:
BUG#16421, BUG#17857, BUG#20384:
This patch modifies the mysql.events table to permit the addition of
another enum value for the status column. The column now has values
of ('DISABLED','SLAVESIDE_DISABLED','ENABLED'). A status of
SLAVESIDE_DISABLED is set on the slave during replication of events.
This enables users to determine which events werereplicated from the
master and to later enable them if they promote the slave to a master.
The CREATE, ALTER, and DROP statements are binlogged.
A new test was added for replication of events (rpl_events).
BUG#17671:
This patch modifies the code to permit logging of user-defined functions.
Note: this is the CREATE FUNCTION ... SONAME variety. A more friendly error
message to be displayed should a replicated user-defined function not be
found in the loadable library or if the library is missing from the
slave.The CREATE andDROP statements are binlogged. A new test was added
for replication of user-defined functions (rpl_udf).
The patch also adds a new column to the mysql.event table named
'originator' that is used to store the server_id of the server that
the event originated on. This enables users to promote a slave to a
master and later return the promoted slave to a slave and disable the
replicated events.
mysql-test/lib/init_db.sql:
WL#3629 - Replication of Invocation and Invoked Feature
This patch adds the SLAVESIDE_DISABLED to the list of enumerated
values for the mysql.event table.
This patch adds the column 'originator' to the mysql.event table.
mysql-test/r/events.result:
WL#3629 - Replication of Invocation and Invoked Feature
This patch adds the 'originator' column to the events test results.
This was necessary to ensure the manual insert into mysql.event table
succeeds because the originator column is set to NOT NULL.
mysql-test/r/events_grant.result:
WL#3629 - Replication of Invocation and Invoked Feature
This patch adds the 'originator' column to the events_grant test results.
This was necessary to ensure the manual insert into mysql.event table
succeeds because the originator column is set to NOT NULL.
mysql-test/r/events_restart_phase1.result:
WL#3629 - Replication of Invocation and Invoked Feature
This patch adds the 'originator' column to the events_restart_phase1
test results. This was necessary to ensure the manual insert into
mysql.event table succeeds because the originator column is set to
NOT NULL.
mysql-test/r/system_mysql_db.result:
WL#3629 - Replication of Invocation and Invoked Feature
This patch adds the SLAVESIDE_DISABLED to the list of enumerated
values for the mysql.event table.
This patch adds the column 'originator' to the mysql.event table.
These changes to the result file were necessary to ensure correct test
results.
mysql-test/t/events.test:
WL#3629 - Replication of Invocation and Invoked Feature
This patch adds the 'originator' column to the events
test. This was necessary to ensure the manual insert into
mysql.event table succeeds because the originator column is set to
NOT NULL.
mysql-test/t/events_restart_phase1.test:
WL#3629 - Replication of Invocation and Invoked Feature
This patch adds the 'originator' column to the events_restart_phase1
test. This was necessary to ensure the manual insert into
mysql.event table succeeds because the originator column is set to
NOT NULL.
scripts/mysql_create_system_tables.sh:
WL#3629 - Replication of Invocation and Invoked Feature
This patch adds the SLAVESIDE_DISABLED to the list of enumerated
values for the mysql.event table.
This patch adds the column 'originator' to the mysql.event table.
scripts/mysql_fix_privilege_tables.sql:
WL#3629 - Replication of Invocation and Invoked Feature
This patch adds the SLAVESIDE_DISABLED to the list of enumerated
values for the mysql.event table.
This patch adds the column 'originator' to the mysql.event table.
sql/event_data_objects.cc:
WL#3629 - Replication of Invocation and Invoked Features
This patch modifies the code to permit processing of the new enum
SLAVESIDE_DISABLED which is set on the slave during replication
of events.
This patch uses the new Event_basic:: enumerated values.
sql/event_data_objects.h:
WL#3629 - Replication of Invocation and Invoked Features
This patch moves the duplicated enumeration values for ENABLED,
SLAVESIDE_DISABLED, and DISABLED to the Event_basic class removing
them from the other Event_* classes.
sql/event_db_repository.cc:
WL#3629 - Replication of Invocation and Invoked Features
This patch modifies the code to permit processing of the new enum
SLAVESIDE_DISABLED which is set on the slave during replication
of events.
The patch also adds a new column to the mysql.event table named
'originator' that is used to store the server_id of the server that
the event originated on. This enables users to promote a slave to a
master and later return the promoted slave to a slave and disable the
replicated events.
sql/event_db_repository.h:
WL#3629 - Replication of Invocation and Invoked Features
This patch modifies the code to add a new field named 'originator'
to the enum_event_table_field and associated structure.
sql/event_queue.cc:
WL#3629 - Replication of Invocation and Invoked Features
This patch modifies the code to permit processing of the new enum
SLAVESIDE_DISABLED which is set on the slave during replication
of events.
sql/events.cc:
WL#3629 - Replication of Invocation and Invoked Features
This patch modifies the code to permit processing of the new enum
SLAVESIDE_DISABLED which is set on the slave during replication
of events.
sql/lex.h:
WL#3629 - Replication of Invocation and Invoked Features
This patch modifies the code to add the new SLAVESIDE_DISABLE symbol
to the lexical parser.
sql/slave.cc:
WL#3629 - Replication of Invocation and Invoked Features
This patch modifies the code to permit the capture of the error on
the slave when a UDF from a loadable library is not loaded on the server
when replicated from the master.
sql/sql_parse.cc:
WL#3629 - Replication of Invocation and Invoked Features
This patch removes the comment because drop functions commands
are replicated.
sql/sql_show.cc:
WL#3629 - Replication of Invocation and Invoked Features
This patch modifies the code to permit processing of the new enum
SLAVESIDE_DISABLED which is set on the slave during replication
of events. The code also adds changes the display width of the status
column for the schema table for the show events command and also adds
the new column 'originator' to the events_field_info structure.
sql/sql_udf.cc:
WL#3629 - Replication of Invocation and Invoked Features
This patch modifies the code to add the binlogging of the create and
drop function events.
sql/sql_yacc.yy:
WL#3629 - Replication of Invocation and Invoked Features
This patch modifies the code to change the enumeration of the status
column for the events in the parser. The code uses the Event_basic::
enumerations allowing the enums to be defined in one place.
mysql-test/t/rpl_events.test:
WL#3629 - Replication of Invocation and Invoked Features
This patch adds a new test for testing replication of events. The test
uses include files so that the test can test under both RBR and SBR.
mysql-test/r/rpl_events.result:
WL#3629 - Replication of Invocation and Invoked Features
This patch adds a new result file for testing replication of events.
mysql-test/r/rpl_udf.result:
WL#3629 - Replication of Invocation and Invoked Features
This patch adds a new result file for testing replication of UDFs.
mysql-test/t/rpl_udf.test:
WL#3629 - Replication of Invocation and Invoked Features
This patch adds a new test for testing replication of UDFs. The test
uses include files so that the test can test under both RBR and SBR.
mysql-test/include/rpl_events.inc:
WL#3629 - Replication of Invocation and Invoked Features
This patch adds a new include file for testing replication of events.
This file contains the core test procedures.
mysql-test/include/rpl_udf.inc:
WL#3629 - Replication of Invocation and Invoked Features
This patch adds a new include file for testing replication of UDFs.
This file contains the core test procedures.
- Bail out with error if MySQL System tables already exist
scripts/mysql_install_db.sh:
Bail out with error if the MySQL system tables already exist
in the location where we want to install
- Fix error message to say that "mysql_upgrade" should be run when
a particular error message is found to be missing
- Dont's set default value on blob's - it will not be used anyway.
scripts/mysql_system_tables_fix.sql:
Don't set a DEFAULT value on blob - depending on sql_mode it
will either be dicarded or throw an error message. But never used.
sql/sql_plugin.cc:
Update error message to indicate that "mysql_upgrade" should
be used to correct the problem
sql/sql_udf.cc:
Update error message to indicate that "mysql_upgrade" should
be used to correct the problem
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
scripts/make_binary_distribution.sh:
Auto merged
BitKeeper/deleted/.del-make_win_bin_dist:
Auto merged
- No .sql files in mysql-test/lib/ anymore, don't copy them
scripts/make_binary_distribution.sh:
No need to copy mysql-test/lib/*.sql there are no sql files there anymore
scripts/make_win_bin_dist:
No need to copy mysql-test/lib/*.sql there are no sql files there anymore
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
Auto merged
BitKeeper/deleted/.del-init_db.sql~af2dfeabaa348dd7:
Auto merged
client/mysqltest.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
scripts/Makefile.am:
Auto merged
sql/mysqld.cc:
Auto merged
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
mysql-test/mysql-test-run.pl:
Auto merged
scripts/Makefile.am:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
scripts/mysql_system_tables_fix.sql:
Auto merged
scripts/mysql_system_tables.sql:
Manual merge
- Split out initial data in mysql_system_tables.sql to it's own file
- Use file from mysql_install_db and mysql-test-run
scripts/mysql_system_tables_fix.sql:
Rename: scripts/mysql_fix_privilege_tables.sql.in -> scripts/mysql_system_tables_fix.sql
mysql-test/mysql-test-run.pl:
- Add mysql_system_tables_data.sql as part of the bootstrap
- Remove the addition of pid to end of bootstrap.sql, now
to file used for bootstrap will be $opt_vardir/tmp/bootstrap.sql
- Improve error message descibing how to find cause of a
failed bootstrap
scripts/Makefile.am:
- Rename mysql_fix_privileg_tables.sql.in to mysql_system_tables_fix.sql
- Build mysql_fix_privilege_tables from mysql_system_tables.sql and
mysql_system_tables_fix.sql
- Add mysql_system_tables_fix.sql to EXTRA_DIST
scripts/mysql_install_db.sh:
- Use mysql_system_tables_data.sql file when bootstrapping
mysql, it will contain initial data for MysQL system tables
scripts/mysql_system_tables.sql:
Move initial data for system tables to it's own file
scripts/mysql_system_tables_data.sql:
Move initial data for system tables to it's own file
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/rpl_temporary.test:
Auto merged
scripts/mysql_system_tables.sql:
Auto merged
sql/mysqld.cc:
Auto merged
- Remove DEFAULT values for blob's in mysql_system_tables.sql
scripts/mysql_system_tables.sql:
Remove attempt to set default value for blob columns since
they can't have any. Depending on 'sql_mode' the default values
has either been silently dropped or thrown an error as reported
by the bug.
- Escape undercore character in mysql.db to only allow
access test_% and not test%
scripts/mysql_system_tables.sql:
underscore is a wildcard character so it need to be
expaed to only match one _
- Updates for 5.1
mysql-test/t/lock_multi.test:
Test need anonymous users
mysql-test/t/rpl_temporary.test:
Test need anonymous users
scripts/mysql_system_tables.sql:
Update mysql_system_tables.sql for 5.1
into pilot.blaudden:/home/msvensson/mysql/bug20166/my51-bug20166
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
Auto merged
BitKeeper/deleted/.del-mysql_create_system_tables.sh:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/join.result:
Auto merged
mysql-test/r/sp-security.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/grant2.test:
Auto merged
mysql-test/t/init_connect.test:
Auto merged
mysql-test/t/ndb_basic.test:
Auto merged
mysql-test/t/ndb_index_ordered.test:
Auto merged
mysql-test/t/ndb_multi.test:
Auto merged
scripts/Makefile.am:
Auto merged
BitKeeper/deleted/.del-init_db.sql~af2dfeabaa348dd7:
Auto merged
mysql-test/r/mysql_upgrade.result:
SCCS merged
mysql-test/t/lock_multi.test:
Use local
mysql-test/t/rpl_temporary.test:
Use local
mysql-test/Makefile.am:
Manual merge
scripts/mysql_fix_privilege_tables.sh:
Manual merge
scripts/mysql_fix_privilege_tables.sql.in:
Manual merge
scripts/mysql_install_db.sh:
Manual merge
- Use mysql_system_tables.sql to create MySQL system tables in
all places where we create them(mysql_install_db, mysql-test-run-pl
and mysql_fix_privilege_tables.sql)
BitKeeper/deleted/.del-init_db.sql:
Rename: mysql-test/init_db.sql -> BitKeeper/deleted/.del-init_db.sql
BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
Rename: mysql-test/lib/init_db.sql -> BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8
BitKeeper/deleted/.del-mysql_create_system_tables.sh:
Rename: scripts/mysql_create_system_tables.sh -> BitKeeper/deleted/.del-mysql_create_system_tables.sh
BitKeeper/etc/ignore:
Added scripts/mysql_fix_privilege_tables.sql to the ignore list
mysql-test/Makefile.am:
lib/init_db.sql has been removed
mysql-test/mysql-test-run.pl:
- Build var/tmp/bootstrap.sql from mysql_system_tables.sql,
mysql_test_data_timezone.sql and fill_help_tables.sql and use
it when bootsraping the system tables to use during test.
mysql-test/r/create.result:
Update result file
mysql-test/r/derived.result:
Update result file
mysql-test/r/join.result:
Update result file
mysql-test/r/mysql_upgrade.result:
Update result file
mysql-test/r/sp-security.result:
Update result file
mysql-test/t/create.test:
Add user mysqltest_1 before trying to connect as that user - no
anon users by default anymore
mysql-test/t/derived.test:
Add user mysqltest_1 before trying to connect as that user - no
anon users by default anymore
mysql-test/t/grant2.test:
Add anonymous users for part of thes that need it.
mysql-test/t/grant_cache.test:
Add anonymous users for part of thes that need it.
mysql-test/t/init_connect.test:
Add anonymous users for part of thes that need it.
mysql-test/t/lock_multi.test:
Add anonymous users for part of thes that need it.
mysql-test/t/ndb_basic.test:
Connect as "root", blank user will take currently logged in
username
mysql-test/t/ndb_index_ordered.test:
Connect as "root", blank user will take currently logged in
username
mysql-test/t/ndb_multi.test:
Connect as "root", blank user will take currently logged in
username
mysql-test/t/overflow.test:
Connect as root - no anonymous users by default anymore
mysql-test/t/rpl_temporary.test:
Add anonymous users for the test
mysql-test/t/xa.test:
Connect as "root", blank user wil pick currently logged in user
scripts/Makefile.am:
Remove mysql_create_system_tables.sh
Add mysql_system_tables.sql and mysql_test_data_timezone.sql
Build mysql_fix_privilege_tables.sql from mysql_system_tables.sql
and mysql_fix_privilege_tables.sql.in
scripts/mysql_fix_privilege_tables.sh:
Update message describing what the script does
scripts/mysql_fix_privilege_tables.sql.in:
Remove the part that creates system tables as that will be added to
mysql_fix_privileg_tables.sql from mysql_system_tables.sql
Change all comments to use #
scripts/mysql_install_db.sh:
Use mysql_system_tables.sql to create the MySQL system tables
Update comments and indentation
Add more descriptive comments about --windows switch
Reduce number of hardcoded names for the SQL files the script
looks for
mysql-test/include/add_anonymous_users.inc:
New BitKeeper file ``mysql-test/include/add_anonymous_users.inc''
mysql-test/include/delete_anonymous_users.inc:
New BitKeeper file ``mysql-test/include/delete_anonymous_users.inc''
scripts/mysql_system_tables.sql:
New BitKeeper file ``scripts/mysql_system_tables.sql''
scripts/mysql_test_data_timezone.sql:
New BitKeeper file ``scripts/mysql_test_data_timezone.sql''
Copy "ndb_size.tmpl" into binary distribution (Bug#24191)
scripts/make_binary_distribution.sh:
Copy "ndb_size.tmpl" into binary distribution (Bug#24191)
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
Makefile.am:
Auto merged
cmd-line-utils/readline/display.c:
Auto merged
configure.in:
Auto merged
extra/yassl/include/buffer.hpp:
Auto merged
extra/yassl/include/crypto_wrapper.hpp:
Auto merged
extra/yassl/include/yassl_imp.hpp:
Auto merged
extra/yassl/include/yassl_int.hpp:
Auto merged
extra/yassl/src/crypto_wrapper.cpp:
Auto merged
extra/yassl/taocrypt/include/algebra.hpp:
Auto merged
extra/yassl/taocrypt/include/des.hpp:
Auto merged
extra/yassl/taocrypt/include/hash.hpp:
Auto merged
extra/yassl/taocrypt/include/hmac.hpp:
Auto merged
extra/yassl/taocrypt/include/modarith.hpp:
Auto merged
extra/yassl/taocrypt/include/modes.hpp:
Auto merged
extra/yassl/taocrypt/include/rsa.hpp:
Auto merged
extra/yassl/taocrypt/include/type_traits.hpp:
Auto merged
extra/yassl/taocrypt/mySTL/list.hpp:
Auto merged
extra/yassl/taocrypt/src/aes.cpp:
Auto merged
extra/yassl/taocrypt/src/algebra.cpp:
Auto merged
extra/yassl/taocrypt/src/asn.cpp:
Auto merged
extra/yassl/testsuite/testsuite.cpp:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysys/default.c:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/net_serv.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/sql_parse.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_select.cc:
Auto merged
extra/yassl/taocrypt/test/test.cpp:
Manual merge
mysql-test/r/grant.result:
Manual merge
mysql-test/r/select.result:
Manual merge
mysql-test/t/grant.test:
Manual merge
mysql-test/t/select.test:
Manual merge
sql/field.h:
Manual merge
sql/mysqld.cc:
Manual merge
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
Makefile.am:
Auto merged
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysys/default.c:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/r/select.result:
Manual merge
mysql-test/t/select.test:
Manual merge
into chilla.local:/home/mydev/mysql-5.1-axmrg
client/mysql.cc:
Auto merged
include/my_global.h:
Auto merged
include/thr_alarm.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/t/symlink.test:
Auto merged
mysys/default.c:
Auto merged
mysys/my_pthread.c:
Auto merged
mysys/my_thr_init.c:
Auto merged
mysys/thr_alarm.c:
Auto merged
sql/field_conv.cc:
Auto merged
sql/gen_lex_hash.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_func.cc:
Auto merged
vio/viosslfactories.c:
Auto merged
BitKeeper/deleted/.del-mysqld.cc.rej:
Delete: sql/mysqld.cc.rej
BitKeeper/deleted/.del-my_create_tables.c~c121a0c4c427ebb:
Auto merged
BitKeeper/deleted/.del-my_manage.c~4de50e721d227d19:
Auto merged
BitKeeper/deleted/.del-my_manage.h~9d2cbc1e8bc894f:
Auto merged
BitKeeper/deleted/.del-mysql.dsw~7ea9e16395f139f4:
Null merged
BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547:
Null merged
BitKeeper/deleted/.del-mysql_test_run_new.c~a23ab2c4b28b25ad:
Auto merged
BitKeeper/deleted/.del-mysql_test_run_new.dsp~9d8078f3f02fcc8e:
Auto merged
BitKeeper/deleted/.del-mysql_test_run_new.vcproj~1ddaed30361efefe:
Auto merged
BitKeeper/deleted/.del-mysql_test_run_new_ia64.dsp~e7ee71ec8d2995e3:
Auto merged
BUILD/SETUP.sh:
Manual merged
Makefile.am:
Manual merged
configure.in:
Manual merged
include/my_pthread.h:
Manual merged
mysql-test/Makefile.am:
Manual merged
sql/mysqld.cc:
Manual merged
support-files/mysql.spec.sh:
Manual merged
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
scripts/mysqld_multi.sh:
Auto merged
sql/mysqld.cc:
Auto merged
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
Makefile.am:
Auto merged
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/range.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/select.test:
Auto merged
mysys/string.c:
Auto merged
scripts/mysql_create_system_tables.sh:
Auto merged
scripts/mysqld_multi.sh:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/range.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/t/select.test:
Auto merged
scripts/mysqld_multi.sh:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_select.cc:
Auto merged
If inserting a GPL header, include a complete one
Makefile.am, mysql.dsw, mysql.sln:
Removed C version of mysql-test-run
mysql.spec.sh:
Specify GPL license only in GPL sources
.del-my_manage.h:
Delete: mysql-test/my_manage.h
mysql.spec.sh:
Added GPL header
.del-mysql_test_run_new.c:
Delete: mysql-test/mysql_test_run_new.c
.del-mysql_test_run_new.dsp:
Delete: VC++Files/mysql-test/mysql_test_run_new.dsp
.del-my_create_tables.c:
Delete: mysql-test/my_create_tables.c
.del-mysql_test_run_new_ia64.dsp:
Delete: VC++Files/mysql-test/mysql_test_run_new_ia64.dsp
msql2mysql.sh:
Use up-to-date GPL header
.del-mysql_test_run_new.vcproj:
Delete: VC++Files/mysql-test/mysql_test_run_new.vcproj
.del-my_manage.c:
Delete: mysql-test/my_manage.c
scripts/msql2mysql.sh:
Use up-to-date GPL header
support-files/mysql.spec.sh:
Added GPL header
sql/gen_lex_hash.cc:
If inserting a GPL header, include a complete one
BitKeeper/deleted/.del-mysql_test_run_new.c:
Delete: mysql-test/mysql_test_run_new.c
BitKeeper/deleted/.del-mysql_test_run_new.dsp:
Delete: VC++Files/mysql-test/mysql_test_run_new.dsp
BitKeeper/deleted/.del-mysql_test_run_new.vcproj:
Delete: VC++Files/mysql-test/mysql_test_run_new.vcproj
BitKeeper/deleted/.del-mysql_test_run_new_ia64.dsp:
Delete: VC++Files/mysql-test/mysql_test_run_new_ia64.dsp
BitKeeper/deleted/.del-my_create_tables.c:
Delete: mysql-test/my_create_tables.c
BitKeeper/deleted/.del-my_manage.c:
Delete: mysql-test/my_manage.c
BitKeeper/deleted/.del-my_manage.h:
Delete: mysql-test/my_manage.h
VC++Files/mysql.dsw:
Removed C version of mysql-test-run
VC++Files/mysql.sln:
Removed C version of mysql-test-run
mysql-test/Makefile.am:
Removed C version of mysql-test-run
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/symlink.test:
Auto merged
sql/lock.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/table.cc:
Auto merged
storage/federated/ha_federated.cc:
Auto merged
storage/myisam/mi_check.c:
Auto merged
storage/myisam/mi_packrec.c:
Auto merged
mysql-test/r/myisam.result:
Manually merged.
mysql-test/t/myisam.test:
Manually merged.
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
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
mysys/my_read.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/field.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
mysql-test/t/mysqladmin.test:
Auto merged
mysys/mf_iocache.c:
Auto merged
mysys/my_read.c:
Auto merged
mysys/my_seek.c:
Auto merged
sql/sql_parse.cc:
Auto merged
into siva.hindu.god:/home/tsmith/m/bk/mysql-5.1-build
BitKeeper/deleted/.del-CMakeLists.txt~3:
Auto merged
BitKeeper/deleted/.del-README~1:
Auto merged
BitKeeper/deleted/.del-configure.js:
Auto merged
BitKeeper/deleted/.del-mysql_test_run_new.c~a23ab2c4b28b25ad:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
configure.in:
Manual merge
mysql-test/install_test_db.sh:
Manual merge
sql/mysqld.cc:
Manual merge
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
into tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0
configure.in:
Auto merged
mysql-test/install_test_db.sh:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
sql/CMakeLists.txt:
Auto merged
sql/mysqld.cc:
Auto merged
win/configure.js:
Auto merged
- configure --disable-grant-options defines DISABLE_GRANT_OPTIONS
- configure.js/cmake also updated
- if DISABLE_GRANT_OPTIONS is defined, mysqld no longer recognizes:
--bootstrap
--init-file
--skip-grant-tables
Scripts which rely on those three options are modified to check the environment for MYSQLD_BOOTSTRAP; it should be set to the full path of a mysqld which does handle those options.
For example:
$ export MYSQLD_BOOTSTRAP
$ MYSQLD_BOOTSTRAP=/path/to/full/MySQL/bin/mysqld
$ mysql_install_db
$ make test
configure.in:
WL#3670
Add --disable-grant-options
mysql-test/install_test_db.sh:
Add MYSQLD_BOOTSTRAP env variable, to enable test suite to work even if mysqld does not accept --bootstrap or --skip-grant-tables.
mysql-test/mysql-test-run.pl:
Add MYSQLD_BOOTSTRAP env variable, to enable test suite to work even if mysqld does not accept --bootstrap or --skip-grant-tables.
mysql-test/mysql_test_run_new.c:
Mention need for MYSQLD_BOOTSTRAP in a comment, in case this needs to be used with a mysqld which does not accept the --bootstrap option.
scripts/mysql_install_db.sh:
Add MYSQLD_BOOTSTRAP env variable, to enable mysqld_install_db to work even if mysqld does not accept --bootstrap or --skip-grant-tables.
sql/CMakeLists.txt:
Add DISABLE_GRANT_OPTIONS define
sql/mysqld.cc:
Add DISABLE_GRANT_OPTIONS define, which removes the --bootstrap, --init-file, and --skip-grant-tables options
win/README:
Document the DISABLE_GRANT_OPTIONS define
win/configure.js:
Handle DISABLE_GRANT_OPTIONS
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint-greener
Makefile.am:
Auto merged
configure.in:
Auto merged
include/mysql.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/r/myisam.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
scripts/mysqlbug.sh:
Auto merged
server-tools/instance-manager/Makefile.am:
Auto merged
sql/event_queue.cc:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item_sum.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_show.cc:
Auto merged
storage/federated/ha_federated.cc:
Auto merged
mysql-test/r/warnings.result:
Manual merge.
mysql-test/t/warnings.test:
Manual merge.
strings/ctype-extra.c:
Manual merge.
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
scripts/make_binary_distribution.sh:
Auto merged
support-files/mysql.spec.sh:
- Put back "libmygcc.a", found no real reason it was removed.
- Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
correct "libgcc.a" path is returned for the 32/64 bit architecture.
Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
correct "libgcc.a" path is returned for the 32/64 bit architecture
scripts/make_binary_distribution.sh:
Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
correct "libgcc.a" path is returned for the 32/64 bit architecture
support-files/mysql.spec.sh:
Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
correct "libgcc.a" path is returned for the 32/64 bit architecture
"mysql_install_db doesn't work properly on 5.1"
force sql_mode to known value within initialization scripts
scripts/fill_help_tables.sh:
force sql_mode to known value
scripts/mysql_create_system_tables.sh:
force sql_mode to known value
scripts/mysql_fix_privilege_tables.sql:
force sql_mode to known value
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
BUILD/check-cpu:
Auto merged
client/mysql_upgrade.c:
Auto merged
BitKeeper/deleted/.del-mysys.vcproj~40a49d09c4184822:
Auto merged
Portable handling of "echo" without newline (bug#24605)
check-cpu:
In developer script safe to use "printf", not "echo -n"
BUILD/check-cpu:
In developer script safe to use "printf", not "echo -n"
scripts/mysql_secure_installation.sh:
Portable handling of "echo" without newline (bug#24605)
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
Added GPL copyright text
my_vle.h, rpl_utility.h, my_vle.c, base64-t.c, rpl_utility.cc:
Changed copyright header formatting some
plugin_example.c, daemon_example.c:
Added "Copyright (C) 2006 MySQL AB" to GPL header
CMakeLists.txt:
Added GPL copyright text
client/CMakeLists.txt:
Added GPL copyright text
dbug/CMakeLists.txt:
Added GPL copyright text
extra/CMakeLists.txt:
Added GPL copyright text
extra/yassl/CMakeLists.txt:
Added GPL copyright text
extra/yassl/taocrypt/CMakeLists.txt:
Added GPL copyright text
libmysql/CMakeLists.txt:
Added GPL copyright text
libmysqld/CMakeLists.txt:
Added GPL copyright text
libmysqld/examples/CMakeLists.txt:
Added GPL copyright text
mysys/CMakeLists.txt:
Added GPL copyright text
regex/CMakeLists.txt:
Added GPL copyright text
server-tools/instance-manager/CMakeLists.txt:
Added GPL copyright text
sql/CMakeLists.txt:
Added GPL copyright text
storage/archive/CMakeLists.txt:
Added GPL copyright text
storage/blackhole/CMakeLists.txt:
Added GPL copyright text
storage/csv/CMakeLists.txt:
Added GPL copyright text
storage/example/CMakeLists.txt:
Added GPL copyright text
storage/federated/CMakeLists.txt:
Added GPL copyright text
storage/heap/CMakeLists.txt:
Added GPL copyright text
storage/innobase/CMakeLists.txt:
Added GPL copyright text
storage/myisam/CMakeLists.txt:
Added GPL copyright text
storage/myisammrg/CMakeLists.txt:
Added GPL copyright text
strings/CMakeLists.txt:
Added GPL copyright text
tests/CMakeLists.txt:
Added GPL copyright text
vio/CMakeLists.txt:
Added GPL copyright text
zlib/CMakeLists.txt:
Added GPL copyright text
include/my_vle.h:
Changed copyright header formatting some
mysys/my_vle.c:
Changed copyright header formatting some
plugin/daemon_example/daemon_example.c:
Added "Copyright (C) 2006 MySQL AB" to GPL header
plugin/fulltext/plugin_example.c:
Added "Copyright (C) 2006 MySQL AB" to GPL header
plugin/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/authors.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/contributors.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/item_xmlfunc.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/partition_element.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/partition_info.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/rpl_injector.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/rpl_injector.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/sql_binlog.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/sql_servers.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
storage/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
storage/archive/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
storage/blackhole/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
storage/csv/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
storage/example/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
storage/federated/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
win/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/rpl_utility.cc:
Changed copyright header formatting some
sql/rpl_utility.h:
Changed copyright header formatting some
unittest/mysys/base64-t.c:
Changed copyright header formatting some
include/my_uctype.h:
Added GPL copyright text
plugin/daemon_example/Makefile.am:
Added GPL copyright text
plugin/fulltext/Makefile.am:
Added GPL copyright text
scripts/make_win_bin_dist:
Added GPL copyright text
server-tools/instance-manager/user_management_commands.cc:
Added GPL copyright text
sql/sql_builtin.cc.in:
Added GPL copyright text
sql/sql_show.h:
Added GPL copyright text
storage/archive/archive_test.c:
Added GPL copyright text
storage/ndb/src/kernel/blocks/dbtup/test_varpage.cpp:
Added GPL copyright text
storage/ndb/src/kernel/blocks/diskpage.cpp:
Added GPL copyright text
storage/ndb/src/kernel/vm/Rope.cpp:
Added GPL copyright text
storage/ndb/src/mgmsrv/ParamInfo.hpp:
Added GPL copyright text
strings/uctypedump.c:
Added GPL copyright text
unittest/Makefile.am:
Added GPL copyright text
unittest/examples/Makefile.am:
Added GPL copyright text
unittest/examples/core-t.c:
Added GPL copyright text
unittest/examples/no_plan-t.c:
Added GPL copyright text
unittest/examples/simple-t.c:
Added GPL copyright text
unittest/examples/skip-t.c:
Added GPL copyright text
unittest/examples/skip_all-t.c:
Added GPL copyright text
unittest/examples/todo-t.c:
Added GPL copyright text
unittest/mysys/Makefile.am:
Added GPL copyright text
unittest/mytap/Makefile.am:
Added GPL copyright text
unittest/mytap/t/Makefile.am:
Added GPL copyright text
unittest/mytap/t/basic-t.c:
Added GPL copyright text
unittest/unit.pl:
Added GPL copyright text
win/build-vs71.bat:
Added GPL copyright text
win/build-vs8.bat:
Added GPL copyright text
win/configure.js:
Added GPL copyright text
into mysql.com:/home/kent/bk/main/mysql-5.1
BUILD/Makefile.am:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~10:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~11:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~12:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~13:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~14:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~15:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~1:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~2f6eabb2f69cb33d:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~2:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~3:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~4ef559bc8b4695f7:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~4:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~5:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~6:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~7:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~84669765249a4bad:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~8:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~9:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~c20dcd005f596740:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~dd682cce1d53c0b4:
Auto merged
BitKeeper/deleted/.del-Makefile.am~2:
Auto merged
BitKeeper/deleted/.del-Makefile.am~ab5c84d46412dc2e:
Auto merged
BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6:
Auto merged
BitKeeper/deleted/.del-Makefile.am~e5b911533dad2713:
Auto merged
BitKeeper/deleted/.del-Makefile.am~ead19441cc5ff35c:
Auto merged
BitKeeper/deleted/.del-Makefile.am~f87185e232d7c4f:
Auto merged
BitKeeper/deleted/.del-Makefile.in:
Auto merged
BitKeeper/deleted/.del-ReadMe.txt~573b1e4ebab241e1:
Auto merged
BitKeeper/deleted/.del-build-vs71.bat:
Auto merged
BitKeeper/deleted/.del-build-vs8.bat:
Auto merged
BitKeeper/deleted/.del-configure.js:
Auto merged
BitKeeper/deleted/.del-copy_mysql_files.bat~f6878eeb80173de9:
Auto merged
BitKeeper/deleted/.del-ha_berkeley.cc:
Auto merged
BitKeeper/deleted/.del-ha_berkeley.h:
Auto merged
BitKeeper/deleted/.del-make_win_bin_dist:
Auto merged
BitKeeper/deleted/.del-make_win_src_distribution.sh~f80d8fca44e4e5f1:
Auto merged
BitKeeper/deleted/.del-my_create_tables.c~c121a0c4c427ebb:
Auto merged
BitKeeper/deleted/.del-mysql_explain_log.sh~5ddc62808e16bd57:
Auto merged
BitKeeper/deleted/.del-mysql_thr.c~20772782813d1274:
Auto merged
BitKeeper/deleted/.del-mysql_upgrade.sh~826da969ccf96ef:
Auto merged
BitKeeper/deleted/.del-mysqlmanager.c~e97636d71145a0b:
Auto merged
BitKeeper/deleted/.del-prepare~773a10a535120a7e:
Auto merged
BitKeeper/deleted/.del-print-limit-table~b8e808031daa3758:
Auto merged
BitKeeper/deleted/.del-sql_manager.h:
Auto merged
BitKeeper/deleted/.del-thr_test.c~70fc0971c72f2a95:
Auto merged
Docs/Makefile.am:
Auto merged
Docs/generate-text-files.pl:
Auto merged
client/Makefile.am:
Auto merged
client/client_priv.h:
Auto merged
client/mysqladmin.cc:
Auto merged
client/mysqlimport.c:
Auto merged
client/mysqlshow.c:
Auto merged
dbug/Makefile.am:
Auto merged
extra/Makefile.am:
Auto merged
extra/yassl/taocrypt/benchmark/Makefile.am:
Auto merged
extra/yassl/taocrypt/test/Makefile.am:
Auto merged
include/Makefile.am:
Auto merged
include/my_time.h:
Auto merged
libmysql/Makefile.am:
Auto merged
libmysql_r/Makefile.am:
Auto merged
libmysqld/Makefile.am:
Auto merged
libmysqld/embedded_priv.h:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/install_test_db.sh:
Auto merged
mysql-test/lib/mtr_cases.pl:
Auto merged
mysql-test/lib/mtr_io.pl:
Auto merged
mysql-test/lib/mtr_match.pl:
Auto merged
mysql-test/lib/mtr_misc.pl:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/lib/mtr_timer.pl:
Auto merged
mysql-test/ndb/ndbcluster.sh:
Auto merged
mysys/Makefile.am:
Auto merged
mysys/my_gethostbyname.c:
Auto merged
mysys/my_getopt.c:
Auto merged
mysys/my_handler.c:
Auto merged
regex/Makefile.am:
Auto merged
scripts/Makefile.am:
Auto merged
scripts/fill_func_tables.sh:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
scripts/mysql_convert_table_format.sh:
Auto merged
scripts/mysql_create_system_tables.sh:
Auto merged
scripts/mysql_fix_privilege_tables.sh:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
server-tools/instance-manager/IMService.cpp:
Auto merged
server-tools/instance-manager/WindowsService.cpp:
Auto merged
server-tools/instance-manager/listener.cc:
Auto merged
server-tools/instance-manager/log.cc:
Auto merged
server-tools/instance-manager/log.h:
Auto merged
server-tools/instance-manager/manager.cc:
Auto merged
server-tools/instance-manager/messages.cc:
Auto merged
server-tools/instance-manager/mysql_connection.cc:
Auto merged
server-tools/instance-manager/mysqlmanager.cc:
Auto merged
server-tools/instance-manager/options.cc:
Auto merged
server-tools/instance-manager/options.h:
Auto merged
server-tools/instance-manager/portability.h:
Auto merged
server-tools/instance-manager/priv.cc:
Auto merged
server-tools/instance-manager/protocol.cc:
Auto merged
server-tools/instance-manager/protocol.h:
Auto merged
server-tools/instance-manager/thread_registry.cc:
Auto merged
server-tools/instance-manager/thread_registry.h:
Auto merged
server-tools/instance-manager/user_map.cc:
Auto merged
server-tools/instance-manager/user_map.h:
Auto merged
sql/Makefile.am:
Auto merged
sql/discover.cc:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/filesort.cc:
Auto merged
sql/gen_lex_hash.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/hostname.cc:
Auto merged
sql/init.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_create.h:
Auto merged
sql/item_func.h:
Auto merged
sql/item_geofunc.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/item_uniq.cc:
Auto merged
sql/key.cc:
Auto merged
sql/lex_symbol.h:
Auto merged
sql/lock.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/my_decimal.cc:
Auto merged
sql/my_decimal.h:
Auto merged
sql/my_lock.c:
Auto merged
sql/opt_range.cc:
Auto merged
sql/opt_range.h:
Auto merged
sql/password.c:
Auto merged
sql/procedure.h:
Auto merged
sql/protocol.h:
Auto merged
sql/records.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/spatial.h:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_analyse.cc:
Auto merged
sql/sql_analyse.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_crypt.cc:
Auto merged
sql/sql_cursor.cc:
Auto merged
sql/sql_do.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_manager.cc:
Auto merged
sql/sql_map.cc:
Auto merged
sql/sql_olap.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_rename.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_repl.h:
Auto merged
sql-bench/Makefile.am:
Auto merged
sql-bench/as3ap.sh:
Auto merged
sql-bench/bench-count-distinct.sh:
Auto merged
sql-bench/bench-init.pl.sh:
Auto merged
sql-bench/compare-results.sh:
Auto merged
sql-bench/copy-db.sh:
Auto merged
sql-bench/crash-me.sh:
Auto merged
sql-bench/run-all-tests.sh:
Auto merged
sql-bench/server-cfg.sh:
Auto merged
sql-bench/test-ATIS.sh:
Auto merged
sql-bench/test-alter-table.sh:
Auto merged
sql-bench/test-big-tables.sh:
Auto merged
sql-bench/test-connect.sh:
Auto merged
sql-bench/test-create.sh:
Auto merged
sql-bench/test-insert.sh:
Auto merged
sql-bench/test-select.sh:
Auto merged
sql-bench/test-transactions.sh:
Auto merged
sql-bench/test-wisconsin.sh:
Auto merged
sql-common/my_time.c:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_test.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/structs.h:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
sql/time.cc:
Auto merged
sql/unireg.cc:
Auto merged
sql/unireg.h:
Auto merged
storage/federated/ha_federated.cc:
Auto merged
storage/heap/Makefile.am:
Auto merged
storage/heap/_check.c:
Auto merged
storage/heap/_rectest.c:
Auto merged
storage/heap/ha_heap.cc:
Auto merged
storage/heap/ha_heap.h:
Auto merged
storage/heap/heapdef.h:
Auto merged
storage/heap/hp_block.c:
Auto merged
storage/heap/hp_clear.c:
Auto merged
storage/heap/hp_close.c:
Auto merged
storage/heap/hp_create.c:
Auto merged
storage/heap/hp_delete.c:
Auto merged
storage/heap/hp_extra.c:
Auto merged
storage/heap/hp_hash.c:
Auto merged
storage/heap/hp_info.c:
Auto merged
storage/heap/hp_open.c:
Auto merged
storage/heap/hp_panic.c:
Auto merged
storage/heap/hp_rename.c:
Auto merged
storage/heap/hp_rfirst.c:
Auto merged
storage/heap/hp_rkey.c:
Auto merged
storage/heap/hp_rlast.c:
Auto merged
storage/heap/hp_rnext.c:
Auto merged
storage/heap/hp_rprev.c:
Auto merged
storage/heap/hp_rrnd.c:
Auto merged
storage/heap/hp_rsame.c:
Auto merged
storage/heap/hp_scan.c:
Auto merged
storage/heap/hp_static.c:
Auto merged
storage/heap/hp_test1.c:
Auto merged
storage/heap/hp_test2.c:
Auto merged
storage/heap/hp_update.c:
Auto merged
storage/heap/hp_write.c:
Auto merged
storage/innobase/Makefile.am:
Auto merged
storage/innobase/btr/Makefile.am:
Auto merged
storage/innobase/buf/Makefile.am:
Auto merged
storage/innobase/data/Makefile.am:
Auto merged
storage/innobase/dict/Makefile.am:
Auto merged
storage/innobase/dyn/Makefile.am:
Auto merged
storage/innobase/eval/Makefile.am:
Auto merged
storage/innobase/fil/Makefile.am:
Auto merged
storage/innobase/fsp/Makefile.am:
Auto merged
storage/innobase/fut/Makefile.am:
Auto merged
storage/innobase/ha/Makefile.am:
Auto merged
storage/innobase/ibuf/Makefile.am:
Auto merged
storage/innobase/lock/Makefile.am:
Auto merged
storage/innobase/log/Makefile.am:
Auto merged
storage/innobase/mach/Makefile.am:
Auto merged
storage/innobase/mem/Makefile.am:
Auto merged
storage/innobase/mtr/Makefile.am:
Auto merged
storage/innobase/os/Makefile.am:
Auto merged
storage/innobase/page/Makefile.am:
Auto merged
storage/innobase/pars/Makefile.am:
Auto merged
storage/innobase/que/Makefile.am:
Auto merged
storage/innobase/read/Makefile.am:
Auto merged
storage/innobase/rem/Makefile.am:
Auto merged
storage/innobase/row/Makefile.am:
Auto merged
storage/innobase/srv/Makefile.am:
Auto merged
storage/innobase/sync/Makefile.am:
Auto merged
storage/innobase/thr/Makefile.am:
Auto merged
storage/innobase/trx/Makefile.am:
Auto merged
storage/innobase/usr/Makefile.am:
Auto merged
storage/innobase/ut/Makefile.am:
Auto merged
storage/myisam/Makefile.am:
Auto merged
storage/myisam/ft_boolean_search.c:
Auto merged
storage/myisam/ft_eval.c:
Auto merged
storage/myisam/ft_nlq_search.c:
Auto merged
storage/myisam/ft_parser.c:
Auto merged
storage/myisam/ft_static.c:
Auto merged
storage/myisam/ft_stem.c:
Auto merged
storage/myisam/ft_stopwords.c:
Auto merged
storage/myisam/ft_test1.c:
Auto merged
storage/myisam/ft_test1.h:
Auto merged
storage/myisam/ft_update.c:
Auto merged
storage/myisam/ftdefs.h:
Auto merged
storage/myisam/fulltext.h:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
storage/myisam/ha_myisam.h:
Auto merged
storage/myisam/mi_cache.c:
Auto merged
storage/myisam/mi_changed.c:
Auto merged
storage/myisam/mi_check.c:
Auto merged
storage/myisam/mi_checksum.c:
Auto merged
storage/myisam/mi_close.c:
Auto merged
storage/myisam/mi_create.c:
Auto merged
storage/myisam/mi_dbug.c:
Auto merged
storage/myisam/mi_delete.c:
Auto merged
storage/myisam/mi_delete_all.c:
Auto merged
storage/myisam/mi_delete_table.c:
Auto merged
storage/myisam/mi_dynrec.c:
Auto merged
storage/myisam/mi_extra.c:
Auto merged
storage/myisam/mi_info.c:
Auto merged
storage/myisam/mi_key.c:
Auto merged
storage/myisam/mi_locking.c:
Auto merged
storage/myisam/mi_log.c:
Auto merged
storage/myisam/mi_open.c:
Auto merged
storage/myisam/mi_packrec.c:
Auto merged
storage/myisam/mi_page.c:
Auto merged
storage/myisam/mi_panic.c:
Auto merged
storage/myisam/mi_preload.c:
Auto merged
storage/myisam/mi_range.c:
Auto merged
storage/myisam/mi_rename.c:
Auto merged
storage/myisam/mi_rfirst.c:
Auto merged
storage/myisam/mi_rkey.c:
Auto merged
storage/myisam/mi_rlast.c:
Auto merged
storage/myisam/mi_rnext.c:
Auto merged
storage/myisam/mi_rnext_same.c:
Auto merged
storage/myisam/mi_rprev.c:
Auto merged
storage/myisam/mi_rrnd.c:
Auto merged
storage/myisam/mi_rsame.c:
Auto merged
storage/myisam/mi_rsamepos.c:
Auto merged
storage/myisam/mi_scan.c:
Auto merged
storage/myisam/mi_search.c:
Auto merged
storage/myisam/mi_static.c:
Auto merged
storage/myisam/mi_statrec.c:
Auto merged
storage/myisam/mi_test1.c:
Auto merged
storage/myisam/mi_test2.c:
Auto merged
storage/myisam/mi_test3.c:
Auto merged
storage/myisam/mi_unique.c:
Auto merged
storage/myisam/mi_update.c:
Auto merged
storage/myisam/mi_write.c:
Auto merged
storage/myisam/myisam_ftdump.c:
Auto merged
storage/myisam/myisamdef.h:
Auto merged
storage/myisam/myisamlog.c:
Auto merged
storage/myisam/myisampack.c:
Auto merged
storage/myisam/rt_index.c:
Auto merged
storage/myisam/rt_index.h:
Auto merged
storage/myisam/rt_key.h:
Auto merged
storage/myisam/rt_mbr.c:
Auto merged
storage/myisam/rt_mbr.h:
Auto merged
storage/myisam/rt_split.c:
Auto merged
storage/myisam/rt_test.c:
Auto merged
storage/myisam/sort.c:
Auto merged
storage/myisam/sp_defs.h:
Auto merged
storage/myisam/sp_test.c:
Auto merged
storage/myisammrg/Makefile.am:
Auto merged
storage/myisammrg/ha_myisammrg.cc:
Auto merged
storage/myisammrg/ha_myisammrg.h:
Auto merged
storage/myisammrg/myrg_close.c:
Auto merged
storage/myisammrg/myrg_create.c:
Auto merged
storage/myisammrg/myrg_def.h:
Auto merged
storage/myisammrg/myrg_delete.c:
Auto merged
storage/myisammrg/myrg_extra.c:
Auto merged
storage/myisammrg/myrg_info.c:
Auto merged
storage/myisammrg/myrg_locking.c:
Auto merged
storage/myisammrg/myrg_open.c:
Auto merged
storage/myisammrg/myrg_panic.c:
Auto merged
storage/myisammrg/myrg_queue.c:
Auto merged
storage/myisammrg/myrg_range.c:
Auto merged
storage/myisammrg/myrg_rfirst.c:
Auto merged
storage/myisammrg/myrg_rkey.c:
Auto merged
storage/myisammrg/myrg_rlast.c:
Auto merged
storage/myisammrg/myrg_rnext.c:
Auto merged
storage/myisammrg/myrg_rnext_same.c:
Auto merged
storage/myisammrg/myrg_rprev.c:
Auto merged
storage/myisammrg/myrg_rrnd.c:
Auto merged
storage/myisammrg/myrg_rsame.c:
Auto merged
storage/myisammrg/myrg_static.c:
Auto merged
storage/myisammrg/myrg_update.c:
Auto merged
storage/myisammrg/myrg_write.c:
Auto merged
storage/ndb/Makefile.am:
Auto merged
storage/ndb/config/common.mk.am:
Auto merged
storage/ndb/config/type_kernel.mk.am:
Auto merged
storage/ndb/config/type_mgmapiclient.mk.am:
Auto merged
storage/ndb/config/type_ndbapi.mk.am:
Auto merged
storage/ndb/config/type_ndbapiclient.mk.am:
Auto merged
storage/ndb/config/type_ndbapitest.mk.am:
Auto merged
storage/ndb/config/type_ndbapitools.mk.am:
Auto merged
storage/ndb/config/type_util.mk.am:
Auto merged
storage/ndb/docs/Makefile.am:
Auto merged
storage/ndb/include/Makefile.am:
Auto merged
storage/ndb/include/kernel/kernel_config_parameters.h:
Auto merged
storage/ndb/include/kernel/signaldata/CntrStart.hpp:
Auto merged
storage/ndb/include/kernel/signaldata/ReadConfig.hpp:
Auto merged
storage/ndb/include/kernel/signaldata/UpgradeStartup.hpp:
Auto merged
storage/ndb/include/logger/FileLogHandler.hpp:
Auto merged
storage/ndb/include/ndb_net.h:
Auto merged
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
Auto merged
storage/ndb/include/mgmapi/mgmapi_config_parameters_debug.h:
Auto merged
storage/ndb/include/util/ConfigValues.hpp:
Auto merged
storage/ndb/include/util/File.hpp:
Auto merged
storage/ndb/include/util/Vector.hpp:
Auto merged
storage/ndb/src/Makefile.am:
Auto merged
storage/ndb/src/common/Makefile.am:
Auto merged
storage/ndb/src/common/debugger/Makefile.am:
Auto merged
storage/ndb/src/common/debugger/signaldata/CntrStart.cpp:
Auto merged
storage/ndb/src/common/debugger/signaldata/Makefile.am:
Auto merged
storage/ndb/src/common/debugger/signaldata/ReadNodesConf.cpp:
Auto merged
storage/ndb/src/common/debugger/signaldata/print.awk:
Auto merged
storage/ndb/src/common/logger/FileLogHandler.cpp:
Auto merged
storage/ndb/src/common/logger/Makefile.am:
Auto merged
storage/ndb/src/common/mgmcommon/Makefile.am:
Auto merged
storage/ndb/src/common/transporter/Makefile.am:
Auto merged
storage/ndb/src/common/util/Bitmask.cpp:
Auto merged
storage/ndb/src/common/util/ConfigValues.cpp:
Auto merged
storage/ndb/src/common/util/File.cpp:
Auto merged
storage/ndb/src/common/util/Makefile.am:
Auto merged
storage/ndb/src/common/util/new.cpp:
Auto merged
storage/ndb/src/common/util/testConfigValues/testConfigValues.cpp:
Auto merged
storage/ndb/src/cw/Makefile.am:
Auto merged
storage/ndb/src/cw/cpcd/Makefile.am:
Auto merged
storage/ndb/src/kernel/blocks/Makefile.am:
Auto merged
storage/ndb/src/kernel/blocks/backup/Makefile.am:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Master_AddTable.sfl:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Slave_AddTable.sfl:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/src/kernel/error/Makefile.am:
Auto merged
storage/ndb/src/kernel/vm/Makefile.am:
Auto merged
storage/ndb/src/mgmapi/Makefile.am:
Auto merged
storage/ndb/src/mgmapi/mgmapi_configuration.cpp:
Auto merged
storage/ndb/src/mgmclient/Makefile.am:
Auto merged
storage/ndb/src/mgmsrv/Makefile.am:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
storage/ndb/src/ndbapi/Makefile.am:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
storage/ndb/src/ndbapi/Ndbif.cpp:
Auto merged
storage/ndb/test/Makefile.am:
Auto merged
storage/ndb/test/ndbapi/Makefile.am:
Auto merged
storage/ndb/test/ndbapi/bank/Makefile.am:
Auto merged
storage/ndb/test/ndbapi/testBasic.cpp:
Auto merged
storage/ndb/test/ndbapi/testIndex.cpp:
Auto merged
storage/ndb/test/run-test/Makefile.am:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
storage/ndb/test/src/Makefile.am:
Auto merged
storage/ndb/test/tools/Makefile.am:
Auto merged
storage/ndb/tools/Makefile.am:
Auto merged
strings/Makefile.am:
Auto merged
strings/ctype-extra.c:
Auto merged
tests/Makefile.am:
Auto merged
vio/Makefile.am:
Auto merged
BitKeeper/deleted/.del-colspec-fix.pl~6c78d3332330b19e:
Auto merged
BitKeeper/deleted/.del-docbook-fixup.pl~46cf3bdef147084e:
Auto merged
BitKeeper/deleted/.del-docbook-prefix.pl~876c7d33c68c224a:
Auto merged
BitKeeper/deleted/.del-docbook-split~be931c3922898d0:
Auto merged
BitKeeper/deleted/.del-make-docbook~ccac1eb717e92ac9:
Auto merged
BitKeeper/deleted/.del-make-makefile~39fd454b487126e8:
Auto merged
BitKeeper/deleted/.del-test-make-manual-de~33cad2886311b8a:
Auto merged
BitKeeper/deleted/.del-test-make-manual~5da458f958a424ec:
Auto merged
BitKeeper/deleted/.del-xwf~76b97805d9146b80:
Auto merged
server-tools/instance-manager/listener.h:
SCCS merged
server-tools/instance-manager/manager.h:
SCCS merged
server-tools/instance-manager/mysql_connection.h:
SCCS merged
server-tools/instance-manager/priv.h:
SCCS merged
storage/ndb/src/kernel/blocks/dblqh/Makefile.am:
SCCS merged
Corrected spelling in copyright text
Makefile.am:
Don't update the files from BitKeeper
Many files:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
Many files:
Added GPL copyright text
Removed files:
Docs/Support/colspec-fix.pl
Docs/Support/docbook-fixup.pl
Docs/Support/docbook-prefix.pl
Docs/Support/docbook-split
Docs/Support/make-docbook
Docs/Support/make-makefile
Docs/Support/test-make-manual
Docs/Support/test-make-manual-de
Docs/Support/xwf
CMakeLists.txt:
Added GPL copyright text
bdb/CMakeLists.txt:
Added GPL copyright text
client/CMakeLists.txt:
Added GPL copyright text
dbug/CMakeLists.txt:
Added GPL copyright text
extra/CMakeLists.txt:
Added GPL copyright text
extra/yassl/CMakeLists.txt:
Added GPL copyright text
extra/yassl/taocrypt/CMakeLists.txt:
Added GPL copyright text
heap/CMakeLists.txt:
Added GPL copyright text
innobase/CMakeLists.txt:
Added GPL copyright text
libmysql/CMakeLists.txt:
Added GPL copyright text
myisam/CMakeLists.txt:
Added GPL copyright text
myisammrg/CMakeLists.txt:
Added GPL copyright text
mysys/CMakeLists.txt:
Added GPL copyright text
regex/CMakeLists.txt:
Added GPL copyright text
server-tools/CMakeLists.txt:
Added GPL copyright text
server-tools/instance-manager/CMakeLists.txt:
Added GPL copyright text
sql/CMakeLists.txt:
Added GPL copyright text
sql/examples/CMakeLists.txt:
Added GPL copyright text
strings/CMakeLists.txt:
Added GPL copyright text
tests/CMakeLists.txt:
Added GPL copyright text
vio/CMakeLists.txt:
Added GPL copyright text
zlib/CMakeLists.txt:
Added GPL copyright text
VC++Files/copy_mysql_files.bat:
Added GPL copyright text
extra/yassl/src/make.bat:
Added GPL copyright text
extra/yassl/taocrypt/benchmark/make.bat:
Added GPL copyright text
extra/yassl/taocrypt/src/make.bat:
Added GPL copyright text
extra/yassl/taocrypt/test/make.bat:
Added GPL copyright text
extra/yassl/testsuite/make.bat:
Added GPL copyright text
Docs/Support/generate-text-files.pl:
Added GPL copyright text
VC++Files/prepare:
Added GPL copyright text
VC++Files/test1/mysql_thr.c:
Added GPL copyright text
VC++Files/thr_test/thr_test.c:
Added GPL copyright text
include/help_end.h:
Added GPL copyright text
include/help_start.h:
Added GPL copyright text
mysql-test/install_test_db.sh:
Added GPL copyright text
mysql-test/my_create_tables.c:
Added GPL copyright text
mysql-test/ndb/ndbcluster.sh:
Added GPL copyright text
scripts/fill_func_tables.sh:
Added GPL copyright text
scripts/fill_help_tables.sh:
Added GPL copyright text
scripts/mysql_create_system_tables.sh:
Added GPL copyright text
scripts/mysql_install_db.sh:
Added GPL copyright text
scripts/mysql_upgrade_shell.sh:
Added GPL copyright text
server-tools/instance-manager/IMService.cpp:
Added GPL copyright text
server-tools/instance-manager/IMService.h:
Added GPL copyright text
server-tools/instance-manager/WindowsService.cpp:
Added GPL copyright text
server-tools/instance-manager/WindowsService.h:
Added GPL copyright text
server-tools/instance-manager/portability.h:
Added GPL copyright text
strings/ctype-extra.c:
Added GPL copyright text
strings/dump_map.c:
Added GPL copyright text
strings/uca-dump.c:
Added GPL copyright text
strings/utr11-dump.c:
Added GPL copyright text
win/build-vs71.bat:
Added GPL copyright text
win/build-vs8.bat:
Added GPL copyright text
win/build-vs8_x64.bat:
Added GPL copyright text
win/configure.js:
Added GPL copyright text
mysql-test/lib/mtr_cases.pl:
Added GPL copyright text
mysql-test/lib/mtr_diff.pl:
Added GPL copyright text
mysql-test/lib/mtr_gcov.pl:
Added GPL copyright text
mysql-test/lib/mtr_gprof.pl:
Added GPL copyright text
mysql-test/lib/mtr_im.pl:
Added GPL copyright text
mysql-test/lib/mtr_io.pl:
Added GPL copyright text
mysql-test/lib/mtr_match.pl:
Added GPL copyright text
mysql-test/lib/mtr_misc.pl:
Added GPL copyright text
mysql-test/lib/mtr_process.pl:
Added GPL copyright text
mysql-test/lib/mtr_report.pl:
Added GPL copyright text
mysql-test/lib/mtr_stress.pl:
Added GPL copyright text
mysql-test/lib/mtr_timer.pl:
Added GPL copyright text
mysql-test/lib/mtr_unique.pl:
Added GPL copyright text
strings/my_strtoll10-x86.s:
Corrected spelling in copyright text
BUILD/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
Docs/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
SSL/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
bdb/Makefile.in:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
client/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
client/client_priv.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
client/completion_hash.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
client/mysqladmin.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
client/mysqlimport.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
client/mysqlshow.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
dbug/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
extra/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
heap/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
heap/_check.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
heap/_rectest.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
heap/heapdef.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
heap/hp_block.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
heap/hp_clear.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
heap/hp_close.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
heap/hp_create.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
heap/hp_delete.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
heap/hp_extra.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
heap/hp_hash.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
heap/hp_info.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
heap/hp_open.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
heap/hp_panic.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
heap/hp_rename.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
heap/hp_rfirst.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
heap/hp_rkey.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
heap/hp_rlast.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
heap/hp_rnext.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
heap/hp_rprev.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
heap/hp_rrnd.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
heap/hp_rsame.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
heap/hp_scan.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
heap/hp_static.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
heap/hp_test1.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
heap/hp_test2.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
heap/hp_update.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
heap/hp_write.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
include/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
include/my_aes.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
include/my_getopt.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
include/my_handler.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
include/my_time.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
include/mysql_time.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
include/rijndael.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
include/sha1.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
include/sql_common.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
libmysql/client_settings.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
libmysqld/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
libmysqld/emb_qcache.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
libmysqld/embedded_priv.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
man/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/ft_boolean_search.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/ft_eval.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/ft_nlq_search.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/ft_parser.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/ft_static.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/ft_stem.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/ft_stopwords.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/ft_test1.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/ft_test1.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/ft_update.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/ftdefs.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/fulltext.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_cache.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_changed.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_check.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_checksum.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_close.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_create.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_dbug.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_delete.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_delete_all.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_delete_table.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_dynrec.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_extra.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_info.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_key.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_locking.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_log.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_open.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_packrec.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_page.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_panic.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_preload.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_range.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_rename.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_rfirst.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_rkey.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_rlast.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_rnext.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_rnext_same.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_rprev.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_rrnd.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_rsame.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_rsamepos.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_scan.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_search.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_static.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_statrec.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_test1.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_test2.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_test3.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_unique.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_update.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/mi_write.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/myisam_ftdump.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/myisamdef.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/myisamlog.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/myisampack.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/rt_index.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/rt_index.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/rt_key.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/rt_mbr.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/rt_mbr.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/rt_split.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/rt_test.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/sort.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/sp_defs.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisam/sp_test.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisammrg/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisammrg/myrg_close.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisammrg/myrg_create.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisammrg/myrg_def.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisammrg/myrg_delete.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisammrg/myrg_extra.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisammrg/myrg_info.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisammrg/myrg_locking.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisammrg/myrg_open.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisammrg/myrg_panic.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisammrg/myrg_queue.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisammrg/myrg_range.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisammrg/myrg_rfirst.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisammrg/myrg_rkey.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisammrg/myrg_rlast.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisammrg/myrg_rnext.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisammrg/myrg_rnext_same.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisammrg/myrg_rprev.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisammrg/myrg_rrnd.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisammrg/myrg_rsame.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisammrg/myrg_static.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisammrg/myrg_update.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
myisammrg/myrg_write.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
mysql-test/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
mysys/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
mysys/my_aes.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
mysys/my_gethostbyname.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
mysys/my_gethwaddr.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
mysys/my_getopt.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
mysys/my_getsystime.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
mysys/my_handler.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
mysys/my_port.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
mysys/my_semaphore.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
mysys/rijndael.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
mysys/sha1.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
os2/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
os2/ReadMe.txt:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
os2/include/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
os2/include/sys/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
pstack/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
regex/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
scripts/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
scripts/mysql_config.sh:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
server-tools/instance-manager/listener.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
server-tools/instance-manager/listener.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
server-tools/instance-manager/log.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
server-tools/instance-manager/log.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
server-tools/instance-manager/manager.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
server-tools/instance-manager/manager.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
server-tools/instance-manager/messages.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
server-tools/instance-manager/messages.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
server-tools/instance-manager/mysql_connection.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
server-tools/instance-manager/mysql_connection.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
server-tools/instance-manager/mysqlmanager.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
server-tools/instance-manager/options.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
server-tools/instance-manager/options.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
server-tools/instance-manager/priv.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
server-tools/instance-manager/priv.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
server-tools/instance-manager/protocol.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
server-tools/instance-manager/protocol.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
server-tools/instance-manager/thread_registry.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
server-tools/instance-manager/thread_registry.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
server-tools/instance-manager/user_map.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
server-tools/instance-manager/user_map.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql-bench/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql-bench/as3ap.sh:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql-bench/bench-count-distinct.sh:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql-bench/bench-init.pl.sh:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql-bench/compare-results.sh:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql-bench/copy-db.sh:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql-bench/crash-me.sh:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql-bench/print-limit-table:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql-bench/run-all-tests.sh:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql-bench/server-cfg.sh:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql-bench/test-ATIS.sh:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql-bench/test-alter-table.sh:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql-bench/test-big-tables.sh:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql-bench/test-connect.sh:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql-bench/test-create.sh:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql-bench/test-insert.sh:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql-bench/test-select.sh:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql-bench/test-transactions.sh:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql-bench/test-wisconsin.sh:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql-common/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql-common/my_time.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/client_settings.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/custom_conf.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/derror.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/des_key_file.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/discover.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/field.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/field.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/filesort.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/frm_crypt.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/gen_lex_hash.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/gstream.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/ha_berkeley.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/ha_berkeley.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/ha_heap.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/ha_heap.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/ha_myisam.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/ha_myisam.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/ha_myisammrg.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/ha_myisammrg.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/handler.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/handler.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/hash_filo.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/hash_filo.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/hostname.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/init.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/item.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/item.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/item_buff.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/item_cmpfunc.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/item_create.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/item_func.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/item_geofunc.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/item_strfunc.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/item_sum.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/item_timefunc.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/item_uniq.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/item_uniq.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/key.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/lex_symbol.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/lock.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/log_event.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/matherr.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/mf_iocache.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/my_decimal.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/my_decimal.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/my_lock.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/opt_range.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/opt_range.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/password.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/procedure.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/procedure.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/protocol.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/records.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/repl_failsafe.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/repl_failsafe.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/set_var.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/spatial.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/sql_acl.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/sql_analyse.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/sql_analyse.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/sql_base.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/sql_cache.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/sql_class.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/sql_class.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/sql_client.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/sql_crypt.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/sql_crypt.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/sql_cursor.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/sql_cursor.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/sql_do.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/sql_insert.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/sql_lex.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/sql_lex.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/sql_list.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/sql_load.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/sql_manager.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/sql_manager.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/sql_map.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/sql_map.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/sql_olap.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/sql_rename.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/sql_repl.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/sql_repl.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/sql_select.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/sql_select.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/sql_test.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/sql_udf.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/sql_update.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/structs.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/table.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/table.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/thr_malloc.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/time.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/unireg.cc:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
sql/unireg.h:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
strings/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
strings/bmove_upp-sparc.s:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
strings/macros.asm:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
strings/ptr_cmp.asm:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
strings/strappend-sparc.s:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
strings/strend-sparc.s:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
strings/strings.asm:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
strings/strinstr-sparc.s:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
strings/strmake-sparc.s:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
strings/strmov-sparc.s:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
strings/strnmov-sparc.s:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
strings/strstr-sparc.s:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
strings/strxmov-sparc.s:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
strings/strxmov.asm:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
support-files/MacOSX/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
support-files/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
tests/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
tests/deadlock_test.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
tools/mysqlmanager.c:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
vio/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
win/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
innobase/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
innobase/ibuf/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
innobase/include/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
innobase/os/Makefile.am:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
ndb/include/Makefile.am:
Added GPL copyright text
ndb/src/common/debugger/Makefile.am:
Added GPL copyright text
ndb/src/common/debugger/signaldata/Makefile.am:
Added GPL copyright text
ndb/src/common/logger/Makefile.am:
Added GPL copyright text
ndb/src/common/mgmcommon/Makefile.am:
Added GPL copyright text
ndb/src/common/transporter/Makefile.am:
Added GPL copyright text
ndb/src/common/util/Makefile.am:
Added GPL copyright text
ndb/src/cw/cpcd/Makefile.am:
Added GPL copyright text
ndb/src/kernel/Makefile.am:
Added GPL copyright text
ndb/src/kernel/blocks/backup/Makefile.am:
Added GPL copyright text
ndb/src/kernel/blocks/cmvmi/Makefile.am:
Added GPL copyright text
ndb/src/kernel/blocks/dbacc/Makefile.am:
Added GPL copyright text
ndb/src/kernel/blocks/dbdict/Makefile.am:
Added GPL copyright text
ndb/src/kernel/blocks/dbdih/Makefile.am:
Added GPL copyright text
ndb/src/kernel/blocks/dblqh/Makefile.am:
Added GPL copyright text
ndb/src/kernel/blocks/dbtc/Makefile.am:
Added GPL copyright text
ndb/src/kernel/blocks/dbtup/Makefile.am:
Added GPL copyright text
ndb/src/kernel/blocks/dbtux/Makefile.am:
Added GPL copyright text
ndb/src/kernel/blocks/dbutil/Makefile.am:
Added GPL copyright text
ndb/src/kernel/blocks/ndbcntr/Makefile.am:
Added GPL copyright text
ndb/src/kernel/blocks/ndbfs/Makefile.am:
Added GPL copyright text
ndb/src/kernel/blocks/qmgr/Makefile.am:
Added GPL copyright text
ndb/src/kernel/blocks/suma/Makefile.am:
Added GPL copyright text
ndb/src/kernel/blocks/trix/Makefile.am:
Added GPL copyright text
ndb/src/kernel/error/Makefile.am:
Added GPL copyright text
ndb/src/kernel/vm/Makefile.am:
Added GPL copyright text
ndb/src/mgmapi/Makefile.am:
Added GPL copyright text
ndb/src/mgmclient/Makefile.am:
Added GPL copyright text
ndb/src/mgmsrv/Makefile.am:
Added GPL copyright text
ndb/src/ndbapi/Makefile.am:
Added GPL copyright text
ndb/test/ndbapi/Makefile.am:
Added GPL copyright text
ndb/test/ndbapi/bank/Makefile.am:
Added GPL copyright text
ndb/test/run-test/Makefile.am:
Added GPL copyright text
ndb/test/src/Makefile.am:
Added GPL copyright text
ndb/test/tools/Makefile.am:
Added GPL copyright text
ndb/tools/Makefile.am:
Added GPL copyright text
scripts/make_binary_distribution.sh:
Added GPL copyright text
scripts/make_sharedlib_distribution.sh:
Added GPL copyright text
scripts/make_win_bin_dist:
Added GPL copyright text
scripts/make_win_src_distribution.sh:
Added GPL copyright text
scripts/mysql_convert_table_format.sh:
Added GPL copyright text
scripts/mysql_explain_log.sh:
Added GPL copyright text
scripts/mysql_find_rows.sh:
Added GPL copyright text
scripts/mysql_fix_privilege_tables.sh:
Added GPL copyright text
scripts/mysql_zap.sh:
Added GPL copyright text
scripts/mysqlbug.sh:
Added GPL copyright text
BitKeeper/deleted/.del-colspec-fix.pl:
Delete: Docs/Support/colspec-fix.pl
BitKeeper/deleted/.del-docbook-fixup.pl:
Delete: Docs/Support/docbook-fixup.pl
BitKeeper/deleted/.del-docbook-prefix.pl:
Delete: Docs/Support/docbook-prefix.pl
BitKeeper/deleted/.del-docbook-split:
Delete: Docs/Support/docbook-split
BitKeeper/deleted/.del-make-docbook:
Delete: Docs/Support/make-docbook
BitKeeper/deleted/.del-make-makefile:
Delete: Docs/Support/make-makefile
BitKeeper/deleted/.del-test-make-manual-de:
Delete: Docs/Support/test-make-manual-de
BitKeeper/deleted/.del-test-make-manual:
Delete: Docs/Support/test-make-manual
BitKeeper/deleted/.del-xwf:
Delete: Docs/Support/xwf
Makefile.am:
Don't update the files from BitKeeper
extra/yassl/Makefile.am:
Don't update the files from BitKeeper
extra/yassl/taocrypt/Makefile.am:
Don't update the files from BitKeeper
extra/yassl/taocrypt/benchmark/Makefile.am:
Don't update the files from BitKeeper
extra/yassl/taocrypt/test/Makefile.am:
Don't update the files from BitKeeper
innobase/btr/Makefile.am:
Don't update the files from BitKeeper
innobase/buf/Makefile.am:
Don't update the files from BitKeeper
innobase/data/Makefile.am:
Don't update the files from BitKeeper
innobase/dict/Makefile.am:
Don't update the files from BitKeeper
innobase/dyn/Makefile.am:
Don't update the files from BitKeeper
innobase/eval/Makefile.am:
Don't update the files from BitKeeper
innobase/fil/Makefile.am:
Don't update the files from BitKeeper
innobase/fsp/Makefile.am:
Don't update the files from BitKeeper
innobase/fut/Makefile.am:
Don't update the files from BitKeeper
innobase/ha/Makefile.am:
Don't update the files from BitKeeper
innobase/lock/Makefile.am:
Don't update the files from BitKeeper
innobase/log/Makefile.am:
Don't update the files from BitKeeper
innobase/mach/Makefile.am:
Don't update the files from BitKeeper
innobase/mem/Makefile.am:
Don't update the files from BitKeeper
innobase/mtr/Makefile.am:
Don't update the files from BitKeeper
innobase/page/Makefile.am:
Don't update the files from BitKeeper
innobase/pars/Makefile.am:
Don't update the files from BitKeeper
innobase/que/Makefile.am:
Don't update the files from BitKeeper
innobase/read/Makefile.am:
Don't update the files from BitKeeper
innobase/rem/Makefile.am:
Don't update the files from BitKeeper
innobase/row/Makefile.am:
Don't update the files from BitKeeper
innobase/srv/Makefile.am:
Don't update the files from BitKeeper
innobase/sync/Makefile.am:
Don't update the files from BitKeeper
innobase/thr/Makefile.am:
Don't update the files from BitKeeper
innobase/trx/Makefile.am:
Don't update the files from BitKeeper
innobase/usr/Makefile.am:
Don't update the files from BitKeeper
innobase/ut/Makefile.am:
Don't update the files from BitKeeper
libmysql/Makefile.am:
Don't update the files from BitKeeper
libmysql_r/Makefile.am:
Don't update the files from BitKeeper
ndb/Makefile.am:
Don't update the files from BitKeeper
ndb/docs/Makefile.am:
Don't update the files from BitKeeper
ndb/src/Makefile.am:
Don't update the files from BitKeeper
ndb/src/common/Makefile.am:
Don't update the files from BitKeeper
ndb/src/common/portlib/Makefile.am:
Don't update the files from BitKeeper
ndb/src/cw/Makefile.am:
Don't update the files from BitKeeper
ndb/src/kernel/blocks/Makefile.am:
Don't update the files from BitKeeper
ndb/test/Makefile.am:
Don't update the files from BitKeeper
pstack/aout/Makefile.am:
Don't update the files from BitKeeper
server-tools/Makefile.am:
Don't update the files from BitKeeper
zlib/Makefile.am:
Don't update the files from BitKeeper
ndb/config/common.mk.am:
Added GPL copyright text
ndb/config/type_kernel.mk.am:
Added GPL copyright text
ndb/config/type_mgmapiclient.mk.am:
Added GPL copyright text
ndb/config/type_ndbapi.mk.am:
Added GPL copyright text
ndb/config/type_ndbapiclient.mk.am:
Added GPL copyright text
ndb/config/type_ndbapitest.mk.am:
Added GPL copyright text
ndb/config/type_ndbapitools.mk.am:
Added GPL copyright text
ndb/config/type_util.mk.am:
Added GPL copyright text
ndb/include/kernel/kernel_config_parameters.h:
Added GPL copyright text
ndb/include/kernel/signaldata/CntrStart.hpp:
Added GPL copyright text
ndb/include/kernel/signaldata/ReadConfig.hpp:
Added GPL copyright text
ndb/include/kernel/signaldata/UpgradeStartup.hpp:
Added GPL copyright text
ndb/include/mgmapi/mgmapi_config_parameters.h:
Added GPL copyright text
ndb/include/mgmapi/mgmapi_config_parameters_debug.h:
Added GPL copyright text
ndb/include/ndb_net.h:
Added GPL copyright text
ndb/include/util/ConfigValues.hpp:
Added GPL copyright text
ndb/src/common/debugger/signaldata/CntrStart.cpp:
Added GPL copyright text
ndb/src/common/debugger/signaldata/ReadNodesConf.cpp:
Added GPL copyright text
ndb/src/common/debugger/signaldata/print.awk:
Added GPL copyright text
ndb/src/common/util/Bitmask.cpp:
Added GPL copyright text
ndb/src/common/util/ConfigValues.cpp:
Added GPL copyright text
ndb/src/common/util/new.cpp:
Added GPL copyright text
ndb/src/common/util/testConfigValues/testConfigValues.cpp:
Added GPL copyright text
ndb/src/kernel/blocks/dbdict/Master_AddTable.sfl:
Added GPL copyright text
ndb/src/kernel/blocks/dbdict/Slave_AddTable.sfl:
Added GPL copyright text
ndb/src/mgmapi/mgmapi_configuration.cpp:
Added GPL copyright text
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
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
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
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
into radha.patg.net:/Users/patg/mysql-build/mysql-5.1-arch-merge
mysql-test/t/disabled.def:
Auto merged
sql/mysqld.cc:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
into siva.hindu.god:/usr/home/tim/m/bk/51
mysql-test/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysql-test/t/rpl_rotate_logs.test:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
scripts/mysqld_multi.sh:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/sql_class.h:
Auto merged
into siva.hindu.god:/usr/home/tim/m/bk/50
mysql-test/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
scripts/mysqld_multi.sh:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/sql_class.h:
Auto merged
into trift2.:/MySQL/M51/push-5.1
mysql-test/mysql-test-run.pl:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
support-files/mysql.spec.sh:
Auto merged
bug #25104
mysys/default.c:
Added /etc/mysql to the search path after /etc.
scripts/mysqld_multi.sh:
Added /etc/mysql to the my.cnf search path.
Changed chop to chomp - since it's smarter.
* New result files due to new error message/error numbers
* Fixed system_mysql_db tests to work with servers table
* Added UTF8 charset to table defs
mysql-test/include/system_db_struct.inc:
WL# 3031
Added servers table to inc file used in system_mysql_db* tests
mysql-test/lib/init_db.sql:
WL# 3031
Added UTF charset to table def
mysql-test/r/mysql.result:
WL# 3031
New result files, new error messages shifted error #s up by two
mysql-test/r/rpl_sp.result:
WL# 3031
New result files, new error messages shifted error #s up by two
mysql-test/r/sp.result:
WL# 3031
New result files, new error messages shifted error #s up by two
mysql-test/r/sp_gis.result:
WL# 3031
New result files, new error messages shifted error #s up by two
mysql-test/r/system_mysql_db.result:
WL #3031
New system_mysql_db tests required adding servers table creation. Some more
comments in these tests would have been nice to explain what they do ;)
mysql-test/t/system_mysql_db_fix30020.test:
WL #3031
New system_mysql_db tests required adding servers table creation. Some more
comments in these tests would have been nice to explain what they do ;)
mysql-test/t/system_mysql_db_fix40123.test:
WL #3031
New system_mysql_db tests required adding servers table creation. Some more
comments in these tests would have been nice to explain what they do ;)
mysql-test/t/system_mysql_db_fix50030.test:
WL #3031
New system_mysql_db tests required adding servers table creation. Some more
comments in these tests would have been nice to explain what they do ;)
scripts/mysql_create_system_tables.sh:
WL# 3031
Added utf8 charset to table def
scripts/mysql_fix_privilege_tables.sql:
WL# 3031
Added servers table to mysql_fix_privilege_tables
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
Post-commit issues fixed
* Test results for other tests fixed due to added error #s
* Memory allocation/free issues found with running with valgrind
* Fix to mysql-test-run shell script to run federated_server test (installs
mysql.servers table properly)
mysql-test/r/1st.result:
WL #3031
New result for 1st test
mysql-test/r/backup.result:
WL #3031
Error codes differ due to addition of error codes for federated server errors (2)
so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/connect.result:
WL #3031
Error codes differ due to addition of error codes for federated server errors (2)
so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/information_schema.result:
WL #3031
Error codes differ due to addition of error codes for federated server errors (2)
so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/mysql.result:
WL #3031
Error codes differ due to addition of error codes for federated server errors (2)
so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/mysqlcheck.result:
WL #3031
Error codes differ due to addition of error codes for federated server errors (2)
so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/ndb_dd_basic.result:
WL #3031
Error codes differ due to addition of error codes for federated server errors (2)
so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/ndb_dd_ddl.result:
WL #3031
Error codes differ due to addition of error codes for federated server errors (2)
so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/select.result:
WL #3031
Error codes differ due to addition of error codes for federated server errors (2)
so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/show_check.result:
WL #3031
Error codes differ due to addition of error codes for federated server errors (2)
so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/sp.result:
WL #3031
Error codes differ due to addition of error codes for federated server errors (2)
so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/sp_gis.result:
WL #3031
Error codes differ due to addition of error codes for federated server errors (2)
so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/sp_trans.result:
WL #3031
Error codes differ due to addition of error codes for federated server errors (2)
so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/system_mysql_db.result:
WL #3031
Error codes differ due to addition of error codes for federated server errors (2)
so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/type_timestamp.result:
WL #3031
Error codes differ due to addition of error codes for federated server errors (2)
so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/warnings.result:
WL #3031
Error codes differ due to addition of error codes for federated server errors (2)
so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/xml.result:
WL #3031
Error codes differ due to addition of error codes for federated server errors (2)
so all test results with hard-coded error #s will be off by two. New results generated.
scripts/mysql_create_system_tables.sh:
WL #3031
Fixed old mysql-test-run.sh script to work with new mysql.servers table as reported
by Cisco
sql/sql_yacc.yy:
WL# 3031
OPTIONS/options must be usable as table or column name.
storage/federated/ha_federated.cc:
WL# 3031
* Fixed allocation and free issues (warnings found with --valgrind)
* Fixed cast issues
* Made sure port was set accordingly
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
client/mysqltest.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/sql_class.h:
Auto merged
scripts/Makefile.am:
pass --sysconfdir to scripts
scripts/mysqlaccess.sh:
use --sysconfdir instead of hardcoded /etc
scripts/mysqld_multi.sh:
use --sysconfdir instead of hardcoded /etc
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
BitKeeper/etc/ignore:
auto-union
Docs/Makefile.am:
Auto merged
Makefile.am:
Auto merged
client/mysql.cc:
Auto merged
client/mysqltest.c:
Auto merged
include/Makefile.am:
Auto merged
myisam/myisampack.c:
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/view_grant.result:
Auto merged
mysql-test/t/view_grant.test:
Auto merged
sql/handler.cc:
Auto merged
sql/item.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-common/my_time.c:
Auto merged
sql/sql_handler.cc:
Auto merged
extra/yassl/taocrypt/include/algebra.hpp:
Manual merge with import of upstream yaSSL
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
If --srcdir and --windows is given, check if error message file
is in source or build tree (bug#24557)
Makefile.am:
Cleaned up "ali_check" target, to satisfy "distcleancheck" (bug#24557)
mysql_install_db.sh:
Added --srcdir=DIR option, used from top Makefile.am in dist-hook
target, to find "fill_help_tables.sql" in VPATH build (bug#24557)
Makefile.am:
Work around problem with "distcleancheck", "sql_yacc.cc" might be in both
the source and build tree.
Call "mysql_install_db" with new option --srcdir, to enable the script
to find all that is needed, if source and build directory is not the same
(bug#24557)
scripts/mysql_install_db.sh:
If --srcdir and --windows is given, check if error message file
is in source or build tree (bug#24557)
Makefile.am:
Work around problem with "distcleancheck", "sql_yacc.cc" might be in both
the source and build tree.
Call "mysql_install_db" with new option --srcdir, to enable the script
to find all that is needed, if source and build directory is not the same
(bug#24557)
include/Makefile.am:
Cleaned up "ali_check" target, to satisfy "distcleancheck" (bug#24557)
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.
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
configure.in:
Auto merged
client/mysqldump.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/log.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/table.cc:
Auto merged
storage/ndb/include/util/OutputStream.hpp:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
mysql-test/mysql-test-run.pl:
Auto merged
mysys/my_getopt.c:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Merge change "--" to "#"
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
Makefile.am:
Auto merged
client/mysql.cc:
Auto merged
client/mysql_upgrade.c:
Auto merged
client/mysqltest.c:
Auto merged
extra/yassl/src/ssl.cpp:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/mysql-test-run-shell.sh:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/udf.result:
Auto merged
mysql-test/t/alter_table.test:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/limit.test:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysql-test/t/query_cache.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
mysys/Makefile.am:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/item.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/sql_handler.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql-common/my_time.c:
Auto merged
sql/sql_table.cc:
Auto merged
extra/yassl/taocrypt/include/algebra.hpp:
Remove fix as it conflicts with "import from yassl" and it's been
fixed there
sql/ha_ndbcluster.cc:
Merge fix of warnings
sql/sql_base.cc:
Merge
- The table_priv column of table_privs table was altered to a enum type
with fewer enums causing the SHOW/CREATE VIEW grants to be truncated.
- Improved comments and moved all declarations for table_privs, column_privs
and proc_privs to one section for each table making it easy to see hat alterations
are performed on each table
- Reduced the number of ALTER's slightly, but as this is an upgrade script we need
to take all possibilites into account.
scripts/mysql_fix_privilege_tables.sql:
Collect everything for tables_priv, columns_priv and procs_priv in one section for each table
Remove duplicate ALTERS
Remove the ALTERS that truncated "SHOW VIEW" and "CREATE VIEW" from
the enum type for Table_priv.
mysql-test/r/fix_priv_tables.result:
New BitKeeper file ``mysql-test/r/fix_priv_tables.result''
mysql-test/r/fix_priv_tabs.result:
New BitKeeper file ``mysql-test/r/fix_priv_tabs.result''
mysql-test/t/fix_priv_tables.test:
New BitKeeper file ``mysql-test/t/fix_priv_tables.test''
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
mysql-test/Makefile.am:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
sql-common/my_time.c:
Auto merged
sql/item_timefunc.cc:
Auto merged
mysql-test/mysql-test-run-shell.sh:
Auto merged
mysql-test/mysql-test-run.pl:
Manual merge of changes for RPM
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
BitKeeper/etc/collapsed:
auto-union
configure.in:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/extra/rpl_tests/rpl_deadlock.test:
Auto merged
mysql-test/mysql-test-run-shell.sh:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/windows.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/t/windows.test:
Auto merged
sql/item.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql-common/my_time.c:
Auto merged
sql/sql_parse.cc:
Auto merged
BitKeeper/deleted/.del-ps_not_windows.result:
Delete: mysql-test/r/ps_not_windows.result
BitKeeper/deleted/.del-ps_not_windows.test:
Delete: mysql-test/t/ps_not_windows.test
mysql-test/mysql-test-run.pl:
Manual merge
mysql-test/r/rpl_deadlock_innodb.result:
Manual merge
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
client/mysql_upgrade.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/mysql-test-run-shell.sh:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
sql-common/my_time.c:
Auto merged
sql/item_timefunc.cc:
Auto merged
mysql-test/mysql-test-run.pl:
Merge
into mysql.com:/home/my/mysql-5.1
client/mysql.cc:
Auto merged
client/mysqlbinlog.cc:
Auto merged
mysql-test/mysql-test-run-shell.sh:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/r/connect.result:
Auto merged
mysql-test/r/drop.result:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/r/rpl_ndb_dd_advance.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/t/information_schema.test:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysql-test/t/rpl_ndb_dd_advance.test:
Auto merged
mysql-test/t/system_mysql_db_fix.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
storage/federated/ha_federated.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
client/mysql_upgrade.c:
Manual merge
client/mysqltest.c:
Manual merge
mysql-test/mysql-test-run.pl:
Manual merge
storage/innobase/handler/ha_innodb.cc:
Manual merge
Moved .progress files into the log directory
Moved 'cluster' database tables into the MySQL database, to not have 'cluster' beeing a reserved database name
Fixed bug where mysqld got a core dump when trying to use a table created by MySQL 3.23
Fixed some compiler warnings
Fixed small memory leak in libmysql
Note that this doesn't changeset doesn't include the new mysqldump.c code required to run some tests. This will be added when I merge 5.0 to 5.1
client/client_priv.h:
Added OPT_DEBUG_INFO and OPT_COLUMN_TYPES
client/mysql.cc:
Split --debug-info into --debug-info and --column-type-info
client/mysql_upgrade.c:
Give only error info at end if using --debug-info
client/mysqladmin.cc:
Added --debug-info to detect memory leaks in mysqltest
client/mysqlbinlog.cc:
Added --debug-info to detect memory leaks in mysqltest
client/mysqlcheck.c:
Added --debug-info to detect memory leaks in mysqltest
client/mysqlimport.c:
Added --debug-info to detect memory leaks in mysqltest
client/mysqlshow.c:
Added --debug-info to detect memory leaks in mysqltest
client/mysqltest.c:
Added --debug-info to detect memory leaks in mysqltest
Added option --logdir to force .progress files in a specific directory
libmysql/libmysql.c:
Fixed memory leak
mysql-test/include/ndb_setup_slave.inc:
Moved cluster tables under 'mysql'
mysql-test/include/query_cache.inc:
Added more tests for query cache
mysql-test/lib/init_db.sql:
Move cluster.binlog_index -> mysql.binlog_index
mysql-test/lib/mtr_report.pl:
Find memory leaks
mysql-test/mysql-test-run-shell.sh:
Added --debug-info to programs to detect memory leaks
mysql-test/mysql-test-run.pl:
Added --debug-info to programs to detect memory leaks
Force log files to var/log
cluster tables moved under 'mysql'
mysql-test/r/cache_innodb.result:
New query cache test with innodb
mysql-test/r/connect.result:
binlog_index is now in mysql
mysql-test/r/drop.result:
Removed 'cluster' database
mysql-test/r/information_schema.result:
Removed 'cluster' database
mysql-test/r/mysqlcheck.result:
cluster.binlog_index -> mysql.binlog_index
mysql-test/r/ndb_binlog_basic.result:
cluster.binlog_index -> mysql.binlog_index
mysql-test/r/ndb_binlog_ddl_multi.result:
cluster -> mysql
mysql-test/r/ndb_binlog_discover.result:
cluster -> mysql
mysql-test/r/ndb_binlog_multi.result:
cluster -> mysql
mysql-test/r/ndb_restore_compat.result:
cluster -> mysql
mysql-test/r/ps_1general.result:
Removed cluster database
mysql-test/r/rpl_create_database.result:
Removed cluster database
mysql-test/r/rpl_load_from_master.result:
Removed cluster database
mysql-test/r/rpl_loaddata_m.result:
Removed cluster database
mysql-test/r/rpl_ndb_bank.result:
cluster -> mysql
mysql-test/r/rpl_ndb_dd_advance.result:
cluster -> mysql
mysql-test/r/rpl_ndb_dd_basic.result:
cluster -> mysql
mysql-test/r/rpl_ndb_idempotent.result:
cluster -> mysql
mysql-test/r/rpl_ndb_log.result:
cluster -> mysql
mysql-test/r/rpl_ndb_multi.result:
cluster -> mysql
mysql-test/r/rpl_ndb_sync.result:
cluster -> mysql
mysql-test/r/rpl_row_basic_11bugs.result:
Removed cluster database
mysql-test/r/rpl_truncate_7ndb.result:
Position have changed
mysql-test/r/rpl_truncate_7ndb_2.result:
cluster -> mysql
mysql-test/r/schema.result:
Removed cluster database
mysql-test/r/show_check.result:
Removed cluster database
mysql-test/r/system_mysql_db.result:
binlog_index moved under mysql
mysql-test/r/upgrade.result:
More tests
mysql-test/t/information_schema.test:
cluster -> mysql
mysql-test/t/mysqldump.test:
More test to detect memory leaks
mysql-test/t/ndb_binlog_basic.test:
cluster -> mysql
mysql-test/t/ndb_binlog_multi.test:
cluster -> mysql
mysql-test/t/ndb_restore_compat.test:
cluster -> mysql
mysql-test/t/rpl_ndb_bank.test:
cluster -> mysql
mysql-test/t/rpl_ndb_dd_advance.test:
cluster -> mysql
mysql-test/t/rpl_ndb_idempotent.test:
cluster -> mysql
mysql-test/t/rpl_ndb_multi.test:
cluster -> mysql
mysql-test/t/rpl_ndb_sync.test:
cluster -> mysql
mysql-test/t/system_mysql_db_fix.test:
Drop also binlog_index
mysql-test/t/upgrade.test:
Check that tables created with 3.23 works
mysys/my_error.c:
Remove all registered errors (to avoid memory leaks)
mysys/my_init.c:
call my_error_unregister_all() to avoid some possible memory leaks
mysys/mysys_priv.h:
Added prototype
scripts/mysql_create_system_tables.sh:
cluster -> mysql
scripts/mysql_fix_privilege_tables.sql:
Changed -- to #
Create binlog_index table if it dosesn't exist
sql/field.cc:
Made offset() inline
sql/field.h:
Changed prototype of offset() to not make it depending on TABLE structure
sql/field_conv.cc:
Removed some usage of current_thd
sql/ha_ndbcluster_tables.h:
cluster -> mysql
sql/item_sum.cc:
Usage of new 'offset' parameters
sql/key.cc:
Changed 'find_ref_key' to not be dependent on field->table
(This fixed a crash when using a table created in MySQL 3.23)
sql/mysql_priv.h:
Changed find_ref_key() to not use field->table
sql/mysqld.cc:
Fix that plugin_init() works properly on bootstrap
(Previously we got warnings from plugin_init)
sql/sql_class.cc:
new 'field->offset()'
sql/sql_select.cc:
New field->offset()
sql/table.cc:
We don't need field->table to be set in find_ref_key() or find_field() anymore.
storage/archive/ha_archive.cc:
New field->offset()
storage/federated/ha_federated.cc:
New field->offset()
storage/innobase/handler/ha_innodb.cc:
Fixed compiler warnings
storage/myisam/ha_myisam.cc:
Fixed compiler warnings (Wrong paramter to sprintf())
New field->offset()
storage/myisam/ha_myisam.h:
Fixed wrong type of table_flags
storage/ndb/tools/restore/Restore.cpp:
Fixed compiler warning
mysql-test/r/1st.result:
New BitKeeper file ``mysql-test/r/1st.result''
mysql-test/std_data/old_table-323.frm:
New BitKeeper file ``mysql-test/std_data/old_table-323.frm''
mysql-test/t/1st.test:
New BitKeeper file ``mysql-test/t/1st.test''
old upgrade behaviour.
Add test for upgrade from 5.0.30
mysql-test/t/system_mysql_db_fix40123.test:
Drop alos the new 5.1 tables after test
scripts/mysql_fix_privilege_tables.sql:
Update 5.1 version of mysql_fix_privilege_tables.sql to also do
an "ALTER TABLE MODIFY" on the new column(s) it adds. This allows us to
make sure that both new and already existing columsn get the right type.
mysql-test/t/system_mysql_db_fix50030-master.opt:
New BitKeeper file ``mysql-test/t/system_mysql_db_fix50030-master.opt''
mysql-test/t/system_mysql_db_fix50030.test:
New BitKeeper file ``mysql-test/t/system_mysql_db_fix50030.test''
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
client/mysql_upgrade.c:
Auto merged
client/mysqltest.c:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/system_mysql_db_fix30020.test:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
columns to make sure they both exist and have the intended type
scripts/mysql_fix_privilege_tables.sql:
Can't attempt to MODIFY columns of a table before they exists. The
new column's Create_view_priv,Show_view_priv, Create_routine_priv,
Alter_routine_priv and Create_user_priv might not exists when
upgrading. Thus an ALTER TABLE MODIFY is added in addition to the
ALTER TABLE ADD that would have added them if they didn't exist.
In this way can be sure the columns both exist and are of the correct type
"Y" are different) to utf8_general_ci (where same).
scripts/mysql_fix_privilege_tables.sql:
Change collation for ALTER-omitted ENUMs from utf8_bin (where "y" and
"Y" are different) to utf8_general_ci (where same). In the previous
statement, we clobber the collation to utf8_bin for all columns, and
that's the wrong thing to do for enums.
with embedded spaces
Problem: Original code written assuming password contains no spaces.
Further, because of how sh interprets characters in variables, you
cannot do the "simple solution".
Solution: Move the "was a password provided" check to the end. This
allows us to correctly quote the password argument when passed to the
mysql client program. Addendum: Put this check inside of a shell fn
to simplify the code.
scripts/mysql_fix_privilege_tables.sh:
Moved password existence check to end to allow for passwords with
with embedded spaces.
Added LICENSE.mysql, removed LICENSE.doc README.NW.
Removed obselete section about MySQLEULA.txt and README.NW.
README:
Added reference to the EXCEPTIONS-CLIENT file.
Changed reference to the commercial license file.
Corrected references into chapters in the manual.
.del-MySQLEULA.txt~4a1afd9284f9be5a:
Delete: Docs/MySQLEULA.txt
README:
Added reference to the EXCEPTIONS-CLIENT file.
Changed reference to the commercial license file.
Corrected references into chapters in the manual.
BitKeeper/deleted/.del-MySQLEULA.txt~4a1afd9284f9be5a:
Delete: Docs/MySQLEULA.txt
scripts/make_binary_distribution.sh:
Added LICENSE.mysql, removed LICENSE.doc README.NW.
Removed obselete section about MySQLEULA.txt and README.NW.
Copy udf examples and raid.h
Create target "include" directory before copying files to it
CMakeLists.txt:
Only compile in bdb if configured
configure.in:
Raised version number to 5.0.27
scripts/make_win_bin_dist:
Copy udf examples and raid.h
Create target "include" directory before copying files to it
CMakeLists.txt:
Only compile in bdb if configured
configure.in:
Raised version number to 5.0.27
Update make_binary_distribution.sh
Make sure all files needed for testing are included
scripts/make_binary_distribution.sh:
Make sure all files needed for testing are included
Split copy of result files to avoid shell limit.
Added copy of mysql-test/std_data/ndb_backup5{0,1}.
configure.in:
Look for dlopen() even if --with-mysqld-ldflags constains "-static",
as this is not the same as the flag to "ld", it just informs
"libtool" to link static with libraries created part of the build,
even if there exists shared versions.
configure.in:
Look for dlopen() even if --with-mysqld-ldflags constains "-static",
as this is not the same as the flag to "ld", it just informs
"libtool" to link static with libraries created part of the build,
even if there exists shared versions.
scripts/make_binary_distribution.sh:
Split copy of result files to avoid shell limit.
Added copy of mysql-test/std_data/ndb_backup5{0,1}.
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
BitKeeper/etc/collapsed:
auto-union
BitKeeper/etc/ignore:
auto-union
Makefile.am:
Auto merged
client/mysql.cc:
Auto merged
include/m_ctype.h:
Auto merged
include/my_global.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/mysql.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/strict.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/r/warnings.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/field.cc:
Auto merged
sql/filesort.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/opt_range.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Filter out plain -O and Sun C/C++ style optimization flags, -xO<level>
Filter out icc specific options from cflags/libs(_r)
scripts/mysql_config.sh:
Filter out plain -O and Sun C/C++ style optimization flags, -xO<level>
Added "test" RPM package
Install all binaries "make install" would
make_binary_distribution.sh:
Copy Cluster API headers into "/usr/include/mysql/storage/ndb/" (Bug#21955)
scripts/make_binary_distribution.sh:
Copy Cluster API headers into "/usr/include/mysql/storage/ndb/" (Bug#21955)
support-files/mysql.spec.sh:
Removed the rest of the "bench" sub RPM, but added a new "test" sub
RPM containing the "mysql-test" directory earlier in the "bench" sub
RPM. The new sub RPM "Obsoltes" "mysql-bench" as well.
Added the rest of the binaries that "make install" would install
bin/ndb_print_backup_file
bin/ndb_print_schema_file
bin/ndb_print_sys_file
sbin/ndb_cpcd
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/config:
Auto merged
client/mysql.cc:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/mysql.result:
Auto merged
mysql-test/r/user_var.result:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/user_var.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
tests/Makefile.am:
Auto merged
vio/viosocket.c:
Auto merged
scripts/make_win_bin_dist:
BitKeeper file /home/georg/work/mysql/prod/mysql-5.0-win/scripts/make_win_bin_dist
client/mysqlbinlog.cc:
Fix for cmake build: Cmake doesn't use the VC++ files
extra/comp_err.c:
fixed windows crash (debug): We can't call DBUG_RETURN after my_end.
include/my_dbug.h:
added missing empty define for DBUG_LEAVE to prevent precompiler errors when
compiling in non_debug mode
mysql-test/mysql-test-run.pl:
Added support for new cmake release and debug paths.
mysql-test/t/system_mysql_db_fix.test:
This test requires unix shell script mysql_fix_previleges_tables -> skip under windows
mysys/my_seek.c:
Fix for windows debug crash. However this solution is bad: we should never
call lseek with an invalid file pointer.
sql/ha_archive.cc:
Fixed windows crash: We need dup in gzdopen to keep the filehandle open,
otherwise subsequent calls to mysql_close will fail/crash.
into zim.(none):/home/brian/mysql/remove-bdb-5.1
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/backup.result:
Auto merged
mysql-test/r/im_utils.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
sql/field.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql-common/my_time.c:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/t/federated_transactions.test:
Merge
into zim.(none):/home/brian/mysql/dep-5.1
client/mysql.cc:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/r/grant2.result:
Auto merged
mysql-test/r/heap_btree.result:
Auto merged
mysql-test/t/grant.test:
Auto merged
mysql-test/t/grant2.test:
Auto merged
mysql-test/t/mysqlbinlog.test:
Auto merged
mysql-test/t/repair.test:
Auto merged
scripts/fill_func_tables.sh:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_update.cc:
Auto merged
storage/heap/hp_delete.c:
Auto merged
storage/myisam/mi_update.c:
Auto merged
storage/myisam/sort.c:
Auto merged
mysql-test/r/mysqldump.result:
Fixing Result
mysql-test/r/repair.result:
Fixing result
mysql-test/t/mysqldump.test:
Merging change
storage/archive/ha_archive.cc:
Merging in change
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
BitKeeper/deleted/.del-mysys.vcproj~40a49d09c4184822:
Auto merged
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/warnings.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/mysqlbinlog.test:
Auto merged
mysql-test/t/udf.test:
Auto merged
mysql-test/t/warnings.test:
Auto merged
BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb:
Auto merged
sql/field.cc:
Auto merged
sql/handler.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/sql_class.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
mysql-test/r/sp.result:
Manual merge. Place 5.0 test before 5.1 test.
mysql-test/t/sp.test:
Manual merge. Place 5.0 test before 5.1 test.
mysys/my_bitmap.c:
Manual merge.
scripts/make_binary_distribution.sh:
Manual merge.
sql/Makefile.am:
Manual merge.
sql/slave.cc:
Manual merge.
sql/sql_class.h:
Manual merge.
sql/sql_parse.cc:
Manual merge.
sql/sql_select.cc:
Manual merge.
tests/mysql_client_test.c:
Manual merge.
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
mysql-test/Makefile.am:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
client/mysqltest.c:
Manual merge
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-merge
configure.in:
Auto merged
man/Makefile.am:
Auto merged
mysys/my_bitmap.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/field.cc:
Auto merged
sql/sql_locale.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
mysql-test/t/mysqlbinlog.test:
Manual merge.
sql/sql_select.cc:
Manual merge.
into rama.(none):/home/jimw/my/mysql-5.1-clean
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
configure.in:
Auto merged
extra/yassl/include/openssl/ssl.h:
Auto merged
extra/yassl/include/yassl_int.hpp:
Auto merged
extra/yassl/src/ssl.cpp:
Auto merged
extra/yassl/src/template_instnt.cpp:
Auto merged
extra/yassl/src/yassl_imp.cpp:
Auto merged
extra/yassl/src/yassl_int.cpp:
Auto merged
include/mysql.h:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/embedded_priv.h:
Auto merged
BitKeeper/deleted/.del-mysql_explain_log.sh~5ddc62808e16bd57:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
libmysqld/libmysqld.c:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/mysqldump-max.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_string.h:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
sql/time.cc:
Auto merged
storage/myisam/mi_create.c:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
tests/mysql_client_test.c:
Auto merged
BitKeeper/deleted/.del-have_case_sensitive_file_system.inc:
Delete: mysql-test/include/have_case_sensitive_file_system.inc
BitKeeper/deleted/.del-case_sensitive_file_system.require:
Delete: mysql-test/r/case_sensitive_file_system.require
mysql-test/lib/mtr_cases.pl:
Resolve conflict
mysql-test/mysql-test-run.pl:
Resolve conflict
mysql-test/r/mysqldump.result:
Resolve conflict
mysql-test/t/mysqldump.test:
Resolve conflict
sql/sql_parse.cc:
Resolve conflict
