1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-13 21:42:58 +03:00
Commit Graph

22318 Commits

Author SHA1 Message Date
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
joerg@trift2.
c836873a8f Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  trift2.:/MySQL/M51/push-5.1
2007-10-29 23:13:28 +01:00
msvensson@pilot.mysql.com
56ec78f7f9 Bug#30366 NDB fails to start on OS X, PPC, 64 bit
- The errno variable should only be used when the previous socket
   write failed, it should be regarded as undefined at other times
2007-10-29 21:33:30 +01:00
ramil/ram@ramil.myoffice.izhnet.ru
15e5e92383 Merge mysql.com:/home/ram/work/mysql-5.0-maint
into  mysql.com:/home/ram/work/b31137/b31137.5.0
2007-10-29 20:43:57 +04:00
cmiller@zippy.cornsilk.net
61621a9791 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-recentcommmerge
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1
2007-10-29 12:42:06 -04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
9d57de144f after-merge fix-up. 2007-10-29 20:31:03 +04:00
malff@lambda.weblab
0909d1f8cb Merge lambda.weblab:/home/malff/TREE/mysql-5.1-base
into  lambda.weblab:/home/malff/TREE/mysql-5.1-rt-merge
2007-10-29 08:07:27 -06:00
malff@lambda.weblab
6d15d42eca Merge lambda.weblab:/home/malff/TREE/mysql-5.0-base
into  lambda.weblab:/home/malff/TREE/mysql-5.0-rt-merge
2007-10-29 07:53:15 -06: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
anozdrin/alik@station.
ee25b4f56f Fix for BUG#27610: ALTER TABLE ROW_FORMAT=... does not
rebuild the table.

The problem was that ROW_FORMAT clause in ALTER TABLE did not trigger
table reconstruction.

The fix is to rebuild a table if ROW_FORMAT is specified.
2007-10-29 15:42:49 +03:00
joerg@trift2.
77c4bfe63a Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1
2007-10-29 12:56:48 +01:00
gluh@mysql.com/eagle.(none)
69ed192e72 after merge fix 2007-10-29 15:49:56 +04:00
gluh@eagle.(none)
61bdbf8a90 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-10-29 15:40:41 +04:00
gluh@mysql.com/eagle.(none)
6b92ec4acb Bug#30889: filesort and order by with float/numeric crashes server
There are two problems with ROUND(X, D) on an exact numeric 
(DECIMAL, NUMERIC type) field of a table:
1) The implementation of the ROUND function would change the number of decimal
places regardless of the value decided upon in fix_length_and_dec. When the
number of decimal places is not constant, this would cause an inconsistent
state where the number of digits was less than the number of decimal places,
which crashes filesort.

Fixed by not allowing the ROUND operation to add any more decimal places than
was decided in fix_length_and_dec.

2) fix_length_and_dec would allow the number of decimals to be greater than
the maximium configured value for constant values of D. This led to the same 
crash as in (1).

Fixed by not allowing the above in fix_length_and_dec.
2007-10-29 15:39:56 +04:00
joerg@trift2.
408727615c Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-10-29 11:55:48 +01:00
gluh@eagle.(none)
a2fa8f724a Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-10-29 14:53:42 +04:00
gluh@mysql.com/eagle.(none)
b943d8cf3c Bug#30897 GROUP_CONCAT returns extra comma on empty fields
The fix is a copy of Martin Friebe's suggestion.
added testing for no_appended which will be false if anything,
including the empty string is in result
2007-10-29 14:53:10 +04:00
gluh@mysql.com/eagle.(none)
7f945b2ad1 backported test case from 5.1 2007-10-29 14:45:35 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
16744e2ee9 Merge mysql.com:/home/ram/work/mysql-5.0-maint
into  mysql.com:/home/ram/work/b30782/b30782.5.0
2007-10-29 13:42:02 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
1317a63b40 Merge mysql.com:/home/ram/work/b30782/b30782.5.0
into  mysql.com:/home/ram/work/b30782/b30782.5.1
2007-10-29 13:16:26 +04:00
mleich@four.local.lan
f85bf63ce7 Fix for
Bug#31857 funcs_1: a_processlist_priv_no_prot and b_processlist_priv_ps fail
  
Reason for the changes is:
  WL4007 Deprecate RENAME DATABASE: replace with ALTER DATABASE <name> UPGRADE
2007-10-29 09:31:13 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
98a4d99961 Fix for bug #30782: Truncated UNSIGNED BIGINT columns only in SELECT w/ CASE,
JOIN, and ORDER BY

Problem: improper maximum length calculation of the CASE function leads to 
decimal value truncation (storing/retrieving decimal field values).

Fix: accurately calculate maximum length/unsigned flag/decimals parameters 
of the CASE function.
2007-10-29 12:20:21 +04:00
kaa@polly.(none)
7518ea2e01 Merge polly.(none):/home/kaa/src/opt/bug29131/my51-bug29131
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
2007-10-29 10:31:26 +03:00
kaa@polly.(none)
42c2ef0f02 Merge polly.(none):/home/kaa/src/opt/bug29131/my50-bug29131
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
2007-10-29 10:25:48 +03:00
gshchepa/uchum@gleb.loc
bf2bb35430 Many files:
Error message numbers.
2007-10-28 11:30:36 +04:00
gshchepa/uchum@gleb.loc
5ebb07a8c0 rpl_row_tabledefs_2myisam.result, sp.result, rpl_row_colSize.result:
Error message numbers.
2007-10-28 02:09:24 +04:00
gshchepa/uchum@gleb.loc
c6429f7990 Merge gleb.loc:/home/uchum/work/bk/PA/5.1-opt-31036-v
into  gleb.loc:/home/uchum/work/bk/5.1-opt
2007-10-28 01:27:47 +05:00
gshchepa/uchum@gleb.loc
c8a4b86e6c Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  gleb.loc:/home/uchum/work/bk/5.1-opt
2007-10-28 01:23:54 +05:00
gshchepa/uchum@gleb.loc
46283f72aa Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  gleb.loc:/home/uchum/work/bk/5.0-opt
2007-10-28 01:19:20 +05:00
gkodinov/kgeorge@magare.gmz
b0558ed25c Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B30715-merged-5.1-opt
2007-10-27 10:21:02 +03:00
gkodinov/kgeorge@magare.gmz
022f2334d1 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B30715-merged-5.0-opt
2007-10-27 10:20:12 +03:00
gshchepa/uchum@gleb.loc
6fbac59c5c Many files:
Error message numbers.
2007-10-27 01:40:48 +05: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
gshchepa/uchum@gleb.loc
5eb3b270d3 Fixed bug #31036: Using order by with archive table crashes server.
1. Memory overrun have been fixed.
2. Server failure on assertion has been fixed.
2007-10-26 21:26:06 +05:00
mleich@four.local.lan
d3e18cc9bb Fix for
Bug#31408 funcs_1: <engine>_trig_03e test fail
Modification:
   The TRIGGER PRIVILEGE is now needed for getting informations about TRIGGERs.
   Therefore after REVOKE TRIGGER privilege the 
   - SHOW TRIGGERS
   - SELECT * FROM INFORMATION_SCHEMA.TRIGGERS
   result sets are now empty.
2007-10-26 17:36:22 +02:00
msvensson@pilot.mysql.com
6d1f99b7d6 Bug#28772 rpl_row_until fails in pushbuild 2007-10-26 16:11:20 +02:00
istruewing@stella.local
8cc5fe116f Bug#4692 - DISABLE/ENABLE KEYS waste a space
Disabling and enabling indexes on a non-empty table grows the
index file.

Disabling indexes just sets a flag per non-unique index and does not
free the index blocks of the affected indexes. Re-enabling indexes
creates new indexes with new blocks. The old blocks remain unused
in the index file.

Fixed by dropping and re-creating all indexes if non-empty disabled
indexes exist when enabling indexes. Dropping all indexes resets
the internal end-of-file marker to the end of the index file header.
It also clears the root block pointers of every index and clears the
deleted blocks chains. This way all blocks are declared as free.
2007-10-26 15:29:06 +02:00
gshchepa/uchum@gleb.loc
30f8c35bca Merge gleb.loc:/home/uchum/work/bk/5.0-opt
into  gleb.loc:/home/uchum/work/bk/5.1-opt
2007-10-26 18:05:46 +05:00
gshchepa/uchum@gleb.loc
9bcd2fb0a6 Merge gleb.loc:/home/uchum/work/bk/PA/5.0-opt-31663
into  gleb.loc:/home/uchum/work/bk/5.0-opt
2007-10-26 17:55:16 +05:00
tnurnberg@white.intern.koehntopp.de
9b58dd92b2 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  mysql.com:/scratch/tnurnberg/31662/51-31662
2007-10-26 12:47:59 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
8ec674dd0c Fix for bug #31137: Assertion failed: primary_key_no == -1 || primary_key_no == 0,
file .\ha_innodb.

Problem: if a partial unique key followed by a non-partial one we declare
the second one as a primary key.

Fix: sort non-partial unique keys before partial ones.
2007-10-26 15:37:38 +05:00
tnurnberg@white.intern.koehntopp.de
3661048f99 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  mysql.com:/misc/mysql/31662/50-31662
2007-10-26 11:44:30 +02:00
tomas@whalegate.ndb.mysql.com
39b1aaed0f commit of WL#3686 test case already in 5.1 to get regression testing, no code committed 2007-10-26 11:42:33 +02:00
tnurnberg@mysql.com/white.intern.koehntopp.de
452516c454 Merge mysql.com:/scratch/tnurnberg/31662/50-31662
into  mysql.com:/scratch/tnurnberg/31662/51-31662
2007-10-26 10:24:31 +02:00
jonas@perch.ndb.mysql.com
85a9b350a6 post merge weirdness 2007-10-26 09:06:18 +02:00
tnurnberg@mysql.com/white.intern.koehntopp.de
66047f1c16 Bug#31662: 'null' is shown as type of fields for view with bad definer, breaks mysqldump
SHOW FIELDS FROM a view with no valid definer was possible (since fix
for Bug#26817), but gave NULL as a field-type. This led to mysqldump-ing
of such views being successful, but loading such a dump with the client
failing. Patch allows SHOW FIELDS to give data-type of field in underlying
table.
2007-10-26 09:01:29 +02:00
jonas@perch.ndb.mysql.com
512ad385db Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
2007-10-26 08:57:10 +02:00
jonas@perch.ndb.mysql.com
2965c480ec ndb - bug#31635 (5.0)
0 pad varsize keys in ndbapi
2007-10-26 08:42:33 +02:00
antony@pcg5ppc.xiphis.org
f9fc31f967 protect bug31473 from regressing into 5.0 2007-10-25 17:23:12 -07:00