List:Commits« Previous MessageNext Message »
From:knielsen Date:January 30 2006 2:05pm
Subject:bk commit into 5.1 tree (knielsen:1.2093)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of knielsen. When knielsen does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2093 06/01/30 15:05:31 knielsen@stripped +6 -0
  Merge mysql.com:/usr/local/mysql/mysql-5.0-merge
  into  mysql.com:/usr/local/mysql/mysql-5.1-merge

  VC++Files/sql/mysqld.vcproj
    1.8 06/01/30 15:05:27 knielsen@stripped +0 -0
    SCCS merged

  storage/innobase/os/os0file.c
    1.112 06/01/30 15:02:50 knielsen@stripped +0 -0
    Auto merged

  storage/innobase/include/os0file.h
    1.43 06/01/30 15:02:50 knielsen@stripped +0 -0
    Auto merged

  storage/innobase/os/os0file.c
    1.103.7.2 06/01/30 15:02:50 knielsen@stripped +0 -0
    Merge rename: innobase/os/os0file.c -> storage/innobase/os/os0file.c

  storage/innobase/include/os0file.h
    1.34.7.2 06/01/30 15:02:50 knielsen@stripped +0 -0
    Merge rename: innobase/include/os0file.h -> storage/innobase/include/os0file.h

  sql/ha_innodb.cc
    1.251 06/01/30 15:02:50 knielsen@stripped +0 -0
    Auto merged

  mysql-test/t/innodb.test
    1.124 06/01/30 15:02:50 knielsen@stripped +0 -0
    Auto merged

  mysql-test/r/innodb.result
    1.155 06/01/30 15:02:50 knielsen@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	knielsen
# Host:	rt.int.sifira.dk
# Root:	/usr/local/mysql/mysql-5.1-merge/RESYNC

--- 1.7/VC++Files/sql/mysqld.vcproj	2006-01-13 22:09:38 +01:00
+++ 1.8/VC++Files/sql/mysqld.vcproj	2006-01-30 15:05:27 +01:00
@@ -3925,6 +3925,81 @@
 			</FileConfiguration>
 		</File>
 		<File
+			RelativePath="my_user.c">
+			<FileConfiguration
+				Name="classic nt|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Max|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Max nt|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="nt|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="pro nt|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="pro|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="classic|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""/>
+			</FileConfiguration>
+		</File>
+		<File
 			RelativePath="..\storage\myisammrg\myrg_rnext_same.c">
 			<FileConfiguration
 				Name="classic nt|Win32">

--- 1.34.7.1/innobase/include/os0file.h	2006-01-15 14:43:22 +01:00
+++ 1.43/storage/innobase/include/os0file.h	2006-01-30 15:02:50 +01:00
@@ -187,7 +187,7 @@
 FILE*
 os_file_create_tmpfile(void);
 /*========================*/
-			/* out: temporary file handle, or NULL on error */
+			/* out: temporary file handle (never NULL) */
 /***************************************************************************
 The os_file_opendir() function opens a directory stream corresponding to the
 directory named by the dirname argument. The directory stream is positioned
Thread
bk commit into 5.1 tree (knielsen:1.2093)knielsen30 Jan