Commits · 0f299acb7c0e693dc3aa2a98cba5453bcc07d0dd · nexedi / MariaDB

11 Apr, 2007 3 commits

Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508 · 0f299acb

unknown authored Apr 11, 2007

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


BitKeeper/etc/ignore:
  auto-union
Makefile.am:
  Auto merged
configure.in:
  Auto merged
include/Makefile.am:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
client/Makefile.am:
  Merge
netware/Makefile.am:
  Merge
sql/Makefile.am:
  Merge

0f299acb

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

unknown authored Apr 11, 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

06f4523d

Add replace_result for things that are not tested · 561cd328
unknown authored Apr 11, 2007

561cd328

10 Apr, 2007 25 commits
- Merge pilot.blaudden:/home/msvensson/mysql/bug25337/my51-bug25337 · b0b7ab6a
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  b0b7ab6a
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · e55d50e4
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/r/mysqltest.result:
  Auto merged
```
  e55d50e4
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · bfe25fb2
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/r/mysqltest.result:
  Auto merged
```
  bfe25fb2
- Update result(which mysterioulsy got lost) · 247c3a81
  unknown authored Apr 10, 2007
  
  247c3a81
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 51587c29
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


client/mysqltest.c:
  Auto merged
```
  51587c29
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 30606c38
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
```
  30606c38
- Take into account wether vertical_results are in effect · da43360e
  unknown authored Apr 10, 2007
  
  da43360e
- Init dying to 1 just after passing the guard · 3120134a
  unknown authored Apr 10, 2007
  
  3120134a
- Add OPT_LOG_DIR · 3f96702b
  unknown authored Apr 10, 2007
  
  3f96702b
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 7122fb33
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  7122fb33
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 4d324e03
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  4d324e03
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · dc443e49
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  dc443e49
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1 · 86ef70e9
  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
```
  86ef70e9
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0 · d76e2592
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  d76e2592
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1 · 76f5c73b
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
```
  76f5c73b
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · a2aa6503
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


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


client/mysqltest.c:
  Manual merge
```
  06ed2ddc
- Add --logdir option ot mysqltest · 5565d329
  unknown authored Apr 10, 2007
  
  5565d329
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 334c2cc2
  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
```
  334c2cc2
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 4788e6df
  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
```
  4788e6df
- Merge 192.168.0.4:mysql/mysql-4.1-maint · 8163d5ec
  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
```
  8163d5ec
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 4aa3615c
  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
```
  4aa3615c
- Give the "sync_slave_with_master" something to do · 9f5e640d
  unknown authored Apr 10, 2007
  
  9f5e640d
- Merge bk-internal:/home/bk/mysql-5.1-new-maint · d2462ac3
  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
```
  d2462ac3
- Merge bk-internal:/home/bk/mysql-5.0-maint · ca33c667
  unknown authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  ca33c667
09 Apr, 2007 5 commits

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

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

37feda25

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

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

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

7f993fa6

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


sql/sql_table.cc:
  Auto merged
```
43d17730
Merge bk@192.168.21.1:mysql-5.0 · 6d9a7969
unknown authored Apr 09, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt


sql/sql_table.cc:
  Auto merged
```
6d9a7969

08 Apr, 2007 2 commits

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

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

fde3e9d4

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

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

ddaeead8

07 Apr, 2007 5 commits

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


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

after-merging fix · 3f0c44c6

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''

3f0c44c6

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

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

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

a748949d