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 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
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
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
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
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
mysql-test/mysql-test-run.pl:
Auto merged
sql/mysqld.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
into zim.(none):/home/brian/mysql/merge-5.1
sql/ha_ndbcluster.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.cc:
Auto merged
storage/archive/ha_archive.cc:
Auto merged
In practice this means that handlerton is now created by the server and is passed to the engine. Plugin startups can now also control how plugins are inited (and can optionally pass values). Bit more flexibility to those who want to write plugin interfaces to the database.
include/mysql/plugin.h:
Optional to pass parameter now to init and deinit functions
sql/ha_ndbcluster.cc:
Cleanup, handlerton is now a pointer.
sql/ha_ndbcluster_binlog.cc:
Cleanup (handlerton is now a pointer)
sql/ha_ndbcluster_binlog.h:
Cleanup (handlerton is now a pointer)
sql/ha_partition.cc:
Cleaned up handlerton change
sql/handler.cc:
Cheanup of handlerton change
sql/item_sum.cc:
Cleanedup of handlerton change
sql/log.cc:
Cleanup of handlerton change
sql/mysql_priv.h:
Reverted patch for variables (what would have happen previously if a have_ would have been called that was dynamically loaded? boom!)
sql/mysqld.cc:
Cleanup of handlerton changes and reverted have variable patch
sql/partition_info.cc:
Cleanup of handlerton (we need to clean this up a bit more).
sql/set_var.cc:
Cleanup related to handlerton changes
sql/sql_cache.cc:
Handlerton changes cleanup
sql/sql_insert.cc:
Handlerton changes cleanup.
sql/sql_partition.cc:
Handlerton cleanup changes
sql/sql_plugin.cc:
Handlerton changes.
init() can now be controlled by a plugin specific startup.
There was also an issue with how we deinited the status variables. It should have been occuring before we shut down the engines.
sql/sql_select.cc:
Handlerton cleanup changes
sql/sql_show.cc:
Handlerton cleanup changes
sql/sql_table.cc:
Handlerton cleanup changes
sql/table.cc:
Cleanup
storage/archive/ha_archive.cc:
Cleanup
storage/archive/ha_archive.h:
Cleanup
storage/blackhole/ha_blackhole.cc:
Cleanup
storage/csv/ha_tina.cc:
Cleanup
storage/example/ha_example.cc:
Cleanup
storage/federated/ha_federated.cc:
Cleanup
storage/heap/ha_heap.cc:
Cleanup
storage/innobase/handler/ha_innodb.cc:
Cleanup
storage/myisam/ha_myisam.cc:
Cleanup
storage/myisammrg/ha_myisammrg.cc:
Cleanup
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/config:
Auto merged
client/mysql.cc:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/mysql.result:
Auto merged
mysql-test/r/user_var.result:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/user_var.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
tests/Makefile.am:
Auto merged
vio/viosocket.c:
Auto merged
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
sql/share/errmsg.txt:
Auto merged
storage/innobase/Makefile.am:
Auto merged
tests/Makefile.am:
Auto merged
storage/innobase/handler/ha_innodb.cc:
SCCS merged
