into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
BUILD/check-cpu:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/myisam.test:
Auto merged
scripts/mysqld_multi.sh:
Auto merged
into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
BUILD/check-cpu:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/myisam.test:
Auto merged
- 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.
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).
- 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.
into mysql.com:/usr/home/ram/work/bug22533/my50-bug22533
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
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50
configure.in:
Auto merged
innobase/buf/buf0buf.c:
Auto merged
innobase/buf/buf0flu.c:
Auto merged
innobase/buf/buf0lru.c:
Auto merged
innobase/include/buf0buf.h:
Auto merged
innobase/include/buf0buf.ic:
Auto merged
innobase/include/sync0arr.h:
Auto merged
innobase/include/sync0rw.h:
Auto merged
innobase/include/sync0rw.ic:
Auto merged
innobase/include/sync0sync.h:
Auto merged
innobase/os/os0sync.c:
Auto merged
innobase/sync/sync0arr.c:
Auto merged
innobase/sync/sync0rw.c:
Auto merged
innobase/sync/sync0sync.c:
Auto merged
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
innobase/buf/buf0buf.c:
Use local
innobase/buf/buf0flu.c:
Use local
innobase/buf/buf0lru.c:
Use local
innobase/include/buf0buf.h:
Use local
innobase/include/buf0buf.ic:
Use local
innobase/include/sync0arr.h:
Use local
innobase/include/sync0rw.h:
Use local
innobase/include/sync0rw.ic:
Use local
innobase/include/sync0sync.h:
Use local
innobase/os/os0sync.c:
Use local
innobase/sync/sync0arr.c:
Use local
innobase/sync/sync0rw.c:
Use local
innobase/sync/sync0sync.c:
Use local
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
sql/item_timefunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
