1
0
mirror of https://github.com/MariaDB/server.git synced 2025-10-27 05:56:07 +03:00
Commit Graph

3983 Commits

Author SHA1 Message Date
kent@mysql.com
917276f254 mysql-test-run.pl:
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
2005-06-19 20:06:27 +02:00
unknown
93f7607de0 Fix information_schema test on Windows. (Bug #10844)
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
2005-06-18 03:02:27 +02:00
jimw@mysql.com
01c690b79b Fix information_schema test on Windows. (Bug #10844) 2005-06-18 03:02:27 +02:00
unknown
7e6bcbcda7 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gca
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
2005-06-10 21:31:39 +02:00
kent@mysql.com
00ddd2c700 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gca
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
2005-06-10 21:31:39 +02:00
unknown
4cc8730d15 mtr_process.pl:
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
2005-06-10 21:29:37 +02:00
kent@mysql.com
a2073df284 mtr_process.pl:
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
2005-06-10 21:29:37 +02:00
unknown
62b1f1e34f mysql-test-run.pl, mysql-test-run.sh:
Corrected path to SSL certificate files


mysql-test/mysql-test-run.sh:
  Corrected path to SSL certificate files
mysql-test/mysql-test-run.pl:
  Corrected path to SSL certificate files
2005-06-09 15:19:10 +02:00
kent@mysql.com
5942498979 mysql-test-run.pl, mysql-test-run.sh:
Corrected path to SSL certificate files
2005-06-09 15:19:10 +02:00
unknown
bd47a7df59 Merge with 4.1
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
2005-06-07 00:31:53 +03:00
monty@mysql.com
775f17667b Merge with 4.1 2005-06-07 00:31:53 +03:00
unknown
bfac85343f mtr_misc.pl, mtr_report.pl:
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
2005-06-05 20:10:47 +02:00
kent@mysql.com
5ec1549776 mtr_misc.pl, mtr_report.pl:
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()
2005-06-05 20:10:47 +02:00
unknown
0697f1d103 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
2005-05-15 20:53:19 +02:00
kent@mysql.com
0d73975517 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-05-15 20:53:19 +02:00
unknown
8fd8d819d0 mysqltest.c:
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
2005-05-15 20:38:54 +02:00
kent@mysql.com
6374bfeb61 mysqltest.c:
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
2005-05-15 20:38:54 +02:00
unknown
f4038de74b Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile


mysql-test/mysql-test-run.pl:
  Auto merged
2005-05-15 17:36:36 +02:00
kent@mysql.com
7858004c51 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-05-15 17:36:36 +02:00
unknown
bea0e79f57 mtr_report.pl, mtr_process.pl, mysql-test-run.pl:
Added option --vardir=<directory> for feature bug#10096


mysql-test/mysql-test-run.pl:
  Added option --vardir=<directory> for feature bug#10096
mysql-test/lib/mtr_process.pl:
  Added option --vardir=<directory> for feature bug#10096
mysql-test/lib/mtr_report.pl:
  Added option --vardir=<directory> for feature bug#10096
2005-05-15 17:22:54 +02:00
kent@mysql.com
81b36addc9 mtr_report.pl, mtr_process.pl, mysql-test-run.pl:
Added option --vardir=<directory> for feature bug#10096
2005-05-15 17:22:54 +02:00
unknown
3f53fa149a Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/lib/init_db.sql:
  Auto merged
2005-05-15 07:38:42 +02:00
kent@mysql.com
e2d7efb238 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-05-15 07:38:42 +02:00
unknown
657469bab8 mysql-test-run.pl:
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"
2005-05-15 07:34:09 +02:00
kent@mysql.com
f37bdbe059 mysql-test-run.pl:
Not to conflict with Windows return code 2 for "not found", use 62 for "skip"
init_db.sql:
  Initial db updates
2005-05-15 07:34:09 +02:00
unknown
7480051bb4 Merge mysql.com:/usr/home/ram/work/mysql-4.1
into mysql.com:/usr/home/ram/work/mysql-5.0


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
2005-04-14 16:39:42 +05:00
ramil@mysql.com
9f440d2b20 Merge mysql.com:/usr/home/ram/work/mysql-4.1
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-04-14 16:39:42 +05:00
unknown
7c91a1fe6d Minor improvements + new option needed for WL#2520 Upgrade/Downgrade Test Plan
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 .
2005-04-13 11:47:28 +02:00
mleich@mysql.com
d1806d7870 Minor improvements + new option needed for WL#2520 Upgrade/Downgrade Test Plan 2005-04-13 11:47:28 +02:00
unknown
1655e97fd2 Merge
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/rpl_rewrite_db.result:
  Auto merged
2005-04-06 18:19:05 +02:00
kent@mysql.com
2aa8253f70 Merge 2005-04-06 18:19:05 +02:00
unknown
1216986050 Makefile.am:
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
2005-04-06 12:20:55 +02:00
kent@mysql.com
57d8914287 Makefile.am:
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
2005-04-06 12:20:55 +02:00
unknown
8b6b6d2c49 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile


mysql-test/mysql-test-run.pl:
  Auto merged
2005-03-29 08:06:43 +02:00
kent@mysql.com
d917683515 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-03-29 08:06:43 +02:00
unknown
346d02419a mysql-test-run.pl:
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
2005-03-29 07:29:38 +02:00
kent@mysql.com
0544c68e1c mysql-test-run.pl:
Corrected typo
mtr_diff.pl:
  A simplified unified diff in Perl
  new file
2005-03-29 07:29:38 +02:00
unknown
de5a4c0968 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-build
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-build


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
2005-03-22 15:14:40 +01:00
kent@mysql.com
466d3bff25 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-build
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-build
2005-03-22 15:14:40 +01:00
unknown
27a711b4cb mysql-test-run.sh, mysql-test-run.pl:
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
2005-03-22 15:12:05 +01:00
kent@mysql.com
f3d284c8bc mysql-test-run.sh, mysql-test-run.pl:
InnoDB needs longer start time for second slave on slow hosts
2005-03-22 15:12:05 +01:00
unknown
662ba3b8fd Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-build
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-build


mysql-test/mysql-test-run.pl:
  Auto merged
2005-03-21 16:34:30 +01:00
kent@mysql.com
e25cc0f061 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-build
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-build
2005-03-21 16:34:30 +01:00
unknown
a94a62cefb mtr_report.pl:
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
2005-03-21 16:01:39 +01:00
kent@mysql.com
c3fa95d467 mtr_report.pl:
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
2005-03-21 16:01:39 +01:00
unknown
48577bb59f merged
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
2005-03-09 14:09:06 +01:00
serg@serg.mylan
956682de1a merged 2005-03-09 14:09:06 +01:00
unknown
f2cfb6ef3b mysql-test-run.pl:
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
2005-03-09 01:34:22 +01:00
kent@mysql.com
c6002966be mysql-test-run.pl:
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
2005-03-09 01:34:22 +01:00
unknown
ccdb4f6671 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-wl2278


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
ndb/include/mgmapi/mgmapi.h:
  Auto merged
ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-02-17 09:37:07 +01:00