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
919ccd91
Commit
919ccd91
authored
Feb 20, 2008
by
davi@buzz.(none)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Post-merge fixes for bugs 34587 and 32265.
parent
bf914282
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
3 deletions
+4
-3
mysql-test/r/view.result
mysql-test/r/view.result
+1
-0
mysql-test/t/view.test
mysql-test/t/view.test
+1
-0
sql/sql_cursor.cc
sql/sql_cursor.cc
+1
-1
tests/mysql_client_test.c
tests/mysql_client_test.c
+1
-2
No files found.
mysql-test/r/view.result
View file @
919ccd91
...
@@ -3729,6 +3729,7 @@ create view a as select 1;
...
@@ -3729,6 +3729,7 @@ create view a as select 1;
end|
end|
call p();
call p();
call p();
call p();
drop view a;
drop procedure p;
drop procedure p;
# -----------------------------------------------------------------
# -----------------------------------------------------------------
# -- Bug#34337: Server crash when Altering a view using a table name.
# -- Bug#34337: Server crash when Altering a view using a table name.
...
...
mysql-test/t/view.test
View file @
919ccd91
...
@@ -3619,6 +3619,7 @@ end|
...
@@ -3619,6 +3619,7 @@ end|
delimiter
;
|
delimiter
;
|
call
p
();
call
p
();
call
p
();
call
p
();
drop
view
a
;
drop
procedure
p
;
drop
procedure
p
;
###########################################################################
###########################################################################
...
...
sql/sql_cursor.cc
View file @
919ccd91
...
@@ -588,7 +588,7 @@ int Materialized_cursor::fill_item_list(THD *thd, List<Item> &send_fields)
...
@@ -588,7 +588,7 @@ int Materialized_cursor::fill_item_list(THD *thd, List<Item> &send_fields)
end:
end:
thd
->
restore_active_arena
(
this
,
&
backup_arena
);
thd
->
restore_active_arena
(
this
,
&
backup_arena
);
/* Check for thd->is_error() in case of OOM */
/* Check for thd->is_error() in case of OOM */
return
rc
||
thd
->
net
.
report_error
;
return
rc
||
thd
->
is_error
()
;
}
}
int
Materialized_cursor
::
open
(
JOIN
*
join
__attribute__
((
unused
)))
int
Materialized_cursor
::
open
(
JOIN
*
join
__attribute__
((
unused
)))
...
...
tests/mysql_client_test.c
View file @
919ccd91
...
@@ -16109,8 +16109,6 @@ static void test_bug24179()
...
@@ -16109,8 +16109,6 @@ static void test_bug24179()
}
}
/*
/**
/**
Bug#32265 Server returns different metadata if prepared statement is used
Bug#32265 Server returns different metadata if prepared statement is used
*/
*/
...
@@ -16191,6 +16189,7 @@ static void test_bug32265()
...
@@ -16191,6 +16189,7 @@ static void test_bug32265()
DBUG_VOID_RETURN
;
DBUG_VOID_RETURN
;
}
}
/*
Bug#28075 "COM_DEBUG crashes mysqld"
Bug#28075 "COM_DEBUG crashes mysqld"
*/
*/
...
...
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