summaryrefslogtreecommitdiff
path: root/mysql-test/suite
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-10-01 13:15:29 +0200
committerSergei Golubchik <sergii@pisem.net>2012-10-01 13:15:29 +0200
commit416d0aebbfaaa00802d00105a0bd2faedb8b8f04 (patch)
tree5244b83a9f22d4d5899154c9a64a316111bbe6b6 /mysql-test/suite
parentadf6e145f77d2f7b049b977ee55ed12d05b96eac (diff)
downloadmariadb-git-416d0aebbfaaa00802d00105a0bd2faedb8b8f04.tar.gz
more fixes for test cases
mysql-test/suite/innodb/include/restart_and_reinit.inc: drop and recreate mysql.innodb* tables when deleting innodb table spaces mysql-test/t/ssl_8k_key-master.opt: with loose- prefix ssl errors are ignored sql-common/client.c: compiler warnings sql/field.cc: use the new function sql/item.cc: don't convert time to double or decimal via longlong, this loses sub-second part. Use dedicated functions. sql/item.h: incorrect cast_to_int type for params sql/item_strfunc.cc: use the new function sql/lex.h: unused sql/my_decimal.h: helper macro sql/sql_plugin.cc: workaround for a compiler warning sql/sql_yacc.yy: unused sql/transaction.cc: fix the merge for SERVER_STATUS_IN_TRANS_READONLY protocol flag storage/sphinx/CMakeLists.txt: compiler warnings
Diffstat (limited to 'mysql-test/suite')
-rw-r--r--mysql-test/suite/innodb/include/restart_and_reinit.inc12
-rw-r--r--mysql-test/suite/innodb/r/innodb_bug57904.result14
-rwxr-xr-xmysql-test/suite/innodb/t/innodb_bug57904.test3
-rw-r--r--mysql-test/suite/perfschema/r/digest_table_full.result2
-rw-r--r--mysql-test/suite/perfschema/r/statement_digest.result40
-rw-r--r--mysql-test/suite/perfschema/r/statement_digest_consumers.result40
-rw-r--r--mysql-test/suite/perfschema/r/statement_digest_long_query.result4
-rw-r--r--mysql-test/suite/sys_vars/t/ssl_ca_basic.test2
-rw-r--r--mysql-test/suite/sys_vars/t/ssl_cert_basic.test2
-rw-r--r--mysql-test/suite/sys_vars/t/ssl_key_basic.test2
-rw-r--r--mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc2
11 files changed, 63 insertions, 60 deletions
diff --git a/mysql-test/suite/innodb/include/restart_and_reinit.inc b/mysql-test/suite/innodb/include/restart_and_reinit.inc
index 0f8c1f913d0..207e9c5dc6e 100644
--- a/mysql-test/suite/innodb/include/restart_and_reinit.inc
+++ b/mysql-test/suite/innodb/include/restart_and_reinit.inc
@@ -5,6 +5,12 @@
#
source include/not_embedded.inc;
+--disable_query_log
+let $innodb_index_stats = query_get_value(show create table mysql.innodb_index_stats, Create Table, 1);
+let $innodb_table_stats = query_get_value(show create table mysql.innodb_table_stats, Create Table, 1);
+let $database=`select database()`;
+drop table mysql.innodb_index_stats, mysql.innodb_table_stats;
+
let $_server_id= `SELECT @@server_id`;
let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.$_server_id.expect;
let $datadir= `SELECT @@datadir`;
@@ -18,3 +24,9 @@ enable_reconnect;
source include/wait_until_connected_again.inc;
disable_reconnect;
+--disable_query_log
+use mysql;
+eval $innodb_table_stats;
+eval $innodb_index_stats;
+eval use $database;
+--enable_query_log
diff --git a/mysql-test/suite/innodb/r/innodb_bug57904.result b/mysql-test/suite/innodb/r/innodb_bug57904.result
index bbcd71325d1..909f77b25d4 100644
--- a/mysql-test/suite/innodb/r/innodb_bug57904.result
+++ b/mysql-test/suite/innodb/r/innodb_bug57904.result
@@ -13,18 +13,8 @@ INDEX (customer_id),
FOREIGN KEY (customer_id)
REFERENCES customer(id)
) ENGINE=INNODB;
-SELECT * FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS;
-CONSTRAINT_CATALOG def
-CONSTRAINT_SCHEMA mysql
-CONSTRAINT_NAME innodb_index_stats_ibfk_1
-UNIQUE_CONSTRAINT_CATALOG def
-UNIQUE_CONSTRAINT_SCHEMA mysql
-UNIQUE_CONSTRAINT_NAME PRIMARY
-MATCH_OPTION NONE
-UPDATE_RULE RESTRICT
-DELETE_RULE RESTRICT
-TABLE_NAME innodb_index_stats
-REFERENCED_TABLE_NAME innodb_table_stats
+SELECT * FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS
+WHERE table_name = 'product_order';
CONSTRAINT_CATALOG def
CONSTRAINT_SCHEMA test
CONSTRAINT_NAME product_order_ibfk_1
diff --git a/mysql-test/suite/innodb/t/innodb_bug57904.test b/mysql-test/suite/innodb/t/innodb_bug57904.test
index 48dc5254b26..97e7ec93d87 100755
--- a/mysql-test/suite/innodb/t/innodb_bug57904.test
+++ b/mysql-test/suite/innodb/t/innodb_bug57904.test
@@ -18,7 +18,8 @@ CREATE TABLE product_order (no INT NOT NULL AUTO_INCREMENT,
REFERENCES customer(id)
) ENGINE=INNODB;
-query_vertical SELECT * FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS;
+query_vertical SELECT * FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS
+WHERE table_name = 'product_order';
DROP TABLE product_order;
DROP TABLE product;
diff --git a/mysql-test/suite/perfschema/r/digest_table_full.result b/mysql-test/suite/perfschema/r/digest_table_full.result
index 218592c7644..f7d9d7116c0 100644
--- a/mysql-test/suite/perfschema/r/digest_table_full.result
+++ b/mysql-test/suite/perfschema/r/digest_table_full.result
@@ -76,7 +76,7 @@ SELECT DIGEST, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS,
SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest;
DIGEST DIGEST_TEXT COUNT_STAR SUM_ROWS_AFFECTED SUM_WARNINGS SUM_ERRORS
NULL NULL 29 21 1 2
-d238cb191361f39845a6adb2961f5501 TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 0 0 0
+05a0fd27e76f6e38420b5dcae970c1d1 TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 0 0 0
SHOW VARIABLES LIKE "performance_schema_digests_size";
Variable_name Value
performance_schema_digests_size 2
diff --git a/mysql-test/suite/perfschema/r/statement_digest.result b/mysql-test/suite/perfschema/r/statement_digest.result
index dc6ab2ee663..c6ffea69148 100644
--- a/mysql-test/suite/perfschema/r/statement_digest.result
+++ b/mysql-test/suite/perfschema/r/statement_digest.result
@@ -75,28 +75,28 @@ Warning 1265 Data truncated for column 'c' at row 1
SELECT DIGEST, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS,
SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest;
DIGEST DIGEST_TEXT COUNT_STAR SUM_ROWS_AFFECTED SUM_WARNINGS SUM_ERRORS
-d238cb191361f39845a6adb2961f5501 TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 0 0 0
-85d75a1b361e6afe5460639bddfc88ed SELECT ? FROM t1 1 0 0 0
-83d5ef3dc373ad216098b07c72e61063 SELECT ? FROM `t1` 1 0 0 0
-ea6492426a33544a059bc12766c5ba3d SELECT ?, ... FROM t1 2 0 0 0
-c050a704c0817ec2865ead136ceea6ec SELECT ? FROM t2 1 0 0 0
-a98062477bd693dacfc0df96c68c5585 SELECT ?, ... FROM t2 2 0 0 0
-72470fa90a09ac60fb0ab822a3d6ade0 INSERT INTO t1 VALUES (?) 1 1 0 0
-3f5fd5225f11e3e8d5e8bda8ee6c1546 INSERT INTO t2 VALUES (?) 1 1 0 0
-2057d54e44b8760b5414781df21e53e5 INSERT INTO t3 VALUES (...) 1 1 0 0
-b6becf79cc1c5b9faf07bcd4680e87d1 INSERT INTO t4 VALUES (...) 1 1 0 0
-7d68bb708120922be9668e8c29b2ba7e INSERT INTO t5 VALUES (...) 1 1 0 0
-16760e44bae66c003e39919411b8adbb INSERT INTO t1 VALUES (?) /* , ... */ 2 7 0 0
-29df714911c3f9b83460385a21b5386d INSERT INTO t3 VALUES (...) /* , ... */ 1 3 0 0
-5504ad628fc868be29157ccf556c6175 INSERT INTO t5 VALUES (...) /* , ... */ 1 3 0 0
-0babf2f70315be35a2a9ad6d3d800960 SELECT ? + ? 3 0 0 0
-060c9d59b5b13bc4ec6188ec4f2822b1 SELECT ? 1 0 0 0
+05a0fd27e76f6e38420b5dcae970c1d1 TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 0 0 0
+cc0d093a57fbe1694ee003da61a18f50 SELECT ? FROM t1 1 0 0 0
+0bf450b7940cf3dd7fc720fdd6281d77 SELECT ? FROM `t1` 1 0 0 0
+3ea6d9e2c71e6fe84643d647f257ef22 SELECT ?, ... FROM t1 2 0 0 0
+e9d6214db9270d8e3b12694483a7ece0 SELECT ? FROM t2 1 0 0 0
+8bfd768d8ce6c88ca3ace9e9eaf74fad SELECT ?, ... FROM t2 2 0 0 0
+49358f164df227c622fa9438e17c5a45 INSERT INTO t1 VALUES (?) 1 1 0 0
+b5777ff47c7e7d37c738c3bbc99a5f50 INSERT INTO t2 VALUES (?) 1 1 0 0
+b8f5b0056d36e62b060d605227e26bfb INSERT INTO t3 VALUES (...) 1 1 0 0
+835ec262d10fbedce1e31c397bdae877 INSERT INTO t4 VALUES (...) 1 1 0 0
+c0cfc65392e6ea3d51708967b0795f09 INSERT INTO t5 VALUES (...) 1 1 0 0
+3e743e4d942c7b76fccddbf15211367e INSERT INTO t1 VALUES (?) /* , ... */ 2 7 0 0
+6048c5411fb3037b4db7a24eed82b83c INSERT INTO t3 VALUES (...) /* , ... */ 1 3 0 0
+2312fd042d1232cd30e4172c69b0b2e4 INSERT INTO t5 VALUES (...) /* , ... */ 1 3 0 0
+33ebf25ca2afeea44fd5390801df4a0a SELECT ? + ? 3 0 0 0
+eb4368e66ef2ee0713b22abe1b94b5e7 SELECT ? 1 0 0 0
bce3f7384ae2ab78354b031184fde12d CREATE SCHEMA statements_digest_temp 2 2 0 0
2a0e36afeaac85dc117c3856388a4fae DROP SCHEMA statements_digest_temp 2 0 0 0
-8761fd6b83357bdd00acd0b301cd1d43 SELECT ? FROM t11 1 0 0 1
-2707097430c8f6e7b8c60d15d1f3ff9a CREATE TABLE t11 ( c CHARACTER (?) ) 2 0 0 1
-503e81940feaf05afaafc435903f6bc3 INSERT INTO t11 VALUES (?) 1 1 1 0
-cb0f8f969018eb9b6019e9fe069f6e2a SHOW WARNINGS 1 0 0 0
+5a6f99b35d55cdcb4c9bd755ff6bed58 SELECT ? FROM t11 1 0 0 1
+88305d7ed153aeef764d4fb992f28034 CREATE TABLE t11 ( c CHARACTER (?) ) 2 0 0 1
+2a533c9f7e3b5d9dac18c4f8a0a49e53 INSERT INTO t11 VALUES (?) 1 1 1 0
+35c70a6aa7abc3da331ef84b3663534b SHOW WARNINGS 1 0 0 0
####################################
# CLEANUP
####################################
diff --git a/mysql-test/suite/perfschema/r/statement_digest_consumers.result b/mysql-test/suite/perfschema/r/statement_digest_consumers.result
index 6daabcbd8bf..70e5c98435a 100644
--- a/mysql-test/suite/perfschema/r/statement_digest_consumers.result
+++ b/mysql-test/suite/perfschema/r/statement_digest_consumers.result
@@ -88,28 +88,28 @@ Warning 1265 Data truncated for column 'c' at row 1
####################################
SELECT digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest;
digest digest_text count_star
-d238cb191361f39845a6adb2961f5501 TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1
-85d75a1b361e6afe5460639bddfc88ed SELECT ? FROM t1 1
-83d5ef3dc373ad216098b07c72e61063 SELECT ? FROM `t1` 1
-ea6492426a33544a059bc12766c5ba3d SELECT ?, ... FROM t1 2
-c050a704c0817ec2865ead136ceea6ec SELECT ? FROM t2 1
-a98062477bd693dacfc0df96c68c5585 SELECT ?, ... FROM t2 2
-72470fa90a09ac60fb0ab822a3d6ade0 INSERT INTO t1 VALUES (?) 1
-3f5fd5225f11e3e8d5e8bda8ee6c1546 INSERT INTO t2 VALUES (?) 1
-2057d54e44b8760b5414781df21e53e5 INSERT INTO t3 VALUES (...) 1
-b6becf79cc1c5b9faf07bcd4680e87d1 INSERT INTO t4 VALUES (...) 1
-7d68bb708120922be9668e8c29b2ba7e INSERT INTO t5 VALUES (...) 1
-16760e44bae66c003e39919411b8adbb INSERT INTO t1 VALUES (?) /* , ... */ 2
-29df714911c3f9b83460385a21b5386d INSERT INTO t3 VALUES (...) /* , ... */ 1
-5504ad628fc868be29157ccf556c6175 INSERT INTO t5 VALUES (...) /* , ... */ 1
-0babf2f70315be35a2a9ad6d3d800960 SELECT ? + ? 3
-060c9d59b5b13bc4ec6188ec4f2822b1 SELECT ? 1
+05a0fd27e76f6e38420b5dcae970c1d1 TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1
+cc0d093a57fbe1694ee003da61a18f50 SELECT ? FROM t1 1
+0bf450b7940cf3dd7fc720fdd6281d77 SELECT ? FROM `t1` 1
+3ea6d9e2c71e6fe84643d647f257ef22 SELECT ?, ... FROM t1 2
+e9d6214db9270d8e3b12694483a7ece0 SELECT ? FROM t2 1
+8bfd768d8ce6c88ca3ace9e9eaf74fad SELECT ?, ... FROM t2 2
+49358f164df227c622fa9438e17c5a45 INSERT INTO t1 VALUES (?) 1
+b5777ff47c7e7d37c738c3bbc99a5f50 INSERT INTO t2 VALUES (?) 1
+b8f5b0056d36e62b060d605227e26bfb INSERT INTO t3 VALUES (...) 1
+835ec262d10fbedce1e31c397bdae877 INSERT INTO t4 VALUES (...) 1
+c0cfc65392e6ea3d51708967b0795f09 INSERT INTO t5 VALUES (...) 1
+3e743e4d942c7b76fccddbf15211367e INSERT INTO t1 VALUES (?) /* , ... */ 2
+6048c5411fb3037b4db7a24eed82b83c INSERT INTO t3 VALUES (...) /* , ... */ 1
+2312fd042d1232cd30e4172c69b0b2e4 INSERT INTO t5 VALUES (...) /* , ... */ 1
+33ebf25ca2afeea44fd5390801df4a0a SELECT ? + ? 3
+eb4368e66ef2ee0713b22abe1b94b5e7 SELECT ? 1
bce3f7384ae2ab78354b031184fde12d CREATE SCHEMA statements_digest_temp 2
2a0e36afeaac85dc117c3856388a4fae DROP SCHEMA statements_digest_temp 2
-8761fd6b83357bdd00acd0b301cd1d43 SELECT ? FROM t11 1
-2707097430c8f6e7b8c60d15d1f3ff9a CREATE TABLE t11 ( c CHARACTER (?) ) 2
-503e81940feaf05afaafc435903f6bc3 INSERT INTO t11 VALUES (?) 1
-cb0f8f969018eb9b6019e9fe069f6e2a SHOW WARNINGS 1
+5a6f99b35d55cdcb4c9bd755ff6bed58 SELECT ? FROM t11 1
+88305d7ed153aeef764d4fb992f28034 CREATE TABLE t11 ( c CHARACTER (?) ) 2
+2a533c9f7e3b5d9dac18c4f8a0a49e53 INSERT INTO t11 VALUES (?) 1
+35c70a6aa7abc3da331ef84b3663534b SHOW WARNINGS 1
SELECT digest, digest_text FROM performance_schema.events_statements_current;
digest digest_text
####################################
diff --git a/mysql-test/suite/perfschema/r/statement_digest_long_query.result b/mysql-test/suite/perfschema/r/statement_digest_long_query.result
index c6a60a46cd4..225977a62af 100644
--- a/mysql-test/suite/perfschema/r/statement_digest_long_query.result
+++ b/mysql-test/suite/perfschema/r/statement_digest_long_query.result
@@ -8,5 +8,5 @@ SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1
####################################
SELECT digest, digest_text, count_star FROM events_statements_summary_by_digest;
digest digest_text count_star
-d01d4cae378e1362fa70663f43b189d1 TRUNCATE TABLE events_statements_summary_by_digest 1
-99d318822f9c746b71583a9d71b49fff SELECT ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ... 1
+e56a507698736d9cf34a6b043f9e5ed8 TRUNCATE TABLE events_statements_summary_by_digest 1
+9eef21cb9bfa3ff9732c95e0ef47dbf1 SELECT ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ... 1
diff --git a/mysql-test/suite/sys_vars/t/ssl_ca_basic.test b/mysql-test/suite/sys_vars/t/ssl_ca_basic.test
index c369f1f0894..e7a7d6f6a4b 100644
--- a/mysql-test/suite/sys_vars/t/ssl_ca_basic.test
+++ b/mysql-test/suite/sys_vars/t/ssl_ca_basic.test
@@ -22,7 +22,7 @@
# #
###############################################################################
--- source include/have_ssl.inc
+-- source include/have_ssl_communication.inc
--echo '#---------------------BS_STVARS_045_01----------------------#'
####################################################################
diff --git a/mysql-test/suite/sys_vars/t/ssl_cert_basic.test b/mysql-test/suite/sys_vars/t/ssl_cert_basic.test
index c3b69bd495f..56d24c11742 100644
--- a/mysql-test/suite/sys_vars/t/ssl_cert_basic.test
+++ b/mysql-test/suite/sys_vars/t/ssl_cert_basic.test
@@ -22,7 +22,7 @@
# #
###############################################################################
--- source include/have_ssl.inc
+-- source include/have_ssl_communication.inc
--echo '#---------------------BS_STVARS_047_01----------------------#'
####################################################################
diff --git a/mysql-test/suite/sys_vars/t/ssl_key_basic.test b/mysql-test/suite/sys_vars/t/ssl_key_basic.test
index 4616f281c27..8d755b4650b 100644
--- a/mysql-test/suite/sys_vars/t/ssl_key_basic.test
+++ b/mysql-test/suite/sys_vars/t/ssl_key_basic.test
@@ -22,7 +22,7 @@
# #
###############################################################################
--- source include/have_ssl.inc
+-- source include/have_ssl_communication.inc
--echo '#---------------------BS_STVARS_049_01----------------------#'
####################################################################
diff --git a/mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc b/mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc
index 78a8e8944fd..559f9ae6eaa 100644
--- a/mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc
+++ b/mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc
@@ -1179,7 +1179,7 @@ let $rows = 1;
--source suite/vcol/inc/vcol_supported_sql_funcs.inc
#--echo # DES_ENCRYPT(), DES_DECRYPT()
-#--source include/have_ssl.inc
+#--source include/have_ssl_communication.inc
#let $cols = a varchar(1024), b varchar(1024) as (des_encrypt(des_decrypt(a,'adf'),'adf'));
#let $values1 = 'MySQL',default;
#let $rows = 1;
View Lorry Controller Status