1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge trift2.:/MySQL/M50/clone-5.0

Browse Source 
into  trift2.:/MySQL/M51/push-5.1


configure.in:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
server-tools/instance-manager/listener.cc:
  C++ fix of 5.0 is not needed, 5.1 has a different approach.
This commit is contained in:
unknown 2007-06-25 13:22:34 +02:00
commit 7c434896b4
4 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure.in
View File

@ -71,14 +71,22 @@ AC_SUBST(AVAILABLE_LANGUAGES)
# Canonicalize the configuration name. # Canonicalize the configuration name.
SYSTEM_TYPE="$host_vendor-$host_os"
MACHINE_TYPE="$host_cpu" # Check whether --with-system-type or --without-system-type was given.
AC_ARG_WITH(system-type,
[ --with-system-type Set the system type, like "sun-solaris10"],
[SYSTEM_TYPE="$withval"],
[SYSTEM_TYPE="$host_vendor-$host_os"])
AC_ARG_WITH(machine-type,
[ --with-machine-type Set the machine type, like "powerpc"],
[MACHINE_TYPE="$withval"],
[MACHINE_TYPE="$host_cpu"])
AC_SUBST(SYSTEM_TYPE) AC_SUBST(SYSTEM_TYPE)
AC_DEFINE_UNQUOTED([SYSTEM_TYPE], ["$SYSTEM_TYPE"], AC_DEFINE_UNQUOTED([SYSTEM_TYPE], ["$SYSTEM_TYPE"],
[Name of system, eg solaris]) [Name of system, eg sun-solaris])
AC_SUBST(MACHINE_TYPE) AC_SUBST(MACHINE_TYPE)
AC_DEFINE_UNQUOTED([MACHINE_TYPE], ["$MACHINE_TYPE"], AC_DEFINE_UNQUOTED([MACHINE_TYPE], ["$MACHINE_TYPE"],
[Machine type name, eg sun10]) [Machine type name, eg sparc])
# Detect intel x86 like processor # Detect intel x86 like processor
BASE_MACHINE_TYPE=$MACHINE_TYPE BASE_MACHINE_TYPE=$MACHINE_TYPE

15
libmysql/libmysql.c
View File

@ -168,8 +168,23 @@ int STDCALL mysql_server_init(int argc __attribute__((unused)),
} }
/*
Free all memory and resources used by the client library
NOTES
When calling this there should not be any other threads using
the library.
To make things simpler when used with windows dll's (which calls this
function automaticly), it's safe to call this function multiple times.
*/
void STDCALL mysql_server_end() void STDCALL mysql_server_end()
{ {
if (!mysql_client_init)
return;
#ifdef EMBEDDED_LIBRARY #ifdef EMBEDDED_LIBRARY
end_embedded_server(); end_embedded_server();
#endif #endif

1
sql/field.cc
View File

@ -6457,6 +6457,7 @@ Field *Field_string::new_field(MEM_ROOT *root, struct st_table *new_table,
is 2. is 2.
****************************************************************************/ ****************************************************************************/
const uint Field_varstring::MAX_SIZE= UINT_MAX16;
int Field_varstring::store(const char *from,uint length,CHARSET_INFO *cs) int Field_varstring::store(const char *from,uint length,CHARSET_INFO *cs)
{ {

2
sql/field.h
View File

@ -1183,7 +1183,7 @@ public:
The maximum space available in a Field_varstring, in bytes. See The maximum space available in a Field_varstring, in bytes. See
length_bytes. length_bytes.
*/ */
static const uint MAX_SIZE= UINT_MAX16; static const uint MAX_SIZE;
/* Store number of bytes used to store length (1 or 2) */ /* Store number of bytes used to store length (1 or 2) */
uint32 length_bytes; uint32 length_bytes;
Field_varstring(uchar *ptr_arg, Field_varstring(uchar *ptr_arg,