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
2a0c3298
Commit
2a0c3298
authored
Mar 16, 2003
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into mashka.mysql.fi:/home/my/mysql-3.23
parents
4885e9a1
73ebe159
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
15 deletions
+10
-15
configure.in
configure.in
+1
-1
innobase/row/row0mysql.c
innobase/row/row0mysql.c
+1
-1
innobase/row/row0sel.c
innobase/row/row0sel.c
+8
-13
No files found.
configure.in
View file @
2a0c3298
...
...
@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_INIT
(
sql/mysqld.cc
)
AC_CANONICAL_SYSTEM
# The Docs Makefile.am parses this line!
AM_INIT_AUTOMAKE
(
mysql, 3.23.5
6
)
AM_INIT_AUTOMAKE
(
mysql, 3.23.5
7
)
AM_CONFIG_HEADER
(
config.h
)
PROTOCOL_VERSION
=
10
...
...
innobase/row/row0mysql.c
View file @
2a0c3298
...
...
@@ -6,7 +6,7 @@ Contains also create table and other data dictionary operations.
Created 9/17/2000 Heikki Tuuri
*******************************************************/
#include "row0mysql.h"
#ifdef UNIV_NONINL
...
...
innobase/row/row0sel.c
View file @
2a0c3298
...
...
@@ -2115,19 +2115,14 @@ row_sel_store_mysql_rec(
extern_field_heap
=
NULL
;
}
}
else
{
/* MySQL sometimes seems to copy the 'data'
pointed to by a BLOB field even if the field
has been marked to contain the SQL NULL value.
This caused seg faults reported by two users.
Set the BLOB length to 0 and the data pointer
to NULL to avoid a seg fault. */
if
(
templ
->
type
==
DATA_BLOB
)
{
row_sel_field_store_in_mysql_format
(
mysql_rec
+
templ
->
mysql_col_offset
,
templ
->
mysql_col_len
,
NULL
,
0
,
templ
->
type
,
templ
->
is_unsigned
);
}
/* MySQL seems to assume the field for an SQL NULL
value is set to zero. Not taking this into account
caused seg faults with NULL BLOB fields, and
bug number 154 in the MySQL bug database: GROUP BY
and DISTINCT could treat NULL values inequal. */
memset
(
mysql_rec
+
templ
->
mysql_col_offset
,
'\0'
,
templ
->
mysql_col_len
);
if
(
!
templ
->
mysql_null_bit_mask
)
{
fprintf
(
stderr
,
...
...
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