Commit 53e59866 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/home/jimw/my/mysql-5.0-clean


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
parents 038631da ccc3052d

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
@@ -1006,6 +1006,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__ */
@@ -1176,6 +1177,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))
@@ -1192,6 +1194,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))

mysql-test/r/select.result

+19 −0
Original line number Diff line number Diff line
@@ -2579,6 +2579,25 @@ K2C4 K4N4 F2I4 
WART	0100	1

WART	0200	1

WART	0300	3

select found_rows();

found_rows()

3

select count(*) from t1;

count(*)

15

select found_rows();

found_rows()

1

select count(*) from t1 limit 2,3;

count(*)

select found_rows();

found_rows()

0

select SQL_CALC_FOUND_ROWS count(*) from t1 limit 2,3;

count(*)

select found_rows();

found_rows()

1

DROP TABLE t1;

CREATE TABLE t1 ( a BLOB, INDEX (a(20)) );

CREATE TABLE t2 ( a BLOB, INDEX (a(20)) );

mysql-test/t/disabled.def

+1 −0
Original line number Diff line number Diff line
@@ -11,3 +11,4 @@ 
##############################################################################



sp-goto:GOTO is currently is disabled - will be fixed in the future

ndb_condition_pushdown:Bug #12021

mysql-test/t/select.test

+8 −1
Original line number Diff line number Diff line
@@ -2152,10 +2152,17 @@ INSERT INTO t1 VALUES 
SELECT K2C4, K4N4, F2I4 FROM t1

  WHERE  K2C4 = 'WART' AND 

        (F2I4 = 2 AND K2C4 = 'WART' OR (F2I4 = 2 OR K4N4 = '0200'));



SELECT K2C4, K4N4, F2I4 FROM t1

  WHERE  K2C4 = 'WART' AND (K2C4 = 'WART' OR K4N4 = '0200');



select found_rows();

select count(*) from t1;

select found_rows();

select count(*) from t1 limit 2,3;

select found_rows();

select SQL_CALC_FOUND_ROWS count(*) from t1 limit 2,3;

select found_rows();



DROP TABLE t1;



#