mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 23:04:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
33793 commits 2774 branches 343 tags 1.6 GiB
Commit graph

11735 commits

Author SHA1 Message Date
monty@mysql.com
9c132f3b6b Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/my/mysql-5.1
 2006-05-05 20:09:20 +03:00
monty@mysql.com
8c7783c1e0 Don't use row level logging on optimize or repair table. 
(Fixes core dump in rpl_failed_optimize.test)
Ensure we end active transcations if we do an admin command (like optimize, repair etc)
 2006-05-05 20:08:40 +03:00
jmiller@mysql.com
9d1f5003c1 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
 2006-05-05 16:54:24 +02:00
tomas@poseidon.ndb.mysql.com
f8c37502b3 do not install ndb slave if no slaves 
fixed memleak in ndbcluster_end
 2006-05-05 15:34:46 +02:00
monty@mysql.com
3ecf4de288 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/my/mysql-5.1
 2006-05-05 11:38:05 +03:00
monty@mysql.com
3e5d75c4e3 After merge fix 2006-05-05 04:52:32 +03:00
tomas@poseidon.ndb.mysql.com
f814a2184a ndb disabled test case against verified bug 2006-05-05 00:06:44 +02:00
tomas@poseidon.ndb.mysql.com
831031ec02 disable test case since it causes failure in ndb_lock occationally, bug report referenced 2006-05-04 23:35:37 +02:00
tomas@poseidon.ndb.mysql.com
f6ede396c0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-05-04 21:55:12 +02:00
monty@mysql.com
a9b83df104 After merge fix 2006-05-04 22:30:01 +03:00
monty@mysql.com
7f3c895332 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
 2006-05-04 22:27:12 +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
monty@mysql.com
c10f37673c Fixed compiler warnings 
Move plugin declarations after system functions have been checked
(Fixes problem with ndb_config failing becasue SHM is not declared)
Fixed some memory leaks
 2006-05-04 19:39:47 +03:00
tomas@poseidon.ndb.mysql.com
f67be8de63 ndb: now no difference in behaviour between row and statement based 2006-05-04 18:26:36 +02: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
monty@mysql.com
3ddc1f9956 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
 2006-05-04 15:58:30 +03:00
tomas@poseidon.ndb.mysql.com
37e8b5ac06 removing the usage if the ndb local dict cache to adress the 241 errors we get now and then 2006-05-04 13:58:17 +02: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
holyfoot@mysql.com
d5c6f594de Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/hf/work/mysql-5.0.mrg
 2006-05-04 10:13:34 +05:00
monty@mysql.com
86b2be8d35 After merge fixes 
Remove compiler warnings
Fix some broken tests
Workaround for syncronization bug in NDB (Bug #16445)
 2006-05-04 06:28:24 +03:00
igor@rurik.mysql.com
3dc06cb3fa Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-05-03 19:38:37 -07:00
monty@mysql.com
8f6ed291a7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/my/mysql-5.1
 2006-05-04 01:58:21 +03:00
cmiller@zippy.(none)
7bbd8fb051 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug18078
 2006-05-03 18:58:13 -04:00
aivanov@mysql.com
2038e05bb4 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/alexi/dev/mysql-5.1-wl3148
 2006-05-04 02:58:11 +04:00
svojtovich@production.mysql.com
1890b04e13 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  production.mysql.com:/usersnfs/svojtovich/mysql-5.0
 2006-05-03 23:17:17 +02:00
holyfoot@mysql.com
2f7ac18f22 Merge bk@192.168.21.1:mysql-5.0 
into mysql.com:/home/hf/work/mysql-5.0.mrg
 2006-05-04 02:17:17 +05:00
pekka@mysql.com
ec42119233 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/space/pekka/ndb/version/my50
 2006-05-03 23:17:16 +02:00
monty@mysql.com
d689f2fa70 Cleanups after review of WL#602 
Fixed warnings from test suite
Some fixes in mysql-test-run script to catch more warnings
 2006-05-03 19:40:52 +03:00
cmiller@zippy.(none)
b07bb71291 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug18078
 2006-05-03 10:04:04 -04:00
holyfoot@deer.(none)
5b5db01a46 merging fix 2006-05-03 19:01:29 +05:00
cmiller@zippy.(none)
a5789854ee Added code to remove closing comment code from event text, as would be 
supplied inside a  /*!VERSION event-text */  segment.  (Fixes Bug#18078
 2006-05-03 09:55:34 -04:00
monty@mysql.com
9756d7f853 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/my/mysql-5.1
 2006-05-03 16:03:19 +03:00
monty@mysql.com
343644dd5d Added support for key_block_size for key and table level (WL#602) 
Added support for key_block_size to MyISAM.
Simplify interface to 'new Key' to make it easier to add new key options.
mysqld option --new is used to define where key options are printed.
(In 5.3 we should move all key options to after key part definition to avoid problem with reserved names)
Fixed some compiler warnings and a memory leak in ssl
 2006-05-03 15:59:17 +03:00
holyfoot@mysql.com
86cab8533f merging 2006-05-03 16:47:05 +05:00
holyfoot@mysql.com
7ee205f67a merging 2006-05-03 16:42:39 +05:00
svoj@april.(none)
365e38b05c Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  april.(none):/home/svoj/devel/mysql/BUG17810/mysql-5.0
 2006-05-03 16:37:42 +05:00
svoj@april.(none)
23d304b312 Merge april.(none):/home/svoj/devel/mysql/BUG18160/mysql-5.0 
into  april.(none):/home/svoj/devel/mysql/BUG17810/mysql-5.0
 2006-05-03 16:36:00 +05:00
holyfoot@mysql.com
9de68b8122 merging 2006-05-03 16:33:42 +05:00
holyfoot@mysql.com
8667344572 Merge hf@192.168.21.28:work/mysql-4.1.16892 
into mysql.com:/home/hf/work/mysql-4.1.mrg
 2006-05-03 15:53:36 +05:00
holyfoot@mysql.com
486693e219 Merge mysql.com:/home/hf/work/mysql-4.1.15442 
into mysql.com:/home/hf/work/mysql-4.1.mrg
 2006-05-03 15:52:07 +05:00
holyfoot@mysql.com
0007484c26 Merge mysql.com:/home/hf/work/mysql-4.1.15225 
into mysql.com:/home/hf/work/mysql-4.1.mrg
 2006-05-03 15:51:19 +05:00
bar@mysql.com
c51d7419e8 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b18170
 2006-05-03 12:34:51 +05:00
bar@mysql.com
467052aa5b Merge mysql.com:/usr/home/bar/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b18170
 2006-05-03 09:08:12 +05:00
igor@rurik.mysql.com
ae4eb6b50f Fixed bug #14292: performance degradation for a benchmark query. 
This performance degradation was due to the fact that some
cost evaluation code added into 4.1 in the function find_best was
not merged into the code of the function best_access_path added
together with other code for greedy optimizer.
Added a parameter to the function print_plan. The parameter contains
accumulated cost for a given partial join.
 
The patch does not include a special test case since this performance
degradation is hard to reproduse with a simple example.

TODO: make the function find_best use the function best_access_path
in order to remove duplication of code which might result in incomplete
merges in the future.
 2006-05-02 18:31:20 -07:00
cmiller@zippy.(none)
9648920963 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug18078
 2006-05-02 18:41:42 -04:00
jmiller@mysql.com
614da47ccc rpl_loaddatalocal.result, rpl_loaddatalocal.test: 
updated for ndb cluster testing
 2006-05-02 22:56:53 +02:00
dlenev@mysql.com
5cae540501 Merge mysql.com:/home/dlenev/mysql-5.0-bg11081 
into  mysql.com:/home/dlenev/mysql-5.1-merges
 2006-05-02 23:16:53 +04:00
cmiller@zippy.(none)
ba0752e125 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug17667
 2006-05-02 15:09:35 -04:00