mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
33800 commits 2778 branches 343 tags 1.6 GiB
Commit graph

33800 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
ingo@mysql.com
1d72bf877d Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-bug10405
 2006-05-04 10:22:48 +02: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
holyfoot@mysql.com
540481aef9 Merge mysql.com:/home/hf/work/mysql-4.1.mrg 
into mysql.com:/home/hf/work/mysql-5.0.mrg
 2006-05-04 09:59:32 +05:00
holyfoot@deer.(none)
2f154ab410 test result fixed 2006-05-04 09:58:03 +05:00
igor@rurik.mysql.com
dd839667c7 Post-review changes. 2006-05-03 21:35:27 -07: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
mikael@zim.(none)
d98fe8b724 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/mikael/bug19313
 2006-05-03 15:58:20 -07:00
kent@mysql.com
55ccf0fe87 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2006-05-04 00:58:19 +02:00
kent@mysql.com
34a37aedfc Merge mysql.com:/Users/kent/mysql/bk/mysql-5.1-release.old02 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2006-05-04 00:58:18 +02:00
jimw@mysql.com
6978a51832 Merge bk-internal:/home/bk/mysql-5.1-new 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-05-03 15:58:17 -07:00
acurtis@xiphis.org
9d4a065ffd fix include path in windows build 2006-05-03 15:58:16 -07:00
jimw@mysql.com
da9a11669d Merge mysql.com:/home/jimw/my/mysql-4.1-wl2852 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-05-03 15:58:16 -07:00
acurtis@xiphis.org
16d8d6bcca fix legacy configure option handling 2006-05-03 15:58:15 -07: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
acurtis@xiphis.org
3954c72207 Merge acurtis@bk-internal:/home/bk/mysql-5.1-new 
into  xiphis.org:/home/antony/work2/wl3201-final
 2006-05-03 15:58:12 -07: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
aivanov@mysql.com
5b20ee67db Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/alexi/innodb/mysql-5.1
 2006-05-04 02:26:57 +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
aivanov@mysql.com
7a74734219 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss521
 2006-05-04 01:17:15 +04:00
aivanov@mysql.com
ac0ac6a3c9 Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss521-work 
into  mysql.com:/home/alexi/innodb/mysql-5.1
 2006-05-04 00:35:45 +04:00
aivanov@mysql.com
4cff042a58 Applied innodb-5.0-ss521 snapshot. 
Fixed BUG#19366: "consistent_snapshot.test fails".
 2006-05-04 00:32:34 +04:00
holyfoot@mysql.com
7d47127e86 Merge bk@192.168.21.1:mysql-4.1 
into mysql.com:/home/hf/work/mysql-4.1.mrg
 2006-05-04 00:45:56 +05:00
aivanov@mysql.com
b695bb4624 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/alexi/innodb/mysql-4.1-ss26
 2006-05-03 23:45:55 +04:00
aivanov@mysql.com
2f190c2c10 Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss521-work 
into  mysql.com:/home/alexi/innodb/mysql-5.1
 Null-merge.
 2006-05-03 23:31:52 +04:00
aivanov@mysql.com
a7122276a4 Merge mysql.com:/home/alexi/innodb/mysql-4.1-ss26-work 
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss521-work
 Null-merge.
 2006-05-03 23:29:27 +04:00
aivanov@mysql.com
d546f0d93e Applied innodb-4.1-ss26 snapshot. 
Fixed BUG#19366: "consistent_snapshot.test fails".
 2006-05-03 23:25:01 +04:00
holyfoot@mysql.com
e5a22d1bca Merge bk@192.168.21.1:mysql-4.1 
into mysql.com:/home/hf/work/mysql-4.1.mrg
 2006-05-04 00:03:58 +05: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
ingo@mysql.com
f9cd0b3d95 Merge mysql.com:/home/mydev/mysql-5.0-bug10405 
into  mysql.com:/home/mydev/mysql-5.1-bug10405
 2006-05-03 16:39:14 +02: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
serg@sergbook.mysql.com
375d3e8258 Fixed dependency checking 2006-05-03 09:46:19 -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@deer.(none)
81e625ac4a merging fix 2006-05-03 17:43:32 +05:00
holyfoot@mysql.com
f66bcd2535 Merge mysql.com:/home/hf/work/mysql-5.0.18455 
into mysql.com:/home/hf/work/mysql-5.0.mrg
 2006-05-03 16:48:15 +05: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