From cba84469eb96481568a9f4ddf3f2989c49c9294c Mon Sep 17 00:00:00 2001 From: Monty Date: Sun, 23 Apr 2017 13:56:50 +0300 Subject: [PATCH] Fixed compiler warnings and wrong test results --- client/mysqltest.cc | 2 +- mysql-test/suite/innodb/r/innodb_mysql.result | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/mysqltest.cc b/client/mysqltest.cc index d930369e303..56d1083a5f6 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -1563,7 +1563,7 @@ static void make_error_message(char *buf, size_t len, const char *fmt, va_list a fmt= "unknown error"; s+= my_vsnprintf(s, end - s, fmt, args); - s+= my_snprintf(s, end -s, "\n", start_lineno); + s+= my_snprintf(s, end -s, "\n"); } void die(const char *fmt, ...) diff --git a/mysql-test/suite/innodb/r/innodb_mysql.result b/mysql-test/suite/innodb/r/innodb_mysql.result index 8bbe562e0f6..4c815c7c212 100644 --- a/mysql-test/suite/innodb/r/innodb_mysql.result +++ b/mysql-test/suite/innodb/r/innodb_mysql.result @@ -1547,7 +1547,7 @@ insert into t1 values('aaa'); set statement sql_mode = 'NO_ENGINE_SUBSTITUTION' for alter table t1 add index(a(1024)); Warnings: -Warning 1071 Specified key was too long; max key length is 767 bytes +Note 1071 Specified key was too long; max key length is 767 bytes show create table t1; Table Create Table t1 CREATE TABLE `t1` (