diff options
| author | Michael Widenius <monty@mysql.com> | 2009-04-25 12:04:38 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2009-04-25 12:04:38 +0300 |
| commit | 210a412522b10115d34b431c66acf403faab7bfe (patch) | |
| tree | 56c09cfd1053265897d114e4acb52d395185f27e /mysql-test/include/check-warnings.test | |
| parent | 059b9356a19118a48fbad31be81c4859e15d3bc8 (diff) | |
| parent | 4aeeb1d157a67c5359475d8941267641fb894b22 (diff) | |
| download | mariadb-git-210a412522b10115d34b431c66acf403faab7bfe.tar.gz | |
bzr merge from guilhem's maria tree to our local 5.1
configure.in:
Manually merged
mysql-test/lib/My/ConfigFactory.pm:
Manually merged
mysql-test/mysql-test-run.pl:
Manually merged
mysql-test/t/information_schema.test:
Manually merged
sql/handler.cc:
Manually merged
support-files/mysql.spec.sh:
Manually merged
Diffstat (limited to 'mysql-test/include/check-warnings.test')
| -rw-r--r-- | mysql-test/include/check-warnings.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/include/check-warnings.test b/mysql-test/include/check-warnings.test index 064521a3c75..8267ccdd102 100644 --- a/mysql-test/include/check-warnings.test +++ b/mysql-test/include/check-warnings.test @@ -27,7 +27,7 @@ create temporary table error_log ( ) engine=myisam; # Get the name of servers error log -let $log_error= query_get_value(show variables like 'log_error', Value, 1); +let $log_error= $MTR_LOG_ERROR; let $log_warning= $log_error.warnings; # Try tload the warnings into a temporary table, |