summaryrefslogtreecommitdiff
path: root/.bzrignore
Commit message (Expand)AuthorAgeFilesLines
* mergedunknown2005-01-061-0/+54
|\
| * WL#964unknown2005-01-031-0/+54
* | Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEYunknown2005-01-031-0/+2
|\ \
| * | added ndb/include/ndb_global.h ndb/include/ndb_version.h to ignoreunknown2005-01-031-0/+2
| |/
| * Clean up the handling of "server" and "client" directories, while still avoid...unknown2004-12-301-0/+2
* | Merge with 4.1unknown2004-12-221-3/+6
|\ \ | |/
| * corrected mysqltest.dspunknown2004-12-141-0/+1
| * Fix for a bug #6996unknown2004-12-071-0/+2
* | Added pathes to mysqld_error.h and sql_state.h; fixed segfault bug; unknown2004-12-141-0/+1
* | Added missing errmsg.txtunknown2004-12-131-0/+2
* | mergeunknown2004-12-091-0/+5
|\ \
| * | fix for the IM linking problemunknown2004-11-061-0/+4
| * | protability fixunknown2004-11-041-0/+1
* | | Merge with 4.1unknown2004-12-061-0/+3
|\ \ \ | | |/ | |/|
| * | Fixes to make mysql-test-run --embedded-server workingunknown2004-12-021-0/+3
| * | - renamed mysqladmin.c -> mysqladmin.cpp to fix the Windows buildsunknown2004-11-221-0/+1
* | | mergedunknown2004-11-201-2/+16
|\ \ \ | |/ /
| * | ignore fixunknown2004-11-191-1/+1
| * | added to ignore listunknown2004-11-191-0/+15
* | | Fixed one warning and two errors reported by VC 6.0.unknown2004-11-181-0/+1
* | | don't delete ac_available_languages_fragment in configure - it may be needed ...unknown2004-11-161-0/+1
* | | Merge bk-internal:/home/bk/mysql-5.0unknown2004-11-151-0/+1
|\ \ \
| * \ \ Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump)unknown2004-11-111-0/+1
| |\ \ \ | | |/ /
| | * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-11-091-0/+1
* | | | Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0-xaunknown2004-11-111-0/+1
|\ \ \ \ | |/ / /
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-11-091-1/+2
| |\ \ \
| | * \ \ Merge with 4.1 to get new thd->mem_root handlingunknown2004-11-081-0/+1
| | |\ \ \ | | | |/ / | | | | / | | | |/ | | |/|
| | | * Ensure that even the (relatively new) "mysql-test/Makefile.am" gets into the ...unknown2004-11-051-0/+1
* | | | Merge sergbook.mylan:/usr/home/serg/Abk/mysql-5.0unknown2004-11-091-1/+83
|\ \ \ \ | |/ / /
| * | | decimal.c:unknown2004-11-081-0/+1
| |/ /
* | | dbug: DBUG_EXECUTE_IF macro, build user manual automatically, document all fe...unknown2004-11-041-82/+18
|/ /
* | Merge on pullunknown2004-11-031-2/+15
|\ \
| * \ merge with 4.1unknown2004-10-291-0/+13
| |\ \ | | |/
| | * s/puts/printf/unknown2004-10-211-0/+13
* | | Fix for BUG#6303 + fix for discovered bug with sub-queries when analyzin quer...unknown2004-10-291-0/+2
|/ /
* | Merge for post-merge fixes for Item_equal patch.unknown2004-10-191-0/+2
|\ \
| * \ Merge for Item_equal.unknown2004-10-091-0/+2
| |\ \
| | * \ Auto Mergeunknown2003-12-231-1/+3
| | |\ \
| | | * \ Merge rurik.mysql.com:/home/igor/mysql-5.0unknown2003-12-081-2/+3
| | | |\ \
| | | * | | The output of explain command for some queries has changedunknown2003-12-021-0/+2
* | | | | | Merge bk-internal:/home/bk/mysql-5.0/unknown2004-10-181-1/+2
|\ \ \ \ \ \
| * | | | | | arbitrary precision decimal numbersunknown2004-10-181-0/+1
| |/ / / / /
* | | | | | After merge adjustment of tests due to changes in cost estimates.unknown2004-10-111-0/+1
|/ / / / /
* | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0unknown2004-09-101-1/+1
|\ \ \ \ \
| * | | | | Fixed --with-embedded builds.unknown2004-09-101-0/+1
* | | | | | thd pointer fixedunknown2004-09-101-0/+1
|/ / / / /
* | | | | Merge with 4.1unknown2004-09-061-2/+120
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2004-08-241-1/+2
| |\ \ \ \
| | * | | | upgrade to libedit-2.6.7unknown2004-08-241-1/+1
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2004-08-241-0/+1
| |/ / / /