ramil/ram@mysql.com/myoffice.izhnet.ru
31402835d4
Fix for bug #23254 : COMPRESS(NULL) makes all futher COMPRESS() calls on same Item return NULL
...
We don't set null_value to 0 in the Item_func_compress::val_str() for
not-NULL results.
2006-10-13 19:05:54 +05:00
msvensson@shellback.(none)
c31a028b9d
Optimize restarts by using --force-restart option
2006-10-13 11:53:19 +02:00
msvensson@shellback.(none)
c2574de306
Improve the function that parses test files looking for what features it uses
...
Now also detects "source nnnn;" command, previous version only detected
"--source"
2006-10-13 11:05:46 +02:00
msvensson@shellback.(none)
927c20dd0f
Improve function that finds the reason why test was skipped, the old version only looked at the ast line, but there might be some additional debug info there so it's better to scan the whole file.
...
There should be only one line that says "reason: <reason>"
2006-10-13 10:41:40 +02:00
msvensson@shellback.(none)
6e3280fd3b
Add missing semicolon in test file
2006-10-13 08:48:47 +02:00
tsmith/tim@siva.hindu.god
0e3cfe02ec
Bug #19764 : SHOW commands end up in the slow log as table scans
...
Do not consider SHOW commands slow queries, just because they don't use proper indexes.
This bug fix is not needed in 5.1, and the code changes will be null merged. However, the test cases will be propogated up to 5.1.
2006-10-12 17:10:34 -06:00
msvensson@shellback.(none)
31f4aaa5be
Skip looking for ndbapi-examples in 4.1, not part of dist
2006-10-12 20:52:53 +02:00
msvensson@shellback.(none)
1be01ceea8
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-10-12 18:48:03 +02:00
msvensson@shellback.(none)
1b06c7c78e
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint-new
2006-10-12 17:37:59 +02:00
kroki/tomash@moonlight.intranet
e7c31e8130
Fix after manual merge.
2006-10-12 19:36:43 +04:00
kroki/tomash@moonlight.intranet
9e942999d6
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug20953
2006-10-12 18:33:07 +04:00
msvensson@shellback.(none)
fe7fce3664
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-12 16:17:31 +02:00
msvensson@shellback.(none)
2db82814c4
Add missing semicolon
2006-10-12 16:17:09 +02:00
kroki/tomash@moonlight.intranet
591c06d4b7
BUG#20953: create proc with a create view that uses local vars/params
...
should fail to create
The problem was that this type of errors was checked during view
creation, which doesn't happen when CREATE VIEW is a statement of
a created stored routine.
The solution is to perform the checks at parse time. The idea of the
fix is that the parser checks if a construction just parsed is allowed
in current circumstances by testing certain flags, and this flags are
reset for VIEWs.
The side effect of this change is that if the user already have
such bogus routines, it will now get a error when trying to do
SHOW CREATE PROCEDURE proc;
(and some other) and when trying to execute such routine he will get
ERROR 1457 (HY000): Failed to load routine test.p5. The table mysql.proc is missing, corrupt, or contains bad data (internal code -6)
However there should be very few such users (if any), and they may
(and should) drop these bogus routines.
2006-10-12 18:02:57 +04:00
msvensson@shellback.(none)
925220627c
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-12 13:51:54 +02:00
msvensson@shellback.(none)
2c4456d30f
Add win paths for mysql_client_test
2006-10-12 13:49:12 +02:00
msvensson@shellback.(none)
1d77363c40
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-12 12:19:52 +02:00
msvensson@shellback.(none)
d093b1029a
Look for mysql_client_test in $path_client_bindir
2006-10-12 12:19:23 +02:00
kaa@polly.local
8c88bb4eaa
Merge polly.local:/tmp/maint/bug22728/my41-bug22728
...
into polly.local:/home/kaa/src/maint/m41-maint--07OGk
2006-10-12 13:39:52 +04:00
msvensson@shellback.(none)
5741683d12
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-12 11:30:07 +02:00
msvensson@shellback.(none)
3c66250e84
Fix unhandled exception in mysql-test-run.pl, creating a dir that already exist
2006-10-12 11:29:13 +02:00
holyfoot/hf@mysql.com/deer.(none)
edc9026842
Merge bk@192.168.21.1:mysql-4.1
...
into mysql.com:/home/hf/mysql-5.0.mrg
2006-10-12 13:50:22 +05:00
kaa@polly.local
1ceb8d34ad
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into polly.local:/home/kaa/src/maint/mysql-5.0-maint
2006-10-12 12:12:09 +04:00
kaa@polly.local
2667443173
Merge polly.local:/tmp/maint/bug11655/my50-bug11655
...
into polly.local:/home/kaa/src/maint/mysql-5.0-maint
2006-10-12 11:28:44 +04:00
kaa@polly.local
e89fdaac73
5.0-specific fixes when merging the fix for bug #11655 and bug #20927 from 4.1
2006-10-12 11:21:12 +04:00
tsmith/tim@siva.hindu.god
64e1a13d0e
Merge siva.hindu.god:/usr/home/tim/m/bk/b19764/50
...
into siva.hindu.god:/usr/home/tim/m/bk/tmp/50
2006-10-11 23:38:15 -06:00
tsmith/tim@siva.hindu.god
360540e891
Revert patch for bug #19764 , which did not work with prepared statements.
2006-10-11 23:35:52 -06:00
istruewing@chilla.local
3ee35a7618
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
...
into chilla.local:/home/mydev/mysql-4.1-bug8283-one
2006-10-11 22:28:06 +02:00
msvensson@shellback.(none)
0eb2fff749
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-11 21:56:09 +02:00
msvensson@shellback.(none)
5b8312986c
Fixes for embedded server test
2006-10-11 21:53:43 +02:00
istruewing@chilla.local
35c94b6e2d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into chilla.local:/home/mydev/mysql-5.0-bug8283
2006-10-11 17:57:47 +02:00
evgen@moonbone.local
ea8a646dc0
Bug#22138: Unhandled NULL caused server crash
...
The Cached_item_decimal::cmp() method wasn't checking for null pointer
returned from the val_decimal() of the item being cached.
This leads to server crash.
The Cached_item_decimal::cmp() method now check for null values.
2006-10-11 19:44:12 +04:00
svoj@mysql.com/april.(none)
62b2044279
BUG#22562 - REPAIR TABLE .. USE_FRM causes server crash on Windows and server
...
hangs on Linux
If REPAIR TABLE ... USE_FRM is issued for table that is located in different
than default database server crash could happen.
In reopen_name_locked_table take database name from table_list (user specified
or default database) instead of from thd (default database).
Affects 4.1 only.
2006-10-11 20:34:20 +05:00
msvensson@shellback.(none)
7a6493f376
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-11 16:01:05 +02:00
msvensson@shellback.(none)
d02909910b
mtr_im_stop returns 1 if all is well
2006-10-11 15:45:35 +02:00
msvensson@shellback.(none)
c4db04fc27
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-11 14:54:36 +02:00
msvensson@shellback.(none)
3e37764216
Improve restart logic all code to detect restart is now in the functions
...
'run_testcase_need_master/slave_restart'
Remove the faulty qw
Only look for mysql_fix_privilege_tables if not windows
2006-10-11 14:50:19 +02:00
jonas@perch.ndb.mysql.com
ca4e9be98f
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2006-10-11 14:02:43 +02:00
kaa@polly.local
737e13e526
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into polly.local:/home/kaa/src/maint/m41-maint--07OGk
2006-10-11 14:57:09 +04:00
kaa@polly.local
a050de9837
Merge polly.local:/tmp/maint/bug11655/my41-bug11655
...
into polly.local:/home/kaa/src/maint/m41-maint--07OGk
2006-10-11 14:55:23 +04:00
kaa@polly.local
02ac635027
Merge polly.local:/tmp/maint/bug11655/my41-bug11655
...
into polly.local:/tmp/maint/bug11655/my50-bug11655
2006-10-11 14:16:30 +04:00
aelkin/elkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi
4b134f7481
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into dsl-hkigw8-feb9fb00-191.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0
2006-10-11 12:48:21 +03:00
kaa@polly.local
456fe01d7e
Fix for bug #22728 "Handler_rollback value is growing".
...
The bug is present only in 4.1, will be null-merged to 5.0
For InnoDB, check value of thd->transaction.all.innodb_active_trans instead of thd->transaction.stmt.innobase_tid to see if we really need to rollback.
2006-10-11 12:44:03 +04:00
Kristofer.Pettersson@naruto.
d51e3b6cb5
Merge naruto.:C:/cpp/bug21811/my50-bug21811
...
into naruto.:C:/cpp/mysql-5.0-maint
2006-10-11 10:41:22 +02:00
aelkin/elkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi
14beb1f4f1
bug#20697 - results in sync with the test
2006-10-11 11:07:20 +03:00
bar@mysql.com/bar.intranet.mysql.r18.ru
4a0bd60446
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into mysql.com:/usr/home/bar/mysql-5.0-rpl.b22052
2006-10-11 12:56:47 +05:00
bar@mysql.com/bar.intranet.mysql.r18.ru
a55b0cbc34
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1-rpl
...
into mysql.com:/usr/home/bar/mysql-4.1-rpl.b22052
2006-10-11 12:51:09 +05:00
aelkin/elkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi
f16b8adc29
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into dsl-hkigw8-feb9fb00-191.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0
2006-10-11 10:19:28 +03:00
aelkin/elkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi
d05db0e7ab
BUG#20697 slave fails to rollback replicated transaction hang over innodb_lock_wait_timeou
...
Transaction on the slave sql thread got blocked against a slave's mysqld local ta's
lock. Since the default, slave-transaction-retries=10, there was replaying of the
replicated ta. That failed because of a new started from 5.0.13 policy not to rollback
a timed-out transaction. Effectively the first round of a timed-out ta becomes committed
by the replaying's first "BEGIN".
It was decided to backport already existed method working in 5.1 implemented in
bug #16228 for handling symmetrical deadlock problem. That patch introduced end_trans
execution whenever a replicated ta deadlocks or timed-out.
Note, that this solution can be practically suboptimal - in the light of the changed behavior
due to timeout we still could replay only the last statement - only with a high rate of timeouting
replicated transactions.
2006-10-11 10:16:37 +03:00
lars@mysql.com/black.(none)
f28e9eb64b
Merge mysql.com:/home/bkroot/mysql-5.0-rpl
...
into mysql.com:/home/bk/MERGE/mysql-5.0-merge
2006-10-10 21:58:46 +02:00