- 07 Jan, 2010 1 commit
-
-
Alfranio Correia authored
Conflicts: Text conflict in .bzr-mysql/default.conf Text conflict in mysql-test/extra/rpl_tests/rpl_loaddata.test Text conflict in mysql-test/r/mysqlbinlog2.result Text conflict in mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result Text conflict in mysql-test/suite/binlog/r/binlog_unsafe.result Text conflict in mysql-test/suite/rpl/r/rpl_insert_id.result Text conflict in mysql-test/suite/rpl/r/rpl_loaddata.result Text conflict in mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result Text conflict in mysql-test/suite/rpl/r/rpl_udf.result Text conflict in mysql-test/suite/rpl/t/rpl_slow_query_log.test Text conflict in sql/field.h Text conflict in sql/log.cc Text conflict in sql/log_event.cc Text conflict in sql/log_event_old.cc Text conflict in sql/mysql_priv.h Text conflict in sql/share/errmsg.txt Text conflict in sql/sp.cc Text conflict in sql/sql_acl.cc Text conflict in sql/sql_base.cc Text conflict in sql/sql_class.h Text conflict in sql/sql_db.cc Text conflict in sql/sql_delete.cc Text conflict in sql/sql_insert.cc Text conflict in sql/sql_lex.cc Text conflict in sql/sql_lex.h Text conflict in sql/sql_load.cc Text conflict in sql/sql_table.cc Text conflict in sql/sql_update.cc Text conflict in sql/sql_view.cc Conflict adding files to storage/innobase. Created directory. Conflict because storage/innobase is not versioned, but has versioned children. Versioned directory. Conflict adding file storage/innobase. Moved existing file to storage/innobase.moved. Conflict adding files to storage/innobase/handler. Created directory. Conflict because storage/innobase/handler is not versioned, but has versioned children. Versioned directory. Contents conflict in storage/innobase/handler/ha_innodb.cc
-
- 24 Dec, 2009 1 commit
-
-
Alfranio Correia authored
-
- 23 Dec, 2009 3 commits
-
-
Alexander Nozdrin authored
-
Alexander Nozdrin authored
-
Alexander Nozdrin authored
-
- 22 Dec, 2009 11 commits
-
-
Vladislav Vaintroub authored
-
Vladislav Vaintroub authored
by shared embedded library)
-
Luis Soares authored
-
Vladislav Vaintroub authored
-
Vladislav Vaintroub authored
restore original innobase version
-
Luis Soares authored
This patch fixes these warnings and some compile time warnings. On top of that, it also fixes rpl_err_ignoredtable test failure. This test was failing because the warning suppression text was not matching the latest text. We fix this by making them match.
-
Alexander Nozdrin authored
-
Alexander Nozdrin authored
-
Alexander Nozdrin authored
Conflicts: - storage/ibmdb2i/ha_ibmdb2i.cc
-
Alexander Nozdrin authored
Conflicts: - storage/ibmdb2i/ha_ibmdb2i.cc
-
Alexander Nozdrin authored
-
- 21 Dec, 2009 13 commits
-
-
Alexander Nozdrin authored
-
Alexander Nozdrin authored
-
Alexander Nozdrin authored
-
Alexander Nozdrin authored
-
Alexander Nozdrin authored
-
Mikael Ronstrom authored
Force use of c-register in CAS instruction on x86-32 bit architecture, b-register used for push and pop, so don't want to give compile the chance to choose the wrong register
-
Mattias Jonsson authored
-
Mattias Jonsson authored
Recommit of patch: http://lists.mysql.com/commits/91400 Test case only (code part was pushes as bug-49028)
-
Alexander Nozdrin authored
-
Alexander Nozdrin authored
-
Alfranio Correia authored
-
Alfranio Correia authored
-
Alfranio Correia authored
-
- 20 Dec, 2009 3 commits
-
-
Vladislav Vaintroub authored
It was pthread_mutex_t in mi_static.c and mysql_mutex_t in my_thr_init.c Solaris linker complains about different size of the symbol. Fix : use mysql_mutex_t everywhere.
-
Alexander Nozdrin authored
-
Alexander Nozdrin authored
-
- 19 Dec, 2009 8 commits
-
-
Mikael Ronstrom authored
-
Mikael Ronstrom authored
-
Mikael Ronstrom authored
Post-merge fix: wait for statement result before disconnecting. Otherwise the statement might affect unrelated tests. mysql-test/t/lock_multi.test, Reap statement status
-
Mikael Ronstrom authored
-
Mikael Ronstrom authored
-
Alexander Nozdrin authored
-
Alexander Nozdrin authored
-
Alexander Nozdrin authored
-