Commit graph

29337 commits

Author SHA1 Message Date
evgen@moonbone.local
d91cbf34ff Fix bug#14583
When InnoDB compares varchar field in ucs2 with given key using bin collation,
it calls my_strnncollsp_ucs2_bin() to perform comparison.
Because field length was lesser than length of key field should be padded
with trailing spaces in order to get correct result. 
Because  my_strnncollsp_ucs2_bin() was calling my_strnncollp_ucs2_bin(), which
doesn't pads field, wrong comparison result was returned. This results in
wrong result set.

my_strnncollsp_ucs2_bin() now compares fields like my_strnncollsp_ucs2 do,
but using binary collation.
2005-12-27 20:16:59 +03:00
pekka@mysql.com
a4fc69dbfb ndb - wl#2972 (5.0) fix detached trigger opType + new pgm test_event_merge 2005-12-27 16:57:50 +01:00
stewart@mysql.com
cb25f0f039 5.0 ndb build fix. 2005-12-28 01:32:03 +11:00
stewart@mysql.com
efbdf7b225 Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
2005-12-28 00:57:18 +11:00
mats@mysql.com
3440170618 Bug#15942 (RBR ignored --binlog_ignore_db and tries to map table on slave for writes):
Added code to do the filtering (seems to have gone away).
2005-12-27 12:06:48 +01:00
ingo@mysql.com
44ef4989bb Merge mysql.com:/home/mydev/mysql-4.1
into  mysql.com:/home/mydev/mysql-4.1-bug5390
2005-12-27 10:36:19 +01:00
ingo@mysql.com
ef52a59418 Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-bug5390
2005-12-27 10:31:00 +01:00
bell@sanja.is.com.ua
14384b8401 Avoiding conditional jump on uninitialized variable (BUG#14904). 2005-12-27 02:01:58 +02:00
ingo@mysql.com
b3803a490b Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-bug5390
2005-12-26 21:35:45 +01:00
sergefp@mysql.com
530cddb6cd WL#2985: fix typo bug when partitioning is not compiled in 2005-12-26 19:46:06 +03:00
ingo@mysql.com
864f575615 Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-bug5390
2005-12-26 14:22:13 +01:00
ramil@mysql.com
c4911a404a Fix for SQLCOM_BINLOG_BASE64_EVENT related code. 2005-12-26 17:22:12 +04:00
psergey@pylon.mylan
26a23dcac9 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  pylon.mylan:/home/psergey/mysql-5.1-26dec-merge
2005-12-26 16:22:11 +03:00
sergefp@mysql.com
e6f3cb553d Merge newbox:mysql-5.1-ppruning-r4
into  mysql.com:/home/psergey/mysql-5.1-26dec-merge
2005-12-26 15:12:49 +03:00
sergefp@mysql.com
e597607cb8 Merge newbox:mysql-5.1-ppruning-r4
into  pylon.mylan:/home/psergey/mysql-5.1-26dec-merge
2005-12-26 14:56:15 +03:00
ingo@mysql.com
c2b4e70eef Merge mysql.com:/home/mydev/mysql-5.0-bug5390
into  mysql.com:/home/mydev/mysql-5.1-bug5390
2005-12-26 10:50:41 +01:00
ingo@mysql.com
bd72782899 Merge mysql.com:/home/mydev/mysql-4.1-bug5390
into  mysql.com:/home/mydev/mysql-5.0-bug5390
2005-12-26 10:32:54 +01:00
bar@mysql.com
cd56ec80bc ignore:
added item_xmlfunc.cc
2005-12-26 12:16:28 +04:00
bar@mysql.com
a1153f45dd .del-item_xmlfunc.cc~565ad32584ed96d4:
Delete: libmysqld/item_xmlfunc.cc
2005-12-26 12:13:53 +04:00
ramil@mysql.com
f6a61875f7 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/5.0.b15108
2005-12-26 11:18:01 +04:00
sergefp@mysql.com
b8d762031f add missing DROP TABLE [IF EXISTS] clauses 2005-12-26 10:16:36 +03:00
sergefp@mysql.com
81452dbcfc WL#2985 "Partition pruning": fixes to post-review fixes: when modifying SEL_TREE::keys,
adjust SEL_TREE::keys_map appropriately.
2005-12-26 09:46:25 +03:00
sergefp@mysql.com
15780cb398 Fix typo bug in previous cset 2005-12-26 08:51:29 +03:00
sergefp@mysql.com
2a3943dbec WL#2985 "Partition Pruning": post-review fixes:
- Added more comments.
- Added a RANGE_OPT_PARAM::remove_jump_scans flag that disables construction of index_merge
  SEL_TREEs that represent unusable conditions like "key1part1<c1 OR key2part2<c2"
- make prune_partitions() function handle the case where range analysis produces a list of 
  index_merge trees (it turned out that this is possible, appropriate test case added).
- Other small fixes.
2005-12-26 08:40:09 +03:00
monty@mysql.com
88bcd74d76 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/my/mysql-5.1
2005-12-25 16:35:15 +02:00
monty@mysql.com
ba99b6c565 Fixed compile errors (when compiling in debug mode) 2005-12-25 16:34:10 +02:00
acurtis@xiphis.org
9aaa8a81eb Bug#15976: Multiply warnings about unfreed memory
leaks caused by Archive storage engine not closing files and
  storage engines not receiving panic() during shutdown
2005-12-25 03:29:49 -08:00
brian@zim.(none)
49419b0b99 New option to run multiple engines through the same test:
--engine="myisam,archive"

--number-of-rows has been removed for the time being and replaced with
 option to allow you to just repeat multiple time all of the inserts you specifed with data. When number-of-rows-returns it will be instead used for averaging rows while growing concurrency. 

Returned stats now has accurent row and query counts since it includes a multiple for the rows and queries added.

Parser is now a touch smarter and understands end of file issues if you have a delimiter at the end of the file.
2005-12-25 02:03:53 -08:00
brian@zim.(none)
939f80be2e Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/cluster-5.1
2005-12-24 15:43:22 -08:00
brian@zim.(none)
dcbe5acb1b See message in mysqlslap.c, but basically
1) Parsing now works
2) Options are safer, aka it doesn't kill the machine and it cleans up after itself
3) Option of --only-print added so that you can see what it does.
4) Tiny cleanup of the auto generate sql. A lot more needs to be done with this, for it to be very valuable. I suspect it doesn't work all that well.
5) Delimeter is now a single character. No good escaping going on.
6) You can now change which schema it is runninng against.

Now I think I can go make use of it! 

Though I need to add support for a "only run this many inserts, divide by the number of clients connecting, to really test scaling"
2005-12-24 15:41:40 -08:00
dlenev@mysql.com
15c86158a7 Merge mysql.com:/home/dlenev/src/mysql-5.0-bg14836
into  mysql.com:/home/dlenev/src/mysql-5.1-merges
2005-12-24 20:13:51 +03:00
serg@serg.mylan
d5d6b51422 remove "defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__)" unmaintainably scattered all over the source 2005-12-24 14:32:50 +01:00
mats@mysql.com
56db7a6b6e Bug#15924 (Core dump in sp_trans):
Added code for pending event flush just before executing the
  function or trigger.
2005-12-24 12:07:07 +01:00
serg@serg.mylan
5bde71e4cb Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-12-24 11:00:31 +01:00
brian@zim.(none)
795f744c5f Just a few cleanup points in azio. Should solve Ubuntu compile problem. 2005-12-23 17:51:14 -08:00
brian@zim.(none)
a580f985ec Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/archive-5.1
2005-12-23 12:25:56 -08:00
brian@zim.(none)
56fd453c5d Fix for Antony's push. I've also changed from using the zlib off_t pointer type to my_off_t to fix issues around buggy zlib versions and to make sure file sizes are consistent through out mysql. 2005-12-23 12:22:31 -08:00
serg@serg.mylan
c063819075 locking issues,
test for LONGLONG_MIN in decimal.c
2005-12-23 20:50:28 +01:00
jmiller@mysql.com
400bc0ca33 Updated tests from Lars Review 2005-12-23 14:45:02 +01:00
joerg@mysql.com
01d0454109 storage/bdb/dist/s_all
When not generating 'tags' file, also don't generate symlinks to it (or make dist will fail/behave wierdly).
(origin:   1.1985 05/12/22 23:31:15 knielsen@mysql.com +1 -0)
2005-12-23 12:46:48 +01:00
serg@serg.mylan
7b049bf2cd correct help text 2005-12-23 12:38:22 +01:00
bar@mysql.com
7f843ffe87 ctype_uca.result, ctype_uca.test:
Adding test case.
charset-def.c:
  Initialize new collation.
ctype-uca.c:
  Adding simplified Hungarian collation.
2005-12-23 14:20:00 +04:00
brian@zim.(none)
f86fd78261 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/archive-5.1
2005-12-22 20:06:05 -08:00
brian@zim.(none)
3ee76a3e3c Update to add in support for AZIO.
AZIO differs in that it uses mysys methods and removes all of the malloc calls.
2005-12-22 19:50:10 -08:00
paul@frost.snake.net
8fa6d83be2 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into  frost.snake.net:/Users/paul/bk/mysql-5.0
2005-12-22 13:05:52 -06:00
paul@frost.snake.net
e5281df9f7 mysqltest.c:
Put options in order.
  Add #ifdef around --debug for non-debug builds.
2005-12-22 13:02:53 -06:00
brian@zim.(none)
680762498a Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/cluster-5.1
2005-12-22 10:39:41 -08:00
mats@mysql.com
2754e14d40 Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/b15920-mysql-5.1-new
2005-12-22 16:38:32 +01:00
knielsen@mysql.com
5e35d7f435 WL#1012 Add to sql/Makefile.am include files forgotten in RBR push.
Remove errorneously committed ChangeLog file.
2005-12-22 14:32:54 +01:00
ingo@mysql.com
a04c5adb0b BUG#5390 - problems with merge tables
Problem #1: INSERT...SELECT, Version for 5.1.
Extended the unique table check by a check of lock data.
Merge sub-tables cannot be detected by doing name checks only.
2005-12-22 13:48:00 +01:00