diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-07-21 16:39:19 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-21 16:39:19 +0200 |
| commit | b7b5f6f1ab49948b0e15b762266d4640b3d6b7fb (patch) | |
| tree | 7c302c2025184dbd053aa6135f0ff28c8ce6f359 /mysys/my_conio.c | |
| parent | 5f6380adde2dac3f32b40339b9b702c0135eb7d6 (diff) | |
| parent | c1d6a2d7e194225ccc19a68ea5d0f368632620d0 (diff) | |
| download | mariadb-git-b7b5f6f1ab49948b0e15b762266d4640b3d6b7fb.tar.gz | |
10.0-monty merge
includes:
* remove some remnants of "Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING"
* introduce LOCK_share, now LOCK_ha_data is strictly for engines
* rea_create_table() always creates .par file (even in "frm-only" mode)
* fix a 5.6 bug, temp file leak on dummy ALTER TABLE
Diffstat (limited to 'mysys/my_conio.c')
| -rw-r--r-- | mysys/my_conio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysys/my_conio.c b/mysys/my_conio.c index dc87b83f6b4..85ea99196a4 100644 --- a/mysys/my_conio.c +++ b/mysys/my_conio.c @@ -165,13 +165,13 @@ char* my_cgets(char *buffer, size_t clen, size_t* plen) though it is known it should not be more than 64K so we cut 64K and try first size of screen buffer if it is still to large we cut half of it and try again - later we may want to cycle from min(clen, 65535) to allowed size + later we may want to cycle from MY_MIN(clen, 65535) to allowed size with small decrement to determine exact allowed buffer */ - clen= min(clen, 65535); + clen= MY_MIN(clen, 65535); do { - clen= min(clen, (size_t) csbi.dwSize.X*csbi.dwSize.Y); + clen= MY_MIN(clen, (size_t) csbi.dwSize.X*csbi.dwSize.Y); if (!ReadConsole((HANDLE)my_coninpfh, (LPVOID)buffer, (DWORD) clen - 1, &plen_res, NULL)) { |