Commit c01a9fc2 authored by unknown's avatar unknown
Browse files

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

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1


sql/field.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
parents 815d705f bda8d58d

client/sql_string.cc

+2 −1
Original line number Diff line number Diff line
@@ -16,11 +16,12 @@ 


/* This file is originally from the mysql distribution. Coded by monty */



#include <my_global.h>



#ifdef USE_PRAGMA_IMPLEMENTATION

#pragma implementation				// gcc: Class implementation

#endif



#include <my_global.h>

#include <my_sys.h>

#include <m_string.h>

#include <m_ctype.h>

mysql-test/r/func_str.result

+6 −0
Original line number Diff line number Diff line
@@ -794,3 +794,9 @@ id aes_decrypt(str, 'bar') 
1	foo

2	NULL

DROP TABLE t1, t2;

select field(0,NULL,1,0), field("",NULL,"bar",""), field(0.0,NULL,1.0,0.0);

field(0,NULL,1,0)	field("",NULL,"bar","")	field(0.0,NULL,1.0,0.0)

3	3	3

select field(NULL,1,2,NULL), field(NULL,1,2,0);

field(NULL,1,2,NULL)	field(NULL,1,2,0)

0	0

mysql-test/r/lowercase_table2.result

+6 −6
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ T1 CREATE TABLE `T1` ( 
RENAME TABLE T1 TO T2;

SHOW TABLES LIKE "T2";

Tables_in_test (T2)

t2

T2

SELECT * FROM t2;

a

1
@@ -83,25 +83,25 @@ t3 
RENAME TABLE T3 TO T1;

SHOW TABLES LIKE "T1";

Tables_in_test (T1)

t1

T1

ALTER TABLE T1 add b int;

SHOW TABLES LIKE "T1";

Tables_in_test (T1)

t1

T1

ALTER TABLE T1 RENAME T2;

SHOW TABLES LIKE "T2";

Tables_in_test (T2)

t2

T2

LOCK TABLE T2 WRITE;

ALTER TABLE T2 drop b;

SHOW TABLES LIKE "T2";

Tables_in_test (T2)

t2

T2

UNLOCK TABLES;

RENAME TABLE T2 TO T1;

SHOW TABLES LIKE "T1";

Tables_in_test (T1)

t1

T1

SELECT * from T1;

a

1

mysql-test/r/rpl_failed_optimize.result

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ BEGIN; 
INSERT INTO t1 VALUES (1);

OPTIMIZE TABLE t1;

Table	Op	Msg_type	Msg_text

test.t1	optimize	error	Lock wait timeout exceeded; try restarting transaction

test.t1	optimize	status	Operation failed

Warnings:

Error	1205	Lock wait timeout exceeded; try restarting transaction

mysql-test/t/func_str.test

+6 −0
Original line number Diff line number Diff line
@@ -523,3 +523,9 @@ SELECT t1.id, aes_decrypt(str, 'bar') FROM t1, t2 WHERE t1.id = t2.id 
 ORDER BY t1.id;



DROP TABLE t1, t2;



#

# Bug #10944: Mishandling of NULL arguments in FIELD()

#

select field(0,NULL,1,0), field("",NULL,"bar",""), field(0.0,NULL,1.0,0.0);

select field(NULL,1,2,NULL), field(NULL,1,2,0);