into mysql.com:/home/jimw/my/mysql-5.1-clean
mysql-test/r/create.result:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/key.result:
Auto merged
mysql-test/r/merge.result:
Auto merged
mysql-test/r/partition.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/r/symlink.result:
Auto merged
mysql-test/r/system_mysql_db.result:
Auto merged
mysql-test/r/type_blob.result:
Auto merged
sql/sql_show.cc:
Auto merged
mysql-test/r/rpl_mixed_ddl_dml.result:
Auto merged
into mysql.com:/home/jimw/my/mysql-5.1-clean
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/bdb.result:
Resolve conflict
mysql-test/t/bdb.test:
Resolve conflict
sql/share/errmsg.txt:
Resolve conflict
into mysql.com:/home/jimw/my/mysql-5.1-clean
BitKeeper/etc/ignore:
auto-union
mysql-test/r/func_str.result:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
mysql-test/t/disabled.def:
Resolve conflict
- Disable --use-threads option in 5.1.7
client/mysqlimport.c:
Disable --use-threads option
mysql-test/r/mysqldump.result:
Update test result
mysql-test/t/mysqldump.test:
Disable test for --use-threads
- do not try to create ndb temp tables even if default storage is ndb
mysql-test/r/ndb_temporary.result:
New BitKeeper file ``mysql-test/r/ndb_temporary.result''
mysql-test/t/ndb_temporary.test:
New BitKeeper file ``mysql-test/t/ndb_temporary.test''
into neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my51-mysqltest_replace
include/config-win.h:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/mysql_client_test.test:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/rpl_000015.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/system_mysql_db_fix.test:
Auto merged
client/mysqltest.c:
Merge
mysql-test/mysql-test-run.pl:
Merge
Evaluate commands passed to "exec" and "system" to expand any $variables before executing command.
client/mysqltest.c:
do_exec, do_system
- call do_eval on the command to be executed in order to expand any $variables
- Remove old subst_env_var and my_popen, not needed anymore
Rewrite 'replace_strings' into 'replace_strings_append'
- copy whole strings instead of byte by byte copy
- insert result directly inito dynamic_string, no need to check if out
string needs to be realloced for every byte.
- Add comments and DBUG_PRINT's
New function 'fix_win_paths', detect filenames in win format that should be converted
do_eval
- Only set "escaped" if next char is \ or $
mysql-test/mysql-test-run.pl:
Always pass path for DBUG .trace file in unix format
Add search path client_debug to find debug compiled windows binaries
Remove unused MYSQL_TEST_WINDIR and MASTER_WINMYSOCK
mysql-test/r/mysqldump.result:
Update test result
mysql-test/t/client_xml.test:
Use " instead of '
mysql-test/t/mysql_client_test.test:
Remove the useless "exec echo" command
mysql-test/t/mysqltest.test:
Escape $variables passed to --exec, that should not be evaluated in exec.
mysql-test/t/rpl000015.test:
Remove unneccessary replace
mysql-test/t/system_mysql_db_fix.test:
Call the "shell script" $MYSQL_FIX_SYSTEM_TABLE using --system
mysql-test/t/disabled.def:
Updated
mysql-test/extra/rpl_tests/rpl_log.test:
Updated and moved drop of tables to end of test to help bin log be more deterministic
mysql-test/r/rpl_row_log.result:
Updated results
mysql-test/r/rpl_row_log_innodb.result:
Updated results
mysql-test/r/rpl_ndb_log.result:
Updated results
into big_geek.:C:/Work/mysql/mysql-5.1-bug15408
sql/ha_partition.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/handler.h:
merging changes into my partition code reorg
Also, moved some of the code out of handler.h and into partition specific files for better
separation.
Also, moved some of the C funcs into partition_info as formal C++ methods
mysql-test/r/partition_mgm_err.result:
result block for test of bug # 15408
mysql-test/t/partition_mgm_err.test:
test for duplicate subpartition names
sql/Makefile.am:
adding sql_partition.h, partition_info.cpp, partition_info.h, and partition_element.h to the makefile
sql/ha_partition.cc:
using the new members of partition_info
sql/ha_partition.h:
using the new members of partition_info
sql/handler.h:
moved this code into sql_partition.h
sql/mysql_priv.h:
including sql_partition.h also now
sql/opt_range.cc:
using the new members of partition_info
sql/sql_partition.cc:
moved some of the functions out and into the partition_info class
using the new members of partition_info
sql/sql_show.cc:
using the new members of partition_info
win/cmakefiles/sql:
added partition_info.cpp to the sql cmake file
sql/partition_element.h:
New BitKeeper file ``sql/partition_element.h''
sql/partition_info.h:
New BitKeeper file ``sql/partition_info.h''
sql/sql_partition.h:
New BitKeeper file ``sql/sql_partition.h''
When creating a new partition, a bogus memory allocation problem was
reported.
mysql-test/r/partition.result:
Add new results
mysql-test/t/partition.test:
Add new regression test
sql/sql_table.cc:
Fix inverted tests that caused mysql_copy_key_list() to not work at all,
remove a forward declaration for a function that does not exist, and fix
a debug message.
mysql-test/t/ndb_dd_backuprestore.test:
Updated with suggestions from Jonas
mysql-test/include/ndb_restore_master.inc:
corrected issues with using cygwin to create
mysql-test/include/ndb_backup.inc:
corrected issues with using cygwin to create
this problem affects only debug builds
mysql-test/r/events.result:
update results
mysql-test/t/events.test:
tests for bug#17543 Creating Event crash the server
sql/event_timed.cc:
the delimiter between DO and the body could be not only a space
but any other recognized white space, so use proper macro.
mysql-test/r/information_schema.result:
Fixing results after PROCESSLIST information schema is added.
mysql-test/r/information_schema_db.result:
Fixing results after PROCESSLIST information schema is added.
mysql-test/t/information_schema.test:
Test case to check PROCESSLIST information schema.
(Note that selecting other fields from PROCESSLIST
can make the test unstable).
sql/sql_show.cc:
Code for PROCESSLIST information schema
sql/table.h:
Added for PROCESSLIST informarion schema
mysql-test/include/ndb_backup.inc:
We are writting test cases that use the ndb backup. This new include contains all the code needed to start the backup and grab the backup ID for the test. By moving the code here it will be easy to reuse
mysql-test/include/ndb_restore_master.inc:
We are writting test cases that use the ndb backup and restore. This new include contains all the code needed to restore a master cluster from the backup done with ndb_backup.inc. By moving the code here it will be easy to reuse
mysql-test/t/ndb_dd_backuprestore.test:
Updated with suggestions from Jonas
| INTERVAL_VALUE | INTERVAL_FIELD |
| 20 | 20 MINUTE |
the second one should be without the value
mysql-test/r/events.result:
update test result to be as they should be
sql/event_timed.cc:
manually append the name of the interval because it's no more appended
by reconstruct_value
- Detect that connection to server has been broken in "net_clear". Since
net_clear is always called before we send command to server, we can be sure
that server has not received the command.
mysql-test/r/wait_timeout.result:
Update test result
mysql-test/t/wait_timeout-master.opt:
Decrease wait_timeout value to avoid unneccessary sleeps
mysql-test/t/wait_timeout.test:
Test that same error message is returned when disconnected regardless of connection is socket or TCP
Decrease sleep times
sql/net_serv.cc:
Make "net_clear" detect if connection with server has been broken by
performing a select. If the select returns that there are data to read but
no data can be read, that means the connection is broken. Signal disconnected
to "write" functions by setting error to 2.
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb_improved_on-line_discover
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Merge
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
client/mysqltest.c:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
tests/mysql_client_test.c:
Auto merged
(pre-push)
mysql-test/r/events.result:
update result
mysql-test/t/events.test:
few more tests
sql/event.cc:
fix compilation failure after big merge
sql/event.h:
initialize s_ctx to be the context to be used.
don't use sphead->m_security_ctx but we will copy
the initted ctx to there
sql/event_timed.cc:
-initialize s_ctx to be the context to be used.
don't use sphead->m_security_ctx but we will copy
the initted ctx to there
- first init the context
- then compile the event
- and then copy the context
- don't use mysql_change_db() for now change_security_context() gets the
right context info
BitKeeper/deleted/.del-rpl_row_multi_update3.test~fcf9a2234bd0f1b:
Delete: mysql-test/t/rpl_row_multi_update3.test
BitKeeper/deleted/.del-rpl_row_multi_update3.test~b366698f8379f38f:
Delete: mysql-test/extra/rpl_tests/rpl_row_multi_update3.test
BitKeeper/deleted/.del-rpl_row_multi_update3.result~1a3a8438eaaf11f2:
Delete: mysql-test/r/rpl_row_multi_update3.result
mysql-test/t/rpl_ndb_commit_afterflush.test:
added comments
mysql-test/r/rpl_ndb_commit_afterflush.result:
New results file
mysql-test/t/rpl_ddl.test:
Added to skip default ndb engine
mysql-test/t/rpl_ndb_ddl.test:
new wrapper for ndb
mysql-test/r/rpl_ndb_ddl.result:
new wrapper for ndb
mysql-test/t/rpl_insert_ignore.test:
Added to skip ndb if default engine
mysql-test/t/rpl_ndb_insert_ignore.test:
New wrapper for ndb
mysql-test/r/rpl_ndb_insert_ignore.result:
New Results file
mysql-test/t/rpl_multi_update2.test:
Updated to skip ndb default engine + added comments
mysql-test/t/rpl_ndb_multi_update2.test:
New ndb wrapper for test case
mysql-test/t/rpl_ndb_multi_update2-slave.opt:
New slave option file to go with new NDB test wrapper
mysql-test/r/rpl_ndb_multi_update2.result:
New results file
mysql-test/t/rpl_multi_update3.test:
Updated to skip ndb default engine + added comments
mysql-test/t/rpl_ndb_multi_update3.test:
New ndb wrapper for test case
mysql-test/r/rpl_ndb_multi_update3.result:
New results file
mysql-test/t/rpl_relayrotate.test:
added comments and ability to sjip when ndb is default engine
mysql-test/t/rpl_ndb_relayrotate.test:
New wrapper for ndb
mysql-test/t/rpl_ndb_relayrotate-slave.opt:
New option file for ndb slave
mysql-test/r/rpl_ndb_relayrotate.result:
New results file
mysql-test/t/rpl_loaddata.test:
Updated
mysql-test/t/rpl_multi_update.test:
Updated
mysql-test/t/rpl_relay_space_myisam.test:
Updated
mysql-test/t/rpl_row_001.test:
Updated
mysql-test/t/rpl_row_blob_myisam.test:
Updated
mysql-test/t/rpl_row_charset.test:
Updated
mysql-test/t/rpl_row_delayed_ins.test:
Updated
mysql-test/t/rpl_row_log.test:
Updated
mysql-test/t/rpl_row_UUID.test:
Updated
mysql-test/t/rpl_auto_increment.test:
Updated
mysql-test/t/rpl_commit_after_flush.test:
Updated
mysql-test/t/rpl_deadlock_innodb.test:
Updated
mysql-test/t/rpl_failed_optimize.test:
Updated
mysql-test/t/rpl_foreign_key_innodb.test:
Updated
mysql-test/t/rpl_insert_id_pk.test:
Updated
mysql-test/t/rpl_insert_id.test:
Updated
mysql-test/t/rpl_relay_space_innodb.test:
Updated
mysql-test/t/rpl_row_blob_innodb.test:
Updated
mysql-test/t/rpl_row_func003.test:
Updated
mysql-test/t/rpl_row_log_innodb.test:
Updated
mysql-test/t/rpl_row_sp002_innodb.test:
Updated
mysql-test/t/rpl_row_sp003.test:
Updated
mysql-test/t/rpl_row_sp006_InnoDB.test:
Updated
mysql-test/t/rpl_row_sp007_innodb.test:
Updated
mysql-test/t/rpl_ndb_row_001.test:
New wrapper for ndb
mysql-test/r/rpl_ndb_row_001.result:
New results file
mysql-test/t/rpl_ndb_UUID.test:
New wrapper for ndb
mysql-test/r/rpl_ndb_UUID.result:
New results file
mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test:
Updated with order by
mysql-test/r/rpl_row_delayed_ins.result:
Updated results file
mysql-test/t/rpl_ndb_charset.test:
New wrapper for ndb
mysql-test/r/rpl_ndb_charset.result:
New results file
mysql-test/t/rpl_row_until.test:
Updated to skip when ndb is default. ndb bin logs are different size, so test would need to be rewitten for ndb
mysql-test/t/rpl_row_max_relay_size.test:
Updated
mysql-test/t/rpl_row_sp008.test:
Removed show binlog as it is not needed for test
mysql-test/r/rpl_row_sp008.result:
Updated results
mysql-test/t/rpl_row_basic_11bugs.test:
Removed show binlog as it is not needed for test
mysql-test/r/rpl_row_basic_11bugs.result:
Updated results
BitKeeper/deleted/.del-rpl_ndb_max_relay_size.test~afa6834a51627676:
Delete: mysql-test/t/rpl_ndb_max_relay_size.test
BitKeeper/deleted/.del-rpl_ndb_max_relay_size.result~1e944e2782e270d8:
Delete: mysql-test/r/rpl_ndb_max_relay_size.result
mysql-test/t/disabled.def:
Updated
