Commit f83cd87c authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0 

into serg.mylan:/usr/home/serg/Abk/mysql-5.0
parents 039a01a1 846d6be7

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ ndbdev@ndbmaster.mysql.com 
ndbdev@shark.

nick@mysql.com

nick@nick.leippe.com

obarnir@mysql.com

papa@gbichot.local

patg@krsna.

patg@krsna.patg.net

innobase/os/os0file.c

+9 −9
Original line number Diff line number Diff line
@@ -605,7 +605,7 @@ os_file_opendir( 


	lpFindFileData = ut_malloc(sizeof(WIN32_FIND_DATA));



	dir = FindFirstFile(path, lpFindFileData);

	dir = FindFirstFile((LPCTSTR) path, lpFindFileData);



	ut_free(lpFindFileData);
@@ -686,15 +686,15 @@ os_file_readdir_next_file( 
	ret = FindNextFile(dir, lpFindFileData);



	if (ret) {

	        ut_a(strlen(lpFindFileData->cFileName) < OS_FILE_MAX_PATH);

	        ut_a(strlen((char *) lpFindFileData->cFileName) < OS_FILE_MAX_PATH);



		if (strcmp(lpFindFileData->cFileName, ".") == 0

		    || strcmp(lpFindFileData->cFileName, "..") == 0) {

		if (strcmp((char *) lpFindFileData->cFileName, ".") == 0

		    || strcmp((char *) lpFindFileData->cFileName, "..") == 0) {



		        goto next_file;

		}



		strcpy(info->name, lpFindFileData->cFileName);

		strcpy(info->name, (char *) lpFindFileData->cFileName);



		info->size = (ib_longlong)(lpFindFileData->nFileSizeLow)

		     + (((ib_longlong)(lpFindFileData->nFileSizeHigh)) << 32);
@@ -830,7 +830,7 @@ os_file_create_directory( 
#ifdef __WIN__

	BOOL	rcode;

    

	rcode = CreateDirectory(pathname, NULL);

	rcode = CreateDirectory((LPCTSTR) pathname, NULL);

	if (!(rcode != 0 ||

	   (GetLastError() == ERROR_ALREADY_EXISTS && !fail_if_exists))) {

		/* failure */
@@ -914,7 +914,7 @@ os_file_create_simple( 
		ut_error;

	}



	file = CreateFile(name,

	file = CreateFile((LPCTSTR) name,

			access,

			FILE_SHARE_READ | FILE_SHARE_WRITE,

					/* file can be read ansd written also
@@ -1053,7 +1053,7 @@ os_file_create_simple_no_error_handling( 
		ut_error;

	}



	file = CreateFile(name,

	file = CreateFile((LPCTSTR) name,

			access,

			share_mode,

			NULL,	/* default security attributes */
@@ -1200,7 +1200,7 @@ os_file_create( 
		ut_error;

	}



	file = CreateFile(name,

	file = CreateFile((LPCTSTR) name,

			GENERIC_READ | GENERIC_WRITE, /* read and write

							access */

			share_mode,     /* File can be read also by other

innobase/os/os0sync.c

+3 −3
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ os_event_create( 
	event->handle = CreateEvent(NULL,/* No security attributes */

			TRUE,		/* Manual reset */

			FALSE,		/* Initial state nonsignaled */

			name);

			(LPCTSTR) name);

	if (!event->handle) {

	        fprintf(stderr,

"InnoDB: Could not create a Windows event semaphore; Windows error %lu\n",
@@ -177,7 +177,7 @@ os_event_create_auto( 
	event->handle = CreateEvent(NULL,/* No security attributes */

			FALSE,		/* Auto-reset */

			FALSE,		/* Initial state nonsignaled */

			name);

			(LPCTSTR) name);



	if (!event->handle) {

	        fprintf(stderr,
@@ -440,7 +440,7 @@ os_mutex_create( 


	mutex = CreateMutex(NULL,	/* No security attributes */

			FALSE,		/* Initial state: no owner */

			name);

			(LPCTSTR) name);

	ut_a(mutex);

#else

	os_fast_mutex_t*	mutex;

mysql-test/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -35,7 +35,8 @@ testdir = $(benchdir_root)/mysql-test 
EXTRA_SCRIPTS = 	mysql-test-run.sh mysql-test-run.pl install_test_db.sh valgrind.supp

EXTRA_DIST = 		$(EXTRA_SCRIPTS) 

test_SCRIPTS = 		mysql-test-run install_test_db 

test_DATA = std_data/client-key.pem std_data/client-cert.pem std_data/cacert.pem

test_DATA = std_data/client-key.pem std_data/client-cert.pem std_data/cacert.pem \

	std_data/server-cert.pem std_data/server-key.pem 

CLEANFILES = 		$(test_SCRIPTS) $(test_DATA)



INCLUDES =		-I$(srcdir)/../include -I../include -I..

mysql-test/include/show_msg.inc

0 → 100755
+19 −0
Original line number Diff line number Diff line 
#### include/show_msg.inc

#

# This file writes the value set in @message into the

# a protocol file as part of executing a test sequence

#

# Usage:

#    Add the following to any *.test file:

#      :

#    set @message="This is a message example";

#    --source include/show_msg.inc

#      :

#



--disable_query_log

SET @utf8_message = CONVERT(@message using utf8);

select @utf8_message as ""

union

select repeat(CONVERT('-' using utf8),char_length(@utf8_message));

--enable_query_log