Commits · 07cc141e999977d6a64ba5442ba5a4f9d697b22b · Kirill Smelkov / mariadb

23 Aug, 2006 3 commits
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint · 07cc141e
  unknown authored Aug 23, 2006
```
into  maint1.mysql.com:/data/localhome/cmiller/mysql-5.1-maint


sql/sql_lex.cc:
  Auto merged
```
  07cc141e
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/m50-maint-b21224 · cdd4bc64
  unknown authored Aug 23, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-new-maint


client/mysql_upgrade.c:
  Auto merged
```
  cdd4bc64
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint · a8dc5c89
  unknown authored Aug 23, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-new-maint


sql/mysqld.cc:
  Auto merged
```
  a8dc5c89
22 Aug, 2006 2 commits

Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_21757 · 3fd4d0f7

unknown authored Aug 21, 2006

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-new-maint_21757


tests/mysql_client_test.c:
  Auto merged
client/mysqltest.c:
  manual merge.

3fd4d0f7

Bug#21757: mysql_client_test fails in testcase when reading master.log file · ad0f34e3
unknown authored Aug 21, 2006
```
tests/mysql_client_test.c:
  Replace fopen with my_fopen and specify O_BINARY. Replace fclose with my_fclose.
```
ad0f34e3

21 Aug, 2006 2 commits
- Merge bk-internal:/home/bk/mysql-5.0-maint · 7a8f8733
  unknown authored Aug 21, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


tests/mysql_client_test.c:
  Auto merged
```
  7a8f8733
- Print lines from log file to see what's in them · d36b0cdf
  unknown authored Aug 21, 2006
  
  d36b0cdf
20 Aug, 2006 1 commit
- Move the initialisation of "NDB_STATUS_OK" env variable to after cluster has been intalled · ae705221
  unknown authored Aug 20, 2006
  
  ae705221
18 Aug, 2006 6 commits

17926 duplicates Bug#1989 in bug db · f177075e

unknown authored Aug 18, 2006

on up-merging 17926 from 5.0 tree it collides with near-identical fix 1989
in 5.1 tree. backing 17926 out of 5.1 tree.


client/mysql.cc:
  Bug#17926 duplicates Bug#1989 in bug db
  
  back 17926 out of 5.1 tree

f177075e

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

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

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

ae606850

innodb r702 · 3468780e

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

3468780e

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

17 Aug, 2006 16 commits

A couple of adjustments to the merge to fix the broken build · 55fb3cae

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*

55fb3cae

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

rename to avoid case sensitive collision · 703717c7

unknown authored Aug 17, 2006


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

703717c7

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1 · 548d45a2

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

548d45a2

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

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

b8930cbc

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

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

b32b2ce7

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

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

5c8c2ab4

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

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

860c3853

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


tests/mysql_client_test.c:
  Auto merged
```
7faa9efe

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

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

d82c1514

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

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

d3efda57

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

358e684e
merge warning test results (!) · 0073d9be
unknown authored Aug 16, 2006

0073d9be

test result changes (non-functional) for 5.1-5.0 merge · 2eb9eb9f

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

2eb9eb9f

16 Aug, 2006 10 commits

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

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

b2cfa703

manual merge · 1c28a068
unknown authored Aug 16, 2006

1c28a068
manual merge · 5297d9c1
unknown authored Aug 16, 2006

5297d9c1

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

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

46f25b3b

Merge tnurnberg@maint1:/data/localhome/tnurnberg/i51 · 42c3fa73
unknown authored Aug 16, 2006
```
into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.1-maint-i51
```
42c3fa73
Remove duplicate free of "ds_res" · 032baf1f
unknown authored Aug 16, 2006

032baf1f

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

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.

49342315

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

8ef847ea

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

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

5a7ab737

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

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

035137fe