Re: MySQL Workbench 5.1 Alpha 1 for Linux Available

Dennis Gilmore <[email protected]> Tue, 23 Sep 2008 02:16:25 -0500

Newsgroups	gmane.comp.db.mysql.mycc
Message-ID	<[email protected]>

On Thursday 18 September 2008 08:17:54 am Johannes Taxacher wrote:
> Dear MySQL users,
> we’re proud to announce that we’ve just uploaded the first Linux-Alpha
> build for upcoming MySQL Workbench 5.1 for everyone to try. But
> beware, it’s an early Alpha release! It includes basic functionality
> like loading/saving Models, import/export SQL files and a set of basic
> editors to model your data-structures. A couple of features are still
> missing and the UI from a lot of things is not done yet but its
> purpose is to give you a chance to experience how WB will look and
> feel on your Linux Desktop.
>
> We’re releasing this as a source package and in binary form compiled
> on Ubuntu 8.04. There’s a build-instructions
> page available for Ubuntu as well. For later releases we’ll be
> providing more intructions/binary packages
> for several more distributions. For more information about the MySQL
> Workbench project please visit
>
> 	http://dev.mysql.com/workbench/
>
> the official Developer Central site.
>
>
> MySQL Workbench OSS 5.1 Alpha 1 - Linux
> ---------------------------------------
> Source Tar Ball
>
> 	ftp://ftp.mysql.com/pub/mysql/download/gui-tools/mysql-workbench-5.1.1-alp
>ha-linux.tar.gz
> ftp://ftp.mysql.com/pub/mysql/download/gui-tools/mysql-workbench-5.1.1-alph
>a-linux.tar.gz.md5
>
> Binaries for Ubuntu 8.04
>
> 	ftp://ftp.mysql.com/pub/mysql/download/gui-tools/mysql-workbench-5.1.1-alp
>ha-ubuntu8-i386.tar.gz
> ftp://ftp.mysql.com/pub/mysql/download/gui-tools/mysql-workbench-5.1.1-alph
>a-ubuntu8-i386.tar.gz.md5
>
> Build instructions for Ubuntu 8.04
>
> 	http://dev.mysql.com/workbench/?page_id=152
>
> Grab a copy, test it on your system, and tell us your thought,
> opinions and experiences.
>
> Please don’t report any bugs yet or submit fixes because the project
> is still under heavy construction. You can find a list of stuff thats
> still missing/not yet working correctily in 5.1 on our WB5.1 Linux-
> status-page.
While you said not to submit bugs or fixes   attached is the patch that i 
needed just to get mysql-workbench to build on fedora.   ive not yet attepted 
to run it yet.  ill package it as a rpm tomorrow and try then and start the 
process of getting it into fedora.


> WB 5.1 Linux-status-page
>
> 	http://dev.mysql.com/workbench/?page_id=155
>
> There is a demo model included in the samples directory,
> sakila_full.mwb that should get you started.


-- 
MySQL GUI Tools Mailing List
For list archives: http://lists.mysql.com/gui-tools
To unsubscribe:    http://lists.mysql.com/[email protected]

mysql-workbench-5.1-gcc-4.3.patch (text/x-patch, 17 KB)

diff -Nru mysql-workbench-5.1-bad/backend/grt/common.h mysql-workbench-5.1/backend/grt/common.h
--- mysql-workbench-5.1-bad/backend/grt/common.h	2008-09-18 07:12:35.000000000 -0500
+++ mysql-workbench-5.1/backend/grt/common.h	2008-09-23 02:08:27.000000000 -0500
@@ -1,7 +1,7 @@
 #ifndef _BE_COMMON_H_
 #define _BE_COMMON_H_
 
-#include <string>
+#include <cstring>
 #include <vector>
 
 #ifndef _WIN32
diff -Nru mysql-workbench-5.1-bad/backend/grt/tree_model.h mysql-workbench-5.1/backend/grt/tree_model.h
--- mysql-workbench-5.1-bad/backend/grt/tree_model.h	2008-09-18 07:12:35.000000000 -0500
+++ mysql-workbench-5.1/backend/grt/tree_model.h	2008-09-23 02:08:27.000000000 -0500
@@ -5,7 +5,7 @@
  * TreeModel is the base class for all list or tree based
  * backend classes. 
  */
-
+#include <algorithm>
 //#include <list>
 //#include <vector>
 
diff -Nru mysql-workbench-5.1-bad/backend/grtdb/charset_utils.cpp mysql-workbench-5.1/backend/grtdb/charset_utils.cpp
--- mysql-workbench-5.1-bad/backend/grtdb/charset_utils.cpp	2008-09-18 07:12:35.000000000 -0500
+++ mysql-workbench-5.1/backend/grtdb/charset_utils.cpp	2008-09-23 02:08:27.000000000 -0500
@@ -1,3 +1,5 @@
+#include <algorithm>
+#include <string>
 #include "stdafx.h"
 #include <map>
 
@@ -7,13 +9,13 @@
 
 std::string toupper(std::string text)
 {
-  std::transform(text.begin(), text.end(), text.begin(), &std::toupper);
+  std::transform(text.begin(), text.end(), text.begin(), (int(*)(int)) std::toupper);
   return text;
 }
 
 std::string tolower(std::string text)
 {
-  std::transform(text.begin(), text.end(), text.begin(), &std::tolower);
+  std::transform(text.begin(), text.end(), text.begin(), (int(*)(int)) std::tolower);
   return text;
 }
 
diff -Nru mysql-workbench-5.1-bad/backend/grtsqlparser/mysql/mysql_sql_parser_utils.cpp mysql-workbench-5.1/backend/grtsqlparser/mysql/mysql_sql_parser_utils.cpp
--- mysql-workbench-5.1-bad/backend/grtsqlparser/mysql/mysql_sql_parser_utils.cpp	2008-09-18 07:12:35.000000000 -0500
+++ mysql-workbench-5.1/backend/grtsqlparser/mysql/mysql_sql_parser_utils.cpp	2008-09-23 02:08:27.000000000 -0500
@@ -1,4 +1,5 @@
 #include "stdafx.h"
+#include <locale>
 
 #ifndef _WIN32
 #include <cctype>
@@ -10,7 +11,6 @@
 #include "grts/structs.db.mysql.h"
 #include "myx_util_functions.h"
 #include "grtpp_util.h"
-#include <locale>
 
 
 std::string unquot(std::string text, const std::string quot_sym)
diff -Nru mysql-workbench-5.1-bad/backend/grtui/Makefile.am mysql-workbench-5.1/backend/grtui/Makefile.am
--- mysql-workbench-5.1-bad/backend/grtui/Makefile.am	2008-09-18 07:12:35.000000000 -0500
+++ mysql-workbench-5.1/backend/grtui/Makefile.am	2008-09-23 02:08:27.000000000 -0500
@@ -36,6 +36,6 @@
 
 boxtest_SOURCES=tests/boxtest.cpp
 
-boxtest_LDADD=../../library/forms/libmforms.la ../../library/grt/src/libgrt.la ../../library/utilities/src/libguiutil.la @GRT_LIBS@ @GNOME_LIBS@ @MYSQL_LIBS@
+boxtest_LDADD=../../library/forms/libmforms.la ../../library/grt/src/libgrt.la ../../library/utilities/src/libguiutil.la @PCRE_LIBS@ @GRT_LIBS@ @GNOME_LIBS@ @MYSQL_LIBS@
 
 
diff -Nru mysql-workbench-5.1-bad/backend/workbench/wb_model_file.cpp mysql-workbench-5.1/backend/workbench/wb_model_file.cpp
--- mysql-workbench-5.1-bad/backend/workbench/wb_model_file.cpp	2008-09-18 07:12:35.000000000 -0500
+++ mysql-workbench-5.1/backend/workbench/wb_model_file.cpp	2008-09-23 02:08:27.000000000 -0500
@@ -1,3 +1,4 @@
+#include <algorithm>
 #include "stdafx.h"
 
 #include <zip.h>
diff -Nru mysql-workbench-5.1-bad/configure.in mysql-workbench-5.1/configure.in
--- mysql-workbench-5.1-bad/configure.in	2008-09-18 07:12:35.000000000 -0500
+++ mysql-workbench-5.1/configure.in	2008-09-23 02:08:27.000000000 -0500
@@ -29,7 +29,7 @@
 AC_CHECK_HEADERS([sys/select.h])
 
 
-AC_CHECK_HEADERS([google/template.h],, AC_MSG_ERROR(["google-ctemplate not found"]))
+AC_CHECK_HEADERS([ctemplate/template.h],, AC_MSG_ERROR(["ctemplate not found"]))
 AC_ARG_WITH(ctemplate-libs, [ --with-ctemplates-libs=<libdir> ], [], [ac_LIBS=-lctemplate])
 CTEMPLATE_LIBS=$ac_LIBS
 AC_SUBST(CTEMPLATE_LIBS)
@@ -281,9 +281,11 @@
 fi
 AC_SUBST(PCRE_CFLAGS)
 
-AC_CHECK_PROG(PCRE_LIBS,pcre-config,`pcre-config --libs`)
+AC_CHECK_PROG(PCRE_LIBS,pcre-config,[yes])
 if test x"$PCRE_LIBS" = x; then
         AC_MSG_ERROR([Could not find pcre-config script. Make sure the pcre libraries are installed])
+else
+        PCRE_LIBS=`pcre-config --libs`
 fi
 AC_SUBST(PCRE_LIBS)
 
diff -Nru mysql-workbench-5.1-bad/library/canvas/src/mdc_canvas_item.cpp mysql-workbench-5.1/library/canvas/src/mdc_canvas_item.cpp
--- mysql-workbench-5.1-bad/library/canvas/src/mdc_canvas_item.cpp	2008-09-18 07:12:36.000000000 -0500
+++ mysql-workbench-5.1/library/canvas/src/mdc_canvas_item.cpp	2008-09-23 02:08:27.000000000 -0500
@@ -1,4 +1,4 @@
-
+#include <cstring>
 #include "stdafx.h"
 
 #ifndef _WIN32
diff -Nru mysql-workbench-5.1-bad/library/canvas/src/mdc_canvas_view_image.cpp mysql-workbench-5.1/library/canvas/src/mdc_canvas_view_image.cpp
--- mysql-workbench-5.1-bad/library/canvas/src/mdc_canvas_view_image.cpp	2008-09-18 07:12:36.000000000 -0500
+++ mysql-workbench-5.1/library/canvas/src/mdc_canvas_view_image.cpp	2008-09-23 02:08:27.000000000 -0500
@@ -1,3 +1,4 @@
+#include <cstring>
 #include "stdafx.h"
 
 #include "mdc_canvas_view_image.h"
diff -Nru mysql-workbench-5.1-bad/library/canvas/src/mdc_common.cpp mysql-workbench-5.1/library/canvas/src/mdc_common.cpp
--- mysql-workbench-5.1-bad/library/canvas/src/mdc_common.cpp	2008-09-18 07:12:36.000000000 -0500
+++ mysql-workbench-5.1/library/canvas/src/mdc_common.cpp	2008-09-23 02:08:27.000000000 -0500
@@ -1,3 +1,4 @@
+#include <cstring>
 #include "stdafx.h"
 
 #ifndef  _WIN32
diff -Nru mysql-workbench-5.1-bad/library/canvas/src/mdc_text.cpp mysql-workbench-5.1/library/canvas/src/mdc_text.cpp
--- mysql-workbench-5.1-bad/library/canvas/src/mdc_text.cpp	2008-09-18 07:12:36.000000000 -0500
+++ mysql-workbench-5.1/library/canvas/src/mdc_text.cpp	2008-09-23 02:08:27.000000000 -0500
@@ -1,3 +1,4 @@
+#include <cstring>
 #include "stdafx.h"
 
 
diff -Nru mysql-workbench-5.1-bad/library/dbc/common/src/resultset.h mysql-workbench-5.1/library/dbc/common/src/resultset.h
--- mysql-workbench-5.1-bad/library/dbc/common/src/resultset.h	2008-09-18 07:12:36.000000000 -0500
+++ mysql-workbench-5.1/library/dbc/common/src/resultset.h	2008-09-23 02:08:27.000000000 -0500
@@ -1,6 +1,8 @@
 #ifndef _RESULTSET_H_
 #define _RESULTSET_H_
 
+#include <cstring>
+#include <cstdlib>
 #include "exception.h"
 #include <list>
 #include <map>
diff -Nru mysql-workbench-5.1-bad/library/dbc/common/src/statement.h mysql-workbench-5.1/library/dbc/common/src/statement.h
--- mysql-workbench-5.1-bad/library/dbc/common/src/statement.h	2008-09-18 07:12:36.000000000 -0500
+++ mysql-workbench-5.1/library/dbc/common/src/statement.h	2008-09-23 02:08:27.000000000 -0500
@@ -1,6 +1,7 @@
 #ifndef _STATEMENT_H_
 #define _STATEMENT_H_
 
+#include <string>
 #include "cppdbc_public_interface.h"
 #ifdef _WIN32
 #include "sigc++.h"
diff -Nru mysql-workbench-5.1-bad/library/dbc/mysql/src/mysql_metadata.h mysql-workbench-5.1/library/dbc/mysql/src/mysql_metadata.h
--- mysql-workbench-5.1-bad/library/dbc/mysql/src/mysql_metadata.h	2008-09-18 07:12:36.000000000 -0500
+++ mysql-workbench-5.1/library/dbc/mysql/src/mysql_metadata.h	2008-09-23 02:08:27.000000000 -0500
@@ -1,6 +1,7 @@
 #ifndef _MYSQL_METADATA_H_
 #define _MYSQL_METADATA_H_
 
+#include <memory>
 #include "metadata.h"
 #include "resultset.h"
 
diff -Nru mysql-workbench-5.1-bad/library/dbc/mysql/src/mysql_statement.cpp mysql-workbench-5.1/library/dbc/mysql/src/mysql_statement.cpp
--- mysql-workbench-5.1-bad/library/dbc/mysql/src/mysql_statement.cpp	2008-09-18 07:12:36.000000000 -0500
+++ mysql-workbench-5.1/library/dbc/mysql/src/mysql_statement.cpp	2008-09-23 02:08:27.000000000 -0500
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 
+#include <algorithm>
 #include "mysql_statement.h"
 
 extern "C"
diff -Nru mysql-workbench-5.1-bad/library/forms/simpleform.cpp mysql-workbench-5.1/library/forms/simpleform.cpp
--- mysql-workbench-5.1-bad/library/forms/simpleform.cpp	2008-09-18 07:12:36.000000000 -0500
+++ mysql-workbench-5.1/library/forms/simpleform.cpp	2008-09-23 02:08:27.000000000 -0500
@@ -1,4 +1,5 @@
-
+#include <cstring>
+#include <cstdlib>
 #include <mforms/simpleform.h>
 #include <mforms/mforms.h>
 
diff -Nru mysql-workbench-5.1-bad/library/grt/src/diff/grtlistdiff.cpp mysql-workbench-5.1/library/grt/src/diff/grtlistdiff.cpp
--- mysql-workbench-5.1-bad/library/grt/src/diff/grtlistdiff.cpp	2008-09-18 07:12:36.000000000 -0500
+++ mysql-workbench-5.1/library/grt/src/diff/grtlistdiff.cpp	2008-09-23 02:08:27.000000000 -0500
@@ -1,4 +1,4 @@
-
+#include <memory>
 #include "stdafx.h"
 
 #include "grtlistdiff.h"
diff -Nru mysql-workbench-5.1-bad/library/grt/src/grtpp.h mysql-workbench-5.1/library/grt/src/grtpp.h
--- mysql-workbench-5.1-bad/library/grt/src/grtpp.h	2008-09-18 07:12:36.000000000 -0500
+++ mysql-workbench-5.1/library/grt/src/grtpp.h	2008-09-23 02:08:27.000000000 -0500
@@ -1,23 +1,22 @@
 #ifndef _GRTPP_H_
 #define _GRTPP_H_
 
-#include <string>
+#ifdef __GNUC__
+#include <cxxabi.h>
+#endif
+#include <cstring>
+#include <typeinfo>
 #include <list>
 #include <map>
 #include <deque>
 #include <vector>
 #include <stdexcept>
 #include <libxml/xmlmemory.h>
-#include <typeinfo>
-#ifdef __GNUC__
-#include <cxxabi.h>
-#endif
 
 #include <sigc++/sigc++.h>
 
 #include <glib.h>
 
-
 #ifndef _NODLL_
 # if defined(_WIN32)
 # pragma warning (disable: 4275)
diff -Nru mysql-workbench-5.1-bad/library/grt/src/grtpp_helper.cpp mysql-workbench-5.1/library/grt/src/grtpp_helper.cpp
--- mysql-workbench-5.1-bad/library/grt/src/grtpp_helper.cpp	2008-09-18 07:12:36.000000000 -0500
+++ mysql-workbench-5.1/library/grt/src/grtpp_helper.cpp	2008-09-23 02:08:27.000000000 -0500
@@ -4,7 +4,6 @@
 
 #include "myx_util_functions.h"
 
-#include <algorithm>
 
 #include <stdio.h>
 #include <errno.h>
diff -Nru mysql-workbench-5.1-bad/library/grt/src/grtpp_module_cpp.h mysql-workbench-5.1/library/grt/src/grtpp_module_cpp.h
--- mysql-workbench-5.1-bad/library/grt/src/grtpp_module_cpp.h	2008-09-18 07:12:36.000000000 -0500
+++ mysql-workbench-5.1/library/grt/src/grtpp_module_cpp.h	2008-09-23 02:08:27.000000000 -0500
@@ -1,6 +1,7 @@
 #ifndef _GRTPP_MODULE_CPP_H_
 #define _GRTPP_MODULE_CPP_H_
 
+#include <cstring>
 #include <grtpp.h>
 #include <typeinfo>
 
diff -Nru mysql-workbench-5.1-bad/library/grt/src/Makefile.am mysql-workbench-5.1/library/grt/src/Makefile.am
--- mysql-workbench-5.1-bad/library/grt/src/Makefile.am	2008-09-18 07:12:36.000000000 -0500
+++ mysql-workbench-5.1/library/grt/src/Makefile.am	2008-09-23 02:08:27.000000000 -0500
@@ -48,7 +48,7 @@
 libmyx_grt_java_la_LIBADD=\
 	libgrt.la \
 	$(top_srcdir)/library/sql-parser/source/libsqlparser.la \
-	$(top_srcdir)/library/utilities/source/libguiutil.la \
+	$(top_srcdir)/library/utilities/src/libguiutil.la \
 	@GLIB_LIBS@ @PCRE_LIBS@ @GRT_LIBS@ @MYSQL_LIBS@
 libmyx_grt_java_la_LDFLAGS=-module
 endif
diff -Nru mysql-workbench-5.1-bad/library/Makefile.am mysql-workbench-5.1/library/Makefile.am
--- mysql-workbench-5.1-bad/library/Makefile.am	2008-09-18 07:12:36.000000000 -0500
+++ mysql-workbench-5.1/library/Makefile.am	2008-09-23 02:08:50.000000000 -0500
@@ -1,2 +1,2 @@
-SUBDIRS= canvas grt sql-parser utilities forms
+SUBDIRS= canvas sql-parser utilities grt forms
 
diff -Nru mysql-workbench-5.1-bad/library/sql-parser/source/my_sys.h mysql-workbench-5.1/library/sql-parser/source/my_sys.h
--- mysql-workbench-5.1-bad/library/sql-parser/source/my_sys.h	2008-09-18 07:12:37.000000000 -0500
+++ mysql-workbench-5.1/library/sql-parser/source/my_sys.h	2008-09-23 02:08:27.000000000 -0500
@@ -17,6 +17,7 @@
 #ifndef _my_sys_h
 #define _my_sys_h
 C_MODE_START
+#include <string.h>
 
 static inline int my_close(int file, myf unused) { return close(file); }
 static inline int my_open(const char *FileName,int Flags, int unused) { return open(FileName, Flags); }
diff -Nru mysql-workbench-5.1-bad/library/sql-parser/source/myx_sql_tree_item.cpp mysql-workbench-5.1/library/sql-parser/source/myx_sql_tree_item.cpp
--- mysql-workbench-5.1-bad/library/sql-parser/source/myx_sql_tree_item.cpp	2008-09-18 07:12:37.000000000 -0500
+++ mysql-workbench-5.1/library/sql-parser/source/myx_sql_tree_item.cpp	2008-09-23 02:08:27.000000000 -0500
@@ -2,11 +2,10 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #endif
-
+#include <algorithm>
 #include "myx_sql_tree_item.h"
 #include "myx_util_functions.h"
 #include "myx_lex_helpers.h"
-#include <algorithm>
 #include <functional>
 
 const char* find_str_in_array_ci(const char *arr[], size_t arr_size, const char* str)
diff -Nru mysql-workbench-5.1-bad/library/sql-parser/source/sql_string.h mysql-workbench-5.1/library/sql-parser/source/sql_string.h
--- mysql-workbench-5.1-bad/library/sql-parser/source/sql_string.h	2008-09-18 07:12:37.000000000 -0500
+++ mysql-workbench-5.1/library/sql-parser/source/sql_string.h	2008-09-23 02:08:27.000000000 -0500
@@ -24,6 +24,8 @@
 #define NOT_FIXED_DEC			31
 #endif
 
+#include <cstring>
+
 #define STRING_WITH_LEN(X)  ((const char*) X), ((uint) (sizeof(X) - 1))
 
 class String;
diff -Nru mysql-workbench-5.1-bad/modules/db.mysql/src/db_mysql_catalog_report.cpp mysql-workbench-5.1/modules/db.mysql/src/db_mysql_catalog_report.cpp
--- mysql-workbench-5.1-bad/modules/db.mysql/src/db_mysql_catalog_report.cpp	2008-09-18 07:12:37.000000000 -0500
+++ mysql-workbench-5.1/modules/db.mysql/src/db_mysql_catalog_report.cpp	2008-09-23 02:08:27.000000000 -0500
@@ -1,3 +1,4 @@
+#include <cstring>
 #include "stdafx.h"
 
 #include "db_mysql_catalog_report.h"
diff -Nru mysql-workbench-5.1-bad/modules/db.mysql/src/db_mysql_catalog_report.h mysql-workbench-5.1/modules/db.mysql/src/db_mysql_catalog_report.h
--- mysql-workbench-5.1-bad/modules/db.mysql/src/db_mysql_catalog_report.h	2008-09-18 07:12:37.000000000 -0500
+++ mysql-workbench-5.1/modules/db.mysql/src/db_mysql_catalog_report.h	2008-09-23 02:08:27.000000000 -0500
@@ -6,7 +6,7 @@
                               // Warning caused by Google templates not using dllexport.
 #endif
 
-#include "google/template.h"
+#include "ctemplate/template.h"
 
 #include "grt/common.h"
 
diff -Nru mysql-workbench-5.1-bad/modules/db.mysql/unit-tests/test_db_mysql_schema_diff_reporting.cpp mysql-workbench-5.1/modules/db.mysql/unit-tests/test_db_mysql_schema_diff_reporting.cpp
--- mysql-workbench-5.1-bad/modules/db.mysql/unit-tests/test_db_mysql_schema_diff_reporting.cpp	2008-09-18 07:12:37.000000000 -0500
+++ mysql-workbench-5.1/modules/db.mysql/unit-tests/test_db_mysql_schema_diff_reporting.cpp	2008-09-23 02:08:27.000000000 -0500
@@ -2,7 +2,7 @@
 #include "stdafx.h"
 
 #include <pcre.h>
-#include "google/template.h"
+#include "ctemplate/template.h"
 
 #include "testgrt.h"
 #include "grt_test_utility.h"
diff -Nru mysql-workbench-5.1-bad/modules/db.mysql/unit-tests/test_db_mysql_schema_reporting.cpp mysql-workbench-5.1/modules/db.mysql/unit-tests/test_db_mysql_schema_reporting.cpp
--- mysql-workbench-5.1-bad/modules/db.mysql/unit-tests/test_db_mysql_schema_reporting.cpp	2008-09-18 07:12:37.000000000 -0500
+++ mysql-workbench-5.1/modules/db.mysql/unit-tests/test_db_mysql_schema_reporting.cpp	2008-09-23 02:08:27.000000000 -0500
@@ -1,7 +1,7 @@
 
 #include "stdafx.h"
 
-#include "google/template.h"
+#include "ctemplate/template.h"
 #include <fstream>
 #include <string>
 
diff -Nru mysql-workbench-5.1-bad/modules/wb.model/src/graph_renderer.cpp mysql-workbench-5.1/modules/wb.model/src/graph_renderer.cpp
--- mysql-workbench-5.1-bad/modules/wb.model/src/graph_renderer.cpp	2008-09-18 07:12:37.000000000 -0500
+++ mysql-workbench-5.1/modules/wb.model/src/graph_renderer.cpp	2008-09-23 02:08:27.000000000 -0500
@@ -1,6 +1,7 @@
 //#if defined(__WIN__) || defined(_WIN32) || defined(_WIN64)
 //#include <windows.h>
 //#endif
+#include <climits>
 #include "stdafx.h"
 
 #include "graph_renderer.h"
diff -Nru mysql-workbench-5.1-bad/modules/wb.model/src/reporting.h mysql-workbench-5.1/modules/wb.model/src/reporting.h
--- mysql-workbench-5.1-bad/modules/wb.model/src/reporting.h	2008-09-18 07:12:37.000000000 -0500
+++ mysql-workbench-5.1/modules/wb.model/src/reporting.h	2008-09-23 02:08:27.000000000 -0500
@@ -1,7 +1,7 @@
 #ifndef _WB_MODEL_REPORTING_H_
 #define _WB_MODEL_REPORTING_H_
 
-#include "google/template.h"
+#include "ctemplate/template.h"
 
 #include "grtpp.h"
 #include "grtpp_util.h"
diff -Nru mysql-workbench-5.1-bad/plugins/db.mysql/backend/db_mysql_sql_export.cpp mysql-workbench-5.1/plugins/db.mysql/backend/db_mysql_sql_export.cpp
--- mysql-workbench-5.1-bad/plugins/db.mysql/backend/db_mysql_sql_export.cpp	2008-09-18 07:12:37.000000000 -0500
+++ mysql-workbench-5.1/plugins/db.mysql/backend/db_mysql_sql_export.cpp	2008-09-23 02:08:27.000000000 -0500
@@ -157,7 +157,7 @@
 }
 
 template<>
-static void name_conversion_hack<ct::Triggers>(
+void name_conversion_hack<ct::Triggers>(
             db_mysql_CatalogRef cat,
             const std::vector<std::string>& filter_item_list,
             std::vector<std::string>& output_list)
@@ -194,7 +194,7 @@
 }
 
 template<>
-static void name_conversion_hack<ct::Users>(
+void name_conversion_hack<ct::Users>(
             db_mysql_CatalogRef cat,
             const std::vector<std::string>& filter_item_list,
             std::vector<std::string>& output_list)