summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | | | | | Fixed problem with range optimization over overlapping ranges (#2448)unknown2004-02-047-223/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/ctype_tis620.result: Cleanup test mysql-test/r/range.result: Test problem with range optimization over overlapping ranges (#2448) mysql-test/t/ctype_tis620.test: Cleanup test mysql-test/t/range.test: Test problem with range optimization over overlapping ranges (#2448) sql/mysqld.cc: Remove debug statement strings/ctype-tis620.c: est problem with range optimization over overlapping ranges (#2448)
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-02-0411-174/+294
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.0 sql/mysqld.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_show.cc: Auto merged
| * | | | | | Ensure that wait_timeout doesn't overflow on windows. (Bug #2400)unknown2004-02-041-1/+2
| | | | | | |
| * | | | | | Ensure that privileges are tested properly for multi-table-updates.unknown2004-02-036-171/+278
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now one need only SELECT privilege for tables that are only read in UPDATE statements with many tables. (Bug #2377). sql/sql_acl.cc: Comment cleanup sql/sql_parse.cc: Merged duplicate code. Removed some outdated 'tables->db' tests. Check privileges for multi-updates properly (Bug #2377) sql/sql_show.cc: Remove disabled code sql/sql_update.cc: Ensure that privileges are tested properly for multi-table-updates tests/grant.pl: Added more tests tests/grant.res: updated results
| * | | | | | Give error if locked table is used twice in query. This fixes strange error ↵unknown2004-02-034-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | message when doing LOCK TABLES t1 WRITE; INSERT TABLE t1 SELECT * from t1 (Bug #2296) client/mysqldump.c: Better help for flush-logs mysql-test/r/lock.result: Test for LOCK TABLES ; INSERT ... SELECT mysql-test/t/lock.test: Test for LOCK TABLES ; INSERT ... SELECT
* | | | | | | extra newline removedunknown2004-02-031-5/+5
| | | | | | |
* | | | | | | Merge bk-internal:/home/bk/mysql-4.0/unknown2004-02-0313-71/+293
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0 sql/mysqld.cc: Auto merged
| * \ \ \ \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-02-031-1/+7
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b2185
| | * | | | | | another variant (bug #2185: mysql.server script echo bug)unknown2004-02-031-6/+4
| | | | | | | |
| | * | | | | | a fix (#2185: mysql.server script echo bug)unknown2004-02-021-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | thnx Paul. <monty> can you get the above into configure and make Makefile.am patch mysql.server.sh with the right values for mysql.server ? <monty> or do you think we should just put the above in mysql.server.sh directly <ramil> as you want <monty> the last is kind of hard to do with variables, so lets put the above in mysql.server.sh directly support-files/mysql.server.sh: #2185: mysql.server script echo bug
| * | | | | | | Added new option --sync-frm / --skip-sync-frmunknown2004-02-035-11/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Marked --bdb-no-sync as deprecated Added --sync-bdb-logs / --disable-sync-bdb-logs as a synonym / alternative. mysys/my_getopt.c: Changed my_getopt so that disabled_my_option can be used for GET_BOOL type options too. sql/mysql_priv.h: Added opt_sync_frm sql/mysqld.cc: Added sync-frm / disable-sync-frm to mysqld, to be able to disable use of my_sync() (fsync()). This defaults to behavior in 4.0.16 and before, where creating of new tables is quicker than currently. This option is enabled by default. Marked --bdb-no-sync as deprecated option and added another one, --sync-bdb-logs besides. --bdb-no-sync and --disabled-sync-bdb-logs are now synonyms. sql/unireg.cc: One can disable my_sync() by using --disable-sync-frm BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | | | | | Thai tis620 crash problem in text comparison routines was fixed.unknown2004-02-034-55/+158
| | | | | | | |
| * | | | | | | Proposed (version #2) fix for bug #1948:unknown2004-02-023-4/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "system variable query_prealloc_size can be only global" include/my_sys.h: Fix for bug #1948: - added reset_root_defaults function declaration mysys/my_alloc.c: Fix for bug #1948: - implementation and description of reset_root_defaults sql/set_var.cc: Fix for bug #1948: - fix_thd_mem_root and fix_trans_mem_root after update triggers implemented for variables query_prealloc_size, query_alloc_block_size, trans_prealloc_size, trans_alloc_block_size
* | | | | | | | increase the size of a signal thread's stack (the old one was too small for ↵unknown2004-02-021-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the thread to be created on some systems) bug#2599