where it isn't. Removed a test where the merge was incorrect (and a test
duplicated.)
mysql-test/r/bdb.result:
Removed binlog-format-specific test.
Elliot says bdb is going away real soon now anyway.
mysql-test/r/binlog_row_blackhole.result:
Removed superfluous commits. Bug#16206.
mysql-test/r/mysqldump.result:
Merged incorrectly.
mysql-test/t/bdb.test:
Removed binlog-format-specific test.
Elliot says bdb is going away real soon now anyway.
Enabling rpl_openssl.test for Windows to check that
currently it still hangs (because I can't reproduce
this on my machine).
mysql-test/t/rpl_openssl.test:
Enabling rpl_openssl.test for Windows
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1
BitKeeper/etc/ignore:
auto-union
client/mysqldump.c:
Auto merged
mysql-test/r/bdb.result:
Auto merged
mysql-test/r/type_timestamp.result:
Auto merged
mysql-test/r/udf.result:
Auto merged
mysql-test/t/bdb.test:
Auto merged
mysql-test/t/type_timestamp.test:
Auto merged
mysys/my_lib.c:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/table.cc:
Auto merged
mysql-test/r/func_time.result:
manual merge
mysql-test/r/mysqldump.result:
manual merge
mysql-test/t/func_time.test:
manual merge
mysql-test/t/mysqldump.test:
manual merge
sql/log.cc:
manual merge
sql/sp_head.cc:
manual merge
sql/sql_table.cc:
manual merge
storage/ndb/test/ndbapi/test_event_merge.cpp:
cannot skip tables if ops specified
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
report even composite op in merge
test case: test_event_merge --no-blobs --ops ic:dcic
into dator5.(none):/home/pappa/bug20583
mysql-test/r/partition.result:
Auto merged
mysql-test/t/partition.test:
Auto merged
sql/ha_partition.cc:
Auto merged
into dator5.(none):/home/pappa/bug17138
BUILD/compile-pentium-gcov:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/handler.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Last round of review fixes
BUILD/compile-pentium-gcov:
No change
sql/ha_ndbcluster.h:
Last round of review changes
sql/ha_partition.h:
Last round of review changes
sql/handler.h:
Last round of review changes
sql/item_sum.cc:
Last round of review changes
sql/sql_acl.cc:
Last round of review changes
sql/sql_insert.cc:
Last round of review changes
sql/sql_select.cc:
Last round of review changes
sql/sql_table.cc:
Last round of review changes
sql/sql_union.cc:
Last round of review changes
sql/sql_update.cc:
Last round of review changes
mysql-test/t/key.test:
Added SHOW CREATE TABLE, which is the proper way to check for table definitions
mysql-test/r/key.result:
Fixed result after removing wrong bug fix
sql/table.cc:
Reverted wrong bug fix.
The intention with the original code was to show that MySQL treats the first
given unique key as a primary key. Clients can use the marked primary key as a
real primary key to validate row changes in case of conflicting updates. The
ODBC driver (and other drivers) may also use this fact to optimize/check
updates and handle conflicts. The marked key also shows what some engines, like InnoDB or NDB,
will use as it's internal primary key.
For checking if someone has declared a true PRIMARY KEY, one should use 'SHOW CREATE TABLE'
binary disctribution for Falcon.
scripts/Makefile.am:
Add the make_win_bin_dist script.
scripts/make_win_bin_dist:
New BitKeeper file ``scripts/make_win_bin_dist''
into moonbone.local:/work/merge-5.1
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/spatial.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_update.cc:
Auto merged
strings/ctype-mb.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/insert_select.result:
Auto merged
mysql-test/r/key.result:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/r/sp-prelocking.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/view_grant.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/key.test:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysql-test/t/select.test:
Auto merged
mysql-test/t/sp-prelocking.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/view_grant.test:
Auto merged
mysql-test/valgrind.supp:
Auto merged
mysys/Makefile.am:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Auto merged
strings/ctype-mb.c:
Auto merged
support-files/mysql.spec.sh:
Auto merged
go from 623 seconds to 11 seconds on AMD64.
This is because we have no native atomic implementation on AMD64,
so the rwlock-based implementation is used, which is a bit slow.
It will be probably be optimized for AMD64 quite soon, but for now
this test case will do fewer iterations.
unittest/mysys/my_atomic-t.c:
10k iterations instead of 1M no of iterations
into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
merge
into perch.ndb.mysql.com:/home/jonas/src/50-work
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
mysys/my_pread.c:
Fix our implementation of pread/pwrite: we did change the file pointer in our
implementation, while the normal preads/pwrites don't. The new code is based
on glibc version of pread/pwrite.
