petr@mysql.com
a0f4c0ce30
Use one option --log-output[=option[,option...]]
...
instead of current --old-log-format and
--both-log-formats options
2006-01-27 13:41:15 +03:00
msvensson@neptunus.(none)
54af4e6d0c
Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my50-mysqltestrun_check_testcases
...
into neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration
2006-01-27 10:49:07 +01:00
msvensson@neptunus.(none)
a98ede7edc
Use MYSQLTEST_VARDIR
2006-01-27 09:24:45 +01:00
andrey@lmy004.
204c566678
post-push fix of fix for bug #16401 (field should be char not varchar)
...
WL#1034 (Internal CRON)
2006-01-26 23:03:46 +01:00
andrey@lmy004.
1a86c35783
post-commit fix of fix for bug#16419
...
WL#1034 (Internal CRON)
(not interesting for the Changelog)
2006-01-26 22:18:40 +01:00
konstantin@mysql.com
674cd35189
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/opt/local/work/mysql-5.1-merge1
2006-01-27 00:08:48 +03:00
andrey@lmy004.
d62d8ac9f7
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug16419
2006-01-26 21:26:19 +01:00
andrey@lmy004.
d4321d9b7c
fix for bug#16419 (Events: can't use timestamp in the schedule)
...
WL #1034 (Internal CRON)
2006-01-26 21:21:21 +01:00
andrey@lmy004.
8f52543224
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug16404
2006-01-26 20:47:08 +01:00
sergefp@mysql.com
c53b5a0b9f
WL#2985 "Partition pruning": addition2: perform partition pruning for
...
single-table UPDATE/DELETE.
2006-01-26 20:17:17 +03:00
bell@sanja.is.com.ua
8eee147e0f
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug8-4.1
2006-01-26 19:01:54 +02:00
msvensson@neptunus.(none)
9304785c10
Add new option "check-testcases" to mysql-test-run.pl
...
Cleanup the sideeffects from most of the testcases with sideeffects.
2006-01-26 17:54:34 +01:00
pem@mysql.com
ff4e2892b7
Fixed on BUG#16568: Continue handler with simple CASE not working correctly
...
After trying multiple inheritance (to messy and hard make it work) and
sublassing jump_if_not (worked, but ugly), decided to on this solution
instead:
Inserting an abstract sp_instr_opt_meta class as parent for all instructions
with destinations makes it possible to handle a continuation pointer for
sp_instr_set_case_expr too.
Note: No special test case; the fix is captured by the changed behaviour of
bug14643_2, and bug14498_4 (formerly disabled), in sp.test.
2006-01-26 17:26:25 +01:00
bell@sanja.is.com.ua
43e281d79c
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug8-4.1
2006-01-26 16:00:49 +02:00
konstantin@mysql.com
c184aec68d
Merge mysql.com:/opt/local/work/mysql-5.0-for-merge
...
into mysql.com:/opt/local/work/mysql-5.1-merge1
2006-01-26 16:36:33 +03:00
pem@mysql.com
5b1fdbec53
Fixed BUG#16303: erroneus stored procedures and functions should be droppable
...
Use a special lookup function for DROP, which doesn't attempt to parse the
definition.
2006-01-26 13:29:46 +01:00
msvensson@neptunus.(none)
169f1ecee6
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration
2006-01-26 12:51:27 +01:00
msvensson@neptunus.(none)
a8672116aa
Update 5.1 to use MYSQLTEST_VARDIR
2006-01-26 12:35:36 +01:00
svoj@april.(none)
4a1bda39ef
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into april.(none):/home/svoj/devel/mysql/BUG16722/mysql-5.1-new
2006-01-26 15:23:08 +04:00
svoj@april.(none)
714cf5688b
BUG#16722 - Fulltext: implicit limit for query word number (depends on length of the query)
...
Remove implicit limit for query word number.
2006-01-26 15:12:59 +04:00
aelkin@mysql.com
58346adcc9
BUG#16487 importing the test case from 5.0 (the fix is done in BUG#15699)
2006-01-26 12:51:34 +02:00
aelkin@mysql.com
2fbdc5483a
BUG#15699 importing the fix from 5.0
2006-01-26 12:49:55 +02:00
reggie@linux.site
8609678978
fixed test issues with bug #14354 . I had mistakenly included
...
/var/tmp in my path when testing data diretory. the var directory
exists in a src tree but may not exist in a different testing
build setup.
2006-01-25 21:54:43 -06:00
pekka@mysql.com
93ceddfe6c
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/space/pekka/ndb/version/my51
2006-01-25 22:39:00 +01:00
pekka@mysql.com
98e59a4447
ndb - wl#2972 rbr blobs: write blob data to binlog
2006-01-25 22:22:50 +01:00
sergefp@mysql.com
cfce3d823b
Merge
2006-01-26 00:06:20 +03:00
sergefp@mysql.com
5d0e8d81ee
BUG#15935: In mysql_update, don't use full index scan when we could have used quick select scan.
2006-01-25 23:25:23 +03:00
reggie@linux.site
8147bbeacd
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into linux.site:/home/reggie/work/mysql-5.1-bug14354
2006-01-25 13:10:00 -06:00
pem@mysql.com
998f0c0aa3
Fixed BUGS#15011: error handler for mysql errno in nested block not activated
...
For nested sql errno handlers (unlike sqlexception and other), we didn't stop
searching when the innermost handler was found - now make sure we do.
2006-01-25 17:19:54 +01:00
lars@mysql.com
865d8f8e89
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
...
into mysql.com:/users/lthalmann/bk/mysql-5.0-bug16487
2006-01-25 17:17:16 +01:00
lars@mysql.com
c88dbea689
BUG#16487: New test for ignored table and multi-update
2006-01-25 16:14:27 +01:00
pem@mysql.com
f60a763208
Fixed BUG#15737: Stored procedure optimizer bug with LEAVE
...
Second version.
The problem was that the optimizer didn't work correctly with forwards jumps
to "no-op" hpop and cpop instructions.
Don't generate "no-op" instructions (hpop 0 and cpop 0), it isn't actually
necessary.
2006-01-25 15:11:49 +01:00
joerg@mysql.com
a473ac5d85
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/M50/bug16730-5.0
2006-01-25 07:34:32 +01:00
evgen@moonbone.local
baed6da5bc
Manually merged
2006-01-24 22:10:39 +03:00
anozdrin@mysql.com
378147a23d
Fix for the following bugs:
...
- BUG#15166: Wrong update permissions required to execute triggers
- BUG#15196: Wrong select permission required to execute triggers
The idea of the fix is to check necessary privileges
in Item_trigger_field::fix_fields(), instead of having "special variables"
technique. To achieve this, we should pass to an Item_trigger_field instance
a flag, which will indicate the usage/access type of this trigger variable.
2006-01-24 20:15:12 +03:00
joerg@mysql.com
61f92945cc
Merge mysql.com:/M41/bug16730-4.1 into mysql.com:/M50/bug16730-5.0
2006-01-24 18:00:23 +01:00
joerg@mysql.com
8d0378f542
Merge mysql.com:/M41/bug16730-4.1 into mysql.com:/M41/merge-4.1
2006-01-24 17:52:53 +01:00
andrey@lmy004.
8519423890
fix for bug#16404 (Events: keyword is ENABLED rather than ENABLE)
...
WL#1034 (Internal CRON)
2006-01-24 16:04:35 +01:00
msvensson@neptunus.(none)
019953e0f2
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var
...
into neptunus.(none):/home/msvensson/mysql/mysqltest_var/my51-mysqltest_var
2006-01-24 15:52:54 +01:00
msvensson@neptunus.(none)
c36e8861e3
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var
...
into neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration
2006-01-24 15:52:08 +01:00
msvensson@neptunus.(none)
b4af5d743e
Make mysql-test-run.sh compatible
2006-01-24 15:51:02 +01:00
msvensson@neptunus.(none)
9f2a17816f
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration
2006-01-24 14:53:47 +01:00
msvensson@neptunus.(none)
60296f8f7f
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var
...
into neptunus.(none):/home/msvensson/mysql/mysqltest_var/my51-mysqltest_var
2006-01-24 14:10:48 +01:00
joerg@mysql.com
1fa62bdafc
Test "ctype_ucs": Disable warnings if "InnoDB" is not configured ("classic" build) (bug#16730).
2006-01-24 13:54:34 +01:00
aelkin@mysql.com
cf6becdebe
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/mysql-5.0
2006-01-24 14:49:25 +02:00
gluh@eagle.intranet.mysql.r18.ru
b4f7c9bbd5
Fix for bug#15307 GROUP_CONCAT() with ORDER BY returns empty set on information_schema(2nd ver)
...
Fill schema tables with data before filesort if it's necessary
2006-01-24 16:48:19 +04:00
sergefp@mysql.com
f02b4f54ad
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/psergey/mysql-5.1-ppruning-r5-push
2006-01-24 15:34:02 +03:00
msvensson@neptunus.(none)
bcf118b474
Merge
2006-01-24 13:33:00 +01:00
jmiller@mysql.com
f82892fea7
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-01-24 13:27:16 +01:00
jmiller@mysql.com
e0fc898399
disabled.def:
...
Updated to remove ndb_dd_disk2memory
ndb_dd_disk2memory.result:
Updated results to match change to show create table for NDB tables. WL 2604
2006-01-24 13:26:21 +01:00