Commit graph

652 commits

Author SHA1 Message Date
heikki@hundin.mysql.fi
10e5ee5196 ha_innodb.cc:
Add a forgotten newline to a print
2005-08-08 21:43:08 +03: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
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
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
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
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
marko@hundin.mysql.fi
a5cbbb7031 InnoDB: Remove some warnings reported by GCC 4.0.0. 2005-06-21 11:49:55 +03: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
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
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
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
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
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
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
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
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
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
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
serg@serg.mylan
9c332d8d2a yassl changeset 2:
remove FIX_GCC_LINKING_PROBLEM and -DDEFINE_CXA_PURE_VIRTUAL
  replace echo in configure.in with AC_MSG_WARN/AC_MSG_ERROR
  don't set -DUSE_MYSYS_NEW for gcc 2.95
  set $USE_MYSYS_NEW even if CXX is g++
  yassl bugfixes
  instantiate all yassl templates explicitly
2005-04-30 19:48:45 +02:00
heikki@hundin.mysql.fi
1e6dba4d88 ha_innodb.cc:
Fix compilation error on Windows in innobase_report_binlog_offset_and_commit()
2005-04-29 12:11:04 +03:00
msvensson@neptunus.(none)
c76c23fcbc Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-27 18:28:57 +02:00
heikki@hundin.mysql.fi
af00b989df ha_innodb.cc:
Correct an assertion
2005-04-27 13:43:02 +03:00
heikki@hundin.mysql.fi
ab0dbb1fc6 ha_innodb.cc, mysqld.cc:
Fix compilation error if HAVE_REPLICATION is not defined
2005-04-27 13:36:58 +03:00