Commits · 670c91de3401ccf0648a533c9c69723e41ed39fa · Kirill Smelkov / mariadb

12 Mar, 2007 11 commits

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 670c91de
unknown authored Mar 12, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
```
670c91de

unknown authored Mar 12, 2007

  Removed references to my_winsem.c


mysys/CMakeLists.txt:
  Removed references to my_winsem.c

428a7f66

Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build · c0f1f2cb

unknown authored Mar 12, 2007

into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build


BitKeeper/deleted/.del-CMakeLists.txt~14:
  Auto merged

c0f1f2cb

Makefile.am, CMakeLists.txt: · 74536862

unknown authored Mar 12, 2007

  Removed references to my_winsem.c


mysys/CMakeLists.txt:
  Removed references to my_winsem.c
mysys/Makefile.am:
  Removed references to my_winsem.c

74536862

Merge trift2.:/MySQL/M51/mysql-5.1 · 595130b0
unknown authored Mar 12, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
595130b0
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 · d438739d
unknown authored Mar 12, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
```
d438739d

Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build · e5ec5241

unknown authored Mar 12, 2007

into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build


configure.in:
  Auto merged
mysys/Makefile.am:
  Auto merged
BitKeeper/deleted/.del-mysys.dsp~32695fee91189326:
  Auto merged
BitKeeper/deleted/.del-mysys.vcproj~40a49d09c4184822:
  Auto merged
BitKeeper/deleted/.del-mysys_ia64.dsp~7a98bd8cd01d3043:
  Auto merged

e5ec5241

Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build · deeb3ee4

unknown authored Mar 12, 2007

into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build


VC++Files/mysys/mysys.vcproj:
  Auto merged
VC++Files/mysys/mysys_ia64.dsp:
  Auto merged
mysys/Makefile.am:
  Auto merged
BitKeeper/deleted/.del-my_semaphore.c:
  Auto merged
VC++Files/mysys/mysys.dsp:
  SCCS merged

deeb3ee4

mysys_ia64.dsp, mysys.vcproj: · d429f590

unknown authored Mar 12, 2007

  Removed references to unused files


VC++Files/mysys/mysys.vcproj:
  Removed unused files
VC++Files/mysys/mysys_ia64.dsp:
  Removed unused files

d429f590

Merge mysql.com:/home/kent/bk/tmp/mysql-4.0 · d4d8d132
unknown authored Mar 12, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build


include/Makefile.am:
  Auto merged
```
d4d8d132

Makefile.am, configure.in, mysys.dsp: · 32b370bb

unknown authored Mar 12, 2007

  Removed unused files
.del-my_winsem.c:
  Delete: mysys/my_winsem.c
.del-my_semaphore.c:
  Delete: mysys/my_semaphore.c
.del-my_semaphore.h:
  Delete: include/my_semaphore.h


BitKeeper/deleted/.del-my_semaphore.c:
  Delete: mysys/my_semaphore.c
BitKeeper/deleted/.del-my_semaphore.h:
  Delete: include/my_semaphore.h
BitKeeper/deleted/.del-my_winsem.c:
  Delete: mysys/my_winsem.c
VC++Files/mysys/mysys.dsp:
  Removed unused files
configure.in:
  Removed unused files
include/Makefile.am:
  Removed unused files
mysys/Makefile.am:
  Removed unused files

32b370bb

10 Mar, 2007 9 commits

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 8a140cb7

unknown authored Mar 11, 2007

into  moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.1-opt


mysql-test/r/explain.result:
  Auto merged
mysql-test/r/func_default.result:
  Auto merged
mysql-test/r/func_regexp.result:
  Auto merged
mysql-test/r/func_test.result:
  Auto merged
mysql-test/r/having.result:
  Auto merged
mysql-test/r/olap.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/r/varbinary.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
mysql-test/r/func_str.result:
  Manually merged
mysql-test/t/func_str.test:
  Manually merged

8a140cb7

Merge moonbone.local:/mnt/gentoo64/work/15757-bug-5.0-opt-mysql · 2f774b47

unknown authored Mar 10, 2007

into  moonbone.local:/mnt/gentoo64/work/25373-bug-5.0-opt-mysql


sql/item_strfunc.cc:
  Auto merged
mysql-test/r/func_str.result:
  SCCS merged
mysql-test/t/func_str.test:
  SCCS merged

2f774b47

Bug#15757: Wrong SUBSTRING() result when a tmp table was employed. · 816ea8a3

unknown authored Mar 10, 2007

When the SUBSTRING() function was used over a LONGTEXT field the max_length of
the SUBSTRING() result was wrongly calculated and set to 0. As the max_length
parameter is used while tmp field creation it limits the length of the result
field and leads to printing an empty string instead of the correct result.

Now the Item_func_substr::fix_length_and_dec() function correctly calculates
the max_length parameter.


mysql-test/t/func_str.test:
  Added a test case for the bug#15757: Wrong SUBSTRING() result when a tmp table was employed.
mysql-test/r/func_str.result:
  Added a test case for the bug#15757: Wrong SUBSTRING() result when a tmp table was employed.
sql/item_strfunc.cc:
  Bug#15757: Wrong SUBSTRING() result when a tmp table was employed.
  Now the Item_func_substr::fix_length_and_dec() function correctly calculates
  the max_length parameter.

816ea8a3

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · c0a05435

unknown authored Mar 10, 2007

into  moonbone.local:/mnt/gentoo64/work/25373-bug-5.0-opt-mysql


mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
sql/item.cc:
  Auto merged

c0a05435

Fixed bug #26830: a crash for the query with a subselect containing ROLLUP. · 4d6ad7ac

unknown authored Mar 10, 2007

Crash happened because the function get_best_group_min_max detected
joins with ROLLUP incorrectly.


mysql-test/r/olap.result:
  Added a test case for bug #26830.
mysql-test/t/olap.test:
  Added a test case for bug #26830.

4d6ad7ac

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-build · d2499e2d
unknown authored Mar 10, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.1
```
d2499e2d
Merge poseidon.mysql.com:/home/tomas/mysql-5.0 · 17c96759
unknown authored Mar 10, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.1


mysql-test/t/disabled.def:
  manual merge
```
17c96759
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 3c811727
unknown authored Mar 10, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.0
```
3c811727
disabling _new_ unstable test case · ff94fdda
unknown authored Mar 10, 2007

ff94fdda

09 Mar, 2007 20 commits

Merge bk-internal:/home/bk/mysql-5.1-build · 509d507d
unknown authored Mar 09, 2007
```
into  production.mysql.com:/usersnfs/mjorgensen/bktrees/mysql-5.1-build
```
509d507d
Merge bk-internal:/home/bk/mysql-5.0 · 8f6972dd
unknown authored Mar 09, 2007
```
into  production.mysql.com:/usersnfs/mjorgensen/bktrees/mysql-5.0-build
```
8f6972dd

Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized · 944030ae

unknown authored Mar 10, 2007

away.

Additional fix for bug#22331. Now Item_field prints its value in the case of
the const field.


mysql-test/r/varbinary.result:
  Corrected test case after fix for bug#22331.
mysql-test/r/union.result:
  Corrected test case after fix for bug#22331.
mysql-test/r/subselect.result:
  Corrected test case after fix for bug#22331.
mysql-test/r/func_test.result:
  Corrected test case after fix for bug#22331.
mysql-test/r/having.result:
  Corrected test case after fix for bug#22331.
mysql-test/r/func_regexp.result:
  Corrected test case after fix for bug#22331.
mysql-test/r/func_str.result:
  Corrected test case after fix for bug#22331.
mysql-test/r/func_default.result:
  Corrected test case after fix for bug#22331.
mysql-test/r/explain.result:
  Corrected test case after fix for bug#22331.
sql/sql_union.cc:
  Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized
  away.
  Cleanup of the SELECT_LEX::order_list list.
sql/item.h:
  Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized
  away.
  Added the print() member function to the Item_field class.
sql/item.cc:
  Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized
  away.
  Added the print() member function to the Item_field class.

944030ae

Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca · e310db00
unknown authored Mar 09, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.1
```
e310db00
corrected returned error code · 435f37a5
unknown authored Mar 09, 2007

435f37a5

Merge poseidon.mysql.com:/home/tomas/mysql-5.0 · 8d007365

unknown authored Mar 09, 2007

into  poseidon.mysql.com:/home/tomas/mysql-5.1


storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged

8d007365

Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca · 75c20729

unknown authored Mar 09, 2007

into  poseidon.mysql.com:/home/tomas/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged

75c20729

Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb-clean · e2d34902
unknown authored Mar 09, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.0
```
e2d34902

Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca · f184c817

unknown authored Mar 09, 2007

into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca


storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  manual merge
storage/ndb/src/ndbapi/ndberror.c:
  manual merge

f184c817

Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca · 07fa209b

unknown authored Mar 09, 2007

into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb-clean


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged

07fa209b

added error code for failing send signal and timeout waiting for node failure · 7c143080

unknown authored Mar 09, 2007

added error code for failing send signal and timeout waiting for node failure


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  added error code for failing send signal and timeout waiting for node failure
ndb/src/ndbapi/ndberror.c:
  added error code for failing send signal and timeout waiting for node failure

7c143080

Bug #26825 MySQL Server Crashes in high load · e8510268

unknown authored Mar 09, 2007

Bug #26997  	mysqld segfault when in single user mode


sql/ha_ndbcluster.cc:
  make sure error is always set even if no proper error code from ndb
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  add error code for failing send signal (typically single user mode)
storage/ndb/src/ndbapi/ndberror.c:
  added error code for failing send signal and timeout waiting for node failure

e8510268

Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt · 209802eb

unknown authored Mar 09, 2007

into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt


mysql-test/r/union.result:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/item.cc:
  Auto merged

209802eb

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 52fb60da
unknown authored Mar 09, 2007
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B26281-5.0-opt
```
52fb60da
Merge bk@192.168.21.1:mysql-5.1 · d5f3bc14
unknown authored Mar 09, 2007
```
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
```
d5f3bc14
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 31796706
unknown authored Mar 09, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.1
```
31796706

Merge poseidon.mysql.com:/home/tomas/mysql-5.0 · b185e0c2

unknown authored Mar 09, 2007

into  poseidon.mysql.com:/home/tomas/mysql-5.1


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged

b185e0c2

Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca · 5621288a

unknown authored Mar 09, 2007

into  poseidon.mysql.com:/home/tomas/mysql-5.1


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged

5621288a

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · c7de22a1

unknown authored Mar 09, 2007

into  magare.gmz:/home/kgeorge/mysql/autopush/B26281-5.0-opt


sql/item_strfunc.cc:
  Auto merged
mysql-test/r/func_str.result:
  resolved test merge conflicts
mysql-test/t/func_str.test:
  resolved test merge conflicts

c7de22a1

Merge perch.ndb.mysql.com:/home/jonas/src/tmp/mysql-5.0-telco-gca · 019c72a4

unknown authored Mar 09, 2007

into  perch.ndb.mysql.com:/home/jonas/src/tmp/mysql-5.1-telco-gca


storage/ndb/tools/waiter.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  merge
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  merge

019c72a4