diff options
| -rw-r--r-- | BUILD/SETUP.sh | 4 | ||||
| -rw-r--r-- | extra/resolveip.c | 5 | ||||
| -rw-r--r-- | include/my_net.h | 6 | ||||
| -rw-r--r-- | mysql-test/t/type_decimal.test | 2 | ||||
| -rw-r--r-- | mysys/Makefile.am | 3 | ||||
| -rw-r--r-- | mysys/raid.cc | 10 | ||||
| -rw-r--r-- | mysys/raid2.c | 31 |
7 files changed, 42 insertions, 19 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index 9204d4216d1..52fe960e3a5 100644 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -34,10 +34,10 @@ AM_MAKEFLAGS="-j 4" # The following warning flag will give too many warnings: # -Wshadow -Wunused -Winline (The later isn't usable in C++ as # __attribute()__ doesn't work with gnu C++) -global_warnings="-Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-function-dec -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings" +global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings" #debug_extra_warnings="-Wuninitialized" c_warnings="$global_warnings -Wunused" -cxx_warnings="$global_warnings -Woverloaded-virtual -Wextern-inline -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor" +cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor" alpha_cflags="-mcpu=ev6 -Wa,-mev6" # Not used yet pentium_cflags="-mcpu=pentiumpro" diff --git a/extra/resolveip.c b/extra/resolveip.c index 2d21d5c672c..9bab5846c03 100644 --- a/extra/resolveip.c +++ b/extra/resolveip.c @@ -32,11 +32,6 @@ #include <netdb.h> #include <getopt.h> -#ifdef SCO -#undef h_errno -#define h_errno errno -#endif - #if !defined(_AIX) && !defined(HAVE_UNIXWARE7_THREADS) && !defined(HAVE_UNIXWARE7_POSIX) && !defined(h_errno) extern int h_errno; #endif diff --git a/include/my_net.h b/include/my_net.h index e06a1142418..6a6e2aecc27 100644 --- a/include/my_net.h +++ b/include/my_net.h @@ -72,6 +72,12 @@ struct hostent *my_gethostbyname_r(const char *name, #define GETHOSTBYNAME_BUFF_SIZE 2048 #endif +/* On SCO you get a link error when refering to h_errno */ +#ifdef SCO +#undef h_errno +#define h_errno errno +#endif + #ifdef __cplusplus } #endif diff --git a/mysql-test/t/type_decimal.test b/mysql-test/t/type_decimal.test index 70b30d455da..7d4dcf3403e 100644 --- a/mysql-test/t/type_decimal.test +++ b/mysql-test/t/type_decimal.test @@ -183,7 +183,7 @@ drop table t1; create table t1 (a decimal(10,2)); -insert into t1 values (0.0),(-0.0),(+0.0),(01.0),(+01.0),(-01.0); +insert into t1 values (0.0),("-0.0"),(+0.0),(01.0),(+01.0),(-01.0); insert into t1 values (-.1),(+.1),(.1); insert into t1 values (00000000000001),(+0000000000001),(-0000000000001); insert into t1 values (+111111111.11),(111111111.11),(-11111111.11); diff --git a/mysys/Makefile.am b/mysys/Makefile.am index ce24d6f6f5b..824c5722aa6 100644 --- a/mysys/Makefile.am +++ b/mysys/Makefile.am @@ -45,7 +45,8 @@ libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c\ my_chsize.c my_lread.c my_lwrite.c my_clock.c \ my_quick.c my_lockmem.c my_static.c \ getopt.c getopt1.c getvar.c my_mkdir.c \ - default.c my_compress.c checksum.c raid.cc my_net.c \ + default.c my_compress.c checksum.c raid.cc raid2.c \ + my_net.c \ my_vsnprintf.c charset.c my_bitmap.c my_gethostbyname.c EXTRA_DIST = thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \ thr_mutex.c thr_rwlock.c diff --git a/mysys/raid.cc b/mysys/raid.cc index d1fdea246ca..47326f29f60 100644 --- a/mysys/raid.cc +++ b/mysys/raid.cc @@ -80,16 +80,6 @@ #include <m_string.h> #include <assert.h> -const char *raid_type_string[]={"none","striped"}; - - -extern "C" { - const char *my_raid_type(int raid_type) - { - return raid_type_string[raid_type]; - } -} - #if defined(USE_RAID) && !defined(MYSQL_CLIENT) #define RAID_SEEK_DONE ~(off_t) 0 diff --git a/mysys/raid2.c b/mysys/raid2.c new file mode 100644 index 00000000000..94b085b0074 --- /dev/null +++ b/mysys/raid2.c @@ -0,0 +1,31 @@ +/* Copyright (C) 2002 MySQL AB + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, + MA 02111-1307, USA */ + +/* + RAID support for MySQL. For full comments, check raid.cc + This is in a separate file to not cause problems on OS that can't + put C++ files in archives. +*/ + +#include "mysys_priv.h" + +const char *raid_type_string[]={"none","striped"}; + +const char *my_raid_type(int raid_type) +{ + return raid_type_string[raid_type]; +} |