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
68eadc8a
Commit
68eadc8a
authored
Sep 28, 2006
by
jimw@rama.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge rama.(none):/home/jimw/my/mysql-4.1-clean
into rama.(none):/home/jimw/my/mysql-5.0-clean
parents
9c3012e6
cb6a0840
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
57 additions
and
32 deletions
+57
-32
include/m_ctype.h
include/m_ctype.h
+3
-2
include/m_string.h
include/m_string.h
+2
-1
include/my_global.h
include/my_global.h
+21
-1
include/my_sys.h
include/my_sys.h
+1
-1
sql/item_timefunc.cc
sql/item_timefunc.cc
+2
-2
sql/mysql_priv.h
sql/mysql_priv.h
+4
-4
sql/mysqld.cc
sql/mysqld.cc
+10
-9
sql/opt_range.cc
sql/opt_range.cc
+4
-3
sql/set_var.cc
sql/set_var.cc
+6
-6
sql/slave.cc
sql/slave.cc
+1
-1
sql/slave.h
sql/slave.h
+2
-1
sql/sql_class.h
sql/sql_class.h
+1
-1
No files found.
include/m_ctype.h
View file @
68eadc8a
...
...
@@ -184,7 +184,7 @@ typedef struct my_charset_handler_st
/* Charset dependant snprintf() */
int
(
*
snprintf
)(
struct
charset_info_st
*
,
char
*
to
,
uint
n
,
const
char
*
fmt
,
...);
...)
ATTRIBUTE_FORMAT
(
printf
,
4
,
5
)
;
int
(
*
long10_to_str
)(
struct
charset_info_st
*
,
char
*
to
,
uint
n
,
int
radix
,
long
int
val
);
int
(
*
longlong10_to_str
)(
struct
charset_info_st
*
,
char
*
to
,
uint
n
,
...
...
@@ -319,7 +319,8 @@ int my_wc_mb_8bit(CHARSET_INFO *cs,my_wc_t wc, uchar *s, uchar *e);
ulong
my_scan_8bit
(
CHARSET_INFO
*
cs
,
const
char
*
b
,
const
char
*
e
,
int
sq
);
int
my_snprintf_8bit
(
struct
charset_info_st
*
,
char
*
to
,
uint
n
,
const
char
*
fmt
,
...);
const
char
*
fmt
,
...)
ATTRIBUTE_FORMAT
(
printf
,
4
,
5
);
long
my_strntol_8bit
(
CHARSET_INFO
*
,
const
char
*
s
,
uint
l
,
int
base
,
char
**
e
,
int
*
err
);
...
...
include/m_string.h
View file @
68eadc8a
...
...
@@ -254,7 +254,8 @@ extern ulonglong strtoull(const char *str, char **ptr, int base);
extern
int
my_vsnprintf
(
char
*
str
,
size_t
n
,
const
char
*
format
,
va_list
ap
);
extern
int
my_snprintf
(
char
*
to
,
size_t
n
,
const
char
*
fmt
,
...);
extern
int
my_snprintf
(
char
*
to
,
size_t
n
,
const
char
*
fmt
,
...)
ATTRIBUTE_FORMAT
(
printf
,
3
,
4
);
#if defined(__cplusplus) && !defined(OS2)
}
...
...
include/my_global.h
View file @
68eadc8a
...
...
@@ -454,14 +454,34 @@ typedef unsigned short ushort;
#define function_volatile volatile
#define my_reinterpret_cast(A) reinterpret_cast<A>
#define my_const_cast(A) const_cast<A>
# ifndef GCC_VERSION
# define GCC_VERSION (__GNUC__ * 1000 + __GNUC_MINOR__)
# endif
#elif !defined(my_reinterpret_cast)
#define my_reinterpret_cast(A) (A)
#define my_const_cast(A) (A)
#endif
#if !defined(__attribute__) && (defined(__cplusplus) || !defined(__GNUC__) || __GNUC__ == 2 && __GNUC_MINOR__ < 8)
/*
Disable __attribute__() on GCC < 2.7 and non-GCC compilers
*/
#if !defined(__attribute__) && (!defined(__GNUC__) || GCC_VERSION < 2007)
#define __attribute__(A)
#endif
/*
__attribute__((format(...))) is only supported in gcc >= 2.8 and g++ >= 3.4
*/
#ifndef ATTRIBUTE_FORMAT
# if defined(__GNUC__) && \
((!defined(__cplusplus__) && GCC_VERSION >= 2008) || \
GCC_VERSION >= 3004)
# define ATTRIBUTE_FORMAT(style, m, n) __attribute__((format(style, m, n)))
# else
# define ATTRIBUTE_FORMAT(style, m, n)
# endif
#endif
/*
Wen using the embedded library, users might run into link problems,
duplicate declaration of __cxa_pure_virtual, solved by declaring it a
...
...
include/my_sys.h
View file @
68eadc8a
...
...
@@ -633,7 +633,7 @@ extern int my_sync(File fd, myf my_flags);
extern
int
my_error
_VARARGS
((
int
nr
,
myf
MyFlags
,
...));
extern
int
my_printf_error
_VARARGS
((
uint
my_err
,
const
char
*
format
,
myf
MyFlags
,
...)
__attribute__
((
format
(
printf
,
2
,
4
)))
);
ATTRIBUTE_FORMAT
(
printf
,
2
,
4
);
extern
int
my_error_register
(
const
char
**
errmsgs
,
int
first
,
int
last
);
extern
const
char
**
my_error_unregister
(
int
first
,
int
last
);
extern
int
my_message
(
uint
my_err
,
const
char
*
str
,
myf
MyFlags
);
...
...
sql/item_timefunc.cc
View file @
68eadc8a
...
...
@@ -65,7 +65,7 @@ static bool make_datetime(date_time_format_types format, TIME *ltime,
ltime
->
hour
,
ltime
->
minute
,
ltime
->
second
);
break
;
case
TIME_MICROSECOND
:
length
=
cs
->
cset
->
snprintf
(
cs
,
buff
,
length
,
"%s%02d:%02d:%02d.%06d"
,
length
=
cs
->
cset
->
snprintf
(
cs
,
buff
,
length
,
"%s%02d:%02d:%02d.%06
l
d"
,
ltime
->
neg
?
"-"
:
""
,
ltime
->
hour
,
ltime
->
minute
,
ltime
->
second
,
ltime
->
second_part
);
...
...
@@ -82,7 +82,7 @@ static bool make_datetime(date_time_format_types format, TIME *ltime,
break
;
case
DATE_TIME_MICROSECOND
:
length
=
cs
->
cset
->
snprintf
(
cs
,
buff
,
length
,
"%04d-%02d-%02d %02d:%02d:%02d.%06d"
,
"%04d-%02d-%02d %02d:%02d:%02d.%06
l
d"
,
ltime
->
year
,
ltime
->
month
,
ltime
->
day
,
ltime
->
hour
,
ltime
->
minute
,
ltime
->
second
,
ltime
->
second_part
);
...
...
sql/mysql_priv.h
View file @
68eadc8a
...
...
@@ -1119,10 +1119,10 @@ bool init_errmessage(void);
void
sql_perror
(
const
char
*
message
);
void
vprint_msg_to_log
(
enum
loglevel
level
,
const
char
*
format
,
va_list
args
);
void
sql_print_error
(
const
char
*
format
,
...);
void
sql_print_warning
(
const
char
*
format
,
...);
void
sql_print_information
(
const
char
*
format
,
...)
;
void
sql_print_error
(
const
char
*
format
,
...)
ATTRIBUTE_FORMAT
(
printf
,
1
,
2
)
;
void
sql_print_warning
(
const
char
*
format
,
...)
ATTRIBUTE_FORMAT
(
printf
,
1
,
2
)
;
void
sql_print_information
(
const
char
*
format
,
...)
ATTRIBUTE_FORMAT
(
printf
,
1
,
2
);
bool
fn_format_relative_to_data_home
(
my_string
to
,
const
char
*
name
,
...
...
sql/mysqld.cc
View file @
68eadc8a
...
...
@@ -1025,8 +1025,8 @@ extern "C" sig_handler print_signal_warning(int sig)
if
(
!
DBUG_IN_USE
)
{
if
(
global_system_variables
.
log_warnings
)
sql_print_warning
(
"Got signal %d from thread %d"
,
sig
,
my_thread_id
());
sql_print_warning
(
"Got signal %d from thread %
l
d"
,
sig
,
my_thread_id
());
}
#ifdef DONT_REMEMBER_SIGNAL
my_sigset
(
sig
,
print_signal_warning
);
/* int. thread system calls */
...
...
@@ -1531,7 +1531,7 @@ static void network_init(void)
if
(
strlen
(
mysqld_unix_port
)
>
(
sizeof
(
UNIXaddr
.
sun_path
)
-
1
))
{
sql_print_error
(
"The socket file path is too long (> %
d
): %s"
,
sql_print_error
(
"The socket file path is too long (> %
lu
): %s"
,
sizeof
(
UNIXaddr
.
sun_path
)
-
1
,
mysqld_unix_port
);
unireg_abort
(
1
);
}
...
...
@@ -2912,7 +2912,7 @@ static void openssl_lock(int mode, openssl_lock_t *lock, const char *file,
}
if
(
err
)
{
sql_print_error
(
"Fatal: can't %s OpenSSL
%s
lock"
,
what
);
sql_print_error
(
"Fatal: can't %s OpenSSL lock"
,
what
);
abort
();
}
}
...
...
@@ -7042,14 +7042,15 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
exit
(
1
);
}
switch
(
method
-
1
)
{
case
0
:
method_conv
=
MI_STATS_METHOD_
NULLS_NOT_EQUAL
;
case
2
:
method_conv
=
MI_STATS_METHOD_
IGNORE_NULLS
;
break
;
case
1
:
method_conv
=
MI_STATS_METHOD_NULLS_EQUAL
;
break
;
case
2
:
method_conv
=
MI_STATS_METHOD_IGNORE_NULLS
;
case
0
:
default:
method_conv
=
MI_STATS_METHOD_NULLS_NOT_EQUAL
;
break
;
}
global_system_variables
.
myisam_stats_method
=
method_conv
;
...
...
sql/opt_range.cc
View file @
68eadc8a
...
...
@@ -5562,8 +5562,9 @@ void SEL_ARG::test_use_count(SEL_ARG *root)
ulong
count
=
count_key_part_usage
(
root
,
pos
->
next_key_part
);
if
(
count
>
pos
->
next_key_part
->
use_count
)
{
sql_print_information
(
"Use_count: Wrong count for key at 0x%lx, %lu should be %lu"
,
pos
,
pos
->
next_key_part
->
use_count
,
count
);
sql_print_information
(
"Use_count: Wrong count for key at 0x%lx, %lu "
"should be %lu"
,
(
long
unsigned
int
)
pos
,
pos
->
next_key_part
->
use_count
,
count
);
return
;
}
pos
->
next_key_part
->
test_use_count
(
root
);
...
...
@@ -5571,7 +5572,7 @@ void SEL_ARG::test_use_count(SEL_ARG *root)
}
if
(
e_count
!=
elements
)
sql_print_warning
(
"Wrong use count: %u (should be %u) for tree at 0x%lx"
,
e_count
,
elements
,
(
gptr
)
this
);
e_count
,
elements
,
(
long
unsigned
int
)
this
);
}
#endif
...
...
sql/set_var.cc
View file @
68eadc8a
...
...
@@ -1295,14 +1295,14 @@ static void fix_net_retry_count(THD *thd, enum_var_type type)
thd
->
net
.
retry_count
=
thd
->
variables
.
net_retry_count
;
}
#else
/* HAVE_REPLICATION */
static
void
fix_net_read_timeout
(
THD
*
thd
__attribute__
(
unused
),
enum_var_type
type
__attribute__
(
unused
))
static
void
fix_net_read_timeout
(
THD
*
thd
__attribute__
(
(
unused
)
),
enum_var_type
type
__attribute__
(
(
unused
)
))
{}
static
void
fix_net_write_timeout
(
THD
*
thd
__attribute__
(
unused
),
enum_var_type
type
__attribute__
(
unused
))
static
void
fix_net_write_timeout
(
THD
*
thd
__attribute__
(
(
unused
)
),
enum_var_type
type
__attribute__
(
(
unused
)
))
{}
static
void
fix_net_retry_count
(
THD
*
thd
__attribute__
(
unused
),
enum_var_type
type
__attribute__
(
unused
))
static
void
fix_net_retry_count
(
THD
*
thd
__attribute__
(
(
unused
)
),
enum_var_type
type
__attribute__
(
(
unused
)
))
{}
#endif
/* HAVE_REPLICATION */
...
...
sql/slave.cc
View file @
68eadc8a
...
...
@@ -4613,7 +4613,7 @@ static int connect_to_master(THD* thd, MYSQL* mysql, MASTER_INFO* mi,
suppress_warnings
=
0
;
sql_print_error
(
"Slave I/O thread: error %s to master \
'%s@%s:%d': \
Error: '%s' errno: %d retry-time: %d retries: %
d
"
,
Error: '%s' errno: %d retry-time: %d retries: %
lu
"
,
(
reconnect
?
"reconnecting"
:
"connecting"
),
mi
->
user
,
mi
->
host
,
mi
->
port
,
mysql_error
(
mysql
),
last_errno
,
...
...
sql/slave.h
View file @
68eadc8a
...
...
@@ -553,7 +553,8 @@ void init_table_rule_array(DYNAMIC_ARRAY* a, bool* a_inited);
const
char
*
print_slave_db_safe
(
const
char
*
db
);
int
check_expected_error
(
THD
*
thd
,
RELAY_LOG_INFO
*
rli
,
int
error_code
);
void
skip_load_data_infile
(
NET
*
net
);
void
slave_print_error
(
RELAY_LOG_INFO
*
rli
,
int
err_code
,
const
char
*
msg
,
...);
void
slave_print_error
(
RELAY_LOG_INFO
*
rli
,
int
err_code
,
const
char
*
msg
,
...)
ATTRIBUTE_FORMAT
(
printf
,
3
,
4
);
void
end_slave
();
/* clean up */
void
init_master_info_with_options
(
MASTER_INFO
*
mi
);
...
...
sql/sql_class.h
View file @
68eadc8a
...
...
@@ -306,7 +306,7 @@ class MYSQL_LOG: public TC_LOG
const
char
*
log_name
);
void
new_file
(
bool
need_lock
);
bool
write
(
THD
*
thd
,
enum
enum_server_command
command
,
const
char
*
format
,
...
);
const
char
*
format
,
...)
ATTRIBUTE_FORMAT
(
printf
,
4
,
5
);
bool
write
(
THD
*
thd
,
const
char
*
query
,
uint
query_length
,
time_t
query_start
=
0
);
bool
write
(
Log_event
*
event_info
);
// binary log write
...
...
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