database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-21 06:21:35 +03:00
Code Activity
37,636 Commits 3,280 Branches 1,098 Tags
f4b671d8bc1ab80342918820a2bc841c5542d57d
Commit Graph

13837 Commits

Author SHA1 Message Date
kroki/tomash@moonlight.intranet
99baff565e Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug18819
 2006-10-25 20:16:39 +04:00
kroki/tomash@moonlight.intranet
fa60a03073 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-runtime 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug18819
 2006-10-25 20:13:07 +04:00
kroki/tomash@moonlight.intranet
2c03444971 Fix after manual merge. 2006-10-25 20:09:31 +04:00
kroki/tomash@moonlight.intranet
c8bb2f396a Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug18819 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug18819
 2006-10-25 20:00:51 +04:00
kroki/tomash@moonlight.intranet
b7b991cec3 BUG#18819: DELETE IGNORE hangs on foreign key parent delete 
If the error happens during DELETE IGNORE, nothing could be send to the
client, thus leaving it frozen expecting the reply.

The problem was that if some error occurred, it wouldn't be reported to
the client because of IGNORE, but neither success would be reported.

MySQL 4.1 would not freeze the client, but will report

  ERROR 1105 (HY000): Unknown error

instead, which is also a bug.

The solution is to report success if we are in DELETE IGNORE and some
non-fatal error has happened.
 2006-10-25 19:53:26 +04:00
holyfoot/hf@mysql.com/deer.(none)
4fb00857ca bug #19491 (CAST do DATETIME wrong result) 2006-10-25 20:14:39 +05:00
lars/lthalmann@mysql.com/dl145h.mysql.com
4743fb6902 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-10-25 17:10:18 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
31abddb5e1 Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
 2006-10-25 17:08:57 +02:00
msvensson@neptunus.(none)
6665d67e3f Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-25 16:51:32 +02:00
msvensson@neptunus.(none)
8f118827c4 Skip innodb test if mysqld doesn't have innodb support 2006-10-25 16:50:06 +02:00
msvensson@neptunus.(none)
e193c7bf87 Test failure when compiled without innodb 
Disable warnings around the create table statements, we want to use innodb when possible but they work just fine without.
 2006-10-25 15:41:32 +02:00
msvensson@neptunus.(none)
8ce354f3cf Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-25 14:57:06 +02:00
msvensson@neptunus.(none)
de932f2a5f Update the binlog format parse routine to only be avaliable in 5.1 and allow for any binlog_format to be specified 2006-10-25 14:56:36 +02:00
msvensson@neptunus.(none)
86cca50848 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-25 14:39:29 +02:00
msvensson@neptunus.(none)
a6d87b4c00 Add valgrinding support for mysql_client_test 
Fix two memory leaks in mysql_client_test
 2006-10-25 14:34:18 +02:00
msvensson@neptunus.(none)
392c00d49e Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-25 12:41:34 +02:00
msvensson@neptunus.(none)
4969081589 Set flag opt_skip_ndbcluster_slave if no slaves are being used. 
Add comments
Deperlify
 2006-10-25 12:40:33 +02:00
msvensson@neptunus.(none)
9906a10a27 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-24 23:40:11 +02:00
msvensson@neptunus.(none)
1f780b77e7 Adapt mysql-test-run.pl to mysqld in 5.1 using "mixed" binlog format by default 2006-10-24 23:39:46 +02:00
tsmith/tim@siva.hindu.god
3af2089b13 Merge siva.hindu.god:/usr/home/tim/m/bk/g50 
into  siva.hindu.god:/usr/home/tim/m/bk/50
 2006-10-24 14:42:08 -06:00
msvensson@neptunus.(none)
e0985bef96 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-24 21:05:35 +02:00
msvensson@neptunus.(none)
ac5b37ef00 Pass --core-file option to mysqld when bootstrapping 2006-10-24 21:02:04 +02:00
msvensson@neptunus.(none)
56d2a6fd3c Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-24 19:22:48 +02:00
msvensson@neptunus.(none)
844369130f Remove debug printout 2006-10-24 19:22:27 +02:00
msvensson@neptunus.(none)
a45e6ba7e8 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-24 18:51:07 +02:00
msvensson@neptunus.(none)
a8d1c62e5f Run mysql_client_test without --silent 
Flush both stdout and stderr before abort'ing mysql_client_test
 2006-10-24 18:49:19 +02:00
msvensson@neptunus.(none)
d02838deb0 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-24 18:08:38 +02:00
msvensson@neptunus.(none)
80f4c1056f Fix spelling errors in test files 2006-10-24 17:54:45 +02:00
msvensson@neptunus.(none)
3df77e48af Add analyze_testcase_failure which is called when mysqltest has failed 
with error 1 and we are running with --force
The specific "analyze" code is enclosed in a .test file fwich can easily
be modified to be more advanced
 2006-10-24 17:36:46 +02:00
stewart@willster.(none)
a8037f478d fix result file for ndb_multi 2006-10-25 00:41:55 +10:00
msvensson@neptunus.(none)
ccc33b4e53 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-24 16:00:42 +02:00
gkodinov/kgeorge@macbook.gmz
932d86bbb9 Bug #21809: Error 1356 while selecting from view with grouping though underlying 
select OK.
The SQL parser was using Item::name to transfer user defined function attributes
to the user defined function (udf). It was not distinguishing between user defined 
function call arguments and stored procedure call arguments. Setting Item::name 
was causing Item_ref::print() method to print the argument as quoted identifiers 
and caused views that reference aggregate functions as udf call arguments (and 
rely on Item::print() for the text of the view to store) to throw an undefined 
identifier error.
Overloaded Item_ref::print to print aggregate functions as such when printing
the references to aggregate functions taken out of context by split_sum_func2()
Fixed the parser to properly detect using AS clause in stored procedure arguments
as an error.
Fixed printing the arguments of udf call to print properly the udf attribute.
 2006-10-24 15:26:41 +03:00
holyfoot/hf@mysql.com/deer.(none)
48caaf1f5e Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/home/hf/work/w3475/my50-w3475
 2006-10-24 16:51:53 +05:00
holyfoot/hf@mysql.com/deer.(none)
dc0d680575 Merge bk@192.168.21.1:mysql-4.1-opt 
into  mysql.com:/home/hf/work/w3475/my41-w3475
 2006-10-24 16:50:27 +05:00
msvensson@neptunus.(none)
e4df2aac07 Avoid matching the trailing carriage return when parsing the mysqld.spec file 
This fixes problem where --replace_result failed in rpl000015 because the MYSQL_TCP_PORT variable was "3306\r"
 2006-10-23 20:36:44 +02:00
msvensson@neptunus.(none)
792adb7ce3 The vardir trick can only bge used on platforms with native symlinks - otherwise opt_vardir need to be set to default value. 2006-10-23 16:51:48 +02:00
andrey@example.com
6237be99d0 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  example.com:/work/bug23037/my50
 2006-10-23 15:21:23 +02:00
holyfoot/hf@mysql.com/deer.(none)
cd5684543c Merge mysql.com:/home/hf/work/w3475/my41-w3475 
into  mysql.com:/home/hf/work/w3475/my50-w3475
 2006-10-23 16:50:01 +05:00
msvensson@neptunus.(none)
6b5ec53962 Don't use the "4.1 vardir trick" on OS that does not have native symlink(i.e windows) 2006-10-23 13:32:20 +02:00
andrey@example.com
389c6a019e Fix for bug#23037 Bug in field "Default" of query "SHOW COLUMNS FROM table" 
To the documentor: The DEFAULT value in SHOW COLUMNS/SELECT FROM I_S.COLUMNS
was truncated to NAME_LEN (which effectively is 64) characters.
 2006-10-23 13:12:30 +02:00
msvensson@neptunus.(none)
cad9d6b106 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-23 12:19:52 +02:00
msvensson@neptunus.(none)
e5c2351b4a Merge bk-internal:/home/bk/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-10-23 12:17:15 +02:00
msvensson@neptunus.(none)
43aa130a38 If "var" is a symlink which does not point to anything, remove it before creating real var 2006-10-23 12:16:40 +02:00
msvensson@neptunus.(none)
962fe84784 As both ndb and im are components that may be disabled as well as the binaries may not exist. Look for 
their binaries in a separate function and produce test casea failures for the test thet needs these components
 2006-10-23 12:02:56 +02:00
holyfoot/hf@mysql.com/deer.(none)
4d23559806 WL#3475 (Threads for the embedded server in mysqltest) 
Necessary code added to mysqltest.c.
Disabled tests are available now.
 2006-10-23 15:02:51 +05:00
kostja@bodhi.local
81962878d8 A post-merge fix. 2006-10-23 13:55:29 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
dd2a1d1e96 Merge mysql.com:/usr/home/ram/work/mysql-4.1-maint 
into  mysql.com:/usr/home/ram/work/bug20732/my41-bug20732
 2006-10-23 12:58:20 +05:00
kostja@bodhi.local
0ef2ae34e7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
 2006-10-23 11:51:45 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
a67472f289 Merge mysql.com:/usr/home/ram/work/mysql-5.0-maint 
into  mysql.com:/usr/home/ram/work/bug20732/my50-bug20732
 2006-10-23 12:44:25 +05:00
igor@rurik.mysql.com
2ab34bac4b Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  rurik.mysql.com:/home/igor/mysql-5.0-opt
 2006-10-20 12:43:01 -07:00