holyfoot/hf@mysql.com/hfmain.(none)
2b1179ad07
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/hf/work/mrg/mysql-5.0-opt
2007-03-09 13:44:43 +04:00
tomas@poseidon.mysql.com
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
tomas@poseidon.mysql.com
9b1281bb9a
ndb single user basic test
2007-03-09 16:39:13 +07:00
holyfoot/hf@mysql.com/hfmain.(none)
60e0dceae8
Merge mysql.com:/home/hf/work/mrg/mysql-4.1-opt
...
into mysql.com:/home/hf/work/mrg/mysql-5.0-opt
2007-03-09 13:39:03 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
4752db40e8
aftermerge fix
2007-03-09 13:37:06 +04:00
tomas@poseidon.mysql.com
97683c4a98
Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb-clean
...
into poseidon.mysql.com:/home/tomas/mysql-5.0
2007-03-09 15:50:21 +07:00
tomas@poseidon.mysql.com
56442970a0
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 15:38:44 +07:00
tomas@poseidon.mysql.com
b8fda36478
Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
...
- correction of part 1
add ndb_waiter option to wait for single user mode
2007-03-09 15:37:10 +07:00
anozdrin/alik@booka.opbmk
bd5b38d66c
Fix typo.
2007-03-09 10:44:48 +03:00
Kristofer.Pettersson@naruto.
ab28345a4b
Merge naruto.:C:/cpp/bug25042/my50-bug25042
...
into naruto.:C:/cpp/mysql-5.0-maint
2007-03-09 08:02:29 +01:00
Kristofer.Pettersson@naruto.
f519821216
Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint
...
into naruto.:C:/cpp/mysql-5.0-maint
2007-03-09 07:51:40 +01:00
anozdrin/alik@booka.opbmk
c666e2f276
Polishing: use constants instead of magic numbers.
2007-03-09 08:05:08 +03:00
istruewing@chilla.local
c029dbecf7
Merge chilla.local:/home/mydev/mysql-4.1-bug25673
...
into chilla.local:/home/mydev/mysql-5.0-bug25673
2007-03-08 19:23:36 +01:00
istruewing@chilla.local
90f23116e2
Bug#25673 - spatial index corruption, error 126 incorrect key file for table
...
After backport fix.
Added forgotten DBUG_RETURNs, which was detected in 5.1 only.
2007-03-08 19:22:43 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
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
holyfoot/hf@mysql.com/hfmain.(none)
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
df@pippilotta.erinye.com
7665f50e9c
add comment to compiler_warnings.supp
2007-03-08 18:12:16 +01:00
evgen@moonbone.local
35e5925673
sql_select.cc:
...
Postfix for bug#22331.
2007-03-08 19:38:21 +03:00
msvensson@pilot.blaudden
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
msvensson@pilot.blaudden
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
msvensson@pilot.blaudden
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
kroki/tomash@moonlight.home
1792908381
Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.0
...
into moonlight.home:/home/tomash/src/mysql_ab/mysql-5.0-bug20492
2007-03-08 15:16:21 +03:00
istruewing@chilla.local
f1bbbcce22
Bug#25673 - spatial index corruption, error 126 incorrect key file for table
...
After merge fix
2007-03-08 12:08:59 +01:00
istruewing@chilla.local
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
kostja@bodhi.local
a52a1f8d56
Fix -ansi -pedantic warning (can't cast a pointer to function
...
to a pointer to object, that is, int foo(); void *bar= (void*) foo
is not allowed.
2007-03-08 12:04:45 +03:00
istruewing@chilla.local
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
tsmith@quadxeon.mysql.com
fee7ab58c6
comp_err.c: return ha_checksum from checksum_format_specifier() - more correct, avoid a compiler warning
2007-03-08 08:15:30 +01:00
tulin/mysqldev@mysql.com/production.mysql.com
34c3cd810e
Merge bk-internal:/home/bk/mysql-5.0-ndb
...
into mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-maint
2007-03-08 04:23:19 +01:00
tomas@poseidon.mysql.com
948ed82a2c
Merge poseidon.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
2007-03-08 08:33:38 +07:00
tsmith@quadxeon.mysql.com
faecfb44a4
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/50
2007-03-08 02:22:50 +01:00
tsmith@quadxeon.mysql.com
d093ba4757
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/41
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/50
2007-03-08 01:12:09 +01:00
tsmith@quadxeon.mysql.com
5959e8a60a
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/40
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/41
2007-03-08 01:06:04 +01:00
tsmith@quadxeon.mysql.com
de61dde90b
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/50
2007-03-08 01:00:49 +01:00
tsmith@quadxeon.mysql.com
6661e6b4a3
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1-build
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/41
2007-03-08 00:59:15 +01:00
tsmith@quadxeon.mysql.com
c06499b210
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/50
2007-03-07 23:55:25 +01:00
tsmith@quadxeon.mysql.com
a5e0f606af
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/40
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/40
2007-03-07 23:54:52 +01:00
tsmith@quadxeon.mysql.com
4656023eec
update test results for bdb_gis after merge of fix for b26038
2007-03-07 23:49:46 +01:00
kent@mysql.com/kent-amd64.(none)
781b271c6f
Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-03-07 23:07:03 +01:00
kent@mysql.com/kent-amd64.(none)
8b2a4b2c47
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-03-07 23:05:46 +01:00
kent@mysql.com/kent-amd64.(none)
5736467ab6
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/kent/bk/tmp/mysql-4.1-build
2007-03-07 23:04:25 +01:00
evgen@moonbone.local
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
evgen@moonbone.local
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
evgen@moonbone.local
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
evgen@moonbone.local
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
evgen@moonbone.local
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
malff/marcsql@weblab.(none)
1f91f47d5e
Bug 8407, post review cleanup: use instr::get_cont_dest() to get the instruction
...
continuation instruction, for CONTINUE exception handlers.
2007-03-07 09:53:46 -07:00
igor@olga.mysql.com
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
iggy@recycle.(none)
d3bdfa2c30
Bug#25222 Win32 HANDLE leak in my_sopen()
...
- When attempting to associate a Windows File handle to a C run-time file
handle there is an upper bound. Once reached, the newly created handles
will cause a memory leak since they are not properly associated with a
handle that can later be cleaned up.
2007-03-07 10:46:38 -05:00
gkodinov/kgeorge@macbook.gmz
d2c977a935
Bug #26672 :
...
DATE/DATETIME values are out of the currently supported
4 basic value types (INT,STRING,REAL and DECIMAL).
So expressions (not fields) of compile type DATE/DATETIME are
generally considered as STRING values. This is not so
when they are compared : then they are compared as
INTEGER values.
But the rule for comparison as INTEGERS must be checked
explicitly each time when a comparison is to be performed.
filesort is one such place. However there the check was
not done and hence the expressions (not fields) of type
DATE/DATETIME were sorted by their string representation.
Fixed to compare them as INTEGER values for filesort.
2007-03-07 14:51:45 +02:00
kostja@bodhi.local
b89b192201
A fix for the windows build (harmless warning).
2007-03-07 14:03:44 +03:00