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
fcb0c7f5
Commit
fcb0c7f5
authored
Jan 22, 2004
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
parents
989cb2f2
2880b07f
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
mysys/my_new.cc
mysys/my_new.cc
+2
-2
mysys/raid.cc
mysys/raid.cc
+2
-2
sql/item_strfunc.cc
sql/item_strfunc.cc
+2
-2
No files found.
mysys/my_new.cc
View file @
fcb0c7f5
...
@@ -19,10 +19,10 @@
...
@@ -19,10 +19,10 @@
with gcc 3.0.x to avoid including libstdc++
with gcc 3.0.x to avoid including libstdc++
*/
*/
#include "mysys_priv.h"
#ifdef USE_MYSYS_NEW
#ifdef USE_MYSYS_NEW
#include "mysys_priv.h"
void
*
operator
new
(
size_t
sz
)
void
*
operator
new
(
size_t
sz
)
{
{
return
(
void
*
)
malloc
(
sz
?
sz
:
1
);
return
(
void
*
)
malloc
(
sz
?
sz
:
1
);
...
...
mysys/raid.cc
View file @
fcb0c7f5
...
@@ -70,6 +70,8 @@
...
@@ -70,6 +70,8 @@
tonu@mysql.com & monty@mysql.com
tonu@mysql.com & monty@mysql.com
*/
*/
#if defined(USE_RAID) && !defined(MYSQL_CLIENT)
#ifdef __GNUC__
#ifdef __GNUC__
#pragma implementation // gcc: Class implementation
#pragma implementation // gcc: Class implementation
#endif
#endif
...
@@ -79,8 +81,6 @@
...
@@ -79,8 +81,6 @@
#include <m_string.h>
#include <m_string.h>
#include <assert.h>
#include <assert.h>
#if defined(USE_RAID) && !defined(MYSQL_CLIENT)
#define RAID_SEEK_DONE ~(off_t) 0
#define RAID_SEEK_DONE ~(off_t) 0
#define RAID_SIZE_UNKNOWN ~(my_off_t) 0
#define RAID_SIZE_UNKNOWN ~(my_off_t) 0
...
...
sql/item_strfunc.cc
View file @
fcb0c7f5
...
@@ -1652,7 +1652,7 @@ void Item_func_elt::fix_length_and_dec()
...
@@ -1652,7 +1652,7 @@ void Item_func_elt::fix_length_and_dec()
if
(
agg_arg_collations
(
collation
,
args
+
1
,
arg_count
-
1
))
if
(
agg_arg_collations
(
collation
,
args
+
1
,
arg_count
-
1
))
return
;
return
;
for
(
uint
i
=
1
;
i
<
arg_count
;
i
++
)
for
(
uint
i
=
1
;
i
<
arg_count
;
i
++
)
{
{
set_if_bigger
(
max_length
,
args
[
i
]
->
max_length
);
set_if_bigger
(
max_length
,
args
[
i
]
->
max_length
);
set_if_bigger
(
decimals
,
args
[
i
]
->
decimals
);
set_if_bigger
(
decimals
,
args
[
i
]
->
decimals
);
...
...
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