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
57c537c6
Commit
57c537c6
authored
Jul 28, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Merge/5.0
parents
9bbcede4
983a836f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
0 deletions
+29
-0
mysql-test/r/information_schema.result
mysql-test/r/information_schema.result
+9
-0
mysql-test/t/information_schema.test
mysql-test/t/information_schema.test
+11
-0
sql/sql_trigger.cc
sql/sql_trigger.cc
+9
-0
No files found.
mysql-test/r/information_schema.result
View file @
57c537c6
...
@@ -940,3 +940,12 @@ f5 19 NULL
...
@@ -940,3 +940,12 @@ f5 19 NULL
f6 1 NULL
f6 1 NULL
f7 64 NULL
f7 64 NULL
drop table t1;
drop table t1;
create table t1 (f1 integer);
create trigger tr1 after insert on t1 for each row set @test_var=42;
use information_schema;
select trigger_schema, trigger_name from triggers where
trigger_name='tr1';
trigger_schema trigger_name
test tr1
use test;
drop table t1;
mysql-test/t/information_schema.test
View file @
57c537c6
...
@@ -622,3 +622,14 @@ select column_name, NUMERIC_PRECISION, NUMERIC_SCALE
...
@@ -622,3 +622,14 @@ select column_name, NUMERIC_PRECISION, NUMERIC_SCALE
from
information_schema
.
columns
from
information_schema
.
columns
where
table_name
=
't1'
;
where
table_name
=
't1'
;
drop
table
t1
;
drop
table
t1
;
#
# Bug #12127 triggers do not show in info_schema before they are used if set to the database
#
create
table
t1
(
f1
integer
);
create
trigger
tr1
after
insert
on
t1
for
each
row
set
@
test_var
=
42
;
use
information_schema
;
select
trigger_schema
,
trigger_name
from
triggers
where
trigger_name
=
'tr1'
;
use
test
;
drop
table
t1
;
sql/sql_trigger.cc
View file @
57c537c6
...
@@ -520,6 +520,7 @@ bool Table_triggers_list::check_n_load(THD *thd, const char *db,
...
@@ -520,6 +520,7 @@ bool Table_triggers_list::check_n_load(THD *thd, const char *db,
char
path_buff
[
FN_REFLEN
];
char
path_buff
[
FN_REFLEN
];
LEX_STRING
path
;
LEX_STRING
path
;
File_parser
*
parser
;
File_parser
*
parser
;
LEX_STRING
save_db
;
DBUG_ENTER
(
"Table_triggers_list::check_n_load"
);
DBUG_ENTER
(
"Table_triggers_list::check_n_load"
);
...
@@ -581,6 +582,10 @@ bool Table_triggers_list::check_n_load(THD *thd, const char *db,
...
@@ -581,6 +582,10 @@ bool Table_triggers_list::check_n_load(THD *thd, const char *db,
thd
->
lex
=
&
lex
;
thd
->
lex
=
&
lex
;
save_db
.
str
=
thd
->
db
;
save_db
.
length
=
thd
->
db_length
;
thd
->
db_length
=
strlen
(
db
);
thd
->
db
=
(
char
*
)
db
;
while
((
trg_create_str
=
it
++
))
while
((
trg_create_str
=
it
++
))
{
{
lex_start
(
thd
,
(
uchar
*
)
trg_create_str
->
str
,
trg_create_str
->
length
);
lex_start
(
thd
,
(
uchar
*
)
trg_create_str
->
str
,
trg_create_str
->
length
);
...
@@ -623,6 +628,8 @@ bool Table_triggers_list::check_n_load(THD *thd, const char *db,
...
@@ -623,6 +628,8 @@ bool Table_triggers_list::check_n_load(THD *thd, const char *db,
lex_end
(
&
lex
);
lex_end
(
&
lex
);
}
}
thd
->
db
=
save_db
.
str
;
thd
->
db_length
=
save_db
.
length
;
thd
->
lex
=
old_lex
;
thd
->
lex
=
old_lex
;
DBUG_RETURN
(
0
);
DBUG_RETURN
(
0
);
...
@@ -631,6 +638,8 @@ err_with_lex_cleanup:
...
@@ -631,6 +638,8 @@ err_with_lex_cleanup:
// QQ: anything else ?
// QQ: anything else ?
lex_end
(
&
lex
);
lex_end
(
&
lex
);
thd
->
lex
=
old_lex
;
thd
->
lex
=
old_lex
;
thd
->
db
=
save_db
.
str
;
thd
->
db_length
=
save_db
.
length
;
DBUG_RETURN
(
1
);
DBUG_RETURN
(
1
);
}
}
...
...
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