Don't use zend_string for other fields (only name here is enough)

1 files changed, 17 insertions, 7 deletions

diff --git a/ext/mysqlnd/mysqlnd_structs.h b/ext/mysqlnd/mysqlnd_structs.h
index 5bb59cd6ca..f8e69986fe 100644
--- a/ext/mysqlnd/mysqlnd_structs.h
+++ b/ext/mysqlnd/mysqlnd_structs.h
@@ -72,19 +72,29 @@ typedef struct st_mysqlnd_cmd_buffer
 
 typedef struct st_mysqlnd_field
 {
-	zend_string *name;			/* Name of column */
-	zend_string *org_name;		/* Original column name, if an alias */
-	zend_string  *table;			/* Table of column if column was a field */
-	zend_string  *org_table;		/* Org table name, if table was an alias */
-	zend_string  *db;			/* Database for table */
-	zend_string  *catalog;		/* Catalog for table */
-	zend_string  *def;					/* Default value (set by mysql_list_fields) */
+	zend_string *sname;			/* Name of column */
+	const char  *name;          /* Name of column in C string */
+	const char  *org_name;		/* Original column name, if an alias */
+	const char  *table;			/* Table of column if column was a field */
+	const char  *org_table;		/* Org table name, if table was an alias */
+	const char  *db;			/* Database for table */
+	const char  *catalog;		/* Catalog for table */
+	char  *def;                 /* Default value (set by mysql_list_fields) */
 	unsigned long length;		/* Width of column (create length) */
 	unsigned long max_length;	/* Max width for selected set */
+	unsigned int name_length;
+	unsigned int org_name_length;
+	unsigned int table_length;
+	unsigned int org_table_length;
+	unsigned int db_length;
+	unsigned int catalog_length;
+	unsigned int def_length;
 	unsigned int flags;			/* Diverse flags */
 	unsigned int decimals;		/* Number of decimals in field */
 	unsigned int charsetnr;		/* Character set */
 	enum mysqlnd_field_types type;	/* Type of field. See mysql_com.h for types */
+	char *root;
+	size_t root_len;
 } MYSQLND_FIELD;