fix some more sp100 hang cases
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
let suma know of API_FAILREQ even if not connected, to handle startme/handover
problem
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
some error inserts
+ resend API_FAILREQ during handover
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.
mysqlimport.c declared the opt_use_threads variable as my_bool, but the corresponding option was defined as GET_UINT. The problem only occured on architectures with strict alignment rules.
client/mysqlimport.c:
Changed the opt_use_threads variable type to uint.
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-engines
mysql-test/r/myisam.result:
Auto merged
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysql-test/t/symlink.test:
Auto merged
cmd-line-utils/readline/undo.c:
Replace an "uint" cast by the expanded "unsigned int",
because there are platforms (QNX) on which "uint" is not defined in the "readline" library
(and so building it failed, version 5.0.34).
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
mysql-test/r/select.result:
Auto merged
mysql-test/r/type_bit.result:
Auto merged
mysql-test/t/select.test:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
client/mysqltest.c:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
Auto merged
tests/mysql_client_test.c:
Auto merged
- 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.
into mysql.com:/usr/home/ram/work/bug22533/my51-bug22533
mysql-test/r/select.result:
Auto merged
mysql-test/t/select.test:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
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/51
client/mysql_upgrade.c:
Auto merged
client/mysqlbinlog.cc:
Auto merged
include/my_pthread.h:
Auto merged
include/my_sys.h:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysys/string.c:
Auto merged
sql/mysqld.cc:
Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
client/mysqlbinlog.cc:
Auto merged
configure.in:
Auto merged
include/config-win.h:
Auto merged
include/my_global.h:
Auto merged
include/my_pthread.h:
Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/table.cc:
Auto merged
storage/myisam/mi_packrec.c:
Use local
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.
