mskold@mysql.com
8ca38a90ad
Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-11-17 15:38:15 +01:00
eric@mysql.com
76ddbf2fd3
removed superfluous local variable
2005-11-17 06:28:11 -08: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
eric@mysql.com
c15c270437
fix potential security hole, pointed out by Sergei. Also simplify code per Sergei's suggestion.
2005-11-17 06:05:09 -08: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
ingo@production.mysql.com
a7daeaf64f
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into production.mysql.com:/usersnfs/istruewing/autopush/mysql-4.1
2005-11-17 13:44:34 +01:00
mskold@mysql.com
77cbf5d3ff
Fixed incorrectly use if table with wrong schema version
2005-11-17 12:45:23 +01:00
pem@mysql.com
c518a2405f
Background:
...
Since long, the compiled code of stored routines has been printed in the trace file
when starting mysqld with the "--debug" flag. (At creation time only, and only in
debug builds of course.) This has been helpful when debugging stored procedure
execution, but it's a bit awkward to use. Also, the printing of some of the
instructions is a bit terse, in particular for sp_instr_stmt where only the command
code was printed.
This improves the printout of several of the instructions, and adds the debugging-
only commands "show procedure code <name>" and "show function code <name>".
(In non-debug builds they are not available.)
2005-11-17 11:11:48 +01:00
sasha@asksasha.com
0b275de13f
Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug7947
2005-11-16 21:18:13 -07:00
sasha@asksasha.com
eac88b685c
fixed the race condition in the test case for BUG#7947
2005-11-16 21:17:38 -07: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
kent@mysql.com
5b61806126
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-11-16 23:12:03 +01: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@mysql.com
1237c2fbcc
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-11-16 21:33:38 +01:00
kent@mysql.com
14a2014901
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-11-16 20:13:14 +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
eric@mysql.com
a316a30d5e
BUG#12659 error handling in federated needs improvement. Sanja pointed out that we were copying an entire buffer, most of which was probably garbage, and possibly hidden by null termination in the middle of the buffer. Now we are only copying the error message.
2005-11-16 08:22:25 -08: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
a6e410dd4e
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/export/space/pekka/ndb/version/my41-r1.2456.1.1
2005-11-16 13:28:54 +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
stewart@mysql.com
87e98c8706
WL#2779 ndb_size.pl
...
Add display of minimum requirements for various cluster parameters
e.g. DataMemory, IndexMemory, MaxNoOfTables, MaxNoOfAttributes etc
and the memory usage because of them.
2005-11-16 19:47:03 +11:00
stewart@mysql.com
d9ef452289
WL#2779 ndb_size.pl
...
fix some small bugs, slightly improve output, add --help
2005-11-16 18:26:30 +11:00
jimw@mysql.com
8ecedd193b
Report truncation of spaces when inserting into a BINARY or VARBINARY
...
field. (Bug #14299 )
2005-11-15 19:21:05 -08: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
sasha@asksasha.com
cb6d69f6f4
Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug7947
2005-11-15 13:38:48 -07:00
sasha@asksasha.com
9986a357ec
merged in the test case for BUG#7947
2005-11-15 13:38:06 -07: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
pem@mysql.com
547f2676d7
Fixed BUG#14723: Dumping of stored functions seems to cause corruption
...
in the function body
Changed the way the end of query was found from the lex state.
The routine body was not extracted correctly when using the
/*!version ... */ wrapper (in dump files); for some types of routines
(e.g. with a label at the first begin), the trailing "*/" was not skipped.
This is a recommit for the 5.0.16-release tree.
2005-11-15 13:10:12 +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
ingo@mysql.com
88b6d28aba
Bug#13707 - Server crash with INSERT DELAYED on MyISAM table
...
After push fix. Must not access new_field if it is NULL.
2005-11-14 19:53:41 +01:00