into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
mysql-test/r/ndb_autodiscover.result:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
added testcase for Bug#8035
added option to wait for not-started
Bug#8035
mysql-test/mysql-test-run.sh:
added variable NDB_MGM to be able to run the management client in tests
mysql-test/r/ndb_autodiscover.result:
added testcase for Bug#8035
mysql-test/t/ndb_autodiscover.test:
added testcase for Bug#8035
ndb/tools/waiter.cpp:
added option to wait for not-started
sql/lock.cc:
Bug#8035
Bug#7834 Illegal mix of collations in IN operator
IN was the first function supporting
character set convertion.
agg_arg_charsets() was written afterwards,
which is more flexible.
Now IN just reuses this function.
sql/item_cmpfunc.cc:
Bug#7834 Illegal mix of collations in IN operator
IN was the first function supporting
character set convertion.
agg_arg_charsets() was written afterwards,
which is more flexible.
Now IN just reuses this function.
Adding Shift-JIS error messages
for Japanese Windows distributions.
Thanks to Serg for help with a perl program
to merge 4.1 messages into 5.0 format :)
sql/share/errmsg.txt:
Adding Shift-JIS error messages
for Japanese Windows distributions.
Thanks Serg for help :)
environment (using "build" on SUSE Linux)
Build-tools/Do-rpm:
- added functionality to perform RPM builds inside of a chrooted build
environment (using "build" on SUSE Linux) - see "--help" for more details
Auto-merge fix:
removing this file: error messages are done
in a different way in 5.0.
.del-errmsg.txt~31abf77f9e7b9211:
Delete: sql/share/japanese-sjis/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~31abf77f9e7b9211:
Delete: sql/share/japanese-sjis/errmsg.txt
configure.in:
Auto-merge fix:
removing this file: error messages are done
in a different way in 5.0.
Add SJIS version of Japanese error messages.
Windows version should include this new file,
instead of the EUC-JP version.
configure.in:
Add SJIS version of Japanese error messages.
Windows version should include this new file,
instead of the EUC-JP version.
into mysql.com:/dbdata/psergey/mysql-5.0-bug7885
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/item_subselect.cc:
Auto merged
(Simpler fix than last commit -- no need to mess with base_cxxflags.)
BUILD/compile-amd64-max:
use $max_cflags
BUILD/compile-pentium-debug-max:
use $max_cflags
BUILD/compile-pentium-debug-max-no-embedded:
use $max_cflags
BUILD/compile-pentium-max:
use $max_cflags
BUILD/compile-pentium-valgrind-max:
use $max_cflags
BUILD/compile-ppc-debug-max:
use $max_cflags
BUILD/compile-ppc-max:
use $max_cflags
BUILD/compile-amd64-debug-max:
use $max_cflags, remove unnecessary base_cxxflags stuff
into build.mysql.com:/users/tulin/mysql-5.0-ndb
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
