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
292aefee
Commit
292aefee
authored
Jul 19, 2005
by
monty@mishka.local
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed some test cases that was not forgotten in a recent patch
parent
29d9aa65
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
23 deletions
+26
-23
mysql-test/r/ps_6bdb.result
mysql-test/r/ps_6bdb.result
+3
-3
mysql-test/r/ps_7ndb.result
mysql-test/r/ps_7ndb.result
+3
-3
sql/sql_show.cc
sql/sql_show.cc
+20
-17
No files found.
mysql-test/r/ps_6bdb.result
View file @
292aefee
...
@@ -1153,12 +1153,12 @@ def id 8 3 1 N 32929 0 63
...
@@ -1153,12 +1153,12 @@ def id 8 3 1 N 32929 0 63
def select_type 253 19 6 N 1 31 8
def select_type 253 19 6 N 1 31 8
def table 253 64 2 Y 0 31 8
def table 253 64 2 Y 0 31 8
def type 253 10 3 Y 0 31 8
def type 253 10 3 Y 0 31 8
def possible_keys 25
3
4096 0 Y 0 31 8
def possible_keys 25
2
4096 0 Y 0 31 8
def key 253 64 0 Y 0 31 8
def key 253 64 0 Y 0 31 8
def key_len 8 3 0 Y 32928 0 63
def key_len 8 3 0 Y 32928 0 63
def ref 25
3
1024 0 Y 0 31 8
def ref 25
2
1024 0 Y 0 31 8
def rows 8 10 1 Y 32928 0 63
def rows 8 10 1 Y 32928 0 63
def Extra 25
3
255 0 N 1 31 8
def Extra 25
2
255 0 N 1 31 8
id select_type table type possible_keys key key_len ref rows Extra
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t9 ALL NULL NULL NULL NULL 3
1 SIMPLE t9 ALL NULL NULL NULL NULL 3
test_sequence
test_sequence
...
...
mysql-test/r/ps_7ndb.result
View file @
292aefee
...
@@ -1153,12 +1153,12 @@ def id 8 3 1 N 32929 0 63
...
@@ -1153,12 +1153,12 @@ def id 8 3 1 N 32929 0 63
def select_type 253 19 6 N 1 31 8
def select_type 253 19 6 N 1 31 8
def table 253 64 2 Y 0 31 8
def table 253 64 2 Y 0 31 8
def type 253 10 3 Y 0 31 8
def type 253 10 3 Y 0 31 8
def possible_keys 25
3
4096 0 Y 0 31 8
def possible_keys 25
2
4096 0 Y 0 31 8
def key 253 64 0 Y 0 31 8
def key 253 64 0 Y 0 31 8
def key_len 8 3 0 Y 32928 0 63
def key_len 8 3 0 Y 32928 0 63
def ref 25
3
1024 0 Y 0 31 8
def ref 25
2
1024 0 Y 0 31 8
def rows 8 10 1 Y 32928 0 63
def rows 8 10 1 Y 32928 0 63
def Extra 25
3
255 0 N 1 31 8
def Extra 25
2
255 0 N 1 31 8
id select_type table type possible_keys key key_len ref rows Extra
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t9 ALL NULL NULL NULL NULL 2
1 SIMPLE t9 ALL NULL NULL NULL NULL 2
test_sequence
test_sequence
...
...
sql/sql_show.cc
View file @
292aefee
...
@@ -639,30 +639,33 @@ int mysqld_extend_show_tables(THD *thd,const char *db,const char *wild)
...
@@ -639,30 +639,33 @@ int mysqld_extend_show_tables(THD *thd,const char *db,const char *wild)
}
}
/*
/*
returns the length of the longest type on the given table.
returns the length of the longest type on the given table.
This is used so that show fields will return the data using the proper
lengths instead of forcing columns such as type to always return with a
This is used so that show fields will return the data using the proper
given length.
lengths instead of forcing columns such as type to always return with a
given length.
*/
*/
uint
get_longest_type_in_table
(
TABLE
*
table
,
const
char
*
wild
)
uint
get_longest_type_in_table
(
TABLE
*
table
,
const
char
*
wild
)
{
{
Field
**
ptr
,
*
field
;
Field
**
ptr
,
*
field
;
char
tmp
[
MAX_FIELD_WIDTH
];
char
tmp
[
MAX_FIELD_WIDTH
];
uint
max_len
=
0
;
uint
max_len
=
0
;
for
(
ptr
=
table
->
field
;
(
field
=
*
ptr
);
ptr
++
)
for
(
ptr
=
table
->
field
;
(
field
=
*
ptr
);
ptr
++
)
{
{
if
(
!
wild
||
!
wild
[
0
]
||
if
(
!
wild
||
!
wild
[
0
]
||
!
wild_case_compare
(
system_charset_info
,
field
->
field_name
,
wild
))
!
wild_case_compare
(
system_charset_info
,
field
->
field_name
,
wild
))
{
{
String
type
(
tmp
,
sizeof
(
tmp
),
system_charset_info
);
String
type
(
tmp
,
sizeof
(
tmp
),
system_charset_info
);
field
->
sql_type
(
type
);
field
->
sql_type
(
type
);
max_len
=
max
(
max_len
,
type
.
length
());
max_len
=
max
(
max_len
,
type
.
length
());
}
}
}
}
return
max_len
;
return
max_len
;
}
}
/***************************************************************************
/***************************************************************************
** List all columns in a table_list->real_name
** List all columns in a table_list->real_name
***************************************************************************/
***************************************************************************/
...
...
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