From 665c32a4ac364ba3db129f8316574eba29e070c0 Mon Sep 17 00:00:00 2001
From: "kent@mysql.com/c-554072d5.010-2112-6f72651.cust.bredbandsbolaget.se" <>
Date: Sun, 10 Jun 2007 19:07:18 +0200
Subject: [PATCH 1/5] mysqldemb.vcproj: Added lots of missing files to make
"mysqlserver.lib" complete (bug#29007) mysql.sln: Let 'mysqlserver' project
also depend on 'vio', else "vio.lib" will not be linked into the
"mysqlserver.lib" static embedded lib (bug#29007)
---
VC++Files/mysql.sln | 1 +
VC++Files/mysqldemb/mysqldemb.vcproj | 578 ++++++++++++++++++++++++++-
2 files changed, 578 insertions(+), 1 deletion(-)
diff --git a/VC++Files/mysql.sln b/VC++Files/mysql.sln
index 9f7f3ae8375..1a8cde68d4d 100644
--- a/VC++Files/mysql.sln
+++ b/VC++Files/mysql.sln
@@ -210,6 +210,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqlserver", "mysqlserver\
{C70A6DC7-7D45-4C16-8654-7E57713A4C04} = {C70A6DC7-7D45-4C16-8654-7E57713A4C04}
{44D9C7DC-6636-4B82-BD01-6876C64017DF} = {44D9C7DC-6636-4B82-BD01-6876C64017DF}
{FC369DF4-AEB7-4531-BF34-A638C4363BFE} = {FC369DF4-AEB7-4531-BF34-A638C4363BFE}
+ {F74653C4-8003-4A79-8F53-FC69E0AD7A9B} = {F74653C4-8003-4A79-8F53-FC69E0AD7A9B}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqlshow", "client\mysqlshow.vcproj", "{3737BFE2-EF25-464F-994D-BD28A9F84528}"
diff --git a/VC++Files/mysqldemb/mysqldemb.vcproj b/VC++Files/mysqldemb/mysqldemb.vcproj
index 8c052735661..d0ccc062140 100644
--- a/VC++Files/mysqldemb/mysqldemb.vcproj
+++ b/VC++Files/mysqldemb/mysqldemb.vcproj
@@ -901,6 +901,42 @@
PreprocessorDefinitions=""/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ RelativePath="..\sql\password.c">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From 425bbb3264e1bb01eceb063e9f3bae5291d9f416 Mon Sep 17 00:00:00 2001
From: "kent@mysql.com/c-554072d5.010-2112-6f72651.cust.bredbandsbolaget.se" <>
Date: Tue, 12 Jun 2007 01:33:23 +0200
Subject: [PATCH 2/5] libmysqld.def: Corrected name of
mysql_thread_{init,end} (bug#29007)
---
libmysqld/libmysqld.def | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libmysqld/libmysqld.def b/libmysqld/libmysqld.def
index ea3133594f5..899f2141b4e 100644
--- a/libmysqld/libmysqld.def
+++ b/libmysqld/libmysqld.def
@@ -29,8 +29,8 @@ EXPORTS
my_print_variables
my_realloc
my_strdup
- my_thread_end
- my_thread_init
+ mysql_thread_end
+ mysql_thread_init
myodbc_remove_escape
mysql_affected_rows
mysql_autocommit
From bd0b478e30e5351cfb5dbaa15f0e8de4213d5ef6 Mon Sep 17 00:00:00 2001
From: "joerg@trift2." <>
Date: Tue, 12 Jun 2007 10:25:24 +0200
Subject: [PATCH 3/5] VC++Files/sql/mysqld.vcproj Ensure ".pdb" and ".map"
files are created for the MySQL server, in all configurations.
---
VC++Files/sql/mysqld.vcproj | 46 +++++++++++++++++++++++++++++++++----
1 file changed, 41 insertions(+), 5 deletions(-)
diff --git a/VC++Files/sql/mysqld.vcproj b/VC++Files/sql/mysqld.vcproj
index 4df723a6560..d94a302d58f 100644
--- a/VC++Files/sql/mysqld.vcproj
+++ b/VC++Files/sql/mysqld.vcproj
@@ -34,6 +34,7 @@
ProgramDataBaseFileName=".\classic_nt/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
+ DebugInformationFormat="1"
CompileAs="0"/>
@@ -44,6 +45,10 @@
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="../client_classic/mysqld-nt.pdb"
+ GenerateMapFile="TRUE"
+ MapFileName="../client_classic/mysqld-nt.map"
SubSystem="1"
TargetMachine="1"/>
@@ -104,6 +110,10 @@
OutputFile="../client_release/mysqld-max.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="../client_release/mysqld-max.pdb"
+ GenerateMapFile="TRUE"
+ MapFileName="../client_release/mysqld-max.map"
SubSystem="1"
TargetMachine="1"/>
@@ -164,9 +175,10 @@
OutputFile="../client_release/mysqld-max-nt.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
- ProgramDatabaseFile=".\max_nt/mysqld-max-nt.pdb"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="../client_release/mysqld-max-nt.pdb"
GenerateMapFile="TRUE"
- MapFileName=".\max_nt/mysqld-max-nt.map"
+ MapFileName="../client_release/mysqld-max-nt.map"
SubSystem="1"
TargetMachine="1"/>
@@ -227,9 +240,10 @@
OutputFile="../client_release/mysqld-nt.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
- ProgramDatabaseFile=".\nt/mysqld-nt.pdb"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="../client_release/mysqld-nt.pdb"
GenerateMapFile="TRUE"
- MapFileName=".\nt/mysqld-nt.map"
+ MapFileName="../client_release/mysqld-nt.map"
SubSystem="1"
TargetMachine="1"/>
@@ -291,6 +306,10 @@
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="../client_pro/mysqld-nt.pdb"
+ GenerateMapFile="TRUE"
+ MapFileName="../client_pro/mysqld-nt.map"
SubSystem="1"
TargetMachine="1"/>
@@ -412,6 +434,10 @@
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="../client_pro/mysqld.pdb"
+ GenerateMapFile="TRUE"
+ MapFileName="../client_pro/mysqld.map"
SubSystem="1"
TargetMachine="1"/>
@@ -473,6 +500,10 @@
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="../client_classic/mysqld.pdb"
+ GenerateMapFile="TRUE"
+ MapFileName="../client_classic/mysqld.map"
SubSystem="1"
TargetMachine="1"/>
@@ -533,6 +565,10 @@
OutputFile="../client_release/mysqld.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="../client_release/mysqld.pdb"
+ GenerateMapFile="TRUE"
+ MapFileName="../client_release/mysqld.map"
SubSystem="1"
TargetMachine="1"/>
Date: Mon, 18 Jun 2007 20:13:33 +0200
Subject: [PATCH 4/5] don't use bk cset in commit e-mails
---
BitKeeper/triggers/post-commit | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/BitKeeper/triggers/post-commit b/BitKeeper/triggers/post-commit
index 5a7d6576d4e..127dad72ba7 100755
--- a/BitKeeper/triggers/post-commit
+++ b/BitKeeper/triggers/post-commit
@@ -105,7 +105,7 @@ see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
EOF
bk changes -v -r+
- bk cset -r+ -d
+ bk rset -r+ -ah | bk gnupatch -h -dup -T
) | head -n $LIMIT | /usr/sbin/sendmail -t
#++
@@ -125,7 +125,7 @@ Subject: bk commit - $VERSION tree (Manual) ($CHANGESET)$BS
EOF
bk changes -v -r+
- bk cset -r+ -d
+ bk rset -r+ -ah | bk gnupatch -h -dup -T
) | head -n $LIMIT | /usr/sbin/sendmail -t
fi
From 4e9d181fad30f37bd7596120495273060a8cd97d Mon Sep 17 00:00:00 2001
From: "joerg@trift2." <>
Date: Fri, 22 Jun 2007 20:08:19 +0200
Subject: [PATCH 5/5] Add the "nist" suite to the "test-bt" target, to be run
only if it is available on the machine.
---
Makefile.am | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/Makefile.am b/Makefile.am
index 6cb080aed5a..186a3ec2453 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -159,6 +159,14 @@ test-bt:
@PERL@ ./mysql-test-run.pl --force --comment=funcs2 --suite=funcs_2
-cd mysql-test ; MTR_BUILD_THREAD=auto \
@PERL@ ./mysql-test-run.pl --force --comment=rowlock --suite=row_lock
+ -if [ -d mysql-test/suite/nist ] ; then \
+ cd mysql-test ; MTR_BUILD_THREAD=auto \
+ @PERL@ ./mysql-test-run.pl --comment=NIST+normal --force --suite=nist ; \
+ fi
+ -if [ -d mysql-test/suite/nist ] ; then \
+ cd mysql-test ; MTR_BUILD_THREAD=auto \
+ @PERL@ ./mysql-test-run.pl --comment=NIST+ps --force --suite=nist --ps-protocol ; \
+ fi
test-bt-debug:
-cd mysql-test ; MTR_BUILD_THREAD=auto \