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)
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"
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
mysql-test/r/view.result:
SCCS merged
mysql-test/t/view.test:
SCCS merged
The 'decimals' member of Item_func was being improperly initialized,
which resulted in improper results when handling large numeric values.
mysql-test/r/func_str.result:
Add test results
mysql-test/t/func_str.test:
Add new regression test
sql/item_strfunc.h:
Remove unnecessary reset of decimals in Item_func_conv::fix_length_and_dec().
into mysql.com:/users/lthalmann/bk/mysql-5.1-new
mysql-test/r/binlog_stm_drop_tmp_tbl.result:
Auto merged
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
Auto merged
mysql-test/r/rpl_temporary.result:
Auto merged
mysql-test/t/mysqlbinlog.test:
Auto merged
mysql-test/t/rpl_stm_until.test:
Auto merged
sql/mysql_priv.h:
Auto merged
mysql-test/r/rpl_stm_until.result:
Manual merge
mysql-test/t/rpl_temporary.test:
Manual merge
sql/sql_base.cc:
Manual merge
into mysql.com:/usr/local/mysql/merge-5.1
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/sp-error.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/trigger-grant.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/trigger-grant.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
server-tools/instance-manager/options.h:
Auto merged
sql/field_conv.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
server-tools/instance-manager/options.cc:
Manual merge
sql/item_func.cc:
Manual merge
sql/mysql_priv.h:
Manual merge
sql/sp_head.cc:
Manual merge
sql/sql_table.cc:
Manual merge
