1b872243ab
Merge poseidon.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.mysql.com:/home/tomas/mysql-5.1
2007-03-10 11:49:08 +07:00
52b975a1c8
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into poseidon.mysql.com:/home/tomas/mysql-5.0
2007-03-10 11:49:04 +07:00
9ef9bfddd4
disabling _new_ unstable test case
2007-03-10 11:46:20 +07:00
0b769c25aa
Merge bk-internal:/home/bk/mysql-5.1-build
...
into production.mysql.com:/usersnfs/mjorgensen/bktrees/mysql-5.1-build
2007-03-09 23:20:50 +01:00
6be30eec86
Merge bk-internal:/home/bk/mysql-5.0
...
into production.mysql.com:/usersnfs/mjorgensen/bktrees/mysql-5.0-build
2007-03-09 23:01:12 +01:00
04f5c46d5d
Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized
...
away.
Additional fix for bug#22331. Now Item_field prints its value in the case of
the const field.
2007-03-10 00:29:02 +03:00
c03a483c51
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/WL3527-5.1-opt
2007-03-09 17:54:13 +02:00
7acdb67643
Merge bk-internal:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/work/WL3527-5.0-opt-merge
2007-03-09 16:30:44 +02:00
58d0267bb5
Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
...
into poseidon.mysql.com:/home/tomas/mysql-5.1
2007-03-09 21:02:52 +07:00
1a07a15cb6
corrected returned error code
2007-03-09 21:01:19 +07:00
6bea442d26
WL#3527: Extend IGNORE INDEX so places where index is ignored can
...
be specified
5.0 part of the fix. Implements IGNORE INDEX FOR JOIN as a synonym
of IGNORE INDEX for backward compatibility with the 5.1 fix.
2007-03-09 15:20:06 +02:00
eca8b1a62d
Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt
...
into mysql.com:/home/hf/work/mrg/mysql-5.1-opt
2007-03-09 16:51:32 +04:00
9625f2e902
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B26281-5.0-opt
2007-03-09 14:48:19 +02:00
71e6d69647
Merge bk@192.168.21.1:mysql-5.1
...
into mysql.com:/home/hf/work/mrg/mysql-5.1-opt
2007-03-09 16:37:36 +04:00
7e32a4b86b
Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
...
into poseidon.mysql.com:/home/tomas/mysql-5.1
2007-03-09 18:10:55 +07:00
86cba48b8f
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B26281-5.0-opt
2007-03-09 13:05:41 +02:00
5a6952b8c5
Merge perch.ndb.mysql.com:/home/jonas/src/tmp/mysql-5.0-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/tmp/mysql-5.1-telco-gca
2007-03-09 11:50:32 +01:00
740a5fd7fe
Bug #26281 :
...
Fixed boundry checks in the INSERT() function:
were one off.
2007-03-09 12:47:12 +02:00
e10d74cff9
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/mysql-5.0-opt
2007-03-09 02:45:17 -08:00
0a6f51075a
Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb-clean
...
into poseidon.mysql.com:/home/tomas/mysql-5.0
2007-03-09 17:28:38 +07:00
6f4da47843
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug26661
2007-03-09 01:50:17 -08:00
96cfd5ab91
Fixed bug #26661 : crash when order by clause in a union
...
construct references invalid name.
Derived tables currently cannot use outer references.
Thus there is no outer context for them.
The 4.1 code takes this fact into account while the
Item_field::fix_outer_field code of 5.0 lost the check that blocks
any attempts to resolve names in outer context for derived tables.
2007-03-09 01:45:32 -08:00
322b535a32
Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca
...
into poseidon.mysql.com:/home/tomas/mysql-5.0-ndb-clean
2007-03-09 16:40:19 +07:00
9b1281bb9a
ndb single user basic test
2007-03-09 16:39:13 +07:00
4ab2b8d782
aftermerge fix
2007-03-09 13:38:40 +04:00
4752db40e8
aftermerge fix
2007-03-09 13:37:06 +04:00
0ba036f783
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into blade08.mysql.com:/data0/istruewing/autopush/mysql-5.1-bug25673
2007-03-09 10:08:39 +01:00
965ca42544
rpl_ssl.result, rpl_ssl.test:
...
Mask out *_Master_Log_Pos in rpl_ssl test; it varies depending on binlog format
2007-03-08 19:57:35 +01:00
cdcf3ec097
Merge bk@192.168.21.1:mysql-5.1
...
into mysql.com:/home/hf/work/mrg/mysql-5.1-opt
2007-03-08 22:04:17 +04:00
11dd0fa326
Merge bk@192.168.21.1:mysql-5.0
...
into mysql.com:/home/hf/work/mrg/mysql-5.0-opt
2007-03-08 21:42:41 +04:00
618ccf376f
Merge bk@192.168.21.1:mysql-4.1
...
into mysql.com:/home/hf/work/mrg/mysql-4.1-opt
2007-03-08 21:14:31 +04:00
48d3e2c1bb
merging
2007-03-08 20:57:12 +04:00
4374a47090
Update result for 5.1
2007-03-08 16:47:18 +01:00
75be7cd1ae
Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt
...
into mysql.com:/home/hf/work/mrg/mysql-5.1-opt
2007-03-08 19:08:28 +04:00
193c3178bc
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
2007-03-08 15:10:24 +01:00
dd16b217c7
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-08 14:56:08 +01:00
433d3e6cf7
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-08 14:55:39 +01:00
2739246719
Merge bk-internal:/home/bk/mysql-5.1-new-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-08 13:31:37 +01:00
49d862230e
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-08 13:30:04 +01:00
a44009fe75
Merge chilla.local:/home/mydev/mysql-5.0-bug25673
...
into chilla.local:/home/mydev/mysql-5.1-bug25673
2007-03-08 12:13:54 +01:00
f1bbbcce22
Bug#25673 - spatial index corruption, error 126 incorrect key file for table
...
After merge fix
2007-03-08 12:08:59 +01:00
760714758e
Merge chilla.local:/home/mydev/mysql-4.1-bug25673
...
into chilla.local:/home/mydev/mysql-5.0-bug25673
2007-03-08 10:10:17 +01:00
2d6ad76abd
Bug#25673 - spatial index corruption, error 126
...
incorrect key file for table
In certain cases it could happen that deleting a row could
corrupt an RTREE index.
According to Guttman's algorithm, page underflow is handled
by storing the page in a list for later re-insertion. The
keys from the stored pages have to be inserted into the
remaining pages of the same level of the tree. Hence the
level number is stored in the re-insertion list together
with the page.
In the MySQL RTree implementation the level counts from zero
at the root page, increasing numbers for levels down the tree.
If during re-insertion of the keys the tree height grows, all
level numbers become invalid. The remaining keys will be
inserted at the wrong level.
The fix is to increment the level numbers stored in the
reinsert list after a split of the root block during reinsertion.
2007-03-08 09:54:37 +01:00
4656023eec
update test results for bdb_gis after merge of fix for b26038
2007-03-07 23:49:46 +01:00
999c1cdcc1
sql_select.cc:
...
Postfix for bug#22331 for windows platform.
explain.test, explain.result:
Cleanup after bugfix#22331.
2007-03-08 00:27:42 +03:00
8936e53fca
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/mnt/gentoo64/work/25373-bug-5.0-opt-mysql
2007-03-07 22:23:08 +03:00
c4fc9c5ef9
Merge moonbone.local:/mnt/gentoo64/work/22331-bug-5.0-opt-mysql
...
into moonbone.local:/mnt/gentoo64/work/25373-bug-5.0-opt-mysql
2007-03-07 22:22:19 +03:00
b81b814cd1
Bug#25373: Stored functions wasn't compared correctly which leads to a wrong
...
result.
For built-in functions like sqrt() function names are hard-coded and can be
compared by pointer. But this isn't the case for a used-defined stored
functions - names there are dynamical and should be compared as strings.
Now the Item_func::eq() function employs my_strcasecmp() function to compare
used-defined stored functions names.
2007-03-07 22:11:57 +03:00
7afa5f1c5a
Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized
...
away.
During optimization stage the WHERE conditions can be changed or even
be removed at all if they know for sure to be true of false. Thus they aren't
showed in the EXPLAIN EXTENDED which prints conditions after optimization.
Now if all elements of an Item_cond were removed this Item_cond is substituted
for an Item_int with the int value of the Item_cond.
If there were conditions that were totally optimized away then values of the
saved cond_value and having_value will be printed instead.
2007-03-07 21:44:58 +03:00
34a643b692
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug26560
2007-03-07 07:58:34 -08:00
