into mysql.com:/mnt/raid/MySQL/devel/5.1-rt-wl3158-merged
BitKeeper/deleted/.del-im_options_set.result~59278f56be61d921:
Auto merged
include/my_sys.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
BitKeeper/deleted/.del-im_options_unset.result~20a4790cd3c70a4f:
Auto merged
mysql-test/r/im_daemon_life_cycle.result:
Auto merged
mysql-test/r/im_life_cycle.result:
Auto merged
server-tools/instance-manager/Makefile.am:
Auto merged
server-tools/instance-manager/mysqlmanager.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/structs.h:
Auto merged
mysql-test/r/im_utils.result:
Auto merged
server-tools/instance-manager/instance_options.cc:
Manually merged.
server-tools/instance-manager/instance_options.h:
Manually merged.
server-tools/instance-manager/manager.cc:
Manually merged.
server-tools/instance-manager/manager.h:
Manually merged.
server-tools/instance-manager/options.cc:
Manually merged.
server-tools/instance-manager/options.h:
Manually merged.
into mysql.com:/space/pekka/ndb/version/my51
mysql-test/r/ndb_blob.result:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
use local
storage/ndb/src/ndbapi/NdbOperationSearch.cpp:
use local
mysql-test/r/ndb_blob.result:
bug#19956 : var* pk
mysql-test/t/ndb_blob.test:
bug#19956 : var* pk
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
bug#19956 - check var* length bytes and zero rest of value if any blob attribute
ndb/src/ndbapi/NdbOperationSearch.cpp:
bug#19956 - check var* length bytes and zero rest of value if any blob attribute
When a CREATE TABLE command created a table from a materialized
view id does not inherit default values from the underlying table.
Moreover the temporary table used for the view materialization
does not inherit those default values.
In the case when the underlying table contained ENUM fields it caused
misleading error messages. In other cases the created table contained
wrong default values.
The code was modified to ensure inheritance of default values for
materialized views.
mysql-test/r/view.result:
Added a test case for bug #19089.
mysql-test/t/view.test:
Added a test case for bug #19089.
sql/field.cc:
Fixed bug ##19089.
Added field dflt_field to the class Field.
This field is set for temp table fields that inherits
default values of items from which they are created.
sql/field.h:
Fixed bug ##19089.
Added field dflt_field to the class Field.
This field is set for temp table fields that inherits
default values of items from which they are created.
sql/sql_select.cc:
Fixed bug #19089.
When a CREATE TABLE command created a table from a materialized
view id does not inherit default values from the underlying table.
Moreover the temporary table used for the view materialization
does not inherit those default values.
The code was modified to ensure inheritance of default values for
materialized views.
Specify yaSSL .a file, not .la (bug#19966)
Don't use Mac OS X "__.SYMDEF SORTED" file in archives
libmysqld/Makefile.am:
Specify yaSSL .a file, not .la (bug#19966)
Don't use Mac OS X "__.SYMDEF SORTED" file in archives
Change mode to -rw-rw-r--
mysql-test/r/archive_bitfield.result:
Change mode to -rw-rw-r--
mysql-test/r/binlog_row_binlog.result:
Change mode to -rw-rw-r--
mysql-test/r/ctype_cp932_binlog_row.result:
Change mode to -rw-rw-r--
mysql-test/r/events.result:
Change mode to -rw-rw-r--
mysql-test/r/events_bugs.result:
Change mode to -rw-rw-r--
mysql-test/r/events_logs_tests.result:
Change mode to -rw-rw-r--
mysql-test/r/events_microsec.result:
Change mode to -rw-rw-r--
mysql-test/r/events_stress.result:
Change mode to -rw-rw-r--
mysql-test/r/federated_transactions.result:
Change mode to -rw-rw-r--
mysql-test/r/myisam-system.result:
Change mode to -rw-rw-r--
mysql-test/r/ndb_config2.result:
Change mode to -rw-rw-r--
mysql-test/r/ndb_dd_ddl.result:
Change mode to -rw-rw-r--
mysql-test/r/ndb_dd_disk2memory.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_insert_id_pk.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_2innodb.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_2myisam.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_blob.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_blob2.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_charset.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_dd_advance.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_func003.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_log.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_multi_update2.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_multi_update3.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_relayrotate.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_row_001.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_sp006.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_UUID.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_ndb_trig004.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_relay_space_innodb.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_row_blob_innodb.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_row_blob_myisam.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_row_log_innodb.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_row_mysqlbinlog.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_stm_EE_err2.result:
Change mode to -rw-rw-r--
mysql-test/r/type_newdecimal-big.result:
Change mode to -rw-rw-r--
mysql-test/t/binlog_row_mix_innodb_myisam-master.opt:
Change mode to -rw-rw-r--
mysql-test/t/events_logs_tests-master.opt:
Change mode to -rw-rw-r--
mysql-test/t/rpl_ndb_commit_afterflush.test:
Change mode to -rw-rw-r--
mysql-test/t/rpl_ndb_insert_ignore.test:
Change mode to -rw-rw-r--
plugin/fulltext/AUTHORS:
Change mode to -rw-rw-r--
plugin/fulltext/ChangeLog:
Change mode to -rw-rw-r--
plugin/fulltext/NEWS:
Change mode to -rw-rw-r--
plugin/fulltext/README:
Change mode to -rw-rw-r--
plugin/fulltext/configure.in:
Change mode to -rw-rw-r--
storage/archive/plug.in:
Change mode to -rw-rw-r--
storage/example/plug.in:
Change mode to -rw-rw-r--
into mysql.com:/home/jimw/my/mysql-5.1-clean
include/my_pthread.h:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/join_outer.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/rpl_temporary.test:
Auto merged
mysql-test/t/variables.test:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_acl.cc:
Auto merged
storage/ndb/test/ndbapi/Makefile.am:
Auto merged
storage/ndb/test/ndbapi/testInterpreter.cpp:
Auto merged
sql/set_var.cc:
Resolve conflict
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Resolve conflict
- record structure wrongly deallocated during online alter on remote mysqld
- change so that ndb handler allocates the buffer itself, so it can be reused after alter
Fix recursive mutex lock in drop index (ndbapi programs only)
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Fix recursive mutex lock in drop index (ndbapi programs only)
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Fix recursive mutex lock in drop index (ndbapi programs only)
The problem was that simple_parser was compiled as static plugin, which
is intended to be linked into server, but not plugged.
This patch makes simple_parser to be compiled as dynamic plugin by adding
-DMYSQL_DYNAMIC_PLUGIN into CFLAGS.
plugin/fulltext/Makefile.am:
Compile mypluglib as dynamic mysql plugin.
2. Fix trigger.test.
server-tools/instance-manager/log.cc:
Fix compilation in Windows.
sql/sql_trigger.cc:
Use strlen() instead of sizeof() for C-strings.
into mysql.com:/home/psergey/mysql-5.1-merge
include/my_sys.h:
Auto merged
libmysql/libmysql.c:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
- A segfault occured when the function 'kill_server' called
'my_sigset' with signal number 0. 'my_sigset' is a macro which
uses 'sigaction' to install the signal handler with an invalid
signal number will on most platforms return EINVAL but yields
a segfauilt on IRIX 6.5
- The server crash was detected by mysqld_safe and it was restarted although
a shutdown was requested.
- Semantics of kill_server(0) is not known, leaving it intact
include/my_pthread.h:
Check return value from sigaction with a DBUG_ASSERT
Also DBUG_ASSERT if signal number 0 is passed
sql/mysqld.cc:
Don't call my_sigset if signo is 0
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/include/util/SocketServer.hpp:
Auto merged
storage/ndb/src/common/util/SocketServer.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
Add mutex surronding sessions, as ndb_mgmd now actively tries to go and "purge stale sessions"
ndb/include/util/SocketServer.hpp:
Add mutex surronding sessions, as ndb_mgmd now actively tries to go and "purge stale sessions"
ndb/src/common/util/SocketServer.cpp:
Add mutex surronding sessions, as ndb_mgmd now actively tries to go and "purge stale sessions"
ndb/src/mgmsrv/Services.cpp:
Add mutex surronding sessions, as ndb_mgmd now actively tries to go and "purge stale sessions"
include/m_string.h:
Fix declaration of C-structure for Visual Studio and Sun C-compiler.
server-tools/instance-manager/IMService.cpp:
Fixed.
server-tools/instance-manager/Makefile.am:
Removed gcc-specific flags.
server-tools/instance-manager/commands.cc:
Moved m_string.h to the header.
server-tools/instance-manager/commands.h:
Replaced forward declaration of LEX_STRING because
it is not understood by all compilers.
server-tools/instance-manager/instance_map.cc:
1. Moved m_string.h to the header.
2. Use (const char *) to point to const C-string.
server-tools/instance-manager/instance_map.h:
Replaced forward declaration of LEX_STRING because
it is not understood by all compilers.
server-tools/instance-manager/instance_options.h:
Fixed headers.
server-tools/instance-manager/mysqlmanager.cc:
Fixed headers.
server-tools/instance-manager/user_management_commands.cc:
Removed unused variables.
server-tools/instance-manager/user_map.cc:
Fixed headers.
