merge with 5.3

sql/sql_insert.cc:
  CREATE ... IF NOT EXISTS may do nothing, but
  it is still not a failure. don't forget to my_ok it.
  ******
  CREATE ... IF NOT EXISTS may do nothing, but
  it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
  small cleanup
  ******
  small cleanup

1 files changed, 12 insertions, 0 deletions

diff --git a/mysys/string.c b/mysys/string.c
index 0aa175e8991..fa669ceda3a 100644
--- a/mysys/string.c
+++ b/mysys/string.c
@@ -181,3 +181,15 @@ void dynstr_free(DYNAMIC_STRING *str)
   my_free(str->str);
   str->str= NULL;
 }
+
+
+/* Give over the control of the dynamic string to caller */
+
+void dynstr_reassociate(DYNAMIC_STRING *str, char **ptr, size_t *length,
+                        size_t *alloc_length)
+{
+  *ptr=          str->str;
+  *length=       str->length;
+  *alloc_length= str->max_length;
+  str->str=0;
+}