into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
BUILD/compile-dist:
Auto merged
client/mysqltest.c:
Auto merged
config/ac-macros/ssl.m4:
Auto merged
include/config-win.h:
Auto merged
include/my_base.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/func_group.result:
Auto merged
mysql-test/r/group_min_max.result:
Auto merged
mysql-test/r/partition.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/rpl_insert_id_pk.result:
Auto merged
mysql-test/r/rpl_ndb_multi_update3.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/join_outer.test:
Auto merged
mysql-test/t/partition.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/r/rpl_ndb_sp006.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysys/my_clock.c:
Auto merged
mysys/my_copy.c:
Auto merged
mysys/my_create.c:
Auto merged
mysys/my_dup.c:
Auto merged
mysys/my_lib.c:
Auto merged
mysys/my_open.c:
Auto merged
mysys/my_redel.c:
Auto merged
mysql-test/r/create.result:
Manual merge
mysql-test/r/innodb_mysql.result:
Manual merge
mysql-test/r/join_outer.result:
Manual merge
mysql-test/t/func_group.test:
Manual merge
mysql-test/t/group_min_max.test:
Manual merge
mysql-test/t/innodb_mysql.test:
Manual merge
Changed error to be more descriptive when you are refering to a not existing key
Fixed core dump in view test and changed to better error message
BUILD/compile-pentium64-debug-max:
Added --pipe option for faster compile
(This changset was missing in the tree I used to rebuild a new 5.1 tree)
BUILD/compile-pentium64-debug:
Added --pipe option for faster compile
(This changset was missing in the tree I used to rebuild a new 5.1 tree)
mysql-test/include/common-tests.inc:
Changed error to be more descriptive
mysql-test/r/compress.result:
Changed error to be more descriptive
mysql-test/r/explain.result:
Changed error to be more descriptive
mysql-test/r/key_cache.result:
Changed error to be more descriptive
mysql-test/r/preload.result:
Changed error to be more descriptive
mysql-test/r/select.result:
Changed error to be more descriptive
mysql-test/r/ssl.result:
Changed error to be more descriptive
mysql-test/r/ssl_compress.result:
Changed error to be more descriptive
mysql-test/r/view.result:
Changed error to be more descriptive
mysql-test/t/disabled.def:
Disable im_instance_conf and im_options until Bug#20294 (Instance manager test im_instance_conf fails randomly) is fixed
mysql-test/t/explain.test:
Changed error to be more descriptive
mysql-test/t/select.test:
Changed error to be more descriptive
mysql-test/t/view.test:
Changed error to be more descriptive
sql/share/errmsg.txt:
Fix that ER_KEY_DOES_NOT_EXISTS has same SQLSTATE as ER_KEY_COLUMN_DOES_NOT_EXISTS
sql/sql_base.cc:
Fixed core dump in view test
Changed to correct error message that also shows the name of the faulty table
BUILD/compile-pentium64:
New BitKeeper file ``BUILD/compile-pentium64''
- Add missing drop(s)
- Reset changed variables
NOTE! These kind of problems are easily found with --check-testcases options to mysql-test-run.pl
mysql-test/extra/rpl_tests/rpl_insert_id_pk.test:
Add missing drop table
mysql-test/extra/rpl_tests/rpl_loaddata.test:
Add missing drop table
mysql-test/extra/rpl_tests/rpl_log.test:
Tables where only dropped on slave, switch to master connection before dropping them
mysql-test/extra/rpl_tests/rpl_multi_update3.test:
Add missing drop table
mysql-test/extra/rpl_tests/rpl_row_sp006.test:
Add missing drop database
mysql-test/include/check-testcase.test:
Add option "--skip-lock-tables" when dumping tables, as noone else is using the tables anyway
mysql-test/r/ndb_cache_multi.result:
Reset query_cache_size after test on both master and "second" master mysqld
mysql-test/r/partition.result:
Add missing drop procedure
mysql-test/r/rpl_drop_db.result:
Add missing drop table
mysql-test/r/rpl_multi_update3.result:
Add missing drop table
mysql-test/r/rpl_ndb_multi_update3.result:
Add missing drop table
mysql-test/r/rpl_ndb_sp006.result:
Add missing drop database
mysql-test/r/rpl_stm_no_op.result:
Add missing drop table
mysql-test/r/rpl_variables.result:
Reset slave_net_timeout to it's default value after test
mysql-test/t/ndb_cache_multi.test:
Reset query_cahche_size after test
mysql-test/t/partition.test:
Add missing drop procedure
mysql-test/t/rpl_drop_db.test:
Add missing drop table
mysql-test/t/rpl_stm_no_op.test:
Add missing drop table
mysql-test/t/rpl_variables.test:
Reset slave_net_timeout to it's default value after test
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 mysql.com:/home/jimw/my/mysql-5.1-clean
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-mysql_upgrade.dsp:
Delete: VC++Files/client/mysql_upgrade.dsp
BitKeeper/deleted/.del-mysql_upgrade_ia64.dsp:
Delete: VC++Files/client/mysql_upgrade_ia64.dsp
BitKeeper/deleted/.del-mysql_upgrade.c:
Delete: client/mysql_upgrade.c
VC++Files/mysql.dsw:
Auto merged
VC++Files/mysql.sln:
Auto merged
VC++Files/mysql_ia64.dsw:
Auto merged
client/mysql.cc:
Auto merged
config/ac-macros/zlib.m4:
Auto merged
configure.in:
Auto merged
extra/yassl/Makefile.am:
Auto merged
extra/yassl/taocrypt/Makefile.am:
Auto merged
include/my_global.h:
Auto merged
include/mysql.h:
Auto merged
libmysql/libmysql.def:
Auto merged
libmysqld/libmysqld.def:
Auto merged
mysql-test/r/grant2.result:
Auto merged
mysql-test/r/sp-security.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/r/udf.result:
Auto merged
mysql-test/t/grant2.test:
Auto merged
mysql-test/t/rpl_openssl.test:
Auto merged
mysql-test/t/rpl_rotate_logs.test:
Auto merged
mysql-test/t/sp-security.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
client/Makefile.am:
Resolve conflict
config/ac-macros/yassl.m4:
Resolve conflict
mysql-test/include/have_udf.inc:
Resolve conflict
mysql-test/lib/mtr_process.pl:
Resolve conflict
mysql-test/mysql-test-run.pl:
Resolve conflict
mysql-test/r/have_udf.require:
Resolve conflict
mysql-test/r/rpl_openssl.result:
Resolve conflict
mysql-test/t/disabled.def:
Resolve conflict
mysql-test/t/information_schema.test:
Resolve conflict
server-tools/instance-manager/instance_options.cc:
Resolve conflict
sql/mysql_priv.h:
Resolve conflict
sql/set_var.cc:
Resolve conflict
support-files/mysql.spec.sh:
Resolve conflict
Then check in have_udf if that variable is set. Finally use tahe variable when loading the shared library.
mysql-test/include/have_udf.inc:
Add check if udf_example.so(or similar) is available
mysql-test/lib/mtr_misc.pl:
Add funcion "mtr_file_exist" to search for files
mysql-test/mysql-test-run.pl:
Add checks to find the udf_example.so library
mysql-test/r/udf.result:
Update result
mysql-test/t/disabled.def:
Remove udf.test from disabled tests
mysql-test/t/udf.test:
Use variable UDF_EXAMPLE_LIB when looking for shared library to load
mysql-test/r/have_udf_example.require:
New BitKeeper file ``mysql-test/r/have_udf_example.require''
mysql-test/include/have_case_sensitive_file_system.inc:
New BitKeeper file ``mysql-test/include/have_case_sensitive_file_system.inc''
mysql-test/r/case_sensitive_file_system.require:
New BitKeeper file ``mysql-test/r/case_sensitive_file_system.require''
mysql-test/r/ndb_restore_compat.result:
New BitKeeper file ``mysql-test/r/ndb_restore_compat.result''
mysql-test/t/ndb_restore_compat.test:
New BitKeeper file ``mysql-test/t/ndb_restore_compat.test''
mysql-test/include/have_ndb.inc:
Remove the "exec test" and instead use the portable way to
check an environment variable using "eval select". The value of
$NDB_STATUS_OK will this be replace by mysqltest and the query
"select "YES" and ndb_status_ok" will be sent to the server and back.
mysql-test/mysql-test-run.pl:
Move initializetion of NDB_STATUS_OK and only do it once in init part of scripot. This will make it possible to set
it to NO if we detect that cluster can't be started.
- Add test to see if tests are running with root permissions
- Disables tests that uses chmod if that is the case
mysql-test/mysql-test-run.pl:
Add test to check if mysql-test-run is run with root permission.
Set environment variable MYSQL_TEST_ROOT to 'YES' or 'NO'.
mysql-test/t/information_schema.test:
Disable test if running as root
mysql-test/t/rpl_rotate_logs.test:
Disable test if running as root.
mysql-test/include/not_as_root.inc:
New BitKeeper file ``mysql-test/include/not_as_root.inc''
mysql-test/r/not_as_root.require:
New BitKeeper file ``mysql-test/r/not_as_root.require''
mysql-test/include/rpl_multi_engine3.inc:
add some sleep for __slow__ replication
mysql-test/t/disabled.def:
enable rpl_ndb_2myisam but keep rpl_ndb_2innodb disabled, new bug#19227
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
client/mysqltest.c:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
mysql-test/t/disabled.def:
manual merge
Restarting scan after call to delete_row().
mysql-test/include/rpl_multi_engine3.inc:
Injector thread was not given enough time.
mysql-test/t/disabled.def:
Disabling some tests.
sql/log_event.cc:
Moving scan init functions for Delete_rows_log_event.
Restarting scan for each found row.
mysql-test/t/rpl_ndb_dd_partitions.test:
New BitKeeper file ``mysql-test/t/rpl_ndb_dd_partitions.test''
mysql-test/include/master-slave-end.inc:
New BitKeeper file ``mysql-test/include/master-slave-end.inc''
mysql-test/include/ndb_setup_slave.inc:
New BitKeeper file ``mysql-test/include/ndb_setup_slave.inc''
- Add variable "have_dynamic_loading" and use it to check if the udf test should be run.
mysql-test/include/have_udf.inc:
Use variable "have_dynamic_loading" to to determine if there is support for udf's
mysql-test/r/have_udf.require:
Use variable "have_dynamic_loading" to to determine if there is support for udf's
mysql-test/t/disabled.def:
Remove udf from disabled
sql/mysql_priv.h:
Add have_dlopen variable
sql/mysqld.cc:
Add have_dlopen variable
sql/set_var.cc:
Add have_dlopen variable and name it "have_dynamic_loading" in "SHOW VARIABLES"
env variable name is fixed.
mysql-test/include/get_binlog_dump_thread_id.inc:
Fixing to right env $var name.
mysql-test/r/rpl_temporary.result:
results
Removing the problematic line from include test file.
mysql-test/include/get_binlog_dump_thread_id.inc:
replacing replace_result by disable_query_log
mysql-test/r/rpl_temporary.result:
results
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/rpl_temporary.result:
Auto merged
sql/sql_repl.cc:
Auto merged
mysql-test/t/rpl_temporary.test:
manual merge
Idea of the fix is for master to send FD event with `created' as 0
to reconnecting slave (upon slave_net_timeout, no master crash) to avoid destroying temp tables.
In a case of a connect by slave to the master after its crash temp tables have been already
cleaned up so that slave can not keep `orphan' temp tables.
mysql-test/r/rpl_temporary.result:
results
mysql-test/t/rpl_temporary.test:
wait-free addon to check temp tables are ok after slave reconnect.
sql/sql_repl.cc:
Storing zero for assigning to `created' of FD event on the reconnecting slave.
mysql-test/include/get_binlog_dump_thread_id.inc:
mysqltest's preudo-macro to calculate $id master dump thread id
Split cp operations, to avoid shell limit on number of args
mysql-test-run.pl:
Removed obsolete way of cleaning up after test failure
.del-drop-on-restart.inc~ef1715ddbebc3102:
Delete: mysql-test/include/drop-on-restart.inc
BitKeeper/deleted/.del-drop-on-restart.inc~ef1715ddbebc3102:
Delete: mysql-test/include/drop-on-restart.inc
mysql-test/mysql-test-run.pl:
Removed obsolete way of cleaning up after test failure
scripts/make_binary_distribution.sh:
Split cp operations, to avoid shell limit on number of args
This to save 5 seconds of test time.
More test to follow. :-)
mysql-test/r/rpl_flushlog_loop.result:
Updated result file
mysql-test/t/rpl_flushlog_loop.test:
Make test use wait_slave_status instead of sleep
- Update for 5.1
- Add "have_dlopen"
- Remove requirement to load udf's only in "opt_plugin_dir"
include/my_global.h:
Remove duplicate defines
mysql-test/include/have_udf.inc:
Use "have_dlopen" to check if we "have udf"
mysql-test/r/have_udf.require:
Use "have_dlopen" to check if we "have udf"
mysql-test/r/udf.result:
Update for new error message "function"->"symbol"
sql/item_func.cc:
Remove "evil" dbug printour that checks args[0] even if arg_count is 0
sql/mysql_priv.h:
Add "have_dlopen"
sql/mysqld.cc:
Add "have_dlopen"
Move HAVE_DLOPEN defined to only surround "udf_free" and "udf_init"
sql/set_var.cc:
Add "have_dlopen"
sql/sql_plugin.cc:
Surround 'dlclose' with HAVE_DLOPEN
sql/sql_udf.cc:
Remove the requirement to load udf's only from "opt_plugin_dir".
Fix spelling error
into neptunus.(none):/home/msvensson/mysql/bug11835/my51-bug11835
client/mysqltest.c:
Auto merged
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
into neptunus.(none):/home/msvensson/mysql/bug11835/my51-bug11835
client/mysqltest.c:
Auto merged
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/item_func.cc:
Auto merged
sql/Makefile.am:
Merge
sql/share/errmsg.txt:
Merge
sql/sql_udf.cc:
Merge
Fixed that LIKE worked case insensitively for latin2_czech_cs,
which was wrong for a case sensitive collation.
include/m_ctype.h:
Making my_wildcmp_bin public instead of static
strings/ctype-bin.c:
Making my_wildcmp_bin public instead of static
strings/ctype-czech.c:
Use my_wildcmp_bin instead of case insensitive my_wildcmp_8bit
mysql-test/include/have_latin2_ch.inc:
New BitKeeper file ``mysql-test/include/have_latin2_ch.inc''
mysql-test/r/ctype_latin2_ch.result:
New BitKeeper file ``mysql-test/r/ctype_latin2_ch.result''
mysql-test/r/have_latin2_ch.require:
New BitKeeper file ``mysql-test/r/have_latin2_ch.require''
mysql-test/t/ctype_latin2_ch.test:
New BitKeeper file ``mysql-test/t/ctype_latin2_ch.test''
into mysql.com:/users/lthalmann/bk/mysql-5.1-new-wl3023-mats
configure.in:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
mysql-test/r/rpl_ndb_blob.result:
Merge
mysql-test/t/disabled.def:
Merge
mysql-test/t/rpl_ndb_blob.test:
Merge
into mysql.com:/users/lthalmann/bk/mysql-5.1-new-wl3023-mats
mysql-test/t/sp.test:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
mysql-test/t/ndb_binlog_ddl_multi.test:
Fix of merge conflict
mysql-test/t/rpl_ndb_dd_advance.test:
New test case to test advance use of Cluster Disk Data and replication
mysql-test/include/ndb_restore_slave_eoption.inc:
New support file to help test advance use of Cluster Disk Data and replication
mysql-test/r/rpl_ndb_dd_advance.result:
New result file for test of advance use of Cluster Disk Data and replication
-added setting up of binlogging after receiving rename table
+cleanup
mysql-test/r/ndb_binlog_ddl_multi.result:
Bug #17838 binlog not setup on seconday master after rename
mysql-test/t/ndb_binlog_ddl_multi.test:
Bug #17838 binlog not setup on seconday master after rename
mysql-test/include/show_binlog_events.inc:
New BitKeeper file ``mysql-test/include/show_binlog_events.inc''
into mysql.com:/home/bk/w3023-mysql-5.1-new
configure.in:
Auto merged
mysql-test/r/rpl_row_create_table.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/table.h:
Auto merged
- Fix for ndb_gis to run with all types of logging
mysql-test/include/gis_generic.inc:
Make the test tables for gis have a primary key with auto increment
mysql-test/r/archive_gis.result:
Update test result
mysql-test/r/bdb_gis.result:
Update test result
mysql-test/r/innodb_gis.result:
Update test result
mysql-test/r/ndb_gis.result:
Update test result
mysql-test/t/ndb_gis.test:
Remove the requirement to only run thiswhen binlog format is row.
into mysql.com:/home/bk/w3023-mysql-5.1-new
configure.in:
Auto merged
mysql-test/extra/binlog_tests/insert_select-binlog.test:
Auto merged
mysql-test/r/binlog_row_insert_select.result:
Auto merged
mysql-test/r/rpl_row_basic_11bugs.result:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/handler.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
client/Makefile.am:
Merging with mysql-5.1-new
mysql-test/r/binlog_row_ctype_cp932.result:
Merging with mysql-5.1-new
mysql-test/r/rpl_ndb_blob.result:
Merging with mysql-5.1-new
mysql-test/r/rpl_ndb_dd_basic.result:
Merging with mysql-5.1-new
configure.in:
Auto merged
client/mysqlimport.c:
Auto merged
include/config-win.h:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/disabled.def:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/field.h:
Auto merged
sql/log_event.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/t/mysqldump.test:
SCCS merged
mysql-test/extra/rpl_tests/rpl_ndb_2multi_eng.test:
Updated from review comments
mysql-test/include/rpl_multi_engine3.inc:
Updated from review comments
into mysql.com:/home/bk/w3023-mysql-5.1-new
configure.in:
Auto merged
BitKeeper/deleted/.del-sp_notembedded.test:
Auto merged
mysql-test/extra/binlog_tests/binlog.test:
Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
Auto merged
mysql-test/r/binlog_stm_ctype_cp932.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/log.h:
Auto merged
sql/log_event.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/table.h:
Auto merged
mysql-test/t/rpl_ndb_2innodb.test:
New rpl ndb test case for replicating to other storage engines
mysql-test/t/rpl_ndb_2myisam.test:
New rpl ndb test case for replicating to other storage engines
mysql-test/t/rpl_ndb_2innodb-slave.opt:
New rpl ndb test supporting option files
mysql-test/t/rpl_ndb_2innodb-master.opt:
New rpl ndb test supporting option files
mysql-test/t/rpl_ndb_2myisam-master.opt:
New rpl ndb test supporting option files
mysql-test/t/rpl_ndb_2myisam-slave.opt:
New rpl ndb test supporting option files
mysql-test/t/rpl_ndb_innodb2ndb.test:
New rpl ndb test case for replicating from other storage engines to ndb
mysql-test/t/rpl_ndb_myisam2ndb.test:
New rpl ndb test case for replicating from other storage engines to ndb
mysql-test/t/rpl_ndb_innodb2ndb-master.opt:
New rpl ndb test supporting option files
mysql-test/t/rpl_ndb_innodb2ndb-slave.opt:
New rpl ndb test supporting option files
mysql-test/t/rpl_ndb_myisam2ndb-master.opt:
New rpl ndb test supporting option files
mysql-test/t/rpl_ndb_myisam2ndb-slave.opt:
New rpl ndb test supporting option files
mysql-test/extra/rpl_tests/rpl_ndb_2multi_eng.test:
New test code that drives the rpl of ndb -> innodb/myisam or innodb/myisam -> ndb
mysql-test/include/rpl_multi_engine3.inc:
New include that cover repeating code of the rpl of ndb -> innodb/myisam or innodb/myisam -> ndb
mysql-test/t/disabled.def:
Updated to include new test cases that have outstanding bug reports.
