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
219c84fa
Commit
219c84fa
authored
Aug 15, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0 sql/sql_show.cc: Auto merged
parents
51919db0
2fc78cb3
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
0 deletions
+20
-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
+10
-0
sql/sql_show.cc
sql/sql_show.cc
+1
-0
No files found.
mysql-test/r/information_schema.result
View file @
219c84fa
...
@@ -958,3 +958,12 @@ trigger_schema trigger_name
...
@@ -958,3 +958,12 @@ trigger_schema trigger_name
test tr1
test tr1
use test;
use test;
drop table t1;
drop table t1;
create table t1 (a int not null, b int);
use information_schema;
select column_name, column_default from columns
where table_schema='test' and table_name='t1';
column_name column_default
a NULL
b NULL
use test;
drop table t1;
mysql-test/t/information_schema.test
View file @
219c84fa
...
@@ -639,3 +639,13 @@ select trigger_schema, trigger_name from triggers where
...
@@ -639,3 +639,13 @@ select trigger_schema, trigger_name from triggers where
trigger_name
=
'tr1'
;
trigger_name
=
'tr1'
;
use
test
;
use
test
;
drop
table
t1
;
drop
table
t1
;
#
# Bug#12518 COLUMN_DEFAULT has wrong value if NOT NULL is set
#
create
table
t1
(
a
int
not
null
,
b
int
);
use
information_schema
;
select
column_name
,
column_default
from
columns
where
table_schema
=
'test'
and
table_name
=
't1'
;
use
test
;
drop
table
t1
;
sql/sql_show.cc
View file @
219c84fa
...
@@ -2462,6 +2462,7 @@ static int get_schema_column_record(THD *thd, struct st_table_list *tables,
...
@@ -2462,6 +2462,7 @@ static int get_schema_column_record(THD *thd, struct st_table_list *tables,
table
->
field
[
5
]
->
set_notnull
();
table
->
field
[
5
]
->
set_notnull
();
}
}
else
if
(
field
->
unireg_check
==
Field
::
NEXT_NUMBER
||
else
if
(
field
->
unireg_check
==
Field
::
NEXT_NUMBER
||
lex
->
orig_sql_command
!=
SQLCOM_SHOW_FIELDS
||
field
->
maybe_null
())
field
->
maybe_null
())
table
->
field
[
5
]
->
set_null
();
// Null as default
table
->
field
[
5
]
->
set_null
();
// Null as default
else
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