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
56fc96dd
Commit
56fc96dd
authored
21 years ago
by
lenz@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- replaced C++-style comments in .c file (Please try to avoid this, as
it breaks compilation on picky C compilers!)
parent
20a1226c
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
fs/database.c
fs/database.c
+6
-6
No files found.
fs/database.c
View file @
56fc96dd
...
@@ -118,7 +118,7 @@ void db_show_result(MYSQL* sock, char *b, struct format *f)
...
@@ -118,7 +118,7 @@ void db_show_result(MYSQL* sock, char *b, struct format *f)
count
=
mysql_num_fields
(
result
);
count
=
mysql_num_fields
(
result
);
/
/ while ((field = mysql_fetch_field(result)))
/
* while ((field = mysql_fetch_field(result))) */
for
(
i
=
0
;
i
<
count
;
++
i
)
for
(
i
=
0
;
i
<
count
;
++
i
)
{
{
field
=
mysql_fetch_field
(
result
);
field
=
mysql_fetch_field
(
result
);
...
@@ -127,7 +127,7 @@ void db_show_result(MYSQL* sock, char *b, struct format *f)
...
@@ -127,7 +127,7 @@ void db_show_result(MYSQL* sock, char *b, struct format *f)
length
=
max
(
length
,
field
->
max_length
);
length
=
max
(
length
,
field
->
max_length
);
if
(
length
<
4
&&
!
IS_NOT_NULL
(
field
->
flags
))
if
(
length
<
4
&&
!
IS_NOT_NULL
(
field
->
flags
))
length
=
4
;
/
/ Room for "NULL"
length
=
4
;
/
* Room for "NULL" */
field
->
max_length
=
length
;
field
->
max_length
=
length
;
memset
(
topptr
,
'='
,
field
->
max_length
);
memset
(
topptr
,
'='
,
field
->
max_length
);
...
@@ -135,7 +135,7 @@ void db_show_result(MYSQL* sock, char *b, struct format *f)
...
@@ -135,7 +135,7 @@ void db_show_result(MYSQL* sock, char *b, struct format *f)
memset
(
botptr
,
'='
,
field
->
max_length
);
memset
(
botptr
,
'='
,
field
->
max_length
);
sprintf
(
hdrptr
,
"%-*s"
,
field
->
max_length
,
field
->
name
);
sprintf
(
hdrptr
,
"%-*s"
,
field
->
max_length
,
field
->
name
);
/
/num_flag[off]= IS_NUM(field->type);
/
* num_flag[off]= IS_NUM(field->type); */
topptr
+=
field
->
max_length
;
topptr
+=
field
->
max_length
;
midptr
+=
field
->
max_length
;
midptr
+=
field
->
max_length
;
...
@@ -341,10 +341,10 @@ int db_show_primary_keys(char *b,const char *database, const char *table)
...
@@ -341,10 +341,10 @@ int db_show_primary_keys(char *b,const char *database, const char *table)
}
}
buff2
[
strlen
(
buff2
)
-
5
]
=
'\0'
;
buff2
[
strlen
(
buff2
)
-
5
]
=
'\0'
;
if
(
!
buff2
[
0
])
if
(
!
buff2
[
0
])
DBUG_RETURN
(
-
1
);
/
/ No PRIMARY keys in table
DBUG_RETURN
(
-
1
);
/
* No PRIMARY keys in table */
DBUG_PRINT
(
"info"
,(
"Keys: %s<-
\n
"
,
buff2
));
DBUG_PRINT
(
"info"
,(
"Keys: %s<-
\n
"
,
buff2
));
}
else
}
else
DBUG_RETURN
(
-
1
);
/
/ No keys in table
DBUG_RETURN
(
-
1
);
/
* No keys in table */
sprintf
(
buff
,
"SELECT CONCAT(%s) AS X FROM %s LIMIT 256"
,
buff2
,
table
);
sprintf
(
buff
,
"SELECT CONCAT(%s) AS X FROM %s LIMIT 256"
,
buff2
,
table
);
if
(
mysql_query
(
sock
,
buff
))
if
(
mysql_query
(
sock
,
buff
))
...
@@ -441,7 +441,7 @@ db_show_servers(char *b,int size)
...
@@ -441,7 +441,7 @@ db_show_servers(char *b,int size)
DBUG_ENTER
(
"db_show_servers"
);
DBUG_ENTER
(
"db_show_servers"
);
DBUG_PRINT
(
"enter"
,(
"buffer: '%s', size: '%d'"
,
b
,
size
));
DBUG_PRINT
(
"enter"
,(
"buffer: '%s', size: '%d'"
,
b
,
size
));
bufptr
=
mysql_get_host_info
(
sock
);
bufptr
=
mysql_get_host_info
(
sock
);
/
/ FIXME: Actually we need to escape prohibited symbols in filenames
/
* FIXME: Actually we need to escape prohibited symbols in filenames */
fix_filenames
(
bufptr
);
fix_filenames
(
bufptr
);
strcpy
(
b
,
bufptr
);
strcpy
(
b
,
bufptr
);
DBUG_RETURN
(
1
);
DBUG_RETURN
(
1
);
...
...
This diff is collapsed.
Click to expand it.
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