summaryrefslogtreecommitdiff
path: root/innobase
Commit message (Collapse)AuthorAgeFilesLines
* manual mergeserg@serg.mylan2004-07-2013-56/+138
|\
| * manual merged (blame me!)serg@serg.mylan2004-07-2013-56/+138
| |\
| | * InnoDB: limit the recursion depth for ON (UPDATE|DELETE) CASCADEmarko@hundin.mysql.fi2004-07-151-13/+65
| | | | | | | | | | | | (Bug #4446)
| | * btr0cur.c:heikki@hundin.mysql.fi2004-07-151-2/+9
| | | | | | | | | | | | Do not add + 1 to the InnoDB index cardinality estimate if the B-tree just contains one page; the fix made in March 2004 caused InnoDB systematically to overestimate the cardinality of empty or small tables by 1
| | * lock0lock.c:marko@hundin.mysql.fi2004-07-131-8/+6
| | | | | | | | | | | | | | | | | | Decrement n_lock_table_exp in lock_table_remove_low() instead of lock_table_dequeue(). Do not empty lock_heap in lock_release_tables_off_kernel().
| | * InnoDB: LOCK TABLES clean-up, part 2marko@hundin.mysql.fi2004-07-121-2/+4
| | |
| | * InnoDB: LOCK TABLE clean-upmarko@hundin.mysql.fi2004-07-126-28/+34
| | |
| | * InnoDB: Increment the lock wait watchdog timeout during CHECK TABLEmarko@hundin.mysql.fi2004-07-125-7/+23
| | | | | | | | | | | | (Bug #2694)
| | * srv0start.c:marko@hundin.mysql.fi2004-07-121-1/+1
| | | | | | | | | | | | | | | innobase_start_or_create_for_mysql(): Rename innodb.status.<pid> to innodb_status.<pid> to avoid problems on VMS
* | | Merge with 4.1.3-betamonty@mysql.com2004-07-0798-1620/+2072
|\ \ \ | |/ /
| * | Merge with 4.0 to get the latest bug patches to 4.1monty@mysql.com2004-06-257-120/+170
| |\ \ | | |/
| | * lexyy.c, pars0lex.l:marko@hundin.mysql.fi2004-06-222-113/+158
| | | | | | | | | | | | Document the handling of quoted strings
| | * Merge marko@build.mysql.com:/home/bk/mysql-4.0marko@hundin.mysql.fi2004-06-211-1/+2
| | |\ | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/k/mysql-4.0
| | | * mem0dbg.c:heikki@hundin.mysql.fi2004-06-191-1/+2
| | | | | | | | | | | | | | | | InnoDB with UNIV_MEM_DEBUG did not compile because a global variable was forgotten when we put back mem_print_info() functions 2 days ago; add that variable
| | * | mach0data.ic, mach0data.h:marko@hundin.mysql.fi2004-06-184-7/+11
| | |/ | | | | | | | | | | | | | | | Improve documentation of mach_*write_*compressed() mtr0log.ic, mtr0log.h: Improve documentation of mlog_write_initial_log_record_fast()
| * | Merge gbichot@213.136.52.20:/home/bk/mysql-4.1guilhem@mysql.com2004-06-232-10/+36
| |\ \ | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.1-1717
| | * | Robustness feature.guilhem@mysql.com2004-06-202-10/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Won't be pushed as is - separate email sent for internal review. WL#1717 "binlog-innodb consistency". Now when mysqld starts, if InnoDB does a crash recovery, we use the binlog name and position retrieved from InnoDB (corresponding to the last transaction successfully committed by InnoDB) to cut any rolled back transaction from the binary log. This is triggered by the --innodb-safe-binlog option. Provided you configure mysqld to fsync() InnoDB at every commit (using flush_log_at_trx_commit) and to fsync() the binlog at every write (using --sync-binlog=1), this behaviour guarantees that a master always has consistency between binlog and InnoDB, whenever the crash happens. 6 tests to verify that it works.
| * | | mergemonty@mysql.com2004-06-2175-442/+955
| |\ \ \ | | |/ / | |/| |
| | * | After merge fixesmonty@mysql.com2004-06-213-4/+1
| | | | | | | | | | | | | | | | Return NULL if a time argument is given to date_add(). (Warning will be shown after Dimitri's timezone patch is pushed)
| | * | Merge with 4.0.21monty@mysql.com2004-06-1874-439/+954
| | |\ \ | | | |/
| | | * mem0dbg.h, mem0dbg.c:heikki@hundin.mysql.fi2004-06-172-0/+138
| | | | | | | | | | | | | | | | Put back mem_print_info() functions that are used to analyze memory leaks; Marko removed them by accident in his Feb 20th, 2004 patch; these functions are very important for debugging, and should always be kept in the source code base
| | | * que0que.c, srv0que.c:heikki@hundin.mysql.fi2004-06-172-0/+6
| | | | | | | | | | | | | | | | Put asserts that make sure srv_que_task_enqueue() is never called under MySQL
| | | * log0recv.c:heikki@hundin.mysql.fi2004-06-171-1/+3
| | | | | | | | | | | | | | | | Revert the patch that put log debug code behind UNIV_LOG_DEBUG
| | | * log0log.h:heikki@hundin.mysql.fi2004-06-174-61/+3
| | | | | | | | | | | | | | | | | | | | | | | | Revert the patch that put log debug code behind UNIV_LOG_DEBUG log0log.ic, log0recv.c, log0log.c, log0log.h: Revert 1.1730.18.1 about UNIV_LOG_DEBUG: debug code is often needed in debugging the production version
| | | * Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040316101802|63386heikki@hundin.mysql.fi2004-06-173-3/+35
| | | |
| | | * Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040311211202|05613heikki@hundin.mysql.fi2004-06-1714-70/+81
| | | |
| | | * srv0que.c:heikki@hundin.mysql.fi2004-06-172-0/+164
| | | | | | | | | | | | | | | | | | | | | | | | Revert Marko's untested changeset 1.1844.1.6 to the stable 4.0 version; stable 4.0 must NOT BE modified except in case of bugs srv0que.c, srv0que.h: new file
| | | * Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040525171209|56870heikki@hundin.mysql.fi2004-06-1712-101/+338
| | | |
| | | * ut0mem.c:heikki@hundin.mysql.fi2004-06-161-7/+0
| | | | | | | | | | | | | | | | Remove printf's that were accidentally pushed in the last push
| | | * ut0mem.h, ut0mem.c:heikki@hundin.mysql.fi2004-06-164-18/+131
| | | | | | | | | | | | | | | | | | | | | | | | Implement ut_realloc lexyy.c, pars0lex.l: Start using ut_malloc, ut_free, ut_realloc in pars0lex.l and lexyy.c; mem_realloc was broken; eliminate possible memcpy(NULL, ..., 0) from string_append()
| | | * mem0mem.ic, mem0mem.h:heikki@hundin.mysql.fi2004-06-162-41/+0
| | | | | | | | | | | | | | | | Remove broken mem_realloc(); a patch to remove its uses in pars0lex.l and fil0fil.c will soon follow
| | | * InnoDB bug fix: mem_realloc() didn't preserve the block contentsmarko@hundin.mysql.fi2004-06-161-3/+15
| | | |
| | | * InnoDB: Revert most of ChangeSet@1.1772, as the debug functions maymarko@hundin.mysql.fi2004-06-1636-140/+23
| | | | | | | | | | | | | | | | be needed when testing production releases
| | | * InnoDB bug fix (row0mysql.c): make reserved table names innodb_* special againmarko@hundin.mysql.fi2004-06-151-17/+33
| | | |
| | | * InnoDB cleanup: Remove debug functionmarko@hundin.mysql.fi2004-06-021-2/+6
| | | | | | | | | | | | | | | | | | | | cmp_debug_dtuple_rec_with_match() unless #ifdef UNIV_DEBUG
| | * | Fixed some byte order bugs with prepared statements on machines with ↵monty@mysql.com2004-06-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | high-byte-first. (Bug #4173) Fixed problem with NULL and derived tables (Bug #4097) Cleanup of new pushed code
| * | | fil0fil.c:heikki@hundin.mysql.fi2004-06-171-5/+4
| | | | | | | | | | | | | | | | Remove the use of mem_realloc in fil0fil.c; mem_realloc() was broken and the patch to remove its definition will propagate from the 4.0 tree; crash recovery with innodb_file_per_table has to be tested after this patch, not tested yet
| * | | row0ins.c:heikki@hundin.mysql.fi2004-06-161-8/+10
| | | | | | | | | | | | | | | | Return the code of row_ins_foreign_check_on_constraint() as close to 4.0 as possible, except that we use mem_strdup() to allocate the memory for the modified table name
| * | | InnoDB: fix bug in call to innobase_invalidate_query_cache(),marko@hundin.mysql.fi2004-06-162-14/+12
| |/ / | | | | | | | | | | | | | | | | | | introduced in ChangeSet@1.1843.1.25 InnoDB: fix bug in the error exit of fil_create_new_single_table_tablespace(), introduced in ChangeSet@1.1843.1.11
| * | Portability fixes (and a typo after last merge)monty@mysql.com2004-06-041-1/+1
| | |
| * | fil0fil.c:heikki@hundin.mysql.fi2004-06-031-11/+11
| | | | | | | | | | | | Make allocation for file path more uniform: always use mem_alloc(), not ut_malloc()
| * | os0file.c, fil0fil.c:heikki@hundin.mysql.fi2004-06-032-35/+54
| | | | | | | | | | | | Align file i/o buffers for DIRECT_IO; fix mem_alloc()/mem_free() crash bugs that came from Marko's latest cleanup
| * | fil0fil.c:heikki@hundin.mysql.fi2004-06-021-2/+2
| | | | | | | | | | | | Fix typo spotted by Paul DuBois: 'no continue' -> 'not continue'
| * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-06-021-4/+45
| |\ \ | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1
| | * | fil0fil.c:heikki@hundin.mysql.fi2004-06-021-4/+45
| | | | | | | | | | | | | | | | Stop InnoDB crash recovery if an .ibd file for a table exists in a database directory, but we cannot access it.
| * | | after merge fixesmonty@mysql.com2004-06-021-8/+8
| | | |
| * | | Merge with 4.0 to get fixes for netwaremonty@mysql.com2004-06-026-16/+43
| |\ \ \ | | |/ / | |/| / | | |/
| | * row0mysql.c, row0mysql.h, ha_innodb.cc:heikki@hundin.mysql.fi2004-06-012-0/+4
| | | | | | | | | | | | Inside LOCK TABLES, use either LOCK_S or LOCK_X in locking reads; an improvent over the previous patch
| | * InnoDB: Add diagnostics when tmpfile() fails at start (Bug #3919)marko@hundin.mysql.fi2004-05-284-16/+39
| | |
| * | InnoDB: os0file.c:marko@hundin.mysql.fi2004-06-011-16/+10
| | | | | | | | | | | | Do not lock raw devices or files opened for read only