Commit a6557b0c authored by unknown's avatar unknown
Browse files

Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-release 

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-main


VC++Files/sql/mysqld.vcproj:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/warnings.result:
  Auto merged
mysql-test/t/warnings-master.opt:
  Auto merged
mysql-test/t/warnings.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
parents 39486004 b0b0c8cc

VC++Files/mysys/mysys.vcproj

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
				Optimization="0"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../zlib"

				PreprocessorDefinitions="__NT__;_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS;USE_SYMDIR"

				PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS;USE_SYMDIR"

				RuntimeLibrary="1"

				PrecompiledHeaderFile=".\debug/mysys.pch"

				AssemblerListingLocation=".\debug/"

VC++Files/sql/mysqld.vcproj

+33 −9
Original line number Diff line number Diff line
@@ -43,7 +43,10 @@ 
				OutputFile="../client_classic/mysqld-nt.exe"

				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"/>

			<Tool
@@ -104,6 +107,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"/>

			<Tool
@@ -164,9 +171,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"/>

			<Tool
@@ -227,9 +235,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"/>

			<Tool
@@ -290,7 +299,10 @@ 
				OutputFile="../client_pro/mysqld-nt.exe"

				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"/>

			<Tool
@@ -350,7 +362,9 @@ 
				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				GenerateDebugInformation="TRUE"

				ProgramDatabaseFile=".\debug/mysqld-debug.pdb"

				ProgramDatabaseFile="../client_debug/mysqld-debug.pdb"

				GenerateMapFile="TRUE"

				MapFileName="../client_debug/mysqld-debug.map"

				SubSystem="1"

				TargetMachine="1"/>

			<Tool
@@ -411,7 +425,10 @@ 
				OutputFile="../client_pro/mysqld.exe"

				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				AdditionalLibraryDirectories=""

				GenerateDebugInformation="TRUE"

				ProgramDatabaseFile="../client_pro/mysqld.pdb"

				GenerateMapFile="TRUE"

				MapFileName="../client_pro/mysqld.map"

				SubSystem="1"

				TargetMachine="1"/>

			<Tool
@@ -472,7 +489,10 @@ 
				OutputFile="../client_classic/mysqld.exe"

				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				AdditionalLibraryDirectories=""

				GenerateDebugInformation="TRUE"

				ProgramDatabaseFile="../client_classic/mysqld.pdb"

				GenerateMapFile="TRUE"

				MapFileName="../client_classic/mysqld.map"

				SubSystem="1"

				TargetMachine="1"/>

			<Tool
@@ -533,6 +553,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"/>

			<Tool

mysql-test/r/derived.result

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ select * from t1; 
N	M

3	0

delete P1.*,p2.* from `t1` AS P1 INNER JOIN (SELECT N FROM `t1` GROUP BY N HAVING Count(M) > 1) AS p2 ON P1.N = p2.N;

ERROR HY000: The target table p2 of the DELETE is not updatable

ERROR 42S02: Unknown table 'p2' in MULTI DELETE

delete P1.* from `t1` AS P1 INNER JOIN (SELECT aaa FROM `t1` GROUP BY N HAVING Count(M) > 1) AS P2 ON P1.N = P2.N;

ERROR 42S22: Unknown column 'aaa' in 'field list'

drop table t1;

mysql-test/r/sp.result

+15 −0
Original line number Diff line number Diff line
@@ -5057,4 +5057,19 @@ concat('data was: /', var1, '/') 
data was: /1/

drop table t3|

drop procedure bug15217|

drop table if exists t3|

drop database if exists mysqltest1|

create table t3 (a int)|

insert into t3 (a) values (1), (2)|

create database mysqltest1|

use mysqltest1|

drop database mysqltest1|

select database()|

database()

NULL

select * from (select 1 as a) as t1 natural join (select * from test.t3) as t2|

a

1

use test|

drop table t3|

drop table t1,t2;

mysql-test/r/sp.result.orig

deleted100644 → 0
+0 −4853

File deleted.

Preview size limit exceeded, changes collapsed.