into mysql.com:/home/jonas/src/mysql-5.0
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/triggers/post-commit:
Auto merged
sql/item.cc:
Auto merged
sql/log.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
mysql-test/r/ndb_index_ordered.result:
fix new decimal mysql vs. ndb
mysql-test/t/ndb_index_ordered.test:
fix new decimal mysql vs. ndb
ndb/include/kernel/signaldata/DictTabInfo.hpp:
fix new decimal mysql vs. ndb
ndb/include/ndb_constants.h:
fix new decimal mysql vs. ndb
ndb/include/ndbapi/NdbDictionary.hpp:
fix new decimal mysql vs. ndb
ndb/include/util/NdbSqlUtil.hpp:
fix new decimal mysql vs. ndb
ndb/src/common/util/NdbSqlUtil.cpp:
fix new decimal mysql vs. ndb
ndb/src/ndbapi/NdbDictionary.cpp:
fix new decimal mysql vs. ndb
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
fix new decimal mysql vs. ndb
ndb/src/ndbapi/NdbRecAttr.cpp:
fix new decimal mysql vs. ndb
ndb/test/include/NdbSchemaOp.hpp:
fix new decimal mysql vs. ndb
ndb/test/src/HugoCalculator.cpp:
fix new decimal mysql vs. ndb
ndb/tools/restore/consumer.cpp:
fix new decimal mysql vs. ndb
sql/ha_ndbcluster.cc:
fix new decimal mysql vs. ndb
mysql-test/r/ndb_index_ordered.result:
Auto merged
mysql-test/t/ndb_index_ordered.test:
Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
Auto merged
ndb/src/ndbapi/NdbRecAttr.cpp:
Auto merged
mysql-test/r/ndb_index_ordered.result:
fix old decimal type mysql vs ndb (re-commit 3)
mysql-test/t/ndb_index_ordered.test:
fix old decimal type mysql vs ndb (re-commit 3)
ndb/include/kernel/signaldata/DictTabInfo.hpp:
fix old decimal type mysql vs ndb (re-commit 3)
ndb/include/ndbapi/NdbDictionary.hpp:
fix old decimal type mysql vs ndb (re-commit 3)
ndb/include/util/NdbSqlUtil.hpp:
fix old decimal type mysql vs ndb (re-commit 3)
ndb/src/common/util/NdbSqlUtil.cpp:
fix old decimal type mysql vs ndb (re-commit 3)
ndb/src/ndbapi/NdbDictionary.cpp:
fix old decimal type mysql vs ndb (re-commit 3)
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
fix old decimal type mysql vs ndb (re-commit 3)
ndb/src/ndbapi/NdbRecAttr.cpp:
fix old decimal type mysql vs ndb (re-commit 3)
ndb/test/include/NdbSchemaOp.hpp:
fix old decimal type mysql vs ndb (re-commit 3)
ndb/tools/restore/consumer.cpp:
fix old decimal type mysql vs ndb (re-commit 3)
sql/ha_ndbcluster.cc:
fix old decimal type mysql vs ndb (re-commit 3)
into mysql.com:/home/jonas/src/mysql-5.0
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/triggers/post-commit:
Auto merged
sql/item.cc:
Auto merged
sql/log.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/triggers/post-commit:
Auto merged
ndb/test/run-test/Makefile.am:
Auto merged
sql/item.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/triggers/post-commit:
Auto merged
innobase/row/row0mysql.c:
Auto merged
myisam/ft_boolean_search.c:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/r/distinct.result:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
mysql-test/t/union.test:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_list.h:
Auto merged
sql/examples/ha_archive.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_string.h:
Auto merged
vio/viosocket.c:
Auto merged
scripts/mysql_create_system_tables.sh:
simple merge
sql/field.cc:
simple merge
sql/item.h:
simple merge
sql/sql_lex.h:
simple merge
sql/sql_yacc.yy:
Merge
(join_table_list was not comptely merged. Need to run test to know how things works...)
sql/table.cc:
Keep code from 5.0, except delted one not needed line
strings/ctype-ucs2.c:
Auto merge
added debug printouts
changed mem allocation handling in event api
split single and parallell event operation testing
ndb/src/kernel/blocks/suma/Suma.cpp:
added info to dump state 8004
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
added debug printouts
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
changed mem allocation handling in event api
ndb/test/ndbapi/test_event.cpp:
split single and parallell event operation testing
into mysql.com:/home/jonas/src/mysql-5.0
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/triggers/post-commit:
Auto merged
ndb/test/run-test/daily-devel-tests.txt:
Auto merged
sql/item.cc:
Auto merged
sql/log.cc:
Auto merged
ndb/test/run-test/daily-basic-tests.txt:
run mysql-test-run for max 1 hour
(normally 30 minutes)
ndb/test/run-test/daily-devel-tests.txt:
Add benchmark to devel suite
ndb/test/run-test/main.cpp:
Add bench mode. always produce report
ndb/test/run-test/run-test.hpp:
Add bench mode. always produce report
into mysql.com:/home/jonas/src/mysql-5.0-ndb
mysql-test/mysql-test-run.sh:
Auto merged
ndb/src/kernel/vm/FastScheduler.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/mysqld.cc:
Auto merged
