merge (b9576858) · Commits · Software / OSDI20 Artifacts / mariadb

.bzrignore

+54 −0

Original line number	Diff line number	Diff line
		@@ -549,13 +549,67 @@ mysql-max-4.0.2-alpha-pc-linux-gnu-i686.tar.gz
		mysql-test/gmon.out
		mysql-test/install_test_db
		mysql-test/mysql-test-run
		mysql-test/mysql-test-run.log
		mysql-test/mysql_test_run_new
		mysql-test/ndb/ndbcluster
		mysql-test/r/*.reject
		mysql-test/r/alter_table.err
		mysql-test/r/archive.err
		mysql-test/r/bdb-alter-table-1.err
		mysql-test/r/bdb-alter-table-2.err
		mysql-test/r/bdb-crash.err
		mysql-test/r/bdb-deadlock.err
		mysql-test/r/bdb.err
		mysql-test/r/bdb_cache.err
		mysql-test/r/client_test.err
		mysql-test/r/csv.err
		mysql-test/r/ctype_ucs.err
		mysql-test/r/derived.err
		mysql-test/r/exampledb.err
		mysql-test/r/func_encrypt.err
		mysql-test/r/index_merge_load.result
		mysql-test/r/isam.err
		mysql-test/r/lowercase_table2.err
		mysql-test/r/multi_update.err
		mysql-test/r/mysql_protocols.err
		mysql-test/r/mysqlbinlog.err
		mysql-test/r/mysqlbinlog2.err
		mysql-test/r/mysqldump.err
		mysql-test/r/mysqltest.err
		mysql-test/r/ndb_alter_table.err
		mysql-test/r/ndb_autodiscover.err
		mysql-test/r/ndb_autodiscover2.err
		mysql-test/r/ndb_basic.err
		mysql-test/r/ndb_blob.err
		mysql-test/r/ndb_cache.err
		mysql-test/r/ndb_charset.err
		mysql-test/r/ndb_index.err
		mysql-test/r/ndb_index_ordered.err
		mysql-test/r/ndb_index_unique.err
		mysql-test/r/ndb_insert.err
		mysql-test/r/ndb_limit.err
		mysql-test/r/ndb_lock.err
		mysql-test/r/ndb_minmax.err
		mysql-test/r/ndb_replace.err
		mysql-test/r/ndb_subquery.err
		mysql-test/r/ndb_transaction.err
		mysql-test/r/ndb_truncate.err
		mysql-test/r/ndb_types.err
		mysql-test/r/ndb_update.err
		mysql-test/r/openssl_1.err
		mysql-test/r/ps_1general.err
		mysql-test/r/ps_6bdb.err
		mysql-test/r/ps_7ndb.err
		mysql-test/r/query_cache.err
		mysql-test/r/query_cache_merge.err
		mysql-test/r/raid.err
		mysql-test/r/repair.err
		mysql-test/r/replace.err
		mysql-test/r/rpl000001.err
		mysql-test/r/rpl000001.eval
		mysql-test/r/rpl000002.eval
		mysql-test/r/rpl000014.eval
		mysql-test/r/rpl000015.err
		mysql-test/r/rpl000015.eval
		mysql-test/r/rpl000016.eval
		mysql-test/r/rpl_log.eval

BUILD/compile-dist

+1 −0

Original line number	Diff line number	Diff line
		@@ -43,5 +43,6 @@ fi
		--with-berkeley-db \
		--with-innodb \
		--enable-thread-safe-client \
		--with-extra-charsets=complex \
		--with-ndbcluster
		make

BitKeeper/etc/logging_ok

+1 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ bk@mysql.r18.ru
		brian@avenger.(none)
		brian@brian-akers-computer.local
		brian@private-client-ip-101.oz.net
		brian@zim.(none)
		carsten@tsort.bitbybit.dk
		cps@silver_beast.(none)
		davida@isil.mysql.com

VC++Files/client/mysqldump.dsp

+6 −6

Original line number	Diff line number	Diff line
		@@ -51,8 +51,8 @@ BSC32=bscmake.exe
		# ADD BASE BSC32 /nologo
		# ADD BSC32 /nologo
		LINK32=xilink6.exe
		# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
		# ADD LINK32 mysqlclient.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"../client_release/mysqldump.exe" /libpath:"..\lib_release\\"
		# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mysys.lib /nologo /subsystem:console /machine:I386
		# ADD LINK32 mysqlclient.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mysys.lib /nologo /subsystem:console /machine:I386 /out:"../client_release/mysqldump.exe" /libpath:"..\lib_release\\"

		!ELSEIF "$(CFG)" == "mysqldump - Win32 Debug"

		@@ -76,8 +76,8 @@ BSC32=bscmake.exe
		# ADD BASE BSC32 /nologo
		# ADD BSC32 /nologo
		LINK32=xilink6.exe
		# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
		# ADD LINK32 mysqlclient.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"../client_debug/mysqldump.exe" /pdbtype:sept /libpath:"..\lib_debug\\"
		# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mysys.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
		# ADD LINK32 mysqlclient.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mysys.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"../client_debug/mysqldump.exe" /pdbtype:sept /libpath:"..\lib_debug\\"

		!ELSEIF "$(CFG)" == "mysqldump - Win32 classic"

		@@ -103,8 +103,8 @@ BSC32=bscmake.exe
		# ADD BASE BSC32 /nologo
		# ADD BSC32 /nologo
		LINK32=xilink6.exe
		# ADD BASE LINK32 mysqlclient.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"../client_release/mysqldump.exe" /libpath:"..\lib_release\\"
		# ADD LINK32 mysqlclient.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"../client_classic/mysqldump.exe" /libpath:"..\lib_release\\"
		# ADD BASE LINK32 mysqlclient.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mysys.lib /nologo /subsystem:console /machine:I386 /out:"../client_release/mysqldump.exe" /libpath:"..\lib_release\\"
		# ADD LINK32 mysqlclient.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mysys.lib /nologo /subsystem:console /machine:I386 /out:"../client_classic/mysqldump.exe" /libpath:"..\lib_release\\"

		!ENDIF

VC++Files/client/mysqltest.dsp

+8 −8

Original line number	Diff line number	Diff line
		@@ -67,8 +67,8 @@ LINK32=link.exe
		# PROP Output_Dir ".\classic"
		# PROP Intermediate_Dir ".\classic"
		# PROP Target_Dir ""
		# ADD BASE CPP /nologo /MT /I "../include" /I "../" /W3 /Ob1 /G6 /D "_CONSOLE" /D "_WINDOWS" /D "LICENSE=Commercial" /D "DBUG_OFF" /D "NDEBUG" /D "_MBCS" /GF /Gy /Fp".\classic/mysqltest.pch" /Fo".\classic/" /Fd".\classic/" /c /GX
		# ADD CPP /nologo /MT /I "../include" /I "../" /W3 /Ob1 /G6 /D "_CONSOLE" /D "_WINDOWS" /D "LICENSE=Commercial" /D "DBUG_OFF" /D "NDEBUG" /D "_MBCS" /GF /Gy /Fp".\classic/mysqltest.pch" /Fo".\classic/" /Fd".\classic/" /c /GX
		# ADD BASE CPP /nologo /MT /I "../include" /I "../regex" /I "../" /W3 /Ob1 /G6 /D "_CONSOLE" /D "_WINDOWS" /D "LICENSE=Commercial" /D "DBUG_OFF" /D "NDEBUG" /D "_MBCS" /GF /Gy /Fp".\classic/mysqltest.pch" /Fo".\classic/" /Fd".\classic/" /c /GX
		# ADD CPP /nologo /MT /I "../include" /I "../regex" /I "../" /W3 /Ob1 /G6 /D "_CONSOLE" /D "_WINDOWS" /D "LICENSE=Commercial" /D "DBUG_OFF" /D "NDEBUG" /D "_MBCS" /GF /Gy /Fp".\classic/mysqltest.pch" /Fo".\classic/" /Fd".\classic/" /c /GX
		# ADD BASE MTL /nologo /tlb".\classic\mysqltest.tlb" /win32
		# ADD MTL /nologo /tlb".\classic\mysqltest.tlb" /win32
		# ADD BASE RSC /l 1033 /d "NDEBUG"
		@@ -77,8 +77,8 @@ BSC32=bscmake.exe
		# ADD BASE BSC32 /nologo
		# ADD BSC32 /nologo
		LINK32=link.exe
		# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib /nologo /out:"..\client_classic\mysqltest.exe" /incremental:no /libpath:"..\lib_release\" /pdb:".\classic\mysqltest.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
		# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib /nologo /out:"..\client_classic\mysqltest.exe" /incremental:no /libpath:"..\lib_release\" /pdb:".\classic\mysqltest.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
		# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib /nologo /out:"..\client_classic\mysqltest.exe" /incremental:no /libpath:"..\lib_release\" /pdb:".\classic\mysqltest.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
		# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib /nologo /out:"..\client_classic\mysqltest.exe" /incremental:no /libpath:"..\lib_release\" /pdb:".\classic\mysqltest.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386

		!ELSEIF "$(CFG)" == "mysqltest - Win32 Release"

		@@ -92,8 +92,8 @@ LINK32=link.exe
		# PROP Output_Dir ".\release"
		# PROP Intermediate_Dir ".\release"
		# PROP Target_Dir ""
		# ADD BASE CPP /nologo /MT /I "../include" /I "../" /W3 /Ob1 /G6 /D "DBUG_OFF" /D "_CONSOLE" /D "_WINDOWS" /D "NDEBUG" /D "_MBCS" /GF /Gy /Fp".\release/mysqltest.pch" /Fo".\release/" /Fd".\release/" /c /GX
		# ADD CPP /nologo /MT /I "../include" /I "../" /W3 /Ob1 /G6 /D "DBUG_OFF" /D "_CONSOLE" /D "_WINDOWS" /D "NDEBUG" /D "_MBCS" /GF /Gy /Fp".\release/mysqltest.pch" /Fo".\release/" /Fd".\release/" /c /GX
		# ADD BASE CPP /nologo /MT /I "../include" /I "../regex" /I "../" /W3 /Ob1 /G6 /D "DBUG_OFF" /D "_CONSOLE" /D "_WINDOWS" /D "NDEBUG" /D "_MBCS" /GF /Gy /Fp".\release/mysqltest.pch" /Fo".\release/" /Fd".\release/" /c /GX
		# ADD CPP /nologo /MT /I "../include" /I "../regex" /I "../" /W3 /Ob1 /G6 /D "DBUG_OFF" /D "_CONSOLE" /D "_WINDOWS" /D "NDEBUG" /D "_MBCS" /GF /Gy /Fp".\release/mysqltest.pch" /Fo".\release/" /Fd".\release/" /c /GX
		# ADD BASE MTL /nologo /tlb".\release\mysqltest.tlb" /win32
		# ADD MTL /nologo /tlb".\release\mysqltest.tlb" /win32
		# ADD BASE RSC /l 1033 /d "NDEBUG"
		@@ -102,8 +102,8 @@ BSC32=bscmake.exe
		# ADD BASE BSC32 /nologo
		# ADD BSC32 /nologo
		LINK32=link.exe
		# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib /nologo /out:"..\client_release\mysqltest.exe" /incremental:no /libpath:"..\lib_release\" /pdb:".\release\mysqltest.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
		# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib /nologo /out:"..\client_release\mysqltest.exe" /incremental:no /libpath:"..\lib_release\" /pdb:".\release\mysqltest.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
		# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib /nologo /out:"..\client_release\mysqltest.exe" /incremental:no /libpath:"..\lib_release\" /pdb:".\release\mysqltest.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
		# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib /nologo /out:"..\client_release\mysqltest.exe" /incremental:no /libpath:"..\lib_release\" /pdb:".\release\mysqltest.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386

		!ENDIF