Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-tmp

into mysql.com:/Users/kent/mysql/bk/mysql-5.0


mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
This commit is contained in:
unknown 2005-06-10 20:12:45 +02:00
commit 5d4a3fa518
22 changed files with 188 additions and 117 deletions

View file

@ -388,6 +388,9 @@ inline double ulonglong2double(ulonglong value)
#define HAVE_SPATIAL 1
#define HAVE_RTREE_KEYS 1
#define HAVE_OPENSSL 1
#define HAVE_YASSL 1
/* Define charsets you want */
/* #undef HAVE_CHARSET_armscii8 */
/* #undef HAVE_CHARSET_ascii */