diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2007-08-14 15:35:19 -0600 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2007-08-14 15:35:19 -0600 |
| commit | 5fe327b7cabbabe25f1111c2e966bc7a0c9b6dbf (patch) | |
| tree | aceeea849924bc93c34127d19abe9261b8e78a7a /mysql-test/mysql-test-run.pl | |
| parent | f4b750f4e139ded84cb3d483904c1870e21158d7 (diff) | |
| download | mariadb-git-5fe327b7cabbabe25f1111c2e966bc7a0c9b6dbf.tar.gz | |
Updates to allow innodb.test to be run with --embedded-server,
including a small change to build_table_filename().
mysql-test/mysql-test-run.pl:
Remove unused bad merge bitrot code. This chunk of code is a repeat
copy of an earlier chunk, and should never have been here.
mysql-test/r/innodb.result:
Updates to allow innodb.test to be run with --embedded-server
mysql-test/suite/binlog/r/binlog_innodb.result:
Updates to allow innodb.test to be run with --embedded-server
mysql-test/suite/binlog/t/binlog_innodb.test:
Updates to allow innodb.test to be run with --embedded-server
mysql-test/t/innodb.test:
Updates to allow innodb.test to be run with --embedded-server
sql/sql_table.cc:
build_table_filename(): Don't add FN_ROOTDIR to mysql_data_home if
it's already there. This is done to make it easier to write tests
which check the output of various error messages, and work with
both the embedded server (mysql_data_home is full path, including
trailing FN_ROOTDIR) and normal server (mysql_data_home is just ".").
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 22b9499c37a..fcfb634bda2 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -933,26 +933,6 @@ sub command_line_setup () { mtr_error("Will not run in record mode without a specific test case"); } - # -------------------------------------------------------------------------- - # Embedded server flag - # -------------------------------------------------------------------------- - if ( $opt_embedded_server ) - { - $glob_use_embedded_server= 1; - push(@glob_test_mode, "embedded"); - $opt_skip_rpl= 1; # We never run replication with embedded - $opt_skip_ndbcluster= 1; # Turn off use of NDB cluster - $opt_skip_ssl= 1; # Turn off use of SSL - - # Turn off use of bin log - push(@opt_extra_mysqld_opt, "--skip-log-bin"); - - if ( $opt_extern ) - { - mtr_error("Can't use --extern with --embedded-server"); - } - } - # -------------------------------------------------------------------------- # ps protcol flag |