From: Elan Ruusamäe <glen@pld-linux.org>
Date: Wed, 9 Nov 2005 00:16:59 +0000 (+0000)
Subject: - fixes crash with INSERT DELAYED
X-Git-Tag: auto/ac/mysql-5_0_15-5
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=85482a054f1a07cbaf1c2073ead099702d484082;p=packages%2Fmysql.git

- fixes crash with INSERT DELAYED

Changed files:
    mysql-bug-13707.patch -> 1.1
---

diff --git a/mysql-bug-13707.patch b/mysql-bug-13707.patch
new file mode 100644
index 0000000..20d0004
--- /dev/null
+++ b/mysql-bug-13707.patch
@@ -0,0 +1,34 @@
+ChangeSet
+  1.2028 05/10/25 15:23:49 ingo@stripped +1 -0
+  Bug#13707 - Server crash with INSERT DELAYED on MyISAM table
+  Initialized 'ptr' for a newly instantiated varstring field.
+  This is required by INSERT DELAYED.
+
+  sql/field.cc
+    1.286 05/10/25 15:23:41 ingo@stripped +10 -3
+    Bug#13707 - Server crash with INSERT DELAYED on MyISAM table
+    Initialized 'ptr' for a newly instantiated varstring field.
+    This is required by INSERT DELAYED.
+
+--- 1.285/sql/field.cc  2005-10-13 23:04:47 +02:00
++++ 1.286/sql/field.cc  2005-10-25 15:23:41 +02:00
+@@ -6201,9 +6201,16 @@
+     This is done to ensure that ALTER TABLE will convert old VARCHAR fields
+     to now VARCHAR fields.
+   */
+-  return new Field_varstring(field_length, maybe_null(),
+-                             field_name, new_table,
+-                             charset());
++  Field *new_field= new Field_varstring(field_length, maybe_null(),
++                                        field_name, new_table,
++                                        charset());
++  /*
++    delayed_insert::get_local_table() needs a ptr copied from old table.
++    This is what other new_field() methods do too. The above method of
++    Field_varstring sets ptr to NULL.
++  */
++  new_field->ptr= ptr;
++  return new_field;
+ }
+ 
+ /****************************************************************************