Commits · d5102bfc2984d7b9eee18856229e46a795f79dfc · nexedi / MariaDB

21 Nov, 2006 5 commits
- Merge mysql.com:/usr/home/bar/mysql-5.0.b13926 · d5102bfc
  bar@bar.intranet.mysql.r18.ru authored Nov 21, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.1-rpl
```
  d5102bfc
- Merge mysql.com:/usr/home/bar/mysql-4.1.b13926 · 449bd63e
  bar@mysql.com/bar.intranet.mysql.r18.ru authored Nov 21, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.0.b13926
```
  449bd63e
- Preparing to merge "backport of bug#13926 into 5.0" · e3964329
  bar@mysql.com/bar.intranet.mysql.r18.ru authored Nov 21, 2006
```
Moving tests to 4.1 section
```
  e3964329
- Prepare to merge "backport of bug#13926 from 5.0 to 4.1" back into 5.0: · 78c74b03
  bar@mysql.com/bar.intranet.mysql.r18.ru authored Nov 21, 2006
```
Moving tests into their new place into 4.1 tests section
```
  78c74b03
- BUG#13926: --order-by-primary fails if PKEY contains quote character. · fb419c42
  bar@mysql.com/bar.intranet.mysql.r18.ru authored Nov 21, 2006
```
Backporting from 5.0
```
  fb419c42
20 Nov, 2006 5 commits
- Merge mysql.com:/usr/home/bar/mysql-4.1.b22646 · a363599a
  bar@mysql.com/bar.intranet.mysql.r18.ru authored Nov 20, 2006
```
into  mysql.com:/usr/home/bar/mysql-4.1-rpl
```
  a363599a
- After merge fix · 17d0ff0e
  bar@mysql.com/bar.intranet.mysql.r18.ru authored Nov 20, 2006
  
  17d0ff0e
- Merge mysql.com:/usr/home/bar/mysql-5.0.b22646 · 079e4ce9
  bar@bar.intranet.mysql.r18.ru authored Nov 20, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.1.b22646
```
  079e4ce9
- After merge fix · 2b25e2b3
  bar@mysql.com/bar.intranet.mysql.r18.ru authored Nov 20, 2006
  
  2b25e2b3
- Merge mysql.com:/usr/home/bar/mysql-4.1.b22646 · 6f6868bf
  bar@mysql.com/bar.intranet.mysql.r18.ru authored Nov 20, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.0.b22646
```
  6f6868bf
16 Nov, 2006 4 commits
- After merge fix: modifying test results according to the fix · c1d25bf2
  bar@mysql.com/bar.intranet.mysql.r18.ru authored Nov 16, 2006
  
  c1d25bf2
- Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · 9543b7df
  bar@mysql.com/bar.intranet.mysql.r18.ru authored Nov 16, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.0.b23619
```
  9543b7df
- Merge mysql.com:/usr/home/bar/mysql-5.0.b23619 · 8c369a47
  bar@bar.intranet.mysql.r18.ru authored Nov 16, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.1.b23619
```
  8c369a47
- Merge mysql.com:/usr/home/bar/mysql-5.0-rpl · d3603eb1
  bar@mysql.com/bar.intranet.mysql.r18.ru authored Nov 16, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.0.b23619
```
  d3603eb1
15 Nov, 2006 9 commits
- 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
14 Nov, 2006 8 commits
- 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
- 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
13 Nov, 2006 9 commits
- 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