database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Merge bk-internal:/home/bk/mysql-5.1-opt

Browse Source 
into  macbook.gmz:/Users/kgeorge/mysql/work/B31326-merge-5.1-opt
This commit is contained in:
gkodinov/kgeorge@macbook.gmz
2008-01-30 13:37:57 +02:00
parent beff5d0752 1a8935f466
commit 2eeebda7a4
5 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
BUILD/SETUP.sh
View File

@@ -100,8 +100,10 @@ if [ "x$warning_mode" != "xpedantic" ]; then
# C warnings # C warnings
c_warnings="$warnings -Wunused-parameter" c_warnings="$warnings -Wunused-parameter"
# C++ warnings # C++ warnings
cxx_warnings="$warnings -Woverloaded-virtual -Wsign-promo -Wreorder" cxx_warnings="$warnings"
cxx_warnings="$warnings -Wctor-dtor-privacy -Wnon-virtual-dtor" # cxx_warnings="$cxx_warnings -Woverloaded-virtual -Wsign-promo"
cxx_warnings="$cxx_warnings -Wreorder"
cxx_warnings="$cxx_warnings -Wctor-dtor-privacy -Wnon-virtual-dtor"
# Added unless --with-debug=full # Added unless --with-debug=full
debug_extra_cflags="-O1 -Wuninitialized" debug_extra_cflags="-O1 -Wuninitialized"
else else

4
sql/rpl_mi.cc
View File

@@ -29,9 +29,9 @@ int init_strvar_from_file(char *var, int max_size, IO_CACHE *f,
Master_info::Master_info() Master_info::Master_info()
:Slave_reporting_capability("I/O"), :Slave_reporting_capability("I/O"),
ssl(0), fd(-1), io_thd(0), inited(0), ssl(0), ssl_verify_server_cert(0), fd(-1), io_thd(0), inited(0),
abort_slave(0),slave_running(0), abort_slave(0),slave_running(0),
ssl_verify_server_cert(0), slave_run_id(0) slave_run_id(0)
{ {
host[0] = 0; user[0] = 0; password[0] = 0; host[0] = 0; user[0] = 0; password[0] = 0;
ssl_ca[0]= 0; ssl_capath[0]= 0; ssl_cert[0]= 0; ssl_ca[0]= 0; ssl_capath[0]= 0; ssl_cert[0]= 0;

4
storage/heap/ha_heap.cc
View File

@@ -61,8 +61,8 @@ static handler *heap_create_handler(handlerton *hton,
*****************************************************************************/ *****************************************************************************/
ha_heap::ha_heap(handlerton *hton, TABLE_SHARE *table_arg) ha_heap::ha_heap(handlerton *hton, TABLE_SHARE *table_arg)
:handler(hton, table_arg), file(0), records_changed(0), internal_table(0), :handler(hton, table_arg), file(0), records_changed(0), key_stat_version(0),
key_stat_version(0) internal_table(0)
{} {}

3
storage/ndb/src/kernel/blocks/backup/Backup.hpp
View File

@@ -425,8 +425,9 @@ public:
ArrayPool<TriggerRecord> & trp) ArrayPool<TriggerRecord> & trp)
: slaveState(b, validSlaveTransitions, validSlaveTransitionsCount,1) : slaveState(b, validSlaveTransitions, validSlaveTransitionsCount,1)
, tables(tp), triggers(trp), files(bp) , tables(tp), triggers(trp), files(bp)
, masterData(b), backup(b)
, ctlFilePtr(RNIL), logFilePtr(RNIL), dataFilePtr(RNIL) , ctlFilePtr(RNIL), logFilePtr(RNIL), dataFilePtr(RNIL)
, masterData(b), backup(b)
{ {
} }

4
storage/ndb/src/kernel/blocks/pgman.cpp
View File

@@ -259,14 +259,14 @@ Pgman::execCONTINUEB(Signal* signal)
// page entry // page entry
Pgman::Page_entry::Page_entry(Uint32 file_no, Uint32 page_no) : Pgman::Page_entry::Page_entry(Uint32 file_no, Uint32 page_no) :
m_state(0),
m_file_no(file_no), m_file_no(file_no),
m_state(0),
m_page_no(page_no), m_page_no(page_no),
m_real_page_i(RNIL), m_real_page_i(RNIL),
m_copy_page_i(RNIL),
m_lsn(0), m_lsn(0),
m_last_lcp(0), m_last_lcp(0),
m_dirty_count(0), m_dirty_count(0),
m_copy_page_i(RNIL),
m_busy_count(0), m_busy_count(0),
m_requests() m_requests()
{ {