database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch 10.2 into 10.3

Browse Source
This commit is contained in:
Julius Goryavsky
2021-12-23 14:14:04 +01:00
parent a5ef74e7eb 12087d6757
commit 3376668ca8
28 changed files with 385 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
client/mysql.cc
View File

@@ -99,8 +99,8 @@ extern "C" {
# endif
# endif
#define HAVE_READLINE
#define USE_POPEN
#endif
#define USE_POPEN
}
#ifdef HAVE_VIDATTR
@@ -4195,11 +4195,6 @@ com_nopager(String *buffer __attribute__((unused)),
}
#endif
/*
Sorry, you can't send the result to an editor in Win32
*/
#ifdef USE_POPEN
static int
com_edit(String *buffer,char *line __attribute__((unused)))
@@ -4220,7 +4215,7 @@ com_edit(String *buffer,char *line __attribute__((unused)))
if (!(editor = (char *)getenv("EDITOR")) &&
!(editor = (char *)getenv("VISUAL")))
editor = "vi";
editor = IF_WIN("notepad","vi");
strxmov(buff,editor," ",filename,NullS);
if ((error= system(buff)))
{
@@ -4235,7 +4230,7 @@ com_edit(String *buffer,char *line __attribute__((unused)))
if ((fd = my_open(filename,O_RDONLY, MYF(MY_WME))) < 0)
goto err;
(void) buffer->alloc((uint) stat_arg.st_size);
if ((tmp=read(fd,(char*) buffer->ptr(),buffer->alloced_length())) >= 0L)
if ((tmp=(int)my_read(fd,(uchar*) buffer->ptr(),buffer->alloced_length(),MYF(0))) >= 0)
buffer->length((uint) tmp);
else
buffer->length(0);