mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
22218 commits 2791 branches 343 tags 1.7 GiB
Commit graph

10619 commits

Author SHA1 Message Date
lenz@mysql.com
7ca62cc674 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2005-04-20 20:44:18 +02:00
acurtis@xiphis.org
8689083aca Bug#9775 - Stored procedures: crash if create function that returns enum or set 
Fix bug and implement return type casting.
 2005-04-20 18:08:42 +01:00
pem@mysql.com
ab0ff5349d Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2005-04-20 18:00:51 +02:00
pem@mysql.comhem.se
54dfe4a66a Fixed BUG#7047: Stored procedure crash if alter procedure 
by simply disallowing alter procedure/function in an SP (as for drop).
 2005-04-20 17:59:28 +02:00
ingo@mysql.com
692093c041 Hand merge, which needs fixes. 2005-04-20 15:50:29 +02:00
pem@mysql.comhem.se
189d6b502b Fixed BUG#6898: Stored procedure crash if GOTO statements exist 
Bug in the optimizer caused an infinite loop for weird code.
 2005-04-20 15:37:07 +02:00
ingo@mysql.com
8faed37945 Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-bug7806
 2005-04-20 12:24:22 +02:00
mskold@mysql.com
8f7bb4eced Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-04-20 11:26:57 +02:00
sergefp@mysql.com
f284512ce0 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug9103
 2005-04-20 12:11:06 +04:00
sergefp@mysql.com
4156f9fa44 BUG#9103 merge to 5.0 2005-04-20 12:09:56 +04:00
igor@rurik.mysql.com
87ade2e6f7 Merge of the fix for bug #9681 4.1->5.0 2005-04-19 19:00:02 -07:00
igor@rurik.mysql.com
25c396628a sql_select.cc: 
Fixed bug #9681.
  The bug happened with queries using derived tables specified by
  a SELECT with ROLLUP, such as:
  SELECT * FROM (SELECT a, SUM(a) FROM t1 GROUP BY a WITH ROLLUP) t2,
  if column a of table t1 is declared as NOT NULL.
  This was to the fact that the first column of the temporary table
  created to contain the derived table erroneously inherited the NOT NULL
  attribute from column a.
olap.result, olap.test:
  Added a test case for bug #9681.
 2005-04-19 16:54:30 -07:00
lenz@mysql.com
814b4aa2eb - manual merge 2005-04-19 17:18:56 +02:00
lenz@mysql.com
a42c7d442e - added missing copyright headers to several Makefile.am's (noticed 
while testing changes to the mysql-copyright scripts
 2005-04-19 17:00:05 +02:00
ingo@mysql.com
792b816b1b Bug#7806 - insert on duplicate key and auto-update of timestamp 
Modified the check for the timestamp field so that the flags for
the automatic for inserts and updates are cleared independently.
 2005-04-19 15:12:32 +02:00
jan@hundin.mysql.fi
bd10055a7e Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/mysql-4.1
 2005-04-19 13:59:09 +03:00
mskold@mysql.com
d4b862f076 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-04-19 12:51:20 +02:00
acurtis@xiphis.org
77a9429c13 Bug#7648 - Stored procedure crash when invoking a function that returns a bit 
bugfix 9102 corrected the crashing, this corrects the result.
 2005-04-19 10:51:11 +01:00
mskold@mysql.com
4193a314fb Fix for Bug #9691 UPDATE fails on attempt to update primary key 2005-04-19 11:21:26 +02:00
acurtis@xiphis.org
f638e5cb8f Bug#9102 - Stored proccedures: function which returns blob causes crash 
Initialization of fields for sp return type was not complete.
 2005-04-19 09:09:25 +01:00
jan@hundin.mysql.fi
1f994ec920 Style change. Use 1 and 0 instead of true and false. 2005-04-19 08:23:03 +03:00
dlenev@mysql.com
855d2376f9 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-merges
 2005-04-18 17:00:02 +04:00
dlenev@mysql.com
8d7eb82a2a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-merges
 2005-04-18 16:03:07 +04:00
heikki@hundin.mysql.fi
69d4d438d2 ha_innodb.cc: 
Style fix
 2005-04-18 14:59:25 +03:00
dlenev@mysql.com
49b4af7bf6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-bg8086
 2005-04-18 15:04:50 +04:00
dlenev@mysql.com
a95ede0527 Manual merge of patch for bug #8068 "TIMEDIFF with first negative 
argument gives wrong result" (and similar bug in ADDTIME/SUBTIME)
into 5.0 tree.
 2005-04-18 14:29:31 +04:00
dlenev@brandersnatch.localdomain
91c482e4a1 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-bg8086
 2005-04-18 13:54:42 +04:00
pem@mysql.com
c8c4ecf462 Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2005-04-18 11:27:02 +02:00
jan@hundin.mysql.fi
384efc4493 Fixed a bug: deadlock without any locking, simple select and update (Bug #7975). 
Backported from 5.0.3.
 2005-04-18 12:17:32 +03:00
sergefp@mysql.com
a76ecc5bc7 Fix for BUG#9103: 
Don't produce data truncation warnings from within cp_buffer_from_ref(). This function
is only used to make index search tuples and data truncation that occurs here has no
relation with truncated values being saved into tables.
 2005-04-18 05:21:44 +04:00
sergefp@mysql.com
39f412d329 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug9439
 2005-04-17 20:56:36 +04:00
sergefp@mysql.com
ba3795f1d4 Post-merge fixes 2005-04-17 02:10:43 +04:00
sergefp@mysql.com
5147f85c62 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-look-range
 2005-04-17 02:06:17 +04:00
sergefp@mysql.com
2ef1963c91 Fix for BUG#9348: when computing union of two intervals set lower bound to 
minimum of lower bounds of two joined intervals.
 2005-04-17 02:05:09 +04:00
sergefp@mysql.com
6b4e759cf7 Fix for BUG#9439: 
Changed type of "Sub_part" column in SHOW KEYS from TINYINT to SMALLINT (as MAX_KEY_LENGTH=1024)
(this is the final cset with proper tests)
 2005-04-16 23:35:39 +04:00
ingo@mysql.com
ab0acbe14d Merge 2005-04-16 17:58:11 +02:00
monty@mishka.local
571ee3c8f0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mishka.local:/home/my/mysql-5.0
 2005-04-16 11:43:03 +03:00
serg@serg.mylan
62079eca1c Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-04-16 10:14:43 +02:00
igor@rurik.mysql.com
285f11064d Merge rurik.mysql.com:/home/igor/mysql-5.0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-04-15 22:35:29 -07:00
igor@rurik.mysql.com
d92d4007f2 subselect.result, subselect.test: 
Added a test case for bug #9516.
item_subselect.h:
  Fixed bug #9516.
  The bug was due to that fact that the class Item_subselect
  inherited the generic implementation of the function
  not_null_tables that was not valid for the objects
  of this class. As a result evaluation of the
  not_null_tables attribute was not correct for subqueries.
  This caused invalid transformations of outer joins into
  inner joins.
 2005-04-15 22:08:34 -07:00
igor@rurik.mysql.com
0f043429e4 subselect.result, subselect.test: 
Added a test case for bug #9338.
sql_select.cc:
  Fixed bug #9338.
  When an occurence of a field reference has to be replaced
  by another field reference the whole Item_field must be
  replaced.
item.cc:
  Fixed bug #9338.
  The method Item_field::replace_equal_field_processor was
  replaced by Item_field::replace_equal_field. The new method
  is used to replace the occurences of Item_field objects.
item.h:
  Fixed bug #9338.
  The virtual function replace_equal_field_processor was replaced
  by replace_equal_field. The latter is supposed to be used as a
  callback function in calls of the method transform.
 2005-04-15 20:43:45 -07:00
monty@mishka.local
c8170b349f Merge with 4.1 2005-04-16 04:35:54 +03:00
monty@mishka.local
8d919770c7 Fixed core dump with long timezone names 
Don't abort on bootstrap if a wrong --default-storage-engine is specified
 2005-04-16 03:40:33 +03:00
serg@serg.mylan
5048aa826c Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-04-16 00:34:05 +02:00
serg@serg.mylan
5fe52ffba4 merged 2005-04-16 00:10:35 +02:00
jimw@mysql.com
ab939dce27 Merge mysql.com:/home/jimw/my/mysql-4.1-9833 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-04-15 11:52:58 -07:00
jimw@mysql.com
886b8603f4 Merge mysql.com:/home/jimw/my/mysql-4.1-9815 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-04-15 11:52:35 -07:00
serg@serg.mylan
08ae28f4b8 BUG#9922 - INSERT SELECT with UNIONs allows concurrent INSERTs 
don't set lex->lock_option=TL_READ in the parser for SELECT
 2005-04-15 19:20:15 +02:00
dlenev@brandersnatch.localdomain
6b0b4734d9 Fix for bug #9486 "Can't perform multi-update in stored procedure". 
New more SP-locking friendly approach to handling locks in multi-update.
Now we mark all tables of multi-update as needing write lock at parsing
stage and if possible downgrade lock at execution stage (For its work
SP-locking mechanism needs to know all lock types right after parsing
stage).
 2005-04-15 20:31:47 +04:00
gbichot@quadita2.mysql.com
f0fa1a6f39 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
 2005-04-15 18:02:22 +02:00