Commit 29ff97f8 authored by unknown's avatar unknown
Browse files

Bug#23735 mysqlbinlog client fails when reading binlog from stdin 

 - Windows opens stdin in text mode by default. Certain characters
   such as CTRL-Z are interpeted as events and the read() method
   will stop. CTRL-Z is the EOF marker in Windows. to get past this
   you have to open stdin in binary mode. Setmode() is used to set
   stdin in binary mode. Errors on setting this mode result in
   halting the function and printing an error message to stderr.


client/mysqlbinlog.cc:
  Apply fix to 5.0 as well
parent 8ba0259a

client/mysqlbinlog.cc

+19 −0
Original line number Diff line number Diff line
@@ -1310,6 +1310,25 @@ static int dump_local_log_entries(const char* logname) 
  }

  else // reading from stdin;

  {

    /*

      Bug fix: #23735

      Author: Chuck Bell

      Description:

        Windows opens stdin in text mode by default. Certain characters

        such as CTRL-Z are interpeted as events and the read() method

        will stop. CTRL-Z is the EOF marker in Windows. to get past this

        you have to open stdin in binary mode. Setmode() is used to set

        stdin in binary mode. Errors on setting this mode result in

        halting the function and printing an error message to stderr.

    */

#if defined (__WIN__) || (_WIN64)

    if (_setmode(fileno(stdin), O_BINARY) == -1)

    {

       fprintf(stderr, "Could not set binary mode on stdin.\n");

       return 1;

    }

#endif



    if (init_io_cache(file, fileno(stdin), 0, READ_CACHE, (my_off_t) 0,

		      0, MYF(MY_WME | MY_NABP | MY_DONT_CHECK_FILESIZE)))

      return 1;