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
5b209040
Commit
5b209040
authored
Nov 15, 2004
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-mysqladmin
parents
595d467d
b4786351
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
222 additions
and
19 deletions
+222
-19
mysql-test/r/ctype_tis620.result
mysql-test/r/ctype_tis620.result
+38
-0
mysql-test/r/rpl_rewrite_db.result
mysql-test/r/rpl_rewrite_db.result
+70
-0
mysql-test/t/ctype_tis620.test
mysql-test/t/ctype_tis620.test
+35
-0
mysql-test/t/rpl_rewrite_db-slave.opt
mysql-test/t/rpl_rewrite_db-slave.opt
+1
-1
mysql-test/t/rpl_rewrite_db.test
mysql-test/t/rpl_rewrite_db.test
+58
-0
sql/log_event.cc
sql/log_event.cc
+16
-10
sql/log_event.h
sql/log_event.h
+1
-1
strings/ctype-tis620.c
strings/ctype-tis620.c
+3
-7
No files found.
mysql-test/r/ctype_tis620.result
View file @
5b209040
...
@@ -2899,3 +2899,41 @@ hex(a) STRCMP(a,'a') STRCMP(a,'a ')
...
@@ -2899,3 +2899,41 @@ hex(a) STRCMP(a,'a') STRCMP(a,'a ')
6109 -1 -1
6109 -1 -1
61 0 0
61 0 0
DROP TABLE t1;
DROP TABLE t1;
CREATE TABLE t1 (
`id` int(11) NOT NULL auto_increment,
`url` varchar(200) NOT NULL default '',
`name` varchar(250) NOT NULL default '',
`type` int(11) NOT NULL default '0',
`website` varchar(250) NOT NULL default '',
`adddate` date NOT NULL default '0000-00-00',
`size` varchar(20) NOT NULL default '',
`movieid` int(11) NOT NULL default '0',
`musicid` int(11) NOT NULL default '0',
`star` varchar(20) NOT NULL default '',
`download` int(11) NOT NULL default '0',
`lastweek` int(11) NOT NULL default '0',
`thisweek` int(11) NOT NULL default '0',
`page` varchar(250) NOT NULL default '',
PRIMARY KEY (`id`),
UNIQUE KEY `url` (`url`)
) CHARACTER SET tis620;
INSERT INTO t1 VALUES
(1,'http://www.siamzone.com/download/download/000001-frodo_1024.jpg','The Lord
of the Rings
Wallpapers',1,'http://www.lordoftherings.net','2002-01-22','',448,0,'',3805,0,0,
'');
INSERT INTO t1 VALUES (2,'http://www.othemovie.com/OScreenSaver1.EXE','O
Screensaver',2,'','2002-01-22','',491,0,'',519,0,0,'');
INSERT INTO t1 VALUES
(3,'http://www.siamzone.com/download/download/000003-jasonx2(800x600).jpg','Jaso
n X Wallpapers',1,'','2002-05-31','',579,0,'',1091,0,0,'');
select * from t1 order by id;
id url name type website adddate size movieid musicid star download lastweek thisweek page
1 http://www.siamzone.com/download/download/000001-frodo_1024.jpg The Lord
of the Rings
Wallpapers 1 http://www.lordoftherings.net 2002-01-22 448 0 3805 0 0
2 http://www.othemovie.com/OScreenSaver1.EXE O
Screensaver 2 2002-01-22 491 0 519 0 0
3 http://www.siamzone.com/download/download/000003-jasonx2(800x600).jpg Jaso
n X Wallpapers 1 2002-05-31 579 0 1091 0 0
DROP TABLE t1;
mysql-test/r/rpl_rewrite_db.result
View file @
5b209040
...
@@ -20,3 +20,73 @@ a
...
@@ -20,3 +20,73 @@ a
9
9
drop table t1;
drop table t1;
drop database mysqltest1;
drop database mysqltest1;
drop database if exists rewrite;
create database rewrite;
use test;
create table t1 (a date, b date, c date not null, d date);
load data infile '../../std_data/loaddata1.dat' into table t1 fields terminated by ',';
Warnings:
Warning 1265 Data truncated for column 'a' at row 1
Warning 1265 Data truncated for column 'c' at row 1
Warning 1265 Data truncated for column 'd' at row 1
Warning 1265 Data truncated for column 'a' at row 2
Warning 1265 Data truncated for column 'b' at row 2
Warning 1265 Data truncated for column 'd' at row 2
load data infile '../../std_data/loaddata1.dat' into table t1 fields terminated by ',' IGNORE 2 LINES;
select * from rewrite.t1;
a b c d
0000-00-00 NULL 0000-00-00 0000-00-00
0000-00-00 0000-00-00 0000-00-00 0000-00-00
2003-03-03 2003-03-03 2003-03-03 NULL
2003-03-03 2003-03-03 2003-03-03 NULL
truncate table t1;
load data infile '../../std_data/loaddata1.dat' into table t1 fields terminated by ',' LINES STARTING BY ',' (b,c,d);
Warnings:
Warning 1265 Data truncated for column 'c' at row 1
Warning 1265 Data truncated for column 'd' at row 1
Warning 1265 Data truncated for column 'b' at row 2
Warning 1265 Data truncated for column 'd' at row 2
select * from rewrite.t1;
a b c d
NULL NULL 0000-00-00 0000-00-00
NULL 0000-00-00 0000-00-00 0000-00-00
NULL 2003-03-03 2003-03-03 NULL
drop table t1;
create table t1 (a text, b text);
load data infile '../../std_data/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''';
Warnings:
Warning 1261 Row 3 doesn't contain data for all columns
select concat('|',a,'|'), concat('|',b,'|') from rewrite.t1;
concat('|',a,'|') concat('|',b,'|')
|Field A| |Field B|
|Field 1| |Field 2'
Field 3,'Field 4|
|Field 5' ,'Field 6| NULL
|Field 6| | 'Field 7'|
drop table t1;
create table t1 (a int, b char(10));
load data infile '../../std_data/loaddata3.dat' into table t1 fields terminated by '' enclosed by '' ignore 1 lines;
Warnings:
Warning 1265 Data truncated for column 'a' at row 3
Warning 1262 Row 3 was truncated; it contained more data than there were input columns
Warning 1265 Data truncated for column 'a' at row 5
Warning 1262 Row 5 was truncated; it contained more data than there were input columns
select * from rewrite.t1;
a b
1 row 1
2 row 2
0 1234567890
3 row 3
0 1234567890
truncate table t1;
load data infile '../../std_data/loaddata4.dat' into table t1 fields terminated by '' enclosed by '' lines terminated by '' ignore 1 lines;
Warnings:
Warning 1265 Data truncated for column 'a' at row 4
Warning 1261 Row 4 doesn't contain data for all columns
select * from rewrite.t1;
a b
1 row 1
2 row 2
3 row 3
0
drop table t1;
mysql-test/t/ctype_tis620.test
View file @
5b209040
...
@@ -116,3 +116,38 @@ CREATE TABLE t1 (a char(10) not null) CHARACTER SET tis620;
...
@@ -116,3 +116,38 @@ CREATE TABLE t1 (a char(10) not null) CHARACTER SET tis620;
INSERT
INTO
t1
VALUES
(
'a'
),(
'a\0'
),(
'a\t'
),(
'a '
);
INSERT
INTO
t1
VALUES
(
'a'
),(
'a\0'
),(
'a\t'
),(
'a '
);
SELECT
hex
(
a
),
STRCMP
(
a
,
'a'
),
STRCMP
(
a
,
'a '
)
FROM
t1
;
SELECT
hex
(
a
),
STRCMP
(
a
,
'a'
),
STRCMP
(
a
,
'a '
)
FROM
t1
;
DROP
TABLE
t1
;
DROP
TABLE
t1
;
#
# Bug#6608
#
CREATE
TABLE
t1
(
`id`
int
(
11
)
NOT
NULL
auto_increment
,
`url`
varchar
(
200
)
NOT
NULL
default
''
,
`name`
varchar
(
250
)
NOT
NULL
default
''
,
`type`
int
(
11
)
NOT
NULL
default
'0'
,
`website`
varchar
(
250
)
NOT
NULL
default
''
,
`adddate`
date
NOT
NULL
default
'0000-00-00'
,
`size`
varchar
(
20
)
NOT
NULL
default
''
,
`movieid`
int
(
11
)
NOT
NULL
default
'0'
,
`musicid`
int
(
11
)
NOT
NULL
default
'0'
,
`star`
varchar
(
20
)
NOT
NULL
default
''
,
`download`
int
(
11
)
NOT
NULL
default
'0'
,
`lastweek`
int
(
11
)
NOT
NULL
default
'0'
,
`thisweek`
int
(
11
)
NOT
NULL
default
'0'
,
`page`
varchar
(
250
)
NOT
NULL
default
''
,
PRIMARY
KEY
(
`id`
),
UNIQUE
KEY
`url`
(
`url`
)
)
CHARACTER
SET
tis620
;
INSERT
INTO
t1
VALUES
(
1
,
'http://www.siamzone.com/download/download/000001-frodo_1024.jpg'
,
'The Lord
of the Rings
Wallpapers'
,
1
,
'http://www.lordoftherings.net'
,
'2002-01-22'
,
''
,
448
,
0
,
''
,
3805
,
0
,
0
,
''
);
INSERT
INTO
t1
VALUES
(
2
,
'http://www.othemovie.com/OScreenSaver1.EXE'
,
'O
Screensaver'
,
2
,
''
,
'2002-01-22'
,
''
,
491
,
0
,
''
,
519
,
0
,
0
,
''
);
INSERT
INTO
t1
VALUES
(
3
,
'http://www.siamzone.com/download/download/000003-jasonx2(800x600).jpg'
,
'Jaso
n X Wallpapers'
,
1
,
''
,
'2002-05-31'
,
''
,
579
,
0
,
''
,
1091
,
0
,
0
,
''
);
select
*
from
t1
order
by
id
;
DROP
TABLE
t1
;
mysql-test/t/rpl_rewrite_db-slave.opt
View file @
5b209040
"--replicate-rewrite-db=mysqltest1->test"
"--replicate-rewrite-db=
test->rewrite" "--replicate-rewrite-db=
mysqltest1->test"
mysql-test/t/rpl_rewrite_db.test
View file @
5b209040
...
@@ -17,3 +17,61 @@ drop table t1;
...
@@ -17,3 +17,61 @@ drop table t1;
drop
database
mysqltest1
;
drop
database
mysqltest1
;
sync_slave_with_master
;
sync_slave_with_master
;
#
# BUG#6353:
# Option --replicate-rewrite-db should work together with LOAD DATA INFILE
#
connection
slave
;
--
disable_warnings
drop
database
if
exists
rewrite
;
--
enable_warnings
create
database
rewrite
;
connection
master
;
use
test
;
create
table
t1
(
a
date
,
b
date
,
c
date
not
null
,
d
date
);
load
data
infile
'../../std_data/loaddata1.dat'
into
table
t1
fields
terminated
by
','
;
load
data
infile
'../../std_data/loaddata1.dat'
into
table
t1
fields
terminated
by
','
IGNORE
2
LINES
;
sync_slave_with_master
;
connection
slave
;
select
*
from
rewrite
.
t1
;
connection
master
;
truncate
table
t1
;
load
data
infile
'../../std_data/loaddata1.dat'
into
table
t1
fields
terminated
by
','
LINES
STARTING
BY
','
(
b
,
c
,
d
);
sync_slave_with_master
;
connection
slave
;
select
*
from
rewrite
.
t1
;
connection
master
;
drop
table
t1
;
create
table
t1
(
a
text
,
b
text
);
load
data
infile
'../../std_data/loaddata2.dat'
into
table
t1
fields
terminated
by
','
enclosed
by
''''
;
sync_slave_with_master
;
connection
slave
;
select
concat
(
'|'
,
a
,
'|'
),
concat
(
'|'
,
b
,
'|'
)
from
rewrite
.
t1
;
connection
master
;
drop
table
t1
;
create
table
t1
(
a
int
,
b
char
(
10
));
load
data
infile
'../../std_data/loaddata3.dat'
into
table
t1
fields
terminated
by
''
enclosed
by
''
ignore
1
lines
;
sync_slave_with_master
;
connection
slave
;
select
*
from
rewrite
.
t1
;
connection
master
;
truncate
table
t1
;
load
data
infile
'../../std_data/loaddata4.dat'
into
table
t1
fields
terminated
by
''
enclosed
by
''
lines
terminated
by
''
ignore
1
lines
;
sync_slave_with_master
;
connection
slave
;
# The empty line last comes from the end line field in the file
select
*
from
rewrite
.
t1
;
connection
master
;
drop
table
t1
;
sql/log_event.cc
View file @
5b209040
...
@@ -1655,16 +1655,22 @@ void Load_log_event::print(FILE* file, bool short_form, char* last_db,
...
@@ -1655,16 +1655,22 @@ void Load_log_event::print(FILE* file, bool short_form, char* last_db,
/*
/*
Load_log_event::set_fields()
Load_log_event::set_fields()
Note that this function can not use the member variable
for the database, since LOAD DATA INFILE on the slave
can be for a different database than the current one.
This is the reason for the affected_db argument to this method.
*/
*/
#ifndef MYSQL_CLIENT
#ifndef MYSQL_CLIENT
void
Load_log_event
::
set_fields
(
List
<
Item
>
&
field_list
)
void
Load_log_event
::
set_fields
(
const
char
*
affected_db
,
List
<
Item
>
&
field_list
)
{
{
uint
i
;
uint
i
;
const
char
*
field
=
fields
;
const
char
*
field
=
fields
;
for
(
i
=
0
;
i
<
num_fields
;
i
++
)
for
(
i
=
0
;
i
<
num_fields
;
i
++
)
{
{
field_list
.
push_back
(
new
Item_field
(
db
,
table_name
,
field
));
field_list
.
push_back
(
new
Item_field
(
affected_db
,
table_name
,
field
));
field
+=
field_lens
[
i
]
+
1
;
field
+=
field_lens
[
i
]
+
1
;
}
}
}
}
...
@@ -1820,7 +1826,7 @@ int Load_log_event::exec_event(NET* net, struct st_relay_log_info* rli,
...
@@ -1820,7 +1826,7 @@ int Load_log_event::exec_event(NET* net, struct st_relay_log_info* rli,
ex
.
skip_lines
=
skip_lines
;
ex
.
skip_lines
=
skip_lines
;
List
<
Item
>
field_list
;
List
<
Item
>
field_list
;
set_fields
(
field_list
);
set_fields
(
thd
->
db
,
field_list
);
thd
->
variables
.
pseudo_thread_id
=
thread_id
;
thd
->
variables
.
pseudo_thread_id
=
thread_id
;
if
(
net
)
if
(
net
)
{
{
...
@@ -1837,13 +1843,13 @@ int Load_log_event::exec_event(NET* net, struct st_relay_log_info* rli,
...
@@ -1837,13 +1843,13 @@ int Load_log_event::exec_event(NET* net, struct st_relay_log_info* rli,
if
(
thd
->
cuted_fields
)
if
(
thd
->
cuted_fields
)
{
{
/* log_pos is the position of the LOAD event in the master log */
/* log_pos is the position of the LOAD event in the master log */
sql_print_error
(
"\
sql_print_warning
(
"Slave: load data infile on table '%s' at "
Slave: load data infile on table '%s' at log position %s in log \
"log position %s in log '%s' produced %ld "
'%s' produced %ld
warning(s). Default database: '%s'"
,
"
warning(s). Default database: '%s'"
,
(
char
*
)
table_name
,
(
char
*
)
table_name
,
llstr
(
log_pos
,
llbuff
),
RPL_LOG_NAME
,
llstr
(
log_pos
,
llbuff
),
RPL_LOG_NAME
,
(
ulong
)
thd
->
cuted_fields
,
(
ulong
)
thd
->
cuted_fields
,
print_slave_db_safe
(
thd
->
db
));
print_slave_db_safe
(
thd
->
db
));
}
}
if
(
net
)
if
(
net
)
net
->
pkt_nr
=
thd
->
net
.
pkt_nr
;
net
->
pkt_nr
=
thd
->
net
.
pkt_nr
;
...
...
sql/log_event.h
View file @
5b209040
...
@@ -587,7 +587,7 @@ class Load_log_event: public Log_event
...
@@ -587,7 +587,7 @@ class Load_log_event: public Log_event
const
char
*
table_name_arg
,
const
char
*
table_name_arg
,
List
<
Item
>&
fields_arg
,
enum
enum_duplicates
handle_dup
,
List
<
Item
>&
fields_arg
,
enum
enum_duplicates
handle_dup
,
bool
using_trans
);
bool
using_trans
);
void
set_fields
(
List
<
Item
>
&
fields_arg
);
void
set_fields
(
const
char
*
db
,
List
<
Item
>
&
fields_arg
);
const
char
*
get_db
()
{
return
db
;
}
const
char
*
get_db
()
{
return
db
;
}
#ifdef HAVE_REPLICATION
#ifdef HAVE_REPLICATION
void
pack_info
(
Protocol
*
protocol
);
void
pack_info
(
Protocol
*
protocol
);
...
...
strings/ctype-tis620.c
View file @
5b209040
...
@@ -562,17 +562,13 @@ int my_strnncollsp_tis620(CHARSET_INFO * cs __attribute__((unused)),
...
@@ -562,17 +562,13 @@ int my_strnncollsp_tis620(CHARSET_INFO * cs __attribute__((unused)),
const
uchar
*
b0
,
uint
b_length
)
const
uchar
*
b0
,
uint
b_length
)
{
{
uchar
buf
[
80
]
;
uchar
buf
[
80
]
;
uchar
*
end
,
*
a
,
*
b
;
uchar
*
end
,
*
a
,
*
b
,
*
alloced
=
NULL
;
uint
length
;
uint
length
;
int
res
=
0
;
int
res
=
0
;
int
alloced
=
0
;
a
=
buf
;
a
=
buf
;
if
((
a_length
+
b_length
+
2
)
>
(
int
)
sizeof
(
buf
))
if
((
a_length
+
b_length
+
2
)
>
(
int
)
sizeof
(
buf
))
{
alloced
=
a
=
(
uchar
*
)
malloc
(
a_length
+
b_length
);
a
=
(
uchar
*
)
malloc
(
a_length
+
b_length
);
alloced
=
1
;
}
b
=
a
+
a_length
+
1
;
b
=
a
+
a_length
+
1
;
memcpy
((
char
*
)
a
,
(
char
*
)
a0
,
a_length
);
memcpy
((
char
*
)
a
,
(
char
*
)
a0
,
a_length
);
...
@@ -618,7 +614,7 @@ int my_strnncollsp_tis620(CHARSET_INFO * cs __attribute__((unused)),
...
@@ -618,7 +614,7 @@ int my_strnncollsp_tis620(CHARSET_INFO * cs __attribute__((unused)),
ret:
ret:
if
(
alloced
)
if
(
alloced
)
free
(
a
);
free
(
a
lloced
);
return
res
;
return
res
;
}
}
...
...
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