jimw@mysql.com
41043bb3f5
Merge
2005-02-22 16:39:21 -08:00
lars@mysql.com
7271a6014f
Merge 4.1->5.0
2005-02-22 22:40:34 +01:00
jimw@mysql.com
df3c8db4f3
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-22 13:14:49 -08:00
serg@serg.mylan
8cb554b3c7
merged
2005-02-22 15:31:38 +01:00
serg@serg.mylan
a4dbb3b061
compatibility fixes, crashing tests
2005-02-22 15:22:37 +01:00
lars@mysql.com
2d1089e8c1
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6662-4.1
2005-02-22 13:22:34 +01:00
lars@mysql.com
1d3c67000b
BUG#6662: Changes after Guilhems and Sergs review
2005-02-22 12:40:31 +01:00
msvensson@neptunus.(none)
e7cfb0f6a6
Fix name of ndb-cache-check-time
2005-02-22 10:59:24 +01:00
lars@mysql.com
be28ef0a20
BUG#6662: Importing mysqldumps should not show any warnings of level "notes".
2005-02-21 18:40:28 +01:00
jimw@mysql.com
793a505c26
Fix merge of fix for Bug #4872 .
2005-02-18 15:02:54 -08:00
serg@serg.mylan
1235e6d2c7
Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
2005-02-18 13:38:10 +01:00
hf@deer.(none)
68a1ba2562
Merge deer.(none):/home/hf/work/mysql-4.1.clean
...
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-02-18 15:57:39 +04:00
hf@deer.(none)
93e0107050
Fix for the bug #7344 (multiple server_init/server_end lead to crash)
...
Some variable wasn't moved to the initial state during mysql_server_end
2005-02-18 15:51:55 +04:00
serg@serg.mylan
c0dda01f76
Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
2005-02-18 12:02:46 +01:00
jani@ua141d10.elisa.omakaista.fi
36998b7cb7
Fixed Bug#8042, "mysqld crashes on sighup".
2005-02-17 14:07:28 +02:00
jimw@mysql.com
9df24e5ebd
When calling initgroups(), set a flag that the segfault handler checks
...
in order to output a special warning about a particular case of segfaults
due to a mix of static binaries, NSS, and LDAP. (Bug #4872 )
2005-02-16 11:58:35 -08:00
serg@serg.mylan
5ddb6354a5
after merge fixes
2005-02-16 17:34:02 +01:00
serg@serg.mylan
fd828e5b4d
manually merged
2005-02-14 21:50:09 +01:00
monty@mysql.com
5239605105
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-02-09 22:03:41 +02:00
monty@mysql.com
b2f4af0013
cleaned up mysql installation code for windows.
...
This removes a (small) memory leak.
2005-02-09 22:02:48 +02:00
serg@serg.mylan
db13afd89d
auto-ROLLBACK if binlog was not closed properly
...
auto-commit on Xid_log_event
2005-02-09 20:04:28 +01:00
hf@deer.(none)
b94a482ee9
Precision Math implementation
2005-02-09 02:50:45 +04:00
jani@ua141d10.elisa.omakaista.fi
1c2f4ffecb
Applied a patch for Netware.
2005-02-08 19:49:40 +02:00
jimw@mysql.com
5f28ad75c3
Merge mysql.com:/home/jimw/my/mysql-5.0-7856
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-02-07 12:19:32 -08:00
msvensson@neptunus.homeip.net
c9d7cd043b
Merge neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0
...
into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0-cluster-extra
2005-02-04 15:13:45 +01:00
monty@mysql.com
422c2eb868
4.1 -> 5.0 merge
2005-02-03 13:18:30 +02:00
msvensson@neptunus.homeip.net
3181f5d2b6
Merged "query cache for ndb" to 5.0
2005-02-03 09:33:48 +01:00
serg@serg.mylan
33fc4b10b6
configure.in
...
don't define UNIV_DEBUG in CFLAGS/CXXFLAGS anymore
sql/mysqld.cc
hide from the user options that do nothing
sql/sql_update.cc
better fix for uninitialized used_index
2005-02-02 12:08:20 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
a67924ecbc
WL#1967
...
Support for COMMIT/ROLLBACK optional arguments
2005-02-01 19:48:05 +00:00
msvensson@neptunus.homeip.net
efd5ed2f9e
WL#2269 Enable query cache for NDB
...
- Added a thread that fetches commit_count for open tables. This
will mean that NDB will not have to be contacted for every use of a cached query.
2005-02-01 15:43:08 +01:00
serg@serg.mylan
fb78bfebe4
open binlog index file *before* tc_log->open() and binlog itself *after*
2005-02-01 15:36:48 +01:00
jimw@mysql.com
d1a2db170c
Restore behavior of 4.1 that allowed any one argument to be passed to the
...
server on Windows service startup, and not just --defaults-file=file. This
appears to be an unnecessary limitation, but fixing that will require
a larger refactoring of the Windows service installation and startup code.
(Bug #7856 )
2005-01-28 10:49:13 -08:00
serg@serg.mylan
3c5060981f
query_id and my_xid -> ulonglong
...
fix for binlog+autocommit+tclog
comments, style fixes
2005-01-27 22:38:56 +01:00
heikki@hundin.mysql.fi
61a0e57cd0
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-01-27 21:33:15 +02:00
ingo@mysql.com
48488e483a
Merge mysql.com:/home/mydev/mysql-4.1-4100
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-27 12:18:02 +01:00
dlenev@mysql.com
d8f0b7bec6
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg7637
2005-01-26 18:36:18 +03:00
ram@gw.mysql.r18.ru
c38886b20c
timed_mutexes moved to include/my_sys.h and mysys/my_static.c
...
to avoid linking problems referring to the variable from .c programs.
2005-01-26 18:37:49 +04:00
dlenev@mysql.com
e85f70ba72
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg7637
2005-01-26 16:40:50 +03:00
ram@gw.mysql.r18.ru
7f6fca4cf0
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1
2005-01-26 17:09:38 +04:00
dlenev@mysql.com
560f2bd4d6
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg7637
2005-01-26 11:23:14 +03:00
heikki@hundin.mysql.fi
9a6e0d06e0
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-01-25 22:12:22 +02:00
heikki@hundin.mysql.fi
d7e5c4d617
sql_class.h, set_var.cc, mysqld.cc:
...
Add settable variables for semi-sync replication
2005-01-25 22:11:21 +02:00
serg@serg.mylan
76f3d6f002
merged
2005-01-25 21:11:04 +01:00
monty@mysql.com
37168015cd
Cleanups during review
2005-01-25 21:27:51 +02:00
marko@hundin.mysql.fi
638e2bd733
InnoDB: Backport innodb_autoextend_increment from 4.1
2005-01-25 16:27:13 +02:00
jimw@mysql.com
d11081bd6f
Merge
2005-01-24 13:48:48 -08:00
jimw@mysql.com
09aaba03cf
Merge mysql.com:/home/jimw/my/mysql-4.1-7887
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-24 12:47:19 -08:00
jimw@mysql.com
fa1098618e
Set lower_case_file_system when it is being tested to check if
...
lower_case_tables_names=2 is sensible. Related to Bug #7887 .
2005-01-24 12:31:14 -08:00
ram@gw.mysql.r18.ru
5432e8a3d7
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1
2005-01-24 13:47:52 +04:00
timour@mysql.com
36f1e91b69
Merge of fix for BUG#4258 from 4.1.
...
Needs additional manual merge.
2005-01-21 17:38:36 +02:00