Commit graph

892 commits

Author SHA1 Message Date
unknown
27fa1254dc Fix bug #9703 "Error 1032 with GROUP BY query and large tables"
Reset old error if tmp table was successfully created.

Test data is large and can be found in bug report along with test query.


sql/sql_select.cc:
  Fix bug #9703
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-04-29 21:19:39 +04:00
unknown
be400cb092 Merge xiphis.org:/var/db/bk/work-acurtis/bug6776
into xiphis.org:/var/db/bk/work-acurtis/bug6776.1


sql/sql_udf.cc:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-04-08 21:40:50 +01:00
unknown
ddd9fd8964 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/gluh/MySQL/Bugs/mysql-4.1.9286


sql/sql_yacc.yy:
  Auto merged
2005-04-06 14:14:13 +05:00
unknown
31d15c3f76 Fix for bug #9286: SESSION/GLOBAL should be disallowed for user variables
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-04-06 14:13:06 +05:00
unknown
a62081a931 merged 2005-04-05 19:44:39 +02:00
unknown
f50dc99d24 add changeset key to the bk commit mail 2005-04-05 15:16:15 +02:00
unknown
73e5f698a9 Do-compile:
Added option --with-big-tables


Build-tools/Do-compile:
  Added option --with-big-tables
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-03-30 02:41:08 +02:00
unknown
68717638d5 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


acinclude.m4:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
2005-03-26 19:49:24 +01:00
unknown
c26930d26f Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-23 21:10:01 +01:00
unknown
6bc324ed21 "After Monty's review" changes to the fix for BUG#8325 "Deadlock in replication thread stops replication":
s/sleep/safe_sleep (thread safe); sleep 0/1/2/3/4/5/5/5 (get slave less late);
no message on error log (deadlock is too common sometimes), a global counter
instead (SHOW STATUS LIKE 'slave_retried_transactions').
Plus a fix for libmysql/Makefile.shared


libmysql/Makefile.shared:
  When we "make clean" in libmysql/ we remove the symlinks there, so we
  need to mark that they have to be recreated later: this is done by removing
  ../linked_libmysql_sources. If we don't do this, 'make' will fail after 'cd libmysql;make clean'.
  This Makefile.shared is used by libmysql_r too.
  No reason to remove linked_client_sources as we don't remove the links in client/.
mysql-test/r/rpl_deadlock.result:
  result fix
mysql-test/t/rpl_deadlock.test:
  small test addition
sql/mysqld.cc:
  if active_mi could not be alloced, die. New SHOW STATUS LIKE "slave_retried_transactions".
sql/slave.cc:
  If slave retries automatically a transaction, no message on error log
  (too common situation); sleep 0 secs at first retry, then 1, 2, 3, 4,
  5, 5, 5... Sleeping 0 is to get the least possible late, as deadlocks
  are usually resolved at first try. New global counter rli->retried_trans
  (for SHOW STATUS: total number of times the slave had to retry
  any transaction). safe_sleep() is thread-safe, sleep() was not.
  I change the rli->trans_retries counter to go from 0 to max instead
  of the other way (better for new sleep()).
sql/slave.h:
  new global counter rli->retried_trans
sql/sql_show.cc:
  SHOW STATUS LIKE "slave_retried_transactions"; needs replication mutexes.
  Can't be a simple SHOW_LONG, because active_mi is unset (not alloced yet)
  when the static global status_vars is created (active_mi is set
  in init_slave()).
sql/structs.h:
  new SHOW_SLAVE_RETRIED_TRANS
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-03-23 19:19:36 +01:00
unknown
c4ab5d61fb don't allow to commit as mysqldev 2005-03-18 09:00:46 +01:00
unknown
afe45b7328 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0
into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
2005-03-17 11:43:56 -06:00
unknown
6cd5a8c0be Update URL.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-03-17 11:33:07 -06:00
unknown
ba9a0fea50 Merge quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.0-4xeon
into quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.1-4xeon


BitKeeper/etc/logging_ok:
  auto-union
sql/log_event.cc:
  Auto merged
2005-03-17 17:00:44 +01:00
unknown
05534c4df0 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.0-4xeon


BitKeeper/etc/logging_ok:
  auto-union
2005-03-17 15:51:52 +01:00
unknown
93c928d3a7 safer creation of temp files used in replication of LOAD DATA INFILE.
When we come to create these, they may already exist and it's necessary to delete these old, useless copies.


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-03-17 14:39:39 +01:00
unknown
6d0ec316a8 mysql.1.in:
Fix path that needs no parameterization.


man/mysql.1.in:
  Fix path that needs no parameterization.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-03-14 19:59:00 -06:00
unknown
2722a28691 Bug #6660 mysqldump creates bad pathnames on Windows
This really should not happen on Windows and part of the problem not fixed here is why show create table includes data directory when being run on Windows.  However, this patch fixes the bug in mysqldump.c

mysqldump.c:
  Added fixPaths function to convert \ to / in data directory and index directory entries only on Windows


client/mysqldump.c:
  Added fixPaths function to convert \ to / in data directory and index directory entries only on Windows
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-03-14 16:47:35 -06:00
unknown
90697f2467 BUG#6554 Problem Building MySql on Fedora Core 3
- Moved static variables defined inside of function to file scope to avoid this linking problem on FC3


sql/ha_berkeley.cc:
  Moved list of bdb extension to file scope
sql/ha_ndbcluster.cc:
  Moved list of ndb extesions to file scope
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-03-14 12:07:49 +01:00
unknown
ae81d53048 New Project files for Windows Ithanium 64-bit builds
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-03-06 14:22:28 +01:00
unknown
f1c81bf669 logging_ok:
Logging to logging@openlogging.org accepted
func_group.result, func_group.test:
  Added a test case for bug #8893.
opt_sum.cc:
  A misplaced initialization for the returned parameter
  prefix_len in the function find_key_for_maxmin caused
  usage of a wrong key prefix by the min/max optimization
  in cases when the matching index was not the first index
  that contained the min/max field.


sql/opt_sum.cc:
  A misplaced initialization for the returned parameter
  prefix_len in the function find_key_for_maxmin caused
  usage of a wrong key prefix by the min/max optimization
  in cases when the matching index was not the first index
  that contained the min/max field.
mysql-test/t/func_group.test:
  Added a test case for bug #8893.
mysql-test/r/func_group.result:
  Added a test case for bug #8893.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-03-04 20:24:13 -08:00
unknown
56679769a8 Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-4.1


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-02-22 13:00:00 +02:00
unknown
1b7dabe492 Merge mysql.com:/home/jimw/my/mysql-4.0-clean
into mysql.com:/home/jimw/my/mysql-4.1-clean


BitKeeper/triggers/post-commit:
  Auto merged
2005-02-17 13:46:33 -08:00
unknown
fd4b5c8ddc Merge mysql.com:/home/jimw/my/mysql-4.0-no-merge-spam
into mysql.com:/home/jimw/my/mysql-4.0-clean
2005-02-17 13:45:20 -08:00
unknown
7770f8f961 Make post-commit trigger not send emails when the message would not contain
any actual changes. (Often the case in merges where the only change involves
renumbering ChangeSet entries.)


BitKeeper/triggers/post-commit:
  Suppress emails when there's no changes actually reported
2005-02-16 14:03:16 -08:00
unknown
1218a7c20c Merge mysql.com:/home/dellis/mysqlab/bk/mysql-4.0
into mysql.com:/home/dellis/bkl/bug-4.1


BitKeeper/etc/logging_ok:
  auto-union
myisam/ft_nlq_search.c:
  Auto merged
2005-02-15 17:30:40 -06:00
unknown
3be01953d1 ft_nlq_search.c:
Added bounds check to avoid accessing unallocated FT_DOC array.  (BUG #8522)


myisam/ft_nlq_search.c:
  Added bounds check to avoid accessing unallocated FT_DOC array.  (BUG #8522)
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-02-15 17:27:23 -06:00
unknown
de3f93c6ff Bug#8351
Fix for crash when using a double quote in boolean fulltext query.


mysql-test/r/fulltext.result:
  Added a test case for bug #8351.
mysql-test/t/fulltext.test:
  Added a test case for bug #8351.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-02-14 18:54:12 +04:00
unknown
7314690bb2 Manual merge
BitKeeper/triggers/post-commit:
  Auto merged
sql/table.cc:
  Auto merged
2005-02-11 10:44:03 -08:00
unknown
cb754b989a Fix extra blank line in emails sent by post-commit trigger.
BitKeeper/triggers/post-commit:
  Remove extra blank link
2005-02-10 20:31:23 -08:00
unknown
a20374e33f Merge commit trigger
BitKeeper/etc/logging_ok:
  auto-union
extra/replace.c:
  Auto merged
BitKeeper/triggers/post-commit:
  Merge changes
2005-02-10 14:32:01 -08:00
unknown
77d2461576 Merge bk-internal:/home/bk/mysql-4.0
into mysql.com:/home/jimw/my/mysql-4.0-clean
2005-02-10 14:23:05 -08:00
unknown
d3694db695 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/4.1


BitKeeper/etc/logging_ok:
  auto-union
2005-02-04 15:53:14 +04:00
unknown
4c69539827 type_float.result.es updated.
mysql-test/r/type_float.result.es:
  Updated.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-02-04 15:35:08 +04:00
unknown
83a096eccc Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/usr/home/ram/work/4.0


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-02-04 13:59:13 +04:00
unknown
f8d38cffdf Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into orca.ndb.mysql.com:/export/home/mikael/mysql-4.1


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-02-03 21:13:28 +01:00
unknown
665a3efe89 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into zim.(none):/home/brian/mysql/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
2005-01-31 11:03:57 -08:00
unknown
4faf77a9fe BUG#8208 don't fsync unless something has been written
+ ion shutdown - don't close files that are not open
+ abort in debug - if closing a fd == -1


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-01-31 11:47:10 +01:00
unknown
96e4281f05 Cleanup for lost file descriptors on close table for ha_archive.
sql/examples/ha_archive.cc:
  More comments, fixed issue with lost file descriptors.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-01-28 16:43:10 -08:00
unknown
577a20f094 Add BUG# to subject and X-Bug header for all outgoing
emails re: bug fixes, and update the URL for the manual
page on installing from the source tree.

Fake bug number for testing: Bug #1234


BitKeeper/triggers/post-commit:
  Update URL for docs page
2005-01-25 12:24:50 -08:00
unknown
5847d10712 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into bob.(none):/home/reggie/bk/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
2005-01-17 14:08:36 -06:00
unknown
4fc1801d08 Fixed memory leak in handle_local_infile()
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-01-17 19:21:01 +03:00
unknown
31457a6258 Bug #7922 prompt \p fails on Windows for shared-memory connections
Fixed bug by adding code that displays the contents of mysql.host when \p is added as part of the prompt.

mysql.cc:
  Added code to display mysql.host as prompt when using shared memory


client/mysql.cc:
  Added code to display mysql.host as prompt when using shared memory
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-01-15 23:19:34 -06:00
unknown
cc1c4a99ef - removed the mysql-test/suites/jp test suite and marked all files as gone 2005-01-10 16:19:01 +01:00
unknown
f92ec09043 set_var.cc:
Silence compiler warning.


sql/set_var.cc:
  Silence compiler warning.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-01-02 15:10:08 -06:00
unknown
ade13078d1 Merged bugfix
BitKeeper/etc/logging_ok:
  auto-union
sql/ha_ndbcluster.h:
  Auto merged
2004-12-30 21:36:16 +01:00
unknown
523882ab71 Fix for bug #7480 Mysqld crash in ha_ndbcluster using Query Browser
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-12-30 19:56:09 +01:00
unknown
baac3b76ac BitKeeper/triggers/pre-delta
don't checkin for Administrator or mysqldev
sql/log.cc@1.157
    restored a bugfix that was lost in a merge


sql/log.cc:
  restored a bugfix that was lost in a merge
BitKeeper/triggers/pre-delta:
  don't commit for Administrator or mysqldev
2004-12-22 22:59:19 +01:00
unknown
d8432ada2c fill_help_tables.sh:
Convert @samp{c} to 'c', not c.


scripts/fill_help_tables.sh:
  Convert @samp{c} to 'c', not c.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-12-18 14:22:20 -06:00
unknown
c892bc8bea my-innodb-heavy-4G.cnf.sh:
I fixed the typos in the transaction-isolation comments.
  I fixed the spelling mistakes in the comment.  It had tripped up a support 
  customer as they couldn't start the server with transaction-isolation=
  read-commited


support-files/my-innodb-heavy-4G.cnf.sh:
  I fixed the typos in the transaction-isolation comments.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-12-17 22:25:35 -05:00