Commit graph

37009 commits

Author SHA1 Message Date
unknown
4a56e7ccbf Merge trift2.:/MySQL/M41/mysql-4.1
into  trift2.:/MySQL/M41/push-4.1
2007-06-18 11:25:26 +02:00
unknown
caf55fffef Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge


mysql-test/t/innodb.test:
  Auto merged
2007-06-18 09:33:43 +02:00
unknown
eff58f5141 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
2007-06-18 09:33:05 +02:00
unknown
4831826c69 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
2007-06-18 11:47:47 +05:00
unknown
fe99cf3ac0 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
2007-06-18 07:42:13 +02:00
unknown
82a7ceb315 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
2007-06-17 22:06:34 +02:00
unknown
c982517540 correct test and result 2007-06-17 22:04:01 +02:00
unknown
6e315bfae2 Post-merge fix
mysql-test/r/func_str.result:
  Post-merge fix.
2007-06-17 11:43:49 -07:00
unknown
145696de54 Merge olga.mysql.com:/home/igor/mysql-5.0-opt
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug27130


mysql-test/r/func_str.result:
  Manual merge
mysql-test/t/func_str.test:
  Manual merge
2007-06-17 11:35:14 -07:00
unknown
a07b055b9a Fixed bug #27130. If the third argument of the function SUBSTR was
represented by an expression of the type UNSIGNED INT and this 
expression was evaluated to 0 then the function erroneously returned
the value of the first argument instead of an empty string. 

This problem was introduced by the patch for bug 10963.

The problem has been resolved by a proper modification of the code of
Item_func_substr::val_str.


mysql-test/r/func_str.result:
  Added a test case for bug #27130.
mysql-test/t/func_str.test:
  Added a test case for bug #27130.
2007-06-17 11:23:19 -07:00
unknown
2eb468f322 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines


sql/handler.h:
  Auto merged
2007-06-17 19:52:01 +02:00
unknown
1f2c0193f4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-06-17 19:50:07 +02:00
unknown
57667d06c2 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
2007-06-17 19:28:01 +02:00
unknown
f2c7b62a3e BUG#27640
- correct test and result file
2007-06-17 19:27:20 +02:00
unknown
0df9dea436 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
2007-06-17 16:26:35 +02:00
unknown
c18b568983 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/home/ram/work/b28144/b28144.5.0
2007-06-17 10:10:36 +05:00
unknown
67988a75fc bigint.test:
Updated test case for bug #28625.


mysql-test/t/bigint.test:
  Updated test case for bug #28625.
2007-06-16 17:00:29 +05:00
unknown
3e2e6ea9e3 Merge chilla.local:/home/mydev/mysql-5.0-amain
into  chilla.local:/home/mydev/mysql-5.0-axmrg


configure.in:
  Auto merged
sql/mysqld.cc:
  Auto merged
2007-06-16 11:34:21 +02:00
unknown
b1dc106bf0 Merge gleb.loc:/home/uchum/work/bk/5.0-opt
into  gleb.loc:/home/uchum/work/bk/5.0-opt-28625


sql/item_func.cc:
  Auto merged
2007-06-16 13:49:26 +05:00
unknown
1b9f594f4a Fixed bug #28625:
DECIMAL column was used instead of BIGINT for the minimal possible
BIGINT (-9223372036854775808).

The Item_func_neg::fix_length_and_dec has been adjusted to
to inherit the type of the argument in the case when it's an 
Item_int object whose value is equal to LONGLONG_MIN.


sql/item_func.cc:
  Fixed bug #28625.
  The Item_func_neg::fix_length_and_dec has been adjusted to
  to inherit the type of the argument in the case when it's an 
  Item_int object whose value is equal to LONGLONG_MIN.
mysql-test/t/bigint.test:
  Added test result for bug #28625.
mysql-test/r/bigint.result:
  Added test case for bug #28625.
2007-06-16 13:05:07 +05:00
unknown
2552a16ee4 Merge bk-internal:/home/bk/mysql-5.0-maint
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
2007-06-16 06:19:47 +02:00
unknown
910d8ea179 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build


client/CMakeLists.txt:
  merge fix
2007-06-16 06:16:00 +02:00
unknown
651a8e7f73 binlog.result, binlog.test:
Post-merge fix: replace xid=* with XID to isolate from number of transactions


mysql-test/r/binlog.result:
  Post-merge fix: replace xid=* with XID to isolate from number of transactions
mysql-test/t/binlog.test:
  Post-merge fix: replace xid=* with XID to isolate from number of transactions
2007-06-15 23:57:53 +02:00
unknown
5b013eb685 Fixed warnings raised from mysqltest (unknown -- commands) 2007-06-15 11:15:22 -06:00
unknown
60456bd865 manual merge 2007-06-15 10:59:40 -06:00
unknown
3982f31857 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50
2007-06-15 18:58:07 +02:00
unknown
c2db927bf7 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50


configure.in:
  Auto merged
sql/mysqld.cc:
  Auto merged
2007-06-15 17:59:04 +02:00
unknown
559bc9399a Merge chilla.local:/home/mydev/mysql-4.1-axmrg
into  chilla.local:/home/mydev/mysql-5.0-axmrg
2007-06-15 17:47:50 +02:00
unknown
30057f678b Merge chilla.local:/home/mydev/mysql-5.0-amain
into  chilla.local:/home/mydev/mysql-5.0-axmrg


mysql-test/r/view.result:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2007-06-15 17:47:02 +02:00
unknown
352d6489d2 Merge chilla.local:/home/mydev/mysql-5.0-ateam
into  chilla.local:/home/mydev/mysql-5.0-axmrg
2007-06-15 17:45:50 +02:00
unknown
f67e46d374 Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge


sql/field.cc:
  Auto merged
2007-06-15 08:56:40 -06:00
unknown
82f757ff0f Merge chilla.local:/home/mydev/mysql-4.1-amain
into  chilla.local:/home/mydev/mysql-4.1-axmrg
2007-06-15 16:24:43 +02:00
unknown
08d2e29cc1 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-06-15 08:57:57 -04:00
unknown
d2f858aba3 Fix for bug #28144: "Slave_IO_Running" differs in replication tests
Problem: show slave status may return different Slave_IO_Running values running some tests.
Fix: wait for a certain slave state if needed to get tests more predictable.


mysql-test/r/rpl_log_pos.result:
  Fix for bug #28144: "Slave_IO_Running" differs in replication tests
    - test result adjusted.
mysql-test/r/rpl_ssl.result:
  Fix for bug #28144: "Slave_IO_Running" differs in replication tests
    - test result adjusted.
mysql-test/t/rpl_log_pos.test:
  Fix for bug #28144: "Slave_IO_Running" differs in replication tests
    - test has been rewritten to get certain slave state, now we use wait_for_slave_param.inc
      to ensure we get proper IO/SQL slave's threads states.
mysql-test/t/rpl_ssl.test:
  Fix for bug #28144: "Slave_IO_Running" differs in replication tests
    - wait_for_slave_to_start.inc used to get certain slave states in order 
      to be more predictable.
mysql-test/include/wait_for_slave_param.inc:
  New BitKeeper file ``mysql-test/include/wait_for_slave_param.inc''
  
  allow to wait until SHOW SLAVE STATUS has returned a spicified value.
2007-06-15 16:09:28 +05:00
unknown
9bba1059bf follow-up fix
include/violite.h:
  this may already be defined
2007-06-15 11:28:15 +02:00
unknown
6082974679 Backport of
mysql-test/include/wait_for_slave_io_to_stop.inc
mysql-test/include/wait_for_slave_sql_to_stop.inc
mysql-test/include/wait_for_slave_to_start.inc
mysql-test/include/wait_for_slave_to_stop.inc
from 5.1


mysql-test/include/wait_for_slave_io_to_stop.inc:
  New BitKeeper file ``mysql-test/include/wait_for_slave_io_to_stop.inc''
mysql-test/include/wait_for_slave_sql_to_stop.inc:
  New BitKeeper file ``mysql-test/include/wait_for_slave_sql_to_stop.inc''
mysql-test/include/wait_for_slave_to_start.inc:
  New BitKeeper file ``mysql-test/include/wait_for_slave_to_start.inc''
mysql-test/include/wait_for_slave_to_stop.inc:
  New BitKeeper file ``mysql-test/include/wait_for_slave_to_stop.inc''
2007-06-15 13:53:36 +05:00
unknown
57726dc0ad Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
2007-06-15 09:36:05 +02:00
unknown
288917f5d8 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
2007-06-15 09:25:53 +02:00
unknown
8ebcb3ee94 Added yassl and taocrypt sources to mysqlclientlib
client/CMakeLists.txt:
  Fix for bug #27861: unresolved externals (yassl and taocrypt)
2007-06-15 09:18:58 +02:00
unknown
39700afdb9 Bug#28862 Extended Latin1 characters get lost in CVS engine
Problem: Temporary buffer which is used for quoting and escaping
  was initialized to character set utf8, and thus didn't allow
  to store data in other character sets.
  Fix: changing character set of the buffer to be able to
  store any arbitrary sequence of bytes.


mysql-test/r/csv.result:
  Adding test case
mysql-test/t/csv.test:
  Adding test case
sql/examples/ha_tina.cc:
  Changing character set of the buffer to "binary".
2007-06-15 11:19:35 +05:00
unknown
36f8bfb22e Fixed bug #27932: the function LOCATE returned NULL if any
of its arguments was evaluated to NULL, while the predicate
LOCATE(str,NULL) IS NULL erroneously was evaluated to FALSE.

This happened because the Item_func_locate::fix_length_and_dec
method by mistake set the value of the maybe_null flag for 
the function item to 0. In consequence of this the function 
was considered as the one that could not ever return NULL.


mysql-test/r/func_str.result:
  Added a test case for bug #27932.
mysql-test/t/func_str.test:
  Added a test case for bug #27932.
2007-06-14 18:55:07 -07:00
unknown
578b81bb5b Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint


configure.in:
  Auto merged
sql/mysqld.cc:
  Auto merged
2007-06-14 18:17:26 -04:00
unknown
cb93ff4d02 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/binlog.result:
  Auto merged
mysql-test/r/have_log_bin.require:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932_notembedded.test:
  Auto merged
mysql-test/t/binlog.test:
  Auto merged
mysql-test/t/ctype_cp932_binlog.test:
  Auto merged
mysql-test/t/ctype_ucs_binlog.test:
  Auto merged
mysql-test/t/flush_block_commit_notembedded.test:
  Auto merged
mysql-test/t/insert_select-binlog.test:
  Auto merged
mysql-test/t/mysqlbinlog-cp932.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/sp_trans.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/mix_innodb_myisam_binlog.result:
  Use local
mysql-test/t/blackhole.test:
  manual merge
mysql-test/t/drop_temp_table.test:
  manual merge
mysql-test/t/mix_innodb_myisam_binlog.test:
  Use local
mysql-test/t/mysqlbinlog.test:
  Use local
2007-06-14 23:23:30 +02:00
unknown
a3c2ebbcdd Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-06-14 21:58:45 +02:00
unknown
863a953e1d Merge trift2.:/MySQL/M41/push-4.1
into  trift2.:/MySQL/M50/push-5.0
2007-06-14 21:34:41 +02:00
unknown
e4c320bfea Merge trift2.:/MySQL/M41/mysql-4.1
into  trift2.:/MySQL/M41/push-4.1
2007-06-14 21:27:33 +02:00
unknown
d0d6c42cc9 Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0


sql/item_func.cc:
  Manual merge: thread identity check was gone from this place in main 5.0.
2007-06-14 21:25:10 +02:00
unknown
4a009817ab Bug#21723: Should be able to dump core after setuid() under Linux
In many cases, binaries can no longer dump core after calling setuid().

Where the PR_SET_DUMPABLE macro is set, use the prctl() system call 
to tell the kernel that it's allowed to dump the core of the server.


configure.in:
  Test system for "sys/prctl.h", to get access to prctl().
sql/mysqld.cc:
  Add a process-control operation that tells the Linux kernel that it 
  is allowed to dump core after setuid().
2007-06-14 14:24:59 -04:00
unknown
bcd6183fe7 Merge mysql.com:/d2/hf/mrg/mysql-4.1-opt
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
2007-06-14 23:02:28 +05:00
unknown
ebcbfef85f Bug #27640 backup id not displayed in the output of "ndb_mgm start backup wait completed"
- correction, missing node id
2007-06-14 18:40:32 +02:00