corrected multiple --log-bin options in mysql-test-run
mysql-test/mysql-test-run.sh:
corrected multiple --log-bin options in mysql-test-run
mysql-test/r/rpl_ndb_sync.result:
changed to use temporary heap table on a ndb test
mysql-test/t/rpl_ndb_sync.test:
changed to use temporary heap table on a ndb test
into mysql.com:/home/alexi/innodb/mysql-5.1-merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
BitKeeper/deleted/.del-ndb_load.result:
Delete: mysql-test/r/ndb_load.result
BitKeeper/deleted/.del-ndb_load.test:
Delete: mysql-test/t/ndb_load.test
extra/perror.c:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/r/ndb_blob.result:
Auto merged
mysql-test/r/sp-code.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/fulltext.test:
Auto merged
mysql-test/t/sp-destruct.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sp.h:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
Auto merged
storage/ndb/src/kernel/main.cpp:
Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
Auto merged
storage/ndb/src/kernel/vm/Configuration.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbBlob.cpp:
Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
Auto merged
storage/ndb/tools/delete_all.cpp:
Auto merged
mysql-test/t/disabled.def:
Manual merge.
post review fixes
Bug fix added missing setting of rw_set for table handler when update occurs via a view. The missing setting of the rw_set resulted in fields not being updated for ndb tables
mysql-test/t/rpl_row_sp005.test:
Updated by adding ORDER by to use test with NDB engine
mysql-test/r/rpl_row_sp005.result:
Updated by adding ORDER by to use test with NDB engine
mysql-test/t/rpl_row_sp009.test:
Updated by adding ORDER by to use test with NDB engine
mysql-test/r/rpl_row_sp009.result:
Updated by adding ORDER by to use test with NDB engine
mysql-test/t/rpl_row_view01.test:
Updated by adding ORDER BY and sleep to use test with NDB engine
mysql-test/r/rpl_row_view01.result:
Updated by adding ORDER BY and sleep to use test with NDB engine
mysql-test/r/rpl_relay_space_myisam.result:
updated
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
configure.in:
Auto merged
include/heap.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
sql/ha_heap.cc:
Auto merged
sql/ha_heap.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
storage/heap/hp_create.c:
Auto merged
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
Auto merged
sql/sql_update.cc:
Manual merge
tests/mysql_client_test.c:
SCCS merged
win/cmakefiles/base:
add flag for diabling insecure crt functions warning
win/cmakefiles/client:
add dependency to GenError to make sure the error files are made
win/cmakefiles/extra:
add custom target to run comp_err
win/cmakefiles/sql:
removed comp_err stuff.
mysql-test/r/ndb_view.result:
New BitKeeper file ``mysql-test/r/ndb_view.result''
mysql-test/t/ndb_view.test:
New BitKeeper file ``mysql-test/t/ndb_view.test''
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
mysql-test/extra/rpl_tests/rpl_log.test:
Auto merged
mysql-test/r/rpl_insert_id.result:
Auto merged
mysql-test/r/rpl_replicate_do.result:
Auto merged
mysql-test/r/rpl_row_log.result:
Auto merged
mysql-test/r/rpl_skip_error.result:
Auto merged
mysql-test/t/rpl_replicate_do.test:
Auto merged
mysql-test/t/rpl_skip_error.test:
Auto merged
BitKeeper/deleted/.del-rpl000004.result~a3147834a662043a:
Auto merged
BitKeeper/deleted/.del-rpl000004.test~61532b03f9ad2734:
Auto merged
mysql-test/t/rpl_load_from_master.test:
Auto merged
mysql-test/extra/rpl_tests/rpl_row_blob.test:
Changes that Larss requested
mysql-test/r/rpl_row_blob_innodb.result:
Changes that Larss requested
mysql-test/r/rpl_row_blob_myisam.result:
Changes that Larss requested
mysql-test/r/rpl_insert_id.result:
updated results
mysql-test/extra/rpl_tests/rpl_insert_id_pk.test:
Suggested PK test by Lars
mysql-test/t/rpl_insert_id_pk.test:
Suggested PK test by Lars
mysql-test/t/rpl_insert_id_pk-slave.opt:
Suggested PK test by Lars
mysql-test/r/rpl_insert_id_pk.result:
Suggested PK test by Lars
mysql-test/extra/rpl_tests/rpl_insert_id.test:
updated per lars
mysql-test/extra/rpl_tests/rpl_insert_id.test:
Updated wiht 1022 error, order by and PK for use with NDB engine
mysql-test/r/rpl_insert_id.result:
Updated wiht 1022 error, order by and PK for use with NDB engine
mysql-test/t/rpl_skip_error.test:
updated to wrk with ndb
mysql-test/r/rpl_skip_error.result:
updated to wrk with ndb
mysql-test/t/rpl_sporadic_master.test:
updated to wrk with ndb
mysql-test/r/rpl_sporadic_master.result:
updated to wrk with ndb
mysql-test/t/rpl_row_trig002.test:
updated to work with NDB engine
mysql-test/r/rpl_row_trig002.result:
updated to work with NDB engine
mysql-test/t/rpl_temporary.test:
updated to work with NDB engine
mysql-test/r/rpl_temporary.result:
updated to work with NDB engine
mysql-test/extra/rpl_tests/rpl_row_001.test:
updated to work with NDB as default engine
mysql-test/r/rpl_row_001.result:
updated to work with NDB as default engine
mysql-test/t/rpl_row_blob_innodb.test:
Fixed bug in test case
mysql-test/t/rpl_row_blob_innodb-slave.opt:
Added slave option file to ensure correct engine type on slave
mysql-test/r/rpl_row_blob_innodb.result:
Updated results
mysql-test/r/rpl_row_blob_myisam.result:
Updated results
mysql-test/r/rpl_ndb_log.result:
update results file
Apply a patch by Jonas for NDB diskdata.
mysql-test/r/sp-code.result:
Fix a test result after merge: 94 and 95 are SQLCOM codes of
SQLCOM_CALL. New commands were added in 5.1 so SQLCOM_CALL got
renumbered.
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
Apply second patch by Jonas to make NDB diskdata work on systems
without O_DIRECT support.
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
client/mysqltest.c:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/r/sp-error.result:
Auto merged
mysql-test/r/sp-security.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/type_float.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
mysql-test/t/sp-error.test:
Auto merged
mysql-test/t/sp-security.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/type_float.test:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/item_timefunc.cc:
Auto merged
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/t/federated.test:
Auto merged
mysql-test/t/trigger-grant.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
