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
d082ed72
Commit
d082ed72
authored
Nov 29, 2000
by
tim@threads.polyesthetic.msg
Browse files
Options
Browse Files
Download
Plain Diff
Merge work.mysql.com:/home/bk/mysql
into threads.polyesthetic.msg:/usr/local/src/my/work
parents
c92c832a
a8066b43
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
mysys/Makefile.am
mysys/Makefile.am
+3
-3
sql/sql_show.cc
sql/sql_show.cc
+3
-3
No files found.
mysys/Makefile.am
View file @
d082ed72
...
@@ -83,17 +83,17 @@ FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
...
@@ -83,17 +83,17 @@ FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
test_thr_alarm
:
thr_alarm.c $(LIBRARIES)
test_thr_alarm
:
thr_alarm.c $(LIBRARIES)
$(CP)
$(srcdir)
/thr_alarm.c ./test_thr_alarm.c
$(CP)
$(srcdir)
/thr_alarm.c ./test_thr_alarm.c
$(LINK)
$(FLAGS)
-DMAIN
./test_thr_alarm.c
$(LDADD)
$(LIBS)
$(LINK)
$(FLAGS)
-DMAIN
./test_thr_alarm.c
$(LDADD)
$(LIBS)
$(RM)
./test_thr_alarm.
*
$(RM)
-f
./test_thr_alarm.
*
test_thr_lock
:
thr_lock.c $(LIBRARIES)
test_thr_lock
:
thr_lock.c $(LIBRARIES)
$(CP)
$(srcdir)
/thr_lock.c test_thr_lock.c
$(CP)
$(srcdir)
/thr_lock.c test_thr_lock.c
$(LINK)
$(FLAGS)
-DMAIN
./test_thr_lock.c
$(LDADD)
$(LIBS)
$(LINK)
$(FLAGS)
-DMAIN
./test_thr_lock.c
$(LDADD)
$(LIBS)
$(RM)
./test_thr_lock.
*
$(RM)
-f
./test_thr_lock.
*
test_vsnprintf
:
my_vsnprintf.c $(LIBRARIES)
test_vsnprintf
:
my_vsnprintf.c $(LIBRARIES)
$(CP)
$(srcdir)
/my_vsnprintf.c test_vsnprintf.c
$(CP)
$(srcdir)
/my_vsnprintf.c test_vsnprintf.c
$(LINK)
$(FLAGS)
-DMAIN
./test_vsnprintf.c
$(LDADD)
$(LIBS)
$(LINK)
$(FLAGS)
-DMAIN
./test_vsnprintf.c
$(LDADD)
$(LIBS)
$(RM)
test_vsnprintf.
*
$(RM)
-f
test_vsnprintf.
*
test_dir
:
test_dir.c $(LIBRARIES)
test_dir
:
test_dir.c $(LIBRARIES)
$(LINK)
$(FLAGS)
-DMAIN
$(srcdir)
/test_dir.c
$(LDADD)
$(LIBS)
$(LINK)
$(FLAGS)
-DMAIN
$(srcdir)
/test_dir.c
$(LDADD)
$(LIBS)
...
...
sql/sql_show.cc
View file @
d082ed72
...
@@ -603,7 +603,7 @@ mysqld_show_keys(THD *thd, TABLE_LIST *table_list)
...
@@ -603,7 +603,7 @@ mysqld_show_keys(THD *thd, TABLE_LIST *table_list)
else
else
net_store_null
(
packet
);
net_store_null
(
packet
);
net_store_null
(
packet
);
// No pack_information yet
net_store_null
(
packet
);
// No pack_information yet
net_store_
null
(
packet
);
// No comments yet
net_store_
data
(
packet
,
key_info
->
flags
&
HA_FULLTEXT
?
"FULLTEXT"
:
""
);
if
(
my_net_write
(
&
thd
->
net
,(
char
*
)
packet
->
ptr
(),
packet
->
length
()))
if
(
my_net_write
(
&
thd
->
net
,(
char
*
)
packet
->
ptr
(),
packet
->
length
()))
DBUG_RETURN
(
1
);
/* purecov: inspected */
DBUG_RETURN
(
1
);
/* purecov: inspected */
}
}
...
...
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