summaryrefslogtreecommitdiff
path: root/plugin/user_variables
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2016-06-19 15:06:10 +0300
committerMonty <monty@mariadb.org>2016-06-22 22:04:55 +0300
commit838205f0bb3a818e05e34c25d55053a9a2a1487e (patch)
tree0c3f99c569a33b926aa10f855791a646817e5ad8 /plugin/user_variables
parent34eb10e4064a7f38fc7d41016a6bcc5443ebe0c3 (diff)
downloadmariadb-git-838205f0bb3a818e05e34c25d55053a9a2a1487e.tar.gz
Fixed compiler warnings and test failures found by buildbot
Diffstat (limited to 'plugin/user_variables')
-rw-r--r--plugin/user_variables/user_variables.cc24
1 files changed, 12 insertions, 12 deletions
diff --git a/plugin/user_variables/user_variables.cc b/plugin/user_variables/user_variables.cc
index c6c48d09303..981c39cdb86 100644
--- a/plugin/user_variables/user_variables.cc
+++ b/plugin/user_variables/user_variables.cc
@@ -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
};