From b08b3a1555c296e4e396fd968a268b7b3dd58397 Mon Sep 17 00:00:00 2001
From: unknown <monty@mysql.com>
Date: Sun, 5 Jun 2005 17:01:20 +0300
Subject: Cleanup during review Simple optimization for 2 argument usage to
 function of variable arguments Fix stack overrun when using
 1+1+1+1+1+1+1+.... Update crash-me results for 5.0 Don't call post_open if
 pre_open() fails (optimization)

sql-bench/limits/mysql-4.1.cfg:
  Rename: sql-bench/limits/mysql.cfg -> sql-bench/limits/mysql-4.1.cfg
libmysql/libmysql.c:
  More portable define
mysql-test/mysql-test-run.sh:
  Write also InnoDB warnings to warnings.log
mysql-test/t/type_newdecimal.test:
  Don't get errors if innodb is not defined
mysys/my_alloc.c:
  Cleanup comments
mysys/thr_lock.c:
  Cleanup comments
sql/item.h:
  Remove not needed initializer
sql/item_func.cc:
  Simple optimization for 2 argument usage to function of variable arguments
sql/mysql_priv.h:
  We use more stackspace with the introduction of int_op() etc.
  This change ensures we don't run out of stack when doing 1+1+1+1...
  (Tested on x86, 32 bit)
sql/sp_head.cc:
  Don't call post_open if pre_open() fails
sql/sp_rcontext.cc:
  More comments
  Change so that post_open() doesn't have to be called if pre_open() fails
sql/sql_parse.cc:
  Fold long lines
sql/sql_select.cc:
  Simple reorganization to reduce number of if's
  Ensure that table_map is updated for where clause (fixed warning from valgrind)
---
 mysql-test/mysql-test-run.sh      | 2 +-
 mysql-test/t/type_newdecimal.test | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'mysql-test')

diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 45b1e948ac2..bdd92e7941b 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -887,7 +887,7 @@ report_stats () {
 
     found_error=0
     # Find errors
-    for i in "^Warning:" "^Error:" "^==.* at 0x"
+    for i in "^Warning:" "^Error:" "^==.* at 0x" "InnoDB: Warning"
     do
       if $GREP "$i" $MY_LOG_DIR/warnings.tmp >> $MY_LOG_DIR/warnings
       then
diff --git a/mysql-test/t/type_newdecimal.test b/mysql-test/t/type_newdecimal.test
index 9b09c415379..0f7d20ed977 100644
--- a/mysql-test/t/type_newdecimal.test
+++ b/mysql-test/t/type_newdecimal.test
@@ -911,7 +911,9 @@ DROP TABLE t1;
 # Bug #10465
 #
 
+--disable_warnings
 CREATE TABLE t1 (GRADE DECIMAL(4) NOT NULL, PRIMARY KEY (GRADE)) ENGINE=INNODB;
+--enable_warnings
 INSERT INTO t1 (GRADE) VALUES (151),(252),(343);
 SELECT GRADE  FROM t1 WHERE GRADE > 160 AND GRADE < 300;
 SELECT GRADE  FROM t1 WHERE GRADE= 151;
-- 
cgit v1.2.1