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
133e91aa
Commit
133e91aa
authored
Oct 21, 2006
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal:/home/bk/mysql-5.0
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
parents
ab133655
71fee03e
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
15 deletions
+15
-15
CMakeLists.txt
CMakeLists.txt
+2
-2
configure.in
configure.in
+2
-2
include/mysql.h
include/mysql.h
+0
-6
libmysqld/lib_sql.cc
libmysqld/lib_sql.cc
+0
-1
scripts/make_win_bin_dist
scripts/make_win_bin_dist
+11
-4
No files found.
CMakeLists.txt
View file @
133e91aa
...
...
@@ -122,10 +122,10 @@ ADD_SUBDIRECTORY(myisam)
ADD_SUBDIRECTORY
(
myisammrg
)
ADD_SUBDIRECTORY
(
client
)
IF
(
WITH_BERKELEY_STORAGE_ENGINE
)
ADD_SUBDIRECTORY
(
bdb
)
ADD_SUBDIRECTORY
(
bdb
)
ENDIF
(
WITH_BERKELEY_STORAGE_ENGINE
)
IF
(
WITH_INNOBASE_STORAGE_ENGINE
)
ADD_SUBDIRECTORY
(
innobase
)
ADD_SUBDIRECTORY
(
innobase
)
ENDIF
(
WITH_INNOBASE_STORAGE_ENGINE
)
ADD_SUBDIRECTORY
(
sql
)
ADD_SUBDIRECTORY
(
sql/examples
)
...
...
configure.in
View file @
133e91aa
...
...
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc)
AC_CANONICAL_SYSTEM
# The Docs Makefile.am parses this line!
# remember to also change ndb version below and update version.c in ndb
AM_INIT_AUTOMAKE
(
mysql, 5.0.2
7
)
AM_INIT_AUTOMAKE
(
mysql, 5.0.2
8
)
AM_CONFIG_HEADER
(
config.h
)
PROTOCOL_VERSION
=
10
...
...
@@ -19,7 +19,7 @@ SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0
# ndb version
NDB_VERSION_MAJOR
=
5
NDB_VERSION_MINOR
=
0
NDB_VERSION_BUILD
=
2
7
NDB_VERSION_BUILD
=
2
8
NDB_VERSION_STATUS
=
""
# Set all version vars based on $VERSION. How do we do this more elegant ?
...
...
include/mysql.h
View file @
133e91aa
...
...
@@ -293,12 +293,6 @@ typedef struct st_mysql
/* needed for embedded server - no net buffer to store the 'info' */
char
*
info_buffer
;
#endif
/*
In embedded server it points to the statement that is processed
in the current query. We store some results directly in statement
fields then.
*/
struct
st_mysql_stmt
*
current_stmt
;
}
MYSQL
;
typedef
struct
st_mysql_res
{
...
...
libmysqld/lib_sql.cc
View file @
133e91aa
...
...
@@ -100,7 +100,6 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command,
mysql
->
affected_rows
=
~
(
my_ulonglong
)
0
;
mysql
->
field_count
=
0
;
net
->
last_errno
=
0
;
mysql
->
current_stmt
=
stmt
;
thd
->
store_globals
();
// Fix if more than one connect
/*
...
...
scripts/make_win_bin_dist
View file @
133e91aa
...
...
@@ -144,8 +144,6 @@ fi
# Copy data directory, readme files etc
# ----------------------------------------------------------------------
cp
COPYING EXCEPTIONS-CLIENT
$DESTDIR
/
# FIXME is there ever a data directory to copy?
if
[
-d
win/data
]
;
then
cp
-pR
win/data
$DESTDIR
/data
...
...
@@ -159,9 +157,13 @@ mkdir $DESTDIR/Docs
cp
Docs/INSTALL-BINARY
$DESTDIR
/Docs/
cp
Docs/manual.chm
$DESTDIR
/Docs/
||
/bin/true
cp
ChangeLog
$DESTDIR
/Docs/
||
/bin/true
cp
COPYING
$DESTDIR
/Docs/
cp
support-files/my-
*
.ini
$DESTDIR
/
if
[
-f
COPYING
]
;
then
cp
COPYING EXCEPTIONS-CLIENT
$DESTDIR
/
cp
COPYING
$DESTDIR
/Docs/
fi
# ----------------------------------------------------------------------
# These will be filled in when we enable embedded. Note that if no
# argument is given, it is copied if exists, else a check is done.
...
...
@@ -170,7 +172,8 @@ cp support-files/my-*.ini $DESTDIR/
copy_embedded
()
{
mkdir
-p
$DESTDIR
/Embedded/DLL/release
\
$DESTDIR
/Embedded/static/release
$DESTDIR
/Embedded/static/release
\
$DESTDIR
/include
cp
libmysqld/libmysqld.def
$DESTDIR
/include/
cp
libmysqld/
$TARGET
/mysqlserver.lib
$DESTDIR
/Embedded/static/release/
cp
libmysqld/
$TARGET
/libmysqld.dll
$DESTDIR
/Embedded/DLL/release/
...
...
@@ -211,6 +214,9 @@ fi
mkdir
-p
$DESTDIR
/examples/tests
cp
tests/
*
.res tests/
*
.tst tests/
*
.pl tests/
*
.c
$DESTDIR
/examples/tests/
mkdir
-p
$DESTDIR
/examples/udf_example
cp
sql/udf_example.def sql/udf_example.vcproj sql/udf_example.c
$DESTDIR
/examples/udf_example/
# ----------------------------------------------------------------------
# FIXME why not copy it all in "include"?!
# ----------------------------------------------------------------------
...
...
@@ -228,6 +234,7 @@ cp include/conf*.h \
include/m_string.h
\
include/m_ctype.h
\
include/my_global.h
\
include/raid.h
\
include/typelib.h
$DESTDIR
/include/
cp
libmysql/libmysql.def
$DESTDIR
/include/
...
...
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