summaryrefslogtreecommitdiff
path: root/innobase
Commit message (Collapse)AuthorAgeFilesLines
* Merge with 3.23 to get fix for halloween problem on Update of InnoDB tablesunknown2003-03-181-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | innobase/row/row0mysql.c: Auto merged innobase/row/row0sel.c: Auto merged sql/key.cc: Auto merged configure.in: Merge with 3.23 mysql-test/r/innodb.result: Merge with 3.23 mysql-test/t/innodb.test: Merge with 3.23 strings/strto.c: Merge with 3.23
| * row0mysql.c:unknown2003-03-161-1/+1
| | | | | | | | | | | | | | | | Test if merging from 3.23 to 4.0 succeeds innobase/row/row0mysql.c: Test if merging from 3.23 to 4.0 succeeds
| * row0sel.c:unknown2003-03-151-13/+8
| | | | | | | | | | | | | | | | Fix bug number 154: GROUP BY and DISTINCT could treat NULL values inequal innobase/row/row0sel.c: Fix bug number 154: GROUP BY and DISTINCT could treat NULL values inequal
| * .del-stamp-h.in~4a5d6676232516c5:unknown2003-03-101-1/+0
| | | | | | | | | | | | | | | | Delete: innobase/stamp-h.in BitKeeper/deleted/.del-stamp-h.in~4a5d6676232516c5: Delete: innobase/stamp-h.in
* | trx0roll.c:unknown2003-03-161-3/+3
| | | | | | | | | | | | | | | | Fix compiler warning in Windows about ib_longlong to ulint conversion innobase/trx/trx0roll.c: Fix compiler warning in Windows about ib_longlong to ulint conversion
* | row0sel.c:unknown2003-03-151-13/+8
| | | | | | | | | | | | | | | | Fix bug number 154: GROUP BY and DISTINCT could treat NULL values inequal innobase/row/row0sel.c: Fix bug number 154: GROUP BY and DISTINCT could treat NULL values inequal
* | os0file.c:unknown2003-03-071-2/+2
| | | | | | | | | | | | | | | | Fix bug in previous push innobase/os/os0file.c: Fix bug in previous push
* | os0file.c:unknown2003-03-071-4/+24
| | | | | | | | | | | | | | | | Print and error message also if a read from file results in the Linux error EEXIST; may happen if the disk is broken innobase/os/os0file.c: Print and error message also if a read from file results in the Linux error EEXIST; may happen if the disk is broken
* | buf0buf.c:unknown2003-03-041-3/+11
| | | | | | | | | | | | | | | | Do not try to resolve the table name of a corrupt page if the code is in ibbackup, i.e., the dict system is not initialized innobase/buf/buf0buf.c: Do not try to resolve the table name of a corrupt page if the code is in ibbackup, i.e., the dict system is not initialized
* | srv0start.c:unknown2003-03-031-6/+17
| | | | | | | | | | | | | | | | Print a more precise error message if log files or data files are of a size different from what is specified in my.cnf innobase/srv/srv0start.c: Print a more precise error message if log files or data files are of a size different from what is specified in my.cnf
* | trx0sys.c, trx0roll.c, srv0start.h:unknown2003-03-023-7/+69
| | | | | | | | | | | | | | | | | | | | | | | | Print trx rollback progress info in crash recovery innobase/include/srv0start.h: Print trx rollback progress info in crash recovery innobase/trx/trx0roll.c: Print trx rollback progress info in crash recovery innobase/trx/trx0sys.c: Print trx rollback progress info in crash recovery
* | merge with 3.23 to get corrected error message files and rename of files in ↵unknown2003-02-261-2/+41
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test innobase/ibuf/ibuf0ibuf.c: Auto merged sql/share/english/errmsg.txt: Auto merged sql/share/french/errmsg.txt: Auto merged sql/share/german/errmsg.txt: Auto merged sql/share/greek/errmsg.txt: Auto merged sql/share/hungarian/errmsg.txt: Auto merged sql/share/italian/errmsg.txt: Auto merged sql/share/japanese/errmsg.txt: Auto merged sql/share/korean/errmsg.txt: Auto merged sql/share/norwegian-ny/errmsg.txt: Auto merged sql/share/norwegian/errmsg.txt: Auto merged sql/sql_analyse.cc: Auto merged sql/sql_analyse.h: Auto merged sql/share/polish/errmsg.txt: Auto merged sql/share/portuguese/errmsg.txt: Auto merged sql/share/romanian/errmsg.txt: Auto merged sql/share/russian/errmsg.txt: Auto merged sql/share/slovak/errmsg.txt: Auto merged sql/share/spanish/errmsg.txt: Auto merged sql/share/ukrainian/errmsg.txt: Auto merged mysql-test/t/rpl000015.slave-mi: Auto merged mysql-test/t/rpl_rotate_logs.slave-mi: Auto merged mysql-test/mysql-test-run.sh: merge with 3.23 scripts/make_binary_distribution.sh: merge with 3.23 sql/share/czech/errmsg.txt: merge with 3.23 sql/share/danish/errmsg.txt: merge with 3.23 sql/share/dutch/errmsg.txt: merge with 3.23 sql/share/estonian/errmsg.txt: merge with 3.23 sql/share/swedish/errmsg.txt: merge with 3.23 sql/sql_class.cc: merge with 3.23 (Keep local copy)
| * ibuf0ibuf.c:unknown2003-02-211-2/+41
| | | | | | | | | | | | | | | | Add diagnostic prints if insert buffer merge is tried to a page whose type is not an index page, try to recover from the situation by discarding the insert buffer records innobase/ibuf/ibuf0ibuf.c: Add diagnostic prints if insert buffer merge is tried to a page whose type is not an index page, try to recover from the situation by discarding the insert buffer records
* | ut0mem.c:unknown2003-02-241-1/+1
| | | | | | | | | | | | | | | | Correct printf format innobase/ut/ut0mem.c: Correct printf format
* | ut0mem.c:unknown2003-02-241-1/+7
| | | | | | | | | | | | | | | | Print correct OS error number also on Windows if we run out of memory innobase/ut/ut0mem.c: Print correct OS error number also on Windows if we run out of memory
* | row0sel.c:unknown2003-02-191-1/+13
| | | | | | | | | | | | | | | | Print a warning if MySQL uses a partial-field key value prefix in a search; that would not work if the search flag would happen to be HA_READ_PREFIX_LAST innobase/row/row0sel.c: Print a warning if MySQL uses a partial-field key value prefix in a search; that would not work if the search flag would happen to be HA_READ_PREFIX_LAST
* | page0cur.c:unknown2003-02-181-20/+51
| | | | | | | | | | | | | | | | | | | | | | | | Prepare for 5.x where HA_READ_PREFIX_LAST may pass only a few first bytes of the last field in a key value ha_innodb.cc: In 4.0 always assume HA_READ_PREFIX_LAST passes a complete-field prefix of a key value; LIKE queries use a padding trick sql/ha_innodb.cc: In 4.0 always assume HA_READ_PREFIX_LAST passes a complete-field prefix of a key value; LIKE queries use a padding trick innobase/page/page0cur.c: Prepare for 5.x where HA_READ_PREFIX_LAST may pass only a few first bytes of the last field in a key value
* | page0cur.c:unknown2003-02-071-0/+5
| | | | | | | | | | | | | | | | Disable PAGE_CUR_LE_OR_EXTENDS because it does not work for non-latin1 char sets now innobase/page/page0cur.c: Disable PAGE_CUR_LE_OR_EXTENDS because it does not work for non-latin1 char sets now
* | page0cur.c:unknown2003-02-071-1/+1
| | | | | | | | | | | | | | | | Sinisas patch to InnoDB ORDER BY DESC bug, push it now so that Jani has it available innobase/page/page0cur.c: Sinisas patch to InnoDB ORDER BY DESC bug, push it now so that Jani has it available
* | Merge with 3.23.56 (Replace manual with 'empty' document)unknown2003-01-281-4/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for bug when using auto_increment column and LAST_INSERT_ID() Makefile.am: Auto merged ltconfig: Auto merged innobase/btr/btr0cur.c: Auto merged sql/Makefile.am: Auto merged Docs/Makefile.am: Merge with 3.23.56 Docs/manual.texi: Merge with 3.23.56 (Replace manual with 'empty' document) libmysql/libmysql.c: Use local version sql/log.cc: Fix for bug when using auto_increment column and LAST_INSERT_ID() sql/sql_base.cc: Use local version
| * btr0cur.c:unknown2003-01-281-4/+8
| | | | | | | | | | | | | | | | Backport from 4.0: Fix a major bug in InnoDB query estimator for queries of type SELECT ... WHERE col < x and SELECT ... WHERE col > x; MySQL could pick a table scan though the result set was only a few rows in a big table innobase/btr/btr0cur.c: Backport from 4.0: Fix a major bug in InnoDB query estimator for queries of type SELECT ... WHERE col < x and SELECT ... WHERE col > x; MySQL could pick a table scan though the result set was only a few rows in a big table
* | Fixes for Netwareunknown2003-01-287-13/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call pthread_mutex_destroy() on not used mutex. Changed comments in .h and .c files from // -> /* */ Added detection of mutex on which one didn't call pthread_mutex_destroy() Fixed bug in create_tmp_field() which causes a memory overrun in queries that uses "ORDER BY constant_expression" Added optimisation for ORDER BY NULL BitKeeper/deleted/.del-ChangeLog~dfc92e15bee6fc75: Delete: sql/ChangeLog BUILD/compile-pentium-valgrind-max: Don't use valgrind with safemalloc as this can hide some bugs Makefile.am: Added platform dirs bdb/os/os_handle.c: Portability fix client/mysql.cc: Fixes for Netware. Fixed duplicate output when using 'tee' Simple optimisations client/mysqldump.c: Portability fix client/mysqltest.c: Portability fix configure.in: Fixes for Netware extra/resolveip.c: Fixes for Netware include/Makefile.am: Fixes for Netware include/config-win.h: Portability fix include/my_global.h: Fixes for Netware include/my_net.h: Fixes for Netware include/my_pthread.h: Fixes for Netware Added detection of mutexes that was not destroyed include/my_sys.h: Fixes for Netware Added 'extern' before external functions include/mysql.h: Fixes for Netware innobase/configure.in: Fixes for Netware innobase/include/os0thread.h: Fixes for Netware innobase/os/os0sync.c: Fixes for Netware innobase/os/os0thread.c: Fixes for Netware innobase/srv/srv0srv.c: Fixes for Netware innobase/srv/srv0start.c: Fixes for Netware innobase/sync/sync0sync.c: Fixes for Netware isam/test3.c: Disable test on Netware libmysql/Makefile.shared: Added my_sleep libmysql/get_password.c: Fixes for Netware libmysql/libmysql.c: Fixes for Netware Made mysql_once_init() global libmysql/manager.c: Fixes for Netware myisam/mi_test3.c: Disable test for netware mysql-test/mysql-test-run.sh: Give warning if output file contains errors mysql-test/r/count_distinct.result: More tests mysql-test/r/group_by.result: Test of ORDER BY NULL mysql-test/t/backup.test: Fixes for Netware mysql-test/t/count_distinct.test: More tests mysql-test/t/func_crypt.test: Fixes for Netware mysql-test/t/grant_cache.test: Fixes for Netware mysql-test/t/group_by.test: Tests of ORDER BY NULL mysql-test/t/rpl000015.test: Fixes for Netware mysql-test/t/rpl000017.test: Fixes for Netware mysql-test/t/rpl_rotate_logs.test: Fixes for Netware mysys/Makefile.am: Added my_sleep.c and my_netware.c mysys/charset.c: Fixes for Netware mysys/default.c: Fixes for Netware mysys/mf_tempfile.c: Fixes for Netware mysys/my_clock.c: Fixes for Netware mysys/my_copy.c: Fixes for Netware mysys/my_getwd.c: Changed function comment from // -> /* */ mysys/my_init.c: Fixes for Netware mysys/my_lock.c: Fixes for Netware mysys/my_messnc.c: Fixes for Netware mysys/my_os2cond.c: Removed comment mysys/my_os2dirsrch.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2dirsrch.h: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2file64.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2mutex.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2thread.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2tls.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_pthread.c: Fixes for Netware mysys/my_redel.c: Fixes for Netware mysys/my_tempnam.c: Fixes for Netware mysys/my_thr_init.c: Remove created mutexes when program ends. mysys/mysys_priv.h: Cleanup mysys/safemalloc.c: Prefix error messages with "Error:" mysys/thr_alarm.c: Destroy internal mutex on end_thr_alarm. mysys/thr_mutex.c: Added detection of mutex on which one didn't call pthread_mutex_destroy() scripts/make_binary_distribution.sh: Fixes for Netware sql/des_key_file.cc: Free mutex at end sql/ha_innodb.cc: Free mutex at end sql/ha_myisam.cc: Changed warnings from REPAIR Note: (For mysql-test-run) sql/hostname.cc: Fixes for Netware sql/item.h: Fixed bug in create_tmp_field() which causes a memory overrun sql/item_func.cc: Free used mutexes sql/item_sum.cc: Fixed bug in create_tmp_field() which causes a memory overrun sql/log.cc: Free used mutexes sql/my_lock.c: Fixes for Netware sql/mysql_priv.h: Fixes for Netware sql/mysqld.cc: Fixes for Netware Added Have_crypt Properly free mutexes from MYSQL_LOG by calling cleanup Free mutex before exit sql/repl_failsafe.cc: Fixes for Netware sql/set_var.cc: Added have_crypt sql/share/english/errmsg.txt: Added version socket and port to stderr log sql/slave.cc: Remove global MASTER_INFO variable and use instead an allocated variable. This allows us to correctly free used mutex. sql/slave.h: Move constructors and destuctors to slave.cc (To make it easier to clear all needed variables) sql/sql_base.cc: Safety fix sql/sql_class.h: Portability fixes. Added 'cleanup' to log handling to be able to free mutexes. sql/sql_insert.cc: Fixes for Netware mysys/my_sleep.c: E sql/sql_parse.cc: Fixes for Netware sql/sql_select.cc: Added optimisation for ORDER BY NULL sql/sql_select.h: Fixed bug in create_tmp_field() which causes a memory overrun sql/sql_table.cc: Fixed bug in create_tmp_field() which causes a memory overrun sql/sql_udf.cc: Free mutex on end vio/test-ssl.c: Simple code cleanup vio/test-sslclient.c: Simple code cleanup vio/test-sslserver.c: Simple code cleanup vio/viotest-ssl.c: Simple code cleanup
* | Merge with 3.23.55unknown2003-01-251-4/+19
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/deleted/.del-net.c~ef21d6402bb882f9: Auto merged innobase/os/os0file.c: Auto merged libmysql/Makefile.am: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/log.cc: Auto merged sql/mysqld.cc: Auto merged sql/sql_select.cc: Auto merged Build-tools/Do-compile: Use local version Makefile.am: remove double libmysql_r configure.in: Use local libmysql/libmysql.c: Dont abort connection if too big packet error sql/ha_innodb.cc: use local sql/net_serv.cc: use local sql/sql_parse.cc: Merge with 3.23.55 (fix double free of user)
| * os0file.c:unknown2003-01-211-4/+7
| | | | | | | | | | | | | | | | The problem yesterday in ERROR_LOCK_VIOLATION was not InnoDB Hot Backup, but some file system backup tool: add to file writes 100 retries with 1 second waits innobase/os/os0file.c: The problem yesterday in ERROR_LOCK_VIOLATION was not InnoDB Hot Backup, but some file system backup tool: add to file writes 100 retries with 1 second waits
| * os0file.c:unknown2003-01-211-4/+16
| | | | | | | | | | | | | | | | Fix an assertion about ERROR_LOCK_VIOLATION 33 in file write if InnoDB Hot Backup is run concurrently with mysqld in Windows innobase/os/os0file.c: Fix an assertion about ERROR_LOCK_VIOLATION 33 in file write if InnoDB Hot Backup is run concurrently with mysqld in Windows
| * btr0sea.c:unknown2003-01-181-1/+11
| | | | | | | | | | | | | | | | Backport from 4.0: fix bug in adaptive hash index search innobase/btr/btr0sea.c: Backport from 4.0: fix bug in adaptive hash index search
| * btr0btr.h, btr0btr.c, row0purge.c:unknown2003-01-163-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | Backport from 4.0: fix the BLOB hang if the index tree is of height 1 innobase/row/row0purge.c: Backport from 4.0: fix the BLOB hang if the index tree is of height 1 innobase/btr/btr0btr.c: Backport from 4.0: fix the BLOB hang if the index tree is of height 1 innobase/include/btr0btr.h: Backport from 4.0: fix the BLOB hang if the index tree is of height 1
| * log0log.c:unknown2003-01-052-11/+27
| | | | | | | | | | | | | | | | | | | | | | | | Backport bugfix from 4.0: combined log file size >= 2 GB could cause log to be written in wrong place btr0pcur.c: Backport bugfix from 4.0: index cursor restoration could theoretically fail innobase/btr/btr0pcur.c: Backport bugfix from 4.0: index cursor restoration could theoretically fail innobase/log/log0log.c: Backport bugfix from 4.0: combined log file size >= 2 GB could cause log to be written in wrong place
* | btr0sea.h, btr0sea.c:unknown2003-01-182-5/+37
| | | | | | | | | | | | | | | | | | | | Fix a crash in page_dir_find_owner_slot if an adaptive hash index search coincides with purge or an insert innobase/btr/btr0sea.c: Fix a crash in page_dir_find_owner_slot if an adaptive hash index search coincides with purge or an insert innobase/include/btr0sea.h: Fix a crash in page_dir_find_owner_slot if an adaptive hash index search coincides with purge or an insert
* | page0cur.c:unknown2003-01-171-2/+4
| | | | | | | | | | | | | | | | Fix bug in PAGE_CUR_LE_OR_EXTENDS search innobase/page/page0cur.c: Fix bug in PAGE_CUR_LE_OR_EXTENDS search
* | srv0srv.c:unknown2003-01-151-0/+4
| | | | | | | | | | | | | | | | Make SHOW INNODB STATUS aware which trx's are waiting because of innodb_thread_concurrency exceeded innobase/srv/srv0srv.c: Make SHOW INNODB STATUS aware which trx's are waiting because of innodb_thread_concurrency exceeded
* | trx0trx.c:unknown2003-01-151-2/+2
| | | | | | | | | | | | | | | | Print also the thread ids in SHOW INNODB STATUS also in Linux innobase/trx/trx0trx.c: Print also the thread ids in SHOW INNODB STATUS also in Linux
* | btr0cur.h, btr0btr.h, btr0btr.c, btr0cur.c, row0purge.c:unknown2003-01-135-9/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a hang associated with an index tree of height 1 and purging of BLOB fields from it innobase/row/row0purge.c: Fix a hang associated with an index tree of height 1 and purging of BLOB fields from it innobase/btr/btr0cur.c: Fix a hang associated with an index tree of height 1 and purging of BLOB fields from it innobase/btr/btr0btr.c: Fix a hang associated with an index tree of height 1 and purging of BLOB fields from it innobase/include/btr0btr.h: Fix a hang associated with an index tree of height 1 and purging of BLOB fields from it innobase/include/btr0cur.h: Fix a hang associated with an index tree of height 1 and purging of BLOB fields from it
* | srv0srv.c:unknown2003-01-131-0/+11
| | | | | | | | | | | | | | | | Add another diagnostic print to determine why the 'queries inside InnoDB' counter might drift upwards innobase/srv/srv0srv.c: Add another diagnostic print to determine why the 'queries inside InnoDB' counter might drift upwards
* | trx0trx.c:unknown2003-01-121-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | Add diagnostic prints to determine why the 'queries inside InnoDB' might drift upwards ha_innodb.cc: Add more print space to SHOW INNODB STATUS; remove possible memory leak in case there is an error sql/ha_innodb.cc: Add more print space to SHOW INNODB STATUS; remove possible memory leak in case there is an error innobase/trx/trx0trx.c: Add diagnostic prints to determine why the 'queries inside InnoDB' might drift upwards
* | mem0pool.c:unknown2003-01-071-13/+0
| | | | | | | | | | | | | | | | Remove the warning message that mem allocation spills from the additional mem pool to the OS; this does not hit performance with modern malloc libraries innobase/mem/mem0pool.c: Remove the warning message that mem allocation spills from the additional mem pool to the OS; this does not hit performance with modern malloc libraries
* | btr0pcur.c:unknown2003-01-052-11/+26
| | | | | | | | | | | | | | | | | | | | | | | | Fix bug: an index cursor can theoretically be restored in a wrong place log0log.c: Fix bug: if combined log file size is >= 2 GB in a 32-bit computer InnoDB can write log to a wrong position innobase/log/log0log.c: Fix bug: if combined log file size is >= 2 GB in a 32-bit computer InnoDB can write log to a wrong position innobase/btr/btr0pcur.c: Fix bug: an index cursor can theoretically be restored in a wrong place
* | A lot of portability fixes.unknown2003-01-055-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added rename table for BDB. This fixes a bug in ALTER TABLE with BDB tables. BUILD/SETUP.sh: Enabled uninitalized warnings for debug builds. Build-tools/Do-compile: Added options --no-mysqltest and --no-benchmarks Log time before each stage Removed warnings on some OS (at least hpux11) acinclude.m4: Fixed call to wrong function configure.in: Don't use -O3 as compiler option with aCC innobase/include/univ.i: Removed compiler warning (on Hpux11) innobase/os/os0file.c: Removed compiler warning (on Hpux11) innobase/trx/trx0sys.c: Removed compiler warning (on Hpux11) innobase/trx/trx0trx.c: Removed compiler warning (on Hpux11) innobase/ut/ut0ut.c: Removed compiler warning (with gcc) myisam/mi_check.c: Added missing 'static' myisam/mi_test1.c: Added missing 'static' mysys/my_getopt.c: Added missing 'static' sql/ha_berkeley.cc: Added rename table. This fixes a bug in ALTER TABLE with BDB tables. Fixed compilation problem on OSF1 sql/ha_berkeley.h: Added rename table. This fixes a bug in ALTER TABLE with BDB tables. sql/mini_client.cc: Added reinterpret cast to avoid some warnings. sql/sql_parse.cc: Added reinterpret cast to avoid some warnings. Removed usage of strnlen() as this gave portability problems. sql/sql_union.cc: Added reinterpret cast to avoid some warnings. sql/table.cc: Added reinterpret cast to avoid some warnings. tools/mysqlmanager.c: Added missing 'static'
* | Many files:unknown2002-12-2218-136/+663
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE sql_select.cc: Remove superfluous prints to .err log when a locking SELECT fails to a deadlock or a lock wait timeout sql/sql_select.cc: Remove superfluous prints to .err log when a locking SELECT fails to a deadlock or a lock wait timeout innobase/btr/btr0sea.c: Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE innobase/dict/dict0dict.c: Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE innobase/fsp/fsp0fsp.c: Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE innobase/ibuf/ibuf0ibuf.c: Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE innobase/include/buf0buf.h: Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE innobase/include/db0err.h: Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE innobase/include/dict0mem.h: Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE innobase/include/mem0mem.h: Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE innobase/include/row0mysql.h: Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE innobase/include/row0upd.h: Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE innobase/include/mem0mem.ic: Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE innobase/mem/mem0pool.c: Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE innobase/row/row0ins.c: Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE innobase/row/row0mysql.c: Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE innobase/row/row0sel.c: Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE innobase/row/row0upd.c: Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE innobase/srv/srv0start.c: Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE innobase/ut/ut0ut.c: Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
* | Merge with 3.23:unknown2002-12-211-3/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate casedn_str() in mysql_change_db() Fix for null handling in CASE innobase/btr/btr0sea.c: Auto merged mysql-test/t/case.test: Auto merged sql/ha_innodb.cc: Auto merged sql/item_cmpfunc.cc: Auto merged mysql-test/r/case.result: merge with 3.23 sql/sql_db.cc: Merge with 3.23 (to remove duplicate casedn_str())
| * btr0sea.c:unknown2002-12-201-3/+4
| | | | | | | | | | | | | | | | Remove an assertion which can fail in a race of 3 threads innobase/btr/btr0sea.c: Remove an assertion which can fail in a race of 3 threads
* | Removed compiler warningsunknown2002-12-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed wrong variable name for Windows VC++Files/innobase/innobase.dsp: Don't use precompiled headers (doesn't work with samba) VC++Files/myisammrg/myisammrg.dsp: Add missing files VC++Files/mysqlbinlog/mysqlbinlog.dsp: Fixed included paths VC++Files/mysqldemb/mysqldemb.dsp: Don't use precompiled headers (doesn't work with samba) VC++Files/mysqlserver/mysqlserver.dsp: Don't use precompiled headers (doesn't work with samba) VC++Files/sql/mysqld.dsp: Fixed paths innobase/include/univ.i: Removed compiler warning myisammrg/myrg_open.c: Removed compiler warning sql/ha_myisam.cc: Removed compiler warning Fixed wrong (but not dangerous) if statement sql/ha_myisammrg.cc: Removed compiler warning sql/mysqld.cc: Fixed wrong variable name for Windows sql/sql_update.cc: Removed not used label
* | Ensure that BEGIN / COMMIT is handled properly if slave diesunknown2002-12-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added syntax support for CREATE TABLE foo (a char CHARACTER SET latin1) CHARSET=latin1; Docs/internals.texi: Update binary protocol description innobase/include/db0err.h: Merge from 3.23 mysql-test/r/insert.result: Updated test result from 3.23 sql/log.cc: Fixed bug in replication and log rotation sql/log_event.cc: Ensure that BEGIN / COMMIT is handled properly if slave dies sql/slave.cc: Fixed bug in replication and log rotation sql/slave.h: Ensure that BEGIN / COMMIT is handled properly if slave dies sql/sql_analyse.cc: Moved usage of res before res is destroyed (by bzero(&s...)) sql/sql_yacc.yy: Added syntax support for CREATE TABLE foo (a char CHARACTER SET latin1) CHARSET=latin1; To be able to read MySQL 4.1 dump files.
* | Merge with 3.23unknown2002-12-111-0/+21
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | innobase/dict/dict0dict.c: Auto merged libmysql/libmysql.c: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/mysqld.cc: Auto merged sql/sql_udf.cc: Auto merged sql/ha_innodb.cc: Auto merged innobase/include/db0err.h: Skiped merge (Heikki wants to do this) innobase/row/row0mysql.c: Skiped merge (Heikki wants to do this) sql/sql_show.cc: Use local code
| * row0mysql.c:unknown2002-12-051-1/+0
| | | | | | | | | | | | | | | | Heikki will merge to 4.0: cleanup innobase/row/row0mysql.c: Heikki will merge to 4.0: cleanup
| * row0mysql.c, dict0dict.c, db0err.h, ha_innobase.cc:unknown2002-12-053-7/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Heikki will merge to 4.0: Prevent listing the same column twice in an InnoDB index: that will cause index corruption when that col is UPDATEd sql/ha_innobase.cc: Heikki will merge to 4.0: Prevent listing the same column twice in an InnoDB index: that will cause index corruption when that col is UPDATEd innobase/include/db0err.h: Heikki will merge to 4.0: Prevent listing the same column twice in an InnoDB index: that will cause index corruption when that col is UPDATEd innobase/dict/dict0dict.c: Heikki will merge to 4.0: Prevent listing the same column twice in an InnoDB index: that will cause index corruption when that col is UPDATEd innobase/row/row0mysql.c: Heikki will merge to 4.0: Prevent listing the same column twice in an InnoDB index: that will cause index corruption when that col is UPDATEd
| * row0mysql.c, row0mysql.h:unknown2002-11-192-0/+2
| | | | | | | | | | | | | | | | | | | | Backport of bug fix in 4.0: do not x-lock rows under LOCK TABLES READ unless the table is a temp table innobase/include/row0mysql.h: Backport of bug fix in 4.0: do not x-lock rows under LOCK TABLES READ unless the table is a temp table innobase/row/row0mysql.c: Backport of bug fix in 4.0: do not x-lock rows under LOCK TABLES READ unless the table is a temp table
| * row0sel.c:unknown2002-11-131-9/+1
| | | | | | | | | | | | | | | | Backport from 4.0 a bug fix: if unique search from a primary key matched a delete-marked record, InnoDB could return the NEXT record innobase/row/row0sel.c: Backport from 4.0 a bug fix: if unique search from a primary key matched a delete-marked record, InnoDB could return the NEXT record
| * row0mysql.c:unknown2002-11-071-4/+19
| | | | | | | | | | | | | | | | Backport from 4.0: Fix corruption of ON DELETE CASCADE in lock wait timeout innobase/row/row0mysql.c: Backport from 4.0: Fix corruption of ON DELETE CASCADE in lock wait timeout
| * ha_innobase.cc:unknown2002-10-311-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Backport from 4.0: Fix bug in MySQL-3.23 ORDER BY from a table with no PRIMARY KEY and where the user had added UNIQUE indexes with CREATE INDEX pars0grm.y: Move inclusion of math.h after univ.i also in the .y file; this fix is already done in 4.0 innobase/pars/pars0grm.y: Move inclusion of math.h after univ.i also in the .y file; this fix is already done in 4.0 sql/ha_innobase.cc: Backport from 4.0: Fix bug in MySQL-3.23 ORDER BY from a table with no PRIMARY KEY and where the user had added UNIQUE indexes with CREATE INDEX
View Lorry Controller Status