Commits · a470f42a25ea824a4506b99884330239b5c04ce0 · Kirill Smelkov / mariadb

28 Mar, 2007 13 commits

Merge chilla.local:/home/mydev/mysql-5.0-axmrg · a470f42a

unknown authored Mar 28, 2007

into  chilla.local:/home/mydev/mysql-5.1-axmrg


mysql-test/r/heap_btree.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/heap_btree.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/item_func.cc:
  Auto merged
storage/heap/hp_write.c:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/mi_range.c:
  Auto merged
storage/myisam/mi_search.c:
  Auto merged
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
sql/mysqld.cc:
  Manual merge

a470f42a

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · fd343179
unknown authored Mar 28, 2007
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
fd343179

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines · 74519b98

unknown authored Mar 28, 2007

into  chilla.local:/home/mydev/mysql-5.1-axmrg


sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_servers.h:
  Auto merged
storage/federated/ha_federated.cc:
  Auto merged
storage/heap/ha_heap.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
sql/sql_servers.cc:
  Manual merge

74519b98

restored run-time thread lib detection · 8f93150d

unknown authored Mar 28, 2007


sql/stacktrace.c:
  removed code duplication
sql/stacktrace.h:
  removed code duplication

8f93150d

After merge fix · 660cb2fd
unknown authored Mar 28, 2007

660cb2fd

Merge chilla.local:/home/mydev/mysql-4.1-axmrg · 5cf5779a

unknown authored Mar 28, 2007

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

5cf5779a

Merge chilla.local:/home/mydev/mysql-5.0--main · fe6a7bdb
unknown authored Mar 28, 2007
```
into  chilla.local:/home/mydev/mysql-5.0-axmrg
```
fe6a7bdb
Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · a7573962
unknown authored Mar 28, 2007
```
into  chilla.local:/home/mydev/mysql-5.0-axmrg
```
a7573962
Merge chilla.local:/home/mydev/mysql-4.1--main · f6eca60a
unknown authored Mar 28, 2007
```
into  chilla.local:/home/mydev/mysql-4.1-axmrg
```
f6eca60a
Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · cd07f122
unknown authored Mar 28, 2007
```
into  chilla.local:/home/mydev/mysql-4.1-axmrg
```
cd07f122
Merge chilla.local:/home/mydev/mysql-4.1--team · 17a4df42
unknown authored Mar 28, 2007
```
into  chilla.local:/home/mydev/mysql-4.1-axmrg


sql/ha_myisam.cc:
  Auto merged
```
17a4df42
Merge chilla.local:/home/mydev/mysql-4.1-bug26231 · 30bf8b69
unknown authored Mar 28, 2007
```
into  chilla.local:/home/mydev/mysql-4.1-axmrg
```
30bf8b69

Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines · fd3b7235

unknown authored Mar 28, 2007

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

fd3b7235

27 Mar, 2007 8 commits

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines · c4b440aa

unknown authored Mar 27, 2007

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

c4b440aa

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 0e625692
unknown authored Mar 27, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
0e625692

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines · 548aad25

unknown authored Mar 27, 2007

into  chilla.local:/home/mydev/mysql-5.1-bug24985


storage/myisam/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 from 5.0
mysql-test/t/heap_btree.test:
  Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
              causes incorrect duplicate entries
  Manual merge from 5.0

548aad25

Merge chilla.local:/home/mydev/mysql-5.0-bug24985 · 5e0ce039

unknown authored Mar 27, 2007

into  chilla.local:/home/mydev/mysql-5.1-bug24985


mysql-test/r/heap_btree.result:
  Auto merged
mysql-test/t/heap_btree.test:
  Auto merged
storage/heap/ha_heap.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged

5e0ce039

Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE · de3c3719
unknown authored Mar 27, 2007
```
            causes incorrect duplicate entries
After merge fix
```
de3c3719

Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1 · 14315122

unknown authored Mar 27, 2007

into  trift-lap.fambruehe:/MySQL/M51/push-5.1


mysql-test/t/query_cache_sql_prepare.test:
  Auto merged

14315122

Merge chilla.local:/home/mydev/mysql-4.1-bug24985 · 42422d0e

unknown authored Mar 27, 2007

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

42422d0e

Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE · 1fd0ba89

unknown authored Mar 27, 2007

            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.

1fd0ba89

26 Mar, 2007 14 commits

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 2dab4457
unknown authored Mar 26, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
2dab4457
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 77341226
unknown authored Mar 26, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
77341226
correction of manual merge · cdbe7302
unknown authored Mar 26, 2007

cdbe7302
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · b339b30c
unknown authored Mar 26, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
b339b30c

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · cba5f9d9

unknown authored Mar 26, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/include/ndbapi/NdbRecAttr.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  manual merge
storage/ndb/test/src/NDBT_Table.cpp:
  manual merge

cba5f9d9

correct medium int printout · d24dab18

unknown authored Mar 26, 2007

    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

d24dab18

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 05a352bb
unknown authored Mar 26, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
05a352bb
Bug #26986 BIT(33) for ndb is broken on solaris. · e3f3c6f0
unknown authored Mar 26, 2007
```
- always store lsw first in ndb
```
e3f3c6f0
Merge clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb · f28a7a06
unknown authored Mar 26, 2007
```
into  clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-bug24028
```
f28a7a06
remove warning · df4d3039
unknown authored Mar 26, 2007

df4d3039

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 0234a14e

unknown authored Mar 26, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged

0234a14e

Merge mysqldev@production.mysql.com:my/mysql-5.1-release · 73ad3195

unknown authored Mar 26, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged

73ad3195

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · dbe5fade

unknown authored Mar 26, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/tools/restore/Restore.cpp:
  manual merge

dbe5fade

Bug #26900 ndb_restore printout option does not give structured data · d37fc3ce
unknown authored Mar 26, 2007
```
- set sizes for data
```
d37fc3ce

25 Mar, 2007 5 commits

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · e97d0212

unknown authored Mar 25, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

e97d0212

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-user · 9f9a4556
unknown authored Mar 25, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
```
9f9a4556
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines · 03089d89
unknown authored Mar 25, 2007
```
into  chilla.local:/home/mydev/mysql-4.1--team


sql/ha_myisam.cc:
  Auto merged
```
03089d89
Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · de1d7c23
unknown authored Mar 25, 2007
```
into  chilla.local:/home/mydev/mysql-4.1--main
```
de1d7c23

Merge clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb · 2e845944

unknown authored Mar 25, 2007

into  clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug24028


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/src/UtilTransactions.cpp:
  Auto merged

2e845944