Commit graph

10515 commits

Author SHA1 Message Date
msvensson@neptunus.(none)
7d595d6488 Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-01 09:33:34 +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
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
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
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
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
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
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
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
andrey@lmy004.
483a6d06fa fix for bug#16537 (Events: mysql.event.starts is null)
- now when the event is created and STARTS is omitted then STARTS is implicitly
  CURRENT_TIMESTAMP
- This CS also fixed incorrect presentation of STARTS/ENDS in I_S.EVENTS
(incorporated review changes)
2006-02-28 11:43:10 +01:00
bar@mysql.com
bcc72ad04f Bug#16313 XML: extractvalue() ignores '!' in names
xml.result, xml.test:
  Adding test case.
item_xmlfunc.cc:
  Fixed that the "!" character written at the end was ignored.

  Now if we try to scan "!=", and if "!" is not
  followed by "=", we rollback lex scanner back 
  to "!" token, so the parser will start to check
  the next rule from the "!" character again.

  Previously parser started from the next character,
  which was EOF in the example in xml.test,
  which led to query being successfully parsed,
  instead of producing a syntax error.
2006-02-28 13:59:16 +04:00
msvensson@neptunus.(none)
2e401e202d Merge msvensson@devsrv-b.mysql.com:/space/magnus/bug17279/my51-bug17279/
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-28 10:55:05 +01:00
msvensson@devsrv-b.mysql.com
ef8b5b47e8 Merge devsrv-b.mysql.com:/space/magnus/bug17279/my50-bug17279
into  devsrv-b.mysql.com:/space/magnus/bug17279/my51-bug17279
2006-02-28 10:44:48 +01:00
brian@zim.(none)
d49995d16e Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/dep-5.1
2006-02-27 13:28:59 -08:00
brian@zim.(none)
23e384fc3e another cleanup patch for removing tables before tests start. 2006-02-27 13:27:25 -08:00
dlenev@mysql.com
88a583da1d Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13525
into  mysql.com:/home/dlenev/src/mysql-5.1-merges2
2006-02-27 20:38:45 +03:00
dlenev@mysql.com
db1ecaa1a2 Fix for trigger.test failures on pushbuild hosts introduced by fix for
bug #13525 "Rename table does not keep info of triggers".

Now we use MYSQLTEST_VARDIR in order to be able to run this test in different
vardir. Also improved cleanup after the test.
2006-02-27 20:32:32 +03:00
dlenev@mysql.com
8dbdf5237e Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13525
into  mysql.com:/home/dlenev/src/mysql-5.1-merges2
2006-02-27 20:00:07 +03:00
dlenev@mysql.com
3d6839d133 Fixed test results after bad auto-merge. 2006-02-27 20:00:06 +03:00
dlenev@mysql.com
6137476427 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/src/mysql-5.0-bg13525
2006-02-27 20:00:05 +03:00
dlenev@mysql.com
6cb5c38c14 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/src/mysql-5.0-bg13525
2006-02-27 20:00:03 +03:00
SergeyV@selena.
763475754a Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
into  selena.:H:/MYSQL/src/#15943-mysql-5.0
2006-02-27 20:00:03 +03:00
sergefp@mysql.com
db54dc36f5 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/psergey/mysql-5.0-bug17314-push
2006-02-27 20:00:02 +03:00
tomas@poseidon.ndb.mysql.com
d3371b996f BUG#17499, forgot to commit result file 2006-02-27 17:24:06 +01:00
tomas@poseidon.ndb.mysql.com
bfc43d5745 Bug #17499 Alter table of ndb partitioned tables causes mysqld to core 2006-02-27 17:04:49 +01:00
msvensson@devsrv-b.mysql.com
706070fbf8 Bug#17279 user with no global privs and with create priv in db can create databases
- Use binary charset in acl_cache, to make searches case sensitive
 - Add testcase
2006-02-27 16:41:58 +01:00
jmiller@mysql.com
c800a13762 New test case fro replication between ndb and other storage engines. 2006-02-27 15:09:03 +01:00
sergefp@mysql.com
0048ea9bb3 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug17314
2006-02-27 11:36:41 +03:00
bar@mysql.com
1f30b1525a xml.test:
xml.result:
  Adding test for Bug #16312 XML: extractvalue() crash if angle brackets,
  A fix for #16234 fixed this bug automatically.
2006-02-27 11:21:20 +04:00
kent@mysql.com
eda13fe08b example.vcproj:
Bug#17721, hang in exampledb, solved by msvensson
drop-on-restart.inc:
  Added drop of tables t00,t03,t04
2006-02-27 02:56:34 +01:00
msvensson@neptunus.(none)
0d2e58c27c Trace mysqlslap to mysqlslap.trace 2006-02-26 23:39:14 +01:00
msvensson@neptunus.(none)
1b115976b6 Trace mysqlcheck to file mysqlcheck.trcae 2006-02-26 23:36:53 +01:00
monty@mysql.com
a95cabcb6b Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/my/mysql-5.1
2006-02-26 23:31:03 +02:00
guilhem@mysql.com
e5d450eeca var/tmp does not work (same fix as knielsen did for rpl_row_UUID a few days ago) 2006-02-26 21:30:39 +01:00
msvensson@neptunus.(none)
45c5c105fd Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-26 20:25:33 +01:00
msvensson@neptunus.(none)
90e5ca96be Look for and "convert" paths that start with $MYSQL_TMP_DIR 2006-02-26 19:54:09 +01:00