From 88aff4bf851e8f0d67cc7cd860d445e0fb234717 Mon Sep 17 00:00:00 2001 From: "monty@hundin.mysql.fi" <> Date: Mon, 8 Oct 2001 04:58:07 +0300 Subject: Updated manual about embedded version. Speed up column-completion in 'mysql' Don't use ISAM if HAVE_ISAM is not defined A lot of fixes for the embedded version. All libraries are now included in libmysqld.a Changed arguments to convert_dirname() to make it more general. Renamed files in the 'merge' directory to all use a common prefix. Don't compile both assembler and C functions on x86 --- libmysql/libmysql.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libmysql') diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index fbf2149d7f9..8de073e94eb 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -92,8 +92,8 @@ static ulong mysql_sub_escape_string(CHARSET_INFO *charset_info, char *to, const char *from, ulong length); int mysql_server_init(int argc __attribute__((unused)), - const char **argv __attribute__((unused)), - const char **groups __attribute__((unused))) + char **argv __attribute__((unused)), + char **groups __attribute__((unused))) { return 0; } @@ -873,7 +873,7 @@ unpack_fields(MYSQL_DATA *data,MEM_ROOT *alloc,uint fields, for (row=data->data; row ; row = row->next,field++) { - field->table= strdup_root(alloc,(char*) row->data[0]); + field->org_table= field->table= strdup_root(alloc,(char*) row->data[0]); field->name= strdup_root(alloc,(char*) row->data[1]); field->length= (uint) uint3korr(row->data[2]); field->type= (enum enum_field_types) (uchar) row->data[3][0]; -- cgit v1.2.1