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
6a59acba
Commit
6a59acba
authored
Nov 29, 2011
by
Andrei Elkin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
reverting the initial patch for bug#13437900 for refinement.
parent
8d154f7a
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
20 deletions
+8
-20
mysql-test/suite/rpl/t/rpl_empty_master_host.test
mysql-test/suite/rpl/t/rpl_empty_master_host.test
+0
-1
sql/slave.cc
sql/slave.cc
+1
-1
sql/sql_lex.cc
sql/sql_lex.cc
+0
-1
sql/sql_lex.h
sql/sql_lex.h
+0
-7
sql/sql_repl.cc
sql/sql_repl.cc
+1
-0
sql/sql_yacc.yy
sql/sql_yacc.yy
+6
-10
No files found.
mysql-test/suite/rpl/t/rpl_empty_master_host.test
View file @
6a59acba
...
@@ -17,7 +17,6 @@
...
@@ -17,7 +17,6 @@
# working when expected.
# working when expected.
--
source
include
/
master
-
slave
.
inc
--
source
include
/
master
-
slave
.
inc
--
source
include
/
have_binlog_format_mixed
.
inc
connection
slave
;
connection
slave
;
STOP
SLAVE
;
STOP
SLAVE
;
...
...
sql/slave.cc
View file @
6a59acba
...
@@ -1129,7 +1129,7 @@ int init_dynarray_intvar_from_file(DYNAMIC_ARRAY* arr, IO_CACHE* f)
...
@@ -1129,7 +1129,7 @@ int init_dynarray_intvar_from_file(DYNAMIC_ARRAY* arr, IO_CACHE* f)
memcpy
(
buf_act
,
buf
,
read_size
);
memcpy
(
buf_act
,
buf
,
read_size
);
snd_size
=
my_b_gets
(
f
,
buf_act
+
read_size
,
max_size
-
read_size
);
snd_size
=
my_b_gets
(
f
,
buf_act
+
read_size
,
max_size
-
read_size
);
if
(
snd_size
==
0
||
if
(
snd_size
==
0
||
((
snd_size
+
1
==
max_size
-
read_size
)
&&
buf
[
max_size
-
2
]
!=
'\n'
))
((
snd_size
+
1
==
max_size
-
read_size
)
&&
buf
_act
[
max_size
-
2
]
!=
'\n'
))
{
{
/*
/*
failure to make the 2nd read or short read again
failure to make the 2nd read or short read again
...
...
sql/sql_lex.cc
View file @
6a59acba
...
@@ -2352,7 +2352,6 @@ LEX::LEX()
...
@@ -2352,7 +2352,6 @@ LEX::LEX()
INITIAL_LEX_PLUGIN_LIST_SIZE
,
INITIAL_LEX_PLUGIN_LIST_SIZE
,
INITIAL_LEX_PLUGIN_LIST_SIZE
);
INITIAL_LEX_PLUGIN_LIST_SIZE
);
reset_query_tables_list
(
TRUE
);
reset_query_tables_list
(
TRUE
);
repl_ignore_server_ids_inited
=
false
;
}
}
...
...
sql/sql_lex.h
View file @
6a59acba
...
@@ -291,9 +291,7 @@ typedef struct st_lex_master_info
...
@@ -291,9 +291,7 @@ typedef struct st_lex_master_info
char
*
ssl_key
,
*
ssl_cert
,
*
ssl_ca
,
*
ssl_capath
,
*
ssl_cipher
;
char
*
ssl_key
,
*
ssl_cert
,
*
ssl_ca
,
*
ssl_capath
,
*
ssl_cipher
;
char
*
relay_log_name
;
char
*
relay_log_name
;
ulong
relay_log_pos
;
ulong
relay_log_pos
;
bool
repl_ignore_server_ids_inited
;
DYNAMIC_ARRAY
repl_ignore_server_ids
;
DYNAMIC_ARRAY
repl_ignore_server_ids
;
typeof
(
::
server_id
)
repl_ignore_server_ids_static_buffer
[
4
];
}
LEX_MASTER_INFO
;
}
LEX_MASTER_INFO
;
typedef
struct
st_lex_reset_slave
typedef
struct
st_lex_reset_slave
...
@@ -2457,11 +2455,6 @@ struct LEX: public Query_tables_list
...
@@ -2457,11 +2455,6 @@ struct LEX: public Query_tables_list
destroy_query_tables_list
();
destroy_query_tables_list
();
plugin_unlock_list
(
NULL
,
(
plugin_ref
*
)
plugins
.
buffer
,
plugins
.
elements
);
plugin_unlock_list
(
NULL
,
(
plugin_ref
*
)
plugins
.
buffer
,
plugins
.
elements
);
delete_dynamic
(
&
plugins
);
delete_dynamic
(
&
plugins
);
if
(
mi
.
repl_ignore_server_ids_inited
)
{
delete_dynamic
(
&
mi
.
repl_ignore_server_ids
);
mi
.
repl_ignore_server_ids_inited
=
false
;
}
}
}
inline
bool
is_ps_or_view_context_analysis
()
inline
bool
is_ps_or_view_context_analysis
()
...
...
sql/sql_repl.cc
View file @
6a59acba
...
@@ -1689,6 +1689,7 @@ err:
...
@@ -1689,6 +1689,7 @@ err:
thd_proc_info
(
thd
,
0
);
thd_proc_info
(
thd
,
0
);
if
(
ret
==
FALSE
)
if
(
ret
==
FALSE
)
my_ok
(
thd
);
my_ok
(
thd
);
delete_dynamic
(
&
lex_mi
->
repl_ignore_server_ids
);
//freeing of parser-time alloc
DBUG_RETURN
(
ret
);
DBUG_RETURN
(
ret
);
}
}
...
...
sql/sql_yacc.yy
View file @
6a59acba
...
@@ -1863,7 +1863,12 @@ change:
...
@@ -1863,7 +1863,12 @@ change:
LEX *lex = Lex;
LEX *lex = Lex;
lex->sql_command = SQLCOM_CHANGE_MASTER;
lex->sql_command = SQLCOM_CHANGE_MASTER;
bzero((char*) &lex->mi, sizeof(lex->mi));
bzero((char*) &lex->mi, sizeof(lex->mi));
/*
resetting flags that can left from the previous CHANGE MASTER
*/
lex->mi.repl_ignore_server_ids_opt= LEX_MASTER_INFO::LEX_MI_UNCHANGED;
lex->mi.repl_ignore_server_ids_opt= LEX_MASTER_INFO::LEX_MI_UNCHANGED;
my_init_dynamic_array(&Lex->mi.repl_ignore_server_ids,
sizeof(::server_id), 16, 16);
}
}
master_defs
master_defs
{}
{}
...
@@ -1974,15 +1979,6 @@ ignore_server_id_list:
...
@@ -1974,15 +1979,6 @@ ignore_server_id_list:
ignore_server_id:
ignore_server_id:
ulong_num
ulong_num
{
{
if (!Lex->mi.repl_ignore_server_ids_inited)
{
my_init_dynamic_array2(&Lex->mi.repl_ignore_server_ids,
sizeof(::server_id),
Lex->mi.repl_ignore_server_ids_static_buffer,
array_elements(Lex->mi.repl_ignore_server_ids_static_buffer),
16);
Lex->mi.repl_ignore_server_ids_inited= true;
}
insert_dynamic(&Lex->mi.repl_ignore_server_ids, (uchar*) &($1));
insert_dynamic(&Lex->mi.repl_ignore_server_ids, (uchar*) &($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