Commit graph

11075 commits

Author SHA1 Message Date
unknown
b8004902c4 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_2526/mysql-4.0
2004-02-05 18:14:39 +04:00
unknown
e55558150d sql_load.cc:
Added a comment for already pushed bug fix


sql/sql_load.cc:
  Added a comment for already pushed bug fix
2004-02-05 16:04:43 +02:00
unknown
f79ff0f909 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_2526/mysql-4.0


sql/sql_class.cc:
  Auto merged
2004-02-05 17:53:46 +04:00
unknown
b911f9b0c0 code cleanup 2004-02-05 17:52:41 +04:00
unknown
0db0b601ab Added SQL_SELECT::cleanup() to make it easier to reuse SQL_SELECT item's for sub selects. Needed for proper fix for bug #2479.
Added 'select_to_file' class to be able to merge identical code for select_export and select_dump


client/mysql.cc:
  Print mysql_insert_id() in 'status'
mysys/charset.c:
  after merge fixup
sql/item_func.cc:
  Code cleanup + new comments
sql/opt_range.cc:
  Added SQL_SELECT::cleanup() to make it easier to reuse SQL_SELECT item's for sub selects.
sql/opt_range.h:
  Added SQL_SELECT::cleanup() to make it easier to reuse SQL_SELECT item's for sub selects.
sql/sql_class.cc:
  Added 'select_to_file' class to be able to merge identical code for select_export and select_dump
sql/sql_class.h:
  Added 'select_to_file' class to be able to merge identical code for select_export and select_dump
sql/sql_select.cc:
  Fixed bug when calling 'delete select' in sub selects. (Bug 2479)
  (Test case is already commited to global source repository)
2004-02-05 10:22:08 +01:00
unknown
d295f07c42 Added testing of pthread_key_delete (to fix compile problem on SCO) (Bug #2461)
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)
2004-02-05 09:12:23 +01:00
unknown
7b0ee22df4 Bug#2634
Emit "TYPE=" for 4.0 and 3.23 compatible modes


mysql-test/r/mysqldump.result:
  Bug#2634
    New test case
mysql-test/t/mysqldump.test:
  Bug#2634
    New test case
2004-02-05 02:30:28 +00:00
unknown
94c03b7199 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-limit-4.1
2004-02-04 23:45:48 +02:00
unknown
68d61d5b8f - don't add merge ChangeSets to the Changelog in Bootstrap
(reduce the noise)


Build-tools/Bootstrap:
   - don't add merge ChangeSets to the Changelog (reduce the noise)
2004-02-04 21:26:52 +01:00
unknown
b594141fc8 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2004-02-04 20:46:59 +01:00
unknown
91f51913fe Fix for bug #2214:
"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
2004-02-04 20:51:26 +03:00
unknown
3886b5620b Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-02-04 18:51:25 +01:00
unknown
807aa79546 Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.0
into hegel.local:/home/miguel/dev/mysql-4.0
2004-02-04 13:51:24 -04:00
unknown
5db9c9dee5 Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.0
into hegel.local:/home/miguel/dev/mysql-4.0
2004-02-04 13:48:25 -04:00
unknown
883ef70c34 For to export the right functions with changes done from 4.0.16 2004-02-04 13:39:01 -04:00
unknown
22b2067aa5 added checking for bootstrap in select_send::send_data
(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
2004-02-04 21:35:20 +04:00
unknown
c8ff8ec18d beautify SHOW INDEX 2004-02-04 17:42:18 +01:00
unknown
9d1f86a3a2 clarify -F help text a bit 2004-02-04 16:50:33 +01:00
unknown
d9016a9b4a Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-02-04 16:21:24 +01:00
unknown
03f098d57e http://bugs.mysql.com/bug.php?id=2619
Bug #2619  	ucs2 LIKE comparison fails in some cases
Fixes
2004-02-04 18:16:28 +04:00
unknown
fc248069e9 correct assignment of default limit (BUG#2600)
mysql-test/r/subselect.result:
  test of global limit and subqueries
mysql-test/t/subselect.test:
  test of global limit and subqueries
sql/sql_lex.cc:
  correct detection of non-default limits
sql/sql_parse.cc:
  correct assignment of default limit
sql/sql_yacc.yy:
  correct assignment of default limit
2004-02-04 15:26:41 +02:00
unknown
46f156696f Some small enhancements for Do-compile:
- 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
2004-02-04 14:16:36 +01:00
unknown
5185075ce6 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2004-02-04 12:44:34 +01:00
unknown
180fa5c204 disabled atof() test as non-portable 2004-02-04 09:59:18 +01:00
unknown
128fac0532 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0


sql/mysqld.cc:
  Auto merged
2004-02-04 09:51:28 +01:00
unknown
4b44b849ba Fixed problem with range optimization over overlapping ranges (#2448)
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)
2004-02-04 09:51:13 +01:00
unknown
7f6f30284e Client character set is now not set from the server value. 2004-02-04 12:49:54 +04:00
unknown
4d98ab822b Fixed a bug in slave-compressed-protocol. Using this option
from command line did not work.
2004-02-04 10:48:42 +02:00
unknown
7ba7ce6e6d Merge bk-internal.mysql.com:/home/bk/mysql-4.0
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
2004-02-04 00:29:34 +01:00
unknown
796a040d5c Ensure that wait_timeout doesn't overflow on windows. (Bug #2400) 2004-02-04 00:28:58 +01:00
unknown
595e46704f - renamed myisam/ft_dump to myisam/mysam_ftdump and added it to the
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
2004-02-03 22:25:02 +01:00
unknown
538e6e8cbd sql_acl.cc:
Fix for a bug #2546 in 4.1.2 that prevented table / column privileges from being loaded on startup. 


sql/sql_acl.cc:
  Fix for a bug #2546 in 4.1.2 that prevented table / column privileges from being loaded on startup.
2004-02-03 22:54:59 +02:00
unknown
f0a715f3ad cleanup: #ifdef DELETE_ITEMS removed
sql/item.cc:
  #ifdef DELETE_ITEMS removed
sql/item_cmpfunc.cc:
  #ifdef DELETE_ITEMS removed
sql/sql_parse.cc:
  #ifdef DELETE_ITEMS removed
sql/sql_select.cc:
  #ifdef DELETE_ITEMS removed
2004-02-03 23:34:31 +03:00
unknown
1e4d0a12d0 extra newline removed 2004-02-03 21:15:20 +01:00
unknown
5614033db1 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0


sql/mysqld.cc:
  Auto merged
2004-02-03 20:46:06 +01:00
unknown
93d3684539 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b2185
2004-02-03 23:30:01 +04:00
unknown
313761cb40 Ensure that privileges are tested properly for multi-table-updates.
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
2004-02-03 19:17:23 +01:00
unknown
ec76183bec Added new option --sync-frm / --skip-sync-frm
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
2004-02-03 18:10:45 +00:00
unknown
cbda6835ed clean up comments 2004-02-03 18:21:48 +04:00
unknown
786a5b6bc3 Bug #2619 ucs2 LIKE comparison fails in some cases 2004-02-03 18:14:23 +04:00
unknown
2dc266aff4 another variant (bug #2185: mysql.server script echo bug) 2004-02-03 16:45:29 +04:00
unknown
d7d012046c .del-mytest-old.c~5237697b30cf59e4:
Delete: mytest-old.c


BitKeeper/deleted/.del-mytest-old.c~5237697b30cf59e4:
  Delete: mytest-old.c
2004-02-03 13:44:56 +01:00
unknown
453a32e927 Code cleanup:
we don't need opt_range.h and opt_range.cc files at all.


BitKeeper/deleted/.del-opt_ft.cc~2048ffa561f9c59:
  Delete: sql/opt_ft.cc
BitKeeper/deleted/.del-opt_ft.h~24aac1d29304599a:
  Delete: sql/opt_ft.h
2004-02-03 14:35:24 +04:00
unknown
92bcbf9a43 Thai tis620 crash problem in text comparison routines was fixed. 2004-02-03 14:03:01 +04:00
unknown
715e7a63a6 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b2419
2004-02-03 12:47:34 +04:00
unknown
619eaee654 Give error if locked table is used twice in query. This fixes strange error 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
2004-02-03 09:46:48 +01:00
unknown
0058d24da4 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_2438/mysql-4.1
2004-02-03 01:19:04 +04:00
unknown
bfadd733ac Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_2438/mysql-4.1
2004-02-03 01:16:08 +04:00
unknown
bbdba29229 changed allocation of st_table::insert_values
from table->mem_root to thd->mem_root 
(fixed bug #2438 "Runaway memory consumption")
2004-02-03 01:07:43 +04:00
unknown
e0b0ec6b2c Proposed (version #2) fix for bug #1948:
"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
2004-02-02 23:01:58 +03:00