summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Make GRANTs, which change SSL attributes and/or user limits,unknown2004-12-233-26/+69
| | | | | | | | | | | | | to behave well on 5.0 tables (well now you can't use tables from 4.1 and 5.0 with 4.0 because former use utf8, but still it is nice to have similar code in acl_init() and replace_user_table()). This also will make such GRANTs working in 5.0 (they are broken now). mysql-test/r/grant.result: Added test for GRANT which manipulates user limits. mysql-test/t/grant.test: Added test for GRANT which manipulates user limits.
* ha_innodb.cc:unknown2004-12-221-1/+2
| | | | | | | | If AUTOCOMMIT=1, do not acquire an InnoDB table lock in LOCK TABLES; this makes porting of old MyISAM applications to InnoDB easier, since in that mode InnoDB table locks caused deadlocks very easily sql/ha_innodb.cc: If AUTOCOMMIT=1, do not acquire an InnoDB table lock in LOCK TABLES; this makes porting of old MyISAM applications to InnoDB easier, since in that mode InnoDB table locks caused deadlocks very easily
* os0file.c:unknown2004-12-211-2/+2
| | | | | | | | Put back accidentally removed undef and remove a debug def innobase/os/os0file.c: Put back accidentally removed undef and remove a debug def
* os0file.c:unknown2004-12-211-8/+10
| | | | | | | | Fix InnoDB bug: on HP-UX, with a 32-bit binary, InnoDB was only able to read or write <= 2 GB files; the reason was that InnoDB treated the return value of lseek() as a 32-bit integer; lseek was used on HP-UX-11 as a replacement for pread() and pwrite() because HAVE_BROKEN_PREAD was defined on that platform innobase/os/os0file.c: Fix InnoDB bug: on HP-UX, with a 32-bit binary, InnoDB was only able to read or write <= 2 GB files; the reason was that InnoDB treated the return value of lseek() as a 32-bit integer; lseek was used on HP-UX-11 as a replacement for pread() and pwrite() because HAVE_BROKEN_PREAD was defined on that platform
* configure.in:unknown2004-12-201-1/+1
| | | | | | | | Increment from 4.0.23 to 4.0.24 configure.in: Increment from 4.0.23 to 4.0.24
* Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-12-181-1/+0
|\ | | | | | | | | | | | | into ltantony.rdg.cyberkinetica.homeunix.net:/usr/home/antony/work/bug7391.4
| * Fix testunknown2004-12-181-1/+0
| |
* | Simplify code during reviewunknown2004-12-181-8/+2
|/
* Remove bogus linesunknown2004-12-181-7/+0
|
* Bug#7391 - Multi-table UPDATE security regressionunknown2004-12-183-0/+156
| | | | | | | | | | | | | | | | Add in missing privilege checks. Tests for the privileges. mysql-test/r/grant.result: Bug#7391 - Multi-table UPDATE security regression Tests column, table and db level access mysql-test/t/grant.test: Bug#7391 - Multi-table UPDATE security regression Tests column, table and db level access sql/sql_update.cc: Bug#7391 - Multi-table UPDATE security regression Add in missing privilege checks.
* Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-12-161-3/+11
|\ | | | | | | | | | | | | into mysql.com:/M40/mysql-4.0
| * Have 'mysql-test-run' write a list of all failed tests at the end, if run ↵unknown2004-12-161-3/+11
| | | | | | | | | | | | | | | | with '--force'. mysql-test/mysql-test-run.sh: Backport an improvement from 4.1: If the tool is run with '--force', give a list of all test cases that failed at the end. This is essential for automated analysis of the build logs file.
* | Moved drop table statement to the end.unknown2004-12-162-1/+2
| | | | | | | | | | | | | | mysql-test/r/update.result: moved drop statement mysql-test/t/update.test: moved drop statement
* | Test for BUG#6054. The bug itsel is fixed by the fix for #5837.unknown2004-12-162-0/+15
|/ | | | | | | mysql-test/r/update.result: test results mysql-test/t/update.test: bug test
* dict0load.c:unknown2004-12-131-0/+16
| | | | | | | | dict_load_table(): detect the new table format of MySQL 5.0.3 innobase/dict/dict0load.c: dict_load_table(): detect the new table format of MySQL 5.0.3
* Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-12-114-1/+35
|\ | | | | | | | | | | | | into mysql.com:/dbdata/psergey/mysql-4.0-bug6976
| * Fix for BUG#6976:unknown2004-12-114-1/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Item_ref::Item_ref set maybe_null (and other fields fix_fields sets) to be the same as in (*ref), because Item_ref::fix_fields() will not be called. Previously maybe_null was 0 always and this produced a bogus state where maybe_null==0 && is_null() == true which broke evaluation for some upper-level Items, like AND and OR. mysql-test/r/group_by.result: Test for BUG#6976 mysql-test/t/group_by.test: Test for BUG#6976 sql/item.cc: Comment added sql/item.h: Fix for BUG#6976: in Item_ref::Item_ref(Item**...) fix all fields because fix_fields() will not be called.
* | Fix for BUG#5837 - attempt 3.unknown2004-12-114-4/+31
| | | | | | | | | | | | | | | | | | | | | | | | Call mark_as_null_row in join_read_const and join_read_system. mysql-test/r/multi_update.result: Testcase for BUG#5837 mysql-test/t/multi_update.test: Testcase for BUG#5837 sql/table.h: Added comments
* | Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-12-103-9/+39
|\ \ | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/k/mysql-4.0
| * | dict0dict.h, dict0dict.c, ha_innodb.cc:unknown2004-12-103-9/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for the 0xA0 character problem in the InnoDB FOREIGN KEY parser: if my_isspace() treats 0xA0 as space, then let InnoDB do the same; this might break some multi-byte charset id's, though for big5, ujis, sjis this seems not to change the current behavior (I checked the tables in /share/charsets); this fix must NOT be merged to 4.1 because in 4.1 everything is in UTF-8 sql/ha_innodb.cc: Fix for the 0xA0 character problem in the InnoDB FOREIGN KEY parser: if my_isspace() treats 0xA0 as space, then let InnoDB do the same; this might break some multi-byte charset id's, though for big5, ujis, sjis this seems not to change the current behavior (I checked the tables in /share/charsets); this fix must NOT be merged to 4.1 because in 4.1 everything is in UTF-8 innobase/dict/dict0dict.c: Fix for the 0xA0 character problem in the InnoDB FOREIGN KEY parser: if my_isspace() treats 0xA0 as space, then let InnoDB do the same; this might break some multi-byte charset id's, though for big5, ujis, sjis this seems not to change the current behavior (I checked the tables in /share/charsets); this fix must NOT be merged to 4.1 because in 4.1 everything is in UTF-8 innobase/include/dict0dict.h: Fix for the 0xA0 character problem in the InnoDB FOREIGN KEY parser: if my_isspace() treats 0xA0 as space, then let InnoDB do the same; this might break some multi-byte charset id's, though for big5, ujis, sjis this seems not to change the current behavior (I checked the tables in /share/charsets); this fix must NOT be merged to 4.1 because in 4.1 everything is in UTF-8
* | | srv0srv.c:unknown2004-12-101-1/+0
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | srv_printf_innodb_monitor(): Removed extraneous rewind() call. The caller of this function calls rewind() if necessary. In this way, we avoid rewind()ing stderr in srv_lock_timeout_and_monitor_thread(). innobase/srv/srv0srv.c: srv_printf_innodb_monitor(): Removed extraneous rewind() call. The caller of this function calls rewind() if necessary. In this way, we avoid rewind()ing stderr in srv_lock_timeout_and_monitor_thread().
* | Merge bk-internal:/home/bk/mysql-4.0/unknown2004-12-072-10/+12
|\ \ | |/ |/| | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| * two fixes for potential security bugsunknown2004-12-072-10/+12
| |
* | Prevent adding 'CREATE TABLE .. SELECT' query to the binary log when theunknown2004-12-036-8/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | insertion of new records partially failed. It would get logged because of the logic to log a partially-failed 'INSERT ... SELECT' (which can't be rolled back in non-transactional tables), but 'CREATE TABLE ... SELECT' is always rolled back on failure, even for non-transactional tables. (Bug #6682) (Original fix reimplemented after review by Serg and Guilhem.) mysql-test/t/insert_select.test: Add test case for Bug #6682 mysql-test/r/insert_select.result: Add results for test case for Bug #6682 sql/sql_table.cc: moved tmp_disable_binlog() and reenable_binlog macros to sql/sql_class.h sql/sql_insert.cc: disable binlog during call to super's ::send_error in select_create class sql/sql_class.h: add select_create::send_error() BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | A fix (bug #6878: Crash with engine=memory).unknown2004-12-023-0/+27
| | | | | | | | | | | | heap/hp_open.c: A fix (bug #6878: Crash with engine=memory). Record length should be >= sizeof(byte*).
* | two-line fix for BUG#6732 "FLUSH TABLES WITH READ LOCK + COMMIT makes next ↵unknown2004-11-303-4/+83
|/ | | | | | | | | | | | | | | | | | | | FLUSH...LOCK hang forever" (originally reported as "second run of innobackup hangs forever and can even hang server"). Plus testcase for the bugfix and comments about global read locks. mysql-test/r/flush_block_commit.result: result update mysql-test/t/flush_block_commit.test: testing bugfix (originally: second run of innobackup hangs) sql/lock.cc: When we are in start_waiting_global_read_lock(), if we ourselves have the global read lock, there is nothing to start. This makes a pair with how wait_if_global_read_lock() behaves when we ourselves have the global read lock. Previously, start_waiting_global_read_lock() decremented protect... whereas wait_if_global_read_lock() hadn't incremented it => very wrong => hangs. Descriptive comments on how global read lock works.
* srv0srv.c:unknown2004-11-261-5/+7
| | | | | | | | | | srv_lock_timeout_and_monitor_thread(): write to srv_monitor_file only if --innodb_status_file=1 innobase/srv/srv0srv.c: srv_lock_timeout_and_monitor_thread(): write to srv_monitor_file only if --innodb_status_file=1
* Fixes while reviewing codeunknown2004-11-267-26/+25
| | | | | | | | | | | | | | | | | | | | (Cleanups and better bug fixes) mysql-test/r/select.result: Fixed test after wrong merge mysql-test/t/select.test: Fixed test after wrong merge scripts/mysql_fix_privilege_tables.sh: Don't read defaults files sql/item_cmpfunc.cc: Fix wrong value for not_null_tables_cache sql/item_cmpfunc.h: Remove wrong patch (flags are set in fix_length_and_dec()) sql/item_func.h: Fix wrong value for not_null_tables_cache sql/slave.cc: Fixed indentation
* Merge mysql.com:/home/timka/mysql/src/4.0-virginunknown2004-11-257-7/+66
|\ | | | | | | | | | | | | | | into mysql.com:/home/timka/mysql/src/4.0-master BitKeeper/etc/logging_ok: auto-union
| * Merge mysql.com:/space/bkroot/mysql-4.0unknown2004-11-257-7/+66
| |\ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/bk/b6148-mysql-4.0 BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| | * Fix for Bug#6148. Only rewind read position in binary log when theunknown2004-11-256-7/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | slave SQL thread is started. sql/slave.cc: Adding threads to init as parameter to init_master_info. Only rewind read position when starting SQL thread. sql/slave.h: Adding threads to init as parameter to init_master_info. Only rewind read position when starting SQL thread. sql/sql_repl.cc: Adding threads to init as parameter to init_master_info. Only rewind read position when starting SQL thread. sql/repl_failsafe.cc: Adding threads to init as parameter to init_master_info. Only rewind read position when starting SQL thread.
* | | Merge for BUG#3759 which was missing from the main tree for some reason.unknown2004-11-25210-1403/+4184
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union sql/item_cmpfunc.h: Auto merged mysql-test/r/select.result: Merge for BUG#3759 mysql-test/t/select.test: Merge for BUG#3759
| * | Ensure consistent sources up to 5.0 where a C++ problem occurs.unknown2004-11-241-1/+1
| | | | | | | | | | | | | | | client/mysqladmin.c: Cast to overcome a C vs. C++ signature problem, occurring in 5.0 where this is a C++ file.
| * | Change "Do-compile" to make automatic build log analysis easier and unknown2004-11-231-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to run the standard tests with "--force" (default, can be switched off). Build-tools/Do-compile: 1) For an automated log analysis, we need a clear marker in the build log whether compile + link succeeded: Write it after successful "make". 2) Ensure the standard tests are run with "--force" in the default case, but allow the old behaviour by an option "--one-error". 3) Correct a typing error in the usage message.
| * | "Table file %s was created in MySQL 4.1+" is an error, not a warningunknown2004-11-221-0/+4
| | |
| * | merged with ulunknown2004-11-221-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union Docs/Support/texi2html: Auto merged mysql-test/t/rpl000001.test: Auto merged mysql-test/t/rpl000015.test: Auto merged mysql-test/t/rpl_log_pos.test: Auto merged
| | * | texi2html:unknown2004-10-212-45/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update texi2html with version from mysqldoc repository. (Please merge this forward to 4.0, 4.1, 5.0.) Docs/Support/texi2html: Update texi2html with version from mysqldoc repository. (Please merge this forward to 4.0, 4.1, 5.0.) BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| | * | texi2html:unknown2004-10-152-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes parsing of @image argument. Docs/Support/texi2html: Changes parsing of @image argument. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| | * | Enabled mysqltest for MASTER_PORT replacement.unknown2004-08-249-34/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced fixed port numbers by MASTER_PORT replacement. This allows for a set of ports per tree and hence parallel testing on multiple trees. client/mysqltest.c: Enabled mysqltest for MASTER_PORT replacement. mysql-test/r/rpl000014.result: Replaced fixed port numbers by MASTER_PORT. mysql-test/r/rpl000015.result: Replaced fixed port numbers by MASTER_PORT. mysql-test/r/rpl_rotate_logs.result: Replaced fixed port numbers by MASTER_PORT. mysql-test/t/rpl000001.test: Replaced fixed port numbers by MASTER_PORT replacement. Just in case it might get un-commented. mysql-test/t/rpl000014.test: Replaced fixed port numbers by MASTER_PORT replacement. mysql-test/t/rpl000015.test: Replaced fixed port numbers by MASTER_PORT replacement. mysql-test/t/rpl_rotate_logs.test: Replaced fixed port numbers by MASTER_PORT replacement. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | Merge bk-internal:/home/bk/mysql-4.0/unknown2004-11-223-2/+12
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| | * | | ft_boolean_search.c:unknown2004-11-223-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug#6705 - (+trunc1* +trunc2*) fulltext.test, fulltext.result: bug#6705 mysql-test/r/fulltext.result: bug#6705 mysql-test/t/fulltext.test: bug#6705 myisam/ft_boolean_search.c: bug#6705 - (+trunc1* +trunc2*)
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-11-193-34/+36
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/dlenev/src/mysql-4.0-bg6439
| | * | | | Proposed fix for bug #6439 "from_unixtime() function returns wrong datetime unknown2004-11-153-34/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | values for too big argument". Added range checking for from_unixtime() argument, cleaned up code a bit. mysql-test/r/func_time.result: Test for bug #6439 "from_unixtime() function returns wrong datetime values for too big argument". mysql-test/t/func_time.test: Test for bug #6439 "from_unixtime() function returns wrong datetime values for too big argument". sql/item_timefunc.cc: Item_func_from_unixtime: Added error range checking for function argument + small code clean up.
| * | | | | When mysqlbinlog prints LOAD DATA INFILE, let it print the thread id. Some ↵unknown2004-11-181-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | customer would have benefited much from this in his recovery. All this change does is adding one commented (#) line before the LOAD DATA command, so it is quite innocuous.
| * | | | test for bug#5528unknown2004-11-172-0/+19
| | | | |
| * | | | ha_innodb.cc:unknown2004-11-161-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix InnoDB bug #6287: if one uses INSERT IGNORE to insert several rows at a time, and the first inserts are ignored because of a duplicate key collision, then InnoDB in a replication slave assigns AUTO_INCREMENT values 1 bigger than in the master sql/ha_innodb.cc: Fix InnoDB bug #6287: if one uses INSERT IGNORE to insert several rows at a time, and the first inserts are ignored because of a duplicate key collision, then InnoDB in a replication slave assigns AUTO_INCREMENT values 1 bigger than in the master
| * | | | wrong constant fixed - boolean fulltext searches like "+something +smth*"unknown2004-11-121-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | were stopping at docid 0xffffffff
| * | | | Makefile.am:unknown2004-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add -acc flag for texi2html to handle accented characters. Docs/Makefile.am: Add -acc flag for texi2html to handle accented characters.
| * | | | Removed an unneccessary for() and variable.unknown2004-11-121-5/+4
| | | | |
| * | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-11-124-31/+77
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b6564
View Lorry Controller Status