diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-06-22 14:10:02 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-06-22 14:10:02 +0200 |
| commit | 4db138f91a04619f6c53ece45f3b143e633a7566 (patch) | |
| tree | e53068db54e844c159cf1431067a242ef99c4ed2 /mysql-test/include | |
| parent | 73ea278f6a44f2840a6784a9c856520090aef159 (diff) | |
| parent | 19f51d3fa50e1ffda7e25eabc879b63627920a81 (diff) | |
| download | mariadb-git-4db138f91a04619f6c53ece45f3b143e633a7566.tar.gz | |
Merged from mysql-4.1 to mysql-5.0
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/t/ndb_autodiscover.test:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
client/mysqldump.c:
Merge from 4.1 to 5.0
mysql-test/r/ndb_autodiscover.result:
Merge
ndb/test/ndbapi/create_tab.cpp:
Merge
sql/ha_ndbcluster.cc:
Merge
sql/handler.cc:
Merge
sql/handler.h:
Merge
sql/sql_base.cc:
Merge
sql/sql_table.cc:
Merge
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/not_openssl.inc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/include/not_openssl.inc b/mysql-test/include/not_openssl.inc new file mode 100644 index 00000000000..afe2ed37c28 --- /dev/null +++ b/mysql-test/include/not_openssl.inc @@ -0,0 +1,4 @@ +-- require r/not_openssl.require +disable_query_log; +show variables like "have_openssl"; +enable_query_log; |