Commits · 7875d9241ce4e89c9eb3be40533680b1bd7cea66 · Kirill Smelkov / mariadb

23 Apr, 2008 2 commits

Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean · 7875d924

unknown authored Apr 23, 2008

into  hh-nb.hungers:/work/merge/mysql-5.1-build


BitKeeper/etc/ignore:
  auto-union
mysql-test/t/disabled.def:
  Auto merged
BitKeeper/deleted/.del-group_concat_max_len_func.result:
  Delete: mysql-test/r/group_concat_max_len_func.result
BitKeeper/deleted/.del-group_concat_max_len_func.test:
  Delete: mysql-test/t/group_concat_max_len_func.test
BitKeeper/deleted/.del-max_allowed_packet_func.test:
  Delete: mysql-test/t/max_allowed_packet_func.test

7875d924

Eightth set of fixes for bug 35988. · 9fd9785a

unknown authored Apr 23, 2008


BitKeeper/etc/ignore:
  Added mysql-test/r/max_allowed_packet_func.result to the ignore list

9fd9785a

22 Apr, 2008 2 commits

Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean · adf397e7

unknown authored Apr 22, 2008

into  hh-nb.hungers:/work/merge/mysql-5.1-build-repogca


BitKeeper/deleted/.del-query_cache_wlock_invalidate_func.result:
  Delete: mysql-test/r/query_cache_wlock_invalidate_func.result
BitKeeper/deleted/.del-timestamp_func.result:
  Delete: mysql-test/r/timestamp_func.result
BitKeeper/deleted/.del-innodb_table_locks_func.test:
  Delete: mysql-test/t/innodb_table_locks_func.test
BitKeeper/deleted/.del-query_cache_wlock_invalidate_func.test:
  Delete: mysql-test/t/query_cache_wlock_invalidate_func.test
BitKeeper/deleted/.del-timestamp_func.test:
  Delete: mysql-test/t/timestamp_func.test

adf397e7

Seventh set of fixes for bug 35988. · d526b752
unknown authored Apr 22, 2008

d526b752

18 Apr, 2008 9 commits
- Merge trift2.:/MySQL/M50/push-5.0 · 24e55790
  unknown authored Apr 18, 2008
```
into  trift2.:/MySQL/M51/push-5.1
```
  24e55790
- Merge trift2.:/MySQL/M50/bug34291-5.0 · 835aa144
  unknown authored Apr 18, 2008
```
into  trift2.:/MySQL/M50/push-5.0
```
  835aa144
- Merge trift2.:/MySQL/M51/bug34291-5.1 · e96e74ba
  unknown authored Apr 18, 2008
```
into  trift2.:/MySQL/M51/push-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
```
  e96e74ba
- Fix of makefile. · e82865b5
  unknown authored Apr 18, 2008
  
  e82865b5
- BUILD/Makefile.am · 476a5c13
  unknown authored Apr 18, 2008
```
    Post-merge fix:  Add those files which are new in version 5.1

This is the 5.1 version of the fix for
   Bug #34291  compile-amd64-debug-max-no-ndb missing


BUILD/Makefile.am:
  Post-merge fix:  Add those files which are new in version 5.1
```
  476a5c13
- Merge trift2.:/MySQL/M50/bug34291-5.0 · dadbb4ca
  unknown authored Apr 18, 2008
```
into  trift2.:/MySQL/M51/bug34291-5.1


BUILD/Makefile.am:
  Auto merged
```
  dadbb4ca
- Merge trift2.:/MySQL/M51/push-5.1 · 6dad5e90
  unknown authored Apr 18, 2008
```
into  trift2.:/MySQL/M51/tmp-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
```
  6dad5e90
- Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean · f6ee0a89
  unknown authored Apr 18, 2008
```
into  hh-nb.hungers:/work/merge/mysql-5.1-build


mysql-test/Makefile.am:
  Auto merged
```
  f6ee0a89
- Fix for win platforms (bug#35988). · 97c25b23
  unknown authored Apr 18, 2008
```
mysql-test/Makefile.am:
  Fix for missing data files (bug#35988).
```
  97c25b23
17 Apr, 2008 3 commits

Fix for Bug #34291 compile-amd64-debug-max-no-ndb missing · d4e5ae56

unknown authored Apr 17, 2008

Include several "BUILD/compile-*" files in a source tarball ("make dist" target)
which might be useful to community users who want to build from source.

When merging this up, the "BUILD/compile-*" file list needs to be checked.

BUILD/Makefile.am:
Fix for Bug #34291 compile-amd64-debug-max-no-ndb missing

Include several "BUILD/compile-*" files in a source tarball ("make dist" target)
which might be useful to community users who want to build from source.

d4e5ae56

Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean · 9acf64da
unknown authored Apr 17, 2008
```
into  hh-nb.hungers:/work/merge/mysql-5.1-build
```
9acf64da
fix of typo for bug#35988. · 1ca18a8a
unknown authored Apr 17, 2008

1ca18a8a

16 Apr, 2008 5 commits
- Merge mysql.com:/home/kent/bk/mysql-5.1-release · 6ac40453
  unknown authored Apr 16, 2008
```
into  mysql.com:/home/kent/bk/build/mysql-5.1-build
```
  6ac40453
- Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean · bfdff281
  unknown authored Apr 16, 2008
```
into  hh-nb.hungers:/work/merge/mysql-5.1-build
```
  bfdff281
- fifth set of fixes to bug#35988. · 14f753d4
  unknown authored Apr 16, 2008
  
  14f753d4
- Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean · c3e0ed6a
  unknown authored Apr 16, 2008
```
into  hh-nb.hungers:/work/merge/mysql-5.1-build
```
  c3e0ed6a
- fourth set of fixes for bug#35988. · 9c63b06c
  unknown authored Apr 16, 2008
  
  9c63b06c
15 Apr, 2008 2 commits
- Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean · 6116e306
  unknown authored Apr 15, 2008
```
into  hh-nb.hungers:/work/merge/mysql-5.1-build
```
  6116e306
- Third set of fixes for bug#35988. · 53c18326
  unknown authored Apr 15, 2008
  
  53c18326
14 Apr, 2008 2 commits
- Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean · 27e532bc
  unknown authored Apr 14, 2008
```
into  hh-nb.hungers:/work/merge/mysql-5.1-build
```
  27e532bc
- Second set of fixes for bug#35988. · a9c37b3b
  unknown authored Apr 14, 2008
  
  a9c37b3b
11 Apr, 2008 3 commits
- Merge hh-nb.hungers:/work/merge/mysql-5.1-build · b1c82444
  unknown authored Apr 11, 2008
```
into  hh-nb.hungers:/work/merge/mysql-5.1-wl4288


mysql-test/t/disabled.def:
  Auto merged
```
  b1c82444
- Fixes of system variable test programs for bug#35988. · 5fd727f7
  unknown authored Apr 11, 2008
  
  5fd727f7
- Fix merge problem. · 462704c5
  unknown authored Apr 10, 2008
  
  462704c5
10 Apr, 2008 9 commits

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build · baa9ff82
unknown authored Apr 10, 2008
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
```
baa9ff82

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build · e68f3e8d

unknown authored Apr 10, 2008

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build


mysql-test/t/type_blob.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/tztime.cc:
  Auto merged
sql/unireg.h:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
mysql-test/r/type_blob.result:
  manual merge
sql/item_create.cc:
  manual merge

e68f3e8d

Fix mismerge. · 57784eae
unknown authored Apr 10, 2008
```
sql/field.cc:
  Fix indentation of new line.
```
57784eae
Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean · 3828535b
unknown authored Apr 10, 2008
```
into  hh-nb.hungers:/work/merge/mysql-5.1-build


BitKeeper/etc/ignore:
  auto-union
```
3828535b

System variable tests delivered by Folio3 (see WL4288). · b00c5363

unknown authored Apr 10, 2008


BitKeeper/etc/ignore:
  Added mysql-test/linux_sys_vars.inc mysql-test/load_sysvars.inc mysql-test/windows_sys_vars.inc to the ignore list

b00c5363

Error message changed across versions. · ec63ce25
unknown authored Apr 09, 2008

ec63ce25
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build · b64f6648
unknown authored Apr 09, 2008
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
```
b64f6648

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776-encore/my51-bug15776-encore · fe6df149

unknown authored Apr 09, 2008

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build


sql/field.cc:
  Auto merged
sql/unireg.h:
  Auto merged
mysql-test/r/type_blob.result:
  manual merge.
mysql-test/t/type_blob.test:
  manual merge.
sql/item_create.cc:
  manual merge.
sql/share/errmsg.txt:
  manual merge.
sql/sql_yacc.yy:
  manual merge.

fe6df149

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776-encore/my50-bug15776-encore · f7687010

unknown authored Apr 09, 2008

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build


mysql-test/r/type_blob.result:
  Auto merged
mysql-test/t/type_blob.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/unireg.h:
  Auto merged

f7687010

09 Apr, 2008 3 commits

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my51-bug15776 · 7cce56b2

unknown authored Apr 09, 2008

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776-encore/my51-bug15776-encore


sql/field.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/unireg.h:
  Auto merged
mysql-test/r/type_blob.result:
  manual merge.
mysql-test/t/type_blob.test:
  manual merge.
sql/sql_yacc.yy:
  merge by hand.

7cce56b2

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776 · 4a77e833

unknown authored Apr 09, 2008

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my51-bug15776


mysql-test/r/type_blob.result:
  Auto merged
mysql-test/t/type_blob.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/unireg.h:
  Auto merged

4a77e833

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776 · e2420997

unknown authored Apr 09, 2008

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776-encore/my50-bug15776-encore


sql/field.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/unireg.h:
  Auto merged
mysql-test/r/type_blob.result:
  manual merge.
mysql-test/t/type_blob.test:
  manual merge.

e2420997