cbell/Chuck@mysql_cab_desk.
e8aff50790
WL#3228 (NDB) : RBR using different table defs on slave/master
...
This patch corrects a problem found during testing on Solaris. The code
changes how length values are retrieved on big endian machines. The
patch allows the rpl_extraColmaster tests to run on these machines.
2007-08-02 16:15:52 -04:00
igor@olga.mysql.com
cf39429295
Fixed bug#28404.
...
This patch adds cost estimation for the queries with ORDER BY / GROUP BY
and LIMIT.
If there was a ref/range access to the table whose rows were required
to be ordered in the result set the optimizer always employed this access
though a scan by a different index that was compatible with the required
order could be cheaper to produce the first L rows of the result set.
Now for such queries the optimizer makes a choice between the cheapest
ref/range accesses not compatible with the given order and index scans
compatible with it.
2007-08-02 12:45:56 -07:00
cbell/Chuck@mysql_cab_desk.
dc2cab6561
Merge mysql_cab_desk.:C:/source/c++/mysql-5.1
...
into mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl-merge
2007-08-02 15:27:47 -04:00
evgen@moonbone.local
9c8673de05
Merge moonbone.local:/mnt/gentoo64/work/24989-bug-5.0-opt-mysql
...
into moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
2007-08-02 18:42:56 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
0d9301585b
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/home/ram/work/b30088/b30088.5.0
2007-08-02 18:23:23 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
e8eaca54a3
After-merge fix: result adjusted.
2007-08-02 17:14:48 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
7512856c31
Merge mysql.com:/home/ram/work/b30088/b30088.5.0
...
into mysql.com:/home/ram/work/b30088/b30088.5.1
2007-08-02 16:56:32 +05:00
kostja@bodhi.(none)
ea3388f2b2
Add a test case for Bug#5719 "impossible to lock VIEW".
...
It has been possible to lock a view in 5.1 for some time.
2007-08-02 13:59:02 +04:00
tsmith@ramayana.hindu.god
0f6f44424f
Post-merge fix. Update some test results, and add an InnoDB-only
...
compatibility hook, thd_mark_transaction_to_rollback().
2007-08-02 02:22:31 -06:00
monty@nosik.monty.fi
93f0771fca
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2007-08-02 07:55:33 +03:00
tsmith@ramayana.hindu.god
b13de9343f
Merge 50 -> 51 (-opt changesets)
2007-08-01 18:59:41 -06:00
tsmith@ramayana.hindu.god
a52a078f75
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-08-01 18:40:02 -06:00
tsmith@ramayana.hindu.god
534c3f325d
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-08-01 18:39:13 -06:00
tsmith@ramayana.hindu.god
7509e1ed24
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-08-01 18:32:01 -06:00
tsmith@ramayana.hindu.god
33c4cdaa66
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-08-01 18:30:55 -06:00
tsmith@ramayana.hindu.god
9ce717b0fe
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-08-01 18:15:24 -06:00
tsmith@ramayana.hindu.god
8575227571
Merge ramayana.hindu.god:/home/tsmith/m/bk/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-08-01 18:14:50 -06:00
kostja@bodhi.(none)
d63d8cb1a3
Add a test case for Bug#18287 create federated table always times out,
...
error 1159 ' ' (fixed by the patch for Bug 25679)
2007-08-02 03:32:54 +04:00
monty@mysql.com/nosik.monty.fi
96f90711a7
Fixes Bug#30127: --debug-info no longer prints memory usage in mysql
...
Fixed compiler warnings, errors and link errors
Fixed new bug on Solaris with gethrtime()
Added --debug-check option to all mysql clients to print errors and memory leaks
Added --debug-info to all clients. This now works as --debug-check but also prints memory and cpu usage
2007-08-01 22:59:05 +03:00
kostja@bodhi.(none)
1c1abb4252
Fix an unstable test.
2007-08-01 16:48:14 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
c5209fcbd0
Merge mysql.com:/home/ram/work/b29928.new/b29928.new.5.0
...
into mysql.com:/home/ram/work/b29928.new/b29928.new.5.1
2007-08-01 15:31:20 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
7fb417d0ba
Fix for bug #29928 : INSERT ... VALUES(connection_id(), ...) incorrect
...
restores from mysqlbinlog out
Problem: using "mysqlbinlog | mysql" for recoveries the connection_id()
result may differ from what was used when issuing the statement.
Fix: if there is a connection_id() in a statement, write to binlog
SET pseudo_thread_id= XXX; before it and use the value later on.
2007-08-01 15:27:03 +05:00
kostja@bodhi.(none)
b89ff2fd6f
Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-08-01 12:32:40 +04:00
kostja@bodhi.(none)
d0dc51b4f7
Fix an unstable test. It was reliant on the current time.
2007-08-01 12:28:08 +04:00
joerg@trift2.
c6bdcd19f2
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-08-01 09:59:48 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
c62d7528c8
Fix for bug #30088 : Can't disable myisam-recover by a value of "".
...
- test result.
Problem: we don't proper handle "" value of the --myisam-recover option.
Fix: turn off myisam recovering if --myisam-recover="" is set.
2007-08-01 11:41:13 +05:00
tsmith@ramayana.hindu.god
70e14610d6
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/jul31/51
2007-07-31 17:36:19 -06:00
kostja@bodhi.(none)
6238763281
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-07-31 23:47:38 +04:00
kostja@bodhi.(none)
1bf318b895
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.(none):/opt/local/work/mysql-5.0-runtime
2007-07-31 20:03:52 +04:00
kostja@bodhi.(none)
4b0bf30008
Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-07-31 20:00:05 +04:00
gkodinov/kgeorge@magare.gmz
d4329ea783
Addendum to bug 27417: poor test results fixes.
2007-07-31 18:04:05 +03:00
gkodinov/kgeorge@magare.gmz
daa5c20360
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B27417-5.0-opt
2007-07-31 15:23:25 +03:00
gkodinov/kgeorge@magare.gmz
7b797aaaca
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B27417-5.1-opt
2007-07-31 14:59:52 +03:00
gkodinov/kgeorge@magare.gmz
992698ce5f
merge of the fix for bug 17417 5.0-opt->5.1-opt
2007-07-31 14:58:04 +03:00
gshchepa/uchum@gleb.loc
355c25f0c2
Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-07-31 13:23:56 +05:00
gshchepa/uchum@gleb.loc
39c77427a6
sql_yacc.yy, sp.result, disabled.def:
...
Post-merge fix.
2007-07-31 13:22:01 +05:00
gshchepa/uchum@gleb.loc
c14d3d2f0d
Merge gleb.loc:/home/uchum/work/bk/5.0-opt-30120
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-07-31 12:09:59 +05:00
holyfoot/hf@hfmain.(none)
de8f84adfd
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/hf/work/29717/my50-29717
2007-07-31 11:53:56 +05:00
gshchepa/uchum@gleb.loc
120866c273
Merge gleb.loc:/home/uchum/work/bk/5.0-opt-30120
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-07-31 11:16:11 +05:00
gshchepa/uchum@gleb.loc
2bba46d3fd
Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-07-31 11:14:53 +05:00
holyfoot/hf@hfmain.(none)
d72a6b1227
Merge mysql.com:/home/hf/work/29717/my50-29717
...
into mysql.com:/home/hf/work/29717/my51-29717
2007-07-31 11:12:23 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
0c63efcaf5
merging
2007-07-31 11:10:03 +05:00
holyfoot/hf@hfmain.(none)
0ff0ed2732
Merge mysql.com:/home/hf/work/29717/my41-29717
...
into mysql.com:/home/hf/work/29717/my50-29717
2007-07-31 11:03:31 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
288ab1aa41
Merge mysql.com:/home/hf/work/029717/my41-29717
...
into mysql.com:/home/hf/work/29717/my41-29717
2007-07-31 11:00:19 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
f1ee2d0687
Bug #29717 INSERT INTO SELECT inserts values even if
...
SELECT statement itself returns empty.
As a result of this bug 'SELECT AGGREGATE_FUNCTION(fld) ... GROUP BY'
can return one row instead of an empty result set.
When GROUP BY only has fields of constant tables
(with a single row), the optimizer deletes the group_list.
After that we lose the information about whether we had an
GROUP BY statement. Though it's important
as SELECT min(x) from empty_table; and
SELECT min(x) from empty_table GROUP BY y; have to return
different results - the first query should return one row,
second - an empty result set.
So here we add the 'group_optimized_away' flag to remember this case
when GROUP BY exists in the query and is removed
by the optimizer, and check this flag in end_send_group()
2007-07-31 10:46:04 +05:00
kent@kent-amd64.(none)
fd3b865149
Merge mysql.com:/home/kent/bk/config_h/mysql-5.0-build
...
into mysql.com:/home/kent/bk/config_h/mysql-5.1-build
2007-07-30 21:45:06 +02:00
omer@linux.site
ce5044072e
Merge obarnir@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into linux.site:/home/omer/source/jrg51
2007-07-30 11:09:37 -07:00
cbell/Chuck@mysql_cab_desk.
11fc097e8d
WL#3915 : (NDB) master's cols > slave
...
Corrective patch to fix test failures in pushbuild and add assertions
to help debug rpl_extraColmaster test failures.
2007-07-30 12:55:26 -04:00
gshchepa/uchum@gleb.loc
9200be40ea
bigint.test:
...
Fixing a typo in the test case.
2007-07-30 21:05:56 +05:00
gkodinov/kgeorge@magare.gmz
cfbfb8bae8
(Pushing for Andrei)
...
Merge magare.gmz:/home/kgeorge/mysql/work/B27417-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/B27417-5.1-opt
2007-07-30 19:02:21 +03:00