Commit 05fc3f10 authored by unknown's avatar unknown
Browse files

Merge chilla.local:/home/mydev/mysql-5.0-mmerge 

into  chilla.local:/home/mydev/mysql-5.1-amain


configure.in:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
libmysqld/libmysqld.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/federated.result:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/gis-rtree.result:
  Auto merged
mysql-test/r/gis.result:
  Auto merged
mysql-test/r/key.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/func_sapdb.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/gis.test:
  Auto merged
mysql-test/t/key.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_geofunc.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_create.c:
  Auto merged
storage/myisam/mi_dynrec.c:
  Auto merged
storage/myisam/mi_key.c:
  Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb:
  Manual merge
include/my_sys.h:
  Manual merge
mysql-test/t/federated.test:
  Manual merge
sql/ha_federated.cc:
  Manual merge
tests/Makefile.am:
  Manual merge
parents 013ecd59 e6f010b6

mysql-test/r/federated.result

+16 −0
Original line number Diff line number Diff line
@@ -1717,6 +1717,22 @@ id c1 c2 
9	abc	ppc

drop table federated.t1, federated.t2;

drop table federated.t1, federated.t2;

create table t1 (id int not null auto_increment primary key, val int);

create table t1

(id int not null auto_increment primary key, val int) engine=federated

connection='mysql://root@127.0.0.1:SLAVE_PORT/test/t1';

insert into t1 values (1,0),(2,0);

update t1 set val = NULL where id = 1;

select * from t1;

id	val

1	NULL

2	0

select * from t1;

id	val

1	NULL

2	0

drop table t1;

drop table t1;

DROP TABLE IF EXISTS federated.t1;

DROP DATABASE IF EXISTS federated;

DROP TABLE IF EXISTS federated.t1;

mysql-test/t/federated.test

+19 −0
Original line number Diff line number Diff line
@@ -1366,6 +1366,25 @@ drop table federated.t1, federated.t2; 
connection master;

--enable_parsing



#

# Bug #16494: Updates that set a column to NULL fail sometimes

#

connection slave;

create table t1 (id int not null auto_increment primary key, val int);

connection master;

--replace_result $SLAVE_MYPORT SLAVE_PORT

eval create table t1

  (id int not null auto_increment primary key, val int) engine=federated

  connection='mysql://root@127.0.0.1:$SLAVE_MYPORT/test/t1';

insert into t1 values (1,0),(2,0);

update t1 set val = NULL where id = 1;

select * from t1;

connection slave;

select * from t1;

drop table t1;

connection master;

drop table t1;



# 

# Additional test for bug#18437 "Wrong values inserted with a before

# update trigger on NDB table". SQL-layer didn't properly inform

netware/BUILD/mwasmnlm

+4 −1
Original line number Diff line number Diff line
@@ -5,4 +5,7 @@ set -e 


args=" $*"



wine --debugmsg -all -- mwasmnlm $args
 
# NOTE: Option 'pipefail' is not standard sh

set -o pipefail

wine --debugmsg -all -- mwasmnlm $args | \

perl -pe 's/\r//g; s/^\e.*\e(\[J|>)?//; s/[[^:print:]]//g'

netware/BUILD/mwccnlm

+4 −1
Original line number Diff line number Diff line
@@ -7,4 +7,7 @@ set -e 
# convert it to "-I../include"

args=" "`echo $* | sed -e 's/-I.\/../-I../g'`



wine --debugmsg -all -- mwccnlm $args
 
# NOTE: Option 'pipefail' is not standard sh

set -o pipefail

wine --debugmsg -all -- mwccnlm $args | \

perl -pe 's/\r//g; s/^\e.*\e(\[J|>)?//; s/[[^:print:]]//g'

netware/BUILD/mwldnlm

+4 −1
Original line number Diff line number Diff line
@@ -5,4 +5,7 @@ set -e 


args=" $*"



wine --debugmsg -all -- mwldnlm $args
 
# NOTE: Option 'pipefail' is not standard sh

set -o pipefail

wine --debugmsg -all -- mwldnlm $args | \

perl -pe 's/\r//g; s/^\e.*\e(\[J|>)?//; s/[[^:print:]]//g'