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
dd8c4928
Commit
dd8c4928
authored
Jan 30, 2009
by
Georgi Kodinov
Browse files
Options
Browse Files
Download
Plain Diff
merged 5.0-main -> 5.0-bugteam
parents
1622582b
cf11f38c
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
5 deletions
+12
-5
client/mysqltest.c
client/mysqltest.c
+8
-1
configure.in
configure.in
+2
-2
scripts/make_binary_distribution.sh
scripts/make_binary_distribution.sh
+2
-2
No files found.
client/mysqltest.c
View file @
dd8c4928
...
@@ -1385,8 +1385,15 @@ void show_diff(DYNAMIC_STRING* ds,
...
@@ -1385,8 +1385,15 @@ void show_diff(DYNAMIC_STRING* ds,
/* determine if we have diff on Windows
/* determine if we have diff on Windows
needs special processing due to return values
needs special processing due to return values
on that OS
on that OS
This test is only done on Windows since it's only needed there
in order to correctly detect non-availibility of 'diff', and
the way it's implemented does not work with default 'diff' on Solaris.
*/
*/
#ifdef __WIN__
have_diff
=
diff_check
();
have_diff
=
diff_check
();
#else
have_diff
=
1
;
#endif
if
(
have_diff
)
if
(
have_diff
)
{
{
...
@@ -1410,7 +1417,7 @@ void show_diff(DYNAMIC_STRING* ds,
...
@@ -1410,7 +1417,7 @@ void show_diff(DYNAMIC_STRING* ds,
"2>&1"
,
"2>&1"
,
NULL
)
>
1
)
/* Most "diff" tools return >1 if error */
NULL
)
>
1
)
/* Most "diff" tools return >1 if error */
{
{
have_diff
=
1
;
have_diff
=
0
;
}
}
}
}
}
}
...
...
configure.in
View file @
dd8c4928
...
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc)
...
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc)
AC_CANONICAL_SYSTEM
AC_CANONICAL_SYSTEM
# The Docs Makefile.am parses this line!
# The Docs Makefile.am parses this line!
# remember to also change ndb version below and update version.c in ndb
# remember to also change ndb version below and update version.c in ndb
AM_INIT_AUTOMAKE
(
mysql, 5.0.7
7
)
AM_INIT_AUTOMAKE
(
mysql, 5.0.7
8
)
AM_CONFIG_HEADER
([
include/config.h:config.h.in]
)
AM_CONFIG_HEADER
([
include/config.h:config.h.in]
)
PROTOCOL_VERSION
=
10
PROTOCOL_VERSION
=
10
...
@@ -23,7 +23,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0
...
@@ -23,7 +23,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0
# ndb version
# ndb version
NDB_VERSION_MAJOR
=
5
NDB_VERSION_MAJOR
=
5
NDB_VERSION_MINOR
=
0
NDB_VERSION_MINOR
=
0
NDB_VERSION_BUILD
=
7
7
NDB_VERSION_BUILD
=
7
8
NDB_VERSION_STATUS
=
""
NDB_VERSION_STATUS
=
""
# Set all version vars based on $VERSION. How do we do this more elegant ?
# Set all version vars based on $VERSION. How do we do this more elegant ?
...
...
scripts/make_binary_distribution.sh
View file @
dd8c4928
...
@@ -372,8 +372,8 @@ fi
...
@@ -372,8 +372,8 @@ fi
# NDB Cluster
# NDB Cluster
if
[
x
$NDBCLUSTER
=
x1
]
;
then
if
[
x
$NDBCLUSTER
=
x1
]
;
then
(
cd
ndb
;
@MAKE@
DESTDIR
=
$BASE
/ndb-stage
install
)
(
cd
ndb
;
@MAKE@
DESTDIR
=
$BASE
/ndb-stage
install
pkglibdir
=
@pkglibdir@
)
(
cd
mysql-test/ndb
;
@MAKE@
DESTDIR
=
$BASE
/ndb-stage
install
)
(
cd
mysql-test/ndb
;
@MAKE@
DESTDIR
=
$BASE
/ndb-stage
install
pkglibdir
=
@pkglibdir@
)
$CP
$BASE
/ndb-stage@bindir@/
*
$BASE
/bin/.
$CP
$BASE
/ndb-stage@bindir@/
*
$BASE
/bin/.
$CP
$BASE
/ndb-stage@libexecdir@/
*
$BASE
/bin/.
$CP
$BASE
/ndb-stage@libexecdir@/
*
$BASE
/bin/.
$CP
$BASE
/ndb-stage@pkglibdir@/
*
$BASE
/lib/.
$CP
$BASE
/ndb-stage@pkglibdir@/
*
$BASE
/lib/.
...
...
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