summaryrefslogtreecommitdiff
path: root/.bzrignore
Commit message (Collapse)AuthorAgeFilesLines
* Mergejimw@mysql.com2005-01-241-1/+2
|\
| * - renamed client_test -> mysql_client_testlenz@mysql.com2005-01-201-0/+2
| | | | | | | | | | | | | | - renamed the tests that use the embedded server (client_test -> mysql_client_test_embedded, mysqltest -> mysql_test_embedded and changed some Makefiles and scripts so they are installed in $bindir (required to be able to run the test suite against the embedded server)
* | mergedserg@serg.mylan2005-01-241-0/+1
| |
* | Merge with global treemonty@mysql.com2005-01-151-0/+1
|\ \
| * \ Merge with 4.1monty@mysql.com2005-01-151-1/+1
| |\ \ | | |/
| | * Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2005-01-061-41/+93
| | |\ | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1
| * | | Added ndb_types.h to ignoremonty@mysql.com2005-01-151-0/+1
| | | |
* | | | Mergeanjuta@arthur.local2005-01-131-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Bug in InnoDB; anjuta@arthur.local2005-01-131-0/+1
| | | | | | | | | | | | | | | | file closing in extra/comp_err.c
* | | | mergedserg@sergbook.mysql.com2005-01-061-0/+54
|\ \ \ \ | | |_|/ | |/| |
| * | | WL#964wax@kishkin.ru2005-01-031-0/+54
| | | | | | | | | | | | | | | | added sort of file names for all OS
* | | | Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEYmonty@mysql.com2005-01-031-0/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | added ndb/include/ndb_global.h ndb/include/ndb_version.h to ignoremonty@mysql.com2005-01-031-0/+2
| |/ /
| * | Clean up the handling of "server" and "client" directories, while still ↵joerg@mysql.com2004-12-301-0/+2
| | | | | | | | | | | | | | | | | | | | | avoiding the double listing of common directories in 'SUBDIRS' macro ("make distclean" had failed due to that). Solves bug#7368: "regex make error in 4.1.8"
* | | Merge with 4.1monty@mishka.local2004-12-221-3/+6
|\ \ \ | |/ / | | / | |/ |/|
| * corrected mysqltest.dspwax@kishkin.ru2004-12-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | corrected mysql_test_run_new.dsp added dependency corrected path of mysql_test_run_new.dsp fixed wrong code added my_create_tables.c removed command_line fixed #elif restored NAME_MAX and MAX_FNAME added create_system_files() added compare() for windows added all files of testes in script added mysql-test in script
| * Fix for a bug #6996Sinisa@sinisa.nasamreza.org2004-12-071-0/+2
| |
* | Added pathes to mysqld_error.h and sql_state.h; fixed segfault bug; anjuta@arthur.local2004-12-141-0/+1
| |
* | Added missing errmsg.txtanjuta@arthur.local2004-12-131-0/+2
| |
* | mergepetr@mysql.com2004-12-091-0/+5
|\ \
| * | fix for the IM linking problempetr@mysql.com2004-11-061-0/+4
| | |
| * | protability fixpetr@mysql.com2004-11-041-0/+1
| | |
* | | Merge with 4.1monty@mysql.com2004-12-061-0/+3
|\ \ \ | | |/ | |/|
| * | Fixes to make mysql-test-run --embedded-server workinghf@deer.(none)2004-12-021-0/+3
| | |
| * | - renamed mysqladmin.c -> mysqladmin.cpp to fix the Windows buildslenz@mysql.com2004-11-221-0/+1
| | |
* | | mergedserg@serg.mylan2004-11-201-2/+16
|\ \ \ | |/ /
| * | ignore fixtomas@poseidon.ndb.mysql.com2004-11-191-1/+1
| | |
| * | added to ignore listtomas@poseidon.ndb.mysql.com2004-11-191-0/+15
| | |
* | | Fixed one warning and two errors reported by VC 6.0.timour@mysql.com2004-11-181-0/+1
| | |
* | | don't delete ac_available_languages_fragment in configure - it may be needed ↵serg@serg.mylan2004-11-161-0/+1
| | | | | | | | | | | | later
* | | Merge bk-internal:/home/bk/mysql-5.0serg@serg.mylan2004-11-151-0/+1
|\ \ \ | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-5.0
| * \ \ Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump)brian@avenger.(none)2004-11-111-0/+1
| |\ \ \ | | |/ /
| | * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-11-091-0/+1
| | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1
* | | | Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0-xaserg@serg.mylan2004-11-111-0/+1
|\ \ \ \ | |/ / / | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-5.0
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2004-11-091-1/+2
| |\ \ \ | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.0
| | * \ \ Merge with 4.1 to get new thd->mem_root handlingmonty@mysql.com2004-11-081-0/+1
| | |\ \ \ | | | |/ / | | | | / | | | |/ | | |/|
| | | * Ensure that even the (relatively new) "mysql-test/Makefile.am" gets into the ↵joerg@mysql.com2004-11-051-0/+1
| | | | | | | | | | | | | | | | source tar-ball.
* | | | Merge sergbook.mylan:/usr/home/serg/Abk/mysql-5.0serg@sergbook.mylan2004-11-091-1/+83
|\ \ \ \ | |/ / / | | | | | | | | into sergbook.mylan:/usr/home/serg/Abk/mysql-5.0-xa
| * | | decimal.c:serg@sergbook.mylan2004-11-081-0/+1
| |/ / | | | | | | | | | | | | | | | | | | test_ro("999999999999999999999.999", 0, CEILING); test_da("5", "-6.0"); ignore: added gdbinit
* | | dbug: DBUG_EXECUTE_IF macro, build user manual automatically, document all ↵serg@serg.mylan2004-11-041-82/+18
|/ / | | | | | | | | | | | | features charset2html moved from mysys to extra ignore: new files added, garbage removed
* | Merge on pullmonty@mysql.com2004-11-031-2/+15
|\ \
| * \ merge with 4.1monty@mysql.com2004-10-291-0/+13
| |\ \ | | |/
| | * s/puts/printf/serg@serg.mylan2004-10-211-0/+13
| | |
* | | Fix for BUG#6303 + fix for discovered bug with sub-queries when analyzin ↵timour@mysql.com2004-10-291-0/+2
|/ / | | | | | | queries for MIN/MAX optimization (WL#1724).
* | Merge for post-merge fixes for Item_equal patch.igor@rurik.mysql.com2004-10-191-0/+2
|\ \
| * \ Merge for Item_equal.igor@rurik.mysql.com2004-10-091-0/+2
| |\ \
| | * \ Auto Mergeigor@rurik.mysql.com2003-12-231-1/+3
| | |\ \
| | | * \ Merge rurik.mysql.com:/home/igor/mysql-5.0igor@rurik.mysql.com2003-12-081-2/+3
| | | |\ \ | | | | | | | | | | | | | | | | | | into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
| | | * | | The output of explain command for some queries has changedigor@rurik.mysql.com2003-12-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | after introducing Item_equal.
* | | | | | Merge bk-internal:/home/bk/mysql-5.0/serg@serg.mylan2004-10-181-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-5.0
View Lorry Controller Status