Commits · 81b0120444a338f1a5ecb4d136794bf7b3e7eaaf · nexedi / MariaDB

12 Mar, 2007 9 commits

unknown authored Mar 12, 2007

  Removed references to my_winsem.c


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

81b01204

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

unknown authored Mar 12, 2007

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


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

394c9b50

Makefile.am, CMakeLists.txt: · f9fe4f4e

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

f9fe4f4e

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

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

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

a65ac7fa

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

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

f35857a0

mysys_ia64.dsp, mysys.vcproj: · c9f146bc

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

c9f146bc

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


include/Makefile.am:
  Auto merged
```
84ea1a3a

Makefile.am, configure.in, mysys.dsp: · 96695de3

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

96695de3

10 Mar, 2007 9 commits

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

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

8354916f

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

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

1625806e

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

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.

e3cf2fa2

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

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

492f3c34

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

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.

fe8951d6

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


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

bd62f9eb

09 Mar, 2007 22 commits

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

Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized · 9cc553a2

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.

9cc553a2

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

aff46232

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

unknown authored Mar 09, 2007

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


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

b279da4f

Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca · 17d85a15

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

17d85a15

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

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

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

2544b595

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

unknown authored Mar 09, 2007

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


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

6470d024

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

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

03a96967

Bug #26825 MySQL Server Crashes in high load · 6803e7ec

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

6803e7ec

Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt · 8b3468ce

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

8b3468ce

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

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

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

876ff452

Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca · 5730f194

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

5730f194

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

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

38cd620f

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

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

55e0aea0

Bug #26281: · 77d751de

unknown authored Mar 09, 2007

 Fixed boundry checks in the INSERT() function:
 were one off.


mysql-test/r/func_str.result:
  Bug #26281: test case
mysql-test/t/func_str.test:
  Bug #26281: test case
sql/item_strfunc.cc:
  Bug #26281: fixed boundry checks

77d751de

Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · d9834d8b
unknown authored Mar 09, 2007
```
into  olga.mysql.com:/home/igor/mysql-5.0-opt


sql/item.cc:
  Auto merged
```
d9834d8b