Merge gluh@gluh:/home/gluh/release/mysql-5.0-build (d0afc349) · Commits · Software / OSDI20 Artifacts / mariadb

VC++Files/sql/mysqld.dsp

+18 −9

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ RSC=rc.exe
		# PROP Ignore_Export_Lib 0
		# PROP Target_Dir ""
		# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
		# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../zlib" /I "../include" /I "../regex" /D "NDEBUG" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /FD /c
		# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../zlib" /I "../include" /I "../regex" /I "../extra/yassl/include" /D "NDEBUG" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /FD /c
		# SUBTRACT CPP /YX
		# ADD BASE RSC /l 0x410 /d "NDEBUG"
		# ADD RSC /l 0x409 /d "NDEBUG"
		@@ -75,7 +75,7 @@ LINK32=xilink6.exe
		# PROP Ignore_Export_Lib 0
		# PROP Target_Dir ""
		# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
		# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /FD /c
		# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../extra/yassl/include" /I "../zlib" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_FEDERATED_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /FD /c
		# SUBTRACT CPP /Fr /YX
		# ADD BASE RSC /l 0x410 /d "_DEBUG"
		# ADD RSC /l 0x409 /d "_DEBUG"
		@@ -102,7 +102,7 @@ LINK32=xilink6.exe
		# PROP Target_Dir ""
		# ADD BASE CPP /nologo /G5 /MT /W3 /O2 /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "__WIN32__" /D "DBUG_OFF" /FD /c
		# SUBTRACT BASE CPP /YX
		# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "HAVE_INNOBASE_DB" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-nt /FD /c
		# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /I "../extra/yassl/include" /D "__NT__" /D "DBUG_OFF" /D "NDEBUG" /D "HAVE_INNOBASE_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-nt /FD /c
		# SUBTRACT CPP /YX
		# ADD BASE RSC /l 0x410 /d "NDEBUG"
		# ADD RSC /l 0x409 /d "NDEBUG"
		@@ -130,7 +130,7 @@ LINK32=xilink6.exe
		# PROP Target_Dir ""
		# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c
		# SUBTRACT BASE CPP /YX
		# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-nt-max /FD /c
		# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../extra/yassl/include" /I "../zlib" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_FEDERATED_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-nt-max /FD /c
		# SUBTRACT CPP /YX
		# ADD BASE RSC /l 0x409 /d "NDEBUG"
		# ADD RSC /l 0x409 /d "NDEBUG"
		@@ -159,7 +159,7 @@ LINK32=xilink6.exe
		# PROP Target_Dir ""
		# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /D "NDEBUG" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c
		# SUBTRACT BASE CPP /YX
		# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /D "NDEBUG" /D "DBUG_OFF" /D "USE_SYMDIR" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-max /FD /c
		# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../extra/yassl/include" /I "../zlib" /D "NDEBUG" /D "DBUG_OFF" /D "USE_SYMDIR" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_FEDERATED_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-max /FD /c
		# SUBTRACT CPP /YX
		# ADD BASE RSC /l 0x409 /d "NDEBUG"
		# ADD RSC /l 0x409 /d "NDEBUG"
		@@ -187,7 +187,7 @@ LINK32=xilink6.exe
		# PROP Target_Dir ""
		# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "USE_SYMDIR" /D "HAVE_DLOPEN" /D "NDEBUG" /FD /c
		# SUBTRACT BASE CPP /YX
		# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D LICENSE=Commercial /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "HAVE_DLOPEN" /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /FD /D MYSQL_SERVER_SUFFIX=-classic /c
		# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /I "../extra/yassl/include" /D LICENSE=Commercial /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "HAVE_DLOPEN" /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /FD /D MYSQL_SERVER_SUFFIX=-classic /c
		# ADD BASE RSC /l 0x409 /d "NDEBUG"
		# ADD RSC /l 0x409 /d "NDEBUG"
		BSC32=bscmake.exe
		@@ -215,7 +215,7 @@ LINK32=xilink6.exe
		# PROP Target_Dir ""
		# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "USE_SYMDIR" /D "HAVE_DLOPEN" /D "NDEBUG" /FD /c
		# SUBTRACT BASE CPP /YX
		# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "MYSQL_SERVER" /D LICENSE=Commercial /D "_MBCS" /D "HAVE_DLOPEN" /D "HAVE_INNOBASE_DB" /D "DBUG_OFF" /D "NDEBUG" /D "_WINDOWS" /D "_CONSOLE" /D MYSQL_SERVER_SUFFIX=-pro /FD /c
		# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /I "../extra/yassl/include" /D "MYSQL_SERVER" /D LICENSE=Commercial /D "_MBCS" /D "HAVE_DLOPEN" /D "HAVE_INNOBASE_DB" /D "DBUG_OFF" /D "NDEBUG" /D "_WINDOWS" /D "_CONSOLE" /D MYSQL_SERVER_SUFFIX=-pro /FD /c
		# ADD BASE RSC /l 0x409 /d "NDEBUG"
		# ADD RSC /l 0x409 /d "NDEBUG"
		BSC32=bscmake.exe
		@@ -243,7 +243,7 @@ LINK32=xilink6.exe
		# PROP Target_Dir ""
		# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "USE_SYMDIR" /D "HAVE_DLOPEN" /D "NDEBUG" /FD /c
		# SUBTRACT BASE CPP /YX
		# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "__NT__" /D "DBUG_OFF" /D "NDEBUG" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /FD /D LICENSE=Commercial /D MYSQL_SERVER_SUFFIX=-classic-nt /c
		# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /I "../extra/yassl/include" /D "__NT__" /D "DBUG_OFF" /D "NDEBUG" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /FD /D LICENSE=Commercial /D MYSQL_SERVER_SUFFIX=-classic-nt /c
		# SUBTRACT CPP /YX
		# ADD BASE RSC /l 0x409 /d "NDEBUG"
		# ADD RSC /l 0x409 /d "NDEBUG"
		@@ -272,7 +272,8 @@ LINK32=xilink6.exe
		# PROP Target_Dir ""
		# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "USE_SYMDIR" /D "HAVE_DLOPEN" /D "NDEBUG" /FD /c
		# SUBTRACT BASE CPP /YX
		# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "__NT__" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D LICENSE=Commercial /D "NDEBUG" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-pro-nt" /FD
		# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /I "../extra/yassl/include" /D "__NT__" /D "DBUG_OFF" /D "NDEBUG" /D "HAVE_INNOBASE_DB" /D "MYSQL_SERVER" /D LICENSE=Commercial /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-pro-nt" /FD /c
		# SUBTRACT CPP /YX
		# ADD BASE RSC /l 0x409 /d "NDEBUG"
		# ADD RSC /l 0x409 /d "NDEBUG"
		BSC32=bscmake.exe
		@@ -451,6 +452,14 @@ SOURCE=.\gstream.cpp
		# End Source File
		# Begin Source File

		SOURCE=.\ha_blackhole.cpp
		# End Source File
		# Begin Source File

		SOURCE=.\ha_federated.cpp
		# End Source File
		# Begin Source File

		SOURCE=.\ha_berkeley.cpp
		# End Source File
		# Begin Source File

mysql-test/r/information_schema_db.result

+2 −2

Original line number	Diff line number	Diff line
		use INFORMATION_SCHEMA;
		show tables;
		Tables_in_INFORMATION_SCHEMA
		Tables_in_information_schema
		SCHEMATA
		TABLES
		COLUMNS
		@@ -17,7 +17,7 @@ COLUMN_PRIVILEGES
		TABLE_CONSTRAINTS
		KEY_COLUMN_USAGE
		show tables from INFORMATION_SCHEMA like 'T%';
		Tables_in_INFORMATION_SCHEMA (T%)
		Tables_in_information_schema (T%)
		TABLES
		TABLE_PRIVILEGES
		TABLE_CONSTRAINTS

mysql-test/t/information_schema_db.test

+2 −0

Original line number	Diff line number	Diff line
		-- source include/testdb_only.inc

		use INFORMATION_SCHEMA;
		--replace_result Tables_in_INFORMATION_SCHEMA Tables_in_information_schema
		show tables;
		--replace_result 'Tables_in_INFORMATION_SCHEMA (T%)' 'Tables_in_information_schema (T%)'
		show tables from INFORMATION_SCHEMA like 'T%';
		create database `inf%`;
		use `inf%`;

sql/ha_federated.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -349,7 +349,7 @@
		#pragma implementation // gcc: Class implementation
		#endif

		#include <mysql_priv.h>
		#include "mysql_priv.h"

		#ifdef HAVE_FEDERATED_DB
		#include "ha_federated.h"