summaryrefslogtreecommitdiff
path: root/regex
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2004-10-22 18:44:51 +0300
committerunknown <monty@mysql.com>2004-10-22 18:44:51 +0300
commitbc6652db9b1f5f302648c3a920fb1fa25449a6d8 (patch)
tree6faefd7a2f197f4031ef94eb74fc71f8f2936185 /regex
parentcfcca61a177eecacdc2c525c1ba4fea082b1b1c4 (diff)
downloadmariadb-git-bc6652db9b1f5f302648c3a920fb1fa25449a6d8.tar.gz
Fix compiler warnings (detected by Intel's C++ compiler)
Fixed checking of privilege handling in CREATE ... SELECT (Bug #6094) client/mysql.cc: Fix compiler warnings client/mysqltest.c: Fix wrong counting of lines Remove compiler warnings heap/hp_hash.c: Fix compiler warnings innobase/dict/dict0load.c: Fix compiler warnings innobase/include/mem0mem.h: Fix compiler warnings libmysql/client_settings.h: Fix compiler warnings myisam/ft_nlq_search.c: Add comments about compiler warnings myisam/rt_index.c: Add comments about compiler warnings myisam/rt_mbr.c: Add comments about compiler warnings mysql-test/r/ps.result: Test case for bug#6094 mysql-test/t/ps.test: Test case for bug#6094 mysys/hash.c: Fix compiler warnings mysys/my_handler.c: Add comments about compiler warnings mysys/my_thr_init.c: Add comments about compiler warnings ndb/include/mgmapi/mgmapi.h: Fix compiler warnings regex/main.c: Fix compiler warnings sql/item.h: Fix compiler warnings sql/item_func.h: Add comments about compiler warnings sql/spatial.h: Add comments about compiler warnings sql/sql_lex.h: Fix compiler warning sql/sql_list.h: Fix compiler warning sql/sql_parse.cc: Move testing of access rights of tables in CREATE ... SELECT to create_table_precheck() to fix privilege checking in CREATE ... SELECT (Bug #6094) sql/sql_prepare.cc: Remove not needed empty line sql/sql_string.h: Fix compiler warnings strings/ctype-mb.c: Fix compiler warnings
Diffstat (limited to 'regex')
-rw-r--r--regex/main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/regex/main.c b/regex/main.c
index f43a112a661..29abca6d9a2 100644
--- a/regex/main.c
+++ b/regex/main.c
@@ -78,7 +78,7 @@ char *argv[];
if (err) {
len = regerror(err, &re, erbuf, sizeof(erbuf));
fprintf(stderr, "error %s, %d/%d `%s'\n",
- eprint(err), len, sizeof(erbuf), erbuf);
+ eprint(err), len, (int) sizeof(erbuf), erbuf);
exit(status);
}
regprint(&re, stdout);
@@ -96,7 +96,7 @@ char *argv[];
if (err) {
len = regerror(err, &re, erbuf, sizeof(erbuf));
fprintf(stderr, "error %s, %d/%d `%s'\n",
- eprint(err), len, sizeof(erbuf), erbuf);
+ eprint(err), (int) len, (int) sizeof(erbuf), erbuf);
exit(status);
}
if (!(copts&REG_NOSUB)) {
@@ -232,7 +232,7 @@ int opts; /* may not match f1 */
len = regerror(err, &re, erbuf, sizeof(erbuf));
fprintf(stderr, "%d: %s error %s, %d/%d `%s'\n",
line, type, eprint(err), len,
- sizeof(erbuf), erbuf);
+ (int) sizeof(erbuf), erbuf);
status = 1;
} else if (err == 0 && opt('C', f1)) {
/* unexpected success */
@@ -263,7 +263,7 @@ int opts; /* may not match f1 */
len = regerror(err, &re, erbuf, sizeof(erbuf));
fprintf(stderr, "%d: %s exec error %s, %d/%d `%s'\n",
line, type, eprint(err), len,
- sizeof(erbuf), erbuf);
+ (int) sizeof(erbuf), erbuf);
status = 1;
} else if (err != 0) {
/* nothing more to check */