Commit graph

1023 commits

Author SHA1 Message Date
jani@ibmlab.site
fa25b9b49d A fix for Bug#8467. 2005-05-06 12:18:37 +03:00
bar@mysql.com
b1431c222a Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/root/mysql-5.0
2005-05-06 13:08:28 +05:00
bar@mysql.com
1f14cfcb35 merging cp932 from 4.1 2005-05-06 12:00:25 +05:00
ramil@mysql.com
802360fbc2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/ram/work/5.0
2005-05-06 08:34:50 +05:00
shuichi@mysql.com
f0fb08dd79 Merge stamagawa@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/shuichi/apps/mysql/bk/4.1/mysql
2005-05-05 10:46:14 -07:00
shuichi@mysql.com
720418fe46 Added cp932 character set 2005-05-05 10:36:17 -07:00
rburnett@bk-internal.mysql.com
e7d7c0f236 Bug net_write_timeout not used on Windows
Added an extra parameter to all calls to timeout().  
1 means we want to set the write timeout
0 means we wnat to set the read timeout

viossl.c:
  Add which parameter to ssl timeout routine
vio_priv.h:
  Added which parameter to vio_ignore_timeout and vio_ssl_timeout
violite.h:
  Add which parameter to vio_timeout sigs
net_serv.cc:
  Use proper which code in call to vio_timeout to set the proper timeout
viosocket.c:
  Set the appropriate timeout in vio_timeout
2005-05-05 17:17:57 +02:00
holyfoot@mysql.com
556504287b Merge 2005-05-05 20:10:50 +05:00
holyfoot@hf-ibm.(none)
2c8e9df232 A lot of fixes to Precision math
Mostly about precision/decimals of the results of the operations
2005-05-05 20:06:49 +05:00
ram@ram-book.(none)
65f5a15a2d Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into ram-book.(none):/home/ram/work/5.0
2005-05-05 19:22:33 +05:00
ramil@ram-book.(none)
b9ccbfd1f3 A fix (bug : error in default value setting). 2005-05-05 17:17:55 +05:00
konstantin@mysql.com
753959cd88 Manual merge 2005-05-05 13:47:09 +04:00
tulin@dl145b.mysql.com
ccac26a27a logging_ok:
Logging to logging@openlogging.org accepted
NDBT_ResultRow.cpp, ndb_restore.test, ndb_restore.result:
  BUG#10287
2005-05-04 10:16:03 +02:00
bell@book.sanja.is.com.ua
3be81d4299 Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-5.0
into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-test-5.0
2005-05-03 18:47:53 +03:00
monty@mysql.com
28a5491d3d Merge with 4.1 2005-04-30 09:46:08 +03:00
evgen@moonbone.local
b11705a2b0 Fix bug "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.
2005-04-29 21:19:39 +04:00
geert@kriem.kemuri.org
2c36f4c821 Merge gvanderkelen@bk-internal.mysql.com:/home/bk/mysql-5.0
into kriem.kemuri.org:/home/geert/MySQL/mysql-5.0
2005-04-09 10:55:38 +02:00
acurtis@xiphis.org
dcc40a080d Merge xiphis.org:/var/db/bk/work-acurtis/bug6776.1
into xiphis.org:/var/db/bk/work-acurtis/bug6776.2
2005-04-09 00:36:08 +01:00
acurtis@xiphis.org
e82edda6c6 Merge xiphis.org:/var/db/bk/work-acurtis/bug6776
into xiphis.org:/var/db/bk/work-acurtis/bug6776.1
2005-04-08 21:40:50 +01:00
gluh@eagle.intranet.mysql.r18.ru
6f18d7d26f Fix for bug : SESSION/GLOBAL should be disallowed for user variables 2005-04-06 14:13:06 +05:00
geert@kriem.kemuri.org
8c42aceb0a Adding --show-warnings option for the mysql command line tool so warnings,
if any, are shown after execution of a statement in both batch and 
interactive mode. 
In interactive mode \w means show the warnings and \W means don't 
show the warnings.
2005-04-05 15:30:17 +02:00
gluh@eagle.intranet.mysql.r18.ru
fed0ba272a Code optimization(discussed with Monty) 2005-04-05 14:31:46 +05:00
gluh@eagle.intranet.mysql.r18.ru
f1773668a8 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into eagle.intranet.mysql.r18.ru:/home/gluh/MySQL/Bugs/mysql-5.0.9344
2005-04-04 12:12:50 +05:00
magnus@msdesk.mysql.com
e8434aadca BUG#8585 ndb_cache2
- When deleting from a cursor the m_rows_changed variable was not properly incremented to indicate that m_share->commit_count should be cleared at end of trans.
2005-03-31 14:33:50 +02:00
gluh@eagle.intranet.mysql.r18.ru
1f38b5bdd1 Fix for bug INFORMATION_SCHEMA, wrong content, numeric columns
The columns CHARACTER_MAXIMUM_LENGTH and CHARACTER_OCTET_LENGTH 
  of INFORMATION_SCHEMA.COLUMNS must be NULL for numeric columns
2005-03-31 13:44:42 +05:00
kent@mysql.com
bb713b13df Do-compile:
Added option --with-big-tables
2005-03-30 02:41:08 +02:00
bar@eagle.intranet.mysql.r18.ru
2a1ad57732 Merge 2005-03-25 10:43:35 +04:00
gbichot@quadita2.mysql.com
19499229ed "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
2005-03-23 19:19:36 +01:00
serg@serg.mylan
d6bedfa8e0 merged 2005-03-23 09:42:24 +01:00
mysqldev@mysql.com
ad26a667e6 sql_acl.cc, sql_acl.h, sql_parse.cc
New privilege CREATE USER (CREATE_USER_ACL, Create_user_priv) added
grant2.test:
  new tests (mostly backported from jani's patch)
system_mysql_db.result, sp.result, grant2.result, grant.result:
  results updated
2005-03-22 15:54:18 +01:00
gbichot@production.mysql.com
56495a3691 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into production.mysql.com:/nfstmp1/guilhem/mysql-5.0-prod
2005-03-22 00:28:33 +01:00
gbichot@production.mysql.com
c766efdc5d Last part of WL#1062: better replication of timezones: no more use
of SET ONE_SHOT; storing tz info directly in event (if this info is needed),
it's now allowed to have different global tz on master and slave.
2005-03-22 00:26:12 +01:00
igor@rurik.mysql.com
d53423383b Manual merge 2005-03-17 21:47:46 -08:00
paul@frost.snake.net
cf5f436236 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0
into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.0
2005-03-17 11:43:56 -06:00
paul@frost.snake.net
86f9b77756 Update URL. 2005-03-17 11:33:07 -06:00
gbichot@quadxeon.mysql.com
7ee2ecbe5d Merge quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.0-4xeon
into quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.1-4xeon
2005-03-17 17:00:44 +01:00
gbichot@quadxeon.mysql.com
3cb85a4740 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.0-4xeon
2005-03-17 15:51:52 +01:00
gbichot@quadxeon.mysql.com
d823bee92a 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.
2005-03-17 14:39:39 +01:00
brian@zim.(none)
473e1ffd3a Removed support for RAID, mit-threads, and MySQL FS (really, if someone wants this feature look at a web-dav hookup). 2005-03-16 16:22:56 -08:00
patg@krsna.
24bc862456 This changeset contains changes approved in code review by
Konstja and Georg, change sets 1.1806, 1.1805. These changes has been successfully 
tested on both my own workstation (Suse 9.0) and production.mysql.com.
2005-03-15 00:32:21 -08:00
paul@snake-hub.snake.net
4af3c8a23a mysql.1.in:
Fix path that needs no parameterization.
2005-03-14 19:59:00 -06:00
reggie@mdk10.(none)
75e1b9e765 Bug 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
2005-03-14 16:47:35 -06:00
mskold@bk-internal.mysql.com
ca3391c7e7 Removed files that disabled ndb tests 2005-03-14 12:27:02 +01:00
msvensson@neptunus.(none)
13ec961c3a 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
2005-03-14 12:07:49 +01:00
mskold@bk-internal.mysql.com
c30095c920 Marked missing file gone 2005-03-14 11:37:26 +01:00
mskold@bk-internal.mysql.com
c7f46d678a Removed 2005-03-14 11:12:54 +01:00
serg@serg.mylan
956682de1a merged 2005-03-09 14:09:06 +01:00
acurtis@ltantony.rdg.cyberkinetica.homeunix.net
be3c863ba0 Merge in fix Bug#3788 2005-03-08 22:32:09 +00:00
gbichot@quadita2.mysql.com
fa27e11923 Default value of slave_transaction_retries is now 10
(whereas it's 0 in 4.1, for safety as this is new code).
2005-03-07 12:49:38 +01:00
georg@lmy002.wdf.sap.corp
473f2f9409 New Project files for Windows Ithanium 64-bit builds 2005-03-06 14:22:28 +01:00