Commit 00845876 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/my/mysql-5.0


sql/mysqld.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
parents a24df602 7955fe52

client/mysqldump.c

+1 −0
Original line number Diff line number Diff line
@@ -1084,6 +1084,7 @@ static void print_xml_row(FILE *xml_file, const char *row_name, 
  check_io(xml_file);

}





/*

  getStructure -- retrievs database structure, prints out corresponding

  CREATE statement and fills out insert_pat.

heap/hp_create.c

+2 −1
Original line number Diff line number Diff line
@@ -168,6 +168,8 @@ int heap_create(const char *name, uint keys, HP_KEYDEF *keydef, 
	keyinfo->write_key= hp_write_key;

        keyinfo->hash_buckets= 0;

      }

      if ((keyinfo->flag & HA_AUTO_KEY) && create_info->with_auto_increment)

        share->auto_key= i + 1;

    }

    share->min_records= min_records;

    share->max_records= max_records;
@@ -178,7 +180,6 @@ int heap_create(const char *name, uint keys, HP_KEYDEF *keydef, 
    share->keys= keys;

    share->max_key_length= max_length;

    share->changed= 0;

    share->auto_key= create_info->auto_key;

    share->auto_key_type= create_info->auto_key_type;

    share->auto_increment= create_info->auto_increment;

    /* Must be allocated separately for rename to work */

include/heap.h

+1 −1
Original line number Diff line number Diff line
@@ -183,10 +183,10 @@ typedef struct st_heap_info 


typedef struct st_heap_create_info

{

  uint auto_key;

  uint auto_key_type;

  ulong max_table_size;

  ulonglong auto_increment;

  my_bool with_auto_increment;

} HP_CREATE_INFO;



	/* Prototypes for heap-functions */

include/my_global.h

+15 −0
Original line number Diff line number Diff line
@@ -120,6 +120,21 @@ 
#define __STDC_EXT__ 1          /* To get large file support on hpux */

#endif



/*

  Solaris include file <sys/feature_tests.h> refers to X/Open document



    System Interfaces and Headers, Issue 5



  saying we should define _XOPEN_SOURCE=500 to get POSIX.1c prototypes

  but apparently other systems (namely FreeBSD) don't agree.

  Furthermore X/Open has since 2004 "System Interfaces, Issue 6"

  that dictates _XOPEN_SOURCE=600, but Solaris checks for 500.

  So, let's define 500 for solaris only.

*/

#ifdef __sun

#define _XOPEN_SOURCE 500

#endif



#if defined(THREAD) && !defined(__WIN__) && !defined(OS2)

#ifndef _POSIX_PTHREAD_SEMANTICS

#define _POSIX_PTHREAD_SEMANTICS /* We want posix threads */

include/my_sys.h

+1 −1
Original line number Diff line number Diff line
@@ -812,7 +812,7 @@ my_bool my_gethwaddr(uchar *to); 
/* qnx ? */

#define my_getpagesize()        8192

#endif

#define my_munmap(a,b)          munmap((char*)(a),(b))

#define my_munmap(a,b)          munmap((a),(b))



#else

/* not a complete set of mmap() flags, but only those that nesessary */