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
e06ac0e5
Commit
e06ac0e5
authored
20 years ago
by
sergefp@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-merge-fix
parents
3c8f48d2
57917916
Branches unavailable
Tags unavailable
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
4 deletions
+16
-4
Makefile.am
Makefile.am
+1
-2
mysql-test/r/insert_select.result.es
mysql-test/r/insert_select.result.es
+7
-0
sql/log_event.cc
sql/log_event.cc
+6
-1
sql/mysqld.cc
sql/mysqld.cc
+2
-1
No files found.
Makefile.am
View file @
e06ac0e5
...
@@ -100,5 +100,4 @@ tags:
...
@@ -100,5 +100,4 @@ tags:
# Test installation
# Test installation
test
:
test
:
cd
mysql-test
;
./mysql-test-run
cd
mysql-test
;
./mysql-test-run
&&
./mysql-test-run
--ps-protocol
This diff is collapsed.
Click to expand it.
mysql-test/r/insert_select.result.es
View file @
e06ac0e5
...
@@ -78,6 +78,13 @@ a
...
@@ -78,6 +78,13 @@ a
1
1
2
2
drop table t1, t2;
drop table t1, t2;
create table t1(a int);
insert into t1 values(1),(1);
reset master;
create table t2(unique(a)) select a from t1;
ERROR 23000: Duplicate entry '1' for key 1
show binlog events;
drop table t1;
create table t1 (a int not null);
create table t1 (a int not null);
create table t2 (a int not null);
create table t2 (a int not null);
insert into t1 values (1);
insert into t1 values (1);
...
...
This diff is collapsed.
Click to expand it.
sql/log_event.cc
View file @
e06ac0e5
...
@@ -1416,7 +1416,9 @@ Load_log_event::Load_log_event(THD *thd_arg, sql_exchange *ex,
...
@@ -1416,7 +1416,9 @@ Load_log_event::Load_log_event(THD *thd_arg, sql_exchange *ex,
List
<
Item
>
&
fields_arg
,
List
<
Item
>
&
fields_arg
,
enum
enum_duplicates
handle_dup
,
enum
enum_duplicates
handle_dup
,
bool
using_trans
)
bool
using_trans
)
:
Log_event
(
thd_arg
,
0
,
using_trans
),
thread_id
(
thd_arg
->
thread_id
),
:
Log_event
(
thd_arg
,
!
thd_arg
->
tmp_table_used
?
0
:
LOG_EVENT_THREAD_SPECIFIC_F
,
using_trans
),
thread_id
(
thd_arg
->
thread_id
),
slave_proxy_id
(
thd_arg
->
variables
.
pseudo_thread_id
),
slave_proxy_id
(
thd_arg
->
variables
.
pseudo_thread_id
),
num_fields
(
0
),
fields
(
0
),
num_fields
(
0
),
fields
(
0
),
field_lens
(
0
),
field_block_len
(
0
),
field_lens
(
0
),
field_block_len
(
0
),
...
@@ -1606,6 +1608,9 @@ void Load_log_event::print(FILE* file, bool short_form, char* last_db,
...
@@ -1606,6 +1608,9 @@ void Load_log_event::print(FILE* file, bool short_form, char* last_db,
commented
?
"# "
:
""
,
commented
?
"# "
:
""
,
db
);
db
);
if
(
flags
&
LOG_EVENT_THREAD_SPECIFIC_F
)
fprintf
(
file
,
"%sSET @@session.pseudo_thread_id=%lu;
\n
"
,
commented
?
"# "
:
""
,
(
ulong
)
thread_id
);
fprintf
(
file
,
"%sLOAD DATA "
,
fprintf
(
file
,
"%sLOAD DATA "
,
commented
?
"# "
:
""
);
commented
?
"# "
:
""
);
if
(
check_fname_outside_temp_buf
())
if
(
check_fname_outside_temp_buf
())
...
...
This diff is collapsed.
Click to expand it.
sql/mysqld.cc
View file @
e06ac0e5
...
@@ -4757,7 +4757,8 @@ replicating a LOAD DATA INFILE command.",
...
@@ -4757,7 +4757,8 @@ replicating a LOAD DATA INFILE command.",
(
gptr
*
)
&
delayed_queue_size
,
(
gptr
*
)
&
delayed_queue_size
,
0
,
GET_ULONG
,
(
gptr
*
)
&
delayed_queue_size
,
(
gptr
*
)
&
delayed_queue_size
,
0
,
GET_ULONG
,
REQUIRED_ARG
,
DELAYED_QUEUE_SIZE
,
1
,
~
0L
,
0
,
1
,
0
},
REQUIRED_ARG
,
DELAYED_QUEUE_SIZE
,
1
,
~
0L
,
0
,
1
,
0
},
{
"expire_logs_days"
,
OPT_EXPIRE_LOGS_DAYS
,
{
"expire_logs_days"
,
OPT_EXPIRE_LOGS_DAYS
,
"Binary logs will be rotated after expire-log-days days "
,
"If non-zero, binary logs will be purged after expire_logs_days "
"days; possible purges happen at startup and at binary log rotation."
,
(
gptr
*
)
&
expire_logs_days
,
(
gptr
*
)
&
expire_logs_days
,
(
gptr
*
)
&
expire_logs_days
,
0
,
GET_ULONG
,
(
gptr
*
)
&
expire_logs_days
,
0
,
GET_ULONG
,
REQUIRED_ARG
,
0
,
0
,
99
,
0
,
1
,
0
},
REQUIRED_ARG
,
0
,
0
,
99
,
0
,
1
,
0
},
...
...
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