Commit 50486eeb authored by monty@donna.mysql.com's avatar monty@donna.mysql.com
Browse files

Fixes for MyISAM and packed keys + AIX

parent 13b3c328

Docs/manual.texi

+4 −0
Original line number Diff line number Diff line
@@ -36742,6 +36742,10 @@ though, so 3.23 is not released as a stable version yet. 
@appendixsubsec Changes in release 3.23.25

@itemize @bullet

@item

Fixed a bug in MyISAM with packed multi-part keys.

@item

Fixed crash when using @code{CHECK TABLE} on Windows.

@item

Fixed a bug where @code{FULLTEXT} index always used the koi8_ukr

character set.

@item

client/mysql.cc

+8 −11
Original line number Diff line number Diff line
@@ -254,13 +254,9 @@ int main(int argc,char *argv[]) 
  if (sql_connect(current_host,current_db,current_user,opt_password,

		  opt_silent))

  {

    if (connected)

      mysql_close(&mysql);

    glob_buffer.free();

    old_buffer.free();

    batch_readline_end(status.line_buff);

    my_end(0);

    exit(1);

    quick=1;					// Avoid history

    status.exit_status=1;

    mysql_end(-1);

  }

  if (!status.batch)

    ignore_errors=1;				// Don't abort monitor
@@ -324,6 +320,7 @@ sig_handler mysql_end(int sig) 
  batch_readline_end(status.line_buff);

  completion_hash_free(&ht);

#endif

  if (sig >= 0)

    put_info(sig ? "Aborted" : "Bye", INFO_RESULT);

  glob_buffer.free();

  old_buffer.free();
@@ -402,7 +399,7 @@ CHANGEABLE_VAR changeable_vars[] = { 


static void usage(int version)

{

  printf("%s  Ver 10.11 Distrib %s, for %s (%s)\n",

  printf("%s  Ver 10.12 Distrib %s, for %s (%s)\n",

	 my_progname, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE);

  if (version)

    return;
@@ -603,7 +600,7 @@ static int get_options(int argc, char **argv) 
      break;

    case 'W':

#ifdef __WIN__

      opt_mysql_unix_port=MYSQL_NAMEDPIPE;

      opt_mysql_unix_port=my_strdup(MYSQL_NAMEDPIPE,MYF(0));

#endif

      break;

    case 'V': usage(1); exit(0);
@@ -1013,7 +1010,7 @@ static void build_completion_hash(bool skip_rehash,bool write_info) 
  int i,j,num_fields;

  DBUG_ENTER("build_completion_hash");



  if (status.batch || quick)

  if (status.batch || quick || !current_db)

    DBUG_VOID_RETURN;			// We don't need completion in batches



  completion_hash_clean(&ht);

include/config-win.h

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ 
#define	SIGQUIT		SIGTERM		/* No SIGQUIT */



#undef _REENTRANT			/* Crashes something for win32 */

#undef SAFE_MUTEX			/* Can't be used on windows */



#define LONGLONG_MIN	((__int64) 0x8000000000000000)

#define LONGLONG_MAX	((__int64) 0x7FFFFFFFFFFFFFFF)

include/my_pthread.h

+4 −4
Original line number Diff line number Diff line
@@ -503,15 +503,15 @@ extern int pthread_dummy(int); 
struct st_my_thread_var

{

  int thr_errno;

  int cmp_length;

  volatile int abort;

  long id;

  pthread_cond_t suspend, *current_cond;

  pthread_mutex_t mutex,  *current_mutex;

  pthread_t pthread_self;

  long id;

  int cmp_length;

  volatile int abort;

#ifndef DBUG_OFF

  char name[THREAD_NAME_SIZE+1];

  gptr dbug;

  char name[THREAD_NAME_SIZE+1];

#endif

};

include/myisam.h

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ typedef struct st_mi_check_param 
  ulonglong max_data_file_length;

  ulonglong keys_in_use;

  my_off_t new_file_pos,key_file_blocks;

  my_off_t keydata,totaldata,key_blocks;

  my_off_t keydata,totaldata,key_blocks,start_check_pos;

  ha_checksum record_checksum,glob_crc;

  char temp_filename[FN_REFLEN],*isam_file_name,*tmpdir;

  int tmpfile_createflag;