include/config-netware.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
netware/BUILD/compile-AUTOTOOLS:
Auto merged
netware/Makefile.am:
Auto merged
netware/my_manage.h:
Auto merged
netware/mysql_test_run.c:
Auto merged
netware/BUILD/compile-linux-tools:
Auto merged
netware/BUILD/compile-netware-END:
Auto merged
netware/BUILD/mwenv:
Auto merged
netware/BUILD/nwbootstrap:
Auto merged
server-tools/instance-manager/Makefile.am:
Auto merged
sql/log.cc:
Auto merged
sql/log.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
storage/innobase/include/univ.i:
Auto merged
storage/innobase/os/os0thread.c:
Auto merged
storage/myisam/mi_locking.c:
Auto merged
storage/ndb/src/kernel/blocks/Makefile.am:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/Makefile.am:
Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
Auto merged
mysql-test/lib/mtr_cases.pl:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/spatial.cc:
Auto merged
Added { ... } around float8get() macro, avoids VC7 error
message "illegal else without matching if"
mtr_report.pl:
Parse error logs to create "warnings" file
mtr_cases.pl:
Added optoion --ignore-disabled-def
Windows build now let TZ pass, removed
work around
mysql-test-run.pl, mtr_process.pl:
Back port of changes from 5.0
mysql-test/lib/mtr_process.pl:
Back port of changes from 5.0
mysql-test/mysql-test-run.pl:
Back port of changes from 5.0
mysql-test/lib/mtr_cases.pl:
Added optoion --ignore-disabled-def
Windows build now let TZ pass, removed
work around
mysql-test/lib/mtr_report.pl:
Parse error logs to create "warnings" file
sql/spatial.cc:
Added { ... } around float8get() macro, avoids VC7 error
message "illegal else without matching if"
Added { ... } around float8get() macro, avoids VC7 error
message "illegal else without matching if"
mtr_report.pl:
Parse error logs to create "warnings" file
mtr_cases.pl:
Added optoion --ignore-disabled-def
Windows build now let TZ pass, removed
work around
mysql-test-run.pl, mtr_process.pl:
Back port of changes from 5.0
Give space for second and third slave port
mysql-test/mysql-test-run.pl:
Give space for second and third slave port
Define shell variables for all ports, and
list these at startup
mysql-test/mysql-test-run.sh:
Give space for second and third slave port
mysql-test/mysql-test-run.sh:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
Display instance manager port
mysql-test-run.sh:
Give port space for more than one slave
mysql-test/mysql-test-run.sh:
Give port space for more than one slave
mysql-test/mysql-test-run.pl:
Display instance manager port
mysql-test/mysql-test-run.sh:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
mysql-test/mysql-test-run.pl:
Rearranged the port numbers to fit into the range
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
client/mysqltest.c:
Auto merged
mysql-test/lib/mtr_cases.pl:
Merge
mysql-test/mysql-test-run.pl:
Merge
into neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my51-mysqltestrun_faster
mysql-test/lib/mtr_match.pl:
Auto merged
mysql-test/lib/mtr_stress.pl:
Auto merged
mysql-test/lib/mtr_cases.pl:
Merge 5.0 -> 5.1, added some comments and set skip if opt_skip_ndbcluster
mysql-test/mysql-test-run.pl:
Merge backpoort from 5.0 -> 5.1
not needed by the tescases. This will save test time for those testcases
that does not need cluster, but need a restart, as they dont have to wait
the extra time it would take for cluster to restart. It will also save
time for other testcases, as cluster does not
need to be contacted for each table to be dropped or created.
Backport from 5.1
mysql-test/lib/mtr_cases.pl:
Mark all test cases where name contains "ndb" as ndbcluster needed
mysql-test/lib/mtr_match.pl:
Add mtr_match_substring function
mysql-test/lib/mtr_stress.pl:
Extre param to mysqld_start
mysql-test/mysql-test-run.pl:
Only start ndbcluster for testcases that needs it.
not needed by the tescases. This will save test time for those testcases
that does not need cluster, but need a restart, as they dont have to wait
the extra time it would take for cluster to restart. It will also save
time for other testcases, as cluster does not
need to be contacted for each table to be dropped or created.
Backport from 5.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
mysql-test/extra/rpl_tests/rpl_stm_000001.test:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/rpl_loaddata.result:
Auto merged
mysql-test/r/rpl_loaddata_m.result:
Auto merged
mysql-test/r/rpl_loaddata_s.result:
Auto merged
mysql-test/r/rpl_misc_functions.result:
Auto merged
mysql-test/r/rpl_replicate_do.result:
Auto merged
mysql-test/r/rpl_stm_000001.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/rpl_loaddata.test:
Auto merged
mysql-test/t/rpl_loaddata_m.test:
Auto merged
mysql-test/t/rpl_loaddata_s.test:
Auto merged
mysql-test/t/rpl_misc_functions.test:
Auto merged
mysql-test/t/rpl_replicate_do.test:
Auto merged
mysql-test/t/trigger-compat.test:
Auto merged
mysql-test/t/type_varchar.test:
Auto merged
mysql-test/r/mysqltest.result:
Merge 5.0 -> 5.1
mysql-test/t/trigger-grant.test:
"Use local" when merging 5.0 -> 5.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/rpl_loaddata_m.result:
Auto merged
mysql-test/r/sp-security.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/r/view_grant.result:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/read_only.test:
Auto merged
mysql-test/t/sp-security.test:
Auto merged
mysql-test/t/trigger-compat.test:
Auto merged
mysql-test/t/view_grant.test:
Auto merged
mysql-test/r/trigger-compat.result:
Merge 5.0 -> 5.1
into neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my51-mysqltestrun_check_testcases
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/extra/binlog_tests/ctype_cp932.test:
Auto merged
mysql-test/extra/rpl_tests/rpl_flsh_tbls.test:
Auto merged
mysql-test/extra/rpl_tests/rpl_stm_000001.test:
Auto merged
mysql-test/r/binlog_stm_ctype_cp932.result:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/rpl000017.result:
Auto merged
mysql-test/r/rpl_loaddata.result:
Auto merged
mysql-test/r/rpl_loaddata_s.result:
Auto merged
mysql-test/r/rpl_replicate_do.result:
Auto merged
mysql-test/r/rpl_stm_000001.result:
Auto merged
mysql-test/r/rpl_stm_flsh_tbls.result:
Auto merged
mysql-test/r/sp-prelocking.result:
Auto merged
mysql-test/r/type_bit.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/r/view_grant.result:
Auto merged
mysql-test/t/create_select_tmp.test:
Auto merged
mysql-test/t/ps_1general.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/rpl000017.test:
Auto merged
mysql-test/t/rpl_replicate_do.test:
Auto merged
mysql-test/t/sp-prelocking.test:
Auto merged
mysql-test/t/trigger-compat.test:
Auto merged
mysql-test/t/variables.test:
Auto merged
mysql-test/t/view_grant.test:
Auto merged
mysql-test/r/rpl_loaddata_m.result:
Merge 5.0->5.1
mysql-test/t/rpl_failed_optimize.test:
Merge 5.0->5.1
mysql-test/t/rpl_insert_id.test:
Merge 5.0->5.1
mysql-test/t/rpl_loaddata.test:
Merge 5.0->5.1
mysql-test/t/rpl_loaddata_m.test:
Merge 5.0->5.1
mysql-test/t/rpl_loaddata_s.test:
Merge 5.0->5.1
mysql-test/t/rpl_multi_update3.test:
Merge 5.0->5.1
into mysql.com:/home/cps/mysql/trees/5.1/5.1-virgin-no-debug
mysql-test/mysql-test-run.pl:
Auto merged
sql/log.cc:
Auto merged
sql/log.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
enable extra logging in ndb handler during test runs
mysql-test/mysql-test-run.pl:
enable extra logging in ndb handler during test runs
sql/ha_ndbcluster_binlog.cc:
added more logging in ndb handler
