1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00

Merge with 3.23.42

This commit is contained in:
monty@work.mysql.com
2001-09-13 09:52:35 +02:00
56 changed files with 832 additions and 482 deletions

View File

@@ -27,17 +27,12 @@
*
**/
#include <global.h>
#include <my_sys.h>
#include <m_string.h>
#include "client_priv.h"
#include <m_ctype.h>
#include "mysql.h"
#include "errmsg.h"
#include <my_dir.h>
#ifndef __GNU_LIBRARY__
#define __GNU_LIBRARY__ // Skip warnings in getopt.h
#endif
#include <getopt.h>
#include "my_readline.h"
#include <signal.h>
#include <violite.h>
@@ -405,10 +400,6 @@ sig_handler mysql_end(int sig)
exit(status.exit_status);
}
enum options {OPT_CHARSETS_DIR=256, OPT_DEFAULT_CHARSET,
OPT_PAGER, OPT_NOPAGER, OPT_TEE, OPT_NOTEE} ;
static struct option long_options[] =
{
{"i-am-a-dummy", optional_argument, 0, 'U'},