Skip to content

Commit 058b2ee

Browse files
jhauglidjhauglid
committed
Bug#17647863: MYSQL DOES NOT COMPILE ON OSX 10.9 GM
Rename test() macro to MY_TEST() to avoid conflict with libc++.
1 parent 51db32b commit 058b2ee

93 files changed

Lines changed: 331 additions & 331 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎client/mysql.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,8 +234,8 @@ static my_bool execute_buffer_conversion_done= 0;
234234
The same is true for stderr.
235235
*/
236236
static uint win_is_console_cache=
237-
(test(my_win_is_console(stdout)) * (1 << _fileno(stdout))) |
238-
(test(my_win_is_console(stderr)) * (1 << _fileno(stderr)));
237+
(MY_TEST(my_win_is_console(stdout)) * (1 << _fileno(stdout))) |
238+
(MY_TEST(my_win_is_console(stderr)) * (1 << _fileno(stderr)));
239239

240240
static inline my_bool
241241
my_win_is_console_cached(FILE *file)

‎include/my_global.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ typedef unsigned short ushort;
461461
#endif
462462

463463
#define swap_variables(t, a, b) { t dummy; dummy= a; a= b; b= dummy; }
464-
#define test(a) ((a) ? 1 : 0)
464+
#define MY_TEST(a) ((a) ? 1 : 0)
465465
#define set_if_bigger(a,b) do { if ((a) < (b)) (a)=(b); } while(0)
466466
#define set_if_smaller(a,b) do { if ((a) > (b)) (a)=(b); } while(0)
467467
#define test_all_bits(a,b) (((a) & (b)) == (b))

‎include/myisam.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ extern "C" {
8080

8181
#define mi_is_key_active(_keymap_,_keyno_) \
8282
(((_keyno_) < MI_KEYMAP_BITS) ? \
83-
test((_keymap_) & (ULL(1) << (_keyno_))) : \
84-
test((_keymap_) & MI_KEYMAP_HIGH_MASK))
83+
MY_TEST((_keymap_) & (ULL(1) << (_keyno_))) : \
84+
MY_TEST((_keymap_) & MI_KEYMAP_HIGH_MASK))
8585
#define mi_set_key_active(_keymap_,_keyno_) \
8686
(_keymap_)|= (((_keyno_) < MI_KEYMAP_BITS) ? \
8787
(ULL(1) << (_keyno_)) : \
@@ -94,7 +94,7 @@ extern "C" {
9494
#else
9595

9696
#define mi_is_key_active(_keymap_,_keyno_) \
97-
test((_keymap_) & (ULL(1) << (_keyno_)))
97+
MY_TEST((_keymap_) & (ULL(1) << (_keyno_)))
9898
#define mi_set_key_active(_keymap_,_keyno_) \
9999
(_keymap_)|= (ULL(1) << (_keyno_))
100100
#define mi_clear_key_active(_keymap_,_keyno_) \
@@ -103,7 +103,7 @@ extern "C" {
103103
#endif
104104

105105
#define mi_is_any_key_active(_keymap_) \
106-
test((_keymap_))
106+
MY_TEST((_keymap_))
107107
#define mi_is_all_keys_active(_keymap_,_keys_) \
108108
((_keymap_) == mi_get_mask_all_keys_active(_keys_))
109109
#define mi_set_all_keys_active(_keymap_,_keys_) \

‎libmysql/libmysql.c‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2078,9 +2078,9 @@ static my_bool execute(MYSQL_STMT *stmt, char *packet, ulong length)
20782078
buff[4]= (char) stmt->flags;
20792079
int4store(buff+5, 1); /* iteration count */
20802080

2081-
res= test(cli_advanced_command(mysql, COM_STMT_EXECUTE, buff, sizeof(buff),
2082-
(uchar*) packet, length, 1, stmt) ||
2083-
(*mysql->methods->read_query_result)(mysql));
2081+
res= MY_TEST(cli_advanced_command(mysql, COM_STMT_EXECUTE, buff, sizeof(buff),
2082+
(uchar*) packet, length, 1, stmt) ||
2083+
(*mysql->methods->read_query_result)(mysql));
20842084
stmt->affected_rows= mysql->affected_rows;
20852085
stmt->server_status= mysql->server_status;
20862086
stmt->insert_id= mysql->insert_id;
@@ -2566,7 +2566,7 @@ int STDCALL mysql_stmt_execute(MYSQL_STMT *stmt)
25662566
reinit_result_set_metadata(stmt);
25672567
prepare_to_fetch_result(stmt);
25682568
}
2569-
DBUG_RETURN(test(stmt->last_errno));
2569+
DBUG_RETURN(MY_TEST(stmt->last_errno));
25702570
}
25712571

25722572

@@ -3186,15 +3186,15 @@ static void fetch_string_with_conversion(MYSQL_BIND *param, char *value,
31863186
int err;
31873187
double data= my_strntod(&my_charset_latin1, value, length, &endptr, &err);
31883188
float fdata= (float) data;
3189-
*param->error= (fdata != data) | test(err);
3189+
*param->error= (fdata != data) | MY_TEST(err);
31903190
floatstore(buffer, fdata);
31913191
break;
31923192
}
31933193
case MYSQL_TYPE_DOUBLE:
31943194
{
31953195
int err;
31963196
double data= my_strntod(&my_charset_latin1, value, length, &endptr, &err);
3197-
*param->error= test(err);
3197+
*param->error= MY_TEST(err);
31983198
doublestore(buffer, data);
31993199
break;
32003200
}
@@ -3203,7 +3203,7 @@ static void fetch_string_with_conversion(MYSQL_BIND *param, char *value,
32033203
MYSQL_TIME_STATUS status;
32043204
MYSQL_TIME *tm= (MYSQL_TIME *)buffer;
32053205
str_to_time(value, length, tm, &status);
3206-
*param->error= test(status.warnings);
3206+
*param->error= MY_TEST(status.warnings);
32073207
break;
32083208
}
32093209
case MYSQL_TYPE_DATE:
@@ -3213,7 +3213,7 @@ static void fetch_string_with_conversion(MYSQL_BIND *param, char *value,
32133213
MYSQL_TIME_STATUS status;
32143214
MYSQL_TIME *tm= (MYSQL_TIME *)buffer;
32153215
(void) str_to_datetime(value, length, tm, TIME_FUZZY_DATE, &status);
3216-
*param->error= test(status.warnings) &&
3216+
*param->error= MY_TEST(status.warnings) &&
32173217
(param->buffer_type == MYSQL_TYPE_DATE &&
32183218
tm->time_type != MYSQL_TIMESTAMP_DATE);
32193219
break;
@@ -3338,7 +3338,7 @@ static void fetch_long_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field,
33383338
int error;
33393339
value= number_to_datetime(value, (MYSQL_TIME *) buffer, TIME_FUZZY_DATE,
33403340
&error);
3341-
*param->error= test(error);
3341+
*param->error= MY_TEST(error);
33423342
break;
33433343
}
33443344
default:
@@ -3686,7 +3686,7 @@ static void fetch_result_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field,
36863686
static void fetch_result_tinyint(MYSQL_BIND *param, MYSQL_FIELD *field,
36873687
uchar **row)
36883688
{
3689-
my_bool field_is_unsigned= test(field->flags & UNSIGNED_FLAG);
3689+
my_bool field_is_unsigned= MY_TEST(field->flags & UNSIGNED_FLAG);
36903690
uchar data= **row;
36913691
*(uchar *)param->buffer= data;
36923692
*param->error= param->is_unsigned != field_is_unsigned && data > INT_MAX8;
@@ -3696,7 +3696,7 @@ static void fetch_result_tinyint(MYSQL_BIND *param, MYSQL_FIELD *field,
36963696
static void fetch_result_short(MYSQL_BIND *param, MYSQL_FIELD *field,
36973697
uchar **row)
36983698
{
3699-
my_bool field_is_unsigned= test(field->flags & UNSIGNED_FLAG);
3699+
my_bool field_is_unsigned= MY_TEST(field->flags & UNSIGNED_FLAG);
37003700
ushort data= (ushort) sint2korr(*row);
37013701
shortstore(param->buffer, data);
37023702
*param->error= param->is_unsigned != field_is_unsigned && data > INT_MAX16;
@@ -3707,7 +3707,7 @@ static void fetch_result_int32(MYSQL_BIND *param,
37073707
MYSQL_FIELD *field __attribute__((unused)),
37083708
uchar **row)
37093709
{
3710-
my_bool field_is_unsigned= test(field->flags & UNSIGNED_FLAG);
3710+
my_bool field_is_unsigned= MY_TEST(field->flags & UNSIGNED_FLAG);
37113711
uint32 data= (uint32) sint4korr(*row);
37123712
longstore(param->buffer, data);
37133713
*param->error= param->is_unsigned != field_is_unsigned && data > INT_MAX32;
@@ -3718,7 +3718,7 @@ static void fetch_result_int64(MYSQL_BIND *param,
37183718
MYSQL_FIELD *field __attribute__((unused)),
37193719
uchar **row)
37203720
{
3721-
my_bool field_is_unsigned= test(field->flags & UNSIGNED_FLAG);
3721+
my_bool field_is_unsigned= MY_TEST(field->flags & UNSIGNED_FLAG);
37223722
ulonglong data= (ulonglong) sint8korr(*row);
37233723
*param->error= param->is_unsigned != field_is_unsigned && data > LONGLONG_MAX;
37243724
longlongstore(param->buffer, data);
@@ -4712,7 +4712,7 @@ my_bool STDCALL mysql_stmt_close(MYSQL_STMT *stmt)
47124712
my_free(stmt->extension);
47134713
my_free(stmt);
47144714

4715-
DBUG_RETURN(test(rc));
4715+
DBUG_RETURN(MY_TEST(rc));
47164716
}
47174717

47184718
/*

‎libmysqld/lib_sql.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -337,9 +337,9 @@ static int emb_stmt_execute(MYSQL_STMT *stmt)
337337
thd->client_param_count= stmt->param_count;
338338
thd->client_params= stmt->params;
339339

340-
res= test(emb_advanced_command(stmt->mysql, COM_STMT_EXECUTE, 0, 0,
341-
header, sizeof(header), 1, stmt) ||
342-
emb_read_query_result(stmt->mysql));
340+
res= MY_TEST(emb_advanced_command(stmt->mysql, COM_STMT_EXECUTE, 0, 0,
341+
header, sizeof(header), 1, stmt) ||
342+
emb_read_query_result(stmt->mysql));
343343
stmt->affected_rows= stmt->mysql->affected_rows;
344344
stmt->insert_id= stmt->mysql->insert_id;
345345
stmt->server_status= stmt->mysql->server_status;

‎mysys/mf_iocache.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ int init_io_cache(IO_CACHE *info, File file, size_t cachesize,
180180
DBUG_ASSERT(seek_offset == 0);
181181
}
182182
else
183-
info->seek_not_done= test(seek_offset != pos);
183+
info->seek_not_done= MY_TEST(seek_offset != pos);
184184
}
185185

186186
info->disk_writes= 0;

‎mysys/my_copy.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ int my_copy(const char *from, const char *to, myf MyFlags)
6363
from_file=to_file= -1;
6464
DBUG_ASSERT(!(MyFlags & (MY_FNABP | MY_NABP))); /* for my_read/my_write */
6565
if (MyFlags & MY_HOLD_ORIGINAL_MODES) /* Copy stat if possible */
66-
new_file_stat= test(my_stat((char*) to, &new_stat_buff, MYF(0)));
66+
new_file_stat= MY_TEST(my_stat((char*) to, &new_stat_buff, MYF(0)));
6767

6868
if ((from_file=my_open(from,O_RDONLY | O_SHARE,MyFlags)) >= 0)
6969
{

‎mysys/my_getwd.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,12 +162,12 @@ int test_if_hard_path(register const char *dir_name)
162162

163163
my_bool has_path(const char *name)
164164
{
165-
return test(strchr(name, FN_LIBCHAR))
165+
return MY_TEST(strchr(name, FN_LIBCHAR))
166166
#if FN_LIBCHAR != '/'
167-
|| test(strchr(name,'/'))
167+
|| MY_TEST(strchr(name,'/'))
168168
#endif
169169
#ifdef FN_DEVCHAR
170-
|| test(strchr(name, FN_DEVCHAR))
170+
|| MY_TEST(strchr(name, FN_DEVCHAR))
171171
#endif
172172
;
173173
}

‎sql-common/client.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1299,7 +1299,7 @@ void mysql_read_default_options(struct st_mysql_options *options,
12991299
options->secure_auth= TRUE;
13001300
break;
13011301
case OPT_report_data_truncation:
1302-
options->report_data_truncation= opt_arg ? test(atoi(opt_arg)) : 1;
1302+
options->report_data_truncation= opt_arg ? MY_TEST(atoi(opt_arg)) : 1;
13031303
break;
13041304
case OPT_plugin_dir:
13051305
{
@@ -4352,7 +4352,7 @@ mysql_options(MYSQL *mysql,enum mysql_option option, const void *arg)
43524352
mysql->options.protocol=MYSQL_PROTOCOL_PIPE; /* Force named pipe */
43534353
break;
43544354
case MYSQL_OPT_LOCAL_INFILE: /* Allow LOAD DATA LOCAL ?*/
4355-
if (!arg || test(*(uint*) arg))
4355+
if (!arg || MY_TEST(*(uint*) arg))
43564356
mysql->options.client_flag|= CLIENT_LOCAL_FILES;
43574357
else
43584358
mysql->options.client_flag&= ~CLIENT_LOCAL_FILES;
@@ -4399,7 +4399,7 @@ mysql_options(MYSQL *mysql,enum mysql_option option, const void *arg)
43994399
mysql->options.secure_auth= *(my_bool *) arg;
44004400
break;
44014401
case MYSQL_REPORT_DATA_TRUNCATION:
4402-
mysql->options.report_data_truncation= test(*(my_bool *) arg);
4402+
mysql->options.report_data_truncation= MY_TEST(*(my_bool *) arg);
44034403
break;
44044404
case MYSQL_OPT_RECONNECT:
44054405
mysql->reconnect= *(my_bool *) arg;

‎sql/event_db_repository.cc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ Event_db_repository::index_read_for_db_for_i_s(THD *thd, TABLE *schema_table,
469469
end:
470470
event_table->file->ha_index_end();
471471

472-
DBUG_RETURN(test(ret));
472+
DBUG_RETURN(MY_TEST(ret));
473473
}
474474

475475

@@ -751,7 +751,7 @@ Event_db_repository::create_event(THD *thd, Event_parse_data *parse_data,
751751
thd->mdl_context.rollback_to_savepoint(mdl_savepoint);
752752

753753
thd->variables.sql_mode= saved_mode;
754-
DBUG_RETURN(test(ret));
754+
DBUG_RETURN(MY_TEST(ret));
755755
}
756756

757757

@@ -866,7 +866,7 @@ Event_db_repository::update_event(THD *thd, Event_parse_data *parse_data,
866866
thd->mdl_context.rollback_to_savepoint(mdl_savepoint);
867867

868868
thd->variables.sql_mode= saved_mode;
869-
DBUG_RETURN(test(ret));
869+
DBUG_RETURN(MY_TEST(ret));
870870
}
871871

872872

@@ -926,7 +926,7 @@ Event_db_repository::drop_event(THD *thd, LEX_STRING db, LEX_STRING name,
926926
close_thread_tables(thd);
927927
thd->mdl_context.rollback_to_savepoint(mdl_savepoint);
928928

929-
DBUG_RETURN(test(ret));
929+
DBUG_RETURN(MY_TEST(ret));
930930
}
931931

932932

@@ -1168,7 +1168,7 @@ update_timing_fields_for_event(THD *thd,
11681168
if (save_binlog_row_based)
11691169
thd->set_current_stmt_binlog_format_row();
11701170

1171-
DBUG_RETURN(test(ret));
1171+
DBUG_RETURN(MY_TEST(ret));
11721172
}
11731173

11741174

@@ -1245,7 +1245,7 @@ Event_db_repository::check_system_tables(THD *thd)
12451245
close_mysql_tables(thd);
12461246
}
12471247

1248-
DBUG_RETURN(test(ret));
1248+
DBUG_RETURN(MY_TEST(ret));
12491249
}
12501250

12511251
/**

0 commit comments

Comments
 (0)