mirror of
https://github.com/MariaDB/server.git
synced 2025-01-15 19:42:28 +01:00
Changed some MySQL names in messages to MariaDB
- Remove obsolete documentation files - Removed old obsolete information from some documentation files
This commit is contained in:
Monty
parent
ae58cd6b87
commit
c82855d882
21 changed files with 73 additions and 1344 deletions
|
|
@ -1,7 +1,9 @@
|
|||
MariaDB and MySQL have identical install methods. In this document we
|
||||
describe how to install MariaDB; However all documentation at www.mysql.com
|
||||
also applies.
|
||||
describe how to install MariaDB.
|
||||
|
||||
The full documentation for installing MariaDB can be found at
|
||||
https://mariadb.com/kb/en/library/binary-packages/
|
||||
However most documentation at www.mysql.com also applies.
|
||||
|
||||
2.2. Installing MariaDB from Generic Binaries on Unix/Linux
|
||||
|
||||
|
|
@ -33,7 +35,8 @@ also applies.
|
|||
If you run into problems and need to file a bug report,
|
||||
please report them to: http://mariadb.org/jira
|
||||
|
||||
See the instructions in Section 1.6, "How to Report Bugs or Problems."
|
||||
See the instructions at
|
||||
https://mariadb.com/kb/en/mariadb-community-bug-reporting
|
||||
|
||||
The basic commands that you must execute to install and use a
|
||||
MariaDB binary distribution are:
|
||||
|
|
@ -79,10 +82,9 @@ shell> useradd -g mysql mysql
|
|||
is protected, you must perform the installation as root.)
|
||||
shell> cd /usr/local
|
||||
|
||||
3. Obtain a distribution file using the instructions in Section
|
||||
2.1.3, "How to Get MariaDB." For a given release, binary
|
||||
distributions for all platforms are built from the same MariaDB
|
||||
source distribution.
|
||||
3. Obtain a distribution file using the instructions at
|
||||
https://mariadb.com/kb/en/library/where-to-download-mariadb/
|
||||
The description below describes how to install a MariaDB tar file.
|
||||
|
||||
4. Unpack the distribution, which creates the installation
|
||||
directory. Then create a symbolic link to that directory:
|
||||
|
|
@ -149,8 +151,8 @@ shell> chown -R mysql data
|
|||
machine, you can copy support-files/mysql.server to the
|
||||
location where your system has its startup files. More
|
||||
information can be found in the support-files/mysql.server
|
||||
script itself and in Section 2.13.1.2, "Starting and Stopping
|
||||
MariaDB Automatically."
|
||||
script itself and at
|
||||
https://mariadb.com/kb/en/starting-and-stopping-mariadb-automatically.
|
||||
10. You can set up new accounts using the bin/mysql_setpermission
|
||||
script if you install the DBI and DBD::mysql Perl modules. See
|
||||
Section 4.6.14, "mysql_setpermission --- Interactively Set
|
||||
|
|
@ -181,8 +183,8 @@ shell> bin/mysqld_safe --user=mysql &
|
|||
find some information in the host_name.err file in the data
|
||||
directory.
|
||||
|
||||
More information about mysqld_safe is given in Section 4.3.2,
|
||||
"mysqld_safe --- MySQL Server Startup Script."
|
||||
More information about mysqld_safe can be found at
|
||||
https://mariadb.com/kb/en/mysqld_safe
|
||||
|
||||
Note
|
||||
|
||||
|
|
|
|||
|
|
@ -1,137 +0,0 @@
|
|||
diff -r -c --exclude='*.info*' glibc-2.2.5.org/linuxthreads/internals.h glibc-2.2.5/linuxthreads/internals.h
|
||||
*** glibc-2.2.5.org/linuxthreads/internals.h Thu Nov 29 08:44:16 2001
|
||||
--- glibc-2.2.5/linuxthreads/internals.h Tue May 21 10:51:53 2002
|
||||
***************
|
||||
*** 343,349 ****
|
||||
THREAD_SELF implementation is used, this must be a power of two and
|
||||
a multiple of PAGE_SIZE. */
|
||||
#ifndef STACK_SIZE
|
||||
! #define STACK_SIZE (2 * 1024 * 1024)
|
||||
#endif
|
||||
|
||||
/* The initial size of the thread stack. Must be a multiple of PAGE_SIZE. */
|
||||
--- 343,349 ----
|
||||
THREAD_SELF implementation is used, this must be a power of two and
|
||||
a multiple of PAGE_SIZE. */
|
||||
#ifndef STACK_SIZE
|
||||
! #define STACK_SIZE (128 * 1024)
|
||||
#endif
|
||||
|
||||
/* The initial size of the thread stack. Must be a multiple of PAGE_SIZE. */
|
||||
diff -r -c --exclude='*.info*' glibc-2.2.5.org/linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h glibc-2.2.5/linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h
|
||||
*** glibc-2.2.5.org/linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h Thu Jun 8 21:49:49 2000
|
||||
--- glibc-2.2.5/linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h Tue May 21 10:52:58 2002
|
||||
***************
|
||||
*** 64,70 ****
|
||||
/* The number of threads per process. */
|
||||
#define _POSIX_THREAD_THREADS_MAX 64
|
||||
/* This is the value this implementation supports. */
|
||||
! #define PTHREAD_THREADS_MAX 1024
|
||||
|
||||
/* Maximum amount by which a process can descrease its asynchronous I/O
|
||||
priority level. */
|
||||
--- 64,70 ----
|
||||
/* The number of threads per process. */
|
||||
#define _POSIX_THREAD_THREADS_MAX 64
|
||||
/* This is the value this implementation supports. */
|
||||
! #define PTHREAD_THREADS_MAX 4096
|
||||
|
||||
/* Maximum amount by which a process can descrease its asynchronous I/O
|
||||
priority level. */
|
||||
diff -r -c --exclude='*.info*' glibc-2.2.5.org/nss/nsswitch.c glibc-2.2.5/nss/nsswitch.c
|
||||
*** glibc-2.2.5.org/nss/nsswitch.c Tue Jul 17 10:21:36 2001
|
||||
--- glibc-2.2.5/nss/nsswitch.c Tue May 21 10:59:55 2002
|
||||
***************
|
||||
*** 496,501 ****
|
||||
--- 496,502 ----
|
||||
{
|
||||
service_user *new_service;
|
||||
const char *name;
|
||||
+ int name_alloc_len;
|
||||
|
||||
while (isspace (line[0]))
|
||||
++line;
|
||||
***************
|
||||
*** 510,522 ****
|
||||
if (name == line)
|
||||
return result;
|
||||
|
||||
|
||||
new_service = (service_user *) malloc (sizeof (service_user)
|
||||
! + (line - name + 1));
|
||||
if (new_service == NULL)
|
||||
return result;
|
||||
|
||||
! *((char *) __mempcpy (new_service->name, name, line - name)) = '\0';
|
||||
|
||||
/* Set default actions. */
|
||||
new_service->actions[2 + NSS_STATUS_TRYAGAIN] = NSS_ACTION_CONTINUE;
|
||||
--- 511,534 ----
|
||||
if (name == line)
|
||||
return result;
|
||||
|
||||
+ name_alloc_len = line - name + 1;
|
||||
+
|
||||
+ #ifdef DO_STATIC_NSS
|
||||
+ if (!((name_alloc_len == 6 && strncmp(name,"files",5) == 0) ||
|
||||
+ (name_alloc_len == 4 && strncmp(name,"dns",3) == 0)))
|
||||
+ {
|
||||
+ name = (char*) "files";
|
||||
+ name_alloc_len = 6;
|
||||
+ }
|
||||
+ #endif
|
||||
|
||||
new_service = (service_user *) malloc (sizeof (service_user)
|
||||
! + name_alloc_len);
|
||||
if (new_service == NULL)
|
||||
return result;
|
||||
|
||||
! *((char *) __mempcpy (new_service->name, name, name_alloc_len-1)) = '\0';
|
||||
!
|
||||
|
||||
/* Set default actions. */
|
||||
new_service->actions[2 + NSS_STATUS_TRYAGAIN] = NSS_ACTION_CONTINUE;
|
||||
diff -r -c --exclude='*.info*' glibc-2.2.5.org/time/Makefile glibc-2.2.5/time/Makefile
|
||||
*** glibc-2.2.5.org/time/Makefile Fri Aug 10 01:59:41 2001
|
||||
--- glibc-2.2.5/time/Makefile Tue May 21 11:01:11 2002
|
||||
***************
|
||||
*** 37,44 ****
|
||||
|
||||
include ../Rules
|
||||
|
||||
! tz-cflags = -DTZDIR='"$(zonedir)"' \
|
||||
! -DTZDEFAULT='"$(localtime-file)"' \
|
||||
-DTZDEFRULES='"$(posixrules-file)"'
|
||||
|
||||
CFLAGS-tzfile.c = $(tz-cflags)
|
||||
--- 37,44 ----
|
||||
|
||||
include ../Rules
|
||||
|
||||
! tz-cflags = -DTZDIR='"/usr/share/zoneinfo/"' \
|
||||
! -DTZDEFAULT='"/etc/localtime"' \
|
||||
-DTZDEFRULES='"$(posixrules-file)"'
|
||||
|
||||
CFLAGS-tzfile.c = $(tz-cflags)
|
||||
diff -r -c --exclude='*.info*' glibc-2.2.5.org/timezone/Makefile glibc-2.2.5/timezone/Makefile
|
||||
*** glibc-2.2.5.org/timezone/Makefile Thu Aug 30 00:45:25 2001
|
||||
--- glibc-2.2.5/timezone/Makefile Tue May 21 11:01:57 2002
|
||||
***************
|
||||
*** 159,166 ****
|
||||
|
||||
$(objpfx)zic: $(objpfx)scheck.o $(objpfx)ialloc.o
|
||||
|
||||
! tz-cflags = -DTZDIR='"$(zonedir)"' \
|
||||
! -DTZDEFAULT='"$(localtime-file)"' \
|
||||
-DTZDEFRULES='"$(posixrules-file)"' \
|
||||
-DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone
|
||||
|
||||
--- 159,166 ----
|
||||
|
||||
$(objpfx)zic: $(objpfx)scheck.o $(objpfx)ialloc.o
|
||||
|
||||
! tz-cflags = -DTZDIR='"/usr/share/zoneinfo/"' \
|
||||
! -DTZDEFAULT='"/etc/localtime"' \
|
||||
-DTZDEFRULES='"$(posixrules-file)"' \
|
||||
-DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone
|
||||
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
[Note this information is obsolete]
|
||||
|
||||
Notes on compiling glibc for the standard MySQL binary:
|
||||
|
||||
- make sure you have gcc 2.95 and gmake 3.79 or newer
|
||||
- wget ftp://ftp.gnu.org/pub/gnu/glibc/glibc-2.2.5.tar.gz
|
||||
- wget ftp://ftp.gnu.org/pub/gnu/glibc/glibc-linuxthreads-2.2.5.tar.gz
|
||||
- tar zxvf glibc-2.2.5.tar.gz ; cd glibc-2.2.5 ;
|
||||
tar zxvf ../glibc-linuxthreads-2.2.5.tar.gz
|
||||
- patch -p1 < ~/bk/mysql/Docs/glibc-2.2.5.patch
|
||||
- ./configure --prefix=/usr/local/mysql-glibc --enable-static-nss \
|
||||
--disable-shared --enable-add-ons=linuxthreads --target=i386 \
|
||||
--host=i386-pc-linux-gnu
|
||||
- make
|
||||
- possible problems - if compiler is not properly installed, one can get
|
||||
"cpp: too many input" files error - easiest way to solve - SUSE RPM for gcc
|
||||
2.95
|
||||
- surun make install
|
||||
- To build the binaries, run Build-tools/Do-linux-build
|
||||
1100
Docs/sp-imp-spec.txt
1100
Docs/sp-imp-spec.txt
File diff suppressed because it is too large
Load diff
|
|
@ -1,35 +1,15 @@
|
|||
This file should contain all known fatal bugs in Mariadb and the Aria
|
||||
storage engine for the last source or binary release. Minor bugs,
|
||||
extensions and feature requests, and bugs found since this release can
|
||||
be found in the MariaDB bugs database at: http://mariadb.org/jira and
|
||||
in the MySQL bugs databases at: http://bugs.mysql.com/ (category
|
||||
"Maria storage engine").
|
||||
This file should contain all known fatal bugs in MariaDB for the last
|
||||
source or binary release. Minor bugs, extensions and feature requests,
|
||||
and bugs found since this release can be found in the MariaDB bugs
|
||||
database at: https://jira.mariadb.org
|
||||
|
||||
There should not normally be any bugs which affect normal operations
|
||||
in any MariaDB release. Still, there are always exceptions and edge
|
||||
cases and that is what this file is for.
|
||||
|
||||
If you have found a bug that is not listed here, please add it to
|
||||
http://mariadb.org/jira so we can either fix it for next release or in
|
||||
the worst case add it here for others to know!
|
||||
If you have find bug please add it to https://jira.mariadb.org so
|
||||
that we are can try to fix it for the next release. You can also add
|
||||
feature request to the JIRA.
|
||||
|
||||
|
||||
IMPORTANT:
|
||||
|
||||
If you have been using the Maria (now Aria) storage engine with the
|
||||
MySQL-5.1-Maria-alpha build and are upgrading to a newer MariaDB you
|
||||
MUST run [m]aria_chk --recover on all your Aria tables. This is because
|
||||
we made an incompatible change with how the transaction id is stored
|
||||
and old transaction id's must be reset!
|
||||
|
||||
cd mysql-data-directory
|
||||
aria_chk --recover */*.MAI
|
||||
|
||||
Going forward, we will do our best to not introduce any incompatible
|
||||
changes in the data format for Aria tables. If this would be ever be
|
||||
needed, we will, if possible, support both the old and the new version
|
||||
to make upgrades as easy as possible.
|
||||
|
||||
Note that for the MariaDB 5.1 release the Aria storage engine is
|
||||
classified as 'beta'; It should work, but use it with caution. Please
|
||||
report all bugs to http://mariadb.org/jira so we can fix them!
|
||||
The latest documentation for the MariaDB server can be found at:
|
||||
https://mariadb.com/kb
|
||||
|
|
|
|||
12
README.md
12
README.md
|
|
@ -8,13 +8,13 @@ Code status:
|
|||
MariaDB is designed as a drop-in replacement of MySQL(R) with more
|
||||
features, new storage engines, fewer bugs, and better performance.
|
||||
|
||||
MariaDB is brought to you by the MariaDB Foundation.
|
||||
MariaDB is brought to you by the MariaDB Foundation and the MariaDB corporation.
|
||||
Please read the CREDITS file for details about the MariaDB Foundation,
|
||||
and who is developing MariaDB.
|
||||
|
||||
MariaDB is developed by many of the original developers of MySQL who
|
||||
now work for the MariaDB Foundation and the MariaDB Corporation,
|
||||
and by many people in the community.
|
||||
now work for the MariaDB Corporation, the MariaDB Foundation and by
|
||||
many people in the community.
|
||||
|
||||
MySQL, which is the base of MariaDB, is a product and trademark of Oracle
|
||||
Corporation, Inc. For a list of developers and other contributors,
|
||||
|
|
@ -23,14 +23,16 @@ list of active contributors.
|
|||
|
||||
A description of the MariaDB project and a manual can be found at:
|
||||
|
||||
https://mariadb.org/
|
||||
|
||||
https://mariadb.com/kb/en/
|
||||
|
||||
https://mariadb.com/kb/en/mariadb-vs-mysql-features/
|
||||
|
||||
https://mariadb.com/kb/en/mariadb-versus-mysql-compatibility/
|
||||
|
||||
https://mariadb.com/kb/en/library/new-and-old-releases/
|
||||
|
||||
https://mariadb.org/
|
||||
|
||||
As MariaDB is a full replacement of MySQL, the MySQL manual at
|
||||
http://dev.mysql.com/doc is generally applicable.
|
||||
|
||||
|
|
|
|||
|
|
@ -278,9 +278,9 @@ static COMMANDS commands[] = {
|
|||
{ "edit", 'e', com_edit, 0, "Edit command with $EDITOR."},
|
||||
#endif
|
||||
{ "ego", 'G', com_ego, 0,
|
||||
"Send command to mysql server, display result vertically."},
|
||||
"Send command to MariaDB server, display result vertically."},
|
||||
{ "exit", 'q', com_quit, 0, "Exit mysql. Same as quit."},
|
||||
{ "go", 'g', com_go, 0, "Send command to mysql server." },
|
||||
{ "go", 'g', com_go, 0, "Send command to MariaDB server." },
|
||||
{ "help", 'h', com_help, 1, "Display this help." },
|
||||
#ifdef USE_POPEN
|
||||
{ "nopager",'n', com_nopager,0, "Disable pager, print to stdout." },
|
||||
|
|
@ -1537,7 +1537,7 @@ static struct my_option my_long_options[] =
|
|||
&ignore_spaces, &ignore_spaces, 0, GET_BOOL, NO_ARG, 0, 0,
|
||||
0, 0, 0, 0},
|
||||
{"init-command", OPT_INIT_COMMAND,
|
||||
"SQL Command to execute when connecting to MySQL server. Will "
|
||||
"SQL Command to execute when connecting to MariaDB server. Will "
|
||||
"automatically be re-executed when reconnecting.",
|
||||
&opt_init_command, &opt_init_command, 0,
|
||||
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
|
||||
|
|
@ -1599,7 +1599,7 @@ static struct my_option my_long_options[] =
|
|||
"Get progress reports for long running commands (like ALTER TABLE)",
|
||||
&opt_progress_reports, &opt_progress_reports, 0, GET_BOOL, NO_ARG, 1, 0,
|
||||
0, 0, 0, 0},
|
||||
{"prompt", OPT_PROMPT, "Set the mysql prompt to this value.",
|
||||
{"prompt", OPT_PROMPT, "Set the command line prompt to this value.",
|
||||
¤t_prompt, ¤t_prompt, 0, GET_STR_ALLOC,
|
||||
REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
|
||||
{"protocol", OPT_MYSQL_PROTOCOL, "The protocol to use for connection (tcp, socket, pipe).",
|
||||
|
|
@ -3127,7 +3127,7 @@ com_help(String *buffer __attribute__((unused)),
|
|||
|
||||
put_info("\nGeneral information about MariaDB can be found at\n"
|
||||
"http://mariadb.org\n", INFO_INFO);
|
||||
put_info("List of all MySQL commands:", INFO_INFO);
|
||||
put_info("List of all client commands:", INFO_INFO);
|
||||
if (!named_cmds)
|
||||
put_info("Note that all text commands must be first on line and end with ';'",INFO_INFO);
|
||||
for (i = 0; commands[i].name; i++)
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@ static struct my_option my_long_options[]=
|
|||
&opt_default_auth, &opt_default_auth, 0,
|
||||
GET_STR, REQUIRED_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.",
|
||||
"has already been executed for the current version of MariaDB.",
|
||||
&opt_force, &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},
|
||||
|
|
@ -808,7 +808,7 @@ static my_bool is_mysql()
|
|||
strstr(ds_events_struct.str, "IGNORE_BAD_TABLE_OPTIONS") != NULL)
|
||||
ret= FALSE;
|
||||
else
|
||||
verbose("MySQL upgrade detected");
|
||||
verbose("MariaDB upgrade detected");
|
||||
|
||||
dynstr_free(&ds_events_struct);
|
||||
return(ret);
|
||||
|
|
@ -1192,7 +1192,7 @@ int main(int argc, char **argv)
|
|||
*/
|
||||
if (!opt_force && upgrade_already_done(0))
|
||||
{
|
||||
printf("This installation of MySQL is already upgraded to %s, "
|
||||
printf("This installation of MariaDB is already upgraded to %s, "
|
||||
"use --force if you still need to run mysql_upgrade\n",
|
||||
MYSQL_SERVER_VERSION);
|
||||
goto end;
|
||||
|
|
|
|||
|
|
@ -573,7 +573,7 @@ static my_bool sql_connect(MYSQL *mysql, uint wait)
|
|||
if (!info)
|
||||
{
|
||||
info=1;
|
||||
fputs("Waiting for MySQL server to answer",stderr);
|
||||
fputs("Waiting for MariaDB server to answer",stderr);
|
||||
(void) fflush(stderr);
|
||||
}
|
||||
else
|
||||
|
|
|
|||
|
|
@ -1598,7 +1598,7 @@ static struct my_option my_options[] =
|
|||
&opt_default_auth, &opt_default_auth, 0,
|
||||
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
|
||||
{"disable-log-bin", 'D', "Disable binary log. This is useful, if you "
|
||||
"enabled --to-last-log and are sending the output to the same MySQL server. "
|
||||
"enabled --to-last-log and are sending the output to the same MariaDB server. "
|
||||
"This way you could avoid an endless loop. You would also like to use it "
|
||||
"when restoring after a crash to avoid duplication of the statements you "
|
||||
"already have. NOTE: you will need a SUPER privilege to use this option.",
|
||||
|
|
@ -1643,7 +1643,7 @@ static struct my_option my_options[] =
|
|||
{"protocol", OPT_MYSQL_PROTOCOL,
|
||||
"The protocol to use for connection (tcp, socket, pipe).",
|
||||
0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
|
||||
{"read-from-remote-server", 'R', "Read binary logs from a MySQL server.",
|
||||
{"read-from-remote-server", 'R', "Read binary logs from a MariaDB server.",
|
||||
&remote_opt, &remote_opt, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0,
|
||||
0, 0},
|
||||
{"raw", 0, "Requires -R. Output raw binlog data instead of SQL "
|
||||
|
|
@ -1696,7 +1696,7 @@ static struct my_option my_options[] =
|
|||
{"start-datetime", OPT_START_DATETIME,
|
||||
"Start reading the binlog at first event having a datetime equal or "
|
||||
"posterior to the argument; the argument must be a date and time "
|
||||
"in the local time zone, in any format accepted by the MySQL server "
|
||||
"in the local time zone, in any format accepted by the MariaDB server "
|
||||
"for DATETIME and TIMESTAMP types, for example: 2004-12-25 11:25:56 "
|
||||
"(you should probably use quotes for your shell to set it properly).",
|
||||
&start_datetime_str, &start_datetime_str,
|
||||
|
|
@ -1714,7 +1714,7 @@ static struct my_option my_options[] =
|
|||
{"stop-datetime", OPT_STOP_DATETIME,
|
||||
"Stop reading the binlog at first event having a datetime equal or "
|
||||
"posterior to the argument; the argument must be a date and time "
|
||||
"in the local time zone, in any format accepted by the MySQL server "
|
||||
"in the local time zone, in any format accepted by the MariaDB server "
|
||||
"for DATETIME and TIMESTAMP types, for example: 2004-12-25 11:25:56 "
|
||||
"(you should probably use quotes for your shell to set it properly).",
|
||||
&stop_datetime_str, &stop_datetime_str,
|
||||
|
|
@ -1738,7 +1738,7 @@ static struct my_option my_options[] =
|
|||
0, 0, 0, 0, 0, 0},
|
||||
{"to-last-log", 't', "Requires -R. Will not stop at the end of the \
|
||||
requested binlog but rather continue printing until the end of the last \
|
||||
binlog of the MySQL server. If you send the output to the same MySQL server, \
|
||||
binlog of the MariaDB server. If you send the output to the same MariaDB server, \
|
||||
that may lead to an endless loop.",
|
||||
&to_last_remote_log, &to_last_remote_log, 0, GET_BOOL,
|
||||
NO_ARG, 0, 0, 0, 0, 0, 0},
|
||||
|
|
@ -1875,7 +1875,7 @@ static void usage()
|
|||
print_version();
|
||||
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
|
||||
printf("\
|
||||
Dumps a MySQL binary log in a format usable for viewing or for piping to\n\
|
||||
Dumps a MariaDB binary log in a format usable for viewing or for piping to\n\
|
||||
the mysql command line client.\n\n");
|
||||
printf("Usage: %s [options] log-files\n", my_progname);
|
||||
print_defaults("my",load_groups);
|
||||
|
|
@ -2281,7 +2281,7 @@ static Exit_status check_master_version()
|
|||
break;
|
||||
default:
|
||||
error("Could not find server version: "
|
||||
"Master reported unrecognized MySQL version '%s'.", row[0]);
|
||||
"Master reported unrecognized MariaDB version '%s'.", row[0]);
|
||||
goto err;
|
||||
}
|
||||
if (!glob_description_event || !glob_description_event->is_valid())
|
||||
|
|
|
|||
|
|
@ -254,10 +254,10 @@ static struct my_option my_long_options[] =
|
|||
1, 0, 0, 0, 0, 0},
|
||||
{"compatible", OPT_COMPATIBLE,
|
||||
"Change the dump to be compatible with a given mode. By default tables "
|
||||
"are dumped in a format optimized for MySQL. Legal modes are: ansi, "
|
||||
"are dumped in a format optimized for MariaDB. Legal modes are: ansi, "
|
||||
"mysql323, mysql40, postgresql, oracle, mssql, db2, maxdb, no_key_options, "
|
||||
"no_table_options, no_field_options. One can use several modes separated "
|
||||
"by commas. Note: Requires MySQL server version 4.1.0 or higher. "
|
||||
"by commas. Note: Requires MariaDB server version 4.1.0 or higher. "
|
||||
"This option is ignored with earlier server versions.",
|
||||
&opt_compatible_mode_str, &opt_compatible_mode_str, 0,
|
||||
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
|
||||
|
|
@ -274,7 +274,7 @@ static struct my_option my_long_options[] =
|
|||
&opt_compress, &opt_compress, 0, GET_BOOL, NO_ARG, 0, 0, 0,
|
||||
0, 0, 0},
|
||||
{"create-options", 'a',
|
||||
"Include all MySQL specific create options.",
|
||||
"Include all MariaDB specific create options.",
|
||||
&create_options, &create_options, 0, GET_BOOL, NO_ARG, 1,
|
||||
0, 0, 0, 0, 0},
|
||||
{"databases", 'B',
|
||||
|
|
@ -642,7 +642,7 @@ static void usage(void)
|
|||
{
|
||||
print_version();
|
||||
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
|
||||
puts("Dumping structure and contents of MySQL databases and tables.");
|
||||
puts("Dumping structure and contents of MariaDB databases and tables.");
|
||||
short_usage_sub(stdout);
|
||||
print_defaults("my",load_default_groups);
|
||||
puts("");
|
||||
|
|
@ -700,7 +700,7 @@ static void write_header(FILE *sql_file, char *db_name)
|
|||
else if (!opt_compact)
|
||||
{
|
||||
print_comment(sql_file, 0,
|
||||
"-- MySQL dump %s Distrib %s, for %s (%s)\n--\n",
|
||||
"-- MariaDB dump %s Distrib %s, for %s (%s)\n--\n",
|
||||
DUMP_VERSION, MYSQL_SERVER_VERSION, SYSTEM_TYPE,
|
||||
MACHINE_TYPE);
|
||||
print_comment(sql_file, 0, "-- Host: %s ",
|
||||
|
|
@ -5515,7 +5515,7 @@ static int start_transaction(MYSQL *mysql_con)
|
|||
if ((mysql_get_server_version(mysql_con) < 40100) && opt_master_data)
|
||||
{
|
||||
fprintf(stderr, "-- %s: the combination of --single-transaction and "
|
||||
"--master-data requires a MySQL server version of at least 4.1 "
|
||||
"--master-data requires a MariaDB server version of at least 4.1 "
|
||||
"(current server's version is %s). %s\n",
|
||||
ignore_errors ? "Warning" : "Error",
|
||||
mysql_con->server_version ? mysql_con->server_version : "unknown",
|
||||
|
|
|
|||
|
|
@ -195,13 +195,14 @@ static void usage(void)
|
|||
{
|
||||
puts("Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.");
|
||||
puts("Copyright 2008-2011 Oracle and Monty Program Ab.");
|
||||
puts("Copyright 2012-2019 MariaDB Corporation Ab.");
|
||||
print_version();
|
||||
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
|
||||
printf("\
|
||||
Loads tables from text files in various formats. The base name of the\n\
|
||||
text file must be the name of the table that should be used.\n\
|
||||
If one uses sockets to connect to the MySQL server, the server will open and\n\
|
||||
read the text file directly. In other cases the client will open the text\n\
|
||||
If one uses sockets to connect to the MariaDB server, the server will open\n\
|
||||
and read the text file directly. In other cases the client will open the text\n\
|
||||
file. The SQL command 'LOAD DATA INFILE' is used to import the rows.\n");
|
||||
|
||||
printf("\nUsage: %s [OPTIONS] database textfile...\n",my_progname);
|
||||
|
|
|
|||
|
|
@ -268,7 +268,7 @@ static void usage(void)
|
|||
{
|
||||
print_version();
|
||||
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
|
||||
puts("Shows the structure of a MySQL database (databases, tables, and columns).\n");
|
||||
puts("Shows the structure of a MariaDB database (databases, tables, and columns).\n");
|
||||
printf("Usage: %s [OPTIONS] [database [table [column]]]\n",my_progname);
|
||||
puts("\n\
|
||||
If last argument contains a shell or SQL wildcard (*,?,% or _) then only\n\
|
||||
|
|
@ -658,7 +658,7 @@ list_table_status(MYSQL *mysql,const char *db,const char *wild)
|
|||
fprintf(stderr,"%s: Cannot get status for db: %s, table: %s: %s\n",
|
||||
my_progname,db,wild ? wild : "",mysql_error(mysql));
|
||||
if (mysql_errno(mysql) == ER_PARSE_ERROR)
|
||||
fprintf(stderr,"This error probably means that your MySQL server doesn't support the\n\'show table status' command.\n");
|
||||
fprintf(stderr,"This error probably means that your MariaDB server doesn't support the\n\'show table status' command.\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -623,7 +623,7 @@ static struct my_option my_long_options[] =
|
|||
{"host", 'h', "Connect to host.", &host, &host, 0, GET_STR,
|
||||
REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
|
||||
{"init-command", OPT_INIT_COMMAND,
|
||||
"SQL Command to execute when connecting to MySQL server. Will "
|
||||
"SQL Command to execute when connecting to MariaDB server. Will "
|
||||
"automatically be re-executed when reconnecting.",
|
||||
&opt_init_command, &opt_init_command, 0,
|
||||
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
|
||||
|
|
|
|||
|
|
@ -7170,7 +7170,7 @@ void usage()
|
|||
{
|
||||
print_version();
|
||||
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
|
||||
printf("Runs a test against the mysql server and compares output with a results file.\n\n");
|
||||
printf("Runs a test against the MariaDB server and compares output with a results file.\n\n");
|
||||
printf("Usage: %s [OPTIONS] [database] < test_file\n", my_progname);
|
||||
print_defaults("my",load_default_groups);
|
||||
puts("");
|
||||
|
|
@ -7928,7 +7928,7 @@ int append_warnings(DYNAMIC_STRING *ds, MYSQL* mysql)
|
|||
static void handle_no_active_connection(struct st_command *command,
|
||||
struct st_connection *cn, DYNAMIC_STRING *ds)
|
||||
{
|
||||
handle_error(command, 2006, "MySQL server has gone away", "000000", ds);
|
||||
handle_error(command, 2006, "MariaDB server has gone away", "000000", ds);
|
||||
cn->pending= FALSE;
|
||||
var_set_errno(2006);
|
||||
}
|
||||
|
|
@ -9245,7 +9245,7 @@ int main(int argc, char **argv)
|
|||
if (mysql_server_init(embedded_server_arg_count,
|
||||
embedded_server_args,
|
||||
(char**) embedded_server_groups))
|
||||
die("Can't initialize MySQL server");
|
||||
die("Can't initialize MariaDB server");
|
||||
server_initialized= 1;
|
||||
if (cur_file == file_stack && cur_file->file == 0)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ static void usage(void)
|
|||
{
|
||||
print_version();
|
||||
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
|
||||
printf("Print a description for a system error code or a MySQL error code.\n");
|
||||
printf("Print a description for a system error code or a MariaDB error code.\n");
|
||||
printf("If you want to get the error for a negative error code, you should use\n-- before the first error code to tell perror that there was no more options.\n\n");
|
||||
printf("Usage: %s [OPTIONS] [ERRORCODE [ERRORCODE...]]\n",my_progname);
|
||||
my_print_help(my_long_options);
|
||||
|
|
@ -336,7 +336,7 @@ int main(int argc,char *argv[])
|
|||
{
|
||||
found= 1;
|
||||
if (verbose)
|
||||
printf("MySQL error code %3d: %s\n", code, msg);
|
||||
printf("MariaDB error code %3d: %s\n", code, msg);
|
||||
else
|
||||
puts(msg);
|
||||
}
|
||||
|
|
@ -344,7 +344,7 @@ int main(int argc,char *argv[])
|
|||
{
|
||||
found= 1;
|
||||
if (verbose)
|
||||
printf("MySQL error code %3d (%s): %s\n", code, name, msg);
|
||||
printf("MariaDB error code %3d (%s): %s\n", code, name, msg);
|
||||
else
|
||||
puts(msg);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ static void print_version(void)
|
|||
static void usage()
|
||||
{
|
||||
print_version();
|
||||
printf("MySQL AB, by Sasha Pachev\n");
|
||||
printf("MariaDB Corporation, originally created by Sasha Pachev\n");
|
||||
printf("This software comes with ABSOLUTELY NO WARRANTY\n\n");
|
||||
printf("Resolve numeric stack strace dump into symbols.\n\n");
|
||||
printf("Usage: %s [OPTIONS] symbols-file [numeric-dump-file]\n",
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ test
|
|||
Phase 7/7: Running 'FLUSH PRIVILEGES'
|
||||
OK
|
||||
Run it again - should say already completed
|
||||
This installation of MySQL is already upgraded to VERSION, use --force if you still need to run mysql_upgrade
|
||||
This installation of MariaDB is already upgraded to VERSION, use --force if you still need to run mysql_upgrade
|
||||
Force should run it regardless of whether it has been run before
|
||||
Phase 1/7: Checking and upgrading mysql database
|
||||
Processing databases
|
||||
|
|
|
|||
|
|
@ -210,7 +210,7 @@ v3 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
|
|||
show create view v4;
|
||||
View Create View character_set_client collation_connection
|
||||
v4 CREATE ALGORITHM=TEMPTABLE DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v4` AS select `t1`.`a` AS `a` from `t1` latin1 latin1_swedish_ci
|
||||
MySQL upgrade detected
|
||||
MariaDB upgrade detected
|
||||
Phase 1/7: Checking and upgrading mysql database
|
||||
Processing databases
|
||||
mysql
|
||||
|
|
@ -334,7 +334,7 @@ drop view v1,v2,v3,v4;
|
|||
rename table mysql.event to mysql.ev_bk;
|
||||
flush tables;
|
||||
The --upgrade-system-tables option was used, user tables won't be touched.
|
||||
MySQL upgrade detected
|
||||
MariaDB upgrade detected
|
||||
Phase 1/7: Checking and upgrading mysql database
|
||||
Processing databases
|
||||
mysql
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
MySQL error code 150: Foreign key constraint is incorrectly formed
|
||||
MariaDB error code 150: Foreign key constraint is incorrectly formed
|
||||
Win32 error code 150: System trace information was not specified in your CONFIG.SYS file, or tracing is disallowed.
|
||||
OS error code 23: Too many open files in system
|
||||
Win32 error code 23: Data error (cyclic redundancy check).
|
||||
MySQL error code 1062 (ER_DUP_ENTRY): Duplicate entry '%-.192s' for key %d
|
||||
MariaDB error code 1062 (ER_DUP_ENTRY): Duplicate entry '%-.192s' for key %d
|
||||
Win32 error code 1062: The service has not been started.
|
||||
Illegal error code: 30000
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
Illegal error code: 10000
|
||||
MySQL error code 1062 (ER_DUP_ENTRY): Duplicate entry '%-.192s' for key %d
|
||||
MySQL error code 1408 (ER_STARTUP): %s: ready for connections.
|
||||
MariaDB error code 1062 (ER_DUP_ENTRY): Duplicate entry '%-.192s' for key %d
|
||||
MariaDB error code 1408 (ER_STARTUP): %s: ready for connections.
|
||||
Version: '%s' socket: '%s' port: %d %s
|
||||
MySQL error code 1459 (ER_TABLE_NEEDS_UPGRADE): Upgrade required. Please do "REPAIR %s %`s" or dump/reload to fix it!
|
||||
MySQL error code 1461 (ER_MAX_PREPARED_STMT_COUNT_REACHED): Can't create more than max_prepared_stmt_count statements (current value: %u)
|
||||
MariaDB error code 1459 (ER_TABLE_NEEDS_UPGRADE): Upgrade required. Please do "REPAIR %s %`s" or dump/reload to fix it!
|
||||
MariaDB error code 1461 (ER_MAX_PREPARED_STMT_COUNT_REACHED): Can't create more than max_prepared_stmt_count statements (current value: %u)
|
||||
|
|
|
|||
Loading…
Reference in a new issue