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
c77ee8c9
Commit
c77ee8c9
authored
Dec 30, 2005
by
reggie@fedora.(none)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
some casts and simple fixes to fix compile errors in Visual 2005
parent
78845aba
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
53 additions
and
39 deletions
+53
-39
sql/handler.cc
sql/handler.cc
+1
-0
sql/log_event.cc
sql/log_event.cc
+46
-33
sql/log_event.h
sql/log_event.h
+1
-1
sql/sql_class.cc
sql/sql_class.cc
+5
-5
No files found.
sql/handler.cc
View file @
c77ee8c9
...
@@ -1178,6 +1178,7 @@ int ha_release_temporary_latches(THD *thd)
...
@@ -1178,6 +1178,7 @@ int ha_release_temporary_latches(THD *thd)
#ifdef WITH_INNOBASE_STORAGE_ENGINE
#ifdef WITH_INNOBASE_STORAGE_ENGINE
innobase_release_temporary_latches
(
thd
);
innobase_release_temporary_latches
(
thd
);
#endif
#endif
return
0
;
}
}
...
...
sql/log_event.cc
View file @
c77ee8c9
This diff is collapsed.
Click to expand it.
sql/log_event.h
View file @
c77ee8c9
...
@@ -1701,7 +1701,7 @@ class Table_map_log_event : public Log_event
...
@@ -1701,7 +1701,7 @@ class Table_map_log_event : public Log_event
~
Table_map_log_event
();
~
Table_map_log_event
();
virtual
Log_event_type
get_type_code
()
{
return
TABLE_MAP_EVENT
;
}
virtual
Log_event_type
get_type_code
()
{
return
TABLE_MAP_EVENT
;
}
virtual
bool
is_valid
()
const
{
return
m_memory
;
/* we check malloc */
}
virtual
bool
is_valid
()
const
{
return
m_memory
!=
NULL
;
/* we check malloc */
}
virtual
int
get_data_size
()
{
return
m_data_size
;
}
virtual
int
get_data_size
()
{
return
m_data_size
;
}
#ifndef MYSQL_CLIENT
#ifndef MYSQL_CLIENT
...
...
sql/sql_class.cc
View file @
c77ee8c9
...
@@ -2322,7 +2322,7 @@ my_size_t THD::pack_row(TABLE *table, MY_BITMAP const* cols, byte *row_data,
...
@@ -2322,7 +2322,7 @@ my_size_t THD::pack_row(TABLE *table, MY_BITMAP const* cols, byte *row_data,
for
(
int
i
=
0
;
field
;
i
++
,
p_field
++
,
field
=
*
p_field
)
for
(
int
i
=
0
;
field
;
i
++
,
p_field
++
,
field
=
*
p_field
)
{
{
if
(
bitmap_is_set
(
cols
,
i
))
if
(
bitmap_is_set
(
cols
,
i
))
ptr
=
field
->
pack
(
ptr
,
field
->
ptr
+
offset
);
ptr
=
(
byte
*
)
field
->
pack
(
ptr
,
field
->
ptr
+
offset
);
}
}
/*
/*
...
@@ -2398,7 +2398,7 @@ int THD::binlog_update_row(TABLE* table, bool is_trans,
...
@@ -2398,7 +2398,7 @@ int THD::binlog_update_row(TABLE* table, bool is_trans,
}
}
else
else
{
{
if
(
unlikely
(
!
(
row_data
=
my_multi_malloc
(
MYF
(
MY_WME
),
if
(
unlikely
(
!
(
row_data
=
(
byte
*
)
my_multi_malloc
(
MYF
(
MY_WME
),
&
before_row
,
before_maxlen
,
&
before_row
,
before_maxlen
,
&
after_row
,
after_maxlen
,
&
after_row
,
after_maxlen
,
NULL
))))
NULL
))))
...
@@ -2420,7 +2420,7 @@ int THD::binlog_update_row(TABLE* table, bool is_trans,
...
@@ -2420,7 +2420,7 @@ int THD::binlog_update_row(TABLE* table, bool is_trans,
if
(
!
table
->
write_row_record
)
if
(
!
table
->
write_row_record
)
{
{
/* add_row_data copies row_data to internal buffer */
/* add_row_data copies row_data to internal buffer */
my_free
(
row_data
,
MYF
(
MY_WME
));
my_free
(
(
gptr
)
row_data
,
MYF
(
MY_WME
));
}
}
return
error
;
return
error
;
...
@@ -2439,7 +2439,7 @@ int THD::binlog_delete_row(TABLE* table, bool is_trans,
...
@@ -2439,7 +2439,7 @@ int THD::binlog_delete_row(TABLE* table, bool is_trans,
bool
error
=
0
;
bool
error
=
0
;
my_size_t
const
max_len
=
max_row_length
(
table
,
record
);
my_size_t
const
max_len
=
max_row_length
(
table
,
record
);
byte
*
row_data
=
table
->
write_row_record
;
byte
*
row_data
=
table
->
write_row_record
;
if
(
!
row_data
&&
unlikely
(
!
(
row_data
=
my_malloc
(
max_len
,
MYF
(
MY_WME
)))))
if
(
!
row_data
&&
unlikely
(
!
(
row_data
=
(
byte
*
)
my_malloc
(
max_len
,
MYF
(
MY_WME
)))))
return
HA_ERR_OUT_OF_MEM
;
return
HA_ERR_OUT_OF_MEM
;
my_size_t
const
len
=
pack_row
(
table
,
cols
,
row_data
,
record
);
my_size_t
const
len
=
pack_row
(
table
,
cols
,
row_data
,
record
);
...
@@ -2451,7 +2451,7 @@ int THD::binlog_delete_row(TABLE* table, bool is_trans,
...
@@ -2451,7 +2451,7 @@ int THD::binlog_delete_row(TABLE* table, bool is_trans,
/* add_row_data copies row_data */
/* add_row_data copies row_data */
if
(
table
->
write_row_record
==
0
)
if
(
table
->
write_row_record
==
0
)
my_free
(
row_data
,
MYF
(
MY_WME
));
my_free
(
(
gptr
)
row_data
,
MYF
(
MY_WME
));
return
error
;
return
error
;
}
}
...
...
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