Commit graph

34515 commits

Author SHA1 Message Date
petr@mysql.com
b90e575d5a fix test failure in the team tree 2006-06-05 03:50:32 +04:00
petr@mysql.com
8638f1ccfd fix csv test failure on aix 2006-05-31 10:50:35 +04:00
petr@mysql.com
bf9244b50e one more portability fix 2006-05-30 18:44:26 +04:00
petr@mysql.com
5fad999feb fix windows build of CSV 2006-05-30 10:48:32 +04:00
petr@mysql.com
c9b6315699 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/cps/mysql/devel/5.1-csv-remove-mmap
2006-05-30 02:53:38 +04:00
petr@mysql.com
f0a1b76140 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/cps/mysql/devel/5.1-csv-remove-mmap
2006-05-30 02:35:23 +04:00
andrey@lmy004.
35b6416fcf Merge lmy004.:/work/mysql-5.1-new-vanilla
into lmy004.:/work/mysql-5.1-runtime
2006-05-29 20:23:44 +02:00
msvensson@neptunus.(none)
10719727ff Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-05-29 15:43:00 +02:00
msvensson@neptunus.(none)
e7375bd438 Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-05-29 15:32:52 +02:00
andrey@lmy004.
ea20259aac Merge lmy004.:/work/mysql-5.1-new-vanilla
into lmy004.:/work/mysql-5.1-runtime
2006-05-29 15:16:07 +02:00
andrey@lmy004.
2a6ffba67d add missing events_grant test 2006-05-29 13:16:29 +02:00
andrey@lmy004.
c9309583ee local variable interval to interval_tmp because it hides
Event_timed::interval
2006-05-29 13:12:34 +02:00
andrey@lmy004.
b4752351f2 Fix for bug #17394 - Events namespace is wrong 2006-05-29 10:39:45 +02:00
vtkachenko@vadima.volia.com
2e6b51579b Merge vtkachenko@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  vadima.volia.com:/root/mysql-5.1-new1
2006-05-27 08:08:03 +03:00
vtkachenko@vadima.volia.com
ddc463494b sql_class.cc, mysql_priv.h:
Added accessor to handler data.
2006-05-27 08:05:39 +03:00
elliot@mysql.com
8be9f0c1e7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.1-new
2006-05-26 16:12:05 -04:00
elliot@mysql.com
708f63d624 Set the Windows README file to EOLN_NATIVE so that it doesn't look
horrible when checked out on Windows.
2006-05-26 16:09:39 -04:00
rburnett@bk-internal.mysql.com
f4aa434fbe Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-05-26 15:08:24 +02:00
kent@mysql.com
7175805cd4 Merge mysql.com:/data0/mysqldev/my/mysql-5.1-release
into  mysql.com:/data0/mysqldev/my/mysql-5.1-new
2006-05-26 13:17:09 +02:00
jmiller@mysql.com
0bf4f53187 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-25 22:37:06 +02:00
jmiller@mysql.com
115bcca2d1 Removing ./r/rpl_ndb_dd_partitions.result & ./t/rpl_ndb_dd_partitions.test since NDB only will support key partitions and moving them to the test-extra tree for safe keeping 2006-05-25 22:36:03 +02:00
pekka@mysql.com
65f21e216b ndb - compile fix for Solaris 10 AMD64 -max GCC [ ulonglong != Uint64 ] v5.1 2006-05-25 20:00:36 +02:00
rburnett@bk-internal.mysql.com
61bd780166 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-05-25 17:47:26 +02:00
pekka@mysql.com
e929e28c7b Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-05-25 16:20:36 +02:00
gluh@eagle.intranet.mysql.r18.ru
31a54240e7 test fix 2006-05-25 19:20:35 +05:00
pekka@mysql.com
ae964cb4cc Merge mysql.com:/space/pekka/ndb/version/my51
into  mysql.com:/space/pekka/ndb/version/my51-bug14509
2006-05-25 16:20:34 +02:00
gluh@mysql.com
023317d68a after merge fix 2006-05-25 19:20:34 +05:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
7f6afa8b2a Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19304
2006-05-25 10:20:33 -04:00
pekka@mysql.com
7fcc77f49c ndb - bug#14509 v5.1 part 2/2 : handler level 2006-05-25 12:13:47 +02:00
pekka@mysql.com
577246509f ndb - bug#14509 v5.1 part 1/2 : ndb api level [requires part 2/2] 2006-05-25 12:03:02 +02:00
reggie@big_geek.
e056a96a29 The previous patch fixed the csv engine to support dos, linux, and mac line endings. The patch, however, had
a problem when the table only has a single record in it.  This patch corrects that.

ha_tina.cc:
  Fix problem with previous patch when there is only one record in the table
2006-05-24 15:41:12 -05:00
evgen@moonbone.local
d7e831ac62 sql_select.cc:
After merge fix
2006-05-25 00:03:35 +04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
701007fe30 review fix 2006-05-24 15:01:03 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
a95f31bd4e manual merge 2006-05-24 13:57:21 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
ba75d18bec Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17455
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19304
2006-05-24 13:56:23 -04:00
reggie@big_geek.
c492b58920 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-kt
into  big_geek.:D:/work/mysql/mysql-5.1-vc71
2006-05-24 12:46:45 -05:00
reggie@big_geek.
4a25f024ee some small fixups 2006-05-24 12:43:03 -05:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
d1098a85eb Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19304
2006-05-24 13:41:04 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
cb0a4f7423 BUG#19304: Merge handler not part of partitioned tables
Review fix
2006-05-24 13:35:52 -04:00
evgen@moonbone.local
516b8f0aca Manually merged 2006-05-24 20:52:57 +04:00
reggie@big_geek.
86787fb3b8 mtr_misc.pl:
Fix mtr_exe_exists to work on win32
2006-05-24 08:32:08 -05:00
rburnett@bk-internal.mysql.com
9138f0ba6e Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-05-24 14:57:44 +02:00
serg@mysql.com
c6abfd2f7f Merge mysql.com:/data0/mysqldev/my/mysql-5.0.22-release
into  mysql.com:/data0/mysqldev/my/mysql-5.1-release
2006-05-24 14:37:18 +02:00
serg@mysql.com
c00edb8e8a Merge mysql.com:/data0/mysqldev/my/mysql-5.0.17c-release
into  mysql.com:/data0/mysqldev/my/mysql-5.0.22-release
2006-05-24 14:22:36 +02:00
serg@mysql.com
1841c44cfc Merge mysql.com:/data0/mysqldev/my/mysql-4.1.16a-release
into  mysql.com:/data0/mysqldev/my/mysql-5.0.17c-release
2006-05-24 12:19:39 +02:00
kent@mysql.com
0b10712033 configure.in:
Changed version to 5.0.22
2006-05-24 11:33:17 +02:00
svoj@april.(none)
13ae6420fd Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.1
2006-05-24 12:34:24 +05:00
svoj@april.(none)
578743cd7d Merge april.(none):/home/svoj/devel/BitKeeper/mysql-5.1-new
into  april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.1
2006-05-24 12:31:39 +05:00
knielsen@mysql.com
b03168eb2f Fix missing source file. 2006-05-24 09:28:37 +02:00
knielsen@mysql.com
fb1e5cee46 Merge mysql.com:/usr/local/mysql/mysql-5.0-gcov
into  mysql.com:/usr/local/mysql/mysql-5.1-new
2006-05-24 09:23:45 +02:00