mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 11:01:52 +01:00
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
This commit is contained in:
commit
03f64a6343
5 changed files with 20 additions and 2 deletions
|
@ -43,5 +43,6 @@ fi
|
|||
--with-berkeley-db \
|
||||
--with-innodb \
|
||||
--enable-thread-safe-client \
|
||||
--with-extra-charsets=complex \
|
||||
--with-ndbcluster
|
||||
make
|
||||
|
|
|
@ -631,6 +631,7 @@ extern int pthread_dummy(int);
|
|||
/* All thread specific variables are in the following struct */
|
||||
|
||||
#define THREAD_NAME_SIZE 10
|
||||
#ifndef DEFAULT_THREAD_STACK
|
||||
#if defined(__ia64__)
|
||||
/*
|
||||
MySQL can survive with 32K, but some glibc libraries require > 128K stack
|
||||
|
@ -640,6 +641,7 @@ extern int pthread_dummy(int);
|
|||
#else
|
||||
#define DEFAULT_THREAD_STACK (192*1024)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
struct st_my_thread_var
|
||||
{
|
||||
|
|
|
@ -1763,7 +1763,21 @@ os_file_flush(
|
|||
#else
|
||||
int ret;
|
||||
|
||||
#ifdef HAVE_FDATASYNC
|
||||
#ifdef HAVE_DARWIN_THREADS
|
||||
/* Apple has disabled fsync() for internal disk drives in OS X. That
|
||||
caused corruption for a user when he tested a power outage. Let us in
|
||||
OS X use a nonstandard flush method recommended by an Apple
|
||||
engineer. */
|
||||
|
||||
ret = fcntl(file, F_FULLFSYNC, NULL);
|
||||
|
||||
if (ret) {
|
||||
/* If we are not on a file system that supports this, then
|
||||
fall back to a plain fsync. */
|
||||
|
||||
ret = fsync(file);
|
||||
}
|
||||
#elif HAVE_FDATASYNC
|
||||
ret = fdatasync(file);
|
||||
#else
|
||||
/* fprintf(stderr, "Flushing to file %p\n", file); */
|
||||
|
|
|
@ -23,6 +23,8 @@ void my_sleep(ulong m_seconds)
|
|||
{
|
||||
#ifdef __NETWARE__
|
||||
delay(m_seconds/1000+1);
|
||||
#elif defined(__WIN__)
|
||||
Sleep(m_seconds/1000+1); /* Sleep() has millisecond arg */
|
||||
#elif defined(OS2)
|
||||
DosSleep(m_seconds/1000+1);
|
||||
#elif defined(HAVE_SELECT)
|
||||
|
|
|
@ -2429,7 +2429,6 @@ mysql_execute_command(THD *thd)
|
|||
create_table_local);
|
||||
break;
|
||||
|
||||
create_error:
|
||||
res= 1; //error reported
|
||||
unsent_create_error:
|
||||
// put tables back for PS rexecuting
|
||||
|
|
Loading…
Add table
Reference in a new issue