Commits · 5a5de967505ef5cf68bb386edfc5aa7f2a500ece · nexedi / MariaDB

28 Mar, 2007 13 commits

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

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

5a5de967

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

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

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

ac7020f7

restored run-time thread lib detection · 310a940d

unknown authored Mar 28, 2007


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

310a940d

After merge fix · bce2a095
unknown authored Mar 28, 2007

bce2a095

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

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

ba503f79

Merge chilla.local:/home/mydev/mysql-5.0--main · 5c88c44e
unknown authored Mar 28, 2007
```
into  chilla.local:/home/mydev/mysql-5.0-axmrg
```
5c88c44e
Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 92533c40
unknown authored Mar 28, 2007
```
into  chilla.local:/home/mydev/mysql-5.0-axmrg
```
92533c40
Merge chilla.local:/home/mydev/mysql-4.1--main · d92eb34a
unknown authored Mar 28, 2007
```
into  chilla.local:/home/mydev/mysql-4.1-axmrg
```
d92eb34a
Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · de7f43cf
unknown authored Mar 28, 2007
```
into  chilla.local:/home/mydev/mysql-4.1-axmrg
```
de7f43cf
Merge chilla.local:/home/mydev/mysql-4.1--team · 8a1859f6
unknown authored Mar 28, 2007
```
into  chilla.local:/home/mydev/mysql-4.1-axmrg


sql/ha_myisam.cc:
  Auto merged
```
8a1859f6
Merge chilla.local:/home/mydev/mysql-4.1-bug26231 · c26c1cfc
unknown authored Mar 28, 2007
```
into  chilla.local:/home/mydev/mysql-4.1-axmrg
```
c26c1cfc

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

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

85f15be1

27 Mar, 2007 8 commits

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

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

78e0150e

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

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines · 8d37f95b

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

8d37f95b

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

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

5dfbe3cc

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

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

unknown authored Mar 27, 2007

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


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

5d567b7b

Merge chilla.local:/home/mydev/mysql-4.1-bug24985 · 0abd1439

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

0abd1439

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

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.

c664a9b5

26 Mar, 2007 14 commits

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

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

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

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

6c6bf612

correct medium int printout · 92492c82

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

92492c82

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 90f04172
unknown authored Mar 26, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
90f04172
Bug #26986 BIT(33) for ndb is broken on solaris. · 8ebefce4
unknown authored Mar 26, 2007
```
- always store lsw first in ndb
```
8ebefce4
Merge clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb · 3d02a5cb
unknown authored Mar 26, 2007
```
into  clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-bug24028
```
3d02a5cb
remove warning · 240dc268
unknown authored Mar 26, 2007

240dc268

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

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

cfb56e5e

Merge mysqldev@production.mysql.com:my/mysql-5.1-release · 9029645d

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

9029645d

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

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

b2db93ed

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

25 Mar, 2007 5 commits

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

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

71b453cd

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-user · ef8786ff
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
```
ef8786ff
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines · de7b7217
unknown authored Mar 25, 2007
```
into  chilla.local:/home/mydev/mysql-4.1--team


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

Merge clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb · 5043b31e

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

5043b31e