mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 23:04:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
30729 commits 2774 branches 343 tags 1.6 GiB
Commit graph

560 commits

Author SHA1 Message Date
konstantin@mysql.com
5ed755d0d8 Merge mysql.com:/home/kostja/mysql/tmp_merge 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-08 23:53:45 +03:00
konstantin@mysql.com
98091b152a Merge mysql.com:/opt/local/work/mysql-4.1-root 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2006-02-02 18:17:18 +03:00
jani@ua141d10.elisa.omakaista.fi
2dcc483e6c Several Netware specific fixes. 2006-02-02 16:22:31 +02:00
sergefp@mysql.com
f02b4f54ad Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/psergey/mysql-5.1-ppruning-r5-push
 2006-01-24 15:34:02 +03:00
holyfoot@mysql.com
09359dce59 Merge bk@192.168.21.1:mysql-5.1-new into mysql.com:/home/hf/work/5.1.emb 2006-01-23 11:59:31 +04:00
sergefp@mysql.com
2e458b0928 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/psergey/mysql-5.1-ppruning-r5
 2006-01-20 19:38:11 +03:00
cps@outpost.site
c08d4aa703 Fix the tree: plugin-related changes, necessary for 
CSV storage engine to be statically compiled.
Derived from antony's patch.
 2006-01-20 00:40:56 +03:00
holyfoot@mysql.com
53a379d041 Merge bk@192.168.21.1:mysql-5.1-new into mysql.com:/home/hf/work/5.1.emb 2006-01-19 18:05:57 +04:00
bell@sanja.is.com.ua
e87d5e9a83 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug8-4.1
 2006-01-18 13:49:37 +02:00
bell@sanja.is.com.ua
4e931d3c45 Excluded posibility of tmp_table_param.copy_field double deletion (BUG#14851). 2006-01-18 13:48:57 +02:00
sergefp@mysql.com
55380631cc Manual merge 2006-01-18 14:09:08 +03:00
bar@mysql.com
4e4b37a8ef loaddata.result, loaddata.test: 
Adding test case.
sql_yacc.yy:
  Adding TEXT_STRING_filesystem, which
  converts from character_set_client to
  character_set_conversion.
  Replacing TEXT_STRING_sys to TEXT_STRING_filesystem
  in LOAD DATA and SELECT INTO OUTFILE contexts.
sql_class.h, sql_class.cc:
  Adding character_set_filesystem variable,
  and charset_is_character_set_filesystem
  flag (to avoid conversion when it's not necessary).
set_var.h, set_var.cc:
  Adding sys_var_character_set_filesystem
mysqld.cc:
  Adding --character-set-filesystem startup option.
 2006-01-18 12:55:38 +04:00
aivanov@mysql.com
55d77bdc36 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/alexi/dev/mysql-5.1-studio
 2006-01-15 17:41:32 +03:00
aivanov@mysql.com
8e499f0292 Changes to avoid compilation errors in MS Visual Studio 7.1 
(reviewed by Mats)
 2006-01-15 15:47:27 +03:00
anozdrin@mysql.com
b1705ae5c4 Merge BUG#15110 from 5.0 into 5.1. 
Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110
into  mysql.com:/home/alik/MySQL/devel/5.1-bug15110
 2006-01-13 19:09:27 +03:00
jani@ua141d10.elisa.omakaista.fi
df801decef Fixed refresh_status function. 2006-01-10 18:56:23 +02:00
reggie@linux.site
74e8c453b6 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  linux.site:/home/reggie/work/mysql-5.1-rbr_cleanups
 2006-01-09 17:35:25 -06:00
mats@mysql.com
94d3a8e050 Changes to support aCC on HP-UX. 2006-01-09 15:59:39 +01:00
lars@mysql.com
9e24aedea5 BUG#16188: Could not compile 2006-01-04 16:24:58 +01:00
mats@mysql.com
3377014a3c Post-merge fixes. 2006-01-04 15:04:36 +01:00
mats@mysql.com
e6bd8be4f3 Merge mysql.com:/home/bkroot/mysql-5.1-new 
into  mysql.com:/home/bk/b15924-mysql-5.1-new
 2006-01-04 14:00:35 +01:00
holyfoot@mysql.com
42dd692212 Merge bk@192.168.21.1:mysql-5.1-new into mysql.com:/home/hf/work/5.1.emb 2006-01-04 14:28:41 +04:00
holyfoot@deer.(none)
e8697cf428 Big patch to make embedded-server working in 5.x 
Now it supports queries returning several results
(particularly important with the SP)
 2006-01-04 14:20:28 +04:00
reggie@fedora.(none)
ffd8a0e5f9 cleaned up some of the casts as a result of Mats' review 2006-01-03 22:37:24 -06:00
reggie@fedora.(none)
c77ee8c96a some casts and simple fixes to fix compile errors in Visual 2005 2005-12-30 06:32:33 -06:00
sergefp@mysql.com
328f8fa735 WL#2985 "Partition pruning", postreview fixes: Small code fixes and better comments 2005-12-27 15:04:35 +03:00
sergefp@mysql.com
e597607cb8 Merge newbox:mysql-5.1-ppruning-r4 
into  pylon.mylan:/home/psergey/mysql-5.1-26dec-merge
 2005-12-26 14:56:15 +03:00
mats@mysql.com
56db7a6b6e Bug#15924 (Core dump in sp_trans): 
Added code for pending event flush just before executing the
  function or trigger.
 2005-12-24 12:07:07 +01:00
sergefp@mysql.com
e1f49888bf WL#2985 "Partition Pruning" 2005-12-22 12:29:00 +03:00
lars@mysql.com
ad126d90e0 WL#1012: All changes as one single changeset. 
This includes both code and test cases.
 2005-12-22 06:39:02 +01:00
kent@mysql.com
63b4ce720a Merge 2005-12-18 15:26:37 +01:00
jonas@perch.ndb.mysql.com
2180197c9b Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-release 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2005-12-15 15:11:42 +01:00
ramil@mysql.com
04cff0d055 Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX 
and bug #15668: Test 'sp-error' crashes server on Mac OS X.
 2005-12-14 21:42:08 +04:00
jimw@mysql.com
00d29cd259 Merge mysql.com:/home/jimw/my/mysql-5.0-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2005-12-12 11:57:07 -08:00
igor@rurik.mysql.com
ad53d72033 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2
 2005-12-10 23:31:03 -08:00
anozdrin@mysql.com
5d105fb7e7 Merge mysql.com:/home/alik/MySQL/devel/5.0-wl2984 
into  mysql.com:/home/alik/MySQL/devel/5.1-wl2984-merge
 2005-12-09 15:14:19 +03:00
anozdrin@mysql.com
0ff8f60b45 Patch for WL#2894: Make stored routine variables work 
according to the standard.

The idea is to use Field-classes to implement stored routines
variables. Also, we should provide facade to Item-hierarchy
by Item_field class (it is necessary, since SRVs take part
in expressions).

The patch fixes the following bugs:
  - BUG#8702: Stored Procedures: No Error/Warning shown for inappropriate data 
    type matching; 
 
  - BUG#8768: Functions: For any unsigned data type, -ve values can be passed 
    and returned; 
 
  - BUG#8769: Functions: For Int datatypes, out of range values can be passed 
    and returned; 
 
  - BUG#9078: STORED PROCDURE: Decimal digits are not displayed when we use 
    DECIMAL datatype; 
 
  - BUG#9572: Stored procedures: variable type declarations ignored; 
 
  - BUG#12903: upper function does not work inside a function; 
 
  - BUG#13705: parameters to stored procedures are not verified; 
 
  - BUG#13808: ENUM type stored procedure parameter accepts non-enumerated
    data; 
 
  - BUG#13909: Varchar Stored Procedure Parameter always BINARY string (ignores 
    CHARACTER SET); 
 
  - BUG#14161: Stored procedure cannot retrieve bigint unsigned;

  - BUG#14188: BINARY variables have no 0x00 padding;

  - BUG#15148: Stored procedure variables accept non-scalar values;
 2005-12-07 17:01:17 +03:00
igor@rurik.mysql.com
09e6597015 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2
 2005-12-02 20:42:36 -08:00
SergeyV@selena.
29941c07ed Merge selena.:H:/MYSQL/bkt/mysql-5.0 
into  selena.:H:/MYSQL/bkt/mysql-5.1
 2005-12-01 23:47:44 +03:00
ramil@mysql.com
ab04ceafc7 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/mysql-5.0
 2005-12-01 14:31:28 +04:00
ramil@mysql.com
37cfade0b4 Fix for bug #14304: auto_increment field incorrect set from within stored procedure (insert select). 2005-12-01 14:26:46 +04:00
timour@mysql.com
aa864660d7 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.1-dbg
 2005-12-01 12:12:24 +02:00
timour@mysql.com
d80feb9e21 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-bug-14920
 2005-12-01 09:26:17 +02:00
timour@mysql.com
999a73ace5 Fix for BUG#14920 Ordering aggregated result sets corrupts resultset. 
The cause of the bug was the use of end_write_group instead of end_write
in the case when ORDER BY required a temporary table, which didn't take
into account the fact that loose index scan already computes the result
of MIN/MAX aggregate functions (and performs grouping).

The solution is to call end_write instead of end_write_group and to add
the MIN/MAX functions to the list of regular functions so that their
values are inserted into the temporary table.
 2005-11-30 12:52:12 +02:00
pem@mysql.com
b2a9961abf Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/mysql-5.1-new
 2005-11-28 20:14:12 +01:00
pem@mysql.com
23cab491e9 Some post-merge cleaning, and made assert THD::store_globals() work at all times. 2005-11-24 19:13:13 +01:00
igor@rurik.mysql.com
9b9f8cab4c Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2
 2005-11-23 21:44:21 -08:00
monty@mysql.com
a3436bd7de Merge mysql.com:/home/my/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1-TDC
 2005-11-24 04:08:07 +02:00
monty@mysql.com
aa37b75768 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
 2005-11-24 02:56:12 +02:00
monty@mysql.com
4575a662cb Merge mysql.com:/home/my/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1-TDC
 2005-11-23 22:58:53 +02:00