summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Fixed failed mergeunknown2005-01-011-5/+5
* Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-312-29/+52
|\
| * Merged bugfixunknown2004-12-302-29/+52
| |\
| | * Fix for bug #7480 Mysqld crash in ha_ndbcluster using Query Browserunknown2004-12-302-29/+50
* | | Merged fixes for bug #7297 "Two digit year should be interpreted unknown2004-12-301-0/+1
* | | Manual merge of fix for bugs of #7297 and #7515 into 4.1 tree.unknown2004-12-301-5/+6
|\ \ \ | |/ / |/| |
| * | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-12-306-52/+55
| |\ \
| * | | Fix for bug #7515 "from_unixtime(0) now returns NULL instead ofunknown2004-12-302-6/+7
| * | | Fix for bug #7297 "Two digit year should be interpreted correctlyunknown2004-12-161-1/+1
* | | | Fix for bug #6914 "Problems using time()/date() output in expressions".unknown2004-12-301-0/+7
* | | | Fix for BUG#7455.unknown2004-12-281-1/+10
* | | | Merge mysql.com:/home/timka/mysql/src/4.1-virginunknown2004-12-272-0/+12
|\ \ \ \
| * | | | Fix for BUG#7377. This fix adds the same implementation for ha_myisammgr::ind...unknown2004-12-272-0/+12
* | | | | mergeunknown2004-12-271-12/+3
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | A fix (bug #5652: [patch] tcpwrapper support is broken on systems using an un...unknown2004-12-241-12/+3
* | | | | sql_table.cc:unknown2004-12-271-1/+5
* | | | | ha_innodb.cc:unknown2004-12-271-11/+9
* | | | | ha_innodb.cc, row0ins.c, fil0fil.c:unknown2004-12-271-1/+1
* | | | | Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-271-14/+1
|\ \ \ \ \
| * | | | | Many files:unknown2004-12-271-14/+1
* | | | | | Merge rurik.mysql.com:/home/igor/mysql-4.1unknown2004-12-262-6/+12
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | subselect.result, subselect.test:unknown2004-12-252-6/+12
| | |/ / / | |/| | |
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2004-12-242-31/+8
|\ \ \ \ \
| * | | | | better fix for bug#7242 (crash in prepared INSERT ... UPDATE)unknown2004-12-242-31/+8
* | | | | | 4.0 -> 4.1 mergeunknown2004-12-241-5/+5
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-12-231-26/+30
| |\ \ \ \ \
| * | | | | | Fix for a bug #7495unknown2004-12-231-7/+7
| * | | | | | A fix for the bug #7495unknown2004-12-221-2/+2
* | | | | | | Manual merge of changes making GRANTs, which change SSL attributes and/orunknown2004-12-231-26/+33
|\ \ \ \ \ \ \ | | |/ / / / / | |/| / / / / | |_|/ / / / |/| | | | |
| * | | | | Make GRANTs, which change SSL attributes and/or user limits,unknown2004-12-231-26/+30
| |/ / / /
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2004-12-231-17/+33
|\ \ \ \ \
| * | | | | fix indentationunknown2004-12-231-19/+26
| * | | | | Merge mysql.com:/home/wax/mysql/mysql-4.1unknown2004-12-231-1/+10
| |\ \ \ \ \
| | * | | | | BUG#6056 unknown2004-12-141-1/+10
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2004-12-221-1/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | BitKeeper/triggers/pre-deltaunknown2004-12-221-1/+3
* | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-221-1/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-221-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | changed name of g_eventLogger so it can be used in TransporterRegistry and is...unknown2004-12-221-1/+1
| | | |_|_|/ / / | | |/| | | | |
* | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-221-21/+39
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix for bug #7458 "Microseconds are gobbled from the string result of unknown2004-12-221-21/+39
* | | | | | | | | Bugs#7278: Don't open a table if it contains columns with non-supported charsetsunknown2004-12-221-8/+29
| |/ / / / / / / |/| | | | | | |
* | | | | | | | ha_innodb.cc:unknown2004-12-221-0/+8
* | | | | | | | Merge hundin.mysql.fi:/home/heikki/mysql-4.0unknown2004-12-221-1/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | |
| * | | | | | ha_innodb.cc:unknown2004-12-221-1/+2
* | | | | | | Bug#7302: UCS2 data in ENUM field get truncated when new column is addedunknown2004-12-214-19/+50
* | | | | | | Bug#6481 - storage_engine system variable allows nonsensical valueunknown2004-12-211-1/+3
* | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-213-14/+67
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-211-0/+16
| |\ \ \ \ \ \ \
| | * | | | | | | Fix for BUG#6825: When calculating Item_func_neg::max_length, add 1 for '-'.unknown2004-12-171-0/+16