Skip to content

M
MariaDB
Commit 6356f563 authored by unknown's avatar unknown
Browse files
Options

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 

into  linux-th5m.site:/home/my/mysql-5.1-marvel


include/keycache.h:
  Auto merged
include/my_sys.h:
  Auto merged
mysys/my_static.c:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
storage/blackhole/ha_blackhole.cc:
  Auto merged
storage/blackhole/ha_blackhole.h:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_preload.c:
  Auto merged
mysys/mf_keycache.c:
  Manual merge from main 5.1
parents 7932fb54 6e849907
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 8604 additions and 8321 deletions
.bzrignore
View file @ 6356f563
......@@ -489,6 +489,8 @@ dbug/main.r
dbug/output*.r
dbug/user.ps
dbug/user.t
debian/control
debian/defs.mk
depcomp
emacs.h
examples/*.ds?
......@@ -1071,6 +1073,7 @@ libmysqld/ha_myisam.cc
libmysqld/ha_myisammrg.cc
libmysqld/ha_ndbcluster.cc
libmysqld/ha_ndbcluster_binlog.cc
libmysqld/ha_ndbcluster_cond.cc
libmysqld/ha_partition.cc
libmysqld/ha_tina.cc
libmysqld/handler.cc
......@@ -2989,4 +2992,3 @@ win/vs71cache.txt
win/vs8cache.txt
zlib/*.ds?
zlib/*.vcproj
libmysqld/ha_ndbcluster_cond.cc
client/completion_hash.cc
View file @ 6356f563
......@@ -213,7 +213,7 @@ void completion_hash_clean(HashTable *ht)
void completion_hash_free(HashTable *ht)
{
completion_hash_clean(ht);
my_free((gptr) ht->arBuckets,MYF(0));
my_free(ht->arBuckets, MYF(0));
}
......
client/my_readline.h
View file @ 6356f563
......@@ -28,6 +28,6 @@ typedef struct st_line_buffer
} LINE_BUFFER;
extern LINE_BUFFER *batch_readline_init(ulong max_size,FILE *file);
extern LINE_BUFFER *batch_readline_command(LINE_BUFFER *buffer, my_string str);
extern LINE_BUFFER *batch_readline_command(LINE_BUFFER *buffer, char * str);
extern char *batch_readline(LINE_BUFFER *buffer);
extern void batch_readline_end(LINE_BUFFER *buffer);
client/mysql.cc
View file @ 6356f563
This diff is collapsed.
client/mysql_upgrade.c
View file @ 6356f563
......@@ -63,8 +63,8 @@ static struct my_option my_long_options[]=
{"debug", '#', "This is a non-debug version. Catch this and exit",
0, 0, 0, GET_DISABLED, OPT_ARG, 0, 0, 0, 0, 0, 0},
#else
{"debug", '#', "Output debug log", (gptr *) & default_dbug_option,
(gptr *) & default_dbug_option, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
{"debug", '#', "Output debug log", (uchar* *) & default_dbug_option,
(uchar* *) & default_dbug_option, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
#endif
{"default-character-set", OPT_DEFAULT_CHARSET,
"Set the default character set.", 0,
......@@ -73,16 +73,16 @@ static struct my_option my_long_options[]=
"Directory where character sets are.", 0,
0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"compress", OPT_COMPRESS, "Use compression in server/client protocol.",
(gptr*)&not_used, (gptr*)&not_used, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
(uchar**)&not_used, (uchar**)&not_used, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"force", 'f', "Force execution of mysqlcheck even if mysql_upgrade "
"has already been executed for the current version of MySQL.",
(gptr*)&opt_force, (gptr*)&opt_force, 0,
(uchar**)&opt_force, (uchar**)&opt_force, 0,
GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"host",'h', "Connect to host.", 0,
0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"password", 'p',
"Password to use when connecting to server. If password is not given"
" it's solicited on the tty.", (gptr*) &opt_password,(gptr*) &opt_password,
" it's solicited on the tty.", (uchar**) &opt_password,(uchar**) &opt_password,
0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
#ifdef __WIN__
{"pipe", 'W', "Use named pipes to connect to server.", 0, 0, 0,
......@@ -100,11 +100,11 @@ static struct my_option my_long_options[]=
#endif
{"socket", 'S', "Socket file to use for connection.",
0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"user", 'u', "User for login if not current user.", (gptr*) &opt_user,
(gptr*) &opt_user, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"user", 'u', "User for login if not current user.", (uchar**) &opt_user,
(uchar**) &opt_user, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
#include <sslopt-longopts.h>
{"verbose", 'v', "Display more output about the process",
(gptr*) &opt_verbose, (gptr*) &opt_verbose, 0,
(uchar**) &opt_verbose, (uchar**) &opt_verbose, 0,
GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
{0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
};
......@@ -387,13 +387,14 @@ static void find_tool(char *tool_path, const char *tool_name)
}
do
{
size_t path_len;
DBUG_PRINT("enter", ("path: %s", path));
/* Chop off last char(since it might be a /) */
path[max((strlen(path)-1), 0)]= 0;
/* Chop off last dir part */
dirname_part(path, path);
dirname_part(path, path, &path_len);
/* Format name of the tool to search for */
fn_format(tool_path, tool_name,
......
client/mysqladmin.cc
View file @ 6356f563
......@@ -44,7 +44,7 @@ static my_bool option_force=0,interrupted=0,new_line=0,
static uint tcp_port = 0, option_wait = 0, option_silent=0, nr_iterations,
opt_count_iterations= 0;
static ulong opt_connect_timeout, opt_shutdown_timeout;
static my_string unix_port=0;
static char * unix_port=0;
#ifdef LATER_HAVE_NDBCLUSTER_DB
static my_bool opt_ndbcluster=0;
static char *opt_ndb_connectstring=0;
......@@ -132,31 +132,31 @@ static struct my_option my_long_options[] =
#endif
{"count", 'c',
"Number of iterations to make. This works with -i (--sleep) only.",
(gptr*) &nr_iterations, (gptr*) &nr_iterations, 0, GET_UINT,
(uchar**) &nr_iterations, (uchar**) &nr_iterations, 0, GET_UINT,
REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"debug", '#', "Output debug log. Often this is 'd:t:o,filename'.",
0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
{"debug-info", OPT_DEBUG_INFO, "Print some debug info at exit.", (gptr*) &info_flag,
(gptr*) &info_flag, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"debug-info", OPT_DEBUG_INFO, "Print some debug info at exit.", (uchar**) &info_flag,
(uchar**) &info_flag, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"force", 'f',
"Don't ask for confirmation on drop database; with multiple commands, continue even if an error occurs.",
(gptr*) &option_force, (gptr*) &option_force, 0, GET_BOOL, NO_ARG, 0, 0,
(uchar**) &option_force, (uchar**) &option_force, 0, GET_BOOL, NO_ARG, 0, 0,
0, 0, 0, 0},
{"compress", 'C', "Use compression in server/client protocol.",
(gptr*) &opt_compress, (gptr*) &opt_compress, 0, GET_BOOL, NO_ARG, 0, 0, 0,
(uchar**) &opt_compress, (uchar**) &opt_compress, 0, GET_BOOL, NO_ARG, 0, 0, 0,
0, 0, 0},
{"character-sets-dir", OPT_CHARSETS_DIR,
"Directory where character sets are.", (gptr*) &charsets_dir,
(gptr*) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
"Directory where character sets are.", (uchar**) &charsets_dir,
(uchar**) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"default-character-set", OPT_DEFAULT_CHARSET,
"Set the default character set.", (gptr*) &default_charset,
(gptr*) &default_charset, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
"Set the default character set.", (uchar**) &default_charset,
(uchar**) &default_charset, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"help", '?', "Display this help and exit.", 0, 0, 0, GET_NO_ARG,
NO_ARG, 0, 0, 0, 0, 0, 0},
{"host", 'h', "Connect to host.", (gptr*) &host, (gptr*) &host, 0, GET_STR,
{"host", 'h', "Connect to host.", (uchar**) &host, (uchar**) &host, 0, GET_STR,
REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"no-beep", 'b', "Turn off beep on error.", (gptr*) &opt_nobeep,
(gptr*) &opt_nobeep, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"no-beep", 'b', "Turn off beep on error.", (uchar**) &opt_nobeep,
(uchar**) &opt_nobeep, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"password", 'p',
"Password to use when connecting to server. If password is not given it's asked from the tty.",
0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
......@@ -164,58 +164,58 @@ static struct my_option my_long_options[] =
{"pipe", 'W', "Use named pipes to connect to server.", 0, 0, 0, GET_NO_ARG,
NO_ARG, 0, 0, 0, 0, 0, 0},
#endif
{"port", 'P', "Port number to use for connection.", (gptr*) &tcp_port,
(gptr*) &tcp_port, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"port", 'P', "Port number to use for connection.", (uchar**) &tcp_port,
(uchar**) &tcp_port, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"protocol", OPT_MYSQL_PROTOCOL, "The protocol of connection (tcp,socket,pipe,memory).",
0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"relative", 'r',
"Show difference between current and previous values when used with -i. Currently works only with extended-status.",
(gptr*) &opt_relative, (gptr*) &opt_relative, 0, GET_BOOL, NO_ARG, 0, 0, 0,
(uchar**) &opt_relative, (uchar**) &opt_relative, 0, GET_BOOL, NO_ARG, 0, 0, 0,
0, 0, 0},
{"set-variable", 'O',
"Change the value of a variable. Please note that this option is deprecated; you can set variables directly with --variable-name=value.",
0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
#ifdef HAVE_SMEM
{"shared-memory-base-name", OPT_SHARED_MEMORY_BASE_NAME,
"Base name of shared memory.", (gptr*) &shared_memory_base_name, (gptr*) &shared_memory_base_name,
"Base name of shared memory.", (uchar**) &shared_memory_base_name, (uchar**) &shared_memory_base_name,
0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
#endif
{"silent", 's', "Silently exit if one can't connect to server.",
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
{"socket", 'S', "Socket file to use for connection.",
(gptr*) &unix_port, (gptr*) &unix_port, 0, GET_STR, REQUIRED_ARG, 0, 0, 0,
(uchar**) &unix_port, (uchar**) &unix_port, 0, GET_STR, REQUIRED_ARG, 0, 0, 0,
0, 0, 0},
{"sleep", 'i', "Execute commands again and again with a sleep between.",
(gptr*) &interval, (gptr*) &interval, 0, GET_INT, REQUIRED_ARG, 0, 0, 0, 0,
(uchar**) &interval, (uchar**) &interval, 0, GET_INT, REQUIRED_ARG, 0, 0, 0, 0,
0, 0},
#include <sslopt-longopts.h>
#ifndef DONT_ALLOW_USER_CHANGE
{"user", 'u', "User for login if not current user.", (gptr*) &user,
(gptr*) &user, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"user", 'u', "User for login if not current user.", (uchar**) &user,
(uchar**) &user, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
#endif
{"verbose", 'v', "Write more information.", (gptr*) &opt_verbose,
(gptr*) &opt_verbose, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"verbose", 'v', "Write more information.", (uchar**) &opt_verbose,
(uchar**) &opt_verbose, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"version", 'V', "Output version information and exit.", 0, 0, 0, GET_NO_ARG,
NO_ARG, 0, 0, 0, 0, 0, 0},
{"vertical", 'E',
"Print output vertically. Is similar to --relative, but prints output vertically.",
(gptr*) &opt_vertical, (gptr*) &opt_vertical, 0, GET_BOOL, NO_ARG, 0, 0, 0,
(uchar**) &opt_vertical, (uchar**) &opt_vertical, 0, GET_BOOL, NO_ARG, 0, 0, 0,
0, 0, 0},
{"wait", 'w', "Wait and retry if connection is down.", 0, 0, 0, GET_UINT,
OPT_ARG, 0, 0, 0, 0, 0, 0},
{"connect_timeout", OPT_CONNECT_TIMEOUT, "", (gptr*) &opt_connect_timeout,
(gptr*) &opt_connect_timeout, 0, GET_ULONG, REQUIRED_ARG, 3600*12, 0,
{"connect_timeout", OPT_CONNECT_TIMEOUT, "", (uchar**) &opt_connect_timeout,
(uchar**) &opt_connect_timeout, 0, GET_ULONG, REQUIRED_ARG, 3600*12, 0,
3600*12, 0, 1, 0},
{"shutdown_timeout", OPT_SHUTDOWN_TIMEOUT, "", (gptr*) &opt_shutdown_timeout,
(gptr*) &opt_shutdown_timeout, 0, GET_ULONG, REQUIRED_ARG,
{"shutdown_timeout", OPT_SHUTDOWN_TIMEOUT, "", (uchar**) &opt_shutdown_timeout,
(uchar**) &opt_shutdown_timeout, 0, GET_ULONG, REQUIRED_ARG,
SHUTDOWN_DEF_TIMEOUT, 0, 3600*12, 0, 1, 0},
#ifdef LATER_HAVE_NDBCLUSTER_DB
{"ndbcluster", OPT_NDBCLUSTER, ""
"", (gptr*) &opt_ndbcluster,
(gptr*) &opt_ndbcluster, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
"", (uchar**) &opt_ndbcluster,
(uchar**) &opt_ndbcluster, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"ndb-connectstring", OPT_NDB_CONNECTSTRING, ""
"", (gptr*) &opt_ndb_connectstring,
(gptr*) &opt_ndb_connectstring, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
"", (uchar**) &opt_ndb_connectstring,
(uchar**) &opt_ndb_connectstring, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
#endif
{ 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
};
......
client/mysqlbinlog.cc
View file @ 6356f563
This diff is collapsed.
client/mysqlcheck.c
View file @ 6356f563
......@@ -37,7 +37,7 @@ static my_bool opt_alldbs = 0, opt_check_only_changed = 0, opt_extended = 0,
opt_fix_table_names= 0, opt_fix_db_names= 0, opt_upgrade= 0,
opt_write_binlog= 1;
static uint verbose = 0, opt_mysql_port=0;
static my_string opt_mysql_unix_port = 0;
static char * opt_mysql_unix_port = 0;
static char *opt_password = 0, *current_user = 0,
*default_charset = (char *)MYSQL_DEFAULT_CHARSET_NAME,
*current_host = 0;
......@@ -55,13 +55,13 @@ static struct my_option my_long_options[] =
{
{"all-databases", 'A',
"Check all the databases. This will be same as --databases with all databases selected.",
(gptr*) &opt_alldbs, (gptr*) &opt_alldbs, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0,
(uchar**) &opt_alldbs, (uchar**) &opt_alldbs, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0,
0, 0},
{"analyze", 'a', "Analyze given tables.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0,
0, 0, 0, 0},
{"all-in-1", '1',
"Instead of issuing one query for each table, use one query per database, naming all tables in the database in a comma-separated list.",
(gptr*) &opt_all_in_1, (gptr*) &opt_all_in_1, 0, GET_BOOL, NO_ARG, 0, 0, 0,
(uchar**) &opt_all_in_1, (uchar**) &opt_all_in_1, 0, GET_BOOL, NO_ARG, 0, 0, 0,
0, 0, 0},
#ifdef __NETWARE__
{"autoclose", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",
......@@ -69,11 +69,11 @@ static struct my_option my_long_options[] =
#endif
{"auto-repair", OPT_AUTO_REPAIR,
"If a checked table is corrupted, automatically fix it. Repairing will be done after all tables have been checked, if corrupted ones were found.",
(gptr*) &opt_auto_repair, (gptr*) &opt_auto_repair, 0, GET_BOOL, NO_ARG, 0,
(uchar**) &opt_auto_repair, (uchar**) &opt_auto_repair, 0, GET_BOOL, NO_ARG, 0,
0, 0, 0, 0, 0},
{"character-sets-dir", OPT_CHARSETS_DIR,
"Directory where character sets are.", (gptr*) &charsets_dir,
(gptr*) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
"Directory where character sets are.", (uchar**) &charsets_dir,
(uchar**) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"check", 'c', "Check table for errors.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0,
0, 0, 0, 0},
{"check-only-changed", 'C',
......@@ -83,11 +83,11 @@ static struct my_option my_long_options[] =
"Check tables for version-dependent changes. May be used with --auto-repair to correct tables requiring version-dependent updates.",
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
{"compress", OPT_COMPRESS, "Use compression in server/client protocol.",
(gptr*) &opt_compress, (gptr*) &opt_compress, 0, GET_BOOL, NO_ARG, 0, 0, 0,
(uchar**) &opt_compress, (uchar**) &opt_compress, 0, GET_BOOL, NO_ARG, 0, 0, 0,
0, 0, 0},
{"databases", 'B',
"To check several databases. Note the difference in usage; In this case no tables are given. All name arguments are regarded as databasenames.",
(gptr*) &opt_databases, (gptr*) &opt_databases, 0, GET_BOOL, NO_ARG,
(uchar**) &opt_databases, (uchar**) &opt_databases, 0, GET_BOOL, NO_ARG,
0, 0, 0, 0, 0, 0},
#ifdef DBUG_OFF
{"debug", '#', "This is a non-debug version. Catch this and exit.",
......@@ -96,37 +96,37 @@ static struct my_option my_long_options[] =
{"debug", '#', "Output debug log. Often this is 'd:t:o,filename'.",
0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
#endif
{"debug-info", OPT_DEBUG_INFO, "Print some debug info at exit.", (gptr*) &info_flag,
(gptr*) &info_flag, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"debug-info", OPT_DEBUG_INFO, "Print some debug info at exit.", (uchar**) &info_flag,
(uchar**) &info_flag, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"default-character-set", OPT_DEFAULT_CHARSET,
"Set the default character set.", (gptr*) &default_charset,
(gptr*) &default_charset, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
"Set the default character set.", (uchar**) &default_charset,
(uchar**) &default_charset, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"fast",'F', "Check only tables that haven't been closed properly.",
(gptr*) &opt_fast, (gptr*) &opt_fast, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0,
(uchar**) &opt_fast, (uchar**) &opt_fast, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0,
0},
{"fix-db-names", OPT_FIX_DB_NAMES, "Fix database names.",
(gptr*) &opt_fix_db_names, (gptr*) &opt_fix_db_names,
(uchar**) &opt_fix_db_names, (uchar**) &opt_fix_db_names,
0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"fix-table-names", OPT_FIX_TABLE_NAMES, "Fix table names.",
(gptr*) &opt_fix_table_names, (gptr*) &opt_fix_table_names,
(uchar**) &opt_fix_table_names, (uchar**) &opt_fix_table_names,
0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"force", 'f', "Continue even if we get an sql-error.",
(gptr*) &ignore_errors, (gptr*) &ignore_errors, 0, GET_BOOL, NO_ARG, 0, 0,
(uchar**) &ignore_errors, (uchar**) &ignore_errors, 0, GET_BOOL, NO_ARG, 0, 0,
0, 0, 0, 0},
{"extended", 'e',
"If you are using this option with CHECK TABLE, it will ensure that the table is 100 percent consistent, but will take a long time. If you are using this option with REPAIR TABLE, it will force using old slow repair with keycache method, instead of much faster repair by sorting.",
(gptr*) &opt_extended, (gptr*) &opt_extended, 0, GET_BOOL, NO_ARG, 0, 0, 0,
(uchar**) &opt_extended, (uchar**) &opt_extended, 0, GET_BOOL, NO_ARG, 0, 0, 0,
0, 0, 0},
{"help", '?', "Display this help message and exit.", 0, 0, 0, GET_NO_ARG,
NO_ARG, 0, 0, 0, 0, 0, 0},
{"host",'h', "Connect to host.", (gptr*) &current_host,
(gptr*) &current_host, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"host",'h', "Connect to host.", (uchar**) &current_host,
(uchar**) &current_host, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"medium-check", 'm',
"Faster than extended-check, but only finds 99.99 percent of all errors. Should be good enough for most cases.",
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
{"write-binlog", OPT_WRITE_BINLOG,
"Log ANALYZE, OPTIMIZE and REPAIR TABLE commands. Enabled by default; use --skip-write-binlog when commands should not be sent to replication slaves.",
(gptr*) &opt_write_binlog, (gptr*) &opt_write_binlog, 0, GET_BOOL, NO_ARG,
(uchar**) &opt_write_binlog, (uchar**) &opt_write_binlog, 0, GET_BOOL, NO_ARG,
1, 0, 0, 0, 0, 0},
{"optimize", 'o', "Optimize table.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0,
0, 0},
......@@ -137,38 +137,38 @@ static struct my_option my_long_options[] =
{"pipe", 'W', "Use named pipes to connect to server.", 0, 0, 0, GET_NO_ARG,
NO_ARG, 0, 0, 0, 0, 0, 0},
#endif
{"port", 'P', "Port number to use for connection.", (gptr*) &opt_mysql_port,
(gptr*) &opt_mysql_port, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0,
{"port", 'P', "Port number to use for connection.", (uchar**) &opt_mysql_port,
(uchar**) &opt_mysql_port, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0,
0},
{"protocol", OPT_MYSQL_PROTOCOL, "The protocol of connection (tcp,socket,pipe,memory).",
0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"quick", 'q',
"If you are using this option with CHECK TABLE, it prevents the check from scanning the rows to check for wrong links. This is the fastest check. If you are using this option with REPAIR TABLE, it will try to repair only the index tree. This is the fastest repair method for a table.",
(gptr*) &opt_quick, (gptr*) &opt_quick, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0,
(uchar**) &opt_quick, (uchar**) &opt_quick, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0,
0},
{"repair", 'r',
"Can fix almost anything except unique keys that aren't unique.",
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
#ifdef HAVE_SMEM
{"shared-memory-base-name", OPT_SHARED_MEMORY_BASE_NAME,
"Base name of shared memory.", (gptr*) &shared_memory_base_name, (gptr*) &shared_memory_base_name,
"Base name of shared memory.", (uchar**) &shared_memory_base_name, (uchar**) &shared_memory_base_name,
0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
#endif
{"silent", 's', "Print only error messages.", (gptr*) &opt_silent,
(gptr*) &opt_silent, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"silent", 's', "Print only error messages.", (uchar**) &opt_silent,
(uchar**) &opt_silent, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"socket", 'S', "Socket file to use for connection.",
(gptr*) &opt_mysql_unix_port, (gptr*) &opt_mysql_unix_port, 0, GET_STR,
(uchar**) &opt_mysql_unix_port, (uchar**) &opt_mysql_unix_port, 0, GET_STR,
REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
#include <sslopt-longopts.h>
{"tables", OPT_TABLES, "Overrides option --databases (-B).", 0, 0, 0,
GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
{"use-frm", OPT_FRM,
"When used with REPAIR, get table structure from .frm file, so the table can be repaired even if .MYI header is corrupted.",
(gptr*) &opt_frm, (gptr*) &opt_frm, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0,
(uchar**) &opt_frm, (uchar**) &opt_frm, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0,
0},
#ifndef DONT_ALLOW_USER_CHANGE
{"user", 'u', "User for login if not current user.", (gptr*) &current_user,
(gptr*) &current_user, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"user", 'u', "User for login if not current user.", (uchar**) &current_user,
(uchar**) &current_user, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
#endif
{"verbose", 'v', "Print info about the various stages.", 0, 0, 0, GET_NO_ARG,
NO_ARG, 0, 0, 0, 0, 0, 0},
......
client/mysqldump.c
View file @ 6356f563
This diff is collapsed.
client/mysqlimport.c
View file @ 6356f563
......@@ -57,7 +57,7 @@ static char *opt_password=0, *current_user=0,
*escaped=0, *opt_columns=0,
*default_charset= (char*) MYSQL_DEFAULT_CHARSET_NAME;
static uint opt_mysql_port= 0, opt_protocol= 0;
static my_string opt_mysql_unix_port=0;
static char * opt_mysql_unix_port=0;
static longlong opt_ignore_lines= -1;
static CHARSET_INFO *charset_info= &my_charset_latin1;
#include <sslopt-vars.h>
......@@ -73,59 +73,59 @@ static struct my_option my_long_options[] =
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
#endif
{"character-sets-dir", OPT_CHARSETS_DIR,
"Directory where character sets are.", (gptr*) &charsets_dir,
(gptr*) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
"Directory where character sets are.", (uchar**) &charsets_dir,
(uchar**) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"default-character-set", OPT_DEFAULT_CHARSET,
"Set the default character set.", (gptr*) &default_charset,
(gptr*) &default_charset, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
"Set the default character set.", (uchar**) &default_charset,
(uchar**) &default_charset, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"columns", 'c',
"Use only these columns to import the data to. Give the column names in a comma separated list. This is same as giving columns to LOAD DATA INFILE.",
(gptr*) &opt_columns, (gptr*) &opt_columns, 0, GET_STR, REQUIRED_ARG, 0, 0, 0,
(uchar**) &opt_columns, (uchar**) &opt_columns, 0, GET_STR, REQUIRED_ARG, 0, 0, 0,
0, 0, 0},
{"compress", 'C', "Use compression in server/client protocol.",
(gptr*) &opt_compress, (gptr*) &opt_compress, 0, GET_BOOL, NO_ARG, 0, 0, 0,
(uchar**) &opt_compress, (uchar**) &opt_compress, 0, GET_BOOL, NO_ARG, 0, 0, 0,
0, 0, 0},
{"debug",'#', "Output debug log. Often this is 'd:t:o,filename'.", 0, 0, 0,
GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
{"debug-info", OPT_DEBUG_INFO, "Print some debug info at exit.", (gptr*) &info_flag,
(gptr*) &info_flag, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"delete", 'd', "First delete all rows from table.", (gptr*) &opt_delete,
(gptr*) &opt_delete, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"debug-info", OPT_DEBUG_INFO, "Print some debug info at exit.", (uchar**) &info_flag,
(uchar**) &info_flag, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"delete", 'd', "First delete all rows from table.", (uchar**) &opt_delete,
(uchar**) &opt_delete, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"fields-terminated-by", OPT_FTB,
"Fields in the textfile are terminated by ...", (gptr*) &fields_terminated,
(gptr*) &fields_terminated, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
"Fields in the textfile are terminated by ...", (uchar**) &fields_terminated,
(uchar**) &fields_terminated, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"fields-enclosed-by", OPT_ENC,
"Fields in the importfile are enclosed by ...", (gptr*) &enclosed,
(gptr*) &enclosed, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
"Fields in the importfile are enclosed by ...", (uchar**) &enclosed,
(uchar**) &enclosed, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"fields-optionally-enclosed-by", OPT_O_ENC,
"Fields in the i.file are opt. enclosed by ...", (gptr*) &opt_enclosed,
(gptr*) &opt_enclosed, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
"Fields in the i.file are opt. enclosed by ...", (uchar**) &opt_enclosed,
(uchar**) &opt_enclosed, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"fields-escaped-by", OPT_ESC, "Fields in the i.file are escaped by ...",
(gptr*) &escaped, (gptr*) &escaped, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0,
(uchar**) &escaped, (uchar**) &escaped, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0,
0, 0},
{"force", 'f', "Continue even if we get an sql-error.",
(gptr*) &ignore_errors, (gptr*) &ignore_errors, 0, GET_BOOL, NO_ARG, 0, 0,
(uchar**) &ignore_errors, (uchar**) &ignore_errors, 0, GET_BOOL, NO_ARG, 0, 0,
0, 0, 0, 0},
{"help", '?', "Displays this help and exits.", 0, 0, 0, GET_NO_ARG, NO_ARG,
0, 0, 0, 0, 0, 0},
{"host", 'h', "Connect to host.", (gptr*) &current_host,
(gptr*) &current_host, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"host", 'h', "Connect to host.", (uchar**) &current_host,
(uchar**) &current_host, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"ignore", 'i', "If duplicate unique key was found, keep old row.",
(gptr*) &ignore, (gptr*) &ignore, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
(uchar**) &ignore, (uchar**) &ignore, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"ignore-lines", OPT_IGN_LINES, "Ignore first n lines of data infile.",
(gptr*) &opt_ignore_lines, (gptr*) &opt_ignore_lines, 0, GET_LL,
(uchar**) &opt_ignore_lines, (uchar**) &opt_ignore_lines, 0, GET_LL,
REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"lines-terminated-by", OPT_LTB, "Lines in the i.file are terminated by ...",
(gptr*) &lines_terminated, (gptr*) &lines_terminated, 0, GET_STR,
(uchar**) &lines_terminated, (uchar**) &lines_terminated, 0, GET_STR,
REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"local", 'L', "Read all files through the client.", (gptr*) &opt_local_file,
(gptr*) &opt_local_file, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"local", 'L', "Read all files through the client.", (uchar**) &opt_local_file,
(uchar**) &opt_local_file, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"lock-tables", 'l', "Lock all tables for write (this disables threads).",
(gptr*) &lock_tables, (gptr*) &lock_tables, 0, GET_BOOL, NO_ARG,
(uchar**) &lock_tables, (uchar**) &lock_tables, 0, GET_BOOL, NO_ARG,
0, 0, 0, 0, 0, 0},
{"low-priority", OPT_LOW_PRIORITY,
"Use LOW_PRIORITY when updating the table.", (gptr*) &opt_low_priority,
(gptr*) &opt_low_priority, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
"Use LOW_PRIORITY when updating the table.", (uchar**) &opt_low_priority,
(uchar**) &opt_low_priority, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"password", 'p',
"Password to use when connecting to server. If password is not given it's asked from the tty.",
0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
......@@ -133,35 +133,35 @@ static struct my_option my_long_options[] =
{"pipe", 'W', "Use named pipes to connect to server.", 0, 0, 0, GET_NO_ARG,
NO_ARG, 0, 0, 0, 0, 0, 0},
#endif
{"port", 'P', "Port number to use for connection.", (gptr*) &opt_mysql_port,
(gptr*) &opt_mysql_port, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0,
{"port", 'P', "Port number to use for connection.", (uchar**) &opt_mysql_port,
(uchar**) &opt_mysql_port, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0,
0},
{"protocol", OPT_MYSQL_PROTOCOL, "The protocol of connection (tcp,socket,pipe,memory).",
0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"replace", 'r', "If duplicate unique key was found, replace old row.",
(gptr*) &replace, (gptr*) &replace, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
(uchar**) &replace, (uchar**) &replace, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
#ifdef HAVE_SMEM
{"shared-memory-base-name", OPT_SHARED_MEMORY_BASE_NAME,
"Base name of shared memory.", (gptr*) &shared_memory_base_name, (gptr*) &shared_memory_base_name,
"Base name of shared memory.", (uchar**) &shared_memory_base_name, (uchar**) &shared_memory_base_name,
0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
#endif
{"silent", 's', "Be more silent.", (gptr*) &silent, (gptr*) &silent, 0,
{"silent", 's', "Be more silent.", (uchar**) &silent, (uchar**) &silent, 0,
GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"socket", 'S', "Socket file to use for connection.",
(gptr*) &opt_mysql_unix_port, (gptr*) &opt_mysql_unix_port, 0, GET_STR,
(uchar**) &opt_mysql_unix_port, (uchar**) &opt_mysql_unix_port, 0, GET_STR,
REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
#include <sslopt-longopts.h>
{"use-threads", OPT_USE_THREADS,
"Load files in parallel. The argument is the number "
"of threads to use for loading data.",
(gptr*) &opt_use_threads, (gptr*) &opt_use_threads, 0,
(uchar**) &opt_use_threads, (uchar**) &opt_use_threads, 0,
GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
#ifndef DONT_ALLOW_USER_CHANGE
{"user", 'u', "User for login if not current user.", (gptr*) &current_user,
(gptr*) &current_user, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"user", 'u', "User for login if not current user.", (uchar**) &current_user,
(uchar**) &current_user, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
#endif
{"verbose", 'v', "Print info about the various stages.", (gptr*) &verbose,
(gptr*) &verbose, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"verbose", 'v', "Print info about the various stages.", (uchar**) &verbose,
(uchar**) &verbose, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"version", 'V', "Output version information and exit.", 0, 0, 0, GET_NO_ARG,
NO_ARG, 0, 0, 0, 0, 0, 0},
{ 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
......
client/mysqlshow.c
View file @ 6356f563
......@@ -26,7 +26,7 @@
#include <stdarg.h>
#include <sslopt-vars.h>
static my_string host=0,opt_password=0,user=0;
static char * host=0, *opt_password=0, *user=0;
static my_bool opt_show_keys= 0, opt_compress= 0, opt_count=0, opt_status= 0;
static my_bool tty_password= 0, opt_table_type= 0, info_flag= 0;
static uint opt_verbose=0;
......@@ -52,7 +52,7 @@ static void print_res_top(MYSQL_RES *result);
static void print_res_row(MYSQL_RES *result,MYSQL_ROW cur);
static const char *load_default_groups[]= { "mysqlshow","client",0 };
static my_string opt_mysql_unix_port=0;
static char * opt_mysql_unix_port=0;
int main(int argc, char **argv)
{
......@@ -120,7 +120,8 @@ int main(int argc, char **argv)
mysql_options(&mysql, MYSQL_SET_CHARSET_NAME, default_charset);
if (!(mysql_real_connect(&mysql,host,user,opt_password,
(first_argument_uses_wildcards) ? "" : argv[0],opt_mysql_port,opt_mysql_unix_port,
(first_argument_uses_wildcards) ? "" :
argv[0],opt_mysql_port,opt_mysql_unix_port,
0)))
{
fprintf(stderr,"%s: %s\n",my_progname,mysql_error(&mysql));
......@@ -161,36 +162,36 @@ static struct my_option my_long_options[] =
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
#endif
{"character-sets-dir", 'c', "Directory where character sets are.",
(gptr*) &charsets_dir, (gptr*) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0,
(uchar**) &charsets_dir, (uchar**) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0,
0, 0, 0, 0, 0},
{"default-character-set", OPT_DEFAULT_CHARSET,
"Set the default character set.", (gptr*) &default_charset,
(gptr*) &default_charset, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
"Set the default character set.", (uchar**) &default_charset,
(uchar**) &default_charset, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"count", OPT_COUNT,
"Show number of rows per table (may be slow for not MyISAM tables)",
(gptr*) &opt_count, (gptr*) &opt_count, 0, GET_BOOL, NO_ARG, 0, 0, 0,
(uchar**) &opt_count, (uchar**) &opt_count, 0, GET_BOOL, NO_ARG, 0, 0, 0,
0, 0, 0},
{"compress", 'C', "Use compression in server/client protocol.",
(gptr*) &opt_compress, (gptr*) &opt_compress, 0, GET_BOOL, NO_ARG, 0, 0, 0,
(uchar**) &opt_compress, (uchar**) &opt_compress, 0, GET_BOOL, NO_ARG, 0, 0, 0,
0, 0, 0},
{"debug", '#', "Output debug log. Often this is 'd:t:o,filename'.",
0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
{"debug-info", OPT_DEBUG_INFO, "Print some debug info at exit.", (gptr*) &info_flag,
(gptr*) &info_flag, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"debug-info", OPT_DEBUG_INFO, "Print some debug info at exit.", (uchar**) &info_flag,
(uchar**) &info_flag, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"help", '?', "Display this help and exit.", 0, 0, 0, GET_NO_ARG, NO_ARG,
0, 0, 0, 0, 0, 0},
{"host", 'h', "Connect to host.", (gptr*) &host, (gptr*) &host, 0, GET_STR,
{"host", 'h', "Connect to host.", (uchar**) &host, (uchar**) &host, 0, GET_STR,
REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"status", 'i', "Shows a lot of extra information about each table.",
(gptr*) &opt_status, (gptr*) &opt_status, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0,
(uchar**) &opt_status, (uchar**) &opt_status, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0,
0, 0},
{"keys", 'k', "Show keys for table.", (gptr*) &opt_show_keys,
(gptr*) &opt_show_keys, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"keys", 'k', "Show keys for table.", (uchar**) &opt_show_keys,
(uchar**) &opt_show_keys, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"password", 'p',
"Password to use when connecting to server. If password is not given it's asked from the tty.",
0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
{"port", 'P', "Port number to use for connection.", (gptr*) &opt_mysql_port,
(gptr*) &opt_mysql_port, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0,
{"port", 'P', "Port number to use for connection.", (uchar**) &opt_mysql_port,
(uchar**) &opt_mysql_port, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0,
0},
#ifdef __WIN__
{"pipe", 'W', "Use named pipes to connect to server.", 0, 0, 0, GET_NO_ARG,
......@@ -200,19 +201,19 @@ static struct my_option my_long_options[] =
0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
#ifdef HAVE_SMEM
{"shared-memory-base-name", OPT_SHARED_MEMORY_BASE_NAME,
"Base name of shared memory.", (gptr*) &shared_memory_base_name, (gptr*) &shared_memory_base_name,
"Base name of shared memory.", (uchar**) &shared_memory_base_name, (uchar**) &shared_memory_base_name,
0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
#endif
{"show-table-type", 't', "Show table type column.",
(gptr*) &opt_table_type, (gptr*) &opt_table_type, 0, GET_BOOL,
(uchar**) &opt_table_type, (uchar**) &opt_table_type, 0, GET_BOOL,
NO_ARG, 0, 0, 0, 0, 0, 0},
{"socket", 'S', "Socket file to use for connection.",
(gptr*) &opt_mysql_unix_port, (gptr*) &opt_mysql_unix_port, 0, GET_STR,
(uchar**) &opt_mysql_unix_port, (uchar**) &opt_mysql_unix_port, 0, GET_STR,
REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
#include <sslopt-longopts.h>
#ifndef DONT_ALLOW_USER_CHANGE
{"user", 'u', "User for login if not current user.", (gptr*) &user,
(gptr*) &user, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"user", 'u', "User for login if not current user.", (uchar**) &user,
(uchar**) &user, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
#endif
{"verbose", 'v',
"More verbose output; You can use this multiple times to get even more verbose output.",
......@@ -733,7 +734,7 @@ print_header(const char *header,uint head_length,...)
for (i=0 ; i < length+2 ; i++)
putchar('-');
putchar('+');
if (!(field=va_arg(args,my_string)))
if (!(field=va_arg(args,char *)))
break;
length=va_arg(args,uint);
}
......@@ -757,7 +758,7 @@ print_header(const char *header,uint head_length,...)
for (i=0 ; i < length ; i++)
putchar(' ');
putchar('|');
if (!(field=va_arg(args,my_string)))
if (!(field=va_arg(args,char *)))
break;
length=va_arg(args,uint);
}
......@@ -772,7 +773,7 @@ print_header(const char *header,uint head_length,...)
for (i=0 ; i < length+2 ; i++)
putchar('-');
putchar('+');
if (!(field=va_arg(args,my_string)))
if (!(field=va_arg(args,char *)))
break;
length=va_arg(args,uint);
}
......@@ -798,7 +799,7 @@ print_row(const char *header,uint head_length,...)
field_length=(uint) strlen(field);
for (i=field_length ; i <= length ; i++)
putchar(' ');
if (!(field=va_arg(args,my_string)))
if (!(field=va_arg(args,char *)))
break;
length=va_arg(args,uint);
}
......
client/mysqlslap.c
View file @ 6356f563
This diff is collapsed.
client/mysqltest.c
View file @ 6356f563
This diff is collapsed.
client/readline.cc
View file @ 6356f563
......@@ -22,8 +22,8 @@
static bool init_line_buffer(LINE_BUFFER *buffer,File file,ulong size,
ulong max_size);
static bool init_line_buffer_from_string(LINE_BUFFER *buffer,my_string str);
static uint fill_buffer(LINE_BUFFER *buffer);
static bool init_line_buffer_from_string(LINE_BUFFER *buffer,char * str);
static size_t fill_buffer(LINE_BUFFER *buffer);
static char *intern_read_line(LINE_BUFFER *buffer,ulong *out_length);
......@@ -35,7 +35,7 @@ LINE_BUFFER *batch_readline_init(ulong max_size,FILE *file)
return 0;
if (init_line_buffer(line_buff,fileno(file),IO_SIZE,max_size))
{
my_free((char*) line_buff,MYF(0));
my_free(line_buff,MYF(0));
return 0;
}
return line_buff;
......@@ -62,13 +62,13 @@ void batch_readline_end(LINE_BUFFER *line_buff)
{
if (line_buff)
{
my_free((gptr) line_buff->buffer,MYF(MY_ALLOW_ZERO_PTR));
my_free((char*) line_buff,MYF(0));
my_free(line_buff->buffer,MYF(MY_ALLOW_ZERO_PTR));
my_free(line_buff,MYF(0));
}
}
LINE_BUFFER *batch_readline_command(LINE_BUFFER *line_buff, my_string str)
LINE_BUFFER *batch_readline_command(LINE_BUFFER *line_buff, char * str)
{
if (!line_buff)
if (!(line_buff=(LINE_BUFFER*)
......@@ -76,7 +76,7 @@ LINE_BUFFER *batch_readline_command(LINE_BUFFER *line_buff, my_string str)
return 0;
if (init_line_buffer_from_string(line_buff,str))
{
my_free((char*) line_buff,MYF(0));
my_free(line_buff,MYF(0));
return 0;
}
return line_buff;
......@@ -106,13 +106,13 @@ init_line_buffer(LINE_BUFFER *buffer,File file,ulong size,ulong max_buffer)
several times. the resulting buffer will contain a
concatenation of all strings separated by spaces
*/
static bool init_line_buffer_from_string(LINE_BUFFER *buffer,my_string str)
static bool init_line_buffer_from_string(LINE_BUFFER *buffer,char * str)
{
uint old_length=(uint)(buffer->end - buffer->buffer);
uint length= (uint) strlen(str);
if (!(buffer->buffer= buffer->start_of_line= buffer->end_of_line=
(char*)my_realloc(buffer->buffer, old_length+length+2,
MYF(MY_FAE|MY_ALLOW_ZERO_PTR))))
(char*) my_realloc((uchar*) buffer->buffer, old_length+length+2,
MYF(MY_FAE|MY_ALLOW_ZERO_PTR))))
return 1;
buffer->end= buffer->buffer + old_length;
if (old_length)
......@@ -133,9 +133,9 @@ static bool init_line_buffer_from_string(LINE_BUFFER *buffer,my_string str)
bytes read from disk.
*/
static uint fill_buffer(LINE_BUFFER *buffer)
static size_t fill_buffer(LINE_BUFFER *buffer)
{
uint read_count;
size_t read_count;
uint bufbytes= (uint) (buffer->end - buffer->start_of_line);
if (buffer->eof)
......@@ -166,11 +166,11 @@ static uint fill_buffer(LINE_BUFFER *buffer)
}
/* Read in new stuff. */
if ((read_count= my_read(buffer->file, (byte*) buffer->end, read_count,
if ((read_count= my_read(buffer->file, (uchar*) buffer->end, read_count,
MYF(MY_WME))) == MY_FILE_ERROR)
return read_count;
return (size_t) -1;
DBUG_PRINT("fill_buff", ("Got %d bytes", read_count));
DBUG_PRINT("fill_buff", ("Got %lu bytes", (ulong) read_count));
/* Kludge to pretend every nonempty file ends with a newline. */
if (!read_count && bufbytes && buffer->end[-1] != '\n')
......@@ -189,7 +189,7 @@ static uint fill_buffer(LINE_BUFFER *buffer)
char *intern_read_line(LINE_BUFFER *buffer,ulong *out_length)
{
char *pos;
uint length;
size_t length;
DBUG_ENTER("intern_read_line");
buffer->start_of_line=buffer->end_of_line;
......@@ -202,7 +202,7 @@ char *intern_read_line(LINE_BUFFER *buffer,ulong *out_length)
{
if ((uint) (pos - buffer->start_of_line) < buffer->max_size)
{
if (!(length=fill_buffer(buffer)) || length == (uint) -1)
if (!(length=fill_buffer(buffer)) || length == (size_t) -1)
DBUG_RETURN(0);
continue;
}
......
client/sql_string.cc
View file @ 6356f563
......@@ -32,7 +32,7 @@
required by the string function
*/
extern gptr sql_alloc(unsigned size);
extern void sql_alloc(size_t size);
extern void sql_element_free(void *ptr);
#include "sql_string.h"
......@@ -506,7 +506,7 @@ bool String::append(FILE* file, uint32 arg_length, myf my_flags)
{
if (realloc(str_length+arg_length))
return TRUE;
if (my_fread(file, (byte*) Ptr + str_length, arg_length, my_flags))
if (my_fread(file, (uchar*) Ptr + str_length, arg_length, my_flags))
{
shrink(str_length);
return TRUE;
......@@ -520,7 +520,7 @@ bool String::append(IO_CACHE* file, uint32 arg_length)
{
if (realloc(str_length+arg_length))
return TRUE;
if (my_b_read(file, (byte*) Ptr + str_length, arg_length))
if (my_b_read(file, (uchar*) Ptr + str_length, arg_length))
{
shrink(str_length);
return TRUE;
......@@ -645,7 +645,7 @@ bool String::replace(uint32 offset,uint32 arg_length,
{
if (realloc(str_length+(uint32) diff))
return TRUE;
bmove_upp(Ptr+str_length+diff,Ptr+str_length,
bmove_upp((uchar*) Ptr+str_length+diff, (uchar*) Ptr+str_length,
str_length-offset-arg_length);
}
if (to_length)
......
dbug/dbug.c
View file @ 6356f563
......@@ -264,7 +264,7 @@ static BOOLEAN DoTrace(CODE_STATE *cs);
/* Test to see if file is writable */
#if !(!defined(HAVE_ACCESS) || defined(MSDOS))
static BOOLEAN Writable(char *pathname);
static BOOLEAN Writable(const char *pathname);
/* Change file owner and group */
static void ChangeOwner(CODE_STATE *cs, char *pathname);
/* Allocate memory for runtime support */
......@@ -343,12 +343,12 @@ static CODE_STATE *code_state(void)
if (!(cs=(CODE_STATE *) tmp->dbug))
{
cs=(CODE_STATE*) DbugMalloc(sizeof(*cs));
bzero((char*) cs,sizeof(*cs));
bzero((uchar*) cs,sizeof(*cs));
cs->process= db_process ? db_process : "dbug";
cs->func="?func";
cs->file="?file";
cs->stack=&init_settings;
tmp->dbug=(gptr) cs;
tmp->dbug= (void*) cs;
}
}
return cs;
......@@ -715,7 +715,7 @@ void _db_push_(const char *control)
void _db_set_init_(const char *control)
{
CODE_STATE tmp_cs;
bzero((char*) &tmp_cs, sizeof(tmp_cs));
bzero((uchar*) &tmp_cs, sizeof(tmp_cs));
tmp_cs.stack= &init_settings;
_db_set_(&tmp_cs, control);
}
......@@ -830,7 +830,7 @@ void _db_pop_()
} \
} while (0)
int _db_explain_ (CODE_STATE *cs, char *buf, int len)
int _db_explain_ (CODE_STATE *cs, char *buf, size_t len)
{
char *start=buf, *end=buf+len-4;
......@@ -887,10 +887,10 @@ int _db_explain_ (CODE_STATE *cs, char *buf, int len)
* see _db_explain_
*/
int _db_explain_init_(char *buf, int len)
int _db_explain_init_(char *buf, size_t len)
{
CODE_STATE cs;
bzero((char*) &cs,sizeof(cs));
bzero((uchar*) &cs,sizeof(cs));
cs.stack=&init_settings;
return _db_explain_(&cs, buf, len);
}
......@@ -1083,7 +1083,7 @@ void _db_pargs_(uint _line_, const char *keyword)
CODE_STATE *cs=0;
get_code_state_or_return;
cs->u_line= _line_;
cs->u_keyword= (char*) keyword;
cs->u_keyword= keyword;
}
......@@ -1160,7 +1160,8 @@ void _db_doprnt_(const char *format,...)
* Is used to examine corrputed memory or arrays.
*/
void _db_dump_(uint _line_, const char *keyword, const char *memory, uint length)
void _db_dump_(uint _line_, const char *keyword,
const unsigned char *memory, size_t length)
{
int pos;
char dbuff[90];
......@@ -1168,7 +1169,7 @@ void _db_dump_(uint _line_, const char *keyword, const char *memory, uint length
CODE_STATE *cs=0;
get_code_state_or_return;
if (_db_keyword_(cs, (char*) keyword))
if (_db_keyword_(cs, keyword))
{
if (!cs->locked)
pthread_mutex_lock(&THR_LOCK_dbug);
......@@ -1182,7 +1183,7 @@ void _db_dump_(uint _line_, const char *keyword, const char *memory, uint length
{
fprintf(cs->stack->out_file, "%s: ", cs->func);
}
sprintf(dbuff,"%s: Memory: 0x%lx Bytes: (%d)\n",
sprintf(dbuff,"%s: Memory: 0x%lx Bytes: (%ld)\n",
keyword,(ulong) memory, length);
(void) fputs(dbuff,cs->stack->out_file);
......@@ -1292,7 +1293,7 @@ static struct link *ListDel(struct link *head,
{
struct link *delme=*cur;
*cur=(*cur)->next_link;
free((char*)delme);
free((void*) delme);
}
} while (*cur && *(cur=&((*cur)->next_link)));
}
......@@ -1451,7 +1452,7 @@ static void FreeState(CODE_STATE *cs, struct settings *state, int free_state)
if (state->prof_file)
DBUGCloseFile(cs, state->prof_file);
if (free_state)
free((char *) state);
free((void*) state);
}
......@@ -1696,7 +1697,7 @@ static void FreeList(struct link *linkp)
{
old= linkp;
linkp= linkp->next_link;
free((char *) old);
free((void*) old);
}
}
......@@ -1815,7 +1816,7 @@ static void DBUGOpenFile(CODE_STATE *cs,
}
else
{
if (!Writable((char*)name))
if (!Writable(name))
{
(void) fprintf(stderr, ERR_OPEN, cs->process, name);
perror("");
......@@ -1988,7 +1989,7 @@ static char *DbugMalloc(size_t size)
{
register char *new_malloc;
if (!(new_malloc= (char*) malloc((size_t) size)))
if (!(new_malloc= (char*) malloc(size)))
DbugExit("out of memory");
return new_malloc;
}
......@@ -2062,7 +2063,7 @@ static const char *BaseName(const char *pathname)
#ifndef Writable
static BOOLEAN Writable(char *pathname)
static BOOLEAN Writable(const char *pathname)
{
REGISTER BOOLEAN granted;
REGISTER char *lastslash;
......
extra/comp_err.c
View file @ 6356f563
......@@ -99,31 +99,31 @@ static struct my_option my_long_options[]=
{"debug", '#', "This is a non-debug version. Catch this and exit",
0, 0, 0, GET_DISABLED, OPT_ARG, 0, 0, 0, 0, 0, 0},
#else
{"debug", '#', "Output debug log", (gptr *) & default_dbug_option,
(gptr *) & default_dbug_option, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
{"debug", '#', "Output debug log", (uchar**) & default_dbug_option,
(uchar**) & default_dbug_option, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
#endif
{"debug-info", 'T', "Print some debug info at exit.", (gptr *) & info_flag,
(gptr *) & info_flag, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"debug-info", 'T', "Print some debug info at exit.", (uchar**) & info_flag,
(uchar**) & info_flag, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"help", '?', "Displays this help and exits.", 0, 0, 0, GET_NO_ARG,
NO_ARG, 0, 0, 0, 0, 0, 0},
{"version", 'V', "Prints version", 0, 0, 0, GET_NO_ARG,
NO_ARG, 0, 0, 0, 0, 0, 0},
{"charset", 'C', "Charset dir", (gptr *) & charsets_dir,
(gptr *) & charsets_dir,
{"charset", 'C', "Charset dir", (uchar**) & charsets_dir,
(uchar**) & charsets_dir,
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"in_file", 'F', "Input file", (gptr *) & TXTFILE, (gptr *) & TXTFILE,
{"in_file", 'F', "Input file", (uchar**) & TXTFILE, (uchar**) & TXTFILE,
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"out_dir", 'D', "Output base directory", (gptr *) & DATADIRECTORY,
(gptr *) & DATADIRECTORY,
{"out_dir", 'D', "Output base directory", (uchar**) & DATADIRECTORY,
(uchar**) & DATADIRECTORY,
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"out_file", 'O', "Output filename (errmsg.sys)", (gptr *) & OUTFILE,
(gptr *) & OUTFILE, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"header_file", 'H', "mysqld_error.h file ", (gptr *) & HEADERFILE,
(gptr *) & HEADERFILE, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"name_file", 'N', "mysqld_ername.h file ", (gptr *) & NAMEFILE,
(gptr *) & NAMEFILE, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"state_file", 'S', "sql_state.h file", (gptr *) & STATEFILE,
(gptr *) & STATEFILE, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"out_file", 'O', "Output filename (errmsg.sys)", (uchar**) & OUTFILE,
(uchar**) & OUTFILE, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"header_file", 'H', "mysqld_error.h file ", (uchar**) & HEADERFILE,
(uchar**) & HEADERFILE, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"name_file", 'N', "mysqld_ername.h file ", (uchar**) & NAMEFILE,
(uchar**) & NAMEFILE, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"state_file", 'S', "sql_state.h file", (uchar**) & STATEFILE,
(uchar**) & STATEFILE, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
};
......@@ -329,21 +329,21 @@ static int create_sys_files(struct languages *lang_head,
/* continue with header of the errmsg.sys file */
length= ftell(to) - HEADER_LENGTH - row_count * 2;
bzero((gptr) head, HEADER_LENGTH);
bmove((byte *) head, (byte *) file_head, 4);
bzero((uchar*) head, HEADER_LENGTH);
bmove((uchar *) head, (uchar *) file_head, 4);
head[4]= 1;
int2store(head + 6, length);
int2store(head + 8, row_count);
head[30]= csnum;
my_fseek(to, 0l, MY_SEEK_SET, MYF(0));
if (my_fwrite(to, (byte*) head, HEADER_LENGTH, MYF(MY_WME | MY_FNABP)))
if (my_fwrite(to, (uchar*) head, HEADER_LENGTH, MYF(MY_WME | MY_FNABP)))
goto err;
for (i= 0; i < row_count; i++)
{
int2store(head, file_pos[i]);
if (my_fwrite(to, (byte*) head, 2, MYF(MY_WME | MY_FNABP)))
if (my_fwrite(to, (uchar*) head, 2, MYF(MY_WME | MY_FNABP)))
goto err;
}
my_fclose(to, MYF(0));
......@@ -362,7 +362,7 @@ static void clean_up(struct languages *lang_head, struct errors *error_head)
struct errors *tmp_error, *next_error;
uint count, i;
my_free((gptr) default_language, MYF(0));
my_free((uchar*) default_language, MYF(0));
for (tmp_lang= lang_head; tmp_lang; tmp_lang= next_language)
{
......@@ -370,7 +370,7 @@ static void clean_up(struct languages *lang_head, struct errors *error_head)
my_free(tmp_lang->lang_short_name, MYF(0));
my_free(tmp_lang->lang_long_name, MYF(0));
my_free(tmp_lang->charset, MYF(0));
my_free((gptr) tmp_lang, MYF(0));
my_free((uchar*) tmp_lang, MYF(0));
}
for (tmp_error= error_head; tmp_error; tmp_error= next_error)
......@@ -381,17 +381,17 @@ static void clean_up(struct languages *lang_head, struct errors *error_head)
{
struct message *tmp;
tmp= dynamic_element(&tmp_error->msg, i, struct message*);
my_free((gptr) tmp->lang_short_name, MYF(0));
my_free((gptr) tmp->text, MYF(0));
my_free((uchar*) tmp->lang_short_name, MYF(0));
my_free((uchar*) tmp->text, MYF(0));
}
delete_dynamic(&tmp_error->msg);
if (tmp_error->sql_code1[0])
my_free((gptr) tmp_error->sql_code1, MYF(0));
my_free((uchar*) tmp_error->sql_code1, MYF(0));
if (tmp_error->sql_code2[0])
my_free((gptr) tmp_error->sql_code2, MYF(0));
my_free((gptr) tmp_error->er_name, MYF(0));
my_free((gptr) tmp_error, MYF(0));
my_free((uchar*) tmp_error->sql_code2, MYF(0));
my_free((uchar*) tmp_error->er_name, MYF(0));
my_free((uchar*) tmp_error, MYF(0));
}
}
......@@ -471,7 +471,7 @@ static int parse_input_file(const char *file_name, struct errors **top_error,
current_error->er_name, current_message.lang_short_name);
DBUG_RETURN(0);
}
if (insert_dynamic(&current_error->msg, (byte *) & current_message))
if (insert_dynamic(&current_error->msg, (uchar *) & current_message))
DBUG_RETURN(0);
continue;
}
......@@ -534,7 +534,7 @@ static uint parse_error_offset(char *str)
end= 0;
ioffset= (uint) my_strtoll10(soffset, &end, &error);
my_free((gptr) soffset, MYF(0));
my_free((uchar*) soffset, MYF(0));
DBUG_RETURN(ioffset);
}
......
extra/innochecksum.c
View file @ 6356f563
......@@ -51,10 +51,10 @@
/* another argument to specify page ranges... seek to right spot and go from there */
typedef unsigned long int ulint;
typedef unsigned char byte;
typedef unsigned char uchar;
/* innodb function in name; modified slightly to not have the ASM version (lots of #ifs that didn't apply) */
ulint mach_read_from_4(byte *b)
ulint mach_read_from_4(uchar *b)
{
return( ((ulint)(b[0]) << 24)
+ ((ulint)(b[1]) << 16)
......@@ -78,7 +78,7 @@ ulint
ut_fold_binary(
/*===========*/
/* out: folded value */
byte* str, /* in: string of bytes */
uchar* str, /* in: string of bytes */
ulint len) /* in: length */
{
ulint i;
......@@ -98,7 +98,7 @@ ulint
buf_calc_page_new_checksum(
/*=======================*/
/* out: checksum */
byte* page) /* in: buffer page */
uchar* page) /* in: buffer page */
{
ulint checksum;
......@@ -123,7 +123,7 @@ ulint
buf_calc_page_old_checksum(
/*=======================*/
/* out: checksum */
byte* page) /* in: buffer page */
uchar* page) /* in: buffer page */
{
ulint checksum;
......@@ -138,7 +138,7 @@ buf_calc_page_old_checksum(
int main(int argc, char **argv)
{
FILE *f; /* our input file */
byte *p; /* storage of pages read */
uchar *p; /* storage of pages read */
int bytes; /* bytes read count */
ulint ct; /* current page number (0 based) */
int now; /* current time */
......@@ -256,7 +256,7 @@ int main(int argc, char **argv)
}
/* allocate buffer for reading (so we don't realloc every time) */
p= (byte *)malloc(UNIV_PAGE_SIZE);
p= (uchar *)malloc(UNIV_PAGE_SIZE);
/* main checksumming loop */
ct= start_page;
......
extra/my_print_defaults.c
View file @ 6356f563
......@@ -47,30 +47,30 @@ static struct my_option my_long_options[] =
added if the file has no extension)
*/
{"config-file", 'c', "Deprecated, please use --defaults-file instead. Name of config file to read; if no extension is given, default extension (e.g., .ini or .cnf) will be added",
(gptr*) &config_file, (gptr*) &config_file, 0, GET_STR, REQUIRED_ARG,
(uchar**) &config_file, (uchar**) &config_file, 0, GET_STR, REQUIRED_ARG,
0, 0, 0, 0, 0, 0},
#ifdef DBUG_OFF
{"debug", '#', "This is a non-debug version. Catch this and exit",
0,0, 0, GET_DISABLED, OPT_ARG, 0, 0, 0, 0, 0, 0},
#else
{"debug", '#', "Output debug log", (gptr*) &default_dbug_option,
(gptr*) &default_dbug_option, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
{"debug", '#', "Output debug log", (uchar**) &default_dbug_option,
(uchar**) &default_dbug_option, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
#endif
{"defaults-file", 'c', "Like --config-file, except: if first option, then read this file only, do not read global or per-user config files; should be the first option",
(gptr*) &config_file, (gptr*) &config_file, 0, GET_STR, REQUIRED_ARG,
(uchar**) &config_file, (uchar**) &config_file, 0, GET_STR, REQUIRED_ARG,
0, 0, 0, 0, 0, 0},
{"defaults-extra-file", 'e',
"Read this file after the global config file and before the config file in the users home directory; should be the first option",
(gptr*) &my_defaults_extra_file, (gptr*) &my_defaults_extra_file, 0,
(uchar**) &my_defaults_extra_file, (uchar**) &my_defaults_extra_file, 0,
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"defaults-group-suffix", 'g',
"In addition to the given groups, read also groups with this suffix",
(gptr*) &my_defaults_group_suffix, (gptr*) &my_defaults_group_suffix,
(uchar**) &my_defaults_group_suffix, (uchar**) &my_defaults_group_suffix,
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"extra-file", 'e',
"Deprecated. Synonym for --defaults-extra-file.",
(gptr*) &my_defaults_extra_file,
(gptr*) &my_defaults_extra_file, 0, GET_STR,
(uchar**) &my_defaults_extra_file,
(uchar**) &my_defaults_extra_file, 0, GET_STR,
REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"no-defaults", 'n', "Return an empty string (useful for scripts).",
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
......
extra/mysql_waitpid.c
View file @ 6356f563
......@@ -38,7 +38,7 @@ static struct my_option my_long_options[] =
0, 0, 0, 0, 0},
{"verbose", 'v',
"Be more verbose. Give a warning, if kill can't handle signal 0.",
(gptr*) &verbose, (gptr*) &verbose, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
(uchar**) &verbose, (uchar**) &verbose, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"version", 'V', "Print version information and exit.", 0, 0, 0,
GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
{ 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
......
extra/perror.c
View file @ 6356f563
......@@ -41,18 +41,18 @@ static struct my_option my_long_options[] =
{"info", 'I', "Synonym for --help.", 0, 0, 0, GET_NO_ARG,
NO_ARG, 0, 0, 0, 0, 0, 0},
#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
{"ndb", 257, "Ndbcluster storage engine specific error codes.", (gptr*) &ndb_code,
(gptr*) &ndb_code, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"ndb", 257, "Ndbcluster storage engine specific error codes.", (uchar**) &ndb_code,
(uchar**) &ndb_code, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
#endif
#ifdef HAVE_SYS_ERRLIST
{"all", 'a', "Print all the error messages and the number.",
(gptr*) &print_all_codes, (gptr*) &print_all_codes, 0, GET_BOOL, NO_ARG,
(uchar**) &print_all_codes, (uchar**) &print_all_codes, 0, GET_BOOL, NO_ARG,
0, 0, 0, 0, 0, 0},
#endif
{"silent", 's', "Only print the error message.", 0, 0, 0, GET_NO_ARG, NO_ARG,
0, 0, 0, 0, 0, 0},
{"verbose", 'v', "Print error code and message (default).", (gptr*) &verbose,
(gptr*) &verbose, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
{"verbose", 'v', "Print error code and message (default).", (uchar**) &verbose,
(uchar**) &verbose, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
{"version", 'V', "Displays version information and exits.",
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
{0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
......
extra/replace.c
View file @ 6356f563
This diff is collapsed.
extra/resolve_stack_dump.c
View file @ 6356f563
......@@ -53,10 +53,10 @@ static struct my_option my_long_options[] =
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
{"version", 'V', "Output version information and exit.",
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
{"symbols-file", 's', "Use specified symbols file.", (gptr*) &sym_fname,
(gptr*) &sym_fname, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"symbols-file", 's', "Use specified symbols file.", (uchar**) &sym_fname,
(uchar**) &sym_fname, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"numeric-dump-file", 'n', "Read the dump from specified file.",
(gptr*) &dump_fname, (gptr*) &dump_fname, 0, GET_STR, REQUIRED_ARG,
(uchar**) &dump_fname, (uchar**) &dump_fname, 0, GET_STR, REQUIRED_ARG,
0, 0, 0, 0, 0, 0},
{ 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
};
......@@ -235,7 +235,7 @@ static void init_sym_table()
SYM_ENTRY se;
if (init_sym_entry(&se, buf))
continue;
if (insert_dynamic(&sym_table, (gptr)&se))
if (insert_dynamic(&sym_table, (uchar*)&se))
die("insert_dynamic() failed - looks like we are out of memory");
}
......@@ -255,7 +255,7 @@ static void verify_sort()
for (i = 0; i < sym_table.elements; i++)
{
SYM_ENTRY se;
get_dynamic(&sym_table, (gptr)&se, i);
get_dynamic(&sym_table, (uchar*)&se, i);
if (se.addr < last)
die("sym table does not appear to be sorted, did you forget \
--numeric-sort arg to nm? trouble addr = %p, last = %p", se.addr, last);
......@@ -267,16 +267,16 @@ static void verify_sort()
static SYM_ENTRY* resolve_addr(uchar* addr, SYM_ENTRY* se)
{
uint i;
get_dynamic(&sym_table, (gptr)se, 0);
get_dynamic(&sym_table, (uchar*)se, 0);
if (addr < se->addr)
return 0;
for (i = 1; i < sym_table.elements; i++)
{
get_dynamic(&sym_table, (gptr)se, i);
get_dynamic(&sym_table, (uchar*)se, i);
if (addr < se->addr)
{
get_dynamic(&sym_table, (gptr)se, i - 1);
get_dynamic(&sym_table, (uchar*)se, i - 1);
return se;
}
}
......
extra/resolveip.c
View file @ 6356f563
......@@ -43,7 +43,7 @@ static struct my_option my_long_options[] =
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
{"info", 'I', "Synonym for --help.",
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
{"silent", 's', "Be more silent.", (gptr*) &silent, (gptr*) &silent,
{"silent", 's', "Be more silent.", (uchar**) &silent, (uchar**) &silent,
0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
{"version", 'V', "Displays version information and exits.",
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
......@@ -83,7 +83,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
return 0;
}
/*static my_string load_default_groups[]= { "resolveip","client",0 }; */
/*static char * load_default_groups[]= { "resolveip","client",0 }; */
static int get_options(int *argc,char ***argv)
{
......
include/config-win.h
View file @ 6356f563
......@@ -310,10 +310,10 @@ inline double ulonglong2double(ulonglong value)
#define doublestore(T,V) do { *((long *) T) = *((long*) &V); \
*(((long *) T)+1) = *(((long*) &V)+1); } while(0)
#define float4get(V,M) { *((long *) &(V)) = *((long*) (M)); }
#define floatstore(T,V) memcpy((byte*)(T), (byte*)(&V), sizeof(float))
#define floatget(V,M) memcpy((byte*)(&V), (byte*)(M), sizeof(float))
#define floatstore(T,V) memcpy((uchar*)(T), (uchar*)(&V), sizeof(float))
#define floatget(V,M) memcpy((uchar*)(&V), (uchar*)(M), sizeof(float))
#define float8get(V,M) doubleget((V),(M))
#define float4store(V,M) memcpy((byte*) V,(byte*) (&M),sizeof(float))
#define float4store(V,M) memcpy((uchar*) V,(uchar*) (&M),sizeof(float))
#define float8store(V,M) doublestore((V),(M))
#endif /* _WIN64 */
......
include/decimal.h
View file @ 6356f563
......@@ -39,8 +39,8 @@ int longlong2decimal(longlong from, decimal_t *to);
int decimal2double(decimal_t *from, double *to);
int double2decimal(double from, decimal_t *to);
int decimal_actual_fraction(decimal_t *from);
int decimal2bin(decimal_t *from, char *to, int precision, int scale);
int bin2decimal(char *from, decimal_t *to, int precision, int scale);
int decimal2bin(decimal_t *from, uchar *to, int precision, int scale);
int bin2decimal(const uchar *from, decimal_t *to, int precision, int scale);
int decimal_size(int precision, int scale);
int decimal_bin_size(int precision, int scale);
......
include/ft_global.h
View file @ 6356f563
......@@ -32,7 +32,7 @@ typedef struct st_ft_info FT_INFO;
struct _ft_vft
{
int (*read_next)(FT_INFO *, char *);
float (*find_relevance)(FT_INFO *, byte *, uint);
float (*find_relevance)(FT_INFO *, uchar *, uint);
void (*close_search)(FT_INFO *);
float (*get_relevance)(FT_INFO *);
void (*reinit_search)(FT_INFO *);
......@@ -62,8 +62,8 @@ void ft_free_stopwords(void);
#define FT_SORTED 2
#define FT_EXPAND 4 /* query expansion */
FT_INFO *ft_init_search(uint,void *, uint, byte *, uint,CHARSET_INFO *, byte *);
my_bool ft_boolean_check_syntax_string(const byte *);
FT_INFO *ft_init_search(uint,void *, uint, uchar *, uint,CHARSET_INFO *, uchar *);
my_bool ft_boolean_check_syntax_string(const uchar *);
#ifdef __cplusplus
}
......
include/hash.h
View file @ 6356f563
......@@ -30,12 +30,13 @@ extern "C" {
/* flags for hash_init */
#define HASH_UNIQUE 1 /* hash_insert fails on duplicate key */
typedef byte *(*hash_get_key)(const byte *,uint*,my_bool);
typedef uchar *(*hash_get_key)(const uchar *,size_t*,my_bool);
typedef void (*hash_free_key)(void *);
typedef struct st_hash {
uint key_offset,key_length; /* Length of key if const length */
uint records, blength;
size_t key_offset,key_length; /* Length of key if const length */
size_t blength;
ulong records;
uint flags;
DYNAMIC_ARRAY array; /* Place for hash_keys */
hash_get_key get_key;
......@@ -48,21 +49,21 @@ typedef uint HASH_SEARCH_STATE;
#define hash_init(A,B,C,D,E,F,G,H) _hash_init(A,B,C,D,E,F,G, H CALLER_INFO)
my_bool _hash_init(HASH *hash, CHARSET_INFO *charset,
uint default_array_elements, uint key_offset,
uint key_length, hash_get_key get_key,
ulong default_array_elements, size_t key_offset,
size_t key_length, hash_get_key get_key,
void (*free_element)(void*), uint flags CALLER_INFO_PROTO);
void hash_free(HASH *tree);
void my_hash_reset(HASH *hash);
byte *hash_element(HASH *hash,uint idx);
gptr hash_search(const HASH *info, const byte *key, uint length);
gptr hash_first(const HASH *info, const byte *key, uint length,
uchar *hash_element(HASH *hash,ulong idx);
uchar *hash_search(const HASH *info, const uchar *key, size_t length);
uchar *hash_first(const HASH *info, const uchar *key, size_t length,
HASH_SEARCH_STATE *state);
gptr hash_next(const HASH *info, const byte *key, uint length,
HASH_SEARCH_STATE *state);
my_bool my_hash_insert(HASH *info,const byte *data);
my_bool hash_delete(HASH *hash,byte *record);
my_bool hash_update(HASH *hash,byte *record,byte *old_key,uint old_key_length);
void hash_replace(HASH *hash, HASH_SEARCH_STATE *state, byte *new_row);
uchar *hash_next(const HASH *info, const uchar *key, size_t length,
HASH_SEARCH_STATE *state);
my_bool my_hash_insert(HASH *info,const uchar *data);
my_bool hash_delete(HASH *hash,uchar *record);
my_bool hash_update(HASH *hash,uchar *record,uchar *old_key,size_t old_key_length);
void hash_replace(HASH *hash, HASH_SEARCH_STATE *state, uchar *new_row);
my_bool hash_check(HASH *hash); /* Only in debug library */
#define hash_clear(H) bzero((char*) (H),sizeof(*(H)))
......
include/heap.h
View file @ 6356f563
......@@ -57,7 +57,7 @@ typedef struct st_heapinfo /* Struct from heap_info */
typedef struct st_heap_ptrs
{
byte *blocks[HP_PTRS_IN_NOD]; /* pointers to HP_PTRS or records */
uchar *blocks[HP_PTRS_IN_NOD]; /* pointers to HP_PTRS or records */
} HP_PTRS;
struct st_level_info
......@@ -70,7 +70,7 @@ struct st_level_info
of last_blocks array. For level 0 - 1, for level 1 - HP_PTRS_IN_NOD, for
level 2 - HP_PTRS_IN_NOD^2 and so forth.
*/
uint records_under_level;
ulong records_under_level;
/*
Ptr to last allocated HP_PTRS (or records buffer for level 0) on this
......@@ -123,10 +123,10 @@ typedef struct st_hp_keydef /* Key definition with open */
ha_rows hash_buckets;
TREE rb_tree;
int (*write_key)(struct st_heap_info *info, struct st_hp_keydef *keyinfo,
const byte *record, byte *recpos);
const uchar *record, uchar *recpos);
int (*delete_key)(struct st_heap_info *info, struct st_hp_keydef *keyinfo,
const byte *record, byte *recpos, int flag);
uint (*get_key_length)(struct st_hp_keydef *keydef, const byte *key);
const uchar *record, uchar *recpos, int flag);
uint (*get_key_length)(struct st_hp_keydef *keydef, const uchar *key);
} HP_KEYDEF;
typedef struct st_heap_share
......@@ -144,8 +144,8 @@ typedef struct st_heap_share
uint keys,max_key_length;
uint currently_disabled_keys; /* saved value from "keys" when disabled */
uint open_count;
byte *del_link; /* Link to next block with del. rec */
my_string name; /* Name of "memory-file" */
uchar *del_link; /* Link to next block with del. rec */
char * name; /* Name of "memory-file" */
#ifdef THREAD
THR_LOCK lock;
pthread_mutex_t intern_lock; /* Locking for use with _locking */
......@@ -162,14 +162,14 @@ struct st_hp_hash_info;
typedef struct st_heap_info
{
HP_SHARE *s;
byte *current_ptr;
uchar *current_ptr;
struct st_hp_hash_info *current_hash_ptr;
ulong current_record,next_block;
int lastinx,errkey;
int mode; /* Mode of file (READONLY..) */
uint opt_flag,update;
byte *lastkey; /* Last used key with rkey */
byte *recbuf; /* Record buffer for rb-tree keys */
uchar *lastkey; /* Last used key with rkey */
uchar *recbuf; /* Record buffer for rb-tree keys */
enum ha_rkey_function last_find_flag;
TREE_ELEMENT *parents[MAX_TREE_HEIGHT+1];
TREE_ELEMENT **last_pos;
......@@ -195,12 +195,12 @@ typedef struct st_heap_create_info
extern HP_INFO *heap_open(const char *name, int mode);
extern int heap_close(HP_INFO *info);
extern int heap_write(HP_INFO *info,const byte *buff);
extern int heap_update(HP_INFO *info,const byte *old,const byte *newdata);
extern int heap_rrnd(HP_INFO *info,byte *buf,byte *pos);
extern int heap_write(HP_INFO *info,const uchar *buff);
extern int heap_update(HP_INFO *info,const uchar *old,const uchar *newdata);
extern int heap_rrnd(HP_INFO *info,uchar *buf,uchar *pos);
extern int heap_scan_init(HP_INFO *info);
extern int heap_scan(register HP_INFO *info, byte *record);
extern int heap_delete(HP_INFO *info,const byte *buff);
extern int heap_scan(register HP_INFO *info, uchar *record);
extern int heap_delete(HP_INFO *info,const uchar *buff);
extern int heap_info(HP_INFO *info,HEAPINFO *x,int flag);
extern int heap_create(const char *name, uint keys, HP_KEYDEF *keydef,
uint reclength, ulong max_records, ulong min_records,
......@@ -211,32 +211,32 @@ extern int heap_extra(HP_INFO *info,enum ha_extra_function function);
extern int heap_reset(HP_INFO *info);
extern int heap_rename(const char *old_name,const char *new_name);
extern int heap_panic(enum ha_panic_function flag);
extern int heap_rsame(HP_INFO *info,byte *record,int inx);
extern int heap_rnext(HP_INFO *info,byte *record);
extern int heap_rprev(HP_INFO *info,byte *record);
extern int heap_rfirst(HP_INFO *info,byte *record,int inx);
extern int heap_rlast(HP_INFO *info,byte *record,int inx);
extern int heap_rsame(HP_INFO *info,uchar *record,int inx);
extern int heap_rnext(HP_INFO *info,uchar *record);
extern int heap_rprev(HP_INFO *info,uchar *record);
extern int heap_rfirst(HP_INFO *info,uchar *record,int inx);
extern int heap_rlast(HP_INFO *info,uchar *record,int inx);
extern void heap_clear(HP_INFO *info);
extern void heap_clear_keys(HP_INFO *info);
extern int heap_disable_indexes(HP_INFO *info);
extern int heap_enable_indexes(HP_INFO *info);
extern int heap_indexes_are_disabled(HP_INFO *info);
extern void heap_update_auto_increment(HP_INFO *info, const byte *record);
extern void heap_update_auto_increment(HP_INFO *info, const uchar *record);
ha_rows hp_rb_records_in_range(HP_INFO *info, int inx, key_range *min_key,
key_range *max_key);
int hp_panic(enum ha_panic_function flag);
int heap_rkey(HP_INFO *info, byte *record, int inx, const byte *key,
int heap_rkey(HP_INFO *info, uchar *record, int inx, const uchar *key,
key_part_map keypart_map, enum ha_rkey_function find_flag);
extern gptr heap_find(HP_INFO *info,int inx,const byte *key);
extern uchar * heap_find(HP_INFO *info,int inx,const uchar *key);
extern int heap_check_heap(HP_INFO *info, my_bool print_status);
extern byte *heap_position(HP_INFO *info);
extern uchar *heap_position(HP_INFO *info);
/* The following is for programs that uses the old HEAP interface where
pointer to rows where a long instead of a (byte*).
pointer to rows where a long instead of a (uchar*).
*/
#if defined(WANT_OLD_HEAP_VERSION) || defined(OLD_HEAP_VERSION)
extern int heap_rrnd_old(HP_INFO *info,byte *buf,ulong pos);
extern int heap_rrnd_old(HP_INFO *info,uchar *buf,ulong pos);
extern ulong heap_position_old(HP_INFO *info);
#endif
#ifdef OLD_HEAP_VERSION
......@@ -244,7 +244,7 @@ typedef ulong HEAP_PTR;
#define heap_position(A) heap_position_old(A)
#define heap_rrnd(A,B,C) heap_rrnd_old(A,B,C)
#else
typedef byte *HEAP_PTR;
typedef uchar *HEAP_PTR;
#endif
#ifdef __cplusplus
......
include/keycache.h
View file @ 6356f563
......@@ -66,9 +66,9 @@ typedef struct st_key_cache
HASH_LINK **hash_root; /* arr. of entries into hash table buckets */
HASH_LINK *hash_link_root; /* memory for hash table links */
HASH_LINK *free_hash_list; /* list of free hash links */
BLOCK_LINK *free_block_list; /* list of free blocks */
BLOCK_LINK *free_block_list; /* list of free blocks */
BLOCK_LINK *block_root; /* memory for block links */
byte HUGE_PTR *block_mem; /* memory for block buffers */
uchar HUGE_PTR *block_mem; /* memory for block buffers */
BLOCK_LINK *used_last; /* ptr to the last block of the LRU chain */
BLOCK_LINK *used_ins; /* ptr to the insertion block in LRU chain */
pthread_mutex_t cache_lock; /* to lock access to the cache structure */
......@@ -115,16 +115,16 @@ extern int resize_key_cache(KEY_CACHE *keycache, uint key_cache_block_size,
uint age_threshold);
extern void change_key_cache_param(KEY_CACHE *keycache, uint division_limit,
uint age_threshold);
extern byte *key_cache_read(KEY_CACHE *keycache,
extern uchar *key_cache_read(KEY_CACHE *keycache,
File file, my_off_t filepos, int level,
byte *buff, uint length,
uchar *buff, uint length,
uint block_length,int return_buffer);
extern int key_cache_insert(KEY_CACHE *keycache,
File file, my_off_t filepos, int level,
byte *buff, uint length);
uchar *buff, uint length);
extern int key_cache_write(KEY_CACHE *keycache,
File file, my_off_t filepos, int level,
byte *buff, uint length,
uchar *buff, uint length,
uint block_length,int force_write);
extern int flush_key_blocks(KEY_CACHE *keycache,
int file, enum flush_type type);
......@@ -133,8 +133,8 @@ extern void end_key_cache(KEY_CACHE *keycache, my_bool cleanup);
/* Functions to handle multiple key caches */
extern my_bool multi_keycache_init(void);
extern void multi_keycache_free(void);
extern KEY_CACHE *multi_key_cache_search(byte *key, uint length);
extern my_bool multi_key_cache_set(const byte *key, uint length,
extern KEY_CACHE *multi_key_cache_search(uchar *key, uint length);
extern my_bool multi_key_cache_set(const uchar *key, uint length,
KEY_CACHE *key_cache);
extern void multi_key_cache_change(KEY_CACHE *old_data,
KEY_CACHE *new_data);
......
include/m_ctype.h
View file @ 6356f563
This diff is collapsed.
include/m_string.h
View file @ 6356f563
......@@ -112,59 +112,59 @@ extern char NEAR _dig_vec_lower[];
/* Prototypes for string functions */
#if !defined(bfill) && !defined(HAVE_BFILL)
extern void bfill(gptr dst,uint len,pchar fill);
extern void bfill(uchar *dst,size_t len,pchar fill);
#endif
#if !defined(bzero) && !defined(HAVE_BZERO)
extern void bzero(gptr dst,uint len);
extern void bzero(uchar * dst,size_t len);
#endif
#if !defined(bcmp) && !defined(HAVE_BCMP)
extern int bcmp(const char *s1,const char *s2,uint len);
extern size_t bcmp(const uchar *s1,const uchar *s2,size_t len);
#endif
#ifdef HAVE_purify
extern int my_bcmp(const char *s1,const char *s2,uint len);
extern size_t my_bcmp(const uchar *s1,const uchar *s2,size_t len);
#undef bcmp
#define bcmp(A,B,C) my_bcmp((A),(B),(C))
#endif
#ifndef bmove512
extern void bmove512(gptr dst,const gptr src,uint len);
extern void bmove512(uchar *dst,const uchar *src,size_t len);
#endif
#if !defined(HAVE_BMOVE) && !defined(bmove)
extern void bmove(char *dst, const char *src,uint len);
extern void bmove(uuchar *dst, const uchar *src,size_t len);
#endif
extern void bmove_upp(char *dst,const char *src,uint len);
extern void bchange(char *dst,uint old_len,const char *src,
uint new_len,uint tot_len);
extern void strappend(char *s,uint len,pchar fill);
extern void bmove_upp(uchar *dst,const uchar *src,size_t len);
extern void bchange(uchar *dst,size_t old_len,const uchar *src,
size_t new_len,size_t tot_len);
extern void strappend(char *s,size_t len,pchar fill);
extern char *strend(const char *s);
extern char *strcend(const char *, pchar);
extern char *strfield(char *src,int fields,int chars,int blanks,
int tabch);
extern char *strfill(my_string s,uint len,pchar fill);
extern uint strinstr(const char *str,const char *search);
extern uint r_strinstr(reg1 my_string str,int from, reg4 my_string search);
extern char *strfill(char * s,size_t len,pchar fill);
extern size_t strinstr(const char *str,const char *search);
extern size_t r_strinstr(const char *str, size_t from, const char *search);
extern char *strkey(char *dst,char *head,char *tail,char *flags);
extern char *strmake(char *dst,const char *src,uint length);
extern char *strmake(char *dst,const char *src,size_t length);
#ifndef strmake_overlapp
extern char *strmake_overlapp(char *dst,const char *src, uint length);
extern char *strmake_overlapp(char *dst,const char *src, size_t length);
#endif
#ifndef strmov
extern char *strmov(char *dst,const char *src);
#endif
extern char *strnmov(char *dst,const char *src,uint n);
extern char *strnmov(char *dst,const char *src,size_t n);
extern char *strsuff(const char *src,const char *suffix);
extern char *strcont(const char *src,const char *set);
extern char *strxcat _VARARGS((char *dst,const char *src, ...));
extern char *strxmov _VARARGS((char *dst,const char *src, ...));
extern char *strxcpy _VARARGS((char *dst,const char *src, ...));
extern char *strxncat _VARARGS((char *dst,uint len, const char *src, ...));
extern char *strxnmov _VARARGS((char *dst,uint len, const char *src, ...));
extern char *strxncpy _VARARGS((char *dst,uint len, const char *src, ...));
extern char *strxncat _VARARGS((char *dst,size_t len, const char *src, ...));
extern char *strxnmov _VARARGS((char *dst,size_t len, const char *src, ...));
extern char *strxncpy _VARARGS((char *dst,size_t len, const char *src, ...));
/* Prototypes of normal stringfunctions (with may ours) */
......@@ -179,7 +179,7 @@ extern size_t strlen(const char *);
#endif
#endif
#ifndef HAVE_STRNLEN
extern uint strnlen(const char *s, uint n);
extern size_t strnlen(const char *s, size_t n);
#endif
#if !defined(__cplusplus)
......@@ -232,9 +232,9 @@ extern ulonglong strtoull(const char *str, char **ptr, int base);
/* my_vsnprintf.c */
extern int my_vsnprintf( char *str, size_t n,
const char *format, va_list ap );
extern int my_snprintf(char *to, size_t n, const char *fmt, ...)
extern size_t my_vsnprintf(char *str, size_t n,
const char *format, va_list ap);
extern size_t my_snprintf(char *to, size_t n, const char *fmt, ...)
ATTRIBUTE_FORMAT(printf, 3, 4);
#if defined(__cplusplus)
......@@ -245,17 +245,18 @@ extern int my_snprintf(char *to, size_t n, const char *fmt, ...)
LEX_STRING -- a pair of a C-string and its length.
NOTE: this exactly form of declaration is required for some C-compilers
(for one, Sun C 5.7 2005/01/07). Unfortunatelt with such declaration
(for one, Sun C 5.7 2005/01/07). Unfortunately with such declaration
LEX_STRING can not be forward declared.
*/
typedef struct
{
char *str;
uint length;
size_t length;
} LEX_STRING;
#define STRING_WITH_LEN(X) (X), ((uint) (sizeof(X) - 1))
#define C_STRING_WITH_LEN(X) ((char *) (X)), ((uint) (sizeof(X) - 1))
#define STRING_WITH_LEN(X) (X), ((size_t) (sizeof(X) - 1))
#define USTRING_WITH_LEN(X) ((uchar*) X), ((size_t) (sizeof(X) - 1))
#define C_STRING_WITH_LEN(X) ((char *) (X)), ((size_t) (sizeof(X) - 1))
#endif
include/my_alloc.h
View file @ 6356f563
......@@ -37,8 +37,8 @@ typedef struct st_mem_root
USED_MEM *used; /* blocks almost without free memory */
USED_MEM *pre_alloc; /* preallocated block */
/* if block have less memory it will be put in 'used' list */
unsigned int min_malloc;
unsigned int block_size; /* initial block size */
size_t min_malloc;
size_t block_size; /* initial block size */
unsigned int block_num; /* allocated blocks counter */
/*
first free block in queue test counter (if it exceed
......
include/my_base.h
View file @ 6356f563
......@@ -478,7 +478,7 @@ enum data_file_type {
typedef struct st_key_range
{
const byte *key;
const uchar *key;
uint length;
key_part_map keypart_map;
enum ha_rkey_function flag;
......
include/my_dbug.h
View file @ 6356f563
......@@ -23,8 +23,8 @@ extern "C" {
struct _db_code_state_;
extern int _db_keyword_(struct _db_code_state_ *cs, const char *keyword);
extern int _db_strict_keyword_(const char *keyword);
extern int _db_explain_(struct _db_code_state_ *cs, char *buf, int len);
extern int _db_explain_init_(char *buf, int len);
extern int _db_explain_(struct _db_code_state_ *cs, char *buf, size_t len);
extern int _db_explain_init_(char *buf, size_t len);
extern void _db_setjmp_(void);
extern void _db_longjmp_(void);
extern void _db_process_(const char *name);
......@@ -40,8 +40,8 @@ extern void _db_return_(uint _line_,const char **_sfunc_,const char **_sfile_,
extern void _db_pargs_(uint _line_,const char *keyword);
extern void _db_doprnt_ _VARARGS((const char *format,...))
ATTRIBUTE_FORMAT(printf, 1, 2);
extern void _db_dump_(uint _line_,const char *keyword,const char *memory,
uint length);
extern void _db_dump_(uint _line_,const char *keyword,
const unsigned char *memory, size_t length);
extern void _db_end_(void);
extern void _db_lock_file_(void);
extern void _db_unlock_file_(void);
......
include/my_getopt.h
View file @ 6356f563
......@@ -44,8 +44,8 @@ struct my_option
const char *name; /* Name of the option */
int id; /* unique id or short option */
const char *comment; /* option comment, for autom. --help */
gptr *value; /* The variable value */
gptr *u_max_value; /* The user def. max variable value */
uchar **value; /* The variable value */
uchar **u_max_value; /* The user def. max variable value */
struct st_typelib *typelib; /* Pointer to possible values */
ulong var_type;
enum get_opt_arg_type arg_type;
......@@ -69,7 +69,7 @@ extern int handle_options (int *argc, char ***argv,
const struct my_option *longopts, my_get_one_option);
extern void my_print_help(const struct my_option *options);
extern void my_print_variables(const struct my_option *options);
extern void my_getopt_register_get_addr(gptr* (*func_addr)(const char *, uint,
extern void my_getopt_register_get_addr(uchar ** (*func_addr)(const char *, uint,
const struct my_option *));
ulonglong getopt_ull_limit_value(ulonglong num, const struct my_option *optp);
......
include/my_global.h
View file @ 6356f563
This diff is collapsed.
include/my_list.h
View file @ 6356f563
......@@ -33,11 +33,11 @@ extern LIST *list_cons(void *data,LIST *root);
extern LIST *list_reverse(LIST *root);
extern void list_free(LIST *root,unsigned int free_data);
extern unsigned int list_length(LIST *);
extern int list_walk(LIST *,list_walk_action action,gptr argument);
extern int list_walk(LIST *,list_walk_action action,unsigned char * argument);
#define list_rest(a) ((a)->next)
#define list_push(a,b) (a)=list_cons((b),(a))
#define list_pop(A) {LIST *old=(A); (A)=list_delete(old,old) ; my_free((gptr) old,MYF(MY_FAE)); }
#define list_pop(A) {LIST *old=(A); (A)=list_delete(old,old) ; my_free((unsigned char *) old,MYF(MY_FAE)); }
#ifdef __cplusplus
}
......
include/my_nosys.h
View file @ 6356f563
......@@ -35,8 +35,9 @@ extern "C" {
#undef my_seek
#define my_read(a,b,c,d) my_quick_read(a,b,c,d)
#define my_write(a,b,c,d) my_quick_write(a,b,c)
extern uint my_quick_read(File Filedes,byte *Buffer,uint Count,myf myFlags);
extern uint my_quick_write(File Filedes,const byte *Buffer,uint Count);
extern size_t my_quick_read(File Filedes,uchar *Buffer,size_t Count,
myf myFlags);
extern size_t my_quick_write(File Filedes,const uchar *Buffer,size_t Count);
#if !defined(SAFEMALLOC) && defined(USE_HALLOC)
#define my_malloc(a,b) halloc(a,1)
......
include/my_pthread.h
View file @ 6356f563
......@@ -688,7 +688,7 @@ struct st_my_thread_var
struct st_my_thread_var *next,**prev;
void *opt_info;
#ifndef DBUG_OFF
gptr dbug;
void *dbug;
char name[THREAD_NAME_SIZE+1];
#endif
};
......
include/my_sys.h
View file @ 6356f563
This diff is collapsed.
include/my_tree.h
View file @ 6356f563
......@@ -25,10 +25,10 @@ extern "C" {
#define MAX_TREE_HEIGHT 64
#define ELEMENT_KEY(tree,element)\
(tree->offset_to_key ? (void*)((byte*) element+tree->offset_to_key) :\
(tree->offset_to_key ? (void*)((uchar*) element+tree->offset_to_key) :\
*((void**) (element+1)))
#define tree_set_pointer(element,ptr) *((byte **) (element+1))=((byte*) (ptr))
#define tree_set_pointer(element,ptr) *((uchar **) (element+1))=((uchar*) (ptr))
#define TREE_NO_DUPS 1
......
include/my_trie.h
View file @ 6356f563
......@@ -22,7 +22,7 @@ extern "C" {
typedef struct st_trie_node
{
uint16 leaf; /* Depth from root node if match, 0 else */
byte c; /* Label on this edge */
uchar c; /* Label on this edge */
struct st_trie_node *next; /* Next label */
struct st_trie_node *links; /* Array of edges leaving this node */
struct st_trie_node *fail; /* AC failure function */
......@@ -45,14 +45,14 @@ typedef struct st_ac_trie_state
extern TRIE *trie_init (TRIE *trie, CHARSET_INFO *charset);
extern void trie_free (TRIE *trie);
extern my_bool trie_insert (TRIE *trie, const byte *key, uint keylen);
extern my_bool trie_insert (TRIE *trie, const uchar *key, uint keylen);
extern my_bool ac_trie_prepare (TRIE *trie);
extern void ac_trie_init (TRIE *trie, AC_TRIE_STATE *state);
/* `trie_goto' is internal function and shouldn't be used. */
static inline TRIE_NODE *trie_goto (TRIE_NODE *root, TRIE_NODE *node, byte c)
static inline TRIE_NODE *trie_goto (TRIE_NODE *root, TRIE_NODE *node, uchar c)
{
TRIE_NODE *next;
DBUG_ENTER("trie_goto");
......@@ -67,7 +67,7 @@ static inline TRIE_NODE *trie_goto (TRIE_NODE *root, TRIE_NODE *node, byte c)
/*
SYNOPSIS
int ac_trie_next (AC_TRIE_STATE *state, byte *c);
int ac_trie_next (AC_TRIE_STATE *state, uchar *c);
state - valid pointer to `AC_TRIE_STATE'
c - character to lookup
......@@ -79,7 +79,7 @@ static inline TRIE_NODE *trie_goto (TRIE_NODE *root, TRIE_NODE *node, byte c)
`ac_trie_next' returns length of matched word or 0.
*/
static inline int ac_trie_next (AC_TRIE_STATE *state, byte *c)
static inline int ac_trie_next (AC_TRIE_STATE *state, uchar *c)
{
TRIE_NODE *root, *node;
DBUG_ENTER("ac_trie_next");
......@@ -94,7 +94,7 @@ static inline int ac_trie_next (AC_TRIE_STATE *state, byte *c)
/*
SYNOPSIS
my_bool trie_search (TRIE *trie, const byte *key, uint keylen);
my_bool trie_search (TRIE *trie, const uchar *key, uint keylen);
trie - valid pointer to `TRIE'
key - valid pointer to key to insert
keylen - non-0 key length
......@@ -113,7 +113,7 @@ static inline int ac_trie_next (AC_TRIE_STATE *state, byte *c)
consecutive loop better (tested)
*/
static inline my_bool trie_search (TRIE *trie, const byte *key, uint keylen)
static inline my_bool trie_search (TRIE *trie, const uchar *key, uint keylen)
{
TRIE_NODE *node;
uint k;
......@@ -123,7 +123,7 @@ static inline my_bool trie_search (TRIE *trie, const byte *key, uint keylen)
for (k= 0; k < keylen; k++)
{
byte p;
uchar p;
if (! (node= node->links))
DBUG_RETURN(FALSE);
p= key[k];
......
include/my_user.h
View file @ 6356f563
This diff is collapsed.
include/my_vle.h
View file @ 6356f563
This diff is collapsed.
include/my_xml.h
View file @ 6356f563
This diff is collapsed.
include/myisam.h
View file @ 6356f563
This diff is collapsed.
include/myisammrg.h
View file @ 6356f563
This diff is collapsed.
include/mysql.h
View file @ 6356f563
This diff is collapsed.
include/mysql_com.h
View file @ 6356f563
This diff is collapsed.
include/queues.h
View file @ 6356f563
This diff is collapsed.
include/sql_common.h
View file @ 6356f563
This diff is collapsed.
include/sslopt-longopts.h
View file @ 6356f563
This diff is collapsed.
include/violite.h
View file @ 6356f563
This diff is collapsed.
libmysql/client_settings.h
View file @ 6356f563
This diff is collapsed.
libmysql/libmysql.c
View file @ 6356f563
This diff is collapsed.
libmysql/manager.c
View file @ 6356f563
This diff is collapsed.
libmysqld/emb_qcache.cc
View file @ 6356f563
This diff is collapsed.
libmysqld/emb_qcache.h
View file @ 6356f563
This diff is collapsed.
libmysqld/lib_sql.cc
View file @ 6356f563
This diff is collapsed.
mysql-test/r/func_misc.result
View file @ 6356f563
This diff is collapsed.
mysql-test/r/sql_mode.result
View file @ 6356f563
This diff is collapsed.
mysql-test/t/func_misc.test
View file @ 6356f563
This diff is collapsed.
mysql-test/t/sql_mode.test
View file @ 6356f563
This diff is collapsed.
mysys/array.c
View file @ 6356f563
This diff is collapsed.
mysys/charset.c
View file @ 6356f563
This diff is collapsed.
mysys/checksum.c
View file @ 6356f563
This diff is collapsed.
mysys/default.c
View file @ 6356f563
This diff is collapsed.
mysys/default_modify.c
View file @ 6356f563
This diff is collapsed.
mysys/hash.c
View file @ 6356f563
This diff is collapsed.
mysys/list.c
View file @ 6356f563
This diff is collapsed.
mysys/mf_cache.c
View file @ 6356f563
This diff is collapsed.
mysys/mf_dirname.c
View file @ 6356f563
This diff is collapsed.
mysys/mf_fn_ext.c
View file @ 6356f563
This diff is collapsed.
mysys/mf_format.c
View file @ 6356f563
This diff is collapsed.
mysys/mf_getdate.c
View file @ 6356f563
This diff is collapsed.
mysys/mf_iocache.c
View file @ 6356f563
This diff is collapsed.
mysys/mf_iocache2.c
View file @ 6356f563
This diff is collapsed.
mysys/mf_keycache.c
View file @ 6356f563
This diff is collapsed.
mysys/mf_keycaches.c
View file @ 6356f563
This diff is collapsed.
mysys/mf_loadpath.c
View file @ 6356f563
This diff is collapsed.
mysys/mf_pack.c
View file @ 6356f563
This diff is collapsed.
mysys/mf_path.c
View file @ 6356f563
This diff is collapsed.
mysys/mf_radix.c
View file @ 6356f563
This diff is collapsed.
mysys/mf_same.c
View file @ 6356f563
This diff is collapsed.
mysys/mf_sort.c
View file @ 6356f563
This diff is collapsed.
mysys/mf_soundex.c
View file @ 6356f563
This diff is collapsed.
mysys/mf_strip.c
View file @ 6356f563
This diff is collapsed.
mysys/mf_tempdir.c
View file @ 6356f563
This diff is collapsed.
mysys/mf_unixpath.c
View file @ 6356f563
This diff is collapsed.
mysys/mf_wfile.c
View file @ 6356f563
This diff is collapsed.
mysys/mulalloc.c
View file @ 6356f563
This diff is collapsed.
mysys/my_alloc.c
View file @ 6356f563
This diff is collapsed.
mysys/my_chsize.c
View file @ 6356f563
This diff is collapsed.
mysys/my_compress.c
View file @ 6356f563
This diff is collapsed.
mysys/my_conio.c
View file @ 6356f563
This diff is collapsed.
mysys/my_create.c
View file @ 6356f563
This diff is collapsed.
mysys/my_div.c
View file @ 6356f563
This diff is collapsed.
mysys/my_error.c
View file @ 6356f563
This diff is collapsed.
mysys/my_fopen.c
View file @ 6356f563
This diff is collapsed.
mysys/my_fstream.c
View file @ 6356f563
This diff is collapsed.
mysys/my_getopt.c
View file @ 6356f563
This diff is collapsed.
mysys/my_getwd.c
View file @ 6356f563
This diff is collapsed.
mysys/my_init.c
View file @ 6356f563
This diff is collapsed.
mysys/my_largepage.c
View file @ 6356f563
This diff is collapsed.
mysys/my_lib.c
View file @ 6356f563
This diff is collapsed.
mysys/my_lockmem.c
View file @ 6356f563
This diff is collapsed.
mysys/my_malloc.c
View file @ 6356f563
This diff is collapsed.
mysys/my_memmem.c
View file @ 6356f563
This diff is collapsed.
mysys/my_once.c
View file @ 6356f563
This diff is collapsed.
mysys/my_open.c
View file @ 6356f563
This diff is collapsed.
mysys/my_pread.c
View file @ 6356f563
This diff is collapsed.
mysys/my_quick.c
View file @ 6356f563
This diff is collapsed.
mysys/my_read.c
View file @ 6356f563
This diff is collapsed.
mysys/my_realloc.c
View file @ 6356f563
This diff is collapsed.
mysys/my_static.c
View file @ 6356f563
This diff is collapsed.
mysys/my_static.h
View file @ 6356f563
This diff is collapsed.
mysys/my_vle.c
View file @ 6356f563
This diff is collapsed.
mysys/my_wincond.c
View file @ 6356f563
This diff is collapsed.
mysys/my_windac.c
View file @ 6356f563
This diff is collapsed.
mysys/my_write.c
View file @ 6356f563
This diff is collapsed.
mysys/ptr_cmp.c
View file @ 6356f563
This diff is collapsed.
mysys/queues.c
View file @ 6356f563
This diff is collapsed.
mysys/safemalloc.c
View file @ 6356f563
This diff is collapsed.
mysys/string.c
View file @ 6356f563
This diff is collapsed.
mysys/testhash.c
View file @ 6356f563
This diff is collapsed.
mysys/thr_alarm.c
View file @ 6356f563
This diff is collapsed.
mysys/thr_lock.c
View file @ 6356f563
This diff is collapsed.
mysys/tree.c
View file @ 6356f563
This diff is collapsed.
mysys/trie.c
View file @ 6356f563
This diff is collapsed.
mysys/typelib.c
View file @ 6356f563
This diff is collapsed.
plugin/daemon_example/daemon_example.cc
View file @ 6356f563
This diff is collapsed.
regex/reginit.c
View file @ 6356f563
This diff is collapsed.
server-tools/instance-manager/buffer.cc
View file @ 6356f563
This diff is collapsed.
server-tools/instance-manager/buffer.h
View file @ 6356f563
This diff is collapsed.
server-tools/instance-manager/commands.cc
View file @ 6356f563
This diff is collapsed.
server-tools/instance-manager/options.cc
View file @ 6356f563
This diff is collapsed.
server-tools/instance-manager/parse.cc
View file @ 6356f563
This diff is collapsed.
server-tools/instance-manager/parse.h
View file @ 6356f563
This diff is collapsed.
server-tools/instance-manager/protocol.cc
View file @ 6356f563
This diff is collapsed.
server-tools/instance-manager/protocol.h
View file @ 6356f563
This diff is collapsed.
server-tools/instance-manager/user_map.cc
View file @ 6356f563
This diff is collapsed.
sql-common/client.c
View file @ 6356f563
This diff is collapsed.
sql-common/my_user.c
View file @ 6356f563
This diff is collapsed.
sql-common/pack.c
View file @ 6356f563
This diff is collapsed.
sql/derror.cc
View file @ 6356f563
This diff is collapsed.
sql/discover.cc
View file @ 6356f563
This diff is collapsed.
sql/event_data_objects.cc
View file @ 6356f563
This diff is collapsed.
sql/event_db_repository.cc
View file @ 6356f563
This diff is collapsed.
sql/event_queue.cc
View file @ 6356f563
This diff is collapsed.
sql/field.cc
View file @ 6356f563
This diff is collapsed.
sql/field.h
View file @ 6356f563
This diff is collapsed.
sql/field_conv.cc
View file @ 6356f563
This diff is collapsed.
sql/filesort.cc
View file @ 6356f563
This diff is collapsed.
sql/gen_lex_hash.cc
View file @ 6356f563
This diff is collapsed.
sql/gstream.h
View file @ 6356f563
This diff is collapsed.
sql/ha_ndbcluster.cc
View file @ 6356f563
This diff is collapsed.
sql/ha_ndbcluster.h
View file @ 6356f563
This diff is collapsed.
sql/ha_ndbcluster_binlog.cc
View file @ 6356f563
This diff is collapsed.
sql/ha_ndbcluster_binlog.h
View file @ 6356f563
This diff is collapsed.
sql/ha_ndbcluster_cond.cc
View file @ 6356f563
This diff is collapsed.
sql/ha_ndbcluster_cond.h
View file @ 6356f563
This diff is collapsed.
sql/ha_partition.cc
View file @ 6356f563
This diff is collapsed.
sql/ha_partition.h
View file @ 6356f563
This diff is collapsed.
sql/handler.cc
View file @ 6356f563
This diff is collapsed.
sql/handler.h
View file @ 6356f563
This diff is collapsed.
sql/hash_filo.h
View file @ 6356f563
This diff is collapsed.
sql/hostname.cc
View file @ 6356f563
This diff is collapsed.
sql/item.cc
View file @ 6356f563
This diff is collapsed.
sql/item.h
View file @ 6356f563
This diff is collapsed.
sql/item_cmpfunc.cc
View file @ 6356f563
This diff is collapsed.
sql/item_cmpfunc.h
View file @ 6356f563
This diff is collapsed.
sql/item_create.cc
View file @ 6356f563
This diff is collapsed.
sql/item_func.cc
View file @ 6356f563
This diff is collapsed.
sql/item_func.h
View file @ 6356f563
This diff is collapsed.
sql/item_row.cc
View file @ 6356f563
This diff is collapsed.
sql/item_row.h
View file @ 6356f563
This diff is collapsed.
sql/item_strfunc.cc
View file @ 6356f563
This diff is collapsed.
sql/item_strfunc.h
View file @ 6356f563
This diff is collapsed.
sql/item_subselect.cc
View file @ 6356f563
This diff is collapsed.
sql/item_subselect.h
View file @ 6356f563
This diff is collapsed.
sql/item_sum.cc
View file @ 6356f563
This diff is collapsed.
sql/item_sum.h
View file @ 6356f563
This diff is collapsed.
sql/item_timefunc.cc
View file @ 6356f563
This diff is collapsed.
sql/item_timefunc.h
View file @ 6356f563
This diff is collapsed.
sql/item_xmlfunc.cc
View file @ 6356f563
This diff is collapsed.
sql/item_xmlfunc.h
View file @ 6356f563
This diff is collapsed.
sql/key.cc
View file @ 6356f563
This diff is collapsed.
sql/lock.cc
View file @ 6356f563
This diff is collapsed.
sql/log.cc
View file @ 6356f563
This diff is collapsed.
sql/log_event.cc
View file @ 6356f563
This diff is collapsed.
sql/log_event.h
View file @ 6356f563
This diff is collapsed.
sql/log_event_old.cc
View file @ 6356f563
This diff is collapsed.
sql/log_event_old.h
View file @ 6356f563
This diff is collapsed.
sql/mf_iocache.cc
View file @ 6356f563
This diff is collapsed.
sql/my_decimal.cc
View file @ 6356f563
This diff is collapsed.
sql/my_decimal.h
View file @ 6356f563
This diff is collapsed.
sql/mysql_priv.h
View file @ 6356f563
This diff is collapsed.
sql/mysqld.cc
View file @ 6356f563
This diff is collapsed.
sql/net_serv.cc
View file @ 6356f563
This diff is collapsed.
sql/opt_range.cc
View file @ 6356f563
This diff is collapsed.
sql/opt_range.h
View file @ 6356f563
This diff is collapsed.
sql/opt_sum.cc
View file @ 6356f563
This diff is collapsed.
sql/parse_file.cc
View file @ 6356f563
This diff is collapsed.
sql/parse_file.h
View file @ 6356f563
This diff is collapsed.
sql/partition_info.cc
View file @ 6356f563
This diff is collapsed.
sql/partition_info.h
View file @ 6356f563
This diff is collapsed.
sql/protocol.cc
View file @ 6356f563
This diff is collapsed.
sql/protocol.h
View file @ 6356f563
This diff is collapsed.
sql/records.cc
View file @ 6356f563
This diff is collapsed.
sql/repl_failsafe.cc
View file @ 6356f563
This diff is collapsed.
sql/rpl_filter.cc
View file @ 6356f563
This diff is collapsed.
sql/rpl_filter.h
View file @ 6356f563
This diff is collapsed.
sql/rpl_injector.h
View file @ 6356f563
This diff is collapsed.
sql/rpl_record.cc
View file @ 6356f563
This diff is collapsed.
sql/rpl_record.h
View file @ 6356f563
This diff is collapsed.
sql/rpl_record_old.cc
View file @ 6356f563
This diff is collapsed.
sql/rpl_record_old.h
View file @ 6356f563
This diff is collapsed.
sql/rpl_rli.cc
View file @ 6356f563
This diff is collapsed.
sql/rpl_tblmap.cc
View file @ 6356f563
This diff is collapsed.
sql/rpl_tblmap.h
View file @ 6356f563
This diff is collapsed.
sql/rpl_utility.cc
View file @ 6356f563
This diff is collapsed.
sql/rpl_utility.h
View file @ 6356f563
This diff is collapsed.
sql/set_var.cc
View file @ 6356f563
This diff is collapsed.
sql/set_var.h
View file @ 6356f563
This diff is collapsed.
sql/slave.cc
View file @ 6356f563
This diff is collapsed.
sql/slave.h
View file @ 6356f563
This diff is collapsed.
sql/sp.cc
View file @ 6356f563
This diff is collapsed.
sql/sp.h
View file @ 6356f563
This diff is collapsed.
sql/sp_cache.cc
View file @ 6356f563
This diff is collapsed.
sql/sp_head.cc
View file @ 6356f563
This diff is collapsed.
sql/sp_head.h
View file @ 6356f563
This diff is collapsed.
sql/sp_pcontext.cc
View file @ 6356f563
This diff is collapsed.
sql/sp_pcontext.h
View file @ 6356f563
This diff is collapsed.
sql/sql_acl.cc
View file @ 6356f563
This diff is collapsed.
sql/sql_analyse.cc
View file @ 6356f563
This diff is collapsed.
sql/sql_analyse.h
View file @ 6356f563
This diff is collapsed.
sql/sql_array.h
View file @ 6356f563
This diff is collapsed.
sql/sql_base.cc
View file @ 6356f563
This diff is collapsed.
sql/sql_binlog.cc
View file @ 6356f563
This diff is collapsed.
sql/sql_cache.cc
View file @ 6356f563
This diff is collapsed.
sql/sql_cache.h
View file @ 6356f563
This diff is collapsed.
sql/sql_class.cc
View file @ 6356f563
This diff is collapsed.
sql/sql_class.h
View file @ 6356f563
This diff is collapsed.
sql/sql_connect.cc
View file @ 6356f563
This diff is collapsed.
sql/sql_db.cc
View file @ 6356f563
This diff is collapsed.
sql/sql_delete.cc
View file @ 6356f563
This diff is collapsed.
sql/sql_handler.cc
View file @ 6356f563
This diff is collapsed.
sql/sql_help.cc
View file @ 6356f563
This diff is collapsed.
sql/sql_insert.cc
View file @ 6356f563
This diff is collapsed.
sql/sql_lex.cc
View file @ 6356f563
This diff is collapsed.
sql/sql_lex.h
View file @ 6356f563
This diff is collapsed.
sql/sql_list.h
View file @ 6356f563
This diff is collapsed.
sql/sql_load.cc
View file @ 6356f563
This diff is collapsed.
sql/sql_manager.cc
View file @ 6356f563
This diff is collapsed.
sql/sql_map.cc
View file @ 6356f563
This diff is collapsed.
sql/sql_map.h
View file @ 6356f563
This diff is collapsed.
sql/sql_olap.cc
View file @ 6356f563
This diff is collapsed.
sql/sql_parse.cc
View file @ 6356f563
This diff is collapsed.
sql/sql_partition.cc
View file @ 6356f563
This diff is collapsed.
sql/sql_partition.h
View file @ 6356f563
This diff is collapsed.
sql/sql_plugin.cc
View file @ 6356f563
This diff is collapsed.
sql/sql_prepare.cc
View file @ 6356f563
This diff is collapsed.
sql/sql_repl.cc
View file @ 6356f563
This diff is collapsed.
sql/sql_select.cc
View file @ 6356f563
This diff is collapsed.
sql/sql_select.h
View file @ 6356f563
This diff is collapsed.
sql/sql_servers.cc
View file @ 6356f563
This diff is collapsed.
sql/sql_show.cc
View file @ 6356f563
This diff is collapsed.
sql/sql_string.cc
View file @ 6356f563
This diff is collapsed.
sql/sql_table.cc
View file @ 6356f563
This diff is collapsed.
sql/sql_test.cc
View file @ 6356f563
This diff is collapsed.
sql/sql_trigger.cc
View file @ 6356f563
This diff is collapsed.
sql/sql_udf.cc
View file @ 6356f563
This diff is collapsed.
sql/sql_union.cc
View file @ 6356f563
This diff is collapsed.
sql/sql_update.cc
View file @ 6356f563
This diff is collapsed.
sql/sql_view.cc
View file @ 6356f563
This diff is collapsed.
sql/sql_yacc.yy
View file @ 6356f563
This diff is collapsed.
sql/stacktrace.c
View file @ 6356f563
This diff is collapsed.
sql/stacktrace.h
View file @ 6356f563
This diff is collapsed.
sql/structs.h
View file @ 6356f563
This diff is collapsed.
sql/table.cc
View file @ 6356f563
This diff is collapsed.
sql/table.h
View file @ 6356f563
This diff is collapsed.
sql/thr_malloc.cc
View file @ 6356f563
This diff is collapsed.
sql/tzfile.h
View file @ 6356f563
This diff is collapsed.
sql/tztime.cc
View file @ 6356f563
This diff is collapsed.
sql/uniques.cc
View file @ 6356f563
This diff is collapsed.
sql/unireg.cc
View file @ 6356f563
This diff is collapsed.
storage/archive/archive_reader.c
View file @ 6356f563
This diff is collapsed.
storage/archive/azio.c
View file @ 6356f563
This diff is collapsed.
storage/archive/ha_archive.cc
View file @ 6356f563
This diff is collapsed.
storage/archive/ha_archive.h
View file @ 6356f563
This diff is collapsed.
storage/blackhole/ha_blackhole.cc
View file @ 6356f563
This diff is collapsed.
storage/blackhole/ha_blackhole.h
View file @ 6356f563
This diff is collapsed.
storage/csv/ha_tina.cc
View file @ 6356f563
This diff is collapsed.
storage/csv/ha_tina.h
View file @ 6356f563
This diff is collapsed.
storage/csv/transparent_file.cc
View file @ 6356f563
This diff is collapsed.
storage/csv/transparent_file.h
View file @ 6356f563
This diff is collapsed.
storage/example/ha_example.cc
View file @ 6356f563
This diff is collapsed.
storage/example/ha_example.h
View file @ 6356f563
This diff is collapsed.
storage/federated/ha_federated.cc
View file @ 6356f563
This diff is collapsed.
storage/federated/ha_federated.h
View file @ 6356f563
This diff is collapsed.
storage/heap/_check.c
View file @ 6356f563
This diff is collapsed.
storage/heap/_rectest.c
View file @ 6356f563
This diff is collapsed.
storage/heap/ha_heap.cc
View file @ 6356f563
This diff is collapsed.
storage/heap/ha_heap.h
View file @ 6356f563
This diff is collapsed.
storage/heap/heapdef.h
View file @ 6356f563
This diff is collapsed.
storage/heap/hp_block.c
View file @ 6356f563
This diff is collapsed.
storage/heap/hp_clear.c
View file @ 6356f563
This diff is collapsed.
storage/heap/hp_close.c
View file @ 6356f563
This diff is collapsed.
storage/heap/hp_create.c
View file @ 6356f563
This diff is collapsed.
storage/heap/hp_delete.c
View file @ 6356f563
This diff is collapsed.
storage/heap/hp_hash.c
View file @ 6356f563
This diff is collapsed.
storage/heap/hp_info.c
View file @ 6356f563
This diff is collapsed.
storage/heap/hp_open.c
View file @ 6356f563
This diff is collapsed.
storage/heap/hp_rfirst.c
View file @ 6356f563
This diff is collapsed.
storage/heap/hp_rkey.c
View file @ 6356f563
This diff is collapsed.
storage/heap/hp_rlast.c
View file @ 6356f563
This diff is collapsed.
storage/heap/hp_rnext.c
View file @ 6356f563
This diff is collapsed.
storage/heap/hp_rprev.c
View file @ 6356f563
This diff is collapsed.
storage/heap/hp_rrnd.c
View file @ 6356f563
This diff is collapsed.
storage/heap/hp_rsame.c
View file @ 6356f563
This diff is collapsed.
storage/heap/hp_scan.c
View file @ 6356f563
This diff is collapsed.
storage/heap/hp_test1.c
View file @ 6356f563
This diff is collapsed.
storage/heap/hp_test2.c
View file @ 6356f563
This diff is collapsed.
storage/heap/hp_update.c
View file @ 6356f563
This diff is collapsed.
storage/heap/hp_write.c
View file @ 6356f563
This diff is collapsed.
storage/innobase/handler/ha_innodb.cc
View file @ 6356f563
This diff is collapsed.
storage/innobase/handler/ha_innodb.h
View file @ 6356f563
This diff is collapsed.
storage/myisam/ft_boolean_search.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/ft_nlq_search.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/ft_parser.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/ft_static.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/ft_stopwords.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/ft_update.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/ftdefs.h
View file @ 6356f563
This diff is collapsed.
storage/myisam/fulltext.h
View file @ 6356f563
This diff is collapsed.
storage/myisam/ha_myisam.cc
View file @ 6356f563
This diff is collapsed.
storage/myisam/ha_myisam.h
View file @ 6356f563
This diff is collapsed.
storage/myisam/mi_cache.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/mi_check.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/mi_checksum.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/mi_close.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/mi_create.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/mi_delete.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/mi_delete_all.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/mi_dynrec.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/mi_extra.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/mi_key.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/mi_locking.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/mi_log.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/mi_open.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/mi_packrec.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/mi_page.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/mi_preload.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/mi_range.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/mi_rfirst.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/mi_rkey.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/mi_rlast.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/mi_rnext.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/mi_rnext_same.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/mi_rprev.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/mi_rrnd.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/mi_rsame.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/mi_rsamepos.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/mi_scan.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/mi_search.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/mi_static.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/mi_statrec.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/mi_test1.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/mi_test2.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/mi_test3.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/mi_unique.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/mi_update.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/mi_write.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/myisam_ftdump.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/myisamchk.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/myisamdef.h
View file @ 6356f563
This diff is collapsed.
storage/myisam/myisamlog.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/myisampack.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/rt_index.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/rt_split.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/sort.c
View file @ 6356f563
This diff is collapsed.
storage/myisam/sp_defs.h
View file @ 6356f563
This diff is collapsed.
storage/myisam/sp_key.c
View file @ 6356f563
This diff is collapsed.
storage/myisammrg/ha_myisammrg.cc
View file @ 6356f563
This diff is collapsed.
storage/myisammrg/ha_myisammrg.h
View file @ 6356f563
This diff is collapsed.
storage/myisammrg/myrg_close.c
View file @ 6356f563
This diff is collapsed.
storage/myisammrg/myrg_def.h
View file @ 6356f563
This diff is collapsed.
storage/myisammrg/myrg_delete.c
View file @ 6356f563
This diff is collapsed.
storage/myisammrg/myrg_open.c
View file @ 6356f563
This diff is collapsed.
storage/myisammrg/myrg_queue.c
View file @ 6356f563
This diff is collapsed.
storage/myisammrg/myrg_rfirst.c
View file @ 6356f563
This diff is collapsed.
storage/myisammrg/myrg_rkey.c
View file @ 6356f563
This diff is collapsed.
storage/myisammrg/myrg_rlast.c
View file @ 6356f563
This diff is collapsed.
storage/myisammrg/myrg_rnext.c
View file @ 6356f563
This diff is collapsed.
storage/myisammrg/myrg_rnext_same.c
View file @ 6356f563
This diff is collapsed.
storage/myisammrg/myrg_rprev.c
View file @ 6356f563
This diff is collapsed.
storage/myisammrg/myrg_rrnd.c
View file @ 6356f563
This diff is collapsed.
storage/myisammrg/myrg_rsame.c
View file @ 6356f563
This diff is collapsed.
storage/myisammrg/myrg_update.c
View file @ 6356f563
This diff is collapsed.
storage/myisammrg/myrg_write.c
View file @ 6356f563
This diff is collapsed.
storage/ndb/include/util/ndb_opts.h
View file @ 6356f563
This diff is collapsed.
storage/ndb/src/cw/cpcd/main.cpp
View file @ 6356f563
This diff is collapsed.
storage/ndb/src/kernel/vm/Configuration.cpp
View file @ 6356f563
This diff is collapsed.
storage/ndb/src/mgmclient/main.cpp
View file @ 6356f563
This diff is collapsed.
storage/ndb/src/mgmsrv/main.cpp
View file @ 6356f563
This diff is collapsed.
storage/ndb/src/ndbapi/NdbBlob.cpp
View file @ 6356f563
This diff is collapsed.
storage/ndb/src/ndbapi/NdbOperationInt.cpp
View file @ 6356f563
This diff is collapsed.
storage/ndb/src/ndbapi/NdbScanOperation.cpp
View file @ 6356f563
This diff is collapsed.
storage/ndb/tools/delete_all.cpp
View file @ 6356f563
This diff is collapsed.
storage/ndb/tools/desc.cpp
View file @ 6356f563
This diff is collapsed.
storage/ndb/tools/drop_index.cpp
View file @ 6356f563
This diff is collapsed.
storage/ndb/tools/drop_tab.cpp
View file @ 6356f563
This diff is collapsed.
storage/ndb/tools/listTables.cpp
View file @ 6356f563
This diff is collapsed.
storage/ndb/tools/ndb_config.cpp
View file @ 6356f563
This diff is collapsed.
storage/ndb/tools/restore/restore_main.cpp
View file @ 6356f563
This diff is collapsed.
storage/ndb/tools/select_all.cpp
View file @ 6356f563
This diff is collapsed.
storage/ndb/tools/select_count.cpp
View file @ 6356f563
This diff is collapsed.
storage/ndb/tools/waiter.cpp
View file @ 6356f563
This diff is collapsed.
strings/bchange.c
View file @ 6356f563
This diff is collapsed.
strings/bcmp.c
View file @ 6356f563
This diff is collapsed.
strings/bmove512.c
View file @ 6356f563
This diff is collapsed.
strings/bmove_upp.c
View file @ 6356f563
This diff is collapsed.
strings/ctype-big5.c
View file @ 6356f563
This diff is collapsed.
strings/ctype-bin.c
View file @ 6356f563
This diff is collapsed.
strings/ctype-cp932.c
View file @ 6356f563
This diff is collapsed.
strings/ctype-czech.c
View file @ 6356f563
This diff is collapsed.
strings/ctype-euc_kr.c
View file @ 6356f563
This diff is collapsed.
strings/ctype-eucjpms.c
View file @ 6356f563
This diff is collapsed.
strings/ctype-gb2312.c
View file @ 6356f563
This diff is collapsed.
strings/ctype-gbk.c
View file @ 6356f563
This diff is collapsed.
strings/ctype-latin1.c
View file @ 6356f563
This diff is collapsed.
strings/ctype-mb.c
View file @ 6356f563
This diff is collapsed.
strings/ctype-simple.c
View file @ 6356f563
This diff is collapsed.
strings/ctype-sjis.c
View file @ 6356f563
This diff is collapsed.
strings/ctype-tis620.c
View file @ 6356f563
This diff is collapsed.
strings/ctype-uca.c
View file @ 6356f563
This diff is collapsed.
strings/ctype-ucs2.c
View file @ 6356f563
This diff is collapsed.
strings/ctype-ujis.c
View file @ 6356f563
This diff is collapsed.
strings/ctype-utf8.c
View file @ 6356f563
This diff is collapsed.
strings/ctype-win1250ch.c
View file @ 6356f563
This diff is collapsed.
strings/ctype.c
View file @ 6356f563
This diff is collapsed.
strings/decimal.c
View file @ 6356f563
This diff is collapsed.
strings/do_ctype.c
View file @ 6356f563
This diff is collapsed.
strings/my_strtoll10.c
View file @ 6356f563
This diff is collapsed.
strings/my_vsnprintf.c
View file @ 6356f563
This diff is collapsed.
strings/r_strinstr.c
View file @ 6356f563
This diff is collapsed.
strings/str_test.c
View file @ 6356f563
This diff is collapsed.
strings/strappend.c
View file @ 6356f563
This diff is collapsed.
strings/strcont.c
View file @ 6356f563
This diff is collapsed.
strings/strfill.c
View file @ 6356f563
This diff is collapsed.
strings/strinstr.c
View file @ 6356f563
This diff is collapsed.
strings/strlen.c
View file @ 6356f563
This diff is collapsed.
strings/strmake.c
View file @ 6356f563
This diff is collapsed.
strings/strnlen.c
View file @ 6356f563
This diff is collapsed.
strings/strnmov.c
View file @ 6356f563
This diff is collapsed.
strings/strto.c
View file @ 6356f563
This diff is collapsed.
strings/strtod.c
View file @ 6356f563
This diff is collapsed.
strings/strxnmov.c
View file @ 6356f563
This diff is collapsed.
strings/xml.c
View file @ 6356f563
This diff is collapsed.
tests/mysql_client_test.c
View file @ 6356f563
This diff is collapsed.
tests/thread_test.c
View file @ 6356f563
This diff is collapsed.
vio/test-ssl.c
View file @ 6356f563
This diff is collapsed.
vio/test-sslclient.c
View file @ 6356f563
This diff is collapsed.
vio/test-sslserver.c
View file @ 6356f563
This diff is collapsed.
vio/vio.c
View file @ 6356f563
This diff is collapsed.
vio/vio_priv.h
View file @ 6356f563
This diff is collapsed.
vio/viosocket.c
View file @ 6356f563
This diff is collapsed.
vio/viossl.c
View file @ 6356f563
This diff is collapsed.
vio/viosslfactories.c
View file @ 6356f563
This diff is collapsed.
vio/viotest-ssl.c
View file @ 6356f563
This diff is collapsed.
win/README
View file @ 6356f563
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7