Commit 79d3149d authored by unknown's avatar unknown
Browse files

Merge hundin.mysql.fi:/home/heikki/mysql-4.1 

into hundin.mysql.fi:/home/heikki/mysql-5.0


innobase/dict/dict0dict.c:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/include/dict0dict.h:
  Auto merged
parents 45baf2b5 705d1631

innobase/dict/dict0dict.c

+11 −1
Original line number Diff line number Diff line
@@ -199,6 +199,16 @@ FILE* dict_foreign_err_file = NULL; 
mutex_t	dict_foreign_err_mutex; 	/* mutex protecting the foreign

					and unique error buffers */

	

/**********************************************************************

Makes all characters in a NUL-terminated UTF-8 string lower case. */



void

dict_casedn_str(

/*============*/

	char*	a)	/* in/out: string to put in lower case */

{

	innobase_casedn_str(a);

}



/************************************************************************

Checks if the database name in two table names is the same. */

innobase/fil/fil0fil.c

+9 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ Created 10/25/1995 Heikki Tuuri 
#include "srv0start.h"

#include "mtr0mtr.h"

#include "mtr0log.h"

#include "dict0dict.h"



	 

/*
@@ -2743,7 +2744,15 @@ fil_load_single_table_tablespace( 
	sprintf(filepath, "%s/%s/%s", fil_path_to_mysql_datadir, dbname,

								filename);

	srv_normalize_path_for_win(filepath);

#ifdef __WIN__

	/* If lower_case_table_names is 0 or 2, then MySQL allows database

	directory names with upper case letters. On Windows, all table and

	database names in InnoDB are internally always in lower case. Put the

	file path to lower case, so that we are consistent with InnoDB's

	internal data dictionary. */



	dict_casedn_str(filepath);

#endif

	file = os_file_create_simple_no_error_handling(filepath, OS_FILE_OPEN,

						OS_FILE_READ_ONLY, &success);

	if (!success) {

innobase/include/dict0dict.h

+7 −0
Original line number Diff line number Diff line
@@ -26,6 +26,13 @@ Created 1/8/1996 Heikki Tuuri 
#include "ut0byte.h"

#include "trx0types.h"



/**********************************************************************

Makes all characters in a NUL-terminated UTF-8 string lower case. */



void

dict_casedn_str(

/*============*/

	char*	a);	/* in/out: string to put in lower case */

/************************************************************************

Get the database name length in a table name. */