diff options
| author | heikki@donna.mysql.fi <> | 2001-08-13 18:37:00 +0300 |
|---|---|---|
| committer | heikki@donna.mysql.fi <> | 2001-08-13 18:37:00 +0300 |
| commit | 335dda93b49cb38bad660c01690af6c16d03816f (patch) | |
| tree | dc09004912f361fb61f2cd3ab7819721f6099761 /innobase | |
| parent | bfbc3252e18a17c12fa48a12f01a0223aed123af (diff) | |
| download | mariadb-git-335dda93b49cb38bad660c01690af6c16d03816f.tar.gz | |
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
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/row/row0sel.c | 1 | ||||
| -rw-r--r-- | innobase/srv/srv0start.c | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/innobase/row/row0sel.c b/innobase/row/row0sel.c index b74bd29a89e..0ad6b7084e2 100644 --- a/innobase/row/row0sel.c +++ b/innobase/row/row0sel.c @@ -2103,6 +2103,7 @@ row_sel_store_mysql_rec( if (extern_field_heap) { mem_heap_free(extern_field_heap); + extern_field_heap = NULL; } } else { mysql_rec[templ->mysql_null_byte_offset] |= diff --git a/innobase/srv/srv0start.c b/innobase/srv/srv0start.c index a79a808ba2e..b3f5dbb28b5 100644 --- a/innobase/srv/srv0start.c +++ b/innobase/srv/srv0start.c @@ -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]) { |