1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-05 12:42:17 +03:00
Commit Graph

3907 Commits

Author SHA1 Message Date
c4fe91b7da Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-06-22 19:07:30 +02:00
d18ab5a024 mysql-test-run.pl:
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
2005-06-21 20:25:50 +02:00
26dc9492c3 mysql-test-run.pl:
Added optional paths for finding mysqld on Windows
  Added language/charset options to embedded mysql_client_test
2005-06-21 20:25:50 +02:00
c2e9730818 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
2005-06-21 02:27:55 +02:00
ff20e1c2ca Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-06-21 02:27:55 +02:00
e74d531373 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.
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.
2005-06-21 02:21:52 +02:00
4958b54339 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.
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
2005-06-21 02:21:52 +02:00
2bf4fa73de Merge
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
2005-06-20 22:31:25 +02:00
9c79bc7e73 Merge 2005-06-20 22:31:25 +02:00
d73327e199 mtr_cases.pl:
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
2005-06-20 21:37:39 +02:00
9426710c68 mtr_cases.pl:
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
2005-06-20 21:37:39 +02:00
1c756c04c2 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
2005-06-20 12:36:40 +02:00
950f36dde6 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-06-20 12:36:40 +02:00
2aa1a04c63 mysql-test-run.pl:
Corrected path to 'mysql_fix_privilege_tables'


mysql-test/mysql-test-run.pl:
  Corrected path to 'mysql_fix_privilege_tables'
2005-06-20 12:32:53 +02:00
67a95f5f14 mysql-test-run.pl:
Corrected path to 'mysql_fix_privilege_tables'
2005-06-20 12:32:53 +02:00
92d9f2caa3 mysql-test-run.pl:
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
2005-06-20 12:17:03 +02:00
9a8cb4406e mysql-test-run.pl:
Added --log-bin-trust-routine-creators to server start
  Increase and autoextend innodb tables
2005-06-20 12:17:03 +02:00
00787a9cc8 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
2005-06-20 11:56:19 +02:00
2c1ef9002d Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-06-20 11:56:19 +02:00
d0a7c1248e mysql-test-run.pl:
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'
2005-06-20 11:49:25 +02:00
5bf83588e3 mysql-test-run.pl:
Corrected path to 'mysql_fix_privilege_tables'
  Corrected dummy --manager-port to take integer argument
2005-06-20 11:49:25 +02:00
c7e49b6bd6 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0


mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
2005-06-19 20:09:28 +02:00
e58054ad16 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-06-19 20:09:28 +02:00
f35c177a2a 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


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
2005-06-19 20:06:27 +02:00
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
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
01c690b79b Fix information_schema test on Windows. (Bug #10844) 2005-06-18 03:02:27 +02:00
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
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
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
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
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
5942498979 mysql-test-run.pl, mysql-test-run.sh:
Corrected path to SSL certificate files
2005-06-09 15:19:10 +02:00
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
775f17667b Merge with 4.1 2005-06-07 00:31:53 +03:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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