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
60fffe65
Commit
60fffe65
authored
16 years ago
by
Alexey Botchkov
Browse files
Options
Browse Files
Download
Plain Diff
merging fixes
parents
d164ce12
67e480d2
Branches unavailable
Tags unavailable
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
1 deletion
+15
-1
mysql-test/r/udf.result
mysql-test/r/udf.result
+6
-0
mysys/my_symlink.c
mysys/my_symlink.c
+8
-0
storage/myisam/mi_static.c
storage/myisam/mi_static.c
+1
-1
No files found.
mysql-test/r/udf.result
View file @
60fffe65
drop table if exists t1;
drop table if exists t1;
CREATE FUNCTION metaphon RETURNS STRING SONAME "UDF_EXAMPLE_LIB";
CREATE FUNCTION metaphon RETURNS STRING SONAME "UDF_EXAMPLE_LIB";
Warnings:
Warning 1105 plugin_dir was not specified
CREATE FUNCTION myfunc_double RETURNS REAL SONAME "UDF_EXAMPLE_LIB";
CREATE FUNCTION myfunc_double RETURNS REAL SONAME "UDF_EXAMPLE_LIB";
CREATE FUNCTION myfunc_nonexist RETURNS INTEGER SONAME "UDF_EXAMPLE_LIB";
CREATE FUNCTION myfunc_nonexist RETURNS INTEGER SONAME "UDF_EXAMPLE_LIB";
ERROR HY000: Can't find symbol 'myfunc_nonexist' in library
ERROR HY000: Can't find symbol 'myfunc_nonexist' in library
...
@@ -235,6 +237,8 @@ DROP FUNCTION avgcost;
...
@@ -235,6 +237,8 @@ DROP FUNCTION avgcost;
select * from mysql.func;
select * from mysql.func;
name ret dl type
name ret dl type
CREATE FUNCTION is_const RETURNS STRING SONAME "UDF_EXAMPLE_LIB";
CREATE FUNCTION is_const RETURNS STRING SONAME "UDF_EXAMPLE_LIB";
Warnings:
Warning 1105 plugin_dir was not specified
select IS_const(3);
select IS_const(3);
IS_const(3)
IS_const(3)
const
const
...
@@ -244,6 +248,8 @@ name ret dl type
...
@@ -244,6 +248,8 @@ name ret dl type
select is_const(3);
select is_const(3);
ERROR 42000: FUNCTION test.is_const does not exist
ERROR 42000: FUNCTION test.is_const does not exist
CREATE FUNCTION is_const RETURNS STRING SONAME "UDF_EXAMPLE_LIB";
CREATE FUNCTION is_const RETURNS STRING SONAME "UDF_EXAMPLE_LIB";
Warnings:
Warning 1105 plugin_dir was not specified
select
select
is_const(3) as const,
is_const(3) as const,
is_const(3.14) as const,
is_const(3.14) as const,
...
...
This diff is collapsed.
Click to expand it.
mysys/my_symlink.c
View file @
60fffe65
...
@@ -111,8 +111,16 @@ int my_symlink(const char *content, const char *linkname, myf MyFlags)
...
@@ -111,8 +111,16 @@ int my_symlink(const char *content, const char *linkname, myf MyFlags)
int
my_is_symlink
(
const
char
*
filename
__attribute__
((
unused
)))
int
my_is_symlink
(
const
char
*
filename
__attribute__
((
unused
)))
{
{
#if defined (HAVE_LSTAT) && defined (S_ISLNK)
struct
stat
stat_buff
;
struct
stat
stat_buff
;
return
!
lstat
(
filename
,
&
stat_buff
)
&&
S_ISLNK
(
stat_buff
.
st_mode
);
return
!
lstat
(
filename
,
&
stat_buff
)
&&
S_ISLNK
(
stat_buff
.
st_mode
);
#elif defined (_WIN32)
DWORD
dwAttr
=
GetFileAttributes
(
filename
);
return
(
dwAttr
!=
INVALID_FILE_ATTRIBUTES
)
&&
(
dwAttr
&
FILE_ATTRIBUTE_REPARSE_POINT
);
#else
/* No symlinks */
return
0
;
#endif
}
}
...
...
This diff is collapsed.
Click to expand it.
storage/myisam/mi_static.c
View file @
60fffe65
...
@@ -42,7 +42,7 @@ ulong myisam_bulk_insert_tree_size=8192*1024;
...
@@ -42,7 +42,7 @@ ulong myisam_bulk_insert_tree_size=8192*1024;
ulong
myisam_data_pointer_size
=
4
;
ulong
myisam_data_pointer_size
=
4
;
static
int
always_valid
(
const
char
*
filename
)
static
int
always_valid
(
const
char
*
filename
__attribute__
((
unused
))
)
{
{
return
0
;
return
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