diff options
| author | unknown <iggy@alf.> | 2007-06-15 14:45:44 -0400 |
|---|---|---|
| committer | unknown <iggy@alf.> | 2007-06-15 14:45:44 -0400 |
| commit | a555f7f2b14603c275704fcfa1f85b7d64be433a (patch) | |
| tree | 9ae0d55f4b06866de3b7dd0654bb84dc7ba7c397 /sql/mysqld.cc | |
| parent | 5da3d3cfc70eda71b5bf39fdb789210f625bae84 (diff) | |
| parent | c15380dc01718b56c5cf3fd38c2a9f9bc148a219 (diff) | |
| download | mariadb-git-a555f7f2b14603c275704fcfa1f85b7d64be433a.tar.gz | |
Merge alf.:D:/src/mysql-5.1-maint
into alf.:D:/src/mysql-5.1-maint_winemb
CMakeLists.txt:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 8159f762dd5..d7c1f258434 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1897,9 +1897,11 @@ static void init_signals(void) static void start_signal_handler(void) { +#ifndef EMBEDDED_LIBRARY // Save vm id of this process if (!opt_bootstrap) create_pid_file(); +#endif /* EMBEDDED_LIBRARY */ } |