mirror of
https://github.com/MariaDB/server.git
synced 2025-01-20 14:02:32 +01:00
Merge bk-internal:/home/bk/mysql-5.1-rpl
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
This commit is contained in:
commit
24f11aa736
3 changed files with 6 additions and 8 deletions
|
@ -2189,7 +2189,7 @@ int open_file(const char *name)
|
|||
if (!(cur_file->file = my_fopen(buff, O_RDONLY | FILE_BINARY, MYF(0))))
|
||||
{
|
||||
cur_file--;
|
||||
die("Could not open file '%s'", buff);
|
||||
die("Could not open '%s' for reading", buff);
|
||||
}
|
||||
cur_file->file_name= my_strdup(buff, MYF(MY_FAE));
|
||||
cur_file->lineno=1;
|
||||
|
@ -5177,7 +5177,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
|
|||
DBUG_ASSERT(cur_file == file_stack && cur_file->file == 0);
|
||||
if (!(cur_file->file=
|
||||
my_fopen(buff, O_RDONLY | FILE_BINARY, MYF(0))))
|
||||
die("Could not open %s: errno = %d", buff, errno);
|
||||
die("Could not open '%s' for reading: errno = %d", buff, errno);
|
||||
cur_file->file_name= my_strdup(buff, MYF(MY_FAE));
|
||||
cur_file->lineno= 1;
|
||||
break;
|
||||
|
@ -5294,9 +5294,9 @@ void str_to_file2(const char *fname, char *str, int size, my_bool append)
|
|||
flags|= O_TRUNC;
|
||||
if ((fd= my_open(buff, flags,
|
||||
MYF(MY_WME | MY_FFNF))) < 0)
|
||||
die("Could not open %s: errno = %d", buff, errno);
|
||||
die("Could not open '%s' for writing: errno = %d", buff, errno);
|
||||
if (append && my_seek(fd, 0, SEEK_END, MYF(0)) == MY_FILEPOS_ERROR)
|
||||
die("Could not find end of file %s: errno = %d", buff, errno);
|
||||
die("Could not find end of file '%s': errno = %d", buff, errno);
|
||||
if (my_write(fd, (uchar*)str, size, MYF(MY_WME|MY_FNABP)))
|
||||
die("write failed");
|
||||
my_close(fd, MYF(0));
|
||||
|
|
|
@ -293,7 +293,7 @@ var5 from query that returns no row
|
|||
failing query in let
|
||||
mysqltest: At line 1: Error running query 'failing query': 1064 You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'failing query' at line 1
|
||||
mysqltest: At line 1: Missing required argument 'filename' to command 'source'
|
||||
mysqltest: At line 1: Could not open file './non_existingFile'
|
||||
mysqltest: At line 1: Could not open './non_existingFile' for reading
|
||||
mysqltest: In included file "MYSQLTEST_VARDIR/tmp/recursive.sql": At line 1: Source directives are nesting too deep
|
||||
mysqltest: In included file "MYSQLTEST_VARDIR/tmp/error.sql": At line 1: query 'garbage ' failed: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'garbage' at line 1
|
||||
|
||||
|
@ -443,7 +443,7 @@ ERROR 3D000: No database selected
|
|||
Output from mysqltest-x.inc
|
||||
Output from mysqltest-x.inc
|
||||
Output from mysqltest-x.inc
|
||||
mysqltest: Could not open ./non_existing_file.inc: errno = 2
|
||||
mysqltest: Could not open './non_existing_file.inc' for reading: errno = 2
|
||||
failing_statement;
|
||||
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'failing_statement' at line 1
|
||||
failing_statement;
|
||||
|
|
|
@ -12,8 +12,6 @@
|
|||
user_limits : Bug#23921 random failure of user_limits.test
|
||||
|
||||
concurrent_innodb : BUG#21579 2006-08-11 mleich innodb_concurrent random failures with varying differences
|
||||
ctype_big5 : BUG#26711 2007-06-21 Lars Test has never worked on Double Whopper
|
||||
|
||||
federated_transactions : Bug#29523 Transactions do not work
|
||||
events : Bug#32664 events.test fails randomly
|
||||
lowercase_table3 : Bug#32667 lowercase_table3.test reports to error log
|
||||
|
|
Loading…
Reference in a new issue