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
1e0819e2
Commit
1e0819e2
authored
Oct 19, 2010
by
Davi Arnaut
Browse files
Options
Browse Files
Download
Plain Diff
Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.
parents
0fab1982
267bd161
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
69 additions
and
47 deletions
+69
-47
client/mysql.cc
client/mysql.cc
+10
-5
client/sql_string.h
client/sql_string.h
+7
-3
cmd-line-utils/libedit/common.c
cmd-line-utils/libedit/common.c
+3
-2
cmd-line-utils/libedit/readline.c
cmd-line-utils/libedit/readline.c
+15
-8
cmd-line-utils/libedit/vi.c
cmd-line-utils/libedit/vi.c
+15
-14
regex/main.c
regex/main.c
+4
-4
sql/ha_ndbcluster.cc
sql/ha_ndbcluster.cc
+4
-4
sql/key.cc
sql/key.cc
+1
-1
sql/log_event.cc
sql/log_event.cc
+1
-1
sql/log_event.h
sql/log_event.h
+1
-1
sql/my_decimal.h
sql/my_decimal.h
+1
-1
sql/sql_string.h
sql/sql_string.h
+7
-3
No files found.
client/mysql.cc
View file @
1e0819e2
...
...
@@ -3739,7 +3739,8 @@ print_tab_data(MYSQL_RES *result)
}
static
int
com_tee
(
String
*
buffer
,
char
*
line
__attribute__
((
unused
)))
com_tee
(
String
*
buffer
__attribute__
((
unused
)),
char
*
line
__attribute__
((
unused
)))
{
char
file_name
[
FN_REFLEN
],
*
end
,
*
param
;
...
...
@@ -3798,7 +3799,8 @@ com_notee(String *buffer __attribute__((unused)),
#ifdef USE_POPEN
static
int
com_pager
(
String
*
buffer
,
char
*
line
__attribute__
((
unused
)))
com_pager
(
String
*
buffer
__attribute__
((
unused
)),
char
*
line
__attribute__
((
unused
)))
{
char
pager_name
[
FN_REFLEN
],
*
end
,
*
param
;
...
...
@@ -3923,7 +3925,8 @@ com_rehash(String *buffer __attribute__((unused)),
#ifdef USE_POPEN
static
int
com_shell
(
String
*
buffer
,
char
*
line
__attribute__
((
unused
)))
com_shell
(
String
*
buffer
__attribute__
((
unused
)),
char
*
line
__attribute__
((
unused
)))
{
char
*
shell_cmd
;
...
...
@@ -4015,7 +4018,8 @@ com_connect(String *buffer, char *line)
}
static
int
com_source
(
String
*
buffer
,
char
*
line
)
static
int
com_source
(
String
*
buffer
__attribute__
((
unused
)),
char
*
line
)
{
char
source_name
[
FN_REFLEN
],
*
end
,
*
param
;
LINE_BUFFER
*
line_buff
;
...
...
@@ -4929,7 +4933,8 @@ static void init_username()
}
}
static
int
com_prompt
(
String
*
buffer
,
char
*
line
)
static
int
com_prompt
(
String
*
buffer
__attribute__
((
unused
)),
char
*
line
)
{
char
*
ptr
=
strchr
(
line
,
' '
);
prompt_counter
=
0
;
...
...
client/sql_string.h
View file @
1e0819e2
...
...
@@ -69,9 +69,13 @@ class String
}
static
void
*
operator
new
(
size_t
size
,
MEM_ROOT
*
mem_root
)
{
return
(
void
*
)
alloc_root
(
mem_root
,
(
uint
)
size
);
}
static
void
operator
delete
(
void
*
ptr_arg
,
size_t
size
)
{
TRASH
(
ptr_arg
,
size
);
}
static
void
operator
delete
(
void
*
ptr_arg
,
MEM_ROOT
*
mem_root
)
static
void
operator
delete
(
void
*
ptr_arg
,
size_t
size
)
{
(
void
)
ptr_arg
;
(
void
)
size
;
TRASH
(
ptr_arg
,
size
);
}
static
void
operator
delete
(
void
*
,
MEM_ROOT
*
)
{
/* never called */
}
~
String
()
{
free
();
}
...
...
cmd-line-utils/libedit/common.c
View file @
1e0819e2
...
...
@@ -136,7 +136,7 @@ ed_delete_prev_word(EditLine *el, int c __attribute__((__unused__)))
*/
protected
el_action_t
/*ARGSUSED*/
ed_delete_next_char
(
EditLine
*
el
,
int
c
)
ed_delete_next_char
(
EditLine
*
el
,
int
c
__attribute__
((
__unused__
))
)
{
#ifdef notdef
/* XXX */
#define EL el->el_line
...
...
@@ -431,7 +431,8 @@ ed_argument_digit(EditLine *el, int c)
*/
protected
el_action_t
/*ARGSUSED*/
ed_unassigned
(
EditLine
*
el
,
int
c
__attribute__
((
__unused__
)))
ed_unassigned
(
EditLine
*
el
__attribute__
((
__unused__
)),
int
c
__attribute__
((
__unused__
)))
{
return
(
CC_ERROR
);
...
...
cmd-line-utils/libedit/readline.c
View file @
1e0819e2
...
...
@@ -202,7 +202,7 @@ _move_history(int op)
*/
static
int
/*ARGSUSED*/
_getc_function
(
EditLine
*
el
,
char
*
c
)
_getc_function
(
EditLine
*
el
__attribute__
((
__unused__
))
,
char
*
c
)
{
int
i
;
...
...
@@ -1613,7 +1613,8 @@ rl_insert(int count, int c)
/*ARGSUSED*/
int
rl_newline
(
int
count
,
int
c
)
rl_newline
(
int
count
__attribute__
((
__unused__
)),
int
c
__attribute__
((
__unused__
)))
{
/*
* Readline-4.0 appears to ignore the args.
...
...
@@ -1623,7 +1624,7 @@ rl_newline(int count, int c)
/*ARGSUSED*/
static
unsigned
char
rl_bind_wrapper
(
EditLine
*
el
,
unsigned
char
c
)
rl_bind_wrapper
(
EditLine
*
el
__attribute__
((
__unused__
))
,
unsigned
char
c
)
{
if
(
map
[
c
]
==
NULL
)
return
CC_ERROR
;
...
...
@@ -1718,7 +1719,7 @@ rl_get_previous_history(int count, int key)
void
/*ARGSUSED*/
rl_prep_terminal
(
int
meta_flag
)
rl_prep_terminal
(
int
meta_flag
__attribute__
((
__unused__
))
)
{
el_set
(
e
,
EL_PREP_TERM
,
1
);
}
...
...
@@ -1922,7 +1923,8 @@ _rl_qsort_string_compare(char **s1, char **s2)
int
/*ARGSUSED*/
rl_kill_text
(
int
from
,
int
to
)
rl_kill_text
(
int
from
__attribute__
((
__unused__
)),
int
to
__attribute__
((
__unused__
)))
{
return
0
;
}
...
...
@@ -1941,20 +1943,25 @@ rl_get_keymap(void)
void
/*ARGSUSED*/
rl_set_keymap
(
Keymap
k
)
rl_set_keymap
(
Keymap
k
__attribute__
((
__unused__
))
)
{
}
int
/*ARGSUSED*/
rl_generic_bind
(
int
type
,
const
char
*
keyseq
,
const
char
*
data
,
Keymap
k
)
rl_generic_bind
(
int
type
__attribute__
((
__unused__
)),
const
char
*
keyseq
__attribute__
((
__unused__
)),
const
char
*
data
__attribute__
((
__unused__
)),
Keymap
k
__attribute__
((
__unused__
)))
{
return
0
;
}
int
/*ARGSUSED*/
rl_bind_key_in_map
(
int
key
,
Function
*
fun
,
Keymap
k
)
rl_bind_key_in_map
(
int
key
__attribute__
((
__unused__
)),
Function
*
fun
__attribute__
((
__unused__
)),
Keymap
k
__attribute__
((
__unused__
)))
{
return
0
;
}
cmd-line-utils/libedit/vi.c
View file @
1e0819e2
...
...
@@ -145,7 +145,7 @@ vi_paste_prev(EditLine *el, int c __attribute__((__unused__)))
*/
protected
el_action_t
/*ARGSUSED*/
vi_prev_big_word
(
EditLine
*
el
,
int
c
)
vi_prev_big_word
(
EditLine
*
el
,
int
c
__attribute__
((
__unused__
))
)
{
if
(
el
->
el_line
.
cursor
==
el
->
el_line
.
buffer
)
...
...
@@ -195,7 +195,7 @@ vi_prev_word(EditLine *el, int c __attribute__((__unused__)))
*/
protected
el_action_t
/*ARGSUSED*/
vi_next_big_word
(
EditLine
*
el
,
int
c
)
vi_next_big_word
(
EditLine
*
el
,
int
c
__attribute__
((
__unused__
))
)
{
if
(
el
->
el_line
.
cursor
>=
el
->
el_line
.
lastchar
-
1
)
...
...
@@ -462,7 +462,7 @@ vi_delete_meta(EditLine *el, int c __attribute__((__unused__)))
*/
protected
el_action_t
/*ARGSUSED*/
vi_end_big_word
(
EditLine
*
el
,
int
c
)
vi_end_big_word
(
EditLine
*
el
,
int
c
__attribute__
((
__unused__
))
)
{
if
(
el
->
el_line
.
cursor
==
el
->
el_line
.
lastchar
)
...
...
@@ -797,7 +797,7 @@ vi_repeat_prev_char(EditLine *el, int c __attribute__((__unused__)))
*/
protected
el_action_t
/*ARGSUSED*/
vi_match
(
EditLine
*
el
,
int
c
)
vi_match
(
EditLine
*
el
,
int
c
__attribute__
((
__unused__
))
)
{
const
char
match_chars
[]
=
"()[]{}"
;
char
*
cp
;
...
...
@@ -844,7 +844,7 @@ vi_match(EditLine *el, int c)
*/
protected
el_action_t
/*ARGSUSED*/
vi_undo_line
(
EditLine
*
el
,
int
c
)
vi_undo_line
(
EditLine
*
el
,
int
c
__attribute__
((
__unused__
))
)
{
cv_undo
(
el
);
...
...
@@ -858,7 +858,7 @@ vi_undo_line(EditLine *el, int c)
*/
protected
el_action_t
/*ARGSUSED*/
vi_to_column
(
EditLine
*
el
,
int
c
)
vi_to_column
(
EditLine
*
el
,
int
c
__attribute__
((
__unused__
))
)
{
el
->
el_line
.
cursor
=
el
->
el_line
.
buffer
;
...
...
@@ -872,7 +872,7 @@ vi_to_column(EditLine *el, int c)
*/
protected
el_action_t
/*ARGSUSED*/
vi_yank_end
(
EditLine
*
el
,
int
c
)
vi_yank_end
(
EditLine
*
el
,
int
c
__attribute__
((
__unused__
))
)
{
cv_yank
(
el
,
el
->
el_line
.
cursor
,
...
...
@@ -886,7 +886,7 @@ vi_yank_end(EditLine *el, int c)
*/
protected
el_action_t
/*ARGSUSED*/
vi_yank
(
EditLine
*
el
,
int
c
)
vi_yank
(
EditLine
*
el
,
int
c
__attribute__
((
__unused__
))
)
{
return
cv_action
(
el
,
YANK
);
...
...
@@ -898,7 +898,7 @@ vi_yank(EditLine *el, int c)
*/
protected
el_action_t
/*ARGSUSED*/
vi_comment_out
(
EditLine
*
el
,
int
c
)
vi_comment_out
(
EditLine
*
el
,
int
c
__attribute__
((
__unused__
))
)
{
el
->
el_line
.
cursor
=
el
->
el_line
.
buffer
;
...
...
@@ -919,7 +919,8 @@ extern char *get_alias_text(const char *) __weak_reference(get_alias_text);
#endif
protected
el_action_t
/*ARGSUSED*/
vi_alias
(
EditLine
*
el
,
int
c
)
vi_alias
(
EditLine
*
el
__attribute__
((
__unused__
)),
int
c
__attribute__
((
__unused__
)))
{
#if defined(__weak_reference) && !defined(__FreeBSD__)
char
alias_name
[
3
];
...
...
@@ -949,7 +950,7 @@ vi_alias(EditLine *el, int c)
*/
protected
el_action_t
/*ARGSUSED*/
vi_to_history_line
(
EditLine
*
el
,
int
c
)
vi_to_history_line
(
EditLine
*
el
,
int
c
__attribute__
((
__unused__
))
)
{
int
sv_event_no
=
el
->
el_history
.
eventno
;
el_action_t
rval
;
...
...
@@ -994,7 +995,7 @@ vi_to_history_line(EditLine *el, int c)
*/
protected
el_action_t
/*ARGSUSED*/
vi_histedit
(
EditLine
*
el
,
int
c
)
vi_histedit
(
EditLine
*
el
,
int
c
__attribute__
((
__unused__
))
)
{
int
fd
;
pid_t
pid
;
...
...
@@ -1050,7 +1051,7 @@ vi_histedit(EditLine *el, int c)
*/
protected
el_action_t
/*ARGSUSED*/
vi_history_word
(
EditLine
*
el
,
int
c
)
vi_history_word
(
EditLine
*
el
,
int
c
__attribute__
((
__unused__
))
)
{
const
char
*
wp
=
HIST_FIRST
(
el
);
const
char
*
wep
,
*
wsp
;
...
...
@@ -1099,7 +1100,7 @@ vi_history_word(EditLine *el, int c)
*/
protected
el_action_t
/*ARGSUSED*/
vi_redo
(
EditLine
*
el
,
int
c
)
vi_redo
(
EditLine
*
el
,
int
c
__attribute__
((
__unused__
))
)
{
c_redo_t
*
r
=
&
el
->
el_chared
.
c_redo
;
...
...
regex/main.c
View file @
1e0819e2
...
...
@@ -17,8 +17,8 @@ regoff_t startoff = 0;
regoff_t
endoff
=
0
;
extern
int
split
();
extern
void
regprint
();
extern
int
split
(
char
*
string
,
char
*
fields
[],
int
nfields
,
char
*
sep
);
extern
void
regprint
(
my_regex_t
*
r
,
FILE
*
d
);
/*
- main - do the simple case, hand off to regress() for regression
...
...
@@ -145,7 +145,7 @@ FILE *in;
inbuf
[
strlen
(
inbuf
)
-
1
]
=
'\0'
;
/* get rid of stupid \n */
if
(
debug
)
fprintf
(
stdout
,
"%d:
\n
"
,
line
);
nf
=
split
(
inbuf
,
f
,
MAXF
,
"
\t\t
"
);
nf
=
split
(
inbuf
,
f
,
MAXF
,
(
char
*
)
"
\t\t
"
);
if
(
nf
<
3
)
{
fprintf
(
stderr
,
"bad input, line %d
\n
"
,
line
);
exit
(
1
);
...
...
@@ -288,7 +288,7 @@ int opts; /* may not match f1 */
for
(
i
=
1
;
i
<
NSHOULD
;
i
++
)
should
[
i
]
=
NULL
;
nshould
=
split
(
f4
,
should
+
1
,
NSHOULD
-
1
,
","
);
nshould
=
split
(
f4
,
should
+
1
,
NSHOULD
-
1
,
(
char
*
)
","
);
if
(
nshould
==
0
)
{
nshould
=
1
;
should
[
1
]
=
(
char
*
)
""
;
...
...
sql/ha_ndbcluster.cc
View file @
1e0819e2
...
...
@@ -6435,8 +6435,8 @@ void ha_ndbcluster::get_auto_increment(ulonglong offset, ulonglong increment,
for
(;;)
{
Ndb_tuple_id_range_guard
g
(
m_share
);
if
(
m_skip_auto_increment
&&
ndb
->
readAutoIncrementValue
(
m_table
,
g
.
range
,
auto_value
)
||
if
(
(
m_skip_auto_increment
&&
ndb
->
readAutoIncrementValue
(
m_table
,
g
.
range
,
auto_value
)
)
||
ndb
->
getAutoIncrementValue
(
m_table
,
g
.
range
,
auto_value
,
cache_size
,
increment
,
offset
))
{
if
(
--
retries
&&
...
...
@@ -10271,8 +10271,8 @@ bool ha_ndbcluster::check_if_incompatible_data(HA_CREATE_INFO *create_info,
{
Field
*
field
=
table
->
field
[
i
];
const
NDBCOL
*
col
=
tab
->
getColumn
(
i
);
if
(
col
->
getStorageType
()
==
NDB_STORAGETYPE_MEMORY
&&
create_info
->
storage_media
!=
HA_SM_MEMORY
||
col
->
getStorageType
()
==
NDB_STORAGETYPE_DISK
&&
create_info
->
storage_media
!=
HA_SM_DISK
)
if
(
(
col
->
getStorageType
()
==
NDB_STORAGETYPE_MEMORY
&&
create_info
->
storage_media
!=
HA_SM_MEMORY
)
||
(
col
->
getStorageType
()
==
NDB_STORAGETYPE_DISK
&&
create_info
->
storage_media
!=
HA_SM_DISK
)
)
{
DBUG_PRINT
(
"info"
,
(
"Column storage media is changed"
));
DBUG_RETURN
(
COMPATIBLE_DATA_NO
);
...
...
sql/key.cc
View file @
1e0819e2
...
...
@@ -361,7 +361,7 @@ void key_unpack(String *to,TABLE *table,uint idx)
if
(
field
->
binary
()
&&
field
->
type
()
==
MYSQL_TYPE_STRING
&&
tmp
.
length
())
{
const
char
*
tmp_end
=
tmp
.
ptr
()
+
tmp
.
length
();
while
(
tmp_end
>
tmp
.
ptr
()
&&
!*--
tmp_end
);
while
(
tmp_end
>
tmp
.
ptr
()
&&
!*--
tmp_end
)
;
tmp
.
length
(
tmp_end
-
tmp
.
ptr
()
+
1
);
}
if
(
cs
->
mbmaxlen
>
1
&&
...
...
sql/log_event.cc
View file @
1e0819e2
...
...
@@ -8509,7 +8509,7 @@ void Table_map_log_event::pack_info(Protocol *protocol)
#ifdef MYSQL_CLIENT
void
Table_map_log_event
::
print
(
FILE
*
file
,
PRINT_EVENT_INFO
*
print_event_info
)
void
Table_map_log_event
::
print
(
FILE
*
,
PRINT_EVENT_INFO
*
print_event_info
)
{
if
(
!
print_event_info
->
short_form
)
{
...
...
sql/log_event.h
View file @
1e0819e2
...
...
@@ -1032,7 +1032,7 @@ class Log_event
return
(
void
*
)
my_malloc
((
uint
)
size
,
MYF
(
MY_WME
|
MY_FAE
));
}
static
void
operator
delete
(
void
*
ptr
,
size_t
size
)
static
void
operator
delete
(
void
*
ptr
,
size_t
)
{
my_free
(
ptr
);
}
...
...
sql/my_decimal.h
View file @
1e0819e2
...
...
@@ -328,7 +328,7 @@ int my_decimal2int(uint mask, const my_decimal *d, my_bool unsigned_flag,
inline
int
my_decimal2double
(
uint
mask
,
const
my_decimal
*
d
,
double
*
result
)
int
my_decimal2double
(
uint
,
const
my_decimal
*
d
,
double
*
result
)
{
/* No need to call check_result as this will always succeed */
return
decimal2double
((
decimal_t
*
)
d
,
result
);
...
...
sql/sql_string.h
View file @
1e0819e2
...
...
@@ -91,9 +91,13 @@ class String
}
static
void
*
operator
new
(
size_t
size
,
MEM_ROOT
*
mem_root
)
throw
()
{
return
(
void
*
)
alloc_root
(
mem_root
,
(
uint
)
size
);
}
static
void
operator
delete
(
void
*
ptr_arg
,
size_t
size
)
{
TRASH
(
ptr_arg
,
size
);
}
static
void
operator
delete
(
void
*
ptr_arg
,
MEM_ROOT
*
mem_root
)
static
void
operator
delete
(
void
*
ptr_arg
,
size_t
size
)
{
(
void
)
ptr_arg
;
(
void
)
size
;
TRASH
(
ptr_arg
,
size
);
}
static
void
operator
delete
(
void
*
,
MEM_ROOT
*
)
{
/* never called */
}
~
String
()
{
free
();
}
...
...
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