diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-10-03 14:21:16 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-10-03 14:21:16 -0600 |
| commit | 7968bc7f66bf7a641fdda4493252bc8e7c571374 (patch) | |
| tree | 228338950ecb3ac05baf2e782fc004a02682b17a /sql/mysql_priv.h | |
| parent | 5a18acf35f208c3cfa9534b337fe31d333615e4f (diff) | |
| parent | 83fa1116792e55ddb9dc57276b689a97e6ab8f74 (diff) | |
| download | mariadb-git-7968bc7f66bf7a641fdda4493252bc8e7c571374.tar.gz | |
merged
client/Makefile.am:
Auto merged
include/my_sys.h:
Auto merged
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/type_ranges.result:
Auto merged
sql/lex.h:
Auto merged
sql/sql_lex.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index c09c2c5e4b2..26b1271c6c5 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -71,7 +71,6 @@ char* query_table_status(THD *thd,const char *db,const char *table_name); #define HASH_PASSWORD_LENGTH 16 #define HOST_CACHE_SIZE 128 #define MAX_ACCEPT_RETRY 10 // Test accept this many times -#define MAX_BLOB_WIDTH 8192 // Default width for blob #define MAX_FIELDS_BEFORE_HASH 32 #define USER_VARS_HASH_SIZE 16 #define STACK_MIN_SIZE 8192 // Abort if less stack during eval. @@ -520,7 +519,7 @@ void sql_print_error(const char *format,...) __attribute__ ((format (printf, 1, 2))); extern uint32 server_id; -extern char mysql_data_home[2],server_version[SERVER_VERSION_LENGTH], +extern char *mysql_data_home,server_version[SERVER_VERSION_LENGTH], max_sort_char, mysql_real_data_home[]; extern my_string mysql_unix_port,mysql_tmpdir; extern const char *first_keyword, *localhost, *delayed_user; |