summaryrefslogtreecommitdiff
path: root/mysql-test/include/common-tests.inc
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2006-06-06 20:21:36 +0300
committerunknown <monty@mysql.com>2006-06-06 20:21:36 +0300
commit7f19b1cc05adb189de29ce4475f6539ec1ac4d09 (patch)
tree9dd7413d751986e81d852168831ec3ffe5452d58 /mysql-test/include/common-tests.inc
parentfffe52346fc2902cb6fd772fc866987993fb2bae (diff)
downloadmariadb-git-7f19b1cc05adb189de29ce4475f6539ec1ac4d09.tar.gz
Added --pipe option for faster compile
Changed error to be more descriptive when you are refering to a not existing key Fixed core dump in view test and changed to better error message BUILD/compile-pentium64-debug-max: Added --pipe option for faster compile (This changset was missing in the tree I used to rebuild a new 5.1 tree) BUILD/compile-pentium64-debug: Added --pipe option for faster compile (This changset was missing in the tree I used to rebuild a new 5.1 tree) mysql-test/include/common-tests.inc: Changed error to be more descriptive mysql-test/r/compress.result: Changed error to be more descriptive mysql-test/r/explain.result: Changed error to be more descriptive mysql-test/r/key_cache.result: Changed error to be more descriptive mysql-test/r/preload.result: Changed error to be more descriptive mysql-test/r/select.result: Changed error to be more descriptive mysql-test/r/ssl.result: Changed error to be more descriptive mysql-test/r/ssl_compress.result: Changed error to be more descriptive mysql-test/r/view.result: Changed error to be more descriptive mysql-test/t/disabled.def: Disable im_instance_conf and im_options until Bug#20294 (Instance manager test im_instance_conf fails randomly) is fixed mysql-test/t/explain.test: Changed error to be more descriptive mysql-test/t/select.test: Changed error to be more descriptive mysql-test/t/view.test: Changed error to be more descriptive sql/share/errmsg.txt: Fix that ER_KEY_DOES_NOT_EXISTS has same SQLSTATE as ER_KEY_COLUMN_DOES_NOT_EXISTS sql/sql_base.cc: Fixed core dump in view test Changed to correct error message that also shows the name of the faulty table BUILD/compile-pentium64: New BitKeeper file ``BUILD/compile-pentium64''
Diffstat (limited to 'mysql-test/include/common-tests.inc')
-rw-r--r--mysql-test/include/common-tests.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/include/common-tests.inc b/mysql-test/include/common-tests.inc
index 46d0182d17f..882ac689498 100644
--- a/mysql-test/include/common-tests.inc
+++ b/mysql-test/include/common-tests.inc
@@ -1296,9 +1296,9 @@ explain select fld3 from t2 use index (fld1,fld3) where fld3 = 'honeysuckle';
# The next should give an error
#
--- error 1072
+-- error 1176
explain select fld3 from t2 ignore index (fld3,not_used);
--- error 1072
+-- error 1176
explain select fld3 from t2 use index (not_used);
#