Commit graph

11018 commits

Author SHA1 Message Date
monty@narttu.mysql.fi
e5d06603fd Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2007-06-20 19:25:44 +03:00
monty@mysql.com/narttu.mysql.fi
9a59083163 Allow multiple calls to mysql_server_end()
(Part of fix for Bug#25621 Error in my_thread_global_end(): 1 threads didn't exit)
Give correct error message if InnoDB table is not found
(This allows us to drop a an innodb table that is not in the InnoDB registery)
2007-06-20 19:22:27 +03:00
mats@kindahl-laptop.dnsalias.net
2f74826394 BUG#29030 (DROP USER command that errors still gets written to binary log
and replicated):

A DROP USER statement with a non-existing user was correctly written to
the binary log (there might be users that were removed, but not all),
but the error code was not set, which caused the slave to stop with an
error.

The error reporting code was moved to before the statement was logged
to ensure that the error information for the thread was correctly set
up. This works since my_error() will set the fields net.last_errno and
net.last_error for the thread that is reporting the error, and this
will then be picked up when the Query_log_event is created and written
to the binary log.
2007-06-20 14:24:31 +02:00
gkodinov/kgeorge@magare.gmz
7ec37ee3be Merge magare.gmz:/home/kgeorge/mysql/work/B29116-4.1-opt
into  magare.gmz:/home/kgeorge/mysql/work/B29116-5.0-opt
2007-06-20 12:46:56 +03:00
gshchepa/uchum@gleb.loc
88d5d8a268 Merge gleb.loc:/home/uchum/work/bk/5.0-opt-28898
into  gleb.loc:/home/uchum/work/bk/5.0-opt
2007-06-20 14:22:32 +05:00
gshchepa/uchum@gleb.loc
0bd3dd9a37 metadata.test, metadata.result:
Updated test case for bug #28898. Additional cleanup.
2007-06-20 14:21:48 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
3b08919f6a Bug #28839 Errors in strict mode silently stop SQL thread if --slave-skip-errors exists.
slave_sql thread calls thd->clear_error() to force error to be ignored,
though this method didn't clear thd->killed state, what causes
slave_sql thread to stop.

clear thd->killed state if we ignore an error
2007-06-20 14:05:49 +05:00
gshchepa/uchum@gleb.loc
5d056de5ff Merge gleb.loc:/home/uchum/work/bk/5.0-opt-28898
into  gleb.loc:/home/uchum/work/bk/5.0-opt
2007-06-20 13:06:24 +05:00
gshchepa/uchum@gleb.loc
2379f9778d Fixed bug #28898.
For a join query with GROUP BY and/or ORDER BY and a view reference
in the FROM list the metadata erroneously showed empty table aliases
and database names for the view columns.
2007-06-20 12:25:07 +05:00
dkatz@damien-katzs-computer.local
bd80d7e465 Merge damien-katzs-computer.local:/Users/dkatz/mysql50
into  damien-katzs-computer.local:/Users/dkatz/50_win
2007-06-19 18:03:47 -04:00
kostja@bodhi.(none)
325b8835c7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
2007-06-19 14:53:13 +04:00
gkodinov/kgeorge@magare.gmz
91f3301c03 Bug #29116: Test "rpl_change_master" returns different
counters from relay

Updated the test to return columns vertically.
2007-06-19 13:19:20 +03:00
msvensson@pilot.(none)
b8eee54d0b Merge bk-internal:/home/bk/mysql-5.0-maint
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-06-19 11:34:54 +02:00
msvensson@pilot.(none)
e003d8ad3b Merge bk-internal:/home/bk/mysql-4.1-maint
into  pilot.(none):/data/msvensson/mysql/mysql-4.1-maint
2007-06-19 11:30:45 +02:00
msvensson@pilot.(none)
6c22726ebd Merge pilot.(none):/data/msvensson/mysql/wl3232/my41-wl3232
into  pilot.(none):/data/msvensson/mysql/wl3232/my50-wl3232
2007-06-19 11:07:39 +02:00
msvensson@pilot.(none)
caebb719b2 WL#3232 mysqltest, enable --source $variables/<remaining_path_to_file>
- Add test case for this already existing feature
2007-06-19 11:06:02 +02:00
msvensson@pilot.(none)
46f0c05afc Bug#28769 Test case "innodb" fails with --skip-log-bin
- Move binlog related tests to binlog_innodb.test
 - Remove "source include/have_log_bin.inc" from innodb.test
2007-06-19 09:56:19 +02:00
dkatz@damien-katzs-computer.local
b7a2b41374 Bug #28921 Queries containing UDF functions are cached
Fixed runtime to no longer allow the caching of queries with UDF calls.
2007-06-18 17:55:12 -04:00
dkatz@damien-katzs-computer.local
b89e4f9ef2 Bug #29053 SQL_CACHE in UNION causes non-deterministic functions to be cached
Changed code to enforce that SQL_CACHE only in the first SELECT is used to turn on caching(as documented), but any SQL_NO_CACHE will turn off caching (not documented, but a useful behaviour, especially for machine generated queries). Added test cases to explicitly test the documented caching behaviour and test cases for the reported bug.
2007-06-18 17:16:20 -04:00
tsmith@maint1.mysql.com
c658464813 Merge maint1.mysql.com:/data/localhome/tsmith/bk/50
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
2007-06-18 22:11:49 +02:00
gshchepa/uchum@gleb.loc
f015b4332b Merge gleb.loc:/home/uchum/work/bk/5.0
into  gleb.loc:/home/uchum/work/bk/5.0-opt
2007-06-18 18:45:55 +05:00
mhansson/martin@linux-st28.site
cc2d534ab1 Bug#28677: SELECT on missing column gives extra error
The method select_insert::send_error does two things, it rolls back a statement
being executed and outputs an error message. But when a 
nonexistent column is referenced, an error message has been published already and
there is no need to publish another.
Fixed by moving all functionality beyond publishing an error message into 
select_insert::abort() and calling only that function.
2007-06-18 16:35:01 +03:00
lars/lthalmann@dl145h.mysql.com
c5c624a752 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-06-18 12:02:39 +02:00
lars/lthalmann@dl145j.mysql.com
519e26e801 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-06-18 09:33:43 +02:00
tomas@whalegate.ndb.mysql.com
4547957450 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
tomas@whalegate.ndb.mysql.com
8a08ac40fb correct test and result 2007-06-17 22:04:01 +02:00
igor@olga.mysql.com
e81be02850 Merge olga.mysql.com:/home/igor/mysql-5.0-opt
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug27130
2007-06-17 11:35:14 -07:00
igor@olga.mysql.com
63ab91090d 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.
2007-06-17 11:23:19 -07:00
tomas@whalegate.ndb.mysql.com
8eb940de27 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:52:01 +02:00
tomas@whalegate.ndb.mysql.com
b5f30a99f9 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
tomas@whalegate.ndb.mysql.com
9c5183ace9 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
tomas@whalegate.ndb.mysql.com
9e3c14fae3 BUG#27640
- correct test and result file
2007-06-17 19:27:20 +02:00
tomas@whalegate.ndb.mysql.com
95ed412809 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
ramil/ram@ramil.myoffice.izhnet.ru
e63f983970 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
gshchepa/uchum@gleb.loc
dac7ce2d12 bigint.test:
Updated test case for bug #28625.
2007-06-16 17:00:29 +05:00
istruewing@chilla.local
70600c15d8 Merge chilla.local:/home/mydev/mysql-5.0-amain
into  chilla.local:/home/mydev/mysql-5.0-axmrg
2007-06-16 11:34:21 +02:00
gshchepa/uchum@gleb.loc
3d4e75d583 Merge gleb.loc:/home/uchum/work/bk/5.0-opt
into  gleb.loc:/home/uchum/work/bk/5.0-opt-28625
2007-06-16 13:49:26 +05:00
gshchepa/uchum@gleb.loc
8f09a374ea 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.
2007-06-16 13:05:07 +05:00
tsmith@quadxeon.mysql.com
891116551e binlog.result, binlog.test:
Post-merge fix: replace xid=* with XID to isolate from number of transactions
2007-06-15 23:57:53 +02:00
malff/marcsql@weblab.(none)
4b427bde82 Fixed warnings raised from mysqltest (unknown -- commands) 2007-06-15 11:15:22 -06:00
tsmith@quadxeon.mysql.com
73035c274f Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50
2007-06-15 17:59:04 +02:00
istruewing@chilla.local
676ea58252 Merge chilla.local:/home/mydev/mysql-5.0-amain
into  chilla.local:/home/mydev/mysql-5.0-axmrg
2007-06-15 17:47:02 +02:00
istruewing@chilla.local
dceae35549 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
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
9c9464d566 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.
2007-06-15 16:09:28 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
caf85332ba 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.
2007-06-15 11:19:35 +05:00
igor@olga.mysql.com
0f0d4720b8 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.
2007-06-14 18:55:07 -07:00
tsmith@quadxeon.mysql.com
87fdad4ce8 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-14 23:23:30 +02:00
mskold/marty@linux.site
dea70c74dd 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
tomas@whalegate.ndb.mysql.com
ad81e83c70 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
mskold/marty@linux.site
8945183fc3 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 16:21:52 +02:00