Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge bk-internal:/home/bk/mysql-4.1/ | serg@serg.mylan | 2004-03-23 | 1 | -5/+5 |
|\ | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1 | ||||
| * | correct support for a mix of UNION/UNION ALL in the same query. | serg@serg.mylan | 2004-03-23 | 1 | -5/+5 |
| | | | | | | | | Bug#1428 | ||||
* | | small addition to the fix for #3188 | hf@deer.(none) | 2004-03-23 | 1 | -0/+1 |
| | | | | | | | | dropping of tables added to the testcase | ||||
* | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 | hf@deer.(none) | 2004-03-23 | 2 | -1/+25 |
|\ \ | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.3188 | ||||
| * \ | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 | hf@deer.(none) | 2004-03-23 | 1 | -0/+15 |
| |\ \ | | |/ | |/| | | | | into deer.(none):/home/hf/work/mysql-4.1.3067 | ||||
| | * | Fix for #3067 (REPAIR TABLE reenables disabled keys) | hf@deer.(none) | 2004-03-22 | 1 | -0/+15 |
| | | | |||||
| * | | aliases should be compared with my_strcasecmp (BUG#3251) | bell@sanja.is.com.ua | 2004-03-22 | 1 | -1/+10 |
| |/ | | | | | | | | | some db comparison code cleupup removed compiler warnings | ||||
* | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 | hf@deer.(none) | 2004-03-22 | 1 | -0/+5 |
|\ \ | |/ |/| | | | into deer.(none):/home/hf/work/mysql-4.1.clean | ||||
| * | Fix for #3188 | hf@deer.(none) | 2004-03-18 | 1 | -0/+5 |
| | | |||||
* | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 | bell@sanja.is.com.ua | 2004-03-21 | 1 | -0/+11 |
|\ \ | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-select_list-4.1 | ||||
| * | | more sys_var_str fixes | serg@serg.mylan | 2004-03-20 | 1 | -0/+9 |
| | | | |||||
| * | | Merge bk-internal:/home/bk/mysql-4.1/ | serg@serg.mylan | 2004-03-20 | 1 | -0/+2 |
| |\ \ | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1 | ||||
| | * | | select @@smth=@@sys_str_var crash fixed | serg@serg.mylan | 2004-03-20 | 1 | -0/+2 |
| | | | | |||||
* | | | | after merge changes | bell@sanja.is.com.ua | 2004-03-21 | 1 | -2/+2 |
|/ / / | |||||
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1 | monty@mysql.com | 2004-03-20 | 7 | -24/+46 |
|\ \ \ | |/ / |/| | | | | | into mysql.com:/home/my/mysql-4.1 | ||||
| * | | Ensure that we use unix file format (no \r\n) for all new files | monty@mysql.com | 2004-03-20 | 2 | -2/+14 |
| | | | | | | | | | | | | Portability fixes | ||||
| * | | merge with 4.0 to get portability fixes | monty@mysql.com | 2004-03-19 | 2 | -10/+1 |
| |\ \ | |||||
| | * | | Portability fixes | monty@mysql.com | 2004-03-19 | 2 | -10/+1 |
| | | | | | | | | | | | | | | | | Fixed some wrong column specifications in mysql_fix_privilege_tables | ||||
| * | | | Added test to show bug in current union implementation | monty@mysql.com | 2004-03-19 | 2 | -10/+29 |
| | | | | | | | | | | | | | | | | | | | | After merge fixes Portability fixes | ||||
| * | | | merge with 4.0 (to get compiler error fixes for innodb) | monty@mysql.com | 2004-03-19 | 1 | -2/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | Removed \r | monty@mysql.com | 2004-03-19 | 1 | -2/+2 |
| | | | | |||||
| | * | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 | guilhem@mysql.com | 2004-03-17 | 1 | -0/+12 |
| | |\ \ | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.0 | ||||
| | | * | | Fix for BUG#2922 "Crash (signal11) after "load data from master"" | guilhem@mysql.com | 2004-03-17 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with a testcase. We needed to init_master_info before we flush_master_info in LOAD DATA FROM MASTER. | ||||
* | | | | | DROP DATABASE now returns (affected_rows) number of tables dropped | serg@serg.mylan | 2004-03-19 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Bug #3087 CONCAT_WS makes the server die in case of illegal mix of collations | bar@bar.intranet.mysql.r18.ru | 2004-03-19 | 1 | -0/+2 |
| | | | | |||||
* | | | | Bug #2821 Table default character set affects LONGBLOB fields | bar@bar.intranet.mysql.r18.ru | 2004-03-19 | 1 | -0/+16 |
| | | | | |||||
* | | | | Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 | guilhem@mysql.com | 2004-03-18 | 1 | -3/+0 |
|\ \ \ \ | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.1 | ||||
| * | | | | Fix for BUG#3204 ""mysqlbinlog --read-from-remote-server this_binlog.001" ↵ | guilhem@mysql.com | 2004-03-18 | 1 | -3/+0 |
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prints all binlogs": we now detect that the server is sending us a log which we did not request by testing the info in the fake Rotate event. I also changed code to not print the fake Rotate which describes the log we asked for (it's always the first received event but old masters may not send it). | ||||
* | | | | Merge bk-internal:/home/bk/mysql-4.1/ | serg@serg.mylan | 2004-03-18 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1 | ||||
| * | | | | make DROP DATABASE to behave as documented in the manual - to report number ↵ | serg@serg.mylan | 2004-03-18 | 1 | -0/+1 |
| |/ / / | | | | | | | | | | | | | of files deleted | ||||
* | | | | Don't change server suffix if given to configure | monty@mysql.com | 2004-03-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Portability fixes | ||||
* | | | | merge fixes (use old code) | monty@mysql.com | 2004-03-18 | 17 | -225/+571 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | after merge fixes | monty@mysql.com | 2004-03-18 | 7 | -263/+250 |
| | | | | |||||
| * | | | merge with 4.0 | monty@mysql.com | 2004-03-17 | 1 | -0/+6 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0 | gluh@gluh.mysql.r18.ru | 2004-03-16 | 1 | -0/+6 |
| | |\ \ | | | | | | | | | | | | | | | | into gluh.mysql.r18.ru:/home/gluh/Bugs/mysql-4.0.3067 | ||||
| | | * | | Fix for bug #2629 NULLIF() doesn't behave as described in manual | gluh@gluh.mysql.r18.ru | 2004-03-16 | 1 | -0/+6 |
| | | | | | |||||
| * | | | | merge with 4.0 | monty@mysql.com | 2004-03-16 | 14 | -0/+353 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Remove not needed patch | monty@mysql.com | 2004-03-16 | 1 | -10/+10 |
| | | |/ | | |/| | |||||
| | * | | after merge fixes. | Sinisa@sinisa.nasamreza.org | 2004-03-13 | 1 | -10/+10 |
| | |\ \ | |||||
| | | * | | multi_update.result: | Sinisa@sinisa.nasamreza.org | 2004-03-13 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for a bug in the result multi_update.test: Fix for a bug in the test | ||||
| | * | | | Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0 | vva@eagle.mysql.r18.ru | 2004-03-12 | 1 | -0/+6 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_2985/mysql-4.0 | ||||
| | | * | | | fixed Bug #2985 | vva@eagle.mysql.r18.ru | 2004-03-05 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Table truncated when creating another table name with Spaces" added to check_db_name, check_table_name and check_column_name test for end space | ||||
| | * | | | | Portability fixes & fixing of test suite | monty@mysql.com | 2004-03-12 | 3 | -10/+21 |
| | | | | | | |||||
| | * | | | | Merge | monty@mysql.com | 2004-03-12 | 1 | -0/+6 |
| | |\ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | | * | | | Merge with 3.23 to get patch for floor() | monty@mysql.com | 2004-03-12 | 1 | -0/+6 |
| | | |\ \ \ | |||||
| | | | * | | | fixed Bug #3051 "FLOOR returns invalid" | vva@eagle.mysql.r18.ru | 2004-03-04 | 1 | -0/+6 |
| | | | | | | | |||||
| | * | | | | | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 | Sinisa@sinisa.nasamreza.org | 2004-03-11 | 1 | -0/+25 |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql-4.0 | ||||
| | | * | | | | Fix for BUG#2983 "If statement was killed on master, slave errors despite ↵ | guilhem@mysql.com | 2004-03-11 | 1 | -0/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | replicate-wild-ignore-t" We introduce a new function mysql_test_parse_for_slave(). If the slave sees that the query got a really bad error on master (killed e.g.), then it calls this function to know if this query can be ignored because of replicate-*-table rules (do not worry about replicate-*-db rules: they are checked so early that they have no bug). If the answer is yes, it skips the query and continues. If it's no, then it stops and say "fix your slave data manually" (like it did before this change). | ||||
| | * | | | | | multi_update.result: | Sinisa@sinisa.nasamreza.org | 2004-03-11 | 1 | -0/+14 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test case for a #2996 bug fix multi_update.test: test case for a #2996 bug fix sql_select.cc: Fix for a bug #2996 involving multi-table updates over the const tables | ||||
| | * | | | | Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0 | vva@eagle.mysql.r18.ru | 2004-03-10 | 2 | -0/+186 |
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_2874/mysql-4.0 |