summaryrefslogtreecommitdiff
path: root/sql/mysql_priv.h
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2006-06-23 02:49:19 +0300
committerunknown <monty@mysql.com>2006-06-23 02:49:19 +0300
commite03f8ef25aa521dd698f185d4500e5eaab5766cb (patch)
tree58ab5561c26c742cf51ff01378a1d269f85b5637 /sql/mysql_priv.h
parentb58e990c748d77637f127a819b41f440e60e1d7d (diff)
downloadmariadb-git-e03f8ef25aa521dd698f185d4500e5eaab5766cb.tar.gz
Remove compiler warnings
Fixed wrong table flags type in ndbcluster that caused previous commit to fail client/mysqltest.c: Portability fix mysys/my_bitmap.c: Remove compiler warning mysys/my_handler.c: Remove compiler warning mysys/thr_lock.c: Remove compiler warning plugin/fulltext/plugin_example.c: Remove compiler warning sql/ha_ndbcluster.h: Fixed wrong of handler flags (caused previous commit to fail) sql/ha_ndbcluster_binlog.cc: Remove compiler warning sql/handler.cc: Indentation cleanups sql/mysql_priv.h: Changed log_output_options to ulong to remove compiler warning (and wrong test on 64 bit machines) sql/mysqld.cc: Changed log_output_options to ulong to remove compiler warning (and wrong test on 64 bit machines) Split initialization of variables of different types to remove compiler warning sql/set_var.cc: Fixed indentation sql/set_var.h: sys_var_log_output now takes a pointer to ulong storage/archive/archive_test.c: Remove compiler warning
Diffstat (limited to 'sql/mysql_priv.h')
-rw-r--r--sql/mysql_priv.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index cb9ae481987..e3d28a23c15 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -1518,7 +1518,7 @@ extern bool opt_using_transactions, mysqld_embedded;
extern bool using_update_log, opt_large_files, server_id_supplied;
extern bool opt_update_log, opt_bin_log, opt_error_log;
extern my_bool opt_log, opt_slow_log;
-extern uint log_output_options;
+extern ulong log_output_options;
extern my_bool opt_log_queries_not_using_indexes;
extern bool opt_disable_networking, opt_skip_show_db;
extern my_bool opt_character_set_client_handshake;