Commits · 2d6a5f29c90344dcbde851d13e53c862d3ee7fd2 · Kirill Smelkov / mariadb

19 Oct, 2006 21 commits

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · 2d6a5f29

unknown authored Oct 19, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_misc.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/sql_class.cc:
  Auto merged

2d6a5f29

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · b1016d64
unknown authored Oct 19, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


sql/sql_class.cc:
  Auto merged
```
b1016d64

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

unknown authored Oct 19, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


client/mysqldump.c:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
sql/sql_class.cc:
  Auto merged

0afa56f4

Merge bk-internal:/home/bk/mysql-4.1-maint · 61e3438f
unknown authored Oct 19, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
```
61e3438f

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · 801368e7

unknown authored Oct 19, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_misc.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged

801368e7

Adapt to running from "binary dist" · fc9cf7f4

unknown authored Oct 19, 2006

Add function mtr_exe_maybe_exists to look for binaries that is optional
Skip ndb support if it's a binary dist where mysqld supports ndb but there is no ndbd


mysql-test/lib/mtr_misc.pl:
  Add function mtr_exe_maybe_exists
mysql-test/mysql-test-run.pl:
  Adapt to running from binary dist
  Add function mtr_exe_maybe_exists to look for binaries that is optional
  Skip ndb support if it's a binary dist where mysqld supports ndb but there is no ndbd

fc9cf7f4

Fix problem running rpl_timezone on powermacg5, it was not popular to set TZ to "" so now it's set · 9ee71787
unknown authored Oct 19, 2006
```
to a value wich is not our default
```
9ee71787

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · c4eaeb83

unknown authored Oct 19, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/r/rpl_000015.result:
  Auto merged
mysql-test/r/rpl_change_master.result:
  Auto merged
mysql-test/r/rpl_loaddata.result:
  Auto merged
mysql-test/extra/rpl_tests/rpl_log.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_max_relay_size.test:
  Auto merged
mysql-test/r/rpl_err_ignoredtable.result:
  Auto merged
mysql-test/r/rpl_replicate_do.result:
  Auto merged
mysql-test/r/rpl_stm_log.result:
  Auto merged
mysql-test/r/rpl_stm_max_relay_size.result:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/rpl_000015.test:
  Auto merged
mysql-test/t/rpl_change_master.test:
  Auto merged
mysql-test/t/rpl_drop_db.test:
  Auto merged
mysql-test/t/rpl_err_ignoredtable.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_replicate_do.test:
  Auto merged
mysql-test/t/rpl_stm_log-master.opt:
  Auto merged
sql/sql_class.cc:
  Auto merged
mysql-test/r/mysqldump.result:
  SCCS merged

c4eaeb83

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · 83196ad8

unknown authored Oct 19, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


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

83196ad8

Add command "exit" to mysqltest, it will stop processing any more · cd06481d

unknown authored Oct 19, 2006

commands and go directly to result file processing


client/mysqltest.c:
  Add command "exit" to mysqltest
mysql-test/r/mysqltest.result:
  Add command "exit" to mysqltest
mysql-test/t/mysqltest.test:
  Add command "exit" to mysqltest

cd06481d

Merge bk-internal:/home/bk/mysql-5.0-maint · 32b3846c

unknown authored Oct 19, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysqldump.c:
  Auto merged
sql/sql_class.cc:
  Auto merged

32b3846c

Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 33d9c05a
unknown authored Oct 19, 2006
```
into  example.com:/work/bug23379/my50-bug23379


sql/sql_class.cc:
  Auto merged
```
33d9c05a
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-4.1-maint · ac7b0a7b
unknown authored Oct 19, 2006
```
into  example.com:/work/bug23379/my41-bug23379


sql/sql_class.cc:
  Auto merged
```
ac7b0a7b
Merge example.com:/work/bug23379/my50-bug23379 · 6c4f74ed
unknown authored Oct 19, 2006
```
into  example.com:/work/bug23379/my51-bug23379


sql/sql_class.cc:
  Auto merged
```
6c4f74ed
Merge example.com:/work/bug23379/my41-bug23379 · 04c8b8d1
unknown authored Oct 19, 2006
```
into  example.com:/work/bug23379/my50-bug23379


sql/sql_class.cc:
  Auto merged
```
04c8b8d1

Fix for bug#23379 "wrong time value in SHOW PROCESSLIST" · ca817b49

unknown authored Oct 19, 2006

  
The value taken to be shown in SHOW PROCESSLIST is not
initialized when THD is created and will be random for
unauthenticated connections.
  
To the documentor: Random value, instead of NULL, was shown,
in SHOW PROCESSLIST for still non-authenticated connections.


sql/sql_class.cc:
  Initialize time_after_lock.
  It is used from SHOW PROCESSLIST's code. If not initialized
  random value is shown for connected but still unauthenticated
  clients in the column Time.

ca817b49

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · 12327532

unknown authored Oct 19, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysqldump.c:
  Auto merged
mysql-test/include/have_lowercase0.inc:
  Auto merged
mysql-test/t/lowercase_table3.test:
  Auto merged
mysql-test/t/mysql_protocols.test:
  Auto merged
mysql-test/t/rpl_change_master.test:
  Auto merged
mysql-test/t/rpl_drop_db.test:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_log.test:
  Auto merged
mysql-test/t/rpl_max_relay_size.test:
  Auto merged
mysql-test/t/rpl_replicate_do.test:
  Auto merged
mysys/my_read.c:
  Auto merged
sql/sql_class.cc:
  Auto merged
mysql-test/r/rpl000015.result:
  C
mysql-test/r/rpl_log.result:
  ul
mysql-test/r/rpl_max_relay_size.result:
  ul
mysql-test/r/rpl_replicate_do.result:
  ul
mysql-test/t/rpl000015.test:
  ul

12327532

Merge bk-internal:/home/bk/mysql-4.1-maint · b273af0e
unknown authored Oct 19, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
```
b273af0e

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · 466701cd

unknown authored Oct 19, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/t/create.test:
  Auto merged
mysql-test/t/lock_multi.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
mysql-test/include/mix1.inc:
  Merge 5.0 -> 5.1
mysql-test/r/create.result:
  Merge 5.0 -> 5.1
mysql-test/r/innodb_mysql.result:
  Merge 5.0 -> 5.1
mysql-test/t/sp.test:
  Merge 5.0 -> 5.1

466701cd

Backport test cases fixes from 5.0 · f30cb127

unknown authored Oct 19, 2006


client/mysqldump.c:
  fflush stderr after printing of error message
mysql-test/include/have_lowercase0.inc:
  Remove extra ;
mysql-test/r/rpl000015.result:
  Update result
mysql-test/r/rpl_change_master.result:
  Update result
mysql-test/r/rpl_error_ignored_table.result:
  Update result
mysql-test/r/rpl_loaddata.result:
  Update result
mysql-test/r/rpl_log.result:
  Update result
mysql-test/r/rpl_max_relay_size.result:
  Update result
mysql-test/r/rpl_replicate_do.result:
  Update result
mysql-test/t/lowercase_table3.test:
  Backport from 5.0
mysql-test/t/mysql_protocols.test:
  Backport from 5.0
mysql-test/t/rpl000015.test:
  Backport from 5.0
mysql-test/t/rpl_change_master.test:
  Backport from 5.0
mysql-test/t/rpl_drop_db.test:
  Backport from 5.0
mysql-test/t/rpl_error_ignored_table.test:
  Backport from 5.0
mysql-test/t/rpl_loaddata.test:
  Backport from 5.0
mysql-test/t/rpl_log-master.opt:
  Use --force-restart command in master.opt to force a restart for this test case
mysql-test/t/rpl_log.test:
  Backport from 5.0
mysql-test/t/rpl_max_relay_size.test:
  Backport from 5.0
mysql-test/t/rpl_replicate_do.test:
  Backport from 5.0

f30cb127

Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-4.1-maint · 57ff1cb8
unknown authored Oct 19, 2006
```
into  example.com:/work/bug23379/my41-bug23379
```
57ff1cb8

18 Oct, 2006 19 commits

Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19745/my51-bug19745 · 44a56612
unknown authored Oct 18, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint


client/mysqldump.c:
  Auto merged
```
44a56612
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19745/my50-bug19745 · 3cb0a19d
unknown authored Oct 18, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint


client/mysqldump.c:
  Auto merged
```
3cb0a19d
Post-Merge Fix. · 2b238773
unknown authored Oct 18, 2006

2b238773

Merge neptunus.(none):/home/msvensson/mysql/bug22436/my50-bug22436 · 15a86d18

unknown authored Oct 19, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/t/innodb_mysql.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/r/create.result:
  Merge
mysql-test/t/create.test:
  Merge
mysql-test/t/view.test:
  Remove the disable_warnings part as engine=innodb has been removed

15a86d18

Change the ssl related variables to loose so they work also when the server is... · 54fadc5b
unknown authored Oct 19, 2006
```
Change the ssl related variables to loose so they work also when the server is compiled without ssl 
```
54fadc5b

Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19745/my50-bug19745 · c81e69e9

unknown authored Oct 18, 2006

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19745/my51-bug19745


client/mysqldump.c:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/r/mysqldump.result:
  manual merge

c81e69e9

Bug#19745: mysqldump --xml produces invalid xml · 016a7d4c

unknown authored Oct 18, 2006

The mysqldump command with both the --xml and --hex-blob options will output blob data encoded as hexBinary.  
The proper XML datatype is xs:hexBinary.  
The correct XML datatype is specified be setting the xsi_type attribute equal to xs:hexBinary for each encoded element.


client/mysqldump.c:
  Bug#19745: mysqldump --xml produces invalid xml
  - Moved hex-blob code to it's own function.
  - Rewrote print_xml_tag function to accept zero or more attribute/value
    pair(s) which are appended to a separate tag name.
  - --xml option respects the --hex-blob option by ouputting blob data in hex
    encoded format.  Each hex encoded field tag will also contain an xsi:type
    attribute with an xs:hexBinary value.
  - --extended-insert and --xml are mutually exclusive. Otherwise, the xml file
    will contain INSERT commands.
  - Minor comment cleanup.
mysql-test/r/mysqldump.result:
  Bug#19745: mysqldump --xml produces invalid xml
  -Added results.
mysql-test/t/mysqldump.test:
  Bug#19745: mysqldump --xml produces invalid xml
  -Added test.

016a7d4c

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · c35506f9

unknown authored Oct 19, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


tests/mysql_client_test.c:
  Auto merged
mysql-test/r/show_check.result:
  Merge 5.0->5.1

c35506f9

Merge neptunus.(none):/home/msvensson/mysql/bug21868/my50-bug21868 · 723b6c30
unknown authored Oct 19, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
723b6c30
Merge neptunus.(none):/home/msvensson/mysql/bug21868/my50-bug21868 · c2699e1a
unknown authored Oct 19, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
c2699e1a
Merge neptunus.(none):/home/msvensson/mysql/bug17039/my51-bug17039 · 8e24510c
unknown authored Oct 19, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


tests/mysql_client_test.c:
  Auto merged
```
8e24510c
Merge neptunus.(none):/home/msvensson/mysql/bug17039/my50-bug17039 · a4f445e1
unknown authored Oct 19, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


tests/mysql_client_test.c:
  Auto merged
```
a4f445e1

Merge neptunus.(none):/home/msvensson/mysql/bug17039/my50-bug17039 · 6b6deee8

unknown authored Oct 18, 2006

into  neptunus.(none):/home/msvensson/mysql/bug17039/my51-bug17039


sql/sql_union.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

6b6deee8

Remove extra whitespace in result file · 8008bf9f
unknown authored Oct 18, 2006
```
mysql-test/r/show_check.result:
  Remove extra whitespace
```
8008bf9f
Merge bk-internal:/home/bk/mysql-4.1-maint · 699c4341
unknown authored Oct 18, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
```
699c4341
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · a1fafb26
unknown authored Oct 18, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


vio/viossl.c:
  Auto merged
```
a1fafb26
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · 5be88ae2
unknown authored Oct 18, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
5be88ae2
Merge 192.168.0.4:mysql/mysql-4.1-maint · f3c0d300
unknown authored Oct 18, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
```
f3c0d300
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-4.1-maint · f336b3fa
unknown authored Oct 18, 2006
```
into  example.com:/work/bug23379/my41-bug23379


sql/sql_class.cc:
  Auto merged
```
f336b3fa