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

5145 commits

Author SHA1 Message Date
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
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
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
f9ec5658c7 Merge fix for BUG#9439 from 4.1 2005-04-17 20:54:31 +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
ingo@mysql.com
e0e3def7c7 Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-bug9188
 2005-04-16 17:44:04 +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
monty@mishka.local
de1b1fe54d Added more rows to test to get predictable results 2005-04-16 10:53:30 +03: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
ingo@mysql.com
990ebef7f6 Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-bug9188
 2005-04-15 17:16:42 +02:00
pem@mysql.comhem.se
da22f75b68 Fixed BUG#9902: Crash with simple stored function using user defined variables 
... actually, it was a query cache problem. (It shouldn't cache such queries)
 2005-04-15 11:06:25 +02:00
konstantin@mysql.com
06c5e43c56 A test case for Bug#4956 (decimal -> string conversion problem) 2005-04-14 15:14:34 -07:00
serg@serg.mylan
4757803662 merged 2005-04-14 21:31:22 +02:00
serg@serg.mylan
533e0551f2 TRUNCATE is always a transaction on itself. pretent we're in auto-commit mode 
bug#8151
 2005-04-14 18:14:54 +02:00
pem@mysql.com
e461c7969b Merge 2005-04-14 16:10:18 +02:00
pem@mysql.comhem.se
6aad6835c6 Fixed BUG#9598: stored procedure call within stored procedure 
overwrites IN variable
  and added error checking of variables for [IN]OUT parameters while
  rewriting the out parameter handling.
 2005-04-14 14:52:35 +02:00
ramil@mysql.com
1dc796a12e Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/ram/work/5.0.bit_class
 2005-04-14 14:33:28 +05:00
ramil@mysql.com
b2dbaea394 Bit type: fix for create_field::create_field(). 2005-04-14 14:32:25 +05:00
igor@rurik.mysql.com
b622aba19f information_schema.result, information_schema.test: 
Added a test in connection with the fix for
  bug #6106.
view.result, view.test:
  Added test cases for bugs #6106/6107.
sql_show.cc:
  The addition of the case for items of the type REF_ITEM in the
  function uses_only_table_name_fields became necessary after
  the fix for bug #6106.
sql_base.cc:
  The problem was due to the fact that two different column
  references were glued together though one of them belonged to
  a subquery while another to an outer query. This caused
  eventually a wrong calculation of values for the used_tables
  attribute.
 2005-04-13 23:06:37 -07:00
jimw@mysql.com
f7d89dd468 Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-04-13 12:46:19 -07:00
konstantin@mysql.com
ced4317774 Allow SQLCOM_CALL in prepared mode. 2005-04-13 12:36:15 -07:00
jimw@mysql.com
62b78d4182 Merge from 4.1 2005-04-13 10:38:11 -07:00
jimw@mysql.com
0162702290 Fix ctype_ucs_binlog test when ucs2 not available 2005-04-13 09:02:12 -07:00
pem@mysql.comhem.se
7a4f495f5b Fixed BUG#9674: Stored Procs: Using declared vars in algebric operation 
causes system crash.
 2005-04-13 17:43:53 +02:00
pem@mysql.comhem.se
387afb3d29 Fixed BUG#9856: Stored procedures: crash if handler for sqlexception, not found. 2005-04-13 16:57:49 +02:00
pem@mysql.comhem.se
6a46d0cd8a Added test case for BUG#6129: Stored procedure won't display @@sql_mode value. 2005-04-13 16:09:28 +02:00
serg@serg.mylan
32221d9b9e Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-04-12 23:12:26 +02:00
pem@mysql.com
24d4264d02 Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2005-04-12 18:13:29 +02:00
serg@serg.mylan
3ab03ccbb0 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-04-12 17:22:14 +02:00
serg@serg.mylan
d4a0becc8a FLUSH TABLES WITH READ LOCK should block writes to binlog too 2005-04-12 17:15:54 +02:00
pem@mysql.comhem.se
9c21006f81 Fixed BUG#7185: Stored procedure crash if identifier is AVG 2005-04-12 15:43:24 +02:00
msvensson@neptunus.(none)
a1c4918a6c Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-04-12 14:51:03 +02:00
msvensson@neptunus.(none)
7387030e67 BUG#8924 'Explain' shows different strategy 
- If number of records in table is 4, the calculated cost for using "index" and "range" become so close so that any rounding errors becomes visible.
 - Added one more record to the tables for heap test and expoect "range" to be selected
 - Decrease number of records in t1 for range and expect "index" to be choosen.
 2005-04-12 12:04:43 +02:00
ramil@mysql.com
3b1c3d8c68 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/ram/work/5.0.bit_class
 2005-04-12 12:30:09 +05:00
ramil@mysql.com
c4376b2bc6 Bit type support for non-MyISAM tables. 2005-04-12 12:27:43 +05:00
serg@serg.mylan
98601055b6 backport kill.test fix from 5.0 2005-04-11 22:36:07 +02:00
reggie@mdk10.(none)
4bb4a285ab Merge mdk10.(none):/home/reggie/bk/mysql-4.1 
into mdk10.(none):/home/reggie/bk/mysql-5.0
 2005-04-11 09:29:49 -05:00
bar@mysql.com
71f530c4ea merge 2005-04-11 15:11:52 +05:00
dlenev@mysql.com
b0dd388190 Merge mysql.com:/home/dlenev/src/mysql-4.0-bg9796 
into mysql.com:/home/dlenev/src/mysql-4.1-merges
 2005-04-11 09:53:54 +04:00
dlenev@mysql.com
06e3647274 Fix for bug #9796 "Query Cache caches queries with CURRENT_USER() 
function".

We should not cache queries using CURRENT_USER() function as we do it
for some other functions, e.g. USER() function.
 2005-04-11 00:30:23 +04:00
bar@mysql.com
16e186779f ctype_collate.result, ctype_collate.test, union.result, union.test: 
fixing tests accordingly
item.cc:
  Allow mixing non-binary collation and binary collation
  even if coercibility is the same. 
  For easier 4.0 -> 4.1 migrating.
 2005-04-10 12:40:33 +05:00
pem@mysql.comhem.se
2038ced40c Fixed BUG#9073: Able to declare two handlers for same condition in same scope 2005-04-08 19:58:04 +02:00