diff options
author | Sergey Petrunia <sergefp@mysql.com> | 2009-03-14 22:04:31 +0300 |
---|---|---|
committer | Sergey Petrunia <sergefp@mysql.com> | 2009-03-14 22:04:31 +0300 |
commit | 3f0a54e35e2c94da81c191d3fe5c0b6089fd26de (patch) | |
tree | 172c0cf755a99a530b5a757eba82daabb01ba056 /sql/mysql_priv.h | |
parent | 6551e173f9912225fca3aaada563d95aaac987f8 (diff) | |
parent | b105e8f5bc0397fa35f7f79c42764bdb27f53b90 (diff) | |
download | mariadb-git-3f0a54e35e2c94da81c191d3fe5c0b6089fd26de.tar.gz |
Merge
Diffstat (limited to 'sql/mysql_priv.h')
-rw-r--r-- | sql/mysql_priv.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 6acac86a1e0..d83c24bf6ca 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -2065,6 +2065,9 @@ extern SHOW_COMP_OPTION have_geometry, have_rtree_keys; extern SHOW_COMP_OPTION have_crypt; extern SHOW_COMP_OPTION have_compress; +extern int orig_argc; +extern char **orig_argv; +extern const char *load_default_groups[]; #ifndef __WIN__ extern pthread_t signal_thread; |