mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 20:11:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
30099 commits 2794 branches 343 tags 1.5 GiB
Commit graph

30099 commits

This branch
This branch
All branches
Author SHA1 Message Date
sergefp@mysql.com
ce766f2c52 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug16798-merge
 2006-05-06 22:24:39 +04:00
kroki@mysql.com
f6c95ee81a Merge mysql.com:/home/tomash/src/mysql_ab/tmp_merge 
into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-merge
 2006-05-06 19:45:24 +04:00
kroki@mysql.com
e00d7c1bf3 Merge mysql.com:/home/tomash/src/mysql_ab/mysql-4.1 
into  mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug16501
 2006-05-06 18:45:07 +04:00
kroki@mysql.com
b00df53ad5 Merge mysql.com:/home/tomash/src/mysql_ab/mysql-4.1 
into  mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug16501
 2006-05-06 18:40:56 +04:00
kroki@mysql.com
bf9ccde948 Fix race condition in the test for bug#16501. 2006-05-06 18:24:41 +04:00
ingo@mysql.com
2d907965ea Merge mysql.com:/home/mydev/mysql-4.1 
into  mysql.com:/home/mydev/mysql-4.1-bug10405
 2006-05-06 15:27:23 +02:00
ingo@mysql.com
42e35c6be3 Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-bug10405
 2006-05-06 13:35:48 +02:00
sergefp@mysql.com
8f8fa5838b Merge mysql.com:/home/psergey/mysql-4.1-bug16798 
into mysql.com:/home/psergey/mysql-5.0-bug16798-merge
 2006-05-06 13:19:09 +04:00
sergefp@mysql.com
1b349cf85f BUG#16798: Inapplicable ref_or_null query plan and bad query result on random occasions 
The bug was as follows: When merge_key_fields() encounters "t.key=X OR t.key=Y" it will 
try to join them into ref_or_null access via "t.key=X OR NULL". In order to make this 
inference it checks if Y<=>NULL, ignoring the fact that value of Y may be not yet known.

The fix is that the check if Y<=>NULL is made only if value of Y is known (i.e. it is a
constant).
TODO: When merging to 5.0, replace used_tables() with const_item() everywhere in merge_key_fields().
 2006-05-06 13:15:00 +04:00
kroki@mysql.com
3ad0cac41b Reapply fix for bug#16372 (Server crashes when test 'conc_sys' is running) 
after merge.

Concurrent read and update of privilege structures (like simultaneous
run of SHOW GRANTS and ADD USER) could result in server crash.

Ensure that proper locking of ACL structures is done.

No test case is provided because this bug can't be reproduced
deterministically.
 2006-05-06 11:25:59 +04:00
kroki@mysql.com
0acef25de8 Merge mysql.com:/home/tomash/src/mysql_ab/tmp_merge 
into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-merge
 2006-05-06 11:18:42 +04:00
kroki@mysql.com
8eb1dd26ad Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-real
 2006-05-06 10:09:56 +04:00
jani@hundin.mysql.fi
96d4b9ebd1 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  hundin.mysql.fi:/home/jani/mysql-5.0merge_4_1_2nd
 2006-05-05 14:25:33 +03:00
jani@hundin.mysql.fi
b2c66756ab Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  hundin.mysql.fi:/home/jani/mysql-5.0merge_4_1_2nd
 2006-05-05 12:46:15 +03:00
pekka@mysql.com
f717495693 Merge mysql.com:/space/pekka/ndb/version/my50 
into  mysql.com:/space/pekka/ndb/version/my50-work
 2006-05-05 11:18:30 +02:00
kroki@mysql.com
d87e132379 Merge mysql.com:/home/tomash/src/mysql_ab/mysql-4.1 
into  mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug16372
 2006-05-05 11:43:55 +04:00
kroki@mysql.com
009cf0b75e Merge mysql.com:/home/tomash/src/mysql_ab/mysql-4.1 
into  mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug16372
 2006-05-05 11:35:49 +04:00
kroki@mysql.com
bc1b9eb04f Merge mysql.com:/home/tomash/src/mysql_ab/mysql-4.1 
into  mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug16501
 2006-05-05 11:35:38 +04:00
pekka@mysql.com
5ce418b260 ndb - bug#17421, changes NDB API pushdown LIKE arg to plain char 2006-05-05 00:53:34 +02:00
monty@mysql.com
047b9e318b Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2006-05-05 01:12:02 +03:00
jani@ua141d10.elisa.omakaista.fi
8b933cd63d Added more comments to the test cases. 2006-05-05 00:27:12 +03:00
jani@ua141d10.elisa.omakaista.fi
c8e5ade80c Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
 2006-05-05 00:22:01 +03:00
paul@polar.kitebird.com
61632812e2 .del-changelog-5.0.xml~f4c50926ccdd7434: 
Delete: Docs/changelog-5.0.xml
 2006-05-04 16:21:10 -05:00
paul@polar.kitebird.com
57ff78b5fe Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  polar.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
 2006-05-04 16:18:34 -05:00
paul@polar.kitebird.com
a1e6218461 .del-changelog-4.1.xml~8aa496ebed09d868: 
Delete: Docs/changelog-4.1.xml
 2006-05-04 16:16:18 -05:00
paul@polar.kitebird.com
e67a5619f9 Merge polar.kitebird.com:/src/extern/MySQL/bk/mysql-4.0 
into  polar.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
 2006-05-04 16:15:31 -05:00
paul@polar.kitebird.com
2842d28d14 .del-changelog-4.0.xml~8f56ee8a913e848b: 
Delete: Docs/changelog-4.0.xml
 2006-05-04 16:14:19 -05:00
monty@mysql.com
0034e1c829 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2006-05-04 23:49:59 +03:00
jani@ua141d10.elisa.omakaista.fi
587a6c6c32 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
 2006-05-04 22:23:58 +03:00
monty@mysql.com
9e460e7a25 Fixed wrong free in sql_view.cc 
mysql-test-run now fails in case of warnings
 2006-05-04 22:19:31 +03:00
jani@hundin.mysql.fi
041669a4db Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  hundin.mysql.fi:/home/jani/mysql-5.0merge_4_1
 2006-05-04 21:21:23 +03:00
jani@ua141d10.elisa.omakaista.fi
46f7b3366c Fixed a test case that got broken during merge. 2006-05-04 21:21:22 +03:00
jani@ua141d10.elisa.omakaista.fi
06d6b7472b Fixed Bug#11324: 
TIME_FORMAT using "%l:%i" returns 36:00 with 24:00:00 in TIME column
 2006-05-04 20:19:37 +03:00
jani@ua141d10.elisa.omakaista.fi
526e1a70e2 Fix for Bug#11326. 2006-05-04 19:31:10 +03:00
monty@mysql.com
ae83d6826d Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2006-05-04 19:18:26 +03:00
jani@ua141d10.elisa.omakaista.fi
0410832526 Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
 2006-05-04 18:35:58 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
3f1019455b Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
 2006-05-04 17:41:07 +03:00
kroki@mysql.com
98949e7a66 Merge mysql.com:/home/tomash/src/mysql_ab/mysql-4.1 
into  mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug16372
 2006-05-04 18:36:53 +04:00
kroki@mysql.com
1139d37545 Merge mysql.com:/home/tomash/src/mysql_ab/mysql-4.1 
into  mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug16501
 2006-05-04 18:36:00 +04:00
monty@mysql.com
e71ad86cc1 Merge monty@192.168.0.9:/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2006-05-04 17:19:43 +03:00
monty@mysql.com
3f2e2664a9 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2006-05-04 17:12:47 +03:00
monty@mysql.com
c33b326d86 Fixed an (unlikely) memory leak 2006-05-04 17:11:40 +03:00
monty@mysql.com
770f03ef02 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2006-05-04 17:08:42 +03:00
jani@ua141d10.elisa.omakaista.fi
634afcc9f8 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
 2006-05-04 17:07:04 +03:00
jani@ua141d10.elisa.omakaista.fi
3e1e98876a Added test case for Bug#18712: Truncation problem. The test 
is only to make sure that this will not be fixed, as it is
intended behaviour. Documentation will be improved accordingly.
 2006-05-04 17:05:21 +03:00
kroki@mysql.com
018d9e17b9 Merge mysql.com:/home/tomash/src/mysql_ab/mysql-4.1 
into  mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug16372
 2006-05-04 17:49:21 +04:00
monty@mysql.com
1809adee63 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2006-05-04 15:32:25 +03:00
monty@mysql.com
837ba4f399 Fixed memory leak in sql_parse.cc (lex_end() was not called) 
This caused sp-vars.test to fail
 2006-05-04 15:30:38 +03:00
igor@rurik.mysql.com
da7108d40b Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-05-04 04:55:32 -07:00
svoj@april.(none)
dee1baaefd Fixed heap_btree test failure on 64-bit boxes. 2006-05-04 15:52:09 +05:00