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
336d4848
Commit
336d4848
authored
Jul 22, 2007
by
holyfoot/hf@hfmain.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk@192.168.21.1:mysql-5.0-opt
into mysql.com:/home/hf/work/29494/my50-29494
parents
ce9ee1b9
14cbdecf
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
sql-common/client.c
sql-common/client.c
+7
-7
No files found.
sql-common/client.c
View file @
336d4848
...
...
@@ -1226,12 +1226,12 @@ unpack_fields(MYSQL_DATA *data,MEM_ROOT *alloc,uint fields,
/* fields count may be wrong */
DBUG_ASSERT
((
uint
)
(
field
-
result
)
<
fields
);
cli_fetch_lengths
(
&
lengths
[
0
],
row
->
data
,
default_value
?
8
:
7
);
field
->
catalog
=
strdup_root
(
alloc
,(
char
*
)
row
->
data
[
0
]);
field
->
db
=
strdup_root
(
alloc
,(
char
*
)
row
->
data
[
1
]);
field
->
table
=
strdup_root
(
alloc
,(
char
*
)
row
->
data
[
2
]);
field
->
org_table
=
str
dup_root
(
alloc
,(
char
*
)
row
->
data
[
3
]);
field
->
name
=
strdup_root
(
alloc
,(
char
*
)
row
->
data
[
4
]);
field
->
org_name
=
strdup_root
(
alloc
,(
char
*
)
row
->
data
[
5
]);
field
->
catalog
=
strmake_root
(
alloc
,(
char
*
)
row
->
data
[
0
],
lengths
[
0
]);
field
->
db
=
strmake_root
(
alloc
,(
char
*
)
row
->
data
[
1
],
lengths
[
1
]);
field
->
table
=
strmake_root
(
alloc
,(
char
*
)
row
->
data
[
2
],
lengths
[
2
]);
field
->
org_table
=
str
make_root
(
alloc
,(
char
*
)
row
->
data
[
3
],
lengths
[
3
]);
field
->
name
=
strmake_root
(
alloc
,(
char
*
)
row
->
data
[
4
],
lengths
[
4
]);
field
->
org_name
=
strmake_root
(
alloc
,(
char
*
)
row
->
data
[
5
],
lengths
[
5
]);
field
->
catalog_length
=
lengths
[
0
];
field
->
db_length
=
lengths
[
1
];
...
...
@@ -1252,7 +1252,7 @@ unpack_fields(MYSQL_DATA *data,MEM_ROOT *alloc,uint fields,
field
->
flags
|=
NUM_FLAG
;
if
(
default_value
&&
row
->
data
[
7
])
{
field
->
def
=
str
dup_root
(
alloc
,(
char
*
)
row
->
data
[
7
]);
field
->
def
=
str
make_root
(
alloc
,(
char
*
)
row
->
data
[
7
],
lengths
[
7
]);
field
->
def_length
=
lengths
[
7
];
}
else
...
...
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