mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 10:14:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

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


sql/item_strfunc.cc:
  Auto merged
This commit is contained in:
unknown 2004-01-22 14:46:54 +01:00
commit 2880b07f75
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mysys/my_new.cc
View file

@ -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)
{

4
mysys/raid.cc
View file

@ -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

4
sql/item_strfunc.cc
View file

@ -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);