msvensson@neptunus.(none)
9a7b8e10e9
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2005-09-06 10:30:29 +02:00
msvensson@neptunus.(none)
fb9be4e990
Merge bk-internal:/home/bk/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2005-09-06 10:19:20 +02:00
msvensson@neptunus.(none)
4c2ddda8b9
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-06 09:44:25 +02:00
msvensson@neptunus.(none)
6861860abe
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-06 09:42:02 +02:00
msvensson@neptunus.(none)
4cfd08d1ab
BUG#12959 mysqltest crashes if testcase passed with -x option
...
- Update test cases
2005-09-06 09:40:42 +02:00
ndbdev@dl145c.mysql.com
86344c4a83
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-09-06 09:21:23 +02:00
ndbdev@dl145c.mysql.com
f40c1576b0
Merge
2005-09-06 09:20:15 +02:00
ndbdev@dl145b.mysql.com
c00a51504a
Merge
2005-09-06 09:01:17 +02:00
msvensson@neptunus.(none)
ef6d75d032
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-05 22:49:36 +02:00
msvensson@neptunus.(none)
466ea56376
BUG#12984 mysqltest.test: different output from "exec NonExistsinfComamdn"
2005-09-05 22:40:13 +02:00
msvensson@neptunus.(none)
949b2329cb
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-05 22:31:58 +02:00
msvensson@neptunus.(none)
a329002a11
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-09-05 17:12:25 +02:00
msvensson@neptunus.(none)
acd68dbf41
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug12959/my50-bug12959
2005-09-05 17:03:25 +02:00
msvensson@neptunus.(none)
7f848c1784
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/bug12959/my41-bug12959
2005-09-05 17:01:15 +02:00
tulin@dl145b.mysql.com
32a3dd850b
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into dl145b.mysql.com:/home/ndbdev/mysql-4.1
2005-09-05 16:54:44 +02:00
msvensson@neptunus.(none)
ff1c50d990
Merge neptunus.(none):/home/msvensson/mysql/bug12959/my50-bug12959
...
into neptunus.(none):/home/msvensson/mysql/bug12959/my51-bug12959
2005-09-05 16:52:26 +02:00
msvensson@neptunus.(none)
e21d8c50bf
Merge neptunus.(none):/home/msvensson/mysql/bug12959/my41-bug12959
...
into neptunus.(none):/home/msvensson/mysql/bug12959/my50-bug12959
2005-09-05 16:51:31 +02:00
msvensson@neptunus.(none)
72228ea825
Bug#12959 mysqltest crashes if testcase passed with -x option
2005-09-05 16:50:32 +02:00
tulin@dl145b.mysql.com
d5d360b180
added --core-file option to ndb executables
...
added parseable printout in ndb_restore
2005-09-05 16:33:40 +02:00
evgen@moonbone.local
7493f615d8
func_gconcat.test, func_gconcat.result:
...
Test case for bug #12859 group_concat in subquery cause incorrect not null.
2005-09-05 17:58:29 +04:00
ramil@mysql.com
0352793605
Merge mysql.com:/usr/home/ram/work/4.1.b4214
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-09-05 18:28:56 +05:00
tulin@dl145b.mysql.com
7573d04323
Bug #12992 Cluster StopOnError = Y restarts ndbd indefinitly
2005-09-05 15:14:44 +02:00
ramil@mysql.com
0f34207606
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b4214
2005-09-05 16:41:01 +05:00
ramil@mysql.com
1fb4441782
a fix (bug #4214 : Table corruption with myisampack and large BLOB objects).
2005-09-05 16:31:42 +05:00
msvensson@neptunus.(none)
6f8e870ca6
Remove extra ;
2005-09-05 12:33:25 +02:00
msvensson@neptunus.(none)
7c7357451e
BUG#12983
...
TRASH macro confliciting with TRASH in my_sys.h
2005-09-05 12:09:35 +02:00
joerg@mysql.com
f12663ec79
Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1
2005-09-05 09:58:34 +02:00
joerg@mysql.com
47e5e73a6f
Merge mysql.com:/M41/upward-4.1 into mysql.com:/M50/merge-5.0
2005-09-05 09:50:54 +02:00
lenz@mysql.com
ec61094daf
- removed the commercial BK license key from BitKeeper/etc/config to be able to push the
...
repository to bkbits.net (License keys should not be put into the repository!)
2005-09-05 09:41:18 +02:00
tulin@dl145b.mysql.com
c83eedc829
added timestamp to shutdown messages in ndbd
2005-09-05 09:29:28 +02:00
tulin@dl145b.mysql.com
3c6ec2a98e
fixed small bug in ndb redolog printer
...
+ added option to dumpe rest of page after exnd of data
2005-09-05 09:13:28 +02:00
jan@hundin.mysql.fi
fc4fea68ad
Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/jan/new/mysql-5.0
2005-09-05 08:35:58 +03:00
heikki@hundin.mysql.fi
4c68ccd949
row0mysql.c, ha_innodb.cc:
...
Fix bug #12308 : do not roll back the whhole transaction in a lock wait timeout error, just roll back the latest SQL statement; note that the locks set in the latest SQL statements remain, as InnoDB does not know what locks were set in which SQL statement
2005-09-05 01:13:44 +03:00
brian@zim.(none)
ffcc4ae4b1
This patch disables the query cache for the federated engine.
2005-09-04 11:25:13 -07:00
heikki@hundin.mysql.fi
bd00b6983d
ha_innodb.cc:
...
Better comments about auto-inc and SHOW TABLE STATUS
2005-09-04 13:00:03 +03:00
heikki@hundin.mysql.fi
7249c12a20
ha_innodb.cc:
...
Fix bug #12973 : set the table handle field auto_increment_value if ::info() is called with the flag HA_STATUS_AUTO
2005-09-04 12:04:21 +03:00
jimw@mysql.com
70badb7904
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-09-03 11:43:41 -07:00
jimw@mysql.com
3be42aabc5
Merge mysql.com:/home/jimw/my/mysql-5.0-11787
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-09-03 09:34:34 -07:00
heikki@hundin.mysql.fi
9300833c91
univ.i, page0page.ic:
...
Add a sanity check to page_rec_is_comp; a new univ.i macro UNIV_RELEASE_NOT_YET_STABLE controls such sanity checks that we will remove after the release is stable enough
2005-09-03 19:15:37 +03:00
heikki@hundin.mysql.fi
0428fec7c7
row0sel.c:
...
Fix a wrong debug assert in the previous patch
2005-09-03 12:48:41 +03:00
heikki@hundin.mysql.fi
92f034332a
row0sel.c:
...
Add more comments to row_search_for_mysql() and remove the ugly double use of the variable rec in that function
2005-09-03 12:32:38 +03:00
heikki@hundin.mysql.fi
cfdb60b6b2
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-09-03 12:30:14 +03:00
jonas@eel.(none)
613258e0b4
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into eel.(none):/home/jonas/src/mysql-4.1-push
2005-09-03 07:58:43 +02:00
brian@zim.(none)
5166290d1c
Fix for a test case.
2005-09-02 18:12:02 -07:00
konstantin@mysql.com
aac74557db
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/kostja/mysql/mysql-5.0-dsql3
2005-09-03 03:25:59 +04:00
konstantin@mysql.com
38486e83c1
Implement WL#2661 "Prepared Statements: Dynamic SQL in Stored Procedures".
...
The idea of the patch is to separate statement processing logic,
such as parsing, validation of the parsed tree, execution and cleanup,
from global query processing logic, such as logging, resetting
priorities of a thread, resetting stored procedure cache, resetting
thread count of errors and warnings.
This makes PREPARE and EXECUTE behave similarly to the rest of SQL
statements and allows their use in stored procedures.
This patch contains a change in behaviour:
until recently for each SQL prepared statement command, 2 queries
were written to the general log, e.g.
[Query] prepare stmt from @stmt_text;
[Prepare] select * from t1 <-- contents of @stmt_text
The chagne was necessary to prevent [Prepare] commands from being written
to the general log when executing a stored procedure with Dynamic SQL.
We should consider whether the old behavior is preferrable and probably
restore it.
This patch refixes Bug#7115, Bug#10975 (partially), Bug#10605 (various bugs
in Dynamic SQL reported before it was disabled).
2005-09-03 03:13:18 +04:00
brian@zim.(none)
557c2d31e5
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zim.(none):/home/brian/mysql/partition-5.1
2005-09-02 16:07:02 -07:00
brian@zim.(none)
82337d1d1e
Fixed partition push so that it now compiles. The sinclude directory was not added which means that though the code was in the tree, it never actually compiled. I did make sure that it compiles, but there are no tests to really test functionality at this point.
2005-09-02 16:01:26 -07:00
heikki@hundin.mysql.fi
a963f5970f
row0sel.c:
...
Fix bug #12947 : a consistent read could return inconsistent results; this bug was introduced in 5.0.5
2005-09-03 01:38:37 +03:00
jimw@mysql.com
0e323e566d
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-09-02 12:42:00 -07:00