Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Manual merge | igor@rurik.mysql.com | 2005-08-02 | 4 | -0/+33 |
|\ | |||||
| * | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1 | svoj@mysql.com | 2005-08-02 | 2 | -0/+14 |
| |\ | |||||
| | * | Fix for BUG#12075. | svoj@mysql.com | 2005-08-02 | 2 | -0/+14 |
| * | | Merge mysql.com:/home/svoj/devel/mysql/BUG11684/mysql-4.0 | svoj@mysql.com | 2005-08-02 | 2 | -0/+19 |
| |\ \ | |||||
| | * | | BUG#11684 fix. | svoj@mysql.com | 2005-08-02 | 2 | -0/+19 |
* | | | | Fix two test results that were merged out-of-order. | jimw@mysql.com | 2005-08-01 | 2 | -24/+34 |
* | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-clean | jimw@mysql.com | 2005-08-01 | 7 | -10/+73 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge mysql.com:/home/jimw/my/mysql-4.1-11402 | jimw@mysql.com | 2005-08-01 | 2 | -0/+8 |
| |\ \ \ | |||||
| | * | | | Fix multiplication of abs() by a negative value. (Bug #11402) | jimw@mysql.com | 2005-06-22 | 2 | -0/+8 |
| * | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-10724 | jimw@mysql.com | 2005-08-01 | 5 | -10/+55 |
| |\ \ \ \ | |||||
| | * | | | | Don't force column header to @@session.var_name if @@local.var_name | jimw@mysql.com | 2005-07-25 | 5 | -10/+55 |
* | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-clean | jimw@mysql.com | 2005-08-01 | 2 | -0/+83 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1 | sasha@asksasha.com | 2005-08-01 | 2 | -0/+83 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | updates for BUG#10780 - fixed slave I/O thread running status to No while att... | sasha@asksasha.com | 2005-07-29 | 2 | -2/+34 |
| | * | | | | testcase for bug 10780 was not added in the previous commit | sasha@asksasha.com | 2005-07-28 | 1 | -0/+28 |
| | * | | | | patch for bug 10780 | sasha@asksasha.com | 2005-07-28 | 1 | -0/+23 |
* | | | | | | Fix crash in 'INSERT DELAYED' statement that failed due to a | jimw@mysql.com | 2005-08-01 | 2 | -0/+16 |
* | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 | mskold@mysql.com | 2005-08-01 | 2 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-release | mskold@mysql.com | 2005-08-01 | 2 | -2/+2 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix for bug#12021 | mskold@mysql.com | 2005-07-31 | 2 | -2/+2 |
* | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | monty@mishka.local | 2005-07-31 | 8 | -171/+205 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | monty@mishka.local | 2005-07-31 | 8 | -171/+205 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fixes during review of new pushed code | monty@mishka.local | 2005-07-31 | 8 | -180/+209 |
* | | | | | | | | | | Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 | igor@rurik.mysql.com | 2005-07-31 | 2 | -4/+4 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | null_key.result, null_key.test: | igor@rurik.mysql.com | 2005-07-31 | 2 | -4/+4 |
* | | | | | | | | | | Merge rurik.mysql.com:/home/igor/mysql-5.0 | igor@rurik.mysql.com | 2005-07-31 | 4 | -2/+170 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Manual merge | igor@rurik.mysql.com | 2005-07-28 | 1 | -0/+7 |
| * | | | | | | | | | Manual merge | igor@rurik.mysql.com | 2005-07-28 | 4 | -7/+168 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | / / / / / / / | | |/ / / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | func_gconcat.result, func_gconcat.test: | igor@rurik.mysql.com | 2005-07-28 | 2 | -0/+64 |
| | * | | | | | | | null_key.test, null_key.result: | igor@rurik.mysql.com | 2005-07-28 | 2 | -17/+6 |
| | * | | | | | | | null_key.test, null_key.result: | igor@rurik.mysql.com | 2005-07-28 | 2 | -6/+66 |
| | * | | | | | | | Manual merge | igor@rurik.mysql.com | 2005-07-28 | 2 | -0/+56 |
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | |||||
| | | * | | | | | | sql_select.cc: | igor@rurik.mysql.com | 2005-07-28 | 2 | -0/+57 |
* | | | | | | | | | postmerge-fix | bell@sanja.is.com.ua | 2005-07-30 | 3 | -25/+14 |
* | | | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 | bell@sanja.is.com.ua | 2005-07-29 | 7 | -29/+147 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Added sql_mode saving to mysql_dump (BUG#5891, part 2) | bell@sanja.is.com.ua | 2005-07-29 | 4 | -33/+67 |
| * | | | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 | bell@sanja.is.com.ua | 2005-07-28 | 3 | -8/+92 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | store/restore sql_mode which was in force during ctrigger creation (BUG#5891) | bell@sanja.is.com.ua | 2005-07-28 | 3 | -8/+92 |
* | | | | | | | | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-10351 | jimw@mysql.com | 2005-07-29 | 4 | -19/+9 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Fix for handling of unsigned long options on 32-bit platforms that | jimw@mysql.com | 2005-07-28 | 4 | -19/+9 |
* | | | | | | | | | | | Fix for bug #12173 (show create table crash) | hf@deer.(none) | 2005-07-29 | 2 | -0/+18 |
| |_|_|/ / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | monty@mysql.com | 2005-07-29 | 5 | -4/+46 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge mysql.com:/home/jimw/my/mysql-5.0-10351 | jimw@mysql.com | 2005-07-28 | 2 | -0/+22 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Fix value returned from SELECT of unsigned long system | jimw@mysql.com | 2005-07-22 | 2 | -0/+22 |
| * | | | | | | | | | | row_sel_store_mysql_rec(): Convert NULL true VARCHAR columns | marko@hundin.mysql.fi | 2005-07-28 | 1 | -4/+4 |
| * | | | | | | | | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 | gluh@mysql.com | 2005-07-28 | 2 | -0/+20 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Fix for bug#12127 triggers do not show in info_schema before they are used if... | gluh@eagle.intranet.mysql.r18.ru | 2005-07-27 | 2 | -0/+20 |
* | | | | | | | | | | | | After merge fixes | monty@mysql.com | 2005-07-28 | 4 | -157/+153 |
* | | | | | | | | | | | | Merge mysql.com:/home/my/mysql-4.1 | monty@mysql.com | 2005-07-28 | 346 | -116/+768 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Added end marker for tests to make future merges easier | monty@mysql.com | 2005-07-28 | 347 | -24/+660 |