summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-01-148-0/+442
|\
| * row0mysql.c:unknown2005-01-131-0/+1
| * InnoDB: Implement fast TRUNCATE TABLE (Bug #7150)unknown2005-01-118-0/+441
* | Bug#7284: strnxfrm generates different results for equal stringsunknown2005-01-145-2/+57
* | Merge anna@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-01-144-32/+21
|\ \
| * \ Merge anna@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-01-134-32/+21
| |\ \
| | * \ Mergeunknown2005-01-134-32/+21
| | |\ \
| | | * | Bug in InnoDB; unknown2005-01-133-1/+3
| | | * | Added creation of mysqld_ername.hunknown2005-01-042-3/+18
| | | * | Merge anna@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-1778-420/+6107
| | | |\ \
| | | * | | Removed several erroneous error messages in different languages in errmsg.txtunknown2004-12-171-29/+1
* | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanunknown2005-01-130-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge bk-internal:/home/bk/mysql-4.1unknown2005-01-132-11/+22
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge jwinstead2@wwwtst1.mysql.com:mysql-4.1-7235unknown2005-01-134-4/+110
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge mysql.com:/home/jimw/my/mysql-4.1-bdb-initunknown2005-01-131-0/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge jwinstead2@wwwtst1.mysql.com:mysql-4.1-7774unknown2005-01-134-3/+50
| |\ \ \ \ \ \ \ \ \
* | | | | | | | | | | Update results filesunknown2005-01-132-7/+7
* | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0unknown2005-01-132-11/+27
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | ha_innodb.cc:unknown2005-01-131-1/+6
| * | | | | | | | | | | Merge hundin.mysql.fi:/home/heikki/mysql-4.1unknown2005-01-132-11/+22
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | / / / / / | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| | * | | | | | | | | ha_innodb.cc:unknown2005-01-131-2/+7
| | * | | | | | | | | Mergeunknown2005-01-131-9/+15
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | ha_innodb.cc:unknown2005-01-131-2/+7
| | | * | | | | | | | Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2005-01-132-9/+17
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | InnoDB: Use system-supplied tmpfile() on Netware, as there is nounknown2005-01-122-9/+17
| | * | | | | | | | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-131-1/+1
| | |\ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-5.0unknown2005-01-1313-12/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Applied a patch for Netware.unknown2005-01-131-1/+7
| * | | | | | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-01-1312-11/+35
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | A patch for Netware.unknown2005-01-1312-11/+35
* | | | | | | | | | | | | | Mergeunknown2005-01-134-7/+113
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Add test cases to verify that SHOW CREATE TABLE always outputs theunknown2005-01-132-0/+102
| * | | | | | | | | | | | | Show the index type even for indexes using the default index type inunknown2005-01-082-4/+8
* | | | | | | | | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-bdb-initunknown2005-01-131-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Fix small memory leak that occured when BerkeleyDB failed to initialize.unknown2005-01-121-0/+2
* | | | | | | | | | | | | | Merge jwinstead2@wwwtst1.mysql.com:mysql-4.1-7774unknown2005-01-134-3/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | / / / / / | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Small fix for Field_str::store() to avoid trying to read past beginningunknown2005-01-131-1/+1
| * | | | | | | | | | | | Fix conversion of floating point values to character fields when theunknown2005-01-134-3/+50
* | | | | | | | | | | | | Fix valgrind warning + post-merge fixes.unknown2005-01-132-5/+5
| |_|_|/ / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | manual mergeunknown2005-01-131-5/+4
* | | | | | | | | | | | manual mergeunknown2005-01-1336-51/+351
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | / / / / | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | bug#7284: strnxfrm returns different results for equal stringsunknown2005-01-1334-45/+344
| * | | | | | | | | | Fixed a problem with a test. Time could be 0 or 1 seconds, dependingunknown2005-01-132-2/+2
* | | | | | | | | | | - keep 5.0.3-alpha version string (after-merge fix)unknown2005-01-130-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | - bumped up the version number in configure.in from 4.1.9 to 4.1.10unknown2005-01-131-1/+1
| |/ / / / / / / / /
* | | | | | | | | | - added the 4.1 shared client libraries to the 5.0 shared-compat RPMunknown2005-01-131-9/+13
* | | | | | | | | | Merge mysql.com:/space/my/mysql-4.1unknown2005-01-132-36/+31
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | - added the 4.0 shared mysqlclient libraries to the 4.1 "shared-compat" RPMunknown2005-01-131-10/+18
| * | | | | | | | | Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2005-01-131-26/+13
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge serg.mylan:/usr/home/serg/Abk/mysql-4.0unknown2005-01-131-26/+13
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | / / / / / | | | | |_|/ / / / / | | | |/| | | | | |