1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-21 06:21:35 +03:00
Commit Graph

14482 Commits

Author SHA1 Message Date
tomas@poseidon.ndb.mysql.com
fe0ff3e21c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-09 23:48:52 +01:00
tomas@poseidon.ndb.mysql.com
246d0ea290 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-09 23:15:46 +01:00
andrey@lmy004.
24c010892c Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-events_i_s
2006-02-09 23:15:46 +01:00
aivanov@mysql.com
f8f8af970e Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/alexi/innodb/mysql-5.1-merged
2006-02-10 01:15:45 +03:00
tomas@poseidon.ndb.mysql.com
930641a5c1 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-09 21:28:22 +01:00
andrey@lmy004.
67985360f0 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-events_i_s
2006-02-09 20:20:22 +01:00
andrey@lmy004.
34b3d54839 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16984
2006-02-09 20:17:49 +01:00
tomas@poseidon.ndb.mysql.com
3c0ed6d410 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-09 19:55:50 +01:00
aivanov@mysql.com
e22d2f1150 Fixed BUG#9680: Wrong error from cascading update
Applied 9680.patch (by Osku Salerma)
2006-02-09 20:43:10 +03:00
konstantin@mysql.com
2a267fed2f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-09 14:22:34 +03:00
konstantin@mysql.com
e1f807af26 Merge mysql.com:/home/kostja/mysql/mysql-5.0-root
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-09 13:35:59 +03:00
knielsen@mysql.com
2b5a4e2807 Merge mysql.com:/usr/local/mysql/mysql-5.1-winfix
into  mysql.com:/usr/local/mysql/mysql-5.1-new
2006-02-09 09:34:42 +01:00
brian@zim.tangent.org
01a8c54406 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.tangent.org:/home/brian/mysql/cleanup-5.1
2006-02-08 21:55:40 -08:00
tomas@poseidon.ndb.mysql.com
d39cb0eb0c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-09 06:45:28 +01:00
konstantin@mysql.com
19018128a3 Merge mysql.com:/home/kostja/mysql/tmp_merge1
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-09 00:21:22 +03:00
tomas@poseidon.ndb.mysql.com
c4c4510a54 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-08 22:15:34 +01:00
tomas@poseidon.ndb.mysql.com
c05463289d Bug #17206 Update through VIEW is not working
post review fixes
Bug fix added missing setting of rw_set for table handler when update occurs via a view.   The missing setting of the rw_set resulted in fields not being updated for ndb tables
2006-02-08 22:13:47 +01:00
konstantin@mysql.com
5ed755d0d8 Merge mysql.com:/home/kostja/mysql/tmp_merge
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-08 23:53:45 +03:00
reggie@linux.site
b23901d95b Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  linux.site:/home/reggie/work/mysql-5.1
2006-02-08 11:20:34 -06:00
tomas@poseidon.ndb.mysql.com
edd1417b46 Bug #17206 Update through VIEW is not working 2006-02-08 18:08:18 +01:00
tomas@poseidon.ndb.mysql.com
44f2bd578c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-08 17:14:32 +01:00
konstantin@mysql.com
365404a048 Merge mysql.com:/home/kostja/mysql/tmp_merge
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-08 14:05:19 +03:00
andrey@lmy004.
9951b9db96 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-events_i_s
2006-02-08 11:54:37 +01:00
tomas@poseidon.ndb.mysql.com
d3a80b4710 Bug #17200 Comment for SHOW ENGINES should be changed for Cluster 2006-02-08 11:29:46 +01:00
konstantin@mysql.com
d4c5516929 Merge mysql.com:/home/kostja/mysql/tmp_merge
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-08 13:11:44 +03:00
reggie@linux.site
760bc0a225 bug# 17082 Client hangs when creating tables with partition
This bug was only on Windows but we updated the call to 
create_temporary_file to match what is being done in other
areas of MySQL
2006-02-08 04:05:18 -06:00
reggie@linux.site
88ba26e15f Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  linux.site:/home/reggie/work/mysql-5.1
2006-02-08 04:05:17 -06:00
konstantin@mysql.com
7452faa503 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-08 13:01:27 +03:00
anozdrin@mysql.com
66e1e8d4a6 Fix for BUG#17180: Failure in trigger-grant on Solaris.
The problem is that LEX_STRING was used instead of LEX_STRING::str.
2006-02-08 12:54:54 +03:00
anozdrin@mysql.com
e24336b0c8 Fix compilation failure. 2006-02-08 12:51:28 +03:00
brian@zim.tangent.org
23d99ee03c The handlerton structures for archive and CSV had not been updated. Nicht so gute. I also fixed CSV to use fast alter table and put in a test in archive in case someone tries to do the same there (hint... it won't work). 2006-02-07 22:42:57 -08:00
andrey@lmy004.
fa143d255c Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16984
2006-02-07 23:57:39 +01:00
andrey@lmy004.
4b0f608472 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-events_i_s
2006-02-07 23:40:03 +01:00
konstantin@mysql.com
da377d1ec8 Merge mysql.com:/home/kostja/mysql/tmp_merge
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-08 00:33:31 +03:00
konstantin@mysql.com
e656863033 Merge mysql.com:/home/kostja/mysql/tmp_merge
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-08 00:02:56 +03:00
pekka@mysql.com
14249f23ed Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/space/pekka/ndb/version/my50
2006-02-07 21:52:56 +01:00
reggie@linux.site
e74b609881 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  linux.site:/home/reggie/work/mysql-5.1
2006-02-07 13:54:42 -06:00
gunnar@mysql.com.
f6590a3b89 Merge gboehn@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com.:/data/BK/mysql-5.0
2006-02-07 20:50:28 +01:00
pekka@mysql.com
05353723f0 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/space/pekka/ndb/version/my50
2006-02-07 20:04:54 +01:00
msvensson@neptunus.(none)
4ddcc7ccc2 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
2006-02-07 20:02:08 +01:00
pekka@mysql.com
9aa06f3bc1 ndb - bug#15918 fix 2006-02-07 19:57:31 +01:00
andrey@lmy004.
64c34f101f Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-events_i_s
2006-02-07 19:37:26 +01:00
andrey@lmy004.
4ba2a3322b - fix for bug #16414 (Events: Crash or hang if event drops itself)
WL#1034 (Internal CRON)
(with post-review fix)
2006-02-07 19:28:33 +01:00
andrey@lmy004.
335c6e8877 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16984
2006-02-07 19:23:39 +01:00
tomas@poseidon.ndb.mysql.com
99cbc34b44 Bug #17188 CRBR: ignores --binlog_ignore_db= settings 2006-02-07 19:02:38 +01:00
msvensson@neptunus.(none)
4fc2b92692 Merge neptunus.(none):/home/msvensson/mysql/bug15302/my51-bug15302
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
2006-02-07 18:12:23 +01:00
reggie@linux.site
824ac10fbc BUG# 17082 - Client hangs when creating tables with partition
no test case needed since simply creating a partitioned table 
reproduces it.
2006-02-07 10:45:11 -06:00
tomas@poseidon.ndb.mysql.com
53040a0762 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-07 17:45:10 +01:00
gunnar@mysql.com.
a0b0cb5551 Merge mysql.com.:/data/BK/mysql-5.0
into  mysql.com.:/data/BK/mysql-5.0_8461_b
2006-02-07 17:15:12 +01:00
tomas@poseidon.ndb.mysql.com
776bc2a6f2 Bug #17005 Ndb partition handling for create table like is broken 2006-02-07 16:31:20 +01:00