Commit 3960c84f authored by unknown's avatar unknown
Browse files

manually merged 

Gluh's SESSION/GLOBAL for @variables fix in sql_yacc.yy and
Bar's well_formed_len() changes in ndb code
did not make it and should be re-applied manually


BitKeeper/etc/logging_ok:
  auto-union
include/m_ctype.h:
  Auto merged
innobase/btr/btr0pcur.c:
  Auto merged
innobase/include/btr0pcur.h:
  Auto merged
innobase/include/os0file.h:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
mysql-test/r/user_var.result:
  Auto merged
mysql-test/t/user_var.test:
  Auto merged
ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
ndb/tools/desc.cpp:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-mb.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
strings/ctype-ujis.c:
  Auto merged
BitKeeper/deleted/.del-NdbResultSet.cpp~84d192cf3f42600d:
  ul
ndb/include/ndbapi/NdbScanOperation.hpp:
  ul
ndb/src/ndbapi/NdbIndexOperation.cpp:
  ul
ndb/src/ndbapi/NdbOperationDefine.cpp:
  ul
ndb/src/ndbapi/NdbOperationSearch.cpp:
  ul
ndb/src/ndbapi/NdbScanOperation.cpp:
  ul
sql/field.cc:
  manually merged, because bk messed it up
sql/sql_yacc.yy:
  merged
parents 6f23625d cde615c9

include/m_ctype.h

+6 −3
Original line number Diff line number Diff line
@@ -149,7 +149,8 @@ typedef struct my_charset_handler_st 
  uint    (*numchars)(struct charset_info_st *, const char *b, const char *e);

  uint    (*charpos)(struct charset_info_st *, const char *b, const char *e, uint pos);

  uint    (*well_formed_len)(struct charset_info_st *,

  			   const char *b,const char *e, uint nchars);

                             const char *b,const char *e,

                             uint nchars, int *error);

  uint    (*lengthsp)(struct charset_info_st *, const char *ptr, uint length);

  uint    (*numcells)(struct charset_info_st *, const char *b, const char *e);
@@ -349,7 +350,8 @@ int my_wildcmp_8bit(CHARSET_INFO *, 
uint my_numchars_8bit(CHARSET_INFO *, const char *b, const char *e);

uint my_numcells_8bit(CHARSET_INFO *, const char *b, const char *e);

uint my_charpos_8bit(CHARSET_INFO *, const char *b, const char *e, uint pos);

uint my_well_formed_len_8bit(CHARSET_INFO *, const char *b, const char *e, uint pos);

uint my_well_formed_len_8bit(CHARSET_INFO *, const char *b, const char *e,

                             uint pos, int *error);

int my_mbcharlen_8bit(CHARSET_INFO *, uint c);
@@ -367,7 +369,8 @@ int my_wildcmp_mb(CHARSET_INFO *, 
uint my_numchars_mb(CHARSET_INFO *, const char *b, const char *e);

uint my_numcells_mb(CHARSET_INFO *, const char *b, const char *e);

uint my_charpos_mb(CHARSET_INFO *, const char *b, const char *e, uint pos);

uint my_well_formed_len_mb(CHARSET_INFO *, const char *b, const char *e, uint pos);

uint my_well_formed_len_mb(CHARSET_INFO *, const char *b, const char *e,

                           uint pos, int *error);

uint my_instr_mb(struct charset_info_st *,

                 const char *b, uint b_length,

                 const char *s, uint s_length,

innobase/btr/btr0pcur.c

+9 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ Created 2/23/1996 Heikki Tuuri 


#include "ut0byte.h"

#include "rem0cmp.h"

#include "trx0trx.h"



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

Allocates memory for a persistent cursor object and initializes the cursor. */
@@ -206,7 +207,14 @@ btr_pcur_restore_position( 


	ut_a(cursor->pos_state == BTR_PCUR_WAS_POSITIONED

			|| cursor->pos_state == BTR_PCUR_IS_POSITIONED);

	ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED);

	if (cursor->old_stored != BTR_PCUR_OLD_STORED) {

		ut_print_buf(stderr, (const byte*)cursor, sizeof(btr_pcur_t));

		if (cursor->trx_if_known) {

			trx_print(stderr, cursor->trx_if_known);

		}

		

		ut_a(0);

	}



	if (cursor->rel_pos == BTR_PCUR_AFTER_LAST_IN_TREE

	    || cursor->rel_pos == BTR_PCUR_BEFORE_FIRST_IN_TREE) {

innobase/include/btr0pcur.h

+4 −0
Original line number Diff line number Diff line
@@ -478,6 +478,10 @@ struct btr_pcur_struct{ 
					BTR_PCUR_WAS_POSITIONED,

					BTR_PCUR_NOT_POSITIONED */

	ulint		search_mode;	/* PAGE_CUR_G, ... */

	trx_t*		trx_if_known;	/* the transaction, if we know it;

					otherwise this field is not defined;

					can ONLY BE USED in error prints in

					fatal assertion failures! */

	/*-----------------------------*/

	/* NOTE that the following fields may possess dynamically allocated

	memory which should be freed if not needed anymore! */

innobase/include/btr0pcur.ic

+10 −0
Original line number Diff line number Diff line
@@ -493,6 +493,8 @@ btr_pcur_open( 
	btr_cur_search_to_nth_level(index, 0, tuple, mode, latch_mode,

							btr_cursor, 0, mtr);

	cursor->pos_state = BTR_PCUR_IS_POSITIONED;



	cursor->trx_if_known = NULL;

}



/******************************************************************
@@ -535,6 +537,8 @@ btr_pcur_open_with_no_init( 
	cursor->pos_state = BTR_PCUR_IS_POSITIONED;



	cursor->old_stored = BTR_PCUR_OLD_NOT_STORED;



	cursor->trx_if_known = NULL;

}



/*********************************************************************
@@ -568,6 +572,8 @@ btr_pcur_open_at_index_side( 
	pcur->pos_state = BTR_PCUR_IS_POSITIONED;



	pcur->old_stored = BTR_PCUR_OLD_NOT_STORED;



	pcur->trx_if_known = NULL;

}



/**************************************************************************
@@ -592,6 +598,8 @@ btr_pcur_open_at_rnd_pos( 
					btr_pcur_get_btr_cur(cursor), mtr);

	cursor->pos_state = BTR_PCUR_IS_POSITIONED;

	cursor->old_stored = BTR_PCUR_OLD_NOT_STORED;



	cursor->trx_if_known = NULL;

}

	

/******************************************************************
@@ -617,4 +625,6 @@ btr_pcur_close( 
	

	cursor->latch_mode = BTR_NO_LATCHES;

	cursor->pos_state = BTR_PCUR_NOT_POSITIONED;



	cursor->trx_if_known = NULL;

}

innobase/include/os0file.h

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ log. */ 
#define OS_FILE_OVERWRITE		53

#define OS_FILE_OPEN_RAW		54

#define	OS_FILE_CREATE_PATH		55

#define	OS_FILE_OPEN_RETRY		56	/* for os_file_create() on

						the first ibdata file */



#define OS_FILE_READ_ONLY 		333

#define	OS_FILE_READ_WRITE		444