1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00

Fixed compiler warnings and test failures found by buildbot

This commit is contained in:
Monty
2016-06-19 15:06:10 +03:00
parent 34eb10e406
commit 838205f0bb
11 changed files with 46 additions and 32 deletions

View File

@ -21,23 +21,23 @@
static const LEX_CSTRING result_types[]=
{
STRING_WITH_LEN("VARCHAR"),
STRING_WITH_LEN("DOUBLE"),
STRING_WITH_LEN("INT"),
STRING_WITH_LEN("<IMPOSSIBLE1>"), // ROW_RESULT
STRING_WITH_LEN("DECIMAL"),
STRING_WITH_LEN("<IMPOSSIBLE2>") // TIME_RESULT
{ STRING_WITH_LEN("VARCHAR") },
{ STRING_WITH_LEN("DOUBLE") },
{ STRING_WITH_LEN("INT") },
{ STRING_WITH_LEN("<IMPOSSIBLE1>") }, // ROW_RESULT
{ STRING_WITH_LEN("DECIMAL") },
{ STRING_WITH_LEN("<IMPOSSIBLE2>")} // TIME_RESULT
};
static const LEX_CSTRING unsigned_result_types[]=
{
STRING_WITH_LEN("<IMPOSSIBLE3>"), // UNSIGNED STRING_RESULT
STRING_WITH_LEN("DOUBLE UNSIGNED"),
STRING_WITH_LEN("INT UNSIGNED"),
STRING_WITH_LEN("<IMPOSSIBLE4>"), // UNSIGNED ROW_RESULT
STRING_WITH_LEN("DECIMAL UNSIGNED"),
STRING_WITH_LEN("<IMPOSSIBLE5>") // UNSIGNED TIME_RESULT
{ STRING_WITH_LEN("<IMPOSSIBLE3>") }, // UNSIGNED STRING_RESULT
{ STRING_WITH_LEN("DOUBLE UNSIGNED") },
{ STRING_WITH_LEN("INT UNSIGNED") },
{ STRING_WITH_LEN("<IMPOSSIBLE4>") }, // UNSIGNED ROW_RESULT
{ STRING_WITH_LEN("DECIMAL UNSIGNED") },
{ STRING_WITH_LEN("<IMPOSSIBLE5>") } // UNSIGNED TIME_RESULT
};