Commit graph

33134 commits

Author SHA1 Message Date
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
fa3c74b420 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
2006-04-21 09:30:05 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
4d0a4e1199 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
2006-04-21 08:57:53 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
dc8a0bd64d Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18962
2006-04-21 08:55:01 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
fe46ee9111 BUG#18962: Crash of ALTER TABLE .. DROP PARTITION ...
Review fixes
2006-04-21 08:37:09 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
6473c10445 WL 2826: Error handling of ALTER TABLE for partitioning
Final review fixes
2006-04-21 08:35:25 -04:00
igor@rurik.mysql.com
1afc70d03e Merge rurik.mysql.com:/home/igor/tmp_merge
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-2
2006-04-20 17:00:29 -07:00
igor@rurik.mysql.com
0b2318f07f Merge rurik.mysql.com:/home/igor/tmp_merge
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-2
2006-04-20 16:51:13 -07:00
igor@rurik.mysql.com
0a65106cfb Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  rurik.mysql.com:/home/igor/mysql-5.1
2006-04-20 16:14:17 -07:00
konstantin@mysql.com
97f001a477 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/opt/local/work/mysql-5.1-merge
2006-04-21 02:48:48 +04:00
serg@serg.mylan
7a746d5905 fix for make distcheck 2006-04-20 23:04:55 +02:00
serg@serg.mylan
e21f10f66e bug#19220
mi_open() should accept filename w/i extension and with .MYI
2006-04-20 23:03:13 +02:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
a3f152cc6e Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18962
2006-04-20 14:16:27 -04:00
konstantin@mysql.com
f14040e4d8 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/opt/local/work/mysql-5.1-merge
2006-04-20 20:49:41 +04:00
igor@rurik.mysql.com
18149be57c Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  rurik.mysql.com:/home/igor/mysql-5.1
2006-04-20 07:24:34 -07:00
mskold@mysql.com
778e362bc3 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-04-20 13:35:31 +02:00
mskold@mysql.com
ed31665b2a Fix for bug#19196: Attempt to create index on usupported field type gives wrong error code: updated with new expected error codes 2006-04-20 13:32:41 +02:00
mskold@mysql.com
27a2d1b68b Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-04-20 12:10:09 +02:00
mskold@mysql.com
22d345bf5b Fix for bug#19196: Attempt to create index on usupported field type gives wrong error code 2006-04-20 12:06:22 +02:00
msvensson@win2003-x86.
9bd55493d3 Fix build of taocrypt. Don't mention /GX or /EHsc as that will turn ON exception handling and not off as we want. 2006-04-20 11:59:12 +02:00
mskold@mysql.com
15ca6daf6f Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-04-20 11:11:21 +02:00
mats@mysql.com
cb48b8ccb3 Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/b17400-mysql-5.1-new
2006-04-20 09:00:49 +02:00
mats@mysql.com
4b605314e3 Bug#16993 (ALTER TABLE ADD col AUTO_INCREMENT does not replicate):
Removed rpl_ndb_relay_space test since it does not make sense (in
its current form) for NDB.
2006-04-20 08:56:47 +02:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
14d75e5b9f WL 2826: Error handling of ALTER TABLE for partitioning
Fixed up create_handler_files call
2006-04-19 21:43:30 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
09e95da616 Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
2006-04-19 21:22:35 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
c9085e5189 WL2826: Error handling of ALTER TABLE for partitioning
Actual error reported in my_errno from my_delete
2006-04-19 20:57:42 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
dd257b22dc WL 2826: Error handling of ALTER TABLE for partitioning
Various bug fixes (mostly mixed to and from in replace methods)
2006-04-19 20:04:00 -04:00
jimw@mysql.com
aabf1120a3 Turn on test timing in mysql-test-run.pl by default, and clean up usage docs. 2006-04-19 14:09:49 -07:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
0a053c3d8c Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-wl2826
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
2006-04-19 16:19:21 -04:00
jimw@mysql.com
ff7717e090 Merge mysql.com:/home/jimw/my/mysql-5.1-old-scripts
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-04-19 13:11:58 -07:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
f78195049d WL 2826: Error handling of ALTER TABLE for partitioning
Fixed a number of bugs
2006-04-19 16:08:59 -04:00
mats@mysql.com
5f763b4378 Disabling test that fails. There is already a bug for the failure. 2006-04-19 19:53:17 +02:00
igor@rurik.mysql.com
a6be98b8a8 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  rurik.mysql.com:/home/igor/mysql-5.1
2006-04-19 10:45:06 -07:00
konstantin@mysql.com
6d277eb89d Merge mysql.com:/opt/local/work/tmp_merge
into  mysql.com:/opt/local/work/mysql-5.1-merge
2006-04-19 21:12:24 +04:00
mikron@c-2709e253.1238-1-64736c10.cust.bredbandsbolaget.se
f3452dfd4d Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-wl2826
into  c-2709e253.1238-1-64736c10.cust.bredbandsbolaget.se:/Users/mikron/wl2826
2006-04-19 18:05:45 +02:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
22ed19e434 WL 2826: Error handling of ALTER TABLE for partitioning
Moved error inject from being flags to compiler to being part of config.h
Also error inject only defined if debug is also defined
+Small fixes
2006-04-19 12:05:44 -04:00
mats@mysql.com
eee166d859 Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/b17400-mysql-5.1-new
2006-04-19 15:33:31 +02:00
mats@mysql.com
97f9cf23a8 Bug#16993 (ALTER TABLE ZEROFILL AUTO_INCREMENT not replicated correctly):
This is not a bug. Enabling disabled test and adding comment.
2006-04-19 15:29:49 +02:00
monty@mysql.com
ed809462e9 Fixed timeing problem by ignoring failures and results from first select after table definition change 2006-04-19 12:21:33 +03:00
mats@mysql.com
04fc2d9eb8 Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/b17400-mysql-5.1-new
2006-04-19 10:58:44 +02:00
monty@mysql.com
f636a4d43c Only run test with row based logging 2006-04-19 11:20:11 +03:00
monty@mysql.com
8901455d5b Fix wrong auto merge 2006-04-19 11:17:32 +03:00
monty@mysql.com
77b6bc4264 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/my/mysql-5.1
2006-04-19 11:09:33 +03:00
monty@mysql.com
7af1f5e0b5 Fixed compilation error
ensure check_if_legal_table_name is also defined on unix
2006-04-19 11:08:22 +03:00
bar@mysql.com
1921fa59ab Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new
2006-04-19 12:52:54 +05:00
bar@mysql.com
b2315c6495 my_access.c:
After merge fix.
2006-04-19 12:51:30 +05:00
monty@mysql.com
feca86044f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/my/mysql-5.1
2006-04-19 10:41:33 +03:00
monty@mysql.com
9ad5c2de05 Fix compilation failure when compiling with BUILD/compile-pentium-debug-max
(Problem with embedded server and ndb)
Fix broken mysql-test-run.sh
Removed memory leak in ha_example.cc
2006-04-19 10:39:57 +03:00
stewart@mysql.com
af2f420a10 Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug18881
into  mysql.com:/home/stewart/Documents/MySQL/5.1/merge
2006-04-19 17:32:13 +10:00
stewart@mysql.com
b59d84069f Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug15530
into  mysql.com:/home/stewart/Documents/MySQL/5.1/merge
2006-04-19 17:30:24 +10:00
bar@mysql.com
a26f115a13 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.b17870v1
2006-04-19 11:42:41 +05:00