Merge lp:~diego-fmpwizard/drizzle/bug-fixes into lp:~drizzle-trunk/drizzle/development

[fmpwizard]

[fmpwizard (diego-fmpwizard)]

* Fixed bug# 439719
"Drizzle crash when running random query generator"
* Added test case.

[Brian Aker (brianaker)]

Hi!

So why comment out the one line?

Cheers,
  -Brian

review: Needs Information

[lp:~diego-fmpwizard/drizzle/bug-fixes]

1140. By Diego Medina <email address hidden> on 2009-10-05

uncommented a call to reset_diagnostics_area()

[fmpwizard (diego-fmpwizard)]

Hi Brian,
> Hi!
>
> So why comment out the one line?
I forgot to uncomment it :)
I just pushed revision 1140 that has the line uncommented.

Thanks

  -Diego

>
> Cheers,
> -Brian

review: Needs Resubmitting

=== modified file 'drizzled/sql_delete.cc'
--- drizzled/sql_delete.cc	2009-09-24 18:30:12 +0000
+++ drizzled/sql_delete.cc	2009-10-05 13:31:44 +0000
@@ -168,6 +168,11 @@
     free_underlaid_joins(session, select_lex);
     session->row_count_func= 0;
     DRIZZLE_DELETE_DONE(0, 0);
+    /**
+     * Resetting the Diagnostic area to prevent
+     * lp bug# 439719
+     */
+    session->main_da.reset_diagnostics_area();
     session->my_ok((ha_rows) session->row_count_func);
     /*
       We don't need to call reset_auto_increment in this case, because
@@ -331,6 +336,11 @@
   if (error < 0 || (session->lex->ignore && !session->is_fatal_error))
   {
     session->row_count_func= deleted;
+    /**
+     * Resetting the Diagnostic area to prevent
+     * lp bug# 439719
+     */
+    session->main_da.reset_diagnostics_area();    
     session->my_ok((ha_rows) session->row_count_func);
   }
   return (error >= 0 || session->is_error());

=== modified file 'drizzled/sql_update.cc'
--- drizzled/sql_update.cc	2009-09-23 21:40:36 +0000
+++ drizzled/sql_update.cc	2009-10-05 13:31:44 +0000
@@ -215,6 +215,11 @@
       (select && select->check_quick(session, safe_update, limit)))
   {
     delete select;
+    /**
+     * Resetting the Diagnostic area to prevent
+     * lp bug# 439719
+     */
+    session->main_da.reset_diagnostics_area();
     free_underlaid_joins(session, select_lex);
     if (error)
       goto abort;				// Error in where
@@ -632,6 +637,11 @@
     sprintf(buff, ER(ER_UPDATE_INFO), (ulong) found, (ulong) updated,
 	    (ulong) session->cuted_fields);
     session->row_count_func= updated;
+    /**
+     * Resetting the Diagnostic area to prevent
+     * lp bug# 439719
+     */
+    session->main_da.reset_diagnostics_area();
     session->my_ok((ulong) session->row_count_func, found, id, buff);
   }
   session->count_cuted_fields= CHECK_FIELD_IGNORE;		/* calc cuted fields */

=== modified file 'tests/r/update.result'
--- tests/r/update.result	2009-08-04 02:33:47 +0000
+++ tests/r/update.result	2009-10-05 13:31:44 +0000
@@ -398,4 +398,6 @@
 count(*)
 16384
 drop table t1,t2;
+CREATE TABLE t1(col1 enum('a','b') NOT NULL, col2 enum('a','b') DEFAULT NULL, KEY col2 (col2));
+UPDATE t1 SET col1 = "crash" WHERE col2 = now() ;
 End of 5.0 tests

=== modified file 'tests/t/update.test'
--- tests/t/update.test	2009-08-04 02:33:47 +0000
+++ tests/t/update.test	2009-10-05 13:31:44 +0000
@@ -337,6 +337,12 @@
 
 drop table t1,t2;
 
+#
+# Bug #439719: Drizzle crash when running random query generator
+#
+CREATE TABLE t1(col1 enum('a','b') NOT NULL, col2 enum('a','b') DEFAULT NULL, KEY col2 (col2));
+UPDATE t1 SET col1 = "crash" WHERE col2 = now() ;
+
 connection default;
 disconnect con1;