mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
row0sel.c Fix a memory freeing bug when a row which contains an externally stored long field in the middle of the row is fetched in a SELECT
srv0start.c Allow drive name followed by a ':' in a data file path ha_innobase.cc Allow drive name followed by a ':' in a data file path sql/ha_innobase.cc: Allow drive name followed by a ':' in a data file path innobase/srv/srv0start.c: Allow drive name followed by a ':' in a data file path innobase/row/row0sel.c: Fix a memory freeing bug when a row which contains an externally stored long field in the middle of the row is fetched in a SELECT
This commit is contained in:
@ -141,21 +141,21 @@ srv_normalize_path_for_win(
|
||||
}
|
||||
|
||||
/*************************************************************************
|
||||
Adds a slash or a backslash to the end of a string if it is missing. */
|
||||
Adds a slash or a backslash to the end of a string if it is missing
|
||||
and the string is not empty. */
|
||||
static
|
||||
char*
|
||||
srv_add_path_separator_if_needed(
|
||||
/*=============================*/
|
||||
/* out, own: string which has the separator */
|
||||
/* out, own: string which has the separator if the
|
||||
string is not empty */
|
||||
char* str) /* in: null-terminated character string */
|
||||
{
|
||||
char* out_str;
|
||||
|
||||
if (ut_strlen(str) == 0) {
|
||||
out_str = ut_malloc(2);
|
||||
sprintf(out_str, "%s", SRV_PATH_SEPARATOR);
|
||||
|
||||
return(out_str);
|
||||
return(str);
|
||||
}
|
||||
|
||||
if (str[ut_strlen(str) - 1] == SRV_PATH_SEPARATOR[0]) {
|
||||
|
Reference in New Issue
Block a user