diff options
| author | unknown <konstantin@mysql.com> | 2006-01-18 15:15:09 +0300 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2006-01-18 15:15:09 +0300 |
| commit | f9bef505ece36b992c17d38c2c6714504d66d1b3 (patch) | |
| tree | 615bbf8a236ace6dcc24da1dee532712f102f681 /libmysql | |
| parent | 596666f74a83e989edb712eab9949d2a13c08fac (diff) | |
| parent | 22bc685dbf3769e4df9aedf139635c8b85bdeb37 (diff) | |
| download | mariadb-git-f9bef505ece36b992c17d38c2c6714504d66d1b3.tar.gz | |
Merge mysql.com:/opt/local/work/mysql-4.1-root
into mysql.com:/opt/local/work/mysql-5.0-root
BitKeeper/etc/ignore:
auto-union
libmysql/Makefile.shared:
Auto merged
configure.in:
Manual merge.
libmysql/libmysql.c:
Manual merge.
tests/mysql_client_test.c:
Manual merge.
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/Makefile.shared | 2 | ||||
| -rw-r--r-- | libmysql/libmysql.c | 2 | ||||
| -rw-r--r-- | libmysql/libmysql.ver.in | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared index a4d616f936a..c4c9c0036e2 100644 --- a/libmysql/Makefile.shared +++ b/libmysql/Makefile.shared @@ -77,7 +77,7 @@ mysysobjects2 = my_lib.lo mysysobjects = $(mysysobjects1) $(mysysobjects2) target_libadd = $(mysysobjects) $(mystringsobjects) $(dbugobjects) \ $(sql_cmn_objects) $(vio_objects) $(sqlobjects) -target_ldflags = -version-info @SHARED_LIB_VERSION@ +target_ldflags = -version-info @SHARED_LIB_VERSION@ @LD_VERSION_SCRIPT@ vio_objects= vio.lo viosocket.lo viossl.lo viosslfactories.lo CLEANFILES = $(target_libadd) $(SHLIBOBJS) \ $(target) diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 0c74dc9121c..be1a3a1fe5f 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -2817,7 +2817,7 @@ my_bool STDCALL mysql_stmt_attr_get(MYSQL_STMT *stmt, { switch (attr_type) { case STMT_ATTR_UPDATE_MAX_LENGTH: - *(ulong*) value= stmt->update_max_length; + *(my_bool*) value= stmt->update_max_length; break; case STMT_ATTR_CURSOR_TYPE: *(ulong*) value= stmt->flags; diff --git a/libmysql/libmysql.ver.in b/libmysql/libmysql.ver.in new file mode 100644 index 00000000000..20eb0fd41bb --- /dev/null +++ b/libmysql/libmysql.ver.in @@ -0,0 +1 @@ +libmysqlclient_@SHARED_LIB_MAJOR_VERSION@ { global: *; }; |