summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authormsvensson@neptunus.(none) <>2005-09-23 14:07:31 +0200
committermsvensson@neptunus.(none) <>2005-09-23 14:07:31 +0200
commit00bcf8cd8e6df820c6c02c8213845de96907eda5 (patch)
tree86b38d97d5a24cdec3176a9ed97ea77b4add0cfe /mysys
parent7ba13b16bdd8415129421e2fca98ecf167186a3e (diff)
downloadmariadb-git-00bcf8cd8e6df820c6c02c8213845de96907eda5.tar.gz
Bug #7037 Test "mysql_protocols" fails on Solaris 8 + 9 /x86
Diffstat (limited to 'mysys')
-rw-r--r--mysys/my_init.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/mysys/my_init.c b/mysys/my_init.c
index c50c00c1e5c..3e5130ec670 100644
--- a/mysys/my_init.c
+++ b/mysys/my_init.c
@@ -127,9 +127,14 @@ my_bool my_init(void)
void my_end(int infoflag)
{
- DBUG_ENTER("my_end");
+ /*
+ this code is suboptimal to workaround a bug in
+ Sun CC: Sun C++ 5.6 2004/06/02 for x86, and should not be
+ optimized until this compiler is not in use anymore
+ */
FILE *info_file= DBUG_FILE;
- bool print_info= (info_file != stderr);
+ my_bool print_info= (info_file != stderr);
+ DBUG_ENTER("my_end");
if (!info_file)
{
info_file= stderr;