into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
BitKeeper/etc/config:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/item.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
BitKeeper/etc/logging_ok:
auto-union
BUILD/autorun.sh:
Auto merged
BitKeeper/etc/config:
Auto merged
Makefile.am:
Auto merged
include/my_bitmap.h:
Auto merged
libmysqld/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/r/ps_6bdb.result:
Auto merged
mysql-test/r/ps_7ndb.result:
Auto merged
mysys/Makefile.am:
Auto merged
mysys/default.c:
Auto merged
scripts/mysql_create_system_tables.sh:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/Makefile.am:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/heap/Makefile.am:
Auto merged
storage/heap/hp_hash.c:
Auto merged
storage/innobase/btr/btr0btr.c:
Auto merged
storage/innobase/btr/btr0cur.c:
Auto merged
storage/innobase/configure.in:
Auto merged
storage/innobase/fil/fil0fil.c:
Auto merged
storage/innobase/ibuf/ibuf0ibuf.c:
Auto merged
storage/innobase/include/os0file.h:
Auto merged
storage/innobase/include/page0cur.h:
Auto merged
storage/innobase/include/row0mysql.h:
Auto merged
storage/innobase/include/srv0srv.h:
Auto merged
storage/innobase/include/trx0trx.h:
Auto merged
storage/innobase/include/trx0trx.ic:
Auto merged
storage/innobase/lock/lock0lock.c:
Auto merged
storage/innobase/log/log0recv.c:
Auto merged
storage/innobase/os/os0file.c:
Auto merged
storage/innobase/page/page0cur.c:
Auto merged
storage/innobase/page/page0page.c:
Auto merged
storage/innobase/rem/rem0rec.c:
Auto merged
storage/innobase/row/row0mysql.c:
Auto merged
storage/innobase/row/row0sel.c:
Auto merged
storage/innobase/row/row0upd.c:
Auto merged
storage/innobase/srv/srv0srv.c:
Auto merged
storage/innobase/trx/trx0trx.c:
Auto merged
storage/innobase/trx/trx0undo.c:
Auto merged
storage/myisam/Makefile.am:
Auto merged
storage/myisam/mi_create.c:
Auto merged
storage/myisam/mi_open.c:
Auto merged
storage/myisam/mi_packrec.c:
Auto merged
storage/myisam/mi_unique.c:
Auto merged
storage/myisam/myisampack.c:
Auto merged
storage/myisammrg/Makefile.am:
Auto merged
storage/ndb/include/mgmcommon/ConfigRetriever.hpp:
Auto merged
storage/ndb/include/transporter/TransporterDefinitions.hpp:
Auto merged
storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/src/mgmsrv/main.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
storage/ndb/test/ndbapi/create_tab.cpp:
Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
support-files/mysql.spec.sh:
Auto merged
configure.in:
merge
mysql-test/t/disabled.def:
merge
mysys/my_bitmap.c:
SCCS merged
sql/ha_federated.cc:
merge
sql/ha_innodb.cc:
merge
sql/ha_ndbcluster.cc:
merge
sql/mysqld.cc:
e
merge
sql/sql_insert.cc:
merge
sql/sql_lex.h:
merge
sql/sql_load.cc:
merge
sql/sql_select.cc:
merge
e
C
sql/sql_update.cc:
merge
sql/table.cc:
merge
adopted perl test script for new dir structure
BitKeeper/etc/config:
no open logging
mysql-test/mysql-test-run.pl:
adopted perl test script for new dir structure
Corrected appending of .exe to Windows executables
Don't alter read only @_ in foreach loop
mysql-test-run.pl:
Improved cleanup of binlogs
Use separate log file for second master
Corrected Windows paths to executables
mysql-test/mysql-test-run.pl:
Improved cleanup of binlogs
Use separate log file for second master
Corrected Windows paths to executables
mysql-test/lib/mtr_misc.pl:
Corrected appending of .exe to Windows executables
Don't alter read only @_ in foreach loop
Handle case where SHELL isn't set in Cygwin
mysql_client_test.dsp:
Put output into the "client_debug" and "client_release" directories
VC++Files/tests/mysql_client_test.dsp:
Put output into the "client_debug" and "client_release" directories
mysql-test/mysql-test-run.pl:
Handle case where SHELL isn't set in Cygwin
into mysql.com:/home/jimw/my/mysql-5.0-clean
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/t/information_schema.test:
Auto merged
Might need a restart after test with special TZ
Removed unused argument to run_mysqltest()
mysql-test/mysql-test-run.pl:
Might need a restart after test with special TZ
Removed unused argument to run_mysqltest()
Added optional paths for finding mysqld on Windows
Added language/charset options to embedded mysql_client_test
mysql-test/mysql-test-run.pl:
Added optional paths for finding mysqld on Windows
Added language/charset options to embedded mysql_client_test
More compact and safe handling of path names.
Support for running in Windows source tree.
Use libtool wrapper, instead of messing with
library path names, and objects in .libs dir.
mtr_misc.pl:
Utility function that search aand check path names
mtr_report.pl:
Patch by Carsten, set correct reject/result/eval if not main suite
mysql-test/lib/mtr_report.pl:
Patch by Carsten, set correct reject/result/eval if not main suite
mysql-test/lib/mtr_misc.pl:
Utility function that search aand check path names
mysql-test/mysql-test-run.pl:
More compact and safe handling of path names.
Support for running in Windows source tree.
Use libtool wrapper, instead of messing with
library path names, and objects in .libs dir.
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/group_by.result:
Auto merged
sql/Makefile.am:
Auto merged
sql/field.h:
Auto merged
sql/sql_select.cc:
Auto merged
Bug#11466: Script can now get test case name
from test case file path on command line
mysql-test-run.pl:
Bug#11466: Added --skip-ndbcluster/--skip-ndb option
mtr_cases.pl:
Don't set --default-time-zone if opt file sets it
Restart the server if time zone is given in opt file
mysql-test-run.pl:
Don't remove symlink to "var" directory in cleanup
Removed duplicate/unessesary options to mysqld
mysql-test/mysql-test-run.pl:
Bug#11466: Added --skip-ndbcluster/--skip-ndb option
mysql-test/lib/mtr_cases.pl:
Bug#11466: Script can now get test case name
from test case file path on command line
Added --log-bin-trust-routine-creators to server start
Increase and autoextend innodb tables
mysql-test/mysql-test-run.pl:
Added --log-bin-trust-routine-creators to server start
Increase and autoextend innodb tables
Corrected path to 'mysql_fix_privilege_tables'
Corrected dummy --manager-port to take integer argument
mysql-test/mysql-test-run.pl:
Corrected path to 'mysql_fix_privilege_tables'
Added dummy --manager-port flag, for backward compatibility
Back port from 5.0, correction of paths to SSL pem files
mtr_cases.pl:
Removed hard coded exclude list for embedded server
mysql-test-run.pl:
Set environment variable MYSQL_SHOW, to be used in test cases
mysql-test/lib/mtr_cases.pl:
Removed hard coded exclude list for embedded server
mysql-test/mysql-test-run.pl:
Added dummy --manager-port flag, for backward compatibility
Back port from 5.0, correction of paths to SSL pem files
mysql-test/mysql_test_run_new.c:
Add --log-bin-trust-routine-creators
mysql-test/mysql-test-run.pl:
Add --log-bin-trust-routine-creators
mysql-test/t/information_schema.test:
Fix use of users to cope with lack of grant to %@localhost to test.*
mysql-test/r/information_schema.result:
Update results
Added a sleep for 5 seconds when shuting down,
work around for strange problem with server restarts
mtr_cases.pl:
Set default time zone as opt to mysqld
mysql-test-run.pl:
Enabled --mysqld=<flags> to work
Put some Windows path names into environment,
to be used in --replace_result
mysql-test-run.sh:
Make shell script tolerant to Windows change in test cases
mysql-test/mysql-test-run.sh:
Make shell script tolerant to Windows change in test cases
mysql-test/mysql-test-run.pl:
Enabled --mysqld=<flags> to work
Put some Windows path names into environment,
to be used in --replace_result
mysql-test/lib/mtr_cases.pl:
Set default time zone as opt to mysqld
mysql-test/lib/mtr_process.pl:
Added a sleep for 5 seconds when shuting down,
work around for strange problem with server restarts
BitKeeper/etc/logging_ok:
auto-union
client/sql_string.cc:
Auto merged
configure.in:
Auto merged
include/my_global.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/olap.result:
Auto merged
mysql-test/r/warnings.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/warnings.test:
Auto merged
mysys/raid.cc:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/field.cc:
Auto merged
BitKeeper/deleted/.del-ha_isam.cc~4dce65904db2675e:
Auto merged
BitKeeper/deleted/.del-ha_isammrg.cc~dc682e4755d77a2e:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_blackhole.cc:
Auto merged
sql/ha_heap.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_geofunc.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/item_uniq.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.h:
Auto merged
sql/procedure.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/protocol_cursor.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_analyse.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_error.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_map.cc:
Auto merged
sql/sql_olap.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_string.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
sql/examples/ha_archive.cc:
Auto merged
sql/examples/ha_example.cc:
Auto merged
sql/examples/ha_tina.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/tztime.cc:
Auto merged
strings/ctype-win1250ch.c:
Auto merged
mysql-test/r/func_gconcat.result:
merge & ensure that 4.1 and 5.0 source have tests in same order
mysql-test/r/innodb.result:
merge & ensure that 4.1 and 5.0 source have tests in same order
mysql-test/t/func_gconcat.test:
merge & ensure that 4.1 and 5.0 source have tests in same order
mysql-test/t/innodb.test:
merge & ensure that 4.1 and 5.0 source have tests in same order
sql/item_func.cc:
merge
sql/mysqld.cc:
merge
sql/opt_range.cc:
merge
sql/sql_parse.cc:
merge
Give better name to goto labels
sql/sql_select.cc:
merge
Try kill all children to the mysql-test-run process when exiting
mtr_process.pl:
Added new function mtr_exit() that try kill all children to the mysql-test-run process when exiting
mysql-test-run.pl:
Try kill all children to the mysql-test-run process when exiting
New --vardir caused problems on Windows
Changed faulty calls to error() to mtr_error()
mysql-test/mysql-test-run.pl:
Try kill all children to the mysql-test-run process when exiting
New --vardir caused problems on Windows
Changed faulty calls to error() to mtr_error()
mysql-test/lib/mtr_report.pl:
Try kill all children to the mysql-test-run process when exiting
mysql-test/lib/mtr_process.pl:
Added new function mtr_exit() that try kill all children to the mysql-test-run process when exiting
mysql-test/lib/mtr_misc.pl:
Try kill all children to the mysql-test-run process when exiting
To solve bug#6193, also reset require when using 'eval' for running query
mysql-test-run.pl:
In cleanup, remove possible soft link to var directory
mysql-test/mysql-test-run.pl:
In cleanup, remove possible soft link to var directory
client/mysqltest.c:
To solve bug#6193, also reset require when using 'eval' for running query
Not to conflict with Windows return code 2 for "not found", use 62 for "skip"
init_db.sql:
Initial db updates
mysql-test/lib/init_db.sql:
Initial db updates
mysql-test/mysql-test-run.pl:
Not to conflict with Windows return code 2 for "not found", use 62 for "skip"
mysql-test/mysql-test-run.pl:
1. Improved description of option user=USER
2. Bug fix
The storage place of the old, to be removed <test case>.reject file is the 'r' subdirectory of the test suite.
3. New option "start-dirty" which is
- per functionality a "start-and-exit" without an initiation
- a convenient method to (re)start an existing database.
So a following
./mysql-test-run.pl --extern ......
will meet a server running with the default ports and sockets according to our test environment.
This option is useful for analyzing bugs and WL#2520 Upgrade/Downgrade Test Plan .
Include the Perl version of mysql-test-run
rpl_rewrite_db.test, rpl_rewrite_db.result:
Added missing database cleanup
mysql-test-run.pl:
Embedded result files no longer needed
mysql-test/mysql-test-run.pl:
Embedded result files no longer needed
mysql-test/r/rpl_rewrite_db.result:
Added missing database cleanup
mysql-test/t/rpl_rewrite_db.test:
Added missing database cleanup
mysql-test/Makefile.am:
Include the Perl version of mysql-test-run
Corrected typo
mtr_diff.pl:
A simplified unified diff in Perl
new file
mysql-test/lib/mtr_diff.pl:
A simplified unified diff in Perl
mysql-test/mysql-test-run.pl:
Corrected typo
InnoDB needs longer start time for second slave on slow hosts
mysql-test/mysql-test-run.pl:
InnoDB needs longer start time for second slave on slow hosts
mysql-test/mysql-test-run.sh:
InnoDB needs longer start time for second slave on slow hosts
Made --timer work
mtr_cases.pl:
Added option --reorder to get less server restarts
mysql-test-run.pl:
Added option --reorder to get less server restarts
Moved do_before_start_master() not to remove binlog files unless restarted
Made --timer work
Slave was incorrectly writing log to error log
mysql-test/mysql-test-run.pl:
Added option --reorder to get less server restarts
Moved do_before_start_master() not to remove binlog files unless restarted
Made --timer work
Slave was incorrectly writing log to error log
mysql-test/lib/mtr_cases.pl:
Added option --reorder to get less server restarts
mysql-test/lib/mtr_report.pl:
Made --timer work
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
Build-tools/Do-compile:
Auto merged
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
include/my_sys.h:
Auto merged
innobase/buf/buf0lru.c:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/include/page0page.ic:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/os/os0thread.c:
Auto merged
innobase/rem/rem0cmp.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/trx/trx0sys.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
innobase/ut/ut0ut.c:
Auto merged
myisam/ft_parser.c:
Auto merged
myisam/mi_create.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/ndb_alter_table.result:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysql-test/t/ndb_alter_table.test:
Auto merged
mysys/hash.c:
Auto merged
mysys/my_bitmap.c:
Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
sql/net_serv.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Removed -c from /bin/sh call
make_win_src_distribution.sh:
Copy all content in mysql-test
make_win_binary_distribution.sh, make_binary_distribution.sh:
Add Perl version of mysql-test-run to package
s_win32_dsp, s_win32, s_vxworks, s_test, s_readme, s_java, s_javah:
Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_javah:
Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_java:
Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_readme:
Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_test:
Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_vxworks:
Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_win32:
Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_win32_dsp:
Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
scripts/make_binary_distribution.sh:
Add Perl version of mysql-test-run to package
scripts/make_win_binary_distribution.sh:
Add Perl version of mysql-test-run to package
scripts/make_win_src_distribution.sh:
Copy all content in mysql-test
mysql-test/mysql-test-run.pl:
Removed -c from /bin/sh call
