into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/symlink.test:
Auto merged
sql/table.cc:
Auto merged
mysql-test/r/myisam.result:
Manually merged.
mysql-test/t/myisam.test:
Manually merged.
Fixed test. On 32-bit machines which compile without
-DBIG_TABLES, MAX_ROWS is truncated to a 32-bit value.
Using a value below 4G is portable.
mysql-test/r/myisam.result:
Bug#24607 - MyISAM pointer size determined incorrectly
Fixed test results.
aim is to:
a) if set_connect_timeout called, timeout connect attempt (for retry on
next call) after timeout period
b) preserve existing blocking behaviour otherwise (for, e.g. mgmapi)
Related to customer issue with long time deleting ndb_cluster_connection
object. believe we're hanging on the connect(2) call until timeout (when
we then realise we should exit the thread).
ndb/include/mgmapi/mgmapi.h:
add ndb_mgm_set_connect_timeout
ndb/include/util/SocketClient.hpp:
add timeout (seconds) for max time to wait for connection
ndb/src/common/transporter/Transporter.cpp:
set limit on amount of time we'll wait for tcp connect
ndb/src/common/util/SocketClient.cpp:
only try to connect for a maximum of timeout time
ndb/src/mgmapi/mgmapi.cpp:
add ndb_mgm_set_connect_timeout
Fix bug in event handling wrt early node shutdown
ndb/src/mgmsrv/MgmtSrvr.cpp:
Fix bug in event handling wrt early node shutdown
ndb/src/ndbapi/ClusterMgr.cpp:
Fix reportNodeFailed if only connected wo/ having received any API_REGCONF
ndb/src/ndbapi/ClusterMgr.hpp:
Fix reportNodeFailed if only connected wo/ having received any API_REGCONF
ndb/src/ndbapi/SignalSender.cpp:
Fix memleak
- make sure keys are copied correctly when varchar has 2 length bytes
- test case
mysql-test/r/ndb_basic.result:
bug#25746 ndb: 4209 error with 2 VARCHAR primary keys
- test case
mysql-test/t/ndb_basic.test:
bug#25746 ndb: 4209 error with 2 VARCHAR primary keys
- test case
sql/ha_ndbcluster.cc:
bug#25746 ndb: 4209 error with 2 VARCHAR primary keys
- make sure keys are copied correctly when varchar has 2 length bytes
corrupted table
Accessing a table with corrupted column definition results in server
crash.
This is fixed by refusing to open such tables. Affects MyISAM only.
No test case, since it requires crashed table.
myisam/mi_open.c:
Refuse to open MyISAM table with summary columns length bigger than
length of the record.
- Corrected compiler warnings and performance problems with new
dynstr_append_os_quoted function.
mysys/string.c:
Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces
- Fix compiler warnings.
- Used dynstr_append_mem where string length is known.
and combined, they add a platform-specific warning. The warnings
are not the goal of the test, in any case.
mysql-test/t/ps.test:
Quash platform-specific warnings.
- Additional patch removing check for mysql_errno on already closed
mysql1
tests/mysql_client_test.c:
No need to check mysql_errno of mysql1 which has already been closed.
mysql-test/r/ndb_types.result:
update results
mysql-test/t/ndb_types.test:
Sleep a bit longer, to ensure that timestamp changes between:
set @now = now();
and:
insert into/update t1
Test case failed (select timestamp>@now from t1 ==> 0, should be 1), and passed when run again. This should(?) avoid that fluke.
Clean up test file a bit while I'm here.
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
client/mysqlbinlog.cc:
Auto merged
include/my_pthread.h:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_parse.cc:
Manual merge
- Create space safe strings for system() calls in mysql_upgrade.exe
client/mysql_upgrade.c:
Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces
- Make use of new dynstr_append_os_quoted function to produce a string safe for
passing to the system() function.
- Refactor possible source of assertion.
include/my_sys.h:
Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces
- Declare dynstr_append_os_quoted function.
mysys/string.c:
Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces
- Define dynstr_append_os_quoted function. This function will concatenate any
number of strings, escapes any OS quote in the result then surround the whole
affair in another set of quotes which is finally appended to specified
DYNAMIC_STRING.
