mysql-test/t/query_cache.test:
Disable query_cache test on embedded, due to bug 30710.
sql/log_event_old.cc:
Post-merge fix, change RELAY_LOG_INFO to Relay_log_info.
into sita.local:/Users/tsmith/m/bk/maint/51
sql/field.cc:
Auto merged
sql/log_event_old.cc:
Auto merged
sql/rpl_record.h:
Auto merged
sql/rpl_utility.cc:
Auto merged
sql/rpl_utility.h:
Auto merged
sql/slave.h:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
sql/log_event.cc:
Manual merge
sql/log_event.h:
Manual merge
sql/log_event_old.h:
Manual merge
sql/rpl_record.cc:
Manual merge
sql/slave.cc:
Manual merge
Do not convert innodb autoincrement value to little endian when on
big endian systems.
storage/innobase/row/row0sel.c:
Do not convert innodb autoincrement value to little endian when on
big endian systems.
Removing unguarded read of slave_running field from inside
terminate_slave_threads(). This could cause premature exit in the event
that the slave thread already were shutting down, but isn't finished yet.
The fields slave_running, io_thd, and sql_thread are guarded by an
associated run_lock. A read of these fields were not guarded inside
terminate_slave_threads(), which caused an assertion to fire. The
assertion was removed, and the code reorganized slightly.
sql/slave.cc:
Changing signature of terminate_slave_thread() to accept a skip_lock
parameter instead of two mutexes. This mimics the signature of the
terminate_slave_threads() function. Code is also changed as a result
of this.
Removing unguarded check of slave_running field in the master info and
relay log info structure since that could cause premature exit of
terminate_slave_threads().
The thread variable for each of the slave threads can change before
acquiring the run_lock mutex inside terminate_slave_thread(). Hence
an assertion was removed that read the variable without guarding it
with run_lock.
Code that checked *slave_running status inside terminate_slave_thread()
was reorganized slightly.
sql/slave.h:
Moving terminate_slave_thread() to use internal linkage.
mysql-test/lib/mtr_misc.pl:
Add function 'mtr_rmtree' it will try 'rmtree' and if that fails (most likely
due to permission problems we will fun File::find to chmod all files and dirs
to 0777 and then delete.
mysql-test/mysql-test-run.pl:
Use 'mtr_rmtree' in favour of 'rmtree'
storage/innobase/handler/ha_innodb.cc:
Fix compiler warning: ::get_auto_increment takes a ulonglong
for nb_desired_values, but InnoDB's trx struct stores it as
a ulint (unsigned long). Probably harmless, as a single
statement won't be asking for more than 2^32 rows.
Fix typo, "next_con" -> "con"
client/mysqltest.c:
Reuse "find_connection_by_name" both from "do_close_connection" and "do_send_quit"
Adjust alignment of comment
Fix typo in "do_close_connection", it used the global variable "next_con" instead
of local variable "con"
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/loaddata.test:
Auto merged
to perform this analyzis)
client/mysqltest.c:
Add function 'show_query' and use it to output some debug queries when
"sync_with_master" has failed.
mysql-test/mysql-test-run.pl:
Move "analyze_testcase_failure" to mysqltest
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
extra/yassl/include/openssl/crypto.h:
Auto merged
extra/yassl/include/openssl/ssl.h:
Auto merged
extra/yassl/include/yassl_int.hpp:
Auto merged
extra/yassl/src/ssl.cpp:
Auto merged
extra/yassl/src/yassl_int.cpp:
Auto merged
vio/viossl.c:
Auto merged
mysql-test/suite/rpl/t/rpl_ssl.test:
Merge 5.0->5.1
