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
19032 commits 2791 branches 343 tags 1.7 GiB
Commit graph

8852 commits

Author SHA1 Message Date
reggie@linux.site
c31d71c065 Fixed some vio code that was using ___WIN__ instead of __WIN__ 2005-07-12 10:31:09 -06:00
jimw@mysql.com
60368919f9 Merge mysql.com:/home/jimw/my/mysql-4.1-11643 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-07-12 09:31:07 -07:00
lars@mysql.com
7d78f53e1c Merge mysql.com:/home/bkroot/mysql-4.1 
into  mysql.com:/home/bk/b6987-mysql-4.1
 2005-07-12 18:31:05 +02:00
sergefp@mysql.com
55e70fd1f6 Fix for BUG#11821: Make Item_type_holder be able to work with MIN(field), 
MAX(field).
 2005-07-12 16:30:45 +00:00
reggie@linux.site
8a68788c39 Bug #7142 Show Fields from fails using Borland's dbExpress interface 
The problem here is that columns that have an especially long type 
such as an enum type with many options would be longer than 40 chars
but the type column returned from show columns always was defined
as varchar(40).

This is fixed in 5.0 using info schema.
 2005-07-12 08:35:30 -06:00
igor@igor-inspiron.creware.com
36945e144c Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into igor-inspiron.creware.com:/home/igor/mysql-4.1
 2005-07-12 03:18:43 -07:00
lars@mysql.com
dc55af92ff BUG#6987: Added note when stat is failing on relay log, added mutex for log rotatation. 2005-07-12 06:01:26 +02:00
bar@mysql.com
1042a275fe field_conv.cc: 
Identation fix
 2005-07-11 16:51:39 +05:00
bar@mysql.com
45fe5e74d8 field_conv.cc: 
Bug#11591
  CHAR column with utf8 does not work properly
  (more chars than expected)
  do_cut_string didn't call well_formed_length,
  and copied all data, which was wrong in the
  case of multibyte character set.
ctype_utf8.result, ctype_utf8.test:
  adding test case
 2005-07-11 13:20:07 +05:00
igor@igor-inspiron.creware.com
3c98b0132e Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into igor-inspiron.creware.com:/home/igor/mysql-4.1
 2005-07-08 06:37:09 -07:00
jimw@mysql.com
de9909faec Fix crash caused by calling DES_ENCRYPT() without the --des-key-file 
option having been passed to the server. (Bug #11643)
 2005-07-07 11:49:44 -07:00
msvensson@neptunus.(none)
a8efd33aec Merge neptunus.(none):/home/msvensson/mysql/bug11635/my41-bug11635 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-07-07 18:21:20 +02:00
msvensson@neptunus.(none)
50133499b5 BUG#11635 mysqldump exports TYPE instead of USING for HASH Cluster indexes 
- Change output from SHOW CREATE TABLE to use USING instead of TYPE
 2005-07-07 14:44:28 +02:00
bell@sanja.is.com.ua
94ec658d6f Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-4.1
 2005-07-06 15:20:51 +03:00
mskold@mysql.com
58703a4380 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-07-06 11:50:05 +02:00
mskold@mysql.com
7063d85bf9 Fixed handling of failed primary key update in INSERT .. ON DUPLICATE KEY UPDATE .. 2005-07-06 11:23:36 +02:00
bell@sanja.is.com.ua
c41c8accd7 Merge 2005-07-06 11:36:27 +03:00
kent@mysql.com
ca420edc21 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
 2005-07-06 00:15:55 +02:00
kent@mysql.com
a7be42163a Makefile.am: 
Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
 2005-07-05 23:24:48 +02:00
jimw@mysql.com
9f654b806a Merge mysql.com:/home/jimw/my/mysql-4.1-11440 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-07-05 12:54:12 -07:00
jimw@mysql.com
81e50844b3 Merge mysql.com:/home/jimw/my/mysql-4.1-11330 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-07-05 12:51:16 -07:00
mats@mysql.com
3c42734174 Merge mysql.com:/home/bkroot/mysql-4.1 
into mysql.com:/home/bk/b11401-mysql-4.1
 2005-07-05 14:08:22 +02:00
mats@mysql.com
6d924c8286 Bug#11401: Setting thd->lex so that engines (i.e., InnoDB) recognizes 
this as a LOAD DATA ... REPLACE INTO .. statement.
 2005-07-05 13:55:54 +02:00
mskold@mysql.com
d36f7357e7 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-07-05 12:24:03 +02:00
mskold@mysql.com
77c481329c Fixed indentation 2005-07-04 20:36:38 +02:00
bell@sanja.is.com.ua
67c9df1eb8 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug_qc-4.1
 2005-07-04 01:36:55 +03:00
bell@sanja.is.com.ua
54662b4487 merge 2005-07-04 01:36:06 +03:00
monty@mysql.com
2735d7dcf6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-07-02 16:13:35 +03:00
bell@sanja.is.com.ua
b6dc32a755 fixed create_distinct_group() to make references via ref_pointer_array 2005-07-01 20:13:07 +03:00
igor@rurik.mysql.com
343e8effa9 olap.result, olap.test: 
Added a test case for bug #11543.
sql_select.cc:
  Fixed bug #11543.
  A ROLLUP query could return a wrong result set when
  its GROUP BY clause contained references to the same
  column.
 2005-07-01 07:40:22 -07:00
monty@mysql.com
3d02b808ba Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-07-01 10:07:01 +03:00
monty@mysql.com
e3a4c1a6b2 Optimization during review 
Add extra check to delete [] to ensure we are not deleting not allocated data
 2005-07-01 09:40:05 +03:00
lenz@mysql.com
59b5c9bf66 - backport of a compile fix from 4.1 (ChangeSet@1.2260.23.2 2005/05/19 from reggie) 
"changed dl_name to udf->dl in mysql_create_function"
 2005-06-30 17:33:23 +02:00
jani@ua141d10.elisa.omakaista.fi
b60175f9c4 Fixed Bug#11226 and reverted fix for Bug#6993. 
Using 8 bytes for data pointer does not work at least on
all computers. The result may become 0 or negative number.
(mysqld, myisamchk)
 2005-06-30 16:13:22 +03:00
mskold@mysql.com
569a846120 Changed delete_row to always get key from record argument, removed unused function 2005-06-29 16:17:47 +02:00
mskold@mysql.com
ec4bb86379 Changed delete_row to always get key from record argument 2005-06-29 16:13:50 +02:00
igor@rurik.mysql.com
ce53a3f229 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2005-06-29 02:44:41 -07:00
igor@rurik.mysql.com
4b8f2e9bb4 func_str.test: 
Added test cases for bug #11469.
item_strfunc.h:
  Fixed bug #11469: wrong implementation of the not_null_tables
  method for CONCAT_WS.
 2005-06-29 02:40:25 -07:00
bell@sanja.is.com.ua
9283e3e3e8 fixed not_null_tables() for IN() (BUG#9393) 
(IN() remove NULL rows only for tables from first argument (value which we looking for in IN() list) but not for tables from IN() list)
Also it will be better change Item::not_null_tables() to prohibit this optimisation by default for new created items in 5.0 or 5.1.
 2005-06-28 22:20:25 +03:00
bell@sanja.is.com.ua
0e30eea141 fixed substring() length calculation in case of constant negative argument (BUG#10269) 2005-06-28 21:45:11 +03:00
igor@rurik.mysql.com
1776464568 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2005-06-28 05:33:40 -07:00
monty@mysql.com
10c4678def Move reset of insert_values to ensure it's done also during error conditions 
This fixed a failure of insert_update.test on some platforms
 2005-06-28 15:06:16 +03:00
igor@rurik.mysql.com
04e6f472dd Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2005-06-28 03:24:06 -07:00
igor@rurik.mysql.com
42bb0eaf9f Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2005-06-28 03:20:00 -07:00
igor@rurik.mysql.com
be1478f6f9 group_by.result, group_by.test: 
Added a test case for bug #11414.
sql_select.cc:
  Fixed bug #11414: crash on Windows with some simple
  GROUP BY queries.
  It happened to an allocation of an array containing
  0 Copy_field elements in setup_copy_fields.
  The bug had been already fixed in 5.0.
 2005-06-28 03:18:37 -07:00
kent@mysql.com
b3a00568fb opt_range.cc: 
Added missing `;' to DBUG_RETURN()
 2005-06-28 04:33:06 +02:00
bell@sanja.is.com.ua
b49b5805eb abort storing query to query cache if warnings appeared (BUG#9414) 2005-06-28 00:52:21 +03:00
monty@mishka.local
7398252d02 Portability fixes 
Fixes while reviewing new pushed code
NULL as argument to encrypt/decrypt should return NULL without a warning
 2005-06-27 20:31:00 +03:00
monty@mishka.local
6db013ef86 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mishka.local:/home/my/mysql-4.1
 2005-06-27 16:47:44 +03:00
monty@mishka.local
83f90e060e Better bug fix for: 
#9728  'Decreased functionality in "on duplicate key update
#8147  'a column proclaimed ambigous in INSERT ... SELECT .. ON DUPLICATE'

This ensures fields are uniquely qualified and also that one can't update other tables in the ON DUPLICATE KEY UPDATE part
 2005-06-27 16:46:41 +03:00