into zim.(none):/home/brian/mysql/remove-bdb-5.1
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/backup.result:
Auto merged
mysql-test/r/im_utils.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
sql/field.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql-common/my_time.c:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/t/federated_transactions.test:
Merge
recommented the uncommented have_innodb.inc line
federated_transactions.test:
BUG #21118 "Federated Transaction test needs to have BDB switched to InnoDB"
slight ommission fixed
mysql-test/t/federated_transactions.test:
BUG #21118 "Federated Transaction test needs to have BDB switched to InnoDB"
slight ommission fixed
Changed federated_transactions.test to use InnoDB instead of BDB
federated_transactions-slave.opt:
BitKeeper file /home/patg/mysql-build/mysql-5.1-engines-bug21118/mysql-test/t/federated_transactions-slave.opt
federated_transactions.result:
BUG #21118 "Federated Transaction test needs to have BDB switched to InnoDB"
New test results for InnoDB being remote transactional table
federated_transactions.test:
BUG #21118 "Federated Transaction test needs to have BDB switched to InnoDB"
Changed remote transactional table from BDB to InnoDB
mysql-test/t/federated_transactions.test:
BUG #21118 "Federated Transaction test needs to have BDB switched to InnoDB"
Changed remote transactional table from BDB to InnoDB
mysql-test/r/federated_transactions.result:
BUG #21118 "Federated Transaction test needs to have BDB switched to InnoDB"
New test results for InnoDB being remote transactional table
mysql-test/t/federated_transactions-slave.opt:
BitKeeper file /home/patg/mysql-build/mysql-5.1-engines-bug21118/mysql-test/t/federated_transactions-slave.opt
Now it supports queries returning several results
(particularly important with the SP)
include/mysql.h:
embedded_query_result structure added
libmysql/libmysql.c:
embedded-server related fixes
libmysqld/emb_qcache.cc:
multiple-result support added
libmysqld/embedded_priv.h:
embedded_query_result struct implemented
libmysqld/lib_sql.cc:
multiple-result support added
libmysqld/libmysqld.c:
small fixes
mysql-test/t/backup.test:
test fixed
mysql-test/t/binlog_stm_binlog.test:
test fixed
mysql-test/t/binlog_stm_blackhole.test:
test fixed
mysql-test/t/binlog_stm_ctype_cp932.test:
test fixed
mysql-test/t/compress.test:
test fixed
mysql-test/t/delayed.test:
test fixed
mysql-test/t/federated.test:
test fixed
mysql-test/t/federated_archive.test:
test fixed
mysql-test/t/federated_bug_13118.test:
test fixed
mysql-test/t/federated_transactions.test:
test fixed
mysql-test/t/flush_table.test:
test fixed
mysql-test/t/handler.test:
test fixed
mysql-test/t/init_connect.test:
test fixed
mysql-test/t/innodb.test:
test fixed
mysql-test/t/mysql.test:
test fixed
mysql-test/t/mysql_client_test.test:
test fixed
mysql-test/t/mysqltest.test:
test fixed
mysql-test/t/query_cache.test:
test fixed
mysql-test/t/query_cache_notembedded.test:
test fixed
mysql-test/t/read_only.test:
test fixed
mysql-test/t/skip_grants.test:
test fixed
mysql-test/t/sp-destruct.test:
test fixed
mysql-test/t/sp-error.test:
test fixed
mysql-test/t/sp-threads.test:
test fixed
mysql-test/t/sp.test:
test fixed
mysql-test/t/view.test:
test fixed
mysql-test/t/wait_timeout.test:
test fixed
sql-common/client.c:
small fixes
sql/mysqld.cc:
embedded-server related fix
sql/protocol.cc:
embedded-server related fix
sql/protocol.h:
embedded-server related fix
sql/sql_class.cc:
embedded-server related fix
sql/sql_class.h:
embedded-server related fix
sql/sql_cursor.cc:
embedded-server related fix
sql/sql_parse.cc:
embedded-server related fix
sql/sql_prepare.cc:
embedded-server related fix
WL#2952 - add simple single-table only transactions to federated.
sql/ha_federated.cc:
added handlerton functions for commit and rollback, added handler methods for same.
sql/ha_federated.h:
added member variable for transaction data (linked list of federated handlers used in transaction) and member functions for support commit and rollback.
mysql-test/r/federated_transactions.result:
New BitKeeper file ``mysql-test/r/federated_transactions.result''
mysql-test/t/federated_transactions.test:
New BitKeeper file ``mysql-test/t/federated_transactions.test''
