Commit 600336ef authored by unknown's avatar unknown
Browse files

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

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


client/mysql.cc:
  Auto merged
cmd-line-utils/readline/bind.c:
  Auto merged
cmd-line-utils/readline/histfile.c:
  Auto merged
extra/yassl/taocrypt/include/algebra.hpp:
  Auto merged
include/my_global.h:
  Auto merged
include/my_tree.h:
  Auto merged
mysys/my_thr_init.c:
  Auto merged
server-tools/instance-manager/guardian.cc:
  Auto merged
server-tools/instance-manager/portability.h:
  Auto merged
sql/field.cc:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sp_cache.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/heap/hp_clear.c:
  Auto merged
storage/heap/hp_write.c:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
storage/innobase/os/os0file.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
client/mysqldump.c:
  Manual merge
client/mysqltest.c:
  Manual merge
extra/replace.c:
  Manual merge
libmysql/libmysql.c:
  Manual merge
mysys/base64.c:
  Manual merge
sql/ha_ndbcluster.cc:
  Manual merge
sql/handler.cc:
  Manual merge
sql/item_strfunc.cc:
  Manual merge
sql/item_timefunc.cc:
  Manual merge
sql/log.cc:
  Manual merge
sql/opt_range.cc:
  Manual merge
sql/password.c:
  Manual merge
sql/sp.cc:
  Manual merge
sql/sql_base.cc:
  Manual merge
sql/sql_cache.cc:
  Manual merge
sql/sql_db.cc:
  Manual merge
sql/sql_rename.cc:
  Manual merge
sql/sql_select.cc:
  Manual merge
sql/sql_show.cc:
  Manual merge
sql/sql_trigger.cc:
  Manual merge
sql/sql_update.cc:
  Manual merge
sql/tztime.cc:
  Manual merge
storage/archive/ha_archive.cc:
  Manual merge
storage/federated/ha_federated.cc:
  Manual merge
storage/myisam/mi_create.c:
  Manual merge
storage/myisam/myisampack.c:
  Manual merge
storage/myisammrg/myrg_rkey.c:
  Manual merge
storage/ndb/src/mgmapi/mgmapi.cpp:
  Manual merge
storage/ndb/src/ndbapi/Ndb.cpp:
  Manual merge
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Manual merge
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Manual merge
storage/ndb/src/ndbapi/Ndblist.cpp:
  Manual merge
parents 9e5ec353 25226de9

client/mysqltest.c

+4 −3
Original line number Diff line number Diff line
@@ -3132,14 +3132,15 @@ void do_connect(struct st_command *command) 
    else if (!strncmp(con_options, "COMPRESS", 8))

      con_compress= 1;

    else

      die("Illegal option to connect: %.*s", (int) (end - con_options), con_options);

      die("Illegal option to connect: %.*s", 

          (int) (end - con_options), con_options);

    /* Process next option */

    con_options= end;

  }



  if (next_con == connections_end)

    die("Connection limit exhausted, you can have max %ld connections",

        (long) (sizeof(connections)/sizeof(struct st_connection)));

    die("Connection limit exhausted, you can have max %d connections",

        (int) (sizeof(connections)/sizeof(struct st_connection)));



  if (find_connection_by_name(ds_connection_name.str))

    die("Connection %s already exists", ds_connection_name.str);

cmd-line-utils/readline/bind.c

+1 −0
Original line number Diff line number Diff line
@@ -337,6 +337,7 @@ rl_generic_bind (type, keyseq, data, map) 
  KEYMAP_ENTRY k;



  k.function = 0;

  k.type= 0;



  /* If no keys to bind to, exit right away. */

  if (!keyseq || !*keyseq)

include/my_tree.h

+3 −2
Original line number Diff line number Diff line
@@ -51,7 +51,8 @@ typedef struct st_tree_element { 
typedef struct st_tree {

  TREE_ELEMENT *root,null_element;

  TREE_ELEMENT **parents[MAX_TREE_HEIGHT];

  uint offset_to_key,elements_in_tree,size_of_element,memory_limit,allocated;

  uint offset_to_key,elements_in_tree,size_of_element;

  ulong memory_limit, allocated;

  qsort_cmp2 compare;

  void *custom_arg;

  MEM_ROOT mem_root;
@@ -61,7 +62,7 @@ typedef struct st_tree { 
} TREE;



	/* Functions on whole tree */

void init_tree(TREE *tree, uint default_alloc_size, uint memory_limit,

void init_tree(TREE *tree, ulong default_alloc_size, ulong memory_limit,

               int size, qsort_cmp2 compare, my_bool with_delete,

	       tree_element_free free_element, void *custom_arg);

void delete_tree(TREE*);

libmysql/libmysql.c

+7 −2
Original line number Diff line number Diff line
@@ -175,8 +175,10 @@ void STDCALL mysql_server_end() 
#ifdef EMBEDDED_LIBRARY

  end_embedded_server();

#endif

  /* If library called my_init(), free memory allocated by it */

  finish_client_errs();

  vio_end();



  /* If library called my_init(), free memory allocated by it */

  if (!org_my_init_done)

  {

    my_end(MY_DONT_FREE_DBUG);
@@ -184,8 +186,11 @@ void STDCALL mysql_server_end() 
    DBUG_POP();

  }

  else

  {

    free_charsets();

    mysql_thread_end();

  vio_end();

  }



  mysql_client_init= org_my_init_done= 0;

#ifdef EMBEDDED_SERVER

  if (stderror_file)

mysys/tree.c

+2 −2
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ static void rb_delete_fixup(TREE *tree,TREE_ELEMENT ***parent); 
static int test_rb_tree(TREE_ELEMENT *element);

#endif



void init_tree(TREE *tree, uint default_alloc_size, uint memory_limit,

void init_tree(TREE *tree, ulong default_alloc_size, ulong memory_limit,

               int size, qsort_cmp2 compare, my_bool with_delete,

	       tree_element_free free_element, void *custom_arg)

{
@@ -128,7 +128,7 @@ void init_tree(TREE *tree, uint default_alloc_size, uint memory_limit, 
  }

  if (!(tree->with_delete=with_delete))

  {

    init_alloc_root(&tree->mem_root, default_alloc_size,0);

    init_alloc_root(&tree->mem_root, (uint) default_alloc_size, 0);

    tree->mem_root.min_malloc=(sizeof(TREE_ELEMENT)+tree->size_of_element);

  }

  DBUG_VOID_RETURN;