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
30673 commits 2781 branches 343 tags 1.6 GiB
Commit graph

8407 commits

Author SHA1 Message Date
andrey@lmy004.
e9af8c1d83 post-merge fixes of bug 16548 2006-02-14 20:10:51 +01:00
andrey@lmy004.
d5d11a9c23 manual merge 2006-02-14 17:05:36 +01:00
andrey@lmy004.
815927e590 - final fixes for bug#16431 (Events: An event which alters itself disappears) 
- fix for bug#16423 (Events: SHOW CREATE EVENT doesn't work)
- this Changeset commits makes CREATE/UPDATE/DELETE EVENT real DDL statements
  by committing the currently open transaction before they are executed.
- this Changeset also fixes a trailing space problem since the very early days
  of the internal cron
- adds sophisticated checking of whether mysql.event was tampered accidentally
  or with purpose by an user.
- adds a lot of inline function documentation - documents everything left
  uncodumented
- INTERVAL_XXXX to XXX in I_S.EVENTS.INTERVAL_FIELD

WL#1034 (Internal CRON)
 2006-02-14 16:20:48 +01:00
serg@serg.mylan
9db19fdf9e Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1-nl
 2006-02-14 13:26:47 +01:00
serg@serg.mylan
b283fb79d0 MATCH(a,b) AGAINST (... IN NATURAL LANGUAGE MODE) 
remove explicit $<ulong_num>$ from sql_yacc.yy
 2006-02-14 13:19:54 +01:00
bar@mysql.com
d967e6200c Merge mysql.com:/usr/home/bar/mysql-5.0.cs_fs 
into  mysql.com:/usr/home/bar/mysql-5.1-new.fscs
 2006-02-14 09:41:34 +04:00
bar@mysql.com
cc3623aecf Many files: 
Backporting character_set_filesystem from 5.0 to 5.1.
 2006-02-14 08:24:01 +04:00
lars@mysql.com
e9a8a765ef Removed version information from test 2006-02-14 02:18:41 +01:00
aivanov@mysql.com
e1a316bcc0 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss115x
 2006-02-14 01:27:49 +03:00
aivanov@mysql.com
434c60bdf0 Deleted innodb_unsafe_binlog.test erroneously merged from 
the innodb-5.0-ss115 snapshot.
 2006-02-14 01:25:13 +03:00
tomas@poseidon.ndb.mysql.com
b04be2212f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-02-13 20:52:42 +01:00
tomas@poseidon.ndb.mysql.com
87a6266fa4 Bug #17179 schema creation fails 
-flag was set on field intable share instead of table
 2006-02-13 20:34:36 +01:00
lars@mysql.com
5b66df060f BUG#17339: Missed line in previous patch 2006-02-13 19:52:57 +01:00
lars@mysql.com
11dde18f88 BUG#17339: Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave 
For this particular bug report it was rpl_loadfile.test that did not make proper cleanup, but the patch
includes fixes for other tests aswell.
 2006-02-13 19:03:12 +01:00
lars@mysql.com
004f399057 Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
 2006-02-13 15:02:51 +01:00
brian@zim.tangent.org
618495e394 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.tangent.org:/home/brian/mysql/cleanup-5.1
 2006-02-13 04:06:50 -08:00
brian@zim.tangent.org
bdd7943dc5 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.tangent.org:/home/brian/mysql/cleanup-5.1
 2006-02-13 02:10:41 -08:00
lars@mysql.com
2d3fcf26b6 Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
 2006-02-13 10:59:12 +01:00
brian@zim.tangent.org
7f3d7af7ae Adding thread support for mysqlimport. You can now specify a number of threads to use and it will thread the loading of the database. Anyone who has had to go through the pain of loading the database will immediatly get the reason for this. 2006-02-13 00:45:59 -08:00
bar@mysql.com
53a0372d87 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.fscs
 2006-02-13 11:53:56 +04:00
bar@mysql.com
611cbc2f4d renamedb.test, renamedb.result: 
new file
Many files:
  WL#757 RENAME DATABASE
 2006-02-13 11:49:28 +04:00
brian@zim.tangent.org
0c487a79c9 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.tangent.org:/home/brian/mysql/dep-5.1
 2006-02-12 13:27:56 -08:00
brian@zim.tangent.org
0a5a30bef3 This patch removes the remaining TYPE= code from MySQL. It cleans up a number of tests where it was being called still (and failing). Also I cleaned up all of the extra scripts so that they now work. 2006-02-12 13:26:30 -08:00
kent@mysql.com
eb9683442d Merge 2006-02-12 20:45:03 +01:00
ingo@mysql.com
8efa06bd68 Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-wl1563-msg
 2006-02-10 22:28:59 +01:00
ingo@mysql.com
66883d76dd WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX 
After merge fix.
 2006-02-10 22:26:04 +01:00
ingo@mysql.com
b9bc1e9108 Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-wl1563-msg
 2006-02-10 20:00:22 +01:00
petr@mysql.com
2e01c8b0d0 Merge mysql.com:/home/cps/mysql/devel/5.0-mike 
into  mysql.com:/home/cps/mysql/devel/5.1-merge
 2006-02-10 21:03:49 +03:00
tomas@poseidon.ndb.mysql.com
9663f6cbee Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-02-10 18:16:34 +01:00
tomas@poseidon.ndb.mysql.com
f0d95d0af3 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-02-10 18:04:46 +01:00
tomas@poseidon.ndb.mysql.com
27a14f93eb Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-02-10 17:50:17 +01:00
tomas@poseidon.ndb.mysql.com
7050a7586e Bug #17249 ndb, delete statement with join where clause fails when table do not have pk 
Bug #17257 ndb, update fails for inner joins if tables do not have Primary Key

change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead
 2006-02-10 17:40:22 +01:00
knielsen@mysql.com
344c334141 Merge mysql.com:/usr/local/mysql/mysql-5.1-sp-destruct 
into  mysql.com:/usr/local/mysql/mysql-5.1-new
 2006-02-10 10:44:09 +01:00
knielsen@mysql.com
1bc91adcef Fix missing test cleanup 2006-02-10 10:18:57 +01:00
petr@mysql.com
f037d4772e Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/cps/mysql/devel/5.0-mike
 2006-02-10 10:56:27 +03:00
petr@mysql.com
c5794763e4 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/cps/mysql/devel/5.1-utf-bug
 2006-02-10 10:24:30 +03:00
petr@mysql.com
f3d73e8cbe Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/cps/mysql/devel/5.1-im-fixes
 2006-02-10 03:38:29 +03:00
petr@mysql.com
392f93c0aa Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/cps/mysql/devel/5.1-utf-bug
 2006-02-10 03:37:13 +03:00
petr@mysql.com
8488498545 IM changes by GUI team: add a version_no column to the 
SHOW INSTANCE STATUS output
 2006-02-10 03:35:07 +03:00
petr@mysql.com
1c7bc08537 a bunch of IM fixes from the GUI team 2006-02-10 02:15:55 +03:00
tomas@poseidon.ndb.mysql.com
76f6331aed changed to use temporary heap table on a ndb test 
corrected multiple --log-bin options in mysql-test-run
 2006-02-10 00:15:07 +01:00
tomas@poseidon.ndb.mysql.com
fe0ff3e21c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-02-09 23:48:52 +01:00
andrey@lmy004.
541e67342f from fix for bug#16414 (Events: Crash or hang if event drops itself) 
WL #1034
 2006-02-09 23:15:47 +01:00
tomas@poseidon.ndb.mysql.com
246d0ea290 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-02-09 23:15:46 +01:00
andrey@lmy004.
24c010892c Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-events_i_s
 2006-02-09 23:15:46 +01:00
aivanov@mysql.com
f8f8af970e Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/alexi/innodb/mysql-5.1-merged
 2006-02-10 01:15:45 +03:00
tomas@poseidon.ndb.mysql.com
930641a5c1 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-02-09 21:28:22 +01:00
andrey@lmy004.
67985360f0 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-events_i_s
 2006-02-09 20:20:22 +01:00
tomas@poseidon.ndb.mysql.com
3c0ed6d410 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-02-09 19:55:50 +01:00
aivanov@mysql.com
e22d2f1150 Fixed BUG#9680: Wrong error from cascading update 
Applied 9680.patch (by Osku Salerma)
 2006-02-09 20:43:10 +03:00