Commit graph

14186 commits

Author SHA1 Message Date
pekka@mysql.com
93ceddfe6c Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-01-25 22:39:00 +01:00
pekka@mysql.com
98e59a4447 ndb - wl#2972 rbr blobs: write blob data to binlog 2006-01-25 22:22:50 +01:00
reggie@linux.site
8147bbeacd Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  linux.site:/home/reggie/work/mysql-5.1-bug14354
2006-01-25 13:10:00 -06:00
sergefp@mysql.com
8223334008 Compile failure fix for gcc 2.95x: Don't use unnamed union of unnamed
structs in PARTITION_ITERATOR
2006-01-25 06:01:54 +03:00
guilhem@mysql.com
3125873c29 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/mysql_src/mysql-5.1-new
2006-01-24 15:38:52 +01:00
guilhem@mysql.com
9e5d951946 Fix for crash of "mysql-test-run --debug mysqldump": don't access dir->str if dir is null. 2006-01-24 15:37:56 +01:00
sergefp@mysql.com
fcb819e06b Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/psergey/mysql-5.1-ppruning-r5-push
2006-01-24 16:54:48 +03:00
bar@mysql.com
aeebffc96b table.cc:
Try to open an old 5.0 table name
  if encoded name doesn't exist.
  This makes SELECT working without having
  to rename tables with tricky characters
  in name into 5.1 format (simpliefies upgrade).
2006-01-24 17:33:39 +04:00
sergefp@mysql.com
f02b4f54ad Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/psergey/mysql-5.1-ppruning-r5-push
2006-01-24 15:34:02 +03:00
reggie@linux.site
daa0587c3d bug #14354 - data directory and index directory not working for partitions 2006-01-23 23:20:23 -06:00
reggie@linux.site
631b9af2be Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  linux.site:/home/reggie/work/mysql-5.1-bug16718
2006-01-23 22:13:12 -06:00
andrey@lmy004.
a6494fbe31 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-tt-copy-works
2006-01-23 16:13:46 +01:00
reggie@linux.site
c5f2f9180f Bug# 16718 partitioning support status variable has incorrect name
change status variable from have_partition_engine to have_partitioning.
2006-01-23 08:42:32 -06:00
andrey@lmy004.
91ff153dcb Merge 2006-01-23 13:07:31 +01:00
andrey@lmy004.
877facc5ec Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16548
2006-01-23 12:38:54 +01:00
holyfoot@mysql.com
edc91d6643 Merge bk@192.168.21.1:mysql-5.1-new into mysql.com:/home/hf/work/5.1.emb 2006-01-23 15:31:54 +04:00
andrey@lmy004.
6df1ec2c76 Merge 2006-01-23 11:06:12 +01:00
sergefp@mysql.com
b729baedcf Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/psergey/mysql-5.1-ppruning-r5-push
2006-01-23 12:29:25 +03:00
jonas@perch.ndb.mysql.com
87202d31db bug#13556 - (ndb) - incorrect parsing in tablespace code
end_ptr to my_strtoll10 is in/out parameter
2006-01-23 09:31:03 +01:00
holyfoot@mysql.com
09359dce59 Merge bk@192.168.21.1:mysql-5.1-new into mysql.com:/home/hf/work/5.1.emb 2006-01-23 11:59:31 +04:00
andrey@lmy004.
7740652961 fix for bug#16431 (Events: An event which alters itself disappears)
WL#1034 (Internal CRON)
2006-01-20 22:24:58 +01:00
sergefp@mysql.com
72ffbf5db8 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/psergey/mysql-5.1-ppruning-r5
2006-01-20 19:38:14 +03:00
sergefp@mysql.com
ace241ba08 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/psergey/mysql-5.1-ppruning-r5
2006-01-20 19:38:13 +03:00
sergefp@mysql.com
2e458b0928 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/psergey/mysql-5.1-ppruning-r5
2006-01-20 19:38:11 +03:00
andrey@lmy004.
b9a0a5dd57 fix for bug#16548 (Events: can't alter clause for preserve)
WL #1034 (Internal CRON)
2006-01-20 16:12:44 +01:00
knielsen@mysql.com
78b722b58c Merge mysql.com:/usr/local/mysql/mysql-5.1-new
into  mysql.com:/usr/local/mysql/tmp5.1
2006-01-20 14:50:04 +01:00
knielsen@mysql.com
585f5b284b Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/mysql/tmp5.1
2006-01-20 14:50:03 +01:00
tomas@poseidon.ndb.mysql.com
996f4a3ccb option to run mysql-test-run without binlog
calculate ndbcluster slave port
2006-01-20 14:50:02 +01:00
knielsen@mysql.com
08ef3d2b9d Fix formatting. 2006-01-20 13:51:18 +01:00
knielsen@mysql.com
c9c276d9a4 Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/mysql/tmp5.1
2006-01-20 13:26:41 +01:00
knielsen@mysql.com
8de62c574b Merge mysql.com:/usr/local/mysql/mysql-5.1-new
into  mysql.com:/usr/local/mysql/tmp5.1
2006-01-20 13:24:18 +01:00
knielsen@mysql.com
c346208a40 Portability compilation fixes. 2006-01-20 13:23:24 +01:00
knielsen@mysql.com
ae8697820c Back out errorneous Windows fix. 2006-01-20 13:17:55 +01:00
tomas@poseidon.ndb.mysql.com
826d0066ee fix so that ndb builds --without-ndb-binlog 2006-01-20 12:55:07 +01:00
cps@outpost.site
c08d4aa703 Fix the tree: plugin-related changes, necessary for
CSV storage engine to be statically compiled.
Derived from antony's patch.
2006-01-20 00:40:56 +03:00
knielsen@mysql.com
113b1e4e6c Merge mysql.com:/usr/local/mysql/ab/mirrors/pullers/mysql-5.1-new
into  mysql.com:/usr/local/mysql/tmp5.1
2006-01-19 21:50:57 +01:00
holyfoot@mysql.com
53a379d041 Merge bk@192.168.21.1:mysql-5.1-new into mysql.com:/home/hf/work/5.1.emb 2006-01-19 18:05:57 +04:00
sergefp@mysql.com
09004c2a03 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/psergey/mysql-5.1-ppruning-r5
2006-01-19 17:05:57 +03:00
bar@mysql.com
55b30563fb Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.12448
2006-01-19 18:05:57 +04:00
pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
5a63dacdfa Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-new
2006-01-19 07:41:58 -05:00
bar@mysql.com
fd4ab36123 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.12448
2006-01-19 10:58:49 +04:00
cps@outpost.site
ce2eb6d8cb WL1019: complete patch. Reapplied patch to the clean
tree to get rid of multiple typos in CS comments and
unify the patch.
2006-01-19 05:56:06 +03:00
pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
f7196b8de9 BUG #16596
Moved init to lex_start
2006-01-18 16:18:42 -05:00
pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
5f147aa4e6 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-new
2006-01-18 16:11:35 -05:00
pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
07e5c13e89 Bug fix 2006-01-18 16:09:25 -05:00
andrey@lmy004.
0322cb1df8 - fix bug #16435 (Weekly events execute every second) (WL#1034 Internal CRON)
Before the interval expression was considered to be in seconds, now it is
just a number and the type of interval is considered.

- this changeset introduces also fix for bug#16432 (Events: error re interval
  misrepresents the facts)
  the code of event_timed::set_interval() was refactored anyway so it is meaningful to
  fix the bug in the same changeset.
2006-01-18 20:41:22 +01:00
sergefp@mysql.com
6e5fb44453 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/psergey/mysql-5.1-ppruning-r5
2006-01-18 21:35:44 +03:00
sergefp@mysql.com
c379f6b0ba WL#2985: Merge 2006-01-18 21:29:48 +03:00
holyfoot@mysql.com
6e42f6ee75 Merge bk@192.168.21.1:mysql-5.1-new
into mysql.com:/home/hf/work/mysql-5.1.15910
2006-01-18 21:53:03 +04:00
holyfoot@deer.(none)
9e338cf4c8 bug #15910 (Wrong value on error message) 2006-01-18 19:27:10 +04:00