kent@mysql.com
f188972456
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2006-01-28 12:39:25 +01:00
kent@mysql.com
c64727e7c0
mysql-test-run.sh:
...
Bug#16780: Extend port range to make space for 5.1 NDBCLUSTER_PORT_SLAVE
2006-01-28 12:35:46 +01:00
dlenev@mysql.com
737084b229
Fix for bug #16829 "Firing trigger with RETURN crashes the server"
...
We should disallow usage of RETURN statement in triggers and emit
error at parsing time (instead of crashing when trigger is fired).
2006-01-28 12:50:16 +03:00
igor@rurik.mysql.com
eb8507208e
Fixed bug #16260 .
...
The problem has manifested itself in the cases when we have a nested outer join
for which it can be inferred that one of the inner tables is a single row table.
2006-01-27 21:20:28 -08:00
patg@govinda.patg.net
15ec4431bc
BUG# 14768
...
Added fixes to make last_insert_id() to work.
2006-01-27 15:43:44 -08:00
msvensson@neptunus.(none)
d18006173f
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2006-01-27 19:11:59 +01:00
pappa@c-5c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
a69827f152
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into c-5c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug12796
2006-01-27 09:29:59 -05:00
msvensson@neptunus.(none)
9c255c4025
Enable kill test
2006-01-27 13:23:10 +01: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
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
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
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
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
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
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
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
msvensson@neptunus.(none)
bcf118b474
Merge
2006-01-24 13:33:00 +01:00
gluh@eagle.intranet.mysql.r18.ru
fa776a6f67
Fix for bug#15851 Unlistable directories yield no info from information_schema
...
to skip directories which are not allowed for read
2006-01-24 15:59:08 +04:00
msvensson@neptunus.(none)
3d5f530caa
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 08:43:34 +01:00
msvensson@neptunus.(none)
09ec2919a1
Make it possible to run mysql-test-run.pl with default test suite in different vardir.
2006-01-24 08:30:54 +01:00
aelkin@mysql.com
4ba60488f6
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-23 22:32:05 +02:00
evgen@moonbone.local
b1967ad723
Fixed bug #16510 : Updating field named like '*name' caused server crash.
...
When setup_fields() function finds field named '*' it expands it to the list
of all table fields. It does so by checking that the first char of
field_name is '*', but it doesn't checks that the '* is the only char.
Due to this, when updating table with a field named like '*name', such field
is wrongly treated as '*' and expanded. This leads to making list of fields
to update being longer than list of the new values. Later, the fill_record()
function crashes by dereferencing null when there is left fields to update,
but no more values.
Added check in the setup_fields() function which ensures that the field
expanding will be done only when '*' is the only char in the field name.
2006-01-23 21:51:32 +03:00
ingo@mysql.com
7e58102bfd
Merge mysql.com:/home/mydev/mysql-4.0-bug5390
...
into mysql.com:/home/mydev/mysql-4.1-bug5390
2006-01-23 19:19:29 +01:00
ingo@mysql.com
87f9c10db5
BUG#5390 - problems with merge tables
...
After-fix optimizations proposed and finally
implemented by Monty.
2006-01-23 19:12:29 +01:00
svoj@april.(none)
18681229a0
Merge april.(none):/home/svoj/devel/mysql/BUG16489/mysql-4.1
...
into april.(none):/home/svoj/devel/mysql/BUG16489/mysql-5.0
2006-01-23 20:07:26 +04:00
aelkin@mysql.com
0fc8284de8
BUG#15699, failure to apply ignore rule for unexisting table.
...
Since replication rules execute after `mysql_multi_update_prepare' returns we
delay to `break' in case this functions returns non-zero (some tables are not found)
for to examine if there is an ignore rule for a not-found table. By doing that
it is guaranteed do/ignore replication rules logically preceed opening table routine.
2006-01-23 18:03:09 +02:00
gvb@phoenix.(none)
5b9d686e87
Merge gboehn@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into phoenix.(none):/data/mysql-4.1-BK
2006-01-23 16:34:53 +01:00
svoj@april.(none)
4dc4502ab3
BUG#16489 - utf8 + fulltext leads to corrupt index file.
...
Fixed that UPDATE statement crashes multi-byte charset fulltext index.
2006-01-23 17:15:33 +04:00
gvb@phoenix.(none)
66cb90410c
Merge gboehn@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into phoenix.(none):/data/mysql-4.1-BK
2006-01-23 11:18:06 +01:00
holyfoot@eagle.intranet.mysql.r18.ru
12fcabbbf2
Merging
2006-01-21 21:50:54 +04:00
hf@eagle.intranet.mysql.r18.ru
4f368f9f93
Merging
2006-01-21 18:50:06 +04:00