mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
28979 commits 2784 branches 343 tags 1.6 GiB
Commit graph

28979 commits

This branch
This branch
All branches
Author SHA1 Message Date
joerg@mysql.com
fd77b58ee8 Merge mysql.com:/M50/bug12429 into mysql.com:/M50/clone-5.0 2005-12-12 18:44:01 +01:00
joerg@mysql.com
62d726582e rpl_until.test + rpl_until.result Fix (completion) for bug#12429 
Manual merge from 4.1,
extension of the old fix (1.1976 05/12/05 17:57:48 mleich@mysql.com) to two other places.
 2005-12-12 18:00:37 +01:00
joerg@mysql.com
8dfe471426 rpl_until.test + rpl_until.result 
Fix for bug#12429: Replication tests fail: "Slave_IO_Running" differs:
The value is not important, and it depends on timing. Mask it.

Backport and extension of a fix made by Matthias in 5.0, originally it was
1.1976 05/12/05 17:57:48 mleich@mysql.com
 2005-12-12 17:51:56 +01:00
jonas@perch.ndb.mysql.com
6f7ca617f5 ndb - bug#15685 
Error in abort handling in TC when timeout during abort
 2005-12-12 17:19:04 +01:00
kent@mysql.com
3e23de493a skip_name_resolve.result, skip_name_resolve.test: 
Ignore columns with unpredictable values.
rpl_relayrotate.result:
  Changed result file to match change in test
 2005-12-12 16:58:20 +01:00
kent@mysql.com
bbf65edaa9 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2005-12-12 16:17:58 +01:00
kent@mysql.com
a6849a9238 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2005-12-12 16:12:36 +01:00
kent@mysql.com
ab882e0b5f Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2005-12-12 15:49:41 +01:00
msvensson@neptunus.(none)
f356bf5615 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2005-12-12 15:48:34 +01:00
msvensson@neptunus.(none)
0705a2b1ca Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2005-12-12 15:22:25 +01:00
msvensson@neptunus.(none)
e0142f908e Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/bug9535/my51-bug9535
 2005-12-12 15:19:14 +01:00
knielsen@production.mysql.com
e76563a33d Merge knielsen@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  production.mysql.com:/usersnfs/knielsen/mysql-5.0
 2005-12-12 13:48:51 +01:00
ingo@mysql.com
3f9f19e34c Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-bug10932
 2005-12-12 13:24:08 +01:00
dlenev@mysql.com
5ff3e4ec57 Merge mysql.com:/home/dlenev/src/mysql-5.0-merges 
into  mysql.com:/home/dlenev/src/mysql-5.1-merges
 2005-12-12 14:59:14 +03:00
ramil@mysql.com
51184adde3 Fix for bug #15630: Test case failure in sp-dynamic, sp-error, and sp. 2005-12-12 15:57:35 +04:00
kent@mysql.com
51443fe422 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2005-12-12 12:30:18 +01:00
kent@mysql.com
2ec5b24d74 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-12-12 11:58:16 +01:00
anozdrin@mysql.com
de84d76299 Merge WL#2984 2005-12-12 13:29:48 +03:00
aivanov@mysql.com
c34595c975 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/dev/mysql-5.0-14614
 2005-12-12 13:16:06 +03:00
knielsen@production.mysql.com
569ebd0a60 Merge knielsen@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  production.mysql.com:/usersnfs/knielsen/mysql-5.0
 2005-12-12 10:59:36 +01:00
ramil@mysql.com
351204834b Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into  mysql.com:/usr/home/ram/work/mysql-5.0-release
 2005-12-12 11:55:49 +04:00
igor@rurik.mysql.com
ede2e0d254 item_sum.h, item.cc: 
Post review corrections in comments.
 2005-12-11 22:21:19 -08:00
aivanov@mysql.com
a61b810508 Fixed BUG #14614: Replication of tables with trigger generates 
error message if database is changed.
 2005-12-11 17:06:36 +03:00
kent@mysql.com
43252fa1bb Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
 2005-12-11 09:23:38 +01:00
kent@mysql.com
cf57f12407 make_win_src_distribution.sh: 
Removed Visual Studio 6 project files, as they are not maintained
 2005-12-11 09:21:13 +01:00
igor@rurik.mysql.com
ad53d72033 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2
 2005-12-10 23:31:03 -08:00
evgen@moonbone.local
2790489cd6 Fix bug #15268 Unchecked null value caused server crash 
cmp_item_sort_string::cmp() wasn't checking values_res variable for null.
Later called function was dereferenced it and crashed server.

Added null check to cmp_item_sort_string::cmp().
 2005-12-09 23:01:52 +03:00
ramil@mysql.com
cafbf5ac3b Fix for bug #15605: 5.0.17 test case 'mysqltest' failure. 2005-12-09 20:18:25 +04:00
ramil@mysql.com
8eba6be5b7 Fix for bug #15602: 5.0.17 test case 'create' failure. 2005-12-09 19:55:59 +04:00
kent@mysql.com
c7ef90400f Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
 2005-12-09 15:32:07 +01:00
kent@mysql.com
2c9ff654a6 trigger-grant.test, trigger-compat.test: 
Removed --text from grep, not portable
 2005-12-09 15:28:20 +01:00
knielsen@mysql.com
95f26f1aa9 Attempt to fix rpl_relayrotate.test for host openbsd, fix suggested by Guilhem 2005-12-09 14:38:35 +01:00
jonas@perch.ndb.mysql.com
17e8f6ca63 bug#15632 - ndb 
Fix race between INCL_NODEREQ(prio b) and GCP_PREPARE(prio a) by also waiting for starting nodes
 2005-12-09 13:51:12 +01:00
anozdrin@mysql.com
5d105fb7e7 Merge mysql.com:/home/alik/MySQL/devel/5.0-wl2984 
into  mysql.com:/home/alik/MySQL/devel/5.1-wl2984-merge
 2005-12-09 15:14:19 +03:00
hartmut@mysql.com
4947091bf5 Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/hartmut/projects/mysql/dev/5.1
 2005-12-09 10:52:39 +01:00
msvensson@devsrv-b.mysql.com
c8000f437d Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  devsrv-b.mysql.com:/space/magnus/my50-bug9535
 2005-12-09 10:22:30 +01:00
konstantin@mysql.com
bbf3a593c9 A fix and a test case for Bug#15441 "Running SP causes Server 
to Crash": the bug was that due to non-standard name
resolution precedence in stored procedures (See Bug#5967)
a stored procedure variable took precedence over a table column
when the arguments for VALUES() function were resolved.
The implementation of VALUES() function was not designed to work
with Item_splocal and crashed.
VALUES() function is non-standard. It can refer to, and
is meaningful for, table columns only. The patch disables SP 
variables as possible arguments of VALUES() function.
 2005-12-09 00:58:59 +03:00
jimw@mysql.com
f7ff3d653a Fix calls to free_underlaid_joins() in INSERT, DELETE, and UPDATE 
handling so that indexes are closed before trying to commit the
transaction. (Bug #15536)
 2005-12-08 12:33:33 -08:00
knielsen@mysql.com
bd9b379227 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/mysql/mysql-5.0
 2005-12-08 21:02:11 +01:00
knielsen@mysql.com
05a59fbc0e Merge mysqldev@production:my/mysql-5.0-release 
into  mysql.com:/usr/local/mysql/mysql-5.0-release
 2005-12-08 21:02:01 +01:00
knielsen@mysql.com
0f86705574 Merge mysql.com:/usr/local/mysql/mysql-5.0-XOPEN_SOURCE 
into  mysql.com:/usr/local/mysql/mysql-5.1-new
 2005-12-08 21:00:29 +01:00
kent@mysql.com
48af1d2674 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-12-08 17:58:17 +01:00
kent@mysql.com
8fd7e5f922 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
 2005-12-08 16:15:27 +01:00
kent@mysql.com
e8198e799e mysqld.cc: 
Bug#14960, reverted code to make symdir work on Windows
symlink.test:
  Disabled test case on Windows
 2005-12-08 16:13:53 +01:00
jonas@perch.ndb.mysql.com
c4e8859b7f bug#15587 - ndb 
Fix typo in autotest script
 2005-12-08 15:29:39 +01:00
jonas@perch.ndb.mysql.com
13bb3c55e0 bug#15587 - ndb 
Fix error in NF during NR
 2005-12-08 15:28:15 +01:00
knielsen@mysql.com
51cd5da314 Fix QNX and IRIX compilation 2005-12-08 15:13:25 +01:00
aivanov@mysql.com
081b2cc6c8 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/alexi/innodb-ss/mysql-5.1-new
 2005-12-08 15:06:26 +03:00
aivanov@mysql.com
141805f9c8 The innodb-5.0-ss52 snapshot changes were erroneously auto-merged 
to 5.1. Undoing the merge.
 2005-12-08 15:00:18 +03:00
hartmut@mysql.com
e5b7e447ed Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/hartmut/projects/mysql/dev/5.1
 2005-12-08 10:24:30 +01:00