Commits · b8dc8d19aae6b80142461d60fa49426c2b7c4b5e · nexedi / MariaDB

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

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

Merge trift2.:/MySQL/M51/clone-5.1 · d6831345

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.

d6831345

Merge trift2.:/MySQL/M51/clone-5.1 · 32804a36
unknown authored Apr 04, 2008
```
into  trift2.:/MySQL/M51/push-5.1
```
32804a36
Merge trift2.:/MySQL/M51/clone-5.1 · b020868d
unknown authored Apr 04, 2008
```
into  trift2.:/MySQL/M51/tmp-5.1
```
b020868d

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

unknown authored Apr 04, 2008

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


mysql-test/Makefile.am:
  Auto merged

9492350a

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

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

b71bb3f6

Backport of fix made in 5.1 to 5.0 · 1daeb665

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.

1daeb665

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

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

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"

d75f5765

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 1ebd9ad6

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

1ebd9ad6

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


sql/share/errmsg.txt:
  Auto merged
```
50e5c619

03 Apr, 2008 11 commits

Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1 · 1d3f27a6

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

1d3f27a6

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


sql/tztime.cc:
  Auto merged
```
fe6e1fc7

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

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

add10a48

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

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

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().

90112d11

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

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

ee3fb5f5

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


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

Merge trift2.:/MySQL/M51/mysql-5.1 · a70bc096

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

a70bc096

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

02 Apr, 2008 8 commits
- Merge five.local.lan:/work/trees/mysql-5.0-build-src-clean · 96942fb6
  unknown authored Apr 02, 2008
```
into  five.local.lan:/work/trees/mysql-5.1-build-src-clean
```
  96942fb6
- Merge five.local.lan:/work/merge/mysql-5.1-funcs_1 · 4ccd06a2
  unknown authored Apr 02, 2008
```
into  five.local.lan:/work/trees/mysql-5.1-build-src-clean
```
  4ccd06a2
- Merge five.local.lan:/work/merge/mysql-5.0-funcs_1 · c4996b32
  unknown authored Apr 02, 2008
```
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
```
  c4996b32
- Merge five.local.lan:/work/merge/mysql-5.0-funcs_1 · 9e24a7c3
  unknown authored Apr 02, 2008
```
into  five.local.lan:/work/merge/mysql-5.1-funcs_1
```
  9e24a7c3
- Correct the location of the directory for · 1a07ecba
  unknown authored Apr 02, 2008
```
"funcs_1" data load
```
  1a07ecba
- Replaced full-stop character in error message. · 7f7d6d9e
  unknown authored Apr 02, 2008
  
  7f7d6d9e
- Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 393c1a01
  unknown authored Apr 02, 2008
```
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
```
  393c1a01
- Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-build · a8f2b73b
  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
```
  a8f2b73b
01 Apr, 2008 8 commits

Merge five.local.lan:/work/trees/mysql-5.0-build-src-clean · 83c7fe54
unknown authored Apr 01, 2008
```
into  five.local.lan:/work/trees/mysql-5.1-build-src-clean
```
83c7fe54
Merge five.local.lan:/work/merge/mysql-5.1-Bug · 74539b07
unknown authored Apr 01, 2008
```
into  five.local.lan:/work/trees/mysql-5.1-build-src-clean
```
74539b07
Merge five.local.lan:/work/merge/mysql-5.0-Bug · 68bd2e4a
unknown authored Apr 01, 2008
```
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
```
68bd2e4a
Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.1-release · c8c28c50
unknown authored Apr 01, 2008
```
into  five.local.lan:/work/mysql-5.1-24-rc
```
c8c28c50

Fixes for failing funcs_1 tests in mysql-5.1.24-rc · 0a4ec61e

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

0a4ec61e

Post-merge fixes. · c481f6b3

unknown authored Apr 01, 2008


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

c481f6b3

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776 · 3ff75e24

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

3ff75e24

Test updated. · a9e65840
unknown authored Apr 01, 2008

a9e65840