Commits · 5cf5779af1526afb33f793a83b32ce2578bb8534 · Kirill Smelkov / mariadb

28 Mar, 2007 8 commits

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 4 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

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 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

25 Mar, 2007 4 commits
- 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 bk-internal.mysql.com:/home/bk/mysql-5.0-engines · 578d29d6
  unknown authored Mar 25, 2007
```
into  chilla.local:/home/mydev/mysql-5.0--team


sql/ha_myisam.cc:
  Auto merged
```
  578d29d6
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 7910abf4
  unknown authored Mar 25, 2007
```
into  chilla.local:/home/mydev/mysql-5.0--main


sql/ha_ndbcluster.cc:
  Auto merged
```
  7910abf4
24 Mar, 2007 2 commits
- Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1 · 27f8c357
  unknown authored Mar 24, 2007
```
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build


sql/mysqld.cc:
  Auto merged
```
  27f8c357
- nptl: typo fixed. sigaddset restored · a1e7490f
  unknown authored Mar 24, 2007
  
  a1e7490f
23 Mar, 2007 12 commits

bug in im* tests - missing --no-defaults in the mysql command line · 85e1718e
unknown authored Mar 23, 2007

85e1718e

Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1 · 1e92dcae

unknown authored Mar 23, 2007

into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build


mysys/thr_alarm.c:
  Auto merged
sql/mysqld.cc:
  Auto merged

1e92dcae

reverted linuxthreads thr_client_alarm fix (not future-proof) · d89329c6

unknown authored Mar 23, 2007

fixed differently: wake up select_thread with THR_SERVER_ALARM instead


mysys/thr_alarm.c:
  reverted linuxthreads thr_client_alarm fix (not future-proof)

d89329c6

Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1 · c62c0d9d

unknown authored Mar 23, 2007

into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build


mysys/thr_alarm.c:
  Auto merged
sql/mysqld.cc:
  SCCS merged

c62c0d9d

Merge bk-internal:/home/bk/mysql-5.0 · 29bf3ad4
unknown authored Mar 23, 2007
```
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build
```
29bf3ad4
Merge bk-internal:/home/bk/mysql-4.1-build · cc72a835
unknown authored Mar 23, 2007
```
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
```
cc72a835

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 9a4b2e90

unknown authored Mar 23, 2007

into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1


mysys/thr_alarm.c:
  Auto merged
sql/mysqld.cc:
  Auto merged

9a4b2e90

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · c80ac29e
unknown authored Mar 23, 2007
```
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1


sql/mysqld.cc:
  merged
```
c80ac29e

move thr_client_alarm initialization to mysqld.cc · 6e1f446a

unknown authored Mar 23, 2007

(in thr_alarm.cc it happened too late).


mysys/thr_alarm.c:
  move thr_client_alarm initialization to mysqld.cc
  (here it happened too late)
sql/mysqld.cc:
  move thr_client_alarm initialization to mysqld.cc
  (in thr_alarm.cc it happened too late).
  moved thr_kill_signal initialization to init_signals()

6e1f446a

Merge trift2.:/MySQL/M50/clone-5.0 · 8e1d4f72
unknown authored Mar 23, 2007
```
into  trift2.:/MySQL/M50/push-5.0


sql/sql_class.cc:
  Auto merged
```
8e1d4f72
Merge trift2.:/MySQL/M50/mysql-5.0 · b2bbfcee
unknown authored Mar 23, 2007
```
into  trift2.:/MySQL/M50/push-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
```
b2bbfcee
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines · f9cf31c4
unknown authored Mar 23, 2007
```
into  chilla.local:/home/mydev/mysql-4.1-bug26996
```
f9cf31c4

22 Mar, 2007 10 commits
- Merge obarnir@bk-internal.mysql.com:/home/bk/mysql-5.0-build · bbcc4bb0
  unknown authored Mar 22, 2007
```
into  linux.site:/home/omer/source/bld50_0321
```
  bbcc4bb0
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines · cc4a0bc4
  unknown authored Mar 22, 2007
```
into  chilla.local:/home/mydev/mysql-5.0-bug26996


heap/hp_write.c:
  Auto merged
```
  cc4a0bc4
- Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 3e6787d3
  unknown authored Mar 22, 2007
```
into  moonbone.local:/mnt/gentoo64/work/26813-bug-5.0-opt-mysql
```
  3e6787d3
- sql_view.cc: · 842eaa44
  unknown authored Mar 22, 2007
```
  Post-fix for bug#26813.


sql/sql_view.cc:
  Post-fix for bug#26813.
```
  842eaa44
- Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 3206447b
  unknown authored Mar 23, 2007
```
into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
```
  3206447b
- Merge bk@192.168.21.1:mysql-5.0-opt · b8c101df
  unknown authored Mar 22, 2007
```
into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
```
  b8c101df
- Merge mysql.com:/home/hf/work/mrg/mysql-4.1-opt · 45b55666
  unknown authored Mar 22, 2007
```
into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
```
  45b55666
- Merge bk@192.168.21.1:mysql-5.0 · 96793a96
  unknown authored Mar 22, 2007
```
into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt


sql/item_cmpfunc.cc:
  Auto merged
```
  96793a96
- Merge bk@192.168.21.1:mysql-4.1 · 55f991c2
  unknown authored Mar 22, 2007
```
into  mysql.com:/home/hf/work/mrg/mysql-4.1-opt
```
  55f991c2
- Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 9558c66c
  unknown authored Mar 22, 2007
```
into  moonbone.local:/mnt/gentoo64/work/26813-bug-5.0-opt-mysql
```
  9558c66c