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
geert@kriem.kemuri.org
dd1f0267ad
Merge gvanderkelen@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into kriem.kemuri.org:/home/geert/MySQL/mysql-5.0
2005-04-08 14:11:22 +02:00
gluh@mysql.com
decfc86fbb
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/gluh/MySQL/Bugs/mysql-4.1.9286
2005-04-06 14:14:13 +05:00
gluh@eagle.intranet.mysql.r18.ru
6f18d7d26f
Fix for bug #9286 : SESSION/GLOBAL should be disallowed for user variables
2005-04-06 14:13:06 +05:00
serg@serg.mylan
ea673c1afd
Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-04-05 19:52:22 +02:00
serg@serg.mylan
4962ba7f8a
merged
2005-04-05 19:44:39 +02: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
serg@serg.mylan
3c3defaa0a
add changeset key to the bk commit mail
2005-04-05 15:16:15 +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 #9344 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
pekka@mysql.com
727015dbb3
Merge
2005-03-28 23:06:19 +02:00
serg@serg.mylan
2dd1847bc2
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-26 19:49:24 +01:00
bar@eagle.intranet.mysql.r18.ru
2a1ad57732
Merge
2005-03-25 10:43:35 +04:00
serg@serg.mylan
091f069671
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
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
serg@serg.mylan
1ccb9dd214
don't allow to commit as mysqldev
2005-03-18 09:00:46 +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 #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
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
bar@mysql.com
d50d213162
Merge
2005-03-05 18:20:35 +04:00
igor@linux.local
6d7862aeaf
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.
2005-03-04 20:24:13 -08:00
bell@51.0.168.192.in-addr.arpa
5d6cc9de06
Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0
...
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
2005-02-24 01:11:59 +02:00
reggie@mdk10.(none)
2ffd3a3a61
Changes to allow 5.0.3 to compile on Windows after XA was pushed
...
logging_ok:
Logging to logging@openlogging.org accepted
mi_packrec.c:
Using HAVE_SYS_MMAN_H to protect include of sys/mman.h and replaced calls to mmap and munmap with my_mmap and my_munmap
mi_extra.c:
Now using HAVE_SYS_MMAN_H to protect include of sys/mman.h
my_mmap.c:
Changed how no mmap message is printed for Windows
sql_map.cc:
Changed HAVE_MMAP to HAVE_SYS_MMAN_H and replaced calls to mmap and munmap with my_mmap and my_munmap
2005-02-23 16:29:03 -06:00
bell@52.0.168.192.in-addr.arpa
9d23922eb6
Post review changes
2005-02-23 18:51:10 +02:00
monty@mysql.com
e2ea35ec67
Merge with 4.1
2005-02-22 15:47:00 +02:00
bell@51.0.168.192.in-addr.arpa
9a9811f3a4
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
2005-02-22 13:00:00 +02:00
bell@51.0.168.192.in-addr.arpa
a11369b999
Merge
2005-02-20 18:49:27 +02:00
msvensson@neptunus.(none)
3d0883bb05
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-8583
2005-02-18 11:02:21 +01:00