mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 03:51:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
29643 commits 2793 branches 343 tags 1.7 GiB
Commit graph

8063 commits

Author SHA1 Message Date
aivanov@mysql.com
e6b08a5ea9 Merge mysql.com:/home/alexi/dev/mysql-4.1-12440 
into  mysql.com:/home/alexi/dev/mysql-5.0-12440
 2005-12-15 18:59:40 +03:00
aivanov@mysql.com
ea4c3481f2 Fixed BUG #12440: "Incorrect processing of time values containing 
long fraction and/or large exponent part".
 2005-12-15 18:48:08 +03:00
jonas@perch.ndb.mysql.com
2180197c9b Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-release 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2005-12-15 15:11:42 +01:00
andrey@lmy004.
533180d76c WL#1034 update 
- fix EVENT_ACL problem that GRANT ALL on some_db.* to someone@somewhere did not get to mysql.db
- fix crash when the following is executed :
  CREATE EVENT P() CREATE EVENT E ON SCHEDULER 1 SECOND DO ROLLBACK;
  (creation works as well as calling P() which creates the event).
 2005-12-15 14:12:28 +01:00
holyfoot@mysql.com
f934268da1 Merge bk@192.168.21.1:mysql-5.1-new 
into mysql.com:/home/hf/work/mysql-5.1.clean
 2005-12-15 16:55:12 +04:00
holyfoot@deer.(none)
dec0720a80 bug #15524 (partitioning range/list violation error message is insufficient) 2005-12-15 16:20:56 +04:00
holyfoot@deer.(none)
55e7f4503e bug #15521 (Cannot reorganise a partition with a new name equal to the old name) 2005-12-15 15:24:35 +04:00
knielsen@mysql.com
b2999daba2 Merge mysql.com:/usr/local/mysql/mysql-5.0-merge 
into  mysql.com:/usr/local/mysql/mysql-5.1-new
 2005-12-15 09:52:11 +01:00
ramil@mysql.com
04cff0d055 Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX 
and bug #15668: Test 'sp-error' crashes server on Mac OS X.
 2005-12-14 21:42:08 +04:00
kent@mysql.com
8e5b353598 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-12-14 16:50:28 +01:00
mskold@mysql.com
138ec21cc9 Fix to make ndb_multi.test (Bug #15401 NDB lock problems) more predictable 2005-12-14 16:29:56 +01:00
aivanov@mysql.com
c6f658d09e Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/alexi/innodb-ss/mysql-5.1-ss28
 2005-12-14 18:08:56 +03:00
jonas@perch.ndb.mysql.com
2059a6c174 bug#15682 - ndb 
incorrect handling of varchar in position/rnd_pos

  Commit for 5.0.17 release clone
 2005-12-14 15:09:12 +01:00
mskold@mysql.com
0663f81acd Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-12-14 14:49:59 +01:00
mskold@mysql.com
973dedbf08 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-12-14 14:48:42 +01:00
mskold@mysql.com
c08ee431bd Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-12-14 14:46:24 +01:00
mskold@mysql.com
b0500f54c8 Fix to make ndb_multi.test (Bug #15401 NDB lock problems) more predictable 2005-12-14 14:45:13 +01:00
kent@mysql.com
c11b35d9bf Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-12-14 13:18:24 +01:00
jonas@perch.ndb.mysql.com
6a02895276 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
 2005-12-14 11:34:08 +01:00
jani@hundin.mysql.fi
b846c5463b Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  hundin.mysql.fi:/home/jani/mysql-5.1-new
 2005-12-14 12:32:58 +02:00
jonas@perch.ndb.mysql.com
4454e7a631 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2005-12-14 11:06:40 +01:00
jonas@perch.ndb.mysql.com
1864165ff3 bug#15682 - ndb - invalid handling of varchar in position/rnd_pos 2005-12-14 10:57:09 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
37010dba85 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
 2005-12-14 01:38:10 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
4ac4020f6d Fixed test case. 2005-12-14 00:23:46 +02:00
evgen@moonbone.local
012933ce39 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/15268-bug-5.0-mysql
 2005-12-13 23:26:35 +03:00
aivanov@mysql.com
2e499986aa Fix BUG#12071: "Windows hang:'Opening tables' or 'Waiting for 
table' lockup".
 Changes from the innodb-5.0-ss92 snapshot.
 Do not call os_file_create_tmpfile() at runtime. Instead, create
 all tempfiles at startup and guard access to them with mutexes.
 2005-12-13 21:35:24 +03:00
msvensson@neptunus.(none)
b38a183d62 Remove confusing printouts from expected to fail "system" commands 2005-12-13 18:47:34 +01:00
msvensson@neptunus.(none)
36c86a4df6 Fix tests after merge 
Straighten out and comment behaviour for --require and --result in run_query
 2005-12-13 18:07:13 +01:00
msvensson@neptunus.(none)
2dbb3bc2ef Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
 2005-12-13 15:14:18 +01:00
aivanov@mysql.com
124b76c5a8 Changes from the innodb-5.1-ss28 snapshot. 
Removed include/Makefile.am and the reference to it.
 Deleted db/db0err.h and db directory.
 Check index column sizes in a better way (bug 13315).
 Fixed comments for memory allocation functions and added
 some extra checks. Adapted callers.
 2005-12-13 16:49:24 +03:00
jimw@mysql.com
e36df26e5b Fix sp.result after merge 2005-12-12 14:53:47 -08:00
jimw@mysql.com
00d29cd259 Merge mysql.com:/home/jimw/my/mysql-5.0-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2005-12-12 11:57:07 -08:00
aivanov@mysql.com
75af3821d7 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/alexi/innodb-ss/mysql-4.1-ss11
 2005-12-12 22:46:49 +03:00
jimw@mysql.com
90befc0a0e Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-12-12 11:39:33 -08:00
jimw@mysql.com
e18679c7ff Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-12-12 10:11:56 -08:00
joerg@mysql.com
2a3d35fa02 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/M41/mysql-4.1
 2005-12-12 19:11:21 +01:00
aivanov@mysql.com
7ae2d46903 Fix BUG#12071: "Windows hang: 'Opening tables' or 'Waiting for 
table' lockup".
 Changes from the innodb-4.1-ss11 snapshot.
 Do not call os_file-create_tmpfile() at runtime. Instead, create
 a tempfile at startup and guard access to it with a mutex.
 Also, fix bugs:
 10511: "Wrong padding of UCS2 CHAR columns in ON UPDATE CASCADE";
 13778: "If FOREIGN_KEY_CHECKS=0, one can create inconsistent FOREIGN
 KEYs". When FOREIGN_KEY_CHECKS=0 we still need to check that
 datatypes between foreign key references are compatible.
 Also, added test cases (also for bug 9802).
 2005-12-12 21:06:59 +03:00
joerg@mysql.com
a86cb213f2 Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/bug12429 2005-12-12 19:04:47 +01:00
joerg@mysql.com
99cf03b295 Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-release 
into mysql.com:/M50/clone-5.0
 2005-12-12 19:00:08 +01:00
joerg@mysql.com
36655f9a1e Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/bug12429 2005-12-12 18:54:35 +01:00
joerg@mysql.com
c256d035dd Merge mysql.com:/M50/bug12429 into mysql.com:/M51/merge-5.1 2005-12-12 18:50:00 +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
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
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
msvensson@neptunus.(none)
4bcb012bbc Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
 2005-12-12 12:43:33 +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
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
dlenev@mysql.com
79d83094ad Fix for bug #14863 "Triggers: crash if create and there is no current database". 
Now when we create or drop trigger we check that both trigger name and trigger
table always have database part specified. Thus we give an error if it they
are not specified explicitly or implicitly via current database.
 2005-12-11 15:26:15 +03:00