Merge bk-internal:/home/bk/mysql-4.1/

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

mysys/my_new.cc

@@ -19,9 +19,9 @@
   with gcc 3.0.x to avoid including libstdc++
 */
 
-#include "mysys_priv.h"
+#ifdef USE_MYSYS_NEW
 
-#ifdef USE_MYSYS_NEW  
+#include "mysys_priv.h"
 
 void *operator new (size_t sz)
 {

mysys/raid.cc

@@ -70,6 +70,8 @@
    tonu@mysql.com & monty@mysql.com
 */
 
+#if defined(USE_RAID) && !defined(MYSQL_CLIENT)
+
 #ifdef __GNUC__
 #pragma implementation				// gcc: Class implementation
 #endif
@@ -79,8 +81,6 @@
 #include <m_string.h>
 #include <assert.h>
 
-#if defined(USE_RAID) && !defined(MYSQL_CLIENT)
-
 #define RAID_SEEK_DONE ~(off_t) 0
 #define RAID_SIZE_UNKNOWN ~(my_off_t) 0
 

sql/item_strfunc.cc

@@ -1648,11 +1648,11 @@ void Item_func_elt::fix_length_and_dec()
 {
   max_length=0;
   decimals=0;
-  
+
   if (agg_arg_collations(collation, args+1, arg_count-1))
     return;
 
-  for (uint i=1 ; i < arg_count ; i++)
+  for (uint i= 1 ; i < arg_count ; i++)
   {
     set_if_bigger(max_length,args[i]->max_length);
     set_if_bigger(decimals,args[i]->decimals);