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
c36e935a
Commit
c36e935a
authored
15 years ago
by
Georgi Kodinov
Browse files
Options
Browse Files
Download
Plain Diff
merged 5.0-bugteam -> 5.1-bugteam
parents
515e83cc
dad07ffe
No related merge requests found
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
8 deletions
+10
-8
client/mysqltest.cc
client/mysqltest.cc
+2
-2
mysys/default.c
mysys/default.c
+1
-1
mysys/my_new.cc
mysys/my_new.cc
+3
-2
sql/opt_range.cc
sql/opt_range.cc
+1
-1
sql/sql_class.cc
sql/sql_class.cc
+1
-1
strings/Makefile.am
strings/Makefile.am
+2
-1
No files found.
client/mysqltest.cc
View file @
c36e935a
...
@@ -7169,7 +7169,7 @@ void init_re_comp(my_regex_t *re, const char* str)
...
@@ -7169,7 +7169,7 @@ void init_re_comp(my_regex_t *re, const char* str)
char
erbuf
[
100
];
char
erbuf
[
100
];
int
len
=
my_regerror
(
err
,
re
,
erbuf
,
sizeof
(
erbuf
));
int
len
=
my_regerror
(
err
,
re
,
erbuf
,
sizeof
(
erbuf
));
die
(
"error %s, %d/%d `%s'
\n
"
,
die
(
"error %s, %d/%d `%s'
\n
"
,
re_eprint
(
err
),
len
,
(
int
)
sizeof
(
erbuf
),
erbuf
);
re_eprint
(
err
),
(
int
)
len
,
(
int
)
sizeof
(
erbuf
),
erbuf
);
}
}
}
}
...
@@ -7225,7 +7225,7 @@ int match_re(my_regex_t *re, char *str)
...
@@ -7225,7 +7225,7 @@ int match_re(my_regex_t *re, char *str)
char
erbuf
[
100
];
char
erbuf
[
100
];
int
len
=
my_regerror
(
err
,
re
,
erbuf
,
sizeof
(
erbuf
));
int
len
=
my_regerror
(
err
,
re
,
erbuf
,
sizeof
(
erbuf
));
die
(
"error %s, %d/%d `%s'
\n
"
,
die
(
"error %s, %d/%d `%s'
\n
"
,
re_eprint
(
err
),
len
,
(
int
)
sizeof
(
erbuf
),
erbuf
);
re_eprint
(
err
),
(
int
)
len
,
(
int
)
sizeof
(
erbuf
),
erbuf
);
}
}
return
0
;
return
0
;
}
}
...
...
This diff is collapsed.
Click to expand it.
mysys/default.c
View file @
c36e935a
...
@@ -1127,7 +1127,7 @@ static const char **init_default_directories(MEM_ROOT *alloc)
...
@@ -1127,7 +1127,7 @@ static const char **init_default_directories(MEM_ROOT *alloc)
errors
+=
add_directory
(
alloc
,
"/etc/mysql/"
,
dirs
);
errors
+=
add_directory
(
alloc
,
"/etc/mysql/"
,
dirs
);
#if defined(DEFAULT_SYSCONFDIR)
#if defined(DEFAULT_SYSCONFDIR)
if
(
DEFAULT_SYSCONFDIR
!=
""
)
if
(
DEFAULT_SYSCONFDIR
[
0
]
)
errors
+=
add_directory
(
alloc
,
DEFAULT_SYSCONFDIR
,
dirs
);
errors
+=
add_directory
(
alloc
,
DEFAULT_SYSCONFDIR
,
dirs
);
#endif
/* DEFAULT_SYSCONFDIR */
#endif
/* DEFAULT_SYSCONFDIR */
...
...
This diff is collapsed.
Click to expand it.
mysys/my_new.cc
View file @
c36e935a
...
@@ -46,8 +46,9 @@ void operator delete[] (void *ptr) throw ()
...
@@ -46,8 +46,9 @@ void operator delete[] (void *ptr) throw ()
C_MODE_START
C_MODE_START
int
__cxa_pure_virtual
()
{
int
__cxa_pure_virtual
()
assert
(
"Pure virtual method called."
==
"Aborted"
);
{
assert
(
!
"Aborted: pure virtual method called."
);
return
0
;
return
0
;
}
}
...
...
This diff is collapsed.
Click to expand it.
sql/opt_range.cc
View file @
c36e935a
...
@@ -9494,7 +9494,7 @@ get_best_group_min_max(PARAM *param, SEL_TREE *tree)
...
@@ -9494,7 +9494,7 @@ get_best_group_min_max(PARAM *param, SEL_TREE *tree)
}
}
/* If we got to this point, cur_index_info passes the test. */
/* If we got to this point, cur_index_info passes the test. */
key_infix_parts
=
cur_key_infix_len
?
key_infix_parts
=
cur_key_infix_len
?
(
uint
)
(
first_non_infix_part
-
first_non_group_part
)
:
0
;
(
first_non_infix_part
-
first_non_group_part
)
:
0
;
cur_used_key_parts
=
cur_group_key_parts
+
key_infix_parts
;
cur_used_key_parts
=
cur_group_key_parts
+
key_infix_parts
;
...
...
This diff is collapsed.
Click to expand it.
sql/sql_class.cc
View file @
c36e935a
...
@@ -2303,7 +2303,7 @@ void Query_arena::set_query_arena(Query_arena *set)
...
@@ -2303,7 +2303,7 @@ void Query_arena::set_query_arena(Query_arena *set)
void
Query_arena
::
cleanup_stmt
()
void
Query_arena
::
cleanup_stmt
()
{
{
DBUG_ASSERT
(
"Query_arena::cleanup_stmt()"
==
"
not implemented"
);
DBUG_ASSERT
(
!
"Query_arena::cleanup_stmt()
not implemented"
);
}
}
/*
/*
...
...
This diff is collapsed.
Click to expand it.
strings/Makefile.am
View file @
c36e935a
...
@@ -53,7 +53,8 @@ EXTRA_DIST = ctype-big5.c ctype-cp932.c ctype-czech.c ctype-eucjpms.c ctype-euc
...
@@ -53,7 +53,8 @@ EXTRA_DIST = ctype-big5.c ctype-cp932.c ctype-czech.c ctype-eucjpms.c ctype-euc
bmove_upp-sparc.s strappend-sparc.s strend-sparc.s
\
bmove_upp-sparc.s strappend-sparc.s strend-sparc.s
\
strinstr-sparc.s strmake-sparc.s strmov-sparc.s
\
strinstr-sparc.s strmake-sparc.s strmov-sparc.s
\
strnmov-sparc.s strstr-sparc.s strxmov-sparc.s
\
strnmov-sparc.s strstr-sparc.s strxmov-sparc.s
\
t_ctype.h my_strchr.c CMakeLists.txt
t_ctype.h my_strchr.c CMakeLists.txt
\
CHARSET_INFO.txt
libmystrings_a_LIBADD
=
libmystrings_a_LIBADD
=
conf_to_src_SOURCES
=
conf_to_src.c xml.c ctype.c bcmp.c
conf_to_src_SOURCES
=
conf_to_src.c xml.c ctype.c bcmp.c
...
...
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