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

9801 commits

Author SHA1 Message Date
msvensson@neptunus.(none)
aa82944b4f Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug17137/my50-bug17137
 2006-03-08 15:35:30 +01:00
msvensson@neptunus.(none)
7f0eba7081 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug17137/my50-bug17137
 2006-03-08 13:31:05 +01:00
msvensson@neptunus.(none)
72f509e228 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/bug17137/my41-bug17137
 2006-03-08 11:20:12 +01:00
msvensson@neptunus.(none)
8c3be395f7 After merge 2006-03-08 10:40:29 +01:00
msvensson@neptunus.(none)
8a977e4b38 Merge neptunus.(none):/home/msvensson/mysql/bug17137/my41-bug17137 
into  neptunus.(none):/home/msvensson/mysql/bug17137/my50-bug17137
 2006-03-08 10:17:12 +01:00
msvensson@neptunus.(none)
8162610a39 Bug#17137 Running "truncate table" on temporary table leaves the table open on a slave 
- Decrease "slave_open_temp_tables" during reopen of truncated table.
 - Add test "rpl_trunc_temp"
 2006-03-08 10:15:48 +01:00
msvensson@shellback.(none)
51ef90a329 Merge bk-internal:/home/bk/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/bug17574/my50-bug17574
 2006-03-08 07:47:26 +01:00
kent@mysql.com
64ed7f1481 mysql-test-run.pl: 
Allow space in base directory path, bug#15736
 2006-03-08 03:51:59 +01:00
anozdrin@mysql.com
615357b96c After-merge fix: fix the test case for BUG#16266 to query 
only its own tables to prevent getting tables from others.
 2006-03-08 00:13:27 +03:00
msvensson@shellback.(none)
78edd3788f Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/bug17574/my50-bug17574
 2006-03-07 20:41:04 +01:00
msvensson@shellback.(none)
87209d560c Bug#17574 Detect cluster start failure and "fail" ndb_* tests 2006-03-07 19:44:58 +01:00
anozdrin@mysql.com
d9d4dc5ef8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-rt
 2006-03-07 14:28:09 +03:00
msvensson@neptunus.(none)
456b2d6b14 Improve error message for faulty usage of "inc" and "dec" 2006-03-07 07:50:04 +01:00
msvensson@neptunus.(none)
f063ce8e31 Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-07 07:42:51 +01:00
serg@serg.mylan
6d6d11787f after merge 2006-03-06 23:43:47 +01:00
msvensson@neptunus.(none)
67f6576de8 Revert 2006-03-06 22:14:06 +01:00
msvensson@neptunus.(none)
a336f48552 Win fixes 
- Use tmp sh file both in system and popen
 2006-03-06 22:05:39 +01:00
msvensson@neptunus.(none)
dfe158fc15 Use grep instead of egrep 
Use system inestad of exec
 2006-03-06 21:45:13 +01:00
serg@serg.mylan
d190e08e4e merged 2006-03-06 20:53:14 +01:00
serg@serg.mylan
e7504b3468 merged 2006-03-06 18:34:38 +01:00
serg@serg.mylan
0b2f4ac3be kill (subquery) - three years old bugfix that never worked 2006-03-06 18:26:39 +01:00
holyfoot@mysql.com
8707e3356d Merge mysql.com:/home/hf/work/mysql-5.0.15745 
into mysql.com:/home/hf/work/mysql-5.0.mrg
 2006-03-06 19:57:20 +04:00
msvensson@neptunus.(none)
30071e9783 Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-06 14:01:15 +01:00
msvensson@neptunus.(none)
108fc10143 Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-06 13:45:53 +01:00
bar@mysql.com
6823225a81 Merge mysql.com:/usr/home/bar/mysql-4.1.b15949 
into  mysql.com:/usr/home/bar/mysql-5.0
 2006-03-06 16:20:15 +04:00
gluh@mysql.com
7f4b27cf29 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/gluh/MySQL/Merge/5.0
 2006-03-06 15:58:16 +04:00
msvensson@devsrv-b.mysql.com
ee97bebc8c Merge bk-internal:/home/bk/mysql-5.0 
into  devsrv-b.mysql.com:/space/magnus/bug17377/my50-bug17377
 2006-03-06 12:28:30 +01:00
gluh@mysql.com
321eb3dce6 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/gluh/MySQL/Merge/5.0
 2006-03-06 15:15:23 +04:00
gluh@eagle.intranet.mysql.r18.ru
f3ce98d2c9 post-merge fix 2006-03-06 15:14:15 +04:00
msvensson@devsrv-b.mysql.com
2660607096 Merge devsrv-b.mysql.com:/space/magnus/mysql-5.0 
into  devsrv-b.mysql.com:/space/magnus/bug17377/my50-bug17377
 2006-03-06 12:04:54 +01:00
msvensson@neptunus.(none)
3f935b2777 Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-06 12:00:51 +01:00
bar@mysql.com
e019d60536 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b15949
 2006-03-06 14:50:34 +04:00
gluh@mysql.com
69e8b9d06e 4.1 -> 5.0 merge 2006-03-06 14:38:31 +04:00
gluh@eagle.intranet.mysql.r18.ru
f1eaf7e8ec Fix for bug#14385 GRANT and mapping to correct user account problems 
Check if the host of table hash record exactly matches host from GRANT command
 2006-03-06 14:03:40 +04:00
timour@mysql.com
593bd1d3b8 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-bug-15229
 2006-03-06 11:41:19 +02:00
gluh@eagle.intranet.mysql.r18.ru
33e7d20f37 Fix for bug#16678 FORMAT gives wrong result if client run with default-character-set=utf8 
calculate Item_func_format::max_length using charset->mbmaxlen
 2006-03-06 12:52:38 +04:00
holyfoot@deer.(none)
a920d0df86 bug #15745 (COUNT(DISTINCT CONCAT(x,y)) returns wrong result 2006-03-05 20:48:31 +04:00
dlenev@mysql.com
0fb4a6645e Merge mysql.com:/home/dlenev/src/mysql-5.0-bg17866-2 
into  mysql.com:/home/dlenev/src/mysql-5.0-merges
 2006-03-04 23:58:48 +03:00
konstantin@mysql.com
40b368af16 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/opt/local/work/mysql-4.1-root
 2006-03-04 22:33:19 +03:00
dlenev@mysql.com
efe0900669 Fix for bug #17866 "Problem with renaming table with triggers with fully 
qualified subject table" which was introduced during work on bug #13525
"Rename table does not keep info of triggers".

The bug was caused by the fact that during reconstruction of CREATE TRIGGER
statement stored in .TRG file which happened during RENAME TABLE we damaged
trigger definition in case when it contained fully qualified name of subject
table (see comment for sql_yacc.yy for more info).
 2006-03-04 16:55:06 +03:00
cmiller@zippy.(none)
e5e1760292 Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0.19-tbr
 2006-03-03 16:27:43 -05:00
cmiller@zippy.(none)
599c710a5b Bug#16859 involves truncating column data at NUL characters. Instead, the 
client will now substitute spaces for NULs, so that the grid isn't messed up
due to silently consumed NULs and that the full field is shown.
 2006-03-03 16:26:38 -05:00
paul@snake-hub.snake.net
33dfa2a91e 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-03 14:59:29 -06:00
pem@mysql.com
2b6f510350 Merge mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0-runtime 
into  mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0
 2006-03-03 19:18:17 +01:00
paul@snake-hub.snake.net
6fa488114d mysql-stress-test.pl, README.stress: 
Revise stress-test README
 2006-03-03 12:15:01 -06:00
pem@mysql.com
b66567f619 Merge mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0-runtime 
into  mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0-release
 2006-03-03 18:51:13 +01:00
msvensson@neptunus.(none)
3c2221b54d Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-03 15:44:38 +01:00
msvensson@neptunus.(none)
21cc7c9555 Windows fixes 
- Use pipes "|"
 - Improved system command, create a temporary .sh faile that is executed  with cygwins sh(bash)
   This makes the Windows version behave exactly as the Lunix version(well almost...) 
 - Give unix path to DBUG, trace files is no produced if running ./mysql-test-run.pl --debug"
 2006-03-03 14:55:05 +01:00
evgen@moonbone.local
62a266f114 Fixed bug#17726: Not checked empty list caused endless loop 
When the Item_cond::fix_fields() function reduces cond tree, it in loop
scans it's own list and when it founds Item_cond with same function (AND
or OR) it does next things: 1) replaces that item with item's list. 2)
empties item's list. Due to this operation is done twice - for update and
for view, at the update phase cond's list of lower view is already empty.
Empty list returns ref to itself, thus making endless loop by replacing
list with itself, emptying, replacing again and so on. This results in
server hung up.

To the Item_cond::fix_fields() function added check that ensures that
list being replaced with isn't empty.
 2006-03-03 16:19:57 +03:00
joerg@debian.(none)
e5b149d1e7 Merge joerg@trift2:/M50/patch-17595 into debian.(none):/M50/clone-5.0 2006-03-03 12:50:15 +01:00