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
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
hf@eagle.intranet.mysql.r18.ru
02ce3d0cad
Merge hf@192.168.21.12:work/mysql-4.1.15429
...
into eagle.intranet.mysql.r18.ru:/home/hf/work/mysql-4.1.mrg
2006-01-21 17:55:58 +04:00
hf@eagle.intranet.mysql.r18.ru
b91380456f
Merge hf@192.168.21.12:work/mysql-4.1.9855
...
into eagle.intranet.mysql.r18.ru:/home/hf/work/mysql-4.1.mrg
2006-01-21 17:53:29 +04:00
anozdrin@mysql.com
f2c3ed8e7b
Test case for BUG#16621: INSERTs in Stored Procedures causes data corruption
...
in the Binary Log.
2006-01-20 17:21:39 +03:00
anozdrin@mysql.com
145fd62bc1
Fix for BUG#15588: String overrun during sp-vars.test
...
The bug appears after implementation of WL#2984
(Make stored routine variables work according to the standard).
2006-01-20 15:59:22 +03:00
pem@mysql.com
2c6ea2d2df
Fix of fix for BUG#15866. (Actually change the fib() call in sp.test)
2006-01-20 08:32:22 +01:00
pem@mysql.com
28f3989c8a
Fixed BUG#15866: Thread stack limit insufficient for recursive call "fib(20)"
...
Lowered the parameter to 10, and also renamed non-standard table names to t3.
2006-01-19 17:55:54 +01:00
pem@mysql.com
d894e3043e
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/bug15658/mysql-5.0
2006-01-19 15:15:47 +01:00
stewart@mysql.com
c079e80122
reintroduce --no-defaults to ndb_mgmd
2006-01-20 00:08:26 +11:00
konstantin@mysql.com
fa5b4b55a0
Merge mysql.com:/opt/local/work/mysql-4.1-root
...
into mysql.com:/opt/local/work/mysql-5.0-root
2006-01-19 15:23:01 +03:00
stewart@mysql.com
95e29a975a
small typo fixes
2006-01-19 22:50:54 +11:00
pem@mysql.com
3a753667dd
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/bug15658/mysql-5.0
2006-01-19 11:48:07 +01:00
pem@mysql.com
6fad448a49
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/bug14834/mysql-5.0
2006-01-18 18:18:04 +01:00
pem@mysql.com
5cf8418b10
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/bug14834/mysql-5.0
2006-01-18 17:09:23 +01:00
aivanov@mysql.com
5f7279d0d5
Applied patch recieved from Marko:
...
Make innodb_thread_concurrency 0 by default, and extend the usable
range from 0 to 1000 (0 disables the thread throttling).
2006-01-18 15:20:56 +03:00
bell@sanja.is.com.ua
e87d5e9a83
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-18 13:49:37 +02:00
bell@sanja.is.com.ua
4e931d3c45
Excluded posibility of tmp_table_param.copy_field double deletion (BUG#14851).
2006-01-18 13:48:57 +02:00
msvensson@neptunus.(none)
e55af5271c
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-01-17 19:46:02 +01:00
konstantin@mysql.com
8d6c98ed90
Bug#15206: "Misleading message "No data to FETCH":
...
reword the misleading message.
2006-01-17 21:10:47 +03:00
msvensson@neptunus.(none)
f729ad7d39
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-01-17 19:08:07 +01:00
msvensson@neptunus.(none)
8b243b3799
Fix for connection not being added to connection pool if "disable_abort_on_error" was used.
2006-01-17 19:02:42 +01:00
pem@mysql.com
7817b99857
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/bug15231/mysql-5.0
2006-01-17 12:44:51 +01:00
pem@mysql.com
2f44b60752
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/bug14498/mysql-5.0
2006-01-17 10:04:11 +01:00
konstantin@mysql.com
4fd615abdb
A post-merge fix.
2006-01-17 01:22:01 +03:00