Commits · c9d14a03299bcb0c649a072195c3b45baed3ebb0 · Kirill Smelkov / mariadb

06 Mar, 2006 16 commits
- Merge bk-internal:/home/bk/mysql-5.1-new · c9d14a03
  msvensson@neptunus.(none) authored Mar 06, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
  c9d14a03
- Merge · ab77867e
  kent@mysql.com authored Mar 06, 2006
  
  ab77867e
- BUG#10460 SHOW CREATE TABLE uses inconsistent upper/lower case · fd47e2d1
  msvensson@neptunus.(none) authored Mar 06, 2006
```
 - Fix result files
```
  fd47e2d1
- Fix merge error, missing "," in result file · 6ffe593d
  msvensson@neptunus.(none) authored Mar 06, 2006
  
  6ffe593d
- Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new · ff71af1e
  kent@mysql.com authored Mar 06, 2006
```
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
```
  ff71af1e
- Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-tmp · dfae81d0
  kent@mysql.com authored Mar 06, 2006
```
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
```
  dfae81d0
- Merge bk-internal:/home/bk/mysql-5.1-new · e4705ea4
  msvensson@neptunus.(none) authored Mar 06, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
  e4705ea4
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 7d7da887
  mskold@mysql.com authored Mar 06, 2006
```
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
```
  7d7da887
- Merge neptunus.(none):/home/msvensson/mysql/bug10460/my51-bug10460 · 40b3222b
  msvensson@neptunus.(none) authored Mar 06, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
  40b3222b
- Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 8da2410a
  kent@mysql.com authored Mar 06, 2006
```
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
```
  8da2410a
- Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-tmp · aec8d2a8
  kent@mysql.com authored Mar 06, 2006
```
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
```
  aec8d2a8
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new · def9e36f
  mskold@mysql.com authored Mar 06, 2006
```
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
```
  def9e36f
- ndb - enable rpl_ndb_charset Bug#17246 for test · 710326f1
  pekka@mysql.com authored Mar 06, 2006
  
  710326f1
- Added test for Bug#17888 DD: ADD INDEX causes error 756 'Index on disk column is not supported · 92eb0acd
  mskold@mysql.com authored Mar 06, 2006
  
  92eb0acd
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new · a34be87f
  mskold@mysql.com authored Mar 06, 2006
```
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
```
  a34be87f
- Fix for Bug#17888 DD: ADD INDEX causes error 756 'Index on disk column is not supported · 7380a4dd
  mskold@mysql.com authored Mar 06, 2006
  
  7380a4dd
04 Mar, 2006 4 commits
- Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 965fd06a
  petr@mysql.com authored Mar 04, 2006
```
into  mysql.com:/home/cps/mysql/devel/5.1-cleanup
```
  965fd06a
- Remove unused thd->options's flag -- OPTION_UPDATE_LOG · 0a861ec8
  petr@mysql.com authored Mar 04, 2006
```
The update log itself was removed back in 5.0. Recommit
with post-review fixes.
```
  0a861ec8
- Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 653596ce
  reggie@big_geek. authored Mar 03, 2006
```
into  big_geek.:C:/Work/mysql/mysql-5.1
```
  653596ce
- Some cmake script fixes · 3bcc2095
  reggie@big_geek. authored Mar 03, 2006
  
  3bcc2095
03 Mar, 2006 20 commits
- Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0-clone · 53ea1584
  paul@snake-hub.snake.net authored Mar 03, 2006
```
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1-clone
```
  53ea1584
- Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-clone · 1442be97
  paul@snake-hub.snake.net authored Mar 03, 2006
```
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0-clone
```
  1442be97
- mysqltest.c: · f3cf5283
  paul@snake-hub.snake.net authored Mar 03, 2006
```
  Typos.
```
  f3cf5283
- mysqltest.c: · f3c7e2d3
  paul@snake-hub.snake.net authored Mar 03, 2006
```
  Better fix for do_sleep().
```
  f3c7e2d3
- mysql-stress-test.pl, README.stress: · 6fa48811
  paul@snake-hub.snake.net authored Mar 03, 2006
```
  Revise stress-test README
```
  6fa48811
- Merge mysql.com:/home/mydev/mysql-5.1 · 7d2af330
  ingo@mysql.com authored Mar 03, 2006
```
into  mysql.com:/home/mydev/mysql-5.1-bug11527
```
  7d2af330
- Merge bk-internal:/home/bk/mysql-5.1-new · b56857d1
  msvensson@neptunus.(none) authored Mar 03, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
  b56857d1
- Merge bk-internal:/home/bk/mysql-5.1-new · 4e55197c
  msvensson@neptunus.(none) authored Mar 03, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
  4e55197c
- Merge mysql.com:/extern/mysql/bk/mysql-5.1-new · 9e001880
  pem@mysql.com authored Mar 03, 2006
```
into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
```
  9e001880
- Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 7dc12415
  bar@mysql.com authored Mar 03, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.1-new.b16316
```
  7dc12415
- Merge bk-internal:/home/bk/mysql-5.1-new · e2827d97
  msvensson@neptunus.(none) authored Mar 03, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
  e2827d97
- Merge mysql.com:/extern/mysql/bk/mysql-5.1-new · 48ca79ad
  pem@mysql.com authored Mar 03, 2006
```
into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
```
  48ca79ad
- Merge mysql.com:/extern/mysql/5.0/bug17476/mysql-5.0 · 015ab71a
  pem@mysql.com authored Mar 03, 2006
```
into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
```
  015ab71a
- Bug#17728 tests that fails are: ndb_gis rpl_ndb_multi_update2 · 5b9b34bd
  msvensson@neptunus.(none) authored Mar 03, 2006
```
 - Fix for ndb_gis to run with all types of logging
```
  5b9b34bd
- ndb - blob tables vs dict cache : patch 2 - bug#17761 (maybe) · dd24ab56
  pekka@mysql.com authored Mar 03, 2006
  
  dd24ab56
- Merge mysql.com:/home/mydev/mysql-5.1 · 85ae00c7
  ingo@mysql.com authored Mar 03, 2006
```
into  mysql.com:/home/mydev/mysql-5.1-bug11527
```
  85ae00c7
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1a071405
  ramil@mysql.com authored Mar 03, 2006
```
into  mysql.com:/usr/home/ram/work/5.0.b17615
```
  1a071405
- mysql.spec.sh: · 7ae10acb
  kent@mysql.com authored Mar 03, 2006
```
  Don't create empty embedded RPM, bug#15769
```
  7ae10acb
- Merge mysqldev@production.mysql.com:my/mysql-5.0-release · 32b003e6
  kent@mysql.com authored Mar 03, 2006
```
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
```
  32b003e6
- Expanding a binary field should result in 0x00-filled positions, not 0x20 · c672c119
  cmiller@zippy.(none) authored Mar 02, 2006
```
(ASCII space).  For Bug#16857.
```
  c672c119