diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2007-09-28 10:54:49 -0600 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2007-09-28 10:54:49 -0600 |
| commit | ba0cd51eb19f1f8868901d4b2327e1c8f4745c19 (patch) | |
| tree | 3b7d7d44c9a9850c900bf0c7499f62818e36ed84 /mysql-test/include | |
| parent | db55af7c4073926e0b1b8ece0f50b4842a6a6d22 (diff) | |
| parent | adb1d7a32787e1e5c40a739b9f2e990e67ba946f (diff) | |
| download | mariadb-git-ba0cd51eb19f1f8868901d4b2327e1c8f4745c19.tar.gz | |
Merge ramayana.hindu.god:/home/tsmith/m/bk/50
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
configure.in:
Auto merged
scripts/mysql_config.sh:
Auto merged
libmysql/libmysql.c:
Manual merge
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/have_bug25714.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/include/have_bug25714.inc b/mysql-test/include/have_bug25714.inc index 0c995cd0d4c..0c09ae1a035 100644 --- a/mysql-test/include/have_bug25714.inc +++ b/mysql-test/include/have_bug25714.inc @@ -3,5 +3,5 @@ # --require r/have_bug25714.require disable_query_log; -eval select LENGTH("MYSQL_BUG25714") > 0 as "have_bug25714_exe"; +eval select LENGTH("$MYSQL_BUG25714") > 0 as "have_bug25714_exe"; enable_query_log; |