Commits · 428349ccda3ff82d64dddf5165ec32aa23df176c · nexedi / MariaDB

05 Apr, 2008 1 commit
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 428349cc
  unknown authored Apr 05, 2008
```
into  trift2.:/MySQL/M51/push-5.1
```
  428349cc
04 Apr, 2008 12 commits

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 98df163f
unknown authored Apr 04, 2008
```
into  trift2.:/MySQL/M51/tmp-5.1
```
98df163f

Merge trift2.:/MySQL/M51/clone-5.1 · 927d993c

unknown authored Apr 04, 2008

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

Null merge - changes specific to 5.1.24-rc are superseded by better ones done in parallel.


mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
  Null merge.
mysql-test/suite/funcs_1/r/innodb_trig_03e.result:
  Null merge.
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
  Null merge.
mysql-test/suite/funcs_1/r/memory_trig_03e.result:
  Null merge.
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
  Null merge.
mysql-test/suite/funcs_1/r/myisam_trig_03e.result:
  Null merge.
mysql-test/suite/funcs_1/r/ndb_storedproc_02.result:
  Null merge.
mysql-test/suite/funcs_1/r/ndb_trig_03e.result:
  Null merge.
mysql-test/suite/funcs_1/storedproc/storedproc_02.inc:
  Null merge.
mysql-test/suite/funcs_1/storedproc/storedproc_master.inc:
  Null merge.
mysql-test/suite/funcs_1/r/innodb_storedproc.result:
  Null merge - changes specific to 5.1.24-rc are superseded by better ones done in parallel.
mysql-test/suite/funcs_1/r/memory_storedproc.result:
  Null merge - changes specific to 5.1.24-rc are superseded by better ones done in parallel.
mysql-test/suite/funcs_1/r/myisam_storedproc.result:
  Null merge - changes specific to 5.1.24-rc are superseded by better ones done in parallel.
mysql-test/suite/funcs_1/r/ndb_storedproc.result:
  Null merge - changes specific to 5.1.24-rc are superseded by better ones done in parallel.

927d993c

Merge trift2.:/MySQL/M51/clone-5.1 · 5cc765c4
unknown authored Apr 04, 2008
```
into  trift2.:/MySQL/M51/push-5.1
```
5cc765c4
Merge trift2.:/MySQL/M51/clone-5.1 · 9d3d99ef
unknown authored Apr 04, 2008
```
into  trift2.:/MySQL/M51/tmp-5.1
```
9d3d99ef

Merge five.local.lan:/work/merge/mysql-5.1-funcs_1 · f809a857

unknown authored Apr 04, 2008

into  five.local.lan:/work/trees/mysql-5.1-build-src-clean


mysql-test/Makefile.am:
  Auto merged

f809a857

Merge five.local.lan:/work/merge/mysql-5.0-funcs_1 · f2ea54a0

unknown authored Apr 04, 2008

into  five.local.lan:/work/merge/mysql-5.1-funcs_1


mysql-test/Makefile.am:
  Fix of Makefile.am has happened by Changeset of Joerg

f2ea54a0

Backport of fix made in 5.1 to 5.0 · ad42f502

unknown authored Apr 04, 2008

mysql-test/Makefile.am   :    Fix a copy-paste error ...


mysql-test/Makefile.am:
  Correct the variables used for target directory
  of copy action.

ad42f502

Merge five.local.lan:/work/trees/mysql-5.0-build-src-clean · 61d7bc0e
unknown authored Apr 04, 2008
```
into  five.local.lan:/work/merge/mysql-5.0-build
```
61d7bc0e
Merge five.local.lan:/work/trees/mysql-5.1-build-src-clean · 3d2c23d0
unknown authored Apr 04, 2008
```
into  five.local.lan:/work/merge/mysql-5.1-build
```
3d2c23d0

mysql-test/Makefile.am : Fix a copy-paste error ... · cf682834

unknown authored Apr 04, 2008


mysql-test/Makefile.am:
  Fix a copy-paste error ...
  In this place, "$(distdir)" expands to empty, resulting in absolute "/std_data/funcs_1"

cf682834

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 6a3e439b

unknown authored Apr 04, 2008

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


mysql-test/suite/rpl/r/rpl_packet.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_packet.test:
  Auto merged
sql/share/errmsg.txt:
  Auto merged

6a3e439b

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 1a201d06
unknown authored Apr 04, 2008
```
into  trift2.:/MySQL/M51/push-5.1


sql/share/errmsg.txt:
  Auto merged
```
1a201d06

03 Apr, 2008 11 commits

Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1 · 4c58d134

unknown authored Apr 03, 2008

into  trift-lap.fambruehe:/MySQL/M51/push-5.1


mysql-test/suite/rpl/r/rpl_packet.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_packet.test:
  Auto merged
sql/share/errmsg.txt:
  Auto merged

4c58d134

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build · c94f7ec6
unknown authored Apr 03, 2008
```
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
```
c94f7ec6
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my51-bug26294 · 6119e977
unknown authored Apr 03, 2008
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build


sql/tztime.cc:
  Auto merged
```
6119e977

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my50-bug26294 · afa5c3e2

unknown authored Apr 03, 2008

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my51-bug26294


client/mysqlbinlog.cc:
  Auto merged
include/my_time.h:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/init.cc:
  Auto merged
sql/tztime.cc:
  Auto merged

afa5c3e2

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 2aa58108
unknown authored Apr 03, 2008
```
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
```
2aa58108

Bug#26294: library name conflict between MySQL 4.x, 5.0 and Qt 3.3 · d668628e

unknown authored Apr 03, 2008

When linking with some external programs, "multiple definition 
of `init_time'"

Rename init_time() to my_init_time() to avoid collision with other
libraries (particularly libmng).


client/mysqlbinlog.cc:
  Rename init_time() to my_init_time().
include/my_time.h:
  Rename init_time() to my_init_time().
sql-common/my_time.c:
  Rename init_time() to my_init_time().
sql/init.cc:
  Rename init_time() to my_init_time().
sql/tztime.cc:
  Rename init_time() to my_init_time().

d668628e

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build · 54ed62d3

unknown authored Apr 03, 2008

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


sql/sql_yacc.yy:
  Auto merged
sql/share/errmsg.txt:
  Auto merged

54ed62d3

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build · e146868c
unknown authored Apr 03, 2008
```
into  trift-lap.fambruehe:/MySQL/M51/push-5.1


storage/innobase/handler/ha_innodb.cc:
  Auto merged
```
e146868c
Merge trift2.:/MySQL/M50/push-5.0 · f6492453
unknown authored Apr 03, 2008
```
into  trift2.:/MySQL/M51/push-5.1
```
f6492453

Merge trift2.:/MySQL/M51/mysql-5.1 · 2292258d

unknown authored Apr 03, 2008

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


mysql-test/suite/rpl/r/rpl_packet.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_packet.test:
  Auto merged

2292258d

Merge trift2.:/MySQL/M50/mysql-5.0 · 17b92361
unknown authored Apr 03, 2008
```
into  trift2.:/MySQL/M50/push-5.0
```
17b92361

02 Apr, 2008 8 commits
- Merge five.local.lan:/work/trees/mysql-5.0-build-src-clean · d63b60f8
  unknown authored Apr 02, 2008
```
into  five.local.lan:/work/trees/mysql-5.1-build-src-clean
```
  d63b60f8
- Merge five.local.lan:/work/merge/mysql-5.1-funcs_1 · 3f22d8b7
  unknown authored Apr 02, 2008
```
into  five.local.lan:/work/trees/mysql-5.1-build-src-clean
```
  3f22d8b7
- Merge five.local.lan:/work/merge/mysql-5.0-funcs_1 · 5da80622
  unknown authored Apr 02, 2008
```
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
```
  5da80622
- Merge five.local.lan:/work/merge/mysql-5.0-funcs_1 · 21419b92
  unknown authored Apr 02, 2008
```
into  five.local.lan:/work/merge/mysql-5.1-funcs_1
```
  21419b92
- Correct the location of the directory for · 12f67622
  unknown authored Apr 02, 2008
```
"funcs_1" data load
```
  12f67622
- Replaced full-stop character in error message. · 25237005
  unknown authored Apr 02, 2008
  
  25237005
- Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 5fc6848e
  unknown authored Apr 02, 2008
```
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
```
  5fc6848e
- Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 5c2e00dc
  unknown authored Apr 02, 2008
```
into  five.local.lan:/work/trees/mysql-5.1-build-src-clean


mysql-test/mysql-test-run.pl:
  Auto merged
```
  5c2e00dc
01 Apr, 2008 8 commits

Merge five.local.lan:/work/trees/mysql-5.0-build-src-clean · 48dfb1fe
unknown authored Apr 01, 2008
```
into  five.local.lan:/work/trees/mysql-5.1-build-src-clean
```
48dfb1fe
Merge five.local.lan:/work/merge/mysql-5.1-Bug · 8f00aa93
unknown authored Apr 01, 2008
```
into  five.local.lan:/work/trees/mysql-5.1-build-src-clean
```
8f00aa93
Merge five.local.lan:/work/merge/mysql-5.0-Bug · 97edcf4b
unknown authored Apr 01, 2008
```
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
```
97edcf4b
Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.1-release · b081d288
unknown authored Apr 01, 2008
```
into  five.local.lan:/work/mysql-5.1-24-rc
```
b081d288

Fixes for failing funcs_1 tests in mysql-5.1.24-rc · 3c0bce56

unknown authored Apr 01, 2008

Problems were caused by modifications of
- the server
  - HANDLER FOR SQLSTATE '00000' is now rejected (bug fix)
    affects several ..._storedproc* tests
  - improved error message
    affects the ..._trig_03e
  - improved content of information_schema.COLUMNS about
    information_schema.REFERENTIAL_CONSTRAINTS
    affects is_columns_is
- the content of the community build (collations)
    affects charset_collation_3 


mysql-test/suite/funcs_1/r/charset_collation_3.result:
  Updated result
mysql-test/suite/funcs_1/r/innodb_storedproc.result:
  Updated result
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
  Updated result
mysql-test/suite/funcs_1/r/innodb_trig_03e.result:
  Updated result
mysql-test/suite/funcs_1/r/is_columns_is.result:
  Updated result
mysql-test/suite/funcs_1/r/memory_storedproc.result:
  Updated result
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
  Updated result
mysql-test/suite/funcs_1/r/memory_trig_03e.result:
  Updated result
mysql-test/suite/funcs_1/r/myisam_storedproc.result:
  Updated result
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
  Updated result
mysql-test/suite/funcs_1/r/myisam_trig_03e.result:
  Updated result
mysql-test/suite/funcs_1/r/ndb_storedproc.result:
  Updated result
mysql-test/suite/funcs_1/r/ndb_storedproc_02.result:
  Updated result
mysql-test/suite/funcs_1/r/ndb_trig_03e.result:
  Updated result
mysql-test/suite/funcs_1/storedproc/storedproc_02.inc:
  Corrected script
mysql-test/suite/funcs_1/storedproc/storedproc_master.inc:
  Corrected script

3c0bce56

Post-merge fixes. · 48665aea

unknown authored Apr 01, 2008


sql/share/errmsg.txt:
  Reverting error message to before merge.

48665aea

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776 · 5d4144a6

unknown authored Apr 01, 2008

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


mysql-test/t/type_blob.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/unireg.h:
  Auto merged

5d4144a6

Test updated. · cbe16064
unknown authored Apr 01, 2008

cbe16064