Skip to content

M
mariadb
Commit b2bf4843 authored by unknown's avatar unknown
Browse files
Options

Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_dbug.h:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/csv.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/csv.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Manual merge
mysql-test/t/func_time.test:
  Manual merge, test already there
mysql-test/t/innodb_mysql.test:
  Manual merge
parents 591d09a9 9a506df0
Hide whitespace changes
Inline Side-by-side
Showing with 126 additions and 45 deletions
client/mysqltest.c
View file @ b2bf4843
...@@ -890,7 +890,7 @@ int dyn_string_cmp(DYNAMIC_STRING* ds, const char *fname) ...@@ -890,7 +890,7 @@ int dyn_string_cmp(DYNAMIC_STRING* ds, const char *fname)
die(NullS); die(NullS);
if (!eval_result && (uint) stat_info.st_size != ds->length) if (!eval_result && (uint) stat_info.st_size != ds->length)
{ {
DBUG_PRINT("info",("Size differs: result size: %u file size: %u", DBUG_PRINT("info",("Size differs: result size: %u file size: %llu",
ds->length, stat_info.st_size)); ds->length, stat_info.st_size));
DBUG_PRINT("info",("result: '%s'", ds->str)); DBUG_PRINT("info",("result: '%s'", ds->str));
DBUG_RETURN(RESULT_LENGTH_MISMATCH); DBUG_RETURN(RESULT_LENGTH_MISMATCH);
...@@ -1810,7 +1810,7 @@ void my_ungetc(int c) ...@@ -1810,7 +1810,7 @@ void my_ungetc(int c)
void read_until_delimiter(DYNAMIC_STRING *ds, void read_until_delimiter(DYNAMIC_STRING *ds,
DYNAMIC_STRING *ds_delimiter) DYNAMIC_STRING *ds_delimiter)
{ {
int c; char c;
DBUG_ENTER("read_until_delimiter"); DBUG_ENTER("read_until_delimiter");
DBUG_PRINT("enter", ("delimiter: %s, length: %d", DBUG_PRINT("enter", ("delimiter: %s, length: %d",
ds_delimiter->str, ds_delimiter->length)); ds_delimiter->str, ds_delimiter->length));
...@@ -2558,7 +2558,7 @@ void do_get_errcodes(struct st_command *command) ...@@ -2558,7 +2558,7 @@ void do_get_errcodes(struct st_command *command)
*to_ptr= 0; *to_ptr= 0;
to->type= ERR_SQLSTATE; to->type= ERR_SQLSTATE;
DBUG_PRINT("info", ("ERR_SQLSTATE: %d", to->code.sqlstate)); DBUG_PRINT("info", ("ERR_SQLSTATE: %s", to->code.sqlstate));
} }
else if (*p == 's') else if (*p == 's')
{ {
...@@ -3346,7 +3346,7 @@ int read_line(char *buf, int size) ...@@ -3346,7 +3346,7 @@ int read_line(char *buf, int size)
LINT_INIT(last_quote); LINT_INIT(last_quote);
start_lineno= cur_file->lineno; start_lineno= cur_file->lineno;
DBUG_PRINT("info", ("start_lineno: %d", start_lineno)); DBUG_PRINT("info", ("Starting to read at lineno: %d", start_lineno));
for (; p < buf_end ;) for (; p < buf_end ;)
{ {
skip_char= 0; skip_char= 0;
...@@ -3370,7 +3370,7 @@ int read_line(char *buf, int size) ...@@ -3370,7 +3370,7 @@ int read_line(char *buf, int size)
die("Missing end of block"); die("Missing end of block");
*p= 0; *p= 0;
DBUG_PRINT("info", ("end of file")); DBUG_PRINT("info", ("end of file at line %d", cur_file->lineno));
DBUG_RETURN(1); DBUG_RETURN(1);
} }
cur_file--; cur_file--;
...@@ -3393,17 +3393,21 @@ int read_line(char *buf, int size) ...@@ -3393,17 +3393,21 @@ int read_line(char *buf, int size)
if (end_of_query(c)) if (end_of_query(c))
{ {
*p= 0; *p= 0;
DBUG_PRINT("exit", ("Found delimiter '%s'", delimiter)); DBUG_PRINT("exit", ("Found delimiter '%s' at line %d",
delimiter, cur_file->lineno));
DBUG_RETURN(0); DBUG_RETURN(0);
} }
else if ((c == '{' && else if ((c == '{' &&
(!strncasecmp(buf, "while", min(5, p - buf)) || (!my_strnncoll_simple(charset_info, "while", 5,
!strncasecmp(buf, "if", min(2, p - buf))))) buf, min(5, p - buf), 0) ||
!my_strnncoll_simple(charset_info, "if", 2,
buf, min(2, p - buf), 0))))
{ {
/* Only if and while commands can be terminated by { */ /* Only if and while commands can be terminated by { */
*p++= c; *p++= c;
*p= 0; *p= 0;
DBUG_PRINT("exit", ("Found '{' indicating begining of block")); DBUG_PRINT("exit", ("Found '{' indicating start of block at line %d",
cur_file->lineno));
DBUG_RETURN(0); DBUG_RETURN(0);
} }
else if (c == '\'' || c == '"' || c == '`') else if (c == '\'' || c == '"' || c == '`')
...@@ -3418,7 +3422,8 @@ int read_line(char *buf, int size) ...@@ -3418,7 +3422,8 @@ int read_line(char *buf, int size)
{ {
/* Comments are terminated by newline */ /* Comments are terminated by newline */
*p= 0; *p= 0;
DBUG_PRINT("exit", ("Found newline in comment")); DBUG_PRINT("exit", ("Found newline in comment at line: %d",
cur_file->lineno));
DBUG_RETURN(0); DBUG_RETURN(0);
} }
break; break;
...@@ -3433,13 +3438,19 @@ int read_line(char *buf, int size) ...@@ -3433,13 +3438,19 @@ int read_line(char *buf, int size)
{ {
/* Skip all space at begining of line */ /* Skip all space at begining of line */
if (c == '\n') if (c == '\n')
start_lineno= cur_file->lineno; /* Query hasn't started yet */ {
/* Query hasn't started yet */
start_lineno= cur_file->lineno;
DBUG_PRINT("info", ("Query hasn't started yet, start_lineno: %d",
start_lineno));
}
skip_char= 1; skip_char= 1;
} }
else if (end_of_query(c)) else if (end_of_query(c))
{ {
*p= 0; *p= 0;
DBUG_PRINT("exit", ("Found delimiter '%s'", delimiter)); DBUG_PRINT("exit", ("Found delimiter '%s' at line: %d",
delimiter, cur_file->lineno));
DBUG_RETURN(0); DBUG_RETURN(0);
} }
else if (c == '}') else if (c == '}')
...@@ -3447,7 +3458,8 @@ int read_line(char *buf, int size) ...@@ -3447,7 +3458,8 @@ int read_line(char *buf, int size)
/* A "}" need to be by itself in the begining of a line to terminate */ /* A "}" need to be by itself in the begining of a line to terminate */
*p++= c; *p++= c;
*p= 0; *p= 0;
DBUG_PRINT("exit", ("Found '}' in begining of a line")); DBUG_PRINT("exit", ("Found '}' in begining of a line at line: %d",
cur_file->lineno));
DBUG_RETURN(0); DBUG_RETURN(0);
} }
else if (c == '\'' || c == '"' || c == '`') else if (c == '\'' || c == '"' || c == '`')
...@@ -4317,7 +4329,7 @@ void append_stmt_result(DYNAMIC_STRING *ds, MYSQL_STMT *stmt, ...@@ -4317,7 +4329,7 @@ void append_stmt_result(DYNAMIC_STRING *ds, MYSQL_STMT *stmt,
bind[i].is_null= &is_null[i]; bind[i].is_null= &is_null[i];
bind[i].length= &length[i]; bind[i].length= &length[i];
DBUG_PRINT("bind", ("col[%d]: buffer_type: %d, buffer_length: %d", DBUG_PRINT("bind", ("col[%d]: buffer_type: %d, buffer_length: %lu",
i, bind[i].buffer_type, bind[i].buffer_length)); i, bind[i].buffer_type, bind[i].buffer_length));
} }
...@@ -7267,5 +7279,3 @@ void replace_dynstr_append_uint(DYNAMIC_STRING *ds, uint val) ...@@ -7267,5 +7279,3 @@ void replace_dynstr_append_uint(DYNAMIC_STRING *ds, uint val)
char *end= longlong10_to_str(val, buff, 10); char *end= longlong10_to_str(val, buff, 10);
replace_dynstr_append_mem(ds, buff, end - buff); replace_dynstr_append_mem(ds, buff, end - buff);
} }
mysql-test/lib/mtr_cases.pl
View file @ b2bf4843
...@@ -575,8 +575,6 @@ sub mtr_options_from_test_file($$) { ...@@ -575,8 +575,6 @@ sub mtr_options_from_test_file($$) {
while ( my $line= <$F> ) while ( my $line= <$F> )
{ {
next if ( $line !~ /^--/ );
# Match this line against tag in "tags" array # Match this line against tag in "tags" array
foreach my $tag (@tags) foreach my $tag (@tags)
{ {
...@@ -588,14 +586,21 @@ sub mtr_options_from_test_file($$) { ...@@ -588,14 +586,21 @@ sub mtr_options_from_test_file($$) {
} }
# If test sources another file, open it as well # If test sources another file, open it as well
if ( $line =~ /^\-\-([[:space:]]*)source(.*)$/ ) if ( $line =~ /^\-\-([[:space:]]*)source(.*)$/ or
$line =~ /^([[:space:]]*)source(.*);$/ )
{ {
my $value= $2; my $value= $2;
$value =~ s/^\s+//; # Remove leading space $value =~ s/^\s+//; # Remove leading space
$value =~ s/[[:space:]]+$//; # Remove ending space $value =~ s/[[:space:]]+$//; # Remove ending space
my $sourced_file= "$::glob_mysql_test_dir/$value"; my $sourced_file= "$::glob_mysql_test_dir/$value";
mtr_options_from_test_file($tinfo, $sourced_file); if ( -f $sourced_file )
{
# Only source the file if it exists, we may get
# false positives in the regexes above if someone
# writes "source nnnn;" in a test case(such as mysqltest.test)
mtr_options_from_test_file($tinfo, $sourced_file);
}
} }
} }
......
mysql-test/lib/mtr_report.pl
View file @ b2bf4843
...@@ -133,6 +133,7 @@ sub mtr_report_test_failed ($) { ...@@ -133,6 +133,7 @@ sub mtr_report_test_failed ($) {
if ( $tinfo->{'timeout'} ) if ( $tinfo->{'timeout'} )
{ {
print "[ fail ] timeout\n"; print "[ fail ] timeout\n";
return;
} }
elsif ( $tinfo->{'ndb_test'} and $::cluster->[0]->{'installed_ok'} eq "NO") elsif ( $tinfo->{'ndb_test'} and $::cluster->[0]->{'installed_ok'} eq "NO")
{ {
......
mysql-test/mysql-test-run.pl
View file @ b2bf4843
...@@ -468,11 +468,11 @@ sub initial_setup () { ...@@ -468,11 +468,11 @@ sub initial_setup () {
# #
# Look for the path where to find the client binaries # Look for the path where to find the client binaries
$path_client_bindir= mtr_path_exists("$glob_basedir/client/release", $path_client_bindir= mtr_path_exists("$glob_basedir/client_release",
"$glob_basedir/client_debug",
"$glob_basedir/client/release",
"$glob_basedir/client/debug", "$glob_basedir/client/debug",
"$glob_basedir/client", "$glob_basedir/client",
"$glob_basedir/client_release",
"$glob_basedir/client_debug",
"$glob_basedir/bin"); "$glob_basedir/bin");
# Look for the mysqld executable # Look for the mysqld executable
...@@ -484,6 +484,7 @@ sub initial_setup () { ...@@ -484,6 +484,7 @@ sub initial_setup () {
"$path_client_bindir/mysqld-debug", "$path_client_bindir/mysqld-debug",
"$path_client_bindir/mysqld-max", "$path_client_bindir/mysqld-max",
"$glob_basedir/libexec/mysqld", "$glob_basedir/libexec/mysqld",
"$glob_basedir/bin/mysqld",
"$glob_basedir/sql/release/mysqld", "$glob_basedir/sql/release/mysqld",
"$glob_basedir/sql/debug/mysqld"); "$glob_basedir/sql/debug/mysqld");
...@@ -1386,11 +1387,14 @@ sub executable_setup () { ...@@ -1386,11 +1387,14 @@ sub executable_setup () {
mtr_exe_exists("$ndb_path/src/kernel/ndbd", mtr_exe_exists("$ndb_path/src/kernel/ndbd",
"$glob_basedir/bin/ndbd"); "$glob_basedir/bin/ndbd");
$path_ndb_examples_dir= if ( $mysql_version_id >= 50000 )
mtr_path_exists("$ndb_path/ndbapi-examples", {
"$ndb_path/examples"); $path_ndb_examples_dir=
$exe_ndb_example= mtr_path_exists("$ndb_path/ndbapi-examples",
mtr_file_exists("$path_ndb_examples_dir/ndbapi_simple/ndbapi_simple"); "$ndb_path/examples");
$exe_ndb_example=
mtr_file_exists("$path_ndb_examples_dir/ndbapi_simple/ndbapi_simple");
}
} }
# Look for the udf_example library # Look for the udf_example library
...@@ -1413,18 +1417,27 @@ sub executable_setup () { ...@@ -1413,18 +1417,27 @@ sub executable_setup () {
} }
# Look for mysql_client_test executable if ( $glob_win32 and $mysql_version_id < 50000 )
if ( $glob_use_embedded_server )
{ {
$exe_mysql_client_test= # Skip looking for exe_mysql_client_test as its not built by default
mtr_exe_exists("$glob_basedir/libmysqld/examples/mysql_client_test_embedded"); # in 4.1 for windows.
$exe_mysql_client_test= "unavailable";
} }
else else
{ {
$exe_mysql_client_test= # Look for mysql_client_test executable
mtr_exe_exists("$glob_basedir/tests/mysql_client_test", if ( $glob_use_embedded_server )
"$glob_basedir/tests/release/mysql_client_test", {
"$glob_basedir/tests/debug/mysql_client_test"); $exe_mysql_client_test=
mtr_exe_exists("$glob_basedir/libmysqld/examples/mysql_client_test_embedded");
}
else
{
$exe_mysql_client_test=
mtr_exe_exists("$glob_basedir/tests/mysql_client_test",
"$glob_basedir/tests/release/mysql_client_test",
"$glob_basedir/tests/debug/mysql_client_test");
}
} }
} }
...@@ -1548,8 +1561,11 @@ sub environment_setup () { ...@@ -1548,8 +1561,11 @@ sub environment_setup () {
$ENV{'NDB_TOOLS_OUTPUT'}= $path_ndb_testrun_log; $ENV{'NDB_TOOLS_OUTPUT'}= $path_ndb_testrun_log;
$ENV{'NDB_CONNECTSTRING'}= $opt_ndbconnectstring; $ENV{'NDB_CONNECTSTRING'}= $opt_ndbconnectstring;
$ENV{'NDB_EXAMPLES_DIR'}= $path_ndb_examples_dir; if ( $mysql_version_id >= 50000 )
$ENV{'MY_NDB_EXAMPLES_BINARY'}= $exe_ndb_example; {
$ENV{'NDB_EXAMPLES_DIR'}= $path_ndb_examples_dir;
$ENV{'MY_NDB_EXAMPLES_BINARY'}= $exe_ndb_example;
}
$ENV{'NDB_EXAMPLES_OUTPUT'}= $path_ndb_testrun_log; $ENV{'NDB_EXAMPLES_OUTPUT'}= $path_ndb_testrun_log;
} }
...@@ -2809,6 +2825,33 @@ sub do_after_run_mysqltest($) ...@@ -2809,6 +2825,33 @@ sub do_after_run_mysqltest($)
} }
sub find_testcase_skipped_reason($)
{
my ($tinfo)= @_;
# Open mysqltest.log
my $F= IO::File->new($path_timefile) or
mtr_error("can't open file \"$path_timefile\": $!");
my $reason;
while ( my $line= <$F> )
{
# Look for "reason: <reason fo skiping test>"
if ( $line =~ /reason: (.*)/ )
{
$reason= $1;
}
}
if ( ! $reason )
{
mtr_warning("Could not find reason for skipping test in $path_timefile");
$reason= "Detected by testcase(reason unknown) ";
}
$tinfo->{'comment'}= $reason;
}
############################################################################## ##############################################################################
# #
# Run a single test case # Run a single test case
...@@ -2881,10 +2924,7 @@ sub run_testcase ($) { ...@@ -2881,10 +2924,7 @@ sub run_testcase ($) {
# Testcase itself tell us to skip this one # Testcase itself tell us to skip this one
# Try to get reason from mysqltest.log # Try to get reason from mysqltest.log
my $last_line= mtr_lastlinefromfile($path_timefile) if -f $path_timefile; find_testcase_skipped_reason($tinfo);
my $reason= mtr_match_prefix($last_line, "reason: ");
$tinfo->{'comment'}=
defined $reason ? $reason : "Detected by testcase(reason unknown) ";
mtr_report_test_skipped($tinfo); mtr_report_test_skipped($tinfo);
} }
elsif ( $res == 63 ) elsif ( $res == 63 )
......
mysql-test/r/innodb_mysql.result
View file @ b2bf4843
...@@ -104,6 +104,16 @@ SELECT `id1` FROM `t1` WHERE `id1` NOT IN (SELECT `id1` FROM `t2` WHERE `id2` = ...@@ -104,6 +104,16 @@ SELECT `id1` FROM `t1` WHERE `id1` NOT IN (SELECT `id1` FROM `t2` WHERE `id2` =
id1 id1
2 2
DROP TABLE t1, t2; DROP TABLE t1, t2;
flush status;
create table t1 (c1 int) engine=innodb;
handler t1 open;
handler t1 read first;
c1
show /*!50002 GLOBAL */ status like 'Handler_rollback';
Variable_name Value
Handler_rollback 0
drop table t1;
End of 4.1 tests
create table t1m (a int) engine=myisam; create table t1m (a int) engine=myisam;
create table t1i (a int) engine=innodb; create table t1i (a int) engine=innodb;
create table t2m (a int) engine=myisam; create table t2m (a int) engine=myisam;
......
mysql-test/t/func_time.test
View file @ b2bf4843
...@@ -488,8 +488,6 @@ DROP TABLE t1; ...@@ -488,8 +488,6 @@ DROP TABLE t1;
# #
# check if SEC_TO_TIME() handles BIGINT UNSIGNED values correctly # check if SEC_TO_TIME() handles BIGINT UNSIGNED values correctly
SELECT SEC_TO_TIME(CAST(-1 AS UNSIGNED)); SELECT SEC_TO_TIME(CAST(-1 AS UNSIGNED));
#
# 21913: DATE_FORMAT() Crashes mysql server if I use it through # 21913: DATE_FORMAT() Crashes mysql server if I use it through
# mysql-connector-j driver. # mysql-connector-j driver.
# #
......
mysql-test/t/innodb_mysql.test
View file @ b2bf4843
...@@ -117,6 +117,22 @@ INSERT INTO `t2`(`id1`,`id2`,`id3`,`id4`) VALUES ...@@ -117,6 +117,22 @@ INSERT INTO `t2`(`id1`,`id2`,`id3`,`id4`) VALUES
SELECT `id1` FROM `t1` WHERE `id1` NOT IN (SELECT `id1` FROM `t2` WHERE `id2` = 1 AND `id3` = 2); SELECT `id1` FROM `t1` WHERE `id1` NOT IN (SELECT `id1` FROM `t2` WHERE `id2` = 1 AND `id3` = 2);
DROP TABLE t1, t2; DROP TABLE t1, t2;
# Bug #22728 - Handler_rollback value is growing
#
flush status;
create table t1 (c1 int) engine=innodb;
connect (con1,localhost,root,,);
connect (con2,localhost,root,,);
connection con2;
handler t1 open;
handler t1 read first;
disconnect con2;
connection con1;
show /*!50002 GLOBAL */ status like 'Handler_rollback';
connection default;
drop table t1;
disconnect con1;
--echo End of 4.1 tests
# #
# Bug #12882 min/max inconsistent on empty table # Bug #12882 min/max inconsistent on empty table
# #
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7