serg@mysql.com
30077692dc
innodb.result:
...
somehow it didn't get into the previous changeset
2005-10-04 21:37:50 +02:00
brian@zim.(none)
11be8401a7
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/brian/mysql/fix-5.0
2005-10-03 21:09:01 -07:00
kent@mysql.com
fe26e59d70
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-04 04:03:48 +02:00
brian@zim.(none)
2a42afd132
Final patch for 5.0 for simplifying storage engine code. We now have just one set of ifdefs. I may also remove the code for creating new handlers.
...
May changes were to simplify storage engine setup and support for legacy call to show storage engines.
2005-10-03 18:42:30 -07:00
timour@mysql.com
233e68e205
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-bug-13410
2005-10-03 22:02:22 +03:00
kent@mysql.com
f49ac24a0f
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-03 10:39:35 +02:00
msvensson@neptunus.(none)
25cf17f695
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug13231/my50-bug13231
2005-10-03 10:08:02 +02:00
kent@mysql.com
a7afd91e97
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-01 18:03:39 +02:00
kent@mysql.com
44f94ed2c9
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-01 17:24:13 +02:00
kent@mysql.com
d8b9f5be41
init_db.sql:
...
mysql.user.password doesn't need utf8
2005-10-01 17:21:09 +02:00
sergefp@mysql.com
90414dcaaf
BUG#13484: In ha_innobase::cmp_ref call Field::key_cmp() as this is the function
...
that compares key images.
2005-10-01 11:56:01 +04:00
timour@mysql.com
77cf84186e
Fix for BUG#13410 - qualified reference to a view column in the HAVING clause cannot be resolved.
...
The problem was then when a column reference was resolved to a view column, the new Item
created for this column contained the name of the view, and not the view alias.
2005-10-01 09:35:30 +03:00
eric@mysql.com
b2f5281929
Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/eric/dev/hton-mysql-5.0
2005-09-30 16:28:47 -07:00
eric@mysql.com
5008a5f208
Move handler specific options into handlerton flag check
...
BUG#13108
2005-09-30 16:26:48 -07:00
anozdrin@mysql.com
d3c0fd2bce
WL#2789 "Instance Manager: test using mysql-test-run testing framework"
...
Add Instance Manager tests.
2005-10-01 01:14:50 +04:00
anozdrin@mysql.com
c73e03ff22
WL#2789 "Instance Manager: test using mysql-test-run testing framework"
...
1) Add support to testing Instance Manager in daemon mode;
2) Don't run Instance Manager tests when running with --ps-protocol option;
2005-10-01 01:12:14 +04:00
kent@mysql.com
aef1f4cd2e
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-09-30 22:37:55 +02:00
kent@mysql.com
185b5636f4
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
2005-09-30 22:01:34 +02:00
serg@serg.mylan
bef3c587c6
Bug#11238
...
"SELECT ... FOR UPDATE executed as consistent read inside LOCK TABLES"
Do not discard lock_type information as handler::start_stmt() may require knowledge.
(fixed by Antony)
2005-09-30 20:20:10 +02:00
msvensson@neptunus.(none)
92b1d080c9
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug13231/my50-bug13231
2005-09-30 16:51:35 +02:00
kent@mysql.com
7b2e04d5a2
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
2005-09-30 16:37:02 +02:00
timour@mysql.com
1740f72305
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-bug-13597
2005-09-30 17:01:55 +03:00
kent@mysql.com
ea3baa035f
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-09-30 14:34:39 +02:00
kent@mysql.com
f3cb039c0b
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-09-30 14:06:08 +02:00
jonas@perch.ndb.mysql.com
aa10174652
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
2005-09-30 12:27:39 +02:00
jonas@perch.ndb.mysql.com
6169d529e5
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-09-30 12:25:46 +02:00
jonas@perch.ndb.mysql.com
b43d0f0495
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
2005-09-30 12:25:39 +02:00
jonas@perch.ndb.mysql.com
f334a14952
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-09-30 12:24:56 +02:00
jonas@perch.ndb.mysql.com
6cff2db932
ndb
...
Add support/test for using my.cnf [cluster_config]
2005-09-30 12:19:15 +02:00
serg@serg.mylan
fff2737b0e
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-09-30 12:04:10 +02:00
serg@serg.mylan
8c813c0a16
duplicate error message removed
2005-09-30 12:01:39 +02:00
jonas@perch.ndb.mysql.com
1e6f19074e
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2005-09-30 11:42:33 +02:00
jonas@perch.ndb.mysql.com
a30faa3b34
ndb -
...
add support for reading config.ini from ndb_config
(as alternative to contacting ndb_mgmd)
2005-09-30 11:39:49 +02:00
guilhem@mysql.com
fd9a6f9750
Tell the user that this ROLLBACK is added by mysqlbinlog (so that he does not wonder if it's present in binlog). This was brought up by Salle - thanks Salle.
2005-09-30 10:58:24 +02:00
serg@serg.mylan
69909c460a
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-09-30 09:40:49 +02:00
timour@mysql.com
638198e17d
Fix for BUG#13597 - columns in ON condition not resolved if references a table in a nested right join.
...
The problem was in that when finding the last table reference in a nested join tree,
the procedure doing the iteration over the right-most branches of a join tree
was testing for RIGHT JOINs the table reference that represents the join, and not
the second operand of the JOIN. Currently the information whether a join is LEFT/RIGHT
is stored not on the join object itself, but on one of its operands.
2005-09-30 10:39:17 +03:00
ramil@mysql.com
63fa48c0f6
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-09-30 12:30:32 +05:00
sergefp@mysql.com
10860b1108
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug13455
2005-09-30 07:07:50 +04:00
sergefp@mysql.com
e0268dbcfd
Adjust test results changed because of fix for BUG#13455
2005-09-30 07:06:04 +04:00
kent@mysql.com
d50b5920e0
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-09-30 02:15:36 +02:00
acurtis@xiphis.org
2e4a1862da
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into xiphis.org:/usr/home/antony/work2/p2-bug10586.5
2005-09-30 00:09:51 +01:00
acurtis@xiphis.org
39bbba6e55
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into xiphis.org:/usr/home/antony/work2/p2-bug10586.5
2005-09-29 23:54:46 +01:00
kent@mysql.com
822a4ac5bb
mtr_report.pl:
...
Text formatting, adjust table header
mysql-test-run.pl:
Remove requirement for source tree to run embedded server test
mysqldump.test:
Removed ending ';' from --exec line
2005-09-30 00:52:18 +02:00
sergefp@mysql.com
7d383eecb5
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug13455
2005-09-30 01:38:04 +04:00
sergefp@mysql.com
71d8990f8e
Fix for BUG#13455: Make "ref" optimizer able to make this inference:
...
"t.key BETWEEN c1 AND c2" and c1 = c2 -> can access table t using "t.key = c1".
2005-09-30 01:34:19 +04:00
ramil@mysql.com
920e456549
fix for bug #13545 : Server crash caused by select query.
2005-09-29 19:34:21 +05:00
pem@mysql.com
f85dd7cee5
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/mysql-5.0
2005-09-29 15:53:28 +02:00
pem@mysql.com
9f20feea5b
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/mysql-5.0
2005-09-29 14:35:08 +02:00
gluh@eagle.intranet.mysql.r18.ru
cac5b085cd
after merge fix
2005-09-29 17:21:32 +05:00
ingo@mysql.com
0af6e68acf
Merge mysql.com:/home/mydev/mysql-4.1-4100
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-09-29 14:07:32 +02:00