Commits · 166cd83de0e796efee06b0c8f576cbe6db6f6326 · nexedi / MariaDB

19 Oct, 2007 5 commits

Merge trift2.:/MySQL/M51/bug31644-5.1 · 166cd83d

unknown authored Oct 19, 2007

into  trift2.:/MySQL/M51/push-5.1


configure.in:
  Auto merged
scripts/Makefile.am:
  Auto merged

166cd83d

Merge trift2.:/MySQL/M50/bug31644-5.0 · da29a105

unknown authored Oct 19, 2007

into  trift2.:/MySQL/M51/bug31644-5.1


configure.in:
  Auto merged
scripts/Makefile.am:
  Auto merged
scripts/mysqlbug.sh:
  Auto merged

da29a105

Merge trift2.:/MySQL/M50/push-5.0 · a0d2cee7
unknown authored Oct 19, 2007
```
into  trift2.:/MySQL/M51/push-5.1


configure.in:
  Auto merged
```
a0d2cee7
Merge trift2.:/MySQL/M51/mysql-5.1 · ebd2092e
unknown authored Oct 19, 2007
```
into  trift2.:/MySQL/M51/push-5.1


configure.in:
  Auto merged
```
ebd2092e
Merge trift2.:/MySQL/M50/mysql-5.0 · 0f42119c
unknown authored Oct 19, 2007
```
into  trift2.:/MySQL/M50/push-5.0


configure.in:
  Auto merged
```
0f42119c

18 Oct, 2007 4 commits

Merge four.local.lan:/WORK2/merge/mysql-5.1-31556 · 38c3c03b
unknown authored Oct 18, 2007
```
into  four.local.lan:/WORK/mysql-5.1-build/src-clean
```
38c3c03b

Merge four.local.lan:/WORK2/merge/mysql-5.0-31556 · cea9cbc7

unknown authored Oct 18, 2007

into  four.local.lan:/WORK2/merge/mysql-5.1-31556


mysql-test/suite/funcs_2/r/innodb_charset.result:
  Auto merged
mysql-test/suite/funcs_2/r/memory_charset.result:
  Auto merged
mysql-test/suite/funcs_2/r/myisam_charset.result:
  Auto merged
mysql-test/suite/funcs_2/r/ndb_charset.result:
  Auto merged

cea9cbc7

Fix for · 214caf24

unknown authored Oct 18, 2007

Bug#31556 Test failure: "select hex(ascii(a)) ... order by a" results in different order


mysql-test/suite/funcs_2/r/innodb_charset.result:
  Updated result
mysql-test/suite/funcs_2/r/memory_charset.result:
  Updated result
mysql-test/suite/funcs_2/r/myisam_charset.result:
  Updated result
mysql-test/suite/funcs_2/r/ndb_charset.result:
  Updated result

214caf24

Modify "mysqlbug" ("scripts/mysqlbug.sh") so that it differs between the original · 776d59dd

unknown authored Oct 18, 2007

and the modified values of the compile-related variables used in "configure".

Make the necessary adjustments in "configure.in" and "scripts/Makefile.am".

This fixes bug#31644
   Values of *FLAGS that were used for building packages is missed in mysqlbug


configure.in:
  Add more variables to the "substitution" list: SAVE_CC, SAVE_CXX, ASFLAGS.
  
  This is necessary so that the "mysqlbug" script can output the variables affecting
  compilation with both their original (on call) and final (modified) values.
  
  This work is related to fixing bug#31644
     Values of *FLAGS that were used for building packages is missed in mysqlbug
scripts/Makefile.am:
  Clearly differ between the original and the modified values of the compile-related
  variables used in "configure".
  
  This is to fix bug#31644
     Values of *FLAGS that were used for building packages is missed in mysqlbug
scripts/mysqlbug.sh:
  Have separate variables "COMP_CALL_INFO" and "COMP_RUN_INFO"
  which contain the original (call parameters, environment) and the modified values
  of the "configure" variables controlling the compile process.
  
  This fixes bug#31644
     Values of *FLAGS that were used for building packages is missed in mysqlbug

776d59dd

17 Oct, 2007 5 commits

Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 988fad13
unknown authored Oct 17, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


libmysql/libmysql.c:
  Auto merged
```
988fad13

Fix syntax error build problem on Windows (variable was defined · 2a65aba5

unknown authored Oct 17, 2007

in middle of block)


libmysql/libmysql.c:
  Fix syntax error - don't define new variables in the middle of a block.
  
  Also, use size_t instead of uint to avoid unnecessary casting.

2a65aba5

Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint · 5940e90a

unknown authored Oct 17, 2007

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


mysql-test/r/repair.result:
  Auto merged
mysql-test/t/repair.test:
  Auto merged

5940e90a

Merge polly.(none):/home/kaa/src/maint/mysql-4.1-maint · 1451a0eb

unknown authored Oct 17, 2007

into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint


mysql-test/r/repair.result:
  Auto merged
mysql-test/t/repair.test:
  Auto merged

1451a0eb

Fixed the test case for bug #31174 to not fail on 64-bit platforms. · 211aaf1f
unknown authored Oct 17, 2007

211aaf1f

16 Oct, 2007 4 commits

Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint · 3a294bf7

unknown authored Oct 16, 2007

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


storage/myisam/sort.c:
  Auto merged
mysql-test/r/repair.result:
  SCCS merged
mysql-test/t/repair.test:
  SCCS merged

3a294bf7

Merge polly.(none):/home/kaa/src/maint/mysql-4.1-maint · 47d6d92d

unknown authored Oct 16, 2007

into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint


myisam/sort.c:
  Auto merged
mysql-test/r/repair.result:
  Auto merged
mysql-test/t/repair.test:
  Auto merged

47d6d92d

Merge polly.(none):/home/kaa/src/maint/bug31174/my41-bug31174 · 40fe4b6e
unknown authored Oct 16, 2007
```
into  polly.(none):/home/kaa/src/maint/mysql-4.1-maint
```
40fe4b6e
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-build · d4b59632
unknown authored Oct 16, 2007
```
into  four.local.lan:/WORK/mysql-5.1-build/src-clean
```
d4b59632

15 Oct, 2007 13 commits

Merge trift2.:/MySQL/M50/bug29658-5.0 · 627b8080
unknown authored Oct 15, 2007
```
into  trift2.:/MySQL/M51/bug29658-5.1


configure.in:
  Auto merged
```
627b8080

Allow for different directories containing the "libc", · 4aa01292

unknown authored Oct 15, 2007

as it may well happen with 32- vs 64-bit Linux systems.

This patch was proposed immediately with the report of
Bug #29658 wrong test for static nss checking on linux, doesn't cover all platforms

4aa01292

Fix for · 78ea5d13

unknown authored Oct 15, 2007

Bug#31169 Test case does not check whether configuration contains feature tested


mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
  Add check for partitioning feature.
mysql-test/suite/rpl/t/rpl_innodb_bug30919.test:
  Add check for partitioning feature.

78ea5d13

Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint · 3e752c81

unknown authored Oct 15, 2007

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint


libmysql/libmysql.c:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged

3e752c81

Merge pilot.mysql.com:/data/msvensson/mysql/bug11589/my50-test_latest · 48ebefc7

unknown authored Oct 15, 2007

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint


libmysql/libmysql.c:
  Auto merged
mysql-test/r/type_float.result:
  Manual merge
mysql-test/t/type_float.test:
  Manual merge

48ebefc7

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · c51fa634
unknown authored Oct 15, 2007
```
into  mysql.com:/home/ram/work/b31154/b31154.5.1
```
c51fa634
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 0cbe252b
unknown authored Oct 15, 2007
```
into  mysql.com:/home/ram/work/b31154/b31154.5.0
```
0cbe252b
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 219fac5c
unknown authored Oct 15, 2007
```
into  mysql.com:/home/ram/work/b31154/b31154.5.0
```
219fac5c
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 05b84978
unknown authored Oct 15, 2007
```
into  mysql.com:/home/ram/work/b31154/b31154.5.1
```
05b84978
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · c9d26db1
unknown authored Oct 15, 2007
```
into  mysql.com:/home/ram/work/b30885/b30885.5.0
```
c9d26db1

Merge mysql.com:/home/ram/work/b31154/b31154.5.0 · 314cf109

unknown authored Oct 15, 2007

into  mysql.com:/home/ram/work/b31154/b31154.5.1


mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
sql/item_sum.cc:
  Auto merged

314cf109

Merge mysql.com:/home/ram/work/mysql-5.1-maint · 360901a3
unknown authored Oct 15, 2007
```
into  mysql.com:/home/ram/work/b30885/b30885.5.1
```
360901a3

Merge mysql.com:/home/ram/work/b30885/b30885.5.0 · 0757823a

unknown authored Oct 15, 2007

into  mysql.com:/home/ram/work/b30885/b30885.5.1


mysql-test/r/heap_btree.result:
  Auto merged
mysql-test/t/heap_btree.test:
  Auto merged
storage/heap/hp_hash.c:
  the code was changed to use bitmaps instead of key length, so ul

0757823a

12 Oct, 2007 9 commits

Merge solace.(none):/home/mtaylor/src/mysql/mysql-5.0-maint · 561a2802

unknown authored Oct 12, 2007

into  solace.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint


BitKeeper/deleted/.del-changelog~8457b43736642c:
  Auto merged
BitKeeper/deleted/.del-copyright~3c3485ee25f7cde0:
  Auto merged
BitKeeper/deleted/.del-my.cnf~c8cce985cf5872e3:
  Auto merged
BitKeeper/deleted/.del-rules~2018e0de32c6d936:
  Auto merged
BitKeeper/deleted/.del-README.debian~223f0edd363d08af:
  Auto merged
BitKeeper/deleted/.del-aa~f8c7e976fa99167f:
  Auto merged
BitKeeper/deleted/.del-ab~1145a71fc2a5dbb8:
  Auto merged
BitKeeper/deleted/.del-ac~66b41066a435209:
  Auto merged
BitKeeper/deleted/.del-ad~9296238d4d7d5bb3:
  Auto merged
BitKeeper/deleted/.del-ae~c54b032746985759:
  Auto merged
BitKeeper/deleted/.del-az~45092291b7eff90a:
  Auto merged
BitKeeper/deleted/.del-control~a2146883b4ed7c94:
  Auto merged
BitKeeper/deleted/.del-gomi~bcec57fe6195deee:
  Auto merged
BitKeeper/deleted/.del-libmysqlclient10.dirs~24c90ade3a371b6f:
  Auto merged
BitKeeper/deleted/.del-libmysqlclient10.postinst~5829f4e4a7c0206b:
  Auto merged
BitKeeper/deleted/.del-libmysqlclient9.dirs~4420713260a0eb40:
  Auto merged
BitKeeper/deleted/.del-libmysqlclient9.postinst~80ad5f1e4633a219:
  Auto merged
BitKeeper/deleted/.del-move~6b750ba06050bc92:
  Auto merged
BitKeeper/deleted/.del-mysql-bench.dirs~3407d505223bf583:
  Auto merged
BitKeeper/deleted/.del-mysql-client.dirs~3f347d1649db13e1:
  Auto merged
BitKeeper/deleted/.del-mysql-dev.dirs~c6cacea9b3289f33:
  Auto merged
BitKeeper/deleted/.del-mysql-doc.dirs~a468f79189ff27ad:
  Auto merged
BitKeeper/deleted/.del-mysql-max-debug.dirs~58d766ce6caffa2b:
  Auto merged
BitKeeper/deleted/.del-mysql-max-debug.postinst~36f2faba601ed8a:
  Auto merged
BitKeeper/deleted/.del-mysql-max-debug.postrm~26bdf891820d3671:
  Auto merged
BitKeeper/deleted/.del-mysql-max-shared.dirs~38f36e6773ac0e79:
  Auto merged
BitKeeper/deleted/.del-mysql-max-shared.postinst~3406aa3bae283fe0:
  Auto merged
BitKeeper/deleted/.del-mysql-max-shared.postrm~92193bedc2b75355:
  Auto merged
BitKeeper/deleted/.del-mysql-max.dirs~be29c2b464db6050:
  Auto merged
BitKeeper/deleted/.del-mysql-max.postinst~cc8a0b3de02b23e0:
  Auto merged
BitKeeper/deleted/.del-mysql-max.postrm~66c355bd3081578b:
  Auto merged
BitKeeper/deleted/.del-mysql-server-debug.dirs~7b6329c9df635ce4:
  Auto merged
BitKeeper/deleted/.del-mysql-server-debug.postinst~12af8ffb8a145fae:
  Auto merged
BitKeeper/deleted/.del-mysql-server-debug.postrm~ae113145ebc34ac8:
  Auto merged
BitKeeper/deleted/.del-mysql-server-shared.dirs~cb56821f47811c7c:
  Auto merged
BitKeeper/deleted/.del-mysql-server-shared.postinst~c6fee24788b634a7:
  Auto merged
BitKeeper/deleted/.del-mysql-server-shared.postrm~f3d7f9c6bfb3ca9b:
  Auto merged
BitKeeper/deleted/.del-mysql-server.conffiles~566a6664d16909f0:
  Auto merged
BitKeeper/deleted/.del-mysql-server.dirs~b12380a091807c5e:
  Auto merged
BitKeeper/deleted/.del-mysql-server.postinst~d72bf57a84001364:
  Auto merged
BitKeeper/deleted/.del-mysql-server.postrm~68a988229b41c3bb:
  Auto merged
BitKeeper/deleted/.del-mysql-server.prerm~4445eacc70e74899:
  Auto merged
BitKeeper/deleted/.del-shlibs~3fe34471c220623c:
  Auto merged
BitKeeper/deleted/.del-ta~ec794c5d9d922b6c:
  Auto merged
BitKeeper/deleted/.del-tb~8844e8c985e40d4e:
  Auto merged

561a2802

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 848e8742
unknown authored Oct 12, 2007
```
into  solace.(none):/home/mtaylor/src/mysql/mysql-5.0-maint
```
848e8742
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint · acdfb9e8
unknown authored Oct 12, 2007
```
into  solace.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint
```
acdfb9e8

Removing 7 year old 3.23 crufty debian dir that is not in use, so as not to cause confusion. · c76bceb0

unknown authored Oct 12, 2007


BitKeeper/deleted/.del-README.debian:
  Delete: support-files/debian/README.debian
BitKeeper/deleted/.del-changelog~8457b43736642c:
  Delete: support-files/debian/changelog
BitKeeper/deleted/.del-control:
  Delete: support-files/debian/control
BitKeeper/deleted/.del-copyright~3c3485ee25f7cde0:
  Delete: support-files/debian/copyright
BitKeeper/deleted/.del-gomi:
  Delete: support-files/debian/gomi
BitKeeper/deleted/.del-libmysqlclient10.dirs:
  Delete: support-files/debian/libmysqlclient10.dirs
BitKeeper/deleted/.del-libmysqlclient10.postinst:
  Delete: support-files/debian/libmysqlclient10.postinst
BitKeeper/deleted/.del-libmysqlclient9.dirs:
  Delete: support-files/debian/libmysqlclient9.dirs
BitKeeper/deleted/.del-libmysqlclient9.postinst:
  Delete: support-files/debian/libmysqlclient9.postinst
BitKeeper/deleted/.del-move:
  Delete: support-files/debian/move
BitKeeper/deleted/.del-my.cnf~c8cce985cf5872e3:
  Delete: support-files/debian/my.cnf
BitKeeper/deleted/.del-mysql-bench.dirs:
  Delete: support-files/debian/mysql-bench.dirs
BitKeeper/deleted/.del-aa:
  Delete: support-files/debian/patches/aa
BitKeeper/deleted/.del-mysql-client.dirs:
  Delete: support-files/debian/mysql-client.dirs
BitKeeper/deleted/.del-mysql-dev.dirs:
  Delete: support-files/debian/mysql-dev.dirs
BitKeeper/deleted/.del-mysql-doc.dirs:
  Delete: support-files/debian/mysql-doc.dirs
BitKeeper/deleted/.del-mysql-max-debug.dirs:
  Delete: support-files/debian/mysql-max-debug.dirs
BitKeeper/deleted/.del-mysql-max-debug.postinst:
  Delete: support-files/debian/mysql-max-debug.postinst
BitKeeper/deleted/.del-mysql-max-debug.postrm:
  Delete: support-files/debian/mysql-max-debug.postrm
BitKeeper/deleted/.del-mysql-max-shared.dirs:
  Delete: support-files/debian/mysql-max-shared.dirs
BitKeeper/deleted/.del-mysql-max-shared.postinst:
  Delete: support-files/debian/mysql-max-shared.postinst
BitKeeper/deleted/.del-mysql-max-shared.postrm:
  Delete: support-files/debian/mysql-max-shared.postrm
BitKeeper/deleted/.del-mysql-max.dirs:
  Delete: support-files/debian/mysql-max.dirs
BitKeeper/deleted/.del-mysql-max.postinst:
  Delete: support-files/debian/mysql-max.postinst
BitKeeper/deleted/.del-mysql-max.postrm:
  Delete: support-files/debian/mysql-max.postrm
BitKeeper/deleted/.del-mysql-server-debug.dirs:
  Delete: support-files/debian/mysql-server-debug.dirs
BitKeeper/deleted/.del-mysql-server-debug.postinst:
  Delete: support-files/debian/mysql-server-debug.postinst
BitKeeper/deleted/.del-mysql-server-debug.postrm:
  Delete: support-files/debian/mysql-server-debug.postrm
BitKeeper/deleted/.del-mysql-server-shared.dirs:
  Delete: support-files/debian/mysql-server-shared.dirs
BitKeeper/deleted/.del-mysql-server-shared.postinst:
  Delete: support-files/debian/mysql-server-shared.postinst
BitKeeper/deleted/.del-mysql-server-shared.postrm:
  Delete: support-files/debian/mysql-server-shared.postrm
BitKeeper/deleted/.del-mysql-server.conffiles:
  Delete: support-files/debian/mysql-server.conffiles
BitKeeper/deleted/.del-mysql-server.dirs:
  Delete: support-files/debian/mysql-server.dirs
BitKeeper/deleted/.del-mysql-server.postinst:
  Delete: support-files/debian/mysql-server.postinst
BitKeeper/deleted/.del-mysql-server.postrm:
  Delete: support-files/debian/mysql-server.postrm
BitKeeper/deleted/.del-mysql-server.prerm:
  Delete: support-files/debian/mysql-server.prerm
BitKeeper/deleted/.del-rules~2018e0de32c6d936:
  Delete: support-files/debian/rules
BitKeeper/deleted/.del-shlibs:
  Delete: support-files/debian/shlibs
BitKeeper/deleted/.del-ab:
  Delete: support-files/debian/patches/ab
BitKeeper/deleted/.del-ac:
  Delete: support-files/debian/patches/ac
BitKeeper/deleted/.del-ad:
  Delete: support-files/debian/patches/ad
BitKeeper/deleted/.del-ae:
  Delete: support-files/debian/patches/ae
BitKeeper/deleted/.del-az:
  Delete: support-files/debian/patches/az
BitKeeper/deleted/.del-ta:
  Delete: support-files/debian/patches/ta
BitKeeper/deleted/.del-tb:
  Delete: support-files/debian/patches/tb

c76bceb0

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · dfbaa346
unknown authored Oct 12, 2007
```
into  sin.intern.azundris.com:/home/tnurnberg/30951/51-30951
```
dfbaa346
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 8461087d
unknown authored Oct 12, 2007
```
into  sin.intern.azundris.com:/home/tnurnberg/30951/50-30951
```
8461087d
Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint · 49616256
unknown authored Oct 12, 2007
```
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


sql/mysqld.cc:
  Auto merged
```
49616256
Merge polly.(none):/home/kaa/src/maint/bug31254/my51-bug31254 · 5ee486cc
unknown authored Oct 12, 2007
```
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
```
5ee486cc
Merge polly.(none):/home/kaa/src/maint/bug31254/my50-bug31254 · ebe9a0be
unknown authored Oct 12, 2007
```
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
```
ebe9a0be