Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
3356ce98
Commit
3356ce98
authored
Mar 17, 2010
by
Luis Soares
Browse files
Options
Browse Files
Download
Plain Diff
Merge bundle from bug report.
parents
26a8eda4
229da7c0
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
52 additions
and
1 deletion
+52
-1
mysql-test/suite/rpl/r/rpl_stm_user_variables.result
mysql-test/suite/rpl/r/rpl_stm_user_variables.result
+16
-0
mysql-test/suite/rpl/t/rpl_stm_user_variables.test
mysql-test/suite/rpl/t/rpl_stm_user_variables.test
+33
-0
sql/item_func.cc
sql/item_func.cc
+1
-0
sql/log.cc
sql/log.cc
+1
-1
sql/sql_class.h
sql/sql_class.h
+1
-0
No files found.
mysql-test/suite/rpl/r/rpl_stm_user_variables.result
View file @
3356ce98
...
@@ -206,3 +206,19 @@ Comparing tables master:test.t1 and slave:test.t1
...
@@ -206,3 +206,19 @@ Comparing tables master:test.t1 and slave:test.t1
TRUNCATE t1;
TRUNCATE t1;
## check: contents of both tables master's and slave's
## check: contents of both tables master's and slave's
DROP TABLE t1;
DROP TABLE t1;
stop slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
CREATE TABLE t1 ( c INT, PRIMARY KEY (c)) Engine=MyISAM;
CREATE TRIGGER tr1 AFTER INSERT ON t1 FOR EACH ROW SET @aux = -1 ;
SET @aux = 10294947273192243200;
SET @aux1= @aux;
INSERT INTO t1 VALUES (@aux) , (@aux1);
ERROR 23000: Duplicate entry '2147483647' for key 'PRIMARY'
## assertion: master and slave tables are in sync
Comparing tables master:test.t1 and slave:test.t1
DROP TRIGGER tr1;
DROP TABLE t1;
mysql-test/suite/rpl/t/rpl_stm_user_variables.test
View file @
3356ce98
...
@@ -139,3 +139,36 @@ TRUNCATE t1;
...
@@ -139,3 +139,36 @@ TRUNCATE t1;
--
connection
master
--
connection
master
DROP
TABLE
t1
;
DROP
TABLE
t1
;
--
sync_slave_with_master
--
sync_slave_with_master
#####################################################################
#
# BUG#51426
#
#####################################################################
--
source
include
/
master
-
slave
-
reset
.
inc
--
connection
master
CREATE
TABLE
t1
(
c
INT
,
PRIMARY
KEY
(
c
))
Engine
=
MyISAM
;
# offending trigger that would reset the unsigned flag for aux before
# binlogging of User_var_log_event would take place.
CREATE
TRIGGER
tr1
AFTER
INSERT
ON
t1
FOR
EACH
ROW
SET
@
aux
=
-
1
;
SET
@
aux
=
10294947273192243200
;
SET
@
aux1
=
@
aux
;
--
error
ER_DUP_ENTRY
INSERT
INTO
t1
VALUES
(
@
aux
)
,
(
@
aux1
);
--
sync_slave_with_master
--
echo
## assertion: master and slave tables are in sync
--
let
$diff_table_1
=
master
:
test
.
t1
--
let
$diff_table_2
=
slave
:
test
.
t1
--
source
include
/
diff_tables
.
inc
--
connection
master
DROP
TRIGGER
tr1
;
DROP
TABLE
t1
;
--
sync_slave_with_master
sql/item_func.cc
View file @
3356ce98
...
@@ -4766,6 +4766,7 @@ int get_var_with_binlog(THD *thd, enum_sql_command sql_command,
...
@@ -4766,6 +4766,7 @@ int get_var_with_binlog(THD *thd, enum_sql_command sql_command,
user_var_event
->
user_var_event
=
var_entry
;
user_var_event
->
user_var_event
=
var_entry
;
user_var_event
->
type
=
var_entry
->
type
;
user_var_event
->
type
=
var_entry
->
type
;
user_var_event
->
charset_number
=
var_entry
->
collation
.
collation
->
number
;
user_var_event
->
charset_number
=
var_entry
->
collation
.
collation
->
number
;
user_var_event
->
unsigned_flag
=
var_entry
->
unsigned_flag
;
if
(
!
var_entry
->
value
)
if
(
!
var_entry
->
value
)
{
{
/* NULL value*/
/* NULL value*/
...
...
sql/log.cc
View file @
3356ce98
...
@@ -4671,7 +4671,7 @@ bool MYSQL_BIN_LOG::write(Log_event *event_info)
...
@@ -4671,7 +4671,7 @@ bool MYSQL_BIN_LOG::write(Log_event *event_info)
/* setting flags for user var log event */
/* setting flags for user var log event */
uchar
flags
=
User_var_log_event
::
UNDEF_F
;
uchar
flags
=
User_var_log_event
::
UNDEF_F
;
if
(
user_var_event
->
u
ser_var_event
->
u
nsigned_flag
)
if
(
user_var_event
->
unsigned_flag
)
flags
|=
User_var_log_event
::
UNSIGNED_F
;
flags
|=
User_var_log_event
::
UNSIGNED_F
;
User_var_log_event
e
(
thd
,
user_var_event
->
user_var_event
->
name
.
str
,
User_var_log_event
e
(
thd
,
user_var_event
->
user_var_event
->
name
.
str
,
...
...
sql/sql_class.h
View file @
3356ce98
...
@@ -75,6 +75,7 @@ typedef struct st_user_var_events
...
@@ -75,6 +75,7 @@ typedef struct st_user_var_events
ulong
length
;
ulong
length
;
Item_result
type
;
Item_result
type
;
uint
charset_number
;
uint
charset_number
;
bool
unsigned_flag
;
}
BINLOG_USER_VAR_EVENT
;
}
BINLOG_USER_VAR_EVENT
;
#define RP_LOCK_LOG_IS_ALREADY_LOCKED 1
#define RP_LOCK_LOG_IS_ALREADY_LOCKED 1
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment