Commits · 598a2db91e109aa7f4d08cffd610941f780f262c · nexedi / MariaDB

10 Apr, 2007 24 commits

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 598a2db9

unknown authored Apr 10, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/r/mysqltest.result:
  Auto merged

598a2db9

Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · d5c68d28

unknown authored Apr 10, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/r/mysqltest.result:
  Auto merged

d5c68d28

Update result(which mysterioulsy got lost) · b7069c27
unknown authored Apr 10, 2007

b7069c27
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 2f5245b3
unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


client/mysqltest.c:
  Auto merged
```
2f5245b3
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · f5039e1f
unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
```
f5039e1f
Take into account wether vertical_results are in effect · a18fcdbf
unknown authored Apr 10, 2007

a18fcdbf
Init dying to 1 just after passing the guard · c7abe519
unknown authored Apr 10, 2007

c7abe519
Add OPT_LOG_DIR · 6a7c5b71
unknown authored Apr 10, 2007

6a7c5b71
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 97974b6a
unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
97974b6a
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 09eb82b5
unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
09eb82b5
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · cf6f5039
unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
cf6f5039

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1 · 31fd5807

unknown authored Apr 10, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/r/create.result:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

31fd5807

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0 · 3d432c99
unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
3d432c99
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1 · d69bca68
unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
```
d69bca68
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · cb880b45
unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


client/mysqltest.c:
  Auto merged
```
cb880b45
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 067e644f
unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Manual merge
```
067e644f
Add --logdir option ot mysqltest · faac6d79
unknown authored Apr 10, 2007

faac6d79

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 42aa2b1b

unknown authored Apr 10, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
client/mysqltest.c:
  Use remote

42aa2b1b

Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 1a14b0ad

unknown authored Apr 10, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  SCCS merged

1a14b0ad

Merge 192.168.0.4:mysql/mysql-4.1-maint · d9534ea8

unknown authored Apr 10, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint


client/mysqltest.c:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged

d9534ea8

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · b911b447

unknown authored Apr 10, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


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

b911b447

Give the "sync_slave_with_master" something to do · 4cf5fb97
unknown authored Apr 10, 2007

4cf5fb97

Merge bk-internal:/home/bk/mysql-5.1-new-maint · be31ea63

unknown authored Apr 10, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/gis.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/t/gis.test:
  Auto merged
sql/field.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

be31ea63

Merge bk-internal:/home/bk/mysql-5.0-maint · 0f039ff2
unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
0f039ff2

09 Apr, 2007 5 commits

Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · d202216d

unknown authored Apr 09, 2007

into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


mysql-test/t/loaddata.test:
  Auto merged
sql/sql_load.cc:
  Auto merged
mysql-test/r/loaddata.result:
  SCCS merged

d202216d

Merge bk@192.168.21.1:mysql-5.0-opt · 2501c71a
unknown authored Apr 09, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
```
2501c71a

Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · 89723d3d

unknown authored Apr 09, 2007

into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


sql/item_func.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

89723d3d

Merge bk@192.168.21.1:mysql-5.1 · 4ed7139d
unknown authored Apr 09, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


sql/sql_table.cc:
  Auto merged
```
4ed7139d
Merge bk@192.168.21.1:mysql-5.0 · 3b7d3230
unknown authored Apr 09, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt


sql/sql_table.cc:
  Auto merged
```
3b7d3230

08 Apr, 2007 2 commits

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 · c407e28b

unknown authored Apr 08, 2007

into  mysql.com:/home/kent/bk/tmp4/mysql-5.1-engines


sql/item_func.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

c407e28b

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · 74c6bf3e

unknown authored Apr 08, 2007

into  mysql.com:/home/kent/bk/tmp4/mysql-5.0-engines


sql/item_func.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

74c6bf3e

07 Apr, 2007 9 commits

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · be15f0c8
unknown authored Apr 07, 2007
```
into  moonbone.local:/mnt/gentoo64/work/27586-bug-5.0-opt-mysql


sql/sql_load.cc:
  Auto merged
```
be15f0c8
merging fix · 69a083ce
unknown authored Apr 08, 2007
```
mysql-test/r/windows.result:
  result fixed
```
69a083ce

after-merging fix · 183200ab

unknown authored Apr 07, 2007


mysql-test/r/events_trans.result:
  result fixed
mysql-test/r/windows.result:
  merging fix
mysql-test/t/events_trans.test:
  moved to events_trans_notembedded.test
mysql-test/r/events_trans_notembedded.result:
  New BitKeeper file ``mysql-test/r/events_trans_notembedded.result''
mysql-test/t/events_trans_notembedded.test:
  New BitKeeper file ``mysql-test/t/events_trans_notembedded.test''

183200ab

Merge mysql.com:/home/hf/work/26074/my51-26074 · 746ffa83
unknown authored Apr 07, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
```
746ffa83

Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · 371c29dd

unknown authored Apr 07, 2007

into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


sql/field.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

371c29dd

Merge bk@192.168.21.1:mysql-5.1-opt · c5d7cab5

unknown authored Apr 07, 2007

into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


client/mysqldump.c:
  Auto merged
mysql-test/r/rpl_packet.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/rpl_packet.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
mysql-test/r/create.result:
  SCCS merged
mysql-test/t/create.test:
  merging
mysql-test/t/disabled.def:
  merging
sql/events.cc:
  merging
sql/sql_parse.cc:
  SCCS merged

c5d7cab5

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 81e04f88
unknown authored Apr 07, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
```
81e04f88
Merge mysql.com:/d2/hf/mrg/mysql-4.1-opt · f34207f4
unknown authored Apr 07, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
```
f34207f4

Merge bk@192.168.21.1:mysql-5.0 · fc19d8eb

unknown authored Apr 07, 2007

into  mysql.com:/d2/hf/mrg/mysql-5.0-opt


sql/field.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

fc19d8eb