1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00

Merge polly.local:/home/kaa/src/maint/mysql-5.0-maint

into  polly.local:/home/kaa/src/maint/mysql-5.1-maint


include/m_string.h:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
strings/strtod.c:
  Auto merged
This commit is contained in:
unknown
2007-05-28 15:36:19 +04:00
3 changed files with 5 additions and 5 deletions

View File

@@ -93,8 +93,8 @@ extern char NEAR _dig_vec_upper[];
extern char NEAR _dig_vec_lower[];
/* Defined in strtod.c */
extern const double log_10[310];
extern const double log_01[310];
extern const double log_10[309];
extern const double log_01[309];
#ifdef BAD_STRING_COMPILER
#define strmov(A,B) (memccpy(A,B,0,INT_MAX)-1)