Commit graph

31319 commits

Author SHA1 Message Date
ingo@mysql.com
a07411cecb Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-bug11527
2006-03-01 08:58:58 +01:00
gluh@eagle.intranet.mysql.r18.ru
701110c943 Bug#16320 XML: extractvalue() won't accept names containing underscores
added '_' to allowed tag body symbols
2006-03-01 10:36:22 +04:00
gluh@mysql.com
b2120c7cce Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/gluh/MySQL/Bugs/5.1.17568
2006-03-01 10:07:19 +04:00
andrey@lmy004.
260b627f7e save the modified value and compare it every time. the memory address
is not that reliable (re #17815). Not perfect solution but will work
till #17815 is fixed.
2006-03-01 04:22:05 +01:00
andrey@lmy004.
e054588421 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug17494
2006-03-01 03:50:56 +01:00
andrey@lmy004.
fc6afaaef9 fix for bug #16426, post fixes 2006-03-01 03:49:31 +01:00
kent@mysql.com
bc5c186828 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-03-01 03:18:59 +01:00
andrey@lmy004.
e38822d29b Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug17494
2006-03-01 02:36:15 +01:00
andrey@lmy004.
a9884c4c0a fix for bug #16426
Events: Event-caused statements don't appear in the slow query log
WL#1034
2006-03-01 02:34:22 +01:00
paul@snake-hub.snake.net
f4c1a0d4f7 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
2006-02-28 18:51:09 -06:00
paul@snake-hub.snake.net
591db4980d Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
2006-02-28 18:12:29 -06:00
paul@snake-hub.snake.net
5ac33e8eb8 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-02-28 17:54:50 -06:00
paul@snake-hub.snake.net
7f7f5969c0 mysqltest.test:
Add real_sleep tests.
2006-02-28 17:54:11 -06:00
kent@mysql.com
5d722a8491 Merge 2006-02-28 23:29:58 +01:00
paul@snake-hub.snake.net
1986796849 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
2006-02-28 15:14:31 -06:00
paul@snake-hub.snake.net
67e4580e29 mysqltest.c:
expand tab
2006-02-28 15:11:44 -06:00
paul@snake-hub.snake.net
d8a6e41c6b Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-02-28 15:09:45 -06:00
paul@snake-hub.snake.net
d6654fe9cb mysql-test-run.sh:
Fix URLs.
README:
  Fix URL.
mysqltest.result:
  Update test result for real_sleep error message.
mysqltest.c:
  Fix do_sleep() to print correct command name for real_sleep.
2006-02-28 15:08:16 -06:00
paul@snake-hub.snake.net
49de5254f3 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
2006-02-28 14:05:20 -06:00
paul@snake-hub.snake.net
7ff2ede8c9 mysqltest.c:
Fix reference to incorrect (non-existent) options in comment.
2006-02-28 14:04:21 -06:00
paul@snake-hub.snake.net
486bd42b06 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-02-28 14:01:16 -06:00
paul@snake-hub.snake.net
fc8ed82da4 mysqltest.c:
Correct/clarify comments.
2006-02-28 14:00:17 -06:00
andrey@lmy004.
8e881441a1 fix compiler warnings: precision loses, unused vars
the warnings came from MSFT compiler (output of pushbuild)
2006-02-28 20:32:37 +01:00
paul@snake-hub.snake.net
c28c6aa953 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
2006-02-28 12:20:48 -06:00
paul@snake-hub.snake.net
a052ef7d82 mysqltest.c:
Fix typos.
2006-02-28 12:19:30 -06:00
paul@snake-hub.snake.net
a2c639d813 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-02-28 12:10:38 -06:00
ingo@mysql.com
9a9c64ce77 Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-bug11527
2006-02-28 19:05:43 +01:00
paul@snake-hub.snake.net
6d4dc91bbf mysqltest.c:
Fix typos.
2006-02-28 12:01:24 -06:00
andrey@lmy004.
c924aecee1 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16537
2006-02-28 18:44:46 +01:00
andrey@lmy004.
991ff4783e class event_timed -> Event_timed
fix for bug#17793 (Scheduler uses class event_timed should be Event_timed)
2006-02-28 18:33:38 +01:00
pekka@mysql.com
9d819dffba Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-02-28 17:41:54 +01:00
andrey@lmy004.
5f9b287384 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16537
2006-02-28 17:04:31 +01:00
andrey@lmy004.
796e45a299 don't use magic numbers when there are already constants
(forgotten to be committed)
2006-02-28 17:02:31 +01:00
pekka@mysql.com
06e879123f ndb - blob tables vs dict cache : patch 1 2006-02-28 17:01:47 +01:00
jmiller@mysql.com
69d8c362d7 Updated new tests from Lars review 2006-02-28 16:14:46 +01:00
jmiller@mysql.com
a8d76e59e5 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-28 16:13:43 +01:00
ingo@mysql.com
8efa709ff1 Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-bug11527
2006-02-28 15:10:34 +01:00
andrey@lmy004.
d1056a7cd7 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16537
2006-02-28 14:45:25 +01:00
andrey@lmy004.
780d634496 fix for bug#16537
(post-review pre-push changes)
coding style (mostly trailing spaces removed)
2006-02-28 14:43:49 +01:00
bar@mysql.com
3fb0e543c8 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.16313
2006-02-28 17:29:49 +04:00
tomas@poseidon.ndb.mysql.com
47cb191a79 Bug #17499 Alter table of ndb partitioned tables causes mysqld to core
- moved used_partitions initialization
2006-02-28 14:29:48 +01:00
tomas@poseidon.ndb.mysql.com
a9ad4c2e6f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-28 14:18:59 +01:00
tomas@poseidon.ndb.mysql.com
0cff2df315 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-28 14:02:16 +01:00
knielsen@mysql.com
deebd0ef3b Windows compile fixes. 2006-02-28 13:21:35 +01:00
knielsen@mysql.com
19c4ba39c4 Windows compile fixes. 2006-02-28 12:52:38 +01:00
tomas@poseidon.ndb.mysql.com
4dee17f159 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-28 12:40:19 +01:00
tomas@poseidon.ndb.mysql.com
81479bde6a Bug #17701, ALTER TABLE t1 ADD PARTITION for PARTITION BY LIST hangs test
- code wrongly tries to do a "fast alter partition", although not supported
2006-02-28 12:29:50 +01:00
tomas@poseidon.ndb.mysql.com
fecfbb4834 Bug#16385, Partitions: crash when updating a range partitioned NDB table
- too little space was allocated for receiving events, partition uses extra column in table
2006-02-28 12:28:52 +01:00
tomas@poseidon.ndb.mysql.com
9850332741 Bug #17763 mysqld cores with list partitioning if update to missing partition
- error string wrongly formatted
2006-02-28 12:27:53 +01:00
andrey@lmy004.
8fe55c09db manual merge 2006-02-28 12:08:13 +01:00