Commit graph

26810 commits

Author SHA1 Message Date
eric@mysql.com
5008a5f208 Move handler specific options into handlerton flag check
BUG#13108
2005-09-30 16:26:48 -07:00
hartmut@mysql.com
16cd4bd332 Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/hartmut/projects/mysql/dev/5.0
2005-09-30 18:16:57 +02:00
hartmut@mysql.com
95525485b2 CygWin build fix (Bug #13640) 2005-09-30 18:06:38 +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
marko@hundin.mysql.fi
4dcd698b86 Merge hundin.mysql.fi:/home/marko/mysql-4.1
into  hundin.mysql.fi:/home/marko/mysql-5.0-bk
2005-09-30 15:56:01 +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
jani@a193-229-222-105.elisa-laajakaista.fi
ae745ef283 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc
2005-09-30 15:29:01 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
ff2da1c0ca Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc
2005-09-30 15:17:37 +03:00
marko@hundin.mysql.fi
17b0098127 InnoDB: After review fix 2005-09-30 15:06:41 +03: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
ffa4d71c97 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 13:42:10 +02:00
jonas@perch.ndb.mysql.com
a9417648fd ndb -
Fix compile error with gcc296
2005-09-30 13:40:02 +02:00
joerg@mysql.com
1345d1bf87 Raise the version. 2005-09-30 13:37:19 +02:00
jonas@perch.ndb.mysql.com
78ba02f26e 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 13:18:31 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
b97a77e824 Fix for Bug#12629, "mysqld_multi produces syntax error".
Quote here is unneccessary as it should all be handled in
quote_opt_arg().
2005-09-30 14:02:31 +03:00
marko@hundin.mysql.fi
8c1ccbc903 InnoDB: On UPDATE, trim UCS2 columns correctly. (Bug #12178) 2005-09-30 13:58:00 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
26b3ef7f44 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc
2005-09-30 13:56:32 +03:00
joerg@mysql.com
ac259199e0 Merge mysql.com:/M50/noserver-5.0 into mysql.com:/M50/mysql-5.0 2005-09-30 12:49:14 +02:00
joerg@mysql.com
c90673de8b Change "mf_keycache.c" so that it can be compiled without thread support (bug#11680):
"configure --without-server"   (without giving "--enable-thread-safe-client").
2005-09-30 12:44:45 +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
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
2722dff13f 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 12:24:03 +02:00
jonas@perch.ndb.mysql.com
bb70442366 ndb_config
Check returnvalue on load/fetch configuration
2005-09-30 12:22:00 +02:00
sergefp@mysql.com
49954f6735 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-sept30-test
2005-09-30 14:21:10 +04:00
sergefp@mysql.com
3625ec5127 BUG#13081: Disable ROR-index_merge for NDB tables (by adding a
HA_KEY_SCAN_NOT_ROR index flag) as NDB index scans are not guaranteed to be ROR 
scans.
2005-09-30 14:20:15 +04: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
jani@a193-229-222-105.elisa-laajakaista.fi
43b544a968 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc
2005-09-30 12:36:23 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
aa08fd0d0a Small fixes. 2005-09-30 12:35:12 +03: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
jonas@perch.ndb.mysql.com
035673c32d wl#1882
allow ndb_mgmd to use my.cnf for cluster configuration
2005-09-30 10:02:56 +02:00
jonas@perch.ndb.mysql.com
21153069fb export forced_defaults_file using global variable defaults_file
analog with defaults_extra_file and defaults_grouop_suffix
2005-09-30 09:54:53 +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
4dbe76d035 Comment adjusted (see fix for #13545) 2005-09-30 12:37:58 +05: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
stewart@mysql.com
dea64fb643 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
2005-09-30 14:45:02 +10:00
stewart@mysql.com
bb4f408112 more post-merge fixes for SingleUser log events 2005-09-30 14:44:24 +10:00
stewart@mysql.com
43d244652b Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
2005-09-30 14:34:53 +10: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