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
6a83d18c
Commit
6a83d18c
authored
Jan 17, 2007
by
tulin/mysqldev@mysql.com/production.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-release
into mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-build
parents
b711c554
1d6fe0ff
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
19 deletions
+12
-19
configure.in
configure.in
+2
-2
myisam/mi_packrec.c
myisam/mi_packrec.c
+1
-1
sql/ha_ndbcluster.cc
sql/ha_ndbcluster.cc
+9
-16
No files found.
configure.in
View file @
6a83d18c
...
...
@@ -2516,9 +2516,9 @@ linked_client_targets="linked_libmysql_sources"
if
test
"
$THREAD_SAFE_CLIENT
"
=
"no"
then
sql_client_dirs
=
"strings regex mysys extra libmysql client"
sql_client_dirs
=
"strings regex mysys
dbug
extra libmysql client"
else
sql_client_dirs
=
"strings regex mysys extra libmysql libmysql_r client"
sql_client_dirs
=
"strings regex mysys
dbug
extra libmysql libmysql_r client"
linked_client_targets
=
"
$linked_client_targets
linked_libmysql_r_sources"
AC_CONFIG_FILES
(
libmysql_r/Makefile
)
AC_DEFINE
([
THREAD_SAFE_CLIENT],
[
1],
[
Should be client be thread safe]
)
...
...
myisam/mi_packrec.c
View file @
6a83d18c
...
...
@@ -592,8 +592,8 @@ static uint copy_decode_table(uint16 *to_pos, uint offset,
uint16
*
decode_table
)
{
uint
prev_offset
;
prev_offset
=
offset
;
DBUG_ENTER
(
"copy_decode_table"
);
prev_offset
=
offset
;
/* Descent on the left side. */
if
(
!
(
*
decode_table
&
IS_CHAR
))
...
...
sql/ha_ndbcluster.cc
View file @
6a83d18c
...
...
@@ -6109,23 +6109,7 @@ ndb_get_table_statistics(ha_ndbcluster* file, bool report_error, Ndb* ndb,
DBUG_RETURN
(
0
);
retry:
if
(
report_error
)
{
if
(
file
)
{
reterr
=
file
->
ndb_err
(
pTrans
);
}
else
{
const
NdbError
&
tmp
=
error
;
ERR_PRINT
(
tmp
);
reterr
=
ndb_to_mysql_error
(
&
tmp
);
}
}
else
reterr
=
error
.
code
;
if
(
pTrans
)
{
ndb
->
closeTransaction
(
pTrans
);
pTrans
=
NULL
;
...
...
@@ -6135,6 +6119,15 @@ ndb_get_table_statistics(ha_ndbcluster* file, bool report_error, Ndb* ndb,
my_sleep
(
retry_sleep
);
continue
;
}
if
(
report_error
)
{
const
NdbError
&
tmp
=
error
;
ERR_PRINT
(
tmp
);
reterr
=
ndb_to_mysql_error
(
&
tmp
);
}
else
reterr
=
error
.
code
;
break
;
}
while
(
1
);
DBUG_PRINT
(
"exit"
,
(
"failed, reterr: %u, NdbError %u(%s)"
,
reterr
,
...
...
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