diff options
| author | unknown <serg@serg.mylan> | 2004-01-22 14:46:54 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-01-22 14:46:54 +0100 |
| commit | 2880b07f758a08fc82e07135dde816226926d0c2 (patch) | |
| tree | 074d84010f261bde1e1ab9e3300cb6f136d5f63a | |
| parent | 63f3d3d2327422ca96d030f87982fbedfcf0ad2b (diff) | |
| parent | 4d2a1ed59eb1acc446c7ea1a448783cb3b9c4535 (diff) | |
| download | mariadb-git-2880b07f758a08fc82e07135dde816226926d0c2.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
sql/item_strfunc.cc:
Auto merged
| -rw-r--r-- | mysys/my_new.cc | 4 | ||||
| -rw-r--r-- | mysys/raid.cc | 4 | ||||
| -rw-r--r-- | sql/item_strfunc.cc | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/mysys/my_new.cc b/mysys/my_new.cc index 5f2da90bbd1..ec27502d8aa 100644 --- a/mysys/my_new.cc +++ b/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) { diff --git a/mysys/raid.cc b/mysys/raid.cc index 0b688464fb3..7eb19ffb16a 100644 --- a/mysys/raid.cc +++ b/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 diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index badc134ae1d..5420a8f69e4 100644 --- a/sql/item_strfunc.cc +++ b/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); |