into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
mysql-test/t/disabled.def:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/ha_ndbcluster_binlog.h:
Auto merged
sql/sql_show.cc:
Auto merged
into trift2.:/MySQL/M51/push-5.1
configure.in:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~7:
Auto merged
Docs/Makefile.am:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/stacktrace.c:
Auto merged
sql/stacktrace.h:
Auto merged
into trift2.:/MySQL/M50/push-5.0
configure.in:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/stacktrace.c:
Auto merged
sql/stacktrace.h:
Auto merged
Fixed udf_example, so tests now can also run udf on win.
sql/udf_example.def:
BitKeeper file /home/georg/work/mysql/prod/mysql-5.1-win/sql/udf_example.def
include/config-win.h:
removed USE_32_BIT_TIME
include/my_time.h:
Fixed size of my_time for Win64 (should be 64bit)
mysql-test/mysql-test-run.pl:
Added windows paths for udf_example
sql/CMakeLists.txt:
Added udf_example.dll
sql/udf_example.c:
Windows doesn't know about socket.h and friends. Use winsock.h instead
into chilla.local:/home/mydev/mysql-5.1-tomain
mysql-test/t/disabled.def:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/r/innodb_mysql.result:
Manual merge from 5.1-engines.
Cleaned up test to no longer need have_
BitKeeper/deleted/.del-have_archive.require:
Delete: mysql-test/r/have_archive.require
BitKeeper/deleted/.del-have_blackhole.require:
Delete: mysql-test/r/have_blackhole.require
BitKeeper/deleted/.del-have_csv.require:
Delete: mysql-test/r/have_csv.require
BitKeeper/deleted/.del-have_exampledb.require:
Delete: mysql-test/r/have_exampledb.require
BitKeeper/deleted/.del-have_federated_db.require:
Delete: mysql-test/r/have_federated_db.require
BitKeeper/deleted/.del-have_innodb.require:
Delete: mysql-test/r/have_innodb.require
BitKeeper/deleted/.del-have_ndb.require:
Delete: mysql-test/r/have_ndb.require
BitKeeper/deleted/.del-have_raid.require:
Delete: mysql-test/r/have_raid.require
mysql-test/include/have_archive.inc:
Rewrite of test to use new syntax
mysql-test/include/have_blackhole.inc:
Test rewritten to use new syntax
mysql-test/include/have_csv.inc:
Test rewrite
mysql-test/include/have_exampledb.inc:
Test rewrite
mysql-test/include/have_federated_db.inc:
Test rewrite
mysql-test/include/have_innodb.inc:
Test rewrite
mysql-test/include/have_multi_ndb.inc:
Test rewrite
mysql-test/include/have_ndb.inc:
Test rewrite
sql/mysql_priv.h:
Removed unneeded ifdef
into chilla.local:/home/mydev/mysql-5.1-bug14400-monty
BitKeeper/etc/ignore:
auto-union
include/my_global.h:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
sql/handler.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_select.cc:
Auto merged
storage/myisam/mi_rkey.c:
Auto merged
storage/myisam/mi_test_all.res:
Auto merged
storage/myisam/mi_test_all.sh:
Merge from 5.0.
into chilla.local:/home/mydev/mysql-5.0-bug14400-monty
BitKeeper/etc/ignore:
auto-union
include/my_global.h:
Auto merged
myisam/mi_rkey.c:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
myisam/mi_test_all.res:
Manual merge from 4.1.
sql/sql_select.cc:
Manual merge from 4.1.
into willster.(none):/home/stewart/Documents/MySQL/5.1/bug20073
client/mysqldump.c:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_show.cc:
Auto merged
into chilla.local:/home/mydev/mysql-4.1-bug14400-monty
BitKeeper/etc/ignore:
auto-union
include/my_global.h:
Auto merged
myisam/mi_rkey.c:
Manual null merge as a better fix is already present.
mysql-test/r/myisam.result:
Manual null merge as a better fix is already present.
mysql-test/t/myisam.test:
Manual null merge as a better fix is already present.
sql/sql_select.cc:
Manual merge of purify improvements.
into chilla.local:/home/mydev/mysql-5.0--team
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
sql/handler.cc:
Auto merged
sql/opt_range.cc:
Auto merged
"plug.in not included in dist source"
storage/archive/Makefile.am:
plug.in needs to be included in dist
storage/blackhole/Makefile.am:
plug.in needs to be included in dist
storage/csv/Makefile.am:
plug.in needs to be included in dist
storage/example/Makefile.am:
plug.in needs to be included in dist
storage/federated/Makefile.am:
plug.in needs to be included in dist
storage/heap/Makefile.am:
plug.in needs to be included in dist
storage/innobase/Makefile.am:
plug.in needs to be included in dist
storage/myisam/Makefile.am:
plug.in needs to be included in dist
storage/myisammrg/Makefile.am:
plug.in needs to be included in dist
storage/ndb/Makefile.am:
plug.in needs to be included in dist
BitKeeper/deleted/.del-strict_autoinc_4bdb.test:
Delete: mysql-test/t/strict_autoinc_4bdb.test
mysql-test/r/strict_autoinc_1myisam.result:
post merge fixes, error message was changed
mysql-test/r/strict_autoinc_2innodb.result:
post merge fixes, error message was changed
mysql-test/r/strict_autoinc_3heap.result:
post merge fixes, error message was changed
mysql-test/r/strict_autoinc_5ndb.result:
post merge fixes, error message was changed
into xiphis.org:/home/antony/work2/engines-merge
BitKeeper/deleted/.del-ha_berkeley.cc:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
sql/opt_range.cc:
Auto merged
storage/heap/ha_heap.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
storage/myisam/mi_packrec.c:
Auto merged
storage/myisam/mi_rkey.c:
Auto merged
storage/myisammrg/ha_myisammrg.cc:
Auto merged
include/my_base.h:
manual merge
sql/ha_ndbcluster.cc:
manual merge
sql/handler.cc:
manual merge
sql/handler.h:
manual merge
sql/share/errmsg.txt:
manual merge
storage/innobase/handler/ha_innodb.cc:
manual merge
into chilla.local:/home/mydev/mysql-5.0--team
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
sql/handler.cc:
Auto merged
sql/opt_range.cc:
Auto merged
Change things around so that we add a row for each log file group that lists
the free space for that log file group.
client/mysqldump.c:
dump logfile groups correctly (ignore row for the log file group itself)
mysql-test/r/ndb_dd_dump.result:
update results with new row for log file groups
sql/ha_ndbcluster.cc:
for fill_files_table:
- set null bits properly
- add rows for log file groups with free undo space.
sql/sql_show.cc:
make most I_S.FILES columns nullable to better fit with reality.
fixed when 5.1-win will be pushed into main tree).
Commenting the libmysqld and libmysqld/example subdirectories will allow us
to upgrade from cmake 2.2 to 2.4.
CMakeLists.txt:
comment libmysqld and libmysqld/example directories
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
2. Correct some logical bugs within the tests, which were caused by
automatic resolve of BitKeeper
mysql-test/include/mix1.inc:
- Remove hardcoded assignment of storage engine, because this violates the logics of
refactored tests
- Remove trailing spaces
- Move the FOREIGN KEY creation(probably not really needed for the testcase) out of
the CREATE TABLE statement + let the FK creation depend on the storage engine capabilities
mysql-test/r/index_merge_innodb.result:
Updated result
mysql-test/r/index_merge_myisam.result:
Updated result
mysql-test/r/innodb_mysql.result:
Updated result
mysql-test/t/disabled.def:
Reenable the fixed tests
mysql-test/t/index_merge_innodb.test:
Important comment describing how to modify the tests when some issues
(most probably no bugs) are fixed.
mysql-test/t/innodb_mysql.test:
Introduction of a variable for switching FOREIGN KEY on/off
into april.(none):/home/svoj/devel/mysql/merge/mysql-5.1-engines
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
sql/handler.cc:
Auto merged
sql/opt_range.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
into april.(none):/home/svoj/devel/mysql/merge/mysql-5.0-engines
myisam/mi_rkey.c:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
into april.(none):/home/svoj/devel/mysql/merge/mysql-5.0-engines
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/share/errmsg.txt:
SCCS merged
