database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-15 09:02:33 +03:00
Code Activity
50,657 Commits 3,275 Branches 1,097 Tags
fdff4ff141e11d0feec10cd73c5459ea9d007bd7
Commit Graph

15741 Commits

Author SHA1 Message Date
aelkin/elkin@koti.dsl.inet.fi
fdff4ff141 Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0 
into  koti.dsl.inet.fi:/home/elkin/MySQL/merge-5.1
 2007-11-06 16:28:09 +02:00
aelkin/elkin@koti.dsl.inet.fi
a179cf1540 bug#27571 
fixing tests
 2007-11-06 16:25:32 +02:00
aelkin/elkin@koti.dsl.inet.fi
122005894f bug#27571 
commit is specific for 5.0 to eliminated non-deterministic tests.
Those tests run only in 5.1 env where there is a necessary devices such
as processlist table of info_schema.
 2007-11-06 13:53:26 +02:00
aelkin/elkin@koti.dsl.inet.fi
355c6a2deb Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug27571_asyn_killed_flags
 2007-11-06 13:27:48 +02:00
aelkin@dl145j.mysql.com
c2b0410ca1 manual merge 2007-10-30 14:08:37 +01:00
aelkin/elkin@koti.dsl.inet.fi
e65d20b5f4 Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug27571_asyn_killed_flags 
into  koti.dsl.inet.fi:/home/elkin/MySQL/5.1-merge-bug27571
 2007-10-30 11:31:03 +02:00
aelkin/elkin@koti.dsl.inet.fi
f974872f5c Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug27571_asyn_killed_flags
 2007-10-30 10:32:20 +02:00
bar@bar.myoffice.izhnet.ru
628b462881 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/bar/mysql-work/mysql-5.0-rpl-merge
 2007-10-30 12:21:44 +04:00
bar@bar.myoffice.izhnet.ru
70488d7dfe Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/bar/mysql-work/mysql-5.1-new-rpl-merge
 2007-10-30 12:03:34 +04:00
aelkin/elkin@koti.dsl.inet.fi
27436f0ba3 Bug #27571 asynchronousity in setting mysql_query::error and 
Query_log_event::error_code

A query can perform completely having the local var error of mysql_$query
zero, where $query in insert, update, delete, load,
and be  binlogged with error_code e.g KILLED_QUERY while there is no
reason do to so.
That can happen because Query_log_event consults thd->killed flag to
evaluate error_code.

Fixed with implementing a scheme suggested and partly implemented at
time of bug@22725 work-on. error_status is cached immediatly after the
control leaves the main rows-loop and that instance always corresponds
to `error' the local of mysql_$query functions. The cached value
is passed to Query_log_event constructor, not the default thd->killed
which can be changed in between of the caching and the constructing.
 2007-10-29 15:20:59 +02:00
mats@kindahl-laptop.dnsalias.net
87fd52cd8c Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.0-rpl 
into  kindahl-laptop.dnsalias.net:/home/bk/b12691-mysql-5.0-rpl
 2007-10-26 19:18:02 +02:00
mats@kindahl-laptop.dnsalias.net
83cfdff638 BUG#12691 (Exec_master_log_pos corrupted with SQL_SLAVE_SKIP_COUNTER): 
Adding code to keep skipping events while inside a transaction. Execution
will start just after the transaction has been skipped.
 2007-10-26 18:52:58 +02:00
gluh@mysql.com/eagle.(none)
97e0180b2b result fix 2007-10-24 12:49:58 +05:00
bar@bar.myoffice.izhnet.ru
811e64de62 Merge mysql.com:/home/bar/mysql-work/mysql-5.0 
into  mysql.com:/home/bar/mysql-work/mysql-5.0-rpl-mr
 2007-10-24 10:49:46 +05:00
gluh@mysql.com/eagle.(none)
b2aeda7699 result fix 2007-10-23 20:12:50 +05:00
gluh@eagle.(none)
d639739022 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-10-23 20:11:39 +05:00
gluh@mysql.com/eagle.(none)
1d42094d18 after merge fix 2007-10-23 19:28:47 +05:00
gluh@eagle.(none)
17acda6ca8 Merge mysql.com:/home/gluh/MySQL/Merge/5.1 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-10-23 19:08:21 +05:00
gluh@eagle.(none)
237383f0fe Merge mysql.com:/home/gluh/MySQL/Merge/5.0 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2007-10-23 18:51:43 +05:00
kaa@polly.(none)
173108956a Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.0-opt 
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
 2007-10-23 16:24:56 +04:00
kaa@polly.(none)
6832d2cc1b Merge polly.(none):/home/kaa/src/opt/bug31742/my51-bug28550 
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
 2007-10-23 16:07:03 +04:00
kaa@polly.(none)
23c65a3b01 Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550 
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
 2007-10-23 16:03:48 +04:00
kaa@polly.(none)
17a533e0d0 Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550 
into  polly.(none):/home/kaa/src/opt/bug31742/my51-bug28550
 2007-10-23 15:52:27 +04:00
gkodinov/kgeorge@magare.gmz
58bce232a8 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-5.1-opt
 2007-10-23 14:28:50 +03:00
gkodinov/kgeorge@magare.gmz
7ac179bc34 merge 5.0-opt -> 5.1-opt for bug 30825 2007-10-23 14:26:57 +03:00
gkodinov/kgeorge@magare.gmz
7c344185bd Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B28687-5.1-opt
 2007-10-23 14:21:50 +03:00
gkodinov/kgeorge@magare.gmz
62737d6d42 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
 2007-10-23 13:10:35 +03:00
gkodinov/kgeorge@magare.gmz
3553f6eac2 Merge magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B30825-5.1-opt
 2007-10-23 11:44:14 +03:00
gkodinov/kgeorge@magare.gmz
d066e2173c Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
 2007-10-23 11:26:37 +03:00
gkodinov/kgeorge@magare.gmz
0a14d1a19b Merge magare.gmz:/home/kgeorge/mysql/work/B28687-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B28687-5.1-opt
 2007-10-23 11:22:59 +03:00
gluh@mysql.com/eagle.(none)
ffea2073b1 Bug#31633 Information schema = NULL queries crash the server 
added correct handling of NULL values for lookup fields
 2007-10-23 13:20:51 +05:00
gkodinov/kgeorge@magare.gmz
52b35112cf Bug #28687: Search fails on '0000-00-00' date after sql_mode change 
When doing indexed search the server constructs a key image for 
faster comparison to the stored keys. While doing that it must not
perform (and stop if they fail) the additional date checks that can 
be turned on by the SQL mode because there already may be values in 
the table that don't comply with the error checks.
Fixed by ignoring these SQL mode bits while making the key image.
 2007-10-22 19:32:18 +03:00
kaa@polly.(none)
53a9e7f478 Fix for bug #31742: delete from ... order by function call that causes 
an error, asserts server

In case of a fatal error during filesort in find_all_keys() the error
was returned without the necessary handler uninitialization.
Fixed by changing the code so that handler uninitialization is performed
before returning the error.
 2007-10-22 16:10:08 +04:00
tnurnberg@white.intern.koehntopp.de
478079b2e8 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/scratch/tnurnberg/31588/50-31588
 2007-10-22 01:57:49 +02:00
tnurnberg@white.intern.koehntopp.de
44fbb702b9 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/scratch/tnurnberg/31588/51-31588
 2007-10-21 22:49:16 +02:00
kaa@polly.(none)
d998b471c9 Merge polly.(none):/home/kaa/src/opt/bug28550/my51-bug28550 
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
 2007-10-21 21:57:57 +04:00
kaa@polly.(none)
f9ba86ee86 Merge polly.(none):/home/kaa/src/opt/bug28550/my50-bug28550 
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
 2007-10-21 21:55:26 +04:00
kaa@polly.(none)
d55d309380 Merge polly.(none):/home/kaa/src/opt/bug28550/my50-bug28550 
into  polly.(none):/home/kaa/src/opt/bug28550/my51-bug28550
 2007-10-21 21:49:30 +04:00
kaa@polly.(none)
349841118f Bug #28550 "Potential bugs related to the return type of the CHAR function". 
Since, as of MySQL 5.0.15, CHAR() arguments larger than 255 are converted into multiple result bytes, a single CHAR() argument can now take up to 4 bytes. This patch fixes Item_func_char::fix_length_and_dec() to take this into account.
  
This patch also fixes a regression introduced by the patch for bug21513. As now we do not always have the 'name' member of Item set for Item_hex_string and Item_bin_string, an own print() method has been added to Item_hex_string so that it could correctly be printed by Item_func::print_args().
 2007-10-21 21:45:31 +04:00
aelkin/elkin@dsl-hkibras1-ff5fc300-23.dhcp.inet.fi
afdc9e8200 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  dsl-hkibras1-ff5fc300-23.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug26199-create_proc_syntax_slave
 2007-10-21 18:39:22 +03:00
aelkin/elkin@dsl-hkibras1-ff5fc300-23.dhcp.inet.fi
0f818ddf75 Bug #26199 Replication Failure on Slave when using stored procs with bit-type parameters. 
The value of the actual argument of BIT-type-arg stored procedure was binlogged as non-escaped
sequence of bytes corresponding to internal representation of the bit value.

The patch enforces binlogging of the bit-argument as a valid literal: prefixing the quoted bytes
sequence with _binary.
Note, that behaviour of Item_field::var_str for field_type() of MYSQL_TYPE_BIT is exceptional
in that the returned string contains the binary representation even though result_type() of
the item is INT_RESULT.
 2007-10-21 18:37:37 +03:00
tnurnberg@sin.intern.azundris.com
b8feb23321 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  sin.intern.azundris.com:/misc/mysql/31588/51-31588
 2007-10-20 17:18:23 +02:00
antony@pcg5ppc.xiphis.org
3b95727600 Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines 
into  anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines.merge
 2007-10-19 13:06:37 -07:00
antony@pcg5ppc.xiphis.org
fb27ce61bc Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.0-engines 
into  anubis.xiphis.org:/usr/home/antony/work/mysql-5.0-engines.merge
 2007-10-19 13:04:30 -07:00
gkodinov/kgeorge@magare.gmz
c95b24cba7 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B31157-5.1-opt
 2007-10-19 17:01:13 +03:00
gkodinov/kgeorge@magare.gmz
fb640797b8 Bug #31157: crash when select+order by the avg of some field within the group by 
The uncacheable flag should be set at fix_fields() stage.
Fixed by moving the flag setting to match the one in 5.1
 2007-10-19 15:43:19 +03:00
malff@lambda.hsd1.co.comcast.net.
94b4f4a870 Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
 2007-10-18 19:21:07 -06:00
malff@lambda.hsd1.co.comcast.net.
2d6fbbda59 Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-base 
into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
 2007-10-18 16:57:51 -06:00
malff@lambda.hsd1.co.comcast.net.
6fa35a5d3b Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-base 
into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-rt-merge
 2007-10-18 16:39:55 -06:00
antony@pcg5ppc.xiphis.org
407f73c821 Merge pcg5ppc.xiphis.org:/private/Network/Servers/anubis.xiphis.org/home/antony/work/p1-bug31473.1 
into  pcg5ppc.xiphis.org:/private/Network/Servers/anubis.xiphis.org/home/antony/work/p1-bug31473.1-merge-5.1-engines
 2007-10-18 15:02:20 -07:00