diff options
| author | unknown <monty@donna.mysql.com> | 2001-01-21 16:30:16 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2001-01-21 16:30:16 +0200 |
| commit | ab7afc8c36279051e25d157993281bd9dba4a58a (patch) | |
| tree | c772f489364087df96cf8f0582915a11ba82ae54 /sql/mysql_priv.h | |
| parent | 9223381f9c85297d7548f99e7ea7cd6c157e763a (diff) | |
| download | mariadb-git-ab7afc8c36279051e25d157993281bd9dba4a58a.tar.gz | |
Changes for --with-server-suffix
Fixed mutex bug in logging (crash on windows when doing SET PASSWORD=)
Changed MERGE tables to not use FILE
BitKeeper/deleted/.del-m.MRG~3f5632c37af00f18:
Delete: mysql-test/std_data/m.MRG
BitKeeper/deleted/.del-m.frm~e351dfe0b6824c0c:
Delete: mysql-test/std_data/m.frm
Docs/manual.texi:
Added DNS section
configure.in:
Update to 3.23.32
include/Makefile.am:
Added my_config.h
include/mysql_com.h:
Changes for --with-server-suffix
include/mysql_version.h.in:
cleanup
merge/open.c:
Don't use FILE
mysql-test/Makefile.am:
removed not needed data files
mysql-test/r/merge.result:
generate merge file
mysql-test/t/merge.test:
generate merge file
sql-bench/Results/ATIS-mysql-NT_4.0:
New benchmark results
sql-bench/Results/RUN-mysql-NT_4.0:
New benchmark results
sql-bench/Results/alter-table-mysql-NT_4.0:
New benchmark results
sql-bench/Results/big-tables-mysql-NT_4.0:
New benchmark results
sql-bench/Results/connect-mysql-NT_4.0:
New benchmark results
sql-bench/Results/create-mysql-NT_4.0:
New benchmark results
sql-bench/Results/insert-mysql-NT_4.0:
New benchmark results
sql-bench/Results/select-mysql-NT_4.0:
New benchmark results
sql-bench/Results/wisconsin-mysql-NT_4.0:
New benchmark results
sql/log.cc:
Ensure that mutex are initialized before used
sql/log_event.h:
Changes for --with-server-suffix
sql/mysql_priv.h:
Changes for --with-server-suffix
sql/mysqlbinlog.cc:
Changes for --with-server-suffix
sql/mysqld.cc:
changed strnmov -> strmake
sql/net_pkg.cc:
Prepare for adding char-set conversion to SHOW commands
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 11e847d9b2b..6b4cfbed59d 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -275,6 +275,7 @@ char *net_store_length(char *packet,uint length); char *net_store_data(char *to,const char *from); char *net_store_data(char *to,int32 from); char *net_store_data(char *to,longlong from); + bool net_store_null(String *packet); bool net_store_data(String *packet,uint32 from); bool net_store_data(String *packet,longlong from); @@ -282,6 +283,9 @@ bool net_store_data(String *packet,const char *from); bool net_store_data(String *packet,const char *from,uint length); bool net_store_data(String *packet,struct tm *tmp); bool net_store_data(String* packet, I_List<i_string>* str_list); +bool net_store_data(String *packet,CONVERT *convert, const char *from, + uint length); +bool net_store_data(String *packet, CONVERT *convert, const char *from); SORT_FIELD * make_unireg_sortorder(ORDER *order, uint *length); int setup_order(THD *thd,TABLE_LIST *tables, List<Item> &fields, @@ -464,8 +468,8 @@ void sql_print_error(const char *format,...) __attribute__ ((format (printf, 1, 2))); extern uint32 server_id; -extern char mysql_data_home[2],server_version[50],max_sort_char, - mysql_real_data_home[]; +extern char mysql_data_home[2],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; extern ulong refresh_version,flush_version, thread_id,query_id,opened_tables, |