Commit 49e1bba3 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


extra/perror.c:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
BitKeeper/deleted/.del-var~62c955ccf2da1a21:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.hpp:
  Auto merged
storage/ndb/src/mgmsrv/main.cpp:
  Auto merged
parents ee7e3e71 f03607ea

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -1119,3 +1119,4 @@ vio/viotest-ssl 
ndb/src/dummy.cpp

innobase/mkinstalldirs

mkinstalldirs

mysql-test/var

extra/perror.c

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static struct my_option my_long_options[] = 
  {"info", 'I', "Synonym for --help.",  0, 0, 0, GET_NO_ARG,

   NO_ARG, 0, 0, 0, 0, 0, 0},

#ifdef HAVE_NDBCLUSTER_DB

  {"ndb", 0, "Ndbcluster storage engine specific error codes.",  (gptr*) &ndb_code,

  {"ndb", 257, "Ndbcluster storage engine specific error codes.",  (gptr*) &ndb_code,

   (gptr*) &ndb_code, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},

#endif

#ifdef HAVE_SYS_ERRLIST

include/my_global.h

+6 −3
Original line number Diff line number Diff line
@@ -1094,6 +1094,7 @@ do { doubleget_union _tmp; \ 
#define float8get(V,M) doubleget((V),(M))

#define float4store(V,M) memcpy((byte*) V,(byte*) (&M),sizeof(float))

#define floatstore(T,V)  memcpy((byte*)(T), (byte*)(&V),sizeof(float))

#define floatget(V,M)    memcpy((byte*) &V,(byte*) (M),sizeof(float))

#define float8store(V,M) doublestore((V),(M))

#endif /* __i386__ */
@@ -1264,6 +1265,7 @@ do { doubleget_union _tmp; \ 
                             *(((char*)T)+1)=(((A) >> 16));\

                             *(((char*)T)+0)=(((A) >> 24)); } while(0)



#define floatget(V,M)    memcpy_fixed((byte*) &V,(byte*) (M),sizeof(float))

#define floatstore(T,V)  memcpy_fixed((byte*) (T),(byte*)(&V),sizeof(float))

#define doubleget(V,M)	 memcpy_fixed((byte*) &V,(byte*) (M),sizeof(double))

#define doublestore(T,V) memcpy_fixed((byte*) (T),(byte*) &V,sizeof(double))
@@ -1280,6 +1282,7 @@ do { doubleget_union _tmp; \ 
#define longstore(T,V)	int4store(T,V)

#ifndef floatstore

#define floatstore(T,V)  memcpy_fixed((byte*) (T),(byte*) (&V),sizeof(float))

#define floatget(V,M)    memcpy_fixed((byte*) &V, (byte*) (M), sizeof(float))

#endif

#ifndef doubleget

#define doubleget(V,M)	 memcpy_fixed((byte*) &V,(byte*) (M),sizeof(double))

include/my_time.h

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ enum enum_mysql_timestamp_type 
str_to_datetime(const char *str, uint length, MYSQL_TIME *l_time,

                uint flags, int *was_cut);

longlong number_to_datetime(longlong nr, MYSQL_TIME *time_res,

                               my_bool fuzzy_date, int *was_cut);

                            uint flags, int *was_cut);

ulonglong TIME_to_ulonglong_datetime(const MYSQL_TIME *time);

ulonglong TIME_to_ulonglong_date(const MYSQL_TIME *time);

ulonglong TIME_to_ulonglong_time(const MYSQL_TIME *time);

libmysql/libmysql.c

+3 −2
Original line number Diff line number Diff line
@@ -3585,7 +3585,7 @@ static void fetch_string_with_conversion(MYSQL_BIND *param, char *value, 
  case MYSQL_TYPE_TIMESTAMP:

  {

    MYSQL_TIME *tm= (MYSQL_TIME *)buffer;

    (void) str_to_datetime(value, length, tm, 0, &err);

    (void) str_to_datetime(value, length, tm, TIME_FUZZY_DATE, &err);

    *param->error= test(err) && (param->buffer_type == MYSQL_TYPE_DATE &&

                                 tm->time_type != MYSQL_TIMESTAMP_DATE);

    break;
@@ -3703,7 +3703,8 @@ static void fetch_long_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field, 
  case MYSQL_TYPE_DATETIME:

  {

    int error;

    value= number_to_datetime(value, (MYSQL_TIME *) buffer, 1, &error);

    value= number_to_datetime(value, (MYSQL_TIME *) buffer, TIME_FUZZY_DATE,

                              &error);

    *param->error= test(error);

    break;

  }