Commit graph

8500 commits

Author SHA1 Message Date
jmiller@mysql.com
0a59884aad Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-02-08 17:48:22 +01:00
jmiller@mysql.com
be29712da5 updated results 2006-02-08 17:47:27 +01:00
jmiller@mysql.com
8e8235ff7c implement a reviw comments 2006-02-08 17:09:57 +01:00
jmiller@mysql.com
e3bfdb9b1c Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-02-08 16:52:34 +01:00
jmiller@mysql.com
dacf64b678 Implement suggestions from lars review 2006-02-08 16:47:46 +01:00
jmiller@mysql.com
75b6720509 More updates for using NDB as default and some bug fixes along the way 2006-02-08 13:08:19 +01:00
konstantin@mysql.com
790c9a05f4 Post merge-fixes.
Apply a patch by Jonas for NDB diskdata.
2006-02-08 15:03:09 +03:00
ramil@mysql.com
34abab41db Removed 'delayed' to make the test deterministic (as the bug itself has nothing to do with 'delayed'). 2006-02-08 16:00:39 +04: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
lars@mysql.com
6bbb1de9ca Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
2006-02-08 11:40:13 +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
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
lars@mysql.com
66bc803160 Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
2006-02-08 10:37:47 +01:00
msvensson@neptunus.(none)
cacdb371bc Update test results 2006-02-08 10:33:21 +01:00
bell@sanja.is.com.ua
ded01c3b6f Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2006-02-08 10:36:42 +02: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
petr@mysql.com
7aa7e4b437 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/cps/mysql/devel/5.1-utf-bug
2006-02-08 09:15:41 +03: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
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
bell@sanja.is.com.ua
6916a4bfe6 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2006-02-07 22:10:44 +02: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
msvensson@neptunus.(none)
ba6b1a6e9b Removed extra "drop view v1" 2006-02-07 19:59:19 +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
jmiller@mysql.com
e5a7238aed Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-02-07 19:19:42 +01:00
msvensson@neptunus.(none)
cc1fd81414 Update after merge 5.0 -> 5.1 2006-02-07 19:18:33 +01:00
tomas@poseidon.ndb.mysql.com
99cbc34b44 Bug #17188 CRBR: ignores --binlog_ignore_db= settings 2006-02-07 19:02:38 +01:00
jmiller@mysql.com
a20976ffd9 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-02-07 18:25:18 +01:00
msvensson@neptunus.(none)
bbff8ade1a Merge neptunus.(none):/home/msvensson/mysql/mysqltest_float_result/my51-mysqltest_float_result
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
2006-02-07 18:17:57 +01:00
msvensson@neptunus.(none)
bcefb0c7fa Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my51-mysqltest_var
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
2006-02-07 18:04:50 +01:00
msvensson@neptunus.(none)
3f1cf9fabc Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my51-mysqltestrun_check_testcases
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
2006-02-07 17:57:26 +01:00
lars@mysql.com
2600ad852a Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
2006-02-07 17:45:11 +01:00
msvensson@neptunus.(none)
809deba6e5 Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my50-mysqltestrun_check_testcases
into  neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my51-mysqltestrun_check_testcases
2006-02-07 17:20:50 +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
jmiller@mysql.com
54e07cea2e More rpl test updates with using ndb as default engine 2006-02-07 14:51:46 +01:00
konstantin@mysql.com
30ddc47ab0 Merge mysql.com:/home/kostja/mysql/tmp_merge
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-07 15:26:58 +03:00
gunnar@mysql.com.
001224c09d item_func.cc:
fix for bug#8461

  BUG 8461 - TRUNCATE returns incorrect result if 2nd argument is negative
  Reason: Both TRUNCATE/ROUND converts INTEGERS to DOUBLE and back to INTEGERS
  Changed the integer routine to work on integers only.
  This bug affects 4.1, 5.0 and 5.1
  Fixing in 4.1 will need to change the routine to handle different types individually.
  5.0 did had different routines for different types already just the INTEGER routine was bad.
2006-02-07 13:26:35 +01:00
bell@sanja.is.com.ua
84900213dd Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into  sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2006-02-07 14:23:16 +02:00
bell@sanja.is.com.ua
5923d50533 kill.test fixed for kill on Mac OS X (which do not send OK) 2006-02-07 13:45:16 +02:00
svoj@april.(none)
328b59a5ed Merge april.(none):/home/svoj/devel/mysql/merge/mysql-4.1
into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.0
2006-02-07 15:30:32 +04:00
jmiller@mysql.com
b135439097 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-02-07 12:16:26 +01:00
lars@mysql.com
caf1fb4b03 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
2006-02-07 11:47:05 +01:00
tomas@poseidon.ndb.mysql.com
407d98b946 Bug#17081 LOAD DATA INFILE" may not load all the data
Bug #17154  	load data infile hangs when duplicate key encountered
2006-02-07 11:47:04 +01:00
svoj@april.(none)
a67d8f9043 Merge april.(none):/home/svoj/devel/mysql/BUG14496/mysql-4.1
into  april.(none):/home/svoj/devel/mysql/merge/mysql-4.1
2006-02-07 13:49:03 +04:00
jmiller@mysql.com
23b68e3a5a More test case updates for using RPL with NDB as default engine 2006-02-07 00:18:10 +01:00