mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 06:44:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
29201 commits 2781 branches 343 tags 1.6 GiB
Commit graph

29201 commits

This branch
This branch
All branches
Author SHA1 Message Date
paul@snake-hub.snake.net
be887ea830 README.gcov: 
Revise README.gcov.
 2006-03-01 17:55:10 -06:00
paul@snake-hub.snake.net
a3797344a2 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
 2006-03-01 17:48:17 -06:00
paul@snake-hub.snake.net
3b67fdf5f5 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478
 2006-03-01 17:41:34 -06:00
paul@snake-hub.snake.net
98f1d2d33e Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
 2006-03-01 17:37:49 -06:00
paul@snake-hub.snake.net
7b4f0dc8b0 README: 
Revise mysql-test README.
 2006-03-01 17:37:07 -06:00
joerg@mysql.com
4b29ce6053 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/M40/comment-4.0
 2006-03-01 20:13:23 +01:00
joerg@mysql.com
1b698f03e4 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/M41/comment-4.1
 2006-03-01 17:43:16 +01:00
tkatchaounov@lsmy3.wdf.sap.corp
95fe35437a Merge lsmy3.wdf.sap.corp:/data/users/tkatchaounov/mysql/src/5.0-virgin 
into  lsmy3.wdf.sap.corp:/data/users/tkatchaounov/mysql/src/5.0-bug-17523
 2006-03-01 17:27:39 +01:00
msvensson@shellback.(none)
c26674d7a0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-01 15:43:57 +01:00
tkatchaounov@lsmy3.wdf.sap.corp
6a44bb6403 Merge lsmy3.wdf.sap.corp:/data/users/tkatchaounov/mysql/src/5.0-virgin 
into  lsmy3.wdf.sap.corp:/data/users/tkatchaounov/mysql/src/5.0-dbg
 2006-03-01 15:43:57 +01:00
joerg@mysql.com
6493af1884 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2006-03-01 15:43:56 +01:00
paul@snake-hub.snake.net
312177d3e3 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
 2006-03-01 08:43:56 -06:00
timour@mysql.com
0408f2bfc7 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-bug-17523
 2006-03-01 16:43:56 +02:00
aivanov@mysql.com
d20ccef6e5 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/bugs/mysql-5.0-merged
 2006-03-01 17:43:55 +03:00
msvensson@shellback.(none)
b802826fc9 Dont' run the mysql_protocols on Windows 2006-03-01 15:22:47 +01:00
msvensson@shellback.(none)
3a325cb81e Bug#2845 client fails to reconnect if using TCP/IP 
- Change to use non blocking read to empty channel in case of too large sd number
 - Don't check for too large socket number on Windows.
 2006-03-01 15:21:03 +01:00
bar@mysql.com
a6973ceed0 Bug#15949 union + illegal mix of collations (IMPLICIT + COERCIBLE) 
union.result, union.test:
  Adding test case.
item.cc:
  Allow safe character set conversion in UNION
  - string constant to column's charset
  - to unicode
  Thus, UNION now works the same with CONCAT (and other string functions)
  in respect of aggregating arguments with different character sets.
 2006-03-01 17:58:01 +04:00
aivanov@mysql.com
a3ea894758 Fixed BUG #16175: Memory leak in rpl_trigger.test 
Allocating/freeing memory for the db member of THD
  is wholy managed by slave thread.
 2006-03-01 16:21:01 +03:00
joerg@mysql.com
24cb1ceb81 Merge mysql.com:/M50/comment-5.0 into mysql.com:/M50/mysql-5.0 2006-03-01 13:35:32 +01:00
joerg@mysql.com
30e00b0f7f Manual merge of the added "--comment=<string>" option 
to both the Shell and the Perl vaerion of "mysql-test-run"-
 2006-03-01 13:29:37 +01:00
joerg@mysql.com
38a7f5551a mysql-test/mysql-test-run.pl : Add a "--comment=<string>" option (backport from 5.1). 2006-03-01 13:15:37 +01:00
joerg@mysql.com
21a57a8f85 Merge mysql.com:/M40/comment-4.0 into mysql.com:/M41/comment-4.1 2006-03-01 13:10:59 +01:00
holyfoot@deer.(none)
dc052a3a00 bug #9088 (bigint WHERE fails) 2006-03-01 15:50:15 +04:00
joerg@mysql.com
0afe7f1987 mysql-test/mysql-test-run.sh : Add a "--comment=<string>" option, to get it logged when the test is run. 2006-03-01 12:21:44 +01:00
anozdrin@mysql.com
e03e522201 Fix for BUG#16266: Definer is not fully qualified error during replication. 
The idea of the fix is to extend support of non-SUID triggers for backward
compatibility. Formerly non-SUID triggers were appeared when "new" server
is being started against "old" database. Now, they are also created when
"new" slave receives updates from "old" master.
 2006-03-01 14:13:07 +03:00
gluh@mysql.com
70b344f910 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/gluh/MySQL/Bugs/5.0.17602
 2006-03-01 09:18:03 +04:00
paul@snake-hub.snake.net
21f0adc7c6 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
 2006-02-28 18:48:58 -06:00
paul@snake-hub.snake.net
5ac33e8eb8 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
 2006-02-28 17:54:50 -06:00
paul@snake-hub.snake.net
7f7f5969c0 mysqltest.test: 
Add real_sleep tests.
 2006-02-28 17:54:11 -06:00
paul@snake-hub.snake.net
67e4580e29 mysqltest.c: 
expand tab
 2006-02-28 15:11:44 -06:00
paul@snake-hub.snake.net
d8a6e41c6b Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
 2006-02-28 15:09:45 -06:00
paul@snake-hub.snake.net
d6654fe9cb mysql-test-run.sh: 
Fix URLs.
README:
  Fix URL.
mysqltest.result:
  Update test result for real_sleep error message.
mysqltest.c:
  Fix do_sleep() to print correct command name for real_sleep.
 2006-02-28 15:08:16 -06:00
paul@snake-hub.snake.net
7ff2ede8c9 mysqltest.c: 
Fix reference to incorrect (non-existent) options in comment.
 2006-02-28 14:04:21 -06:00
paul@snake-hub.snake.net
486bd42b06 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
 2006-02-28 14:01:16 -06:00
paul@snake-hub.snake.net
fc8ed82da4 mysqltest.c: 
Correct/clarify comments.
 2006-02-28 14:00:17 -06:00
paul@snake-hub.snake.net
a052ef7d82 mysqltest.c: 
Fix typos.
 2006-02-28 12:19:30 -06:00
paul@snake-hub.snake.net
a2c639d813 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
 2006-02-28 12:10:38 -06:00
paul@snake-hub.snake.net
6d4dc91bbf mysqltest.c: 
Fix typos.
 2006-02-28 12:01:24 -06:00
evgen@sunlight.local
f641a91943 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into sunlight.local:/work_local/14169-bug-5.0-mysql
 2006-02-28 19:42:11 +03:00
evgen@moonbone.local
0ce39664b6 Fixed bug#14169: type of group_concat() result changed to blob if tmp_table was 
used

In a simple queries a result of the GROUP_CONCAT() function was always of 
varchar type.
But if length of GROUP_CONCAT() result is greater than 512 chars and temporary
table is used during select then the result is converted to blob, due to
policy to not to store fields longer than 512 chars in tmp table as varchar
fields.

In order to provide consistent behaviour, result of GROUP_CONCAT() now
will always be converted to blob if it is longer than 512 chars.
Item_func_group_concat::field_type() is modified accordingly.
 2006-02-28 19:30:30 +03:00
msvensson@shellback.(none)
916f763b9e Merge neptunus:/home/msvensson/mysql/bug16795/my50-bug16795 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-28 13:03:00 +01:00
msvensson@devsrv-b.mysql.com
f2444c50fc Bug#17377 Federated Engine returns wrong Data, always the rows with the highest ID 
- Always make rnd_pos reposition the cursor in the fetched result set.
 2006-02-28 11:17:40 +01:00
msvensson@shellback.(none)
318bee862a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-28 11:00:35 +01:00
msvensson@neptunus.(none)
7551c8d7f8 Merge msvensson@devsrv-b.mysql.com:/space/magnus/bug17279/my50-bug17279/ 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-28 10:52:36 +01:00
gluh@eagle.intranet.mysql.r18.ru
4858032176 Fix for bug#17602 Server crash on AVG/SUM over DECIMAL column(2nd ver) 
The table may be corrupted and decimal columns may have invalid values in this case.
To prevent crash we need to check that decimal column has allowable value.
In case of invalid value generate warning and set the value to 0.
 2006-02-28 13:36:41 +04:00
SergeyV@selena.
2c8a6fadf9 Postfix for #17595. few lines in a test were accidentally commented. 
Comments removed.
 2006-02-27 22:14:48 +03:00
lars@mysql.com
05d1921181 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 
into  mysql.com:/users/lthalmann/bk/mysql-5.0-bug13418
 2006-02-27 19:26:31 +01:00
lars@mysql.com
2ebe57777f BUG#13418: Virtualized some functions so that Bit_field class will use correct cmp functions 2006-02-27 18:34:04 +01:00
dlenev@mysql.com
db1ecaa1a2 Fix for trigger.test failures on pushbuild hosts introduced by fix for 
bug #13525 "Rename table does not keep info of triggers".

Now we use MYSQLTEST_VARDIR in order to be able to run this test in different
vardir. Also improved cleanup after the test.
 2006-02-27 20:32:32 +03:00
dlenev@mysql.com
3d6839d133 Fixed test results after bad auto-merge. 2006-02-27 20:00:06 +03:00