summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Merge bk-internal.mysql.com:/home/bk/mysql-4.1/serg@serg.mylan2004-08-221-11/+11
|\
| * check for mysql_bin_log.is_open() before my_b_tell(&thd->transaction.trans_logserg@serg.mylan2004-08-221-11/+11
* | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1paul@ice.snake.net2004-08-2115-261/+303
|\ \ | |/
| * Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1igor@rurik.mysql.com2004-08-2015-261/+298
| |\
| | * Merge bk-internal.mysql.com:/home/bk/mysql-4.1konstantin@mysql.com2004-08-2115-261/+298
| | |\
| | | * Fix for bug#4912 "mysqld crashs in case a statement is executedkonstantin@mysql.com2004-08-2115-261/+298
| * | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1igor@rurik.mysql.com2004-08-202-0/+5
| |\ \ \ | | |/ / | |/| |
| | * | Merge rurik.mysql.com:/home/igor/mysql-4.1igor@rurik.mysql.com2004-08-202-0/+5
| | |\ \
| | | * | olap.test, olap.result:igor@rurik.mysql.com2004-08-122-0/+5
* | | | | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1paul@ice.snake.net2004-08-2010-34/+93
|\ \ \ \ \ | |/ / / /
| * | | | after merge fixserg@serg.mylan2004-08-205-6/+5
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/serg@serg.mylan2004-08-201-1/+0
| |\ \ \ \
| | * \ \ \ Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1rburnett@build.mysql.com2004-08-201-1/+0
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | This fixes a Windows build failure. How did this build on Linux?rburnett@build.mysql.com2004-08-191-1/+0
| * | | | | mergedserg@serg.mylan2004-08-206-27/+88
| |\ \ \ \ \
| | * \ \ \ \ Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0guilhem@mysql.com2004-08-206-21/+81
| | |\ \ \ \ \
| | | * | | | | Making FLUSH TABLES WITH READ LOCK block COMMITs of existing transactions,guilhem@mysql.com2004-08-206-21/+81
| * | | | | | | sql_select.cc: compilation failure fixedserg@serg.mylan2004-08-201-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1paul@ice.snake.net2004-08-208-108/+216
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1dlenev@brandersnatch.localdomain2004-08-202-32/+100
| |\ \ \ \ \ \
| | * | | | | | Fix for bug#4302 "ambiguos order by when renamed column is identical to anoth...dlenev@brandersnatch.localdomain2004-08-202-32/+100
| * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1pem@mysql.com2004-08-201-0/+3
| |\ \ \ \ \ \ \
| | * | | | | | | Fixed compiler warnings in sql/field.h.pem@mysql.comhem.se2004-08-201-0/+3
| * | | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1hf@deer.(none)2004-08-203-0/+6
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1hf@deer.(none)2004-08-209-28/+103
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1hf@deer.(none)2004-08-191-1/+1
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1hf@deer.(none)2004-08-193-0/+6
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Small tab's cleanuphf@deer.(none)2004-08-191-1/+1
| | | * | | | | | | | | addition to fixes about #4700, 4701hf@deer.(none)2004-08-191-0/+1
| | | * | | | | | | | | Several fixes to make tests working for embedded libraryhf@deer.(none)2004-07-232-0/+4
| | | * | | | | | | | | Fixes for bugs in embedded library:hf@deer.(none)2004-07-221-0/+1
| * | | | | | | | | | | Merge mskold@build.mysql.com:/home/bk/mysql-4.1-ndbmskold@mysql.com2004-08-209-26/+101
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge mskold@build.mysql.com:/home/bk/mysql-4.1mskold@mysql.com2004-08-195-8/+10
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| * | | | | | | | | | | Minor typomskold@mysql.com2004-08-192-3/+3
| * | | | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndbmskold@mysql.com2004-08-192-76/+107
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| | * | | | | | | | | | Cleaned up build of index listmskold@mysql.com2004-08-192-82/+55
| | * | | | | | | | | | Minor cosmetic fixmskold@mysql.com2004-08-191-3/+3
| | * | | | | | | | | | Fix for WL#1731 Handler: multiple databasesmskold@mysql.com2004-08-182-29/+87
* | | | | | | | | | | | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1paul@ice.snake.net2004-08-199-26/+101
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | mergedserg@serg.mylan2004-08-201-1/+0
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | sql_class.h:guilhem@mysql.com2004-08-201-1/+0
| * | | | | | | | | | | | mergedserg@serg.mylan2004-08-205-13/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge bk-internal:/home/bk/mysql-4.0/serg@serg.mylan2004-08-191-2/+4
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | less strict assert to take into account weird casesserg@serg.mylan2004-08-191-2/+4
| | * | | | | | | | | | | | ha_innodb.cc:marko@hundin.mysql.fi2004-08-191-3/+24
| | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge bk-internal:/home/bk/mysql-4.0/serg@serg.mylan2004-08-192-10/+10
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | |
| | | * | | | | | | | | | cosmetic changeguilhem@mysql.com2004-08-192-10/+10
| | * | | | | | | | | | | take dec. point into account in store_double_in_stringserg@serg.mylan2004-08-191-6/+12
| | |/ / / / / / / / / /
| | * | | | | | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0guilhem@mysql.com2004-08-195-9/+60
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Fix for BUG#4971 "CREATE TABLE ... TYPE=HEAP SELECT ... stops slave (wrong DE...guilhem@mysql.com2004-08-195-9/+60
View Lorry Controller Status