Add select_send::cleanup.
Fix a compilation warning.
Issues spotted while working on the fix for Bug#12713.
sql-common/client.c:
Fix a warning.
sql/sql_class.cc:
Give a variable a more specific name. Rewrite an incorrect comment.
Add a cleanup for select_send. The only case now this cleanup can be
necessary is when we have a prepared statement inside a stored procedure,
and a continue handler. At first execution, the statement is killed
after having executed select_send::send_fields. At the second execution
it is killed after having executed select_send::send_fields.
sql/sql_class.h:
Rename a member. Add comments.
No functionality added or changed.
This is a pre-requisite for the fix for Bug#12713 Error in a stored
function called from a SELECT doesn't cause ROLLBACK of statem
Address post-review comments.
include/sql_common.h:
Declare auxiliary functions to manipulate mysql.net.last_er* and
mysql_stmt.last_er*
libmysql/libmysql.c:
Use helper functions to set an error in MYSQL or MYSQL_STMT
libmysqld/lib_sql.cc:
Use helper functions to set an error in MYSQL or MYSQL_STMT
sql-common/client.c:
Use helper functions to set an error in MYSQL or MYSQL_STMT
No functionality added or changed.
This is a pre-requisite for the fix for Bug#12713 Error in a stored
function called from a SELECT doesn't cause ROLLBACK of statem
Address post-review comments.
Faster thr_alarm()
Added 'Opened_files' status variable to track calls to my_open()
Don't give warnings when running mysql_install_db
Added option --source-install to mysql_install_db
I had to do the following renames() as used polymorphism didn't work with Forte compiler on 64 bit systems
index_read() -> index_read_map()
index_read_idx() -> index_read_idx_map()
index_read_last() -> index_read_last_map()
BUILD/compile-solaris-sparc-forte:
Updated script to current Solaris installations
Now we compile by default for 64 bits
client/mysql.cc:
Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)
client/mysql_upgrade.c:
Fixed compiler warning (on Forte)
client/mysqladmin.cc:
Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)
client/mysqlcheck.c:
Fixed compiler warning (on Forte)
client/mysqldump.c:
Fixed compiler warning (on Forte)
client/mysqlslap.c:
Fixed compiler warning (on Forte)
client/mysqltest.c:
Fixed compiler warning (on Forte)
client/sql_string.cc:
Avoid compiler warnings when using C function pointers in C++
configure.in:
Added detection of mtmalloc and ieeefp.h
extra/replace.c:
Fixed compiler warning (on Forte)
include/m_ctype.h:
Added some typedef's to make it easy to use C function pointers in C++
include/my_sys.h:
Added my_file_total_opened (counter for calls to my_open())
include/myisam.h:
Fixed compiler warning (on Forte)
libmysql/libmysql.c:
Fixed compiler warning (on Forte) by adding casts and change types
libmysql/manager.c:
Fixed compiler warning (on Forte) by adding casts and change types
mysql-test/r/ctype_cp932_binlog_stm.result:
Updated positions
(Needed because we didn't before correctly restore collation_database after running stored procedure
mysys/my_fopen.c:
Count number of opened files
mysys/my_open.c:
Count number of opened files
mysys/my_static.c:
Count number of opened files
mysys/thr_alarm.c:
Optimization to do less alarm() and pthread_sigmask() calls.
Idea is to remember time for next pending alarm and not reschedule a new alarm if it's after the current one.
Before we only did this if there was other pending alarms.
We don't have to use pthread_sigmask() in case of 'USE_ONE_SIGNAL_HAND' as the alarm()
signal will be blocked for the calling thread anyway and no other thread will have the alarm() signal enabled to call process_alarm()
regex/regcomp.c:
Fixed compiler warning (on Forte) by adding casts and change types
scripts/mysql_install_db.sh:
Added option --source-install to allow one to create a mysql database from the source tree without installing MySQL
Don't give (unnecessary) warnings
server-tools/instance-manager/angel.cc:
Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)
server-tools/instance-manager/thread_registry.cc:
Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)
sql/event_db_repository.cc:
index_read() -> index_read_map()
sql/event_queue.cc:
Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)
sql/field.cc:
Fixed compiler warnings about hidden fields
sql/ha_partition.cc:
Fixed compiler warnings about hidden fields
index_read() -> index_read_map()
sql/ha_partition.h:
index_read() -> index_read_map()
sql/handler.cc:
Added PAGE option to row types (to prepare for future)
index_read() -> index_read_map()
sql/handler.h:
Added ROW_TYPE_PAGE (for future)
Added flag to signal if table was to be created transactionally
I had to do the following renames() as used polymorphism didn't work with Forte compiler on 64 bit systems
index_read() -> index_read_map()
index_read_idx() -> index_read_idx_map()
index_read_last() -> index_read_last_map()
sql/item.cc:
Fixed indentation
Renamed local variable to avoid hiding class variable
sql/item_cmpfunc.cc:
Renamed local variable to avoid hiding class variable
sql/item_cmpfunc.h:
Removed not used variable
sql/item_func.cc:
Renamed local variable to avoid hiding class variable
sql/item_strfunc.cc:
Moved functions from Item_strfunc.cc
sql/item_strfunc.h:
Move functions to item_strfunc.cc
Use C function pointer type to avoid compiler warnings (with Forte)
sql/item_subselect.cc:
index_read() -> index_read_map()
sql/item_xmlfunc.cc:
Renamed local variable to avoid hiding class variable
Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)
sql/key.cc:
Fixed indentation
sql/log.cc:
Renamed local variable to avoid hiding class variable
sql/log_event.cc:
Removed call to my_time() when creating class instance of Log_event() as this may have static instances.
(One can't call my_time() before my_init())
index_read() -> index_read_map()
Renamed local variable to avoid hiding class variable
sql/log_event_old.cc:
Renamed local variable to avoid hiding class variable
sql/mysql_priv.h:
Made all create_backup_ctx() declarations identical.
This lifted up a bug where wrong create_backup_ctx() was called in some cases.
Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)
sql/mysqld.cc:
Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)
Fixed indentation
Don't call end_thr_alarm() when calling unireg_abort() as unireg_abort() already calls end_thr_alarm()
Added variable 'Opened_files' (number of calls to my_open() or my_fopen())
Don't print 'loose' warnings when using --bootstrap (to avoid warnings when running mysql_install_db)
Fixed compiler warnings
sql/opt_range.cc:
index_read() -> index_read_map()
sql/opt_sum.cc:
index_read() -> index_read_map()
sql/partition_info.cc:
Renamed local variable to avoid hiding class variable
sql/rpl_filter.cc:
Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)
sql/set_var.cc:
Renamed local variable to avoid hiding class variable
Added 'process_key_cache_t' type to avoid compiler warning (on Forte)
sql/set_var.h:
Added 'process_key_cache_t' type to avoid compiler warning (on Forte)
sql/sp.cc:
More debugging
index_read() -> index_read_map()
sql/sp_cache.cc:
Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)
sql/sp_head.cc:
Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)
Moved 'saved_creation_ctx' higher up to be able to free objects allocated by create_backup_ctx()
sql/sql_acl.cc:
index_read() -> index_read_map()
sql/sql_class.cc:
Renamed local variable to avoid hiding class variable
Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)
sql/sql_class.h:
Renamed local variable to avoid hiding class variable
sql/sql_db.cc:
Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)
sql/sql_delete.cc:
Renamed local variable to avoid hiding class variable
sql/sql_handler.cc:
index_read() -> index_read_map()
sql/sql_help.cc:
index_read() -> index_read_map()
sql/sql_insert.cc:
index_read() -> index_read_map()
Renamed local variable to avoid hiding class variable
sql/sql_lex.cc:
Renamed local variable to avoid hiding class variable
sql/sql_plugin.cc:
Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)
index_read() -> index_read_map()
Don't give warnings about not used plugins if we are using --warnings=0
sql/sql_select.cc:
index_read() -> index_read_map()
sql-common/client.c:
Fixed compiler warning (on Forte)
sql-common/my_time.c:
Removed never accessed code
Fixed compiler warning (on Forte)
sql/sql_servers.cc:
index_read() -> index_read_map()
sql/sql_show.cc:
Added TRANSACTIONAL to SHOW CREATE
Fixed ROW_TYPE_PAGE
sql/sql_string.cc:
Avoid compiler warnings when using C function pointers in C++
sql/sql_table.cc:
Set create_info->transactional if we used TRANSACTIONAL=1
sql/sql_udf.cc:
index_read() -> index_read_map()
sql/sql_yacc.yy:
Added TRANSACTIONAL=0|1 to CREATE (for future)
Added row type PAGE (was only partionally handled before)
sql/strfunc.cc:
Avoid compiler warnings when using C function pointers in C++
sql/table.cc:
More DBUG statements
Declare all create_backup_ctx() functions identically
Remember if table was created with TRANSACTIONAL flag or not (future safe)
Renamed local variable to avoid hiding class variable
sql/table.h:
Remember if table was created with TRANSACTIONAL=1
sql/tztime.cc:
index_read() -> index_read_map()
sql-common/pack.c:
Fixed compiler warning (on Forte)
storage/archive/archive_reader.c:
Fixed compiler warning (on Forte)
storage/archive/azio.c:
Fixed compiler warning (on Forte)
storage/blackhole/ha_blackhole.cc:
index_read() -> index_read_map()
storage/blackhole/ha_blackhole.h:
index_read() -> index_read_map()
storage/csv/ha_tina.cc:
Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte)
storage/example/ha_example.cc:
index_read() -> index_read_map()
storage/example/ha_example.h:
index_read() -> index_read_map()
storage/heap/ha_heap.cc:
index_read() -> index_read_map()
storage/heap/ha_heap.h:
index_read() -> index_read_map()
storage/heap/hp_test1.c:
Fixed compiler warning (on Forte)
storage/heap/hp_test2.c:
Fixed compiler warning (on Forte)
storage/myisam/ft_boolean_search.c:
Fixed compiler warning (on Forte)
storage/myisam/ft_nlq_search.c:
Fixed compiler warning (on Forte)
storage/myisam/ft_parser.c:
Fixed compiler warning (on Forte)
storage/myisam/ft_stopwords.c:
Fixed compiler warning (on Forte)
storage/myisam/ha_myisam.cc:
index_read() -> index_read_map()
storage/myisam/ha_myisam.h:
index_read() -> index_read_map()
storage/myisam/mi_check.c:
Fixed compiler warning (on Forte)
storage/myisam/mi_delete.c:
Fixed compiler warning (on Forte)
storage/myisam/mi_dynrec.c:
Fixed compiler warning (on Forte)
storage/myisam/mi_extra.c:
Fixed compiler warning (on Forte)
storage/myisam/mi_key.c:
Fixed compiler warning (on Forte)
storage/myisam/mi_keycache.c:
Fixed compiler warning (on Forte)
storage/myisam/mi_locking.c:
Fixed compiler warning (on Forte)
storage/myisam/mi_log.c:
Fixed compiler warning (on Forte)
storage/myisam/mi_open.c:
Fixed compiler warning (on Forte)
storage/myisam/mi_packrec.c:
Fixed compiler warning (on Forte)
storage/myisam/mi_page.c:
Fixed compiler warning (on Forte)
storage/myisam/mi_rkey.c:
Added comment
storage/myisam/mi_search.c:
Fixed compiler warning (on Forte)
storage/myisam/mi_statrec.c:
Fixed compiler warning (on Forte)
storage/myisam/mi_test1.c:
Fixed compiler warning (on Forte)
storage/myisam/mi_test2.c:
Fixed compiler warning (on Forte)
storage/myisam/mi_test3.c:
Fixed compiler warning (on Forte)
storage/myisam/mi_update.c:
Fixed compiler warning (on Forte)
storage/myisam/mi_write.c:
Fixed compiler warning (on Forte)
storage/myisam/myisamdef.h:
Fixed that file_read/file_write returns type size_t
Changed some functions to use uchar * as argument/return value instead of char*
This fixed some compiler warnings on Forte
storage/myisam/myisamlog.c:
Fixed compiler warning (on Forte)
storage/myisam/myisampack.c:
Fixed compiler warning (on Forte)
storage/myisam/rt_test.c:
Fixed compiler warning (on Forte)
storage/myisam/sort.c:
Fixed compiler warning (on Forte) by adding casts or changing variables to uchar*
storage/myisam/sp_test.c:
Fixed compiler warning (on Forte) by adding casts or changing variables to uchar*
storage/myisammrg/ha_myisammrg.cc:
index_read() -> index_read_map()
storage/myisammrg/ha_myisammrg.h:
index_read() -> index_read_map()
storage/myisammrg/myrg_create.c:
Fixed compiler warning (on Forte) by adding casts or changing variable types
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Tdummy -> align (as in other part of cluster code)
storage/ndb/src/kernel/vm/DynArr256.cpp:
Removed not used variable
storage/ndb/src/ndbapi/Ndb.cpp:
Removed not used variable
strings/strtod.c:
Include ieeefp.h to avoid compiler warning
tests/bug25714.c:
Fixed compiler warning
tests/mysql_client_test.c:
Remove not used variable
Fixed indentation
Removed never reached code
Fixed compiler warning (on Forte) by adding casts or changing variable types
vio/viosocket.c:
Fixed compiler warning (on Forte) by adding casts or changing variable types
Faster thr_alarm()
Added 'Opened_files' status variable to track calls to my_open()
Don't give warnings when running mysql_install_db
Added option --source-install to mysql_install_db
I had to do the following renames() as used polymorphism didn't work with Forte compiler on 64 bit systems
index_read() -> index_read_map()
index_read_idx() -> index_read_idx_map()
index_read_last() -> index_read_last_map()
into mysql.com:/home/my/mysql-5.1
client/client_priv.h:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqlslap.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/event_data_objects.cc:
Auto merged
sql/event_queue.cc:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_cache.cc:
Manual merge
Removed comment about bug in old code (not relevant)
--long-query-time is now given in seconds with microseconds as decimals
--min_examined_row_limit added for slow query log
long_query_time user variable is now double with 6 decimals
Added functions to get time in microseconds
Added faster time() functions for system that has gethrtime() (Solaris)
We now do less time() calls.
Added field->in_read_set() and field->in_write_set() for easier field manipulation by handlers
set_var.cc and my_getopt() can now handle DOUBLE variables.
All time() calls changed to my_time()
my_time() now does retry's if time() call fails.
Added debug function for stopping in mysql_admin_table() when tables are locked
Some trivial function and struct variable renames to avoid merge errors.
Fixed compiler warnings
Initialization of some time variables on windows moved to my_init()
include/my_getopt.h:
Added support for double arguments
include/my_sys.h:
Fixed wrong type to packfrm()
Added new my_time functions
include/mysql/plugin.h:
Added support for DOUBLE
libmysql/CMakeLists.txt:
Added new time functions
libmysql/Makefile.shared:
Added new time functions
mysql-test/r/variables.result:
Testing of long_query_time
mysql-test/t/variables.test:
Testing of long_query_time
mysys/charset.c:
Fixed compiler warnings
mysys/default_modify.c:
Fixed compiler warnings
mysys/hash.c:
Fixed compiler warnings
mysys/mf_getdate.c:
Use my_time()
mysys/mf_iocache2.c:
Fixed compiler warnings
mysys/mf_pack.c:
Fixed compiler warnings
mysys/mf_path.c:
Fixed compiler warnings
mysys/my_append.c:
Fixed compiler warnings
mysys/my_compress.c:
Fixed compiler warnings
mysys/my_copy.c:
Fixed compiler warnings
mysys/my_gethwaddr.c:
Fixed compiler warnings
mysys/my_getopt.c:
Added support for double arguments
mysys/my_getsystime.c:
Added functions to get time in microseconds.
Added faster time() functions for system that has gethrtime() (Solaris)
Moved windows initialization code to my_init()
mysys/my_init.c:
Added initializing of variables needed for windows time functions
mysys/my_static.c:
Added variables needed for windows time functions
mysys/my_static.h:
Added variables needed for windows time functions
mysys/my_thr_init.c:
Added THR_LOCK_time, used for faster my_time()
mysys/mysys_priv.h:
Added THR_LOCK_time, used for faster my_time()
mysys/thr_alarm.c:
time() -> my_time()
sql/event_data_objects.cc:
end_time() -> set_current_time()
sql/event_queue.cc:
end_time() -> set_current_time()
sql/event_scheduler.cc:
Fixed compiler warnings
sql/field.h:
Added field->in_read_set() and field->in_write_set() for easier field manipulation by handlers
sql/item.h:
Added decimal to Item_float(double)
sql/item_cmpfunc.h:
Added decimal to Item_float(double)
sql/item_timefunc.cc:
time() -> my_time()
sql/item_xmlfunc.cc:
Fixed compiler warning
sql/lock.cc:
lock_time() -> set_time_after_lock()
sql/log.cc:
Timing in slow query log to file is now done in microseconds
Changed some while() loops to for() loops.
Fixed indentation
time() -> my_time()
sql/log.h:
Slow query logging is now done based on microseconds
sql/log_event.cc:
time() -> my_time()
Fixed arguments to new Item_float()
sql/mysql_priv.h:
Fixed compiler warnings
Added opt_log_slow_slave_statements
sql/mysqld.cc:
Added --log_slow_slave_statements and --min_examined_row_limit
--long-query-time now takes a double argument with microsecond resolution
Don't write shutdown message when using --help
Removed not needed \n
Thread create time and connect time is now done in microseconds
time() -> my_time()
Avoid some time() calls
sql/net_serv.cc:
Fixed compiler warnings
sql/parse_file.cc:
time() -> my_time()
sql/set_var.cc:
Added support for DOUBLE variables
Added support for variables that are given in seconds with microsecond resolution
sql/set_var.h:
Added support for variables that are given in seconds with microsecond resolution
sql/slave.cc:
Allow logging of slave queries to slow query log if 'opt_log_slow_slave_statements' is given
time() -> my_time()
sql/sql_cache.h:
Fixed compiler warning()
sql/sql_class.cc:
Initialize new THD variables
sql/sql_class.h:
long_query_time is now in microseconds
Added min_examined_row_limit
Reordered some THD elements for higher efficency
Added timers in microseconds (connect_utime, thr_create_utime, start_utime and utime_after_lock)
Start of query is now recorded both in seconds and in microseconds.
Following renames was made for more clarity and avoid merge problems from earlier versions:
connect_time -> connect_utime
thr_create_time -> thr_create_utime
end_time() -> set_current_time()
lock_time() -> set_time_after_lock()
Added THD::start_utime, which is start of query in microseconds from some arbitary time
Added function THD::current_utime()
Removed safe_time() as retry's are handled in my_time()
sql/sql_connect.cc:
User resources are now using microsecond resolution
sql/sql_insert.cc:
end_time() -> set_current_time()
sql-common/client.c:
time() -> my_time()
sql/sql_parse.cc:
Testing if we should print to slow_query_log() is now done with microsecond precission.
If min_examined_row_limit is given, only log queries to slow query log that has examined more rows than this.
sql/sql_select.cc:
Simplify code now that Item_float() takes decimals as argument
sql/sql_show.cc:
time() -> my_time()
Added support for SYS_DOUBLE
sql/sql_table.cc:
Added debug function for stopping in mysql_admin_table() when tables are locked
sql/structs.h:
intime -> reset_utime
--long-query-time is now given in seconds with microseconds as decimals
--min_examined_row_limit added for slow query log
long_query_time user variable is now double with 6 decimals
Added functions to get time in microseconds
Added faster time() functions for system that has gethrtime() (Solaris)
We now do less time() calls.
Added field->in_read_set() and field->in_write_set() for easier field manipulation by handlers
set_var.cc and my_getopt() can now handle DOUBLE variables.
All time() calls changed to my_time()
my_time() now does retry's if time() call fails.
Added debug function for stopping in mysql_admin_table() when tables are locked
Some trivial function and struct variable renames to avoid merge errors.
Fixed compiler warnings
Initialization of some time variables on windows moved to my_init()
unpack_fields() didn't expect NULL_LENGHT in the field's descriptions.
In this case we get NULL in the resulting string so cannot use
strdup_root to make a copy of it.
strdup_root changed with strmake_root as it's NULL-safe
sql-common/client.c:
Bug #29494 Field packet with NULL fields crashes libmysqlclient
strdup_root changed with strmake_root in unpack_fields()
unpack_fields() didn't expect NULL_LENGHT in the field's descriptions.
In this case we get NULL in the resulting string so cannot use
strdup_root to make a copy of it.
strdup_root changed with strmake_root as it's NULL-safe
If one sets MYSQL_READ_DEFAULTS_FILE and MYSQL_READ_DEFAULT_GROUP options
after mysql_real_connect() called with that MYSQL instance,
these options will affect next mysql_reconnect then.
As we use a copy of the original MYSQL object inside mysql_reconnect,
and mysql_real_connect frees options.my_cnf_file and _group strings,
we will free these twice when we execute mysql_reconnect with the
same MYSQL for the second time.
I don't think we should ever read defaults files handling mysql_reconnect.
So i just set them to 0 for the temporary MYSQL object there/
sql-common/client.c:
Bug #29247 Double free in libmysqlclient_r when mysql restarted.
we don't need mysql_real_connect to reread defaults file in this
case, so set related parameters to zero
If one sets MYSQL_READ_DEFAULTS_FILE and MYSQL_READ_DEFAULT_GROUP options
after mysql_real_connect() called with that MYSQL instance,
these options will affect next mysql_reconnect then.
As we use a copy of the original MYSQL object inside mysql_reconnect,
and mysql_real_connect frees options.my_cnf_file and _group strings,
we will free these twice when we execute mysql_reconnect with the
same MYSQL for the second time.
I don't think we should ever read defaults files handling mysql_reconnect.
So i just set them to 0 for the temporary MYSQL object there/
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql-common/client.c:
Auto merged
sql/mysqld.cc:
Auto merged
long shared-memory-base-names could overflow a static internal buffer
and thus crash mysqld and various clients. change both to dynamic
buffers, show everything but overflowing those buffers still works.
The test case for this would pretty much amount to
mysqld --shared-memory-base-name=HeyMrBaseNameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX --shared-memory=1 &
mysqladmin --no-defaults --shared-memory-base-name=HeyMrBaseNameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX shutdown
Unfortunately, we can't just use an .opt file for the
server. The .opt file is used at start-up, before any
include in the actual test can tell mysqltest to skip
this one on non-Windows. As a result, such a test would
break on unices.
Fixing mysql-test-run.pl to export full path for master
and slave would enable us to start a server from within
the test which is ugly and, what's more, doesn't work as
the server blocks (mysqltest offers no fire-and-forget
fork-and-exec), and mysqladmin never gets run.
Making the test rpl_windows_shm or some such so we can
is beyond ugly. As is introducing another file-name based
special case (run "win*.test" only when on Windows). As is
(yuck) coding half the test into mtr (as in, having it
hand out a customized environment conductive to the shm-
thing on Win only).
Situation is exacerbated by the fact that .sh is not
necessary run as expected on Win.
In short, it's just not worth it. No test-case until we
have a new-and-improved test framework.
sql-common/client.c:
Bug#24924: shared-memory-base-name that is too long causes buffer overflow
compose shared memory name in dynamic rather than static buffer to prevent
overflows (clients)
sql/mysqld.cc:
Bug#24924: shared-memory-base-name that is too long causes buffer overflow
compose shared memory name in dynamic rather than static buffer to prevent
overflows (server)
long shared-memory-base-names could overflow a static internal buffer
and thus crash mysqld and various clients. change both to dynamic
buffers, show everything but overflowing those buffers still works.
The test case for this would pretty much amount to
mysqld --shared-memory-base-name=HeyMrBaseNameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX --shared-memory=1 &
mysqladmin --no-defaults --shared-memory-base-name=HeyMrBaseNameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX shutdown
Unfortunately, we can't just use an .opt file for the
server. The .opt file is used at start-up, before any
include in the actual test can tell mysqltest to skip
this one on non-Windows. As a result, such a test would
break on unices.
Fixing mysql-test-run.pl to export full path for master
and slave would enable us to start a server from within
the test which is ugly and, what's more, doesn't work as
the server blocks (mysqltest offers no fire-and-forget
fork-and-exec), and mysqladmin never gets run.
Making the test rpl_windows_shm or some such so we can
is beyond ugly. As is introducing another file-name based
special case (run "win*.test" only when on Windows). As is
(yuck) coding half the test into mtr (as in, having it
hand out a customized environment conductive to the shm-
thing on Win only).
Situation is exacerbated by the fact that .sh is not
necessary run as expected on Win.
In short, it's just not worth it. No test-case until we
have a new-and-improved test framework.
- Add build configuration parameter EMBEDDED_ONLY which will configure
the VS solution to produce only mysql embedded binary.
- Make necessary updates to successfully compile solution.
CMakeLists.txt:
Embedded Server doesn't build on Windows.
- Remove leading space from various definitions.
- Remove optimizations from RelWithDebInfo configuration for debugging.
- Conditionally add the necessary build directories based on
EMBEDDED_ONLY flag.
BitKeeper/etc/ignore:
Embedded Server doesn't build on Windows.
- Ignore CMake's default configuration output directories.
- Ignore autogenerated cmake_dummy.c file.
libmysql/client_settings.h:
Embedded Server doesn't build on Windows.
- Build fixup
libmysqld/CMakeLists.txt:
Embedded Server doesn't build on Windows.
- Update for recent changes.
libmysqld/libmysqld.def:
Embedded Server doesn't build on Windows.
- Export necessary methods.
libmysqld/examples/CMakeLists.txt:
Embedded Server doesn't build on Windows.
- Updated include directories.
- test_libmysqld fixup.
- Added mysqltest_embedded and mysql_client_test_embedded exes needed for
testing.
sql/mysqld.cc:
Embedded Server doesn't build on Windows.
- Build fixup.
sql/sql_binlog.cc:
Embedded Server doesn't build on Windows.
- Build fixup.
sql-common/client.c:
Embedded Server doesn't build on Windows.
- Build fixup.
storage/federated/CMakeLists.txt:
Embedded Server doesn't build on Windows.
- Define USE_TLS for embedded only builds.
storage/heap/CMakeLists.txt:
Embedded Server doesn't build on Windows.
- Define USE_TLS for embedded only builds.
storage/innobase/CMakeLists.txt:
Embedded Server doesn't build on Windows.
- Define USE_TLS for embedded only builds.
storage/myisam/CMakeLists.txt:
Embedded Server doesn't build on Windows.
- Define USE_TLS for embedded only builds.
storage/myisam/ha_myisam.cc:
Embedded Server doesn't build on Windows.
- Define USE_TLS for embedded only builds.
storage/myisammrg/CMakeLists.txt:
Embedded Server doesn't build on Windows.
- Define USE_TLS for embedded only builds.
win/configure.js:
Embedded Server doesn't build on Windows.
- Add EMBEDDED_ONLY build configuration.
- Add build configuration parameter EMBEDDED_ONLY which will configure
the VS solution to produce only mysql embedded binary.
- Make necessary updates to successfully compile solution.
The events were not being opened in the global namespace.
sql-common/client.c:
Add Global\\ to the event names so they are opened in the global namespace
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51
client/mysqldump.c:
Auto merged
include/m_string.h:
Auto merged
include/mysql_com.h:
Auto merged
include/violite.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/include/mix1.inc:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/innodb_mysql.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysys/my_init.c:
Auto merged
server-tools/instance-manager/mysql_connection.cc:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/net_serv.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_connect.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_yacc.yy:
Auto merged
strings/ctype-mb.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
strings/strtod.c:
Auto merged
vio/vio_priv.h:
Auto merged
vio/viosocket.c:
Auto merged
client/mysqltest.c:
SCCS merged
include/my_global.h:
SCCS merged
sql/field.h:
SCCS merged
sql/sql_table.cc:
Manual merge
strings/ctype-bin.c:
Manual merge
into pilot.blaudden:/home/msvensson/mysql/bug26664/my51-bug26664
include/mysql_com.h:
Auto merged
include/violite.h:
Auto merged
libmysql/libmysql.c:
Auto merged
server-tools/instance-manager/mysql_connection.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/net_serv.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
vio/viosocket.c:
Auto merged
sql/sql_parse.cc:
Merge 5.0->5.1
- The "mysql client in mysqld"(which is used by
replication and federated) should use alarms instead of setting
socket timeout value if the rest of the server uses alarm. By
always calling 'my_net_set_write_timeout'
or 'my_net_set_read_timeout' when changing the timeout value(s), the
selection whether to use alarms or timeouts will be handled by
ifdef's in those two functions.
- Move declaration of 'vio_timeout' into "vio_priv.h"
include/mysql_com.h:
Move the net_set_*_timeout function declarations to mysql_com.h and
rename to my_net_set_*_timeout to avoid name clashes
include/violite.h:
Move declaration of 'vio_timeout' to vio_priv.h (to make
the function as private as possible)
libmysql/libmysql.c:
Use my_net_read_timeout or my_net_write_timeout when setting
the timeouts. Move the global variables for my_net_read/my_write_timeout
into the only place where they are used. Thus removing them...
server-tools/instance-manager/mysql_connection.cc:
Use my_net_read_timeout or my_net_write_timeout when setting the timeouts
sql-common/client.c:
Use my_net_read_timeout or my_net_write_timeout when setting the timeouts
sql/mysql_priv.h:
Move the net_set_*_timeout function declarations to mysql_com.h
sql/net_serv.cc:
No need to cast the net->write_timeout value from "uint" to "uint"
sql/set_var.cc:
Rename net_set_*_timeout to my_net_set_*_timeout
sql/sql_client.cc:
Use my_net_read_timeout or my_net_write_timeout when setting the timeouts
sql/sql_parse.cc:
Rename net_set_*_timeout to my_net_set_*_timeout
sql/sql_repl.cc:
Rename net_set_*_timeout to my_net_set_*_timeout
vio/vio_priv.h:
Move declaration of 'vio_timeout' to vio_priv.h
vio/viosocket.c:
Cleanup 'vio_timeout'
- Use "const void*" on POSIX and "const char*" on windows for
setsockopt
- Add DBUG_PRINT's
- Add comment about why we don't have an implementation of
vio_timeout for platforms not supporting SO_SNDTIMEO or SO_RCVTIMEO
- The "mysql client in mysqld"(which is used by
replication and federated) should use alarms instead of setting
socket timeout value if the rest of the server uses alarm. By
always calling 'my_net_set_write_timeout'
or 'my_net_set_read_timeout' when changing the timeout value(s), the
selection whether to use alarms or timeouts will be handled by
ifdef's in those two functions.
- Move declaration of 'vio_timeout' into "vio_priv.h"
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
BitKeeper/etc/ignore:
added libmysqld/ha_ndbcluster_cond.cc
---
added debian/defs.mk debian/control
client/completion_hash.cc:
Remove not needed casts
client/my_readline.h:
Remove some old types
client/mysql.cc:
Simplify types
client/mysql_upgrade.c:
Remove some old types
Update call to dirname_part
client/mysqladmin.cc:
Remove some old types
client/mysqlbinlog.cc:
Remove some old types
Change some buffers to be uchar to avoid casts
client/mysqlcheck.c:
Remove some old types
client/mysqldump.c:
Remove some old types
Remove some not needed casts
Change some string lengths to size_t
client/mysqlimport.c:
Remove some old types
client/mysqlshow.c:
Remove some old types
client/mysqlslap.c:
Remove some old types
Remove some not needed casts
client/mysqltest.c:
Removed some old types
Removed some not needed casts
Updated hash-get-key function arguments
Updated parameters to dirname_part()
client/readline.cc:
Removed some old types
Removed some not needed casts
Changed some string lengths to use size_t
client/sql_string.cc:
Removed some old types
dbug/dbug.c:
Removed some old types
Changed some string lengths to use size_t
Changed some prototypes to avoid casts
extra/comp_err.c:
Removed some old types
extra/innochecksum.c:
Removed some old types
extra/my_print_defaults.c:
Removed some old types
extra/mysql_waitpid.c:
Removed some old types
extra/perror.c:
Removed some old types
extra/replace.c:
Removed some old types
Updated parameters to dirname_part()
extra/resolve_stack_dump.c:
Removed some old types
extra/resolveip.c:
Removed some old types
include/config-win.h:
Removed some old types
include/decimal.h:
Changed binary strings to be uchar* instead of char*
include/ft_global.h:
Removed some old types
include/hash.h:
Removed some old types
include/heap.h:
Removed some old types
Changed records_under_level to be 'ulong' instead of 'uint' to clarify usage of variable
include/keycache.h:
Removed some old types
include/m_ctype.h:
Removed some old types
Changed some string lengths to use size_t
Changed character length functions to return uint
unsigned char -> uchar
include/m_string.h:
Removed some old types
Changed some string lengths to use size_t
include/my_alloc.h:
Changed some string lengths to use size_t
include/my_base.h:
Removed some old types
include/my_dbug.h:
Removed some old types
Changed some string lengths to use size_t
Changed db_dump() to take uchar * as argument for memory to reduce number of casts in usage
include/my_getopt.h:
Removed some old types
include/my_global.h:
Removed old types:
my_size_t -> size_t
byte -> uchar
gptr -> uchar *
include/my_list.h:
Removed some old types
include/my_nosys.h:
Removed some old types
include/my_pthread.h:
Removed some old types
include/my_sys.h:
Removed some old types
Changed MY_FILE_ERROR to be in line with new definitions of my_write()/my_read()
Changed some string lengths to use size_t
my_malloc() / my_free() now uses void *
Updated parameters to dirname_part() & my_uncompress()
include/my_tree.h:
Removed some old types
include/my_trie.h:
Removed some old types
include/my_user.h:
Changed some string lengths to use size_t
include/my_vle.h:
Removed some old types
include/my_xml.h:
Removed some old types
Changed some string lengths to use size_t
include/myisam.h:
Removed some old types
include/myisammrg.h:
Removed some old types
include/mysql.h:
Removed some old types
Changed byte streams to use uchar* instead of char*
include/mysql_com.h:
Removed some old types
Changed some string lengths to use size_t
Changed some buffers to be uchar* to avoid casts
include/queues.h:
Removed some old types
include/sql_common.h:
Removed some old types
include/sslopt-longopts.h:
Removed some old types
include/violite.h:
Removed some old types
Changed some string lengths to use size_t
libmysql/client_settings.h:
Removed some old types
libmysql/libmysql.c:
Removed some old types
libmysql/manager.c:
Removed some old types
libmysqld/emb_qcache.cc:
Removed some old types
libmysqld/emb_qcache.h:
Removed some old types
libmysqld/lib_sql.cc:
Removed some old types
Removed some not needed casts
Changed some buffers to be uchar* to avoid casts
true -> TRUE, false -> FALSE
mysys/array.c:
Removed some old types
mysys/charset.c:
Changed some string lengths to use size_t
mysys/checksum.c:
Include zlib to get definition for crc32
Removed some old types
mysys/default.c:
Removed some old types
Changed some string lengths to use size_t
mysys/default_modify.c:
Changed some string lengths to use size_t
Removed some not needed casts
mysys/hash.c:
Removed some old types
Changed some string lengths to use size_t
Note: Prototype of hash_key() has changed which may cause problems if client uses hash_init() with a cast for the hash-get-key function.
hash_element now takes 'ulong' as the index type (cleanup)
mysys/list.c:
Removed some old types
mysys/mf_cache.c:
Changed some string lengths to use size_t
mysys/mf_dirname.c:
Removed some old types
Changed some string lengths to use size_t
Added argument to dirname_part() to avoid calculation of length for 'to'
mysys/mf_fn_ext.c:
Removed some old types
Updated parameters to dirname_part()
mysys/mf_format.c:
Removed some old types
Changed some string lengths to use size_t
mysys/mf_getdate.c:
Removed some old types
mysys/mf_iocache.c:
Removed some old types
Changed some string lengths to use size_t
Changed calculation of 'max_length' to be done the same way in all functions
mysys/mf_iocache2.c:
Removed some old types
Changed some string lengths to use size_t
Clean up comments
Removed not needed indentation
mysys/mf_keycache.c:
Removed some old types
mysys/mf_keycaches.c:
Removed some old types
mysys/mf_loadpath.c:
Removed some old types
mysys/mf_pack.c:
Removed some old types
Changed some string lengths to use size_t
Removed some not needed casts
Removed very old VMS code
Updated parameters to dirname_part()
Use result of dirnam_part() to remove call to strcat()
mysys/mf_path.c:
Removed some old types
mysys/mf_radix.c:
Removed some old types
mysys/mf_same.c:
Removed some old types
mysys/mf_sort.c:
Removed some old types
mysys/mf_soundex.c:
Removed some old types
mysys/mf_strip.c:
Removed some old types
mysys/mf_tempdir.c:
Removed some old types
mysys/mf_unixpath.c:
Removed some old types
mysys/mf_wfile.c:
Removed some old types
mysys/mulalloc.c:
Removed some old types
mysys/my_alloc.c:
Removed some old types
Changed some string lengths to use size_t
Use void* as type for allocated memory area
Removed some not needed casts
Changed argument 'Size' to 'length' according coding guidelines
mysys/my_chsize.c:
Changed some buffers to be uchar* to avoid casts
mysys/my_compress.c:
More comments
Removed some old types
Changed string lengths to use size_t
Changed arguments to my_uncompress() to make them easier to understand
Changed packfrm()/unpackfrm() to not be depending on uint size (portability fix)
Changed type of 'pack_data' argument to packfrm() to avoid casts.
mysys/my_conio.c:
Changed some string lengths to use size_t
mysys/my_create.c:
Removed some old types
mysys/my_div.c:
Removed some old types
mysys/my_error.c:
Removed some old types
mysys/my_fopen.c:
Removed some old types
mysys/my_fstream.c:
Removed some old types
Changed some string lengths to use size_t
writen -> written
mysys/my_getopt.c:
Removed some old types
mysys/my_getwd.c:
Removed some old types
More comments
mysys/my_init.c:
Removed some old types
mysys/my_largepage.c:
Removed some old types
Changed some string lengths to use size_t
mysys/my_lib.c:
Removed some old types
mysys/my_lockmem.c:
Removed some old types
mysys/my_malloc.c:
Removed some old types
Changed malloc(), free() and related functions to use void *
Changed all functions to use size_t
mysys/my_memmem.c:
Indentation cleanup
mysys/my_once.c:
Removed some old types
Changed malloc(), free() and related functions to use void *
mysys/my_open.c:
Removed some old types
mysys/my_pread.c:
Removed some old types
Changed all functions to use size_t
Added comment for how my_pread() / my_pwrite() are supposed to work.
Removed windows specific code to restore cursor position as this causes slowdown on windows and we should not mix read() and pread() calls anyway as this is not thread safe.
(If we ever would really need this, it should be enabled only with a flag argument)
mysys/my_quick.c:
Removed some old types
Changed all functions to use size_t
mysys/my_read.c:
Removed some old types
Changed all functions to use size_t
mysys/my_realloc.c:
Removed some old types
Use void* as type for allocated memory area
Changed all functions to use size_t
mysys/my_static.c:
Removed some old types
mysys/my_static.h:
Removed some old types
mysys/my_vle.c:
Removed some old types
mysys/my_wincond.c:
Removed some old types
mysys/my_windac.c:
Removed some old types
mysys/my_write.c:
Removed some old types
Changed all functions to use size_t
mysys/ptr_cmp.c:
Removed some old types
Changed all functions to use size_t
mysys/queues.c:
Removed some old types
mysys/safemalloc.c:
Removed some old types
Changed malloc(), free() and related functions to use void *
Changed all functions to use size_t
mysys/string.c:
Removed some old types
Changed all functions to use size_t
mysys/testhash.c:
Removed some old types
mysys/thr_alarm.c:
Removed some old types
mysys/thr_lock.c:
Removed some old types
mysys/tree.c:
Removed some old types
mysys/trie.c:
Removed some old types
mysys/typelib.c:
Removed some old types
plugin/daemon_example/daemon_example.cc:
Removed some old types
regex/reginit.c:
Removed some old types
server-tools/instance-manager/buffer.cc:
Changed some string lengths to use size_t
Changed buffer to be of type uchar*
server-tools/instance-manager/buffer.h:
Changed some string lengths to use size_t
Changed buffer to be of type uchar*
server-tools/instance-manager/commands.cc:
Removed some old types
Changed some string lengths to use size_t
Changed buffer to be of type uchar*
server-tools/instance-manager/instance_map.cc:
Removed some old types
Changed some string lengths to use size_t
Changed buffer to be of type uchar*
server-tools/instance-manager/instance_options.cc:
Changed buffer to be of type uchar*
Replaced alloc_root + strcpy() with strdup_root()
server-tools/instance-manager/mysql_connection.cc:
Changed buffer to be of type uchar*
server-tools/instance-manager/options.cc:
Removed some old types
server-tools/instance-manager/parse.cc:
Changed some string lengths to use size_t
server-tools/instance-manager/parse.h:
Removed some old types
Changed some string lengths to use size_t
server-tools/instance-manager/protocol.cc:
Changed some buffers to be uchar* to avoid casts
Changed some string lengths to use size_t
server-tools/instance-manager/protocol.h:
Changed some string lengths to use size_t
server-tools/instance-manager/user_map.cc:
Removed some old types
Changed some string lengths to use size_t
sql/derror.cc:
Removed some old types
Changed some buffers to be uchar* to avoid casts
Changed some string lengths to use size_t
sql/discover.cc:
Changed in readfrm() and writefrom() the type for argument 'frmdata' to uchar** to avoid casts
Changed some string lengths to use size_t
Changed some buffers to be uchar* to avoid casts
sql/event_data_objects.cc:
Removed some old types
Added missing casts for alloc() and sprintf()
sql/event_db_repository.cc:
Changed some buffers to be uchar* to avoid casts
Added missing casts for sprintf()
sql/event_queue.cc:
Removed some old types
sql/field.cc:
Removed some old types
Changed memory buffers to be uchar*
Changed some string lengths to use size_t
Removed a lot of casts
Safety fix in Field_blob::val_decimal() to not access zero pointer
sql/field.h:
Removed some old types
Changed memory buffers to be uchar* (except of store() as this would have caused too many other changes).
Changed some string lengths to use size_t
Removed some not needed casts
Changed val_xxx(xxx, new_ptr) to take const pointers
sql/field_conv.cc:
Removed some old types
Added casts required because memory area pointers are now uchar*
sql/filesort.cc:
Initalize variable that was used unitialized in error conditions
sql/gen_lex_hash.cc:
Removed some old types
Changed memory buffers to be uchar*
Changed some string lengths to use size_t
Removed a lot of casts
Safety fix in Field_blob::val_decimal() to not access zero pointer
sql/gstream.h:
Added required cast
sql/ha_ndbcluster.cc:
Removed some old types
Updated hash-get-key function arguments
Changed some buffers to be uchar* to avoid casts
Added required casts
Removed some not needed casts
sql/ha_ndbcluster.h:
Removed some old types
sql/ha_ndbcluster_binlog.cc:
Removed some old types
Changed some buffers to be uchar* to avoid casts
Replaced sql_alloc() + memcpy() + set end 0 with sql_strmake()
Changed some string lengths to use size_t
Added missing casts for alloc() and sprintf()
sql/ha_ndbcluster_binlog.h:
Removed some old types
sql/ha_ndbcluster_cond.cc:
Removed some old types
Removed some not needed casts
sql/ha_ndbcluster_cond.h:
Removed some old types
sql/ha_partition.cc:
Removed some old types
Changed prototype for change_partition() to avoid casts
sql/ha_partition.h:
Removed some old types
sql/handler.cc:
Removed some old types
Changed some string lengths to use size_t
sql/handler.h:
Removed some old types
Changed some string lengths to use size_t
Changed type for 'frmblob' parameter for discover() and ha_discover() to get fewer casts
sql/hash_filo.h:
Removed some old types
Changed all functions to use size_t
sql/hostname.cc:
Removed some old types
sql/item.cc:
Removed some old types
Changed some string lengths to use size_t
Use strmake() instead of memdup() to create a null terminated string.
Updated calls to new Field()
sql/item.h:
Removed some old types
Changed malloc(), free() and related functions to use void *
Changed some buffers to be uchar* to avoid casts
sql/item_cmpfunc.cc:
Removed some old types
Changed some buffers to be uchar* to avoid casts
sql/item_cmpfunc.h:
Removed some old types
sql/item_create.cc:
Removed some old types
sql/item_func.cc:
Removed some old types
Changed some buffers to be uchar* to avoid casts
Removed some not needed casts
Added test for failing alloc() in init_result_field()
Remove old confusing comment
Fixed compiler warning
sql/item_func.h:
Removed some old types
sql/item_row.cc:
Removed some old types
sql/item_row.h:
Removed some old types
sql/item_strfunc.cc:
Include zlib (needed becasue we call crc32)
Removed some old types
sql/item_strfunc.h:
Removed some old types
Changed some types to match new function prototypes
sql/item_subselect.cc:
Removed some old types
sql/item_subselect.h:
Removed some old types
sql/item_sum.cc:
Removed some old types
Changed some buffers to be uchar* to avoid casts
Removed some not needed casts
sql/item_sum.h:
Removed some old types
sql/item_timefunc.cc:
Removed some old types
Changed some string lengths to use size_t
sql/item_timefunc.h:
Removed some old types
sql/item_xmlfunc.cc:
Changed some string lengths to use size_t
sql/item_xmlfunc.h:
Removed some old types
sql/key.cc:
Removed some old types
Removed some not needed casts
sql/lock.cc:
Removed some old types
Added some cast to my_multi_malloc() arguments for safety
sql/log.cc:
Removed some old types
Changed some string lengths to use size_t
Changed some buffers to be uchar* to avoid casts
Changed usage of pwrite() to not assume it holds the cursor position for the file
Made usage of my_read() safer
sql/log_event.cc:
Removed some old types
Added checking of return value of malloc() in pack_info()
Changed some buffers to be uchar* to avoid casts
Removed some 'const' to avoid casts
Added missing casts for alloc() and sprintf()
Added required casts
Removed some not needed casts
Added some cast to my_multi_malloc() arguments for safety
sql/log_event.h:
Removed some old types
Changed some buffers to be uchar* to avoid casts
sql/log_event_old.cc:
Changed some buffers to be uchar* to avoid casts
Removed some not needed casts
sql/log_event_old.h:
Changed some buffers to be uchar* to avoid casts
sql/mf_iocache.cc:
Removed some old types
sql/my_decimal.cc:
Changed memory area to use uchar*
sql/my_decimal.h:
Changed memory area to use uchar*
sql/mysql_priv.h:
Removed some old types
Changed malloc(), free() and related functions to use void *
Changed some string lengths to use size_t
Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid long overflow
Changed some buffers to be uchar* to avoid casts
sql/mysqld.cc:
Removed some old types
sql/net_serv.cc:
Removed some old types
Changed some string lengths to use size_t
Changed some buffers to be uchar* to avoid casts
Ensure that vio_read()/vio_write() return values are stored in a size_t variable
Removed some not needed casts
sql/opt_range.cc:
Removed some old types
Changed some buffers to be uchar* to avoid casts
Removed some not needed casts
sql/opt_range.h:
Removed some old types
Changed some buffers to be uchar* to avoid casts
sql/opt_sum.cc:
Removed some old types
Removed some not needed casts
sql/parse_file.cc:
Removed some old types
Changed some string lengths to use size_t
Changed alloc_root + memcpy + set end 0 -> strmake_root()
sql/parse_file.h:
Removed some old types
sql/partition_info.cc:
Removed some old types
Added missing casts for alloc()
Changed some buffers to be uchar* to avoid casts
sql/partition_info.h:
Changed some buffers to be uchar* to avoid casts
sql/protocol.cc:
Removed some old types
Changed some buffers to be uchar* to avoid casts
Removed some not needed casts
sql/protocol.h:
Removed some old types
Changed some buffers to be uchar* to avoid casts
Changed some string lengths to use size_t
sql/records.cc:
Removed some old types
sql/repl_failsafe.cc:
Removed some old types
Changed some string lengths to use size_t
Added required casts
sql/rpl_filter.cc:
Removed some old types
Updated hash-get-key function arguments
Changed some string lengths to use size_t
sql/rpl_filter.h:
Changed some string lengths to use size_t
sql/rpl_injector.h:
Removed some old types
sql/rpl_record.cc:
Removed some old types
Removed some not needed casts
Changed some buffers to be uchar* to avoid casts
sql/rpl_record.h:
Removed some old types
Changed some buffers to be uchar* to avoid casts
sql/rpl_record_old.cc:
Removed some old types
Changed some buffers to be uchar* to avoid casts
Removed some not needed casts
sql/rpl_record_old.h:
Removed some old types
Changed some buffers to be uchar* to avoid cast
sql/rpl_rli.cc:
Removed some old types
sql/rpl_tblmap.cc:
Removed some old types
sql/rpl_tblmap.h:
Removed some old types
sql/rpl_utility.cc:
Removed some old types
sql/rpl_utility.h:
Removed some old types
Changed type of m_size from my_size_t to ulong to reflect that m_size is the number of elements in the array, not a string/memory length
sql/set_var.cc:
Removed some old types
Updated parameters to dirname_part()
sql/set_var.h:
Removed some old types
sql/slave.cc:
Removed some old types
Changed some string lengths to use size_t
sql/slave.h:
Removed some old types
sql/sp.cc:
Removed some old types
Added missing casts for printf()
sql/sp.h:
Removed some old types
Updated hash-get-key function arguments
sql/sp_cache.cc:
Removed some old types
Added missing casts for printf()
Updated hash-get-key function arguments
sql/sp_head.cc:
Removed some old types
Added missing casts for alloc() and printf()
Added required casts
Updated hash-get-key function arguments
sql/sp_head.h:
Removed some old types
sql/sp_pcontext.cc:
Removed some old types
sql/sp_pcontext.h:
Removed some old types
sql/sql_acl.cc:
Removed some old types
Changed some string lengths to use size_t
Changed some buffers to be uchar* to avoid casts
Removed some not needed casts
Added required casts
sql/sql_analyse.cc:
Changed some buffers to be uchar* to avoid casts
sql/sql_analyse.h:
Changed some buffers to be uchar* to avoid casts
sql/sql_array.h:
Removed some old types
sql/sql_base.cc:
Removed some old types
Updated hash-get-key function arguments
sql/sql_binlog.cc:
Removed some old types
Added missing casts for printf()
sql/sql_cache.cc:
Removed some old types
Updated hash-get-key function arguments
Removed some not needed casts
Changed some string lengths to use size_t
sql/sql_cache.h:
Removed some old types
Removed reference to not existing function cache_key()
Updated hash-get-key function arguments
sql/sql_class.cc:
Removed some old types
Updated hash-get-key function arguments
Added missing casts for alloc()
Updated hash-get-key function arguments
Moved THD::max_row_length() to table.cc (as it's not depending on THD)
Removed some not needed casts
sql/sql_class.h:
Removed some old types
Changed malloc(), free() and related functions to use void *
Removed some not needed casts
Changed some string lengths to use size_t
Moved max_row_length and max_row_length_blob() to table.cc, as they are not depending on THD
sql/sql_connect.cc:
Removed some old types
Added required casts
sql/sql_db.cc:
Removed some old types
Removed some not needed casts
Added some cast to my_multi_malloc() arguments for safety
Added missing casts for alloc()
sql/sql_delete.cc:
Removed some old types
sql/sql_handler.cc:
Removed some old types
Updated hash-get-key function arguments
Added some cast to my_multi_malloc() arguments for safety
sql/sql_help.cc:
Removed some old types
Changed some buffers to be uchar* to avoid casts
Removed some not needed casts
sql/sql_insert.cc:
Removed some old types
Added missing casts for alloc() and printf()
sql/sql_lex.cc:
Removed some old types
sql/sql_lex.h:
Removed some old types
Removed some not needed casts
sql/sql_list.h:
Removed some old types
Removed some not needed casts
sql/sql_load.cc:
Removed some old types
Removed compiler warning
sql/sql_manager.cc:
Removed some old types
sql/sql_map.cc:
Removed some old types
sql/sql_map.h:
Removed some old types
sql/sql_olap.cc:
Removed some old types
sql/sql_parse.cc:
Removed some old types
Trivial move of code lines to make things more readable
Changed some string lengths to use size_t
Added missing casts for alloc()
sql/sql_partition.cc:
Removed some old types
Removed compiler warnings about not used functions
Changed some buffers to be uchar* to avoid casts
Removed some not needed casts
sql/sql_partition.h:
Removed some old types
Changed some buffers to be uchar* to avoid casts
sql/sql_plugin.cc:
Removed some old types
Added missing casts for alloc()
Updated hash-get-key function arguments
sql/sql_prepare.cc:
Removed some old types
Changed some buffers to be uchar* to avoid casts
Added missing casts for alloc() and printf()
sql-common/client.c:
Removed some old types
Changed some memory areas to use uchar*
sql-common/my_user.c:
Changed some string lengths to use size_t
sql-common/pack.c:
Changed some buffers to be uchar* to avoid casts
sql/sql_repl.cc:
Added required casts
Changed some buffers to be uchar* to avoid casts
Changed some string lengths to use size_t
sql/sql_select.cc:
Removed some old types
Changed some buffers to be uchar* to avoid casts
Removed some old types
sql/sql_select.h:
Removed some old types
Changed some buffers to be uchar* to avoid casts
sql/sql_servers.cc:
Removed some old types
Updated hash-get-key function arguments
sql/sql_show.cc:
Removed some old types
Added missing casts for alloc()
Removed some not needed casts
sql/sql_string.cc:
Removed some old types
Added required casts
sql/sql_table.cc:
Removed some old types
Removed compiler warning about not used variable
Changed some buffers to be uchar* to avoid casts
Removed some not needed casts
sql/sql_test.cc:
Removed some old types
sql/sql_trigger.cc:
Removed some old types
Added missing casts for alloc()
sql/sql_udf.cc:
Removed some old types
Updated hash-get-key function arguments
sql/sql_union.cc:
Removed some old types
sql/sql_update.cc:
Removed some old types
Removed some not needed casts
sql/sql_view.cc:
Removed some old types
sql/sql_yacc.yy:
Removed some old types
Changed some string lengths to use size_t
Added missing casts for alloc()
sql/stacktrace.c:
Removed some old types
sql/stacktrace.h:
Removed some old types
sql/structs.h:
Removed some old types
sql/table.cc:
Removed some old types
Updated hash-get-key function arguments
Changed some buffers to be uchar* to avoid casts
Removed setting of LEX_STRING() arguments in declaration
Added required casts
More function comments
Moved max_row_length() here from sql_class.cc/sql_class.h
sql/table.h:
Removed some old types
Changed some string lengths to use size_t
sql/thr_malloc.cc:
Use void* as type for allocated memory area
Changed all functions to use size_t
sql/tzfile.h:
Changed some buffers to be uchar* to avoid casts
sql/tztime.cc:
Changed some buffers to be uchar* to avoid casts
Updated hash-get-key function arguments
Added missing casts for alloc()
Removed some not needed casts
sql/uniques.cc:
Removed some old types
Removed some not needed casts
sql/unireg.cc:
Removed some old types
Changed some buffers to be uchar* to avoid casts
Removed some not needed casts
Added missing casts for alloc()
storage/archive/archive_reader.c:
Removed some old types
storage/archive/azio.c:
Removed some old types
Removed some not needed casts
storage/archive/ha_archive.cc:
Removed some old types
Changed type for 'frmblob' in archive_discover() to match handler
Updated hash-get-key function arguments
Removed some not needed casts
storage/archive/ha_archive.h:
Removed some old types
storage/blackhole/ha_blackhole.cc:
Removed some old types
storage/blackhole/ha_blackhole.h:
Removed some old types
storage/csv/ha_tina.cc:
Removed some old types
Updated hash-get-key function arguments
Changed some buffers to be uchar* to avoid casts
storage/csv/ha_tina.h:
Removed some old types
Removed some not needed casts
storage/csv/transparent_file.cc:
Removed some old types
Changed type of 'bytes_read' to be able to detect read errors
Fixed indentation
storage/csv/transparent_file.h:
Removed some old types
storage/example/ha_example.cc:
Removed some old types
Updated hash-get-key function arguments
storage/example/ha_example.h:
Removed some old types
storage/federated/ha_federated.cc:
Removed some old types
Updated hash-get-key function arguments
Removed some not needed casts
storage/federated/ha_federated.h:
Removed some old types
storage/heap/_check.c:
Changed some buffers to be uchar* to avoid casts
storage/heap/_rectest.c:
Removed some old types
storage/heap/ha_heap.cc:
Removed some old types
storage/heap/ha_heap.h:
Removed some old types
storage/heap/heapdef.h:
Removed some old types
storage/heap/hp_block.c:
Removed some old types
Changed some string lengths to use size_t
storage/heap/hp_clear.c:
Removed some old types
storage/heap/hp_close.c:
Removed some old types
storage/heap/hp_create.c:
Removed some old types
storage/heap/hp_delete.c:
Removed some old types
storage/heap/hp_hash.c:
Removed some old types
storage/heap/hp_info.c:
Removed some old types
storage/heap/hp_open.c:
Removed some old types
storage/heap/hp_rfirst.c:
Removed some old types
storage/heap/hp_rkey.c:
Removed some old types
storage/heap/hp_rlast.c:
Removed some old types
storage/heap/hp_rnext.c:
Removed some old types
storage/heap/hp_rprev.c:
Removed some old types
storage/heap/hp_rrnd.c:
Removed some old types
storage/heap/hp_rsame.c:
Removed some old types
storage/heap/hp_scan.c:
Removed some old types
storage/heap/hp_test1.c:
Removed some old types
storage/heap/hp_test2.c:
Removed some old types
storage/heap/hp_update.c:
Removed some old types
storage/heap/hp_write.c:
Removed some old types
Changed some string lengths to use size_t
storage/innobase/handler/ha_innodb.cc:
Removed some old types
Updated hash-get-key function arguments
Added missing casts for alloc() and printf()
Removed some not needed casts
storage/innobase/handler/ha_innodb.h:
Removed some old types
storage/myisam/ft_boolean_search.c:
Removed some old types
storage/myisam/ft_nlq_search.c:
Removed some old types
storage/myisam/ft_parser.c:
Removed some old types
Changed some buffers to be uchar* to avoid casts
storage/myisam/ft_static.c:
Removed some old types
storage/myisam/ft_stopwords.c:
Removed some old types
storage/myisam/ft_update.c:
Removed some old types
Changed some buffers to be uchar* to avoid casts
storage/myisam/ftdefs.h:
Removed some old types
Changed some buffers to be uchar* to avoid casts
storage/myisam/fulltext.h:
Removed some old types
storage/myisam/ha_myisam.cc:
Removed some old types
storage/myisam/ha_myisam.h:
Removed some old types
storage/myisam/mi_cache.c:
Removed some old types
Changed some buffers to be uchar* to avoid casts
storage/myisam/mi_check.c:
Removed some old types
storage/myisam/mi_checksum.c:
Removed some old types
storage/myisam/mi_close.c:
Removed some old types
storage/myisam/mi_create.c:
Removed some old types
storage/myisam/mi_delete.c:
Removed some old types
storage/myisam/mi_delete_all.c:
Removed some old types
storage/myisam/mi_dynrec.c:
Removed some old types
storage/myisam/mi_extra.c:
Removed some old types
storage/myisam/mi_key.c:
Removed some old types
storage/myisam/mi_locking.c:
Removed some old types
storage/myisam/mi_log.c:
Removed some old types
storage/myisam/mi_open.c:
Removed some old types
Removed some not needed casts
Check argument of my_write()/my_pwrite() in functions returning int
Added casting of string lengths to size_t
storage/myisam/mi_packrec.c:
Removed some old types
Changed some buffers to be uchar* to avoid casts
storage/myisam/mi_page.c:
Removed some old types
storage/myisam/mi_preload.c:
Removed some old types
storage/myisam/mi_range.c:
Removed some old types
storage/myisam/mi_rfirst.c:
Removed some old types
storage/myisam/mi_rkey.c:
Removed some old types
storage/myisam/mi_rlast.c:
Removed some old types
storage/myisam/mi_rnext.c:
Removed some old types
storage/myisam/mi_rnext_same.c:
Removed some old types
storage/myisam/mi_rprev.c:
Removed some old types
storage/myisam/mi_rrnd.c:
Removed some old types
storage/myisam/mi_rsame.c:
Removed some old types
storage/myisam/mi_rsamepos.c:
Removed some old types
storage/myisam/mi_scan.c:
Removed some old types
storage/myisam/mi_search.c:
Removed some old types
storage/myisam/mi_static.c:
Removed some old types
storage/myisam/mi_statrec.c:
Removed some old types
storage/myisam/mi_test1.c:
Removed some old types
storage/myisam/mi_test2.c:
Removed some old types
storage/myisam/mi_test3.c:
Removed some old types
storage/myisam/mi_unique.c:
Removed some old types
storage/myisam/mi_update.c:
Removed some old types
storage/myisam/mi_write.c:
Removed some old types
storage/myisam/myisam_ftdump.c:
Removed some old types
storage/myisam/myisamchk.c:
Removed some old types
storage/myisam/myisamdef.h:
Removed some old types
storage/myisam/myisamlog.c:
Removed some old types
Indentation fix
storage/myisam/myisampack.c:
Removed some old types
storage/myisam/rt_index.c:
Removed some old types
storage/myisam/rt_split.c:
Removed some old types
storage/myisam/sort.c:
Removed some old types
storage/myisam/sp_defs.h:
Removed some old types
storage/myisam/sp_key.c:
Removed some old types
storage/myisammrg/ha_myisammrg.cc:
Removed some old types
storage/myisammrg/ha_myisammrg.h:
Removed some old types
storage/myisammrg/myrg_close.c:
Removed some old types
storage/myisammrg/myrg_def.h:
Removed some old types
storage/myisammrg/myrg_delete.c:
Removed some old types
storage/myisammrg/myrg_open.c:
Removed some old types
Updated parameters to dirname_part()
storage/myisammrg/myrg_queue.c:
Removed some old types
storage/myisammrg/myrg_rfirst.c:
Removed some old types
storage/myisammrg/myrg_rkey.c:
Removed some old types
storage/myisammrg/myrg_rlast.c:
Removed some old types
storage/myisammrg/myrg_rnext.c:
Removed some old types
storage/myisammrg/myrg_rnext_same.c:
Removed some old types
storage/myisammrg/myrg_rprev.c:
Removed some old types
storage/myisammrg/myrg_rrnd.c:
Removed some old types
storage/myisammrg/myrg_rsame.c:
Removed some old types
storage/myisammrg/myrg_update.c:
Removed some old types
storage/myisammrg/myrg_write.c:
Removed some old types
storage/ndb/include/util/ndb_opts.h:
Removed some old types
storage/ndb/src/cw/cpcd/main.cpp:
Removed some old types
storage/ndb/src/kernel/vm/Configuration.cpp:
Removed some old types
storage/ndb/src/mgmclient/main.cpp:
Removed some old types
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
Removed some old types
Removed old disabled code
storage/ndb/src/mgmsrv/main.cpp:
Removed some old types
storage/ndb/src/ndbapi/NdbBlob.cpp:
Removed some old types
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
Removed not used variable
storage/ndb/src/ndbapi/NdbOperationInt.cpp:
Added required casts
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Added required casts
storage/ndb/tools/delete_all.cpp:
Removed some old types
storage/ndb/tools/desc.cpp:
Removed some old types
storage/ndb/tools/drop_index.cpp:
Removed some old types
storage/ndb/tools/drop_tab.cpp:
Removed some old types
storage/ndb/tools/listTables.cpp:
Removed some old types
storage/ndb/tools/ndb_config.cpp:
Removed some old types
storage/ndb/tools/restore/consumer_restore.cpp:
Changed some buffers to be uchar* to avoid casts with new defintion of packfrm()
storage/ndb/tools/restore/restore_main.cpp:
Removed some old types
storage/ndb/tools/select_all.cpp:
Removed some old types
storage/ndb/tools/select_count.cpp:
Removed some old types
storage/ndb/tools/waiter.cpp:
Removed some old types
strings/bchange.c:
Changed function to use uchar * and size_t
strings/bcmp.c:
Changed function to use uchar * and size_t
strings/bmove512.c:
Changed function to use uchar * and size_t
strings/bmove_upp.c:
Changed function to use uchar * and size_t
strings/ctype-big5.c:
Changed functions to use size_t
Changed character length functions to return uint
strings/ctype-bin.c:
Changed functions to use size_t
strings/ctype-cp932.c:
Changed functions to use size_t
Changed character length functions to return uint
strings/ctype-czech.c:
Fixed indentation
Changed functions to use size_t
strings/ctype-euc_kr.c:
Changed functions to use size_t
Changed character length functions to return uint
strings/ctype-eucjpms.c:
Changed functions to use size_t
Changed character length functions to return uint
unsigned char -> uchar
strings/ctype-gb2312.c:
Changed functions to use size_t
Changed character length functions to return uint
strings/ctype-gbk.c:
Changed functions to use size_t
Changed character length functions to return uint
strings/ctype-latin1.c:
Changed functions to use size_t
Changed character length functions to return uint
unsigned char -> uchar
strings/ctype-mb.c:
Changed functions to use size_t
Changed character length functions to return uint
strings/ctype-simple.c:
Changed functions to use size_t
Simpler loops for caseup/casedown
unsigned int -> uint
unsigned char -> uchar
strings/ctype-sjis.c:
Changed functions to use size_t
Changed character length functions to return uint
strings/ctype-tis620.c:
Changed functions to use size_t
Changed character length functions to return uint
unsigned char -> uchar
strings/ctype-uca.c:
Changed functions to use size_t
unsigned char -> uchar
strings/ctype-ucs2.c:
Moved inclusion of stdarg.h to other includes
usigned char -> uchar
Changed functions to use size_t
Changed character length functions to return uint
strings/ctype-ujis.c:
Changed functions to use size_t
Changed character length functions to return uint
unsigned char -> uchar
strings/ctype-utf8.c:
Changed functions to use size_t
unsigned char -> uchar
Indentation fixes
strings/ctype-win1250ch.c:
Indentation fixes
Changed functions to use size_t
strings/ctype.c:
Changed functions to use size_t
strings/decimal.c:
Changed type for memory argument to uchar *
strings/do_ctype.c:
Indentation fixes
strings/my_strtoll10.c:
unsigned char -> uchar
strings/my_vsnprintf.c:
Changed functions to use size_t
strings/r_strinstr.c:
Removed some old types
Changed functions to use size_t
strings/str_test.c:
Removed some old types
strings/strappend.c:
Changed functions to use size_t
strings/strcont.c:
Removed some old types
strings/strfill.c:
Removed some old types
strings/strinstr.c:
Changed functions to use size_t
strings/strlen.c:
Changed functions to use size_t
strings/strmake.c:
Changed functions to use size_t
strings/strnlen.c:
Changed functions to use size_t
strings/strnmov.c:
Changed functions to use size_t
strings/strto.c:
unsigned char -> uchar
strings/strtod.c:
Changed functions to use size_t
strings/strxnmov.c:
Changed functions to use size_t
strings/xml.c:
Changed functions to use size_t
Indentation fixes
tests/mysql_client_test.c:
Removed some old types
tests/thread_test.c:
Removed some old types
vio/test-ssl.c:
Removed some old types
vio/test-sslclient.c:
Removed some old types
vio/test-sslserver.c:
Removed some old types
vio/vio.c:
Removed some old types
vio/vio_priv.h:
Removed some old types
Changed vio_read()/vio_write() to work with size_t
vio/viosocket.c:
Changed vio_read()/vio_write() to work with size_t
Indentation fixes
vio/viossl.c:
Changed vio_read()/vio_write() to work with size_t
Indentation fixes
vio/viosslfactories.c:
Removed some old types
vio/viotest-ssl.c:
Removed some old types
win/README:
More explanations
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
Change to use remove_file instead of 'system rm' in a lot of tests. (Should fix some windows test problems)
Removed memory leak in mysql_test if sync_with_master fails.
Do not terminate ndb_cluster_binary_log before the util thread has finnished. This should fix a shutdown bug where a thread is accessing injector_mutex after it's freed.
Patch may fix Bug#27622 "mysqld shutdown, util thread continues, while binlog thread exits"
client/mysqltest.c:
Added missing 'mysql_free_result' (fixed confusing memory leak when sync_with_master fails)ug
mysql-test/mysql-test-run.pl:
Add the test case name to the instance manager log files
mysql-test/r/rpl_log_pos.result:
Made test more portable (for powermac)
mysql-test/t/disabled.def:
Disabled im_life_cycle (added bug#27851)
mysql-test/t/myisam-system.test:
Use remove_file instead of "system rm"
mysql-test/t/ndb_autodiscover.test:
Use remove_file instead of "system rm"
mysql-test/t/ndb_loaddatalocal.test:
Use remove_file instead of "system rm"
mysql-test/t/rpl_loaddatalocal.test:
Use remove_file instead of "system rm"
mysql-test/t/rpl_log_pos.test:
Made test more portable (for powermac)
mysql-test/t/rpl_misc_functions.test:
Use remove_file instead of "system rm"
mysql-test/t/rpl_rbr_to_sbr.test:
Use remove_file instead of "system rm"
mysql-test/t/rpl_row_NOW.test:
Use remove_file instead of "system rm"
mysql-test/t/rpl_row_sp001.test:
Use remove_file instead of "system rm"
mysql-test/t/rpl_row_sp011.test:
Use remove_file instead of "system rm"
mysql-test/t/show_check.test:
Use remove_file instead of "system rm"
mysys/my_alloc.c:
Don't return on zero argument, as this may hide other errors
server-tools/instance-manager/log.cc:
Log errors to both stdout and stderr (to know in which context we got the error)
server-tools/instance-manager/thread_registry.cc:
Log error before common assert (to know in which context we fail)
sql/ha_ndbcluster.cc:
Do not terminate ndb_cluster_binary_log before the util thread has finnished.
sql/ha_ndbcluster.h:
Do not terminate ndb_cluster_binary_log before the util thread has finnished.
sql/ha_ndbcluster_binlog.cc:
Do not terminate ndb_cluster_binary_log before the util thread has finnished.
sql-common/client.c:
Clear field_alloc when it's moved to result set (allows us to always call free_root on field_alloc)
Change to use remove_file instead of 'system rm' in a lot of tests. (Should fix some windows test problems)
Removed memory leak in mysql_test if sync_with_master fails.
Do not terminate ndb_cluster_binary_log before the util thread has finnished. This should fix a shutdown bug where a thread is accessing injector_mutex after it's freed.
Patch may fix Bug#27622 "mysqld shutdown, util thread continues, while binlog thread exits"
Print information if net_clear() skipped bytes (As this otherwise hides critical timeing bugs)
Added DBUG_ASSERT if we get packets out of order
mysql_change_user() could on error send multiple packets, which caused mysql_client_test to randomly fail
include/errmsg.h:
Added more descriptive error message of why statement was automaticly dropped
libmysql/client_settings.h:
Added more descriptive error message of why statement was automaticly dropped
libmysql/errmsg.c:
Added more descriptive error message of why statement was automaticly dropped
libmysql/libmysql.c:
Added more descriptive error message of why statement was automaticly dropped
sql-common/client.c:
Added more descriptive error message of why statement was automaticly dropped
sql/net_serv.cc:
Print information if net_clear() skipped bytes (As this otherwise hides critical timeing bugs)
Added DBUG_ASSERT if we get packets out of order
sql/sql_class.cc:
We need to set killed to NOT_KILLED after cleanup() if we want to continue using THD
(If not, the connection will be closed after the current stmt)
sql/sql_parse.cc:
mysql_change_user() could on error send multiple packets, which caused mysql_client_test to randomly fail
tests/mysql_client_test.c:
More DBUG information
Better usage of --silent
Always print 'OK' the same way.
Disable test_bug17667 if run outside of mysql-test-run
Print information if net_clear() skipped bytes (As this otherwise hides critical timeing bugs)
Added DBUG_ASSERT if we get packets out of order
mysql_change_user() could on error send multiple packets, which caused mysql_client_test to randomly fail
- Change 'mysql_options' third argment "arg" to "const void*"
include/mysql.h:
Change 'mysql_options' third argment "arg" to "const void*"
sql-common/client.c:
Change 'mysql_options' third argment "arg" to "const void*"
- Interpret the pointer passed to 'mysql_options' for
MYSQL_OPT_SSL_VERIFY_SERVER_CERT as a my_bool
- In 5.1 the mysql_options signature will be chanegd to take
a 'void*' in order to further emphasize the need for a pointer
to correct type
client/mysqltest.c:
Turn on ssl_verify_server_cert for all connections to "localhost"
in mysqltest
sql-common/client.c:
The pointer passed to 'mysql_options' for MYSQL_OPT_SSL_VERIFY_SERVER_CERT
should be interpreted as a my_bool pointer (aka char*).
- Interpret the pointer passed to 'mysql_options' for
MYSQL_OPT_SSL_VERIFY_SERVER_CERT as a my_bool
- In 5.1 the mysql_options signature will be chanegd to take
a 'void*' in order to further emphasize the need for a pointer
to correct type
into mysql.com:/home/my/mysql-5.0
BitKeeper/etc/ignore:
auto-union
BUILD/SETUP.sh:
Auto merged
Makefile.am:
Auto merged
client/mysql.cc:
Auto merged
cmd-line-utils/readline/display.c:
Auto merged
configure.in:
Auto merged
extra/yassl/include/buffer.hpp:
Auto merged
extra/yassl/include/crypto_wrapper.hpp:
Auto merged
extra/yassl/include/yassl_imp.hpp:
Auto merged
extra/yassl/include/yassl_int.hpp:
Auto merged
extra/yassl/src/crypto_wrapper.cpp:
Auto merged
extra/yassl/taocrypt/include/algebra.hpp:
Auto merged
extra/yassl/taocrypt/include/des.hpp:
Auto merged
extra/yassl/taocrypt/include/hash.hpp:
Auto merged
extra/yassl/taocrypt/include/hmac.hpp:
Auto merged
extra/yassl/taocrypt/include/modarith.hpp:
Auto merged
extra/yassl/taocrypt/include/modes.hpp:
Auto merged
extra/yassl/taocrypt/include/rsa.hpp:
Auto merged
extra/yassl/taocrypt/include/type_traits.hpp:
Auto merged
extra/yassl/taocrypt/mySTL/list.hpp:
Auto merged
extra/yassl/taocrypt/src/aes.cpp:
Auto merged
extra/yassl/taocrypt/src/algebra.cpp:
Auto merged
extra/yassl/testsuite/testsuite.cpp:
Auto merged
include/my_global.h:
Auto merged
include/my_pthread.h:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
myisam/mi_open.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysys/default.c:
Auto merged
ndb/src/common/transporter/Transporter.cpp:
Auto merged
ndb/src/common/util/File.cpp:
Auto merged
ndb/src/common/util/SocketClient.cpp:
Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.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/MgmtSrvr.cpp:
Auto merged
ndb/src/ndbapi/ClusterMgr.hpp:
Auto merged
ndb/src/ndbapi/Ndb.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
ndb/src/ndbapi/SignalSender.cpp:
Auto merged
sql/field.cc:
Auto merged
sql/filesort.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_subselect.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_timefunc.cc:
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/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql/unireg.cc:
Auto merged
extra/yassl/taocrypt/src/asn.cpp:
Manual merge (Fix shadowed variable name)
extra/yassl/taocrypt/test/test.cpp:
No changes
ndb/src/common/util/ConfigValues.cpp:
Manual merge (Fix shadowed variable name)
sql/field.h:
manual merge
sql/ha_myisam.cc:
manual merge
sql/ha_ndbcluster.cc:
manual merge
sql/item_cmpfunc.cc:
manual merge
sql/item_subselect.cc:
Manual merge (Fix shadowed variable name)
sql/mysqld.cc:
no changes
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
Makefile.am:
Auto merged
cmd-line-utils/readline/display.c:
Auto merged
configure.in:
Auto merged
extra/yassl/include/buffer.hpp:
Auto merged
extra/yassl/include/crypto_wrapper.hpp:
Auto merged
extra/yassl/include/yassl_imp.hpp:
Auto merged
extra/yassl/include/yassl_int.hpp:
Auto merged
extra/yassl/src/crypto_wrapper.cpp:
Auto merged
extra/yassl/taocrypt/include/algebra.hpp:
Auto merged
extra/yassl/taocrypt/include/des.hpp:
Auto merged
extra/yassl/taocrypt/include/hash.hpp:
Auto merged
extra/yassl/taocrypt/include/hmac.hpp:
Auto merged
extra/yassl/taocrypt/include/modarith.hpp:
Auto merged
extra/yassl/taocrypt/include/modes.hpp:
Auto merged
extra/yassl/taocrypt/include/rsa.hpp:
Auto merged
extra/yassl/taocrypt/include/type_traits.hpp:
Auto merged
extra/yassl/taocrypt/mySTL/list.hpp:
Auto merged
extra/yassl/taocrypt/src/aes.cpp:
Auto merged
extra/yassl/taocrypt/src/algebra.cpp:
Auto merged
extra/yassl/taocrypt/src/asn.cpp:
Auto merged
extra/yassl/testsuite/testsuite.cpp:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysys/default.c:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/net_serv.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_select.cc:
Auto merged
extra/yassl/taocrypt/test/test.cpp:
Manual merge
mysql-test/r/grant.result:
Manual merge
mysql-test/r/select.result:
Manual merge
mysql-test/t/grant.test:
Manual merge
mysql-test/t/select.test:
Manual merge
sql/field.h:
Manual merge
sql/mysqld.cc:
Manual merge
mysql-test/t/log_state.test:
Move disconnect last to avoid sporadic failures in test because 'Quit' command appeared in general log
plugin/daemon_example/daemon_example.c:
Define __attribute__ to fix compiler error with not gcc compilers
sql-common/client.c:
Fixed spelling error
sql/sql_parse.cc:
Added comment
into pilot.mysql.com:/home/msvensson/mysql/bug22943/my51-bug22943
sql-common/client.c:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/net_serv.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
vio/vio.c:
Auto merged
vio/viossl.c:
Auto merged
into pilot.mysql.com:/home/msvensson/mysql/bug22943/my50-bug22943
sql/mysqld.cc:
Auto merged
sql/net_serv.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
vio/vio.c:
Auto merged
vio/viossl.c:
Auto merged
sql/mysql_priv.h:
Manual merge
sql/sql_parse.cc:
Manual merge
- Set the timeout values only where needed
sql/mysql_priv.h:
Add new functions for setting read and write timeout on "net"
sql/mysqld.cc:
- Move the setting of "read_timeout" to the value of "connect_timeout" to
just before 'check_connection' which is the function where we want
to use the different timeout
- With the new functions to set timeout on "net", there is no need to
specifically set the default wait_timeout on windows.
sql/net_serv.cc:
Add new functions for setting read and write timeout of "net, when
server is compiled not to use alarms it will set the write/read timeout
directly on connection using 'vio_timeout'(using setsockopt if socket)
sql/repl_failsafe.cc:
Put unused code within "#if NOT_USED"
sql/set_var.cc:
Use 'net_set_*_timeout' when adjusting timeout value
on the current connection
sql/slave.cc:
The read timeout used when connecting to master server is set
using 'mysql_options' in 'connect_to_master' function
sql/sql_parse.cc:
- Set read and write timeout values to "connect_timeout" during
connect phase
- Use "read_timeout" value during sslaccept phase, since this is during
connect phase it implies "connect-timeout"
- Set read and write timeout value back to default after connect phase
- Set "read_timeout" to "wait_timeout" while waiting for client.
sql/sql_repl.cc:
Set "read_timeout" to "wait_timeout" while ask other mysqld to send file
sql-common/client.c:
Call 'vio_timeout' to set up the read and write timeout's for the
newly created connection. It only need to be done once at connect time.
vio/vio.c:
Use 'vio_timeout' for setting timeout also on an SSL connection
since they both use sockets
vio/viossl.c:
Remove 'vio_ssl_timeout' function
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')
- 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
Fixed compiler warnings (detected by VC++):
- Removed not used variables
- Added casts
- Fixed wrong assignments to bool
- Fixed wrong calls with bool arguments
- Added missing argument to store(longlong), which caused wrong store method to be called.
client/mysqldump.c:
Removed compiler warning
heap/hp_clear.c:
Removed compiler warning
include/my_global.h:
Removed compiler warning
include/my_tree.h:
Changed memory limits from int to ulong
(Allowed me to get rid of some compiler warnings)
myisam/mi_create.c:
Removed compiler warning
myisam/myisampack.c:
Removed compiler warning
mysys/base64.c:
Removed compiler warning
mysys/my_thr_init.c:
Fixed portability issue (detected on windows)
Added DBUG_ASSERT to detect if we call my_thread_end() too many times
Don't wait if THR_thread_count == -1 (error condition)
mysys/tree.c:
Removed compiler warning
sql/field.cc:
Removed compiler warning
Fixed wrong parameter to check_date()
Added missing argument to store(longlong)
sql/ha_archive.cc:
Removed compiler warning
sql/ha_federated.cc:
Removed compiler warning
sql/ha_innodb.cc:
Removed not used variable
sql/handler.cc:
Removed not used variable
Fixed wrong if (we didn't detect if rollback or commit failed). Not critical as value is not yet used
sql/item.cc:
Removed compiler warning
sql/item_func.cc:
Removed compiler warning
sql/item_strfunc.cc:
Removed compiler warning
sql/item_timefunc.cc:
Removed compiler warning
sql/log.cc:
Removed compiler warning
sql/mysql_priv.h:
Removed compiler warning
sql/opt_range.cc:
Removed compiler warning
sql/password.c:
Removed compiler warning
sql/set_var.cc:
Removed compiler warning
sql/slave.cc:
Removed compiler warning
sql/sp.cc:
Removed compiler warning
sql/sp_cache.cc:
Removed compiler warning
sql/sp_head.cc:
Removed compiler warning
Adjusted argument to reserve() to not use up too much memory that we are probably not going to need
sql/sql_acl.cc:
Added missing argument to store(longlong)
sql/sql_base.cc:
Removed compiler warning
sql/sql_db.cc:
Removed compiler warning
sql/sql_delete.cc:
Removed compiler warning
sql/sql_handler.cc:
Removed not used variable
sql/sql_lex.h:
Removed not used variable
sql/sql_prepare.cc:
Removed not used variable
sql/sql_rename.cc:
Removed not used variable
sql/sql_select.cc:
Fixed that select_options are not 'cut'
Removed some not used variables
Removed compiler warnings by adding cast
sql/sql_show.cc:
Removed not used variables
Added missing argument to store(longlong)
Removed compiler warnings
sql/sql_trigger.cc:
Removed not used variables
Added cast to remove compiler warnings
sql/sql_update.cc:
Fixed wrong set of bool variable
sql/sql_view.cc:
Removed not used variables
Added cast to get rid of compiler warnings
sql-common/client.c:
Fixed compiler warning
sql-common/my_time.c:
Fixed wrong argument to check_date()
Added casts to get rid of compiler warnings
sql/sql_yacc.yy:
Removed not used variable
sql/uniques.cc:
Changes memory size from uint to ulong
Added casts to get rid of compiler warnings
strings/ctype-simple.c:
Fixed cast to get rid of compiler warnings
Fixed compiler warnings (detected by VC++):
- Removed not used variables
- Added casts
- Fixed wrong assignments to bool
- Fixed wrong calls with bool arguments
- Added missing argument to store(longlong), which caused wrong store method to be called.
- Removed not used variables
- Changed some ulong parameters/variables to ulonglong (possible serious bug)
- Added casts to get rid of safe assignment from longlong to long (and similar)
- Added casts to function parameters
- Fixed signed/unsigned compares
- Added some constructores to structures
- Removed some not portable constructs
Better fix for bug Bug #21428 "skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown"
(Added new parameter to net_clear() to define when we want the communication buffer to be emptied)
into mysql.com:/home/my/mysql-5.1
Makefile.am:
Auto merged
configure.in:
Auto merged
sql/field.h:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/table.h:
Auto merged
Fixed memory leak in _db_set() (Bug#24497 Valgrind warning: get_one_option)
Don't call net_clear() on COM_QUIT. This avoids a warning from net_clear() after shutdown: "skipped ## bytes from file"
BUG#21428: skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown"
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt
client/mysqltest.c:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/information_schema.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
mysql-test/t/type_newdecimal.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/filesort.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql-common/client.c:
Auto merged
sql-common/my_time.c:
Auto merged
sql/table.cc:
Auto merged
strings/decimal.c:
Auto merged
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt
libmysql/libmysql.c:
Auto merged
mysql-test/t/subselect.test:
Auto merged
mysql-test/t/type_newdecimal.test:
Auto merged
sql/filesort.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
sql-common/my_time.c:
Auto merged
strings/decimal.c:
Auto merged
into mysql.com:/home/my/mysql-5.1
client/mysqldump.c:
Auto merged
include/errmsg.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql-common/client.c:
Auto merged
mysql-test/mysql-test-run-shell.sh:
SCCS merged
Fixed that --valgrind works again with mysql-test-run.sh
Extended error messages when loosing connection during mysql_real_connect()
client/mysqldump.c:
Added some missing DBUG_RETURN
include/errmsg.h:
Extended error messages when loosing connection during mysql_real_connect()
libmysql/errmsg.c:
Extended error messages when loosing connection during mysql_real_connect()
mysql-test/mysql-test-run.pl:
Don't remove .reject files at startup
mysql-test/mysql-test-run.sh:
Fixed that --valgrind works again
Don't give warnings for directores in var/tmp
sql-common/client.c:
Extended error messages when loosing connection during mysql_real_connect()
into mysql.com:/home/my/mysql-5.1
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-my_lread.c:
Auto merged
BitKeeper/deleted/.del-my_lwrite.c:
Auto merged
client/mysqlbinlog.cc:
Auto merged
client/mysqldump.c:
Auto merged
cmd-line-utils/readline/complete.c:
Auto merged
extra/yassl/src/ssl.cpp:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/libmysqld.c:
Auto merged
mysql-test/mysql-test-run-shell.sh:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/csv.test:
Auto merged
mysql-test/t/ctype_cp1250_ch.test:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/t/func_sapdb.test:
Auto merged
mysql-test/t/func_str.test:
Auto merged
mysql-test/t/grant.test:
Auto merged
mysql-test/t/group_min_max.test:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/join.test:
Auto merged
mysql-test/t/select.test:
Auto merged
mysql-test/t/sp-prelocking.test:
Auto merged
mysql-test/t/strict.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
mysql-test/t/type_newdecimal.test:
Auto merged
mysql-test/t/view_grant.test:
Auto merged
mysys/default.c:
Auto merged
mysys/mf_iocache.c:
Auto merged
mysys/mf_keycache.c:
Auto merged
mysys/my_alloc.c:
Auto merged
mysys/my_dup.c:
Auto merged
mysys/my_getwd.c:
Auto merged
mysys/my_handler.c:
Auto merged
mysys/my_lib.c:
Auto merged
mysys/my_malloc.c:
Auto merged
mysys/my_pread.c:
Auto merged
mysys/my_seek.c:
Auto merged
mysys/safemalloc.c:
Auto merged
sql/Makefile.am:
Auto merged
sql/filesort.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/net_serv.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql-common/client.c:
Auto merged
sql-common/my_time.c:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/strfunc.cc:
Auto merged
sql/tztime.cc:
Auto merged
sql/unireg.cc:
Auto merged
storage/heap/_check.c:
Auto merged
storage/heap/hp_delete.c:
Auto merged
storage/heap/hp_hash.c:
Auto merged
storage/heap/hp_open.c:
Auto merged
storage/heap/hp_rkey.c:
Auto merged
storage/heap/hp_rrnd.c:
Auto merged
storage/heap/hp_write.c:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
storage/myisam/mi_close.c:
Auto merged
storage/myisam/mi_delete.c:
Auto merged
storage/myisam/mi_dynrec.c:
Auto merged
storage/myisam/mi_keycache.c:
Auto merged
storage/myisam/mi_page.c:
Auto merged
storage/myisam/mi_statrec.c:
Auto merged
storage/myisam/mi_test2.c:
Auto merged
storage/myisam/mi_write.c:
Auto merged
storage/myisam/myisampack.c:
Auto merged
storage/myisammrg/ha_myisammrg.cc:
Auto merged
storage/myisammrg/myrg_extra.c:
Auto merged
storage/ndb/include/logger/LogHandler.hpp:
Auto merged
storage/ndb/include/util/OutputStream.hpp:
Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
Auto merged
storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp:
Auto merged
storage/ndb/src/common/logger/LogHandler.cpp:
Auto merged
storage/ndb/src/common/portlib/NdbMutex.c:
Auto merged
storage/ndb/src/common/portlib/NdbThread.c:
Auto merged
storage/ndb/src/common/transporter/Transporter.cpp:
Auto merged
storage/ndb/src/cw/cpcd/CPCD.hpp:
Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
storage/ndb/src/kernel/error/ErrorReporter.cpp:
Auto merged
storage/ndb/src/kernel/error/ErrorReporter.hpp:
Auto merged
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
Auto merged
storage/ndb/src/kernel/vm/TransporterCallback.cpp:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp:
Auto merged
storage/ndb/src/ndbapi/DictCache.cpp:
Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbOperationExec.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbOperationInt.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
storage/ndb/src/ndbapi/Ndbif.cpp:
Auto merged
storage/ndb/tools/drop_index.cpp:
Auto merged
storage/ndb/tools/drop_tab.cpp:
Auto merged
storage/ndb/tools/ndb_condig.cpp:
Auto merged
tests/mysql_client_test.c:
Auto merged
vio/viossl.c:
Auto merged
vio/viosslfactories.c:
Auto merged
BUILD/SETUP.sh:
Use local version
client/client_priv.h:
Manual merge
mysql-test/mysql-test-run.pl:
Manual merge
mysql-test/r/ctype_cp1250_ch.result:
Manual merge
mysql-test/t/disabled.def:
Manual merge
mysys/hash.c:
Manual merge
mysys/thr_lock.c:
Manual merge
server-tools/instance-manager/mysql_connection.cc:
Manual merge
sql/ha_ndbcluster.cc:
Manual merge
sql/handler.cc:
Manual merge
sql/item_timefunc.cc:
Manual merge
sql/mysqld.cc:
Manual merge
sql/opt_range.cc:
Manual merge
sql/slave.cc:
Manual merge
sql/sql_parse.cc:
Manual merge
sql/sql_prepare.cc:
Manual merge
sql/sql_view.cc:
Manual merge
sql/table.cc:
Manual merge
storage/archive/ha_archive.cc:
Manual merge
storage/federated/ha_federated.cc:
Manual merge
storage/federated/ha_federated.h:
Manual merge
storage/innobase/handler/ha_innodb.cc:
Manual merge
storage/ndb/include/ndb_global.h.in:
Manual merge
storage/ndb/include/util/InputStream.hpp:
Manual merge
storage/ndb/include/util/SimpleProperties.hpp:
Manual merge
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Manual merge
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
Manual merge
storage/ndb/src/ndbapi/NdbOperationSearch.cpp:
Manual merge
storage/ndb/src/ndbapi/Ndbinit.cpp:
Manual merge
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
Manual merge
strings/decimal.c:
Manual merge
vio/viosocket.c:
Manual merge
(Mostly in DBUG_PRINT() and unused arguments)
Fixed bug in query cache when used with traceing (--with-debug)
Fixed memory leak in mysqldump
Removed warnings from mysqltest scripts (replaced -- with #)
into mysql.com:/home/hf/work/mysql-5.1-mrg
Makefile.am:
Auto merged
client/mysqltest.c:
Auto merged
include/mysql.h:
Auto merged
BitKeeper/deleted/.del-bdb-deadlock.test:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
mysql-test/r/order_by.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/lock_multi.test:
Auto merged
mysql-test/t/rename.test:
Auto merged
mysql-test/t/show_check.test:
Auto merged
mysql-test/t/status.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_subselect.h:
Auto merged
sql/protocol.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/protocol.h:
Auto merged
sql/sql_class.h:
Auto merged
mysql-test/include/deadlock.inc:
SCCS merged
mysql-test/t/disabled.def:
merging
sql/item.cc:
merging
into mysql.com:/home/hf/work/mysql-4.1-mrg
include/mysql.h:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/rename.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_class.h:
Auto merged
Makefile.am:
merging
client/mysqltest.c:
merging
mysql-test/t/mysql_client.test:
merging
The server sends a number of columns to the client.
It uses a limited "fast" function for that instead of the
general one. This fast function cannot send numbers larger
than 2 bytes.
This causes the client to expect smaller number of columns.
The client writes outside of the allocated memory buffer
as a result.
Fixed the server to use the general function to send column
count.
Fixed the client to check the column count before writing
column data.
mysql-test/t/mysql_client.test:
Bug #19216: Client crashes on long SELECT
- test case
sql/protocol.cc:
Bug #19216: Client crashes on long SELECT
- renamed the function for bether comprehention
and made it local
- used the right (non-local) function to transfer
the column count in Protocol::send_fields
sql/protocol.h:
Bug #19216: Client crashes on long SELECT
- made optimized net_store_length local
sql-common/client.c:
Bug #19216: Client crashes on long SELECT
- fixed the client to check for older servers (without the fix).
The server sends a number of columns to the client.
It uses a limited "fast" function for that instead of the
general one. This fast function cannot send numbers larger
than 2 bytes.
This causes the client to expect smaller number of columns.
The client writes outside of the allocated memory buffer
as a result.
Fixed the server to use the general function to send column
count.
Fixed the client to check the column count before writing
column data.
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
client/mysqltest.c:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
sql-common/client.c:
Auto merged
mysql-test/mysql-test-run.pl:
Use remote
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
sql-common/client.c:
Auto merged
into mysql.com:/home/gluh/MySQL/Merge/5.1
include/mysql_com.h:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/type_date.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/slave.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_repl.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/sp.cc:
manual merge
sql/sp_head.cc:
manual merge
sql/sql_class.h:
manual merge
sql/table.cc:
manual merge
into mysql.com:/home/gluh/MySQL/Merge/5.0
include/mysql_com.h:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
mysql-test/r/ctype_utf8.result:
manual merge
sql/sql_acl.cc:
manual merge
Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
include/mysql_com.h:
Bug#20393 User name truncation in mysql client
Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
added new constants NAME_BYTE_LEN, USERNAME_BYTE_LENGTH, SYSTEM_CHARSET_MBMAXLEN
mysql-test/r/ctype_utf8.result:
Bug#20393 User name truncation in mysql client
Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
test case
mysql-test/t/ctype_utf8.test:
Bug#20393 User name truncation in mysql client
Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
test case
sql-common/client.c:
Bug#20393 User name truncation in mysql client
Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
increased buffers for user name & db
sql/sql_acl.cc:
Bug#20393 User name truncation in mysql client
Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
check that user name is not longer than USERNAME_LENGTH symbols
sql/sql_parse.cc:
Bug#20393 User name truncation in mysql client
Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
increased buffers for user name & db
sql/table.cc:
Bug#20393 User name truncation in mysql client
Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
check that db name is not longer than NAME_LEN symbols
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-new-maint_21527
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
sql-common/client.c:
Auto merged
client/mysqldump.c:
manual merge
mysql-test/r/mysqldump.result:
manual merge
mysql-test/t/mysqldump.test:
manual merge
into zippy.cornsilk.net:/home/cmiller/work/mysql/release/mysql-5.0-maint
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
sql-common/client.c:
Auto merged
InterfaceError on connect
Removed the bool flag from the st_mysql_options struct, since it adds
another word in size to the memory size and shifts member memory locations
down, both of which break binary-interface compatibility.
Instead, use a flag, 2**30, in the client_options bit-field to represent
that the client should check the SSL certificate of the server.
include/mysql.h:
Do not change the struct size.
include/mysql_com.h:
Add a new bit-flag for client verifying server SSL certificate.
Emphasize that we're not stepping on anyone else's bit/toes.
sql-common/client.c:
Set and read the bit-field for client-side SSL-cert checking of the server.
InterfaceError on connect
Removed the bool flag from the st_mysql_options struct, since it adds
another word in size to the memory size and shifts member memory locations
down, both of which break binary-interface compatibility.
Instead, use a flag, 2**30, in the client_options bit-field to represent
that the client should check the SSL certificate of the server.
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-im_options_set.result~59278f56be61d921:
Auto merged
BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
Auto merged
BitKeeper/deleted/.del-mysys.dsp~32695fee91189326:
Auto merged
BitKeeper/deleted/.del-im_options_set.imtest~b53d9d60e5684833:
Auto merged
BitKeeper/deleted/.del-im_options_unset.imtest~768eb186b51d0048:
Auto merged
BitKeeper/deleted/.del-im_options_unset.result~20a4790cd3c70a4f:
Auto merged
client/mysql.cc:
Auto merged
client/mysqlbinlog.cc:
Auto merged
client/mysqlcheck.c:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
dbug/dbug.c:
Auto merged
extra/perror.c:
Auto merged
extra/yassl/src/yassl_imp.cpp:
Auto merged
extra/yassl/src/yassl_int.cpp:
Auto merged
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/r/cast.result:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/r/federated.result:
Auto merged
mysql-test/r/func_compress.result:
Auto merged
mysql-test/r/func_group.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/gis-rtree.result:
Auto merged
mysql-test/r/gis.result:
Auto merged
mysql-test/r/im_daemon_life_cycle.result:
Auto merged
mysql-test/r/im_utils.result:
Auto merged
mysql-test/r/join_outer.result:
Auto merged
mysql-test/r/mysqlcheck.result:
Auto merged
mysql-test/r/rpl_sp.result:
Auto merged
mysql-test/r/rpl_trigger.result:
Auto merged
mysql-test/r/sp-code.result:
Auto merged
mysql-test/r/sp-security.result:
Auto merged
mysql-test/r/strict.result:
Auto merged
mysql-test/r/type_blob.result:
Auto merged
mysql-test/r/type_datetime.result:
Auto merged
mysql-test/r/type_ranges.result:
Auto merged
mysql-test/r/udf.result:
Auto merged
mysql-test/r/user_var.result:
Auto merged
mysql-test/t/cast.test:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/func_group.test:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
Auto merged
mysql-test/t/im_life_cycle.imtest:
Auto merged
mysql-test/t/im_utils.imtest:
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/ps.test:
Auto merged
mysql-test/t/rpl_trigger.test:
Auto merged
mysql-test/t/sp-security.test:
Auto merged
mysql-test/t/strict.test:
Auto merged
mysql-test/t/udf.test:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.cc:
Auto merged
sql-common/client.c:
Auto merged
sql-common/my_time.c:
Auto merged
sql/table.h:
Auto merged
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
mysql-test/r/im_life_cycle.result:
e
use local
mysql-test/r/ps.result:
use local
client/Makefile.am:
Manual merge.
client/mysqlimport.c:
Manual merge.
configure.in:
Manual merge.
mysql-test/mysql-test-run.pl:
Manual merge.
mysql-test/r/mysqldump.result:
Manual merge.
mysql-test/r/mysqltest.result:
Manual merge.
mysql-test/r/ndb_basic.result:
Manual merge.
mysql-test/r/rpl_view.result:
Manual merge.
mysql-test/r/show_check.result:
Manual merge.
mysql-test/r/sp-error.result:
Manual merge.
mysql-test/r/sp.result:
Manual merge.
mysql-test/r/union.result:
Manual merge.
mysql-test/t/mysqldump.test:
Manual merge.
mysql-test/t/mysqltest.test:
Manual merge.
mysql-test/t/ndb_basic.test:
Manual merge.
mysql-test/t/rpl_sp.test:
Manual merge.
mysql-test/t/rpl_view.test:
Manual merge.
mysql-test/t/show_check.test:
Manual merge.
mysql-test/t/sp-error.test:
Manual merge.
mysql-test/t/sp.test:
Manual merge.
sql/item_sum.cc:
Manual merge.
sql/mysql_priv.h:
Manual merge.
sql/sp_head.cc:
Manual merge.
sql/sql_db.cc:
Manual merge.
sql/sql_delete.cc:
Manual merge.
sql/sql_lex.h:
Manual merge.
sql/sql_show.cc:
Manual merge.
sql/sql_table.cc:
Manual merge.
sql/sql_trigger.cc:
Manual merge.
sql/sql_yacc.yy:
Manual merge.
tests/mysql_client_test.c:
Manual merge.
--with-collation worked only on the server side.
Client side ignored this argument, so collation_connection
was not properly set (remained latin1_swedish_ci).
sql-common/client.c:
- Take into account MYSQL_DEFAULT_COLLATION_NAME if
character set is not set using mysql_option(), to
honor --with-collation argument to configure.
- Use default collation for the character set when it's
not set using mysql_option().
--with-collation worked only on the server side.
Client side ignored this argument, so collation_connection
was not properly set (remained latin1_swedish_ci).
into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
include/mysql.h:
Auto merged
include/sql_common.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/t/udf.test:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
mysql-test/r/ps.result:
Manual merge.
mysql-test/r/sp.result:
Manual merge.
mysql-test/t/ps.test:
Manual merge.
mysql-test/t/sp.test:
Manual merge.
sql/sql_prepare.cc:
Manual merge.
sql/table.cc:
Manual merge.
tests/mysql_client_test.c:
Manual merge.
into rama.(none):/home/jimw/my/mysql-5.1-clean
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
configure.in:
Auto merged
extra/yassl/include/openssl/ssl.h:
Auto merged
extra/yassl/include/yassl_int.hpp:
Auto merged
extra/yassl/src/ssl.cpp:
Auto merged
extra/yassl/src/template_instnt.cpp:
Auto merged
extra/yassl/src/yassl_imp.cpp:
Auto merged
extra/yassl/src/yassl_int.cpp:
Auto merged
include/mysql.h:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/embedded_priv.h:
Auto merged
BitKeeper/deleted/.del-mysql_explain_log.sh~5ddc62808e16bd57:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
libmysqld/libmysqld.c:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/mysqldump-max.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_string.h:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
sql/time.cc:
Auto merged
storage/myisam/mi_create.c:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
tests/mysql_client_test.c:
Auto merged
BitKeeper/deleted/.del-have_case_sensitive_file_system.inc:
Delete: mysql-test/include/have_case_sensitive_file_system.inc
BitKeeper/deleted/.del-case_sensitive_file_system.require:
Delete: mysql-test/r/case_sensitive_file_system.require
mysql-test/lib/mtr_cases.pl:
Resolve conflict
mysql-test/mysql-test-run.pl:
Resolve conflict
mysql-test/r/mysqldump.result:
Resolve conflict
mysql-test/t/mysqldump.test:
Resolve conflict
sql/sql_parse.cc:
Resolve conflict
when calling a SP from C API"
The bug was caused by lack of checks for misuse in mysql_real_query.
A stored procedure always returns at least one result, which is the
status of execution of the procedure itself.
This result, or so-called OK packet, is similar to a result
returned by INSERT/UPDATE/CREATE operations: it contains the overall
status of execution, the number of affected rows and the number of
warnings. The client test program attached to the bug did not read this
result and ivnoked the next query. In turn, libmysql had no check for
such scenario and mysql_real_query was simply trying to send that query
without reading the pending response, thus messing up the communication
protocol.
The fix is to return an error from mysql_real_query when it's called
prior to retrieval of all pending results.
client/mysqlbinlog.cc:
net_safe_read -> cli_safe_read
include/mysql.h:
Remove a private function from the public header.
include/mysql_com.h:
Remove a define that is never used.
include/sql_common.h:
Add a declaration for cli_safe_read - a function that reads one packet
from the server.
libmysql/libmysql.c:
net_safe_read -> cli_safe_read
Return CR_COMMANDS_OUT_OF_SYNC on attempt to execute a statement
using a connection which has pending result sets.
sql-common/client.c:
Actual fix for Bug#15752: if the server has pending result sets for
the client, return CR_COMMANDS_OUT_OF_SYNC on attempt to execute
another query. Similarly to the behaviour of mysql_use_result(),
multiple result sets block the connection and must be fetched
before it can be used for another query.
This uncovered an error in the protocol: the server doesn't drop
SERVER_MORE_RESULTS_EXISTS status flag upon an error, so in case of
a multi-query like SELECT 1; SELECT syntax_error; SELECT 2;
the client has no way to know that the server won't ever come to
execution of the third query and won't return any result sets for it.
For now, fix it in cli_safe_read, as a proper fix requires extension
of the client-server protocol.
sql/protocol.cc:
Remove a name that is never used.
sql/slave.cc:
net_safe_read -> cli_safe_read
tests/mysql_client_test.c:
Make 'query' a local variable to avoid name clash.
Add a test case for Bug#15752 "Lost connection to MySQL server when
calling an SP from C API"
when calling a SP from C API"
The bug was caused by lack of checks for misuse in mysql_real_query.
A stored procedure always returns at least one result, which is the
status of execution of the procedure itself.
This result, or so-called OK packet, is similar to a result
returned by INSERT/UPDATE/CREATE operations: it contains the overall
status of execution, the number of affected rows and the number of
warnings. The client test program attached to the bug did not read this
result and ivnoked the next query. In turn, libmysql had no check for
such scenario and mysql_real_query was simply trying to send that query
without reading the pending response, thus messing up the communication
protocol.
The fix is to return an error from mysql_real_query when it's called
prior to retrieval of all pending results.
into chilla.local:/home/mydev/mysql-5.1-amain
configure.in:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
libmysqld/libmysqld.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/federated.result:
Auto merged
mysql-test/r/func_sapdb.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/gis-rtree.result:
Auto merged
mysql-test/r/gis.result:
Auto merged
mysql-test/r/key.result:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
mysql-test/t/func_sapdb.test:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/gis.test:
Auto merged
mysql-test/t/key.test:
Auto merged
mysql-test/t/myisam.test:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_geofunc.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/table.cc:
Auto merged
storage/myisam/mi_check.c:
Auto merged
storage/myisam/mi_create.c:
Auto merged
storage/myisam/mi_dynrec.c:
Auto merged
storage/myisam/mi_key.c:
Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
Auto merged
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
support-files/mysql.spec.sh:
Auto merged
BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb:
Manual merge
include/my_sys.h:
Manual merge
mysql-test/t/federated.test:
Manual merge
sql/ha_federated.cc:
Manual merge
tests/Makefile.am:
Manual merge
into mysql.com:/home/hf/work/mysql-4.1.16017
include/sql_common.h:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_parse.cc:
Auto merged
libmysqld/libmysqld.c:
merging
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1
libmysqld/lib_sql.cc:
Auto merged
libmysqld/libmysqld.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/gis.result:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/r/sp-security.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/gis.test:
Auto merged
mysql-test/t/sp-security.test:
Auto merged
mysql-test/t/variables.test:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_geofunc.h:
Auto merged
sql-common/client.c:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Auto merged
mysql-test/t/mysqldump.test:
Manual merge. (Seems to need null-merging.)
sql/mysqld.cc:
Manual merge + formatting change.
sql/sql_show.cc:
Manual merge
into chilla.local:/home/mydev/mysql-5.1-ateam
libmysqld/lib_sql.cc:
Auto merged
libmysqld/libmysqld.c:
Auto merged
mysql-test/r/func_sapdb.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/gis-rtree.result:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/key.test:
Auto merged
mysql-test/t/myisam.test:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/field.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/table.cc:
Auto merged
storage/myisam/mi_check.c:
Auto merged
storage/myisam/mi_create.c:
Auto merged
storage/myisam/mi_delete_table.c:
Auto merged
storage/myisam/mi_dynrec.c:
Auto merged
storage/myisam/mi_key.c:
Auto merged
storage/myisam/mi_rkey.c:
Auto merged
storage/myisam/rt_index.c:
Auto merged
storage/myisam/rt_mbr.c:
Auto merged
support-files/mysql.spec.sh:
Auto merged
mysql-test/r/ctype_utf8.result:
Manual merge
mysql-test/r/key.result:
Manual merge
mysql-test/t/ctype_utf8.test:
Manual merge
sql/item_timefunc.cc:
Manual merge
into mysql.com:/home/mydev/mysql-5.0-ateam
libmysqld/libmysqld.c:
Auto merged
myisam/mi_rkey.c:
Auto merged
mysql-test/r/func_sapdb.result:
Auto merged
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/func_sapdb.test:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/item_geofunc.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
libmysqld/lib_sql.cc:
Manual merge
mysql-test/r/func_time.result:
Manual merge
mysql-test/r/gis.result:
Manual merge
mysql-test/t/func_time.test:
Manual merge
mysql-test/t/gis.test:
Manual merge
sql-common/client.c:
Manual merge
Define 'mysql_get_ssl_cipher' even if no SSL built in, it is referenced in libmysql.def
sql-common/client.c:
Define 'mysql_get_ssl_cipher' even if no SSL built in, it is referenced in libmysql.def
--with-collation worked only on the server side.
Client side ignored this argument, so collation_connection
was not properly set (remained latin1_swedish_ci).
sql-common/client.c:
- Take into account MYSQL_DEFAULT_COLLATION_NAME if
character set is not set using mysql_option(), to
honor --with-collation argument to configure.
- Use default collation for the character set when it's
not set using mysql_option().
--with-collation worked only on the server side.
Client side ignored this argument, so collation_connection
was not properly set (remained latin1_swedish_ci).
there was two problems about charsets in embedded server
1. mysys/charset.c - defined there default_charset_info variable is
modified by both server and client code (particularly when
--default-charset option is handled)
In embedded server we get two codelines modifying one variable.
I created separate default_client_charset_info for client code
2. mysql->charset and mysql->options.charset initialization isn't
properly done for embedded server - necessary calls added
include/sql_common.h:
client charset info default declared
libmysqld/lib_sql.cc:
thd_init_client_charset calls added
libmysqld/libmysqld.c:
check_embedded_connection moved to client.c to avoid code duplication
sql-common/client.c:
charset initialization moved to mysql_init_character_set to
be used in embedded server
sql/sql_parse.cc:
thread client charset initialization moved to thd_init_client_charset
to avoid code duplication
there was two problems about charsets in embedded server
1. mysys/charset.c - defined there default_charset_info variable is
modified by both server and client code (particularly when
--default-charset option is handled)
In embedded server we get two codelines modifying one variable.
I created separate default_client_charset_info for client code
2. mysql->charset and mysql->options.charset initialization isn't
properly done for embedded server - necessary calls added
There actually was 3 different problems -
hash_user_connections wasn't cleaned
one strdupped database name wasn't freed
and stmt->mem_root wasn't cleaned as it was
replased with mysql->field_alloc for result
For the last one - i made the library using stmt's
fields to store result if it's the case.
include/mysql.h:
statement pointer added to the advanced_command to be checked in
embedded server
include/sql_common.h:
stmt added to the cli_advanced_command interface
libmysql/libmysql.c:
stmt pointer now sent to advanced_command
libmysqld/embedded_priv.h:
it's enough to send database name to check_embedded_connection
libmysqld/lib_sql.cc:
Now we store result directly in the MYSQL_STMT structure to
avoid extra copying
libmysqld/libmysqld.c:
it's enough to only send database pointer to check_embedded_connection
sql-common/client.c:
stmt fake attribute added to cli_advanced_command
sql/sql_parse.cc:
hash_user_connections isn't used if no access checks compiled
There actually was 3 different problems -
hash_user_connections wasn't cleaned
one strdupped database name wasn't freed
and stmt->mem_root wasn't cleaned as it was
replased with mysql->field_alloc for result
For the last one - i made the library using stmt's
fields to store result if it's the case.
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-new
BitKeeper/deleted/.del-changelog-4.0.xml~8f56ee8a913e848b:
Auto merged
BitKeeper/deleted/.del-changelog-4.1.xml~8aa496ebed09d868:
Auto merged
BitKeeper/deleted/.del-changelog-5.0.xml~f4c50926ccdd7434:
Auto merged
BitKeeper/deleted/.del-client-req.pem~efd482e1d290d4d8:
Auto merged
BitKeeper/deleted/.del-server-req.pem~16301893cacf1be4:
Auto merged
client/mysql.cc:
Auto merged
configure.in:
Auto merged
BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6:
Auto merged
BitKeeper/deleted/.del-NOTES~e926d3e6929ac052:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqlimport.c:
Auto merged
client/mysqltest.c:
Auto merged
include/mysql.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/auto_increment.result:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/r/func_misc.result:
Auto merged
mysql-test/r/gis-rtree.result:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/r/ndb_condition_pushdown.result:
Auto merged
mysql-test/r/symlink.result:
Auto merged
mysql-test/std_data/cacert.pem:
Auto merged
mysql-test/std_data/client-cert.pem:
Auto merged
mysql-test/std_data/client-key.pem:
Auto merged
mysql-test/std_data/server-cert.pem:
Auto merged
mysql-test/std_data/server-key.pem:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
mysql-test/t/having.test:
Auto merged
mysql-test/t/information_schema.test:
Auto merged
mysql-test/t/ndb_condition_pushdown.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
storage/ndb/include/ndbapi/NdbOperation.hpp:
Auto merged
storage/ndb/include/util/NdbSqlUtil.hpp:
Auto merged
storage/ndb/src/common/util/NdbSqlUtil.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
Auto merged
vio/vio.c:
Auto merged
client/client_priv.h:
manual merge
include/violite.h:
Automatic
mysql-test/Makefile.am:
manual merge
mysql-test/r/mysqldump.result:
Automatic
mysql-test/r/rpl_user_variables.result:
Manual merge (diff is because lars removed displaying of binlog)
mysql-test/t/disabled.def:
manual merge
mysql-test/t/mysqldump.test:
manual merge
mysql-test/t/rpl_user_variables.test:
manual merge (Changes becasue of lars removed binlog logging)
sql/mysqld.cc:
manual merge
vio/viossl.c:
manual merge
vio/viosslfactories.c:
manual merge
client/client_priv.h.rej:
merge 5.0 -> 5.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
client/mysql.cc:
Auto merged
include/mysql.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql-common/client.c:
SCCS merged
- Add function mysql_get_ssl_cipher
- Use function mysql_get_ssl_cipher from mysql
client/mysql.cc:
Backport fix for mysql client not using SSl library directly
include/mysql.h:
Backport fix for mysql client not using SSl library directly
libmysql/libmysql.def:
Backport fix for mysql client not using SSl library directly
libmysqld/libmysqld.def:
Backport fix for mysql client not using SSl library directly
sql-common/client.c:
Backport fix for mysql client not using SSl library directly
- Add new function 'ssl_verify_server_cert' which is used if we are
connecting to the server with SSL. It will compare the hostname in
the server's cert against the hostname that we used when connecting
to the server. Will reject the connection if hostname does not match.
- Add new option "OPT_SSL_VERIFY_SERVER_CERT" to be passed to mysql_options
which will turn on checking of servers cert.
- Add new argument "ssl-verify-server-cert" to all mysql* clients which
will activate the above option.
- Generate a new server cert with 1024 bits that has "localhost" as the server name.
SSL/server-cert.pem:
Generate a new server cert that has "localhost" as CN, so that we can test to verify the hostname we connected against with the hostname in the cert
client/client_priv.h:
Add OPT_SSL_VERIFY_CERT
client/mysql.cc:
Pass the variable "opt_ssl_verify_server_cert" to the mysql_options function. It's processed/included by include/sslopt*.h files
client/mysqladmin.cc:
Pass the variable "opt_ssl_verify_server_cert" to the mysql_options function. It's processed/included by include/sslopt*.h files
client/mysqldump.c:
Pass the variable "opt_ssl_verify_server_cert" to the mysql_options function. It's processed/included by include/sslopt*.h files
client/mysqlimport.c:
Pass the variable "opt_ssl_verify_server_cert" to the mysql_options function. It's processed/included by include/sslopt*.h files
client/mysqlshow.c:
Pass the variable "opt_ssl_verify_server_cert" to the mysql_options function. It's processed/included by include/sslopt*.h files
client/mysqltest.c:
Always set opt_ssl_verify_server_cert on in mysqltest if we are using SSL
include/mysql.h:
Add variable ssl_verify_cerver_cert
include/sslopt-longopts.h:
Add ssl-verify-server-cert options to all clients.
include/sslopt-vars.h:
Add opt_ssl_varify_server_cert to all clients.
sql-common/client.c:
Add ssl_vertify_server_cert function which is executed if user has set the option ssl_verify_cerver_cert
vio/viosslfactories.c:
Ask the SSL library to verify servers cert by setting the SSL_VERIFY_PEER flag
- Add new function 'ssl_verify_server_cert' which is used if we are
connecting to the server with SSL. It will compare the hostname in
the server's cert against the hostname that we used when connecting
to the server. Will reject the connection if hostname does not match.
- Add new option "OPT_SSL_VERIFY_SERVER_CERT" to be passed to mysql_options
which will turn on checking of servers cert.
- Add new argument "ssl-verify-server-cert" to all mysql* clients which
will activate the above option.
- Generate a new server cert with 1024 bits that has "localhost" as the server name.
sql-common/client.c:
Remove the ssl_verify_server_cert will be added in separate patch
vio/viossl.c:
Fix coding standard
vio/viosslfactories.c:
Remove comment
into neptunus.(none):/home/msvensson/mysql/bug17208/my50-bug17208
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_acl.cc:
Auto merged
client/mysql.cc:
Only call mysql_get_ssl_cipher once, save the result in variable "status"
libmysql/libmysql.def:
Add new function mysql_get_ssl_cipher to exported functions in dll
sql-common/client.c:
Add missing return(DBUG_RETURN)
include/mysql.h:
Add new function mysql_get_ssl_cipher
sql-common/client.c:
Add new function mysql_get_ssl_cipher, will return the cipher used for the current connection to the server.
as it is now required by mysql_set_character_set()
libmysql/libmysql.c:
Removing mysql_get_server_version()
sql-common/client.c:
Adding mysql_get_server_version()
Bug#18830 incompatibility new libraries with old server
Additional 5.0 fix:
applying the same patch to client.c.
sql-common/client.c:
Bug#18830 incompatibility new libraries with old server
Additional 5.0 fix:
applying the same patch to client.c.
This fixes the problem if someone is using struct MYSQL as part of another structure together with a shared
library
include/mysql.h:
Safer fix for Bug #18435
sql-common/client.c:
Safer fix for Bug #18435
(Needed for "list of pushes" web page and autopush)
include/mysql.h:
Fix to embedded server to be able to run tests on it
libmysql/libmysql.c:
Fix to embedded server to be able to run tests on it
libmysqld/emb_qcache.cc:
Fix to embedded server to be able to run tests on it
libmysqld/embedded_priv.h:
Fix to embedded server to be able to run tests on it
libmysqld/lib_sql.cc:
Fix to embedded server to be able to run tests on it
libmysqld/libmysqld.c:
Fix to embedded server to be able to run tests on it
mysql-test/mysql-test-run.sh:
Fix to embedded server to be able to run tests on it
mysql-test/r/binlog.result:
Updated test for embedded server
mysql-test/r/ctype_cp932.result:
Updated test for embedded server
mysql-test/r/innodb.result:
Updated test for embedded server
mysql-test/r/mysqltest.result:
Updated test for embedded server
mysql-test/r/query_cache.result:
Updated test for embedded server
mysql-test/r/query_cache_notembedded.result:
Updated test for embedded server
mysql-test/r/sp-error.result:
Updated test for embedded server
mysql-test/r/sp.result:
Updated test for embedded server
mysql-test/r/subselect.result:
Updated test for embedded server
mysql-test/r/view.result:
Updated test for embedded server
mysql-test/r/view_grant.result:
Updated test for embedded server
mysql-test/t/backup.test:
Updated test for embedded server
mysql-test/t/binlog.test:
Updated test for embedded server
mysql-test/t/blackhole.test:
Updated test for embedded server
mysql-test/t/compress.test:
Updated test for embedded server
mysql-test/t/ctype_cp932.test:
Updated test for embedded server
mysql-test/t/delayed.test:
Updated test for embedded server
mysql-test/t/handler.test:
Updated test for embedded server
mysql-test/t/innodb.test:
Updated test for embedded server
mysql-test/t/mysql.test:
Updated test for embedded server
mysql-test/t/mysql_client_test.test:
Updated test for embedded server
mysql-test/t/mysqltest.test:
Updated test for embedded server
mysql-test/t/query_cache.test:
Updated test for embedded server
mysql-test/t/query_cache_notembedded.test:
Updated test for embedded server
mysql-test/t/read_only.test:
Updated test for embedded server
mysql-test/t/skip_grants.test:
Updated test for embedded server
mysql-test/t/sp-destruct.test:
Updated test for embedded server
mysql-test/t/sp-error.test:
Updated test for embedded server
mysql-test/t/sp-threads.test:
Updated test for embedded server
mysql-test/t/sp.test:
Updated test for embedded server
mysql-test/t/subselect.test:
Updated test for embedded server
mysql-test/t/temp_table.test:
Updated test for embedded server
mysql-test/t/view.test:
Updated test for embedded server
mysql-test/t/view_grant.test:
Updated test for embedded server
mysql-test/t/wait_timeout.test:
Updated test for embedded server
mysys/mf_dirname.c:
Review fix: Don't access data outside of array
mysys/my_bitmap.c:
Remove compiler warnings
scripts/mysql_fix_privilege_tables.sql:
Add flush privileges to .sql script so that one doesn't have to reboot mysqld when one runs the mysql_fix_privilege_script
sql-common/client.c:
Updated test for embedded server
sql/item.cc:
Remove DBUG_PRINT statement that can cause crashes when running with --debug
sql/mysqld.cc:
Fix to embedded server to be able to run tests on it
sql/protocol.cc:
Fix to embedded server to be able to run tests on it
(Trivial reconstruction of code)
sql/protocol.h:
Fix to embedded server to be able to run tests on it
sql/sql_base.cc:
Better comment
sql/sql_class.cc:
Fix to embedded server to be able to run tests on it
sql/sql_class.h:
Fix to embedded server to be able to run tests on it
sql/sql_cursor.cc:
Fix to embedded server to be able to run tests on it
sql/sql_parse.cc:
Fix to embedded server to be able to run tests on it
Don't crash for disabled commands when using embedded server
sql/sql_prepare.cc:
Fix to embedded server to be able to run tests on it
mysql-test/r/ctype_cp932_notembedded.result:
New BitKeeper file ``mysql-test/r/ctype_cp932_notembedded.result''
mysql-test/r/innodb_notembedded.result:
New BitKeeper file ``mysql-test/r/innodb_notembedded.result''
mysql-test/r/sp.result.orig:
New BitKeeper file ``mysql-test/r/sp.result.orig''
mysql-test/r/sp_notembedded.result:
New BitKeeper file ``mysql-test/r/sp_notembedded.result''
mysql-test/r/subselect_notembedded.result:
New BitKeeper file ``mysql-test/r/subselect_notembedded.result''
mysql-test/t/ctype_cp932_notembedded.test:
New BitKeeper file ``mysql-test/t/ctype_cp932_notembedded.test''
mysql-test/t/innodb_notembedded.test:
New BitKeeper file ``mysql-test/t/innodb_notembedded.test''
mysql-test/t/sp.test.orig:
New BitKeeper file ``mysql-test/t/sp.test.orig''
mysql-test/t/sp_notembedded.test:
New BitKeeper file ``mysql-test/t/sp_notembedded.test''
mysql-test/t/subselect_notembedded.test:
New BitKeeper file ``mysql-test/t/subselect_notembedded.test''
- Move init of "reconnect" variable to mysql_init
- Add test case to mysql_client_test.
sql-common/client.c:
Move initialisation of reconnect variable to mysql_init instead of doing it in mysql_real_connect.
tests/mysql_client_test.c:
Add test to check that reconnect is not modified by a call to mysql_real_connect
statement that generated a warning. (Bug #15510)
sql-common/client.c:
Reset warning_count in free_old_query(), don't stomp old value for
it in cli_read_query_result().
tests/mysql_client_test.c:
Add new regression test
- Added show status variable "compression" for checking that compression is turned on.
- Updated show status variable "have_openssl" to be set to DISABLED if server supports ssl but it's not turned on to accept incoming ssl connections.
- Setup server to accept ssl connections from clients ig that is supported by server
- New tests
- ssl - Run with ssl turned on
- ssl_compress - Run with ssl and compression turned on
- compress - Run with compression turned in
- Updated test
- openssl_1, rpl_openssl1 - Changed to run if server supports ssl
BitKeeper/deleted/.del-have_openssl_1.inc~55590efedeec9ee0:
Delete: mysql-test/include/have_openssl_1.inc
BitKeeper/deleted/.del-have_openssl_1.require~e8cdeb0adba99ac5:
Delete: mysql-test/r/have_openssl_1.require
client/mysqltest.c:
Add commands to enable/disable ssl for the follwing connect's
Add commands to enable/disable compression for the following connect's
mysql-test/mysql-test-run.pl:
Test if ssl is supported by the server
If ssl is supported by the server, start server with ability to accept ssl connections from clients
Cleanup check of supported features check_ssl_support, check_ndbcluster_support
Flags and helptext for mysl-test-run.pl updated
--ssl, turn on ssl encryption between server and client
--skip-ssl, don'r turn on ssl or setup ssl even if it's supported
--with-openssl, deprecated, synonym with --ssl
mysql-test/r/openssl_1.result:
Update test results
mysql-test/t/openssl_1.test:
Run this if server reports it has support for ssl
Enable ssl before connecting
Check that ssl encryption has been turned on
mysql-test/t/rpl_openssl.test:
Run this if server reports it supports ssl
sql-common/client.c:
Add DBUG_PRINT's
sql/mysqld.cc:
If server can't accept ssl connection set have_openssl to SHOW_OPTION_DISABLED
Add status variable to show if connection with server is using compressed protocol
sql/sql_show.cc:
Add status variable to show if connection with server is using compressed protocol
sql/structs.h:
Add status variable to show if connection with server is using compressed protocol
mysql-test/r/compress.result:
New BitKeeper file ``mysql-test/r/compress.result''
mysql-test/r/ssl.result:
New BitKeeper file ``mysql-test/r/ssl.result''
mysql-test/r/ssl_compress.result:
New BitKeeper file ``mysql-test/r/ssl_compress.result''
mysql-test/t/compress.test:
New BitKeeper file ``mysql-test/t/compress.test''
mysql-test/t/ssl.test:
New BitKeeper file ``mysql-test/t/ssl.test''
mysql-test/t/ssl_compress.test:
New BitKeeper file ``mysql-test/t/ssl_compress.test''
- Added show status variable "compression" for checking that compression is turned on.
- Updated show status variable "have_openssl" to be set to DISABLED if server supports ssl but it's not turned on to accept incoming ssl connections.
- Setup server to accept ssl connections from clients ig that is supported by server
- New tests
- ssl - Run with ssl turned on
- ssl_compress - Run with ssl and compression turned on
- compress - Run with compression turned in
- Updated test
- openssl_1, rpl_openssl1 - Changed to run if server supports ssl
Added flag to Field::store(longlong) to specify if value is unsigned.
This fixes bug #12750: Incorrect storage of 9999999999999999999 in DECIMAL(19, 0)
Fixed warning from valgrind in CREATE ... SELECT
Fixed double free of mysql.options if reconnect failed
mysql-test/mysql-test-run.sh:
Added option --valgrind-mysqltest to allow one to run mysqltest with valgrind
mysql-test/r/bigint.result:
Update results after fix for Field::store(longlong)
mysql-test/r/range.result:
Update results after fix for Field::store(longlong)
mysql-test/r/strict.result:
Update results after fix for Field::store(longlong)
(This fixes some wrong results when storing things into bigint columns)
mysql-test/r/type_ranges.result:
Update results after fix for Field::store(longlong)
mysql-test/t/bigint.test:
Added testing for #12750: Incorrect storage of 9999999999999999999 in DECIMAL(19, 0)
mysql-test/t/innodb.test:
Removed comments affected by this bug fix
mysql-test/t/mysqldump.test:
Fixed result to not depend on existing config files
mysql-test/t/range.test:
0xff numbers are now unsigned
mysql-test/t/strict.test:
Added errors for things that previously (wrongly) succeeded
sql-common/client.c:
Fixed double free of mysql.options if reconnect failed
sql/field.cc:
Added flag to Field::store(longlong) to specify if value is unsigned
sql/field.h:
Added flag to Field::store(longlong) to specify if value is unsigned
sql/field_conv.cc:
Fixed calls to Field::store(longlong,flag)
sql/ha_ndbcluster.cc:
Fixed calls to Field::store(longlong,flag)
sql/handler.cc:
Fixed calls to Field::store(longlong,flag)
sql/item.cc:
Fixed calls to Field::store(longlong,flag)
sql/item_sum.cc:
Fixed calls to Field::store(longlong,flag)
sql/sp.cc:
Fixed calls to Field::store(longlong,flag)
sql/sql_acl.cc:
Fixed calls to Field::store(longlong,flag)
sql/sql_help.cc:
Fixed calls to Field::store(longlong,flag)
sql/sql_show.cc:
Fixed calls to Field::store(longlong,flag)
sql/sql_table.cc:
Fixed varning from valgrind
sql/sql_udf.cc:
Fixed calls to Field::store(longlong,flag)
sql/tztime.cc:
Fixed calls to Field::store(longlong,flag)
sql/unireg.cc:
Fixed calls to Field::store(longlong,flag)
Added flag to Field::store(longlong) to specify if value is unsigned.
This fixes bug #12750: Incorrect storage of 9999999999999999999 in DECIMAL(19, 0)
Fixed warning from valgrind in CREATE ... SELECT
Fixed double free of mysql.options if reconnect failed
into mysql.com:/home/jimw/my/mysql-5.0-clean
include/my_global.h:
Auto merged
include/my_pthread.h:
Auto merged
include/violite.h:
Auto merged
mysql-test/r/ndb_autodiscover.result:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/ndbapi/SignalSender.cpp:
Auto merged
sql-common/client.c:
Auto merged
sql/examples/ha_archive.cc:
Auto merged
sql/net_serv.cc:
Auto merged
vio/vio.c:
Auto merged
vio/viosocket.c:
Auto merged
vio/viossl.c:
Auto merged
configure.in:
Resolve conflicts
sql-common/client.c:
Fixes bug #5588. checks if operation was timed out.
vio/vio.c:
Added vio_was_interrupted() function references to detect timed out
operation properly on win32.
vio/vio_priv.h:
Added vio_ssl_was_interrupted() function that detects timed out
operation properly on win32.
vio/viosocket.c:
Minor changes to follow up the coding standard.
vio/viossl.c:
Added vio_ssl_was_interrupted() function that detects timed out
operation properly on win32.
into mysql.com:/home/jimw/my/mysql-5.0-clean
myisam/myisampack.c:
Auto merged
mysql-test/r/metadata.result:
Auto merged
mysys/list.c:
Auto merged
mysys/thr_lock.c:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_test.cc:
Auto merged
sql/mysqld.cc:
SCCS merged
query that mixed statements that do and do not return info. (Bug #11688)
mysql-test/r/metadata.result:
Add new results
mysql-test/t/metadata.test:
Add new regression test
sql-common/client.c:
Clear mysql->info in free_old_query()
Ensure mysql_close() is called if mysql_set_character_set() fails
libmysql/libmysql.c:
Indentation cleanup
mysql-test/r/select.result:
Fix bad merge & align code with 4.1
mysql-test/r/type_newdecimal.result:
Added test of extreme case
mysql-test/t/select.test:
Fix bad merge & align code with 4.1
mysql-test/t/type_newdecimal.test:
Added test of extreme case
mysys/charset.c:
Removed not used variable
mysys/default.c:
Simplify code
sql-common/client.c:
Ensure mysql_close() is called if mysql_set_character_set() fails
sql/log.cc:
strmov(strmov()) -> strxmov()
sql/sp.cc:
Indentation fixes
sql/sql_acl.cc:
Indentation fixes
sql/sql_base.cc:
Added commments
Moved variable to inner block
sql/sql_show.cc:
Simple optimization (removed loop variable)
sql/sql_trigger.cc:
strmov(strmov()) -> strxmov()
strings/decimal.c:
Indentation fixes
Moved mysql_set_character_set function to client.c
Changed function prototype for mysql_set_character_set (as suggested
by Konstantin)
include/mysql.h:
Changed function prototype
libmysql/libmysql.c:
moved mysql_set_character_set to client.c
sql-common/client.c:
moved mysql_set_character_set to client.c
heap/hp_hash.c:
fix for windows 64-bit compiler warnings
heap/hp_update.c:
fix for windows 64-bit compiler warnings
mysys/default.c:
fix for windows 64-bit compiler warnings
mysys/default_modify.c:
fix for windows 64-bit compiler warnings
mysys/mf_iocache.c:
fix for windows 64-bit compiler warnings
mysys/mf_keycache.c:
fix for windows 64-bit compiler warnings
mysys/my_alloc.c:
fix for windows 64-bit compiler warnings
mysys/my_getopt.c:
fix for windows 64-bit compiler warnings
mysys/my_mmap.c:
fix for windows 64-bit compiler warnings
mysys/my_once.c:
fix for windows 64-bit compiler warnings
mysys/string.c:
fix for windows 64-bit compiler warnings
sql-common/client.c:
fix for windows 64-bit compiler warnings
sql/field.cc:
fix for windows 64-bit compiler warnings
sql/gstream.cc:
fix for windows 64-bit compiler warnings
sql/ha_myisam.cc:
fix for windows 64-bit compiler warnings
sql/ha_myisammrg.cc:
fix for windows 64-bit compiler warnings
sql/item.cc:
fix for windows 64-bit compiler warnings
sql/item.h:
fix for windows 64-bit compiler warnings
sql/item_cmpfunc.cc:
fix for windows 64-bit compiler warnings
sql/password.c:
fix for windows 64-bit compiler warnings
sql/set_var.h:
fix for windows 64-bit compiler warnings
strings/ctype-big5.c:
fix for windows 64-bit compiler warnings
strings/ctype-bin.c:
fix for windows 64-bit compiler warnings
strings/ctype-cp932.c:
fix for windows 64-bit compiler warnings
strings/ctype-eucjpms.c:
fix for windows 64-bit compiler warnings
strings/ctype-mb.c:
fix for windows 64-bit compiler warnings
strings/ctype-simple.c:
fix for windows 64-bit compiler warnings
strings/ctype-sjis.c:
fix for windows 64-bit compiler warnings
strings/ctype-uca.c:
fix for windows 64-bit compiler warnings
strings/ctype-ucs2.c:
fix for windows 64-bit compiler warnings
strings/ctype-ujis.c:
fix for windows 64-bit compiler warnings
strings/ctype-utf8.c:
fix for windows 64-bit compiler warnings
strings/ctype.c:
fix for windows 64-bit compiler warnings
strings/decimal.c:
fix for windows 64-bit compiler warnings
strings/xml.c:
fix for windows 64-bit compiler warnings
Fixed bug in mysql_stmt_fetch() when retrieving rows to return
mysql-test/r/ps.result:
Fix to not get warnings if mysql_client_test.test fails
mysql-test/t/index_merge_ror.test:
Proper fix for 64 bit intel (which gives uses another, equal good index)
mysql-test/t/ps.test:
Fix to not get warnings if mysql_client_test.test fails
sql-common/client.c:
More debugging
sql/sql_prepare.cc:
Fixed bug in mysql_stmt_fetch() when retrieving rows to return
sql/sql_select.cc:
More debugging
tests/mysql_client_test.c:
More debugging
(crash on attempt to re-execute a statement with an open cursor) +
post-review fixes.
include/errmsg.h:
Add a special error message when we attempt to mysql_stmt_fetch
from a statement which has no result set.
libmysql/errmsg.c:
Error message text for CR_NO_RESULT_SET
libmysql/libmysql.c:
Move the code which frees result sets on client and closes the cursor
on server, resets long data state on client and server.
This makes one function out of two (mysql_stmt_reset and
mysql_stmt_free_result), thus aggregating all related reset work
in one place.
sql-common/client.c:
Fix one place where we flushed the pending result set of a statement,
but didn't set unbuffered_fetch_cancelled flag.
sql/share/errmsg.txt:
Fix format of ER_UNKNOWN_STMT_HANDLER error message (needs to
be fixed separately in 4.1). Add two new error messages
for the case when we fetch from when there is no cursor
and for the case when we attempt to execute a statement while there is
a cursor.
sql/sql_prepare.cc:
Return error when we fetch while there is no open cursor and
when we call execute while there is a pending cursor.
Fix mysql_stmt_reset to close the open cursor if there is any.
sql/sql_select.cc:
free_items and free_root moved to Cursor::close().
sql/sql_select.h:
A comment added.
tests/mysql_client_test.c:
A test case for Bug#9478, test the case of mysql_stmt_reset
called for client-side cached result set and for the case with open cursor.
All strcpy replaced with strmov (review request).
- Removed use of mysql->extra_info
- Removed unused function send_records_num
VC++Files/winmysqladmin/mysql.h:
Comment extra_info as not used anymore
client/mysqlshow.c:
Remove use of extra info. Instead read number of records in table using SELECT COUNT(*)
include/mysql.h:
Comment extra_info as not used anymore
libmysqld/lib_sql.cc:
Removed unused function send_records_num
sql-common/client.c:
Remove use of extra_info since number of records is not sent in the protocol anymore
sql/protocol.cc:
Removed unused function send_records_num
sql/protocol.h:
Removed unused function send_records_num
--disable_reconnect and --enable_reconnect to mysqltest
so that it can be tested properly. (Bug #8866)
client/mysqltest.c:
Add support for --disable_reconnect and --enable_reconnect
mysql-test/r/kill.result:
Update results
mysql-test/t/kill.test:
Fix test to actually verify that killing a connection is working,
and that automatic reconnect is working as desired.
sql-common/client.c:
Clean up MYSQL->stmts on reconnect by invalidating statements
not in the MYSQL_STMT_INIT_DONE state, and reconnecting others
to the new MYSQL object.
provide created shared memory objects with proper
access rights to make them usable when client and server
are running under different accounts.
Post review fixes.
VC++Files/mysys/mysys.dsp:
Add my_windac.c to mysys.lib
include/my_sys.h:
Declarations for SECURITY_ATTRIBUTES create/destroy functions.
mysys/Makefile.am:
Add my_windac.c to the list of compiled files.
sql-common/client.c:
Lower requested access rights for events as the server won't
provide clients with ALL access in order to prevent denial
of service attack.
sql/mysqld.cc:
Set proper security attributes for the kernel objects to make them
usable when mysqld is running as a Windows service.
provide created shared memory objects with proper
access rights to make them usable when client and server
are running under different accounts.
Post review fixes.
The patch implements the idea suggested by Olaf van der Spek in
thread "Client: many small reads?" (internals@lists.mysql.com).
Now small reads performed by the client library are buffered.
The buffering gives up to 2 times speedup when retrieving
one-column tables.
BUILD/SETUP.sh:
Remove --with-vio option which no longer exist.
BUILD/compile-pentium64-valgrind-max:
Remove --with-vio option which no longer exist.
config/ac-macros/misc.m4:
Removed --with-vio configure switch: we always use VIO. The switch,
in fact, only saved us one pointer dereferencing per call in case we had
only one transport type in VIO enabled.
config/ac-macros/openssl.m4:
Removed HAVE_VIO.
include/config-win.h:
Removed HAVE_VIO (not needed anymore)
Added HAVE_VIO_READ_BUFF (define buffered client reads for Windows clients).
include/violite.h:
Removed HAVE_VIO, as currently VIO is always in use.
Added declaration for vio_read_buff and related members in struct VIO.
sql-common/client.c:
Use flags to set up vio read buffering in mysql_real_connect.
sql/mysqld.cc:
Use flags to disable vio read buffering when creating a server
connection.
vio/vio.c:
Optionally set up vio read buffer when creating a new VIO structure.
vio/viosocket.c:
Implementation of client-side buffered reads in VIO: the idea
is to buffer small reads in a client buffer to save amount of
syscalls per retrieved result set. The implementation relies
on the fact that read/recv will return as soon as there is
some data in the kernel buffer, no matter how big the given
user's buffer is. To be able to disable it in case recv/read don't
have such semantics, the new calls are guarded
with #define HAVE_VIO_READ_BUFF. Currently buffered reading is
switched on only for BSD sockets and named pipes, both on Windows
and UNIXes.
The patch implements the idea suggested by Olaf van der Spek in
thread "Client: many small reads?" (internals@lists.mysql.com).
Now small reads performed by the client library are buffered.
The buffering gives up to 2 times speedup when retrieving
one-column tables.
This is the first changeset of suggested changes recommended in Kostja's
review of my patch, 1.1846, which includes only functionality changes.
Style changes/Documentation patch to follow.
include/mysql.h:
removed declaration of cli_fetch_lengths per Kostja's suggestion
libmysql/libmysql.c:
moved mysql_fetch_lengths to client.c (for server to access) per Kostja's
suggestion
sql-common/client.c:
added back 'static' to function definition, added mysql_fetch_lengths
sql/ha_federated.cc:
changed to use defines as opposed to hardcoded values
sql/ha_federated.h:
took out duplicate table_flag, fixed a resolve mistake
This is the first changeset of suggested changes recommended in Kostja's
review of my patch, 1.1846, which includes only functionality changes.
Style changes/Documentation patch to follow.
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
include/mysql.h:
added cli_fetch_lengths to mysql.h in order to use this function in the federated handler
mysql-test/r/federated.result:
- Moved countries to be created and inserted prior to federated test table
- Added a test of inserting binary values into a blob table
mysql-test/t/federated.test:
- Moved order of countries table creation to prior to test table creation
- Test insertion of binary values in a blob table
sql-common/client.c:
removed 'static' to allow cli_fetch_lengths to be used in the federated handler
sql/ha_federated.cc:
1. share->scheme that was created in parse_url was not being freed
2. HASH federated_open_tables was being deleted, but not freed
3. 'result' from mysql_store_result was not being free in several instances
4. Fixed the problem where a table scan was being performed after
index_read_idx, which didn't cause a problem because the result set from
idx_read_idx was not being freed, but once the result set was properly freed,
it broke update_row. Now, I'm using the bool 'scan' to determine if I need to
perform a table scan, which it magically is false when the query is an update
with an index.
5. Changed all stings containing the query to perform in mysql_real_query
calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion
(better performance)
6. Fixed various cast/type/truth compile warnings.
7. Removed 'load_conn_info' and just let 'parse_url' handle it.
8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved
from the database in rnd_next/convert_row_to_internal_format
9. Formatting changes by using indent-ex!
sql/ha_federated.h:
added scan flag, setting defaults for result and scan_flag
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch.
The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:
(*field)->store(row[x], strlen(row[x]), &my_charset_bin);
was changed to:
(*field)->store(row[x], lengths[x], &my_charset_bin);
lengths being a unsigned long pointer to the values of the field lengths from a
MYSQL_ROW.
Since the server doesn't have the function "mysql_fetch_lengths" available, I tried
to use "result->lengths", but this isn't set, so I finally successfully used
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.
I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!
This code passes the entire test suite, without any errors or warning on both my
workstation and build.mysql.com
BitKeeper/etc/gone:
auto-union
innobase/os/os0file.c:
Auto merged
sql-common/client.c:
Auto merged
sql/examples/ha_archive.cc:
Auto merged
sql/net_serv.cc:
Auto merged
sql/set_var.cc:
Auto merged
format strings (in all languages) already included field limits on the
specifiers, so this is just protection against future mistakes. (Bug #7556)
sql-common/client.c:
Replace all sprintf() calls with my_snprintf()
BitKeeper/etc/ignore:
auto-union
include/my_pthread.h:
Auto merged
innobase/os/os0file.c:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql-common/client.c:
merged manually
Make multi-statements the preferred option name (to coincide
with the renaming of the CLIENT_MULTI_RESULTS symbol to
CLIENT_MULTI_STATEMENTS). Continue to allow multi-queries
for backward compatibility.
sql-common/client.c:
Make multi-statements the preferred option name (to coincide
with the renaming of the CLIENT_MULTI_RESULTS symbol to
CLIENT_MULTI_STATEMENTS). Continue to allow multi-queries
for backward compatibility.
Make multi-statements the preferred option name (to coincide
with the renaming of the CLIENT_MULTI_RESULTS symbol to
CLIENT_MULTI_STATEMENTS). Continue to allow multi-queries
for backward compatibility.
configure.in:
Auto merged
client/mysqldump.c:
Auto merged
innobase/buf/buf0rea.c:
Auto merged
innobase/dict/dict0load.c:
Auto merged
innobase/fil/fil0fil.c:
Auto merged
innobase/include/fil0fil.h:
Auto merged
innobase/include/row0mysql.h:
Auto merged
innobase/include/trx0trx.h:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/row/row0ins.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/alter_table.result:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/r/grant_cache.result:
Auto merged
mysql-test/r/merge.result:
Auto merged
mysql-test/r/ndb_blob.result:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/timezone2.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/t/grant.test:
Auto merged
mysql-test/t/merge.test:
Auto merged
mysql-test/t/multi_update.test:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/NdbOperationDefine.cpp:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/ha_myisammrg.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_table.cc:
Auto merged
sql/strfunc.cc:
Auto merged
sql/unireg.cc:
Auto merged
vio/vio.c:
Auto merged
vio/viosocket.c:
Auto merged
add space after comma
add space after equal
add comments in vio_close_shared_memory()
include/violite.h:
fix indentation
sql-common/client.c:
fix identation
sql/mysqld.cc:
add space after comma
vio/vio.c:
add space after equal
fix identation
vio/viosocket.c:
add space after comma
add comments in vio_close_shared_memory()
Solaris doesn't define INADDR_NONE macro. This resulted in compilation
failure. (advanced fix)
include/my_net.h:
Added INADDR_NONE define
sql-common/client.c:
removed INADDR_NONE define as it is moved to my_net.h
sql/mysqld.cc:
add my_net.h define and remove INADDR_NONE
include/mysql.h:
Adding an option for data truncations feature.
libmysql/libmysql.c:
No 'smart' behaviour now for data truncations: they are always
reported, unless switched off with
mysql_options(mysql, MYSQL_REPORT_DATA_TRUNCATION, (my_bool*) &(option=1));
sql-common/client.c:
Add support for report-data-truncation variable in my.cnf
tests/client_test.c:
A test for MYSQL_REPORT_DATA_TRUNCATION option.
(continue)
added event_conn_closed
replaced WaitForSingleObject on WaitForMultipleObjects
inserted a check in vio_close()
added SetEvent() for event_conn_closed
All our programs which use mysql_real_connect() and mysql_connect() are updated accordingly, though I have deliberately
made mysqlimport not reconnect anymore (already true for mysqldump >= 4.1.8).
All Connector devs have been warned about the change I'm doing here - which was agreed with Monty,
and fixes BUG#2555.
VC++Files/libmysqltest/mytest.c:
explicit mention of reconnect (no behaviour change)
VC++Files/mysqlmanager/mysqlmanagerview.cpp:
explicit mention of reconnect (no behaviour change)
VC++Files/test1/mysql_thr.c:
explicit mention of reconnect (no behaviour change)
VC++Files/winmysqladmin/main.cpp:
explicit mention of reconnect (no behaviour change)
client/mysql.cc:
explicit mention of reconnect if embedded (no behaviour change)
client/mysqladmin.cc:
explicit mention of reconnect (no behaviour change)
client/mysqlbinlog.cc:
explicit mention of reconnect (no behaviour change)
client/mysqlcheck.c:
explicit mention of reconnect (no behaviour change)
client/mysqlimport.c:
explicit mention of NO reconnect (behaviour change). As most time is passed in LOAD DATA INFILE,
and as it does not make sense to reconnect after a partly failed LOAD... And as mysqlimport sometimes
does LOCK TABLES where we mustn't reconnect...
client/mysqlshow.c:
explicit mention of reconnect (no behaviour change)
client/mysqltest.c:
explicit mention of reconnect (no behaviour change).
Normally we should not reconnect (it's not good to have silent reconnection in the middle of a test),
but 5.0 is too touchy to change it now. I'm marking it TODO.
libmysql/libmysql.c:
explicit mention of reconnect (no behaviour change)
libmysqld/examples/builder-sample/emb_samples.cpp:
explicit mention of reconnect (no behaviour change)
ndb/test/ndbapi/flex_bench_mysql.cpp:
explicit mention of reconnect (no behaviour change)
ndb/tools/restore/consumer_restorem.cpp:
explicit mention of reconnect (no behaviour change)
sql-common/client.c:
Changing the default of libmysqlclient : it's now NO reconnection.
sql/repl_failsafe.cc:
explicit mention of reconnect (no behaviour change)
sql/slave.cc:
explicit mention of reconnect (no behaviour change)
tests/client_test.c:
explicit mention of reconnect (no behaviour change)
tests/connect_test.c:
explicit mention of reconnect (no behaviour change)
tests/deadlock_test.c:
explicit mention of reconnect (no behaviour change)
tests/insert_test.c:
explicit mention of reconnect (no behaviour change)
tests/list_test.c:
explicit mention of reconnect (no behaviour change)
tests/select_test.c:
explicit mention of reconnect (no behaviour change)
tests/showdb_test.c:
explicit mention of reconnect (no behaviour change)
tests/ssl_test.c:
explicit mention of reconnect (no behaviour change)
tests/thread_test.c:
explicit mention of reconnect (no behaviour change)
tools/mysqlmanager.c:
explicit mention of reconnect (no behaviour change)
All our programs which use mysql_real_connect() and mysql_connect() are updated accordingly, though I have deliberately
made mysqlimport not reconnect anymore (already true for mysqldump >= 4.1.8).
All Connector devs have been warned about the change I'm doing here - which was agreed with Monty,
and fixes BUG#2555.
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
FOUND is not a reserved keyword anymore
Added Item_field::set_no_const_sub() to be able to mark fields that can't be substituted
Added 'simple_select' method to be able to quickly determinate if a select_result is a normal SELECT
Note that the 5.0 tree is not yet up to date: Sanja will have to fix multi-update-locks for this merge to be complete
BUILD/SETUP.sh:
Portability fix
client/mysqltest.c:
Portability fix
mysql-test/r/drop.result:
updated results
mysql-test/r/func_str.result:
New warnings (after merge)
mysql-test/r/insert.result:
Updated tests
mysql-test/r/join_nested.result:
Updated results (because of new column types in 5.0)
mysql-test/r/lock_multi.result:
Temporarly wrong results until Sanja fixes multi-update-lock in 5.0
mysql-test/r/multi_update.result:
Temporary fix until Sanja fixes multi-update locking
mysql-test/r/ps_1general.result:
Update of results after merge
mysql-test/r/ps_2myisam.result:
Update of results after merge
mysql-test/r/ps_3innodb.result:
Update of results after merge
mysql-test/r/ps_4heap.result:
Update of results after merge
mysql-test/r/ps_5merge.result:
Update of results after merge
mysql-test/r/ps_6bdb.result:
Update of results after merge
mysql-test/r/query_cache.result:
Update of results after merge
mysql-test/r/range.result:
New results for new tests
mysql-test/r/rpl_auto_increment.result:
Update with new 4.0 information
mysql-test/r/rpl_charset.result:
After merge fixes
mysql-test/r/subselect.result:
After merge fixes
mysql-test/r/view.result:
Temporary fix until multi-update-locking is fixed
mysql-test/t/drop.test:
Safety fix
mysql-test/t/multi_update.test:
Temporary fix until multi-update-locking is fixed
mysql-test/t/rpl_charset.test:
More comments
mysql-test/t/sp-error.test:
Updated comments
mysql-test/t/view.test:
Temporary fix until multi-update-locking is fixed
scripts/mysql_fix_privilege_tables.sh:
Better error message
sql-common/client.c:
More debugging
sql/ha_ndbcluster.cc:
After merge fixes
sql/handler.cc:
After merge fixes
sql/item.cc:
Simple optimization of creating item
After merge fixed
Added Item_field::set_no_const_sub() to be able to mark fields that can't be substituted
The problem is that if you compare a string field to a binary string, you can't replace the field with a string constant as the binary comparison may then fail (The original field value may be in a different case)
sql/item.h:
Added Item::set_no_const_sub() to be able to mark fields that can't be substituted
sql/item_cmpfunc.cc:
Mark fields compared as binary to not be substituted.
sql/item_func.cc:
After merge fix
sql/log_event.cc:
After merge fix
sql/mysql_priv.h:
After merge fix
sql/opt_range.cc:
After merge fix
sql/protocol.cc:
Made flags uint instead of int (as it's used as a bit mask)
sql/protocol.h:
Made flags uint instead of int (as it's used as a bit mask)
sql/protocol_cursor.cc:
Made flags uint instead of int (as it's used as a bit mask)
Indentation cleanups
sql/sp.cc:
After merge fixes
Removed compiler warnings
sql/sp_head.cc:
After merge fixes
sql/sql_base.cc:
After merge fixes
Removed 'send_error' from 'insert_fields()' as the error is sent higher up
sql/sql_class.cc:
Give assert if set_n_backup_item_arena is used twice
sql/sql_class.h:
Give assert if set_n_backup_item_arena is used twice
After merge fixes
Added 'simple_select' method to be able to quickly determinate if a select_result is a normal SELECT
sql/sql_handler.cc:
After merge fixes
sql/sql_parse.cc:
After merge fixes
sql/sql_prepare.cc:
After merge fixes
sql/sql_select.cc:
After merge fixes
Moved 'build_equal_items' to optimize_cond() (logical place)
sql/sql_table.cc:
After merge fixes
sql/sql_trigger.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
(This should be fixed by Sanja to have lower granuality locking of tables in multi-update)
sql/sql_view.cc:
After merge fixes
sql/sql_yacc.yy:
After merge fixes
Don't have FOUND as a reserved keyword
FOUND is not a reserved keyword anymore
Added Item_field::set_no_const_sub() to be able to mark fields that can't be substituted
Added 'simple_select' method to be able to quickly determinate if a select_result is a normal SELECT
Note that the 5.0 tree is not yet up to date: Sanja will have to fix multi-update-locks for this merge to be complete
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
New mysqltest that can run mysqltest with PS
Added support for ZEROFILL in PS
Fixed crash when one called mysql_stmt_store_result() without a preceding mysql_stmt_bind_result()
Updated test cases to support --ps-protocol
(Some tests are still run using old protocol)
Fixed crash in PS when using SELECT * FROM t1 NATURAL JOIN t2...
Fixed crash in PS when using sub queries
Create table didn't signal when table was created. This could cause a "DROP TABLE created_table" in another thread to wait "forever"
Fixed wrong permissions check in PS and multi-table updates (one could get permission denied for legal quries)
Fix for PS and SELECT ... PROCEDURE
Reset all warnings when executing a new PS query
group_concat(...ORDER BY) didn't work with PS
Fixed problem with test suite when not using innodb
BitKeeper/deleted/.del-innodb-lock-master.opt~f76a4a1999728f87:
Delete: mysql-test/t/innodb-lock-master.opt
client/Makefile.am:
mysqltest now uses regex
client/mysqltest.c:
Added support for testing of prepared statements (with --ps-protocol)
Main code was done by Kent, I did mainly some cleanups and minor bug fixes
New test commands:
--disable_ps_protocol
--enable_ps_protocol
NOTE: new code still has some things that needs to be cleaned up.
For example run_query_stmt_handle_error() should be made more general so that same code can be used also by 'normal' queries
configure.in:
mysqltest now uses regex
libmysql/libmysql.c:
Reset warning_count after prepare (safety). In the future we should also provide warnings on prepare
integer -> string conversion now handles ZEROFILL
double -> string conversion is now closer to the one in the server
Fixed crash when one called mysql_stmt_store_result() without preceding mysql_stmt_bind_result()
libmysqld/examples/Makefile.am:
mysqltest now uses regex
mysql-test/include/have_query_cache.inc:
Fixes for --ps-protocol
mysql-test/include/ps_conv.inc:
Fixes for --ps-protocol
mysql-test/mysql-test-run.sh:
Added options --ps-protocol
mysql-test/r/ctype_utf8.result:
Fixed test case
mysql-test/r/fulltext_cache.result:
Changed output of MATCH to use round() to get same numbers with --ps-protocol
mysql-test/r/fulltext_left_join.result:
Changed output of MATCH to use round() to get same numbers with --ps-protocol
mysql-test/r/fulltext_multi.result:
Changed output of MATCH to use round() to get same numbers with --ps-protocol
mysql-test/r/innodb-lock.result:
Fixed test to work even if Innodb is not compiled in.
mysql-test/t/create.test:
Fixes for --ps-protocol
mysql-test/t/ctype_utf8.test:
Remove warnings
mysql-test/t/date_formats.test:
Fixes for --ps-protocol
mysql-test/t/fulltext_cache.test:
Changed output of MATCH to use round() to get same numbers with --ps-protocol
mysql-test/t/fulltext_left_join.test:
Changed output of MATCH to use round() to get same numbers with --ps-protocol
mysql-test/t/fulltext_multi.test:
Changed output of MATCH to use round() to get same numbers with --ps-protocol
mysql-test/t/func_group.test:
Fixes for --ps-protocol
mysql-test/t/func_sapdb.test:
Fixes for --ps-protocol
mysql-test/t/innodb-lock.test:
Fixed test to work even if Innodb is not compiled in.
mysql-test/t/insert.test:
Fixes for --ps-protocol
mysql-test/t/insert_select.test:
Fixes for --ps-protocol
mysql-test/t/insert_update.test:
Fixes for --ps-protocol
mysql-test/t/metadata.test:
Fixes for --ps-protocol
mysql-test/t/multi_statement.test:
Fixes for --ps-protocol
mysql-test/t/ps_1general.test:
Fixes for --ps-protocol
mysql-test/t/rollback.test:
Fixes for --ps-protocol
mysql-test/t/rpl_redirect.test:
Fixes for --ps-protocol
mysql-test/t/rpl_user_variables.test:
Fixes for --ps-protocol
mysql-test/t/select.test:
Fixes for --ps-protocol
mysql-test/t/status.test:
Fixes for --ps-protocol
mysql-test/t/type_blob.test:
Fixes for --ps-protocol
mysql-test/t/type_float.test:
Fixes for --ps-protocol
mysql-test/t/union.test:
Fixes for --ps-protocol
mysql-test/t/warnings.test:
Fixes for --ps-protocol
mysys/my_alloc.c:
More debugging information
sql-common/client.c:
More debugging information
sql-common/my_time.c:
TIME didn't support full range with PS
sql/field.cc:
TIME didn't support full range with PS
sql/item_cmpfunc.cc:
IN(constants,...) didn't work with PS
sql/item_subselect.cc:
Some subqueries didn't work with PS
sql/item_sum.cc:
group_concat(...ORDER BY) didn't work with PS
Removed variable warning_available as 'warning' can be used for this.
sql/item_sum.h:
Removed not needed variable
sql/protocol.cc:
TIME didn't support full range with PS
sql/set_var.cc:
Style fix
sql/sql_base.cc:
setup_wild() didn't properly restore old arena, which caused core dump in PS when using
SELECT * FROM t1 NATURAL JOIN t2...
sql/sql_class.cc:
Style fix
sql/sql_error.cc:
Style fix
sql/sql_insert.cc:
Create table didn't signal when table was created. This could cause a "DROP TABLE created_table" in another thread to wait "forever"
sql/sql_lex.h:
Fix for PS and procedures
sql/sql_parse.cc:
More debugging information
Make a copy of 'db' in PS as this may change
Fixed wrong permissions check in PS and multi-table updates
sql/sql_prepare.cc:
Fix for PS and SELECT ... PROCEDURE
Reset all warnings when executing a new query
sql/sql_union.cc:
Fixes for PS and SELECT ... PROCEDURE
Reset 'with_wild' as 'wild' is resolved on prepare
New mysqltest that can run mysqltest with PS
Added support for ZEROFILL in PS
Fixed crash when one called mysql_stmt_store_result() without a preceding mysql_stmt_bind_result()
Updated test cases to support --ps-protocol
(Some tests are still run using old protocol)
Fixed crash in PS when using SELECT * FROM t1 NATURAL JOIN t2...
Fixed crash in PS when using sub queries
Create table didn't signal when table was created. This could cause a "DROP TABLE created_table" in another thread to wait "forever"
Fixed wrong permissions check in PS and multi-table updates (one could get permission denied for legal quries)
Fix for PS and SELECT ... PROCEDURE
Reset all warnings when executing a new PS query
group_concat(...ORDER BY) didn't work with PS
Fixed problem with test suite when not using innodb
Simple optimzations and cleanups
Removed compiler warnings and fixed portability issues
Added client functions 'mysql_embedded()' to allow client to check if we are using embedded server
Fixes for purify
client/mysqlimport.c:
Remove not used variable
client/mysqltest.c:
Remove usage of MAXPATHLEN (all MySQL code uses FN_REFLEN)
Simplified code
Remove usage of sprintf("%llu") as this is not portable
include/mysql.h:
Added mysql_embedded() to be able to easily check if we are using the embedded server
innobase/srv/srv0start.c:
Don't use memcmp() when using purify (to avoid false warnings)
libmysql/libmysql.c:
Added mysql_embedded() to be able to easily check if we are using the embedded server
libmysql/libmysql.def:
Added mysql_embedded() to be able to easily check if we are using the embedded server
myisam/myisam_ftdump.c:
Remove compiler warning
myisam/myisamchk.c:
Remove compiler warning
myisam/rt_test.c:
#ifdef not used code
mysys/hash.c:
Remove compiler warning (from last push)
mysys/my_gethwaddr.c:
Remove compiler warning
ndb/src/ndbapi/ndberror.c:
#ifdef not used code
regex/regcomp.c:
Remove not used code
regex/regcomp.ih:
Remove not used code (to remove compiler warnings)
sql-common/client.c:
Remove compiler warnings
sql/field.cc:
Simple optimization
sql/ha_innodb.cc:
Rename mysql_embedded -> mysqld_embedded
sql/item.cc:
Fix comments
Move variables first on block
Remove else after return
Simple optimizations
(no logic changes)
sql/item_cmpfunc.cc:
Added comment
sql/mysql_priv.h:
Rename mysql_embedded -> mysqld_embedded
sql/mysqld.cc:
Rename mysql_embedded -> mysqld_embedded
sql/sql_acl.cc:
Added comments
simple optimization
Fixed 'very unlikely' bug when doing REVOKE ALL PRIVILEGES
sql/sql_select.cc:
More comments
Simple optimization
sql/sql_show.cc:
Simple changes to make similar code similar
More comments
sql/sql_string.cc:
Trivial optimization and better code layout
strings/Makefile.am:
Change xml.c to use bcmp to avoid warnings from purify
strings/xml.c:
Change xml.c to use bcmp to avoid warnings from purify
tests/client_test.c:
Remove usage of MAXPATHLEN (all MySQL code uses FN_REFLEN)
Simple optimzations and cleanups
Removed compiler warnings and fixed portability issues
Added client functions 'mysql_embedded()' to allow client to check if we are using embedded server
Fixes for purify
prepared statements."
include/hash.h:
New declaration for hash_reset() function. The old version was not used.
libmysql/client_settings.h:
Declaration for mysql_detach_stmt_list().
libmysql/libmysql.c:
Fix for bug#5315 "mysql_change_user() doesn't free prepared statements":
add call to mysql_detach_stmt_list(prepared statements) to
mysql_change_user(): all statements are freed by server, so client
counterparts need to be marked as not usable.
mysys/hash.c:
Fix for bug#5315 "mysql_change_user() doesn't free prepared statements":
implementation of hash_reset(), which frees all hash elements
and prepares the hash for reuse.
sql-common/client.c:
Fix for bug#5315 "mysql_change_user() doesn't free prepared statements":
implementation of mysql_detach_stmt_list(): zero connection pointer
in given statement list, thus marking given statements as not usable.
sql/sql_class.cc:
Fix for bug#5315 "mysql_change_user() doesn't free prepared statements":
reset prepared statements map in THD::change_user().
sql/sql_class.h:
Fix for bug#5315 "mysql_change_user() doesn't free prepared statements":
implementation of Statement_map::reset().
A little cleanup of ~Statement_map(): first empty names_hash, as st_hash
has a free function, which will delete statements.
tests/client_test.c:
A test case for bug #5315 "mysql_change_user() doesn't free prepared
statements".
