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

11528 commits

Author SHA1 Message Date
evgen@moonbone.local
e94f16a125 Fix bug #7422 "order by" doesn't work 
Field with wrong buffer was used to make sort key, which results in producing
same sort key for all records.
 2005-06-21 20:14:50 +04:00
igor@rurik.mysql.com
295645b688 Manual merge 2005-06-21 06:26:02 -07:00
igor@rurik.mysql.com
3bfe28e9bf Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2005-06-21 06:19:06 -07:00
msvensson@neptunus.(none)
ddeaf342a7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-06-21 14:24:13 +02:00
igor@rurik.mysql.com
bb944aa9dc Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-1
 2005-06-21 04:31:07 -07:00
igor@rurik.mysql.com
2104e9e668 group_by.result, group_by.test: 
Added a test case for bug #11295.
item_buff.cc:
  Fixed bug #11295.
  This a correction for the patch of bug #11088 that takes into
  account a possible NULL values of the BLOB column.
 2005-06-21 04:24:21 -07:00
marko@hundin.mysql.fi
a5cbbb7031 InnoDB: Remove some warnings reported by GCC 4.0.0. 2005-06-21 11:49:55 +03:00
mskold@mysql.com
2716e772d4 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-06-21 10:35:22 +02:00
mskold@mysql.com
981e845d8f Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-06-21 08:59:37 +02:00
marko@hundin.mysql.fi
e992adcb3f Merge hundin.mysql.fi:/home/marko/mysql-5.0 
into hundin.mysql.fi:/home/marko/mysql-5.0-current
 2005-06-21 07:36:18 +03:00
kent@mysql.com
9c79bc7e73 Merge 2005-06-20 22:31:25 +02:00
kent@mysql.com
c7e501d883 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-06-20 21:25:54 +02:00
igor@rurik.mysql.com
28214f3da8 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2005-06-20 10:52:38 -07:00
igor@rurik.mysql.com
acc6651d24 group_by.result: 
Added  a test case for bug #11385.
group_by.test:
  Added  a test case for bug #11385.
field.h:
  Fixed bug #11385.
  The bug was due to not defined method decimals for the class
  Field_datetime.
 2005-06-20 10:49:04 -07:00
kent@mysql.com
fb09633eb1 Makefile.am: 
Corrected dependency for "lex_hash.h", to avoid occasional make failure
 2005-06-20 18:03:30 +02:00
mskold@mysql.com
91c422e029 Merge 2005-06-20 18:02:47 +02:00
mskold@mysql.com
d34fce5bf6 ha_ndbcluster.cc: 
Added CR for readability
 2005-06-20 17:17:44 +02:00
mskold@mysql.com
e8e6554a22 Added comment to store_lock 2005-06-20 17:16:22 +02:00
mskold@mysql.com
777ec78755 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-06-20 16:13:34 +02:00
igor@igor-inspiron.creware.com
7ea12bd787 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into igor-inspiron.creware.com:/home/igor/mysql-4.1
 2005-06-20 06:13:30 -07:00
dlenev@mysql.com
e28264d29f Manual merge of patch for bug#11060 "Server crashes on calling stored 
procedure with INSERT SELECT UNION SELECT" aka "Server crashes on
re-execution of prepared INSERT ... SELECT with UNION" into 5.0 tree.
 2005-06-20 16:58:02 +04:00
dlenev@mysql.com
b5b3b32d0a Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-bg11060
 2005-06-20 16:07:36 +04:00
dlenev@brandersnatch.localdomain
d07843efd9 Fix for bug #11060 "Server crashes on re-execution of prepared 
INSERT ... SELECT with UNION" (reviewed version).

Altough bug manifest itself only starting from 5.0 it is better to
apply fix to 4.1 to keep some assumptions true and make code more
future-proof.
 2005-06-20 16:07:00 +04:00
bell@sanja.is.com.ua
02cac1c5e6 fixed time_format printing (BUG#7521) 2005-06-20 14:56:17 +03:00
konstantin@mysql.com
b875f7902d Fix a formatting bug and add a test for it. 2005-06-20 15:38:15 +04:00
msvensson@neptunus.(none)
73c1578f15 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/bug10365
 2005-06-20 13:08:45 +02:00
msvensson@neptunus.(none)
8aaad90786 BUG#10466 Datatype "timestamp" displays "YYYYMMDDHHMMSS" irrespective of display sizes. 
- Use buffer for printing error message
 2005-06-20 12:11:52 +02:00
msvensson@neptunus.(none)
6282d89b0a bug#10466: Datatype "timestamp" displays "YYYYMMDDHHMMSS" irrespective of display sizes. 
- Print warning that says display width is not supported for datatype TIMESTAMP, if user tries to create a TIMESTAMP column with display width.
 - Use display width for TIMESTAMP only in type_timestamp test to make sure warning is displayed correctly.
 2005-06-20 12:09:00 +02:00
sergefp@mysql.com
ef85deab92 Fix for BUG#10151: In Item_func_case::find_item don't assume that parameter str != &(this->str_value) 2005-06-20 11:43:38 +02:00
sergefp@mysql.com
014fe01512 Fix for BUG#8441: in index_merge code when creating index search tuples use 
KEY_PART_INFO::store_length, not KEY_PART_INFO::length (like range code does)
 2005-06-20 08:56:37 +00:00
mskold@mysql.com
6fa3cdad5f Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-06-20 09:37:31 +02:00
svoj@mysql.com
c45df76029 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
 2005-06-20 11:33:57 +05:00
tulin@dl145c.mysql.com
2d654a5551 Merge dl145c.mysql.com:/home/ndbdev/tomas/mysql-4.1 
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0
 2005-06-20 07:57:09 +02:00
tulin@dl145c.mysql.com
61c36b1c12 ha_ndbcluster.cc: 
remove typecheck in ndb handler not needed
 2005-06-20 07:53:53 +02:00
svoj@mysql.com
7660f609e6 WL#2286 - Compile MySQL w/YASSL support 
Fix for yaSSL link failures with Forte Developer 7, MIPSpro Compilers, Compaq C++.
These compilers have problem with implicit template instantiation in archives
(libyassl.a, libtaocrypt.a). Instantiate templates explicitly.

Fix for yaSSL link failure on powermacg5 (gcc 3.3). When -O3 is specified gcc inlines
__cxa_pure_virtual. This is wrong behavior, __cxa_pure_virtual must never be inlined.
 2005-06-19 21:46:44 +05:00
gbichot@quadita2.mysql.com
c2ec0e7409 correcting error messages after discussion with Paul (replication of routines). 2005-06-19 17:39:08 +02:00
bell@sanja.is.com.ua
d75f6d74b5 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
 2005-06-18 20:11:41 +03:00
acurtis@xiphis.org
07892fe219 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 
into xiphis.org:/usr/home/antony/work2/p3-bug6877.3
 2005-06-17 22:32:46 +01:00
acurtis@xiphis.org
51dd521dfc Bug#6877 MySQL should give an error if the requested table type is not available 
Implement new SQL mode - NO_ENGINE_SUBSTITUTION
 2005-06-17 22:14:44 +01:00
bell@sanja.is.com.ua
640027f7ba Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
 2005-06-17 23:53:51 +03:00
konstantin@mysql.com
362a83d2f2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/opt/local/work/mysql-5.0-10736
 2005-06-17 23:27:23 +04:00
konstantin@mysql.com
b3d977df10 Rename all prepared statements COM_ commands to prefix with COM_STMT_ 2005-06-17 23:26:25 +04:00
bell@sanja.is.com.ua
6d030c637b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
 2005-06-17 20:30:11 +03:00
msvensson@neptunus.(none)
daba295db0 BUG#10589: des_encrypt functionality always return NULL 
- Push warnings if des_encrypt or des_descrypt function fails because of out of resources or wrong params.
 - Push warning if des_encrypt or des_decrypt function is used when server is missing support for openssl.
 - Add test func_encrypt_nossl that is tun when the server is missing support for openssl.
 2005-06-17 18:07:46 +02:00
elliot@mysql.com
0c71508759 BUG#10442 Fix replication slave crash when a query with multiupdate and 
subselects is used.
 2005-06-17 11:15:29 -04:00
bell@sanja.is.com.ua
a11677026f fixed printing of sum(distinct ) & avg(distinct ) & cast(... as decimal) (BUG#7015, BUG#11387) 2005-06-17 17:27:47 +03:00
serg@serg.mylan
637a353d93 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-06-17 14:54:59 +02:00
mskold@mysql.com
dc5e1444a0 Fix for bug#10936: Cluster engine shows wrong key value for duplicate key error 2005-06-17 14:45:54 +02:00
igor@rurik.mysql.com
dd782a8746 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2005-06-17 03:56:24 -07:00
tulin@dl145c.mysql.com
a6c19c2532 Merge dl145c.mysql.com:/home/ndbdev/tomas/mysql-4.1 
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0
 2005-06-17 12:53:49 +02:00