additional fix for bug@10493, for sjis
ctype-cp932.c:
additional fix for bug#10493, for cp932
strings/ctype-cp932.c:
additional fix for bug#10493, for cp932
strings/ctype-big5.c:
additional fix for bug@10493, for sjis
Enable creation of embedded lib when --with-darwin-mwcc
configure.in:
Enable creation of embedded lib when --with-darwin-mwcc
libmysqld/Makefile.am:
Enable creation of embedded lib when --with-darwin-mwcc
BitKeeper/etc/logging_ok:
auto-union
include/my_global.h:
Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/ndbapi/NdbIndexOperation.cpp:
Auto merged
ndb/src/ndbapi/ndberror.c:
Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
ndb/test/run-test/Makefile.am:
Auto merged
sql/item.h:
Auto merged
sql/item_func.h:
Auto merged
sql/item_sum.h:
Auto merged
sql/sql_udf.h:
Auto merged
ndb/src/ndbapi/ClusterMgr.cpp:
SCCS merged
another column gets rotten value.
mysql-test/r/type_newdecimal.result:
Added a test case for Bug#10232: update with subquery, precision math,
another column gets rotten value.
mysql-test/t/type_newdecimal.test:
Added a test case for Bug#10232: update with subquery, precision math,
another column gets rotten value.
into mysql.com:/home/jonas/src/mysql-5.0-ndb
BitKeeper/etc/logging_ok:
auto-union
mysql-test/mysql-test-run.sh:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/item.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
include/my_global.h:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/t/select.test:
Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/ndbapi/NdbIndexOperation.cpp:
Auto merged
ndb/src/ndbapi/ndberror.c:
Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
sql/item.h:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/sql_udf.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
configure.in:
Ignore 4.1 version change
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
merge 4.1
ndb/src/ndbapi/ClusterMgr.cpp:
merge
ndb/test/run-test/Makefile.am:
merge
sql/mysql_priv.h:
merge from 4.1
sql/table.cc:
Merge from 4.1
include/my_global.h:
Auto merged
ndb/src/cw/cpcd/Process.cpp:
Auto merged
ndb/src/kernel/error/ErrorReporter.cpp:
Auto merged
sql/item.h:
Auto merged
sql/item_func.h:
Auto merged
sql/item_sum.h:
Auto merged
sql/sql_udf.h:
Auto merged
heap/hp_hash.c:
Fix for bug #9404: information_schema: Weird error messages with SELECT SUM() ... GROUP BY queries
use length in symbols instead of length in bytes
to calculate record length and key length
include/my_global.h:
a fix (bug #10438: Raid stopped working because of change in atomic add detection).
In order to compile with atomic.h on itanium we redefine 'new' because it's used
as a local variable in this file and conflicts with a kernel header.
Detect conflicting options in SELECT
mysql-test/r/select.result:
Test for bug#8733
mysql-test/t/select.test:
Test for bug#8733
sql/mysql_priv.h:
New bit for ALL
sql/sql_yacc.yy:
We want to complain if DISTINCT or ALL is used in SELECT when a
conflicting option is already selected.
into mysql.com:/home/jonas/src/mysql-5.0
BitKeeper/etc/logging_ok:
auto-union
mysql-test/t/ndb_restore.test:
Auto merged
ndb/src/cw/cpcd/Process.cpp:
Auto merged
ndb/src/kernel/error/ErrorReporter.cpp:
Auto merged
ndb/test/src/NDBT_ResultRow.cpp:
Auto merged
whith some multi update scenarios
Make sure to init GCI on correct operation before firering operation
ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
Init gci, to make sure that fire_trig_ord gets correct GCI
