Below is the list of changes that have just been committed into a local
5.1 repository of vvaintroub. When vvaintroub does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2008-04-08 12:30:06+02:00, vvaintroub@wva. +122 -0
Bug#32082 : definition of VOID in my_global.h conflicts with Windows
SDK headers
VOID macro is now removed. Its usage is replaced with void cast.
In some cases, where cast does not make much sense (pthread_*, printf,
hash_delete, my_seek), cast is ommited.
client/mysqladmin.cc@stripped, 2008-04-08 12:28:59+02:00, vvaintroub@wva. +3 -3
Bug#32082 : remove VOID macro
client/mysqldump.c@stripped, 2008-04-08 12:29:00+02:00, vvaintroub@wva. +5 -5
Bug#32082 : remove VOID macro
client/mysqlimport.c@stripped, 2008-04-08 12:29:00+02:00, vvaintroub@wva. +4 -4
Bug#32082 : remove VOID macro
client/mysqlslap.c@stripped, 2008-04-08 12:29:00+02:00, vvaintroub@wva. +8 -8
Bug#32082 : remove VOID macro
client/mysqltest.c@stripped, 2008-04-08 12:29:01+02:00, vvaintroub@wva. +4 -4
Bug#32082 : remove VOID macro
client/sql_string.cc@stripped, 2008-04-08 12:29:01+02:00, vvaintroub@wva. +1 -1
Bug#32082 : remove VOID macro
extra/comp_err.c@stripped, 2008-04-08 12:29:02+02:00, vvaintroub@wva. +4 -4
Bug#32082 : remove VOID macro
extra/replace.c@stripped, 2008-04-08 12:29:02+02:00, vvaintroub@wva. +2 -2
Bug#32082 : remove VOID macro
include/my_alarm.h@stripped, 2008-04-08 12:29:03+02:00, vvaintroub@wva. +5 -5
Bug#32082 : remove VOID macro
include/my_global.h@stripped, 2008-04-08 12:29:03+02:00, vvaintroub@wva. +0 -11
Bug#32082 : remove VOID macro
libmysql/libmysql.c@stripped, 2008-04-08 12:29:04+02:00, vvaintroub@wva. +1 -1
Bug#32082 : remove VOID macro
mysys/hash.c@stripped, 2008-04-08 12:29:04+02:00, vvaintroub@wva. +1 -1
Bug#32082 : remove VOID macro
mysys/mf_iocache2.c@stripped, 2008-04-08 12:29:05+02:00, vvaintroub@wva. +2 -2
Bug#32082 : remove VOID macro
mysys/mf_keycache.c@stripped, 2008-04-08 12:29:05+02:00, vvaintroub@wva. +2 -2
Bug#32082 : remove VOID macro
mysys/mf_loadpath.c@stripped, 2008-04-08 12:29:06+02:00, vvaintroub@wva. +4 -4
Bug#32082 : remove VOID macro
mysys/mf_path.c@stripped, 2008-04-08 12:29:06+02:00, vvaintroub@wva. +3 -3
Bug#32082 : remove VOID macro
mysys/my_append.c@stripped, 2008-04-08 12:29:06+02:00, vvaintroub@wva. +2 -2
Bug#32082 : remove VOID macro
mysys/my_clock.c@stripped, 2008-04-08 12:29:07+02:00, vvaintroub@wva. +1 -1
Bug#32082 : remove VOID macro
mysys/my_copy.c@stripped, 2008-04-08 12:29:07+02:00, vvaintroub@wva. +6 -6
Bug#32082 : remove VOID macro
mysys/my_fstream.c@stripped, 2008-04-08 12:29:08+02:00, vvaintroub@wva. +3 -3
Bug#32082 : remove VOID macro
mysys/my_getwd.c@stripped, 2008-04-08 12:29:08+02:00, vvaintroub@wva. +1 -1
Bug#32082 : remove VOID macro
mysys/my_lib.c@stripped, 2008-04-08 12:29:09+02:00, vvaintroub@wva. +11 -11
Bug#32082 : remove VOID macro
mysys/my_lockmem.c@stripped, 2008-04-08 12:29:09+02:00, vvaintroub@wva. +2 -2
Bug#32082 : remove VOID macro
mysys/my_pread.c@stripped, 2008-04-08 12:29:10+02:00, vvaintroub@wva. +1 -1
Bug#32082 : remove VOID macro
mysys/my_pthread.c@stripped, 2008-04-08 12:29:10+02:00, vvaintroub@wva. +6 -6
Bug#32082 : remove VOID macro
mysys/my_redel.c@stripped, 2008-04-08 12:29:10+02:00, vvaintroub@wva. +4 -4
Bug#32082 : remove VOID macro
mysys/my_winthread.c@stripped, 2008-04-08 12:29:11+02:00, vvaintroub@wva. +1 -1
Bug#32082 : remove VOID macro
mysys/my_write.c@stripped, 2008-04-08 12:29:11+02:00, vvaintroub@wva. +1 -1
Bug#32082 : remove VOID macro
mysys/thr_alarm.c@stripped, 2008-04-08 12:29:12+02:00, vvaintroub@wva. +10 -10
Bug#32082 : remove VOID macro
mysys/thr_lock.c@stripped, 2008-04-08 12:29:12+02:00, vvaintroub@wva. +10 -10
Bug#32082 : remove VOID macro
sql/derror.cc@stripped, 2008-04-08 12:29:13+02:00, vvaintroub@wva. +3 -3
Bug#32082 : remove VOID macro
sql/des_key_file.cc@stripped, 2008-04-08 12:29:13+02:00, vvaintroub@wva. +2 -2
Bug#32082 : remove VOID macro
sql/discover.cc@stripped, 2008-04-08 12:29:14+02:00, vvaintroub@wva. +2 -2
Bug#32082 : remove VOID macro
sql/field.cc@stripped, 2008-04-08 12:29:14+02:00, vvaintroub@wva. +2 -2
Bug#32082 : remove VOID macro
sql/filesort.cc@stripped, 2008-04-08 12:29:14+02:00, vvaintroub@wva. +1 -1
Bug#32082 : remove VOID macro
sql/ha_ndbcluster.cc@stripped, 2008-04-08 12:29:15+02:00, vvaintroub@wva. +2 -2
Bug#32082 : remove VOID macro
sql/ha_partition.cc@stripped, 2008-04-08 12:29:15+02:00, vvaintroub@wva. +15 -15
Bug#32082 : remove VOID macro
sql/handler.cc@stripped, 2008-04-08 12:29:16+02:00, vvaintroub@wva. +3 -3
Bug#32082 : remove VOID macro
sql/hostname.cc@stripped, 2008-04-08 12:29:16+02:00, vvaintroub@wva. +14 -14
Bug#32082 : remove VOID macro
sql/init.cc@stripped, 2008-04-08 12:29:17+02:00, vvaintroub@wva. +1 -1
Bug#32082 : remove VOID macro
sql/item.cc@stripped, 2008-04-08 12:29:17+02:00, vvaintroub@wva. +1 -1
Bug#32082 : remove VOID macro
sql/item_cmpfunc.cc@stripped, 2008-04-08 12:29:18+02:00, vvaintroub@wva. +1 -1
Bug#32082 : remove VOID macro
sql/item_strfunc.cc@stripped, 2008-04-08 12:29:18+02:00, vvaintroub@wva. +6 -6
Bug#32082 : remove VOID macro
sql/lock.cc@stripped, 2008-04-08 12:29:19+02:00, vvaintroub@wva. +6 -6
Bug#32082 : remove VOID macro
sql/log.cc@stripped, 2008-04-08 12:29:19+02:00, vvaintroub@wva. +10 -10
Bug#32082 : remove VOID macro
sql/log_event.cc@stripped, 2008-04-08 12:29:20+02:00, vvaintroub@wva. +8 -8
Bug#32082 : remove VOID macro
sql/mysqld.cc@stripped, 2008-04-08 12:29:20+02:00, vvaintroub@wva. +6 -6
Bug#32082 : remove VOID macro
sql/opt_range.h@stripped, 2008-04-08 12:29:21+02:00, vvaintroub@wva. +1 -1
Bug#32082 : remove VOID macro
sql/parse_file.cc@stripped, 2008-04-08 12:29:21+02:00, vvaintroub@wva. +2 -2
Bug#32082 : remove VOID macro
sql/protocol.cc@stripped, 2008-04-08 12:29:22+02:00, vvaintroub@wva. +7 -7
Bug#32082 : remove VOID macro
sql/records.cc@stripped, 2008-04-08 12:29:22+02:00, vvaintroub@wva. +3 -3
Bug#32082 : remove VOID macro
sql/slave.cc@stripped, 2008-04-08 12:29:23+02:00, vvaintroub@wva. +4 -4
Bug#32082 : remove VOID macro
sql/sp_head.cc@stripped, 2008-04-08 12:29:23+02:00, vvaintroub@wva. +4 -4
Bug#32082 : remove VOID macro
sql/sp_pcontext.cc@stripped, 2008-04-08 12:29:24+02:00, vvaintroub@wva. +20 -20
Bug#32082 : remove VOID macro
sql/sql_acl.cc@stripped, 2008-04-08 12:29:24+02:00, vvaintroub@wva. +50 -50
Bug#32082 : remove VOID macro
sql/sql_base.cc@stripped, 2008-04-08 12:29:25+02:00, vvaintroub@wva. +54 -54
Bug#32082 : remove VOID macro
sql/sql_cache.cc@stripped, 2008-04-08 12:29:25+02:00, vvaintroub@wva. +6 -6
Bug#32082 : remove VOID macro
sql/sql_connect.cc@stripped, 2008-04-08 12:29:26+02:00, vvaintroub@wva. +1 -1
Bug#32082 : remove VOID macro
sql/sql_db.cc@stripped, 2008-04-08 12:29:26+02:00, vvaintroub@wva. +8 -8
Bug#32082 : remove VOID macro
sql/sql_delete.cc@stripped, 2008-04-08 12:29:26+02:00, vvaintroub@wva. +6 -6
Bug#32082 : remove VOID macro
sql/sql_handler.cc@stripped, 2008-04-08 12:29:27+02:00, vvaintroub@wva. +2 -2
Bug#32082 : remove VOID macro
sql/sql_insert.cc@stripped, 2008-04-08 12:29:27+02:00, vvaintroub@wva. +10 -10
Bug#32082 : remove VOID macro
sql/sql_map.cc@stripped, 2008-04-08 12:29:28+02:00, vvaintroub@wva. +8 -8
Bug#32082 : remove VOID macro
sql/sql_parse.cc@stripped, 2008-04-08 12:29:28+02:00, vvaintroub@wva. +10 -10
Bug#32082 : remove VOID macro
sql/sql_select.cc@stripped, 2008-04-08 12:29:29+02:00, vvaintroub@wva. +8 -8
Bug#32082 : remove VOID macro
sql/sql_servers.cc@stripped, 2008-04-08 12:29:29+02:00, vvaintroub@wva. +2 -2
Bug#32082 : remove VOID macro
sql/sql_show.cc@stripped, 2008-04-08 12:29:30+02:00, vvaintroub@wva. +11 -11
Bug#32082 : remove VOID macro
sql/sql_string.cc@stripped, 2008-04-08 12:29:30+02:00, vvaintroub@wva. +1 -1
Bug#32082 : remove VOID macro
sql/sql_table.cc@stripped, 2008-04-08 12:29:31+02:00, vvaintroub@wva. +52 -52
Bug#32082 : remove VOID macro
sql/sql_test.cc@stripped, 2008-04-08 12:29:31+02:00, vvaintroub@wva. +14 -14
Bug#32082 : remove VOID macro
sql/sql_trigger.cc@stripped, 2008-04-08 12:29:32+02:00, vvaintroub@wva. +2 -2
Bug#32082 : remove VOID macro
sql/sql_update.cc@stripped, 2008-04-08 12:29:32+02:00, vvaintroub@wva. +2 -2
Bug#32082 : remove VOID macro
sql/sql_view.cc@stripped, 2008-04-08 12:29:33+02:00, vvaintroub@wva. +4 -4
Bug#32082 : remove VOID macro
sql/stacktrace.c@stripped, 2008-04-08 12:29:33+02:00, vvaintroub@wva. +0 -3
Remove workaround for Bug#32082
sql/table.cc@stripped, 2008-04-08 12:29:34+02:00, vvaintroub@wva. +15 -15
Bug#32082 : remove VOID macro
sql/tztime.cc@stripped, 2008-04-08 12:29:34+02:00, vvaintroub@wva. +4 -4
Bug#32082 : remove VOID macro
sql/udf_example.c@stripped, 2008-04-08 12:29:35+02:00, vvaintroub@wva. +6 -6
Bug#32082 : remove VOID macro
sql/uniques.cc@stripped, 2008-04-08 12:29:35+02:00, vvaintroub@wva. +2 -2
Bug#32082 : remove VOID macro
sql/unireg.cc@stripped, 2008-04-08 12:29:36+02:00, vvaintroub@wva. +7 -7
Bug#32082 : remove VOID macro
storage/archive/ha_archive.cc@stripped, 2008-04-08 12:29:36+02:00, vvaintroub@wva. +6 -6
Bug#32082 : remove VOID macro
storage/blackhole/ha_blackhole.cc@stripped, 2008-04-08 12:29:36+02:00, vvaintroub@wva. +1 -1
Bug#32082 : remove VOID macro
storage/csv/ha_tina.cc@stripped, 2008-04-08 12:29:37+02:00, vvaintroub@wva. +3 -3
Bug#32082 : remove VOID macro
storage/csv/transparent_file.cc@stripped, 2008-04-08 12:29:37+02:00, vvaintroub@wva. +2 -2
Bug#32082 : remove VOID macro
storage/example/ha_example.cc@stripped, 2008-04-08 12:29:38+02:00, vvaintroub@wva. +1 -1
Bug#32082 : remove VOID macro
storage/federated/ha_federated.cc@stripped, 2008-04-08 12:29:38+02:00, vvaintroub@wva. +3
-3
Bug#32082 : remove VOID macro
storage/heap/hp_clear.c@stripped, 2008-04-08 12:29:39+02:00, vvaintroub@wva. +3 -3
Bug#32082 : remove VOID macro
storage/heap/hp_create.c@stripped, 2008-04-08 12:29:39+02:00, vvaintroub@wva. +2 -2
Bug#32082 : remove VOID macro
storage/heap/hp_test1.c@stripped, 2008-04-08 12:29:40+02:00, vvaintroub@wva. +1 -1
Bug#32082 : remove VOID macro
storage/heap/hp_test2.c@stripped, 2008-04-08 12:29:40+02:00, vvaintroub@wva. +1 -1
Bug#32082 : remove VOID macro
storage/innobase/handler/ha_innodb.cc@stripped, 2008-04-08 12:29:41+02:00, vvaintroub@wva.
+2 -2
Bug#32082 : remove VOID macro
storage/myisam/ft_eval.c@stripped, 2008-04-08 12:29:41+02:00, vvaintroub@wva. +2 -2
Bug#32082 : remove VOID macro
storage/myisam/ha_myisam.cc@stripped, 2008-04-08 12:29:42+02:00, vvaintroub@wva. +6 -6
Bug#32082 : remove VOID macro
storage/myisam/mi_changed.c@stripped, 2008-04-08 12:29:42+02:00, vvaintroub@wva. +1 -1
Bug#32082 : remove VOID macro
storage/myisam/mi_check.c@stripped, 2008-04-08 12:29:42+02:00, vvaintroub@wva. +35 -35
Bug#32082 : remove VOID macro
storage/myisam/mi_close.c@stripped, 2008-04-08 12:29:43+02:00, vvaintroub@wva. +3 -3
Bug#32082 : remove VOID macro
storage/myisam/mi_create.c@stripped, 2008-04-08 12:29:43+02:00, vvaintroub@wva. +3 -3
Bug#32082 : remove VOID macro
storage/myisam/mi_dbug.c@stripped, 2008-04-08 12:29:44+02:00, vvaintroub@wva. +18 -18
Bug#32082 : remove VOID macro
storage/myisam/mi_delete.c@stripped, 2008-04-08 12:29:44+02:00, vvaintroub@wva. +2 -2
Bug#32082 : remove VOID macro
storage/myisam/mi_delete_all.c@stripped, 2008-04-08 12:29:45+02:00, vvaintroub@wva. +2 -2
Bug#32082 : remove VOID macro
storage/myisam/mi_dynrec.c@stripped, 2008-04-08 12:29:45+02:00, vvaintroub@wva. +6 -6
Bug#32082 : remove VOID macro
storage/myisam/mi_info.c@stripped, 2008-04-08 12:29:46+02:00, vvaintroub@wva. +1 -1
Bug#32082 : remove VOID macro
storage/myisam/mi_locking.c@stripped, 2008-04-08 12:29:46+02:00, vvaintroub@wva. +9 -9
Bug#32082 : remove VOID macro
storage/myisam/mi_log.c@stripped, 2008-04-08 12:29:46+02:00, vvaintroub@wva. +7 -7
Bug#32082 : remove VOID macro
storage/myisam/mi_open.c@stripped, 2008-04-08 12:29:47+02:00, vvaintroub@wva. +8 -8
Bug#32082 : remove VOID macro
storage/myisam/mi_packrec.c@stripped, 2008-04-08 12:29:47+02:00, vvaintroub@wva. +3 -3
Bug#32082 : remove VOID macro
storage/myisam/mi_panic.c@stripped, 2008-04-08 12:29:48+02:00, vvaintroub@wva. +1 -1
Bug#32082 : remove VOID macro
storage/myisam/mi_rsame.c@stripped, 2008-04-08 12:29:48+02:00, vvaintroub@wva. +2 -2
Bug#32082 : remove VOID macro
storage/myisam/mi_statrec.c@stripped, 2008-04-08 12:29:49+02:00, vvaintroub@wva. +1 -1
Bug#32082 : remove VOID macro
storage/myisam/mi_test1.c@stripped, 2008-04-08 12:29:49+02:00, vvaintroub@wva. +3 -3
Bug#32082 : remove VOID macro
storage/myisam/mi_test2.c@stripped, 2008-04-08 12:29:50+02:00, vvaintroub@wva. +1 -1
Bug#32082 : remove VOID macro
storage/myisam/mi_test3.c@stripped, 2008-04-08 12:29:50+02:00, vvaintroub@wva. +1 -1
Bug#32082 : remove VOID macro
storage/myisam/mi_update.c@stripped, 2008-04-08 12:29:50+02:00, vvaintroub@wva. +2 -2
Bug#32082 : remove VOID macro
storage/myisam/mi_write.c@stripped, 2008-04-08 12:29:51+02:00, vvaintroub@wva. +2 -2
Bug#32082 : remove VOID macro
storage/myisam/myisamchk.c@stripped, 2008-04-08 12:29:51+02:00, vvaintroub@wva. +43 -43
Bug#32082 : remove VOID macro
storage/myisam/myisamlog.c@stripped, 2008-04-08 12:29:52+02:00, vvaintroub@wva. +25 -25
Bug#32082 : remove VOID macro
storage/myisam/myisampack.c@stripped, 2008-04-08 12:29:52+02:00, vvaintroub@wva. +110 -110
Bug#32082 : remove VOID macro
storage/myisam/sort.c@stripped, 2008-04-08 12:29:53+02:00, vvaintroub@wva. +1 -1
Bug#32082 : remove VOID macro
storage/myisammrg/myrg_close.c@stripped, 2008-04-08 12:29:53+02:00, vvaintroub@wva. +1 -1
Bug#32082 : remove VOID macro
storage/myisammrg/myrg_create.c@stripped, 2008-04-08 12:29:54+02:00, vvaintroub@wva. +1 -1
Bug#32082 : remove VOID macro
storage/myisammrg/myrg_open.c@stripped, 2008-04-08 12:29:54+02:00, vvaintroub@wva. +12 -12
Bug#32082 : remove VOID macro
strings/str_test.c@stripped, 2008-04-08 12:29:55+02:00, vvaintroub@wva. +8 -8
Bug#32082 : remove VOID macro
tests/thread_test.c@stripped, 2008-04-08 12:29:55+02:00, vvaintroub@wva. +1 -1
Bug#32082 : remove VOID macro
diff -Nrup a/client/mysqladmin.cc b/client/mysqladmin.cc
--- a/client/mysqladmin.cc 2007-09-15 05:10:27 +02:00
+++ b/client/mysqladmin.cc 2008-04-08 12:28:59 +02:00
@@ -344,8 +344,8 @@ int main(int argc,char *argv[])
if (tty_password)
opt_password = get_tty_password(NullS);
- VOID(signal(SIGINT,endprog)); /* Here if abort */
- VOID(signal(SIGTERM,endprog)); /* Here if abort */
+ (void) signal(SIGINT,endprog); /* Here if abort */
+ (void) signal(SIGTERM,endprog); /* Here if abort */
if (opt_compress)
mysql_options(&mysql,MYSQL_OPT_COMPRESS,NullS);
@@ -1071,7 +1071,7 @@ static int drop_db(MYSQL *mysql, const c
puts("Any data stored in the database will be destroyed.\n");
printf("Do you really want to drop the '%s' database [y/N] ",db);
fflush(stdout);
- VOID(fgets(buf,sizeof(buf)-1,stdin));
+ (void) fgets(buf,sizeof(buf)-1,stdin);
if ((*buf != 'y') && (*buf != 'Y'))
{
puts("\nOK, aborting database drop!");
diff -Nrup a/client/mysqldump.c b/client/mysqldump.c
--- a/client/mysqldump.c 2008-03-28 11:03:00 +01:00
+++ b/client/mysqldump.c 2008-04-08 12:29:00 +02:00
@@ -1999,7 +1999,7 @@ static uint dump_events_for_db(char *db)
mysql_free_result(event_list_res);
if (lock_tables)
- VOID(mysql_query_with_error_report(mysql, 0, "UNLOCK TABLES"));
+ (void) mysql_query_with_error_report(mysql, 0, "UNLOCK TABLES");
DBUG_RETURN(0);
}
@@ -2193,7 +2193,7 @@ static uint dump_routines_for_db(char *d
DBUG_RETURN(1);
if (lock_tables)
- VOID(mysql_query_with_error_report(mysql, 0, "UNLOCK TABLES"));
+ (void) mysql_query_with_error_report(mysql, 0, "UNLOCK TABLES");
DBUG_RETURN(0);
}
@@ -4048,7 +4048,7 @@ static int dump_all_tables_in_db(char *d
check_io(md_result_file);
}
if (lock_tables)
- VOID(mysql_query_with_error_report(mysql, 0, "UNLOCK TABLES"));
+ (void) mysql_query_with_error_report(mysql, 0, "UNLOCK TABLES");
if (flush_privileges && using_mysql_db == 0)
{
fprintf(md_result_file,"\n--\n-- Flush Grant Tables \n--\n");
@@ -4122,7 +4122,7 @@ static my_bool dump_all_views_in_db(char
check_io(md_result_file);
}
if (lock_tables)
- VOID(mysql_query_with_error_report(mysql, 0, "UNLOCK TABLES"));
+ (void) mysql_query_with_error_report(mysql, 0, "UNLOCK TABLES");
return 0;
} /* dump_all_tables_in_db */
@@ -4291,7 +4291,7 @@ static int dump_selected_tables(char *db
check_io(md_result_file);
}
if (lock_tables)
- VOID(mysql_query_with_error_report(mysql, 0, "UNLOCK TABLES"));
+ (void) mysql_query_with_error_report(mysql, 0, "UNLOCK TABLES");
DBUG_RETURN(0);
} /* dump_selected_tables */
diff -Nrup a/client/mysqlimport.c b/client/mysqlimport.c
--- a/client/mysqlimport.c 2007-11-08 12:18:00 +01:00
+++ b/client/mysqlimport.c 2008-04-08 12:29:00 +02:00
@@ -601,8 +601,8 @@ int main(int argc, char **argv)
pthread_attr_setdetachstate(&attr,
PTHREAD_CREATE_DETACHED);
- VOID(pthread_mutex_init(&counter_mutex, NULL));
- VOID(pthread_cond_init(&count_threshhold, NULL));
+ pthread_mutex_init(&counter_mutex, NULL);
+ pthread_cond_init(&count_threshhold, NULL);
for (counter= 0; *argv != NULL; argv++) /* Loop through tables */
{
@@ -641,8 +641,8 @@ int main(int argc, char **argv)
pthread_cond_timedwait(&count_threshhold, &counter_mutex, &abstime);
}
pthread_mutex_unlock(&counter_mutex);
- VOID(pthread_mutex_destroy(&counter_mutex));
- VOID(pthread_cond_destroy(&count_threshhold));
+ pthread_mutex_destroy(&counter_mutex);
+ pthread_cond_destroy(&count_threshhold);
pthread_attr_destroy(&attr);
}
else
diff -Nrup a/client/mysqlslap.c b/client/mysqlslap.c
--- a/client/mysqlslap.c 2008-02-08 12:13:25 +01:00
+++ b/client/mysqlslap.c 2008-04-08 12:29:00 +02:00
@@ -352,10 +352,10 @@ int main(int argc, char **argv)
}
}
- VOID(pthread_mutex_init(&counter_mutex, NULL));
- VOID(pthread_cond_init(&count_threshhold, NULL));
- VOID(pthread_mutex_init(&sleeper_mutex, NULL));
- VOID(pthread_cond_init(&sleep_threshhold, NULL));
+ pthread_mutex_init(&counter_mutex, NULL);
+ pthread_cond_init(&count_threshhold, NULL);
+ pthread_mutex_init(&sleeper_mutex, NULL);
+ pthread_cond_init(&sleep_threshhold, NULL);
/* Main iterations loop */
eptr= engine_options;
@@ -386,10 +386,10 @@ int main(int argc, char **argv)
} while (eptr ? (eptr= eptr->next) : 0);
- VOID(pthread_mutex_destroy(&counter_mutex));
- VOID(pthread_cond_destroy(&count_threshhold));
- VOID(pthread_mutex_destroy(&sleeper_mutex));
- VOID(pthread_cond_destroy(&sleep_threshhold));
+ pthread_mutex_destroy(&counter_mutex);
+ pthread_cond_destroy(&count_threshhold);
+ pthread_mutex_destroy(&sleeper_mutex);
+ pthread_cond_destroy(&sleep_threshhold);
if (!opt_only_print)
mysql_close(&mysql); /* Close & free connection */
diff -Nrup a/client/mysqltest.c b/client/mysqltest.c
--- a/client/mysqltest.c 2008-03-30 13:12:23 +02:00
+++ b/client/mysqltest.c 2008-04-08 12:29:01 +02:00
@@ -504,12 +504,12 @@ pthread_handler_t send_one_query(void *a
struct st_connection *cn= (struct st_connection*)arg;
mysql_thread_init();
- VOID(mysql_send_query(&cn->mysql, cn->cur_query, cn->cur_query_len));
+ (void) mysql_send_query(&cn->mysql, cn->cur_query, cn->cur_query_len);
mysql_thread_end();
pthread_mutex_lock(&cn->mutex);
cn->query_done= 1;
- VOID(pthread_cond_signal(&cn->cond));
+ pthread_cond_signal(&cn->cond);
pthread_mutex_unlock(&cn->mutex);
pthread_exit(0);
return 0;
@@ -8150,7 +8150,7 @@ REPLACE *init_replace(char * *from, char
free_sets(&sets);
DBUG_RETURN(0);
}
- VOID(make_new_set(&sets)); /* Set starting set */
+ (void) make_new_set(&sets); /* Set starting set */
make_sets_invisible(&sets); /* Hide previus sets */
used_sets=-1;
word_states=make_new_set(&sets); /* Start of new word */
@@ -8649,7 +8649,7 @@ int insert_pointer_name(reg1 POINTER_ARR
pa->flag[pa->typelib.count]=0; /* Reset flag */
pa->typelib.type_names[pa->typelib.count++]= (char*) pa->str+pa->length;
pa->typelib.type_names[pa->typelib.count]= NullS; /* Put end-mark */
- VOID(strmov((char*) pa->str+pa->length,name));
+ (void) strmov((char*) pa->str+pa->length,name);
pa->length+=length;
DBUG_RETURN(0);
} /* insert_pointer_name */
diff -Nrup a/client/sql_string.cc b/client/sql_string.cc
--- a/client/sql_string.cc 2007-08-13 15:11:09 +02:00
+++ b/client/sql_string.cc 2008-04-08 12:29:01 +02:00
@@ -132,7 +132,7 @@ bool String::set(double num,uint decimal
int decpt,sign;
char *pos,*to;
- VOID(fconvert(num,(int) decimals,&decpt,&sign,buff+1));
+ (void) fconvert(num,(int) decimals,&decpt,&sign,buff+1);
if (!my_isdigit(&my_charset_latin1, buff[1]))
{ // Nan or Inf
pos=buff+1;
diff -Nrup a/extra/comp_err.c b/extra/comp_err.c
--- a/extra/comp_err.c 2007-10-05 19:58:12 +02:00
+++ b/extra/comp_err.c 2008-04-08 12:29:02 +02:00
@@ -1039,11 +1039,11 @@ static char *parse_text_line(char *pos)
switch (*++pos) {
case '\\':
case '"':
- VOID(strmov(pos - 1, pos));
+ (void) strmov(pos - 1, pos);
break;
case 'n':
pos[-1]= '\n';
- VOID(strmov(pos, pos + 1));
+ (void) strmov(pos, pos + 1);
break;
default:
if (*pos >= '0' && *pos < '8')
@@ -1053,10 +1053,10 @@ static char *parse_text_line(char *pos)
nr= nr * 8 + (*(pos++) - '0');
pos -= i;
pos[-1]= nr;
- VOID(strmov(pos, pos + i));
+ (void) strmov(pos, pos + i);
}
else if (*pos)
- VOID(strmov(pos - 1, pos)); /* Remove '\' */
+ (void) strmov(pos - 1, pos); /* Remove '\' */
}
}
else
diff -Nrup a/extra/replace.c b/extra/replace.c
--- a/extra/replace.c 2008-02-18 23:29:35 +01:00
+++ b/extra/replace.c 2008-04-08 12:29:02 +02:00
@@ -311,7 +311,7 @@ static int insert_pointer_name(reg1 POIN
pa->flag[pa->typelib.count]=0; /* Reset flag */
pa->typelib.type_names[pa->typelib.count++]= (char*) (pa->str+pa->length);
pa->typelib.type_names[pa->typelib.count]= NullS; /* Put end-mark */
- VOID(strmov((char*) pa->str + pa->length, name));
+ (void) strmov((char*) pa->str + pa->length, name);
pa->length+=length;
DBUG_RETURN(0);
} /* insert_pointer_name */
@@ -433,7 +433,7 @@ static REPLACE *init_replace(char * *fro
free_sets(&sets);
DBUG_RETURN(0);
}
- VOID(make_new_set(&sets)); /* Set starting set */
+ (void) make_new_set(&sets); /* Set starting set */
make_sets_invisible(&sets); /* Hide previus sets */
used_sets=-1;
word_states=make_new_set(&sets); /* Start of new word */
diff -Nrup a/include/my_alarm.h b/include/my_alarm.h
--- a/include/my_alarm.h 2006-12-23 20:04:04 +01:00
+++ b/include/my_alarm.h 2008-04-08 12:29:03 +02:00
@@ -33,15 +33,15 @@ extern ulong my_time_to_wait_for_lock;
#define ALARM_INIT my_have_got_alarm=0 ; \
alarm_old=(uint) alarm(MY_HOW_OFTEN_TO_ALARM); \
alarm_signal=signal(SIGALRM,my_set_alarm_variable);
-#define ALARM_END VOID(signal(SIGALRM,alarm_signal)); \
- VOID(alarm(alarm_old));
+#define ALARM_END (void) signal(SIGALRM,alarm_signal); \
+ (void) alarm(alarm_old);
#define ALARM_TEST my_have_got_alarm
#ifdef DONT_REMEMBER_SIGNAL
-#define ALARM_REINIT VOID(alarm(MY_HOW_OFTEN_TO_ALARM)); \
- VOID(signal(SIGALRM,my_set_alarm_variable));\
+#define ALARM_REINIT (void) alarm(MY_HOW_OFTEN_TO_ALARM); \
+ (void) signal(SIGALRM,my_set_alarm_variable);\
my_have_got_alarm=0;
#else
-#define ALARM_REINIT VOID(alarm((uint) MY_HOW_OFTEN_TO_ALARM)); \
+#define ALARM_REINIT (void) alarm((uint) MY_HOW_OFTEN_TO_ALARM); \
my_have_got_alarm=0;
#endif /* DONT_REMEMBER_SIGNAL */
#else
diff -Nrup a/include/my_global.h b/include/my_global.h
--- a/include/my_global.h 2008-03-28 11:03:01 +01:00
+++ b/include/my_global.h 2008-04-08 12:29:03 +02:00
@@ -538,17 +538,6 @@ extern "C" int madvise(void *addr, size_
#define DONT_REMEMBER_SIGNAL
#endif
-/* Define void to stop lint from generating "null effekt" comments */
-#ifndef DONT_DEFINE_VOID
-#ifdef _lint
-int __void__;
-#define VOID(X) (__void__ = (int) (X))
-#else
-#undef VOID
-#define VOID(X) (X)
-#endif
-#endif /* DONT_DEFINE_VOID */
-
#if defined(_lint) || defined(FORCE_INIT_OF_VARS)
#define LINT_INIT(var) var=0 /* No uninitialize-warning */
#else
diff -Nrup a/libmysql/libmysql.c b/libmysql/libmysql.c
--- a/libmysql/libmysql.c 2008-03-29 08:58:48 +01:00
+++ b/libmysql/libmysql.c 2008-04-08 12:29:04 +02:00
@@ -867,7 +867,7 @@ my_bool handle_local_infile(MYSQL *mysql
if ((*options->local_infile_init)(&li_ptr, net_filename,
options->local_infile_userdata))
{
- VOID(my_net_write(net,(const uchar*) "",0)); /* Server needs one packet */
+ (void) my_net_write(net,(const uchar*) "",0); /* Server needs one packet */
net_flush(net);
strmov(net->sqlstate, unknown_sqlstate);
net->last_errno=
diff -Nrup a/mysys/hash.c b/mysys/hash.c
--- a/mysys/hash.c 2008-03-18 10:45:32 +01:00
+++ b/mysys/hash.c 2008-04-08 12:29:04 +02:00
@@ -525,7 +525,7 @@ my_bool hash_delete(HASH *hash,uchar *re
pos->next=empty_index;
exit:
- VOID(pop_dynamic(&hash->array));
+ (void) pop_dynamic(&hash->array);
if (hash->free)
(*hash->free)((uchar*) record);
DBUG_RETURN(0);
diff -Nrup a/mysys/mf_iocache2.c b/mysys/mf_iocache2.c
--- a/mysys/mf_iocache2.c 2007-08-08 18:20:59 +02:00
+++ b/mysys/mf_iocache2.c 2008-04-08 12:29:05 +02:00
@@ -135,7 +135,7 @@ void my_b_seek(IO_CACHE *info,my_off_t p
b) see if there is a better way to make it work
*/
if (info->type == SEQ_READ_APPEND)
- VOID(flush_io_cache(info));
+ (void) flush_io_cache(info);
offset=(pos - info->pos_in_file);
@@ -163,7 +163,7 @@ void my_b_seek(IO_CACHE *info,my_off_t p
info->write_pos = info->write_buffer + offset;
DBUG_VOID_RETURN;
}
- VOID(flush_io_cache(info));
+ (void) flush_io_cache(info);
/* Correct buffer end so that we write in increments of IO_SIZE */
info->write_end=(info->write_buffer+info->buffer_length-
(pos & (IO_SIZE-1)));
diff -Nrup a/mysys/mf_keycache.c b/mysys/mf_keycache.c
--- a/mysys/mf_keycache.c 2008-03-31 09:40:35 +02:00
+++ b/mysys/mf_keycache.c 2008-04-08 12:29:05 +02:00
@@ -4401,8 +4401,8 @@ static void keycache_debug_print(const c
va_start(args,fmt);
if (keycache_debug_log)
{
- VOID(vfprintf(keycache_debug_log, fmt, args));
- VOID(fputc('\n',keycache_debug_log));
+ (void) vfprintf(keycache_debug_log, fmt, args);
+ (void) fputc('\n',keycache_debug_log);
}
va_end(args);
}
diff -Nrup a/mysys/mf_loadpath.c b/mysys/mf_loadpath.c
--- a/mysys/mf_loadpath.c 2007-05-10 11:59:25 +02:00
+++ b/mysys/mf_loadpath.c 2008-04-08 12:29:06 +02:00
@@ -34,7 +34,7 @@ char * my_load_path(char * to, const cha
if ((path[0] == FN_HOMELIB && path[1] == FN_LIBCHAR) ||
test_if_hard_path(path))
- VOID(strmov(buff,path));
+ (void) strmov(buff,path);
else if ((is_cur=(path[0] == FN_CURLIB && path[1] == FN_LIBCHAR)) ||
(is_prefix(path,FN_PARENTDIR)) ||
! own_path_prefix)
@@ -42,12 +42,12 @@ char * my_load_path(char * to, const cha
if (is_cur)
is_cur=2; /* Remove current dir */
if (! my_getwd(buff,(uint) (FN_REFLEN-strlen(path)+is_cur),MYF(0)))
- VOID(strcat(buff,path+is_cur));
+ (void) strcat(buff,path+is_cur);
else
- VOID(strmov(buff,path)); /* Return org file name */
+ (void) strmov(buff,path); /* Return org file name */
}
else
- VOID(strxmov(buff,own_path_prefix,path,NullS));
+ (void) strxmov(buff,own_path_prefix,path,NullS);
strmov(to,buff);
DBUG_PRINT("exit",("to: %s",to));
DBUG_RETURN(to);
diff -Nrup a/mysys/mf_path.c b/mysys/mf_path.c
--- a/mysys/mf_path.c 2007-07-30 10:33:42 +02:00
+++ b/mysys/mf_path.c 2008-04-08 12:29:06 +02:00
@@ -42,7 +42,7 @@ char * my_path(char * to, const char *pr
((prog=getenv("_")) != 0 &&
dirname_part(to, prog, &to_length))))
{
- VOID(intern_filename(to,to));
+ (void) intern_filename(to,to);
if (!test_if_hard_path(to))
{
if (!my_getwd(curr_dir,FN_REFLEN,MYF(0)))
@@ -60,11 +60,11 @@ char * my_path(char * to, const char *pr
end= (char*) "/my/";
#endif
}
- VOID(intern_filename(to,end));
+ (void) intern_filename(to,end);
to=strend(to);
if (to != start && to[-1] != FN_LIBCHAR)
*to++ = FN_LIBCHAR;
- VOID(strmov(to,own_pathname_part));
+ (void) strmov(to,own_pathname_part);
}
DBUG_PRINT("exit",("to: '%s'",start));
DBUG_RETURN(start);
diff -Nrup a/mysys/my_append.c b/mysys/my_append.c
--- a/mysys/my_append.c 2007-07-30 10:33:42 +02:00
+++ b/mysys/my_append.c 2008-04-08 12:29:06 +02:00
@@ -58,7 +58,7 @@ int my_append(const char *from, const ch
}
}
err:
- if (from_file >= 0) VOID(my_close(from_file,MyFlags));
- if (to_file >= 0) VOID(my_close(to_file,MyFlags));
+ if (from_file >= 0) (void) my_close(from_file,MyFlags);
+ if (to_file >= 0) (void) my_close(to_file,MyFlags);
DBUG_RETURN(-1);
}
diff -Nrup a/mysys/my_clock.c b/mysys/my_clock.c
--- a/mysys/my_clock.c 2006-12-23 20:19:46 +01:00
+++ b/mysys/my_clock.c 2008-04-08 12:29:07 +02:00
@@ -24,7 +24,7 @@ long my_clock(void)
{
#if !defined(__WIN__) && !defined(__NETWARE__)
struct tms tmsbuf;
- VOID(times(&tmsbuf));
+ (void) times(&tmsbuf);
return (tmsbuf.tms_utime + tmsbuf.tms_stime);
#else
return clock();
diff -Nrup a/mysys/my_copy.c b/mysys/my_copy.c
--- a/mysys/my_copy.c 2007-07-30 10:33:42 +02:00
+++ b/mysys/my_copy.c 2008-04-08 12:29:07 +02:00
@@ -94,9 +94,9 @@ int my_copy(const char *from, const char
if (MyFlags & MY_HOLD_ORIGINAL_MODES && !new_file_stat)
DBUG_RETURN(0); /* File copyed but not stat */
- VOID(chmod(to, stat_buff.st_mode & 07777)); /* Copy modes */
+ (void) chmod(to, stat_buff.st_mode & 07777); /* Copy modes */
#if !defined(__WIN__) && !defined(__NETWARE__)
- VOID(chown(to, stat_buff.st_uid,stat_buff.st_gid)); /* Copy ownership */
+ (void) chown(to, stat_buff.st_uid,stat_buff.st_gid); /* Copy ownership */
#endif
#if !defined(VMS) && !defined(__ZTC__)
if (MyFlags & MY_COPYTIME)
@@ -104,19 +104,19 @@ int my_copy(const char *from, const char
struct utimbuf timep;
timep.actime = stat_buff.st_atime;
timep.modtime = stat_buff.st_mtime;
- VOID(utime((char*) to, &timep)); /* last accessed and modified times */
+ (void) utime((char*) to, &timep); /* last accessed and modified times */
}
#endif
DBUG_RETURN(0);
}
err:
- if (from_file >= 0) VOID(my_close(from_file,MyFlags));
+ if (from_file >= 0) (void) my_close(from_file,MyFlags);
if (to_file >= 0)
{
- VOID(my_close(to_file, MyFlags));
+ (void) my_close(to_file, MyFlags);
/* attempt to delete the to-file we've partially written */
- VOID(my_delete(to, MyFlags));
+ (void) my_delete(to, MyFlags);
}
DBUG_RETURN(-1);
} /* my_copy */
diff -Nrup a/mysys/my_fstream.c b/mysys/my_fstream.c
--- a/mysys/my_fstream.c 2007-05-10 11:59:25 +02:00
+++ b/mysys/my_fstream.c 2008-04-08 12:29:08 +02:00
@@ -119,7 +119,7 @@ size_t my_fwrite(FILE *stream, const uch
#ifdef EINTR
if (errno == EINTR)
{
- VOID(my_fseek(stream,seekptr,MY_SEEK_SET,MYF(0)));
+ (void) my_fseek(stream,seekptr,MY_SEEK_SET,MYF(0));
continue;
}
#endif
@@ -134,8 +134,8 @@ size_t my_fwrite(FILE *stream, const uch
if (!(errors++ % MY_WAIT_GIVE_USER_A_MESSAGE))
my_error(EE_DISK_FULL,MYF(ME_BELL | ME_NOREFRESH),
"[stream]",my_errno,MY_WAIT_FOR_USER_TO_FIX_PANIC);
- VOID(sleep(MY_WAIT_FOR_USER_TO_FIX_PANIC));
- VOID(my_fseek(stream,seekptr,MY_SEEK_SET,MYF(0)));
+ (void) sleep(MY_WAIT_FOR_USER_TO_FIX_PANIC);
+ (void) my_fseek(stream,seekptr,MY_SEEK_SET,MYF(0));
continue;
}
#endif
diff -Nrup a/mysys/my_getwd.c b/mysys/my_getwd.c
--- a/mysys/my_getwd.c 2007-05-10 11:59:25 +02:00
+++ b/mysys/my_getwd.c 2008-04-08 12:29:08 +02:00
@@ -51,7 +51,7 @@ int my_getwd(char * buf, size_t size, my
(long) buf, (uint) size, MyFlags));
if (curr_dir[0]) /* Current pos is saved here */
- VOID(strmake(buf,&curr_dir[0],size-1));
+ (void) strmake(buf,&curr_dir[0],size-1);
else
{
#if defined(HAVE_GETCWD)
diff -Nrup a/mysys/my_lib.c b/mysys/my_lib.c
--- a/mysys/my_lib.c 2007-10-18 12:32:38 +02:00
+++ b/mysys/my_lib.c 2008-04-08 12:29:09 +02:00
@@ -160,8 +160,8 @@ MY_DIR *my_dir(const char *path, myf MyF
goto error;
bzero(finfo.mystat, sizeof(MY_STAT));
- VOID(strmov(tmp_file,dp->d_name));
- VOID(my_stat(tmp_path, finfo.mystat, MyFlags));
+ (void) strmov(tmp_file,dp->d_name);
+ (void) my_stat(tmp_path, finfo.mystat, MyFlags);
if (!(finfo.mystat->st_mode & MY_S_IREAD))
continue;
}
@@ -267,7 +267,7 @@ char * directory_file_name (char * dst,
/* what about when we have logical_name:???? */
if (src[slen] == FN_DEVCHAR)
{ /* Xlate logical name and see what we get */
- VOID(strmov(dst,src));
+ (void) strmov(dst,src);
dst[slen] = 0; /* remove colon */
if (!(src = getenv (dst)))
return dst; /* Can't translate */
@@ -283,13 +283,13 @@ char * directory_file_name (char * dst,
slen = strlen (src) - 1;
if (src[slen] != FN_C_AFTER_DIR && src[slen] != FN_C_AFTER_DIR_2)
{ /* no recursion here! */
- VOID(strmov(dst, src));
+ (void) strmov(dst, src);
return(dst);
}
}
else
{ /* not a directory spec */
- VOID(strmov(dst, src));
+ (void) strmov(dst, src);
return(dst);
}
}
@@ -297,13 +297,13 @@ char * directory_file_name (char * dst,
bracket = src[slen]; /* End char */
if (!(ptr = strchr (src, bracket - 2)))
{ /* no opening bracket */
- VOID(strmov (dst, src));
+ (void) strmov (dst, src);
return dst;
}
if (!(rptr = strrchr (src, '.')))
rptr = ptr;
slen = rptr - src;
- VOID(strmake (dst, src, slen));
+ (void) strmake (dst, src, slen);
if (*rptr == '.')
{ /* Put bracket and add */
@@ -324,7 +324,7 @@ char * directory_file_name (char * dst,
&& (ptr[rlen] == FN_C_AFTER_DIR || ptr[rlen] == FN_C_AFTER_DIR_2)
&& ptr[rlen - 1] == '.')
{
- VOID(strmov(esa,ptr));
+ (void) strmov(esa,ptr);
esa[rlen - 1] = FN_C_AFTER_DIR;
esa[rlen] = '\0';
return (directory_file_name (dst, esa));
@@ -332,13 +332,13 @@ char * directory_file_name (char * dst,
else
dst[slen - 1] = ':';
}
- VOID(strmov(dst+slen,"[000000]"));
+ (void) strmov(dst+slen,"[000000]");
slen += 8;
}
- VOID(strmov(strmov(dst+slen,rptr+1)-1,".DIR.1"));
+ (void) strmov(strmov(dst+slen,rptr+1)-1,".DIR.1");
return dst;
}
- VOID(strmov(dst, src));
+ (void) strmov(dst, src);
if (dst[slen] == '/' && slen > 1)
dst[slen] = 0;
return dst;
diff -Nrup a/mysys/my_lockmem.c b/mysys/my_lockmem.c
--- a/mysys/my_lockmem.c 2007-05-10 11:59:25 +02:00
+++ b/mysys/my_lockmem.c 2008-04-08 12:29:09 +02:00
@@ -59,7 +59,7 @@ uchar *my_malloc_lock(uint size,myf MyFl
/* Add block in a list for munlock */
if (!(element=(struct st_mem_list*) my_malloc(sizeof(*element),MyFlags)))
{
- VOID(munlock((uchar*) ptr,size));
+ (void) munlock((uchar*) ptr,size);
free(ptr);
DBUG_RETURN(0);
}
@@ -85,7 +85,7 @@ void my_free_lock(uchar *ptr,myf Myflags
element=(struct st_mem_list*) list->data;
if (ptr == element->page)
{ /* Found locked mem */
- VOID(munlock((uchar*) ptr,element->size));
+ (void) munlock((uchar*) ptr,element->size);
mem_list=list_delete(mem_list,list);
break;
}
diff -Nrup a/mysys/my_pread.c b/mysys/my_pread.c
--- a/mysys/my_pread.c 2007-10-11 17:07:34 +02:00
+++ b/mysys/my_pread.c 2008-04-08 12:29:10 +02:00
@@ -164,7 +164,7 @@ size_t my_pwrite(int Filedes, const ucha
if (!(errors++ % MY_WAIT_GIVE_USER_A_MESSAGE))
my_error(EE_DISK_FULL,MYF(ME_BELL | ME_NOREFRESH),
my_filename(Filedes),my_errno,MY_WAIT_FOR_USER_TO_FIX_PANIC);
- VOID(sleep(MY_WAIT_FOR_USER_TO_FIX_PANIC));
+ (void) sleep(MY_WAIT_FOR_USER_TO_FIX_PANIC);
continue;
}
if ((writenbytes && writenbytes != (size_t) -1) || my_errno == EINTR)
diff -Nrup a/mysys/my_pthread.c b/mysys/my_pthread.c
--- a/mysys/my_pthread.c 2007-07-30 21:42:51 +02:00
+++ b/mysys/my_pthread.c 2008-04-08 12:29:10 +02:00
@@ -38,7 +38,7 @@ void my_pthread_setprio(pthread_t thread
struct sched_param tmp_sched_param;
bzero((char*) &tmp_sched_param,sizeof(tmp_sched_param));
tmp_sched_param.sched_priority=prior;
- VOID(pthread_setschedparam(thread_id,SCHED_POLICY,&tmp_sched_param));
+ pthread_setschedparam(thread_id,SCHED_POLICY,&tmp_sched_param);
#endif
}
#endif
@@ -65,7 +65,7 @@ void my_pthread_attr_setprio(pthread_att
struct sched_param tmp_sched_param;
bzero((char*) &tmp_sched_param,sizeof(tmp_sched_param));
tmp_sched_param.sched_priority=priority;
- VOID(pthread_attr_setschedparam(attr,&tmp_sched_param));
+ pthread_attr_setschedparam(attr,&tmp_sched_param);
#endif
}
#endif
@@ -308,7 +308,7 @@ void sigwait_handle_sig(int sig)
{
pthread_mutex_lock(&LOCK_sigwait);
sigaddset(&pending_set, sig);
- VOID(pthread_cond_signal(&COND_sigwait)); /* inform sigwait() about signal */
+ pthread_cond_signal(&COND_sigwait); /* inform sigwait() about signal */
pthread_mutex_unlock(&LOCK_sigwait);
}
@@ -365,8 +365,8 @@ int sigwait(sigset_t *setp, int *sigp)
pthread_attr_setdetachstate(&thr_attr,PTHREAD_CREATE_DETACHED);
pthread_attr_setstacksize(&thr_attr,8196);
my_pthread_attr_setprio(&thr_attr,100); /* Very high priority */
- VOID(pthread_create(&sigwait_thread_id,&thr_attr,sigwait_thread,setp));
- VOID(pthread_attr_destroy(&thr_attr));
+ pthread_create(&sigwait_thread_id,&thr_attr,sigwait_thread,setp);
+ pthread_attr_destroy(&thr_attr);
}
pthread_mutex_lock(&LOCK_sigwait);
@@ -392,7 +392,7 @@ int sigwait(sigset_t *setp, int *sigp)
return 0;
}
}
- VOID(pthread_cond_wait(&COND_sigwait,&LOCK_sigwait));
+ pthread_cond_wait(&COND_sigwait,&LOCK_sigwait);
}
return 0;
}
diff -Nrup a/mysys/my_redel.c b/mysys/my_redel.c
--- a/mysys/my_redel.c 2007-03-29 19:01:47 +02:00
+++ b/mysys/my_redel.c 2008-04-08 12:29:10 +02:00
@@ -86,7 +86,7 @@ int my_copystat(const char *from, const
}
if ((statbuf.st_mode & S_IFMT) != S_IFREG)
return 1;
- VOID(chmod(to, statbuf.st_mode & 07777)); /* Copy modes */
+ (void) chmod(to, statbuf.st_mode & 07777); /* Copy modes */
#if !defined(__WIN__) && !defined(__NETWARE__)
if (statbuf.st_nlink > 1 && MyFlags & MY_LINK_WARNING)
@@ -94,7 +94,7 @@ int my_copystat(const char *from, const
if (MyFlags & MY_LINK_WARNING)
my_error(EE_LINK_WARNING,MYF(ME_BELL+ME_WAITTANG),from,statbuf.st_nlink);
}
- VOID(chown(to, statbuf.st_uid, statbuf.st_gid)); /* Copy ownership */
+ (void) chown(to, statbuf.st_uid, statbuf.st_gid); /* Copy ownership */
#endif /* !__WIN__ && !__NETWARE__ */
#ifndef VMS
@@ -104,7 +104,7 @@ int my_copystat(const char *from, const
struct utimbuf timep;
timep.actime = statbuf.st_atime;
timep.modtime = statbuf.st_mtime;
- VOID(utime((char*) to, &timep));/* Update last accessed and modified times */
+ (void) utime((char*) to, &timep);/* Update last accessed and modified times */
}
#else
if (MyFlags & MY_COPYTIME)
@@ -112,7 +112,7 @@ int my_copystat(const char *from, const
time_t time[2];
time[0]= statbuf.st_atime;
time[1]= statbuf.st_mtime;
- VOID(utime((char*) to, time));/* Update last accessed and modified times */
+ (void) utime((char*) to, time);/* Update last accessed and modified times */
}
#endif
#endif
diff -Nrup a/mysys/my_winthread.c b/mysys/my_winthread.c
--- a/mysys/my_winthread.c 2007-10-03 21:38:30 +02:00
+++ b/mysys/my_winthread.c 2008-04-08 12:29:11 +02:00
@@ -119,7 +119,7 @@ int pthread_create(pthread_t *thread_id,
("Can't create thread to handle request (error %d)",error));
DBUG_RETURN(error ? error : -1);
}
- VOID(SetThreadPriority(hThread, attr->priority)) ;
+ SetThreadPriority(hThread, attr->priority);
DBUG_RETURN(0);
}
diff -Nrup a/mysys/my_write.c b/mysys/my_write.c
--- a/mysys/my_write.c 2007-10-25 06:22:07 +02:00
+++ b/mysys/my_write.c 2008-04-08 12:29:11 +02:00
@@ -57,7 +57,7 @@ size_t my_write(int Filedes, const uchar
if (!(errors++ % MY_WAIT_GIVE_USER_A_MESSAGE))
my_error(EE_DISK_FULL,MYF(ME_BELL | ME_NOREFRESH),
my_filename(Filedes),my_errno,MY_WAIT_FOR_USER_TO_FIX_PANIC);
- VOID(sleep(MY_WAIT_FOR_USER_TO_FIX_PANIC));
+ (void) sleep(MY_WAIT_FOR_USER_TO_FIX_PANIC);
continue;
}
diff -Nrup a/mysys/thr_alarm.c b/mysys/thr_alarm.c
--- a/mysys/thr_alarm.c 2008-02-19 18:45:06 +01:00
+++ b/mysys/thr_alarm.c 2008-04-08 12:29:12 +02:00
@@ -99,8 +99,8 @@ void init_thr_alarm(uint max_alarms)
pthread_attr_setstacksize(&thr_attr,8196);
my_pthread_attr_setprio(&thr_attr,100); /* Very high priority */
- VOID(pthread_create(&alarm_thread,&thr_attr,alarm_handler,NULL));
- VOID(pthread_attr_destroy(&thr_attr));
+ pthread_create(&alarm_thread,&thr_attr,alarm_handler,NULL);
+ pthread_attr_destroy(&thr_attr);
}
#elif defined(USE_ONE_SIGNAL_HAND)
pthread_sigmask(SIG_BLOCK, &s, NULL); /* used with sigwait() */
@@ -774,7 +774,7 @@ static void *test_thread(void *arg)
break;
continue;
}
- VOID(getchar()); /* Somebody was playing */
+ (void) getchar(); /* Somebody was playing */
}
}
}
@@ -786,7 +786,7 @@ static void *test_thread(void *arg)
}
pthread_mutex_lock(&LOCK_thread_count);
thread_count--;
- VOID(pthread_cond_signal(&COND_thread_count)); /* Tell main we are ready */
+ pthread_cond_signal(&COND_thread_count); /* Tell main we are ready */
pthread_mutex_unlock(&LOCK_thread_count);
free((uchar*) arg);
return 0;
@@ -815,7 +815,7 @@ static void *signal_hand(void *arg __att
pthread_detach_this_thread();
init_thr_alarm(10); /* Setup alarm handler */
pthread_mutex_lock(&LOCK_thread_count); /* Required by bsdi */
- VOID(pthread_cond_signal(&COND_thread_count)); /* Tell main we are ready */
+ pthread_cond_signal(&COND_thread_count); /* Tell main we are ready */
pthread_mutex_unlock(&LOCK_thread_count);
sigemptyset(&set); /* Catch all signals */
@@ -906,7 +906,7 @@ int main(int argc __attribute__((unused)
#ifdef NOT_USED
sigemptyset(&set);
sigaddset(&set, thr_client_alarm);
- VOID(pthread_sigmask(SIG_UNBLOCK, &set, (sigset_t*) 0));
+ pthread_sigmask(SIG_UNBLOCK, &set, (sigset_t*) 0);
#endif
pthread_attr_init(&thr_attr);
@@ -915,10 +915,10 @@ int main(int argc __attribute__((unused)
pthread_attr_setstacksize(&thr_attr,65536L);
/* Start signal thread and wait for it to start */
- VOID(pthread_mutex_lock(&LOCK_thread_count));
+ pthread_mutex_lock(&LOCK_thread_count);
pthread_create(&tid,&thr_attr,signal_hand,NULL);
- VOID(pthread_cond_wait(&COND_thread_count,&LOCK_thread_count));
- VOID(pthread_mutex_unlock(&LOCK_thread_count));
+ pthread_cond_wait(&COND_thread_count,&LOCK_thread_count);
+ pthread_mutex_unlock(&LOCK_thread_count);
DBUG_PRINT("info",("signal thread created"));
thr_setconcurrency(3);
@@ -946,7 +946,7 @@ int main(int argc __attribute__((unused)
alarm_info.next_alarm_time);
while (thread_count)
{
- VOID(pthread_cond_wait(&COND_thread_count,&LOCK_thread_count));
+ pthread_cond_wait(&COND_thread_count,&LOCK_thread_count);
if (thread_count == 1)
{
printf("Calling end_thr_alarm. This should cancel the last thread\n");
diff -Nrup a/mysys/thr_lock.c b/mysys/thr_lock.c
--- a/mysys/thr_lock.c 2008-02-18 23:36:53 +01:00
+++ b/mysys/thr_lock.c 2008-04-08 12:29:12 +02:00
@@ -316,7 +316,7 @@ void thr_lock_init(THR_LOCK *lock)
{
DBUG_ENTER("thr_lock_init");
bzero((char*) lock,sizeof(*lock));
- VOID(pthread_mutex_init(&lock->mutex,MY_MUTEX_INIT_FAST));
+ pthread_mutex_init(&lock->mutex,MY_MUTEX_INIT_FAST);
lock->read.last= &lock->read.data;
lock->read_wait.last= &lock->read_wait.data;
lock->write_wait.last= &lock->write_wait.data;
@@ -333,7 +333,7 @@ void thr_lock_init(THR_LOCK *lock)
void thr_lock_delete(THR_LOCK *lock)
{
DBUG_ENTER("thr_lock_delete");
- VOID(pthread_mutex_destroy(&lock->mutex));
+ pthread_mutex_destroy(&lock->mutex);
pthread_mutex_lock(&THR_LOCK_lock);
thr_lock_thread_list=list_delete(thr_lock_thread_list,&lock->list);
pthread_mutex_unlock(&THR_LOCK_lock);
@@ -500,7 +500,7 @@ thr_lock(THR_LOCK_DATA *data, THR_LOCK_O
data->cond=0; /* safety */
data->type=lock_type;
data->owner= owner; /* Must be reset ! */
- VOID(pthread_mutex_lock(&lock->mutex));
+ pthread_mutex_lock(&lock->mutex);
DBUG_PRINT("lock",("data: 0x%lx thread: 0x%lx lock: 0x%lx type: %d",
(long) data, data->owner->info->thread_id,
(long) lock, (int) lock_type));
@@ -750,7 +750,7 @@ static inline void free_all_read_locks(T
data->owner->info->thread_id));
/* purecov: end */
data->cond=0; /* Mark thread free */
- VOID(pthread_cond_signal(cond));
+ pthread_cond_signal(cond);
} while ((data=data->next));
*lock->read_wait.last=0;
if (!lock->read_wait.data)
@@ -860,7 +860,7 @@ static void wake_up_waiters(THR_LOCK *lo
{
pthread_cond_t *cond=data->cond;
data->cond=0; /* Mark thread free */
- VOID(pthread_cond_signal(cond)); /* Start waiting thread */
+ pthread_cond_signal(cond); /* Start waiting thread */
}
if (data->type != TL_WRITE_ALLOW_WRITE ||
!lock->write_wait.data ||
@@ -911,7 +911,7 @@ static void wake_up_waiters(THR_LOCK *lo
lock->write.last= &data->next;
data->next=0; /* Only one write lock */
data->cond=0; /* Mark thread free */
- VOID(pthread_cond_signal(cond)); /* Start waiting thread */
+ pthread_cond_signal(cond); /* Start waiting thread */
} while (lock_type == TL_WRITE_ALLOW_WRITE &&
(data=lock->write_wait.data) &&
data->type == TL_WRITE_ALLOW_WRITE);
@@ -1478,7 +1478,7 @@ void thr_print_locks(void)
list= list_rest(list))
{
THR_LOCK *lock=(THR_LOCK*) list->data;
- VOID(pthread_mutex_lock(&lock->mutex));
+ pthread_mutex_lock(&lock->mutex);
printf("lock: 0x%lx:",(ulong) lock);
if ((lock->write_wait.data || lock->read_wait.data) &&
(! lock->read.data && ! lock->write.data))
@@ -1496,7 +1496,7 @@ void thr_print_locks(void)
thr_print_lock("write_wait",&lock->write_wait);
thr_print_lock("read",&lock->read);
thr_print_lock("read_wait",&lock->read_wait);
- VOID(pthread_mutex_unlock(&lock->mutex));
+ pthread_mutex_unlock(&lock->mutex);
puts("");
}
fflush(stdout);
@@ -1636,7 +1636,7 @@ static void *test_thread(void *arg)
thr_print_locks();
pthread_mutex_lock(&LOCK_thread_count);
thread_count--;
- VOID(pthread_cond_signal(&COND_thread_count)); /* Tell main we are ready */
+ pthread_cond_signal(&COND_thread_count); /* Tell main we are ready */
pthread_mutex_unlock(&LOCK_thread_count);
free((uchar*) arg);
return 0;
@@ -1697,7 +1697,7 @@ int main(int argc __attribute__((unused)
}
#endif
#ifdef HAVE_THR_SETCONCURRENCY
- VOID(thr_setconcurrency(2));
+ (void) thr_setconcurrency(2);
#endif
for (i=0 ; i < (int) array_elements(lock_counts) ; i++)
{
diff -Nrup a/sql/derror.cc b/sql/derror.cc
--- a/sql/derror.cc 2007-10-09 23:56:29 +02:00
+++ b/sql/derror.cc 2008-04-08 12:29:13 +02:00
@@ -137,7 +137,7 @@ Error message file '%s' had only %d erro
but it should contain at least %d error messages.\n\
Check that the above file is the right version for this program!",
name,count,error_messages);
- VOID(my_close(file,MYF(MY_WME)));
+ (void) my_close(file,MYF(MY_WME));
DBUG_RETURN(1);
}
@@ -164,7 +164,7 @@ Check that the above file is the right v
{
point[i]= *point +uint2korr(head+10+i+i);
}
- VOID(my_close(file,MYF(0)));
+ (void) my_close(file,MYF(0));
DBUG_RETURN(0);
err:
@@ -182,7 +182,7 @@ err:
sql_print_error(errmsg, name);
err1:
if (file != FERR)
- VOID(my_close(file,MYF(MY_WME)));
+ (void) my_close(file,MYF(MY_WME));
DBUG_RETURN(1);
} /* read_texts */
diff -Nrup a/sql/des_key_file.cc b/sql/des_key_file.cc
--- a/sql/des_key_file.cc 2007-10-09 23:56:29 +02:00
+++ b/sql/des_key_file.cc 2008-04-08 12:29:13 +02:00
@@ -43,7 +43,7 @@ load_des_key_file(const char *file_name)
DBUG_ENTER("load_des_key_file");
DBUG_PRINT("enter",("name: %s",file_name));
- VOID(pthread_mutex_lock(&LOCK_des_key_file));
+ pthread_mutex_lock(&LOCK_des_key_file);
if ((file=my_open(file_name,O_RDONLY | O_BINARY ,MYF(MY_WME))) < 0 ||
init_io_cache(&io, file, IO_SIZE*2, READ_CACHE, 0, 0, MYF(MY_WME)))
goto error;
@@ -96,7 +96,7 @@ error:
my_close(file,MYF(0));
end_io_cache(&io);
}
- VOID(pthread_mutex_unlock(&LOCK_des_key_file));
+ pthread_mutex_unlock(&LOCK_des_key_file);
DBUG_RETURN(result);
}
#endif /* HAVE_OPENSSL */
diff -Nrup a/sql/discover.cc b/sql/discover.cc
--- a/sql/discover.cc 2007-10-09 23:56:29 +02:00
+++ b/sql/discover.cc 2008-04-08 12:29:14 +02:00
@@ -82,7 +82,7 @@ int readfrm(const char *name, uchar **fr
err:
if (file > 0)
- VOID(my_close(file,MYF(MY_WME)));
+ (void) my_close(file,MYF(MY_WME));
err_end: /* Here when no file */
DBUG_RETURN (error);
@@ -118,7 +118,7 @@ int writefrm(const char *name, const uch
{
if (my_write(file, frmdata, len,MYF(MY_WME | MY_NABP)))
error= 2;
- VOID(my_close(file,MYF(0)));
+ (void) my_close(file,MYF(0));
}
DBUG_RETURN(error);
} /* writefrm */
diff -Nrup a/sql/field.cc b/sql/field.cc
--- a/sql/field.cc 2008-04-01 18:37:52 +02:00
+++ b/sql/field.cc 2008-04-08 12:29:14 +02:00
@@ -4176,7 +4176,7 @@ String *Field_float::val_str(String *val
char buff[70],*pos=buff;
int decpt,sign,tmp_dec=dec;
- VOID(sfconvert(&nr,tmp_dec,&decpt,&sign,buff));
+ (void) sfconvert(&nr,tmp_dec,&decpt,&sign,buff);
if (sign)
{
*to++='-';
@@ -4534,7 +4534,7 @@ String *Field_double::val_str(String *va
char *pos= buff;
int decpt,sign,tmp_dec=dec;
- VOID(fconvert(nr,tmp_dec,&decpt,&sign,buff));
+ (void) fconvert(nr,tmp_dec,&decpt,&sign,buff);
if (sign)
{
*to++='-';
diff -Nrup a/sql/filesort.cc b/sql/filesort.cc
--- a/sql/filesort.cc 2008-03-12 09:21:09 +01:00
+++ b/sql/filesort.cc 2008-04-08 12:29:14 +02:00
@@ -1277,7 +1277,7 @@ int merge_buffers(SORTPARAM *param, IO_C
if (!(error= (int) read_to_buffer(from_file,buffpek,
rec_length)))
{
- VOID(queue_remove(&queue,0));
+ (void) queue_remove(&queue,0);
reuse_freed_buff(&queue, buffpek, rec_length);
break; /* One buffer have been removed */
}
diff -Nrup a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
--- a/sql/ha_ndbcluster.cc 2008-03-29 08:59:07 +01:00
+++ b/sql/ha_ndbcluster.cc 2008-04-08 12:29:15 +02:00
@@ -6842,7 +6842,7 @@ int ndbcluster_drop_database_impl(const
while ((tabname=it++))
{
tablename_to_filename(tabname, tmp, FN_REFLEN - (tmp - full_path)-1);
- VOID(pthread_mutex_lock(&LOCK_open));
+ pthread_mutex_lock(&LOCK_open);
if (ha_ndbcluster::delete_table(0, ndb, full_path, dbname, tabname))
{
const NdbError err= dict->getNdbError();
@@ -6852,7 +6852,7 @@ int ndbcluster_drop_database_impl(const
ret= ndb_to_mysql_error(&err);
}
}
- VOID(pthread_mutex_unlock(&LOCK_open));
+ pthread_mutex_unlock(&LOCK_open);
}
DBUG_RETURN(ret);
}
diff -Nrup a/sql/ha_partition.cc b/sql/ha_partition.cc
--- a/sql/ha_partition.cc 2008-03-28 11:03:01 +01:00
+++ b/sql/ha_partition.cc 2008-04-08 12:29:15 +02:00
@@ -640,7 +640,7 @@ int ha_partition::drop_partitions(const
part_elem->part_state= PART_IS_DROPPED;
}
} while (++i < no_parts);
- VOID(sync_ddl_log());
+ (void) sync_ddl_log();
DBUG_RETURN(error);
}
@@ -730,7 +730,7 @@ int ha_partition::rename_partitions(cons
part_elem->log_entry= NULL; /* Indicate success */
}
} while (++i < temp_partitions);
- VOID(sync_ddl_log());
+ (void) sync_ddl_log();
}
i= 0;
do
@@ -782,7 +782,7 @@ int ha_partition::rename_partitions(cons
error= ret_error;
else if (deactivate_ddl_log_entry(sub_elem->log_entry->entry_pos))
error= 1;
- VOID(sync_ddl_log());
+ (void) sync_ddl_log();
}
file= m_new_file[part];
create_subpartition_name(part_name_buff, path,
@@ -813,7 +813,7 @@ int ha_partition::rename_partitions(cons
error= ret_error;
else if (deactivate_ddl_log_entry(part_elem->log_entry->entry_pos))
error= 1;
- VOID(sync_ddl_log());
+ (void) sync_ddl_log();
}
file= m_new_file[i];
create_partition_name(part_name_buff, path,
@@ -831,7 +831,7 @@ int ha_partition::rename_partitions(cons
}
}
} while (++i < no_parts);
- VOID(sync_ddl_log());
+ (void) sync_ddl_log();
DBUG_RETURN(error);
}
@@ -1173,7 +1173,7 @@ int ha_partition::prepare_new_partition(
DBUG_RETURN(0);
error:
if (create_flag)
- VOID(file->ha_delete_table(part_name));
+ (void) file->ha_delete_table(part_name);
DBUG_RETURN(error);
}
@@ -1751,7 +1751,7 @@ create_error:
{
create_partition_name(from_buff, from, name_buffer_ptr, NORMAL_PART_NAME,
FALSE);
- VOID((*file)->ha_delete_table((const char*) from_buff));
+ (void) (*file)->ha_delete_table((const char*) from_buff);
name_buffer_ptr= strend(name_buffer_ptr) + 1;
}
DBUG_RETURN(error);
@@ -2025,7 +2025,7 @@ bool ha_partition::create_handler_file(c
{
result= my_write(file, (uchar *) file_buffer, tot_len_byte,
MYF(MY_WME | MY_NABP)) != 0;
- VOID(my_close(file, MYF(0)));
+ (void) my_close(file, MYF(0));
}
else
result= TRUE;
@@ -2211,7 +2211,7 @@ bool ha_partition::get_from_handler_file
len_bytes= 4 * len_words;
if (!(file_buffer= (char*) my_malloc(len_bytes, MYF(0))))
goto err1;
- VOID(my_seek(file, 0, MY_SEEK_SET, MYF(0)));
+ my_seek(file, 0, MY_SEEK_SET, MYF(0));
if (my_read(file, (uchar *) file_buffer, len_bytes, MYF(MY_NABP)))
goto err2;
@@ -2233,7 +2233,7 @@ bool ha_partition::get_from_handler_file
if (len_words != (tot_partition_words + tot_name_words + 4))
goto err3;
name_buffer_ptr= file_buffer + 16 + 4 * tot_partition_words;
- VOID(my_close(file, MYF(0)));
+ (void) my_close(file, MYF(0));
m_file_buffer= file_buffer; // Will be freed in clear_handler_file()
m_name_buffer_ptr= name_buffer_ptr;
@@ -2258,7 +2258,7 @@ err3:
err2:
my_free(file_buffer, MYF(0));
err1:
- VOID(my_close(file, MYF(0)));
+ (void) my_close(file, MYF(0));
DBUG_RETURN(TRUE);
}
@@ -5185,9 +5185,9 @@ void ha_partition::late_extra_cache(uint
DBUG_VOID_RETURN;
file= m_file[partition_id];
if (m_extra_cache_size == 0)
- VOID(file->extra(HA_EXTRA_CACHE));
+ (void) file->extra(HA_EXTRA_CACHE);
else
- VOID(file->extra_opt(HA_EXTRA_CACHE, m_extra_cache_size));
+ (void) file->extra_opt(HA_EXTRA_CACHE, m_extra_cache_size);
DBUG_VOID_RETURN;
}
@@ -5211,7 +5211,7 @@ void ha_partition::late_extra_no_cache(u
if (!m_extra_cache)
DBUG_VOID_RETURN;
file= m_file[partition_id];
- VOID(file->extra(HA_EXTRA_NO_CACHE));
+ (void) file->extra(HA_EXTRA_NO_CACHE);
DBUG_VOID_RETURN;
}
@@ -5838,7 +5838,7 @@ static PARTITION_SHARE *get_share(const
if (!partition_init)
{
partition_init++;
- VOID(pthread_mutex_init(&partition_mutex, MY_MUTEX_INIT_FAST));
+ pthread_mutex_init(&partition_mutex, MY_MUTEX_INIT_FAST);
(void) hash_init(&partition_open_tables, system_charset_info, 32, 0, 0,
(hash_get_key) partition_get_key, 0, 0);
}
diff -Nrup a/sql/handler.cc b/sql/handler.cc
--- a/sql/handler.cc 2008-03-26 11:32:17 +01:00
+++ b/sql/handler.cc 2008-04-08 12:29:16 +02:00
@@ -2795,7 +2795,7 @@ static bool update_frm_version(TABLE *ta
}
err:
if (file >= 0)
- VOID(my_close(file,MYF(MY_WME)));
+ (void) my_close(file,MYF(MY_WME));
DBUG_RETURN(result);
}
@@ -3475,7 +3475,7 @@ int ha_create_table(THD *thd, const char
name= check_lowercase_names(table.file, share.path.str, name_buff);
error= table.file->ha_create(name, &table, create_info);
- VOID(closefrm(&table, 0));
+ (void) closefrm(&table, 0);
if (error)
{
strxmov(name_buff, db, ".", table_name, NullS);
@@ -3546,7 +3546,7 @@ int ha_create_table_from_engine(THD* thd
check_lowercase_names(table.file, path, path);
error=table.file->ha_create(path, &table, &create_info);
- VOID(closefrm(&table, 1));
+ (void) closefrm(&table, 1);
DBUG_RETURN(error != 0);
}
diff -Nrup a/sql/hostname.cc b/sql/hostname.cc
--- a/sql/hostname.cc 2007-10-11 19:29:05 +02:00
+++ b/sql/hostname.cc 2008-04-08 12:29:16 +02:00
@@ -87,7 +87,7 @@ static void add_hostname(struct in_addr
{
if (!(specialflag & SPECIAL_NO_HOST_CACHE))
{
- VOID(pthread_mutex_lock(&hostname_cache->lock));
+ pthread_mutex_lock(&hostname_cache->lock);
host_entry *entry;
if (!(entry=(host_entry*) hostname_cache->search((uchar*) &in->s_addr,0)))
{
@@ -106,7 +106,7 @@ static void add_hostname(struct in_addr
(void) hostname_cache->add(entry);
}
}
- VOID(pthread_mutex_unlock(&hostname_cache->lock));
+ pthread_mutex_unlock(&hostname_cache->lock);
}
}
@@ -118,20 +118,20 @@ inline void add_wrong_ip(struct in_addr
void inc_host_errors(struct in_addr *in)
{
- VOID(pthread_mutex_lock(&hostname_cache->lock));
+ pthread_mutex_lock(&hostname_cache->lock);
host_entry *entry;
if ((entry=(host_entry*) hostname_cache->search((uchar*) &in->s_addr,0)))
entry->errors++;
- VOID(pthread_mutex_unlock(&hostname_cache->lock));
+ pthread_mutex_unlock(&hostname_cache->lock);
}
void reset_host_errors(struct in_addr *in)
{
- VOID(pthread_mutex_lock(&hostname_cache->lock));
+ pthread_mutex_lock(&hostname_cache->lock);
host_entry *entry;
if ((entry=(host_entry*) hostname_cache->search((uchar*) &in->s_addr,0)))
entry->errors=0;
- VOID(pthread_mutex_unlock(&hostname_cache->lock));
+ pthread_mutex_unlock(&hostname_cache->lock);
}
/* Deal with systems that don't defined INADDR_LOOPBACK */
@@ -153,7 +153,7 @@ char * ip_to_hostname(struct in_addr *in
/* Check first if we have name in cache */
if (!(specialflag & SPECIAL_NO_HOST_CACHE))
{
- VOID(pthread_mutex_lock(&hostname_cache->lock));
+ pthread_mutex_lock(&hostname_cache->lock);
if ((entry=(host_entry*) hostname_cache->search((uchar*) &in->s_addr,0)))
{
char *name;
@@ -162,10 +162,10 @@ char * ip_to_hostname(struct in_addr *in
else
name=my_strdup(entry->hostname,MYF(0));
*errors= entry->errors;
- VOID(pthread_mutex_unlock(&hostname_cache->lock));
+ pthread_mutex_unlock(&hostname_cache->lock);
DBUG_RETURN(name);
}
- VOID(pthread_mutex_unlock(&hostname_cache->lock));
+ pthread_mutex_unlock(&hostname_cache->lock);
}
struct hostent *hp, *check;
@@ -214,10 +214,10 @@ char * ip_to_hostname(struct in_addr *in
}
my_gethostbyname_r_free();
#else
- VOID(pthread_mutex_lock(&LOCK_hostname));
+ pthread_mutex_lock(&LOCK_hostname);
if (!(hp=gethostbyaddr((char*) in,sizeof(*in), AF_INET)))
{
- VOID(pthread_mutex_unlock(&LOCK_hostname));
+ pthread_mutex_unlock(&LOCK_hostname);
DBUG_PRINT("error",("gethostbyaddr returned %d",errno));
if (errno == HOST_NOT_FOUND || errno == NO_DATA)
@@ -227,17 +227,17 @@ char * ip_to_hostname(struct in_addr *in
}
if (!hp->h_name[0]) // Don't allow empty hostnames
{
- VOID(pthread_mutex_unlock(&LOCK_hostname));
+ pthread_mutex_unlock(&LOCK_hostname);
DBUG_PRINT("error",("Got an empty hostname"));
goto add_wrong_ip_and_return;
}
if (!(name=my_strdup(hp->h_name,MYF(0))))
{
- VOID(pthread_mutex_unlock(&LOCK_hostname));
+ pthread_mutex_unlock(&LOCK_hostname);
DBUG_RETURN(0); // out of memory
}
check=gethostbyname(name);
- VOID(pthread_mutex_unlock(&LOCK_hostname));
+ pthread_mutex_unlock(&LOCK_hostname);
if (!check)
{
DBUG_PRINT("error",("gethostbyname returned %d",errno));
diff -Nrup a/sql/init.cc b/sql/init.cc
--- a/sql/init.cc 2008-04-03 19:14:52 +02:00
+++ b/sql/init.cc 2008-04-08 12:29:17 +02:00
@@ -40,7 +40,7 @@ void unireg_init(ulong options)
my_abort_hook=unireg_abort; /* Abort with close of databases */
#endif
- VOID(strmov(reg_ext,".frm"));
+ (void) strmov(reg_ext,".frm");
reg_ext_length= 4;
specialflag=SPECIAL_SAME_DB_NAME | options; /* Set options from argv */
DBUG_VOID_RETURN;
diff -Nrup a/sql/item.cc b/sql/item.cc
--- a/sql/item.cc 2008-03-28 16:09:12 +01:00
+++ b/sql/item.cc 2008-04-08 12:29:17 +02:00
@@ -1188,7 +1188,7 @@ void Item_case_expr::print(String *str,
{
if (str->reserve(MAX_INT_WIDTH + sizeof("case_expr@")))
return; /* purecov: inspected */
- VOID(str->append(STRING_WITH_LEN("case_expr@")));
+ (void) str->append(STRING_WITH_LEN("case_expr@"));
str->qs_append(m_case_expr_id);
}
diff -Nrup a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
--- a/sql/item_cmpfunc.cc 2008-03-28 19:03:46 +01:00
+++ b/sql/item_cmpfunc.cc 2008-04-08 12:29:18 +02:00
@@ -4117,7 +4117,7 @@ void Item_cond::neg_arguments(THD *thd)
if (!(new_item= new Item_func_not(item)))
return; // Fatal OEM error
}
- VOID(li.replace(new_item));
+ (void) li.replace(new_item);
}
}
diff -Nrup a/sql/item_strfunc.cc b/sql/item_strfunc.cc
--- a/sql/item_strfunc.cc 2008-02-22 11:30:30 +01:00
+++ b/sql/item_strfunc.cc 2008-04-08 12:29:18 +02:00
@@ -462,18 +462,18 @@ String *Item_func_des_encrypt::val_str(S
if (arg_count == 1)
{
/* Protect against someone doing FLUSH DES_KEY_FILE */
- VOID(pthread_mutex_lock(&LOCK_des_key_file));
+ pthread_mutex_lock(&LOCK_des_key_file);
keyschedule= des_keyschedule[key_number=des_default_key];
- VOID(pthread_mutex_unlock(&LOCK_des_key_file));
+ pthread_mutex_unlock(&LOCK_des_key_file);
}
else if (args[1]->result_type() == INT_RESULT)
{
key_number= (uint) args[1]->val_int();
if (key_number > 9)
goto error;
- VOID(pthread_mutex_lock(&LOCK_des_key_file));
+ pthread_mutex_lock(&LOCK_des_key_file);
keyschedule= des_keyschedule[key_number];
- VOID(pthread_mutex_unlock(&LOCK_des_key_file));
+ pthread_mutex_unlock(&LOCK_des_key_file);
}
else
{
@@ -559,9 +559,9 @@ String *Item_func_des_decrypt::val_str(S
key_number > 9)
goto error;
- VOID(pthread_mutex_lock(&LOCK_des_key_file));
+ pthread_mutex_lock(&LOCK_des_key_file);
keyschedule= des_keyschedule[key_number];
- VOID(pthread_mutex_unlock(&LOCK_des_key_file));
+ pthread_mutex_unlock(&LOCK_des_key_file);
}
else
{
diff -Nrup a/sql/lock.cc b/sql/lock.cc
--- a/sql/lock.cc 2008-03-29 16:55:56 +01:00
+++ b/sql/lock.cc 2008-04-08 12:29:19 +02:00
@@ -280,7 +280,7 @@ MYSQL_LOCK *mysql_lock_tables(THD *thd,
if (rc > 1) /* a timeout or a deadlock */
{
if (sql_lock->table_count)
- VOID(unlock_external(thd, sql_lock->table, sql_lock->table_count));
+ (void) unlock_external(thd, sql_lock->table, sql_lock->table_count);
my_error(rc, MYF(0));
my_free((uchar*) sql_lock,MYF(0));
sql_lock= 0;
@@ -388,7 +388,7 @@ void mysql_unlock_tables(THD *thd, MYSQL
if (sql_lock->lock_count)
thr_multi_unlock(sql_lock->locks,sql_lock->lock_count);
if (sql_lock->table_count)
- VOID(unlock_external(thd,sql_lock->table,sql_lock->table_count));
+ (void) unlock_external(thd,sql_lock->table,sql_lock->table_count);
my_free((uchar*) sql_lock,MYF(0));
DBUG_VOID_RETURN;
}
@@ -452,7 +452,7 @@ void mysql_unlock_read_tables(THD *thd,
/* Unlock all read locked tables */
if (i != found)
{
- VOID(unlock_external(thd,table,i-found));
+ (void) unlock_external(thd,table,i-found);
sql_lock->table_count=found;
}
/* Fix the lock positions in TABLE */
@@ -970,7 +970,7 @@ int lock_and_wait_for_table_name(THD *th
if (wait_if_global_read_lock(thd, 0, 1))
DBUG_RETURN(1);
- VOID(pthread_mutex_lock(&LOCK_open));
+ pthread_mutex_lock(&LOCK_open);
if ((lock_retcode = lock_table_name(thd, table_list, TRUE)) < 0)
goto end;
if (lock_retcode && wait_for_locked_table_names(thd, table_list))
@@ -1595,8 +1595,8 @@ bool make_global_read_lock_block_commit(
void broadcast_refresh(void)
{
- VOID(pthread_cond_broadcast(&COND_refresh));
- VOID(pthread_cond_broadcast(&COND_global_read_lock));
+ pthread_cond_broadcast(&COND_refresh);
+ pthread_cond_broadcast(&COND_global_read_lock);
}
/**
diff -Nrup a/sql/log.cc b/sql/log.cc
--- a/sql/log.cc 2008-03-31 10:55:41 +02:00
+++ b/sql/log.cc 2008-04-08 12:29:19 +02:00
@@ -2815,7 +2815,7 @@ bool MYSQL_BIN_LOG::reset_logs(THD* thd)
thread. If the transaction involved MyISAM tables, it should go
into binlog even on rollback.
*/
- VOID(pthread_mutex_lock(&LOCK_thread_count));
+ pthread_mutex_lock(&LOCK_thread_count);
/* Save variables so that we can reopen the log */
save_name=name;
@@ -2895,7 +2895,7 @@ bool MYSQL_BIN_LOG::reset_logs(THD* thd)
my_free((uchar*) save_name, MYF(0));
err:
- VOID(pthread_mutex_unlock(&LOCK_thread_count));
+ pthread_mutex_unlock(&LOCK_thread_count);
pthread_mutex_unlock(&LOCK_index);
pthread_mutex_unlock(&LOCK_log);
DBUG_RETURN(error);
@@ -3851,7 +3851,7 @@ bool MYSQL_BIN_LOG::write(Log_event *eve
if ((thd && !(thd->options & OPTION_BIN_LOG)) ||
(!binlog_filter->db_ok(local_db)))
{
- VOID(pthread_mutex_unlock(&LOCK_log));
+ pthread_mutex_unlock(&LOCK_log);
DBUG_RETURN(0);
}
#endif /* HAVE_REPLICATION */
@@ -4260,7 +4260,7 @@ int MYSQL_BIN_LOG::write_cache(IO_CACHE
bool MYSQL_BIN_LOG::write(THD *thd, IO_CACHE *cache, Log_event *commit_event)
{
DBUG_ENTER("MYSQL_BIN_LOG::write(THD *, IO_CACHE *, Log_event *)");
- VOID(pthread_mutex_lock(&LOCK_log));
+ pthread_mutex_lock(&LOCK_log);
/* NULL would represent nothing to replicate after ROLLBACK */
DBUG_ASSERT(commit_event != NULL);
@@ -4346,7 +4346,7 @@ bool MYSQL_BIN_LOG::write(THD *thd, IO_C
else
rotate_and_purge(RP_LOCK_LOG_IS_ALREADY_LOCKED);
}
- VOID(pthread_mutex_unlock(&LOCK_log));
+ pthread_mutex_unlock(&LOCK_log);
DBUG_RETURN(0);
@@ -4356,7 +4356,7 @@ err:
write_error= 1;
sql_print_error(ER(ER_ERROR_ON_WRITE), name, errno);
}
- VOID(pthread_mutex_unlock(&LOCK_log));
+ pthread_mutex_unlock(&LOCK_log);
DBUG_RETURN(1);
}
@@ -4548,7 +4548,7 @@ bool flush_error_log()
char err_renamed[FN_REFLEN], *end;
end= strmake(err_renamed,log_error_file,FN_REFLEN-4);
strmov(end, "-old");
- VOID(pthread_mutex_lock(&LOCK_error_log));
+ pthread_mutex_lock(&LOCK_error_log);
#ifdef __WIN__
char err_temp[FN_REFLEN+4];
/*
@@ -4587,7 +4587,7 @@ bool flush_error_log()
else
result= 1;
#endif
- VOID(pthread_mutex_unlock(&LOCK_error_log));
+ pthread_mutex_unlock(&LOCK_error_log);
}
return result;
}
@@ -4661,7 +4661,7 @@ static void print_buffer_to_file(enum lo
DBUG_ENTER("print_buffer_to_file");
DBUG_PRINT("enter",("buffer: %s", buffer));
- VOID(pthread_mutex_lock(&LOCK_error_log));
+ pthread_mutex_lock(&LOCK_error_log);
skr= my_time(0);
localtime_r(&skr, &tm_tmp);
@@ -4680,7 +4680,7 @@ static void print_buffer_to_file(enum lo
fflush(stderr);
- VOID(pthread_mutex_unlock(&LOCK_error_log));
+ pthread_mutex_unlock(&LOCK_error_log);
DBUG_VOID_RETURN;
}
diff -Nrup a/sql/log_event.cc b/sql/log_event.cc
--- a/sql/log_event.cc 2008-03-28 14:52:30 +01:00
+++ b/sql/log_event.cc 2008-04-08 12:29:20 +02:00
@@ -2329,9 +2329,9 @@ int Query_log_event::do_apply_event(Rela
thd->set_time((time_t)when);
thd->query_length= q_len_arg;
thd->query= (char*)query_arg;
- VOID(pthread_mutex_lock(&LOCK_thread_count));
+ pthread_mutex_lock(&LOCK_thread_count);
thd->query_id = next_query_id();
- VOID(pthread_mutex_unlock(&LOCK_thread_count));
+ pthread_mutex_unlock(&LOCK_thread_count);
thd->variables.pseudo_thread_id= thread_id; // for temp tables
DBUG_PRINT("query",("%s",thd->query));
@@ -2530,7 +2530,7 @@ Default database: '%s'. Query: '%s'",
} /* End of if (db_ok(... */
end:
- VOID(pthread_mutex_lock(&LOCK_thread_count));
+ pthread_mutex_lock(&LOCK_thread_count);
/*
Probably we have set thd->query, thd->db, thd->catalog to point to places
in the data_buf of this event. Now the event is going to be deleted
@@ -2546,7 +2546,7 @@ end:
DBUG_PRINT("info", ("end: query= 0"));
thd->query= 0; // just to be sure
thd->query_length= 0;
- VOID(pthread_mutex_unlock(&LOCK_thread_count));
+ pthread_mutex_unlock(&LOCK_thread_count);
close_thread_tables(thd);
/*
As a disk space optimization, future masters will not log an event for
@@ -3767,9 +3767,9 @@ int Load_log_event::do_apply_event(NET*
if (rpl_filter->db_ok(thd->db))
{
thd->set_time((time_t)when);
- VOID(pthread_mutex_lock(&LOCK_thread_count));
+ pthread_mutex_lock(&LOCK_thread_count);
thd->query_id = next_query_id();
- VOID(pthread_mutex_unlock(&LOCK_thread_count));
+ pthread_mutex_unlock(&LOCK_thread_count);
/*
Initing thd->row_count is not necessary in theory as this variable has no
influence in the case of the slave SQL thread (it is used to generate a
@@ -3923,12 +3923,12 @@ int Load_log_event::do_apply_event(NET*
error:
thd->net.vio = 0;
const char *remember_db= thd->db;
- VOID(pthread_mutex_lock(&LOCK_thread_count));
+ pthread_mutex_lock(&LOCK_thread_count);
thd->catalog= 0;
thd->set_db(NULL, 0); /* will free the current database */
thd->query= 0;
thd->query_length= 0;
- VOID(pthread_mutex_unlock(&LOCK_thread_count));
+ pthread_mutex_unlock(&LOCK_thread_count);
close_thread_tables(thd);
DBUG_EXECUTE_IF("LOAD_DATA_INFILE_has_fatal_error",
diff -Nrup a/sql/mysqld.cc b/sql/mysqld.cc
--- a/sql/mysqld.cc 2008-04-02 00:42:29 +02:00
+++ b/sql/mysqld.cc 2008-04-08 12:29:20 +02:00
@@ -970,14 +970,14 @@ static void close_server_sock()
{
ip_sock=INVALID_SOCKET;
DBUG_PRINT("info",("calling shutdown on TCP/IP socket"));
- VOID(shutdown(tmp_sock, SHUT_RDWR));
+ (void) shutdown(tmp_sock, SHUT_RDWR);
#if defined(__NETWARE__)
/*
The following code is disabled for normal systems as it causes MySQL
to hang on AIX 4.3 during shutdown
*/
DBUG_PRINT("info",("calling closesocket on TCP/IP socket"));
- VOID(closesocket(tmp_sock));
+ (void) closesocket(tmp_sock);
#endif
}
tmp_sock=unix_sock;
@@ -985,16 +985,16 @@ static void close_server_sock()
{
unix_sock=INVALID_SOCKET;
DBUG_PRINT("info",("calling shutdown on unix socket"));
- VOID(shutdown(tmp_sock, SHUT_RDWR));
+ (void) shutdown(tmp_sock, SHUT_RDWR);
#if defined(__NETWARE__)
/*
The following code is disabled for normal systems as it may cause MySQL
to hang on AIX 4.3 during shutdown
*/
DBUG_PRINT("info",("calling closesocket on unix/IP socket"));
- VOID(closesocket(tmp_sock));
+ (void) closesocket(tmp_sock);
#endif
- VOID(unlink(mysqld_unix_port));
+ (void) unlink(mysqld_unix_port);
}
DBUG_VOID_RETURN;
#endif
@@ -5004,7 +5004,7 @@ pthread_handler_t handle_connections_soc
if (!(thd= new THD))
{
(void) shutdown(new_sock, SHUT_RDWR);
- VOID(closesocket(new_sock));
+ (void) closesocket(new_sock);
continue;
}
if (!(vio_tmp=vio_new(new_sock,
diff -Nrup a/sql/opt_range.h b/sql/opt_range.h
--- a/sql/opt_range.h 2007-11-06 19:57:39 +01:00
+++ b/sql/opt_range.h 2008-04-08 12:29:21 +02:00
@@ -726,7 +726,7 @@ class SQL_SELECT :public Sql_alloc {
class FT_SELECT: public QUICK_RANGE_SELECT {
public:
FT_SELECT(THD *thd, TABLE *table, uint key) :
- QUICK_RANGE_SELECT (thd, table, key, 1) { VOID(init()); }
+ QUICK_RANGE_SELECT (thd, table, key, 1) { (void) init(); }
~FT_SELECT() { file->ft_end(); }
int init() { return error=file->ft_init(); }
int reset() { return 0; }
diff -Nrup a/sql/parse_file.cc b/sql/parse_file.cc
--- a/sql/parse_file.cc 2007-10-11 20:37:42 +02:00
+++ b/sql/parse_file.cc 2008-04-08 12:29:21 +02:00
@@ -386,8 +386,8 @@ my_bool rename_in_schema_file(const char
ulonglong limit= ((revision > num_view_backups) ?
revision - num_view_backups : 0);
- VOID(tablename_to_filename(old_name, old_name_buf, sizeof(old_name_buf)));
- VOID(tablename_to_filename(new_name, new_name_buf, sizeof(new_name_buf)));
+ (void) tablename_to_filename(old_name, old_name_buf, sizeof(old_name_buf));
+ (void) tablename_to_filename(new_name, new_name_buf, sizeof(new_name_buf));
for (; revision > limit ; revision--)
{
diff -Nrup a/sql/protocol.cc b/sql/protocol.cc
--- a/sql/protocol.cc 2008-02-19 13:45:16 +01:00
+++ b/sql/protocol.cc 2008-04-08 12:29:22 +02:00
@@ -162,8 +162,8 @@ net_send_ok(THD *thd,
if (message && message[0])
pos= net_store_data(pos, (uchar*) message, strlen(message));
- VOID(my_net_write(net, buff, (size_t) (pos-buff)));
- VOID(net_flush(net));
+ (void) my_net_write(net, buff, (size_t) (pos-buff));
+ (void) net_flush(net);
thd->main_da.can_overwrite_status= FALSE;
DBUG_PRINT("info", ("OK sent, so no more error sending allowed"));
@@ -202,7 +202,7 @@ net_send_eof(THD *thd, uint server_statu
{
thd->main_da.can_overwrite_status= TRUE;
write_eof_packet(thd, net, server_status, total_warn_count);
- VOID(net_flush(net));
+ (void) net_flush(net);
thd->main_da.can_overwrite_status= FALSE;
DBUG_PRINT("info", ("EOF sent, so no more error sending allowed"));
}
@@ -237,10 +237,10 @@ static void write_eof_packet(THD *thd, N
if (thd->is_fatal_error)
server_status&= ~SERVER_MORE_RESULTS_EXISTS;
int2store(buff + 3, server_status);
- VOID(my_net_write(net, buff, 5));
+ (void) my_net_write(net, buff, 5);
}
else
- VOID(my_net_write(net, eof_buff, 1));
+ (void) my_net_write(net, eof_buff, 1);
}
/**
@@ -301,8 +301,8 @@ void net_send_error_packet(THD *thd, uin
length=(uint) strlen(err);
set_if_smaller(length,MYSQL_ERRMSG_SIZE-1);
}
- VOID(net_write_command(net,(uchar) 255, (uchar*) "", 0, (uchar*) err,
- length));
+ (void) net_write_command(net,(uchar) 255, (uchar*) "", 0, (uchar*) err,
+ length);
DBUG_VOID_RETURN;
}
diff -Nrup a/sql/records.cc b/sql/records.cc
--- a/sql/records.cc 2007-12-14 16:33:35 +01:00
+++ b/sql/records.cc 2008-04-08 12:29:22 +02:00
@@ -153,7 +153,7 @@ void init_read_record(READ_RECORD *info,
if (table->s->tmp_table == NON_TRANSACTIONAL_TMP_TABLE &&
!table->sort.addon_field)
- VOID(table->file->extra(HA_EXTRA_MMAP));
+ (void) table->file->extra(HA_EXTRA_MMAP);
if (table->sort.addon_field)
{
@@ -239,8 +239,8 @@ void init_read_record(READ_RECORD *info,
!(table->s->db_options_in_use & HA_OPTION_PACK_RECORD) ||
(use_record_cache < 0 &&
!(table->file->ha_table_flags() & HA_NOT_DELETE_WITH_CACHE))))
- VOID(table->file->extra_opt(HA_EXTRA_CACHE,
- thd->variables.read_buff_size));
+ (void) table->file->extra_opt(HA_EXTRA_CACHE,
+ thd->variables.read_buff_size);
}
/* Condition pushdown to storage engine */
if (thd->variables.engine_condition_pushdown &&
diff -Nrup a/sql/slave.cc b/sql/slave.cc
--- a/sql/slave.cc 2008-03-31 10:55:42 +02:00
+++ b/sql/slave.cc 2008-04-08 12:29:23 +02:00
@@ -2503,10 +2503,10 @@ err:
// print the current replication position
sql_print_information("Slave I/O thread exiting, read up to log '%s', position %s",
IO_RPL_LOG_NAME, llstr(mi->master_log_pos,llbuff));
- VOID(pthread_mutex_lock(&LOCK_thread_count));
+ pthread_mutex_lock(&LOCK_thread_count);
thd->query = thd->db = 0; // extra safety
thd->query_length= thd->db_length= 0;
- VOID(pthread_mutex_unlock(&LOCK_thread_count));
+ pthread_mutex_unlock(&LOCK_thread_count);
if (mysql)
{
/*
@@ -2789,7 +2789,7 @@ the slave SQL thread with \"SLAVE START\
must "proactively" clear playgrounds:
*/
rli->cleanup_context(thd, 1);
- VOID(pthread_mutex_lock(&LOCK_thread_count));
+ pthread_mutex_lock(&LOCK_thread_count);
/*
Some extra safety, which should not been needed (normally, event deletion
should already have done these assignments (each event which sets these
@@ -2797,7 +2797,7 @@ the slave SQL thread with \"SLAVE START\
*/
thd->query= thd->db= thd->catalog= 0;
thd->query_length= thd->db_length= 0;
- VOID(pthread_mutex_unlock(&LOCK_thread_count));
+ pthread_mutex_unlock(&LOCK_thread_count);
thd_proc_info(thd, "Waiting for slave mutex on exit");
pthread_mutex_lock(&rli->run_lock);
/* We need data_lock, at least to wake up any waiting master_pos_wait() */
diff -Nrup a/sql/sp_head.cc b/sql/sp_head.cc
--- a/sql/sp_head.cc 2008-02-22 11:30:30 +01:00
+++ b/sql/sp_head.cc 2008-04-08 12:29:23 +02:00
@@ -1718,9 +1718,9 @@ sp_head::execute_function(THD *thd, Item
as one select and not resetting THD::user_var_events before
each invocation.
*/
- VOID(pthread_mutex_lock(&LOCK_thread_count));
+ pthread_mutex_lock(&LOCK_thread_count);
q= global_query_id;
- VOID(pthread_mutex_unlock(&LOCK_thread_count));
+ pthread_mutex_unlock(&LOCK_thread_count);
mysql_bin_log.start_union_events(thd, q + 1);
binlog_save_options= thd->options;
thd->options&= ~OPTION_BIN_LOG;
@@ -2663,9 +2663,9 @@ sp_lex_keeper::reset_lex_and_exec_core(T
*/
thd->lex= m_lex;
- VOID(pthread_mutex_lock(&LOCK_thread_count));
+ pthread_mutex_lock(&LOCK_thread_count);
thd->query_id= next_query_id();
- VOID(pthread_mutex_unlock(&LOCK_thread_count));
+ pthread_mutex_unlock(&LOCK_thread_count);
if (thd->prelocked_mode == NON_PRELOCKED)
{
diff -Nrup a/sql/sp_pcontext.cc b/sql/sp_pcontext.cc
--- a/sql/sp_pcontext.cc 2008-03-21 19:07:59 +01:00
+++ b/sql/sp_pcontext.cc 2008-04-08 12:29:24 +02:00
@@ -62,21 +62,21 @@ sp_pcontext::sp_pcontext()
m_context_handlers(0), m_parent(NULL), m_pboundary(0),
m_label_scope(LABEL_DEFAULT_SCOPE)
{
- VOID(my_init_dynamic_array(&m_vars, sizeof(sp_variable_t *),
+ (void) my_init_dynamic_array(&m_vars, sizeof(sp_variable_t *),
PCONTEXT_ARRAY_INIT_ALLOC,
- PCONTEXT_ARRAY_INCREMENT_ALLOC));
- VOID(my_init_dynamic_array(&m_case_expr_id_lst, sizeof(int),
+ PCONTEXT_ARRAY_INCREMENT_ALLOC);
+ (void) my_init_dynamic_array(&m_case_expr_id_lst, sizeof(int),
PCONTEXT_ARRAY_INIT_ALLOC,
- PCONTEXT_ARRAY_INCREMENT_ALLOC));
- VOID(my_init_dynamic_array(&m_conds, sizeof(sp_cond_type_t *),
+ PCONTEXT_ARRAY_INCREMENT_ALLOC);
+ (void) my_init_dynamic_array(&m_conds, sizeof(sp_cond_type_t *),
PCONTEXT_ARRAY_INIT_ALLOC,
- PCONTEXT_ARRAY_INCREMENT_ALLOC));
- VOID(my_init_dynamic_array(&m_cursors, sizeof(LEX_STRING),
+ PCONTEXT_ARRAY_INCREMENT_ALLOC);
+ (void) my_init_dynamic_array(&m_cursors, sizeof(LEX_STRING),
PCONTEXT_ARRAY_INIT_ALLOC,
- PCONTEXT_ARRAY_INCREMENT_ALLOC));
- VOID(my_init_dynamic_array(&m_handlers, sizeof(sp_cond_type_t *),
+ PCONTEXT_ARRAY_INCREMENT_ALLOC);
+ (void) my_init_dynamic_array(&m_handlers, sizeof(sp_cond_type_t *),
PCONTEXT_ARRAY_INIT_ALLOC,
- PCONTEXT_ARRAY_INCREMENT_ALLOC));
+ PCONTEXT_ARRAY_INCREMENT_ALLOC);
m_label.empty();
m_children.empty();
@@ -90,21 +90,21 @@ sp_pcontext::sp_pcontext(sp_pcontext *pr
m_context_handlers(0), m_parent(prev), m_pboundary(0),
m_label_scope(label_scope)
{
- VOID(my_init_dynamic_array(&m_vars, sizeof(sp_variable_t *),
+ (void) my_init_dynamic_array(&m_vars, sizeof(sp_variable_t *),
PCONTEXT_ARRAY_INIT_ALLOC,
- PCONTEXT_ARRAY_INCREMENT_ALLOC));
- VOID(my_init_dynamic_array(&m_case_expr_id_lst, sizeof(int),
+ PCONTEXT_ARRAY_INCREMENT_ALLOC);
+ (void) my_init_dynamic_array(&m_case_expr_id_lst, sizeof(int),
PCONTEXT_ARRAY_INIT_ALLOC,
- PCONTEXT_ARRAY_INCREMENT_ALLOC));
- VOID(my_init_dynamic_array(&m_conds, sizeof(sp_cond_type_t *),
+ PCONTEXT_ARRAY_INCREMENT_ALLOC);
+ (void) my_init_dynamic_array(&m_conds, sizeof(sp_cond_type_t *),
PCONTEXT_ARRAY_INIT_ALLOC,
- PCONTEXT_ARRAY_INCREMENT_ALLOC));
- VOID(my_init_dynamic_array(&m_cursors, sizeof(LEX_STRING),
+ PCONTEXT_ARRAY_INCREMENT_ALLOC);
+ (void) my_init_dynamic_array(&m_cursors, sizeof(LEX_STRING),
PCONTEXT_ARRAY_INIT_ALLOC,
- PCONTEXT_ARRAY_INCREMENT_ALLOC));
- VOID(my_init_dynamic_array(&m_handlers, sizeof(sp_cond_type_t *),
+ PCONTEXT_ARRAY_INCREMENT_ALLOC);
+ (void) my_init_dynamic_array(&m_handlers, sizeof(sp_cond_type_t *),
PCONTEXT_ARRAY_INIT_ALLOC,
- PCONTEXT_ARRAY_INCREMENT_ALLOC));
+ PCONTEXT_ARRAY_INCREMENT_ALLOC);
m_label.empty();
m_children.empty();
diff -Nrup a/sql/sql_acl.cc b/sql/sql_acl.cc
--- a/sql/sql_acl.cc 2008-03-28 10:28:48 +01:00
+++ b/sql/sql_acl.cc 2008-04-08 12:29:24 +02:00
@@ -326,7 +326,7 @@ static my_bool acl_load(THD *thd, TABLE_
init_sql_alloc(&mem, ACL_ALLOC_BLOCK_SIZE, 0);
init_read_record(&read_record_info,thd,table= tables[0].table,NULL,1,0);
table->use_all_columns();
- VOID(my_init_dynamic_array(&acl_hosts,sizeof(ACL_HOST),20,50));
+ (void) my_init_dynamic_array(&acl_hosts,sizeof(ACL_HOST),20,50);
while (!(read_record_info.read_record(&read_record_info)))
{
ACL_HOST host;
@@ -366,7 +366,7 @@ static my_bool acl_load(THD *thd, TABLE_
host.access|=REFERENCES_ACL | INDEX_ACL | ALTER_ACL | CREATE_TMP_ACL;
}
#endif
- VOID(push_dynamic(&acl_hosts,(uchar*) &host));
+ (void) push_dynamic(&acl_hosts,(uchar*) &host);
}
my_qsort((uchar*) dynamic_element(&acl_hosts,0,ACL_HOST*),acl_hosts.elements,
sizeof(ACL_HOST),(qsort_cmp) acl_compare);
@@ -375,7 +375,7 @@ static my_bool acl_load(THD *thd, TABLE_
init_read_record(&read_record_info,thd,table=tables[1].table,NULL,1,0);
table->use_all_columns();
- VOID(my_init_dynamic_array(&acl_users,sizeof(ACL_USER),50,100));
+ (void) my_init_dynamic_array(&acl_users,sizeof(ACL_USER),50,100);
password_length= table->field[2]->field_length /
table->field[2]->charset()->mbmaxlen;
if (password_length < SCRAMBLED_PASSWORD_CHAR_LENGTH_323)
@@ -550,7 +550,7 @@ static my_bool acl_load(THD *thd, TABLE_
user.access|= SUPER_ACL | EXECUTE_ACL;
#endif
}
- VOID(push_dynamic(&acl_users,(uchar*) &user));
+ (void) push_dynamic(&acl_users,(uchar*) &user);
if (!user.host.hostname ||
(user.host.hostname[0] == wild_many && !user.host.hostname[1]))
allow_all_hosts=1; // Anyone can connect
@@ -563,7 +563,7 @@ static my_bool acl_load(THD *thd, TABLE_
init_read_record(&read_record_info,thd,table=tables[2].table,NULL,1,0);
table->use_all_columns();
- VOID(my_init_dynamic_array(&acl_dbs,sizeof(ACL_DB),50,100));
+ (void) my_init_dynamic_array(&acl_dbs,sizeof(ACL_DB),50,100);
while (!(read_record_info.read_record(&read_record_info)))
{
ACL_DB db;
@@ -613,7 +613,7 @@ static my_bool acl_load(THD *thd, TABLE_
db.access|=REFERENCES_ACL | INDEX_ACL | ALTER_ACL;
}
#endif
- VOID(push_dynamic(&acl_dbs,(uchar*) &db));
+ (void) push_dynamic(&acl_dbs,(uchar*) &db);
}
my_qsort((uchar*) dynamic_element(&acl_dbs,0,ACL_DB*),acl_dbs.elements,
sizeof(ACL_DB),(qsort_cmp) acl_compare);
@@ -704,7 +704,7 @@ my_bool acl_reload(THD *thd)
}
if ((old_initialized=initialized))
- VOID(pthread_mutex_lock(&acl_cache->lock));
+ pthread_mutex_lock(&acl_cache->lock);
old_acl_hosts=acl_hosts;
old_acl_users=acl_users;
@@ -731,7 +731,7 @@ my_bool acl_reload(THD *thd)
delete_dynamic(&old_acl_dbs);
}
if (old_initialized)
- VOID(pthread_mutex_unlock(&acl_cache->lock));
+ pthread_mutex_unlock(&acl_cache->lock);
end:
close_thread_tables(thd);
DBUG_RETURN(return_val);
@@ -883,7 +883,7 @@ int acl_getroot(THD *thd, USER_RESOURCES
DBUG_RETURN(0);
}
- VOID(pthread_mutex_lock(&acl_cache->lock));
+ pthread_mutex_lock(&acl_cache->lock);
/*
Find acl entry in user database. Note, that find_acl_user is not the same,
@@ -1055,7 +1055,7 @@ int acl_getroot(THD *thd, USER_RESOURCES
else
*sctx->priv_host= 0;
}
- VOID(pthread_mutex_unlock(&acl_cache->lock));
+ pthread_mutex_unlock(&acl_cache->lock);
DBUG_RETURN(res);
}
@@ -1102,7 +1102,7 @@ bool acl_getroot_no_password(Security_co
DBUG_RETURN(FALSE);
}
- VOID(pthread_mutex_lock(&acl_cache->lock));
+ pthread_mutex_lock(&acl_cache->lock);
sctx->master_access= 0;
sctx->db_access= 0;
@@ -1156,7 +1156,7 @@ bool acl_getroot_no_password(Security_co
else
*sctx->priv_host= 0;
}
- VOID(pthread_mutex_unlock(&acl_cache->lock));
+ pthread_mutex_unlock(&acl_cache->lock);
DBUG_RETURN(res);
}
@@ -1245,7 +1245,7 @@ static void acl_insert_user(const char *
set_user_salt(&acl_user, password, password_len);
- VOID(push_dynamic(&acl_users,(uchar*) &acl_user));
+ (void) push_dynamic(&acl_users,(uchar*) &acl_user);
if (!acl_user.host.hostname ||
(acl_user.host.hostname[0] == wild_many && !acl_user.host.hostname[1]))
allow_all_hosts=1; // Anyone can connect /* purecov: tested */
@@ -1311,7 +1311,7 @@ static void acl_insert_db(const char *us
acl_db.db=strdup_root(&mem,db);
acl_db.access=privileges;
acl_db.sort=get_sort(3,acl_db.host.hostname,acl_db.db,acl_db.user);
- VOID(push_dynamic(&acl_dbs,(uchar*) &acl_db));
+ (void) push_dynamic(&acl_dbs,(uchar*) &acl_db);
my_qsort((uchar*) dynamic_element(&acl_dbs,0,ACL_DB*),acl_dbs.elements,
sizeof(ACL_DB),(qsort_cmp) acl_compare);
}
@@ -1335,7 +1335,7 @@ ulong acl_get(const char *host, const ch
acl_entry *entry;
DBUG_ENTER("acl_get");
- VOID(pthread_mutex_lock(&acl_cache->lock));
+ pthread_mutex_lock(&acl_cache->lock);
end=strmov((tmp_db=strmov(strmov(key, ip ? ip : "")+1,user)+1),db);
if (lower_case_table_names)
{
@@ -1347,7 +1347,7 @@ ulong acl_get(const char *host, const ch
key_length)))
{
db_access=entry->access;
- VOID(pthread_mutex_unlock(&acl_cache->lock));
+ pthread_mutex_unlock(&acl_cache->lock);
DBUG_PRINT("exit", ("access: 0x%lx", db_access));
DBUG_RETURN(db_access);
}
@@ -1401,7 +1401,7 @@ exit:
memcpy((uchar*) entry->key,key,key_length);
acl_cache->add(entry);
}
- VOID(pthread_mutex_unlock(&acl_cache->lock));
+ pthread_mutex_unlock(&acl_cache->lock);
DBUG_PRINT("exit", ("access: 0x%lx", db_access & host_access));
DBUG_RETURN(db_access & host_access);
}
@@ -1417,10 +1417,10 @@ exit:
static void init_check_host(void)
{
DBUG_ENTER("init_check_host");
- VOID(my_init_dynamic_array(&acl_wild_hosts,sizeof(struct acl_host_and_ip),
- acl_users.elements,1));
- VOID(hash_init(&acl_check_hosts,system_charset_info,acl_users.elements,0,0,
- (hash_get_key) check_get_key,0,0));
+ (void) my_init_dynamic_array(&acl_wild_hosts,sizeof(struct acl_host_and_ip),
+ acl_users.elements,1);
+ (void) hash_init(&acl_check_hosts,system_charset_info,acl_users.elements,0,0,
+ (hash_get_key) check_get_key,0,0);
if (!allow_all_hosts)
{
for (uint i=0 ; i < acl_users.elements ; i++)
@@ -1481,12 +1481,12 @@ bool acl_check_host(const char *host, co
{
if (allow_all_hosts)
return 0;
- VOID(pthread_mutex_lock(&acl_cache->lock));
+ pthread_mutex_lock(&acl_cache->lock);
if (host && hash_search(&acl_check_hosts,(uchar*) host,strlen(host)) ||
ip && hash_search(&acl_check_hosts,(uchar*) ip, strlen(ip)))
{
- VOID(pthread_mutex_unlock(&acl_cache->lock));
+ pthread_mutex_unlock(&acl_cache->lock);
return 0; // Found host
}
for (uint i=0 ; i < acl_wild_hosts.elements ; i++)
@@ -1494,11 +1494,11 @@ bool acl_check_host(const char *host, co
acl_host_and_ip *acl=dynamic_element(&acl_wild_hosts,i,acl_host_and_ip*);
if (compare_hostname(acl, host, ip))
{
- VOID(pthread_mutex_unlock(&acl_cache->lock));
+ pthread_mutex_unlock(&acl_cache->lock);
return 0; // Host ok
}
}
- VOID(pthread_mutex_unlock(&acl_cache->lock));
+ pthread_mutex_unlock(&acl_cache->lock);
return 1; // Host is not allowed
}
@@ -1612,11 +1612,11 @@ bool change_password(THD *thd, const cha
if (!(table= open_ltable(thd, &tables, TL_WRITE, 0)))
DBUG_RETURN(1);
- VOID(pthread_mutex_lock(&acl_cache->lock));
+ pthread_mutex_lock(&acl_cache->lock);
ACL_USER *acl_user;
if (!(acl_user= find_acl_user(host, user, TRUE)))
{
- VOID(pthread_mutex_unlock(&acl_cache->lock));
+ pthread_mutex_unlock(&acl_cache->lock);
my_message(ER_PASSWORD_NO_MATCH, ER(ER_PASSWORD_NO_MATCH), MYF(0));
goto end;
}
@@ -1628,12 +1628,12 @@ bool change_password(THD *thd, const cha
acl_user->user ? acl_user->user : "",
new_password, new_password_len))
{
- VOID(pthread_mutex_unlock(&acl_cache->lock)); /* purecov: deadcode */
+ pthread_mutex_unlock(&acl_cache->lock); /* purecov: deadcode */
goto end;
}
acl_cache->clear(1); // Clear locked hostname cache
- VOID(pthread_mutex_unlock(&acl_cache->lock));
+ pthread_mutex_unlock(&acl_cache->lock);
result= 0;
if (mysql_bin_log.is_open())
{
@@ -1673,9 +1673,9 @@ bool is_acl_user(const char *host, const
if (!initialized)
return TRUE;
- VOID(pthread_mutex_lock(&acl_cache->lock));
+ pthread_mutex_lock(&acl_cache->lock);
res= find_acl_user(host, user, TRUE) != NULL;
- VOID(pthread_mutex_unlock(&acl_cache->lock));
+ pthread_mutex_unlock(&acl_cache->lock);
return res;
}
@@ -3425,7 +3425,7 @@ bool mysql_grant(THD *thd, const char *d
/* go through users in user_list */
rw_wrlock(&LOCK_grant);
- VOID(pthread_mutex_lock(&acl_cache->lock));
+ pthread_mutex_lock(&acl_cache->lock);
grant_version++;
int result=0;
@@ -3457,7 +3457,7 @@ bool mysql_grant(THD *thd, const char *d
}
}
}
- VOID(pthread_mutex_unlock(&acl_cache->lock));
+ pthread_mutex_unlock(&acl_cache->lock);
if (!result)
{
@@ -4491,12 +4491,12 @@ bool mysql_show_grants(THD *thd,LEX_USER
}
rw_rdlock(&LOCK_grant);
- VOID(pthread_mutex_lock(&acl_cache->lock));
+ pthread_mutex_lock(&acl_cache->lock);
acl_user= find_acl_user(lex_user->host.str, lex_user->user.str, TRUE);
if (!acl_user)
{
- VOID(pthread_mutex_unlock(&acl_cache->lock));
+ pthread_mutex_unlock(&acl_cache->lock);
rw_unlock(&LOCK_grant);
my_error(ER_NONEXISTING_GRANT, MYF(0),
@@ -4514,7 +4514,7 @@ bool mysql_show_grants(THD *thd,LEX_USER
if (protocol->send_fields(&field_list,
Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
{
- VOID(pthread_mutex_unlock(&acl_cache->lock));
+ pthread_mutex_unlock(&acl_cache->lock);
rw_unlock(&LOCK_grant);
DBUG_RETURN(TRUE);
@@ -4825,7 +4825,7 @@ bool mysql_show_grants(THD *thd,LEX_USER
}
end:
- VOID(pthread_mutex_unlock(&acl_cache->lock));
+ pthread_mutex_unlock(&acl_cache->lock);
rw_unlock(&LOCK_grant);
my_eof(thd);
@@ -5614,7 +5614,7 @@ bool mysql_create_user(THD *thd, List <L
DBUG_RETURN(result != 1);
rw_wrlock(&LOCK_grant);
- VOID(pthread_mutex_lock(&acl_cache->lock));
+ pthread_mutex_lock(&acl_cache->lock);
while ((tmp_user_name= user_list++))
{
@@ -5644,7 +5644,7 @@ bool mysql_create_user(THD *thd, List <L
}
}
- VOID(pthread_mutex_unlock(&acl_cache->lock));
+ pthread_mutex_unlock(&acl_cache->lock);
if (result)
my_error(ER_CANNOT_USER, MYF(0), "CREATE USER", wrong_users.c_ptr_safe());
@@ -5693,7 +5693,7 @@ bool mysql_drop_user(THD *thd, List <LEX
DBUG_RETURN(result != 1);
rw_wrlock(&LOCK_grant);
- VOID(pthread_mutex_lock(&acl_cache->lock));
+ pthread_mutex_lock(&acl_cache->lock);
while ((tmp_user_name= user_list++))
{
@@ -5715,7 +5715,7 @@ bool mysql_drop_user(THD *thd, List <LEX
/* Rebuild 'acl_check_hosts' since 'acl_users' has been modified */
rebuild_check_host();
- VOID(pthread_mutex_unlock(&acl_cache->lock));
+ pthread_mutex_unlock(&acl_cache->lock);
if (result)
my_error(ER_CANNOT_USER, MYF(0), "DROP USER", wrong_users.c_ptr_safe());
@@ -5765,7 +5765,7 @@ bool mysql_rename_user(THD *thd, List <L
DBUG_RETURN(result != 1);
rw_wrlock(&LOCK_grant);
- VOID(pthread_mutex_lock(&acl_cache->lock));
+ pthread_mutex_lock(&acl_cache->lock);
while ((tmp_user_from= user_list++))
{
@@ -5799,7 +5799,7 @@ bool mysql_rename_user(THD *thd, List <L
/* Rebuild 'acl_check_hosts' since 'acl_users' has been modified */
rebuild_check_host();
- VOID(pthread_mutex_unlock(&acl_cache->lock));
+ pthread_mutex_unlock(&acl_cache->lock);
if (result)
my_error(ER_CANNOT_USER, MYF(0), "RENAME USER", wrong_users.c_ptr_safe());
@@ -5846,7 +5846,7 @@ bool mysql_revoke_all(THD *thd, List <L
DBUG_RETURN(result != 1);
rw_wrlock(&LOCK_grant);
- VOID(pthread_mutex_lock(&acl_cache->lock));
+ pthread_mutex_lock(&acl_cache->lock);
LEX_USER *lex_user, *tmp_lex_user;
List_iterator <LEX_USER> user_list(list);
@@ -5985,7 +5985,7 @@ bool mysql_revoke_all(THD *thd, List <L
} while (revoked);
}
- VOID(pthread_mutex_unlock(&acl_cache->lock));
+ pthread_mutex_unlock(&acl_cache->lock);
write_bin_log(thd, FALSE, thd->query, thd->query_length);
@@ -6086,7 +6086,7 @@ bool sp_revoke_privileges(THD *thd, cons
thd->push_internal_handler(&error_handler);
rw_wrlock(&LOCK_grant);
- VOID(pthread_mutex_lock(&acl_cache->lock));
+ pthread_mutex_lock(&acl_cache->lock);
/*
This statement will be replicated as a statement, even when using
@@ -6124,7 +6124,7 @@ bool sp_revoke_privileges(THD *thd, cons
}
} while (revoked);
- VOID(pthread_mutex_unlock(&acl_cache->lock));
+ pthread_mutex_unlock(&acl_cache->lock);
rw_unlock(&LOCK_grant);
close_thread_tables(thd);
@@ -6165,7 +6165,7 @@ int sp_grant_privileges(THD *thd, const
combo->user.str= sctx->user;
- VOID(pthread_mutex_lock(&acl_cache->lock));
+ pthread_mutex_lock(&acl_cache->lock);
if ((au=
find_acl_user(combo->host.str=(char*)sctx->host_or_ip,combo->user.str,FALSE)))
goto found_acl;
@@ -6176,11 +6176,11 @@ int sp_grant_privileges(THD *thd, const
if((au= find_acl_user(combo->host.str=(char*)"%", combo->user.str, FALSE)))
goto found_acl;
- VOID(pthread_mutex_unlock(&acl_cache->lock));
+ pthread_mutex_unlock(&acl_cache->lock);
DBUG_RETURN(TRUE);
found_acl:
- VOID(pthread_mutex_unlock(&acl_cache->lock));
+ pthread_mutex_unlock(&acl_cache->lock);
bzero((char*)tables, sizeof(TABLE_LIST));
user_list.empty();
diff -Nrup a/sql/sql_base.cc b/sql/sql_base.cc
--- a/sql/sql_base.cc 2008-03-27 12:54:43 +01:00
+++ b/sql/sql_base 