Commits · 7f21400c528095557a584901c5ad08bff7f533d3 · nexedi / MariaDB

03 Oct, 2006 4 commits
- Merge bk-internal:/home/bk/mysql-5.1-maint · 7f21400c
  msvensson@neptunus.(none) authored Oct 03, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
  7f21400c
- after-merge fix: warning adjusted. · 5b491de2
  ramil/ram@mysql.com/myoffice.izhnet.ru authored Oct 03, 2006
  
  5b491de2
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · b1463a4b
  ramil/ram@myoffice.izhnet.ru authored Oct 03, 2006
```
into  mysql.com:/usr/home/ram/work/bug22271/my51-bug22271
```
  b1463a4b
- Merge mysql.com:/usr/home/ram/work/bug22271/my50-bug22271 · 9241230b
  ramil/ram@myoffice.izhnet.ru authored Oct 03, 2006
```
into  mysql.com:/usr/home/ram/work/bug22271/my51-bug22271
```
  9241230b
02 Oct, 2006 14 commits
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · 3da45a6d
  msvensson@neptunus.(none) authored Oct 02, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
  3da45a6d
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 4c6dc3c4
  tsmith/tim@siva.hindu.god authored Oct 02, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/wl3516/51
```
  4c6dc3c4
- Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · 14186cbd
  msvensson@neptunus.(none) authored Oct 02, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  14186cbd
- Remove faulty merge · d5ad8ff4
  msvensson@neptunus.(none) authored Oct 02, 2006
  
  d5ad8ff4
- When compiling with qcc on QNC the define __GNUC__will be set although it... · cb0a874c
  msvensson@neptunus.(none) authored Oct 02, 2006
```
When compiling with qcc on QNC the define __GNUC__will be set although it doesn't support full GNU syntax
 - disable __attribute__ when using qcc
```
  cb0a874c
- Remove faulty merge causing ctype_utf8 failure · c3a1980e
  msvensson@neptunus.(none) authored Oct 02, 2006
  
  c3a1980e
- Fix __attribute__(A) macro (it formerly used bogus __cplusplus__ symbol) · 1517d370
  msvensson@neptunus.(none) authored Oct 02, 2006
  
  1517d370
- Merge bk-internal:/home/bk/mysql-4.1-maint · 1dc026f7
  msvensson@neptunus.(none) authored Oct 02, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
```
  1dc026f7
- Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 · b277139b
  msvensson@neptunus.(none) authored Oct 02, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
```
  b277139b
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · a5c4d2c5
  msvensson@neptunus.(none) authored Oct 02, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
  a5c4d2c5
- Merge neptunus.(none):/home/msvensson/mysql/work/my51-work · c5ddd64b
  msvensson@neptunus.(none) authored Oct 02, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
  c5ddd64b
- Merge bk-internal:/home/bk/mysql-5.1-maint · a42a6aaf
  msvensson@neptunus.(none) authored Oct 02, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
  a42a6aaf
- Merge bk-internal:/home/bk/mysql-5.0-maint · c3820867
  msvensson@neptunus.(none) authored Oct 02, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  c3820867
- Don't run crash_commit_before under valgrind · 6ebcb3d7
  msvensson@neptunus.(none) authored Oct 02, 2006
  
  6ebcb3d7
30 Sep, 2006 12 commits
- Merge siva.hindu.god:/usr/home/tim/m/bk/mrg/50 · 04538cd6
  tsmith/tim@siva.hindu.god authored Sep 30, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/mrg/51
```
  04538cd6
- Fix __attribute__(A) macro (it formerly used bogus __cplusplus__ symbol) · 5ffa3e1b
  tsmith/tim@siva.hindu.god authored Sep 30, 2006
  
  5ffa3e1b
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 26185e56
  tsmith/tim@siva.hindu.god authored Sep 30, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/mrg/51
```
  26185e56
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 4b56f9a6
  tsmith/tim@siva.hindu.god authored Sep 30, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/mrg/51
```
  4b56f9a6
- Post-merge fix. New error ER_NON_INSERTABLE_TABLE put at end of errmsg.txt,... · c36f1656
  tsmith/tim@siva.hindu.god authored Sep 30, 2006
```
Post-merge fix.  New error ER_NON_INSERTABLE_TABLE put at end of errmsg.txt, means that the error number in 5.1 is 1573, while in 5.0 it is 1471.
```
  c36f1656
- Merge bk-internal:/home/bk/mysql-5.0-maint · f3ead515
  jimw@rama.(none) authored Sep 29, 2006
```
into  rama.(none):/home/jimw/my/mysql-5.0-clean
```
  f3ead515
- Merge rama.(none):/home/jimw/my/mysql-5.0-clean · f51525dc
  jimw@rama.(none) authored Sep 29, 2006
```
into  rama.(none):/home/jimw/my/mysql-5.1-clean
```
  f51525dc
- Merge bk-internal:/home/bk/mysql-4.1-maint · 34531d26
  jimw@rama.(none) authored Sep 29, 2006
```
into  rama.(none):/home/jimw/my/mysql-4.1-clean
```
  34531d26
- Merge rama.(none):/home/jimw/my/mysql-4.1-clean · 02962273
  jimw@rama.(none) authored Sep 29, 2006
```
into  rama.(none):/home/jimw/my/mysql-5.0-clean
```
  02962273
- Disable __attribute__ entirely on g++ < 3.4. (Bug #2717) · 52d22ad8
  jimw@rama.(none) authored Sep 29, 2006
  
  52d22ad8
- Merge bk-internal:/home/bk/mysql-4.1-maint · 5963b5af
  jimw@rama.(none) authored Sep 29, 2006
```
into  rama.(none):/home/jimw/my/mysql-4.1-clean
```
  5963b5af
- Merge siva.hindu.god:/usr/home/tim/m/bk/50 · 44f0e55c
  tsmith/tim@siva.hindu.god authored Sep 29, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/mrg/51
```
  44f0e55c
29 Sep, 2006 10 commits
- Merge siva.hindu.god:/usr/home/tim/m/bk/g51 · ca1f99bd
  tsmith/tim@siva.hindu.god authored Sep 29, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/mrg/51
```
  ca1f99bd
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · cca474bb
  cmiller@zippy.cornsilk.net authored Sep 29, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
```
  cca474bb
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 5275e243
  cmiller@zippy.cornsilk.net authored Sep 29, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
```
  5275e243
- Merge siva.hindu.god:/usr/home/tim/m/bk/wl3516/50 · 5ceadf89
  tsmith/tim@siva.hindu.god authored Sep 29, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/wl3516/51
```
  5ceadf89
- WL #3516: MySQL Enterprise: implement Version Display Specification · b7d0ec24
  tsmith/tim@siva.hindu.god authored Sep 29, 2006
```
Print version_comment after server version in:
mysql.cc:  Welcome message and 'status' command output
log.cc: Top of log files
```
  b7d0ec24
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 802292ae
  baker@bk-internal.mysql.com authored Sep 29, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
```
  802292ae
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug20778/my51-bug20778 · fa438d86
  cmiller@zippy.cornsilk.net authored Sep 29, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  fa438d86
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug20778/my50-bug20778 · 097d60a8
  cmiller@zippy.cornsilk.net authored Sep 29, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
```
  097d60a8
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug20778/my50-bug20778 · 2a7d7dd9
  cmiller@zippy.cornsilk.net authored Sep 29, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug20778/my51-bug20778
```
  2a7d7dd9
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 94e6327d
  cmiller@zippy.cornsilk.net authored Sep 29, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  94e6327d