diff options
| author | istruewing@chilla.local <> | 2007-06-15 20:23:20 +0200 |
|---|---|---|
| committer | istruewing@chilla.local <> | 2007-06-15 20:23:20 +0200 |
| commit | 875cac1ffbfb31699061c979e93eb1a741988822 (patch) | |
| tree | 3ba1a3424a2724d272b0353d24a430a5653cd604 /sql/mysql_priv.h | |
| parent | b64b1a56d6e6fe5a95ef8eb698b2984ea9e353e4 (diff) | |
| parent | e6a478dee6a36f515d24b0ed6c30f8dc1d30c6ae (diff) | |
| download | mariadb-git-875cac1ffbfb31699061c979e93eb1a741988822.tar.gz | |
Merge chilla.local:/home/mydev/mysql-5.1-amain
into chilla.local:/home/mydev/mysql-5.1-axmrg
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 921a940834f..abf7811b953 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -1598,6 +1598,7 @@ extern int creating_table; // How many mysql_create_table() are running */ extern time_t server_start_time; +extern uint mysql_data_home_len; extern char *mysql_data_home,server_version[SERVER_VERSION_LENGTH], mysql_real_data_home[], *opt_mysql_tmpdir, mysql_charsets_dir[], def_ft_boolean_syntax[sizeof(ft_boolean_syntax)]; @@ -1924,6 +1925,8 @@ uint build_table_filename(char *buff, size_t bufflen, const char *db, #define MYSQL50_TABLE_NAME_PREFIX "#mysql50#" #define MYSQL50_TABLE_NAME_PREFIX_LENGTH 9 +uint build_table_shadow_filename(char *buff, size_t bufflen, + ALTER_PARTITION_PARAM_TYPE *lpt); /* Flags for conversion functions. */ #define FN_FROM_IS_TMP (1 << 0) #define FN_TO_IS_TMP (1 << 1) |