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/bug28121/my50-bug28121

into  polly.local:/home/kaa/src/maint/bug28121/my51-bug28121


include/m_string.h:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
sql/init.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/field.cc:
  Manual merge.
sql/field.h:
  Manual merge.
This commit is contained in:
unknown
2007-05-28 12:52:05 +04:00
10 changed files with 200 additions and 134 deletions

View File

@@ -92,6 +92,10 @@ extern char *stpcpy(char *, const char *); /* For AIX with gcc 2.95.3 */
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];
#ifdef BAD_STRING_COMPILER
#define strmov(A,B) (memccpy(A,B,0,INT_MAX)-1)
#else