mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 14:54:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
29510 commits 2785 branches 343 tags 1.6 GiB
Commit graph

7748 commits

Author SHA1 Message Date
andrey@lmy004.
fd0613f59e Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl1034 
into lmy004.:/work/mysql-5.1-tt-copy-works
 2005-12-14 12:15:48 +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
2ed8d82c61 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 09:42:05 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
f845256f89 Disabled test. Fails in ps-protocol mode. 2005-12-14 02:56:34 +02: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
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
11073be8d0 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss92
 2005-12-13 22:29:36 +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
jonas@perch.ndb.mysql.com
530e22edbf Bug#15675 - ndb - fix read_multi_range.test drop all tables it using 
NOTE: only changes to test script
 2005-12-13 17:33:19 +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
knielsen@mysql.com
c1551bf94d BUG#15624: Use --real_sleep in rpl_deadlock.test to avoid breaking when run with --sleep. 2005-12-13 11:42:10 +01: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
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
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
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
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
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
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
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
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
jimw@mysql.com
d07a57c03a Fix crash in BDB from improper cleanup of transactions, and avoid problem 
in NDB that the fix would cause due to improper registration of a transaction
that isn't meant to be seen by the handler layer. (Bug #14212)

Thanks to Sergei Golubchik for helping with this.
 2005-12-09 15:00:33 -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
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
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
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