summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Merge with 4.0monty@mysql.com2004-10-207-7/+43
|\
| * Fix test case for innodb-lockmonty@mysql.com2004-10-202-1/+3
| * Code cleanups (done during review of new code)monty@mysql.com2004-10-204-11/+11
| * Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.0dellis@goetia.(none)2004-10-171-1/+1
| |\
| | * mysqld.cc:dellis@goetia.(none)2004-10-171-1/+1
| | * mysqld.cc:dellis@goetia.(none)2004-10-031-1/+1
| * | Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0marko@hundin.mysql.fi2004-10-152-3/+17
| |\ \
| | * \ Merge mysql.com:/home/mydev/mysql-4.0ingo@mysql.com2004-10-142-3/+17
| | |\ \
| | | * | BUG#5625 - MyISAM Index corruption on ALTER TABLE x ENABLE KEYS due to full t...ingo@mysql.com2004-10-142-3/+17
| * | | | Added startup option and settable session variablemarko@hundin.mysql.fi2004-10-134-2/+15
| |/ / /
| * | | ha_innodb.cc:heikki@hundin.mysql.fi2004-10-121-1/+1
| * | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0guilhem@mysql.com2004-10-111-2/+8
| |\ \ \
| | * | | Fix for BUG#5949 "error code 1223 in binlog when using innobackup":guilhem@mysql.com2004-10-111-2/+8
| * | | | Using MySQL 4.0 with privilege tables from 5.0 caused a crash.monty@mysql.com2004-10-081-20/+36
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mishka.local2004-10-2024-207/+276
|\ \ \ \ \
| * | | | | Review of all code pushed since last reviewmonty@mishka.local2004-10-2010-97/+137
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mishka.local2004-10-1414-110/+139
| |\ \ \ \ \
| | * | | | | true,false -> TRUE, FALSEmonty@mishka.local2004-10-1414-110/+139
* | | | | | | fix for platforms that have lower_case_table_names == 2tomas@poseidon.ndb.mysql.com2004-10-191-1/+1
* | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2004-10-193-23/+57
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1marko@hundin.mysql.fi2004-10-191-20/+36
| |\ \ \ \ \ \ \
| | * | | | | | | ha_innodb.cc:marko@hundin.mysql.fi2004-10-181-8/+1
| | * | | | | | | InnoDB: Treat UTF-8 strings properly in case insensitive operationsmarko@hundin.mysql.fi2004-10-181-12/+35
| * | | | | | | | sql_union.cc:bar@mysql.com2004-10-191-5/+6
| * | | | | | | | Bug #6139 UNION doesn't understand collate in the column of second selectbar@mysql.com2004-10-182-2/+19
| |/ / / / / / /
* | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2004-10-184-7/+32
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Fix for broken --with-csv-storage-engine build.dlenev@brandersnatch.localdomain2004-10-182-6/+6
| * | | | | | | Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1jan@hundin.mysql.fi2004-10-161-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Remove stale declaration, fix a typo in comment.konstantin@mysql.com2004-10-151-1/+1
| | |/ / / / / /
| * | | | | | | Use already parsed SQL-query in the current thread when determiningjan@hundin.mysql.fi2004-10-151-0/+25
| |/ / / / / /
* | | | | | | Merge mysql.com:/home/jonas/src/mysql-4.1joreland@mysql.com2004-10-1514-68/+174
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1joreland@mysql.com2004-10-1511-60/+103
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2004-10-1410-58/+99
| | |\ \ \ \ \ \
| | | * | | | | | Bug #6043 erratic searching for diacriticals in indexed MyISAM UTF-8 tablebar@mysql.com2004-10-141-6/+6
| | | * | | | | | Followup to Bug#5985: fixing one thing that went wrong.konstantin@mysql.com2004-10-141-0/+1
| | | * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1konstantin@mysql.com2004-10-149-53/+93
| | | |\ \ \ \ \ \
| | | | * | | | | | A fix and test case for Bug#5985 ""prepare stmt from "select rand(?)" konstantin@mysql.com2004-10-149-53/+93
| | * | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2004-10-131-2/+4
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | correct (high level) fix for BUG#5367 to privent problems in other enginesbell@sanja.is.com.ua2004-10-071-2/+4
| * | | | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1joreland@mysql.com2004-10-133-8/+71
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | srv0srv.c, log0log.c, srv0srv.h, ha_innodb.cc, ha_innodb.h:heikki@hundin.mysql.fi2004-10-132-1/+70
| | * | | | | | | | BUG#4286 - HANDLER tables are closed by FLUSH TABLE(S).ingo@mysql.com2004-10-131-7/+1
* | | | | | | | | | Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndbpekka@mysql.com2004-10-142-117/+143
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Mergepekka@mysql.com2004-10-102-117/+143
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | NDB wl-2151 Fix bounds setting table handler vs TUXpekka@mysql.com2004-10-082-117/+143
* | | | | | | | | | | | Merge mysql.com:/home/jonas/src/mysql-4.1joreland@mysql.com2004-10-133-20/+23
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | / / / / / / / / / | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Bug#6020, any lock >= write_allow_write is a write lockjoreland@mysql.com2004-10-131-2/+5
| | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Move Heikki's comment about thd->query comment to proper place konstantin@mysql.com2004-10-131-18/+17
| | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | item.h:konstantin@mysql.com2004-10-121-0/+1
* | | | | | | | | Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1tomas@poseidon.ndb.mysql.com2004-10-106-73/+124
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /