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
c0cdfe85
Commit
c0cdfe85
authored
Nov 24, 2005
by
ramil@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0.b15047
parents
f5804869
e5f0a861
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
sql/sql_class.h
sql/sql_class.h
+4
-2
No files found.
sql/sql_class.h
View file @
c0cdfe85
...
@@ -1230,14 +1230,16 @@ public:
...
@@ -1230,14 +1230,16 @@ public:
free_root
(
&
mem_root
,
MYF
(
MY_KEEP_PREALLOC
));
free_root
(
&
mem_root
,
MYF
(
MY_KEEP_PREALLOC
));
#endif
#endif
}
}
#ifdef USING_TRANSACTIONS
st_transactions
()
st_transactions
()
{
{
#ifdef USING_TRANSACTIONS
bzero
((
char
*
)
this
,
sizeof
(
*
this
));
bzero
((
char
*
)
this
,
sizeof
(
*
this
));
xid_state
.
xid
.
null
();
xid_state
.
xid
.
null
();
init_sql_alloc
(
&
mem_root
,
ALLOC_ROOT_MIN_BLOCK_SIZE
,
0
);
init_sql_alloc
(
&
mem_root
,
ALLOC_ROOT_MIN_BLOCK_SIZE
,
0
);
}
#else
xid_state
.
xa_state
=
XA_NOTR
;
#endif
#endif
}
}
transaction
;
}
transaction
;
Field
*
dupp_field
;
Field
*
dupp_field
;
#ifndef __WIN__
#ifndef __WIN__
...
...
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