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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
611fd752
Commit
611fd752
authored
19 years ago
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
parents
ec459b58
053b7bf7
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
8 deletions
+12
-8
mysql-test/r/ctype_ucs.result
mysql-test/r/ctype_ucs.result
+1
-1
mysql-test/r/user_var.result
mysql-test/r/user_var.result
+8
-5
mysql-test/t/user_var.test
mysql-test/t/user_var.test
+2
-1
sql/log_event.cc
sql/log_event.cc
+1
-1
No files found.
mysql-test/r/ctype_ucs.result
View file @
611fd752
...
@@ -520,7 +520,7 @@ Log_name Pos Event_type Server_id Orig_log_pos Info
...
@@ -520,7 +520,7 @@ Log_name Pos Event_type Server_id Orig_log_pos Info
master-bin.000001 79 User var 1 79 @`v`=_ucs2 0x006100620063 COLLATE ucs2_general_ci
master-bin.000001 79 User var 1 79 @`v`=_ucs2 0x006100620063 COLLATE ucs2_general_ci
master-bin.000001 119 Query 1 119 use `test`; insert into t2 values (@v)
master-bin.000001 119 Query 1 119 use `test`; insert into t2 values (@v)
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
SET @`v`:=_ucs2 0x006100620063 COLLATE
ucs2_general_ci
;
SET @`v`:=_ucs2 0x006100620063 COLLATE
`ucs2_general_ci`
;
use test;
use test;
SET TIMESTAMP=10000;
SET TIMESTAMP=10000;
insert into t2 values (@v);
insert into t2 values (@v);
...
...
This diff is collapsed.
Click to expand it.
mysql-test/r/user_var.result
View file @
611fd752
...
@@ -168,21 +168,24 @@ SET TIMESTAMP=10000;
...
@@ -168,21 +168,24 @@ SET TIMESTAMP=10000;
SET @`a b`='hello';
SET @`a b`='hello';
INSERT INTO t1 VALUES(@`a b`);
INSERT INTO t1 VALUES(@`a b`);
set @var1= "';aaa";
set @var1= "';aaa";
insert into t1 values (@var1);
SET @var2=char(ascii('a'));
insert into t1 values (@var1),(@var2);
show binlog events from 79;
show binlog events from 79;
Log_name Pos Event_type Server_id Orig_log_pos Info
Log_name Pos Event_type Server_id Orig_log_pos Info
master-bin.000001 79 User var 1 79 @`a b`=_latin1 0x68656C6C6F COLLATE latin1_swedish_ci
master-bin.000001 79 User var 1 79 @`a b`=_latin1 0x68656C6C6F COLLATE latin1_swedish_ci
master-bin.000001 120 Query 1 120 use `test`; INSERT INTO t1 VALUES(@`a b`)
master-bin.000001 120 Query 1 120 use `test`; INSERT INTO t1 VALUES(@`a b`)
master-bin.000001 184 User var 1 184 @`var1`=_latin1 0x273B616161 COLLATE latin1_swedish_ci
master-bin.000001 184 User var 1 184 @`var1`=_latin1 0x273B616161 COLLATE latin1_swedish_ci
master-bin.000001 226 Query 1 226 use `test`; insert into t1 values (@var1)
master-bin.000001 226 User var 1 226 @`var2`=_binary 0x61 COLLATE binary
master-bin.000001 264 Query 1 264 use `test`; insert into t1 values (@var1),(@var2)
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
SET @`a b`:=_latin1 0x68656C6C6F COLLATE
latin1_swedish_ci
;
SET @`a b`:=_latin1 0x68656C6C6F COLLATE
`latin1_swedish_ci`
;
use test;
use test;
SET TIMESTAMP=10000;
SET TIMESTAMP=10000;
INSERT INTO t1 VALUES(@`a b`);
INSERT INTO t1 VALUES(@`a b`);
SET @`var1`:=_latin1 0x273B616161 COLLATE latin1_swedish_ci;
SET @`var1`:=_latin1 0x273B616161 COLLATE `latin1_swedish_ci`;
SET @`var2`:=_binary 0x61 COLLATE `binary`;
SET TIMESTAMP=10000;
SET TIMESTAMP=10000;
insert into t1 values (@var1);
insert into t1 values (@var1)
,(@var2)
;
drop table t1;
drop table t1;
set @var= NULL ;
set @var= NULL ;
select FIELD( @var,'1it','Hit') as my_column;
select FIELD( @var,'1it','Hit') as my_column;
...
...
This diff is collapsed.
Click to expand it.
mysql-test/t/user_var.test
View file @
611fd752
...
@@ -107,7 +107,8 @@ SET TIMESTAMP=10000;
...
@@ -107,7 +107,8 @@ SET TIMESTAMP=10000;
SET
@
`a b`
=
'hello'
;
SET
@
`a b`
=
'hello'
;
INSERT
INTO
t1
VALUES
(
@
`a b`
);
INSERT
INTO
t1
VALUES
(
@
`a b`
);
set
@
var1
=
"';aaa"
;
set
@
var1
=
"';aaa"
;
insert
into
t1
values
(
@
var1
);
SET
@
var2
=
char
(
ascii
(
'a'
));
insert
into
t1
values
(
@
var1
),(
@
var2
);
show
binlog
events
from
79
;
show
binlog
events
from
79
;
# more important than SHOW BINLOG EVENTS, mysqlbinlog (where we
# more important than SHOW BINLOG EVENTS, mysqlbinlog (where we
# absolutely need variables names to be quoted and strings to be
# absolutely need variables names to be quoted and strings to be
...
...
This diff is collapsed.
Click to expand it.
sql/log_event.cc
View file @
611fd752
...
@@ -2459,7 +2459,7 @@ void User_var_log_event::print(FILE* file, bool short_form, char* last_db)
...
@@ -2459,7 +2459,7 @@ void User_var_log_event::print(FILE* file, bool short_form, char* last_db)
*/
*/
fprintf
(
file
,
":=???;
\n
"
);
fprintf
(
file
,
":=???;
\n
"
);
else
else
fprintf
(
file
,
":=_%s %s COLLATE
%s
;
\n
"
,
cs
->
csname
,
hex_str
,
cs
->
name
);
fprintf
(
file
,
":=_%s %s COLLATE
`%s`
;
\n
"
,
cs
->
csname
,
hex_str
,
cs
->
name
);
my_afree
(
hex_str
);
my_afree
(
hex_str
);
}
}
break
;
break
;
...
...
This diff is collapsed.
Click to expand it.
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