summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* resolving conflictsunknown2003-01-15170-5398/+6713
|\
| * Merge abelkin@work.mysql.com:/home/bk/mysql-4.1unknown2003-01-144-11/+40
| |\
| | * after merging fixingunknown2003-01-144-11/+40
| * | bin chatset now handles strnncoll itself so we don't have to checkunknown2003-01-141-30/+0
| |/
| * mergeunknown2003-01-1417-281/+350
| |\
| | * Updates for multi-byte character setsunknown2003-01-1417-281/+350
| * | ha_innodb.cc:unknown2003-01-131-1/+9
| * | sql_handler.cc:unknown2003-01-131-2/+10
| * | Fix for spatial objectsunknown2003-01-131-7/+1
| * | ut0mem.c, row0sel.c, row0mysql.c, ut0mem.h, row0sel.h, row0mysql.h:unknown2003-01-121-11/+23
| * | Fix to make the tables re-inited for every execute call unknown2003-01-111-1/+21
| * | Remove/change unwanted variables in client protocolunknown2003-01-092-2/+5
| |/
| * Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1unknown2003-01-0916-67/+195
| |\
| | * Post merge fixunknown2003-01-094-12/+51
| | * merge with 4.0.9unknown2003-01-0915-60/+148
| | |\
| | | * Don't count NULL values in cardinalty for MyISAM tables.unknown2003-01-099-34/+81
| | | * mergeunknown2003-01-081-1/+1
| | | |\
| | | | * Fix embedded server crashunknown2003-01-071-0/+2
| | | * | Fix for bug in LOAD DATA INFILE and replicationunknown2003-01-084-13/+56
| | | * | Portability fixesunknown2003-01-074-18/+33
| | | |/
| | * | Add TYPE as an alias for specifying key typeunknown2003-01-091-0/+1
| * | | .del-koi8_u.xml~ec104975f7e009bf:unknown2003-01-092-239/+0
| * | | euc_kr, koi8_r and koi8_u have been renamed so that nowunknown2003-01-091-8/+8
| * | | koi8u.xml, koi8r.xml:unknown2003-01-092-0/+239
| * | | do not call get_charset_by_name() with string "DEFAULT" unknown2003-01-091-3/+5
| * | | Separating CHARSET and COLLATION termsunknown2003-01-095-19/+71
| * | | Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1unknown2003-01-081-4/+6
| |\ \ \
| | * | | Fix for the bug about point(subselect(...))unknown2003-01-081-4/+6
| * | | | Renamed to look in common styleunknown2003-01-081-13/+5
| * | | | Merge abarkov@work.mysql.com:/home/bk/mysql-4.1unknown2003-01-081-2/+2
| |\ \ \ \
| | * | | | COLLATE is field attribute not field typeunknown2003-01-081-2/+2
| | | |/ / | | |/| |
| * | | | Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1unknown2003-01-081-0/+84
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1unknown2003-01-061-0/+84
| | |\ \ \
| | | * | | Optimization of key usage (ORDER BY) (SCRUM)unknown2003-01-041-0/+84
| * | | | | Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1unknown2003-01-079-66/+117
| |\ \ \ \ \
| | * | | | | Fixed that derived tables are properly dropedunknown2003-01-079-66/+117
| * | | | | | Merge abarkov@work.mysql.com:/home/bk/mysql-4.1unknown2003-01-071-2/+1
| |\ \ \ \ \ \
| | * | | | | | Index.xml:unknown2003-01-051-2/+1
| | | |/ / / / | | |/| | | |
| * | | | | | buf0buf.c, buf0buf.ic, buf0buf.h:unknown2003-01-064-3/+29
| | |/ / / / | |/| | | |
| * | | | | mergeunknown2003-01-0664-3756/+2499
| |\ \ \ \ \ | | |/ / / /
| | * | | | Index.xml:unknown2003-01-051-1/+1
| | * | | | latin5.xml, cp1251.xml:unknown2003-01-0552-4623/+19
| | * | | | koi8_ru -> koi8_runknown2003-01-051-2/+1
| | * | | | koi8_u.xml, koi8_r.xml:unknown2003-01-053-4/+243
| | * | | | keybcs2.xml, hp8.xml:unknown2003-01-052-0/+240
| | * | | | hebrew.xml, greek.xml:unknown2003-01-052-0/+240
| | * | | | dec8.xml, armscii8.xml, cp866.xml:unknown2003-01-053-0/+362
| | * | | | swe7.xml, ascii.xml:unknown2003-01-053-1/+241
| | * | | | cp1250.xml:unknown2003-01-052-2/+123
| | * | | | pclatin2.xml, pclatin1.xml:unknown2003-01-053-1/+239