summaryrefslogtreecommitdiff
path: root/mysql-test/include
diff options
context:
space:
mode:
authorunknown <patg@krsna.patg.net>2005-07-15 17:33:47 -0700
committerunknown <patg@krsna.patg.net>2005-07-15 17:33:47 -0700
commitd887a6924e618562c2a2b80d66a142d29ab81cbd (patch)
tree5b7890ff544d61910557283851233d154fac5f6b /mysql-test/include
parentd49ddbd70548ce348fde81bcecc9ebbe11fa0704 (diff)
downloadmariadb-git-d887a6924e618562c2a2b80d66a142d29ab81cbd.tar.gz
This is the same patch as 1.1937, with small variable declaration changes, memory
deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
Diffstat (limited to 'mysql-test/include')
-rw-r--r--mysql-test/include/federated.inc21
-rw-r--r--mysql-test/include/federated_cleanup.inc11
2 files changed, 32 insertions, 0 deletions
diff --git a/mysql-test/include/federated.inc b/mysql-test/include/federated.inc
new file mode 100644
index 00000000000..1c53b9ed2c5
--- /dev/null
+++ b/mysql-test/include/federated.inc
@@ -0,0 +1,21 @@
+--source ./include/have_federated_db.inc
+
+source ./include/master-slave.inc;
+
+# remote table creation
+
+connection slave;
+--replicate-ignore-db=federated
+stop slave;
+
+--disable_warnings
+# at this point, we are connected to master
+DROP DATABASE IF EXISTS federated;
+--enable_warnings
+CREATE DATABASE federated;
+
+connection master;
+--disable_warnings
+DROP DATABASE IF EXISTS federated;
+--enable_warnings
+CREATE DATABASE federated;
diff --git a/mysql-test/include/federated_cleanup.inc b/mysql-test/include/federated_cleanup.inc
new file mode 100644
index 00000000000..17a6e1e5100
--- /dev/null
+++ b/mysql-test/include/federated_cleanup.inc
@@ -0,0 +1,11 @@
+connection master;
+--disable_warnings
+DROP TABLE IF EXISTS federated.t1;
+DROP DATABASE IF EXISTS federated;
+--enable_warnings
+
+connection slave;
+--disable_warnings
+DROP TABLE IF EXISTS federated.t1;
+DROP DATABASE IF EXISTS federated;
+--enable_warnings