Commit 243e9f32 authored by unknown's avatar unknown
Browse files

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

into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0


sql/sql_prepare.cc:
  Auto merged
parents b340b7b7 68cd99bd

.bzrignore

+5 −4
Original line number Diff line number Diff line
@@ -357,6 +357,7 @@ innobase/conftest.s1 
innobase/conftest.subs

innobase/ib_config.h

innobase/ib_config.h.in

innobase/mkinstalldirs

innobase/stamp-h1

insert_test

install
@@ -537,6 +538,7 @@ mit-pthreads/machdep.c 
mit-pthreads/pg++

mit-pthreads/pgcc

mit-pthreads/syscall.S

mkinstalldirs

myisam/FT1.MYD

myisam/FT1.MYI

myisam/ft_dump
@@ -639,6 +641,7 @@ mysql-test/r/slave-stopped.eval 
mysql-test/share/mysql

mysql-test/std_data/*.pem

mysql-test/t/index_merge.load

mysql-test/var

mysql-test/var/*

mysql.kdevprj

mysql.proj
@@ -793,6 +796,7 @@ ndb/src/common/portlib/libportlib.dsp 
ndb/src/common/transporter/libtransporter.dsp

ndb/src/common/util/libgeneral.dsp

ndb/src/cw/cpcd/ndb_cpcd

ndb/src/dummy.cpp

ndb/src/kernel/blocks/backup/libbackup.dsp

ndb/src/kernel/blocks/backup/restore/ndb_restore

ndb/src/kernel/blocks/cmvmi/libcmvmi.dsp
@@ -879,6 +883,7 @@ ndb/test/tools/hugoScanUpdate 
ndb/test/tools/ndb_cpcc

ndb/test/tools/restart

ndb/test/tools/verify_index

ndb/tools/ndb_config

ndb/tools/ndb_delete_all

ndb/tools/ndb_delete_all.dsp

ndb/tools/ndb_desc
@@ -1116,7 +1121,3 @@ vio/test-ssl 
vio/test-sslclient

vio/test-sslserver

vio/viotest-ssl
 
ndb/src/dummy.cpp

innobase/mkinstalldirs

mkinstalldirs

mysql-test/var

include/thr_lock.h

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ enum enum_thr_lock_result thr_multi_lock(THR_LOCK_DATA **data, 
                                         uint count, THR_LOCK_OWNER *owner);

void thr_multi_unlock(THR_LOCK_DATA **data,uint count);

void thr_abort_locks(THR_LOCK *lock);

bool thr_abort_locks_for_thread(THR_LOCK *lock, pthread_t thread);

my_bool thr_abort_locks_for_thread(THR_LOCK *lock, pthread_t thread);

void thr_print_locks(void);		/* For debugging */

my_bool thr_upgrade_write_delay_lock(THR_LOCK_DATA *data);

my_bool thr_reschedule_write_lock(THR_LOCK_DATA *data);

innobase/row/row0sel.c

+12 −4
Original line number Diff line number Diff line
@@ -2524,13 +2524,21 @@ row_sel_store_mysql_rec( 
					(byte) (templ->mysql_null_bit_mask);

			switch (templ->type) {

			case DATA_VARCHAR:

			case DATA_CHAR:

			case DATA_BINARY:

			case DATA_VARMYSQL:

				if (templ->mysql_type

				    == DATA_MYSQL_TRUE_VARCHAR) {

					/* This is a >= 5.0.3 type

					true VARCHAR.  Zero the field. */

					pad_char = 0x00;

					break;

				}

				/* Fall through */

			case DATA_CHAR:

			case DATA_FIXBINARY:

			case DATA_MYSQL:

			case DATA_VARMYSQL:

			        /* MySQL pads all non-BLOB and non-TEXT

				string types with space ' ' */

			        /* MySQL pads all string types (except

				BLOB, TEXT and true VARCHAR) with space. */

				if (UNIV_UNLIKELY(templ->mbminlen == 2)) {

					/* Treat UCS2 as a special case. */

					data = mysql_rec

libmysql/libmysql.c

+1 −6
Original line number Diff line number Diff line
@@ -1599,14 +1599,9 @@ mysql_real_escape_string(MYSQL *mysql, char *to,const char *from, 
			 ulong length)

{

  if (mysql->server_status & SERVER_STATUS_NO_BACKSLASH_ESCAPES)

  {

    return escape_quotes_for_mysql(mysql->charset, to, 0, from, length);

  }

  else

  {

  return escape_string_for_mysql(mysql->charset, to, 0, from, length);

}

}





char * STDCALL

mysql-test/r/func_group.result

+26 −26
Original line number Diff line number Diff line
@@ -795,6 +795,32 @@ show columns from t2; 
Field	Type	Null	Key	Default	Extra

f2	datetime	NO		0000-00-00 00:00:00	

drop table t2, t1;

CREATE TABLE t1(

id int PRIMARY KEY,

a  int,

b  int,

INDEX i_b_id(a,b,id),

INDEX i_id(a,id)

);

INSERT INTO t1 VALUES 

(1,1,4), (2,2,1), (3,1,3), (4,2,1), (5,1,1);

SELECT MAX(id) FROM t1 WHERE id < 3 AND a=2 AND b=6;

MAX(id)

NULL

DROP TABLE t1;

CREATE TABLE t1(

id int PRIMARY KEY,

a  int,

b  int,

INDEX i_id(a,id),

INDEX i_b_id(a,b,id)

);

INSERT INTO t1 VALUES 

(1,1,4), (2,2,1), (3,1,3), (4,2,1), (5,1,1);

SELECT MAX(id) FROM t1 WHERE id < 3 AND a=2 AND b=6;

MAX(id)

NULL

DROP TABLE t1;

create table t2 (ff double);

insert into t2 values (2.2);

select cast(sum(distinct ff) as decimal(5,2)) from t2;
@@ -860,32 +886,6 @@ select col1,sum(col1),max(col1),min(col1) from t1 group by col1; 
col1	sum(col1)	max(col1)	min(col1)

5.000000000010	10.000000000020	5.000000000010	5.000000000010

DROP TABLE t1;

CREATE TABLE t1(

id int PRIMARY KEY,

a  int,

b  int,

INDEX i_b_id(a,b,id),

INDEX i_id(a,id)

);

INSERT INTO t1 VALUES 

(1,1,4), (2,2,1), (3,1,3), (4,2,1), (5,1,1);

SELECT MAX(id) FROM t1 WHERE id < 3 AND a=2 AND b=6;

MAX(id)

NULL

DROP TABLE t1;

CREATE TABLE t1(

id int PRIMARY KEY,

a  int,

b  int,

INDEX i_id(a,id),

INDEX i_b_id(a,b,id)

);

INSERT INTO t1 VALUES 

(1,1,4), (2,2,1), (3,1,3), (4,2,1), (5,1,1);

SELECT MAX(id) FROM t1 WHERE id < 3 AND a=2 AND b=6;

MAX(id)

NULL

DROP TABLE t1;

CREATE TABLE t1 (a VARCHAR(400));

INSERT INTO t1 (a) VALUES ("A"), ("a"), ("a "), ("a   "),

("B"), ("b"), ("b "), ("b   ");