1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.

Also merge charset patch.
This commit is contained in:
unknown
2009-11-30 22:37:27 +01:00
570 changed files with 21041 additions and 5483 deletions

View File

@ -7,11 +7,6 @@
# include <config.h>
#endif
/* to get wcwidth() defined */
#define _XOPEN_SOURCE 600
#define _XOPEN_SOURCE_EXTENDED
#define _XOPEN_
/*
Ultrix botches type-ahead when switching from canonical to
non-canonical mode, at least through version 4.3

View File

@ -824,7 +824,7 @@ rl_redisplay ()
cpos_buffer_position = out;
lb_linenum = newlines;
}
for (i = in; (size_t) i < in+wc_bytes; i++)
for (i = in; i < in+(int)wc_bytes; i++)
line[out++] = rl_line_buffer[i];
for (i = 0; i < wc_width; i++)
CHECK_LPOS();