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)
---
 mysys/my_alloc.c | 10 ++++++----
 mysys/thr_lock.c |  6 ++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'mysys')

diff --git a/mysys/my_alloc.c b/mysys/my_alloc.c
index e0d6288f76b..072fc09cd12 100644
--- a/mysys/my_alloc.c
+++ b/mysys/my_alloc.c
@@ -39,10 +39,11 @@
   DESCRIPTION
     This function prepares memory root for further use, sets initial size of
     chunk for memory allocation and pre-allocates first block if specified.
-    Altough error can happen during execution of this function if pre_alloc_size
-    is non-0 it won't be reported. Instead it will be reported as error in first
-    alloc_root() on this memory root.
+    Altough error can happen during execution of this function if
+    pre_alloc_size is non-0 it won't be reported. Instead it will be
+    reported as error in first alloc_root() on this memory root.
 */
+
 void init_alloc_root(MEM_ROOT *mem_root, uint block_size,
 		     uint pre_alloc_size __attribute__((unused)))
 {
@@ -71,6 +72,7 @@ void init_alloc_root(MEM_ROOT *mem_root, uint block_size,
   DBUG_VOID_RETURN;
 }
 
+
 /*
   SYNOPSIS
     reset_root_defaults()
@@ -86,7 +88,7 @@ void init_alloc_root(MEM_ROOT *mem_root, uint block_size,
     reuse one of existing blocks as prealloc block, or malloc new one of
     requested size. If no blocks can be reused, all unused blocks are freed
     before allocation.
- */
+*/
 
 void reset_root_defaults(MEM_ROOT *mem_root, uint block_size,
                          uint pre_alloc_size __attribute__((unused)))
diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c
index 7761d2a9fc8..85a2b34b851 100644
--- a/mysys/thr_lock.c
+++ b/mysys/thr_lock.c
@@ -684,8 +684,10 @@ void thr_unlock(THR_LOCK_DATA *data)
     lock->read.last=data->prev;
   else if (lock_type == TL_WRITE_DELAYED && data->cond)
   {
-    /* This only happens in extreme circumstances when a 
-       write delayed lock that is waiting for a lock */
+    /*
+      This only happens in extreme circumstances when a 
+      write delayed lock that is waiting for a lock
+    */
     lock->write_wait.last=data->prev;		/* Put it on wait queue */
   }
   else
-- 
cgit v1.2.1