Commit 384999f3 authored by Sergei Golubchik's avatar Sergei Golubchik

MDEV-6528 review debian patches for mysql

and apply whatever was reasonable
parent e9085100
...@@ -194,7 +194,7 @@ DWord() {} ...@@ -194,7 +194,7 @@ DWord() {}
"a" (a), "rm" (b) : "cc"); "a" (a), "rm" (b) : "cc");
#elif defined(__mips64) #elif defined(__mips64)
__asm__("dmultu %2,%3" : "=h" (r.halfs_.high), "=l" (r.halfs_.low) __asm__("dmultu %2,%3" : "=d" (r.halfs_.high), "=l" (r.halfs_.low)
: "r" (a), "r" (b)); : "r" (a), "r" (b));
#elif defined(_M_IX86) #elif defined(_M_IX86)
......
...@@ -81,7 +81,7 @@ const char *client_errors[]= ...@@ -81,7 +81,7 @@ const char *client_errors[]=
"Attempt to read a row while there is no result set associated with the statement", "Attempt to read a row while there is no result set associated with the statement",
"This feature is not implemented yet", "This feature is not implemented yet",
"Lost connection to MySQL server at '%s', system error: %d", "Lost connection to MySQL server at '%s', system error: %d",
"Statement closed indirectly because of a preceeding %s() call", "Statement closed indirectly because of a preceding %s() call",
"The number of columns in the result set differs from the number of bound buffers. You must reset the statement, rebind the result set columns, and execute the statement again", "The number of columns in the result set differs from the number of bound buffers. You must reset the statement, rebind the result set columns, and execute the statement again",
"This handle is already connected. Use a separate handle for each connection.", "This handle is already connected. Use a separate handle for each connection.",
"Authentication plugin '%s' cannot be loaded: %s", "Authentication plugin '%s' cannot be loaded: %s",
......
...@@ -98,8 +98,8 @@ ...@@ -98,8 +98,8 @@
# --> less switching of AUTOCOMMIT mode on master side. # --> less switching of AUTOCOMMIT mode on master side.
# #
# 4. Never use a test object, which was direct or indirect affected by a # 4. Never use a test object, which was direct or indirect affected by a
# preceeding test sequence again. # preceding test sequence again.
# If one preceeding test sequence hits a (sometimes not visible, # If one preceding test sequence hits a (sometimes not visible,
# because the sql error code of the statement might be 0) bug # because the sql error code of the statement might be 0) bug
# and these rules are ignored, a following test sequence might earn ugly # and these rules are ignored, a following test sequence might earn ugly
# effects like failing 'sync_slave_with_master', crashes of the slave or # effects like failing 'sync_slave_with_master', crashes of the slave or
......
...@@ -221,7 +221,7 @@ INSERT INTO t7 VALUES (1,3), (2,6), (3,9); ...@@ -221,7 +221,7 @@ INSERT INTO t7 VALUES (1,3), (2,6), (3,9);
SELECT * FROM t7 ORDER BY C1; SELECT * FROM t7 ORDER BY C1;
# since bug#31552/31609 idempotency is not default any longer. In order # since bug#31552/31609 idempotency is not default any longer. In order
# the preceeding test INSERT INTO t7 to pass the mode is switched # the preceding test INSERT INTO t7 to pass the mode is switched
# temprorarily # temprorarily
set @@global.slave_exec_mode= 'IDEMPOTENT'; set @@global.slave_exec_mode= 'IDEMPOTENT';
...@@ -260,7 +260,7 @@ INSERT INTO t8 VALUES (1,2,3), (2,4,6), (3,6,9); ...@@ -260,7 +260,7 @@ INSERT INTO t8 VALUES (1,2,3), (2,4,6), (3,6,9);
SELECT * FROM t8 ORDER BY a; SELECT * FROM t8 ORDER BY a;
# since bug#31552/31609 idempotency is not default any longer. In order # since bug#31552/31609 idempotency is not default any longer. In order
# the preceeding test INSERT INTO t8 to pass the mode is switched # the preceding test INSERT INTO t8 to pass the mode is switched
# temprorarily # temprorarily
set @@global.slave_exec_mode= 'IDEMPOTENT'; set @@global.slave_exec_mode= 'IDEMPOTENT';
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
# 1. We wait for $current_sessions <= $count_sessions because in the use case # 1. We wait for $current_sessions <= $count_sessions because in the use case
# with count_sessions.inc before and wait_until_count_sessions.inc after # with count_sessions.inc before and wait_until_count_sessions.inc after
# the core of the test it could happen that the disconnects of sessions # the core of the test it could happen that the disconnects of sessions
# belonging to the preceeding test are not finished. # belonging to the preceding test are not finished.
# sessions at test begin($count_sessions) = m + n # sessions at test begin($count_sessions) = m + n
# sessions of the previous test which will be soon disconnected = n (n >= 0) # sessions of the previous test which will be soon disconnected = n (n >= 0)
# sessions at test end ($current sessions, assuming the test disconnects # sessions at test end ($current sessions, assuming the test disconnects
......
...@@ -282,7 +282,7 @@ INSERT INTO t1_values SET ...@@ -282,7 +282,7 @@ INSERT INTO t1_values SET
# other interesting value # other interesting value
# numbers -> 0 # numbers -> 0
# strings, blobs, binaries -> not full length of used data type, "exotic" # strings, blobs, binaries -> not full length of used data type, "exotic"
# characters and preceeding and trailing spaces # characters and preceding and trailing spaces
# FIXME enum, set ?? # FIXME enum, set ??
INSERT INTO t1_values SET INSERT INTO t1_values SET
my_char_30 = ' ---äÖüß@µ*$-- ', my_char_30 = ' ---äÖüß@µ*$-- ',
......
...@@ -545,7 +545,7 @@ let $message= Testcase 3.3.1.7 ; ...@@ -545,7 +545,7 @@ let $message= Testcase 3.3.1.7 ;
# view names are accepted, at creation time, alteration time, # view names are accepted, at creation time, alteration time,
# and drop time. # and drop time.
############################################################################### ###############################################################################
# Note(mleich): non-qualified view name means a view name without preceeding # Note(mleich): non-qualified view name means a view name without preceding
# database name # database name
--disable_warnings --disable_warnings
DROP VIEW IF EXISTS v1 ; DROP VIEW IF EXISTS v1 ;
......
...@@ -13,10 +13,10 @@ ...@@ -13,10 +13,10 @@
# sequences start. # sequences start.
# #
# 2. Never use a test object, which was direct or indirect affected by a # 2. Never use a test object, which was direct or indirect affected by a
# preceeding test sequence again. # preceding test sequence again.
# Except table d1.t1 where ONLY DML is allowed. # Except table d1.t1 where ONLY DML is allowed.
# #
# If one preceeding test sequence hits a (sometimes not good visible, # If one preceding test sequence hits a (sometimes not good visible,
# because the sql error code of the statement might be 0) bug # because the sql error code of the statement might be 0) bug
# and these rules are ignored, a following test sequence might earn ugly # and these rules are ignored, a following test sequence might earn ugly
# effects like failing 'sync_slave_with_master', crashes of the slave or # effects like failing 'sync_slave_with_master', crashes of the slave or
......
...@@ -244,7 +244,7 @@ sync_slave_with_master; ...@@ -244,7 +244,7 @@ sync_slave_with_master;
UPDATE t1 SET a = 5, b = 'slave' WHERE a = 1; UPDATE t1 SET a = 5, b = 'slave' WHERE a = 1;
SELECT * FROM t1 ORDER BY a; SELECT * FROM t1 ORDER BY a;
# since bug#31552/31609 idempotency is not default any longer. In # since bug#31552/31609 idempotency is not default any longer. In
# order for the preceeding test UPDATE t1 to pass, the mode is switched # order for the preceding test UPDATE t1 to pass, the mode is switched
# temprorarily # temprorarily
set @@global.slave_exec_mode= 'IDEMPOTENT'; set @@global.slave_exec_mode= 'IDEMPOTENT';
--echo **** On Master **** --echo **** On Master ****
......
...@@ -3649,7 +3649,7 @@ int Query_log_event::do_apply_event(Relay_log_info const *rli, ...@@ -3649,7 +3649,7 @@ int Query_log_event::do_apply_event(Relay_log_info const *rli,
if ((error= rows_event_stmt_cleanup(const_cast<Relay_log_info*>(rli), thd))) if ((error= rows_event_stmt_cleanup(const_cast<Relay_log_info*>(rli), thd)))
{ {
const_cast<Relay_log_info*>(rli)->report(ERROR_LEVEL, error, const_cast<Relay_log_info*>(rli)->report(ERROR_LEVEL, error,
"Error in cleaning up after an event preceeding the commit; " "Error in cleaning up after an event preceding the commit; "
"the group log file/position: %s %s", "the group log file/position: %s %s",
const_cast<Relay_log_info*>(rli)->group_master_log_name, const_cast<Relay_log_info*>(rli)->group_master_log_name,
llstr(const_cast<Relay_log_info*>(rli)->group_master_log_pos, llstr(const_cast<Relay_log_info*>(rli)->group_master_log_pos,
......
...@@ -66,7 +66,7 @@ int mi_rnext(MI_INFO *info, uchar *buf, int inx) ...@@ -66,7 +66,7 @@ int mi_rnext(MI_INFO *info, uchar *buf, int inx)
Normally SQL layer would never request "search next" if Normally SQL layer would never request "search next" if
"search first" failed. But HANDLER may do anything. "search first" failed. But HANDLER may do anything.
As mi_rnext() without preceeding mi_rkey()/mi_rfirst() As mi_rnext() without preceding mi_rkey()/mi_rfirst()
equals to mi_rfirst(), we must restore original state equals to mi_rfirst(), we must restore original state
as if failing mi_rfirst() was not called. as if failing mi_rfirst() was not called.
*/ */
......
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