Merge lp:~linuxjedi/drizzle/trunk-bug-689448 into lp:drizzle/7.0

[Andrew Hutchings]

Avoid assert when retrieving an empty query string for the data_dictionary.innodb_trx table.

An assert on this table keeps cropping at various stages (3rd time now) so added a test case too.

[Brian Aker (brianaker)]

Hi!

In this code you are working with a shared_ptr. This means that though you check it in one call, there is a chance it will have been changed by the time the second call is made. Either you need to make the call in just a single call, or you need to copy the shared_ptr locally and then make use of it from there.

Cheers,
   -Brina

[Andrew Hutchings (linuxjedi)]

ok, now just uses a copy of the shared pointer (or NULL)

=== modified file 'drizzled/session.h'
--- drizzled/session.h	2010-12-08 18:53:46 +0000
+++ drizzled/session.h	2010-12-17 18:47:12 +0000
@@ -431,11 +431,10 @@
   {
     QueryString tmp_string(getQueryString());
 
-    assert(tmp_string);
     if (not tmp_string)
     {
       length= 0;
-      return 0;
+      return NULL;
     }
 
     length= tmp_string->length();

=== modified file 'plugin/innobase/tests/r/innodb_trx.result'
--- plugin/innobase/tests/r/innodb_trx.result	2010-11-11 11:28:48 +0000
+++ plugin/innobase/tests/r/innodb_trx.result	2010-12-17 18:47:12 +0000
@@ -26,3 +26,9 @@
   `TRX_ADAPTIVE_HASH_LATCHED` BIGINT NOT NULL,
   `TRX_ADAPTIVE_HASH_TIMEOUT` BIGINT NOT NULL
 ) ENGINE=FunctionEngine COLLATE = utf8_general_ci
+use test;
+create table t1 (a int);
+start transaction;
+select TRX_STATE,TRX_QUERY from data_dictionary.INNODB_TRX;
+TRX_STATE	TRX_QUERY
+RUNNING	NULL

=== modified file 'plugin/innobase/tests/t/innodb_trx.test'
--- plugin/innobase/tests/t/innodb_trx.test	2010-03-01 02:11:17 +0000
+++ plugin/innobase/tests/t/innodb_trx.test	2010-12-17 18:47:12 +0000
@@ -3,3 +3,14 @@
 select * from INNODB_TRX;
 
 show create table INNODB_TRX;
+
+# Make sure we don't hit a bad assert() with an empty transaction
+connect (con1,localhost,root,,);
+connect (con2,localhost,root,,);
+connection con1;
+use test;
+create table t1 (a int);
+start transaction;
+connection con2;
+sleep 0.1;
+select TRX_STATE,TRX_QUERY from data_dictionary.INNODB_TRX;