1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge with 4.1 to get fix for memory leak

Browse Source
This commit is contained in:
monty@mysql.com 2005-05-16 20:21:38 +03:00
commit 3b3d00c4a2
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client/mysql.cc
View File

@ -2094,7 +2094,8 @@ print_table_data(MYSQL_RES *result)
separator.fill(separator.length()+length+2,'-'); separator.fill(separator.length()+length+2,'-');
separator.append('+'); separator.append('+');
} }
tee_puts(separator.c_ptr_safe(), PAGER); separator.append('\0'); // End marker for \0
tee_puts((char*) separator.ptr(), PAGER);
if (column_names) if (column_names)
{ {
mysql_field_seek(result,0); mysql_field_seek(result,0);
@ -2107,7 +2108,7 @@ print_table_data(MYSQL_RES *result)
num_flag[off]= IS_NUM(field->type); num_flag[off]= IS_NUM(field->type);
} }
(void) tee_fputs("\n", PAGER); (void) tee_fputs("\n", PAGER);
tee_puts(separator.c_ptr(), PAGER); tee_puts((char*) separator.ptr(), PAGER);
} }
while ((cur= mysql_fetch_row(result))) while ((cur= mysql_fetch_row(result)))
@ -2136,7 +2137,7 @@ print_table_data(MYSQL_RES *result)
} }
(void) tee_fputs("\n", PAGER); (void) tee_fputs("\n", PAGER);
} }
tee_puts(separator.c_ptr(), PAGER); tee_puts((char*) separator.ptr(), PAGER);
my_afree((gptr) num_flag); my_afree((gptr) num_flag);
} }

2
cmd-line-utils/libedit/readline/readline.h
View File

@ -73,7 +73,7 @@ typedef KEYMAP_ENTRY *Keymap;
#ifndef CTRL #ifndef CTRL
#include <sys/ioctl.h> #include <sys/ioctl.h>
#ifdef __GLIBC__ #if defined(__GLIBC__) || defined(__MWERKS__)
#include <sys/ttydefaults.h> #include <sys/ttydefaults.h>
#endif #endif
#ifndef CTRL #ifndef CTRL

10
sql/item.h
View File

@ -1394,12 +1394,14 @@ public:
void print(String *str); void print(String *str);
}; };
/* /*
The following class is used to optimize comparing of date and bigint columns The following class is used to optimize comparing of date and bigint columns
We need to save the original item, to be able to set the field to the We need to save the original item ('ref') to be able to call
original value in 'opt_range'. ref->save_in_field(). This is used to create index search keys.
An instance of Item_int_with_ref may refer to a signed or an unsigned
integer. An instance of Item_int_with_ref may have signed or unsigned integer value.
*/ */
class Item_int_with_ref :public Item_int class Item_int_with_ref :public Item_int

4
sql/sql_base.cc
View File

@ -3306,8 +3306,8 @@ bool get_key_map_from_key_list(key_map *map, TABLE *table,
name->length(), 1)) <= name->length(), 1)) <=
0) 0)
{ {
my_error(ER_KEY_COLUMN_DOES_NOT_EXITS, MYF(0), my_error(ER_KEY_COLUMN_DOES_NOT_EXITS, MYF(0), name->c_ptr(),
name->c_ptr_safe(), table->s->table_name); table->real_name);
map->set_all(); map->set_all();
return 1; return 1;
} }