mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Merge with MYSQL 5.1.61
Fixed README with link to source Merged InnoDB change to XtraDB README: Added information of where to find MariaDB code storage/archive/ha_archive.cc: Removed memset() of rows, a MariaDB checksum's doesn't touch not used data.
This commit is contained in:
@ -45,11 +45,11 @@
|
||||
* seems to actually advertise this properly, despite Unicode 3.1 having
|
||||
* been around since 2001... */
|
||||
|
||||
/* XXXMYSQL : Added FreeBSD to bypass this check.
|
||||
TODO : Verify if FreeBSD stores ISO 10646 in wchar_t. */
|
||||
/* XXXMYSQL : Added FreeBSD & AIX to bypass this check.
|
||||
TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */
|
||||
#if !defined(__NetBSD__) && !defined(__sun) \
|
||||
&& !(defined(__APPLE__) && defined(__MACH__)) \
|
||||
&& !defined(__FreeBSD__)
|
||||
&& !defined(__FreeBSD__) && !defined(_AIX)
|
||||
#ifndef __STDC_ISO_10646__
|
||||
/* In many places it is assumed that the first 127 code points are ASCII
|
||||
* compatible, so ensure wchar_t indeed does ISO 10646 and not some other
|
||||
|
@ -200,7 +200,7 @@ el_set(EditLine *el, int op, ...)
|
||||
ret = -1;
|
||||
goto out;
|
||||
}
|
||||
// XXX: The two strdup's leak
|
||||
/* XXX: The two strdups leak. */
|
||||
ret = map_addfunc(el, Strdup(wargv[0]), Strdup(wargv[1]),
|
||||
func);
|
||||
ct_free_argv(wargv);
|
||||
|
@ -1978,7 +1978,7 @@ rl_callback_read_char()
|
||||
} else
|
||||
wbuf = NULL;
|
||||
(*(void (*)(const char *))rl_linefunc)(wbuf);
|
||||
//el_set(e, EL_UNBUFFERED, 1);
|
||||
/*el_set(e, EL_UNBUFFERED, 1);*/
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user