Adding upstream version 1:10.11.6.upstream/1%10.11.6

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 36 insertions, 0 deletions

diff --git a/sql/main.cc b/sql/main.cc
new file mode 100644
index 00000000..357c72b8
--- /dev/null
+++ b/sql/main.cc
@@ -0,0 +1,36 @@
+/* Copyright (c) 2009 Sun Microsystems, Inc.
+   Use is subject to license terms.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
+
+/* 
+  main() for mysqld.
+  Calls mysqld_main() entry point exported by sql library.
+  On Windows, might do some service handling.
+*/
+#ifdef _WIN32
+/* Windows main function, service handling, calls mysqld_main */
+extern int mysqld_win_main(int argc, char **argv);
+#else
+extern int mysqld_main(int argc, char **argv);
+#endif
+
+int main(int argc, char **argv)
+{
+#ifdef _WIN32
+  return mysqld_win_main(argc, argv);
+#else
+  return mysqld_main(argc, argv);
+#endif
+}