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
af93f443
Commit
af93f443
authored
Aug 15, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/home/jimw/my/mysql-4.1-11688
into mysql.com:/home/jimw/my/mysql-4.1-clean
parents
94052bf1
db67a7aa
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
2 deletions
+26
-2
mysql-test/r/metadata.result
mysql-test/r/metadata.result
+11
-0
mysql-test/t/metadata.test
mysql-test/t/metadata.test
+12
-0
sql-common/client.c
sql-common/client.c
+3
-2
No files found.
mysql-test/r/metadata.result
View file @
af93f443
...
...
@@ -85,3 +85,14 @@ def aaa 1 1 8 20 1 N 32769 0 63
1
1
drop table t1;
create table t1 (i int);
insert into t1 values (1),(2),(3);
select * from t1 where i = 2;
drop table t1;//
affected rows: 0
affected rows: 3
info: Records: 3 Duplicates: 0 Warnings: 0
i
2
affected rows: 1
affected rows: 0
mysql-test/t/metadata.test
View file @
af93f443
...
...
@@ -49,4 +49,16 @@ drop table t1;
--
disable_metadata
#
# Bug #11688: Bad mysql_info() results in multi-results
#
--
enable_info
delimiter
//;
create
table
t1
(
i
int
);
insert
into
t1
values
(
1
),(
2
),(
3
);
select
*
from
t1
where
i
=
2
;
drop
table
t1
;
//
delimiter
;
//
--
disable_info
# End of 4.1 tests
sql-common/client.c
View file @
af93f443
...
...
@@ -713,8 +713,9 @@ void free_old_query(MYSQL *mysql)
if
(
mysql
->
fields
)
free_root
(
&
mysql
->
field_alloc
,
MYF
(
0
));
init_alloc_root
(
&
mysql
->
field_alloc
,
8192
,
0
);
/* Assume rowlength < 8192 */
mysql
->
fields
=
0
;
mysql
->
field_count
=
0
;
/* For API */
mysql
->
fields
=
0
;
mysql
->
field_count
=
0
;
/* For API */
mysql
->
info
=
0
;
DBUG_VOID_RETURN
;
}
...
...
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