diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-03-16 07:40:11 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-03-16 07:40:11 +0200 |
| commit | c7fd1fa4968b9649567895af2b5ebf11ca2f5e6c (patch) | |
| tree | ed85d427ded2a3c957cb64be83314ba53f015811 /sql/mysql_priv.h | |
| parent | 7b13e02039f5a38dced00ca9590512e132226c40 (diff) | |
| parent | 17f8d3d725f4b465a8a0dc8e96b04cd973c47fd5 (diff) | |
| download | mariadb-git-c7fd1fa4968b9649567895af2b5ebf11ca2f5e6c.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-fix_fields-4.1
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 9fd7e6f5b93..8f86d9990fe 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -64,14 +64,6 @@ char* query_table_status(THD *thd,const char *db,const char *table_name); #define PREV_BITS(type,A) ((type) (((type) 1 << (A)) -1)) #define all_bits_set(A,B) ((A) & (B) != (B)) -#ifndef LL -#ifdef HAVE_LONG_LONG -#define LL(A) A ## LL -#else -#define LL(A) A ## L -#endif -#endif - extern CHARSET_INFO *system_charset_info, *files_charset_info ; extern CHARSET_INFO *national_charset_info, *table_alias_charset; @@ -621,7 +613,7 @@ int mysqld_help (THD *thd, const char *text); /* sql_prepare.cc */ void mysql_stmt_prepare(THD *thd, char *packet, uint packet_length); -void mysql_stmt_execute(THD *thd, char *packet); +void mysql_stmt_execute(THD *thd, char *packet, uint packet_length); void mysql_stmt_free(THD *thd, char *packet); void mysql_stmt_reset(THD *thd, char *packet); void mysql_stmt_get_longdata(THD *thd, char *pos, ulong packet_length); |