gkodinov/kgeorge@rakia.(none)
623df6b128
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
...
into rakia.(none):/home/kgeorge/mysql/autopush/B14019-4.1-opt
2006-10-16 14:42:51 +03:00
gkodinov/kgeorge@macbook.gmz
dff0a1ac7c
Merge macbook.gmz:/Users/kgeorge/mysql/work/B14019-4.1-opt
...
into macbook.gmz:/Users/kgeorge/mysql/work/B14019-5.0-opt
2006-10-16 13:24:54 +03:00
gkodinov/kgeorge@macbook.gmz
115616381d
BUG#14019 : group by converts literal string to column name
...
When resolving unqualified name references MySQL was not
checking what is the item type for the reference. Thus
e.g a string literal item that has by convention a name
equal to its string value will also work as a reference to
a SELECT list item or a table field.
Fixed by allowing only Item_ref or Item_field to referenced by
(unqualified) name.
2006-10-16 13:10:25 +03:00
mskold/marty@mysql.com/linux.site
fc1286e391
Bug #21072 Duplicate key error in NDB references wrong key: re-generated test results
2006-10-16 11:54:54 +02:00
mskold/marty@mysql.com/linux.site
e7f69b424a
Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0
2006-10-16 10:07:19 +02:00
mskold/marty@mysql.com/linux.site
aafe6e4663
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0
2006-10-16 08:33:22 +02:00
msvensson@shellback.(none)
947d219d1b
Cleanup mtr_timer
...
Add verbose printouts making it possible to see what happens.
Make it an error if trying to stop a non existing timer
Print warning if fork fails.
2006-10-15 15:38:56 +02:00
msvensson@shellback.(none)
ffc9538bb4
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-14 19:55:06 +02:00
msvensson@shellback.(none)
cfd442b67f
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-10-14 17:49:14 +02:00
msvensson@shellback.(none)
f60e544902
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-14 17:31:04 +02:00
msvensson@shellback.(none)
88e11706c3
No need to continue in 'mtr_report_test_failed' after timeout detected, return immediately after
2006-10-14 17:14:03 +02:00
msvensson@shellback.(none)
a9e60bab29
Use char as datatype for the byte that are read with my_fgetc, fixes problem with
...
mysqltest.test on Solaris and Mac. write_file produced nice files with all zeroes.
2006-10-14 17:09:06 +02:00
msvensson@shellback.(none)
a9bd28307d
Skip looking for mysql_client_test in 4.1 on windows as it's not built by default
2006-10-14 16:31:20 +02:00
msvensson@shellback.(none)
1c2113de40
Look for client bindirs client_release and client_debug before other directories.
2006-10-13 20:29:27 +02:00
msvensson@shellback.(none)
8c55cf8f9a
rpl_empty_master_crash need a master restart so that all log files are deleted
2006-10-13 20:22:56 +02:00
evgen@moonbone.local
2b474898dc
Bug#14959: ALTER TABLE isn't able to rename a view
...
The mysql_alter_table() was able to rename only a table.
The view/table renaming code is moved from the function rename_tables
to the new function called do_rename().
The mysql_alter_table() function calls it when it needs to rename a view.
2006-10-13 21:59:52 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
0e3ccedd6b
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into mysql.com:/usr/home/ram/work/bug23254/my41-bug23254
2006-10-13 21:12:07 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
23727a851b
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/usr/home/ram/work/bug23254/my50-bug23254
2006-10-13 21:09:20 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
84048dc763
Merge mysql.com:/usr/home/ram/work/bug23254/my41-bug23254
...
into mysql.com:/usr/home/ram/work/bug23254/my50-bug23254
2006-10-13 19:09:22 +05:00
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