mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-24 07:44:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge changes from MySQL AB.

Browse source 
dict_col_copy_type_noninline(): Remove the return statement.
Some compilers do not allow return expressions of void type.

innobase_start_or_create_for_mysql(): Do not cap srv_max_threads to 1000
on Windows.

Makefile.am (EXTRA_DIST): Add plug.in
This commit is contained in:
marko 2006-10-05 11:00:06 +00:00
parent a3a432119d
commit 4351bedba7
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -91,7 +91,7 @@ EXTRA_DIST = include/btr0btr.h include/btr0btr.ic include/btr0cur.h include/btr
include/ut0sort.h include/ut0ut.h include/ut0ut.ic include/ut0vec.h include/ut0vec.ic include/ha_prototypes.h \
include/ut0list.h include/ut0list.ic \
include/ut0wqueue.h \
CMakeLists.txt
CMakeLists.txt plug.in
noinst_LIBRARIES = libinnobase.a
libinnobase_a_LIBADD = usr/libusr.a srv/libsrv.a dict/libdict.a \

2
dict/dict0dict.c
View file

@ -334,7 +334,7 @@ dict_col_copy_type_noninline(
const dict_col_t* col, /* in: column */
dtype_t* type) /* out: data type */
{
return(dict_col_copy_type(col, type));
dict_col_copy_type(col, type);
}
/************************************************************************

2
srv/srv0start.c
View file

@ -1163,7 +1163,7 @@ innobase_start_or_create_for_mysql(void)
maximum number of threads that can wait in the 'srv_conc array' for
their time to enter InnoDB. */
#if defined(__WIN__) || defined(__NETWARE__)
#if defined(__NETWARE__)
/* Create less event semaphores because Win 98/ME had
difficulty creating 40000 event semaphores. Comment from