diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_gemini.h | 1 | ||||
| -rw-r--r-- | sql/ha_innobase.cc | 14 | ||||
| -rw-r--r-- | sql/ha_innobase.h | 1 | ||||
| -rw-r--r-- | sql/handler.cc | 6 | ||||
| -rw-r--r-- | sql/mysqld.cc | 6 |
5 files changed, 21 insertions, 7 deletions
diff --git a/sql/ha_gemini.h b/sql/ha_gemini.h index 97a7ed3602f..7e6e8f26588 100644 --- a/sql/ha_gemini.h +++ b/sql/ha_gemini.h @@ -158,6 +158,7 @@ class ha_gemini: public handler #define GEM_OPTID_SPIN_RETRIES 1 extern bool gemini_skip; +extern SHOW_COMP_OPTION have_gemini; extern long gemini_options; extern long gemini_buffer_cache; extern long gemini_io_threads; diff --git a/sql/ha_innobase.cc b/sql/ha_innobase.cc index bf9f2a38740..45dcb4e80df 100644 --- a/sql/ha_innobase.cc +++ b/sql/ha_innobase.cc @@ -917,7 +917,7 @@ innobase_mysql_cmp( not UNIV_SQL_NULL */ { enum_field_types mysql_tp; - int ret; + int ret; dbug_assert(a_length != UNIV_SQL_NULL); dbug_assert(b_length != UNIV_SQL_NULL); @@ -928,9 +928,15 @@ innobase_mysql_cmp( case FIELD_TYPE_STRING: case FIELD_TYPE_VAR_STRING: - ret = my_sortncmp((const char*) a, a_length, - (const char*) b, b_length); - return ret; + ret = my_sortncmp((const char*) a, a_length, + (const char*) b, b_length); + if (ret < 0) { + return(-1); + } else if (ret > 0) { + return(1); + } else { + return(0); + } default: assert(0); } diff --git a/sql/ha_innobase.h b/sql/ha_innobase.h index 7ce22e70dcb..df1bcea3cca 100644 --- a/sql/ha_innobase.h +++ b/sql/ha_innobase.h @@ -148,6 +148,7 @@ class ha_innobase: public handler }; extern bool innobase_skip; +extern SHOW_COMP_OPTION have_innobase; extern uint innobase_init_flags, innobase_lock_type; extern ulong innobase_cache_size; extern char *innobase_home, *innobase_tmpdir, *innobase_logdir; diff --git a/sql/handler.cc b/sql/handler.cc index 1d41b33e90b..600683d9c18 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -159,7 +159,10 @@ int ha_init() if (innobase_init()) return -1; if (!innobase_skip) // If we couldn't use handler + { opt_using_transactions=1; + have_innobase=SHOW_OPTION_DISABLED; + } } #endif #ifdef HAVE_GEMINI_DB @@ -168,7 +171,10 @@ int ha_init() if (gemini_init()) return -1; if (!gemini_skip) // If we couldn't use handler + { opt_using_transactions=1; + have_gemini=SHOW_OPTION_DISABLED; + } } #endif return 0; diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 9c8e28e19f0..9b33c7efa51 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1696,9 +1696,9 @@ int main(int argc, char **argv) #ifdef EXTRA_DEBUG case 1: sql_print_error("\ -Warning: You should set server-id to a non-0 value if log-bin is enabled.\n\ -mysqld will log updates to the binary log, but will not accept connections\n\ -from slaves."); +Warning: You have enabled the binary log, but you haven't set server-id:\n\ +Updates will be logged to the binary log, but connections to slaves will\n\ +not be accepted."); break; #endif case 2: |