diff options
| author | serg@sergbook.mysql.com <> | 2002-11-05 11:55:17 +0100 |
|---|---|---|
| committer | serg@sergbook.mysql.com <> | 2002-11-05 11:55:17 +0100 |
| commit | 57152522383909bcc8c2d8a75600c8c1415b0907 (patch) | |
| tree | 9250227e9a80cdf4ab063b2323e754c57e9036ae /sql | |
| parent | 27d07047bbfdfa22424185ae97cb55c747a080ea (diff) | |
| parent | 537f1c2f1e69ac6f965b0823f422592dbbd4dc10 (diff) | |
| download | mariadb-git-57152522383909bcc8c2d8a75600c8c1415b0907.tar.gz | |
Merge work:/home/bk/mysql
into sergbook.mysql.com:/usr/home/serg/Abk/mysql
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/field.h | 1 | ||||
| -rw-r--r-- | sql/item_cmpfunc.cc | 1 | ||||
| -rw-r--r-- | sql/mysqld.cc | 4 | ||||
| -rw-r--r-- | sql/stacktrace.c | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/sql/field.h b/sql/field.h index 92e098c75c4..e822f6a71d6 100644 --- a/sql/field.h +++ b/sql/field.h @@ -533,7 +533,6 @@ public: enum Item_result result_type () const { return field_length == 8 || field_length == 14 ? INT_RESULT : STRING_RESULT; } enum_field_types type() const { return FIELD_TYPE_TIMESTAMP;} enum ha_base_keytype key_type() const { return HA_KEYTYPE_ULONG_INT; } - enum Item_result cmp_type () const { return INT_RESULT; } void store(const char *to,uint length); void store(double nr); void store(longlong nr); diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 4650b770299..36ecde337a7 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -354,7 +354,6 @@ void Item_func_between::fix_length_and_dec() if (args[0]->type() == FIELD_ITEM) { Field *field=((Item_field*) args[0])->field; - cmp_type=field->cmp_type(); if (field->store_for_compare()) { if (convert_constant_item(field,&args[1])) diff --git a/sql/mysqld.cc b/sql/mysqld.cc index f7be5525e34..71b832f24f4 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1326,7 +1326,11 @@ information that should help you find out what is causing the crash\n"); #endif /* HAVE_STACKTRACE */ if (test_flags & TEST_CORE_ON_SIGNAL) + { + fprintf(stderr, "Writing a core file\n"); + fflush(stderr); write_core(sig); + } exit(1); } diff --git a/sql/stacktrace.c b/sql/stacktrace.c index f4415571f1b..d5711bcd78e 100644 --- a/sql/stacktrace.c +++ b/sql/stacktrace.c @@ -206,7 +206,7 @@ resolve it\n"); /* Produce a core for the thread */ -#ifdef HAVE_LINUXTHREADS +#ifdef NOT_USED /* HAVE_LINUXTHREADS */ void write_core(int sig) { signal(sig, SIG_DFL); |