summaryrefslogtreecommitdiff
path: root/sql/authors.h
Commit message (Collapse)AuthorAgeFilesLines
* manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeLuis Soares2009-10-221-0/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * WL#5016: Fix header file include guardsMats Kindahl2009-09-231-0/+5
| | | | | | | | Adding header include file guards to files that are missing such.
* | WL#2110 (SIGNAL)Marc Alff2009-09-101-0/+1
|/ | | | | | | WL#2265 (RESIGNAL) Manual merge of SIGNAL and RESIGNAL to mysql-trunk-signal, plus required dependencies.
* Correctly report load type.brian@zim.(none)2007-03-151-0/+1
| | | | | Updated engine to also handle create options Secondary indexes can now be generated (aka the test PeterZ thoughts!)
* Many files:kent@mysql.com/kent-amd64.(none)2006-12-311-2/+2
| | | | | | | | | | 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
* Many files:kent@mysql.com/kent-amd64.(none)2006-12-271-2/+1
| | | | Changed header to GPL version 2 only
* errmsg.txt:arjen@mysql.com/albus.bitbike.com2006-09-071-0/+2
| | | | | | | | Update of Dutch errmsg translations (not complete yet) errmsg.h: Fixup of changed error message file path in comment authors.h: Ego add.
* update show authorsandrey@lmy004.2006-05-301-0/+1
|
* update show authorspetr@mysql.com2006-05-301-1/+2
|
* Andrei Elkin has arrived.aelkin@mysql.com2006-04-011-0/+1
|
* Hakan Kuecuekyilmazhakan@lu0008.wdf.sap.corp2006-03-301-0/+1
|
* Finalize storage engine pluginsacurtis@xiphis.org2005-12-211-1/+2
| | | | | Give BerkeleyDB savepoints Remove "enum db_type" from most of the code
* Merge mysql.com:/home/jimw/my/mysql-5.1-releasejimw@mysql.com2005-11-301-23/+130
|\ | | | | | | into mysql.com:/home/jimw/my/mysql-5.1-clean
| * Add Ingo to SHOW AUTHORSjimw@mysql.com2005-11-281-0/+1
| |
| * Small tweaks to SHOW AUTHORS listjimw@mysql.com2005-11-281-3/+4
| |
| * Update list of authors with information from documentation.jimw@mysql.com2005-11-281-23/+127
| |
| * Added my name.knielsen@mysql.com2005-11-281-0/+1
| |
| * (no commit message)kent@mysql.com2005-11-281-0/+1
| |
* | Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-newreggie@fedora.(none)2005-11-281-0/+1
|\ \ | | | | | | | | | into fedora.(none):/home/reggie/bk/mysql-5.1-new
| * | Added myself to authors table for 5.1reggie@fedora.(none)2005-11-271-0/+1
| | |
* | | Added my namelars@mysql.com2005-11-271-8/+9
| | | | | | | | | | | | Changed to alphabetical order
* | | Fixed failing "show check" test.eric@mysql.com2005-11-251-0/+1
| | |
* | | HF mentioned in authors.hholyfoot@deer.(none)2005-11-251-0/+1
| |/ |/|
* | Added myself to authors.h.pem@mysql.com2005-11-231-0/+1
|/
* More authors.konstantin@mysql.com2005-11-181-1/+7
|
* Updated authors.h file (and show_check.result file) to include QA team membersomer@mysql.com2005-11-171-0/+9
| | | | Note: This change was reviewed by Brian before the commit.
* Added "SHOW AUTHORS" codebrian@grrr.local2005-11-101-0/+18