Commit graph

35642 commits

Author SHA1 Message Date
unknown
e95357d72f Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
into  mysql.com:/home/svoj/devel/mysql/BUG25729/mysql-5.0-engines


sql/item_func.cc:
  Auto merged
2007-04-03 12:11:51 +05:00
unknown
3c763afc9c BUG#25729 - boolean full text search is confused by NULLs produced by
LEFT JOIN
Fixed that in certain situations MATCH ... AGAINST returns false hits
for NULLs produced by LEFT JOIN when there is no fulltext index
available.


mysql-test/r/fulltext_left_join.result:
  A test case for BUG#25729.
mysql-test/t/fulltext_left_join.test:
  A test case for BUG#25729.
sql/item_func.cc:
  concat_ws(NULL) returns empty string instead of NULL. There is not much
  sense to calculate relevance for empty strings, thus return 0 immediately
  if we got NULL or empty string from concat_ws.
sql/item_func.h:
  Item_func_match::concat renamed to concat_ws.
2007-04-02 17:26:39 +05:00
unknown
55b096b8f0 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
into  mysql.com:/home/svoj/devel/mysql/BUG26138/mysql-5.0-engines
2007-03-31 12:24:28 +05:00
unknown
fe8c67effa Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  chilla.local:/home/mydev/mysql-5.0-axmrg


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
2007-03-30 11:02:19 +02:00
unknown
0da1a0cdec BUG#26138 - REPAIR TABLE with option USE_FRM erases all records in
ARCHIVE table
ARCHIVE table was truncated by REPAIR TABLE ... USE_FRM statement.
The table handler returned its file name extensions in a wrong order.
REPAIR TABLE believed it has to use the meta file to create a new table
from it.

With the fixed order, REPAIR TABLE does now use the data file to create
a new table. So REPAIR TABLE ... USE_FRM works well with ARCHIVE engine
now.

This issue affects 5.0 only, since in 5.1 ARCHIVE engine stores meta
information and data in the same file.


mysql-test/r/archive.result:
  A test case for bug#26138.
mysql-test/t/archive.test:
  A test case for bug#26138.
sql/examples/ha_example.cc:
  Added a comment.
sql/ha_archive.cc:
  First element of engine file name extentions array should be meta/index
  file extention. Second element - data file extention. This is true
  for engines that have separate meta/index file and data file.
  
  Reoder ha_archive_exts elements to meet described above requirement.
sql/handler.h:
  Added a comment.
sql/sql_table.cc:
  Added a comment.
2007-03-30 13:00:21 +05:00
unknown
29741b71ca Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  chilla.local:/home/mydev/mysql-5.0-axmrg
2007-03-29 21:32:34 +02:00
unknown
817a474c3d Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
into  mysql.com:/home/svoj/devel/mysql/BUG25521/mysql-5.0-engines
2007-03-29 21:50:54 +05:00
unknown
8122b0caa4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-03-29 14:20:34 +02:00
unknown
406fd12ad4 configure.in:
Don't install ndb man pages if no ndb configured
config-win.h, CMakeLists.txt, README, configure.js:
  Removed Cybozu patches


configure.in:
  Don't install ndb man pages if no ndb configured
CMakeLists.txt:
  Removed Cybozu patches
include/config-win.h:
  Removed Cybozu patches
win/README:
  Removed Cybozu patches
win/configure.js:
  Removed Cybozu patches
2007-03-28 23:00:50 +02:00
unknown
e8a25c95d3 BUG#25521 - optimize table, delete, show table status leads to table
losing it's .MYD

When OPTIMIZE TABLE is completed it attempts to rename temporary
file to original name. This step may fail on windows when a file
is opened. As a result data file might be deleted and optimized
copy of file (table_name.MYD) remains.

This situation is handled properly by my_delete_allow_opened, so
use it instead of my_delete when attempting to rename a file on
windows.

No suitable test case for this bug.


mysys/my_redel.c:
  Attempting to delete an opened file and to immediately create
  a new one with the same name may result in my_redel failure on
  windows. It may fail because file is not deleted until it is
  closed.
  
  This situation is handled properly by my_delete_allow_opened, so
  use it instead of my_delete.
2007-03-28 21:09:16 +05:00
unknown
660cb2fdea After merge fix 2007-03-28 12:11:44 +02:00
unknown
5cf5779af1 Merge chilla.local:/home/mydev/mysql-4.1-axmrg
into  chilla.local:/home/mydev/mysql-5.0-axmrg


myisam/mi_range.c:
  Auto merged
myisam/mi_search.c:
  Auto merged
mysql-test/r/heap_btree.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
mysql-test/r/myisam.result:
  Manual merge from 4.1
mysql-test/t/heap_btree.test:
  Manual merge from 4.1
2007-03-28 10:25:51 +02:00
unknown
fe6a7bdbe3 Merge chilla.local:/home/mydev/mysql-5.0--main
into  chilla.local:/home/mydev/mysql-5.0-axmrg
2007-03-28 10:21:38 +02:00
unknown
a7573962e3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  chilla.local:/home/mydev/mysql-5.0-axmrg
2007-03-28 10:20:46 +02:00
unknown
a6f6c7d5cf Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
- test case
2007-03-28 10:10:27 +02:00
unknown
f6eca60afb Merge chilla.local:/home/mydev/mysql-4.1--main
into  chilla.local:/home/mydev/mysql-4.1-axmrg
2007-03-28 09:00:00 +02:00
unknown
cd07f122ad Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  chilla.local:/home/mydev/mysql-4.1-axmrg
2007-03-28 08:59:30 +02:00
unknown
17a4df4226 Merge chilla.local:/home/mydev/mysql-4.1--team
into  chilla.local:/home/mydev/mysql-4.1-axmrg


sql/ha_myisam.cc:
  Auto merged
2007-03-28 08:58:55 +02:00
unknown
30bf8b6996 Merge chilla.local:/home/mydev/mysql-4.1-bug26231
into  chilla.local:/home/mydev/mysql-4.1-axmrg
2007-03-28 08:57:46 +02:00
unknown
fd3b723562 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
into  chilla.local:/home/mydev/mysql-4.1-bug24985


mysql-test/r/heap_btree.result:
  Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
              causes incorrect duplicate entries
  Manual merge
mysql-test/t/heap_btree.test:
  Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
              causes incorrect duplicate entries
  Manual merge
2007-03-28 08:51:12 +02:00
unknown
c4b440aaf0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
into  chilla.local:/home/mydev/mysql-5.0-bug24985


sql/ha_myisam.cc:
  Auto merged
mysql-test/r/heap_btree.result:
  Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
              causes incorrect duplicate entries
  Manual merge
mysql-test/t/heap_btree.test:
  Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
              causes incorrect duplicate entries
  Manual merge
2007-03-27 21:19:25 +02:00
unknown
96366a2deb Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-03-27 18:11:48 +02:00
unknown
ffa3c301e2 Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build


Makefile.am:
  Added target for RPM debug mysql-test-run
2007-03-27 17:51:30 +02:00
unknown
0d5a969ace mysql.spec.sh, Makefile.am:
Don't use explicit calls to mysql-test-run in spec


Makefile.am:
  Don't use explicit calls to mysql-test-run in spec
support-files/mysql.spec.sh:
  Don't use explicit calls to mysql-test-run in spec
2007-03-27 17:42:55 +02:00
unknown
de3c371956 Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
causes incorrect duplicate entries
After merge fix
2007-03-27 12:39:31 +02:00
unknown
42422d0e62 Merge chilla.local:/home/mydev/mysql-4.1-bug24985
into  chilla.local:/home/mydev/mysql-5.0-bug24985


mysql-test/r/heap_btree.result:
  Auto merged
sql/ha_heap.cc:
  Auto merged
mysql-test/t/heap_btree.test:
  Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
              causes incorrect duplicate entries
  Manual merge from 4.1
2007-03-27 10:54:37 +02:00
unknown
1fd0ba8909 Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
causes incorrect duplicate entries

Keys for BTREE indexes on ENUM and SET columns of MEMORY tables
with character set UTF8 were computed incorrectly. Many
different column values got the same key value.

Apart of possible performance problems, it made unique indexes
of this type unusable because it rejected many different
values as duplicates.

The problem was that multibyte character detection was tried
on the internal numeric column value. Many values were not
identified as characters. Their key value became blank filled.

Thanks to Alexander Barkov and Ramil Kalimullin for the patch,
which sets the character set of ENUM and SET key segments to
the pseudo binary character set.


mysql-test/r/heap_btree.result:
  Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
              causes incorrect duplicate entries
  Added test result.
mysql-test/t/heap_btree.test:
  Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
              causes incorrect duplicate entries
  Added test.
sql/ha_heap.cc:
  Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
              causes incorrect duplicate entries
  Set key segment charset to my_charset_bin for ENUM and SET
  columns.
2007-03-27 10:49:48 +02:00
unknown
b339b30c55 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-03-26 21:02:14 +02:00
unknown
d24dab182f correct medium int printout
correct cit printout
    correct bit store retrieve


ndb/include/ndbapi/NdbRecAttr.hpp:
  correct medium int printout
ndb/src/ndbapi/NdbRecAttr.cpp:
  correct cit printout
sql/ha_ndbcluster.cc:
  correct bit store retrieve
2007-03-26 17:57:00 +02:00
unknown
05a352bb99 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-03-26 14:49:24 +02:00
unknown
e3f3c6f0b6 Bug #26986 BIT(33) for ndb is broken on solaris.
- always store lsw first in ndb
2007-03-26 14:48:52 +02:00
unknown
f28a7a0674 Merge clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb
into  clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-bug24028
2007-03-26 12:50:40 +02:00
unknown
df4d3039c3 remove warning 2007-03-26 10:39:11 +02:00
unknown
d37fc3ce1f Bug #26900 ndb_restore printout option does not give structured data
- set sizes for data
2007-03-26 09:58:01 +02:00
unknown
9f9a4556df Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-user
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
2007-03-25 16:44:06 +02:00
unknown
03089d8977 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
into  chilla.local:/home/mydev/mysql-4.1--team


sql/ha_myisam.cc:
  Auto merged
2007-03-25 15:13:22 +02:00
unknown
de1d7c23f6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  chilla.local:/home/mydev/mysql-4.1--main
2007-03-25 15:11:16 +02:00
unknown
578d29d6f3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
into  chilla.local:/home/mydev/mysql-5.0--team


sql/ha_myisam.cc:
  Auto merged
2007-03-25 14:44:16 +02:00
unknown
7910abf4b9 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  chilla.local:/home/mydev/mysql-5.0--main


sql/ha_ndbcluster.cc:
  Auto merged
2007-03-25 14:40:25 +02:00
unknown
27f8c35760 Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build


sql/mysqld.cc:
  Auto merged
2007-03-24 14:05:27 +02:00
unknown
a1e7490f41 nptl: typo fixed. sigaddset restored 2007-03-24 14:03:27 +02:00
unknown
85e1718e00 bug in im* tests - missing --no-defaults in the mysql command line 2007-03-23 22:16:32 +02:00
unknown
1e92dcae89 Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build


mysys/thr_alarm.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
2007-03-23 20:39:34 +02:00
unknown
d89329c685 reverted linuxthreads thr_client_alarm fix (not future-proof)
fixed differently: wake up select_thread with THR_SERVER_ALARM instead


mysys/thr_alarm.c:
  reverted linuxthreads thr_client_alarm fix (not future-proof)
2007-03-23 20:37:20 +02:00
unknown
7dc5c00453 enabled and extended single user test 2007-03-23 17:14:38 +01:00
unknown
1404365643 Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  abort on timeout if in single user mode
2007-03-23 17:07:33 +01:00
unknown
c62c0d9df8 Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build


mysys/thr_alarm.c:
  Auto merged
sql/mysqld.cc:
  SCCS merged
2007-03-23 16:37:19 +02:00
unknown
29bf3ad4fb Merge bk-internal:/home/bk/mysql-5.0
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build
2007-03-23 16:32:42 +02:00
unknown
cc72a835d6 Merge bk-internal:/home/bk/mysql-4.1-build
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2007-03-23 16:05:02 +02:00
unknown
06083cdc03 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-user
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-single-user


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  manual merge
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  manual merge
2007-03-23 14:09:30 +01:00