diff options
| author | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-06-02 18:08:06 +0200 |
|---|---|---|
| committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-06-02 18:08:06 +0200 |
| commit | ae19d3e705149a7807749450ae371ad35805a571 (patch) | |
| tree | 2f49b2dea907e5180c8c5ff2343df85da2d93236 /client | |
| parent | 5c41c238fcfc0cd168432d331a5cde385459a71b (diff) | |
| parent | eb27f163a31ca6995c98ada9fc678176c041dd93 (diff) | |
| download | mariadb-git-ae19d3e705149a7807749450ae371ad35805a571.tar.gz | |
Merge from mysql-trunk
Diffstat (limited to 'client')
| -rw-r--r-- | client/Makefile.am | 3 | ||||
| -rw-r--r-- | client/mysql.cc | 6 | ||||
| -rw-r--r-- | client/mysqlbinlog.cc | 4 | ||||
| -rw-r--r-- | client/mysqltest.cc | 4 |
4 files changed, 6 insertions, 11 deletions
diff --git a/client/Makefile.am b/client/Makefile.am index 5da59296cdf..04f0ac39b0e 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -124,6 +124,3 @@ link_sources: rm -f $(srcdir)/my_user.c; \ @LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c; echo timestamp > link_sources; - -# Don't update the files from bitkeeper -%::SCCS/s.% diff --git a/client/mysql.cc b/client/mysql.cc index 5e77b6e9d17..86094edc039 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -4300,7 +4300,7 @@ sql_real_connect(char *host,char *database,char *user,char *password, mysql_options(&mysql, MYSQL_SECURE_AUTH, (char *) &opt_secure_auth); if (using_opt_local_infile) mysql_options(&mysql,MYSQL_OPT_LOCAL_INFILE, (char*) &opt_local_infile); -#ifdef HAVE_OPENSSL +#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY) if (opt_use_ssl) mysql_ssl_set(&mysql, opt_ssl_key, opt_ssl_cert, opt_ssl_ca, opt_ssl_capath, opt_ssl_cipher); @@ -4421,12 +4421,12 @@ com_status(String *buffer __attribute__((unused)), mysql_free_result(result); } -#ifdef HAVE_OPENSSL +#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY) if ((status_str= mysql_get_ssl_cipher(&mysql))) tee_fprintf(stdout, "SSL:\t\t\tCipher in use is %s\n", status_str); else -#endif /* HAVE_OPENSSL */ +#endif /* HAVE_OPENSSL && !EMBEDDED_LIBRARY */ tee_puts("SSL:\t\t\tNot in use", stdout); if (skip_updates) diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 410d3a875d7..ecba818a156 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -736,9 +736,7 @@ Exit_status process_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev, switch (ev_type) { case QUERY_EVENT: - if (strncmp(((Query_log_event*)ev)->query, "BEGIN", 5) && - strncmp(((Query_log_event*)ev)->query, "COMMIT", 6) && - strncmp(((Query_log_event*)ev)->query, "ROLLBACK", 8) && + if (!((Query_log_event*)ev)->is_trans_keyword() && shall_skip_database(((Query_log_event*)ev)->db)) goto end; if (opt_base64_output_mode == BASE64_OUTPUT_ALWAYS) diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 071e41dec69..f73b083c758 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -5179,7 +5179,7 @@ void do_connect(struct st_command *command) mysql_options(&con_slot->mysql, MYSQL_SET_CHARSET_DIR, opt_charsets_dir); -#ifdef HAVE_OPENSSL +#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY) if (opt_use_ssl || con_ssl) { mysql_ssl_set(&con_slot->mysql, opt_ssl_key, opt_ssl_cert, opt_ssl_ca, @@ -7933,7 +7933,7 @@ int main(int argc, char **argv) if (opt_protocol) mysql_options(&con->mysql,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol); -#ifdef HAVE_OPENSSL +#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY) if (opt_use_ssl) { |