Commits · 3776e9622baf373de641fbdd512dc610af50b621 · nexedi / MariaDB

07 Nov, 2006 1 commit
- Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl · 3776e962
  lars/lthalmann@dl145h.mysql.com authored Nov 07, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
```
  3776e962
04 Nov, 2006 6 commits
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · a56565b8
  msvensson@neptunus.(none) authored Nov 04, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
  a56565b8
- Remove old comments · 56f10ac8
  msvensson@neptunus.(none) authored Nov 04, 2006
  
  56f10ac8
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · abd1e54d
  msvensson@neptunus.(none) authored Nov 04, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
  abd1e54d
- Disable user_limits for bug23921 · 83a44bd8
  msvensson@neptunus.(none) authored Nov 04, 2006
  
  83a44bd8
- Updates for abi_check · 39a346b7
  msvensson@neptunus.(none) authored Nov 04, 2006
  
  39a346b7
- Merge neptunus.(none):/home/msvensson/mysql/my50-m-stress · d59a3b4d
  msvensson@neptunus.(none) authored Nov 04, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  d59a3b4d
03 Nov, 2006 23 commits
- Post-merge fixes. · efaa0f40
  mats@romeo.(none) authored Nov 03, 2006
  
  efaa0f40
- Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl · a726fec6
  mats@romeo.(none) authored Nov 03, 2006
```
into  romeo.(none):/home/bk/b18581-mysql-5.1-new-rpl
```
  a726fec6
- Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl · a3864256
  mats@romeo.(none) authored Nov 03, 2006
```
into  romeo.(none):/home/bkroot/mysql-5.1-new-rpl
```
  a3864256
- Fiexes for --stress mode in mysql-test-run.pl · aa19771c
  msvensson@neptunus.(none) authored Nov 03, 2006
  
  aa19771c
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · 899dca14
  msvensson@neptunus.(none) authored Nov 03, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
  899dca14
- Has issues with original tree, so had to pull new tree and copy test over.... · a66daa28
  jmiller/ndbdev@mysql.com/ndb08.mysql.com authored Nov 03, 2006
```
Has issues with original tree, so had to pull new tree and copy test over. Running last test now and will push after
```
  a66daa28
- Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · 63091e07
  msvensson@neptunus.(none) authored Nov 03, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  63091e07
- Fix problem with mysql.test relying on "echo" behaviour · 78af4ae4
  msvensson@neptunus.(none) authored Nov 03, 2006
  
  78af4ae4
- Fix DBUG_PRINT in mysqltest, the real value to print is in ds_cmd · fa79d0fc
  msvensson@neptunus.(none) authored Nov 03, 2006
  
  fa79d0fc
- Don't warn about "Found non pid file" for elements that are not files. · 570f6039
  msvensson@neptunus.(none) authored Nov 03, 2006
  
  570f6039
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · b850ae8a
  msvensson@neptunus.(none) authored Nov 03, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
  b850ae8a
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · 5c086315
  msvensson@neptunus.(none) authored Nov 03, 2006
```
into  neptunus.(none):/home/msvensson/mysql/my50-m-stress
```
  5c086315
- Use lowercase for "Too long dbname" test as it will be put ot lower on some... · 795ad91b
  msvensson@neptunus.(none) authored Nov 03, 2006
```
Use lowercase for "Too long dbname" test as it will be put ot lower on some platforms and we don't wan't to test that.
```
  795ad91b
- Remove sql_state-h from list of include files. (Merge error from 4.1) · 74496f8d
  msvensson@neptunus.(none) authored Nov 03, 2006
  
  74496f8d
- Merge neptunus.(none):/home/msvensson/mysql/my41-m-stress · 1c19dc7e
  msvensson@neptunus.(none) authored Nov 03, 2006
```
into  neptunus.(none):/home/msvensson/mysql/my50-m-stress
```
  1c19dc7e
- Merge mysql.com:/usr/home/bar/mysql-5.1.b22823 · 0dd8eb22
  bar@bar.intranet.mysql.r18.ru authored Nov 03, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.1-rpl
```
  0dd8eb22
- Fix mysql-test-run.pl for "bin dist" look in "bin" directory for client binaries as well. · 7b4a8e41
  msvensson@neptunus.(none) authored Nov 03, 2006
  
  7b4a8e41
- Merge bk-internal:/home/bk/mysql-5.0-maint · 580b540d
  msvensson@neptunus.(none) authored Nov 03, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  580b540d
- Fix typo, Add "s" to format specifier for --stress-init-file · d94101f7
  msvensson@neptunus.(none) authored Nov 03, 2006
  
  d94101f7
- After merge fix. · 76d00075
  bar@mysql.com/bar.intranet.mysql.r18.ru authored Nov 03, 2006
  
  76d00075
- Merge mysql.com:/usr/home/bar/mysql-5.0-rpl · 88034969
  bar@bar.intranet.mysql.r18.ru authored Nov 03, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.1-rpl
```
  88034969
- Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl · 8748cde9
  bar@bar.intranet.mysql.r18.ru authored Nov 03, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.1-rpl
```
  8748cde9
- After merge fix for BUG#18908 ERROR 1406 (22001): Data too long for column :: using utf8 · 45ac1365
  bar@mysql.com/bar.intranet.mysql.r18.ru authored Nov 03, 2006
  
  45ac1365
02 Nov, 2006 10 commits
- Fix merge collision. · e235c8c4
  cmiller@zippy.cornsilk.net authored Nov 02, 2006
  
  e235c8c4
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · b074e134
  cmiller@zippy.cornsilk.net authored Nov 02, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  b074e134
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · af5acac0
  cmiller@zippy.cornsilk.net authored Nov 02, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
```
  af5acac0
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · c34f3219
  cmiller@zippy.cornsilk.net authored Nov 02, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
```
  c34f3219
- Merge bk-internal:/home/bk/mysql-4.1-maint · 15835edd
  msvensson@shellback.(none) authored Nov 02, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
```
  15835edd
- configure.in: · 27f3bb10
  kent/mysqldev@mysql.com/production.mysql.com authored Nov 02, 2006
```
  Raise version number to 4.1.23
```
  27f3bb10
- Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my50-mtr_vs_config · 2704ba36
  iggy@rolltop.ignatz42.dyndns.org authored Nov 02, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
```
  2704ba36
- Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my51-mtr_vs_config · deb03b93
  iggy@rolltop.ignatz42.dyndns.org authored Nov 02, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
```
  deb03b93
- Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my50-mtr_vs_config · cf65c157
  iggy@rolltop.ignatz42.dyndns.org authored Nov 02, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my51-mtr_vs_config
```
  cf65c157
- Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my41-mtr_vs_config · 9f329f2c
  iggy@rolltop.ignatz42.dyndns.org authored Nov 02, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my50-mtr_vs_config
```
  9f329f2c