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
43960b93
Commit
43960b93
authored
Mar 30, 2012
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1. support for testing statically built oqgraph
2. my_new.cc should redefine new (std:nothrow) too.
parent
d3c7798e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
2 deletions
+24
-2
mysql-test/suite/oqgraph/suite.opt
mysql-test/suite/oqgraph/suite.opt
+1
-1
mysql-test/suite/oqgraph/suite.pm
mysql-test/suite/oqgraph/suite.pm
+2
-1
mysys/my_new.cc
mysys/my_new.cc
+21
-0
No files found.
mysql-test/suite/oqgraph/suite.opt
View file @
43960b93
--plugin-load=$HA_OQGRAPH_SO
--plugin-load=$HA_OQGRAPH_SO
--enable-oqgraph
mysql-test/suite/oqgraph/suite.pm
View file @
43960b93
...
@@ -2,7 +2,8 @@ package My::Suite::OQGraph;
...
@@ -2,7 +2,8 @@ package My::Suite::OQGraph;
@ISA
=
qw(My::Suite)
;
@ISA
=
qw(My::Suite)
;
return
"
No OQGraph
"
unless
$ENV
{
HA_OQGRAPH_SO
};
return
"
No OQGraph
"
unless
$ENV
{
HA_OQGRAPH_SO
}
or
$::mysqld_variables
{'
oqgraph
'}
eq
"
ON
";
bless
{
};
bless
{
};
mysys/my_new.cc
View file @
43960b93
...
@@ -23,6 +23,7 @@
...
@@ -23,6 +23,7 @@
*/
*/
#include "mysys_priv.h"
#include "mysys_priv.h"
#include <new>
#ifdef USE_MYSYS_NEW
#ifdef USE_MYSYS_NEW
...
@@ -36,6 +37,16 @@ void *operator new[] (size_t sz)
...
@@ -36,6 +37,16 @@ void *operator new[] (size_t sz)
return
(
void
*
)
my_malloc
(
sz
?
sz
:
1
,
MYF
(
0
));
return
(
void
*
)
my_malloc
(
sz
?
sz
:
1
,
MYF
(
0
));
}
}
void
*
operator
new
(
std
::
size_t
sz
,
const
std
::
nothrow_t
&
)
throw
()
{
return
(
void
*
)
my_malloc
(
sz
?
sz
:
1
,
MYF
(
0
));
}
void
*
operator
new
[](
std
::
size_t
sz
,
const
std
::
nothrow_t
&
)
throw
()
{
return
(
void
*
)
my_malloc
(
sz
?
sz
:
1
,
MYF
(
0
));
}
void
operator
delete
(
void
*
ptr
)
void
operator
delete
(
void
*
ptr
)
{
{
my_free
(
ptr
);
my_free
(
ptr
);
...
@@ -46,6 +57,16 @@ void operator delete[] (void *ptr) throw ()
...
@@ -46,6 +57,16 @@ void operator delete[] (void *ptr) throw ()
my_free
(
ptr
);
my_free
(
ptr
);
}
}
void
operator
delete
(
void
*
ptr
,
const
std
::
nothrow_t
&
)
throw
()
{
my_free
(
ptr
);
}
void
operator
delete
[](
void
*
ptr
,
const
std
::
nothrow_t
&
)
throw
()
{
my_free
(
ptr
);
}
C_MODE_START
C_MODE_START
int
__cxa_pure_virtual
()
int
__cxa_pure_virtual
()
...
...
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