mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 19:11:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

Browse source 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
This commit is contained in:
df@pippilotta.erinye.com 2007-03-15 22:28:33 +01:00
commit 99a785c5aa
5 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
EXCEPTIONS-CLIENT
View file

@ -4,7 +4,7 @@ The MySQL AB Exception for Free/Libre and Open Source
Software-only Applications Using MySQL Client Libraries (the Software-only Applications Using MySQL Client Libraries (the
"FLOSS Exception"). "FLOSS Exception").
Version 0.5, 30 August 2006 Version 0.6, 7 March 2007
Exception Intent Exception Intent
@ -59,10 +59,12 @@ Apache Software License 1.0/1.1/2.0
Apple Public Source License 2.0 Apple Public Source License 2.0
Artistic license From Perl 5.8.0 Artistic license From Perl 5.8.0
BSD license "July 22 1999" BSD license "July 22 1999"
Common Development and Distribution License (CDDL) 1.0
Common Public License 1.0 Common Public License 1.0
Eclipse Public License 1.0
GNU Library or "Lesser" General Public License (LGPL) 2.0/2.1 GNU Library or "Lesser" General Public License (LGPL) 2.0/2.1
Jabber Open Source License 1.0 Jabber Open Source License 1.0
MIT license --- MIT license (As listed in file MIT-License.txt) ---
Mozilla Public License (MPL) 1.0/1.1 Mozilla Public License (MPL) 1.0/1.1
Open Software License 2.0 Open Software License 2.0
OpenSSL license (with original SSLeay license) "2003" ("1998") OpenSSL license (with original SSLeay license) "2003" ("1998")

4
configure.in
View file

@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc)
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
# The Docs Makefile.am parses this line! # The Docs Makefile.am parses this line!
# remember to also change ndb version below and update version.c in ndb # remember to also change ndb version below and update version.c in ndb
AM_INIT_AUTOMAKE(mysql, 5.0.38) AM_INIT_AUTOMAKE(mysql, 5.0.40)
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
PROTOCOL_VERSION=10 PROTOCOL_VERSION=10
@ -23,7 +23,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0
# ndb version # ndb version
NDB_VERSION_MAJOR=5 NDB_VERSION_MAJOR=5
NDB_VERSION_MINOR=0 NDB_VERSION_MINOR=0
NDB_VERSION_BUILD=38 NDB_VERSION_BUILD=40
NDB_VERSION_STATUS="" NDB_VERSION_STATUS=""
# Set all version vars based on $VERSION. How do we do this more elegant ? # Set all version vars based on $VERSION. How do we do this more elegant ?

6
sql/mysqld.cc
View file

@ -1681,6 +1681,12 @@ void end_thread(THD *thd, bool put_in_cache)
thd->real_id=pthread_self(); thd->real_id=pthread_self();
thd->thread_stack= (char*) &thd; // For store_globals thd->thread_stack= (char*) &thd; // For store_globals
(void) thd->store_globals(); (void) thd->store_globals();
/*
THD::mysys_var::abort is associated with physical thread rather
than with THD object. So we need to reset this flag before using
this thread for handling of new THD object/connection.
*/
thd->mysys_var->abort= 0;
thd->thr_create_time= time(NULL); thd->thr_create_time= time(NULL);
threads.append(thd); threads.append(thd);
pthread_mutex_unlock(&LOCK_thread_count); pthread_mutex_unlock(&LOCK_thread_count);

1
sql/sp_head.cc
View file

@ -1087,6 +1087,7 @@ sp_head::execute(THD *thd)
ctx->enter_handler(hip); ctx->enter_handler(hip);
thd->clear_error(); thd->clear_error();
thd->killed= THD::NOT_KILLED; thd->killed= THD::NOT_KILLED;
thd->mysys_var->abort= 0;
continue; continue;
} }
} }

3
sql/sql_parse.cc
View file

@ -1604,7 +1604,10 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
DBUG_ENTER("dispatch_command"); DBUG_ENTER("dispatch_command");
if (thd->killed == THD::KILL_QUERY || thd->killed == THD::KILL_BAD_DATA) if (thd->killed == THD::KILL_QUERY || thd->killed == THD::KILL_BAD_DATA)
{
thd->killed= THD::NOT_KILLED; thd->killed= THD::NOT_KILLED;
thd->mysys_var->abort= 0;
}
thd->command=command; thd->command=command;
/* /*