Commit 167ce823 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/home/my/mysql-4.1
parents b00b2126 21d5136d

innobase/dict/dict0dict.c

+11 −1
Original line number Diff line number Diff line
@@ -197,6 +197,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"



	 

/*
@@ -2732,7 +2733,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. */

ndb/include/kernel/signaldata/BackupImpl.hpp

+7 −5
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ class DefineBackupRef { 


  friend bool printDEFINE_BACKUP_REF(FILE *, const Uint32 *, Uint32, Uint16);

public:

  STATIC_CONST( SignalLength = 3 );

  STATIC_CONST( SignalLength = 4 );

  

  enum ErrorCode {

    Undefined = 1340,
@@ -92,6 +92,7 @@ private: 
  Uint32 backupId;

  Uint32 backupPtr;

  Uint32 errorCode;

  Uint32 nodeId;

};



class DefineBackupConf {
@@ -158,7 +159,7 @@ class StartBackupRef { 


  friend bool printSTART_BACKUP_REF(FILE *, const Uint32 *, Uint32, Uint16);

public:

  STATIC_CONST( SignalLength = 4 );

  STATIC_CONST( SignalLength = 5 );



  enum ErrorCode {

    FailedToAllocateTriggerRecord = 1
@@ -168,6 +169,7 @@ private: 
  Uint32 backupPtr;

  Uint32 signalNo;

  Uint32 errorCode;

  Uint32 nodeId;

};



class StartBackupConf {
@@ -232,9 +234,8 @@ public: 
private:

  Uint32 backupId;

  Uint32 backupPtr;

  Uint32 tableId;

  Uint32 fragmentNo;

  Uint32 errorCode;

  Uint32 nodeId;

};



class BackupFragmentConf {
@@ -296,12 +297,13 @@ class StopBackupRef { 


  friend bool printSTOP_BACKUP_REF(FILE *, const Uint32 *, Uint32, Uint16);

public:

  STATIC_CONST( SignalLength = 3 );

  STATIC_CONST( SignalLength = 4 );



private:

  Uint32 backupId;

  Uint32 backupPtr;

  Uint32 errorCode;

  Uint32 nodeId;

};



class StopBackupConf {

ndb/include/kernel/signaldata/BackupSignalData.hpp

+3 −0
Original line number Diff line number Diff line
@@ -240,6 +240,9 @@ public: 
    FileOrScanError = 1325, //                       slave -> coordinator

    BackupFailureDueToNodeFail = 1326, //             slave -> slave

    OkToClean = 1327                  //             master -> slave

    

    ,AbortScan = 1328

    ,IncompatibleVersions = 1329

  };

private:

  Uint32 requestType;