Commit e44823ff authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 

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


sql/ha_ndbcluster.cc:
  Auto merged
mysql-test/t/disabled.def:
  Manual merge
parents 2a655fcc 9535b127

VC++Files/libmysqld/libmysqld.dsp

+4 −0
Original line number Diff line number Diff line
@@ -364,6 +364,10 @@ SOURCE=..\sql-common\my_time.c 
# End Source File

# Begin Source File

 

SOURCE=..\sql-common\my_user.c

# End Source File

# Begin Source File



SOURCE=..\sql\net_serv.cpp

# End Source File

# Begin Source File

VC++Files/libmysqld/libmysqld_ia64.dsp

+4 −0
Original line number Diff line number Diff line
@@ -338,6 +338,10 @@ SOURCE="..\sql-common\my_time.c" 
# End Source File

# Begin Source File



SOURCE="..\sql-common\my_user.c"

# End Source File

# Begin Source File



SOURCE=..\sql\net_serv.cpp

# End Source File

# Begin Source File

client/mysqltest.c

+11 −8
Original line number Diff line number Diff line
@@ -688,10 +688,11 @@ static void die(const char *fmt, ...) 


/* Note that we will get some memory leaks when calling this! */



static void abort_not_supported_test()

static void abort_not_supported_test(const char *fname)

{

  DBUG_ENTER("abort_not_supported_test");

  fprintf(stderr, "This test is not supported by this installation\n");

  fprintf(stderr, "The test '%s' is not supported by this installation\n",

          fname);

  if (!silent)

    printf("skipped\n");

  free_used_memory();
@@ -814,7 +815,7 @@ static void check_result(DYNAMIC_STRING* ds, const char *fname, 
  DBUG_ENTER("check_result");



  if (res && require_option)

    abort_not_supported_test();

    abort_not_supported_test(fname);

  switch (res) {

  case RESULT_OK:

    break; /* ok */
@@ -1036,7 +1037,7 @@ int do_wait_for_slave_to_stop(struct st_query *q __attribute__((unused))) 
int do_require_manager(struct st_query *query __attribute__((unused)) )

{

  if (!manager)

    abort_not_supported_test();

    abort_not_supported_test("manager");

  return 0;

}
@@ -1305,7 +1306,9 @@ int var_query_set(VAR* var, const char *query, const char** query_end) 
    uint i;

    ulong *lengths;

    char *end;

#ifdef NOT_YET

    MYSQL_FIELD *fields= mysql_fetch_fields(res);

#endif



    init_dynamic_string(&result, "", 16384, 65536);

    lengths= mysql_fetch_lengths(res);
@@ -1920,7 +1923,7 @@ static void set_charset(struct st_query *q) 
  q->last_argument= p;

  charset_info= get_charset_by_csname(charset_name,MY_CS_PRIMARY,MYF(MY_WME));

  if (!charset_info)

    abort_not_supported_test();

    abort_not_supported_test(charset_name);

}



static uint get_errcodes(match_err *to,struct st_query *q)
@@ -1963,7 +1966,7 @@ static uint get_errcodes(match_err *to,struct st_query *q) 
          (as in ER_WRONG_VALUE vs. ER_WRONG_VALUE_COUNT).

        */

	if (!strncmp(start, e->name, (int) (p - start)) &&

            strlen(e->name) == (p - start))

            (uint) strlen(e->name) == (uint) (p - start))

	{

	  to[count].code.errnum= (uint) e->code;

	  to[count].type= ERR_ERRNO;
@@ -4329,7 +4332,7 @@ static void handle_error(const char *query, struct st_query *q, 
    if (err_errno == CR_SERVER_LOST ||

        err_errno == CR_SERVER_GONE_ERROR)

      die("require query '%s' failed: %d: %s", query, err_errno, err_error);

    abort_not_supported_test();

    abort_not_supported_test("failed_query");

  }



  if (q->abort_on_error)
@@ -5101,7 +5104,7 @@ static void init_var_hash(MYSQL *mysql) 
  DBUG_VOID_RETURN;

}



static void mark_progress(int line)

static void mark_progress(int line __attribute__((unused)))

{

#ifdef NOT_YET

  static FILE* fp = NULL;

configure.in

+96 −96
Original line number Diff line number Diff line
@@ -48,92 +48,9 @@ czech danish dutch english estonian french german greek hungarian \ 
italian japanese korean norwegian norwegian-ny polish portuguese \

romanian russian serbian slovak spanish swedish ukrainian"



#--------------------------------------------------------------------

# Declare our plugin modules

#--------------------------------------------------------------------



MYSQL_STORAGE_ENGINE(archive,,  [Archive Storage Engine],

        [Archive Storage Engine], [max,max-no-ndb])

MYSQL_PLUGIN_DIRECTORY(archive, [storage/archive])

MYSQL_PLUGIN_STATIC(archive,    [libarchive.a])

MYSQL_PLUGIN_DYNAMIC(archive,   [ha_archive.la])



MYSQL_STORAGE_ENGINE(berkeley,  berkeley-db, [BerkeleyDB Storage Engine],

        [Transactional Tables using BerkeleyDB], [max,max-no-ndb])

MYSQL_PLUGIN_DIRECTORY(berkeley,[storage/bdb])

MYSQL_PLUGIN_STATIC(berkeley,   [[\$(bdb_libs_with_path)]])

MYSQL_PLUGIN_ACTIONS(berkeley,  [MYSQL_SETUP_BERKELEY_DB])



MYSQL_STORAGE_ENGINE(blackhole,,[Blackhole Storage Engine],

        [Basic Write-only Read-never tables], [max,max-no-ndb])

MYSQL_PLUGIN_DIRECTORY(blackhole, [storage/blackhole])

MYSQL_PLUGIN_STATIC(blackhole,  [libblackhole.a])

MYSQL_PLUGIN_DYNAMIC(blackhole, [ha_blackhole.la])



MYSQL_STORAGE_ENGINE(csv,,      [CSV Storage Engine],

        [Stores tables in text CSV format])

MYSQL_PLUGIN_DIRECTORY(csv,     [storage/csv])

MYSQL_PLUGIN_STATIC(csv,        [libcsv.a])

MYSQL_PLUGIN_MANDATORY(csv)     dnl Used for logging



MYSQL_STORAGE_ENGINE(example,,  [Example Storage Engine],

        [Skeleton for Storage Engines for developers], [max,max-no-ndb])

MYSQL_PLUGIN_DIRECTORY(example, [storage/example])

MYSQL_PLUGIN_STATIC(example,    [libexample.a])

MYSQL_PLUGIN_DYNAMIC(example,   [ha_example.la])



MYSQL_STORAGE_ENGINE(federated,,[Federated Storage Engine],

        [Connects to tables on remote MySQL servers], [max,max-no-ndb])



MYSQL_PLUGIN(ftexample,         [Simple Parser],

        [Simple full-text parser plugin])

MYSQL_PLUGIN_DIRECTORY(ftexample, [plugin/fulltext])

MYSQL_PLUGIN_DYNAMIC(ftexample, [mypluglib.la])



MYSQL_STORAGE_ENGINE(heap,no,   [Memory Storage Engine],

        [Volatile memory based tables])

MYSQL_PLUGIN_DIRECTORY(heap,    [storage/heap])

MYSQL_PLUGIN_STATIC(heap,       [libheap.a])

MYSQL_PLUGIN_MANDATORY(heap)    dnl Memory tables



MYSQL_STORAGE_ENGINE(innobase,  innodb, [InnoDB Storage Engine],

        [Transactional Tables using InnoDB], [max,max-no-ndb])

MYSQL_PLUGIN_DIRECTORY(innobase, [storage/innobase])

MYSQL_PLUGIN_STATIC(innobase,   [libinnobase.a])

MYSQL_PLUGIN_ACTIONS(innobase,  [

  AC_CHECK_LIB(rt, aio_read, [innodb_system_libs="-lrt"])

  AC_SUBST(innodb_system_libs)

])



MYSQL_STORAGE_ENGINE(myisam,no, [MyISAM Storage Engine],

        [Traditional non-transactional MySQL tables])

MYSQL_PLUGIN_DIRECTORY(myisam,  [storage/myisam])

MYSQL_PLUGIN_STATIC(myisam,     [libmyisam.a])

MYSQL_PLUGIN_MANDATORY(myisam)  dnl Default



MYSQL_STORAGE_ENGINE(myisammrg,no,[MyISAM MERGE Engine],

        [Merge multiple MySQL tables into one])

MYSQL_PLUGIN_DIRECTORY(myisammrg,[storage/myisammrg])

MYSQL_PLUGIN_STATIC(myisammrg,  [libmyisammrg.a])

MYSQL_PLUGIN_MANDATORY(myisammrg)



MYSQL_STORAGE_ENGINE(ndbcluster, ndbcluster, [Cluster Storage Engine],

        [High Availability Clustered tables], [max])

MYSQL_PLUGIN_DIRECTORY(ndbcluster,[storage/ndb])

MYSQL_PLUGIN_STATIC(ndbcluster, [[\$(ndbcluster_libs) \$(ndbcluster_system_libs) \$(NDB_SCI_LIBS)]])

MYSQL_PLUGIN_ACTIONS(ndbcluster,[MYSQL_SETUP_NDBCLUSTER])



MYSQL_STORAGE_ENGINE(partition, partition, [Partition Support],

        [MySQL Partitioning Support], [max,max-no-ndb])



dnl -- ndbcluster requires partition to be enabled

MYSQL_PLUGIN_DEPENDS(ndbcluster, [partition])





#####

#####





AC_SUBST(MYSQL_NO_DASH_VERSION)

AC_SUBST(MYSQL_BASE_VERSION)

AC_SUBST(MYSQL_VERSION_ID)
@@ -762,16 +679,6 @@ MYSQL_SYS_LARGEFILE 
# Types that must be checked AFTER large file support is checked

AC_TYPE_SIZE_T



#--------------------------------------------------------------------

# Check for requested features

#--------------------------------------------------------------------



MYSQL_CHECK_BIG_TABLES

MYSQL_CHECK_MAX_INDEXES

MYSQL_CHECK_REPLICATION



MYSQL_CONFIGURE_PLUGINS([none])



#--------------------------------------------------------------------

# Check for system header files

#--------------------------------------------------------------------
@@ -2288,6 +2195,102 @@ then 
fi

AC_MSG_RESULT("$netinet_inc")



#--------------------------------------------------------------------

# Check for requested features

#--------------------------------------------------------------------



MYSQL_CHECK_BIG_TABLES

MYSQL_CHECK_MAX_INDEXES

MYSQL_CHECK_REPLICATION

MYSQL_CHECK_VIO

MYSQL_CHECK_OPENSSL

MYSQL_CHECK_YASSL



#--------------------------------------------------------------------

# Declare our plugin modules

# Has to be done late, as the plugin may need to check for existence of

# functions tested above

#--------------------------------------------------------------------



MYSQL_STORAGE_ENGINE(archive,,  [Archive Storage Engine],

        [Archive Storage Engine], [max,max-no-ndb])

MYSQL_PLUGIN_DIRECTORY(archive, [storage/archive])

MYSQL_PLUGIN_STATIC(archive,    [libarchive.a])

MYSQL_PLUGIN_DYNAMIC(archive,   [ha_archive.la])



MYSQL_STORAGE_ENGINE(berkeley,  berkeley-db, [BerkeleyDB Storage Engine],

        [Transactional Tables using BerkeleyDB], [max,max-no-ndb])

MYSQL_PLUGIN_DIRECTORY(berkeley,[storage/bdb])

MYSQL_PLUGIN_STATIC(berkeley,   [[\$(bdb_libs_with_path)]])

MYSQL_PLUGIN_ACTIONS(berkeley,  [MYSQL_SETUP_BERKELEY_DB])



MYSQL_STORAGE_ENGINE(blackhole,,[Blackhole Storage Engine],

        [Basic Write-only Read-never tables], [max,max-no-ndb])

MYSQL_PLUGIN_DIRECTORY(blackhole, [storage/blackhole])

MYSQL_PLUGIN_STATIC(blackhole,  [libblackhole.a])

MYSQL_PLUGIN_DYNAMIC(blackhole, [ha_blackhole.la])



MYSQL_STORAGE_ENGINE(csv,,      [CSV Storage Engine],

        [Stores tables in text CSV format])

MYSQL_PLUGIN_DIRECTORY(csv,     [storage/csv])

MYSQL_PLUGIN_STATIC(csv,        [libcsv.a])

MYSQL_PLUGIN_MANDATORY(csv)     dnl Used for logging



MYSQL_STORAGE_ENGINE(example,,  [Example Storage Engine],

        [Skeleton for Storage Engines for developers], [max,max-no-ndb])

MYSQL_PLUGIN_DIRECTORY(example, [storage/example])

MYSQL_PLUGIN_STATIC(example,    [libexample.a])

MYSQL_PLUGIN_DYNAMIC(example,   [ha_example.la])



MYSQL_STORAGE_ENGINE(federated,,[Federated Storage Engine],

        [Connects to tables on remote MySQL servers], [max,max-no-ndb])



MYSQL_PLUGIN(ftexample,         [Simple Parser],

        [Simple full-text parser plugin])

MYSQL_PLUGIN_DIRECTORY(ftexample, [plugin/fulltext])

MYSQL_PLUGIN_DYNAMIC(ftexample, [mypluglib.la])



MYSQL_STORAGE_ENGINE(heap,no,   [Memory Storage Engine],

        [Volatile memory based tables])

MYSQL_PLUGIN_DIRECTORY(heap,    [storage/heap])

MYSQL_PLUGIN_STATIC(heap,       [libheap.a])

MYSQL_PLUGIN_MANDATORY(heap)    dnl Memory tables



MYSQL_STORAGE_ENGINE(innobase,  innodb, [InnoDB Storage Engine],

        [Transactional Tables using InnoDB], [max,max-no-ndb])

MYSQL_PLUGIN_DIRECTORY(innobase, [storage/innobase])

MYSQL_PLUGIN_STATIC(innobase,   [libinnobase.a])

MYSQL_PLUGIN_ACTIONS(innobase,  [

  AC_CHECK_LIB(rt, aio_read, [innodb_system_libs="-lrt"])

  AC_SUBST(innodb_system_libs)

])



MYSQL_STORAGE_ENGINE(myisam,no, [MyISAM Storage Engine],

        [Traditional non-transactional MySQL tables])

MYSQL_PLUGIN_DIRECTORY(myisam,  [storage/myisam])

MYSQL_PLUGIN_STATIC(myisam,     [libmyisam.a])

MYSQL_PLUGIN_MANDATORY(myisam)  dnl Default



MYSQL_STORAGE_ENGINE(myisammrg,no,[MyISAM MERGE Engine],

        [Merge multiple MySQL tables into one])

MYSQL_PLUGIN_DIRECTORY(myisammrg,[storage/myisammrg])

MYSQL_PLUGIN_STATIC(myisammrg,  [libmyisammrg.a])

MYSQL_PLUGIN_MANDATORY(myisammrg)



MYSQL_STORAGE_ENGINE(ndbcluster, ndbcluster, [Cluster Storage Engine],

        [High Availability Clustered tables], [max])

MYSQL_PLUGIN_DIRECTORY(ndbcluster,[storage/ndb])

MYSQL_PLUGIN_STATIC(ndbcluster, [[\$(ndbcluster_libs) \$(ndbcluster_system_libs) \$(NDB_SCI_LIBS)]])

MYSQL_PLUGIN_ACTIONS(ndbcluster,[MYSQL_SETUP_NDBCLUSTER])



MYSQL_STORAGE_ENGINE(partition, partition, [Partition Support],

        [MySQL Partitioning Support], [max,max-no-ndb])



dnl -- ndbcluster requires partition to be enabled

MYSQL_PLUGIN_DEPENDS(ndbcluster, [partition])



MYSQL_CONFIGURE_PLUGINS([none])



# Only build client code?

AC_ARG_WITH(server,

    [  --without-server        Only build the client.],
@@ -2353,9 +2356,6 @@ fi 
AC_SUBST(tools_dirs)



#MYSQL_CHECK_CPU

MYSQL_CHECK_VIO

MYSQL_CHECK_OPENSSL

MYSQL_CHECK_YASSL



libmysqld_dirs=

linked_libmysqld_targets=

include/my_base.h

+1 −0
Original line number Diff line number Diff line
@@ -231,6 +231,7 @@ enum ha_base_keytype { 
#define HA_VAR_LENGTH_KEY	 8

#define HA_NULL_PART_KEY	 64

#define HA_USES_PARSER           16384  /* Fulltext index uses [pre]parser */

#define HA_USES_BLOCK_SIZE	 ((uint) 32768)

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

/*

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