database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-18 07:48:43 +03:00
Code Activity
25,078 Commits 3,279 Branches 1,097 Tags
48ded4ab3d1b413e8dd8dfd60f4417f02df9d33e
Commit Graph

7614 Commits

Author SHA1 Message Date
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
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
kent@mysql.com
950f36dde6 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-06-20 12:36:40 +02:00
kent@mysql.com
67a95f5f14 mysql-test-run.pl: 
Corrected path to 'mysql_fix_privilege_tables'
 2005-06-20 12:32:53 +02:00
mskold@mysql.com
598929a109 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 12:27:50 +02:00
kent@mysql.com
9a8cb4406e mysql-test-run.pl: 
Added --log-bin-trust-routine-creators to server start
  Increase and autoextend innodb tables
 2005-06-20 12:17:03 +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
kent@mysql.com
2c1ef9002d Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-06-20 11:56:19 +02:00
kent@mysql.com
5bf83588e3 mysql-test-run.pl: 
Corrected path to 'mysql_fix_privilege_tables'
  Corrected dummy --manager-port to take integer argument
 2005-06-20 11:49:25 +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
5fd19ea864 Fix for BUG#10804: allow differences in rows field in EXPLAIN output 2005-06-20 11:05: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
kent@mysql.com
e58054ad16 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-06-19 20:09:28 +02:00
kent@mysql.com
917276f254 mysql-test-run.pl: 
Added dummy --manager-port flag, for backward compatibility
  Back port from 5.0, correction of paths to SSL pem files
mtr_cases.pl:
  Removed hard coded exclude list for embedded server
mysql-test-run.pl:
  Set environment variable MYSQL_SHOW, to be used in test cases
 2005-06-19 20:06:27 +02:00
kent@mysql.com
32734072d0 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-06-19 18:55:00 +02: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
serg@serg.mylan
3812e15c00 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-06-18 18:16:04 +02:00
serg@serg.mylan
07513c001c BSD make compatibility. bug#9828 2005-06-18 18:14:28 +02:00
jimw@mysql.com
01c690b79b Fix information_schema test on Windows. (Bug #10844) 2005-06-18 03:02:27 +02: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
jimw@mysql.com
176143413e Fix hang/crash with Boolean full-text search against an unindexed field for 
which the query contained more words than we allocated space. (Bug #7858)
 2005-06-17 21:44:17 +02: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
jimw@mysql.com
ec54dcb054 Fix spurious permissions problem when CONVERT_TZ() is used 
in a multi-table update query. (Bug #9979)
 2005-06-17 08:56:04 -07: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
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
lars@mysql.com
41d1c094b6 Fix of 5.0 tree 2005-06-17 14:03:27 +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
konstantin@mysql.com
62dacf0813 Manual merge (4.1->5.0) 2005-06-17 00:34:35 +04:00
konstantin@mysql.com
dcb0e65dcb Fix Bug#9334 "PS API queries in log file" and 
Bug#8367 "low log doesn't gives complete information about prepared 
statements"
Implement status variables for prepared statements commands (a port of
the patch by Andrey Hristov).
See details in comments to the changed files.
No test case as there is no way to test slow log/general log in 
mysqltest.
 2005-06-17 00:11:48 +04:00
igor@rurik.mysql.com
ad223c9c10 group_by.result, group_by.test: 
Correction after merge of fix for bug #8614.
 2005-06-16 11:59:00 -07:00
igor@rurik.mysql.com
86a314cc7b Manual merge 2005-06-16 10:04:41 -07:00
igor@rurik.mysql.com
deaf7f9608 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2005-06-16 09:49:04 -07:00
igor@rurik.mysql.com
2095758a9d group_by.result, group_by.test: 
Added a test case for bug #8614.
sql_select.cc:
  Fixed bug #8614.
  SELECT DISTINCT ... GROUP BY 'const' must be equivalent to
  SELECT ... GROUP BY 'const'.
 2005-06-16 09:45:41 -07:00
joerg@mysql.com
f0caf7d58c Merge mysql.com:/M50/clone-5.0.7 into mysql.com:/M50/mysql-5.0 2005-06-16 18:30:19 +02:00
matthias@three.local.lan
a785b84ea1 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-B
 2005-06-16 17:37:04 +02:00
timour@mysql.com
64df4e1170 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into mysql.com:/home/timka/mysql/src/5.0-dbg
 2005-06-16 18:11:35 +03:00
timour@mysql.com
375e79bb6e Post-fix for BUG#11211 
Exclude the query that generates warning from PS tests, due to extra warning
under PS.
 2005-06-16 18:03:51 +03:00
lars@mysql.com
869882f321 WL#2076: Added if(...) construct to mysqltest 
Removed SHOW BINLOG EVENTS in test case for ps-protocol and row-based replication
 2005-06-16 16:56:03 +02:00
mleich@mysql.com
2e732594bc Post review fixes 2005-06-16 12:46:09 +02:00
matthias@three.local.lan
e0bd604c92 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-B
 2005-06-16 12:10:06 +02:00
gluh@mysql.com
a68bfdc334 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/gluh/MySQL/Merge/5.0
 2005-06-16 13:30:14 +05:00