--Bug#52157 various crashes and assertions with multi-table update, stored function
--Bug#54475 improper error handling causes cascading crashing failures in innodb/ndb
--Bug#57703 create view cause Assertion failed: 0, file .\item_subselect.cc, line 846
--Bug#57352 valgrind warnings when creating view
--Recently discovered problem when a nested materialized derived table is used
before being populated and it leads to incorrect result
We have several modes when we should disable subquery evaluation.
The reasons for disabling are different. It could be
uselessness of the evaluation as in case of 'CREATE VIEW'
or 'PREPARE stmt', or we should disable subquery evaluation
if tables are not locked yet as it happens in bug#54475, or
too early evaluation of subqueries can lead to wrong result
as it happened in Bug#19077.
Main problem is that if subquery items are treated as const
they are evaluated in ::fix_fields(), ::fix_length_and_dec()
of the parental items as a lot of these methods have
Item::val_...() calls inside.
We have to make subqueries non-const to prevent unnecessary
subquery evaluation. At the moment we have different methods
for this. Here is a list of these modes:
1. PREPARE stmt;
We use UNCACHEABLE_PREPARE flag.
It is set during parsing in sql_parse.cc, mysql_new_select() for
each SELECT_LEX object and cleared at the end of PREPARE in
sql_prepare.cc, init_stmt_after_parse(). If this flag is set
subquery becomes non-const and evaluation does not happen.
2. CREATE|ALTER VIEW, SHOW CREATE VIEW, I_S tables which
process FRM files
We use LEX::view_prepare_mode field. We set it before
view preparation and check this flag in
::fix_fields(), ::fix_length_and_dec().
Some bugs are fixed using this approach,
some are not(Bug#57352, Bug#57703). The problem here is
that we have a lot of ::fix_fields(), ::fix_length_and_dec()
where we use Item::val_...() calls for const items.
3. Derived tables with subquery = wrong result(Bug19077)
The reason of this bug is too early subquery evaluation.
It was fixed by adding Item::with_subselect field
The check of this field in appropriate places prevents
const item evaluation if the item have subquery.
The fix for Bug19077 fixes only the problem with
convert_constant_item() function and does not cover
other places(::fix_fields(), ::fix_length_and_dec() again)
where subqueries could be evaluated.
Example:
CREATE TABLE t1 (i INT, j BIGINT);
INSERT INTO t1 VALUES (1, 2), (2, 2), (3, 2);
SELECT * FROM (SELECT MIN(i) FROM t1
WHERE j = SUBSTRING('12', (SELECT * FROM (SELECT MIN(j) FROM t1) t2))) t3;
DROP TABLE t1;
4. Derived tables with subquery where subquery
is evaluated before table locking(Bug#54475, Bug#52157)
Suggested solution is following:
-Introduce new field LEX::context_analysis_only with the following
possible flags:
#define CONTEXT_ANALYSIS_ONLY_PREPARE 1
#define CONTEXT_ANALYSIS_ONLY_VIEW 2
#define CONTEXT_ANALYSIS_ONLY_DERIVED 4
-Set/clean these flags when we perform
context analysis operation
-Item_subselect::const_item() returns
result depending on LEX::context_analysis_only.
If context_analysis_only is set then we return
FALSE that means that subquery is non-const.
As all subquery types are wrapped by Item_subselect
it allow as to make subquery non-const when
it's necessary.
mysql-test/r/derived.result:
test case
mysql-test/r/multi_update.result:
test case
mysql-test/r/view.result:
test case
mysql-test/suite/innodb/r/innodb_multi_update.result:
test case
mysql-test/suite/innodb/t/innodb_multi_update.test:
test case
mysql-test/suite/innodb_plugin/r/innodb_multi_update.result:
test case
mysql-test/suite/innodb_plugin/t/innodb_multi_update.test:
test case
mysql-test/t/derived.test:
test case
mysql-test/t/multi_update.test:
test case
mysql-test/t/view.test:
test case
sql/item.cc:
--removed unnecessary code
sql/item_cmpfunc.cc:
--removed unnecessary checks
--THD::is_context_analysis_only() is replaced with LEX::is_ps_or_view_context_analysis()
sql/item_func.cc:
--refactored context analysis checks
sql/item_row.cc:
--removed unnecessary checks
sql/item_subselect.cc:
--removed unnecessary code
--added DBUG_ASSERT into Item_subselect::exec()
which asserts that subquery execution can not happen
if LEX::context_analysis_only is set, i.e. at context
analysis stage.
--Item_subselect::const_item()
Return FALSE if LEX::context_analysis_only is set.
It prevents subquery evaluation in ::fix_fields &
::fix_length_and_dec at context analysis stage.
sql/item_subselect.h:
--removed unnecessary code
sql/mysql_priv.h:
--Added new set of flags.
sql/sql_class.h:
--removed unnecessary code
sql/sql_derived.cc:
--added LEX::context_analysis_only analysis intialization/cleanup
sql/sql_lex.cc:
--init LEX::context_analysis_only field
sql/sql_lex.h:
--New LEX::context_analysis_only field
sql/sql_parse.cc:
--removed unnecessary code
sql/sql_prepare.cc:
--removed unnecessary code
--added LEX::context_analysis_only analysis intialization/cleanup
sql/sql_select.cc:
--refactored context analysis checks
sql/sql_show.cc:
--added LEX::context_analysis_only analysis intialization/cleanup
sql/sql_view.cc:
--added LEX::context_analysis_only analysis intialization/cleanup
strict aliasing violations.
One somewhat major source of strict-aliasing violations and
related warnings is the SQL_LIST structure. For example,
consider its member function `link_in_list` which takes
a pointer to pointer of type T (any type) as a pointer to
pointer to unsigned char. Dereferencing this pointer, which
is done to reset the next field, violates strict-aliasing
rules and might cause problems for surrounding code that
uses the next field of the object being added to the list.
The solution is to use templates to parametrize the SQL_LIST
structure in order to deference the pointers with compatible
types. As a side bonus, it becomes possible to remove quite
a few casts related to acessing data members of SQL_LIST.
sql/handler.h:
Use the appropriate template type argument.
sql/item.cc:
Remove now-unnecessary cast.
sql/item_subselect.cc:
Remove now-unnecessary casts.
sql/item_sum.cc:
Use the appropriate template type argument.
Remove now-unnecessary cast.
sql/mysql_priv.h:
Move SQL_LIST structure to sql_list.h
Use the appropriate template type argument.
sql/sp.cc:
Remove now-unnecessary casts.
sql/sql_delete.cc:
Use the appropriate template type argument.
Remove now-unnecessary casts.
sql/sql_derived.cc:
Remove now-unnecessary casts.
sql/sql_lex.cc:
Remove now-unnecessary casts.
sql/sql_lex.h:
SQL_LIST now takes a template type argument which must
match the type of the elements of the list. Use forward
declaration when the type is not available, it is used
in pointers anyway.
sql/sql_list.h:
Rename SQL_LIST to SQL_I_List. The template parameter is
the type of object that is stored in the list.
sql/sql_olap.cc:
Remove now-unnecessary casts.
sql/sql_parse.cc:
Remove now-unnecessary casts.
sql/sql_prepare.cc:
Remove now-unnecessary casts.
sql/sql_select.cc:
Remove now-unnecessary casts.
sql/sql_show.cc:
Remove now-unnecessary casts.
sql/sql_table.cc:
Remove now-unnecessary casts.
sql/sql_trigger.cc:
Remove now-unnecessary casts.
sql/sql_union.cc:
Remove now-unnecessary casts.
sql/sql_update.cc:
Remove now-unnecessary casts.
sql/sql_view.cc:
Remove now-unnecessary casts.
sql/sql_yacc.yy:
Remove now-unnecessary casts.
storage/myisammrg/ha_myisammrg.cc:
Remove now-unnecessary casts.
Added a more detailed error message on calling an ambiguous missing function.
mysql-test/r/ps.result:
Bug #38159: fixed existing tests
mysql-test/r/sp-error.result:
Bug #38159: test case
mysql-test/t/ps.test:
Bug #38159: fixed existing tests
mysql-test/t/sp-error.test:
Bug #38159: test case
sql/item_func.cc:
Bug #38159: generate more detailed error message
sql/share/errmsg.txt:
Bug #38159: add a more detailed error message
sql/sql_derived.cc:
Bug #38159: treat the detailed error message the same way as the
generic one
sql/sql_lex.cc:
Bug #38159:
- detect if the token is ambiguous and print the appropriate error.
- backport is_lex_native_function() from 5.1
sql/sql_lex.h:
Bug #38159: detect if the token is ambiguous and print the appropriate error.
sql/sql_yacc.yy:
Bug #38159: generate more detailed error message
sql/table.cc:
Bug #38159: treat the detailed error message the same way as the
generic one
- Remove bothersome warning messages. This change focuses on the warnings
that are covered by the ignore file: support-files/compiler_warnings.supp.
- Strings are guaranteed to be max uint in length
This patch also fixes bugs 36963 and 35600.
- In many places a view was confused with an anonymous derived
table, i.e. access checking was skipped. Fixed by introducing a
predicate to tell the difference between named and anonymous
derived tables.
- When inserting fields for "SELECT * ", there was no
distinction between base tables and views, where one should be
made. View privileges are checked elsewhere.
mysql-test/include/grant_cache.inc:
Bug#36086: Changed test case.
mysql-test/r/grant2.result:
Bug#36086: Changed test result.
mysql-test/r/grant_cache_no_prot.result:
Bug#36086: Changed test result.
mysql-test/r/grant_cache_ps_prot.result:
Bug#36086: Changed test result.
mysql-test/r/view_grant.result:
Bug#36086: Test result.
mysql-test/t/grant2.test:
Bug#36086: Changed test case.
mysql-test/t/view_grant.test:
Bug#36086: Test case.
sql/item.cc:
Bug#36086: Replaced conditional with new methods.
sql/sql_acl.cc:
Bug no 35600:
In mysql_table_grant:
Replaced conditional with the new accessor method.
In check_grant:
- Changed the requirement table->derived != null to
checking all anonymous derived tables.
- Use of the accessor methods for getting object and database
names.
Bug#36086: In check_grant_all_columns:
- Updated comment. This function is now called for views
as well.
- The error message should not disclose any column names
unless the user has privilege to see all column names.
- Changed names of Field_iterator_table_ref methods.
sql/sql_base.cc:
Bug no 36963: In insert_fields()
- Commented.
- We should call check_grant_all_columns() for views in
this case.
- Changed names of Field_iterator_table_ref methods.
- We should not disclose column names in the error message
when the user has no approprate privilege.
sql/sql_cache.cc:
Bug#36086: Replaced test with new predicate method.
sql/sql_derived.cc:
Bug#36086: commenting only. Updated and doxygenated
comment for mysql_derived_prepare().
sql/sql_parse.cc:
Bug no 35600:
- In check_single_table_access:
Due to the bug, check_grant would raise an error for a
SHOW CREATE TABLE command for a TEMPTABLE view. It should in
fact not be be invoked in this case. This table privilege
is checked already.
There is a test case for this in information_schema_db.test.
- In check_access: replaced table->derived
sql/table.cc:
Bug#36086:
- In TABLE_LIST::set_underlying_merge():
Commenting only. Doxygenated, corrected spelling,
added.
- Renamed table_name() and db_name() methods of
Field_iterator_table_ref in order to be consistent
with new methods in TABLE_LIST.
sql/table.h:
Bug#36086:
- Commented GRANT_INFO.
- Added a predicate is_anonymous_derived_table() to
TABLE_LIST.
- Added get_table_name() and get_db_name() to
TABLE_LIST in order to hide the disparate
representation of these properties.
cause ROLLBACK of statement", part 1. Review fixes.
Do not send OK/EOF packets to the client until we reached the end of
the current statement.
This is a consolidation, to keep the functionality that is shared by all
SQL statements in one place in the server.
Currently this functionality includes:
- close_thread_tables()
- log_slow_statement().
After this patch and the subsequent patch for Bug#12713, it shall also include:
- ha_autocommit_or_rollback()
- net_end_statement()
- query_cache_end_of_result().
In future it may also include:
- mysql_reset_thd_for_next_command().
include/mysql_com.h:
Rename now unused members of NET: no_send_ok, no_send_error, report_error.
These were server-specific variables related to the client/server
protocol. They have been made obsolete by this patch.
Previously the same members of NET were used to store the error message
both on the client and on the server.
The error message was stored in net.last_error (client: mysql->net.last_error,
server: thd->net.last_error).
The error code was stored in net.last_errno (client: mysql->net.last_errno,
server: thd->net.last_errno).
The server error code and message are now stored elsewhere
(in the Diagnostics_area), thus NET members are no longer used by the
server.
Rename last_error to client_last_error, last_errno to client_last_errno
to avoid potential bugs introduced by merges.
include/mysql_h.ic:
Update the ABI file to reflect a rename.
Renames do not break the binary compatibility.
libmysql/libmysql.c:
Rename last_error to client_last_error, last_errno to client_last_errno.
This is necessary to ensure no unnoticed bugs introduced by merged
changesets.
Remove net.report_error, net.no_send_ok, net.no_send_error.
libmysql/manager.c:
Rename net.last_errno to net.client_last_errno.
libmysqld/lib_sql.cc:
Rename net.last_errno to net.client_last_errno.
Update the embedded implementation of the client-server protocol to
reflect the refactoring of protocol.cc.
libmysqld/libmysqld.c:
Rename net.last_errno to net.client_last_errno.
mysql-test/r/events.result:
Update to reflect the change in mysql_rm_db(). Now we drop stored
routines and events for a given database name only if there
is a directory for this database name. ha_drop_database() and
query_cache_invalidate() are called likewise.
Previously we would attempt to drop routines/events even if database
directory was not found (it worked, since routines and events are stored
in tables). This fixes Bug 29958 "Weird message on DROP DATABASE if mysql.proc
does not exist".
The change was done because the previous code used to call send_ok()
twice, which led to an assertion failure when asserts against it were
added by this patch.
mysql-test/r/grant.result:
Fix the patch for Bug 16470, now FLUSH PRIVILEGES produces an error
if mysql.procs_priv is missing.
This fixes the assert that send_ok() must not called after send_error()
(the original patch for Bug 16470 was prone to this).
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
Produce a more detailed error message.
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
Produce a more detailed error message.
mysql-test/t/grant.test:
Update the test, now FLUSH PRIVILEGES returns an error if mysql.procs_priv
is missing.
server-tools/instance-manager/mysql_connection.cc:
Rename net.last_errno to net.client_last_errno.
sql/ha_ndbcluster_binlog.cc:
Add asserts.
Use getters to access statement status information.
Add a comment why run_query() is broken. Reset the diagnostics area
in the end of run_query() to fulfill the invariant that the diagnostics_area
is never assigned twice per statement (see the comment in the code
when this can happen). We still do not clear thd->is_fatal_error and
thd->is_slave_error, which may lead to bugs, I consider the whole affair
as something to be dealt with separately.
sql/ha_partition.cc:
fatal_error() doesn't set an error by itself. Perhaps we should
remove this method altogether and instead add a flag to my_error
to set thd->is_fatal_error property.
Meanwhile, this change is a part of inspection made to the entire source
code with the goal to ensure that fatal_error()
is always accompanied by my_error().
sql/item_func.cc:
There is no net.last_error anymore. Remove the obsolete assignment.
sql/log_event.cc:
Use getters to access statement error status information.
sql/log_event_old.cc:
Use getters to access statement error status information.
sql/mysqld.cc:
Previously, if a continue handler for an error was found, my_message_sql()
would not set an error in THD. Since the current statement
must be aborted in any case, find_handler() had a hack to assign
thd->net.report_error to 1.
Remove this hack. Set an error in my_message_sql() even if the continue
handler is found. The error will be cleared anyway when the handler
is executed. This is one action among many in this patch to ensure the
invariant that whenever thd->is_error() is TRUE, we have a message in
thd->main_da.message().
sql/net_serv.cc:
Use a full-blown my_error() in net_serv.cc to report an error,
instead of just setting net->last_errno. This ensures the invariant that
whenever thd->is_error() returns TRUE, we have a message in
thd->main_da.message().
Remove initialization of removed NET members.
sql/opt_range.cc:
Use my_error() instead of just raising thd->net.report_error.
This ensures the invariant that whenever thd->is_error() returns TRUE,
there is a message in thd->main_da.message().
sql/opt_sum.cc:
Move invocation of fatal_error() right next to the place where
we set the error message. That makes it easier to track that whenever
fatal_error() is called, there is a message in THD.
sql/protocol.cc:
Rename send_ok() and send_eof() to net_send_ok() and net_send_eof()
respectively. These functions write directly to the network and are not
for use anywhere outside the client/server protocol code.
Remove the code that was responsible for cases when either there is
no error code, or no error message, or both.
Instead the calling code ensures that they are always present. Asserts
are added to enforce the invariant.
Instead of a direct access to thd->server_status and thd->total_warn_count
use function parameters, since these from now on don't always come directly
from THD.
Introduce net_end_statement(), the single-entry-point replacement API for
send_ok(), send_eof() and net_send_error().
Implement Protocol::end_partial_result_set to use in select_send::abort()
when there is a continue handler.
sql/protocol.h:
Update declarations.
sql/repl_failsafe.cc:
Use getters to access statement status information in THD.
Rename net.last_error to net.client_last_error.
sql/rpl_record.cc:
Set an error message in prepare_record() if there is no default
value for the field -- later we do print this message to the client.
sql/rpl_rli.cc:
Use getters to access statement status information in THD.
sql/slave.cc:
In create_table_from_dump() (a common function that is used in
LOAD MASTER TABLE SQL statement and COM_LOAD_MASTER_DATA), instead of hacks
with no_send_ok, clear the diagnostics area when mysql_rm_table() succeeded.
Update has_temporary_error() to work correctly when no error is set.
This is the case when Incident_log_event is executed: it always returns
an error but does not set an error message.
Use getters to access error status information.
sql/sp_head.cc:
Instead of hacks with no_send_error, work through the diagnostics area
interface to suppress sending of OK/ERROR packets to the client.
Move query_cache_end_of_result before log_slow_statement(), similarly
to how it's done in dispatch_command().
sql/sp_rcontext.cc:
Remove hacks with assignment of thd->net.report_error, they are not
necessary any more (see the changes in mysqld.cc).
sql/sql_acl.cc:
Use getters to access error status information in THD.
sql/sql_base.cc:
Access thd->main_da.sql_errno() only if there is an error. This fixes
a bug when auto-discovery, that was effectively disabled under pre-locking.
sql/sql_binlog.cc:
Remove hacks with no_send_ok/no_send_error, they are not necessary
anymore: the caller is responsible for network communication.
sql/sql_cache.cc:
Disable sending of OK/ERROR/EOF packet in the end of dispatch_command
if the response has been served from the query cache. This raises the
question whether we should store EOF packet in the query cache at all,
or generate it anew for each statement (we should generate it anew), but
this is to be addressed separately.
sql/sql_class.cc:
Implement class Diagnostics_area. Please see comments in sql_class.h
for details.
Fix a subtle coding mistake in select_send::send_data: when on slave,
an error in Item::send() was ignored.
The problem became visible due to asserts that the diagnostics area is
never double assigned.
Remove initialization of removed NET members.
In select_send::abort() do not call select_send::send_eof(). This is
not inheritance-safe. Even if a stored procedure continue handler is
found, the current statement is aborted, not succeeded.
Instead introduce a Protocol API to send the required response,
Protocol::end_partial_result_set().
This simplifies implementation of select_send::send_eof(). No need
to add more asserts that there is no error, there is an assert inside
Diagnostics_area::set_ok_status() already.
Leave no trace of no_send_* in the code.
sql/sql_class.h:
Declare class Diagnostics_area.
Remove the hack with no_send_ok from
Substatement_state.
Provide inline implementations of send_ok/send_eof.
Add commetns.
sql/sql_connect.cc:
Remove hacks with no_send_error.
Since now an error in THD is always set if net->error, it's not necessary
to check both net->error and thd->is_error() in the do_command loop.
Use thd->main_da.message() instead of net->last_errno.
Remove the hack with is_slave_error in sys_init_connect. Since now we do not
reset the diagnostics area in net_send_error (it's reset at the beginning
of the next statement), we can access it safely even after
execute_init_command.
sql/sql_db.cc:
Update the code to satisfy the invariant that the diagnostics area is never
assigned twice.
Incidentally, this fixes Bug 29958 "Weird message on DROP DATABASE if
mysql.proc does not exist".
sql/sql_delete.cc:
Change multi-delete to abort in abort(), as per select_send protocol.
Fixes the merge error with the test for Bug 29136
sql/sql_derived.cc:
Use getters to access error information.
sql/sql_insert.cc:
Use getters to access error information.
sql-common/client.c:
Rename last_error to client_last_error, last_errno to client_last_errno.
sql/sql_parse.cc:
Remove hacks with no_send_error. Deploy net_end_statement().
The story of COM_SHUTDOWN is interesting. Long story short, the server
would become on its death's door, and only no_send_ok/no_send_error assigned
by send_ok()/net_send_error() would hide its babbling from the client.
First of all, COM_QUIT does not require a response. So, the comment saying
"Let's send a response to possible COM_QUIT" is not only groundless
(even mysqladmin shutdown/mysql_shutdown() doesn't send COM_QUIT after
COM_SHUTDOWN), it's plainly incorrect.
Secondly, besides this additional 'OK' packet to respond to a hypothetical
COM_QUIT, there was the following code in dispatch_command():
if (thd->killed)
thd->send_kill_message();
if (thd->is_error()
net_send_error(thd);
This worked out really funny for the thread through which COM_SHUTDOWN
was delivered: we would get COM_SHUTDOWN, say okay, say okay again,
kill everybody, get the kill signal ourselves, and then attempt to say
"Server shutdown in progress" to the client that is very likely long gone.
This all became visible when asserts were added that the Diagnostics_area
is not assigned twice.
Move query_cache_end_of_result() to the end of dispatch_command(), since
net_send_eof() has been moved there. This is safe, query_cache_end_of_result()
is a no-op if there is no started query in the cache.
Consistently use select_send interface to call abort() or send_eof()
depending on the operation result.
Remove thd->fatal_error() from reset_master(), it was a no-op.
in hacks with no_send_error woudl save us
from complete breakage of the client/server protocol.
Consistently use select_send::abort() whenever there is an error,
and select_send::send_eof() in case of success.
The issue became visible due to added asserts.
sql/sql_partition.cc:
Always set an error in THD whenever there is a call to fatal_error().
sql/sql_prepare.cc:
Deploy class Diagnostics_area.
Remove the unnecessary juggling with the protocol in
Select_fetch_protocol_binary::send_eof(). EOF packet format is
protocol-independent.
sql/sql_select.cc:
Call fatal_error() directly in opt_sum_query.
Call my_error() whenever we call thd->fatal_error().
sql/sql_servers.cc:
Use getters to access error information in THD.
sql/sql_show.cc:
Use getters to access error information in THD.
Add comments.
Call my_error() whenever we call fatal_error().
sql/sql_table.cc:
Replace hacks with no_send_ok with the interface of the diagnostics area.
Clear the error if ENOENT error in ha_delete_table().
sql/sql_update.cc:
Introduce multi_update::abort(), which is the proper way to abort a
multi-update. This fixes the merge conflict between this patch and
the patch for Bug 29136.
sql/table.cc:
Use a getter to access error information in THD.
sql/tztime.cc:
Use a getter to access error information in THD.
applied the new function is_union() to places
in the code that check the same condition.
- 5.0->5.1 merge fixes
mysql-test/r/subselect3.result:
merge 5.0->5.1 : updated explain.
sql/item_subselect.cc:
addendum of the fix for bug 27786:
applied the new function is_union() to the applicable places.
sql/sql_derived.cc:
addendum of the fix for bug 27786:
applied the new function is_union() to the applicable places.
sql/sql_parse.cc:
addendum of the fix for bug 27786:
applied the new function is_union() to the applicable places.
sql/sql_select.cc:
addendum of the fix for bug 27786:
applied the new function is_union() to places
in the code that check the same condition.
sql/sql_union.cc:
addendum of the fix for bug 27786:
applied the new function is_union() to the applicable places.
sql/sql_view.cc:
addendum of the fix for bug 27786:
applied the new function is_union() to the applicable places.
sql/sql_yacc.yy:
addendum of the fix for bug 27786:
applied the new function is_union() to the applicable places.
into gbichot3.local:/home/mysql_src/mysql-5.1-rpl-26194
will fix by hand
mysql-test/t/rpl_misc_functions.test:
Auto merged
sql/lock.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_derived.cc:
Auto merged
sql/sql_select.cc:
will fix by hand
sql/table.h:
merge from 5.0
what it actually means (Monty approved the renaming)
- correcting description of transaction_alloc command-line options
(our manual is correct)
- fix for a failure of rpl_trigger.
mysql-test/t/rpl_misc_functions.test:
test was cleaning up only on slave, but it's also needed on master,
otherwise it influences rpl_trigger.test
sql/lock.cc:
clearer name
sql/mysqld.cc:
I checked the code that those two variables are not about binlogging
but about the size of the transaction's memroot which is used
to create savepoint structures and to store list of tables to be invalidated
(for NDB). The manual has a correct description, no need to fix it.
sql/sql_base.cc:
clearer name
sql/sql_derived.cc:
clearer name
sql/sql_select.cc:
clearer name
sql/table.h:
clearer name: TMP_TABLE is used for non-transactional tables.
into mysql.com:/home/my/mysql-5.1
Merge of 'remove compiler warnings when using -Wshadow'
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-MetaData.hpp~538342afcd8ac53c:
Auto merged
configure.in:
Auto merged
client/mysql.cc:
Auto merged
client/mysql_upgrade.c:
Auto merged
client/mysqlbinlog.cc:
Auto merged
client/mysqldump.c:
Auto merged
extra/yassl/include/yassl_int.hpp:
Auto merged
extra/yassl/taocrypt/include/algebra.hpp:
Auto merged
include/m_ctype.h:
Auto merged
include/my_global.h:
Auto merged
include/my_pthread.h:
Auto merged
include/my_sys.h:
Auto merged
include/my_time.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/mysqlbinlog.test:
Auto merged
mysql-test/t/mysqlcheck.test:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/wait_timeout.test:
Auto merged
mysys/default.c:
Auto merged
mysys/mf_iocache2.c:
Auto merged
mysys/mf_keycache.c:
Auto merged
server-tools/instance-manager/instance_options.cc:
Auto merged
sql/filesort.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_geofunc.cc:
Auto merged
sql/item_row.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_subselect.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/net_serv.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/opt_range.h:
Auto merged
sql/password.c:
Auto merged
sql/protocol.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/spatial.h:
Auto merged
sql/sql_cache.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_derived.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql-common/client.c:
Auto merged
sql-common/my_time.c:
Auto merged
sql/sql_string.cc:
Auto merged
sql/sql_string.h:
Auto merged
sql/sql_trigger.h:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/tztime.cc:
Auto merged
storage/archive/ha_archive.h:
Auto merged
storage/heap/hp_write.c:
Auto merged
storage/myisam/ft_boolean_search.c:
Auto merged
storage/myisam/mi_open.c:
Auto merged
storage/myisam/mi_search.c:
Auto merged
storage/myisam/mi_unique.c:
Auto merged
storage/myisam/myisampack.c:
Auto merged
storage/myisam/rt_index.c:
Auto merged
storage/myisam/sort.c:
Auto merged
storage/ndb/include/kernel/signaldata/ArbitSignalData.hpp:
Auto merged
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbReceiver.hpp:
Auto merged
storage/ndb/include/transporter/TransporterDefinitions.hpp:
Auto merged
storage/ndb/include/util/OutputStream.hpp:
Auto merged
storage/ndb/include/util/SimpleProperties.hpp:
Auto merged
storage/ndb/include/util/SocketAuthenticator.hpp:
Auto merged
storage/ndb/include/util/SocketServer.hpp:
Auto merged
storage/ndb/src/common/portlib/NdbTick.c:
Auto merged
storage/ndb/src/common/transporter/SHM_Transporter.cpp:
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/TransporterRegistry.cpp:
Auto merged
storage/ndb/src/common/util/File.cpp:
Auto merged
storage/ndb/src/common/util/Properties.cpp:
Auto merged
storage/ndb/src/common/util/SocketClient.cpp:
Auto merged
storage/ndb/src/common/util/random.c:
Auto merged
storage/ndb/src/common/util/socket_io.cpp:
Auto merged
storage/ndb/src/cw/cpcd/APIService.cpp:
Auto merged
storage/ndb/src/cw/cpcd/main.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
storage/ndb/src/mgmapi/LocalConfig.cpp:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
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/MgmtSrvr.hpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
storage/ndb/src/mgmsrv/main.cpp:
Auto merged
storage/ndb/src/ndbapi/ClusterMgr.hpp:
Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbIndexOperation.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbOperationExec.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbOperationSearch.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanFilter.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
storage/ndb/src/ndbapi/SignalSender.cpp:
Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.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/restore/Restore.hpp:
Auto merged
storage/ndb/tools/restore/consumer.hpp:
Auto merged
storage/ndb/tools/select_all.cpp:
Auto merged
storage/ndb/tools/select_count.cpp:
Auto merged
strings/ctype-bin.c:
Auto merged
strings/ctype-cp932.c:
Auto merged
strings/ctype-eucjpms.c:
Auto merged
strings/ctype-mb.c:
Auto merged
strings/ctype-simple.c:
Auto merged
strings/ctype-sjis.c:
Auto merged
strings/ctype-ujis.c:
Auto merged
strings/ctype-utf8.c:
Auto merged
strings/decimal.c:
Auto merged
BUILD/SETUP.sh:
manual merge
BUILD/compile-pentium-gcov:
manual merge
Makefile.am:
manual merge
client/mysqltest.c:
Automatic merge
include/mysql.h:
manual merge
libmysqld/lib_sql.cc:
Automatic merge
mysql-test/r/mysqlbinlog.result:
Automatic merge
mysql-test/r/mysqlcheck.result:
Fixed test case (we should never drop 'test' database)
mysys/my_bitmap.c:
manual merge
server-tools/instance-manager/commands.h:
manual merge
server-tools/instance-manager/guardian.cc:
manual merge
server-tools/instance-manager/mysql_connection.cc:
manual merge
server-tools/instance-manager/options.cc:
manual merge
server-tools/instance-manager/options.h:
manual merge
server-tools/instance-manager/parse.cc:
Automatic merge
server-tools/instance-manager/user_map.cc:
manual merge
server-tools/instance-manager/user_map.h:
manual merge
sql/field.cc:
manual merge
sql/field.h:
manual merge
sql/ha_ndbcluster.cc:
manual merge
sql/handler.cc:
manual merge
sql/item.cc:
manual merge
sql/item.h:
Automatic merge
sql/log.cc:
manual merge
sql/log_event.cc:
manual merge
sql/mysqld.cc:
manual merge
sql/slave.cc:
manual merge
sql/spatial.cc:
Automatic merge
sql/sql_class.h:
manual merge
sql/sql_insert.cc:
manual merge
sql/sql_parse.cc:
manual merge
sql/sql_select.cc:
manual merge
sql/sql_show.cc:
manual merge
sql/sql_table.cc:
manual merge
sql/sql_trigger.cc:
manual merge
sql/sql_view.cc:
manual merge
sql/sql_yacc.yy:
manual merge
Made setting thd and lex uniform
sql/table.cc:
manual merge
sql/unireg.cc:
manual merge
storage/archive/ha_archive.cc:
manual merge
storage/federated/ha_federated.cc:
manual merge
storage/heap/ha_heap.cc:
manual merge
storage/myisam/ha_myisam.cc:
manual merge
storage/myisammrg/ha_myisammrg.cc:
manual merge
storage/ndb/include/util/InputStream.hpp:
manual merge
storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp:
manual merge
storage/ndb/src/common/util/Bitmask.cpp:
manual merge
storage/ndb/src/common/util/ConfigValues.cpp:
Automatic merge
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
manual merge
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
manual merge
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
manual merge
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
manual merge
Changed commented code to be #ifdef-ed instead
storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
manual merge
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
Automatic merge
storage/ndb/src/kernel/blocks/suma/Suma.hpp:
manual merge
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Automatic merge
storage/ndb/src/ndbapi/NdbBlob.cpp:
Automatic merge
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Automatic merge
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
manual merge
storage/ndb/tools/restore/restore_main.cpp:
manual merge
tests/mysql_client_test.c:
manual merge
into mysql.com:/home/my/mysql-5.0
BitKeeper/etc/ignore:
added mysql-test/mysql-test-run-shell
client/mysql.cc:
Auto merged
client/mysql_upgrade.c:
Auto merged
client/mysqlbinlog.cc:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
client/sql_string.cc:
Auto merged
client/sql_string.h:
Auto merged
extra/my_print_defaults.c:
Auto merged
include/m_ctype.h:
Auto merged
include/my_pthread.h:
Auto merged
include/my_sys.h:
Auto merged
include/my_time.h:
Auto merged
include/mysql.h:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
myisam/ft_boolean_search.c:
Auto merged
myisam/mi_open.c:
Auto merged
myisam/mi_search.c:
Auto merged
myisam/mi_unique.c:
Auto merged
myisam/myisampack.c:
Auto merged
myisam/rt_index.c:
Auto merged
myisam/sort.c:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysys/default.c:
Auto merged
mysys/mf_iocache2.c:
Auto merged
mysys/mf_keycache.c:
Auto merged
mysys/my_bitmap.c:
Auto merged
mysys/sha1.c:
Auto merged
ndb/include/kernel/signaldata/ArbitSignalData.hpp:
Auto merged
ndb/include/kernel/signaldata/DictTabInfo.hpp:
Auto merged
ndb/include/ndbapi/NdbReceiver.hpp:
Auto merged
ndb/include/transporter/TransporterDefinitions.hpp:
Auto merged
ndb/include/util/InputStream.hpp:
Auto merged
ndb/include/util/OutputStream.hpp:
Auto merged
ndb/include/util/SimpleProperties.hpp:
Auto merged
ndb/include/util/SocketAuthenticator.hpp:
Auto merged
ndb/include/util/SocketServer.hpp:
Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
ndb/src/common/portlib/NdbTick.c:
Auto merged
ndb/src/common/transporter/SHM_Transporter.cpp:
Auto merged
ndb/src/common/transporter/TCP_Transporter.cpp:
Auto merged
ndb/src/common/transporter/TCP_Transporter.hpp:
Auto merged
ndb/src/common/transporter/Transporter.cpp:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/common/util/Bitmask.cpp:
Auto merged
ndb/src/common/util/ConfigValues.cpp:
Auto merged
ndb/src/common/util/File.cpp:
Auto merged
ndb/src/common/util/Properties.cpp:
Auto merged
ndb/src/common/util/SocketClient.cpp:
Auto merged
ndb/src/common/util/random.c:
Auto merged
ndb/src/common/util/socket_io.cpp:
Auto merged
ndb/src/cw/cpcd/APIService.cpp:
Auto merged
ndb/src/cw/cpcd/main.cpp:
Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Auto merged
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Auto merged
ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp:
Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp:
Auto merged
ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp:
Auto merged
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
ndb/src/kernel/blocks/suma/Suma.cpp:
Auto merged
ndb/src/kernel/blocks/suma/Suma.hpp:
Auto merged
ndb/src/kernel/vm/MetaData.hpp:
Auto merged
ndb/src/mgmapi/LocalConfig.cpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.hpp:
Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
ndb/src/ndbapi/ClusterMgr.hpp:
Auto merged
ndb/src/ndbapi/Ndb.cpp:
Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/NdbIndexOperation.cpp:
Auto merged
ndb/src/ndbapi/NdbOperationDefine.cpp:
Auto merged
ndb/src/ndbapi/NdbOperationExec.cpp:
Auto merged
ndb/src/ndbapi/NdbOperationSearch.cpp:
Auto merged
ndb/src/ndbapi/NdbScanFilter.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
ndb/src/ndbapi/SignalSender.cpp:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
ndb/tools/delete_all.cpp:
Auto merged
ndb/tools/desc.cpp:
Auto merged
ndb/tools/drop_index.cpp:
Auto merged
ndb/tools/drop_tab.cpp:
Auto merged
ndb/tools/listTables.cpp:
Auto merged
ndb/tools/ndb_config.cpp:
Auto merged
ndb/tools/restore/Restore.hpp:
Auto merged
ndb/tools/restore/consumer.hpp:
Auto merged
ndb/tools/restore/restore_main.cpp:
Auto merged
ndb/tools/select_all.cpp:
Auto merged
ndb/tools/select_count.cpp:
Auto merged
server-tools/instance-manager/commands.h:
Auto merged
server-tools/instance-manager/guardian.cc:
Auto merged
server-tools/instance-manager/instance_options.cc:
Auto merged
server-tools/instance-manager/mysql_connection.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/user_map.cc:
Auto merged
server-tools/instance-manager/user_map.h:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/filesort.cc:
Auto merged
sql/ha_archive.cc:
Auto merged
sql/ha_archive.h:
Auto merged
sql/ha_federated.cc:
Auto merged
sql/ha_heap.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_geofunc.cc:
Auto merged
sql/item_row.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_subselect.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
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/password.c:
Auto merged
sql/protocol.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/sp.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_cache.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_derived.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql-common/client.c:
Auto merged
sql-common/my_time.c:
Auto merged
sql/sql_select.cc:
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_trigger.cc:
Auto merged
sql/sql_trigger.h:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql/tztime.cc:
Auto merged
sql/unireg.cc:
Auto merged
strings/ctype-bin.c:
Auto merged
strings/ctype-cp932.c:
Auto merged
strings/ctype-eucjpms.c:
Auto merged
strings/ctype-mb.c:
Auto merged
strings/ctype-simple.c:
Auto merged
strings/ctype-sjis.c:
Auto merged
strings/ctype-uca.c:
Auto merged
strings/ctype-ujis.c:
Auto merged
strings/ctype-utf8.c:
Auto merged
strings/decimal.c:
Auto merged
strings/my_vsnprintf.c:
Auto merged
tests/mysql_client_test.c:
Auto merged
mysql-test/t/mysqlbinlog.test:
Manual merge
sql/sql_class.h:
Manual merge
sql/sql_parse.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
- Removed not used variables and functions
- Added #ifdef around code that is not used
- Renamed variables and functions to avoid conflicts
- Removed some not used arguments
Fixed some class/struct warnings in ndb
Added define IS_LONGDATA() to simplify code in libmysql.c
I did run gcov on the changes and added 'purecov' comments on almost all lines that was not just variable name changes
BUILD/SETUP.sh:
Added printing of unused functions and variables.
Made it easy to test compiling with -Wshadow
BUILD/compile-pentium-gcov:
Added warnings
Mark binary with -gcov
client/mysql.cc:
Fixed warnings found with gcc -Wshadow
client/mysql_upgrade.c:
Fixed warnings found with gcc -Wshadow
client/mysqlbinlog.cc:
Fixed warnings found with gcc -Wshadow
client/mysqldump.c:
Fixed warnings found with gcc -Wshadow
client/mysqltest.c:
Fixed warnings found with gcc -Wshadow
client/sql_string.cc:
Fixed warnings found with gcc -Wshadow
Merged with sql/sql_string.cc
client/sql_string.h:
Fixed warnings found with gcc -Wshadow
Merged with sql/sql_string.h
cmd-line-utils/readline/display.c:
Fixed compiler warning
cmd-line-utils/readline/histexpand.c:
Fixed warnings found with gcc -Wshadow
cmd-line-utils/readline/input.c:
Fixed warnings found with gcc -Wshadow
cmd-line-utils/readline/text.c:
Fixed warnings found with gcc -Wshadow
cmd-line-utils/readline/vi_mode.c:
Fixed warnings found with gcc -Wshadow
dbug/dbug_analyze.c:
Fixed warnings found with gcc -Wshadow
extra/my_print_defaults.c:
Prefixed defaults_extra_file and defaults_group_suffix with 'my' to avoid conflicts with similar named local variables
extra/yassl/include/buffer.hpp:
Fixed compiler warnings
extra/yassl/include/crypto_wrapper.hpp:
Fixed compiler warnings
extra/yassl/include/yassl_imp.hpp:
Fixed compiler warnings
extra/yassl/include/yassl_int.hpp:
Fixed compiler warnings
extra/yassl/src/crypto_wrapper.cpp:
Fixed compiler warnings
extra/yassl/taocrypt/benchmark/benchmark.cpp:
Fixed warnings found with gcc -Wshadow
extra/yassl/taocrypt/include/algebra.hpp:
Fixed compiler warnings
extra/yassl/taocrypt/include/des.hpp:
Fixed compiler warnings
extra/yassl/taocrypt/include/hash.hpp:
Fixed compiler warnings
extra/yassl/taocrypt/include/hmac.hpp:
Fixed compiler warnings
extra/yassl/taocrypt/include/modarith.hpp:
Fixed compiler warnings
extra/yassl/taocrypt/include/modes.hpp:
Fixed compiler warnings
extra/yassl/taocrypt/include/rsa.hpp:
Fixed compiler warnings
extra/yassl/taocrypt/mySTL/list.hpp:
Fixed compiler warnings
extra/yassl/taocrypt/src/aes.cpp:
Fixed compiler warnings
extra/yassl/taocrypt/src/algebra.cpp:
Fixed compiler warnings
extra/yassl/taocrypt/src/asn.cpp:
Fixed compiler warnings
extra/yassl/taocrypt/test/test.cpp:
Fixed compiler warnings
extra/yassl/testsuite/testsuite.cpp:
Fixed compiler warnings
include/m_ctype.h:
Fixed warnings found with gcc -Wshadow
include/my_pthread.h:
Fixed warnings found with gcc -Wshadow
include/my_sys.h:
Fixed warnings found with gcc -Wshadow
include/my_time.h:
Fixed warnings found with gcc -Wshadow
include/mysql.h:
Fixed warnings found with gcc -Wshadow
Added define IS_LONGDATA() to simplify code in libmysql.c
libmysql/libmysql.c:
Fixed warnings found with gcc -Wshadow
(Mostly replaced bind -> my_bind and time -> my_time)
libmysqld/lib_sql.cc:
Removed not used variables and labels
myisam/ft_boolean_search.c:
Fixed warnings found with gcc -Wshadow
myisam/mi_open.c:
Fixed warnings found with gcc -Wshadow
myisam/mi_search.c:
Fixed warnings found with gcc -Wshadow
myisam/mi_unique.c:
Fixed compiler warning
myisam/myisampack.c:
Fixed warnings found with gcc -Wshadow
myisam/rt_index.c:
Remove not used variables
myisam/sort.c:
Fixed warnings found with gcc -Wshadow
mysql-test/r/mysqlcheck.result:
Remove databases and tables possible left by previous test
mysql-test/r/mysqltest.result:
New test results
mysql-test/t/mysql.test:
Coverage tests
mysql-test/t/mysqlbinlog.test:
Coverage tests
mysql-test/t/mysqlcheck.test:
Remove databases and tables possible left by previous test
mysql-test/t/mysqltest.test:
Coverage tests
mysys/default.c:
Prefixed defaults_file, defaults_group_suffix and defaults_extra_file with 'my' to avoid conflicts with local variables in some functions
mysys/mf_iocache2.c:
Fixed warnings found with gcc -Wshadow
mysys/mf_keycache.c:
Fixed warnings found with gcc -Wshadow
mysys/my_bitmap.c:
Fixed warnings found with gcc -Wshadow
mysys/sha1.c:
Fixed warnings found with gcc -Wshadow
ndb/include/kernel/signaldata/ArbitSignalData.hpp:
Fixed compiler warning
ndb/include/kernel/signaldata/DictTabInfo.hpp:
Fixed compiler warnings
ndb/include/ndbapi/NdbReceiver.hpp:
Fixed warnings found with gcc -Wshadow
ndb/include/transporter/TransporterDefinitions.hpp:
Fixed compiler warning
ndb/include/util/InputStream.hpp:
Fixed compiler warning
ndb/include/util/OutputStream.hpp:
Fixed compiler warning
ndb/include/util/SimpleProperties.hpp:
Fixed compiler warning
ndb/include/util/SocketAuthenticator.hpp:
Fixed compiler warning
ndb/include/util/SocketServer.hpp:
Fixed compiler warning
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Fixed warnings found with gcc -Wshadow
ndb/src/common/portlib/NdbTick.c:
Fixed warnings found with gcc -Wshadow
ndb/src/common/transporter/SHM_Transporter.cpp:
Fixed warnings found with gcc -Wshadow
ndb/src/common/transporter/TCP_Transporter.cpp:
Fixed warnings found with gcc -Wshadow
ndb/src/common/transporter/TCP_Transporter.hpp:
Fixed compiler warning
ndb/src/common/transporter/Transporter.cpp:
Removed not used variable
ndb/src/common/transporter/TransporterRegistry.cpp:
Removed not used variable
ndb/src/common/util/Bitmask.cpp:
Moved function to avoid warnings of not used function
ndb/src/common/util/ConfigValues.cpp:
Fixed warnings found with gcc -Wshadow
ndb/src/common/util/File.cpp:
Fixed warnings found with gcc -Wshadow
ndb/src/common/util/Properties.cpp:
Fixed warnings found with gcc -Wshadow
ndb/src/common/util/SocketClient.cpp:
Fixed wrong return value
ndb/src/common/util/random.c:
Fixed warnings found with gcc -Wshadow
ndb/src/common/util/socket_io.cpp:
Fixed warnings found with gcc -Wshadow
ndb/src/cw/cpcd/APIService.cpp:
Removed not used variable
ndb/src/cw/cpcd/main.cpp:
Removed not used variables
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Fixed compiler warnings
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Removed not used variables
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Fixed compiler warnings
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Fixed compiler warnings
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Fixed compiler warnings
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Removed not used variables
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Fixed compiler warnings
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Fixed compiler warnings
ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
Removed not used variable
ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp:
Removed not used variables
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
Removed not used variables
ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp:
Removed not used variables
ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
Fixed compiler warnings
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Removed not used variables
ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp:
Fixed compiler warnings
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
Fixed compiler warnings
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Removed not used variables
ndb/src/kernel/blocks/suma/Suma.cpp:
Removed not used variables
ndb/src/kernel/blocks/suma/Suma.hpp:
Fixed compiler warnings
ndb/src/kernel/vm/MetaData.hpp:
Fixed compiler warnings
ndb/src/mgmapi/LocalConfig.cpp:
Fixed warnings found with gcc -Wshadow
ndb/src/mgmapi/mgmapi.cpp:
Fixed warnings found with gcc -Wshadow
ndb/src/mgmclient/CommandInterpreter.cpp:
Removed not used variables
ndb/src/mgmsrv/ConfigInfo.cpp:
Fixed warnings found with gcc -Wshadow
Removed not used variables
ndb/src/mgmsrv/ConfigInfo.hpp:
Fixed warnings found with gcc -Wshadow
ndb/src/mgmsrv/InitConfigFileParser.cpp:
Prefixed defaults_file, defaults_group_suffix and defaults_extra_file with 'my' to avoid conflicts with local variables in some functions
ndb/src/mgmsrv/MgmtSrvr.cpp:
Removed not used variables and functions
ndb/src/mgmsrv/MgmtSrvr.hpp:
Fixed compiler warnings
ndb/src/mgmsrv/Services.cpp:
Removed not used variables and functions
ndb/src/mgmsrv/main.cpp:
Removed not used variable
ndb/src/ndbapi/ClusterMgr.hpp:
Fixed compiler warnings
ndb/src/ndbapi/Ndb.cpp:
Removed not used variables
ndb/src/ndbapi/NdbBlob.cpp:
Removed not used variables
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Removed not used variables
ndb/src/ndbapi/NdbIndexOperation.cpp:
Removed not used variables
ndb/src/ndbapi/NdbOperationDefine.cpp:
Removed not used variables
ndb/src/ndbapi/NdbOperationExec.cpp:
Removed not used variables
ndb/src/ndbapi/NdbOperationSearch.cpp:
Removed not used variables
ndb/src/ndbapi/NdbScanFilter.cpp:
Fixed compiler warning
ndb/src/ndbapi/NdbScanOperation.cpp:
Removed not used variables
ndb/src/ndbapi/SignalSender.cpp:
Removed not used variables
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Removed not used variable
ndb/tools/delete_all.cpp:
Removed not used variable
ndb/tools/desc.cpp:
Removed not used variable
ndb/tools/drop_index.cpp:
Removed not used variable
ndb/tools/drop_tab.cpp:
Removed not used variable
ndb/tools/listTables.cpp:
Removed not used variable
ndb/tools/ndb_config.cpp:
Fixed warnings found with gcc -Wshadow
Added missing puts(desc)
ndb/tools/restore/Restore.hpp:
Changed delimiter to define instead of static variable, as the static variable caused a LOT of compiler warnings
Fixed compiler warning
ndb/tools/restore/consumer.hpp:
Fixed compiler warning
ndb/tools/restore/restore_main.cpp:
Fixed compiler warnings
ndb/tools/select_all.cpp:
Removed not used variables
ndb/tools/select_count.cpp:
Removed not used variable
server-tools/instance-manager/commands.h:
Fixed compiler warnings
server-tools/instance-manager/guardian.cc:
Fixed compiler warnings
server-tools/instance-manager/instance_options.cc:
Removed not used variables
server-tools/instance-manager/mysql_connection.cc:
Fixed compiler warnings
server-tools/instance-manager/options.cc:
Fixed compiler warnings
server-tools/instance-manager/options.h:
Fixed compiler warnings
server-tools/instance-manager/parse.cc:
Removed not used variable
server-tools/instance-manager/user_map.cc:
Fixed compiler warnings
server-tools/instance-manager/user_map.h:
Fixed compiler warnings
sql/field.cc:
Fixed compiler warnings
sql/field.h:
Fixed compiler warnings
sql/filesort.cc:
Fixed compiler warnings
sql/ha_archive.cc:
Removed table and share arguments from get_share() / free_share() to get rid of compiler warnings
sql/ha_archive.h:
Removed table and share arguments from get_share() / free_share() to get rid of compiler warnings
sql/ha_federated.cc:
Fixed compiler warnings
sql/ha_heap.cc:
Fixed compiler warnings
sql/ha_myisam.cc:
Fixed compiler warnings
sql/ha_myisammrg.cc:
Fixed compiler warnings
sql/ha_ndbcluster.cc:
Fixed compiler warnings
sql/handler.cc:
Fixed compiler warnings
sql/item.cc:
Fixed compiler warnings
sql/item.h:
Fixed compiler warnings
new_item() -> clone_item(), to avoid a lot of warnings with variable 'new_item'
el() -> element_index()
sql/item_cmpfunc.cc:
Fixed compiler warnings
sql/item_cmpfunc.h:
Fixed compiler warnings
sql/item_func.cc:
Fixed compiler warnings
sql/item_geofunc.cc:
Fixed compiler warnings
sql/item_row.h:
Fixed compiler warnings
sql/item_strfunc.cc:
Fixed compiler warnings
sql/item_subselect.cc:
Fixed compiler warnings
sql/item_subselect.h:
Fixed compiler warnings
sql/item_sum.cc:
Fixed compiler warnings
sql/item_timefunc.cc:
Fixed compiler warnings
sql/log.cc:
Fixed compiler warnings
More comments
Added #ifdef HAVE_REPLICATION
sql/log_event.cc:
Fixed compiler warnings
sql/log_event.h:
Fixed compiler warnings
sql/mysql_priv.h:
query_id -> global_query_id, to avoid a lot of clashes with function and class variables
start_time -> server_start_time
sql/mysqld.cc:
Fixed compiler warnings:
- Removed not used variables
- Added #ifndef EMBEDDED_LIBRARY
- Fixed shadow warnings
sql/net_serv.cc:
Fixed compiler warnings
sql/opt_range.cc:
range -> last_range to avoid shadow warnings
Removed not used function print_rowid()
sql/opt_range.h:
range -> last_range to avoid shadow warnings
sql/password.c:
Fixed compiler warnings
sql/protocol.cc:
Fixed compiler warnings
sql/repl_failsafe.cc:
Fixed compiler warnings
sql/set_var.cc:
Fixed compiler warnings
sql/set_var.h:
type() -> show_type()
Fixed compiler warnings
sql/slave.cc:
Fixed compiler warnings
sql/sp_head.cc:
Fixed compiler warnings
sql/sp_head.h:
Fixed compiler warnings
sql/spatial.cc:
Fixed compiler warnings
sql/spatial.h:
length() -> geom_length() to avoid compiler warnings
wkb_end -> wkb_last to avoid compiler warnings with local variables named 'wkb_end'
sql/sql_cache.h:
Fixed compiler warnings
sql/sql_class.cc:
Fixed compiler warnings
sql/sql_class.h:
log -> log_xid() to avoid compiler warnings
Fixed shadow compiler warnings
sql/sql_derived.cc:
Removed not used variable
sql/sql_insert.cc:
Fixed compiler warnings
sql/sql_lex.cc:
Fixed compiler warnings
sql/sql_lex.h:
res -> saved_error to make the meaning of the variable clear and avoid shadow warnings
sql/sql_load.cc:
Fixed compiler warnings
sql/sql_parse.cc:
Fixed compiler warnings
sql/sql_prepare.cc:
Fixed compiler warnings
sql/sql_select.cc:
Fixed compiler warnings
sql/sql_show.cc:
Fixed compiler warnings
sql/sql_string.cc:
Fixed compiler warnings
sql/sql_string.h:
Fixed compiler warnings
sql/sql_table.cc:
Fixed compiler warnings
sql/sql_trigger.cc:
Fixed compiler warnings
sql/sql_trigger.h:
table -> trigger_table to avoid warnings from local variables
sql/sql_union.cc:
Fixed compiler warnings
(mainly res -> saved_error)
sql-common/client.c:
Removed not used variable
sql-common/my_time.c:
Removed not used variable
time -> my_time
sql/sql_update.cc:
Removed not used variable
sql/sql_view.cc:
Removed not used variable
sql/sql_yacc.yy:
Removed not used variable
sql/table.cc:
Removed not used variable
sql/tztime.cc:
Removed not used variable
sql/unireg.cc:
Removed not used variable
strings/ctype-bin.c:
mblen -> mb_len to avoid compiler warnings with local variable mblen
strings/ctype-cp932.c:
Fixed compiler warnings
strings/ctype-eucjpms.c:
Fixed compiler warnings
strings/ctype-mb.c:
mblen -> mb_len to avoid compiler warnings with local variable mblen
strings/ctype-simple.c:
mblen -> mb_len to avoid compiler warnings with local variable mblen
exp -> exponent
strings/ctype-sjis.c:
Fixed compiler warnings
strings/ctype-uca.c:
mblen -> mb_len to avoid compiler warnings with local variable mblen
strings/ctype-ujis.c:
Fixed compiler warnings
strings/ctype-utf8.c:
Fixed compiler warnings
strings/decimal.c:
Fixed compiler warnings
strings/my_vsnprintf.c:
Added comment
strings/strtod.c:
Fixed compiler warnings
tests/mysql_client_test.c:
Fixed compiler warnings
(Biggest part of patch is to not get a conflict with global function 'bind')
The table opening process now works the following way:
- Create common TABLE_SHARE object
- Read the .frm file and unpack it into the TABLE_SHARE object
- Create a TABLE object based on the information in the TABLE_SHARE
object and open a handler to the table object
Other noteworthy changes:
- In TABLE_SHARE the most common strings are now LEX_STRING's
- Better error message when table is not found
- Variable table_cache is now renamed 'table_open_cache'
- New variable 'table_definition_cache' that is the number of table defintions that will be cached
- strxnmov() calls are now fixed to avoid overflows
- strxnmov() will now always add one end \0 to result
- engine objects are now created with a TABLE_SHARE object instead of a TABLE object.
- After creating a field object one must call field->init(table) before using it
- For a busy system this change will give you:
- Less memory usage for table object
- Faster opening of tables (if it's has been in use or is in table definition cache)
- Allow you to cache many table definitions objects
- Faster drop of table
mysql-test/mysql-test-run.sh:
Fixed some problems with --gdb option
Test both with socket and tcp/ip port that all old servers are killed
mysql-test/r/flush_table.result:
More tests with lock table with 2 threads + flush table
mysql-test/r/information_schema.result:
Removed old (now wrong) result
mysql-test/r/innodb.result:
Better error messages (thanks to TDC patch)
mysql-test/r/merge.result:
Extra flush table test
mysql-test/r/ndb_bitfield.result:
Better error messages (thanks to TDC patch)
mysql-test/r/ndb_partition_error.result:
Better error messages (thanks to TDC patch)
mysql-test/r/query_cache.result:
Remove tables left from old tests
mysql-test/r/temp_table.result:
Test truncate with temporary tables
mysql-test/r/variables.result:
Table_cache -> Table_open_cache
mysql-test/t/flush_table.test:
More tests with lock table with 2 threads + flush table
mysql-test/t/merge.test:
Extra flush table test
mysql-test/t/multi_update.test:
Added 'sleep' to make test predictable
mysql-test/t/query_cache.test:
Remove tables left from old tests
mysql-test/t/temp_table.test:
Test truncate with temporary tables
mysql-test/t/variables.test:
Table_cache -> Table_open_cache
mysql-test/valgrind.supp:
Remove warning that may happens becasue threads dies in different order
mysys/hash.c:
Fixed wrong DBUG_PRINT
mysys/mf_dirname.c:
More DBUG
mysys/mf_pack.c:
Better comment
mysys/mf_tempdir.c:
More DBUG
Ensure that we call cleanup_dirname() on all temporary directory paths.
If we don't do this, we will get a failure when comparing temporary table
names as in some cases the temporary table name is run through convert_dirname())
mysys/my_alloc.c:
Indentation fix
sql/examples/ha_example.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/examples/ha_example.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/examples/ha_tina.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/examples/ha_tina.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/field.cc:
Update for table definition cache:
- Field creation now takes TABLE_SHARE instead of TABLE as argument
(This is becasue field definitions are now cached in TABLE_SHARE)
When a field is created, one now must call field->init(TABLE) before using it
- Use s->db instead of s->table_cache_key
- Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE
- make_field() takes TABLE_SHARE as argument instead of TABLE
- move_field() -> move_field_offset()
sql/field.h:
Update for table definition cache:
- Field creation now takes TABLE_SHARE instead of TABLE as argument
(This is becasue field definitions are now cached in TABLE_SHARE)
When a field is created, one now must call field->init(TABLE) before using it
- Added Field::clone() to create a field in TABLE from a field in TABLE_SHARE
- make_field() takes TABLE_SHARE as argument instead of TABLE
- move_field() -> move_field_offset()
sql/ha_archive.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_archive.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_berkeley.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Changed name of argument create() to not hide internal 'table' variable.
table->s -> table_share
sql/ha_berkeley.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_blackhole.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_blackhole.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_federated.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Fixed comments
Remove index variable and replace with pointers (simple optimization)
move_field() -> move_field_offset()
Removed some strlen() calls
sql/ha_federated.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_heap.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Simplify delete_table() and create() as the given file names are now without extension
sql/ha_heap.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_innodb.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_innodb.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_myisam.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Remove not needed fn_format()
Fixed for new table->s structure
sql/ha_myisam.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_myisammrg.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Don't set 'is_view' for MERGE tables
Use new interface to find_temporary_table()
sql/ha_myisammrg.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Added flag HA_NO_COPY_ON_ALTER
sql/ha_ndbcluster.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Fixed wrong calls to strxnmov()
Give error HA_ERR_TABLE_DEF_CHANGED if table definition has changed
drop_table -> intern_drop_table()
table->s -> table_share
Move part_info to TABLE
Fixed comments & DBUG print's
New arguments to print_error()
sql/ha_ndbcluster.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
sql/ha_partition.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
We can't set up or use part_info when creating handler as there is not yet any table object
New ha_intialise() to work with TDC (Done by Mikael)
sql/ha_partition.h:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
Got set_part_info() from Mikael
sql/handler.cc:
We new use TABLE_SHARE instead of TABLE when creating engine handlers
ha_delete_table() now also takes database as an argument
handler::ha_open() now takes TABLE as argument
ha_open() now calls ha_allocate_read_write_set()
Simplify ha_allocate_read_write_set()
Remove ha_deallocate_read_write_set()
Use table_share (Cached by table definition cache)
sql/handler.h:
New table flag: HA_NO_COPY_ON_ALTER (used by merge tables)
Remove ha_deallocate_read_write_set()
get_new_handler() now takes TABLE_SHARE as argument
ha_delete_table() now gets database as argument
sql/item.cc:
table_name and db are now LEX_STRING objects
When creating fields, we have now have to call field->init(table)
move_field -> move_field_offset()
sql/item.h:
tmp_table_field_from_field_type() now takes an extra paramenter 'fixed_length' to allow one to force usage of CHAR
instead of BLOB
sql/item_cmpfunc.cc:
Fixed call to tmp_table_field_from_field_type()
sql/item_create.cc:
Assert if new not handled cast type
sql/item_func.cc:
When creating fields, we have now have to call field->init(table)
dummy_table used by 'sp' now needs a TABLE_SHARE object
sql/item_subselect.cc:
Trivial code cleanups
sql/item_sum.cc:
When creating fields, we have now have to call field->init(table)
sql/item_timefunc.cc:
Item_func_str_to_date::tmp_table_field() now replaced by call to
tmp_table_field_from_field_type() (see item_timefunc.h)
sql/item_timefunc.h:
Simply tmp_table_field()
sql/item_uniq.cc:
When creating fields, we have now have to call field->init(table)
sql/key.cc:
Added 'KEY' argument to 'find_ref_key' to simplify code
sql/lock.cc:
More debugging
Use create_table_def_key() to create key for table cache
Allocate TABLE_SHARE properly when creating name lock
Fix that locked_table_name doesn't test same table twice
sql/mysql_priv.h:
New functions for table definition cache
New interfaces to a lot of functions.
New faster interface to find_temporary_table() and close_temporary_table()
sql/mysqld.cc:
Added support for table definition cache of size 'table_def_size'
Fixed som calls to strnmov()
Changed name of 'table_cache' to 'table_open_cache'
sql/opt_range.cc:
Use new interfaces
Fixed warnings from valgrind
sql/parse_file.cc:
Safer calls to strxnmov()
Fixed typo
sql/set_var.cc:
Added variable 'table_definition_cache'
Variable table_cache renamed to 'table_open_cache'
sql/slave.cc:
Use new interface
sql/sp.cc:
Proper use of TABLE_SHARE
sql/sp_head.cc:
Remove compiler warnings
We have now to call field->init(table)
sql/sp_head.h:
Pointers to parsed strings are now const
sql/sql_acl.cc:
table_name is now a LEX_STRING
sql/sql_base.cc:
Main implementation of table definition cache
(The #ifdef's are there for the future when table definition cache will replace open table cache)
Now table definitions are cached indepndent of open tables, which will speed up things when a table is in use at once from several places
Views are not yet cached; For the moment we only cache if a table is a view or not.
Faster implementation of find_temorary_table()
Replace 'wait_for_refresh()' with the more general function 'wait_for_condition()'
Drop table is slightly faster as we can use the table definition cache to know the type of the table
sql/sql_cache.cc:
table_cache_key and table_name are now LEX_STRING
'sDBUG print fixes
sql/sql_class.cc:
table_cache_key is now a LEX_STRING
safer strxnmov()
sql/sql_class.h:
Added number of open table shares (table definitions)
sql/sql_db.cc:
safer strxnmov()
sql/sql_delete.cc:
Use new interface to find_temporary_table()
sql/sql_derived.cc:
table_name is now a LEX_STRING
sql/sql_handler.cc:
TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's
sql/sql_insert.cc:
TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's
sql/sql_lex.cc:
Make parsed string a const (to quickly find out if anything is trying to change the query string)
sql/sql_lex.h:
Make parsed string a const (to quickly find out if anything is trying to change the query string)
sql/sql_load.cc:
Safer strxnmov()
sql/sql_parse.cc:
Better error if wrong DB name
sql/sql_partition.cc:
part_info moved to TABLE from TABLE_SHARE
Indentation changes
sql/sql_select.cc:
Indentation fixes
Call field->init(TABLE) for new created fields
Update create_tmp_table() to use TABLE_SHARE properly
sql/sql_select.h:
Call field->init(TABLE) for new created fields
sql/sql_show.cc:
table_name is now a LEX_STRING
part_info moved to TABLE
sql/sql_table.cc:
Use table definition cache to speed up delete of tables
Fixed calls to functions with new interfaces
Don't use 'share_not_to_be_used'
Instead of doing openfrm() when doing repair, we now have to call
get_table_share() followed by open_table_from_share().
Replace some fn_format() with faster unpack_filename().
Safer strxnmov()
part_info is now in TABLE
Added Mikaels patch for partition and ALTER TABLE
Instead of using 'TABLE_SHARE->is_view' use 'table_flags() & HA_NO_COPY_ON_ALTER
sql/sql_test.cc:
table_name and table_cache_key are now LEX_STRING's
sql/sql_trigger.cc:
TABLE_SHARE->db and TABLE_SHARE->table_name are now LEX_STRING's
safer strxnmov()
Removed compiler warnings
sql/sql_update.cc:
Call field->init(TABLE) after field is created
sql/sql_view.cc:
safer strxnmov()
Create common TABLE_SHARE object for views to allow us to cache if table is a view
sql/structs.h:
Added SHOW_TABLE_DEFINITIONS
sql/table.cc:
Creation and destruct of TABLE_SHARE objects that are common for many TABLE objects
The table opening process now works the following way:
- Create common TABLE_SHARE object
- Read the .frm file and unpack it into the TABLE_SHARE object
- Create a TABLE object based on the information in the TABLE_SHARE
object and open a handler to the table object
open_table_def() is written in such a way that it should be trival to add parsing of the .frm files in new formats
sql/table.h:
TABLE objects for the same database table now share a common TABLE_SHARE object
In TABLE_SHARE the most common strings are now LEX_STRING's
sql/unireg.cc:
Changed arguments to rea_create_table() to have same order as other functions
Call field->init(table) for new created fields
sql/unireg.h:
Added OPEN_VIEW
strings/strxnmov.c:
Change strxnmov() to always add end \0
This makes usage of strxnmov() safer as most of MySQL code assumes that strxnmov() will create a null terminated string
mysql-test/r/information_schema.result:
error message changed
mysql-test/r/sp.result:
error message changed
mysql-test/r/sql_mode.result:
fixed test suite
mysql-test/r/view.result:
error message changed
mysql-test/r/view_grant.result:
test of underlying view tables check
mysql-test/t/sql_mode.test:
fixed test suite
mysql-test/t/view_grant.test:
test of underlying view tables check
sql/item.cc:
check of underlying tables privilege added
sql/item.h:
Name the resolution context points to the security context of view (if item belong to the view)
sql/item_func.cc:
a view error hiding for execution of prepared function belonged to a view
fixed checking privileges if stored functions belonds to some view
sql/mysql_priv.h:
refult of derived table processing functions changed to bool
Security_context added as an argument to find_field_in_table()
sql/share/errmsg.txt:
error message fixed
sql/sql_acl.cc:
Storing requested privileges of tables added
View underlying tables privilege check added
sql/sql_base.cc:
View underlying tables privilege check added
sql/sql_cache.cc:
Code cleunup: we should not register underlying tables of view second time
sql/sql_delete.cc:
ancestor -> merge_underlying_list renaming
sql/sql_derived.cc:
refult of derived table processing functions changed to bool
do not give SELECT_ACL for TEMPTABLE views
sql/sql_lex.h:
The comment added
sql/sql_parse.cc:
registration of requested privileges added
sql/sql_prepare.cc:
registration of requested privileges added
sql/sql_update.cc:
manipulation of requested privileges for underlying tables made the same as for table which we are updating
sql/sql_view.cc:
underlying tables of view security check support added
sql/table.cc:
renaming and fixing view preparation methods, methods for checking underlyoing tables security context added
sql/table.h:
storege for reuested privileges added
cursor is interpreted latin1 character and Bug#9819 "Cursors: Mysql Server
Crash while fetching from table with 5 million records."
A fix for a possible memory leak when fetching into an SP cursor
in a long loop.
The patch uses a common implementation of cursors in the binary protocol and
in stored procedures and implements materialized cursors.
For implementation details, see comments in sql_cursor.cc
include/my_sys.h:
- declaration for multi_alloc_root
libmysqld/Makefile.am:
- drop protocol_cursor.cc, add sql_cursor.cc (replaces the old
implementation of cursors with a new one)
mysql-test/r/ctype_ujis.result:
- test results fixed (a test case for Bug#6513)
mysql-test/r/sp-big.result:
- test results fixed (a test case for Bug#9819)
mysql-test/t/ctype_ujis.test:
Add a test case for Bug#6513 "Test Suite: Values inserted by using cursor is
interpreted latin1 character"
mysql-test/t/sp-big.test:
Add a restricted test case for Bug#9819 "Cursors: Mysql Server Crash
while fetching from table with 5 million records."
mysys/my_alloc.c:
- an implementation of multi_alloc_root; this is largely a copy-paste
from mulalloc.c, but the function is small and there is no easy way
to reuse the existing C function.
sql/Makefile.am:
- add sql_cursor.h, sql_cursor.cc (a new implementation of stored procedure
cursors) and drop protocol_cursor.cc (the old one)
sql/handler.cc:
- now TABLE object has its mem_root always initialized.
Adjust the implementation handler::ha_open
sql/item_subselect.cc:
- adjust to the changed declaration of st_select_lex_unit::prepare
sql/protocol.h:
- drop Protocol_cursor
sql/sp_head.cc:
- move juggling with Query_arena::free_list and Item::next to
sp_eval_func_item, as this is needed in 3 places already.
sql/sp_head.h:
- declare a no-op implementation for cleanup_stmt in sp_instr_cpush.
This method is needed for non-materializing cursors, which are yet not
used in stored procedures.
- declaration for sp_eval_func_item
sql/sp_rcontext.cc:
- reimplement sp_cursor using the new implementation of server side cursors.
- use sp_eval_func_item to assign values of SP variables from the
row fetched from a cursor. This should fix a possible memory leak in
the old implementation of sp_cursor::fetch
sql/sp_rcontext.h:
- reimplement sp_cursor using the new implementation of server side cursors.
sql/sql_class.cc:
- disable the functionality that closes transient cursors at commit/rollback;
transient cursors are not used in 5.0, instead we use materialized ones.
To be enabled in a later version.
sql/sql_class.h:
- adjust to the rename Cursor -> Server_side_cursor
- additional declarations of select_union used in materialized cursors
sql/sql_derived.cc:
- reuse bits of tmp table code in UNION, derived tables, and materialized
cursors
- cleanup comments
sql/sql_lex.h:
- declarations of auxiliary methods used by materialized cursors
- a cleanup in st_select_lex_unit interface
sql/sql_list.h:
- add an array operator new[] to class Sql_alloc
sql/sql_prepare.cc:
- split the tight coupling of cursors and prepared statements to reuse
the same implementation in stored procedures
- cleanups of error processing in Prepared_statement::{prepare,execute}
sql/sql_select.cc:
- move the implementation of sensitive (non-materializing) cursors to
sql_cursor.cc
- make temporary tables self-contained: the table, its record and fields
are allocated in TABLE::mem_root. This implementation is not clean
and resets thd->mem_root several times because of the way create_tmp_table
works (many additional things are done inside it).
- adjust to the changed declaration of st_select_lex_unit::prepare
sql/sql_select.h:
- move the declaration of sensitive (non-materializing) cursors to
sql_cursor.cc
sql/sql_union.cc:
- move pieces of st_select_unit::prepare to select_union and st_table
methods to be able to reuse code in the implementation of materialized
cursors
sql/sql_view.cc:
- adjust to the changed signature of st_select_lex_unit::prepare
sql/table.cc:
- implement auxiliary st_table methods for use with temporary tables
sql/table.h:
- add declarations for auxiliary methods of st_table used to work with
temporary tables
tests/mysql_client_test.c:
- if cursors are materialized, a parallel update of the table used
in the cursor may go through: update the test.
sql/sql_cursor.cc:
New BitKeeper file ``sql/sql_cursor.cc'' -- implementation of server side
cursors
sql/sql_cursor.h:
New BitKeeper file ``sql/sql_cursor.h'' - declarations for
server side cursors.
into mysql.com:/home/my/mysql-5.0
sql/ha_berkeley.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_derived.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_update.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/sql_class.cc:
Manual merge
Removed duplicate usage of TMP_TABLE_FORCE_MYISAM by making 'options' longlong
sql/ha_berkeley.cc:
Removed not used variable (and options)
sql/ha_berkeley.h:
Removed not used argument
sql/ha_ndbcluster.cc:
Remove compiler warning
sql/init.cc:
Simplify code
sql/item_sum.cc:
Removed duplicate usage of TMP_TABLE_FORCE_MYISAM by making 'options' longlong
sql/mysql_priv.h:
Removed duplicate usage of TMP_TABLE_FORCE_MYISAM by making 'options' longlong
sql/mysqld.cc:
Removed duplicate usage of TMP_TABLE_FORCE_MYISAM by making 'options' longlong
sql/sql_class.h:
Removed duplicate usage of TMP_TABLE_FORCE_MYISAM by making 'options' longlong
sql/sql_delete.cc:
Removed duplicate usage of TMP_TABLE_FORCE_MYISAM by making 'options' longlong
sql/sql_derived.cc:
Removed duplicate usage of TMP_TABLE_FORCE_MYISAM by making 'options' longlong
sql/sql_lex.h:
Removed duplicate usage of TMP_TABLE_FORCE_MYISAM by making 'options' longlong
sql/sql_parse.cc:
Indentation fixes
sql/sql_select.cc:
Removed duplicate usage of TMP_TABLE_FORCE_MYISAM by making 'options' longlong
sql/sql_select.h:
Removed duplicate usage of TMP_TABLE_FORCE_MYISAM by making 'options' longlong
sql/sql_show.cc:
Removed duplicate usage of TMP_TABLE_FORCE_MYISAM by making 'options' longlong
sql/sql_union.cc:
Removed duplicate usage of TMP_TABLE_FORCE_MYISAM by making 'options' longlong
sql/sql_update.cc:
Removed duplicate usage of TMP_TABLE_FORCE_MYISAM by making 'options' longlong
sql/sql_yacc.yy:
Changed variable name i to more descriptive name
Removed compiler warning
Column names weren't checked for uniqueness for subqueries.
Code for names uniqueness checking used for view creation moved into
separate function named check_duplicate_names(). It's called on
preparation of subqueries to check uniqueness of names. If duplicate names
are found then error is raised.
sql/sql_derived.cc:
Fix bug #11864 non unique names are allowed in subquery
Added check for names uniqueness in select list.
sql/sql_view.cc:
Fix bug #11864 non unique names are allowed in subquery
Code for checking uniqueness of names in item list moved into separate function to make in available for use from other places.
sql/sql_view.h:
Fix bug #11864 non unique names are allowed in subquery
Added check_duplicate_names() function prototype.
mysql-test/t/derived.test:
Fixed test case results after bug fix#11864
Added test case for bug#11864 non unique names are allowed in subquery.
mysql-test/t/select_safe.test:
Fixed test case results after bug fix#11864
mysql-test/r/derived.result:
Added test case for bug #11864 non unique names are allowed in subquery.
Fixed test case results after bug fix#11864
mysql-test/r/select_safe.result:
Fixed test case results after bug fix#11864
We're out of bits in st_select_lex->options so make TMP_TABLE_FORCE_MYISAM ==
OPTION_FOUND_COMMENT (the latter is not used by create_tmp_table).
mysql-test/r/create.result:
Updated the test result
mysql-test/r/fulltext_order_by.result:
Drop all tables this test uses
mysql-test/t/fulltext_order_by.test:
Drop all tables this test uses
include/my_bitmap.h:
new bitmap operation
mysql-test/r/view.result:
added warnings
Correct inserting data check (absence of default value) for view underlying tables (BUG#6443)
mysql-test/t/view.test:
Correct inserting data check (absence of default value) for view underlying tables (BUG#6443)
mysys/my_bitmap.c:
new bitmap operation
sql/field.h:
index of field in table added
sql/item.cc:
Name resolution context added
table list removed from fix_fields() arguments
sql/item.h:
Name resolution context added
table list removed from fix_fields() arguments
sql/item_cmpfunc.cc:
table list removed from fix_fields() arguments
sql/item_cmpfunc.h:
table list removed from fix_fields() arguments
sql/item_func.cc:
table list removed from fix_fields() arguments
sql/item_func.h:
table list removed from fix_fields() arguments
sql/item_row.cc:
table list removed from fix_fields() arguments
sql/item_row.h:
table list removed from fix_fields() arguments
sql/item_strfunc.cc:
fixed server crash on NULL argument
sql/item_strfunc.h:
table list removed from fix_fields() arguments
sql/item_subselect.cc:
table list removed from fix_fields() arguments
sql/item_subselect.h:
table list removed from fix_fields() arguments
sql/item_sum.cc:
table list removed from fix_fields() arguments
sql/item_sum.h:
table list removed from fix_fields() arguments
sql/item_timefunc.cc:
table list removed from fix_fields() arguments
sql/item_timefunc.h:
table list removed from fix_fields() arguments
sql/item_uniq.h:
table list removed from fix_fields() arguments
sql/log_event.cc:
Name resolution context added
sql/log_event.h:
Name resolution context added
sql/mysql_priv.h:
Name resolution context added
sql/set_var.cc:
table list removed from fix_fields() arguments
sql/share/errmsg.txt:
new error message
sql/sp.cc:
Name resolution context added
sql/sp_head.cc:
table list removed from fix_fields() arguments
sql/sp_head.h:
Name resolution context added
sql/sql_base.cc:
table list removed from fix_fields() arguments
Name resolution context added
sql/sql_class.cc:
renamed variable
sql/sql_delete.cc:
Name resolution context added
sql/sql_derived.cc:
Name resolution context added
sql/sql_do.cc:
table list removed from fix_fields() arguments
sql/sql_handler.cc:
Name resolution context added
sql/sql_help.cc:
Name resolution context added
sql/sql_insert.cc:
Name resolution context added
table list removed from fix_fields() arguments
sql/sql_lex.cc:
Name resolution context added
sql/sql_lex.h:
removed resolve mode (information stored into name resolution context)
sql/sql_load.cc:
table list removed from fix_fields() arguments
sql/sql_olap.cc:
Name resolution context added
sql/sql_parse.cc:
Name resolution context added
sql/sql_prepare.cc:
table list removed from fix_fields() arguments
sql/sql_select.cc:
table list removed from fix_fields() arguments
sql/sql_show.cc:
Name resolution context added
sql/sql_trigger.cc:
table list removed from fix_fields() arguments
sql/sql_udf.h:
table list removed from fix_fields() arguments
sql/sql_union.cc:
Name resolution context added
sql/sql_update.cc:
Name resolution context added
sql/sql_view.cc:
Name resolution context added
sql/sql_view.h:
table list removed from fix_fields() arguments
sql/sql_yacc.yy:
Name resolution context added
sql/table.cc:
Name resolution context added
merged view processing moved
sql/table.h:
merged view processing moved
error for LIMIT placeholder".
The patch adds grammar support for LIMIT ?, ? and changes the
type of ST_SELECT_LEX::select_limit,offset_limit from ha_rows to Item*,
so that it can point to Item_param.
mysql-test/include/ps_modify.inc:
Fix existing tests: now LIMIT can contain placeholders.
mysql-test/include/ps_query.inc:
Fix existing tests: now LIMIT can contain placeholders.
mysql-test/r/ps.result:
Add basic test coverage for LIMIT ?, ? and fix test results.
mysql-test/r/ps_2myisam.result:
Fix test results: now LIMIT can contain placeholders.
mysql-test/r/ps_3innodb.result:
Fix test results: now LIMIT can contain placeholders.
mysql-test/r/ps_4heap.result:
Fix test results: now LIMIT can contain placeholders.
mysql-test/r/ps_5merge.result:
Fix test results: now LIMIT can contain placeholders.
mysql-test/r/ps_6bdb.result:
Fix test results: now LIMIT can contain placeholders.
mysql-test/r/ps_7ndb.result:
Fix test results: now LIMIT can contain placeholders.
mysql-test/t/ps.test:
Add basic test coverage for LIMIT ?, ?.
sql/item.h:
Add a short-cut for (ulonglong) val_int() to Item.
Add a constructor to Item_int() that accepts ulonglong.
Simplify Item_uint constructor by using the c-tor above.
sql/item_subselect.cc:
Now select_limit has type Item *.
We can safely create an Item in Item_exists_subselect::fix_length_and_dec():
it will be allocated in runtime memory root and freed in the end of
execution.
sql/sp_head.cc:
Add a special initalization state for stored procedures to
be able to easily distinguish the first execution of a stored procedure
from prepared statement prepare.
sql/sql_class.h:
Introduce new state 'INITIALIZED_FOR_SP' to be able to easily distinguish
the first execution of a stored procedure from prepared statement prepare.
sql/sql_derived.cc:
- use unit->set_limit() to set unit->select_limit_cnt, offset_limit_cnt
evreryplace. Add a warning about use of set_limit in
mysql_derived_filling.
sql/sql_error.cc:
- use unit->set_limit() to set unit->select_limit_cnt, offset_limit_cnt
evreryplace.
- this change is also aware of bug#11095 "show warnings limit 0 returns
all rows instead of zero rows", so the one who merges the bugfix from
4.1 can use local version of sql_error.cc.
sql/sql_handler.cc:
- use unit->set_limit() to initalize
unit->select_limit_cnt,offset_limit_cnt everyplace.
sql/sql_lex.cc:
Now ST_SELECT_LEX::select_limit, offset_limit have type Item *
sql/sql_lex.h:
Now ST_SELECT_LEX::select_limit, offset_limit have type Item *
sql/sql_parse.cc:
- use unit->set_limit() to initalize
unit->select_limit_cnt,offset_limit_cnt everyplace.
- we can create an Item_int to set global limit of a statement:
it will be created in the runtime mem root and freed in the end of
execution.
sql/sql_repl.cc:
Use unit->set_limit to initialize limits.
sql/sql_select.cc:
- select_limit is now Item* so the proper way to check for default value
is to compare it with NULL.
sql/sql_union.cc:
Evaluate offset_limit_cnt using the new type of ST_SELECT_LEX::offset_limit
sql/sql_view.cc:
Now ST_SELECT_LEX::select_limit, offset_limit have type Item *
sql/sql_yacc.yy:
Add grammar support for LIMIT ?, ? clause.
into sanja.is.com.ua:/home/bell/mysql/bk/work-multi-5.0
mysql-test/r/view.result:
Auto merged
sql/sql_derived.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
mysql-test/r/group_by.result:
result change
mysql-test/r/union.result:
result change
mysql-test/r/view.result:
result change
mysql-test/t/subselect.test:
fixed mistake of merge
sql/field.cc:
new 5.0 types support
temporary table/db names detection in field fixed
sql/field.h:
removed non-existent methods
added wrongly deleted during manual merge string
sql/item.cc:
support of new types added to merge of union types routines
sql/item.h:
fixed method definition
sql/item_cmpfunc.cc:
fixed type
sql/item_func.h:
item type name fixed
sql/item_subselect.cc:
added forgoten methods
sql/item_subselect.h:
fixed type
sql/sql_derived.cc:
fixed typo of manual merge
sql/sql_view.cc:
added new parameter
mysql-test/r/group_by.result:
Auto merged
mysql-test/r/metadata.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/t/union.test:
Auto merged
sql/item.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
support-files/mysql.server.sh:
Auto merged
(BUG##9398, BUG#8703)
fixed wrong join view detection in multi-delete which lead to server crash
mysql-test/r/lowercase_view.result:
added new tests of updation and selection from the same table
mysql-test/r/view.result:
added new tests of updation and selection from the same table
added test of multidelete command over join view which lead to server crash
test suite from bugs #9398 and #8703
mysql-test/t/lowercase_view.test:
added new tests of updation and selection from the same table
mysql-test/t/view.test:
added new tests of updation and selection from the same table
added test of multidelete command over join view which lead to server crash
test suite from bugs #9398 and #8703
sql/sql_base.cc:
changed procedure of finding tables
sql/sql_class.cc:
added derived table procession detection
sql/sql_class.h:
added derived table procession detection
sql/sql_delete.cc:
fixed detection of selection from table which update for multidelete
sql/sql_derived.cc:
added derived table procession detection
sql/sql_lex.cc:
added detection os SELECTs processed inside derived tables
removed old mechanism of multidelete/multiupdate table duplication detection (which can't work with views)
sql/sql_lex.h:
added detection os SELECTs processed inside derived tables
removed old mechanism of multidelete/multiupdate table duplication detection (which can't work with views)
sql/sql_parse.cc:
removed wrong test of join view (for multidelete in can be not only first table)
sql/sql_prepare.cc:
added detection os SELECTs processed inside derived tables (reset it for reusing in PS/SP)
sql/sql_select.cc:
added detection os SELECTs processed inside derived tables
sql/sql_update.cc:
fixed detection of selection from table which update for multiupdate
mysql-test/r/func_group.result:
new result
mysql-test/r/metadata.result:
new result
test of metadata of variables, unions and derived tables
mysql-test/r/union.result:
new results
test of union of enum
mysql-test/t/metadata.test:
test of metadata of variables, unions and derived tables
mysql-test/t/union.test:
test of union of enum
sql/field.cc:
Field type merging rules added
Fixed table name/alias returting for field made from temporary tables
sql/field.h:
removed unned field type reporting
sql/item.cc:
fixed bug in NEW_DATE type field creartion
replaced mechanism of merging types of UNION
sql/item.h:
replaced mechanism of merging types of UNION
sql/item_func.h:
new item type to make correct field type detection possible
sql/item_subselect.cc:
added table name parameter to prepare() to show right table alias for derived tables
sql/sql_derived.cc:
added table name parameter to prepare() to show right table alias for derived tables
sql/sql_lex.h:
added table name parameter to prepare() to show right table alias for derived tables
sql/sql_parse.cc:
made function for enum/set pack length calculation
sql/sql_prepare.cc:
added table name parameter to prepare() to show right table alias for derived tables
sql/sql_select.cc:
new temporary table field creation by Item_type_holder
fixed table alias for temporary table
sql/sql_union.cc:
added table name parameter to prepare() to show right table alias for derived tables
BitKeeper/etc/logging_ok:
auto-union
client/mysql.cc:
Auto merged
extra/my_print_defaults.c:
Auto merged
include/m_string.h:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/user_var.result:
Auto merged
mysql-test/t/user_var.test:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
strings/ctype-simple.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
strings/ctype-utf8.c:
Auto merged
libmysql/libmysql.c:
ul
mysql-test/r/ps_1general.result:
Merge
mysql-test/t/derived.test:
Merge
mysql-test/t/ps_1general.test:
Merge
mysql-test/t/type_float.test:
Merge
sql/field.cc:
ul
sql/item.cc:
ul
sql/item.h:
ul
sql/item_func.h:
ul
sql/item_strfunc.cc:
ul
sql/item_sum.cc:
ul
sql/item_sum.h:
ul
sql/procedure.h:
ul
sql/sql_derived.cc:
Trivial merge
sql/sql_parse.cc:
ul
sql/sql_update.cc:
Trivial merge
strings/strtod.c:
Use updated code from 4.1
This is bascily same code as we had before or 5.0, execpt that we now have higher accuracy for floating points value that are integers (like 123.45E+02)
mysql-test/r/derived.result:
test of union subquery in the FROM clause with complex distinct/all
mysql-test/t/derived.test:
test of union subquery in the FROM clause with complex distinct/all
sql/sql_derived.cc:
removed wrong distinct UNION detection
Collect all tables and SPs refered by a statement, and open all tables
with an implicit LOCK TABLES. Do find things refered by triggers and views,
we open them first (and then repeat this until nothing new is found), before
doing the actual lock tables.
mysql-test/r/information_schema.result:
Updated result for WL#2130.
mysql-test/r/lock.result:
Updated result for WL#2130.
mysql-test/r/sp-error.result:
Updated result for WL#2130.
mysql-test/r/sp.result:
Updated result for WL#2130.
mysql-test/r/view.result:
Updated result for WL#2130.
mysql-test/t/information_schema.test:
Disabled one test case due to a bug involving LOCK TABLES,
which shows up with WL#2130.
mysql-test/t/lock.test:
New error message with WL#2130. This change is under debate and might change
in the future, but will do for now.
mysql-test/t/sp-error.test:
Updated for WL#2130. Some tests are voided when table access does work from
functions.
mysql-test/t/sp.test:
Updated for WL#2130.
mysql-test/t/view.test:
Updated for WL#2130.
sql/item_func.cc:
We now have to set net.no_send_ok for functions too, with WL#2130.
sql/share/errmsg.txt:
Reused an error code since the old use was voided by WL#2130, but a new
one was needed instead (similar, but more specific restriction).
sql/sp.cc:
Fixed error handling and collection of used tables for WL#2130.
sql/sp.h:
Fixed error handling and collection of used tables for WL#2130.
sql/sp_head.cc:
Added support functions for collecting and merging hash tables and lists
of used tables from SPs and substatements, for WL#2130.
sql/sp_head.h:
Added support functions for collecting and merging hash tables and lists
of used tables from SPs and substatements, for WL#2130.
sql/sql_base.cc:
Changed the way table->query_id is tested and set during with locked tables
in effect. This makes some SP test cases work with WL#2130, but has a side
effect on some error cases with explicit LOCK TABLES. It's still debated if
this is the correct way, so it might change.
sql/sql_class.h:
Added flags for circumventing some interference between WL#2130 and mysql_make_view().
sql/sql_derived.cc:
Added some missing initializations. (Potential bugs.)
sql/sql_lex.cc:
Clear the new hash tables for WL#2130.
sql/sql_lex.h:
Added hash tables for procedures and tables too (as for functions), for WL#2130.
sql/sql_parse.cc:
WL#2130: Make table accesses from stored functions work by adding an implicit
LOCK TABLES around (most) executed statements. To do this, we have to go through
a loop where we collect all SPs and tables in mysql_execute_statement.
sql/sql_prepare.cc:
Cache both functions and procedures for WL#2130.
sql/sql_show.cc:
Added some missing initializations. (Potential bugs.)
sql/sql_view.cc:
Shortcut mysql_make_view() if thd->shortcut_make_view is true during
the pre-open phase for collecting tables in WL#2130. Otherwise, the
similar mechanism here causes interference.
sql/sql_yacc.yy:
For WL#2130, added caching of procedures and disallowed LOCK/UNLOCK TABLES in SPs.
Split TABLE to TABLE and TABLE_SHARE (TABLE_SHARE is still allocated as part of table, will be fixed soon)
Created Field::make_field() and made Field_num::make_field() to call this
Added 'TABLE_SHARE->db' that points to database name; Changed all usage of table_cache_key as database name to use this instead
Changed field->table_name to point to pointer to alias. This allows us to change alias for a table by just updating one pointer.
Renamed TABLE_SHARE->real_name to table_name
Renamed TABLE->table_name to alias
Renamed TABLE_LIST->real_name to table_name
include/myisam.h:
Added const before names
mysql-test/r/group_min_max.result:
Make results repeatable
mysql-test/t/group_min_max.test:
Make results repeatable
sql/field.cc:
Created Field::make_field() and made Field_num::make_field() to call this
Use TABLE_SHARE
Use sql_strmake() instead of sql_memdup() to simplify code
sql/field.h:
Changed table_name to be pointer to table_name. This allows us to change alias for all fields by just changing one pointer.
Use TABLE_SHARE
sql/field_conv.cc:
Use TABLE_SHARE
sql/filesort.cc:
Use TABLE_SHARE
sql/ha_berkeley.cc:
Use TABLE_SHARE
sql/ha_heap.cc:
Use TABLE_SHARE
sql/ha_innodb.cc:
Use TABLE_SHARE
sql/ha_myisam.cc:
Use TABLE_SHARE
sql/ha_myisammrg.cc:
Use TABLE_SHARE
Change some pointer handling to use const char*
sql/ha_ndbcluster.cc:
Use TABLE_SHARE
sql/handler.cc:
Use TABLE_SHARE
sql/item.cc:
Use TABLE_SHARE
sql/item_func.cc:
Use TABLE_SHARE
sql/item_subselect.cc:
Use TABLE_SHARE
sql/item_sum.cc:
Use TABLE_SHARE
sql/key.cc:
Use TABLE_SHARE
sql/lock.cc:
Use TABLE_SHARE
sql/log_event.cc:
real_name -> table_name
sql/mysql_priv.h:
Use TABLE_SHARE
sql/opt_range.cc:
Use TABLE_SHARE
sql/opt_sum.cc:
Use TABLE_SHARE
sql/records.cc:
Use TABLE_SHARE
sql/repl_failsafe.cc:
real_name -> table_name
sql/slave.cc:
Use TABLE_SHARE
sql/sp.cc:
Use TABLE_SHARE
sql/sp_head.cc:
real_name -> table_name
sql/sql_acl.cc:
Use TABLE_SHARE
removed unnecessary assert
fixed indentation
changed some char * -> const char*
sql/sql_acl.h:
changed some char* -> const char*
sql/sql_base.cc:
Use TABLE_SHARE
sql/sql_cache.cc:
Use TABLE_SHARE
sql/sql_class.cc:
Use TABLE_SHARE
sql/sql_db.cc:
real_name -> table_name
sql/sql_delete.cc:
Use TABLE_SHARE
sql/sql_derived.cc:
Use TABLE_SHARE
sql/sql_handler.cc:
Use TABLE_SHARE
sql/sql_help.cc:
Use TABLE_SHARE
sql/sql_insert.cc:
Use TABLE_SHARE
sql/sql_load.cc:
Use TABLE_SHARE
sql/sql_parse.cc:
Use TABLE_SHARE
sql/sql_rename.cc:
real_name -> table_name
sql/sql_select.cc:
Use TABLE_SHARE
table->blob_fields now points to field offsets, not fields
tmp_table->table_name now points to alias name
sql/sql_show.cc:
Use TABLE_SHARE
sql/sql_table.cc:
Use TABLE_SHARE
sql/sql_test.cc:
Use TABLE_SHARE
sql/sql_trigger.cc:
Use TABLE_SHARE
sql/sql_udf.cc:
Use TABLE_SHARE
sql/sql_union.cc:
real_name -> table_name
sql/sql_update.cc:
Use TABLE_SHARE
sql/sql_view.cc:
Use TABLE_SHARE
sql/table.cc:
Split TABLE to TABLE and TABLE_SHARE
Changed blob_field to be field offsets instead of pointer to fields
Only initialize table->s->default_values with default record (not all table->record[#])
Some indentation changes
sql/table.h:
Split TABLE to TABLE and TABLE_SHARE
sql/tztime.cc:
real_name -> table_name
sql/unireg.cc:
Use TABLE_SHARE
sql/unireg.h:
Use TABLE_SHARE
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
Build-tools/Do-compile:
Auto merged
VC++Files/sql/mysqld.dsp:
Auto merged
client/Makefile.am:
Auto merged
client/mysql.cc:
Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
Auto merged
client/mysqltest.c:
Auto merged
include/my_base.h:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/dict/dict0load.c:
Auto merged
innobase/include/dict0dict.h:
Auto merged
innobase/include/row0mysql.h:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
libmysql/libmysql.c:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/mi_rnext_same.c:
Auto merged
myisam/mi_write.c:
Auto merged
myisam/sort.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/r/ctype_ujis.result:
Auto merged
mysql-test/r/gis-rtree.result:
Auto merged
mysql-test/r/group_by.result:
Auto merged
mysql-test/r/merge.result:
Auto merged
mysql-test/r/metadata.result:
Auto merged
mysql-test/r/ndb_alter_table.result:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
mysql-test/r/insert_update.result:
Auto merged
mysql-test/r/timezone2.result:
Auto merged
mysql-test/r/type_enum.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/t/merge.test:
Auto merged
mysql-test/t/ps_1general.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
mysql-test/t/system_mysql_db_fix.test:
Auto merged
mysql-test/t/variables.test:
Auto merged
ndb/include/ndbapi/NdbConnection.hpp:
Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
ndb/src/common/util/version.c:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
Auto merged
ndb/src/kernel/blocks/dbacc/Makefile.am:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Auto merged
ndb/src/ndbapi/NdbOperationExec.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
ndb/test/ndbapi/Makefile.am:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
sql/field.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/handler.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_create.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_geofunc.cc:
Auto merged
sql/item_row.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/net_serv.cc:
Auto merged
sql/password.c:
Auto merged
sql/protocol.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_derived.cc:
Auto merged
sql/sql_do.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_help.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/examples/ha_archive.cc:
Auto merged
sql/strfunc.cc:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
sql/tztime.h:
Auto merged
sql/udf_example.cc:
Auto merged
sql/unireg.cc:
Auto merged
Makefile.am:
Simple merge
client/mysqldump.c:
Simple merge
configure.in:
Simple merge
libmysqld/lib_sql.cc:
Automatic merge
mysql-test/r/func_str.result:
Automatic merge
mysql-test/r/grant.result:
simple merge
mysql-test/r/multi_update.result:
automatc merge
mysql-test/r/ps.result:
automatic merge
mysql-test/r/ps_2myisam.result:
Automatic merge
mysql-test/r/ps_3innodb.result:
Automatic merge
mysql-test/r/ps_4heap.result:
Automatic merge
mysql-test/r/ps_5merge.result:
Automatic merge
mysql-test/r/ps_6bdb.result:
Automatic merge
mysql-test/r/ps_7ndb.result:
Automatic merge
mysql-test/r/show_check.result:
Automatic merge
mysql-test/r/subselect.result:
Automatic merge
mysql-test/t/grant.test:
Automatic merge
mysql-test/t/multi_update.test:
Automatic merge
mysql-test/t/ps.test:
Automatic merge
mysql-test/t/show_check.test:
Automatic merge
ndb/docs/wl2077.txt:
merge
ndb/src/mgmsrv/main.cpp:
merge
scripts/mysql_fix_privilege_tables.sh:
merge
sql/item.cc:
Merge (difficult)
sql/item.h:
simple merge
sql/item_cmpfunc.h:
Automatic merge
sql/item_subselect.cc:
Simple merge
sql/item_subselect.h:
Automatic merge
sql/mysql_priv.h:
Simple merge
sql/slave.h:
Automatic merge
sql/sql_base.cc:
Removed code that was backported to 4.1
sql/sql_class.h:
Merge (some code moved to sql_insert.cc)
sql/sql_db.cc:
simple merge
sql/sql_insert.cc:
Merge (difficult as logic had changed both in 4.1 and 5.0)
Some coded moved here from sql_class.h
sql/sql_parse.cc:
Merge (difficult)
sql/sql_prepare.cc:
Simple merge
sql/sql_select.cc:
Automatic merge
sql/sql_table.cc:
Simple merge
sql/sql_update.cc:
Difficult merge because of different logic for multi-updates
sql/sql_yacc.yy:
Simple merge
tests/client_test.c:
Simple merge
We should not call free_tmp_table() for derived table in
mysql_derived_filling(), since by this moment this table is already
registered in THD::derived_tables list and thus free_tmp_table() will
be called for it automatically in close_thread_tables().
sql/sql_derived.cc:
We should not call free_tmp_table() for derived table in
mysql_derived_filling(), since by this moment this table is already
registered in THD::derived_tables list and thus free_tmp_table() will
be called for it automatically in close_thread_tables().
tables requires privileges for them if some table or column level grants
present" (with after-review fixes).
We should set SELECT_ACL for implicitly opened tables in
my_tz_check_n_skip_implicit_tables() to be able to bypass privilege
checking in check_grant(). Also we should exclude those tables from
privilege checking in multi-update.
mysql-test/r/timezone2.result:
Extended test for bug #6116 "SET time_zone := ... requires access to
mysql.time_zone tables"
Added test for bug #6765 "Implicit access to time zone description
tables requires privileges for them if some table or column level grants
present"
mysql-test/t/timezone2.test:
Extended test for bug #6116 "SET time_zone := ... requires access to
mysql.time_zone tables"
Added test for bug #6765 "Implicit access to time zone description
tables requires privileges for them if some table or column level grants
present"
sql/item_geofunc.cc:
sql_acl.h is now included via mysql_priv.h
sql/item_strfunc.cc:
sql_acl.h is now included via mysql_priv.h
sql/log.cc:
sql_acl.h is now included via mysql_priv.h
sql/mysql_priv.h:
Now we have to include sql_acl.h before tztime.h, since
my_tz_check_n_skip_implicit_tables() defined there requires
SELECT_ACL constant defined in sql_acl.h.
sql/mysqld.cc:
sql_acl.h is now included via mysql_priv.h
sql/repl_failsafe.cc:
sql_acl.h is now included via mysql_priv.h
sql/set_var.cc:
sql_acl.h is now included via mysql_priv.h
sql/sql_acl.cc:
sql_acl.h is now included via mysql_priv.h
sql/sql_base.cc:
sql_acl.h is now included via mysql_priv.h
sql/sql_cache.cc:
sql_acl.h is now included via mysql_priv.h
sql/sql_class.cc:
sql_acl.h is now included via mysql_priv.h
sql/sql_db.cc:
sql_acl.h is now included via mysql_priv.h
sql/sql_derived.cc:
sql_acl.h is now included via mysql_priv.h
sql/sql_do.cc:
sql_acl.h is now included via mysql_priv.h
sql/sql_insert.cc:
sql_acl.h is now included via mysql_priv.h
sql/sql_parse.cc:
check_one_table_access(): Tweaked comments.
multi_update_precheck(): Added skipping of implicitly opened tables
during privilege checking.
sql/sql_prepare.cc:
sql_acl.h is now included via mysql_priv.h
sql/sql_repl.cc:
sql_acl.h is now included via mysql_priv.h
sql/sql_show.cc:
sql_acl.h is now included via mysql_priv.h
sql/sql_update.cc:
sql_acl.h is now included via mysql_priv.h
sql/sql_yacc.yy:
sql_acl.h is now included via mysql_priv.h
sql/tztime.h:
my_tz_check_n_skip_implicit_tables():
We should set SELECT_ACL for implictly opened tables to be able to
bypass privilege checking in check_grant().
Fixed compiler warnings
Fix core dump when sending SIGHUP to mysqld
mysql-test/r/drop_temp_table.result:
After merge fixes
mysql-test/r/grant.result:
After merge fixes
mysql-test/r/group_min_max.result:
After merge fixes
mysql-test/r/innodb.result:
After merge fixes
mysql-test/r/insert_select.result:
After merge fixes
mysql-test/r/rpl_charset.result:
After merge fixes
mysql-test/r/rpl_create_database.result:
After merge fixes
mysql-test/r/rpl_loaddata_rule_m.result:
After merge fixes
mysql-test/t/rpl_charset.test:
After merge fixes
mysql-test/t/rpl_create_database.test:
After merge fixes
sql-common/client.c:
After merge fixes
sql/item.cc:
After merge fixes
sql/mysqld.cc:
Fix core dump when sending SIGHUP to mysqld
sql/sql_acl.cc:
Better comment
sql/sql_derived.cc:
Fixed comment
Added missing DBUG_RETURN
sql/sql_insert.cc:
Fixed compiler warnings
After merge fixes
sql/sql_lex.cc:
After merge fixes
Removed compiler warnings
sql/sql_parse.cc:
After merge fixes
sql/sql_select.cc:
More debugging
sql/sql_table.cc:
Added missing DBUG_VOID_RETURN
sql/sql_update.cc:
Fixed compiler warning
sql/sql_view.cc:
Added missing DBUG_RETURN
Fixed compiler warnings
Added flag to signal that the view is a derived table
- open and create derived tables
- detect which tables should be locked for write
- lock and fill derived tables
some unitialized variables fixed
mysql-test/r/lock_multi.result:
correct results returned
mysql-test/r/multi_update.result:
correct results returned
mysql-test/r/view.result:
correct results returned
mysql-test/t/multi_update.test:
correct results returned
mysql-test/t/view.test:
correct results returned
sql/mysql_priv.h:
derived tables processing splited on table creation and table filling
sql/sql_base.cc:
derived tables processing splited on table creation and table filling
sql/sql_class.h:
function to detect when we need fill derived tables
sql/sql_derived.cc:
derived tables processing splited on table creation and table filling
sql/sql_lex.cc:
fixed uninitialized value
sql/sql_load.cc:
fixed uninitialized value
sql/sql_parse.cc:
initialization muved (will be done for all queries)
sql/sql_prepare.cc:
preparation of multiupdate changed a bit because new locking procedure
sql/sql_update.cc:
new lock for multiupdate:
- open and create derived tables
- detect which tables should be locked for write
- lock and fill derived tables
sql/table.h:
place to store select_result between creation and filling tables
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/triggers/post-commit:
Auto merged
Docs/Support/texi2html:
Auto merged
Makefile.am:
Auto merged
client/Makefile.am:
Auto merged
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
include/my_base.h:
Auto merged
include/my_global.h:
Auto merged
include/my_pthread.h:
Auto merged
include/my_sys.h:
Auto merged
include/my_time.h:
Auto merged
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
innobase/buf/buf0buf.c:
Auto merged
innobase/include/row0mysql.h:
Auto merged
innobase/row/row0sel.c:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/examples/Makefile.am:
Auto merged
myisam/mi_check.c:
Auto merged
mysql-test/include/ps_modify.inc:
Auto merged
mysql-test/install_test_db.sh:
Auto merged
mysql-test/r/alter_table.result:
Auto merged
mysql-test/r/auto_increment.result:
Auto merged
mysql-test/r/bdb.result:
Auto merged
mysql-test/r/ctype_latin1_de.result:
Auto merged
mysql-test/r/ctype_recoding.result:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/r/func_gconcat.result:
Auto merged
mysql-test/r/func_group.result:
Auto merged
mysql-test/r/func_if.result:
Auto merged
mysql-test/t/derived.test:
Auto merged
mysql-test/t/insert.test:
merge with 4.1
Fixed test case to not use 'if exists' when it shouldn't
mysql-test/t/range.test:
merge with 4.1
Added missing drop table
sql/ha_ndbcluster.cc:
merge with 4.1
Simple optimization: use max() instead of ? :
sql/item_func.cc:
merge with 4.1
(Added back old variable names for easier merges)
sql/opt_range.cc:
merge with 4.1
Removed argument 'parent_alloc' from QUICK_RANGE_SELECT as this was not used
Added assert if using QUICK_GROUP_MIN_MAX_SELECT with parent_alloc as the init() function can't handle this
Changed back get_quick_select_for_ref() to use it's own alloc root becasue this function may be called several times for one query
sql/sql_handler.cc:
merge with 4.1
change variable 'err' to 'error' as same function had a label named 'err'
sql/sql_update.cc:
Use multi-update code from 5.0 instead of 4.1
We will fix the locking code shortly in 5.0 to be faster than in 4.1
sql/field.cc:
fixed compatibility fields type detection
sql/item.cc:
fixed compatibility fields detection with using standard method for all fields, also some bugs are fixed
sql/sql_derived.cc:
some cleanup
single row subquery always can return NULL (no rows found) (BUG#5590)
mysql-test/r/subselect.result:
maybe_null flag returning by subquwery for temporary table creation
mysql-test/t/subselect.test:
maybe_null flag returning by subquwery for temporary table creation
sql/item.cc:
storing maybe_null in type holder
sql/item_subselect.cc:
single row subquery always can return NULL (no rows found)
sql/sql_derived.cc:
fixed error handling if creating derived table failed
a second time". The bug was caused by incompatibility of
negations elimination algorithm and PS: during first statement
execute a subtree with negation was replaced with equivalent
subtree without NOTs.
The problem was that although this transformation was permanent,
items of the new subtree were created in execute-local memory.
The patch adds means to check if it is the first execute of a
prepared statement, and if this is the case, to allocate items
in memory of the prepared statement.
The implementation:
- backports Item_arena from 5.0
- adds Item_arena::is_stmt_prepare(),
Item_arena::is_first_stmt_execute().
- deletes THD::allocate_temporary_pool_for_ps_preparing(),
THD::free_temporary_pool_for_ps_preparing(); they
were redundant.
and adds a few invariants:
- thd->free_list never contains junk (= freed items)
- thd->current_arena is never null. If there is no
prepared statement, it points at the thd.
The rest of the patch contains mainly mechanical changes and
cleanups.
mysql-test/r/ps.result:
Test results updated (test case for Bug#4912)
mysql-test/t/ps.test:
A test case for Bug#4912 "mysqld crashs in case a statement is
executed a second time"
sql/item_cmpfunc.cc:
current_statement -> current_arena
sql/item_subselect.cc:
Statement -> Item_arena, current_statement -> current_arena
sql/item_subselect.h:
Item_subselect does not need to save thd->current_statement.
sql/item_sum.cc:
Statement -> Item_arena
sql/item_sum.h:
Statement -> Item_arena
sql/mysql_priv.h:
Statement -> Item_arena
sql/sql_base.cc:
current_statement -> current_arena
sql/sql_class.cc:
- Item_arena
- convenient set_n_backup_statement, restore_backup_statement
(nice idea, Sanja)
sql/sql_class.h:
- Item_arena: backport from 5.0
- allocate_temporary_pool_for_ps_preparing,
free_temporary_pool_for_ps_preparing removed.
sql/sql_derived.cc:
current_statement -> current_arena
sql/sql_lex.cc:
current_statement -> current_arena
sql/sql_parse.cc:
Deploy invariant that thd->free_list never contains junk items
(backport from 5.0).
sql/sql_prepare.cc:
- backporting Item_arena
- no need to allocate_temporary_pool_for_ps_preparing().
sql/sql_select.cc:
Fix for bug#4912 "mysqld crashs in case a statement is
executed a second time": if this is the first execute of
a prepared statement, negation elimination is
done in memory of the prepared statement.
sql/sql_union.cc:
Backporting Item_arena from 5.0.
two TABLE_LIST copy eliminated
include/mysqld_error.h:
errors of view
libmysqld/Makefile.am:
new view file
mysql-test/r/connect.result:
SHOW TABLE show type of table
mysql-test/r/ctype_recoding.result:
SHOW TABLE show type of table
mysql-test/r/drop.result:
SHOW TABLE show type of table
mysql-test/r/grant.result:
new two privileges (CRETEA|SHOW VIEW)
mysql-test/r/lowercase_table.result:
SHOW TABLE show type of table
mysql-test/r/ps_1general.result:
SHOW TABLE show type of table
mysql-test/r/rename.result:
SHOW TABLE show type of table
mysql-test/r/rpl000009.result:
SHOW TABLE show type of table
mysql-test/r/rpl_error_ignored_table.result:
SHOW TABLE show type of table
mysql-test/r/select.result:
SHOW TABLE show type of table
mysql-test/r/system_mysql_db.result:
SHOW TABLE show type of table
new two privileges (CRETEA|SHOW VIEW)
mysql-test/t/system_mysql_db_fix.test:
removing all system tables
scripts/mysql_fix_privilege_tables.sql:
new two privileges (CRETEA|SHOW VIEW)
sql/Makefile.am:
new VIEW related file
sql/ha_myisammrg.cc:
two TABLE_LIST copy eliminated
sql/item.cc:
VIEW
sql/item.h:
VIEW
sql/item_subselect.cc:
VIEW
sql/item_subselect.h:
VIEW
sql/lex.h:
VIEW
sql/lock.cc:
VIEW
sql/mysql_priv.h:
VIEW
sql/mysqld.cc:
VIEW
new parameter - sql_updatable_view_key
sql/opt_sum.cc:
two TABLE_LIST copy eliminated
sql/set_var.cc:
new parameter - sql_updatable_view_key
sql/share/czech/errmsg.txt:
errors messages of views
sql/share/danish/errmsg.txt:
errors messages of views
sql/share/dutch/errmsg.txt:
errors messages of views
sql/share/english/errmsg.txt:
errors messages of views
sql/share/estonian/errmsg.txt:
errors messages of views
sql/share/french/errmsg.txt:
errors messages of views
sql/share/german/errmsg.txt:
errors messages of views
sql/share/greek/errmsg.txt:
errors messages of views
sql/share/hungarian/errmsg.txt:
errors messages of views
sql/share/italian/errmsg.txt:
errors messages of views
sql/share/japanese/errmsg.txt:
errors messages of views
sql/share/korean/errmsg.txt:
errors messages of views
sql/share/norwegian-ny/errmsg.txt:
errors messages of views
sql/share/norwegian/errmsg.txt:
errors messages of views
sql/share/polish/errmsg.txt:
errors messages of views
sql/share/portuguese/errmsg.txt:
errors messages of views
sql/share/romanian/errmsg.txt:
errors messages of views
sql/share/russian/errmsg.txt:
errors messages of views
sql/share/serbian/errmsg.txt:
errors messages of views
sql/share/slovak/errmsg.txt:
errors messages of views
sql/share/spanish/errmsg.txt:
errors messages of views
sql/share/swedish/errmsg.txt:
errors messages of views
sql/share/ukrainian/errmsg.txt:
errors messages of views
sql/slave.cc:
two TABLE_LIST copy eliminated
sql/sp.cc:
VIEW
sql/sql_acl.cc:
VIEW
sql/sql_acl.h:
VIEW
sql/sql_base.cc:
VIEW
sql/sql_cache.cc:
two TABLE_LIST copy eliminated
sql/sql_class.h:
VIEW
sql/sql_db.cc:
two TABLE_LIST copy eliminated
sql/sql_delete.cc:
VIEW
sql/sql_derived.cc:
VIEW
sql/sql_handler.cc:
two TABLE_LIST copy eliminated
sql/sql_help.cc:
two TABLE_LIST copy eliminated
sql/sql_insert.cc:
VIEW
sql/sql_lex.cc:
VIEW
sql/sql_lex.h:
VIEW
sql/sql_load.cc:
VIEW
sql/sql_olap.cc:
VIEW
sql/sql_parse.cc:
two TABLE_LIST copy eliminated
VIEW
sql/sql_prepare.cc:
VIEW
sql/sql_rename.cc:
two TABLE_LIST copy eliminated
sql/sql_select.cc:
VIEW
sql/sql_show.cc:
VIEW
sql/sql_table.cc:
VIEW
sql/sql_union.cc:
VIEW
sql/sql_update.cc:
VIEW
sql/sql_yacc.yy:
VIEW
sql/table.cc:
VIEW
sql/table.h:
VIEW
sql/tztime.cc:
two TABLE_LIST copy eliminated
sql/unireg.h:
VIEW
tests/client_test.c:
VIEW
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
VC++Files/libmysqld/libmysqld.dsp:
Auto merged
VC++Files/sql/mysqld.dsp:
Auto merged
client/mysql.cc:
Auto merged
client/mysqlbinlog.cc:
Auto merged
client/mysqltest.c:
Auto merged
include/config-netware.h:
Auto merged
include/my_base.h:
Auto merged
include/my_global.h:
Auto merged
include/my_sys.h:
Auto merged
include/mysql_com.h:
Auto merged
include/sql_state.h:
Auto merged
innobase/include/row0mysql.h:
Auto merged
innobase/row/row0sel.c:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
myisam/mi_check.c:
Auto merged
mysql-test/r/bdb.result:
Auto merged
mysql-test/r/connect.result:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/r/derived.result:
Auto merged
mysql-test/r/func_group.result:
Auto merged
mysql-test/r/func_like.result:
Auto merged
mysql-test/r/func_sapdb.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/insert.result:
Auto merged
mysql-test/r/insert_select.result:
Auto merged
mysql-test/r/join_outer.result:
Auto merged
mysql-test/r/key.result:
Auto merged
mysql-test/r/multi_update.result:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/null.result:
Auto merged
mysql-test/r/null_key.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/rpl_rotate_logs.result:
Auto merged
mysql-test/r/rpl_server_id1.result:
Auto merged
mysql-test/r/rpl_until.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/system_mysql_db.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/multi_update.test:
Auto merged
mysql-test/t/mysqlbinlog.test:
Auto merged
mysql-test/t/rpl000015.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
mysql-test/t/variables.test:
Auto merged
mysys/mf_iocache2.c:
Auto merged
mysys/my_bitmap.c:
Auto merged
mysys/my_pthread.c:
Auto merged
netware/Makefile.am:
Auto merged
netware/my_manage.c:
Auto merged
netware/mysql_test_run.c:
Auto merged
netware/BUILD/compile-linux-tools:
Auto merged
netware/BUILD/compile-netware-standard:
Auto merged
netware/BUILD/mwenv:
Auto merged
netware/BUILD/nwbootstrap:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_berkeley.h:
Auto merged
sql/ha_heap.h:
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.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/net_serv.cc:
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/sql_acl.cc:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_derived.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_string.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/structs.h:
Auto merged
sql-common/client.c:
Auto merged
configure.in:
Merge with 4.1
include/mysqld_error.h:
New errors from 4.1
libmysqld/Makefile.am:
Merge with 4.1
myisam/myisamchk.c:
Merge with 4.1
myisam/myisamdef.h:
Merge with 4.1
myisam/sort.c:
Merge with 4.1
mysql-test/r/mysqlbinlog.result:
Merge with 4.1
mysql-test/r/range.result:
Merge with 4.1
mysql-test/r/rpl_flush_log_loop.result:
Merge with 4.1
mysql-test/r/rpl_replicate_do.result:
Merge with 4.1
mysql-test/r/rpl_temporary.result:
Merge with 4.1
mysql-test/r/rpl_user_variables.result:
Merge with 4.1
mysql-test/t/func_time.test:
Merge with 4.1
scripts/mysql_create_system_tables.sh:
Merge with 4.1
scripts/mysql_fix_privilege_tables.sql:
Merge with 4.1
sql/Makefile.am:
Merge with 4.1
sql/filesort.cc:
Merge with 4.1
sql/ha_innodb.cc:
Merge with 4.1
sql/ha_innodb.h:
Merge with 4.1
sql/ha_myisam.cc:
Merge with 4.1
sql/handler.cc:
Merge with 4.1
sql/handler.h:
Merge with 4.1
sql/item_func.cc:
Merge with 4.1
sql/item_timefunc.cc:
Merge with 4.1
sql/log.cc:
Merge with 4.1
sql/log_event.cc:
Merge with 4.1
sql/mysqld.cc:
Merge with 4.1
sql/opt_range.cc:
Merge with 4.1
sql/opt_range.h:
Merge with 4.1
sql/share/czech/errmsg.txt:
Merge with 4.1
Updated english error messages
sql/share/danish/errmsg.txt:
Merge with 4.1
sql/share/dutch/errmsg.txt:
Merge with 4.1
sql/share/english/errmsg.txt:
Merge with 4.1
sql/share/estonian/errmsg.txt:
Merge with 4.1
sql/share/french/errmsg.txt:
Merge with 4.1
sql/share/german/errmsg.txt:
Merge with 4.1
sql/share/greek/errmsg.txt:
Merge with 4.1
sql/share/hungarian/errmsg.txt:
Merge with 4.1
sql/share/italian/errmsg.txt:
Merge with 4.1
sql/share/japanese/errmsg.txt:
Merge with 4.1
sql/share/korean/errmsg.txt:
Merge with 4.1
sql/share/norwegian-ny/errmsg.txt:
Merge with 4.1
sql/share/norwegian/errmsg.txt:
Merge with 4.1
sql/share/polish/errmsg.txt:
Merge with 4.1
sql/share/portuguese/errmsg.txt:
Merge with 4.1
sql/share/romanian/errmsg.txt:
Merge with 4.1
sql/share/russian/errmsg.txt:
Merge with 4.1
sql/share/serbian/errmsg.txt:
Merge with 4.1
sql/share/slovak/errmsg.txt:
Merge with 4.1
sql/share/spanish/errmsg.txt:
Merge with 4.1
sql/share/swedish/errmsg.txt:
Merge with 4.1
sql/share/ukrainian/errmsg.txt:
Merge with 4.1
sql/slave.cc:
Merge with 4.1
sql/sql_class.cc:
Merge with 4.1
sql/sql_class.h:
Merge with 4.1
sql/sql_db.cc:
Merge with 4.1
sql/sql_insert.cc:
Merge with 4.1
sql/sql_lex.cc:
Merge with 4.1
sql/sql_lex.h:
Merge with 4.1
sql/sql_parse.cc:
Merge with 4.1 tree
Changed // comments to /* */
sql/sql_prepare.cc:
Merge with 4.1
sql/sql_select.cc:
Merge with 4.1
sql/sql_table.cc:
Merge with 4.1
sql/sql_yacc.yy:
Merge with 4.1
sql/table.h:
Merge with 4.1
tests/client_test.c:
Merge with 4.1
mysql-test/r/sp.result:
test suite for Bug #2266
mysql-test/t/sp.test:
test suite for Bug #2266
sql/item_subselect.cc:
made ancestor for Statement (Item_arena)
sql/item_subselect.h:
made ancestor for Statement (Item_arena)
sql/item_sum.cc:
made ancestor for Statement (Item_arena)
sql/item_sum.h:
made ancestor for Statement (Item_arena)
sql/mysql_priv.h:
reset_stmt_for_execute use PS and SP
sql/sp_head.cc:
sp_head use Item_arena as ancestor to be PS cleunup compatible
SP use PS storing/restoring/cleanup mechanisms
cleanup() of SP Items added
Items created in temporary memory pool during SP execution saved for normal freeing after SP execution
sql/sp_head.h:
sp_head use Item_arena
sql/sql_base.cc:
made ancestor for Statement (Item_arena)
results of wild_setup made permanent
setup_conds make natural joins expanding only once and store results in PS/SP memory
sql/sql_class.cc:
made ancestor for Statement (Item_arena)
sql/sql_class.h:
made ancestor for Statement (Item_arena)
method to detect PS preparation added
sql/sql_delete.cc:
storing where for DELETE and mark first execution
sql/sql_derived.cc:
use method
sql/sql_insert.cc:
mark first execution for INSERT
sql/sql_lex.cc:
flags to correctly make transformations of query and storing them in memory of PS/SP
made ancestor for Statement (Item_arena)
sql/sql_lex.h:
reved variable od SP ol saving data
flags to correctly make transformations of query and storing them in memory of PS/SP
sql/sql_parse.cc:
cleunup unit for any query
sql/sql_prepare.cc:
made ancestor for Statement (Item_arena)
storing where moved to preparation
changed interface of reset_stmt_for_execute to use it is SP
do not restore where/order by/group by before first execution (but tables and unit can be chenged without execution and should be prepared (subqueries executes on demand))
sql/sql_select.cc:
storing where for SELECT/multi-DELETE/... and mark first execution
sql/sql_union.cc:
made ancestor for Statement (Item_arena)
sql/sql_update.cc:
storing where for UPDATE and mark first execution
Sergey Glukhov
Davi Arnaut
Georgi Kodinov
Ignacio Galarza
Martin Hansson
unknown
unknown
unknown
unknown
unknown
unknown
unknown
unknown
unknown
unknown
unknown
unknown
unknown
unknown
unknown
unknown