Hi everyone,
This patch removes most of the Windows build warnings on Windows Vista
32 bit with Visual Studio 2005. I have only built with debug info using
the configuration in win\configure-mariadb.sh.
I added "namespace { char dummy; };" to empty files, because the VC++
linker gives a warning when it finds empty object files. These changes
are all guarded by #ifdef __WIN__. There are probably more of those when
compiling with different options and other things disabled.
In extra/yassl/taocrypt/src/algebra.cpp there is a re-definition of
DEBUG, when building with debug info. I removed it completely, because
it shouldn't be necessary at all.
In storage/xtradb/include/univ.i I changed the type of UNIV_PAGE_SIZE to
uint to get rid of a bunch of uint/int comparison warnings.
The xtradb sync0sync.c removes a warning about an unused variable.
Can I push this to lp:maria?
Bo.
ÿþ= = = m o d i f i e d f i l e
' e x t r a / y a s s l / t a o c r y p t / s r c / a l g e b r a . c p p '
- - -
e x t r a / y a s s l / t a o c r y p t / s r c / a l g e b r a . c p p
2 0 0 9 - 0 2 - 1 3 1 6 : 4 1 : 4 7 + 0 0 0 0
+ + +
e x t r a / y a s s l / t a o c r y p t / s r c / a l g e b r a . c p p
2 0 1 0 - 0 4 - 2 0 1 7 : 1 1 : 1 0 + 0 0 0 0
...@ @ - 1 8 , 7 + 1 8 , 6 ...@ @
/ * b a s e d o n W e i D a i ' s a l g e b r a . c p p f r o m
C r y p t o P P * /
# u n d e f N D E B U G
- # d e f i n e D E B U G / / G C C 4 . 0 b u g i f
N D E B U G a n d O p t i m i z e > 1
# i n c l u d e " r u n t i m e . h p p "
# i n c l u d e " a l g e b r a . h p p "
= = = m o d i f i e d f i l e ' s q l / h a s h _ f i l o . c c '
- - - s q l / h a s h _ f i l o . c c 2 0 0 6 - 1 2 - 3 1
0 0 : 0 2 : 2 7 + 0 0 0 0
+ + + s q l / h a s h _ f i l o . c c 2 0 1 0 - 0 4 - 2 0
1 5 : 1 0 : 5 1 + 0 0 0 0
...@ @ - 2 5 , 3 + 2 5 , 8 ...@ @
# i n c l u d e " m y s q l _ p r i v . h "
# i n c l u d e " h a s h _ f i l o . h "
+
+ # i f d e f _ _ W I N _ _
+ / / R e m o v e l i n k e r w a r n i n g 4 2 2 1 a b o u t
e m p t y f i l e
+ n a m e s p a c e { c h a r d u m m y ; } ;
+ # e n d i f / / _ _ W I N _ _
= = = m o d i f i e d f i l e ' s q l / m f _ i o c a c h e . c c '
- - - s q l / m f _ i o c a c h e . c c 2 0 0 7 - 1 0 - 1 1
1 7 : 2 9 : 0 9 + 0 0 0 0
+ + + s q l / m f _ i o c a c h e . c c 2 0 1 0 - 0 4 - 2 0
1 5 : 1 2 : 3 9 + 0 0 0 0
...@ @ - 8 5 , 6 + 8 5 , 1 2 ...@ @
}
} / * e x t e r n " C " * /
+
+ # e l i f d e f i n e d ( _ _ W I N _ _ )
+
+ / / R e m o v e l i n k e r w a r n i n g 4 2 2 1 a b o u t
e m p t y f i l e
+ n a m e s p a c e { c h a r d u m m y ; } ;
+
# e n d i f / * H A V E _ R E P L I C A T I O N * /
= = = m o d i f i e d f i l e
' s q l / r e p l _ f a i l s a f e . c c '
- - - s q l / r e p l _ f a i l s a f e . c c 2 0 1 0 - 0 1 - 2 2
1 0 : 5 8 : 2 1 + 0 0 0 0
+ + + s q l / r e p l _ f a i l s a f e . c c 2 0 1 0 - 0 4 - 2 0
1 5 : 1 3 : 1 5 + 0 0 0 0
...@ @ - 1 0 3 5 , 6 + 1 0 3 5 , 1 1 ...@ @
r e t u r n e r r o r ;
}
+
+ # e l i f d e f i n e d ( _ _ W I N _ _ )
+
+ / / R e m o v e l i n k e r w a r n i n g 4 2 2 1 a b o u t
e m p t y f i l e
+ n a m e s p a c e { c h a r d u m m y ; } ;
# e n d i f / * H A V E _ R E P L I C A T I O N * /
= = = m o d i f i e d f i l e ' s q l / s q l _ r e p l . c c '
- - - s q l / s q l _ r e p l . c c 2 0 1 0 - 0 3 - 0 4 0 8 : 0 3 : 0 7
+ 0 0 0 0
+ + + s q l / s q l _ r e p l . c c 2 0 1 0 - 0 4 - 2 0 1 5 : 1 3 : 4 8
+ 0 0 0 0
...@ @ - 1 8 3 4 , 6 + 1 8 3 4 , 1 1 ...@ @
}
r e t u r n 0 ;
}
+
+ # e l i f d e f i n e d ( _ _ W I N _ _ )
+
+ / / R e m o v e l i n k e r w a r n i n g 4 2 2 1 a b o u t
e m p t y f i l e
+ n a m e s p a c e { c h a r d u m m y ; } ;
# e n d i f / * H A V E _ R E P L I C A T I O N * /
= = = m o d i f i e d f i l e
' s t o r a g e / p b x t / s r c / l o c k l i s t _ x t . c c '
- - - s t o r a g e / p b x t / s r c / l o c k l i s t _ x t . c c
2 0 0 9 - 0 8 - 1 7 1 1 : 1 2 : 3 6 + 0 0 0 0
+ + + s t o r a g e / p b x t / s r c / l o c k l i s t _ x t . c c
2 0 1 0 - 0 4 - 2 0 1 5 : 1 4 : 3 7 + 0 0 0 0
...@ @ - 1 8 5 , 6 + 1 8 5 , 1 1 ...@ @
x t _ t t r a c e f ( s e l f , " # l o c k # % d :
t y p e : % s n a m e : % s \ n " , c o u n t ,
l o c k _ t y p e , l o c k _ n a m e ) ;
}
}
+
+ # e l i f d e f i n e d ( _ _ W I N _ _ )
+
+ / / R e m o v e l i n k e r w a r n i n g 4 2 2 1 a b o u t
e m p t y f i l e
+ n a m e s p a c e { c h a r d u m m y ; } ;
# e n d i f
= = = m o d i f i e d f i l e
' s t o r a g e / p b x t / s r c / p b m s _ e n a b l e d . c c '
- - - s t o r a g e / p b x t / s r c / p b m s _ e n a b l e d . c c
2 0 0 9 - 1 1 - 2 4 1 0 : 5 5 : 0 6 + 0 0 0 0
+ + + s t o r a g e / p b x t / s r c / p b m s _ e n a b l e d . c c
2 0 1 0 - 0 4 - 2 0 1 5 : 1 4 : 5 9 + 0 0 0 0
...@ @ - 2 4 0 , 5 + 2 4 0 , 1 0 ...@ @
r e t u r n ;
}
+
+ # e l i f d e f i n e d ( _ _ W I N _ _ )
+
+ / / R e m o v e l i n k e r w a r n i n g 4 2 2 1 a b o u t
e m p t y f i l e
+ n a m e s p a c e { c h a r d u m m y ; } ;
# e n d i f / / P B M S _ E N A B L E D
= = = m o d i f i e d f i l e
' s t o r a g e / x t r a d b / i n c l u d e / u n i v . i '
- - - s t o r a g e / x t r a d b / i n c l u d e / u n i v . i
2 0 1 0 - 0 1 - 1 5 1 5 : 5 8 : 2 5 + 0 0 0 0
+ + + s t o r a g e / x t r a d b / i n c l u d e / u n i v . i
2 0 1 0 - 0 4 - 2 0 1 5 : 1 8 : 0 0 + 0 0 0 0
...@ @ - 2 9 0 , 7 + 2 9 0 , 7 ...@ @
/ * T h e 2 - l o g a r i t h m o f U N I V _ P A G E _ S I Z E :
* /
# d e f i n e U N I V _ P A G E _ S I Z E _ S H I F T 1 4
/ * T h e u n i v e r s a l p a g e s i z e o f t h e
d a t a b a s e * /
- # d e f i n e U N I V _ P A G E _ S I Z E ( 1 < <
U N I V _ P A G E _ S I Z E _ S H I F T )
+ # d e f i n e U N I V _ P A G E _ S I Z E ( 1 u < <
U N I V _ P A G E _ S I Z E _ S H I F T )
/ * M a x i m u m n u m b e r o f p a r a l l e l t h r e a d s
i n a p a r a l l e l i z e d o p e r a t i o n * /
# d e f i n e U N I V _ M A X _ P A R A L L E L I S M 3 2
= = = m o d i f i e d f i l e
' s t o r a g e / x t r a d b / s y n c / s y n c 0 s y n c . c '
- - - s t o r a g e / x t r a d b / s y n c / s y n c 0 s y n c . c
2 0 1 0 - 0 1 - 0 6 1 2 : 0 0 : 1 4 + 0 0 0 0
+ + + s t o r a g e / x t r a d b / s y n c / s y n c 0 s y n c . c
2 0 1 0 - 0 4 - 2 0 1 5 : 1 8 : 5 7 + 0 0 0 0
...@ @ - 4 2 3 , 8 + 4 2 3 , 1 1 ...@ @
m u t e x _ t * m u t e x , / * ! < i n : m u t e x
* /
u l i n t n ) / * ! < i n : v a l u e t o
s e t * /
{
+ # i f n d e f I N N O D B _ R W _ L O C K S _ U S E _ A T O M I C S
v o l a t i l e u l i n t * p t r ; / *
d e c l a r e d v o l a t i l e t o e n s u r e t h a t
t h e v a l u e i s s t o r e d
t o m e m o r y * /
+ # e n d i f
+
u t _ a d ( m u t e x ) ;
# i f d e f I N N O D B _ R W _ L O C K S _ U S E _ A T O M I C S
_______________________________________________
Mailing list: https://launchpad.net/~maria-developers
Post to : maria-developers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~maria-developers
More help : https://help.launchpad.net/ListHelp
