Commit 5d8f7471 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/dlenev/mysql-5.0-bg11081 

into  mysql.com:/home/dlenev/mysql-5.1-merges


VC++Files/mysql.sln:
  Auto merged
VC++Files/mysys/mysys.vcproj:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/timezone2.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/tztime.cc:
  Auto merged
sql/tztime.h:
  Auto merged
tests/Makefile.am:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
parents 30e6df0e 853f5413

VC++Files/mysql.sln

+1 −0
Original line number Diff line number Diff line
@@ -257,6 +257,7 @@ EndProject 
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysql_client_test", "tests\mysql_client_test.vcproj", "{DA224DAB-5006-42BE-BB77-16E8BE5326D5}"

	ProjectSection(ProjectDependencies) = postProject

		{26383276-4843-494B-8BE0-8936ED3EBAAB} = {26383276-4843-494B-8BE0-8936ED3EBAAB}

		{44D9C7DC-6636-4B82-BD01-6876C64017DF} = {44D9C7DC-6636-4B82-BD01-6876C64017DF}

	EndProjectSection

EndProject

Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqlmanager", "server-tools\instance-manager\mysqlmanager.vcproj", "{6D524B3E-210A-4FCD-8D41-FEC0D21E83AC}"

VC++Files/mysys/mysys.vcproj

+43 −0
Original line number Diff line number Diff line
@@ -3232,6 +3232,49 @@ 
					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="my_memmem.c">

			<FileConfiguration

				Name="Debug|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="0"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Max|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Release|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="TLS_DEBUG|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="0"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="TLS|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="my_messnc.c">

			<FileConfiguration

client/mysql_upgrade.c

+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ int main(int argc, char **argv) 
    b_read= my_read(check_file, chf_buffer, sizeof(chf_buffer)-1, MYF(0));

    chf_buffer[b_read]= 0;

    my_close(check_file, MYF(0));

    if (!strcmp(chf_buffer, VERSION))

    if (!strcmp(chf_buffer, MYSQL_SERVER_VERSION))

    {

      if (opt_verbose)

        puts("mysql_upgrade already done for this version");

mysql-test/r/ps.result

+101 −0
Original line number Diff line number Diff line
@@ -1056,3 +1056,104 @@ a b 
1	9

3	7

drop table t1;

create table t1 (a int);

create table t2 like t1;

create table t3 like t2;

prepare stmt from "repair table t1";

execute stmt;

Table	Op	Msg_type	Msg_text

test.t1	repair	status	OK

execute stmt;

Table	Op	Msg_type	Msg_text

test.t1	repair	status	OK

prepare stmt from "optimize table t1";

execute stmt;

Table	Op	Msg_type	Msg_text

test.t1	optimize	status	OK

execute stmt;

Table	Op	Msg_type	Msg_text

test.t1	optimize	status	Table is already up to date

prepare stmt from "analyze table t1";

execute stmt;

Table	Op	Msg_type	Msg_text

test.t1	analyze	status	Table is already up to date

execute stmt;

Table	Op	Msg_type	Msg_text

test.t1	analyze	status	Table is already up to date

prepare stmt from "repair table t1, t2, t3";

execute stmt;

Table	Op	Msg_type	Msg_text

test.t1	repair	status	OK

test.t2	repair	status	OK

test.t3	repair	status	OK

execute stmt;

Table	Op	Msg_type	Msg_text

test.t1	repair	status	OK

test.t2	repair	status	OK

test.t3	repair	status	OK

prepare stmt from "optimize table t1, t2, t3";

execute stmt;

Table	Op	Msg_type	Msg_text

test.t1	optimize	status	OK

test.t2	optimize	status	OK

test.t3	optimize	status	OK

execute stmt;

Table	Op	Msg_type	Msg_text

test.t1	optimize	status	Table is already up to date

test.t2	optimize	status	Table is already up to date

test.t3	optimize	status	Table is already up to date

prepare stmt from "analyze table t1, t2, t3";

execute stmt;

Table	Op	Msg_type	Msg_text

test.t1	analyze	status	Table is already up to date

test.t2	analyze	status	Table is already up to date

test.t3	analyze	status	Table is already up to date

execute stmt;

Table	Op	Msg_type	Msg_text

test.t1	analyze	status	Table is already up to date

test.t2	analyze	status	Table is already up to date

test.t3	analyze	status	Table is already up to date

prepare stmt from "repair table t1, t4, t3";

execute stmt;

Table	Op	Msg_type	Msg_text

test.t1	repair	status	OK

test.t4	repair	error	Table 'test.t4' doesn't exist

test.t3	repair	status	OK

Warnings:

Error	1146	Table 'test.t4' doesn't exist

execute stmt;

Table	Op	Msg_type	Msg_text

test.t1	repair	status	OK

test.t4	repair	error	Table 'test.t4' doesn't exist

test.t3	repair	status	OK

Warnings:

Error	1146	Table 'test.t4' doesn't exist

prepare stmt from "optimize table t1, t3, t4";

execute stmt;

Table	Op	Msg_type	Msg_text

test.t1	optimize	status	OK

test.t3	optimize	status	OK

test.t4	optimize	error	Table 'test.t4' doesn't exist

Warnings:

Error	1146	Table 'test.t4' doesn't exist

execute stmt;

Table	Op	Msg_type	Msg_text

test.t1	optimize	status	Table is already up to date

test.t3	optimize	status	Table is already up to date

test.t4	optimize	error	Table 'test.t4' doesn't exist

Warnings:

Error	1146	Table 'test.t4' doesn't exist

prepare stmt from "analyze table t4, t1";

execute stmt;

Table	Op	Msg_type	Msg_text

test.t4	analyze	error	Table 'test.t4' doesn't exist

test.t1	analyze	status	Table is already up to date

Warnings:

Error	1146	Table 'test.t4' doesn't exist

execute stmt;

Table	Op	Msg_type	Msg_text

test.t4	analyze	error	Table 'test.t4' doesn't exist

test.t1	analyze	status	Table is already up to date

Warnings:

Error	1146	Table 'test.t4' doesn't exist

deallocate prepare stmt;

mysql-test/r/ps_1general.result

+0 −3
Original line number Diff line number Diff line
@@ -410,13 +410,10 @@ ERROR HY000: This command is not supported in the prepared statement protocol ye 
prepare stmt1 from ' select * into outfile ''data.txt'' from t1 ';

execute stmt1 ;

prepare stmt1 from ' optimize table t1 ' ;

ERROR HY000: This command is not supported in the prepared statement protocol yet

prepare stmt1 from ' analyze table t1 ' ;

ERROR HY000: This command is not supported in the prepared statement protocol yet

prepare stmt1 from ' checksum table t1 ' ;

ERROR HY000: This command is not supported in the prepared statement protocol yet

prepare stmt1 from ' repair table t1 ' ;

ERROR HY000: This command is not supported in the prepared statement protocol yet

prepare stmt1 from ' restore table t1 from ''data.txt'' ' ;

ERROR HY000: This command is not supported in the prepared statement protocol yet

prepare stmt1 from ' handler t1 open ';