serg@serg.mylan
e0abc22bfc
BUG#13406 - incorrect amount of "records deleted" in CSV.
...
Fallback to row-wise delete if number or rows in the table is unknown
2005-11-17 22:52:31 +01:00
konstantin@mysql.com
a42b3730aa
Post-review fixes (Bug#13524).
2005-11-17 19:40:48 +03:00
konstantin@mysql.com
c2a1c6c81f
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-13524
2005-11-17 19:26:58 +03:00
grog@mysql.com
e91e55d643
set_var.cc, mysqld.cc, ha_innodb.h:
...
BUG#12701: SHOW VARIABLES does not show correct size of buffer pool.
ha_innodb.cc:
BUG#12701: SHOW VARIABLES does not show correct size of buffer pool
2005-11-17 15:08:49 +01:00
konstantin@mysql.com
85f5263284
A fix and a test case for Bug#13524 "lock timeout gives
...
incorrect warning on open cursor"
2005-11-17 16:20:12 +03:00
dlenev@mysql.com
f0e558c1b8
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg13399-2
2005-11-17 04:38:10 +03:00
dlenev@mysql.com
63fcccb193
Fix for bug #13399 Crash when executing PS/SP which should activate trigger
...
which is now dropped" and bug #12329 "Bogus error msg when executing PS with
stored procedure after SP was re-created".
2005-11-17 03:51:14 +03:00
konstantin@mysql.com
9e1f155864
A fix and a test case for Bug#14077 "Failure to replicate a stored
...
function with a cursor". Enable execution of SELECT queries in SP on slave.
2005-11-17 03:15:10 +03:00
pekka@mysql.com
becda93988
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/export/space/pekka/ndb/version/my50
2005-11-16 22:22:34 +01:00
ingo@production.mysql.com
e55fd656dc
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into production.mysql.com:/usersnfs/istruewing/autopush/mysql-5.0
2005-11-16 18:47:17 +01:00
ingo@production.mysql.com
82d91620ce
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into production.mysql.com:/usersnfs/istruewing/autopush/mysql-5.0
2005-11-16 16:04:34 +01:00
ingo@mysql.com
41bb21de16
Bug#14616 - Freshly imported table returns error 124 when using LIMIT
...
After merge fix.
2005-11-16 15:58:17 +01:00
serg@serg.mylan
60875d3236
bug#14433 - archive uses wrong ref_length
2005-11-16 15:17:08 +01:00
pekka@mysql.com
06531fb1d0
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/export/space/pekka/ndb/version/my50
2005-11-16 13:29:44 +01:00
pekka@mysql.com
9fe68c3da6
ndb - bug#14007 5.0 *** does not automerge into 5.1 ***
2005-11-16 13:26:26 +01:00
bell@sanja.is.com.ua
a60a6b0f7f
Issuing error about presence of commit/rollback statements in stored functions and triggers added to SP parsing procedure (BUG#13627)
...
The crash mentioned in original bug report is already prevented by one
of previous patches (fix for bug #13343 "CREATE|etc TRIGGER|VIEW|USER
don't commit the transaction (inconsistency)"), this patch only improve
error returning.
2005-11-16 14:09:06 +02:00
pekka@mysql.com
6651c0876c
DbtupRoutines.cpp:
...
Auto merged
2005-11-16 12:08:22 +01:00
pekka@mysql.com
a8ce4d27ce
ndb - bug#14007 4.1 [re-commit for LenZ merge]
2005-11-16 11:52:09 +01:00
ingo@mysql.com
3df2007147
Merge mysql.com:/home/mydev/mysql-4.1-4100
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-11-16 10:23:42 +01:00
ingo@mysql.com
e66b88bb7d
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-11-16 10:10:53 +01:00
evgen@moonbone.local
7749b8d15b
Merge
2005-11-16 02:08:20 +03:00
ingo@mysql.com
74781d6559
Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
...
Version for 5.0.
It fixes three problems:
1. The cause of the bug was that we did not check the table version for
the HANDLER ... READ commands. We did not notice when a table was
replaced by a new one. This can happen during ALTER TABLE, REPAIR
TABLE, and OPTIMIZE TABLE (there might be more cases). I call the fix
for this problem "the primary bug fix".
2. mysql_ha_flush() was not always called with a locked LOCK_open.
Though the function comment clearly said it must.
I changed the code so that the locking is done when required. I call
the fix for this problem "the secondary fix".
3. In 5.0 (not in 4.1 or 4.0) DROP TABLE had a possible deadlock flaw in
concur with FLUSH TABLES WITH READ LOCK. I call the fix for this
problem "the 5.0 addendum fix".
2005-11-15 21:57:02 +01:00
bell@sanja.is.com.ua
13ae8d8d70
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug6-5.0
2005-11-15 22:08:17 +02:00
evgen@moonbone.local
3a8e7b7fb9
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/14850-bug-5.0-mysql
2005-11-15 22:47:03 +03:00
bell@sanja.is.com.ua
a2b8128398
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug6-5.0
2005-11-15 19:22:00 +02:00
ingo@mysql.com
6bc4636b64
Merge mysql.com:/home/mydev/mysql-4.0-4000
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-11-15 18:09:40 +01:00
ingo@mysql.com
aa1f46a819
Bug#14616 - Freshly imported table returns error 124 when using LIMIT
...
After merge fix.
2005-11-15 18:01:30 +01:00
bell@sanja.is.com.ua
297639bdbe
Test suite for BUG#13673 (the bug was fixed in the bugfix for BUG#14138)
2005-11-15 18:14:53 +02:00
ingo@mysql.com
1aa15c25c7
Merge mysql.com:/home/mydev/mysql-4.0-bug14397
...
into mysql.com:/home/mydev/mysql-4.0-4000
2005-11-15 16:47:15 +01:00
ingo@mysql.com
8996fd40cf
Merge mysql.com:/home/mydev/mysql-4.0-bug14616
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-11-15 16:07:05 +01:00
pem@mysql.com
15df2c2298
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/bug14723/mysql-5.0
2005-11-15 13:27:00 +01:00
kent@mysql.com
d017ef511a
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-11-15 11:05:15 +01:00
evgen@moonbone.local
35f7b50b18
Fix bug #14816 test_if_order_by_key() expected only Item_fields.
...
test_if_order_by_key() expected only Item_fields to be in order->item, thus
failing to find available index on view's field, which results in reported
error.
Now test_if_order_by_key() calls order->item->real_item() to get field for
choosing index.
2005-11-14 22:10:34 +03:00
evgen@moonbone.local
70e1974f76
Fix bug #14850 Item_ref's null_value wasn't updated
...
Item_ref's null_value wasn't updated in save_org_in_field() causing reported
error.
2005-11-14 21:52:39 +03:00
SergeyV@selena.
43bbd352e3
Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into selena.:H:/MYSQL/src/#14569-mysql-5.0
2005-11-14 17:42:14 +03:00
pem@mysql.com
b614c82b10
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/bug14723/mysql-5.0
2005-11-14 15:18:05 +01:00
kent@mysql.com
f189de5170
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-11-14 15:15:43 +01:00
SergeyV@selena.
5583e98498
Added workaround for rpl_frop_db test to run on win32 properly.
2005-11-14 16:39:46 +03:00
SergeyV@selena.
be18f91a01
Added number of files into ignore list for win32 build within bk tree.
2005-11-14 16:36:05 +03:00
SergeyV@selena.
450909f0d3
Merge selena.:H:/MYSQL/bkt/mysql-5.0-rel
...
into selena.:H:/MYSQL/bkt/mysql-5.0
2005-11-14 16:16:29 +03:00
SergeyV@selena.
00990f9774
Fixes bug #13377 . my_open() & my_create() functions changed to use
...
my_sopen() on win32 which allows to use FILE_SHARE_DELETE flag to
allow deleting opened files. my_sopen() implementation is added to
support this functionality.
2005-11-14 16:01:10 +03:00
SergeyV@selena.
95e0c72eb2
Fixed number of compiler errors on win32.
2005-11-14 15:19:52 +03:00
kent@mysql.com
7966c4ddac
config-win.h:
...
Disabled yaSSL support for now
2005-11-14 04:07:24 +02:00
kent@mysql.com
a717f7bf98
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gca
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
2005-11-14 02:08:17 +02:00
kent@mysql.com
61438b0218
mysql-test-run.pl:
...
Corrected search for 'mysqlimport' executable
2005-11-14 01:59:15 +02:00
kent@mysql.com
6c2017e0c0
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-11-12 15:11:21 +02:00
svoj@mysql.com
5d8cefe0b4
Fix for BUG#5686 - #1034 - Incorrect key file for table - only utf8
2005-11-12 11:25:14 +04:00
joerg@mysql.com
9f065041fc
Not all RPM builds can use the bundled zlib, due to dependency and link conflicts. Solve this.
2005-11-11 22:18:41 +01:00
SergeyV@selena.
dbb29d11ee
Fixes bug #14569 . When no db is selected as current and we do create procedure db.sp()...
...
we changing current db temporarily and restore it when sp is created. however thd->db
in this case becomes empty string rather than NULL and so all checks of thd->db == NULL
will be false. So if after this we'll issue create procedure sp2()... without specifying
db it will succeed and create sp with db=NULL, which causes mysqldto crash on
show procedure status statement.
This patch fixes the problem.
2005-11-11 21:01:48 +03:00
pem@mysql.com
b607fdb04d
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/bug14723/mysql-5.0
2005-11-11 18:12:40 +01:00