Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Manual merge | konstantin@mysql.com | 2005-05-05 | 4 | -12/+31 |
|\ | |||||
| * | A fix and test case for Bug#9777 " Empty set returned by Prepared Statement w... | konstantin@mysql.com | 2005-05-05 | 2 | -6/+25 |
| * | Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 | jan@hundin.mysql.fi | 2005-05-05 | 1 | -1/+1 |
| |\ | |||||
| | * | terminal.c, sql_bitmap.h, my_sys.h, configure.in, config.h: | kent@mysql.com | 2005-05-05 | 1 | -1/+1 |
| * | | Fig compiler error. | jan@hundin.mysql.fi | 2005-05-05 | 1 | -0/+1 |
| * | | Initial value for a auto_increment can now be set using ALTER TABLE | jan@hundin.mysql.fi | 2005-05-04 | 1 | -3/+18 |
| * | | Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 | jan@hundin.mysql.fi | 2005-05-04 | 3 | -9/+141 |
| |\ \ | | |/ | |||||
| * | | Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 | jan@hundin.mysql.fi | 2005-05-03 | 3 | -1/+8 |
| |\ \ | |||||
| * \ \ | Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 | jan@hundin.mysql.fi | 2005-05-02 | 1 | -4/+3 |
| |\ \ \ | |||||
| | * \ \ | Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 | jan@hundin.mysql.fi | 2005-04-29 | 1 | -4/+3 |
| | |\ \ \ | |||||
| | | * | | | Fixed a bug using mysqldump to InnoDB tables causes error (Bug #10200). | jan@hundin.mysql.fi | 2005-04-27 | 1 | -4/+3 |
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | konstantin@mysql.com | 2005-05-04 | 4 | -1/+87 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-5.0 | bell@book.sanja.is.com.ua | 2005-05-03 | 4 | -1/+87 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 | bell@sanja.is.com.ua | 2005-04-30 | 9 | -24/+122 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | postreview changes | bell@sanja.is.com.ua | 2005-04-30 | 3 | -5/+8 |
| | * | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 | bell@sanja.is.com.ua | 2005-04-30 | 3 | -356/+398 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 | bell@sanja.is.com.ua | 2005-04-30 | 4 | -1/+84 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | if outer refernce (identifier) was resolved with help of cache all subqueries... | bell@sanja.is.com.ua | 2005-04-29 | 4 | -1/+84 |
* | | | | | | | | | | | Post-merge fixes for Bug#9096 "select doesn't return all matched | konstantin@mysql.com | 2005-05-04 | 2 | -5/+25 |
* | | | | | | | | | | | Manual merge of Bug#9096 | konstantin@mysql.com | 2005-05-03 | 3 | -7/+140 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | / | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge mysql.com:/opt/local/work/mysql-4.1-root | konstantin@mysql.com | 2005-05-03 | 3 | -9/+141 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| | * | | | | | | | | A fix and test case for Bug#9096 "select doesn't return all matched | konstantin@mysql.com | 2005-05-03 | 3 | -9/+141 |
* | | | | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 | sergefp@mysql.com | 2005-05-03 | 3 | -9/+25 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 | sergefp@mysql.com | 2005-05-03 | 3 | -9/+25 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Fix for BUG#10244: | sergefp@mysql.com | 2005-04-29 | 3 | -9/+25 |
* | | | | | | | | | | | | ha_innodb.cc: | heikki@hundin.mysql.fi | 2005-05-03 | 1 | -0/+2 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Clean up merge from 4.1 | jimw@mysql.com | 2005-05-02 | 3 | -1/+8 |
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-9947 | jimw@mysql.com | 2005-05-02 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Clean up error message for connections-per-hour user limit | jimw@mysql.com | 2005-04-27 | 1 | -1/+1 |
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||||
| * | | | | | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-9761 | jimw@mysql.com | 2005-05-02 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Fix 'CREATE TABLE ... LIKE ...' when lower_case_table_names | jimw@mysql.com | 2005-04-28 | 1 | -0/+2 |
| | |/ / / / / / / / / | |||||
| * | | | | | | | | | | Merge bk-internal:/home/bk/mysql-4.1 | jimw@mysql.com | 2005-05-02 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | Manually resolve merge | jimw@mysql.com | 2005-04-29 | 1 | -0/+5 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | Fix crash in embedded server due to incorrect storage of results | jimw@mysql.com | 2005-03-31 | 1 | -0/+5 |
* | | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0 | serg@serg.mylan | 2005-05-01 | 12 | -381/+521 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge mysql.com:/home/psergey/mysql-4.1-bug9228 | sergefp@mysql.com | 2005-05-01 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 | sergefp@mysql.com | 2005-05-01 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | Fix for BUG#10274: In Protocol_simple::store_long don't make any assumptions ... | sergefp@mysql.com | 2005-04-30 | 1 | -1/+1 |
| | | | |_|_|_|/ / / / / | | | |/| | | | | | | | | |||||
| * | | | | | | | | | | | Merge with 4.1 | monty@mysql.com | 2005-04-30 | 7 | -15/+101 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1 | monty@mysql.com | 2005-04-30 | 5 | -27/+109 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | |||||
| | | * | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 | evgen@moonbone.local | 2005-04-29 | 1 | -0/+5 |
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | |||||
| | | | * | | | | | | | | Fix bug #9703 "Error 1032 with GROUP BY query and large tables" | evgen@moonbone.local | 2005-04-29 | 1 | -0/+5 |
| | | * | | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 | mskold@mysql.com | 2005-04-29 | 2 | -22/+79 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 | mskold@mysql.com | 2005-04-29 | 2 | -22/+79 |
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | |||||
| | | * | | | | | | | | | | Merge mysql.com:/home/mydev/mysql-4.1 | ingo@mysql.com | 2005-04-29 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | |||||
| | | | * | | | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 | sergefp@mysql.com | 2005-04-28 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 | sergefp@mysql.com | 2005-04-27 | 1 | -20/+55 |
| | | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ \ | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 | sergefp@mysql.com | 2005-04-27 | 1 | -1/+1 |
| | | | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | * \ \ \ \ \ \ \ \ \ | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 | sergefp@mysql.com | 2005-04-27 | 1 | -1/+1 |
| | | | | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | CAST(string_argument AS UNSIGNED) didn't work for big integers above the sign... | monty@mysql.com | 2005-04-29 | 5 | -8/+92 |