diff options
| author | unknown <igor@olga.mysql.com> | 2007-06-01 15:05:21 -0700 |
|---|---|---|
| committer | unknown <igor@olga.mysql.com> | 2007-06-01 15:05:21 -0700 |
| commit | 7488faa210dd60dc174263856ea1f38bae23f29a (patch) | |
| tree | 0c291740b2bd0a9324a3f13db165468eaf004cb7 /sql/mysqld.cc | |
| parent | b16765156ab1d92950463f0009c53283cd8aa0cc (diff) | |
| parent | 1b4234e43cece93593558bda32ec84622028168e (diff) | |
| download | mariadb-git-7488faa210dd60dc174263856ea1f38bae23f29a.tar.gz | |
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
into olga.mysql.com:/home/igor/mysql-5.1-opt
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index be376a07c49..c853f71ed31 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3805,6 +3805,11 @@ we force server id to 2, but this MySQL server will not act as a slave."); freopen(log_error_file,"a+",stderr); FreeConsole(); // Remove window } + else + { + /* Don't show error dialog box when on foreground: it stops the server */ + SetErrorMode(SEM_NOOPENFILEERRORBOX | SEM_FAILCRITICALERRORS); + } #endif /* |