Commit 634a6beb 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


mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysys/default.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/heap/hp_hash.c:
  Auto merged
storage/heap/hp_update.c:
  Auto merged
storage/ndb/include/transporter/TransporterDefinitions.hpp:
  Auto merged
storage/ndb/src/common/mgmcommon/IPCConfig.cpp:
  Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
parents a9ba149a fc465d14

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -1116,3 +1116,4 @@ vio/test-ssl 
vio/test-sslclient

vio/test-sslserver

vio/viotest-ssl

ndb/src/dummy.cpp

extra/yassl/taocrypt/src/misc.cpp

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ unsigned long Crop(unsigned long value, unsigned int size) 




#if !(defined(_MSC_VER) && (_MSC_VER < 1300)) && \

    !(defined(__HP_aCC) && (__HP_aCC <= 35700))

    !(defined(__HP_aCC) && (__HP_aCC <= 36300))

using std::new_handler;

using std::set_new_handler;

#endif

mysql-test/include/ps_query.inc

+1 −1
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ set @arg00=1; 
prepare stmt1 from ' select a,b from t1 order by a

limit 1 ';

execute stmt1 ;

prepare stmt1 from ' select a,b from t1 limit ? ';

prepare stmt1 from ' select a,b from t1 order by a limit ? ';

execute stmt1 using @arg00;



##### parameter used in many places

mysql-test/r/alias.result

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ INSERT INTO t1 VALUES (3359362,406,3359362,'Mustermann Musterfrau',7001,'2000-05 
SELECT ELT(FIELD(kundentyp,'PP','PPA','PG','PGA','FK','FKA','FP','FPA','K','KA','V','VA',''), 'Privat (Private Nutzung)','Privat (Private Nutzung) Sitz im Ausland','Privat (geschaeftliche Nutzung)','Privat (geschaeftliche Nutzung) Sitz im Ausland','Firma (Kapitalgesellschaft)','Firma (Kapitalgesellschaft) Sitz im Ausland','Firma (Personengesellschaft)','Firma (Personengesellschaft) Sitz im Ausland','oeff. rechtl. Koerperschaft','oeff. rechtl. Koerperschaft Sitz im Ausland','Eingetragener Verein','Eingetragener Verein Sitz im Ausland','Typ unbekannt') AS Kundentyp ,kategorie FROM t1 WHERE hdl_nr < 2000000 AND kategorie IN ('Prepaid','Mobilfunk') AND st_klasse = 'Workflow' GROUP BY kundentyp ORDER BY kategorie;

Kundentyp	kategorie

Privat (Private Nutzung)	Mobilfunk

Warnings:

Warning	1052	Column 'kundentyp' in group statement is ambiguous

drop table t1;

CREATE TABLE t1 (

AUFNR varchar(12) NOT NULL default '',

mysql-test/r/cast.result

+11 −0
Original line number Diff line number Diff line
@@ -344,3 +344,14 @@ select cast(s1 as decimal(7,2)) from t1; 
cast(s1 as decimal(7,2))

111111.00

drop table t1;

CREATE TABLE t1 (v varchar(10), tt tinytext, t text,

mt mediumtext, lt longtext);

INSERT INTO t1 VALUES ('1.01', '2.02', '3.03', '4.04', '5.05');

SELECT CAST(v AS DECIMAL), CAST(tt AS DECIMAL), CAST(t AS DECIMAL),

CAST(mt AS DECIMAL), CAST(lt AS DECIMAL) from t1;

CAST(v AS DECIMAL)	CAST(tt AS DECIMAL)	CAST(t AS DECIMAL)	CAST(mt AS DECIMAL)	CAST(lt AS DECIMAL)

1.01	2.02	3.03	4.04	5.05

DROP TABLE t1;

select cast(NULL as decimal(6)) as t1;

t1

NULL