into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
mysql-test/t/disabled.def:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
into mysql.com:/home/my/mysql-5.1
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/subselect.result:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_test.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_lex.cc:
manual merge
mysql-test-run now fails in case of warnings
mysql-test/lib/mtr_report.pl:
Fail if find warnings
mysql-test/mysql-test-run.sh:
Fail if find warnings
sql/sql_lex.cc:
Initalize st_lex properly
sql/sql_view.cc:
Fixed problem with unaligned memory (wrong free)
"NDB replication fails when no explicit--binlog-format given"
fix initialization, storage engine initialization must occur after
logging type is configured
sql/mysqld.cc:
Bug#19536
fix initialization, storage engine initialization must occur after
logging type is configured
Move plugin declarations after system functions have been checked
(Fixes problem with ndb_config failing becasue SHM is not declared)
Fixed some memory leaks
configure.in:
Move plugin declarations after system functions have been checked
(Fixes problem with ndb_config failing becasue SHM is not declared)
mysql-test/t/disabled.def:
Disabled ndb_load, as it is in 5.0
(Fails randomly in binlog_close_connection())
mysql-test/t/log_tables.test:
Update error numbers
mysql-test/t/ndb_config.test:
Moved test depending on SHM to ndb_config2.test
mysql-test/t/ndb_partition_error.test:
Update error numbers
sql/event_timed.cc:
Removed not needed line
sql/ha_berkeley.cc:
Fixed compiler warning
sql/ha_heap.cc:
Fixed compiler warning
sql/ha_innodb.cc:
Fixed compiler warning
sql/ha_myisam.cc:
Fixed compiler warning
sql/ha_myisammrg.cc:
Fixed compiler warning
sql/ha_ndbcluster.cc:
Fixed compiler warning
sql/ha_partition.cc:
Fixed compiler warning
sql/mysql_priv.h:
After merge fix
sql/mysqld.cc:
Fixed memory leak in skip_grant.test
sql/share/errmsg.txt:
Removed wrong error messages
sql/sql_lex.cc:
More debugging
Faster lex_end()
sql/sql_partition.cc:
Fixed memory leak
sql/sql_view.cc:
Fixed memory leak
mysql-test/r/ndb_config2.result:
New BitKeeper file ``mysql-test/r/ndb_config2.result''
mysql-test/t/ndb_config2.test:
New BitKeeper file ``mysql-test/t/ndb_config2.test''
Fix bug where page is read, modified and then transaction abort
and then puge is flushed causing lsn on page to be 0
storage/ndb/src/kernel/blocks/pgman.cpp:
Fix bug where page is read, modified and then transaction abort
and then puge is flushed causing lsn on page to be 0
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Impl. support for using delayed page request, to simulate "full" page buffer cache
storage/ndb/src/kernel/blocks/pgman.cpp:
Impl. support for using delayed page request, to simulate "full" page buffer cache
storage/ndb/src/kernel/blocks/pgman.hpp:
Impl. support for using delayed page request, to simulate "full" page buffer cache
into mysql.com:/home/my/mysql-5.1
VC++Files/libmysqld/libmysqld.dsp:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/heap_btree.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/r/ndb_blob.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/mysql_client_test.test:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
storage/heap/hp_delete.c:
Auto merged
storage/myisam/mi_key.c:
Auto merged
storage/myisam/myisamlog.c:
Auto merged
storage/ndb/include/kernel/signaldata/TcKeyReq.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbBlob.hpp:
Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
Auto merged
storage/ndb/tools/delete_all.cpp:
Auto merged
VC++Files/libmysqld/libmysqld.vcproj:
Use original file (my_user.c was already added in 5.1)
mysql-test/mysql-test-run.pl:
Manual merge
sql/handler.h:
Manual merge
sql/share/errmsg.txt:
Align error messages with 5.0
sql/sql_table.cc:
Manual merge
storage/ndb/src/ndbapi/NdbBlob.cpp:
No changes
into mysql.com:/home/hf/work/mysql-5.0.mrg
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
sql/sql_table.cc:
Auto merged
Remove compiler warnings
Fix some broken tests
Workaround for syncronization bug in NDB (Bug #16445)
client/mysqltest.c:
Added more information to output from abort_not_supported_test()
Removed compiler warnings
include/my_sys.h:
Added function to print names of open files
include/mysys_err.h:
Print names of open files
mysql-test/include/have_ndb.inc:
Added comment
mysql-test/lib/mtr_report.pl:
Only print warning once
mysql-test/r/mysqldump.result:
After merge fix
mysql-test/r/ndb_basic.result:
Workaround for syncronization bug in NDB
mysql-test/r/ndb_config.result:
Remove not portable test
mysql-test/t/ndb_basic.test:
Workaround for syncronization bug in NDB
mysql-test/t/ndb_config.test:
Remove not portable test
mysys/errors.c:
Print names of open files
mysys/my_file.c:
Ensure that structs are cleared and copyied properly so that my_print_open_files() works.
mysys/my_init.c:
In case of EXTRA_DEBUG, print names of open files
mysys/my_open.c:
Added function to print names of open files
sql/sql_table.cc:
Fixed file-not-closed error
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
mysql-test/r/subselect.result:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_select.cc:
Auto merged
into mysql.com:/home/my/mysql-5.1
mysql-test/t/mysqldump.test:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/sql_table.cc:
After merge fix
sql/sql_show.cc:
Auto merged
