aboutsummaryrefslogtreecommitdiff
path: root/contrib/mysql_to_pgsql
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/mysql_to_pgsql')
-rw-r--r--contrib/mysql_to_pgsql/cmake/FindMySQL.cmake4
-rw-r--r--contrib/mysql_to_pgsql/cmake/FindPostgreSQL.cmake8
-rw-r--r--contrib/mysql_to_pgsql/src/defines.h4
3 files changed, 8 insertions, 8 deletions
diff --git a/contrib/mysql_to_pgsql/cmake/FindMySQL.cmake b/contrib/mysql_to_pgsql/cmake/FindMySQL.cmake
index e7d158de275..3d13c6f4d2a 100644
--- a/contrib/mysql_to_pgsql/cmake/FindMySQL.cmake
+++ b/contrib/mysql_to_pgsql/cmake/FindMySQL.cmake
@@ -30,7 +30,7 @@ IF(MSVC)
ELSE(MSVC)
SET(MYSQL_NAMES mysqlclient mysqlclient_r)
ENDIF(MSVC)
-SET(MYSQL_SEARCH_LIB_PATHS
+SET(MYSQL_SEARCH_LIB_PATHS
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 6.0;Location]/lib/opt"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.1;Location]/lib/opt"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.0;Location]/lib/opt"
@@ -71,4 +71,4 @@ MARK_AS_ADVANCED(
MYSQL_INCLUDE_DIR
)
-ENDMACRO(FIND_MYSQL) \ No newline at end of file
+ENDMACRO(FIND_MYSQL)
diff --git a/contrib/mysql_to_pgsql/cmake/FindPostgreSQL.cmake b/contrib/mysql_to_pgsql/cmake/FindPostgreSQL.cmake
index 06a1adc9e7a..6cfabd2a2ff 100644
--- a/contrib/mysql_to_pgsql/cmake/FindPostgreSQL.cmake
+++ b/contrib/mysql_to_pgsql/cmake/FindPostgreSQL.cmake
@@ -14,7 +14,7 @@ ENDIF (PGSQL_INCLUDE_DIR)
# the registry settings checked are in order:
# - for pgInstaller 8.2.x postgresql version
# - for pgInstaller 8.3.x postgresql version
-SET(PGSQL_WIN_BASE
+SET(PGSQL_WIN_BASE
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\PostgreSQL\\Installations\\{B823632F-3B72-4514-8861-B961CE263224};Base Directory]"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\PostgreSQL\\Installations\\{1F701DBD-1660-4108-B10A-FB435EA63BF0};Base Directory]")
@@ -42,12 +42,12 @@ FIND_PATH(PGSQL_INCLUDE_DIR libpq-fe.h
)
SET(PGSQL_NAMES pq libpq)
-SET(PGSQL_SEARCH_LIB_PATHS
+SET(PGSQL_SEARCH_LIB_PATHS
${PGSQL_SEARCH_LIB_PATHS}
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\PostgreSQL\\Installations\\{1F701DBD-1660-4108-B10A-FB435EA63BF0};Base Directory]/lib"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\PostgreSQL\\Installations\\{B823632F-3B72-4514-8861-B961CE263224};Base Directory]/lib"
- /usr/local/pgsql/lib
- /usr/local/lib
+ /usr/local/pgsql/lib
+ /usr/local/lib
/usr/lib
)
FIND_LIBRARY(PGSQL_LIBRARY
diff --git a/contrib/mysql_to_pgsql/src/defines.h b/contrib/mysql_to_pgsql/src/defines.h
index ed151bf5fae..3ffaf9923e0 100644
--- a/contrib/mysql_to_pgsql/src/defines.h
+++ b/contrib/mysql_to_pgsql/src/defines.h
@@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
+
#ifndef _DEFINES_
#define _DEFINES_
@@ -59,7 +59,7 @@ typedef vector<sField> T_Table;
typedef vector<string> T_TableList;
typedef map< string, T_Table > TDataBase;
-static
+static
void pg_notice(void *arg, const char *message)
{
/// Do nothing