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
7642b388
Commit
7642b388
authored
14 years ago
by
Alexander Nozdrin
Browse files
Options
Browse Files
Download
Plain Diff
Merge from mysql-5.1-bugteam.
parents
9919ac5c
d7a4672c
No related merge requests found
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
19 additions
and
25 deletions
+19
-25
Makefile.am
Makefile.am
+1
-1
libmysql/Makefile.am
libmysql/Makefile.am
+1
-2
libmysql/Makefile.shared
libmysql/Makefile.shared
+1
-2
libmysql/conf_to_src.c
libmysql/conf_to_src.c
+1
-2
libmysql/dll.c
libmysql/dll.c
+1
-2
libmysql/errmsg.c
libmysql/errmsg.c
+1
-2
libmysql/get_password.c
libmysql/get_password.c
+1
-2
libmysql/libmysql.c
libmysql/libmysql.c
+1
-2
libmysql/manager.c
libmysql/manager.c
+1
-2
libmysql_r/Makefile.am
libmysql_r/Makefile.am
+1
-2
scripts/make_binary_distribution.sh
scripts/make_binary_distribution.sh
+3
-3
scripts/make_win_bin_dist
scripts/make_win_bin_dist
+2
-2
support-files/mysql.spec.sh
support-files/mysql.spec.sh
+4
-1
No files found.
Makefile.am
View file @
7642b388
...
...
@@ -19,7 +19,7 @@ AUTOMAKE_OPTIONS = foreign
# These are built from source in the Docs directory
EXTRA_DIST
=
INSTALL-SOURCE INSTALL-WIN-SOURCE
\
README COPYING
EXCEPTIONS-CLIENT
CMakeLists.txt
README COPYING CMakeLists.txt
SUBDIRS
=
.
include @docs_dirs@ @zlib_dir@
\
@readline_topdir@ sql-common scripts
\
...
...
This diff is collapsed.
Click to expand it.
libmysql/Makefile.am
View file @
7642b388
...
...
@@ -5,8 +5,7 @@
# published by the Free Software Foundation.
#
# There are special exceptions to the terms and conditions of the GPL as it
# is applied to this software. View the full text of the exception in file
# EXCEPTIONS-CLIENT in the directory of this software distribution.
# is applied to this software.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
...
...
This diff is collapsed.
Click to expand it.
libmysql/Makefile.shared
View file @
7642b388
...
...
@@ -5,8 +5,7 @@
# published by the Free Software Foundation.
#
# There are special exceptions to the terms and conditions of the GPL as it
# is applied to this software. View the full text of the exception in file
# EXCEPTIONS-CLIENT in the directory of this software distribution.
# is applied to this software.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
...
...
This diff is collapsed.
Click to expand it.
libmysql/conf_to_src.c
View file @
7642b388
...
...
@@ -5,8 +5,7 @@
the Free Software Foundation.
There are special exceptions to the terms and conditions of the GPL as it
is applied to this software. View the full text of the exception in file
EXCEPTIONS-CLIENT in the directory of this software distribution.
is applied to this software.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
...
...
This diff is collapsed.
Click to expand it.
libmysql/dll.c
View file @
7642b388
...
...
@@ -5,8 +5,7 @@
the Free Software Foundation.
There are special exceptions to the terms and conditions of the GPL as it
is applied to this software. View the full text of the exception in file
EXCEPTIONS-CLIENT in the directory of this software distribution.
is applied to this software.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
...
...
This diff is collapsed.
Click to expand it.
libmysql/errmsg.c
View file @
7642b388
...
...
@@ -5,8 +5,7 @@
the Free Software Foundation.
There are special exceptions to the terms and conditions of the GPL as it
is applied to this software. View the full text of the exception in file
EXCEPTIONS-CLIENT in the directory of this software distribution.
is applied to this software.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
...
...
This diff is collapsed.
Click to expand it.
libmysql/get_password.c
View file @
7642b388
...
...
@@ -5,8 +5,7 @@
the Free Software Foundation.
There are special exceptions to the terms and conditions of the GPL as it
is applied to this software. View the full text of the exception in file
EXCEPTIONS-CLIENT in the directory of this software distribution.
is applied to this software.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
...
...
This diff is collapsed.
Click to expand it.
libmysql/libmysql.c
View file @
7642b388
...
...
@@ -5,8 +5,7 @@
the Free Software Foundation.
There are special exceptions to the terms and conditions of the GPL as it
is applied to this software. View the full text of the exception in file
EXCEPTIONS-CLIENT in the directory of this software distribution.
is applied to this software.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
...
...
This diff is collapsed.
Click to expand it.
libmysql/manager.c
View file @
7642b388
...
...
@@ -5,8 +5,7 @@
the Free Software Foundation.
There are special exceptions to the terms and conditions of the GPL as it
is applied to this software. View the full text of the exception in file
EXCEPTIONS-CLIENT in the directory of this software distribution.
is applied to this software.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
...
...
This diff is collapsed.
Click to expand it.
libmysql_r/Makefile.am
View file @
7642b388
...
...
@@ -5,8 +5,7 @@
# published by the Free Software Foundation.
#
# There are special exceptions to the terms and conditions of the GPL as it
# is applied to this software. View the full text of the exception in file
# EXCEPTIONS-CLIENT in the directory of this software distribution.
# is applied to this software.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
...
...
This diff is collapsed.
Click to expand it.
scripts/make_binary_distribution.sh
View file @
7642b388
...
...
@@ -302,8 +302,8 @@ if [ x"$BASE_SYSTEM" != x"netware" ] ; then
# Copy readme and license files
cp
README Docs/INSTALL-BINARY
$DEST
/
if
[
-f
COPYING
-a
-f
EXCEPTIONS-CLIENT
]
;
then
cp
COPYING
EXCEPTIONS-CLIENT
$DEST
/
if
[
-f
COPYING
]
;
then
cp
COPYING
$DEST
/
elif
[
-f
LICENSE.mysql
]
;
then
cp
LICENSE.mysql
$DEST
/
else
...
...
@@ -381,7 +381,7 @@ copyfileto()
copyfileto
$BASE
/docs ChangeLog Docs/mysql.info
copyfileto
$BASE
COPYING COPYING.LIB README Docs/INSTALL-BINARY
\
EXCEPTIONS-CLIENT
LICENSE.mysql
LICENSE.mysql
# Non platform-specific bin dir files:
BIN_FILES
=
"extra/comp_err
$BS
extra/replace
$BS
extra/perror
$BS
\
...
...
This diff is collapsed.
Click to expand it.
scripts/make_win_bin_dist
View file @
7642b388
...
...
@@ -187,8 +187,8 @@ cp ChangeLog $DESTDIR/Docs/ || /bin/true
cp
support-files/my-
*
.ini
$DESTDIR
/
if
[
-f
COPYING
]
;
then
cp
COPYING
EXCEPTIONS-CLIENT
$DESTDIR
/
cp
COPYING
$DESTDIR
/Docs/
cp
COPYING
$DESTDIR
/
cp
COPYING
$DESTDIR
/Docs/
fi
# ----------------------------------------------------------------------
...
...
This diff is collapsed.
Click to expand it.
support-files/mysql.spec.sh
View file @
7642b388
...
...
@@ -1063,7 +1063,6 @@ fi
%files devel
%defattr
(
-, root, root, 0755
)
%doc mysql-release-%
{
mysql_version
}
/EXCEPTIONS-CLIENT
%doc %attr
(
644, root, man
)
%
{
_mandir
}
/man1/mysql_config.1
*
%attr
(
755, root, root
)
%
{
_bindir
}
/mysql_config
%dir %attr
(
755, root, root
)
%
{
_includedir
}
/mysql
...
...
@@ -1134,6 +1133,10 @@ fi
##############################################################################
%changelog
*
Wed Nov 24 2010 Alexander Nozdrin <alexander.nozdrin@oracle.com>
- EXCEPTIONS-CLIENT has been deleted, remove it from here too.
*
Tue Jun 15 2010 Joerg Bruehe <joerg.bruehe@sun.com>
- Change the behaviour on upgrade:
...
...
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