Skip to content

Commit 05a7568

Browse files
jhauglidjhauglid
committed
Bug#18047020: BROKEN BUILD WITH CLANG 3.4
Fix a compilation error in extra/yassl/taocrypt/include/runtime.hpp and a number of new warnings about unused functions/variables. Also removed all MTR suppressions for __cxa_pure_virtual. They are no longer needed as these tests use DBUG_SUICIDE to terminate the server rather than exit(1). See Bug#11759828
1 parent 9a12e43 commit 05a7568

30 files changed

+20
-588
lines changed

‎extra/yassl/include/yassl_int.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
33
44
This program is free software; you can redistribute it and/or modify
55
it under the terms of the GNU General Public License as published by
@@ -441,7 +441,7 @@ class SSL_CTX {
441441
const Ciphers& GetCiphers() const;
442442
const DH_Parms& GetDH_Parms() const;
443443
const Stats& GetStats() const;
444-
const VerifyCallback getVerifyCallback() const;
444+
VerifyCallback getVerifyCallback() const;
445445
pem_password_cb GetPasswordCb() const;
446446
void* GetUserData() const;
447447
bool GetSessionCacheOff() const;

‎extra/yassl/src/yassl_int.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
1+
/* Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License as published by
@@ -1955,7 +1955,7 @@ SSL_CTX::GetCA_List() const
19551955
}
19561956

19571957

1958-
const VerifyCallback SSL_CTX::getVerifyCallback() const
1958+
VerifyCallback SSL_CTX::getVerifyCallback() const
19591959
{
19601960
return verifyCallback_;
19611961
}

‎extra/yassl/taocrypt/include/block.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
33
44
This program is free software; you can redistribute it and/or modify
55
it under the terms of the GNU General Public License as published by
@@ -187,8 +187,8 @@ class Block {
187187
~Block() { allocator_.deallocate(buffer_, sz_); }
188188
private:
189189
word32 sz_; // size in Ts
190-
T* buffer_;
191190
A allocator_;
191+
T* buffer_;
192192
};
193193

194194

‎extra/yassl/taocrypt/include/runtime.hpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
33
44
This program is free software; you can redistribute it and/or modify
55
it under the terms of the GNU General Public License as published by
@@ -29,6 +29,8 @@
2929
#include "config.h"
3030
#endif
3131

32+
#ifdef YASSL_PURE_C
33+
3234
#ifdef __sun
3335

3436

@@ -53,5 +55,6 @@ extern "C" {
5355

5456
#endif // __GNUC__ > 2
5557
#endif // compiler check
58+
#endif // YASSL_PURE_C
5659
#endif // yaSSL_NEW_HPP
5760

‎mysql-test/suite/rpl/r/rpl_row_crash_safe.result

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ call mtr.add_suppression('Attempting backtrace');
77
call mtr.add_suppression("Recovery from master pos .* and file master-bin.000001");
88
call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
99
call mtr.add_suppression(".* InnoDB: Warning: allocated tablespace .*, old maximum was .*");
10-
call mtr.add_suppression(".*int __cxa_pure_virtual().*");
1110
###################################################################################
1211
# PREPARE EXECUTION
1312
###################################################################################

‎mysql-test/suite/rpl/r/rpl_row_mts_crash_safe.result

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ Note #### Storing MySQL user name or password information in the master info rep
66
call mtr.add_suppression('Attempting backtrace');
77
call mtr.add_suppression("Recovery from master pos .*");
88
call mtr.add_suppression(".* InnoDB: Warning: allocated tablespace .*, old maximum was .*");
9-
call mtr.add_suppression(".*int __cxa_pure_virtual().*");
109
########################################################################
1110
# SET UP
1211
########################################################################

‎mysql-test/suite/rpl/r/rpl_row_mts_rec_crash_safe.result

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ Note #### Storing MySQL user name or password information in the master info rep
66
call mtr.add_suppression('Attempting backtrace');
77
call mtr.add_suppression("Recovery from master pos .*");
88
call mtr.add_suppression(".* InnoDB: Warning: allocated tablespace .*, old maximum was .*");
9-
call mtr.add_suppression(".*int __cxa_pure_virtual().*");
109
########################################################################
1110
# SET UP
1211
########################################################################

‎mysql-test/suite/rpl/r/rpl_stm_mixed_crash_safe.result

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ call mtr.add_suppression('Attempting backtrace');
77
call mtr.add_suppression("Recovery from master pos .* and file master-bin.000001");
88
call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
99
call mtr.add_suppression(".* InnoDB: Warning: allocated tablespace .*, old maximum was .*");
10-
call mtr.add_suppression(".*int __cxa_pure_virtual().*");
1110
###################################################################################
1211
# PREPARE EXECUTION
1312
###################################################################################

‎mysql-test/suite/rpl/r/rpl_stm_mixed_mts_crash_safe.result

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ Note #### Storing MySQL user name or password information in the master info rep
66
call mtr.add_suppression('Attempting backtrace');
77
call mtr.add_suppression("Recovery from master pos .*");
88
call mtr.add_suppression(".* InnoDB: Warning: allocated tablespace .*, old maximum was .*");
9-
call mtr.add_suppression(".*int __cxa_pure_virtual().*");
109
########################################################################
1110
# SET UP
1211
########################################################################

‎mysql-test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe.result

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ Note #### Storing MySQL user name or password information in the master info rep
66
call mtr.add_suppression('Attempting backtrace');
77
call mtr.add_suppression("Recovery from master pos .*");
88
call mtr.add_suppression(".* InnoDB: Warning: allocated tablespace .*, old maximum was .*");
9-
call mtr.add_suppression(".*int __cxa_pure_virtual().*");
109
########################################################################
1110
# SET UP
1211
########################################################################

‎mysql-test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe_checksum.result

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ Note #### Storing MySQL user name or password information in the master info rep
66
call mtr.add_suppression('Attempting backtrace');
77
call mtr.add_suppression("Recovery from master pos .*");
88
call mtr.add_suppression(".* InnoDB: Warning: allocated tablespace .*, old maximum was .*");
9-
call mtr.add_suppression(".*int __cxa_pure_virtual().*");
109
########################################################################
1110
# SET UP
1211
########################################################################

‎mysql-test/suite/rpl/r/rpl_stm_mixed_mts_rec_crash_safe_small.result

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ Note #### Storing MySQL user name or password information in the master info rep
66
call mtr.add_suppression('Attempting backtrace');
77
call mtr.add_suppression("Recovery from master pos .*");
88
call mtr.add_suppression(".* InnoDB: Warning: allocated tablespace .*, old maximum was .*");
9-
call mtr.add_suppression(".*int __cxa_pure_virtual().*");
109
########################################################################
1110
# SET UP
1211
########################################################################

‎mysql-test/suite/rpl/t/rpl_row_crash_safe.test

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ call mtr.add_suppression('Attempting backtrace');
1010
call mtr.add_suppression("Recovery from master pos .* and file master-bin.000001");
1111
call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
1212
call mtr.add_suppression(".* InnoDB: Warning: allocated tablespace .*, old maximum was .*");
13-
call mtr.add_suppression(".*int __cxa_pure_virtual().*");
1413

1514
let $engine_type=Innodb;
1615
let $database_name=test;

‎mysql-test/suite/rpl/t/rpl_row_mts_crash_safe.test

-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,5 @@
99
call mtr.add_suppression('Attempting backtrace');
1010
call mtr.add_suppression("Recovery from master pos .*");
1111
call mtr.add_suppression(".* InnoDB: Warning: allocated tablespace .*, old maximum was .*");
12-
call mtr.add_suppression(".*int __cxa_pure_virtual().*");
1312

1413
--source extra/rpl_tests/rpl_mts_crash_safe.test

‎mysql-test/suite/rpl/t/rpl_row_mts_rec_crash_safe.test

-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,5 @@
99
call mtr.add_suppression('Attempting backtrace');
1010
call mtr.add_suppression("Recovery from master pos .*");
1111
call mtr.add_suppression(".* InnoDB: Warning: allocated tablespace .*, old maximum was .*");
12-
call mtr.add_suppression(".*int __cxa_pure_virtual().*");
1312

1413
--source extra/rpl_tests/rpl_mts_crash_safe.test

‎mysql-test/suite/rpl/t/rpl_stm_mixed_crash_safe.test

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ call mtr.add_suppression('Attempting backtrace');
1111
call mtr.add_suppression("Recovery from master pos .* and file master-bin.000001");
1212
call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
1313
call mtr.add_suppression(".* InnoDB: Warning: allocated tablespace .*, old maximum was .*");
14-
call mtr.add_suppression(".*int __cxa_pure_virtual().*");
1514

1615
let $engine_type=Innodb;
1716
let $database_name=test;

‎mysql-test/suite/rpl/t/rpl_stm_mixed_mts_crash_safe.test

-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,5 @@
99
call mtr.add_suppression('Attempting backtrace');
1010
call mtr.add_suppression("Recovery from master pos .*");
1111
call mtr.add_suppression(".* InnoDB: Warning: allocated tablespace .*, old maximum was .*");
12-
call mtr.add_suppression(".*int __cxa_pure_virtual().*");
1312

1413
--source extra/rpl_tests/rpl_mts_crash_safe.test

‎mysql-test/suite/rpl/t/rpl_stm_mixed_mts_rec_crash_safe.test

-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,5 @@
99
call mtr.add_suppression('Attempting backtrace');
1010
call mtr.add_suppression("Recovery from master pos .*");
1111
call mtr.add_suppression(".* InnoDB: Warning: allocated tablespace .*, old maximum was .*");
12-
call mtr.add_suppression(".*int __cxa_pure_virtual().*");
1312

1413
--source extra/rpl_tests/rpl_mts_crash_safe.test

‎mysql-test/suite/rpl/t/rpl_stm_mixed_mts_rec_crash_safe_small.test

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
call mtr.add_suppression('Attempting backtrace');
1212
call mtr.add_suppression("Recovery from master pos .*");
1313
call mtr.add_suppression(".* InnoDB: Warning: allocated tablespace .*, old maximum was .*");
14-
call mtr.add_suppression(".*int __cxa_pure_virtual().*");
1514

1615
--let $crash_safe_small= 1
1716
--source extra/rpl_tests/rpl_mts_crash_safe.test

‎mysys/thr_lock.c

+1-18
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
1+
/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License as published by
@@ -100,11 +100,6 @@ void thr_set_lock_wait_callback(void (*before_wait)(void),
100100
after_lock_wait= after_wait;
101101
}
102102

103-
static inline mysql_cond_t *get_cond(void)
104-
{
105-
return &my_thread_var->suspend;
106-
}
107-
108103
/*
109104
** For the future (now the thread specific cond is alloced by my_pthread.c)
110105
*/
@@ -369,18 +364,6 @@ has_old_lock(THR_LOCK_DATA *data, THR_LOCK_INFO *owner)
369364
return 0;
370365
}
371366

372-
static inline my_bool have_specific_lock(THR_LOCK_DATA *data,
373-
enum thr_lock_type type)
374-
{
375-
for ( ; data ; data=data->next)
376-
{
377-
if (data->type == type)
378-
return 1;
379-
}
380-
return 0;
381-
}
382-
383-
384367
static void wake_up_waiters(THR_LOCK *lock);
385368

386369

0 commit comments

Comments
 (0)