summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* merge with 4.1monty@mysql.com2005-02-289-55/+116
|\
| * Fixed wrong memory references found by purifymonty@mysql.com2005-02-288-50/+114
| * Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1ramil@mysql.com2005-02-251-0/+2
| |\
| | * After review fixesramil@mysql.com2005-02-021-1/+1
| | * Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1ramil@mysql.com2005-02-021-0/+2
| | |\
| | | * A fix (bug #4802 prompt in mysql client shows wrong database after dropping d...ram@gw.mysql.r18.ru2004-10-211-0/+2
| * | | Merge mysql.com:/home/jonas/src/fixjoreland@mysql.com2005-02-241-1/+1
| |\ \ \
* | \ \ \ Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0svoj@mysql.com2005-02-274-16/+32
|\ \ \ \ \
| * | | | | BUG#3190 fix (request for STDDEV_SAMP, VAR_SAMP).svoj@mysql.com2005-02-254-16/+32
* | | | | | Fixes while during review of last pullmonty@mysql.com2005-02-264-11/+15
* | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-02-2538-194/+160
|\ \ \ \ \ \
| * \ \ \ \ \ Merge with global treemonty@mysql.com2005-02-2538-194/+160
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Remove compiler warnings and remove not used variablesmonty@mysql.com2005-02-2533-149/+95
| | * | | | | Show all generated warnings in SHOW ERRORmonty@mysql.com2005-02-2410-40/+62
* | | | | | | Fixed BUG#8757: Stored Procedures: Scope of Begin and End Statements do not w...pem@mysql.comhem.se2005-02-251-1/+1
* | | | | | | Fixed BUG#7620: Stored procedure packet error if show mutex statuspem@mysql.comhem.se2005-02-251-0/+1
* | | | | | | Fixed BUG#6857: current_time() in STORED PROCEDURESpem@mysql.comhem.se2005-02-251-0/+1
|/ / / / / /
* | | | | | Cset exclude: joreland@mysql.com|ChangeSet|20050224071025|18754joreland@mysql.com2005-02-251-8/+1
* | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0joreland@mysql.com2005-02-258-20/+33
|\ \ \ \ \ \
| * | | | | | Solved bug 8691.brian@zim.(none)2005-02-241-6/+6
| * | | | | | fixed compilation failure affects build without InnoDBramil@mysql.com2005-02-242-6/+10
| * | | | | | Fixed BUG#8638: Test 'sp' fails: Stored Procedure often sends warning 1329pem@mysql.comhem.se2005-02-242-1/+9
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@neptunus.(none)2005-02-242-3/+5
| |\ \ \ \ \ \
| | * | | | | | Update text for optionmsvensson@neptunus.(none)2005-02-241-1/+1
| | * | | | | | Convert ndb-cache-check-time fomr milliseconds to secondsmsvensson@neptunus.(none)2005-02-241-2/+4
| * | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0ramil@mysql.com2005-02-241-2/+1
| |\ \ \ \ \ \ \
| | * | | | | | | A fix (mysql_priv.h should be included first)ramil@mysql.com2005-02-241-2/+1
| * | | | | | | | sql_select.cc:bar@mysql.com2005-02-241-2/+2
| |/ / / / / / /
* | | | | | | | Merge mysql.com:/home/jonas/src/fixjoreland@mysql.com2005-02-241-1/+1
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | bug#8786 - ndb autodiscover, sometimes failsjoreland@mysql.com2005-02-241-1/+1
* | | | | | | | #ifdef innodb specific code, (old_innodb_table_locks)joreland@mysql.com2005-02-241-1/+8
| |/ / / / / / |/| | | | | |
* | | | | | | More changes to make 5.0.3 compile on Windowsreggie@mdk10.(none)2005-02-232-5/+4
* | | | | | | Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0bell@51.0.168.192.in-addr.arpa2005-02-241-1/+3
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0mats@mysql.com2005-02-241-4/+4
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Bug#8412: merged from 4.1mats@mysql.com2005-02-231-1/+3
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | Bug#8412: Setting error code to 0 on statements that cannot fail.mats@mysql.com2005-02-231-1/+3
| | * | | | | | | Bug#8412: Merge from 4.0mats@mysql.com2005-02-231-1/+13
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge mysql.com:/home/bkroot/mysql-4.0mats@mysql.com2005-02-235-14/+21
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Bug#8412: For replication to work correctly, the prologue and mats@mysql.com2005-02-141-1/+14
* | | | | | | | | | | Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0bell@51.0.168.192.in-addr.arpa2005-02-247-29/+32
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Changes to allow 5.0.3 to compile on Windows after XA was pushedreggie@mdk10.(none)2005-02-231-4/+4
| |/ / / / / / / / /
| * | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0serg@serg.mylan2005-02-232-4/+4
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-5.0serg@serg.mylan2005-02-236-25/+28
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-5.0serg@serg.mylan2005-02-236-25/+28
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| | | * | | | | | | | | don't log BEGIN in auto-commit modeserg@serg.mylan2005-02-236-34/+27
| | | * | | | | | | | | write "COMMIT" into binlog if there's no Xid at the end of transactionserg@serg.mylan2005-02-231-8/+18
* | | | | | | | | | | | Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-qc_item_view-5.0bell@51.0.168.192.in-addr.arpa2005-02-233-78/+188
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0bell@51.0.168.192.in-addr.arpa2005-02-233-78/+188
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0bell@51.0.168.192.in-addr.arpa2005-02-213-78/+188
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | postreview changesbell@51.0.168.192.in-addr.arpa2005-02-211-4/+17