diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2012-06-29 13:36:01 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2012-06-29 13:36:01 +0200 |
| commit | 050048462c8209a5e5d75587147d343f683cc7df (patch) | |
| tree | e59402376e17ec2bcafbd8ff085307b066cdf7c4 /client/mysqltest.cc | |
| parent | 47c1ce35e2ce9b9e756be17ab3a1ce309eea12c8 (diff) | |
| parent | 435866976746d342847ad2a7a13be77cd77c556b (diff) | |
| download | mariadb-git-050048462c8209a5e5d75587147d343f683cc7df.tar.gz | |
Bug#14238406 NEW COMPILATION WARNINGS WITH GCC 4.7 (-WERROR=NARROWING)
Manual merge from mysql-5.1 to mysql-5.5
Diffstat (limited to 'client/mysqltest.cc')
| -rw-r--r-- | client/mysqltest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 1bd5d5941e5..6bd1472f6a3 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -4823,7 +4823,7 @@ typedef struct static st_error global_error_names[] = { - { "<No error>", -1, "" }, + { "<No error>", -1U, "" }, #include <mysqld_ername.h> { 0, 0, 0 } }; |