mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
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
This commit is contained in:
@ -339,3 +339,24 @@ bool net_store_data(String* packet, I_List<i_string>* str_list)
|
||||
|
||||
return net_store_data(packet, (char*)tmp.ptr(), tmp.length());
|
||||
}
|
||||
|
||||
/*
|
||||
** translate and store data; These are mainly used by the SHOW functions
|
||||
*/
|
||||
|
||||
bool
|
||||
net_store_data(String *packet,CONVERT *convert, const char *from,uint length)
|
||||
{
|
||||
if (convert)
|
||||
return convert->store(packet, from, length);
|
||||
return net_store_date(packet,from,length);
|
||||
}
|
||||
|
||||
bool
|
||||
net_store_data(String *packet, CONVERT *convert, const char *from)
|
||||
{
|
||||
uint length=(uint) strlen(from);
|
||||
if (convert)
|
||||
return convert->store(packet, from, length);
|
||||
return net_store_date(packet,from,length);
|
||||
}
|
||||
|
Reference in New Issue
Block a user