Commits · c0474311514c92861ee4d504787daece8df6004d · Kirill Smelkov / mariadb

15 Nov, 2006 14 commits
- Merge chilla.local:/home/mydev/mysql-5.0-axmrg · c0474311
  istruewing@chilla.local authored Nov 15, 2006
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
  c0474311
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · c1bee74d
  istruewing@chilla.local authored Nov 15, 2006
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
  c1bee74d
- Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge · 0791f808
  lars@black.(none) authored Nov 15, 2006
```
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
```
  0791f808
- Merge mysql.com:/home/bkroot/mysql-5.0 · 8da4385e
  lars@mysql.com/black.(none) authored Nov 15, 2006
```
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
```
  8da4385e
- disabled test case that is still disabled in main · a265af42
  lars@mysql.com/black.(none) authored Nov 15, 2006
  
  a265af42
- Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge · 866b998b
  lars@black.(none) authored Nov 15, 2006
```
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
```
  866b998b
- Merge mysql.com:/home/bk/MERGE/mysql-4.1-merge · 021d85f0
  lars@mysql.com/black.(none) authored Nov 15, 2006
```
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
```
  021d85f0
- Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl · 3ecf6b34
  lars@black.(none) authored Nov 15, 2006
```
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
```
  3ecf6b34
- Merge mysql.com:/home/bkroot/mysql-5.0-rpl · ea3915db
  lars@mysql.com/black.(none) authored Nov 15, 2006
```
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
```
  ea3915db
- Merge mysql.com:/home/bkroot/mysql-4.1-rpl · a6801d4f
  lars@mysql.com/black.(none) authored Nov 15, 2006
```
into  mysql.com:/home/bk/MERGE/mysql-4.1-merge
```
  a6801d4f
- Merge dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0 · 3af7d5fa
  aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi authored Nov 15, 2006
```
into  dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl
```
  3af7d5fa
- Merge dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/4.1 · 10767f3f
  aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi authored Nov 15, 2006
```
into  dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0
```
  10767f3f
- bug#19402 SQL close to the size of the max_allowed_packet fails on the slave · 5235785b
  aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi authored Nov 15, 2006
```
mending windows test.
```
  5235785b
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 2cfe8a0c
  istruewing@chilla.local authored Nov 15, 2006
```
into  chilla.local:/home/mydev/mysql-5.0-axmrg
```
  2cfe8a0c
14 Nov, 2006 16 commits
- Merge chilla.local:/home/mydev/mysql-5.0-axmrg · 556ab483
  istruewing@chilla.local authored Nov 14, 2006
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
  556ab483
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 1922d5dc
  istruewing@chilla.local authored Nov 14, 2006
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
  1922d5dc
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 · fc4530f1
  df@kahlann.erinye.com authored Nov 14, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
```
  fc4530f1
- Merge dev:my/mysql-5.0-release · 68335d81
  df@kahlann.erinye.com authored Nov 14, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
```
  68335d81
- Merge kahlann.erinye.com:/home/df/mysql/build/mtr-5.0 · a3d8fdbe
  df@kahlann.erinye.com authored Nov 14, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/51
```
  a3d8fdbe
- Merge kahlann.erinye.com:/home/df/mysql/build/mtr-4.1 · 4dd2d706
  df@kahlann.erinye.com authored Nov 14, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
```
  4dd2d706
- make_binary_distribution should of course also copy .test files from mysql-test/include · 5d8525c6
  df@kahlann.erinye.com authored Nov 14, 2006
  
  5d8525c6
- Merge kahlann.erinye.com:/home/df/mysql/build/mtr-5.0 · 5fb072b0
  df@kahlann.erinye.com authored Nov 14, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/51
```
  5fb072b0
- Merge kahlann.erinye.com:/home/df/mysql/build/mtr-4.1 · cc129e62
  df@kahlann.erinye.com authored Nov 14, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
```
  cc129e62
- make dist now copies .test files in mysql-test/include · a863fbbf
  df@kahlann.erinye.com authored Nov 14, 2006
  
  a863fbbf
- Raise version number after cloning 5.0.30 · 2ddb61eb
  joerg/mysqldev@mysql.com/production.mysql.com authored Nov 14, 2006
  
  2ddb61eb
- Merge trift2.:/MySQL/M50/clone-5.0 · d22948a1
  joerg@trift2. authored Nov 14, 2006
```
into  trift2.:/MySQL/M50/mysql-5.0
```
  d22948a1
- Merge dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0 · a7c31fa7
  aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi authored Nov 14, 2006
```
into  dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/merge_50_1
```
  a7c31fa7
- bug#19402 SQL close to the size of the max_allowed_packet fails on the slave · 650a2455
  aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi authored Nov 14, 2006
```
ver 5.0 and 5.1 refinement.
adding to the MAX_SIZE_LOG_EVENT_STATUS estimation status vars and 
EXECUTE_LOAD_QUERY_EXTRA_HEADER_LEN
```
  650a2455
- Merge chilla.local:/home/mydev/mysql-4.1-axmrg · 22a39277
  istruewing@chilla.local authored Nov 14, 2006
```
into  chilla.local:/home/mydev/mysql-5.0-axmrg
```
  22a39277
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · a77205c5
  istruewing@chilla.local authored Nov 14, 2006
```
into  chilla.local:/home/mydev/mysql-5.0-axmrg
```
  a77205c5
13 Nov, 2006 10 commits
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · c378a8ee
  istruewing@chilla.local authored Nov 13, 2006
```
into  chilla.local:/home/mydev/mysql-4.1-axmrg
```
  c378a8ee
- Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge · 07ac3d3a
  lars@black.(none) authored Nov 13, 2006
```
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
```
  07ac3d3a
- Merge mysql.com:/home/bk/MERGE/mysql-4.1-merge · 7aa562ad
  lars@mysql.com/black.(none) authored Nov 13, 2006
```
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
```
  7aa562ad
- Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl · b1a0052e
  mats@romeo.(none) authored Nov 13, 2006
```
into  romeo.(none):/home/bk/b18581-mysql-5.1-new-rpl
```
  b1a0052e
- Fixing problem in injector code making NDB tests fire an assertion. · 851041ec
  mats@romeo.(none) authored Nov 13, 2006
  
  851041ec
- configure.in: · d615edba
  bteam/mysqldev@mysql.com/production.mysql.com authored Nov 13, 2006
```
  Raise version number after cloning 5.1.13
```
  d615edba
- Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge · 81a853eb
  lars@black.(none) authored Nov 13, 2006
```
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
```
  81a853eb
- Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl · 63c906f7
  lars@black.(none) authored Nov 13, 2006
```
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
```
  63c906f7
- Merge mysql.com:/home/bkroot/mysql-5.0-rpl · c5d56416
  lars@mysql.com/black.(none) authored Nov 13, 2006
```
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
```
  c5d56416
- Merge mysql.com:/home/bkroot/mysql-4.1-rpl · de01754c
  lars@mysql.com/black.(none) authored Nov 13, 2006
```
into  mysql.com:/home/bk/MERGE/mysql-4.1-merge
```
  de01754c