Merge mariadb 5.3->mariadb 5.5

This commit is contained in:
unknown
2012-03-24 18:21:22 +01:00
42 changed files with 893 additions and 382 deletions

View File

@ -140,7 +140,7 @@ int my_addr_resolve(void *ptr, my_addr_loc *loc)
char output[1024];
size_t len;
len= my_safe_snprintf(input, sizeof(input), "0x%p\n", ptr);
len= snprintf(input, sizeof(input), "0x%p\n", ptr);
if (write(in[1], input, len) <= 0)
return 1;
if (read(out[0], output, sizeof(output)) <= 0)