innobase_add_instant_try(): Set zero-length strings to non-NULL pointer

ae7bef22 · Marko Mäkelä · ed8561bf · ae7bef22
Commit ae7bef22 authored Sep 25, 2017 by Marko Mäkelä
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

storage/innobase/handler/handler0alter.cc storage/innobase/handler/handler0alter.cc +2 -1

No files found.
--- a/storage/innobase/handler/handler0alter.cc
+++ b/storage/innobase/handler/handler0alter.cc
@@ -4295,7 +4295,8 @@ innobase_add_instant_try(
 		}

 		if (!new_field->field) {
-			col->def_val.data = dfield_get_data(dfield);
+			col->def_val.data = dfield_get_len(dfield)
+				? dfield_get_data(dfield) : "";
 			col->def_val.len = dfield_get_len(dfield);

 			pars_info_t*    info = pars_info_create();