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
9dbb0918
Commit
9dbb0918
authored
Jun 29, 2006
by
gkodinov@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/home/kgeorge/mysql/4.1/teamclean
into mysql.com:/home/kgeorge/mysql/4.1/warnings
parents
be3c4a15
96ceb6c2
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
4 deletions
+22
-4
sql/item_cmpfunc.h
sql/item_cmpfunc.h
+14
-0
sql/opt_range.cc
sql/opt_range.cc
+2
-2
sql/spatial.h
sql/spatial.h
+4
-0
sql/sql_select.h
sql/sql_select.h
+1
-1
sql/sql_update.cc
sql/sql_update.cc
+1
-1
No files found.
sql/item_cmpfunc.h
View file @
9dbb0918
...
...
@@ -124,6 +124,8 @@ public:
class
Comp_creator
{
public:
Comp_creator
()
{}
/* Remove gcc warning */
virtual
~
Comp_creator
()
{}
/* Remove gcc warning */
virtual
Item_bool_func2
*
create
(
Item
*
a
,
Item
*
b
)
const
=
0
;
virtual
const
char
*
symbol
(
bool
invert
)
const
=
0
;
virtual
bool
eqne_op
()
const
=
0
;
...
...
@@ -133,6 +135,8 @@ public:
class
Eq_creator
:
public
Comp_creator
{
public:
Eq_creator
()
{}
/* Remove gcc warning */
virtual
~
Eq_creator
()
{}
/* Remove gcc warning */
virtual
Item_bool_func2
*
create
(
Item
*
a
,
Item
*
b
)
const
;
virtual
const
char
*
symbol
(
bool
invert
)
const
{
return
invert
?
"<>"
:
"="
;
}
virtual
bool
eqne_op
()
const
{
return
1
;
}
...
...
@@ -142,6 +146,8 @@ public:
class
Ne_creator
:
public
Comp_creator
{
public:
Ne_creator
()
{}
/* Remove gcc warning */
virtual
~
Ne_creator
()
{}
/* Remove gcc warning */
virtual
Item_bool_func2
*
create
(
Item
*
a
,
Item
*
b
)
const
;
virtual
const
char
*
symbol
(
bool
invert
)
const
{
return
invert
?
"="
:
"<>"
;
}
virtual
bool
eqne_op
()
const
{
return
1
;
}
...
...
@@ -151,6 +157,8 @@ public:
class
Gt_creator
:
public
Comp_creator
{
public:
Gt_creator
()
{}
/* Remove gcc warning */
virtual
~
Gt_creator
()
{}
/* Remove gcc warning */
virtual
Item_bool_func2
*
create
(
Item
*
a
,
Item
*
b
)
const
;
virtual
const
char
*
symbol
(
bool
invert
)
const
{
return
invert
?
"<="
:
">"
;
}
virtual
bool
eqne_op
()
const
{
return
0
;
}
...
...
@@ -160,6 +168,8 @@ public:
class
Lt_creator
:
public
Comp_creator
{
public:
Lt_creator
()
{}
/* Remove gcc warning */
virtual
~
Lt_creator
()
{}
/* Remove gcc warning */
virtual
Item_bool_func2
*
create
(
Item
*
a
,
Item
*
b
)
const
;
virtual
const
char
*
symbol
(
bool
invert
)
const
{
return
invert
?
">="
:
"<"
;
}
virtual
bool
eqne_op
()
const
{
return
0
;
}
...
...
@@ -169,6 +179,8 @@ public:
class
Ge_creator
:
public
Comp_creator
{
public:
Ge_creator
()
{}
/* Remove gcc warning */
virtual
~
Ge_creator
()
{}
/* Remove gcc warning */
virtual
Item_bool_func2
*
create
(
Item
*
a
,
Item
*
b
)
const
;
virtual
const
char
*
symbol
(
bool
invert
)
const
{
return
invert
?
"<"
:
">="
;
}
virtual
bool
eqne_op
()
const
{
return
0
;
}
...
...
@@ -178,6 +190,8 @@ public:
class
Le_creator
:
public
Comp_creator
{
public:
Le_creator
()
{}
/* Remove gcc warning */
virtual
~
Le_creator
()
{}
/* Remove gcc warning */
virtual
Item_bool_func2
*
create
(
Item
*
a
,
Item
*
b
)
const
;
virtual
const
char
*
symbol
(
bool
invert
)
const
{
return
invert
?
">"
:
"<="
;
}
virtual
bool
eqne_op
()
const
{
return
0
;
}
...
...
sql/opt_range.cc
View file @
9dbb0918
...
...
@@ -63,8 +63,8 @@ public:
SEL_ARG
(
Field
*
field
,
uint8
part
,
char
*
min_value
,
char
*
max_value
,
uint8
min_flag
,
uint8
max_flag
,
uint8
maybe_flag
);
SEL_ARG
(
enum
Type
type_arg
)
:
elements
(
1
),
use_count
(
1
),
left
(
0
),
next_key_part
(
0
),
color
(
BLACK
),
type
(
type_arg
),
min_flag
(
0
)
:
min_flag
(
0
),
elements
(
1
),
use_count
(
1
),
left
(
0
),
next_key_part
(
0
),
color
(
BLACK
),
type
(
type_arg
)
{}
inline
bool
is_same
(
SEL_ARG
*
arg
)
{
...
...
sql/spatial.h
View file @
9dbb0918
...
...
@@ -165,6 +165,8 @@ struct Geometry_buffer;
class
Geometry
{
public:
Geometry
()
{}
/* remove gcc warning */
virtual
~
Geometry
()
{}
/* remove gcc warning */
static
void
*
operator
new
(
size_t
size
,
void
*
buffer
)
{
return
buffer
;
...
...
@@ -173,6 +175,8 @@ public:
static
void
operator
delete
(
void
*
ptr
,
void
*
buffer
)
{}
static
void
operator
delete
(
void
*
buffer
)
{}
/* remove gcc warning */
enum
wkbType
{
wkb_point
=
1
,
...
...
sql/sql_select.h
View file @
9dbb0918
...
...
@@ -229,7 +229,7 @@ class JOIN :public Sql_alloc
}
JOIN
(
JOIN
&
join
)
:
fields_list
(
join
.
fields_list
)
:
Sql_alloc
(),
fields_list
(
join
.
fields_list
)
{
init
(
join
.
thd
,
join
.
fields_list
,
join
.
select_options
,
join
.
result
);
...
...
sql/sql_update.cc
View file @
9dbb0918
...
...
@@ -1094,7 +1094,7 @@ bool multi_update::send_data(List<Item> ¬_used_values)
memcpy
((
char
*
)
tmp_table
->
field
[
0
]
->
ptr
,
(
char
*
)
table
->
file
->
ref
,
table
->
file
->
ref_length
);
/* Write row, ignoring duplicated updates to a row */
if
(
error
=
tmp_table
->
file
->
write_row
(
tmp_table
->
record
[
0
]
))
if
(
(
error
=
tmp_table
->
file
->
write_row
(
tmp_table
->
record
[
0
])
))
{
if
(
error
!=
HA_ERR_FOUND_DUPP_KEY
&&
error
!=
HA_ERR_FOUND_DUPP_UNIQUE
&&
...
...
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