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
7a34153b
Commit
7a34153b
authored
Jan 22, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-4.1-lenz
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
parents
d3db70de
4e1e23a1
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
18 additions
and
13 deletions
+18
-13
.bzrignore
.bzrignore
+2
-0
libmysql/libmysql.c
libmysql/libmysql.c
+1
-1
libmysqld/examples/Makefile.am
libmysqld/examples/Makefile.am
+9
-8
scripts/make_binary_distribution.sh
scripts/make_binary_distribution.sh
+3
-1
tests/Makefile.am
tests/Makefile.am
+3
-3
tests/mysql_client_test.c
tests/mysql_client_test.c
+0
-0
No files found.
.bzrignore
View file @
7a34153b
...
...
@@ -1002,3 +1002,5 @@ vio/test-ssl
vio/test-sslclient
vio/test-sslserver
vio/viotest-ssl
tests/mysql_client_test
tests/mysql_client_test
libmysql/libmysql.c
View file @
7a34153b
...
...
@@ -2978,7 +2978,7 @@ static my_bool int_is_null_false= 0;
values and mysql_stmt_execute() the statement.
See also: mysql_stmt_send_long_data() for sending long text/blob
data in pieces, examples in tests/client_test.c.
data in pieces, examples in tests/
mysql_
client_test.c.
Next steps you might want to make:
- execute statement with mysql_stmt_execute(),
- reset statement using mysql_stmt_reset() or reprepare it with
...
...
libmysqld/examples/Makefile.am
View file @
7a34153b
noinst_PROGRAMS
=
mysqltest mysql client_test
client_sources
=
$(mysqltest_SOURCES)
$(mysql_SOURCES)
tests_sources
=
$(client_test_SOURCES)
noinst_PROGRAMS
=
mysql
bin_PROGRAMS
=
mysqltest_embedded mysql_client_test_embedded
client_sources
=
$(mysqltest_embedded_SOURCES)
$(mysql_SOURCES)
tests_sources
=
$(mysql_client_test_embedded_SOURCES)
link_sources
:
for
f
in
$(client_sources)
;
do
\
...
...
@@ -19,16 +20,16 @@ INCLUDES = @MT_INCLUDES@ -I$(top_srcdir)/include -I$(srcdir) \
LIBS
=
@LIBS@ @WRAPLIBS@ @CLIENT_LIBS@
LDADD
=
@CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @innodb_system_libs@ @LIBDL@
$(CXXLDFLAGS)
mysqltest_LINK
=
$(CXXLINK)
mysqltest_SOURCES
=
mysqltest.c
mysqltest_LDADD
=
$(LDADD)
$(top_builddir)
/regex/libregex.a
mysqltest_
embedded_
LINK
=
$(CXXLINK)
mysqltest_
embedded_
SOURCES
=
mysqltest.c
mysqltest_
embedded_
LDADD
=
$(LDADD)
$(top_builddir)
/regex/libregex.a
mysql_SOURCES
=
mysql.cc readline.cc completion_hash.cc
\
my_readline.h sql_string.h completion_hash.h
mysql_LDADD
=
@readline_link@ @TERMCAP_LIB@
$(LDADD)
client_test
_LINK
=
$(CXXLINK)
client_test_SOURCES
=
client_test.c
mysql_client_test_embedded
_LINK
=
$(CXXLINK)
mysql_client_test_embedded_SOURCES
=
mysql_
client_test.c
clean
:
rm
-f
$(client_sources)
...
...
scripts/make_binary_distribution.sh
View file @
7a34153b
...
...
@@ -127,6 +127,8 @@ else
client/.libs/mysqltest client/.libs/mysqlcheck
\
client/.libs/mysqlbinlog client/.libs/mysqlmanagerc
\
client/.libs/mysqlmanager-pwgen tools/.libs/mysqlmanager
\
tests/.libs/mysql_client_test libmysqld/examples/mysql_client_test_embedded
\
libmysqld/examples/mysqltest_embedded
\
"
;
fi
...
...
@@ -187,7 +189,7 @@ fi
if
[
$BASE_SYSTEM
!=
"netware"
]
;
then
if
[
-d
tests
]
;
then
$CP
tests/
client_test tests/
*
.res tests/
*
.tst tests/
*
.pl
$BASE
/tests
$CP
tests/
*
.res tests/
*
.tst tests/
*
.pl
$BASE
/tests
fi
if
[
-d
man
]
;
then
$CP
man/
*
.1
$BASE
/man/man1
...
...
tests/Makefile.am
View file @
7a34153b
...
...
@@ -26,7 +26,7 @@ EXTRA_DIST = auto_increment.res auto_increment.tst \
pmail.pl mail_to_db.pl table_types.pl
\
udf_test udf_test.res myisam-big-rows.tst
bin_PROGRAMS
=
client_test
bin_PROGRAMS
=
mysql_
client_test
noinst_PROGRAMS
=
insert_test select_test thread_test
#
...
...
@@ -35,8 +35,8 @@ noinst_PROGRAMS = insert_test select_test thread_test
INCLUDES
=
-I
$(top_srcdir)
/include
$(openssl_includes)
LIBS
=
@CLIENT_LIBS@
LDADD
=
@CLIENT_EXTRA_LDFLAGS@ ../libmysql/libmysqlclient.la
client_test_LDADD
=
$(LDADD)
$(CXXLDFLAGS)
client_test_SOURCES
=
client_test.c
mysql_
client_test_LDADD
=
$(LDADD)
$(CXXLDFLAGS)
mysql_client_test_SOURCES
=
mysql_
client_test.c
insert_test_DEPENDENCIES
=
$(LIBRARIES)
$(pkglib_LTLIBRARIES)
select_test_DEPENDENCIES
=
$(LIBRARIES)
$(pkglib_LTLIBRARIES)
...
...
tests/client_test.c
→
tests/
mysql_
client_test.c
View file @
7a34153b
File moved
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