database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge mysql.com:/opt/local/work/mysql-4.1-root

Browse Source 
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.
This commit is contained in:
unknown
2006-01-18 15:15:09 +03:00
parent 596666f74a 22bc685dbf
commit f9bef505ec
6 changed files with 174 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libmysql/Makefile.shared
View File

@ -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)

2
libmysql/libmysql.c
View File

@ -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;

1
libmysql/libmysql.ver.in Normal file
View File

@ -0,0 +1 @@
libmysqlclient_@SHARED_LIB_MAJOR_VERSION@ { global: *; };