diff options
| author | Davi Arnaut <davi.arnaut@oracle.com> | 2011-03-14 15:03:22 -0300 |
|---|---|---|
| committer | Davi Arnaut <davi.arnaut@oracle.com> | 2011-03-14 15:03:22 -0300 |
| commit | 07106d4ad95175b50db878c16b12215b2221db87 (patch) | |
| tree | 716557fcbdbdfc59de90c8b8981fc17aabc3ac19 | |
| parent | 52cb0b1e3932b54c1fff4c863d80574244cf0fb5 (diff) | |
| download | mariadb-git-07106d4ad95175b50db878c16b12215b2221db87.tar.gz | |
Bug#11765202: Dbug_violation_helper::~Dbug_violation_helper(): Assertion `!_entered' failed.
Add a missing DBUG_RETURN function test_if_number().
| -rw-r--r-- | mysql-test/r/analyse.result | 13 | ||||
| -rw-r--r-- | mysql-test/t/analyse.test | 12 | ||||
| -rw-r--r-- | sql/sql_analyse.cc | 2 |
3 files changed, 26 insertions, 1 deletions
diff --git a/mysql-test/r/analyse.result b/mysql-test/r/analyse.result index 1820782d2f8..92fc26e7ba3 100644 --- a/mysql-test/r/analyse.result +++ b/mysql-test/r/analyse.result @@ -123,3 +123,16 @@ CREATE TABLE t2 SELECT 1 FROM t1, t1 t3 GROUP BY t3.a PROCEDURE ANALYSE(); ERROR HY000: Incorrect usage of PROCEDURE and non-SELECT DROP TABLE t1; End of 5.0 tests +# +# Bug#11765202: Dbug_violation_helper::~Dbug_violation_helper(): Assertion `!_entered' failed. +# +DROP TABLE IF EXISTS t1; +Warnings: +Note 1051 Unknown table 't1' +CREATE TABLE t1 (a VARCHAR(2) CHARSET UTF8 NOT NULL); +INSERT INTO t1 VALUES ('e'),('e'),('e-'); +SELECT * FROM t1 PROCEDURE ANALYSE(); +Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype +test.t1.a e e- 1 2 0 0 1.3333 NULL ENUM('e','e-') NOT NULL +DROP TABLE t1; +End of 5.1 tests diff --git a/mysql-test/t/analyse.test b/mysql-test/t/analyse.test index 05f739bfd69..63929d8766b 100644 --- a/mysql-test/t/analyse.test +++ b/mysql-test/t/analyse.test @@ -133,3 +133,15 @@ DROP TABLE t1; --echo End of 5.0 tests + +--echo # +--echo # Bug#11765202: Dbug_violation_helper::~Dbug_violation_helper(): Assertion `!_entered' failed. +--echo # + +DROP TABLE IF EXISTS t1; +CREATE TABLE t1 (a VARCHAR(2) CHARSET UTF8 NOT NULL); +INSERT INTO t1 VALUES ('e'),('e'),('e-'); +SELECT * FROM t1 PROCEDURE ANALYSE(); +DROP TABLE t1; + +--echo End of 5.1 tests diff --git a/sql/sql_analyse.cc b/sql/sql_analyse.cc index 29ba956bf6c..2b894282a9c 100644 --- a/sql/sql_analyse.cc +++ b/sql/sql_analyse.cc @@ -242,7 +242,7 @@ bool test_if_number(NUM_INFO *info, const char *str, uint str_len) if (str == end) { info->is_float = 1; // we can't use variable decimals here - return 1; + DBUG_RETURN(1); } DBUG_RETURN(0); } |