Skip to content

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

Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql 


Docs/manual.texi:
  Auto merged
parents 47760621 0ce8adf2
Expand all Show whitespace changes
Inline Side-by-side
Showing with 913 additions and 58 deletions
Docs/manual.texi
View file @ e9255e42
...@@ -7011,7 +7011,8 @@ table. @xref{Crashing}. ...@@ -7011,7 +7011,8 @@ table. @xref{Crashing}.
To get a core dump on Linux if mysqld dies with a SIGSEGV To get a core dump on Linux if mysqld dies with a SIGSEGV
signal, you can start mysqld with the @code{--core-file} option. Note signal, you can start mysqld with the @code{--core-file} option. Note
that you also probably need to raise the @code{core file size} by adding that you also probably need to raise the @code{core file size} by adding
@code{ulimit -c 1000000} to @code{safe_mysqld}. @xref{safe_mysqld}. @code{ulimit -c 1000000} to @code{safe_mysqld} or starting @code{safe_mysqld}
with @code{--core-file-sizes=1000000}. @xref{safe_mysqld}.
If you are using LinuxThreads and @code{mysqladmin shutdown} doesn't work, If you are using LinuxThreads and @code{mysqladmin shutdown} doesn't work,
you must upgrade to LinuxThreads Version 0.7.1 or newer. you must upgrade to LinuxThreads Version 0.7.1 or newer.
...@@ -13465,7 +13466,7 @@ One way to avoid this problem is to start @code{mysqld} with @code{-O ...@@ -13465,7 +13466,7 @@ One way to avoid this problem is to start @code{mysqld} with @code{-O
lower_case_table_names=1}. lower_case_table_names=1}.
In this case @strong{MySQL} will convert all table names to lower case on In this case @strong{MySQL} will convert all table names to lower case on
storage and lookup. Not that you need to first convert your old table storage and lookup. Note that you need to first convert your old table
names to lower case before starting @code{mysqld} with this option. names to lower case before starting @code{mysqld} with this option.
@cindex variables, user @cindex variables, user
...@@ -20227,6 +20228,9 @@ or SHOW LOGS ...@@ -20227,6 +20228,9 @@ or SHOW LOGS
or SHOW [FULL] PROCESSLIST or SHOW [FULL] PROCESSLIST
or SHOW GRANTS FOR user or SHOW GRANTS FOR user
or SHOW CREATE TABLE table_name or SHOW CREATE TABLE table_name
or SHOW MASTER STATUS
or SHOW MASTER LOGS
or SHOW SLAVE STATUS
@end example @end example
@code{SHOW} provides information about databases, tables, columns, or @code{SHOW} provides information about databases, tables, columns, or
...@@ -26423,14 +26427,10 @@ If this is not desirable, you should delete the @file{master.info} file before ...@@ -26423,14 +26427,10 @@ If this is not desirable, you should delete the @file{master.info} file before
restarting, and the slave will read its master from @code{my.cnf} or the restarting, and the slave will read its master from @code{my.cnf} or the
command line. (Slave) command line. (Slave)
@item @code{SHOW MASTER STATUS} @item @code{SHOW MASTER STATUS} @tab Provides status information on the binlog of the master. (Master)
@tab Provides status information on the binlog of the master. (Master)
@item @code{SHOW SLAVE STATUS} @item @code{SHOW SLAVE STATUS} @tab Provides status information on essential parameters of the slave thread. (Slave)
@tab Provides status information on essential parameters of the slave thread. (Slave) @item @code{SHOW MASTER LOGS} @tab Only available starting in Version 3.23.28. Lists the binary logs on the master. You should use this command prior to @code{PURGE MASTER LOGS TO} to find out how far you should go.
@item @code{SHOW MASTER LOGS}
@tab Only available starting in Version 3.23.28. Lists the binary logs on the master. You should use this command
prior to @code{PURGE MASTER LOGS TO} to find out how far you should go.
@item @code{PURGE MASTER LOGS TO 'logname'} @item @code{PURGE MASTER LOGS TO 'logname'}
@tab Available starting in Version 3.23.28. Deletes all the @tab Available starting in Version 3.23.28. Deletes all the
...@@ -26442,13 +26442,12 @@ log index, so that the given log now becomes first. Example: ...@@ -26442,13 +26442,12 @@ log index, so that the given log now becomes first. Example:
PURGE MASTER LOGS TO 'mysql-bin.010' PURGE MASTER LOGS TO 'mysql-bin.010'
@end example @end example
This command will do nothing and fail with an error This command will do nothing and fail with an error if you have an
if you have an active slave that active slave that is currently reading one of the logs you are trying to
is currently reading one of the logs you are trying to delete. However, delete. However, if you have a dormant slave, and happen to purge one of
if you have a dormant slave, and happen to purge one of the logs it the logs it wants to read, the slave will be unable to replicate once it
wants to read, the slave will be unable to replicate once it comes up. comes up. The command is safe to run while slaves are replicating - you
The command is safe to run while slaves are replicating - you do not do not need to stop them.
need to stop them.
You must first check all the slaves with @code{SHOW SLAVE STATUS} to You must first check all the slaves with @code{SHOW SLAVE STATUS} to
see which log they are on, then do a listing of the logs on the see which log they are on, then do a listing of the logs on the
...@@ -26490,21 +26489,20 @@ it up from @code{pthread_cond_wait()}. In the meantime, the slave ...@@ -26490,21 +26489,20 @@ it up from @code{pthread_cond_wait()}. In the meantime, the slave
could have opened another connection, which resulted in another could have opened another connection, which resulted in another
@code{Binlog_Dump} thread. @code{Binlog_Dump} thread.
The above problem should not be present in Version 3.23.26 and later versions. The above problem should not be present in Version 3.23.26 and later
In Version 3.23.26 we added @code{server-id} to each replication server, and versions. In Version 3.23.26 we added @code{server-id} to each
now all the old zombie threads are killed on the master when a new replication thread replication server, and now all the old zombie threads are killed on the
connects from the same slave master when a new replication thread connects from the same slave
@strong{Q}: How do I rotate replication logs? @strong{Q}: How do I rotate replication logs?
@strong{A}: In Version 3.23.28 you should use @code{PURGE MASTER LOGS TO} @strong{A}: In Version 3.23.28 you should use @code{PURGE MASTER LOGS
command after determining which logs can be deleted, and optionally TO} command after determining which logs can be deleted, and optionally
backing them up first. In earlier versions the process is much more backing them up first. In earlier versions the process is much more
painful, and cannot be safely done without stopping all the slaves in painful, and cannot be safely done without stopping all the slaves in
the case that you plan to re-use log names . the case that you plan to re-use log names. You will need to stop the
You will need to stop the slave threads, edit the binary log index slave threads, edit the binary log index file, delete all the old logs,
file, delete all the old logs, restart the master, start slave threads, restart the master, start slave threads,and then remove the old log files.
and then remove the old log files.
@strong{Q}: How do I upgrade on a hot replication setup? @strong{Q}: How do I upgrade on a hot replication setup?
...@@ -26811,14 +26809,14 @@ sketchy information, it would take us a while to track down the problem. The ...@@ -26811,14 +26809,14 @@ sketchy information, it would take us a while to track down the problem. The
evidence you should collect is: evidence you should collect is:
@itemize @bullet @itemize @bullet
@item @item
all binary logs on the master All binary logs on the master
@item @item
all binary log on the slave All binary log on the slave
@item @item
the output of @code{SHOW MASTER STATUS} on the master at the time The output of @code{SHOW MASTER STATUS} on the master at the time
you have discovered the problem you have discovered the problem
@item @item
the output of @code{SHOW SLAVE STATUS} on the master at the time The output of @code{SHOW SLAVE STATUS} on the master at the time
you have discovered the problem you have discovered the problem
@item @item
Error logs on the master and on the slave Error logs on the master and on the slave
...@@ -29107,7 +29105,7 @@ Path to @code{mysqld} ...@@ -29107,7 +29105,7 @@ Path to @code{mysqld}
Name of the mysqld version in the @code{ledir} directory you want to start. Name of the mysqld version in the @code{ledir} directory you want to start.
@item --no-defaults @item --no-defaults
@item --open-files-limit=# @item --open-files-limit=#
Number of files @code{mysqld} should be able to open. Passed to @code{ulimit -n}. Not that you need to start @code{safe_mysqld} as root for this to work properly! Number of files @code{mysqld} should be able to open. Passed to @code{ulimit -n}. Note that you need to start @code{safe_mysqld} as root for this to work properly!
@item --pid-file=path @item --pid-file=path
@item --port=# @item --port=#
@item --socket=path @item --socket=path
...@@ -35670,19 +35668,7 @@ None. ...@@ -35670,19 +35668,7 @@ None.
@subsubheading Errors @subsubheading Errors
@table @code None.
@item CR_COMMANDS_OUT_OF_SYNC
Commands were executed in an improper order.
@item CR_SERVER_GONE_ERROR
The @strong{MySQL} server has gone away.
@item CR_SERVER_LOST
The connection to the server was lost during the query.
@item CR_UNKNOWN_ERROR
An unknown error occurred.
@end table
@findex @code{mysql_connect()} @findex @code{mysql_connect()}
@node mysql_connect, mysql_change_user, mysql_close, C API functions @node mysql_connect, mysql_change_user, mysql_close, C API functions
client/mysqltest.c
View file @ e9255e42
This diff is collapsed.
mysql-test/t/backup.test
View file @ e9255e42
...@@ -4,6 +4,7 @@ connection con1; ...@@ -4,6 +4,7 @@ connection con1;
set SQL_LOG_BIN=0; set SQL_LOG_BIN=0;
drop table if exists t1; drop table if exists t1;
create table t1(n int); create table t1(n int);
--replace "errno = 2" "errno = X" "errno = 22" "errno = X"
backup table t1 to '../bogus'; backup table t1 to '../bogus';
backup table t1 to '../tmp'; backup table t1 to '../tmp';
drop table t1; drop table t1;
......
sql-bench/crash-me.sh
View file @ e9255e42
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
# as such, and clarify ones such as "mediumint" with comments such as # as such, and clarify ones such as "mediumint" with comments such as
# "3-byte int" or "same as xxx". # "3-byte int" or "same as xxx".
$version="1.55"; $version="1.56";
use DBI; use DBI;
use Getopt::Long; use Getopt::Long;
...@@ -1333,7 +1333,7 @@ report("index in create table",'index_in_create', ...@@ -1333,7 +1333,7 @@ report("index in create table",'index_in_create',
# The following must be executed as we need the value of end_drop_keyword # The following must be executed as we need the value of end_drop_keyword
# later # later
if (defined($limits{'create_index'}) && defined($limits{'drop_index'})) if (!(defined($limits{'create_index'}) && defined($limits{'drop_index'})))
{ {
if ($res=safe_query("create index crash_q on crash_me (a)")) if ($res=safe_query("create index crash_q on crash_me (a)"))
{ {
......
sql/item_func.cc
View file @ e9255e42
...@@ -1870,7 +1870,7 @@ double Item_func_match::val() ...@@ -1870,7 +1870,7 @@ double Item_func_match::val()
if (ft_handler==NULL) if (ft_handler==NULL)
init_search(1); init_search(1);
if (null_value=(ft_handler==NULL)) if ((null_value= (ft_handler==NULL)))
return 0.0; return 0.0;
if (join_key) if (join_key)
......
sql/sql_yacc.yy
View file @ e9255e42
...@@ -1842,7 +1842,7 @@ group_clause: ...@@ -1842,7 +1842,7 @@ group_clause:
group_list: group_list:
group_list ',' group_ident group_list ',' group_ident
{ if (add_group_to_list($3,(bool) 1)) YYABORT; } { if (add_group_to_list($3,(bool) 1)) YYABORT; }
| group_ident order_dir | group_ident
{ if (add_group_to_list($1,(bool) 1)) YYABORT; } { if (add_group_to_list($1,(bool) 1)) YYABORT; }
/* /*
...@@ -2410,7 +2410,7 @@ table_wild: ...@@ -2410,7 +2410,7 @@ table_wild:
{ $$ = new Item_field((current_thd->client_capabilities & CLIENT_NO_SCHEMA ? NullS : $1.str),$3.str,"*"); } { $$ = new Item_field((current_thd->client_capabilities & CLIENT_NO_SCHEMA ? NullS : $1.str),$3.str,"*"); }
group_ident: group_ident:
order_ident order_ident order_dir
order_ident: order_ident:
expr { $$=$1; } expr { $$=$1; }
......
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