diff options
author | unknown <msvensson@neptunus.(none)> | 2006-04-18 17:07:35 +0200 |
---|---|---|
committer | unknown <msvensson@neptunus.(none)> | 2006-04-18 17:07:35 +0200 |
commit | f539e5880b044ffd9e2fdbf76eef5f2667069ea8 (patch) | |
tree | 90029e8b204ff150f594eeed8ffaa64fda3796a2 /sql/mysql_priv.h | |
parent | 5c1b70beb8a0dd93d0ffb0ef1944a93ec7a92e10 (diff) | |
parent | 0a8d876d1480f2da2f6783378ce5cfea6e45b0fb (diff) | |
download | mariadb-git-f539e5880b044ffd9e2fdbf76eef5f2667069ea8.tar.gz |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/bug18564/my50-bug18564
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
-rw-r--r-- | sql/mysql_priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 4eb444e9854..98ffb54c240 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -1299,7 +1299,7 @@ extern SHOW_COMP_OPTION have_ndbcluster; #endif extern SHOW_COMP_OPTION have_isam; -extern SHOW_COMP_OPTION have_raid, have_openssl, have_symlink; +extern SHOW_COMP_OPTION have_raid, have_openssl, have_symlink, have_dlopen; extern SHOW_COMP_OPTION have_query_cache; extern SHOW_COMP_OPTION have_geometry, have_rtree_keys; extern SHOW_COMP_OPTION have_crypt; |