Commit 94504d52 authored by unknown's avatar unknown
Browse files

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

into sergbook.mylan:/usr/home/serg/Abk/mysql-4.1
parents c86ae204 4c8d52aa

client/completion_hash.cc

+2 −1
Original line number Diff line number Diff line
@@ -79,7 +79,8 @@ int completion_hash_update(HashTable *ht, char *arKey, uint nKeyLength, 
      if (!memcmp(p->arKey, arKey, nKeyLength)) {

	entry *n;



	n = (entry *) alloc_root(&ht->mem_root,sizeof(entry));

	if (!(n = (entry *) alloc_root(&ht->mem_root,sizeof(entry))))

          return FAILURE;

	n->pNext = p->pData;

	n->str = str;

	p->pData = n;

client/mysql.cc

+6 −3
Original line number Diff line number Diff line
@@ -1502,7 +1502,10 @@ You can turn off this feature to get a quicker startup with -A\n\n"); 
      if (!(field_names[i] = (char **) alloc_root(&hash_mem_root,

						  sizeof(char *) *

						  (num_fields*2+1))))

      {

        mysql_free_result(fields);

        break;

      }

      field_names[i][num_fields*2]= '\0';

      j=0;

      while ((sql_field=mysql_fetch_field(fields)))
@@ -2077,10 +2080,10 @@ print_table_data_html(MYSQL_RES *result) 
  }

  while ((cur = mysql_fetch_row(result)))

  {

    ulong *lengths=mysql_fetch_lengths(result);

    (void) tee_fputs("<TR>", PAGER);

    for (uint i=0; i < mysql_num_fields(result); i++)

    {

      ulong *lengths=mysql_fetch_lengths(result);

      (void) tee_fputs("<TD>", PAGER);

      safe_put_field(cur[i],lengths[i]);

      (void) tee_fputs("</TD>", PAGER);
@@ -2106,10 +2109,10 @@ print_table_data_xml(MYSQL_RES *result) 
  fields = mysql_fetch_fields(result);

  while ((cur = mysql_fetch_row(result)))

  {

    ulong *lengths=mysql_fetch_lengths(result);

    (void) tee_fputs("\n  <row>\n", PAGER);

    for (uint i=0; i < mysql_num_fields(result); i++)

    {

      ulong *lengths=mysql_fetch_lengths(result);

      tee_fprintf(PAGER, "\t<%s>", (fields[i].name ?

				  (fields[i].name[0] ? fields[i].name :

				   " &nbsp; ") : "NULL"));

cmd-line-utils/libedit/parse.c

+2 −1
Original line number Diff line number Diff line
@@ -87,7 +87,8 @@ parse_line(EditLine *el, const char *line) 
	int argc;

	Tokenizer *tok;



	tok = tok_init(NULL);

	if (!(tok = tok_init(NULL)))

          return -1;

	tok_line(tok, line, &argc, &argv);

	argc = el_parse(el, argc, argv);

	tok_end(tok);

pstack/pstack.c

+1 −1
Original line number Diff line number Diff line
@@ -1663,7 +1663,7 @@ pr_tag_type (p, name, id, kind) 
{

  struct pr_handle *info = (struct pr_handle *) p;

  const char *t, *tag;

  char idbuf[20];

  char idbuf[30];



  switch (kind)

    {