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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
580b540d
Commit
580b540d
authored
18 years ago
by
msvensson@neptunus.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal:/home/bk/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
parents
af5acac0
a2e38573
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
17 deletions
+11
-17
include/Makefile.am
include/Makefile.am
+11
-17
include/mysql_h.ic
include/mysql_h.ic
+0
-0
No files found.
include/Makefile.am
View file @
580b540d
...
@@ -15,14 +15,14 @@
...
@@ -15,14 +15,14 @@
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
# MA 02111-1307, USA
# MA 02111-1307, USA
BUILT_SOURCES
=
mysql_version.h my_config.h
mysql_h.ic
BUILT_SOURCES
=
mysql_version.h my_config.h
abi_check
pkginclude_HEADERS
=
my_dbug.h m_string.h my_sys.h my_list.h my_xml.h
\
pkginclude_HEADERS
=
my_dbug.h m_string.h my_sys.h my_list.h my_xml.h
\
mysql.h mysql_com.h mysql_embed.h
\
mysql.h mysql_com.h mysql_embed.h
\
my_semaphore.h my_pthread.h my_no_pthread.h raid.h
\
my_semaphore.h my_pthread.h my_no_pthread.h raid.h
\
errmsg.h my_global.h my_net.h my_alloc.h
\
errmsg.h my_global.h my_net.h my_alloc.h
\
my_getopt.h sslopt-longopts.h my_dir.h typelib.h
\
my_getopt.h sslopt-longopts.h my_dir.h typelib.h
\
sslopt-vars.h sslopt-case.h sql_common.h keycache.h
\
sslopt-vars.h sslopt-case.h sql_common.h keycache.h
\
mysql_time.h m_ctype.h
$(BUILT_SOURCES)
sql_state.h
mysql_time.h m_ctype.h
$(BUILT_SOURCES)
noinst_HEADERS
=
config-win.h config-os2.h config-netware.h
\
noinst_HEADERS
=
config-win.h config-os2.h config-netware.h
\
heap.h my_bitmap.h
\
heap.h my_bitmap.h
\
myisam.h myisampack.h myisammrg.h ft_global.h
\
myisam.h myisampack.h myisammrg.h ft_global.h
\
...
@@ -36,6 +36,8 @@ noinst_HEADERS = config-win.h config-os2.h config-netware.h \
...
@@ -36,6 +36,8 @@ noinst_HEADERS = config-win.h config-os2.h config-netware.h \
# Remove built files and the symlinked directories
# Remove built files and the symlinked directories
CLEANFILES
=
$(BUILT_SOURCES)
readline openssl
CLEANFILES
=
$(BUILT_SOURCES)
readline openssl
EXTRA_DIST
=
mysql_h.ic
# Some include files that may be moved and patched by configure
# Some include files that may be moved and patched by configure
DISTCLEANFILES
=
sched.h
$(CLEANFILES)
DISTCLEANFILES
=
sched.h
$(CLEANFILES)
...
@@ -56,25 +58,17 @@ dist-hook:
...
@@ -56,25 +58,17 @@ dist-hook:
# Rules for checking that ABI has not changed
# Rules for checking that ABI has not changed
#
#
# Create a icheck file
for mysql.h
# Create a icheck file
and compare it to the reference
mysql_h.ic
:
mysql.h mysql_version.h mysql_com.h mysql_time.h my_list.h
\
abi_check
:
mysql.h mysql_version.h mysql_com.h mysql_time.h my_list.h
\
my_alloc.h typelib.h
my_alloc.h typelib.h
@
set
-x
;
\
if
[
@ICHECK@
!=
no
]
;
then
\
@ICHECK@
--canonify
--skip-from-re
/usr/
-o
$@
mysql.h
;
\
else
\
touch
$@
;
\
fi
;
# Compare the icheck file to the reference
check_abi
:
mysql_h.ic
@
set
-ex
;
\
@
set
-ex
;
\
if
[
@ICHECK@
!=
no
]
;
then
\
if
[
@ICHECK@
!=
no
]
;
then
\
@ICHECK@
--compare
mysql_h.ic mysql_h_abi.ic
;
\
@ICHECK@
--canonify
--skip-from-re
/usr/
-o
$@
.ic mysql.h
;
\
@ICHECK@
--compare
mysql_h.ic
$@
.ic
;
\
fi
;
\
fi
;
\
touch
check_abi
;
touch
abi_check
;
all
:
check_abi
all
:
abi_check
# Don't update the files from bitkeeper
# Don't update the files from bitkeeper
...
...
This diff is collapsed.
Click to expand it.
include/mysql_h
_abi
.ic
→
include/mysql_h.ic
View file @
580b540d
File moved
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