Remove result.es files and support for them, which requires splitting

up a couple of tests and adjusting the output of others. Exposes two
bugs (9472 and 9508).


BitKeeper/deleted/.del-drop_temp_table.result.es~bc4cfb1ee1257458:
  Delete: mysql-test/r/drop_temp_table.result.es
BitKeeper/deleted/.del-insert_select.result.es~ae7eb9891d6c07c4:
  Delete: mysql-test/r/insert_select.result.es
BitKeeper/deleted/.del-myisam-blob.result.es~d498dae7d9f1a6d4:
  Delete: mysql-test/r/myisam-blob.result.es
BitKeeper/deleted/.del-packet.result.es~6e71c3b634806185:
  Delete: mysql-test/r/packet.result.es
BitKeeper/deleted/.del-query_cache.result.es~246ad731a517d9ab:
  Delete: mysql-test/r/query_cache.result.es
BitKeeper/deleted/.del-select.result.es~240635f6a3f1a079:
  Delete: mysql-test/r/select.result.es
BitKeeper/deleted/.del-type_blob.result.es~a4a0d4454b2d0218:
  Delete: mysql-test/r/type_blob.result.es
BitKeeper/deleted/.del-type_float.result.es~a5533e4118eadc04:
  Delete: mysql-test/r/type_float.result.es
BitKeeper/deleted/.del-type_ranges.result.es~bb77517f4c9dc978:
  Delete: mysql-test/r/type_ranges.result.es
mysql-test/mysql-test-run.sh:
  Remove support for special result extension -- bad idea!
mysql-test/t/ps_1general.test:
  Explain --replace_result
mysql-test/r/insert_select.result:
  Update results
mysql-test/r/select.result:
  Update results
mysql-test/r/type_blob.result:
  Update results
mysql-test/r/type_float.result:
  Update results
mysql-test/r/type_ranges.result:
  Update results
mysql-test/t/drop_temp_table.test:
  Skip this test with embedded server
mysql-test/t/insert_select.test:
  Move binlog test to new file
mysql-test/t/select.test:
  Replace grants column from 'show full columns'
mysql-test/t/type_blob.test:
  Replace grants column from 'show full columns'
mysql-test/t/type_float.test:
  Replace grants column from 'show full columns'
mysql-test/t/type_ranges.test:
  Replace grants column from 'show full columns'
sql/sql_select.cc:
  Fix conditional around query_cache_abort() call.

1 files changed, 20 insertions, 10 deletions

diff --git a/mysql-test/t/type_blob.test b/mysql-test/t/type_blob.test
index f70193ddbe0..b081c27cb30 100644
--- a/mysql-test/t/type_blob.test
+++ b/mysql-test/t/type_blob.test
@@ -77,8 +77,11 @@ insert into t1 values (NULL,NULL,NULL,NULL);
 update t1 set c="",b=null where c="1";
 
 lock tables t1 READ;
+# We mask out the Privileges column because it differs for embedded server
+--replace_column 8 #
 show full fields from t1;
 lock tables t1 WRITE;
+--replace_column 8 #
 show full fields from t1;
 unlock tables;
 
@@ -299,18 +302,25 @@ drop table t1;
 
 create table t1 (id integer auto_increment unique,imagem LONGBLOB not null);
 insert into t1 (id) values (1);
-select 
-  charset(load_file('../../std_data/words.dat')),
-  collation(load_file('../../std_data/words.dat')),
-  coercibility(load_file('../../std_data/words.dat'));
-explain extended select 
-  charset(load_file('../../std_data/words.dat')),
-  collation(load_file('../../std_data/words.dat')),
-  coercibility(load_file('../../std_data/words.dat'));
-update t1 set imagem=load_file('../../std_data/words.dat') where id=1;
+# We have to clean up the path in the results for safe comparison
+--replace_result $MYSQL_TEST_DIR ../..
+eval select 
+  charset(load_file('$MYSQL_TEST_DIR/std_data/words.dat')),
+  collation(load_file('$MYSQL_TEST_DIR/std_data/words.dat')),
+  coercibility(load_file('$MYSQL_TEST_DIR/std_data/words.dat'));
+--replace_result $MYSQL_TEST_DIR ../..
+eval explain extended select 
+  charset(load_file('$MYSQL_TEST_DIR/std_data/words.dat')),
+  collation(load_file('$MYSQL_TEST_DIR/std_data/words.dat')),
+  coercibility(load_file('$MYSQL_TEST_DIR/std_data/words.dat'));
+--replace_result $MYSQL_TEST_DIR ../..
+eval update t1 set imagem=load_file('$MYSQL_TEST_DIR/std_data/words.dat') where id=1;
 select if(imagem is null, "ERROR", "OK"),length(imagem) from t1 where id = 1;
 drop table t1;
-create table t1 select load_file('../../std_data/words.dat');
+--replace_result $MYSQL_TEST_DIR ../..
+eval create table t1 select load_file('$MYSQL_TEST_DIR/std_data/words.dat') l;
+# We mask out the Privileges column because it differs for embedded server
+--replace_column 8 #
 show full fields from t1;
 drop table t1;