Commit graph

662 commits

Author SHA1 Message Date
osku@127.(none)
084e37b88c InnoDB: Reject foreign keys in temporary tables. Closes bug #12084. 2005-09-06 14:38:21 +03:00
ndbdev@dl145c.mysql.com
f40c1576b0 Merge 2005-09-06 09:20:15 +02: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
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
msvensson@neptunus.(none)
345dfef41f Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2005-09-02 08:59:59 +02:00
jimw@mysql.com
1d997477aa Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-31 15:24:06 -07:00
ndbdev@dl145b.mysql.com
583979d949 merge 2005-08-31 20:45:48 +02:00
heikki@hundin.mysql.fi
183feee465 ha_innodb.cc:
Fix bug #12410 : InnoDB was too permissive with LOCK TABLE ... READ LOCAL, and alowed new inserts to the table; we now make READ LOCAL equivalent to READ for InnoDB; note that this will cause slightly more locking in mysqldump, but makes the InnoDB table dumps consistent with MyISAM table dumps; note that the real code change patch was accidentally pushed with my another patch 5 minutes ago
2005-08-31 14:27:44 +03:00
heikki@hundin.mysql.fi
9aa5a86a80 ha_innodb.cc:
Fix bug #12852 : do not increment the open handle count to a table if the table does not have an .ibd file and InnoDB decides to return an error from the ::open() function; then the table can be dropped even if the user has tried to open it
2005-08-31 14:17:05 +03:00
paul@kite-hub.kitebird.com
dfc55d2142 ha_innodb.cc:
Reorder out-of-order status variables
2005-08-30 13:17:50 -05:00
osku@127.(none)
0848d8c366 Bug #11946: Review fixes. 2005-08-30 12:39:20 +03:00
osku@127.(none)
caf74b7cdd Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
into  127.(none):/home/osku/mysql-5.0
2005-08-29 09:06:43 +03:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
02056f8e3a Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
2005-08-25 13:11:38 -04:00
heikki@hundin.mysql.fi
7ec0b37c3c ha_innodb.cc:
Fix typo
2005-08-25 16:57:13 +03:00
osku@127.(none)
ce22788bdd Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
into  127.(none):/home/osku/mysql-5.0
2005-08-25 14:15:31 +03:00
monty@mishka.local
f384e08277 Merge mishka.local:/home/my/mysql-4.1
into  mishka.local:/home/my/mysql-5.0
2005-08-25 06:55:48 +03:00
heikki@hundin.mysql.fi
2310ef6938 Merge hundin.mysql.fi:/home/heikki/mysql-4.0
into  hundin.mysql.fi:/home/heikki/mysql-4.1
2005-08-24 17:30:25 +03:00
heikki@hundin.mysql.fi
9f72d504b4 ha_innodb.cc:
Fix bug #12779 : never give a row count estimate of 0 to the MySQL query optimizer, as then left join optimizer may beleive it KNOWS that the table is empty; note that this fix may change query optimization of many other queries where one table is empty; note that the proper fix would be to make the query optimizer to know that the row count estimates it receives really are just estimates, it cannot assume they are certain
2005-08-24 17:27:46 +03:00
osku@127.(none)
3809fdac6d Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
into  127.(none):/home/osku/mysql-5.0
2005-08-17 11:11:50 +03:00
osku@127.(none)
fb48039444 Fix bug #11946, truncate not always resetting the auto-increment counter
in InnoDB tables.
2005-08-17 11:00:20 +03:00
jani@ua141d10.elisa.omakaista.fi
c7bdc5bb12 Fixed indentations in error and warning messages. 2005-08-16 15:32:41 +03:00
serg@sergbook.mysql.com
d42f973b80 merged 2005-08-12 22:58:13 +02:00
serg@sergbook.mysql.com
f5ff607c14 BUG#12162 - one can start two transactions with the same XID.
Now we keep all active XID's in a hash
2005-08-12 21:15:01 +02:00
osku@127.(none)
b1c81e43ac Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
into  127.(none):/home/osku/mysql-5.0
2005-08-12 11:40:02 +03:00
osku@127.(none)
04056ffd3d InnoDB: Print more than 300 characters of queries in various error conditions,
most notably deadlocked ones in SHOW INNODB STATUS. Fixes bug #7819.
2005-08-12 11:39:19 +03:00
vtkachenko@quadxeon.mysql.com
ba8df85719 Merge bk-internal:/home/bk/mysql-5.0
into quadxeon.mysql.com:/users/vtkachenko/bk/mysql-5.0-tmp
2005-08-11 20:19:28 +02:00
jani@ua141d10.elisa.omakaista.fi
1a7af25913 Fixed some warning and error messages so that they use
sql_print_warning() and sql_print_error() instead of fprintf to stderr.
Above functions are tuned for different platforms so that the behavior
is consistent around platforms. Using fprintf() different behavior can
be expected at least on Windows and Unix.
2005-08-11 19:19:20 +03:00
vtkachenko@quadxeon.mysql.com
fc22a36d78 set_var.cc, mysqld.cc, ha_innodb.h, ha_innodb.cc, srv0srv.c, srv0srv.h:
Added innodb_commit_concurrency variable
2005-08-11 18:03:01 +02:00
konstantin@mysql.com
8392a814af A fix and a test case for Bug#12243 "MySQL Server crashes with 2
cursors (+ commit)" and Bug#11832 "Server crash with InnoDB + Cursors"
See comments to the changed files.
2005-08-10 18:36:13 +04:00
evgen@moonbone.local
2a025ffbeb Fix bug #12340 Wrong comparison in ha_innobase::cmp_ref()
When PRIMARY KEY is present ha_innobase::cmp_ref() uses it to compare refs.
After comparing part of key it moves pointers to compare next part.
For varchar parts pointers were moved only by length of parts, not including
bytes containig part length itself. This results in wrong comparision and
wrong number of deleted records.
2005-08-09 22:05:07 +04:00
monty@mysql.com
c954c09a11 Fixed test that failed on 32 bit systems 2005-08-09 11:21:45 +03:00
heikki@hundin.mysql.fi
10e5ee5196 ha_innodb.cc:
Add a forgotten newline to a print
2005-08-08 21:43:08 +03:00
pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se
69acde961f Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into  c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
2005-08-05 18:01:34 -04:00
heikki@hundin.mysql.fi
7e588ac074 ha_innodb.cc:
Fix compilation error in the fix of Bug #12263
2005-08-03 18:53:22 +03:00
heikki@hundin.mysql.fi
353b3a2cad ha_innodb.cc:
Fix compilation error in previous commit
2005-08-03 18:47:50 +03:00
heikki@hundin.mysql.fi
c9c6b82404 ha_innodb.cc:
Backport of Bug #9670 to 4.0: assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED)
2005-08-03 18:11:55 +03:00
heikki@hundin.mysql.fi
74fd4504bb Many files:
Push the patch of Jan Lindstrom: better comments
ha_innodb.cc:
  Partial fix for Bug #12263 : we let InnoDB always to perform a rollback on the trx object if MySQL closes a connection; but we do print a warning to the .err log if an InnoDB transaction was active; we may remove that print later, since the situation really is not a bug; MySQL just is not aware that some cursor operation started an InnoDB transaction
2005-08-03 17:09:21 +03:00
sergefp@mysql.com
6289ba1570 [Patch from Konstantin] Enable InnoDB cursor view functionality. 2005-07-29 00:32:03 +00:00
jani@a193-229-222-105.elisa-laajakaista.fi
8f10662eab Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1
2005-07-23 00:15:53 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
2657e48c64 Faster alter table code for 5.1. 2005-07-22 23:43:59 +03:00
jan@hundin.mysql.fi
7d5e724c40 Implement MySQL framework to support consistent read views in
cursors for InnoDB. The idea of the patch is that if MySQL requests
a consistent read view, we open one when open a cursor, set is as the
active view to a transaction when fetch from the cursor, and close
together with cursor close. This patch is associated to bugs #11813, 
#11832, and #11833. Contains after review fixes.
2005-07-22 14:10:03 +03:00
tulin@dl145b.mysql.com
98a26f0c3f merge 2005-07-21 00:04:18 +02:00
konstantin@mysql.com
21957c423e Implement MySQL framework to support consistent read views in
cursors. This should fix Bug#11813 when InnoDB part is in 
(tested with a draft patch).
The idea of the patch is that if a storage engine supports
consistent read views, we open one when open a cursor,
set is as the active view when fetch from the cursor, and close
together with cursor close.
2005-07-20 20:02:36 +04:00
tulin@dl145b.mysql.com
a6c21a0791 merge 2005-07-19 21:56:10 +02:00
konstantin@mysql.com
14344b658a A fix and a test case for Bug#10760 and complementary cleanups.
The idea of the patch
is that every cursor gets its own lock id for table level locking.
Thus cursors are protected from updates performed within the same 
connection. Additionally a list of transient (must be closed at
commit) cursors is maintained and all transient cursors are closed
when necessary. Lastly, this patch adds support for deadlock
timeouts to TLL locking when using cursors.
+ post-review fixes.
2005-07-19 22:21:12 +04:00
monty@mishka.local
2278e0319c Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mishka.local:/home/my/mysql-5.0
2005-07-18 19:03:01 +03:00
monty@mishka.local
78c65b5adc Cleanups during review
Changed defaults option --instance to --defaults-group-suffix
Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order
Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX
mysql_print_defaults now understands --defaults-group-suffix
Remove usage of my_tempnam() (not safe function)
if( -> if ( and while( to while (
2005-07-18 15:33:18 +03:00
mronstrom@mysql.com
67087e2aa7 Patch for push of wl1354 Partitioning 2005-07-18 13:31:02 +02:00
tomas@poseidon.ndb.mysql.com
674b6bb151 Merge 2005-07-12 20:01:22 +02:00
marko@hundin.mysql.fi
006bb7bbc9 InnoDB: Make the srv_thread_concurrency checks more consistent. 2005-07-06 09:38:31 +03:00
marko@hundin.mysql.fi
774916a902 Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/marko/mysql-5.0-current
2005-07-04 16:12:08 +03:00
heikki@hundin.mysql.fi
4fe03b705a Many files:
Fix Bug #3300 : if innodb_locks_unsafe_for_binlog is set, release locks on rows that we do not UPDATE or DELETE
2005-07-01 20:44:35 +03:00
marko@hundin.mysql.fi
4eba989290 InnoDB: Optimize [and clarify] a condition in build_template() 2005-07-01 13:20:16 +03:00
heikki@hundin.mysql.fi
c73914977c ha_innodb.cc:
Let InnoDB use a consistent read when it initializes the auto-inc counter for a table: this will eliminate spurious deadlocks, but will ignore an UPDATE if that happens at the same time that we init the auto-inc counter; this has to be documented; this path also fixes most of Bug #11633, but not all: if ::external_lock() is not called on the table in SHOW TABLE STATUS, that might cause a crash if someone simultaneously DROPs the table
2005-06-29 20:52:22 +03:00
tulin@dl145b.mysql.com
b4f774f62b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-21 15:14:21 +02:00
marko@hundin.mysql.fi
a5cbbb7031 InnoDB: Remove some warnings reported by GCC 4.0.0. 2005-06-21 11:49:55 +03:00
tulin@dl145b.mysql.com
a6d0581275 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-21 08:49:21 +02:00
marko@hundin.mysql.fi
e992adcb3f Merge hundin.mysql.fi:/home/marko/mysql-5.0
into hundin.mysql.fi:/home/marko/mysql-5.0-current
2005-06-21 07:36:18 +03:00
ndbdev@dl145b.mysql.com
0257d41da1 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-13 20:35:38 +02:00
heikki@hundin.mysql.fi
fcfc8d7ffe ha_innodb.cc:
Add a patch by Georg Richter to remove compiler warnings on 64-bit Windows
2005-06-13 16:42:00 +03:00
marko@hundin.mysql.fi
c3da5b0b7b InnoDB: Do not distinguish explicitly requested table locks.
Since UNLOCK TABLES will commit the transaction (and thus release
all InnoDB locks held by it), it is unnecessary to release the
user-requested table locks separately.
2005-06-08 15:45:56 +03:00
ndbdev@dl145b.mysql.com
639a70d7ef Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-07 13:03:29 +02:00
heikki@hundin.mysql.fi
8a3c1ae851 ha_innodb.cc:
Update the InnoDB internal auto-inc counter in ::write_row() if the statement is a REPLACE that fails in a duplicate key error: REPLACE will handle duplicate key error, and the insert will eventually succeed; note that we did NOT change InnoDB's behavior in an UPDATE, because updating the auto-inc counter in an UPDATE would require a bigger patch (Bug #11005)
2005-06-07 11:51:27 +03:00
ndbdev@dl145b.mysql.com
2fb1fb5877 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-07 06:50:50 +02:00
monty@mysql.com
775f17667b Merge with 4.1 2005-06-07 00:31:53 +03:00
serg@serg.mylan
6a5349028c a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
2005-06-05 19:38:52 +02:00
tomas@poseidon.ndb.mysql.com
f6d51a44f4 Merge 2005-06-04 19:26:35 +02:00
monty@mysql.com
29fd1f2fd9 Move USE_PRAGMA_IMPLEMENTATION to proper place
Ensure that 'null_value' is not accessed before val() is called in FIELD() functions
Fixed initialization of key maps. This fixes some problems with keys when you have more than 64 keys
Fixed that ROLLUP don't always create a temporary table. This fix ensures that func_gconcat.test results are now predictable
2005-06-03 23:46:03 +03:00
heikki@hundin.mysql.fi
894de1686a ha_innodb.cc:
Weaken InnoDB table locking at the start of a stored procedure call: this will make multi-transaction stored procedures less deterministic for binlogging, but since they are non-deterministic anyway, it is not that bad; this fix will remove the huge amount of InnoDB tranasctional deadlocks caused by table locking at the start of a stored procedure
2005-06-02 18:10:32 +03:00
tomas@poseidon.ndb.mysql.com
bef102ec90 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
2005-06-02 09:50:47 +02:00
kent@mysql.com
f0fcc54b0c Merge 2005-06-02 04:45:09 +02:00
kent@mysql.com
bd48eed988 tztime.cc:
Set #pragma implementation" earlier
Many files:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
2005-06-02 02:43:32 +02:00
tomas@poseidon.ndb.mysql.com
5088b28d09 Merge 2005-05-31 14:37:47 +02:00
serg@serg.mylan
29d6af8d9a merged 2005-05-28 01:28:18 +02:00
heikki@hundin.mysql.fi
4ea3ec87f3 ha_innodb.cc:
Check in Jan's fix to bug #10746 and also add a note to ::start_stmt() that stored procs in 5.0 call it
2005-05-27 17:04:50 +03:00
serg@serg.mylan
324c20d41c Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-05-27 12:48:36 +02:00
serg@serg.mylan
d21b8d1077 don't downgrade the lock for CREATE ... SELECT (bug#6678) 2005-05-27 12:38:29 +02:00
msvensson@neptunus.(none)
697cfe7f07 Merge from 4.1 2005-05-26 21:01:55 +02:00
msvensson@neptunus.(none)
83d430353e Add ifdefs to control when "#pragma implementation" should be used
Added some more ifdefs for "#pragma interface"
2005-05-26 12:09:14 +02:00
ndbdev@dl145c.mysql.com
30def9f3f8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-05-23 10:45:48 +02:00
heikki@hundin.mysql.fi
d68a52377a ha_innodb.cc:
The natural InnoDB type for NEWDECIMAL is FIXBINARY, not BINARY, since there probably is no benefit from stripping trailing bytes 0x20; note that tables created with 5.0.6 and containing DECIMAL do not need to be rebuilt, as BINARY works as well; note that because of Jani's fix to bug 10465, tables created with 5.0.? - 5.0.5 DO NEED TO BE REBUILT if they contain DECIMAL
2005-05-21 18:44:51 +03:00
tulin@dl145c.mysql.com
4a1d6f6a18 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-05-17 23:25:13 +02:00
heikki@hundin.mysql.fi
69b3b81734 ha_innodb.cc:
Fix bug #10359 : remove extra code
2005-05-17 21:47:28 +03:00
heikki@hundin.mysql.fi
0e642803b3 ha_innodb.h, ha_innodb.cc:
Fix bug #10359 : the critical AUTO-INC bug in InnoDB; since reading of the auto-inc counter in an INSERT was not protected by the AUTO-INC table lock of InnoDB, two inserted rows could get the same value for the auto-inc counter, leading to a duplicate key error
2005-05-17 21:43:15 +03:00
mronstrom@mysql.com
c33a0673a6 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/Users/mikron/wl1682
2005-05-12 12:01:01 +02:00
lars@mysql.com
e76c641190 Merge mysql.com:/home/bk/mysql-5.0 into mysql.com:/home/bk/mysql-5.1 2005-05-09 11:45:59 +02:00
mronstrom@mysql.com
c18a302577 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/Users/mikron/wl1682
2005-05-07 11:23:09 +02:00
lars@mysql.com
05cbb3962c Manual merge 5.0->5.1 2005-05-06 15:04:07 +02:00
monty@mishka.local
015cd1cd21 merge 2005-05-06 13:51:58 +03:00
marko@hundin.mysql.fi
2f0424cd62 Merge 2005-05-06 11:45:59 +03:00
monty@mishka.local
a9f6aab4c9 Fixes while reviewing new code
Added option --count to mysqlshow (to show number of rows)
Fixed possible core dump in information schema
2005-05-06 11:39:30 +03:00
marko@hundin.mysql.fi
f9e7e2ee90 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/mysql-4.1
2005-05-06 10:15:58 +03:00
konstantin@mysql.com
753959cd88 Manual merge 2005-05-05 13:47:09 +04:00
jan@hundin.mysql.fi
71f620890c Fig compiler error. 2005-05-05 08:08:39 +03:00
jan@hundin.mysql.fi
91640e9d60 Initial value for a auto_increment can now be set using ALTER TABLE
AUTO_INCREMENT = X; or CREATE TABLE .. AUTO_INCREMENT = X; This
change is backported from 5.0 (Bug #7061).
2005-05-04 12:24:56 +03:00
marko@hundin.mysql.fi
64bf449bf7 InnoDB: Disable throttling against thread thrashing by default. 2005-05-03 15:55:53 +03:00
tomas@poseidon.ndb.mysql.com
01082e26f1 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean
2005-05-03 11:17:49 +02:00
heikki@hundin.mysql.fi
e8233c3afc ha_innodb.cc:
Return a value from innobase_repl_report_sent_binlog()
2005-05-03 08:40:35 +03:00
tomas@poseidon.ndb.mysql.com
4f1e27ed00 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean
2005-05-03 00:10:52 +02:00