kostja@bodhi.local
605404ec68
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime
2006-11-30 02:00:39 +03:00
kostja@bodhi.local
c6c172e40c
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into bodhi.local:/opt/local/work/mysql-4.1-runtime
2006-11-30 01:58:57 +03:00
msvensson@neptunus.(none)
d3090cc3fe
Merge neptunus.(none):/home/msvensson/mysql/bug19731/my50-bug19731
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-29 23:08:35 +01:00
msvensson@neptunus.(none)
68724b3a8d
Bug#19371 VARBINARY() have trailing zeros after upgrade from 4.1
...
- chmod the saved files from 4.1 to make sure they are writable
2006-11-29 23:03:45 +01:00
msvensson@neptunus.(none)
db863d826c
Add command "chmod" to mysqltest
2006-11-29 23:02:06 +01:00
msvensson@neptunus.(none)
eea2bd8421
Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-29 22:51:25 +01:00
msvensson@neptunus.(none)
b23cb23349
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-29 22:50:10 +01:00
msvensson@neptunus.(none)
9799bbd76f
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/work/my50-work
2006-11-29 22:49:31 +01:00
msvensson@neptunus.(none)
5f4acf145b
After 5.1.6 just turn on logging, it will be sent to tables by default
2006-11-29 22:49:02 +01:00
patg@radha.local
7ce83bc36a
federated.test:
...
fixed test to replace port to SLAVE_PORT in result file
federated.result:
new result file
2006-11-29 13:56:59 -05:00
iggy@rolltop.ignatz42.dyndns.org
98c6f8bf49
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my41-bug20836
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836
2006-11-29 12:15:15 -05:00
gkodinov@dl145s.mysql.com
1405ed13fe
Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0-opt
...
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0-opt
2006-11-29 16:32:13 +01:00
monty@mysql.com/narttu.mysql.fi
8aec636ba8
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2006-11-29 17:25:23 +02:00
evgen@moonbone.local
ecc63d81b8
view_grant.result:
...
Small fix for a test case
2006-11-29 18:12:08 +03:00
gkodinov@dl145s.mysql.com
fd28e74aa6
Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0-opt
...
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0-opt
2006-11-29 15:21:28 +01:00
gkodinov@dl145s.mysql.com
5c0be323ac
Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-4.1-opt
...
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0-opt
2006-11-29 15:20:30 +01:00
evgen@moonbone.local
595d8c5bcb
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/work/20327-bug-5.0-opt-mysql
2006-11-29 15:03:53 +03:00
thek@kpdesk.mysql.com
4debf85521
Merge kpdesk.mysql.com:/home/thek/dev/bug22043/my50-bug22043
...
into kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
2006-11-29 12:57:43 +01:00
evgen@moonbone.local
e851a9eaea
Bug#20327: Marking of a wrong field leads to a wrong result on select with view,
...
prepared statement and subquery.
When a field of a view from an outer select is resolved the find_field_in_view
function creates an Item_direct_view_ref object that references the
corresponding view underlying field. After that the view_ref is marked
as a dependent one. While resolving view underlying field it also get
marked as a dependent one due to current_select still points to the subselect.
Marking the view underlying field is wrong and lead to attaching conditions
to a wrong table and thus to the wrong result of the whole statement.
Now mark_select_range_as_dependent() function isn't called for fields from a
view underlying table.
2006-11-29 14:52:11 +03:00
evgen@moonbone.local
1314ab222f
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/work/17254-bug-5.0-opt-mysql
2006-11-29 14:44:24 +03:00
msvensson@neptunus.(none)
dcf0f346cf
Bug#20589 Missing some table level privileges after upgrade
...
- The table_priv column of table_privs table was altered to a enum type
with fewer enums causing the SHOW/CREATE VIEW grants to be truncated.
- Improved comments and moved all declarations for table_privs, column_privs
and proc_privs to one section for each table making it easy to see hat alterations
are performed on each table
- Reduced the number of ALTER's slightly, but as this is an upgrade script we need
to take all possibilites into account.
2006-11-29 12:04:29 +01:00
mskold/marty@mysql.com/linux.site
ae0d7e87d9
bug#24303 Wrong result for UPDATE IGNORE for NDB table: Added test case
2006-11-29 11:53:43 +01:00
gkodinov@dl145s.mysql.com
43c3dfeb27
Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0
...
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0-opt
2006-11-29 11:25:22 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
b1664c220c
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/usr/home/ram/work/bug22229/my50-bug22229
2006-11-29 13:41:03 +04:00
df@kahlann.erinye.com
343e779571
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
2006-11-29 10:35:15 +01:00
df@kahlann.erinye.com
756f104591
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
2006-11-29 10:33:23 +01:00
df@kahlann.erinye.com
c134b8c332
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
2006-11-29 10:22:43 +01:00
df@kahlann.erinye.com
1c46f7d841
minor fix
2006-11-29 10:21:59 +01:00
kostja@bodhi.local
5fea0724bc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime
2006-11-29 02:44:12 +03:00
kostja@bodhi.local
bf3fbb44ae
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into bodhi.local:/opt/local/work/mysql-4.1-runtime
2006-11-29 02:39:17 +03:00
iggy@rolltop.ignatz42.dyndns.org
761a88ee0d
Bug#20836 Selecting into variables results in wrong results being returned
...
This error is displayed anytime the SELECT statement needs a temp table to
return correct results because the object (select_dumpvar) that represents
variables named in the INTO clause stored the results before the temp
table was considered. The problem was fixed by creating the necessary
Item_func_set_user_var objects once the correct data is ready.
2006-11-28 17:21:39 -05:00
msvensson@neptunus.(none)
3a50528940
Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-28 23:12:22 +01:00
msvensson@neptunus.(none)
2b98e19bb5
Remove the moved check a second time.
2006-11-28 23:09:17 +01:00
msvensson@neptunus.(none)
6dd62468bd
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/work/my50-work
2006-11-28 23:07:02 +01:00
msvensson@neptunus.(none)
7eb487ab26
Move the check that $opt_vardir could be created and was writable to the function
...
where we know how to creat the vardir
Remove unused variable
2006-11-28 23:06:06 +01:00
msvensson@neptunus.(none)
ef582b9fa6
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-28 22:35:00 +01:00
msvensson@neptunus.(none)
bb0d7ed44b
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-28 22:17:26 +01:00
msvensson@neptunus.(none)
9235e363a3
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/work/my50-work
2006-11-28 22:16:52 +01:00
msvensson@neptunus.(none)
05eb532514
Bug#24335 mysql-test-run.pl fails with ActiveState Perl on Windows
...
- Avoid use of mtr_run when executing "mysqld --verbose --help" to find
version and supported features
2006-11-28 22:16:31 +01:00
msvensson@neptunus.(none)
0c48000e6c
Fix missing parameter declaration
2006-11-28 21:57:42 +01:00
msvensson@neptunus.(none)
627a0bf0b4
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-28 21:20:56 +01:00
msvensson@neptunus.(none)
cc747a02b3
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-28 21:11:05 +01:00
cmiller@zippy.cornsilk.net
f983166c01
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-11-28 15:08:16 -05:00
msvensson@neptunus.(none)
04d5a42bbf
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-28 20:59:57 +01:00
msvensson@neptunus.(none)
e61b7b9f64
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/work/my50-work
2006-11-28 20:51:09 +01:00
msvensson@neptunus.(none)
80d6de7e56
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-28 20:00:54 +01:00
msvensson@neptunus.(none)
fa8af12651
Look for client binaries also in bin/ directory
2006-11-28 20:00:27 +01:00
msvensson@neptunus.(none)
7c9d0abb19
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-28 19:54:52 +01:00
msvensson@neptunus.(none)
2346ee93ed
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/work/my50-work
2006-11-28 19:54:37 +01:00
msvensson@neptunus.(none)
961ae4ab2f
Create new function "run_testcase_mark_logs' and use it to mark start of testcase
...
in all cuurently known log files
2006-11-28 19:54:16 +01:00