mirror of
https://github.com/MariaDB/server.git
synced 2025-09-02 09:41:40 +03:00
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
This commit is contained in:
@@ -3051,7 +3051,7 @@ static void refresh_status(void)
|
||||
|
||||
static bool append_file_to_dir(char **filename_ptr, char *table_name)
|
||||
{
|
||||
char buff[FN_REFLEN],*ptr;
|
||||
char buff[FN_REFLEN],*ptr, *end;
|
||||
if (!*filename_ptr)
|
||||
return 0; // nothing to do
|
||||
|
||||
@@ -3064,8 +3064,8 @@ static bool append_file_to_dir(char **filename_ptr, char *table_name)
|
||||
}
|
||||
/* Fix is using unix filename format on dos */
|
||||
strmov(buff,*filename_ptr);
|
||||
convert_dirname(buff);
|
||||
if (!(ptr=sql_alloc(strlen(buff)+strlen(table_name)+1)))
|
||||
end=convert_dirname(buff, *filename_ptr, NullS);
|
||||
if (!(ptr=sql_alloc((uint) (end-buff)+strlen(table_name)+1)))
|
||||
return 1; // End of memory
|
||||
*filename_ptr=ptr;
|
||||
strxmov(ptr,buff,table_name,NullS);
|
||||
|
Reference in New Issue
Block a user