# At a local mysql-5.1 repository of davi
2658 Davi Arnaut 2008-06-03
This is a test, please ignore.
renamed:
sql/stacktrace.c => mysys/stacktrace.c
sql/stacktrace.h => include/my_stacktrace.h
modified:
include/Makefile.am
libmysqld/CMakeLists.txt
libmysqld/Makefile.am
libmysqld/lib_sql.cc
mysql-test/t/sql_low_priority_updates_func.test
mysys/CMakeLists.txt
mysys/Makefile.am
sql/CMakeLists.txt
sql/Makefile.am
sql/mysqld.cc
mysys/stacktrace.c
include/my_stacktrace.h
=== modified file 'include/Makefile.am'
--- a/include/Makefile.am 2008-02-08 11:13:33 +0000
+++ b/include/Makefile.am 2008-06-03 14:08:27 +0000
@@ -36,7 +36,7 @@ noinst_HEADERS = config-win.h config-net
mysql_version.h.in my_handler.h my_time.h \
my_vle.h my_user.h my_atomic.h atomic/nolock.h \
atomic/rwlock.h atomic/x86-gcc.h atomic/x86-msvc.h \
- atomic/gcc_builtins.h my_libwrap.h
+ atomic/gcc_builtins.h my_libwrap.h my_stacktrace.h
# Remove built files and the symlinked directories
CLEANFILES = $(BUILT_SOURCES) readline openssl
=== renamed file 'sql/stacktrace.h' => 'include/my_stacktrace.h'
--- a/sql/stacktrace.h 2008-02-21 00:53:35 +0000
+++ b/include/my_stacktrace.h 2008-06-03 14:08:27 +0000
@@ -13,9 +13,12 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef _my_stacktrace_h_
+#define _my_stacktrace_h_
+
+#include <my_global.h>
+
+C_MODE_START
#if HAVE_BACKTRACE && HAVE_BACKTRACE_SYMBOLS && HAVE_CXXABI_H && HAVE_ABI_CXA_DEMANGLE
#define BACKTRACE_DEMANGLE 1
@@ -63,7 +66,6 @@ void safe_print_str(const char* name, co
void write_core(int sig);
#endif
+C_MODE_END
-#ifdef __cplusplus
-}
-#endif
+#endif /* _my_stacktrace_h_ */
=== modified file 'libmysqld/CMakeLists.txt'
--- a/libmysqld/CMakeLists.txt 2008-05-20 07:38:17 +0000
+++ b/libmysqld/CMakeLists.txt 2008-06-03 14:08:27 +0000
@@ -185,8 +185,7 @@ SET(LIBMYSQLD_SOURCES emb_qcache.cc libm
../sql/strfunc.cc ../sql/table.cc ../sql/thr_malloc.cc
../sql/time.cc ../sql/tztime.cc ../sql/uniques.cc ../sql/unireg.cc
../sql/partition_info.cc ../sql/sql_connect.cc
- ../sql/scheduler.cc ../sql/stacktrace.c
- ../sql/event_parse_data.cc
+ ../sql/scheduler.cc ../sql/event_parse_data.cc
${GEN_SOURCES}
${LIB_SOURCES})
=== modified file 'libmysqld/Makefile.am'
--- a/libmysqld/Makefile.am 2008-05-09 07:43:02 +0000
+++ b/libmysqld/Makefile.am 2008-06-03 14:08:27 +0000
@@ -69,7 +69,7 @@ sqlsources = derror.cc field.cc field_co
sql_select.cc sql_do.cc sql_show.cc set_var.cc \
sql_string.cc sql_table.cc sql_test.cc sql_udf.cc \
sql_update.cc sql_yacc.cc table.cc thr_malloc.cc time.cc \
- unireg.cc uniques.cc stacktrace.c sql_union.cc hash_filo.cc \
+ unireg.cc uniques.cc sql_union.cc hash_filo.cc \
spatial.cc gstream.cc sql_help.cc tztime.cc sql_cursor.cc \
sp_head.cc sp_pcontext.cc sp.cc sp_cache.cc sp_rcontext.cc \
parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \
=== modified file 'libmysqld/lib_sql.cc'
--- a/libmysqld/lib_sql.cc 2008-05-20 07:38:17 +0000
+++ b/libmysqld/lib_sql.cc 2008-06-03 14:08:27 +0000
@@ -79,6 +79,15 @@ emb_advanced_command(MYSQL *mysql, enum
my_bool result= 1;
THD *thd=(THD *) mysql->thd;
NET *net= &mysql->net;
+ my_bool stmt_skip= stmt ? stmt->state != MYSQL_STMT_INIT_DONE : FALSE;
+
+ if (!thd)
+ {
+ /* Do "reconnect" if possible */
+ if (mysql_reconnect(mysql) || stmt_skip)
+ return 1;
+ thd= (THD *) mysql->thd;
+ }
#if defined(ENABLED_PROFILING) && defined(COMMUNITY_SERVER)
thd->profiling.start_new_query();
=== modified file 'mysql-test/t/sql_low_priority_updates_func.test'
--- a/mysql-test/t/sql_low_priority_updates_func.test 2008-04-10 13:14:28 +0000
+++ b/mysql-test/t/sql_low_priority_updates_func.test 2008-06-03 14:08:27 +0000
@@ -19,6 +19,7 @@
# #
###############################################################################
+--source include/not_embedded.inc
################################################################
# sql_low_priority_updates was renamed to low_priority_updates #
=== modified file 'mysys/CMakeLists.txt'
--- a/mysys/CMakeLists.txt 2007-11-07 22:47:25 +0000
+++ b/mysys/CMakeLists.txt 2008-06-03 14:08:27 +0000
@@ -39,7 +39,7 @@ SET(MYSYS_SOURCES array.c charset-def.c
my_mkdir.c my_mmap.c my_net.c my_once.c my_open.c my_pread.c my_pthread.c
my_quick.c my_read.c my_realloc.c my_redel.c my_rename.c my_seek.c my_sleep.c
my_static.c my_symlink.c my_symlink2.c my_sync.c my_thr_init.c my_wincond.c
- my_windac.c my_winthread.c my_write.c ptr_cmp.c queues.c
+ my_windac.c my_winthread.c my_write.c ptr_cmp.c queues.c stacktrace.c
rijndael.c safemalloc.c sha1.c string.c thr_alarm.c thr_lock.c thr_mutex.c
thr_rwlock.c tree.c typelib.c my_vle.c base64.c my_memmem.c my_getpagesize.c)
=== modified file 'mysys/Makefile.am'
--- a/mysys/Makefile.am 2008-03-28 19:11:07 +0000
+++ b/mysys/Makefile.am 2008-06-03 14:08:27 +0000
@@ -51,7 +51,7 @@ libmysys_a_SOURCES = my_init.c my_get
charset.c charset-def.c my_bitmap.c my_bit.c md5.c \
my_gethostbyname.c rijndael.c my_aes.c sha1.c \
my_handler.c my_netware.c my_largepage.c \
- my_memmem.c \
+ my_memmem.c stacktrace.c \
my_windac.c my_access.c base64.c my_libwrap.c
EXTRA_DIST = thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \
thr_mutex.c thr_rwlock.c \
=== renamed file 'sql/stacktrace.c' => 'mysys/stacktrace.c'
--- a/sql/stacktrace.c 2008-02-21 00:53:35 +0000
+++ b/mysys/stacktrace.c 2008-06-03 14:08:27 +0000
@@ -16,8 +16,7 @@
/* Workaround for Bug#32082: VOID redefinition on Win results in compile errors*/
#define DONT_DEFINE_VOID 1
-#include <my_global.h>
-#include "stacktrace.h"
+#include <my_stacktrace.h>
#ifndef __WIN__
#include <signal.h>
=== modified file 'sql/CMakeLists.txt'
--- a/sql/CMakeLists.txt 2008-05-12 16:34:25 +0000
+++ b/sql/CMakeLists.txt 2008-06-03 14:08:27 +0000
@@ -43,7 +43,7 @@ ADD_DEFINITIONS(-DMYSQL_SERVER -D_CONSOL
ADD_EXECUTABLE(mysqld
../sql-common/client.c derror.cc des_key_file.cc
- discover.cc ../libmysql/errmsg.c field.cc stacktrace.c stacktrace.h field_conv.cc
+ discover.cc ../libmysql/errmsg.c field.cc field_conv.cc
filesort.cc gstream.cc
ha_partition.cc
handler.cc hash_filo.cc hash_filo.h
=== modified file 'sql/Makefile.am'
--- a/sql/Makefile.am 2008-05-09 07:43:02 +0000
+++ b/sql/Makefile.am 2008-06-03 14:08:27 +0000
@@ -66,7 +66,7 @@ noinst_HEADERS = item.h item_func.h item
sql_repl.h slave.h rpl_filter.h rpl_injector.h \
log_event.h rpl_record.h \
log_event_old.h rpl_record_old.h \
- stacktrace.h sql_sort.h sql_cache.h set_var.h \
+ sql_sort.h sql_cache.h set_var.h \
spatial.h gstream.h client_settings.h tzfile.h \
tztime.h my_decimal.h\
sp_head.h sp_pcontext.h sp_rcontext.h sp.h sp_cache.h \
@@ -110,7 +110,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler.
rpl_reporting.cc \
sql_union.cc sql_derived.cc \
sql_client.cc \
- stacktrace.c repl_failsafe.h repl_failsafe.cc \
+ repl_failsafe.h repl_failsafe.cc \
sql_olap.cc sql_view.cc \
gstream.cc spatial.cc sql_help.cc sql_cursor.cc \
tztime.cc my_decimal.cc\
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc 2008-05-20 07:38:17 +0000
+++ b/sql/mysqld.cc 2008-06-03 14:08:27 +0000
@@ -22,7 +22,7 @@
#include "sql_repl.h"
#include "rpl_filter.h"
#include "repl_failsafe.h"
-#include "stacktrace.h"
+#include <my_stacktrace.h>
#include "mysqld_suffix.h"
#include "mysys_err.h"
#include "events.h"
| Thread |
|---|
| • bzr commit into mysql-5.1 branch (davi:2658) | Davi Arnaut | 3 Jun |
