Commit graph

29619 commits

Author SHA1 Message Date
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
pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
9a6bad5951 Added two test cases that needs fixing 2006-01-19 09:05:56 -05:00
pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
826aae1885 Fixes for broken tree 2006-01-19 08:58:32 -05: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
cps@outpost.site
a306382651 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  outpost.site:/home/cps/mysql/devel/mysql-5.1-logs-prepush
2006-01-19 07:04:39 +03: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
paul@snake-hub.snake.net
8cefc4ce5b mysqlslap.c:
Put options in standard order: --help first, then lexically.
  Rename --number-of-query to --number-of-queries.
2006-01-18 20:27:07 -06: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
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
pekka@mysql.com
b6ed13a36b Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-01-18 19:35:16 +01: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
pekka@mysql.com
cd55dea8fb ndb - wl#2972 (5.1) omit trigger check post!=pre if recipient is SUMA 2006-01-18 14:21:24 +01:00
mskold@mysql.com
1fb4202c6b Disabled fast/drop index temporarily 2006-01-18 12:44:08 +01:00
sergefp@mysql.com
55380631cc Manual merge 2006-01-18 14:09:08 +03:00
pekka@mysql.com
18a060e798 ndb - wl#2972 (5.1, related) un-initialized var in Suma 2006-01-18 10:59:41 +01:00
mskold@mysql.com
08d8691b40 disabled.def:
Disabled failing tests
mysql_priv.h:
  Removed compiler warning
2006-01-18 10:56:07 +01:00
mskold@mysql.com
b516d5bdea 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-01-18 10:29:27 +01:00
bar@mysql.com
0e665a7aa5 sql_show.cc:
Don't display charsets/collations with HIDDEN flag.
ctype-utf8.c:
  Adding HIDDEN flag to "filename"
  Changeing ID to 17 which was previosly
  used by deprecated "win1251", removed in 4.1.
charset-def.c:
  Adding "filename" as a hidden charset, for test purposes.
m_ctype.h:
  Adding MY_CS_HIDDEN flag,
  to hide charsets and collations from
  being displayed in SHOW.
2006-01-18 12:27:02 +04:00
mskold@mysql.com
b508fab071 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-01-18 09:12:56 +01:00
knielsen@mysql.com
92e1557dce C++ comments in C files are not portable. 2006-01-17 21:38:19 +01:00
mskold@mysql.com
b35d591095 Post review fixes of WL#1892 2006-01-17 18:35:17 +01:00
mskold@mysql.com
0b32dbca38 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-01-17 18:35:16 +01:00
tomas@poseidon.ndb.mysql.com
b3658d6731 fix my_compress/zlib link error 2006-01-17 18:35:15 +01:00
mskold@mysql.com
aae4a997d4 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-01-17 18:35:15 +01:00
joerg@mysql.com
3d3c9ba4fa Merge mysql.com:/M51/clone-5.1 into mysql.com:/M51/mysql-5.1 2006-01-17 18:35:14 +01:00
joerg@mysql.com
be46467b1f Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/M51/mysql-5.1
2006-01-17 18:35:12 +01:00
tomas@poseidon.ndb.mysql.com
246cccc1a5 fix compile error 2006-01-17 18:35:11 +01:00
tomas@poseidon.ndb.mysql.com
933a87a943 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-01-17 18:35:10 +01:00
pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
fb79504889 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2747-push
2006-01-17 12:35:09 -05:00
tomas@poseidon.ndb.mysql.com
368f4d86e3 fix some options to ndb tools that seem to be disturbing some shells 2006-01-17 17:22:04 +01:00
pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
0f74283ba1 Merge c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-new
into  c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2604-push
2006-01-17 11:22:03 -05:00
pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
a9ab4f9cb8 Fix for auto-partitioned tables and PARTITION BY KEY() tables 2006-01-17 11:19:48 -05:00
pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
b809a9d027 Merge c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-new
into  c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2604-push
2006-01-17 09:36:55 -05:00
mskold@mysql.com
c18c667154 Resetting of alter table marker in NDB_SHARE (WL#1892) 2006-01-17 13:59:36 +01:00
joerg@mysql.com
728c67466d Manual merge of 5.1.5 build changes into the general tree. 2006-01-17 13:32:28 +01:00
mskold@mysql.com
1476b484c2 Additional fixes for WL#1892 2006-01-17 12:53:49 +01:00
tomas@poseidon.ndb.mysql.com
6ccfda09c9 added missing setting of ndb environment variables used in tests 2006-01-17 10:48:47 +01:00
mikron@c-1e0be253.1238-1-64736c10.cust.bredbandsbolaget.se
6bf5c9113d WL #2747: Fix such that backup and restore works for user defined
partitioned tables in NDB
2006-01-17 09:25:12 +01:00
mikron@c-1e0be253.1238-1-64736c10.cust.bredbandsbolaget.se
e802a94284 WL #2604: Partition Management
Optimised version of ADD/DROP/REORGANIZE partitions for
non-NDB storage engines.
New syntax to handle REBUILD/OPTIMIZE/ANALYZE/CHECK/REPAIR partitions
Quite a few bug fixes
2006-01-17 08:40:00 +01:00
tomas@poseidon.ndb.mysql.com
9d4882d51d added option to run all ndb tests only 2006-01-17 08:25:52 +01:00
tomas@poseidon.ndb.mysql.com
31596d5456 added assert for when ndb share is not released as it should
+ corrected the bugs in this resuling from mysql-test-run
+removed some debug printouts
2006-01-17 07:36:50 +01:00
tomas@poseidon.ndb.mysql.com
f569266bfa Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-01-16 22:48:57 +01:00
tomas@poseidon.ndb.mysql.com
0d8ed9ba04 added option to force ndb to be run for all tests 2006-01-16 22:47:19 +01:00
reggie@linux.site
3573c2cf47 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  linux.site:/home/reggie/work/mysql-5.1-bug15968
2006-01-16 15:23:29 -06:00
svoj@april.(none)
74c475b23d Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  april.(none):/home/svoj/devel/mysql/BUG14194/mysql-5.1-new
2006-01-16 22:27:36 +04:00
svoj@april.(none)
237e80670a Merge april.(none):/home/svoj/devel/mysql/BUG13835/mysql-5.0
into  april.(none):/home/svoj/devel/mysql/BUG13835/mysql-5.1-new
2006-01-16 21:42:09 +04:00