summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* manually mergedserg@serg.mylan2005-02-1433-2644/+3939
|\
| * auto-ROLLBACK if binlog was not closed properlyserg@serg.mylan2005-02-098-268/+336
| * open binlog index file *before* tc_log->open() and binlog itself *after*serg@serg.mylan2005-02-017-226/+252
| * Merge bk-internal:/home/bk/mysql-5.0-xaserg@serg.mylan2005-01-2818-278/+344
| |\
| | * query_id and my_xid -> ulonglongserg@serg.mylan2005-01-2718-278/+344
| * | Required changes to support recovery of X/Open XA in InnoDB.jan@hundin.mysql.fi2005-01-171-41/+9
| |/
| * documented handlerton structureserg@serg.mylan2005-01-161-0/+52
| * XA (not completely polished out yet)serg@serg.mylan2005-01-1626-1967/+3047
* | Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0marko@hundin.mysql.fi2005-02-141-7/+18
|\ \
| * | InnoDB: Small improvements to earlier patch (fix Bug #7350 better),marko@hundin.mysql.fi2005-02-141-2/+2
| * | InnoDB: Fix Bug #7350 without hard-coding charset-collation numbers.marko@hundin.mysql.fi2005-02-081-7/+18
* | | Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0heikki@hundin.mysql.fi2005-02-141-2/+2
|\ \ \
| * | | Fix for bug#8156:information_schema and lowercase_table3 fail on OSXgluh@gluh.mysql.r18.ru2005-02-141-2/+2
* | | | ha_innodb.cc:heikki@hundin.mysql.fi2005-02-141-18/+23
|/ / /
* | | Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0marko@hundin.mysql.fi2005-02-1169-1403/+6711
|\ \ \
| * | | After merge fix.ingo@mysql.com2005-02-111-1/+1
| * | | Mergeingo@mysql.com2005-02-113-2/+3
| |\ \ \
| | * \ \ Merge rurik.mysql.com:/home/igor/mysql-4.1igor@rurik.mysql.com2005-02-101-0/+1
| | |\ \ \
| | | * \ \ Merge rurik.mysql.com:/home/igor/dev/mysql-4.0-0igor@rurik.mysql.com2005-02-101-0/+1
| | | |\ \ \
| | | | * | | select.result, select.test:igor@rurik.mysql.com2005-02-101-0/+1
| | * | | | | Set of fixes requested by Kent in IRC. Tested (except the windows changes sin...brian@zim.(none)2005-02-101-1/+1
| | * | | | | Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6749-4.1lars@mysql.com2005-02-101-1/+1
| | |\ \ \ \ \
| | | * | | | | BUG#6749: If there is no current database, then nothing should be binlogged iflars@mysql.com2005-02-101-1/+1
| * | | | | | | Fix -ansi -pedantic compilation failure.konstantin@mysql.com2005-02-101-1/+1
| * | | | | | | Things missing in last changsetmonty@mysql.com2005-02-105-38/+65
| * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-02-101-0/+6
| |\ \ \ \ \ \ \
| | * | | | | | | Added missing #ifdef HAVE_INNOBASE_DB:s in sql_parse.cc.pem@mysql.comhem.se2005-02-101-0/+6
| * | | | | | | | Merge with 4.1monty@mysql.com2005-02-1010-100/+105
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2005-02-092-12/+6
| | |\ \ \ \ \ \ \
| | | * | | | | | | reverted patch for BUG#7351 (because of performance ussie)bell@sanja.is.com.ua2005-02-092-12/+6
| | | | |_|/ / / / | | | |/| | | | |
| | * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2005-02-098-95/+89
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Better bugfix for "HAVING when refering to RAND()" (Bug #8216)monty@mysql.com2005-02-088-95/+89
| | | | |/ / / / | | | |/| | | |
| | * | | | | | Fix for BUG#8371: wrong rec_per_key value for hash index on temporary tablesergefp@mysql.com2005-02-082-6/+8
| | * | | | | | Applied a patch for Netware.jani@ua141d10.elisa.omakaista.fi2005-02-081-1/+7
| | * | | | | | Relaxed locking in INSERT...SELECT, single table UPDATE...SELECT and jan@hundin.mysql.fi2005-02-081-2/+21
| | |/ / / / /
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-02-092-17/+17
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | cleaned up mysql installation code for windows.monty@mysql.com2005-02-092-17/+17
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@neptunus.homeip.net2005-02-091-9/+6
| |\ \ \ \ \ \
| | * | | | | | Fix core dump in ha_ndbcluster::print_resultsmsvensson@neptunus.homeip.net2005-02-091-9/+6
| * | | | | | | Merge serg.mylan:/usr/home/serg/Abk/m50-brokenserg@serg.mylan2005-02-091-1/+0
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-5.0serg@serg.mylan2005-02-0211-71/+301
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-5.0serg@serg.mylan2005-02-014-7/+90
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-5.0serg@serg.mylan2005-01-311-1/+0
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | unused variable removedserg@serg.mylan2005-01-301-1/+0
| * | | | | | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0hf@deer.(none)2005-02-091-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Fix for NCHAR bug appeared during the merginghf@deer.(none)2005-02-091-1/+1
| * | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@neptunus.homeip.net2005-02-091-87/+87
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Updated style after reviewmsvensson@neptunus.homeip.net2005-02-091-87/+87
| | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | fixed C++ syntax in C codebell@sanja.is.com.ua2005-02-091-1/+1
| | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0hf@deer.(none)2005-02-0955-990/+5906
| |\ \ \ \ \ \ \ \ \ \
View Lorry Controller Status