Commit 7c62023b authored by unknown's avatar unknown
Browse files

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

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


sql/sql_select.cc:
  Auto merged
parents 4360dd16 fec4347f

BitKeeper/etc/logging_ok

+2 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ hf@deer.mysql.r18.ru 
hf@genie.(none)

holyfoot@mysql.com

igor@hundin.mysql.fi

igor@igor-inspiron.creware.com

igor@linux.local

igor@rurik.mysql.com

ingo@mysql.com
@@ -236,6 +237,7 @@ rburnett@bk-internal.mysql.com 
rburnett@build.mysql.com

reggie@bob.(none)

reggie@mdk10.(none)

reggie@monster.

root@home.(none)

root@mc04.(none)

root@x3.internalnet

extra/yassl/src/ssl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#include "handshake.hpp"

#include "yassl_int.hpp"

#include <stdio.h>



#include "runtime.hpp"



namespace yaSSL {

include/mysql.h

+2 −2
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ extern char *mysql_unix_port; 
#define IS_PRI_KEY(n)	((n) & PRI_KEY_FLAG)

#define IS_NOT_NULL(n)	((n) & NOT_NULL_FLAG)

#define IS_BLOB(n)	((n) & BLOB_FLAG)

#define IS_NUM(t)	((t) <= FIELD_TYPE_INT24 || (t) == FIELD_TYPE_YEAR)

#define IS_NUM(t)	((t) <= FIELD_TYPE_INT24 || (t) == FIELD_TYPE_YEAR || (t) == FIELD_TYPE_NEWDECIMAL)

#define IS_NUM_FIELD(f)	 ((f)->flags & NUM_FLAG)

#define INTERNAL_NUM_FIELD(f) (((f)->type <= FIELD_TYPE_INT24 && ((f)->type != FIELD_TYPE_TIMESTAMP || (f)->length == 14 || (f)->length == 8)) || (f)->type == FIELD_TYPE_YEAR)

mysql-test/r/case.result

+17 −0
Original line number Diff line number Diff line
@@ -160,3 +160,20 @@ t1 CREATE TABLE `t1` ( 
  `COALESCE('a' COLLATE latin1_bin,'b')` varchar(1) character set latin1 collate latin1_bin NOT NULL default ''

) ENGINE=MyISAM DEFAULT CHARSET=latin1

DROP TABLE t1;

CREATE TABLE t1 (EMPNUM INT);

INSERT INTO t1 VALUES (0), (2);

CREATE TABLE t2 (EMPNUM DECIMAL (4, 2));

INSERT INTO t2 VALUES (0.0), (9.0);

SELECT COALESCE(t2.EMPNUM,t1.EMPNUM) AS CEMPNUM,

t1.EMPNUM AS EMPMUM1, t2.EMPNUM AS EMPNUM2

FROM t1 LEFT JOIN t2 ON t1.EMPNUM=t2.EMPNUM;

CEMPNUM	EMPMUM1	EMPNUM2

0.00	0	0.00

2.00	2	NULL

SELECT IFNULL(t2.EMPNUM,t1.EMPNUM) AS CEMPNUM,

t1.EMPNUM AS EMPMUM1, t2.EMPNUM AS EMPNUM2

FROM t1 LEFT JOIN t2 ON t1.EMPNUM=t2.EMPNUM;

CEMPNUM	EMPMUM1	EMPNUM2

0.00	0	0.00

2.00	2	NULL

DROP TABLE t1,t2;

mysql-test/t/case.test

+19 −0
Original line number Diff line number Diff line
@@ -110,3 +110,22 @@ explain extended SELECT 
 COALESCE('a' COLLATE latin1_bin,'b');

SHOW CREATE TABLE t1;

DROP TABLE t1;



#

# Tests for bug #9939: conversion of the arguments for COALESCE and IFNULL

#



CREATE TABLE t1 (EMPNUM INT);

INSERT INTO t1 VALUES (0), (2);

CREATE TABLE t2 (EMPNUM DECIMAL (4, 2));

INSERT INTO t2 VALUES (0.0), (9.0);



SELECT COALESCE(t2.EMPNUM,t1.EMPNUM) AS CEMPNUM,

               t1.EMPNUM AS EMPMUM1, t2.EMPNUM AS EMPNUM2

  FROM t1 LEFT JOIN t2 ON t1.EMPNUM=t2.EMPNUM;



SELECT IFNULL(t2.EMPNUM,t1.EMPNUM) AS CEMPNUM,

               t1.EMPNUM AS EMPMUM1, t2.EMPNUM AS EMPNUM2

  FROM t1 LEFT JOIN t2 ON t1.EMPNUM=t2.EMPNUM;



DROP TABLE t1,t2;