| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts
=========
Text conflict in .bzr-mysql/default.conf
Text conflict in libmysqld/CMakeLists.txt
Text conflict in libmysqld/Makefile.am
Text conflict in mysql-test/collections/default.experimental
Text conflict in mysql-test/extra/rpl_tests/rpl_row_sp006.test
Text conflict in mysql-test/suite/binlog/r/binlog_tmp_table.result
Text conflict in mysql-test/suite/rpl/r/rpl_loaddata.result
Text conflict in mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
Text conflict in mysql-test/suite/rpl/r/rpl_row_create_table.result
Text conflict in mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result
Text conflict in mysql-test/suite/rpl/r/rpl_stm_log.result
Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result
Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result
Text conflict in mysql-test/t/mysqlbinlog.test
Text conflict in sql/CMakeLists.txt
Text conflict in sql/Makefile.am
Text conflict in sql/log_event_old.cc
Text conflict in sql/rpl_rli.cc
Text conflict in sql/slave.cc
Text conflict in sql/sql_binlog.cc
Text conflict in sql/sql_lex.h
21 conflicts encountered.
NOTE
====
mysql-5.1-rpl-merge has been made a mirror of mysql-next-mr:
- "mysql-5.1-rpl-merge$ bzr pull ../mysql-next-mr"
This is the first cset (merge/...) committed after pulling
from mysql-next-mr.
|
| |
| |
| |
| | |
Adding header include file guards to files that are missing such.
|
|/
|
|
|
|
|
| |
WL#2265 (RESIGNAL)
Manual merge of SIGNAL and RESIGNAL to mysql-trunk-signal,
plus required dependencies.
|
|
|
|
|
| |
Updated engine to also handle create options
Secondary indexes can now be generated (aka the test PeterZ thoughts!)
|
|
|
|
|
|
|
|
|
|
| |
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
Added GPL copyright text
my_vle.h, rpl_utility.h, my_vle.c, base64-t.c, rpl_utility.cc:
Changed copyright header formatting some
plugin_example.c, daemon_example.c:
Added "Copyright (C) 2006 MySQL AB" to GPL header
|
|
|
|
| |
Changed header to GPL version 2 only
|
|
|
|
|
|
|
|
| |
Update of Dutch errmsg translations (not complete yet)
errmsg.h:
Fixup of changed error message file path in comment
authors.h:
Ego add.
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
| |
Give BerkeleyDB savepoints
Remove "enum db_type" from most of the code
|
|\
| |
| |
| | |
into mysql.com:/home/jimw/my/mysql-5.1-clean
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
|\ \
| | |
| | |
| | | |
into fedora.(none):/home/reggie/bk/mysql-5.1-new
|
| | | |
|
| | |
| | |
| | |
| | | |
Changed to alphabetical order
|
| | | |
|
| |/
|/| |
|
|/ |
|
| |
|
|
|
|
| |
Note: This change was reviewed by Brian before the commit.
|
|
|