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

Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1

Browse Source 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
This commit is contained in:
jani@a193-229-222-105.elisa-laajakaista.fi
2005-08-26 15:56:52 +03:00
parent 78a0585cea 6b4baf48a5
commit 7b7188cea6
25 changed files with 103 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/mysqlbinlog.cc
View File

@ -636,6 +636,11 @@ end:
static struct my_option my_long_options[] =
{
#ifdef __NETWARE__
{"auto-close", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
#endif
/*
mysqlbinlog needs charsets knowledge, to be able to convert a charset
number found in binlog to a charset name (to be able to print things
@ -830,6 +835,11 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
{
bool tty_password=0;
switch (optid) {
#ifdef __NETWARE__
case OPT_AUTO_CLOSE:
setscreenmode(SCR_AUTOCLOSE_ON_EXIT);
break;
#endif
#ifndef DBUG_OFF
case '#':
DBUG_PUSH(argument ? argument : default_dbug_option);