From d29146f9f42caa3696ccc540449e4c4dd8732e35 Mon Sep 17 00:00:00 2001
From: "mhansson/martin@linux-st28.site" <>
Date: Tue, 9 Oct 2007 11:36:05 +0200
Subject: [PATCH] Bug#30832:Assertion + crash with select
 name_const('test',now()); Completion of previous patch. Negative number were
 denied as the second argument to NAME_CONST.

---
 mysql-test/r/func_misc.result | 6 ++++++
 mysql-test/t/func_misc.test   | 2 ++
 sql/item_func.h               | 1 +
 3 files changed, 9 insertions(+)

diff --git a/mysql-test/r/func_misc.result b/mysql-test/r/func_misc.result
index bb6f4127a2a..c941790c35b 100644
--- a/mysql-test/r/func_misc.result
+++ b/mysql-test/r/func_misc.result
@@ -195,9 +195,15 @@ NULL
 SELECT NAME_CONST('test', 1);
 test
 1
+SELECT NAME_CONST('test', -1);
+test
+-1
 SELECT NAME_CONST('test', 1.0);
 test
 1.0
+SELECT NAME_CONST('test', -1.0);
+test
+-1.0
 SELECT NAME_CONST('test', 'test');
 test
 test
diff --git a/mysql-test/t/func_misc.test b/mysql-test/t/func_misc.test
index c93e411e691..2c34f77b1ff 100644
--- a/mysql-test/t/func_misc.test
+++ b/mysql-test/t/func_misc.test
@@ -199,7 +199,9 @@ SELECT NAME_CONST('test', UPPER('test'));
 
 SELECT NAME_CONST('test', NULL);
 SELECT NAME_CONST('test', 1);
+SELECT NAME_CONST('test', -1);
 SELECT NAME_CONST('test', 1.0);
+SELECT NAME_CONST('test', -1.0);
 SELECT NAME_CONST('test', 'test');
 
 --echo End of 5.0 tests
diff --git a/sql/item_func.h b/sql/item_func.h
index 87c9e016df2..43221a18a5b 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -435,6 +435,7 @@ public:
   longlong int_op();
   my_decimal *decimal_op(my_decimal *);
   const char *func_name() const { return "-"; }
+  virtual bool basic_const_item() const { return args[0]->basic_const_item(); }
   void fix_length_and_dec();
   void fix_num_length_and_dec();
   uint decimal_precision() const { return args[0]->decimal_precision(); }