mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
39353 commits 2784 branches 343 tags 1.6 GiB
Commit graph

39353 commits

This branch
This branch
All branches
Author SHA1 Message Date
anozdrin/alik@alik.
18fb4abff4 Merge alik.:/mnt/raid/alik/MySQL/devel/5.1-monty 
into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
 2006-11-03 14:00:35 +03:00
kroki/tomash@moonlight.intranet
6967657466 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-cleanup
 2006-11-03 12:47:32 +03:00
kroki/tomash@moonlight.intranet
d5a69e6fa2 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-cleanup 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-cleanup
 2006-11-03 12:30:09 +03:00
kroki/tomash@moonlight.intranet
1dbf98d162 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-cleanup 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-cleanup
 2006-11-03 12:25:34 +03:00
kroki/tomash@moonlight.intranet
fbf508d686 Cleanup: fix race in rename.test. 2006-11-03 12:16:31 +03:00
malff/marcsql@weblab.(none)
181459d444 Post merge fix 2006-11-02 14:02:07 -07:00
malff/marcsql@weblab.(none)
48a87f8ae0 Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-21114_b
 2006-11-02 11:13:04 -07:00
malff/marcsql@weblab.(none)
62c242cc75 Bug#21114 (Foreign key creation fails to table with name format) 
Due to the complexity of this change, everything is documented in WL#3565

This patch is the third iteration, it takes into account the comments
received to date.
 2006-11-02 11:01:53 -07:00
andrey@example.com
63f7ca0662 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  example.com:/work/mysql-5.1-runtime-bug22830-new
 2006-11-02 13:59:44 +01:00
andrey@example.com
c27a88ca2d Better fix for bug#22830 
Events: crash with procedure which alters events with function

Post-review CS

This fix also changes the handling of KILL command combined with
subquery. It changes the error message given back to "not supported",
from parse error. The error for CREATE|ALTER EVENT has also been changed
to generate "not supported yet" instead of parse error.
In case of a SP call, the error is "not supported yet". This change
cleans the parser from code which should not belong to there. Still
LEX::expr_allows_subselect is existant because it simplifies the handling
 of SQLCOM_HA_READ which forbids subselects.
 2006-11-02 13:51:43 +01:00
kostja@bodhi.local
b2978f9ee8 A post-merge fix. 2006-11-02 08:58:51 +03:00
kostja@bodhi.local
aaeef40e72 Merge bodhi.local:/opt/local/work/mysql-5.0-runtime 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-11-02 03:30:16 +03:00
kostja@bodhi.local
965669d1f9 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-11-02 03:24:11 +03:00
kostja@bodhi.local
5196eadc06 Merge bodhi.local:/opt/local/work/mysql-4.1-runtime 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
 2006-11-02 02:38:41 +03:00
kostja@bodhi.local
b471ea50f7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
 2006-11-02 01:21:37 +03:00
kostja@bodhi.local
6a28c436f7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  bodhi.local:/opt/local/work/mysql-4.1-runtime
 2006-11-02 01:08:39 +03:00
monty@mysql.com/nosik.monty.fi
959e906768 bug#23110 Some NDB tests assert randomly on mixed mode binlog: Don't reset binlog format for NDB binlog injector thread 2006-11-01 23:35:58 +02:00
monty@nosik.monty.fi
d745fe49fe Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2006-11-01 19:46:23 +02:00
monty@mysql.com/nosik.monty.fi
ca99516cc7 Fixed a lot of compiler warnings (Mainly in mysqld and instance manager) 
Fixed some possible fatal wrong arguments to printf() style functions
Initialized some not initialized variables
Fixed bug in stored procedure and continue handlers
(Fixes Bug#22150)
 2006-11-01 19:41:09 +02:00
jonas@perch.ndb.mysql.com
7acfde913a ndb - revert bug to wait for "proper" bug fix 
bug#21052
 2006-11-01 16:14:49 +01:00
dlenev@mockturtle.local
5961d4721f Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  mockturtle.local:/home/dlenev/src/mysql-5.0-hash-2
 2006-11-01 16:20:15 +03:00
dlenev@mockturtle.local
9ac5ed6784 Merge mockturtle.local:/home/dlenev/src/mysql-5.0-hash-2 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-merge
 2006-11-01 15:46:40 +03:00
dlenev@mockturtle.local
bd1b57f930 Small cleanup in code handling stored routines/table prelocking. 
Use lazy initialization for Query_tables_list::sroutines hash.
This step should significantly decrease amount of memory consumed
by stored routines as we no longer will allocate chunk of memory
required for this HASH for each statement in routine.
 2006-11-01 15:41:48 +03:00
joerg@trift2.
0d27df6f1a Merge trift2.:/MySQL/M51/clone-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2006-11-01 13:26:03 +01:00
jonas@perch.ndb.mysql.com
543e73d663 Merge perch.ndb.mysql.com:/home/jonas/src/50-multi 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2006-10-31 16:15:15 +01:00
jonas@perch.ndb.mysql.com
b5e1d6f2a3 Merge perch.ndb.mysql.com:/home/jonas/src/50-multi 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-10-31 16:13:01 +01:00
jonas@perch.ndb.mysql.com
c6308d652d ndb - ndb_multi spurious failure 
remove timeing dependant part of test
 2006-10-31 16:09:31 +01:00
kroki/tomash@moonlight.intranet
75881599e5 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21915
 2006-10-30 17:59:23 +03:00
kroki/tomash@moonlight.intranet
77f1d01fbb Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-runtime 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug21915
 2006-10-30 17:58:56 +03:00
kroki/tomash@moonlight.intranet
cf99db484e Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21915 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug21915
 2006-10-30 17:57:45 +03:00
kroki/tomash@moonlight.intranet
1c87434699 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug21915 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21915
 2006-10-30 17:51:36 +03:00
kroki/tomash@moonlight.intranet
1bfe00e0da BUG#21915: Changing limits of table_cache when setting max_connections 
If the user has specified --max-connections=N or --table-open-cache=M
options to the server, a warning could be given that some values were
recalculated, and table-open-cache could be assigned greater value.

Note that both warning and increase of table-open-cache were totally
harmless.

This patch fixes recalculation code to ensure that table-open-cache will
be never increased automatically and that a warning will be given only if
some values had to be decreased due to operating system limits.

No test case is provided because we neither can't predict nor control
operating system limits for maximal number of open files.
 2006-10-30 17:47:02 +03:00
kostja@bodhi.local
dfc4dd423c A cleanup. 2006-10-30 12:03:42 +03:00
kostja@bodhi.local
8143148bc1 Cleanup. 2006-10-30 11:36:30 +03:00
kostja@bodhi.local
b94f939c5a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2006-10-30 10:05:43 +03:00
jonas@perch.ndb.mysql.com
f6fcb302ab Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-10-28 00:01:24 +02:00
jonas@perch.ndb.mysql.com
b67e5b1131 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2006-10-27 23:59:04 +02:00
jonas@perch.ndb.mysql.com
dc2ca8ca10 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
 2006-10-27 23:56:51 +02:00
jonas@perch.ndb.mysql.com
f4af143fcb Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
 2006-10-27 23:54:57 +02:00
jonas@perch.ndb.mysql.com
85b0e1f80b Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
 2006-10-27 23:54:24 +02:00
jonas@perch.ndb.mysql.com
3b726b2845 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2006-10-27 16:41:06 +02:00
jonas@perch.ndb.mysql.com
a172a5dc63 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-10-27 16:38:12 +02:00
jonas@perch.ndb.mysql.com
ebcc594ea3 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-10-27 16:37:16 +02:00
jonas@perch.ndb.mysql.com
4037a8d657 Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-work
 2006-10-27 16:34:22 +02:00
jonas@perch.ndb.mysql.com
0cbb309b1a ndb - valgrind 
Still leakage, make sure all unlinked operations are put back so they will be release
  (on failing blob operations, when AO_IgnoreError)
 2006-10-27 16:32:59 +02:00
kroki/tomash@moonlight.intranet
43e84da003 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug22584
 2006-10-27 13:47:45 +04:00
kroki/tomash@moonlight.intranet
db952c2faa Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug22584 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug22584
 2006-10-27 13:40:28 +04:00
kroki/tomash@moonlight.intranet
0e0f7a0423 BUG#22584: last_insert_id not updated after inserting a record through 
a updatable view.

When there's a VIEW on a base table that have AUTO_INCREMENT column, and
this VIEW doesn't provide an access such column, after INSERT to such
VIEW LAST_INSERT_ID() did not return the value just generated.

This behaviour is intended and correct, because if the VIEW doesn't list
some columns then these columns are effectively hidden from the user,
and so any side effects of inserting default values to them.

However, there was a bug that such statement inserting into a view would
reset LAST_INSERT_ID() instead of leaving it unchanged.

This patch restores the original value of LAST_INSERT_ID() instead of
resetting it to zero.
 2006-10-27 13:32:41 +04:00
pekka@orca.ndb.mysql.com
7236064342 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-ndb
 2006-10-25 21:03:01 +02:00
kroki/tomash@moonlight.intranet
25501c38d3 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug18819
 2006-10-25 20:23:41 +04:00