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 :)
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.
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
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999
mysql-test/r/strict.result:
Auto merged
mysql-test/t/strict.test:
Auto merged
sql/field.cc:
Auto merged
into mysql.com:/home/jonas/src/mysql-5.0-ndb
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/mysqld.cc:
Auto merged
into mysql.com:/home/jonas/src/mysql-5.0
configure.in:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
when using shm transporter, set sigmask on each thread using pthread_sigmask
configure.in:
Add more functions needed for SHM
ndb/src/common/portlib/NdbThread.c:
1) Create thread wrapper function
2) block SIGUSR1 #ifdef NDB_SHM_TRANSPORTER
ndb/src/common/transporter/TransporterRegistry.cpp:
(un)block SIGUSR1 #ifdef NDB_SHM_TRANSPORTER
sql/ha_ndbcluster.cc:
cast pointer to UintPtr before printout
mysql-test/r/type_float.result:
Auto merged
mysql-test/t/type_float.test:
Auto merged
sql/field_conv.cc:
Auto merged
sql/table.cc:
Merge warning of multi-byte charset being applied
to table of unknown charset.
mysql-test/r/union.result:
result for a test case for the wrong examined rows with UNION's
mysql-test/t/union.test:
test case for the wrong examined rows with UNION's
sql/sql_union.cc:
a patch for the wrong examined rows with UNION's
mysql-test/r/join_outer.result:
Corrected table names
mysql-test/t/join_outer.test:
Corrected table names
sql/item_cmpfunc.h:
Fix for valgrind failure (unitialized read Item_func_trig_cond->const_item_cache in get_mm_tree):
Since get_mm_tree can be called for an instance of Item_func_trig_cond, make Item_func_trig_cond::const_item() return false.
get_mm_tree will assume Item_func_trig_cond are unknown functions and will not build range access plans for them
into mysql.com:/home/dlenev/src/mysql-5.0-merges
mysql-test/r/alter_table.result:
Auto merged
mysql-test/t/alter_table.test:
Auto merged
sql/field.h:
Auto merged
