database/mariadb
database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-05-28 13:01:41 +03:00
Code

Merge work.mysql.com:/home/bk/mysql

Browse Source 
into cane.mysql.fi:/usr/home/tim/my/work
This commit is contained in:
tim@cane.mysql.fi 2000-12-21 12:00:09 +02:00
commit 7e3fd8ce79
10 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
acconfig.h
View File

@ -189,6 +189,9 @@
/* Define as the base type of the last arg to accept */
#undef SOCKET_SIZE_TYPE
/* Last argument to get/setsockopt */
#undef SOCKOPT_OPTLEN_TYPE
#undef SPEED_T_IN_SYS_TYPES
#undef SPRINTF_RETURNS_PTR
#undef SPRINTF_RETURNS_INT

5
configure.in
View File

@ -1177,6 +1177,11 @@ AC_C_BIGENDIAN
#---START: Used in for client configure
# Check base type of last arg to accept
MYSQL_TYPE_ACCEPT
case "$SYSTEM_TYPE" in
*bsdi* ) AC_DEFINE_UNQUOTED(SOCKOPT_OPTLEN_TYPE, size_t);;
* ) AC_DEFINE_UNQUOTED(SOCKOPT_OPTLEN_TYPE, size_socket);;
esac
#---END:
# Find where the stack goes
MYSQL_STACK_DIRECTION

1
libmysql/Makefile.am
View File

@ -28,6 +28,7 @@ include $(srcdir)/Makefile.shared
libmysqlclient_la_SOURCES = $(target_sources)
libmysqlclient_la_LIBADD = $(target_libadd)
libmysqlclient_la_LDFLAGS = $(target_ldflags)
EXTRA_DIST = Makefile.shared
# This is called from the toplevel makefile
link_sources:

2
libmysql/Makefile.shared
View File

@ -39,7 +39,7 @@ mystringsobjects = strmov.lo strxmov.lo strnmov.lo strmake.lo strend.lo \
int2str.lo str2int.lo strinstr.lo strcont.lo \
strcend.lo \
bchange.lo bmove.lo bmove_upp.lo longlong2str.lo \
strtoull.lo strtoll.lo llstr.lo strto.lo \
strtoull.lo strtoll.lo llstr.lo \
ctype.lo $(LTCHARSET_OBJS)
mystringsextra= strto.c ctype_autoconf.c
dbugobjects = dbug.lo # IT IS IN SAFEMALLOC.C sanity.lo

2
libmysql/libmysql.c
View File

@ -125,7 +125,7 @@ static int connect2(my_socket s, const struct sockaddr *name, uint namelen,
return connect(s, (struct sockaddr*) name, namelen);
#else
int flags, res, s_err;
size_socket s_err_size = sizeof(uint);
SOCKOPT_OPTLEN_TYPE s_err_size = sizeof(uint);
fd_set sfds;
struct timeval tv;
time_t start_time, now_time;

0
mysql-test/r/delete.result Normal file
View File

0
mysql-test/r/replace.result Normal file
View File

8
mysql-test/t/delete.test Normal file
View File

@ -0,0 +1,8 @@
drop table if exists t1;
# test delete using hidden_primary_key
create table t1 (a int) type=bdb;
insert into t1 values (1), (2);
delete from t1 where a = 1;
drop table t1;

21
mysql-test/t/replace.test Normal file
View File

@ -0,0 +1,21 @@
#
# Test of REPLACE with ISAM and MyISAM and BDB
#
drop table if exists t1;
CREATE TABLE t1 (
gesuchnr int(11) DEFAULT '0' NOT NULL,
benutzer_id int(11) DEFAULT '0' NOT NULL,
PRIMARY KEY (gesuchnr,benutzer_id)
) type=ISAM;
replace into t1 (gesuchnr,benutzer_id) values (1,1);
replace into t1 (gesuchnr,benutzer_id) values (1,1);
alter table t1 type=myisam;
replace into t1 (gesuchnr,benutzer_id) values (1,1);
alter table t1 type=bdb;
replace into t1 (gesuchnr,benutzer_id) values (1,1);
alter table t1 type=heap;
replace into t1 (gesuchnr,benutzer_id) values (1,1);
drop table t1;

2
sql/mini_client.cc
View File

@ -233,7 +233,7 @@ static int mc_sock_connect(my_socket s, const struct sockaddr *name,
return connect(s, (struct sockaddr*) name, namelen);
#else
int flags, res, s_err;
size_socket s_err_size = sizeof(uint);
SOCKOPT_OPTLEN_TYPE s_err_size = sizeof(uint);
fd_set sfds;
struct timeval tv;