Commit 5d10a445 authored by unknown's avatar unknown
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb


mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
parents 16d6c0b2 69c72002

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) 
AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

# remember to also change ndb version below and update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 5.0.27)

AM_INIT_AUTOMAKE(mysql, 5.0.29)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10
@@ -19,7 +19,7 @@ SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0 
# ndb version

NDB_VERSION_MAJOR=5

NDB_VERSION_MINOR=0

NDB_VERSION_BUILD=27

NDB_VERSION_BUILD=29

NDB_VERSION_STATUS=""



# Set all version vars based on $VERSION. How do we do this more elegant ?

include/m_ctype.h

+4 −0
Original line number Diff line number Diff line
@@ -112,6 +112,8 @@ enum my_lex_states 


struct charset_info_st;





/* See strings/CHARSET_INFO.txt for information about this structure  */

typedef struct my_collation_handler_st

{

  my_bool (*init)(struct charset_info_st *, void *(*alloc)(uint));
@@ -154,6 +156,7 @@ extern MY_COLLATION_HANDLER my_collation_8bit_simple_ci_handler; 
extern MY_COLLATION_HANDLER my_collation_ucs2_uca_handler;





/* See strings/CHARSET_INFO.txt about information on this structure  */

typedef struct my_charset_handler_st

{

  my_bool (*init)(struct charset_info_st *, void *(*alloc)(uint));
@@ -216,6 +219,7 @@ extern MY_CHARSET_HANDLER my_charset_8bit_handler; 
extern MY_CHARSET_HANDLER my_charset_ucs2_handler;





/* See strings/CHARSET_INFO.txt about information on this structure  */

typedef struct charset_info_st

{

  uint      number;

include/my_base.h

+6 −1
Original line number Diff line number Diff line
@@ -224,12 +224,17 @@ enum ha_base_keytype { 
/* poor old NISAM has 8-bit flags :-( */

#define HA_SORT_ALLOWS_SAME	 128	/* Intern bit when sorting records */

#endif

#if MYSQL_VERSION_ID < 0x50200

/*

  Key has a part that can have end space.  If this is an unique key

  we have to handle it differently from other unique keys as we can find

  many matching rows for one key (because end space are not compared)

*/

#define HA_END_SPACE_KEY	4096

#define HA_END_SPACE_KEY      0 /* was: 4096 */

#else

#error HA_END_SPACE_KEY is obsolete, please remove it

#endif





	/* These flags can be added to key-seg-flag */

include/my_sys.h

+14 −8
Original line number Diff line number Diff line
@@ -351,12 +351,18 @@ typedef int (*IO_CACHE_CALLBACK)(struct st_io_cache*); 
#ifdef THREAD

typedef struct st_io_cache_share

{

  /* to sync on reads into buffer */

  pthread_mutex_t mutex;

  pthread_cond_t  cond;

  int             count, total;

  /* actual IO_CACHE that filled the buffer */

  struct st_io_cache *active;

  pthread_mutex_t       mutex;           /* To sync on reads into buffer. */

  pthread_cond_t        cond;            /* To wait for signals. */

  pthread_cond_t        cond_writer;     /* For a synchronized writer. */

  /* Offset in file corresponding to the first byte of buffer. */

  my_off_t              pos_in_file;

  /* If a synchronized write cache is the source of the data. */

  struct st_io_cache    *source_cache;

  byte                  *buffer;         /* The read buffer. */

  byte                  *read_end;       /* Behind last valid byte of buffer. */

  int                   running_threads; /* threads not in lock. */

  int                   total_threads;   /* threads sharing the cache. */

  int                   error;           /* Last error. */

#ifdef NOT_YET_IMPLEMENTED

  /* whether the structure should be free'd */

  my_bool alloced;
@@ -720,8 +726,8 @@ extern void setup_io_cache(IO_CACHE* info); 
extern int _my_b_read(IO_CACHE *info,byte *Buffer,uint Count);

#ifdef THREAD

extern int _my_b_read_r(IO_CACHE *info,byte *Buffer,uint Count);

extern void init_io_cache_share(IO_CACHE *info,

				IO_CACHE_SHARE *s, uint num_threads);

extern void init_io_cache_share(IO_CACHE *read_cache, IO_CACHE_SHARE *cshare,

                                IO_CACHE *write_cache, uint num_threads);

extern void remove_io_thread(IO_CACHE *info);

#endif

extern int _my_b_seq_read(IO_CACHE *info,byte *Buffer,uint Count);

include/myisam.h

+1 −1
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ typedef struct st_mi_check_param 
  uint testflag, key_cache_block_size;

  uint8 language;

  my_bool using_global_keycache, opt_lock_memory, opt_follow_links;

  my_bool retry_repair, force_sort, calc_checksum;

  my_bool retry_repair, force_sort;

  char temp_filename[FN_REFLEN],*isam_file_name;

  MY_TMPDIR *tmpdir;

  int tmpfile_createflag;