Commits · 266cd861e773982107c0894bf3752bf2e68f3586 · Kirill Smelkov / mariadb

30 Mar, 2007 1 commit
- Add missing \ causing CMakelists.txt etc not to be included in dist · 266cd861
  msvensson@pilot.blaudden authored Mar 30, 2007
  
  266cd861
29 Mar, 2007 39 commits
- Merge bk-internal:/home/bk/mysql-5.1-new-maint · 97d3d2e7
  msvensson@pilot.blaudden authored Mar 29, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  97d3d2e7
- Update result for bug#19991 · ce4d3994
  msvensson@pilot.blaudden authored Mar 29, 2007
  
  ce4d3994
- Post Merge Cleanup. · 0f4a1b38
  iggy@recycle.(none) authored Mar 29, 2007
  
  0f4a1b38
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint · c90400c5
  iggy@recycle.(none) authored Mar 29, 2007
```
into  recycle.(none):/src/bug23491/my51-bug23491
```
  c90400c5
- Bug #23491 MySQLDump prefix function call in a view by database name · d41cffc0
  iggy@recycle.(none) authored Mar 29, 2007
```
- 5.0 merged to 5.1 differences.
```
  d41cffc0
- Bug#26922 Test 'varbinary' fails to do copy_file on Windows · bde1d63d
  msvensson@pilot.blaudden authored Mar 29, 2007
```
- Copy all *.MY* files from std_data/, we have some .MYD and .MYI
files from 4.1 there
5.0 version of make_win_bin_dist copies everything in std_data/
```
  bde1d63d
- Merge recycle.(none):/src/bug23491/my50-bug23491 · 4f498dec
  iggy@recycle.(none) authored Mar 29, 2007
```
into  recycle.(none):/src/bug23491/my51-bug23491
```
  4f498dec
- After merge fixes · c4a13137
  msvensson@pilot.blaudden authored Mar 29, 2007
  
  c4a13137
- Merge pilot.blaudden:/home/msvensson/mysql/bug19991/my51-bug19991 · 9f2bee02
  msvensson@pilot.blaudden authored Mar 29, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  9f2bee02
- Bug#19991 CHANGE MASTER need option ssl-verify-server-cert · f865bd1d
  msvensson@pilot.blaudden authored Mar 29, 2007
```
 - Add MASTER_SSL_VERIFY_SERVER_CERT option to CHANGE MASTER TO
 - Add Master_Ssl_Serify_Server_Cert to SHOW SLAVE STATUS
 - Save and restore ssl_verify_server_cert  to master info file
   setting it to disabled as default.
```
  f865bd1d
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 3ec564e7
  msvensson@pilot.blaudden authored Mar 29, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  3ec564e7
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · f4176443
  msvensson@pilot.blaudden authored Mar 29, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  f4176443
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 62c63239
  msvensson@pilot.blaudden authored Mar 29, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  62c63239
- Merge pilot.blaudden:/home/msvensson/mysql/bug25482/my41-bug25482-alt2 · 79b2bd53
  msvensson@pilot.blaudden authored Mar 29, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
```
  79b2bd53
- Update test result after merge · f03ea622
  msvensson@pilot.blaudden authored Mar 29, 2007
  
  f03ea622
- Merge bk-internal:/home/bk/mysql-4.1-maint · 110c2961
  msvensson@pilot.blaudden authored Mar 29, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
```
  110c2961
- Merge pilot.blaudden:/home/msvensson/mysql/bug25482/my41-bug25482-alt2 · f9c5bb36
  msvensson@pilot.blaudden authored Mar 29, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  f9c5bb36
- Bug#25482 GRANT statements are not replicated if you use "replicate-ignore-table" · a71d1951
  msvensson@pilot.blaudden authored Mar 29, 2007
```
 - GRANT and REVOKE statments didn't have the "updating" flag set and
   thus statements with a table specified would not replicate if
   slave filtering rules where turned on.
   For example "GRANT ... ON test.t1 TO ..." would not replicate.
```
  a71d1951
- Merge bk-internal:/home/bk/mysql-5.1-new-maint · c16b50e2
  msvensson@pilot.blaudden authored Mar 29, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  c16b50e2
- Merge bk-internal:/home/bk/mysql-5.0-maint · f5b888db
  msvensson@pilot.blaudden authored Mar 29, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  f5b888db
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 · d393ec79
  tsmith@quadxeon.mysql.com authored Mar 29, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
```
  d393ec79
- Merge pilot.blaudden:/home/msvensson/mysql/bug24121/my50-bug24121 · 7cf07224
  msvensson@pilot.blaudden authored Mar 29, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  7cf07224
- Merge pilot.blaudden:/home/msvensson/mysql/bug24121/my51-bug24121 · a16de884
  msvensson@pilot.blaudden authored Mar 29, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  a16de884
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · a778498f
  tsmith@quadxeon.mysql.com authored Mar 29, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
```
  a778498f
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 6a897bf1
  tsmith@quadxeon.mysql.com authored Mar 29, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
```
  6a897bf1
- Merge bk-internal:/home/bk/mysql-5.0-maint · eac521a9
  msvensson@pilot.blaudden authored Mar 29, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  eac521a9
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 · 91809fed
  tsmith@quadxeon.mysql.com authored Mar 29, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
```
  91809fed
- create.result: · 28c6822b
  tsmith@quadxeon.mysql.com authored Mar 29, 2007
```
  post-merge test result fixup
```
  28c6822b
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 9e99b243
  tsmith@quadxeon.mysql.com authored Mar 29, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
```
  9e99b243
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 4f95bd34
  tsmith@quadxeon.mysql.com authored Mar 29, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
```
  4f95bd34
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 · 0b0d2c32
  tsmith@quadxeon.mysql.com authored Mar 29, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
```
  0b0d2c32
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 9f6c7071
  msvensson@pilot.blaudden authored Mar 29, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  9f6c7071
- Merge bk-internal:/home/bk/mysql-5.1-new-maint · cdd07a17
  msvensson@pilot.blaudden authored Mar 29, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  cdd07a17
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41 · a7f506db
  tsmith@quadxeon.mysql.com authored Mar 29, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
```
  a7f506db
- Merge pilot.blaudden:/home/msvensson/mysql/bug26837/my51-bug26837 · 5d820841
  msvensson@pilot.blaudden authored Mar 29, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  5d820841
- ndb_gis.result: · 97ba2109
  tsmith@quadxeon.mysql.com authored Mar 29, 2007
```
  post-merge fixup of test result
```
  97ba2109
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 9a7f3451
  tsmith@quadxeon.mysql.com authored Mar 29, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
```
  9a7f3451
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 91f4b485
  tsmith@quadxeon.mysql.com authored Mar 29, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
```
  91f4b485
- Merge pilot.blaudden:/home/msvensson/mysql/bug26837/my50-bug26837 · 0e2de06a
  msvensson@pilot.blaudden authored Mar 29, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  0e2de06a