mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 19:41:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
22116 commits 2793 branches 343 tags 1.7 GiB
Commit graph

22116 commits

This branch
This branch
All branches
Author SHA1 Message Date
sergefp@mysql.com
0e7e062465 Fix for BUG#9912: make the test handle both possible optimizer choices 2005-04-21 13:32:46 +04:00
hf@deer.(none)
f83481923b Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.clean
 2005-04-21 13:29:06 +05:00
ingo@mysql.com
eeda9b3f8c After merge fix. 2005-04-21 10:29:05 +02:00
hf@deer.(none)
64f4fd2bbd Merging 2005-04-21 13:19:02 +05:00
ingo@mysql.com
5ed49fbfef Merge mysql.com:/home/mydev/mysql-5.0 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-04-21 08:22:43 +02:00
hf@deer.(none)
53b496a356 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.7344
 2005-04-21 11:10:28 +05:00
hf@deer.(none)
c6464cab0d Fix for bug #7344 (Repeating mysql_server_start/mysql_server_end crash clients) 
One more free_charset call added
 2005-04-21 10:58:58 +05:00
igor@rurik.mysql.com
ca35e36310 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-04-20 16:39:31 -07:00
igor@rurik.mysql.com
20250dc497 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2005-04-20 15:08:22 -07:00
sergefp@mysql.com
c2959178ca Fix for BUG#10037 
* Add 0.01 to cost of 'range'+'using index' scan to avoid optimizer choice races with 
  'index' scan.
 2005-04-21 01:55:33 +04:00
ingo@mysql.com
bee3f9e95f Merge mysql.com:/home/mydev/mysql-5.0 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-04-20 23:04:27 +02: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
pekka@mysql.com
737a866faa ndb - dbug aid for api signal log 2005-04-20 16:09:00 +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
c179d0c1cc Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-bug7806
 2005-04-20 15:04:00 +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
msvensson@neptunus.(none)
32a872938e manual merge 2005-04-20 12:06:11 +02:00
msvensson@neptunus.(none)
b26d29a081 After review fix 2005-04-20 12:02:07 +02:00
msvensson@neptunus.(none)
de9ba7b0a5 Merge 2005-04-20 11:59:02 +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
jani@a193-229-222-105.elisa-laajakaista.fi
ff665c9513 Fixed Bug#8046 --mysqld of mysqld_safe must contain substring "mysqld" 2005-04-20 10:37:03 +03: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
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
joerg@mysql.com
dee14fdd40 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2005-04-19 14:06:09 +02:00
joerg@mysql.com
91b0f86189 Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/push-5.0 2005-04-19 13:53:34 +02:00
msvensson@neptunus.(none)
4a4c9017ad BUG#9568 mysql segfaults from CTRL-R 
- Segfault because of passing a 64-bit pointer to 32 bit integer.
 - Add new include  config_readline.h which will calculate some new defines 
   based on what is found in config.h
 - This file was originally included in readline 4.3 as config.h.in, only the part that
    makes new defines have been moved to this file.
 2005-04-19 13:12:19 +02:00
jan@hundin.mysql.fi
110025e647 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/jan/orig/mysql-5.0
 2005-04-19 14:01:55 +03: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
acurtis@xiphis.org
ba51f96e39 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into xiphis.org:/.amd_mnt/bk.anubis/host/work-acurtis/bug9496
 2005-04-19 10:32:04 +01:00
joreland@mysql.com
2df2c4b895 CSC5149 - ndb test programs 
Fix src distributions for benchmark prg
 2005-04-19 11:17:32 +02:00
jan@hundin.mysql.fi
09a425fa19 Merge changes from 4.1.x to 5.0.x. Only a style changes. 2005-04-19 09:38:20 +03: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
igor@rurik.mysql.com
ea9cbd3bb4 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into rurik.mysql.com:/home/igor/mysql-5.0
 2005-04-18 14:49:11 -07:00
igor@rurik.mysql.com
60164ced47 view.result: 
Correction after fix for bug #9902.
 2005-04-18 14:44:14 -07:00
jani@a193-229-222-105.elisa-laajakaista.fi
1658d737b3 Fixed Bug#6593, "Inconsistency in handling option prefixes (--skip, --disable, etc.)" 2005-04-19 00:22:57 +03:00
acurtis@xiphis.org
1ef7bbc74b Update for VARCHAR and remove 4.1-specific actions. 
by Philip Antoniades
 2005-04-18 22:01:18 +01:00
sergefp@mysql.com
969263cf1d Post merge fix - updated the test results (BUG#9439) 2005-04-18 22:30:22 +04: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@brandersnatch.localdomain
03d8c01a4c Fixed test results after merging fix for bug #8068 "TIMEDIFF with first 
negative argument gives wrong result" into 5.0 tree.
 2005-04-18 15:58:58 +04: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