database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

WL#4189 mtr.pl v2

Browse Source 
- First try LOAD DATA INFILE and fall back to LOAD DATA LOCAL INFILE if
   that fails.
This commit is contained in:
Magnus Svensson
2009-01-27 21:14:23 +01:00
parent d4c34f24fd
commit 3d1c85da1f
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mysql-test/include/check-warnings.test
View File

@@ -29,13 +29,27 @@ create temporary table error_log (
let $log_error= query_get_value(show variables like 'log_error', Value, 1); let $log_error= query_get_value(show variables like 'log_error', Value, 1);
let $log_warning= $log_error.warnings; let $log_warning= $log_error.warnings;
# Load the warnings into a temporary table # Try tload the warnings into a temporary table,
eval load data local infile '$log_warning' into table error_log # it might fail with error saying "The MySQL server is
# running with the --secure-file-priv" in which case
# an attempt to load the file using LOAD DATA LOCAL is made
--error 0,1290
eval load data infile '$log_warning' into table error_log
fields terminated by 'xykls37' escaped by '' fields terminated by 'xykls37' escaped by ''
ignore 1 lines ignore 1 lines
(line) (line)
set file_name='$log_error'; set file_name='$log_error';
if ($mysql_errno)
{
# Try LOAD DATA LOCAL
eval load data local infile '$log_warning' into table error_log
fields terminated by 'xykls37' escaped by ''
ignore 1 lines
(line)
set file_name='$log_error';
}
# Call check_warnings to filter out any warning in # Call check_warnings to filter out any warning in
# the error_log table # the error_log table
call mtr.check_warnings(@result); call mtr.check_warnings(@result);