mirror of
https://github.com/MariaDB/server.git
synced 2025-01-21 06:22:28 +01:00
70f1128619
------------------------------------------------------------------------
r2838 | vasil | 2008-10-21 12:49:27 +0300 (Tue, 21 Oct 2008) | 61 lines
branches/zip:
Merge 2744:2837 from branches/5.1 (skipping r2782 and r2826):
------------------------------------------------------------------------
r2832 | vasil | 2008-10-21 10:08:30 +0300 (Tue, 21 Oct 2008) | 10 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
In ha_innobase::info():
Replace sql_print_warning() which prints to mysqld error log with
push_warning_printf() which sends the error message to the client.
Suggested by: Marko, Sunny, Michael
Objected by: Inaam
------------------------------------------------------------------------
r2837 | vasil | 2008-10-21 12:07:44 +0300 (Tue, 21 Oct 2008) | 32 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-semi-consistent.result
M /branches/5.1/mysql-test/innodb-semi-consistent.test
M /branches/5.1/mysql-test/innodb.result
M /branches/5.1/mysql-test/innodb.test
branches/5.1:
Merge a change from MySQL (this fixes the failing innodb and
innodb-semi-consistent tests):
revno: 2757
committer: Georgi Kodinov <kgeorge@mysql.com>
branch nick: B39812-5.1-5.1.29-rc
timestamp: Fri 2008-10-03 15:24:19 +0300
message:
Bug #39812: Make statement replication default for 5.1 (to match 5.0)
Make STMT replication default for 5.1.
Add a default of MIXED into the config files
Fix the tests that needed MIXED replication mode.
modified:
mysql-test/include/mix1.inc
mysql-test/r/innodb-semi-consistent.result
mysql-test/r/innodb.result
mysql-test/r/innodb_mysql.result
mysql-test/r/tx_isolation_func.result
mysql-test/t/innodb-semi-consistent.test
mysql-test/t/innodb.test
mysql-test/t/tx_isolation_func.test
sql/mysqld.cc
support-files/my-huge.cnf.sh
support-files/my-innodb-heavy-4G.cnf.sh
support-files/my-large.cnf.sh
support-files/my-medium.cnf.sh
support-files/my-small.cnf.sh
------------------------------------------------------------------------
------------------------------------------------------------------------
r2847 | marko | 2008-10-22 10:07:37 +0300 (Wed, 22 Oct 2008) | 6 lines
branches/zip: page_zip_rec_needs_ext(): Fix a bug that was introduced
in the fix of Mantis issue #73. With key_block_size=16, we will also
have to check the available space on the uncompressed page.
Otherwise, the clustered index record can be almost 16 kilobytes in
size, and the undo log record will not fit.
------------------------------------------------------------------------
r2850 | marko | 2008-10-22 13:52:12 +0300 (Wed, 22 Oct 2008) | 2 lines
branches/zip: ibuf_insert_to_index_page(): Discard the local variable block.
page_cur is always positioned on block, the function parameter.
------------------------------------------------------------------------
r2853 | sunny | 2008-10-23 01:52:09 +0300 (Thu, 23 Oct 2008) | 2 lines
branches/zip: Add missing UNIV_INTERN.
------------------------------------------------------------------------
r2855 | sunny | 2008-10-23 09:29:46 +0300 (Thu, 23 Oct 2008) | 36 lines
branches/zip:
Merge revisions 2837:2852 from branches/5.1:
------------------------------------------------------------------------
r2849 | sunny | 2008-10-22 12:01:18 +0300 (Wed, 22 Oct 2008) | 8 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/include/row0mysql.h
M /branches/5.1/row/row0mysql.c
branches/5.1: Return the actual error code encountered when allocating
a new autoinc value. The change in behavior (bug) was introduced in 5.1.22
when we introduced the new AUTOINC locking model.
rb://31
Bug#40224 New AUTOINC changes mask reporting of deadlock/timeout errors
------------------------------------------------------------------------
r2852 | sunny | 2008-10-23 01:42:24 +0300 (Thu, 23 Oct 2008) | 9 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/handler/ha_innodb.h
branches/5.1: Backport r2724 from branches/zip
Check column value against the col max value before updating the table's
global autoinc counter value. This is part of simplifying the AUTOINC
sub-system. We extract the type info from MySQL data structures at runtime.
This fixes Bug#37788 InnoDB Plugin: AUTO_INCREMENT wrong for compressed tables
------------------------------------------------------------------------
------------------------------------------------------------------------
r2856 | sunny | 2008-10-23 10:07:05 +0300 (Thu, 23 Oct 2008) | 1 line
Reverting test file changes from r2855
------------------------------------------------------------------------
r2857 | sunny | 2008-10-23 10:24:33 +0300 (Thu, 23 Oct 2008) | 30 lines
branches/zip:
Merge revisions 2852:2854 from branches/5.1:
------------------------------------------------------------------------
r2854 | sunny | 2008-10-23 08:30:32 +0300 (Thu, 23 Oct 2008) | 13 lines
Changed paths:
M /branches/5.1/dict/dict0dict.c
M /branches/5.1/dict/dict0mem.c
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/handler/ha_innodb.h
M /branches/5.1/include/dict0dict.h
M /branches/5.1/include/dict0mem.h
M /branches/5.1/row/row0mysql.c
branches/5.1: Backport changes from branches/zip r2725
Simplify the autoinc initialization code. This removes the
non-determinism related to reading the table's autoinc value for the first
time. This change has also reduced the sizeof dict_table_t by sizeof(ibool)
bytes because we don't need the dict_table_t::autoinc_inited field anymore.
Bug#39830 Table autoinc value not updated on first insert.
Bug#35498 Cannot get table test/table1 auto-inccounter value in ::info
Bug#36411 Failed to read auto-increment value from storage engine" in 5.1.24 auto-inc
rb://16
------------------------------------------------------------------------
------------------------------------------------------------------------
r2858 | vasil | 2008-10-23 11:33:43 +0300 (Thu, 23 Oct 2008) | 4 lines
branches/zip:
Update the ChangeLog
------------------------------------------------------------------------
r2861 | marko | 2008-10-23 12:27:15 +0300 (Thu, 23 Oct 2008) | 24 lines
branches/zip: Clean up the file format stamping.
trx_sys_file_format_max_upgrade(): Rename from
trx_sys_file_format_max_update(). Improve the documentation. Add a
const qualifier to the parameter "name". Replace the parameter
"flags" with "format_id", because this function should deal with file
format identifiers, not with table flags.
trx_sys_file_format_max_write(), trx_sys_file_format_max_set(): Add a
const qualifier to the parameter "name".
ha_innodb.cc: Correct the spelling in some comments: "side effect".
Remove redundant prototypes for some static callback functions.
innodb_file_format_name_update(), innodb_file_format_check_update():
Correct the function signature. Use appropriate pointer type conversions.
MYSQL_SYSVAR_STR(file_format), MYSQL_SYSVAR_STR(file_format_check):
Remove the type conversions from the callback function pointers. When
the function signatures match, no type conversion is needed. The type
conversions would only prevent compilation warnings for any mismatch.
Approved by Sunny in rb://25.
------------------------------------------------------------------------
r2862 | marko | 2008-10-23 12:37:42 +0300 (Thu, 23 Oct 2008) | 8 lines
branches/zip: Non-functional changes:
ibuf_get_volume_buffered(): Declare with static linkage.
This function is private to ibuf0ibuf.c.
btr_cur_pessimistic_delete(): Use the cached result of
btr_cur_get_index(cursor).
------------------------------------------------------------------------
|
||
|---|---|---|
| .. | ||
| btr0btr.h | ||
| btr0btr.ic | ||
| btr0cur.h | ||
| btr0cur.ic | ||
| btr0pcur.h | ||
| btr0pcur.ic | ||
| btr0sea.h | ||
| btr0sea.ic | ||
| btr0types.h | ||
| buf0buddy.h | ||
| buf0buddy.ic | ||
| buf0buf.h | ||
| buf0buf.ic | ||
| buf0flu.h | ||
| buf0flu.ic | ||
| buf0lru.h | ||
| buf0lru.ic | ||
| buf0rea.h | ||
| buf0types.h | ||
| data0data.h | ||
| data0data.ic | ||
| data0type.h | ||
| data0type.ic | ||
| data0types.h | ||
| db0err.h | ||
| dict0boot.h | ||
| dict0boot.ic | ||
| dict0crea.h | ||
| dict0crea.ic | ||
| dict0dict.h | ||
| dict0dict.ic | ||
| dict0load.h | ||
| dict0load.ic | ||
| dict0mem.h | ||
| dict0mem.ic | ||
| dict0types.h | ||
| dyn0dyn.h | ||
| dyn0dyn.ic | ||
| eval0eval.h | ||
| eval0eval.ic | ||
| eval0proc.h | ||
| eval0proc.ic | ||
| fil0fil.h | ||
| fsp0fsp.h | ||
| fsp0fsp.ic | ||
| fut0fut.h | ||
| fut0fut.ic | ||
| fut0lst.h | ||
| fut0lst.ic | ||
| ha0ha.h | ||
| ha0ha.ic | ||
| ha0storage.h | ||
| ha0storage.ic | ||
| ha_prototypes.h | ||
| handler0alter.h | ||
| hash0hash.h | ||
| hash0hash.ic | ||
| ibuf0ibuf.h | ||
| ibuf0ibuf.ic | ||
| ibuf0types.h | ||
| lock0iter.h | ||
| lock0lock.h | ||
| lock0lock.ic | ||
| lock0priv.h | ||
| lock0priv.ic | ||
| lock0types.h | ||
| log0log.h | ||
| log0log.ic | ||
| log0recv.h | ||
| log0recv.ic | ||
| mach0data.h | ||
| mach0data.ic | ||
| mem0dbg.h | ||
| mem0dbg.ic | ||
| mem0mem.h | ||
| mem0mem.ic | ||
| mem0pool.h | ||
| mem0pool.ic | ||
| mtr0log.h | ||
| mtr0log.ic | ||
| mtr0mtr.h | ||
| mtr0mtr.ic | ||
| mtr0types.h | ||
| mysql_addons.h | ||
| os0file.h | ||
| os0proc.h | ||
| os0proc.ic | ||
| os0sync.h | ||
| os0sync.ic | ||
| os0thread.h | ||
| os0thread.ic | ||
| page0cur.h | ||
| page0cur.ic | ||
| page0page.h | ||
| page0page.ic | ||
| page0types.h | ||
| page0zip.h | ||
| page0zip.ic | ||
| pars0grm.h | ||
| pars0opt.h | ||
| pars0opt.ic | ||
| pars0pars.h | ||
| pars0pars.ic | ||
| pars0sym.h | ||
| pars0sym.ic | ||
| pars0types.h | ||
| que0que.h | ||
| que0que.ic | ||
| que0types.h | ||
| read0read.h | ||
| read0read.ic | ||
| read0types.h | ||
| rem0cmp.h | ||
| rem0cmp.ic | ||
| rem0rec.h | ||
| rem0rec.ic | ||
| rem0types.h | ||
| row0ext.h | ||
| row0ext.ic | ||
| row0ins.h | ||
| row0ins.ic | ||
| row0merge.h | ||
| row0mysql.h | ||
| row0mysql.ic | ||
| row0purge.h | ||
| row0purge.ic | ||
| row0row.h | ||
| row0row.ic | ||
| row0sel.h | ||
| row0sel.ic | ||
| row0types.h | ||
| row0uins.h | ||
| row0uins.ic | ||
| row0umod.h | ||
| row0umod.ic | ||
| row0undo.h | ||
| row0undo.ic | ||
| row0upd.h | ||
| row0upd.ic | ||
| row0vers.h | ||
| row0vers.ic | ||
| srv0que.h | ||
| srv0srv.h | ||
| srv0srv.ic | ||
| srv0start.h | ||
| sync0arr.h | ||
| sync0arr.ic | ||
| sync0rw.h | ||
| sync0rw.ic | ||
| sync0sync.h | ||
| sync0sync.ic | ||
| sync0types.h | ||
| thr0loc.h | ||
| thr0loc.ic | ||
| trx0i_s.h | ||
| trx0purge.h | ||
| trx0purge.ic | ||
| trx0rec.h | ||
| trx0rec.ic | ||
| trx0roll.h | ||
| trx0roll.ic | ||
| trx0rseg.h | ||
| trx0rseg.ic | ||
| trx0sys.h | ||
| trx0sys.ic | ||
| trx0trx.h | ||
| trx0trx.ic | ||
| trx0types.h | ||
| trx0undo.h | ||
| trx0undo.ic | ||
| trx0xa.h | ||
| univ.i | ||
| usr0sess.h | ||
| usr0sess.ic | ||
| usr0types.h | ||
| ut0byte.h | ||
| ut0byte.ic | ||
| ut0dbg.h | ||
| ut0list.h | ||
| ut0list.ic | ||
| ut0lst.h | ||
| ut0mem.h | ||
| ut0mem.ic | ||
| ut0rbt.h | ||
| ut0rnd.h | ||
| ut0rnd.ic | ||
| ut0sort.h | ||
| ut0ut.h | ||
| ut0ut.ic | ||
| ut0vec.h | ||
| ut0vec.ic | ||
| ut0wqueue.h | ||