From 7ca65155ad07834d136190a4d55a512e86df1fd5 Mon Sep 17 00:00:00 2001
From: "sergefp@mysql.com" <>
Date: Tue, 23 Oct 2007 21:32:30 +0400
Subject: [PATCH] Post-merge fixes

---
 mysql-test/r/type_decimal.result |  1 +
 mysql-test/t/type_decimal.test   | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/mysql-test/r/type_decimal.result b/mysql-test/r/type_decimal.result
index 8dd4f6aaaf4..b550536d0db 100644
--- a/mysql-test/r/type_decimal.result
+++ b/mysql-test/r/type_decimal.result
@@ -811,6 +811,7 @@ insert into t1 values (-0.123456,0.123456);
 select group_concat(f1),group_concat(f2) from t1;
 group_concat(f1)	group_concat(f2)
 -0.123456	0.123456
+drop table t1;
 create table t1 (
 ua_id decimal(22,0) not null,
 ua_invited_by_id decimal(22,0) default NULL,
diff --git a/mysql-test/t/type_decimal.test b/mysql-test/t/type_decimal.test
index 4d61350a613..12d4398dd57 100644
--- a/mysql-test/t/type_decimal.test
+++ b/mysql-test/t/type_decimal.test
@@ -425,5 +425,20 @@ insert into t1 values (-0.123456,0.123456);
 select group_concat(f1),group_concat(f2) from t1;
 drop table t1;
 
+#
+# BUG#31450 "Query causes error 1048"
+#
+create table t1 (
+  ua_id decimal(22,0) not null,
+  ua_invited_by_id decimal(22,0) default NULL,
+  primary key(ua_id)
+);
+insert into t1 values (123, NULL), (456, NULL);
+
+--echo this must not produce error 1048: 
+select * from t1 where ua_invited_by_id not in (select ua_id from t1);
+
+drop table t1;
+
 --echo End of 5.0 tests