Commits · 09357d5102690ebac55d0dfe81aca1594f1bf00e · nexedi / MariaDB

18 Aug, 2006 5 commits

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 09357d51
unknown authored Aug 18, 2006
```
into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1-maint
```
09357d51

Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.0-maint · 21db71d7

unknown authored Aug 18, 2006

into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1-maint


sql/ha_innodb.cc:
  null
storage/innobase/btr/btr0btr.c:
  null
storage/innobase/buf/buf0buf.c:
  null
storage/innobase/dict/dict0dict.c:
  null
storage/innobase/fil/fil0fil.c:
  null
storage/innobase/fsp/fsp0fsp.c:
  null
storage/innobase/include/btr0cur.ic:
  null
storage/innobase/include/buf0buf.ic:
  null
storage/innobase/log/log0log.c:
  null
storage/innobase/log/log0recv.c:
  null
storage/innobase/os/os0file.c:
  null
storage/innobase/row/row0mysql.c:
  null
storage/innobase/row/row0sel.c:
  null
storage/innobase/srv/srv0start.c:
  null
storage/innobase/ut/ut0dbg.c:
  null

21db71d7

innodb r702 · bd2028ff

unknown authored Aug 18, 2006

innodb r719


innobase/btr/btr0btr.c:
  innodb r702
innobase/buf/buf0buf.c:
  innodb r702
innobase/dict/dict0dict.c:
  innodb r702
innobase/fil/fil0fil.c:
  innodb r702
innobase/fsp/fsp0fsp.c:
  innodb r702
innobase/include/btr0cur.ic:
  innodb r719
innobase/include/buf0buf.ic:
  innodb r702
innobase/log/log0log.c:
  innodb r702
innobase/log/log0recv.c:
  innodb r702
innobase/os/os0file.c:
  innodb r702
innobase/row/row0mysql.c:
  innodb r702
innobase/row/row0sel.c:
  innodb r702
innobase/srv/srv0start.c:
  innodb r702
innobase/ut/ut0dbg.c:
  innodb r702
sql/ha_innodb.cc:
  innodb r702

bd2028ff

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1 · 6e9cb810
unknown authored Aug 18, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
```
6e9cb810
Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · c77d73cc
unknown authored Aug 18, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
```
c77d73cc

17 Aug, 2006 16 commits

A couple of adjustments to the merge to fix the broken build · ba155977

unknown authored Aug 17, 2006

instance.cc:
  Removed wrongly placed closing brace
item_geofunc.cc:
  needed to pass in a TABLE_SHARE* instead of a TABLE*


server-tools/instance-manager/instance.cc:
  Removed wrongly placed closing brace
sql/item_geofunc.cc:
  needed to pass in a TABLE_SHARE* instead of a TABLE*

ba155977

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1 · d8c50792
unknown authored Aug 17, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
```
d8c50792
Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · f912010d
unknown authored Aug 17, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
```
f912010d

rename to avoid case sensitive collision · 209056e9

unknown authored Aug 17, 2006


BitKeeper/deleted/.del-readme-renamed:
  Rename: BitKeeper/deleted/.del-readme -> BitKeeper/deleted/.del-readme-renamed

209056e9

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1 · 5e7efc78

unknown authored Aug 17, 2006

into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/disabled.def:
  SCCS merged

5e7efc78

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0 · 98345d89

unknown authored Aug 17, 2006

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


BitKeeper/deleted/.del-openssl.m4~41cebd0ba8281769:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/mysql_client_test.test:
  Auto merged
server-tools/instance-manager/listener.cc:
  Auto merged
server-tools/instance-manager/portability.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
client/mysql.cc:
  Manual merge
mysql-test/mysql-test-run.pl:
  Manual merge
mysql-test/t/func_time.test:
  Manual merge

98345d89

Merge bk-internal.mysql.com:/data0/bk/tmp_reg · 061c3fab

unknown authored Aug 17, 2006

into  bk-internal.mysql.com:/data0/bk/mysql-5.1


client/mysql.cc:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/gis.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/im_life_cycle.result:
  Auto merged
mysql-test/r/information_schema_db.result:
  Auto merged
mysql-test/r/type_newdecimal.result:
  Auto merged
mysql-test/r/type_ranges.result:
  Auto merged
mysql-test/r/type_timestamp.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/gis.test:
  Auto merged
mysql-test/t/im_life_cycle.imtest:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
mysql-test/t/type_timestamp.test:
  Auto merged
server-tools/instance-manager/messages.cc:
  Auto merged
sql/item_geofunc.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

061c3fab

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge · f5ed297a

unknown authored Aug 17, 2006

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


BitKeeper/deleted/.del-mysql_client.result:
  Auto merged
BitKeeper/deleted/.del-mysql_client.test:
  Auto merged
client/mysql.cc:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged

f5ed297a

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge · 3cbaa966

unknown authored Aug 17, 2006

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


client/mysql.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

3cbaa966

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge · 74c48abe
unknown authored Aug 17, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0


tests/mysql_client_test.c:
  Auto merged
```
74c48abe

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge · 778bf6e8

unknown authored Aug 17, 2006

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


mysql-test/r/grant.result:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

778bf6e8

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge · f183cfed

unknown authored Aug 17, 2006

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


mysql-test/r/grant.result:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged

f183cfed

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint · dd2a3da2
unknown authored Aug 17, 2006
```
into  maint1.mysql.com:/data/localhome/tnurnberg/mysql-5.1-maint-i51
```
dd2a3da2
temporarily disabled partition test, fails w/ PS protocol, filed as Bug#21658 · 60557f81
unknown authored Aug 17, 2006

60557f81
merge warning test results (!) · 56625d59
unknown authored Aug 16, 2006

56625d59

test result changes (non-functional) for 5.1-5.0 merge · 535bf60d

unknown authored Aug 16, 2006


mysql-test/r/federated_transactions.result:
  merge fixes to result file (case sensitivity)
mysql-test/r/warnings.result:
  wrong warning message result

535bf60d

16 Aug, 2006 19 commits

Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_20328 · 8f374814

unknown authored Aug 16, 2006

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-merge


sql/item_timefunc.cc:
  Auto merged
sql/slave.cc:
  Auto merged
mysql-test/r/func_time.result:
  manual merge
mysql-test/r/mysql_client.result:
  manual merge
mysql-test/t/func_time.test:
  manual merge
mysql-test/t/mysql_client.test:
  manual merge
sql/sql_acl.cc:
  manual merge

8f374814

manual merge · 2af624d3
unknown authored Aug 16, 2006

2af624d3
manual merge · 89e2712e
unknown authored Aug 16, 2006

89e2712e

Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_20328 · cb320dfb

unknown authored Aug 16, 2006

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_20328


sql/item_timefunc.cc:
  Auto merged
sql/slave.cc:
  Auto merged
BitKeeper/deleted/.del-mysql_client.result:
  manual merge
BitKeeper/deleted/.del-mysql_client.test:
  manual merge
mysql-test/r/func_time.result:
  manual merge
mysql-test/t/func_time.test:
  manual merge
sql/sql_acl.cc:
  manual merge

cb320dfb

Merge tnurnberg@maint1:/data/localhome/tnurnberg/i51 · 75126a5b
unknown authored Aug 16, 2006
```
into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.1-maint-i51
```
75126a5b

Bug#20328 - Correction to test/result for broken Windows build. · 7f087e2b

unknown authored Aug 16, 2006


mysql-test/r/mysql_client.result:
  Removed OS dependant output.
mysql-test/t/mysql_client.test:
  Re-directed output to a temporary file because the actual output isn't important and was causing a Windows test failure.

7f087e2b

merge 5.0 -> 5.1, re-enabling federated, disabled partition · 7c4fd91a
unknown authored Aug 16, 2006

7c4fd91a

Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · bc6a33e7

unknown authored Aug 16, 2006

into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-clean2


mysql-test/lib/mtr_misc.pl:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/ctype_cp1250_ch.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/federated.result:
  Auto merged
mysql-test/r/insert_select.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/r/warnings.result:
  Auto merged
mysql-test/t/ctype_cp1250_ch.test:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
BitKeeper/deleted/.del-ps_6bdb.result:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
storage/myisam/mi_unique.c:
  Auto merged

bc6a33e7

Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1 · a6682dcb

unknown authored Aug 16, 2006

into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-clean2


mysql-test/r/warnings.result:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
BitKeeper/deleted/.del-ps_6bdb.result:
  Auto merged
sql/share/errmsg.txt:
  SCCS merged

a6682dcb

Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 · ec01ad53
unknown authored Aug 16, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
```
ec01ad53
small fix to enable the test suite to find executables and scripts on Windows · d4324d21
unknown authored Aug 16, 2006
```
mysql-test/lib/mtr_misc.pl:
  if running on win32, check for the existence of the file rather than it being executable
```
d4324d21
Merge shellback.(none):/home/msvensson/mysql/bug20328/my50-bug20328 · a636270a
unknown authored Aug 16, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
a636270a
Merge shellback.(none):/home/msvensson/mysql/bug20328/my51-bug20328 · ab7d1fb5
unknown authored Aug 16, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
ab7d1fb5
Merge shellback.(none):/home/msvensson/mysql/bug20328/my50-bug20328 · 613511c8
unknown authored Aug 16, 2006
```
into  shellback.(none):/home/msvensson/mysql/bug20328/my51-bug20328


mysql-test/t/mysql.test:
  Auto merged
```
613511c8

Bug#20328 mysql client: dumb about trailing spaces on 'help' command · 8485d436

unknown authored Aug 16, 2006

 Fix testcase to also work on windows


BitKeeper/deleted/.del-mysql_client.test:
  Delete: mysql-test/t/mysql_client.test
BitKeeper/deleted/.del-mysql_client.result:
  Delete: mysql-test/r/mysql_client.result
mysql-test/r/mysql.result:
  Update test result
mysql-test/t/mysql.test:
  Move tests from mysql_client to mysql
  Fix test case for bug#20328 to work on windows by comparing the output from "help" and "help "

8485d436

Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 · 5197499e

unknown authored Aug 16, 2006

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt


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

5197499e

Merge shellback.(none):/home/msvensson/mysql/bug20219/my50-bug20219 · c39ec831
unknown authored Aug 16, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
c39ec831

Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 · ff2592a3

unknown authored Aug 16, 2006

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysql.cc:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
sql/mysqld.cc:
  Auto merged

ff2592a3

Merge shellback.(none):/home/msvensson/mysql/bug20219/my51-bug20219 · 6b7dea75
unknown authored Aug 16, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/mysql-test-run.pl:
  Manual merge
```
6b7dea75