mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01:00
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into sergbook.mylan:/usr/home/serg/Abk/mysql-4.1
This commit is contained in:
commit
94504d529b
4 changed files with 11 additions and 6 deletions
|
@ -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;
|
||||
|
|
|
@ -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))))
|
||||
break;
|
||||
{
|
||||
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 :
|
||||
" ") : "NULL"));
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue