summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge with 4.0.18unknown2004-02-11229-3728/+6995
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union mysql-test/r/ctype_tis620.result-old: Merge rename: mysql-test/r/ctype_tis620.result -> mysql-test/r/ctype_tis620.result-old BUILD/compile-pentium-max: Auto merged BitKeeper/etc/config: Auto merged Build-tools/Bootstrap: Auto merged Build-tools/Do-compile: Auto merged configure.in: Auto merged mysql-test/t/ctype_tis620.test-old: Merge rename: mysql-test/t/ctype_tis620.test -> mysql-test/t/ctype_tis620.test-old Docs/Makefile.am: Auto merged client/mysqldump.c: Auto merged client/mysqltest.c: Auto merged include/my_global.h: Auto merged include/my_pthread.h: Auto merged include/my_sys.h: Auto merged include/myisam.h: Auto merged innobase/btr/btr0cur.c: Auto merged innobase/ibuf/ibuf0ibuf.c: Auto merged innobase/include/dict0dict.h: Auto merged innobase/include/srv0srv.h: Auto merged innobase/include/ut0mem.h: Auto merged innobase/log/log0log.c: Auto merged innobase/row/row0ins.c: Auto merged innobase/row/row0sel.c: Auto merged innobase/srv/srv0start.c: Auto merged innobase/ut/ut0mem.c: Auto merged myisam/mi_check.c: Auto merged myisam/mi_dynrec.c: Auto merged myisam/mi_key.c: Auto merged myisam/myisam_ftdump.c: Auto merged myisam/myisamdef.h: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/alter_table.result: Auto merged mysql-test/r/bdb.result: Auto merged mysql-test/r/bigint.result: Auto merged mysql-test/r/fulltext.result: Auto merged
| * Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-02-101-1/+1
| |\ | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.0
| | * Export CXX and AR to make it easier to invoke other configure scripts with ↵unknown2004-02-101-1/+1
| | | | | | | | | | | | same options.
| * | compile-irix-mips64-mipspro addded to the source distributionunknown2004-02-101-0/+1
| |/
| * Code cleanupsunknown2004-02-103-86/+162
| | | | | | | | | | | | | | | | | | client/mysqlbinlog.cc: Ensure that errors are returned to upper levels instead of just doing 'exit/die' in sub function. sql/handler.h: Indentation cleanup sql/sql_insert.cc: Indentation cleanup
| * row0mysql.c:unknown2004-02-097-2/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow always DROPping of a table which is only referenced by FOREIGN KEY constraints from the same table Many files: Do not let REPLACE to perform internally an UPDATE if the table is referenced by a FOREIGN KEY: the manual says that REPLACE must resolve a duplicate key error semantically with DELETE(s) + INSERT, and not by an UPDATE; the internal update caused foreign key checks and cascaded operations to behave in a semantically wrong way sql/ha_innodb.cc: Do not let REPLACE to perform internally an UPDATE if the table is referenced by a FOREIGN KEY: the manual says that REPLACE must resolve a duplicate key error semantically with DELETE(s) + INSERT, and not by an UPDATE; the internal update caused foreign key checks and cascaded operations to behave in a semantically wrong way sql/sql_insert.cc: Do not let REPLACE to perform internally an UPDATE if the table is referenced by a FOREIGN KEY: the manual says that REPLACE must resolve a duplicate key error semantically with DELETE(s) + INSERT, and not by an UPDATE; the internal update caused foreign key checks and cascaded operations to behave in a semantically wrong way sql/ha_innodb.h: Do not let REPLACE to perform internally an UPDATE if the table is referenced by a FOREIGN KEY: the manual says that REPLACE must resolve a duplicate key error semantically with DELETE(s) + INSERT, and not by an UPDATE; the internal update caused foreign key checks and cascaded operations to behave in a semantically wrong way sql/handler.h: Do not let REPLACE to perform internally an UPDATE if the table is referenced by a FOREIGN KEY: the manual says that REPLACE must resolve a duplicate key error semantically with DELETE(s) + INSERT, and not by an UPDATE; the internal update caused foreign key checks and cascaded operations to behave in a semantically wrong way innobase/dict/dict0dict.c: Do not let REPLACE to perform internally an UPDATE if the table is referenced by a FOREIGN KEY: the manual says that REPLACE must resolve a duplicate key error semantically with DELETE(s) + INSERT, and not by an UPDATE; the internal update caused foreign key checks and cascaded operations to behave in a semantically wrong way innobase/include/dict0dict.h: Do not let REPLACE to perform internally an UPDATE if the table is referenced by a FOREIGN KEY: the manual says that REPLACE must resolve a duplicate key error semantically with DELETE(s) + INSERT, and not by an UPDATE; the internal update caused foreign key checks and cascaded operations to behave in a semantically wrong way innobase/row/row0mysql.c: Allow always DROPping of a table which is only referenced by FOREIGN KEY constraints from the same table
| * row0mysql.c:unknown2004-02-091-1/+1
| | | | | | | | | | | | | | | | Fix crash in InnoDB RENAME TABLE if 'databasename/tablename' is shorter than 5 characters (Bug #2689); reported by Sergey Petrunia innobase/row/row0mysql.c: Fix crash in InnoDB RENAME TABLE if 'databasename/tablename' is shorter than 5 characters (Bug #2689); reported by Sergey Petrunia
| * follow-up to bug #2628: attempt to makeunknown2004-02-091-2/+6
| | | | | | | | | | | | | | | | alter table rename a bit more efficient in case of lower_case_table_names.
| * Many files:unknown2004-02-098-67/+440
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug #2167: generate foreign key id's locally for each table, in the form databasename/tablename_ibfk_number; if the user gives the constraint name explicitly remember it; these changes should ensure that foreign key id's in a slave are the same as in the master, and DROP FOREIGN KEY does not break replication sync0sync.c: UNIV_SYNC_DEBUG caused assertion in the creation of the doublewrite buffer, if we do not allow thousands of latches per thread innobase/dict/dict0crea.c: Fix bug #2167: generate foreign key id's locally for each table, in the form databasename/tablename_ibfk_number; if the user gives the constraint name explicitly remember it; these changes should ensure that foreign key id's in a slave are the same as in the master, and DROP FOREIGN KEY does not break replication innobase/dict/dict0dict.c: Fix bug #2167: generate foreign key id's locally for each table, in the form databasename/tablename_ibfk_number; if the user gives the constraint name explicitly remember it; these changes should ensure that foreign key id's in a slave are the same as in the master, and DROP FOREIGN KEY does not break replication innobase/include/dict0crea.h: Fix bug #2167: generate foreign key id's locally for each table, in the form databasename/tablename_ibfk_number; if the user gives the constraint name explicitly remember it; these changes should ensure that foreign key id's in a slave are the same as in the master, and DROP FOREIGN KEY does not break replication innobase/include/dict0dict.h: Fix bug #2167: generate foreign key id's locally for each table, in the form databasename/tablename_ibfk_number; if the user gives the constraint name explicitly remember it; these changes should ensure that foreign key id's in a slave are the same as in the master, and DROP FOREIGN KEY does not break replication innobase/include/ut0mem.h: Fix bug #2167: generate foreign key id's locally for each table, in the form databasename/tablename_ibfk_number; if the user gives the constraint name explicitly remember it; these changes should ensure that foreign key id's in a slave are the same as in the master, and DROP FOREIGN KEY does not break replication innobase/row/row0mysql.c: Fix bug #2167: generate foreign key id's locally for each table, in the form databasename/tablename_ibfk_number; if the user gives the constraint name explicitly remember it; these changes should ensure that foreign key id's in a slave are the same as in the master, and DROP FOREIGN KEY does not break replication innobase/sync/sync0sync.c: UNIV_SYNC_DEBUG caused assertion in the creation of the doublewrite buffer, if we do not allow thousands of latches per thread innobase/ut/ut0mem.c: Fix bug #2167: generate foreign key id's locally for each table, in the form databasename/tablename_ibfk_number; if the user gives the constraint name explicitly remember it; these changes should ensure that foreign key id's in a slave are the same as in the master, and DROP FOREIGN KEY does not break replication
| * ha_innodb.cc:unknown2004-02-081-4/+10
| | | | | | | | | | | | | | | | If AUTOCOMMIT=1, then we do not need to make a plain SELECT set shared locks even on the SERIALIZABLE isolation level, because we know the transaction is read-only: a read-only transaction can always be performed on the REPEATABLE READ level, and that does not endanger the serializability sql/ha_innodb.cc: If AUTOCOMMIT=1, then we do not need to make a plain SELECT set shared locks even on the SERIALIZABLE isolation level, because we know the transaction is read-only: a read-only transaction can always be performed on the REPEATABLE READ level, and that does not endanger the serializability
| * Delete: COPYING.LIBunknown2004-02-061-481/+0
| |
| * Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-02-065-183/+261
| |\ | | | | | | | | | | | | | | | | | | into mysql.com:/home/kostja/mysql/mysql-4.0-merge
| | * fixed bug #1378 "mysqlbinlog for remote host is broken"unknown2004-02-065-183/+261
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysqlbinlog.cc: fixed bug #1378 "mysqlbinlog for remote host is broken" by using shared part of code for local and remote variant (function process_event) mysql-test/r/mysqlbinlog.result: fixed results for remote variant (they are the same as for local now) mysql-test/t/mysqlbinlog.test: discarded note 'V. Vagin should ...' because V.Vagin done sql/log_event.cc: added special local_fname flag to Load_log_event for using in Load_log_event::check_fname_outside_temp_buf instead of ugly condition sql/log_event.h: added special local_fname flag to Load_log_event for using in Load_log_event::check_fname_outside_temp_buf instead of ugly condition
| * | 3.23 -> 4.0 merge: after merge fixesunknown2004-02-065-0/+41
| | |
| * | merge 3.23 -> 4.0, 2003/02/06unknown2004-02-0611-23/+125
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union mysql-test/r/func_math.result: Auto merged mysql-test/t/func_math.test: Auto merged sql/item_func.cc: Auto merged
| | * Fix for bug #2628 "ALTER TABLE destroys table and reports success"unknown2004-02-064-6/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted mysql-test/r/alter_table.result: Fix for bug #2628: test result fixed mysql-test/t/alter_table.test: Fix for bug #2628: test case added sql/sql_table.cc: Fix for bug #2628: We need to take into account database name when checking if source and destination table names are equal. Note, that after merge to 4.0 we also need to check for lower_case_table_names.
| | * clean up commentsunknown2004-02-031-2/+2
| | |
| | * Fixed Bug #2338 Trigonometric arithmetic problemunknown2004-01-123-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by fixing optimizer bug with help of 'volatile' keyword mysql-test/r/func_math.result: added tests for BUG #2338 Trigonometric arithmetic problems mysql-test/t/func_math.test: added tests for BUG #2338 Trigonometric arithmetic problems sql/item_func.cc: added keyword volatile in Item_func_acos::val and Item_func_asin::val to calm optimizer down and to avoid it's bug
| | * Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-3.23unknown2003-12-173-1/+50
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_2012/mysql-3.23
| | | * fixed restoring of thd->count_cuted_fields in store_val_in_fieldunknown2003-12-163-1/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (fixed #bug 2012) mysql-test/r/insert_select.result: added test case for bug #2012 mysql-test/t/insert_select.test: added test case for bug #2012
| | * | Merge bk-internal:/home/bk/mysql-3.23/unknown2003-11-272-5/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql
| | | * | - The LGPL section was removed from manual.texi, hence we now use a localunknown2003-11-252-5/+1
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | copy of COPYING.LIB (moved from the mysys subdirectory) instead of creating it on the fly out of the manual. COPYING.LIB: Rename: mysys/COPYING.LIB -> COPYING.LIB Docs/Makefile.am: - Don't build COPYING.LIB from manual.texi anymore (section was removed from the manual)
| | * | fix contact personunknown2003-11-271-2/+2
| | | |
| | * | Merge bk-internal:/home/bk/mysql-3.23/unknown2003-11-241-0/+2
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql
| | | * ignore:unknown2003-11-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added sql/udf_example.so scripts/make_win_src_distribution BitKeeper/etc/ignore: added sql/udf_example.so scripts/make_win_src_distribution
| * | | - updated config.guess, config.sub and ltmain.sh with versions from libtoolunknown2004-02-063-1055/+2528
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1.5 to fix BUG#202 (update config.guess & co for MIPS architecture) config.guess: - upplied diffs from libtool 1.5 config.sub: - upplied diffs from libtool 1.5 ltmain.sh: - upplied diffs from libtool 1.5
| * | | Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0unknown2004-02-053-3/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.0
| | * | | - renamed mysql-test/t/init_file.sql to mysql-test/std_data/init_file.datunknown2004-02-053-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so it gets picked up by "make dist" and updated init_file test accordingly. mysql-test/std_data/init_file.dat: Rename: mysql-test/t/init_file.sql -> mysql-test/std_data/init_file.dat mysql-test/t/init_file-master.opt: - moved init file to std_data mysql-test/t/init_file.test: - updated info
| * | | | include atomic.h in extern "C" modeunknown2004-02-051-0/+2
| |/ / /
| * | | Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-02-054-0/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_2526/mysql-4.0
| | * \ \ Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0unknown2004-02-054-0/+8
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_2526/mysql-4.0 sql/sql_class.cc: Auto merged
| | | * | | code cleanupunknown2004-02-052-11/+3
| | | | | |
| | | * | | added checking for bootstrap in select_send::send_dataunknown2004-02-044-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (fixed bug #2526 "--init-file crashes MySQL if contains large select") Such checking usually works in send_ok, send_eof, but in this case large result causes interim flushing. sql/sql_class.cc: added checking for bootstrap in select_send::send_data
| * | | | | Added testing of pthread_key_delete (to fix compile problem on SCO) (Bug #2461)unknown2004-02-059-15/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DROP DATABASE now assumes RAID directories are in hex. (Bug #2627) Don't increment 'select_full_range' and similar statistics for EXPLAIN queries. (Bug #2506) Test in configure if pthread_key_delete() exists (to fix compile problem on SCO) (Bug #2461) BUILD/compile-pentium-max: Added --with-raid configure.in: Added testing of pthread_key_delete (to fix compile problem on SCO) (Bug #2461) include/my_pthread.h: Added testing of pthread_key_delete (to fix compile problem on SCO) (Bug #2461) innobase/include/data0data.ic: Added missing newline mysql-test/r/raid.result: Test of DROP DATABASE with RAID directories in hex mysql-test/t/raid.test: Test of DROP DATABASE with RAID directories in hex sql/sql_db.cc: DROP DATABASE could not drop databases with RAID tables that had more than 9 RAID_CHUNKS because DROP DATABASE assumed raid tables where in decimal while the RAID CREATE code assumed directories was in hex.(Bug #2627) sql/sql_select.cc: Don't increment 'select_full_range' and similar statistics for EXPLAIN queries. (Bug #2506) sql/sql_udf.cc: mysqld crashed if mysql.func table didn't exists (Bug #2577)
| * | | | | - don't add merge ChangeSets to the Changelog in Bootstrapunknown2004-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (reduce the noise) Build-tools/Bootstrap: - don't add merge ChangeSets to the Changelog (reduce the noise)
| * | | | | Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0unknown2004-02-049-12/+101
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.0
| | * | | | Fix for bug #2214: unknown2004-02-042-1/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "CC: ERROR File = item.h, Line = 401 The identifier strtoll is undefined" (compilation failure on SGI IRIX + MIPSPro 7.41) Compilation script implemented. Tested in 32 and 64 bit mode configure.in: Fix for bug #2214: we should not reset CXXFLAGS on IRIX for build script to work
| | * | | | Merge bk-internal:/home/bk/mysql-4.0/unknown2004-02-041-2/+2
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| | | * \ \ \ Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-02-041-2/+2
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into hegel.local:/home/miguel/dev/mysql-4.0
| | | | * \ \ \ Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-02-041-2/+2
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into hegel.local:/home/miguel/dev/mysql-4.0
| | | | | * | | | For to export the right functions with changes done from 4.0.16unknown2004-02-041-2/+2
| | | | | | | | |
| | * | | | | | | beautify SHOW INDEX unknown2004-02-043-4/+8
| | |/ / / / / /
| | * | | | | | clarify -F help text a bitunknown2004-02-041-1/+4
| | | | | | | |
| | * | | | | | Merge bk-internal:/home/bk/mysql-4.0/unknown2004-02-042-4/+2
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| | | * | | | | disabled atof() test as non-portableunknown2004-02-042-4/+2
| | | | | | | |
| * | | | | | | Some small enhancements for Do-compile:unknown2004-02-041-8/+5
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - more flexible removal of old cruft before creating the new binary distribution - more flexible globbing for the binary tarball (required for QNX, where the file name ends on *.tgz instead of .tar.gz due to file name lenght restrictions Build-tools/Do-compile: Some small enhancements: - more flexible removal of old cruft before creating the new binary distribution - more flexible globbing for the binary tarball (required for QNX, where the file name ends on *.tgz instead of .tar.gz due to file name lenght restrictions
| * | | | | | Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0unknown2004-02-045-3/+10
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.0
| | * | | | | | - renamed myisam/ft_dump to myisam/mysam_ftdump and added it to theunknown2004-02-035-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | binary distribution and Server RPM myisam/myisam_ftdump.c: Rename: myisam/ft_dump.c -> myisam/myisam_ftdump.c BitKeeper/etc/ignore: Added myisam/myisam_ftdump to the ignore list myisam/Makefile.am: - renamed ft_dump to myisam_ftdump and added it to bin_PROGRAMS scripts/make_binary_distribution.sh: - added myisam_ftdump to the binary distribution support-files/mysql.spec.sh: - added myisam_ftdump to the Server package
| * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-02-041-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.0 sql/mysqld.cc: Auto merged
| | * | | | | | | Fixed a bug in slave-compressed-protocol. Using this optionunknown2004-02-041-1/+1
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from command line did not work.
View Lorry Controller Status