Commit 145cb3ef authored by unknown's avatar unknown
Browse files

Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
parents e1293021 d8817c63

VC++Files/libmysqld/libmysqld.vcproj

+36 −0
Original line number Diff line number Diff line
@@ -2050,6 +2050,42 @@ 
					PreprocessorDefinitions="WIN32;_WINDOWS;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;MYSQL_SERVER;USE_TLS;__WIN__;LICENSE=Commercial;DBUG_OFF;_MBCS;NDEBUG;$(NoInherit)"/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="..\sql-common\my_user.c">

			<FileConfiguration

				Name="Debug|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="0"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;SAFEMALLOC;HAVE_BERKELEY_DB;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;HAVE_INNOBASE_DB;USE_TLS;__WIN__;$(NoInherit)"

					BasicRuntimeChecks="3"/>

			</FileConfiguration>

			<FileConfiguration

				Name="pro|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions="WIN32;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;EMBEDDED_LIBRARY;USE_TLS;__WIN__;MYSQL_SERVER;LICENSE=Commercial;_MBCS;HAVE_DLOPEN;HAVE_INNOBASE_DB;DBUG_OFF;NDEBUG;_WINDOWS;_CONSOLE;$(NoInherit)"/>

			</FileConfiguration>

			<FileConfiguration

				Name="Release|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;HAVE_INNOBASE_DB;DBUG_OFF;USE_TLS;__WIN__;$(NoInherit)"/>

			</FileConfiguration>

			<FileConfiguration

				Name="classic|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions="WIN32;_WINDOWS;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;USE_TLS;__WIN__;LICENSE=Commercial;DBUG_OFF;_MBCS;NDEBUG;$(NoInherit)"/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="..\sql\net_serv.cpp">

			<FileConfiguration

extra/perror.c

+15 −1
Original line number Diff line number Diff line
@@ -243,6 +243,20 @@ int main(int argc,char *argv[]) 
	}

	else

	  msg= ndb_string;

        if (msg)

        {

          if (verbose)

            printf("NDB error code %3d: %s\n",code,msg);

          else

            puts(msg);

        }

        else

        {

	  fprintf(stderr,"Illegal ndb error code: %d\n",code);

          error= 1;

        }

        found= 1;

        msg= 0;

      }

      else 

#endif

include/my_base.h

+4 −1
Original line number Diff line number Diff line
@@ -367,8 +367,11 @@ enum ha_base_keytype { 
                                          given value */

#define HA_ERR_RBR_LOGGING_FAILED 161  /* Row-based binlogging of row failed */

#define HA_ERR_DROP_INDEX_FK      162  /* Index needed in foreign key constr. */

#define HA_ERR_FOREIGN_DUPLICATE_KEY 163 /* Upholding foreign key constraints

                                            would lead to a duplicate key

                                            error in some other table. */



#define HA_ERR_LAST               162  /* Copy last error no */

#define HA_ERR_LAST               163  /* Copy last error no */



/* Add error numbers before HA_ERR_LAST and change it accordingly. */

#define HA_ERR_ERRORS            (HA_ERR_LAST - HA_ERR_FIRST + 1)

mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ connection con3; 
delete from t1;

delete from t2;

--disable_warnings

alter table t2 type=MyISAM;

alter table t2 engine=MyISAM;

--enable_warnings

insert into t1 values (1);

begin;

mysql-test/extra/rpl_tests/rpl_row_UUID.test

+2 −0
Original line number Diff line number Diff line
@@ -63,7 +63,9 @@ connection master; 
# Let's cleanup



DROP PROCEDURE test.p1;

DROP FUNCTION test.fn1;

DROP TABLE test.t1;

DROP TABLE test.t2;



# Let's compare. Note: If they match test will pass, if they do not match

# the test will show that the diff statement failed and not reject file