diff options
| author | unknown <sergefp@mysql.com> | 2004-04-28 19:27:56 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2004-04-28 19:27:56 +0400 |
| commit | 2902f9e8a57ca76cc52863d70d02dcf7693ce8cd (patch) | |
| tree | 4864372894fc29ff2e4d9de93f2c438b29184acb /sql/mysql_priv.h | |
| parent | 15e207b0e7d1cd010b9e0eea4663c98e1eb209de (diff) | |
| parent | 5605374b668068ef5ede826b3d04e2fe7ead4f9f (diff) | |
| download | mariadb-git-2902f9e8a57ca76cc52863d70d02dcf7693ce8cd.tar.gz | |
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 00af3c67c7e..4381ea1f93e 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -839,7 +839,7 @@ extern ulong server_id, concurrency; extern ulong ha_read_count, ha_write_count, ha_delete_count, ha_update_count; extern ulong ha_read_key_count, ha_read_next_count, ha_read_prev_count; extern ulong ha_read_first_count, ha_read_last_count; -extern ulong ha_read_rnd_count, ha_read_rnd_next_count; +extern ulong ha_read_rnd_count, ha_read_rnd_next_count, ha_discover_count; extern ulong ha_commit_count, ha_rollback_count,table_cache_size; extern ulong max_connections,max_connect_errors, connect_timeout; extern ulong slave_net_timeout; @@ -893,6 +893,7 @@ extern SHOW_VAR init_vars[],status_vars[], internal_vars[]; extern SHOW_COMP_OPTION have_isam; extern SHOW_COMP_OPTION have_innodb; extern SHOW_COMP_OPTION have_berkeley_db; +extern SHOW_COMP_OPTION have_ndbcluster; extern struct system_variables global_system_variables; extern struct system_variables max_system_variables; extern struct rand_struct sql_rand; @@ -962,6 +963,10 @@ int format_number(uint inputflag,uint max_length,my_string pos,uint length, my_string *errpos); int openfrm(const char *name,const char *alias,uint filestat,uint prgflag, uint ha_open_flags, TABLE *outparam); +int readfrm(const char *name, const void** data, uint* length); +int writefrm(const char* name, const void* data, uint len); +int create_table_from_handler(const char *db, const char *name, + bool create_if_found); int closefrm(TABLE *table); db_type get_table_type(const char *name); int read_string(File file, gptr *to, uint length); |