heikki@hundin.mysql.fi
af00b989df
ha_innodb.cc:
...
Correct an assertion
2005-04-27 13:43:02 +03:00
ingo@mysql.com
0998abc831
Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock
...
Added protection against global read lock while creating and
initializing a delayed insert handler.
Allowed to ignore a global read lock when locking the table
inside the delayed insert handler.
Added some minor improvements.
2005-04-27 12:40:37 +02:00
heikki@hundin.mysql.fi
ab0dbb1fc6
ha_innodb.cc, mysqld.cc:
...
Fix compilation error if HAVE_REPLICATION is not defined
2005-04-27 13:36:58 +03:00
msvensson@neptunus.(none)
2627475a86
Merge neptunus.(none):/home/msvensson/mysql/bug9714
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-27 12:30:11 +02:00
msvensson@neptunus.(none)
30caa4a32d
Merge neptunus.(none):/home/msvensson/mysql/bug8162
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-04-27 12:24:17 +02:00
heikki@hundin.mysql.fi
e93f8ec420
ha_innodb.cc:
...
Fix linking and compilation errors
2005-04-27 13:19:40 +03:00
msvensson@neptunus.(none)
b5e96531a7
Merge neptunus.(none):/home/msvensson/mysql/bug9954
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-04-27 12:19:18 +02:00
msvensson@neptunus.(none)
631f035ee9
Merge neptunus.(none):/home/msvensson/mysql/bug9911
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-04-27 12:17:07 +02:00
msvensson@neptunus.(none)
62473cce91
Merge neptunus.(none):/home/msvensson/mysql/bug2596
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-04-27 12:10:19 +02:00
serg@serg.mylan
c35e690c12
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-04-27 11:43:00 +02:00
jan@hundin.mysql.fi
138a1a9b1d
Fixed a bug using mysqldump to InnoDB tables causes error (Bug #10200 ).
2005-04-27 12:28:25 +03:00
msvensson@neptunus.(none)
c12ee8dc16
BUG#9714 libsupc++ problem
...
- Remove linking of libsupc++
- Move all local static variables to filescope
2005-04-27 11:25:08 +02:00
msvensson@neptunus.(none)
81c5cd8aed
Bug #8162 MySQL cannot be compiled without readline
...
- Display error if system readline or libedit can't be found
2005-04-27 11:19:00 +02:00
msvensson@neptunus.(none)
f3c72cc891
Bug #9954 mysql-4.1.11/cmd-line-utils/libedit/makelist.sh is not portable
...
- Changed makelist.sh
- Bump up required version of autoconf
- Use new style to init mutex in my_thr_init
2005-04-27 09:59:12 +02:00
joreland@mysql.com
d6f80c436c
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2005-04-27 07:56:37 +02:00
jimw@mysql.com
b186f021a8
Fix undersized array in my_print_defaults that caused crash on Sun Solaris
...
(and maybe strange results on other platforms). (Bug #9851 )
2005-04-26 17:33:49 -07:00
heikki@hundin.mysql.fi
36c1766f5d
sql_repl.cc:
...
Remove printf's from semi-sync code in sql_repl.cc
2005-04-27 03:18:54 +03:00
heikki@hundin.mysql.fi
9eadf2366c
Merge hundin.mysql.fi:/home/heikki/mysql-4.1
...
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-04-27 03:02:25 +03:00
heikki@hundin.mysql.fi
d694d5f1c9
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-04-27 02:59:05 +03:00
heikki@hundin.mysql.fi
bea92e1646
dict0dict.c, dict0dict.h, fil0fil.c:
...
Fix a problem in crash recovery of .ibd files on Windows if the user used lower_case_table_names=0 or 2; the directory scan in crash recovery forgot to put all paths to lower case, so that the tablespace name would be consistent with the internal data dictionary of InnoDB; remember that InnoDB puts internally all database names and table names to lower case on Windows, regardless of the value of lower_case_table_names
2005-04-27 02:57:19 +03:00
serg@serg.mylan
e7b2de98ee
be sure to call top_level_item() on the new Item_cond_and,
...
that merges ON and WHERE (BUG#10162)
2005-04-27 01:32:44 +02:00
monty@mysql.com
972f86f1ee
Cleanups during review
2005-04-26 23:24:59 +03:00
monty@mysql.com
3ca23bd918
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-04-26 21:09:42 +03:00
jimw@mysql.com
fe8d8aca18
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-04-26 10:30:27 -07:00
jimw@mysql.com
64f8ebc68b
Merge mysql.com:/home/jimw/my/mysql-5.0-build
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-04-26 10:29:58 -07:00
joerg@mysql.com
af59b7502b
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/M41/mysql-4.1
2005-04-26 19:26:51 +02:00
joerg@mysql.com
f0a5615383
Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/nptl-4.1
2005-04-26 19:22:43 +02:00
joerg@mysql.com
d461d05e8b
Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/merge-5.0
2005-04-26 19:18:05 +02:00
joerg@mysql.com
c45a942dc7
Merge of parallel fixes in 4.1 and 5.0
2005-04-26 19:16:18 +02:00
joerg@mysql.com
a0cac19e6e
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/M50/mysql-5.0
2005-04-26 19:11:54 +02:00
pem@mysql.comhem.se
406ea35128
Fixed memory leak in Item_func_sp::cleanup().
2005-04-26 18:18:41 +02:00
jimw@mysql.com
6f95cf02ab
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-26 08:56:29 -07:00
pem@mysql.comhem.se
281c0a8130
Fixed BUG#8408: Stored procedure crash if function contains SHOW
...
We simply have to disallow any kind of result set being sent back
from a function. Can't see any way to make that to work.
2005-04-26 17:31:59 +02:00
jimw@mysql.com
fcc04b2ffd
Merge changes to acinclude.m4 that are now in config/ac-macros/misc.m4
2005-04-26 08:23:42 -07:00
jimw@mysql.com
ef5ad50ccc
Merge mysql.com:/home/jimw/my/mysql-4.1-9063
...
into mysql.com:/home/jimw/my/mysql-5.0-build
2005-04-26 08:20:51 -07:00
jimw@mysql.com
a296ccfd28
Fix typo in include file name (Bug #9063 )
2005-04-26 08:20:00 -07:00
heikki@hundin.mysql.fi
f12cd8c708
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-04-26 17:57:15 +03:00
ramil@mysql.com
5624641cb0
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b9489
2005-04-26 19:57:15 +05:00
jani@ua141d10.elisa.omakaista.fi
005c447183
Added a check for config-file.
2005-04-26 17:57:14 +03:00
jani@ua141d10.elisa.omakaista.fi
cdda50acbb
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-04-26 17:47:19 +03:00
ramil@mysql.com
db2b729c73
A fix (bug #10176 : problem with varchar keys).
2005-04-26 19:46:52 +05:00
jani@ua141d10.elisa.omakaista.fi
c98b90bbfb
Fixed Bug#9834, "mysqld_multi --config-file parameter requires
...
absolute path".
2005-04-26 17:46:43 +03:00
gbichot@quadita2.mysql.com
bc7856cd1e
Merge quadita2.mysql.com:/nfstmp1/guilhem/mysql-4.1-4ita
...
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
2005-04-26 16:09:04 +02:00
gbichot@quadita2.mysql.com
a95571875c
checking that statements get into binlog even when they were affecting
...
no rows of the blackhold engine (for this engine to be a binlog propagator).
NOTE: blackhole.test currently hangs in 5.0 BUG#10175 so I'll merge without running this test; the
person who fixes the hang will correct the merged blackhole.result or ask me to).
2005-04-26 15:52:04 +02:00
jani@ua141d10.elisa.omakaista.fi
d4d0f9c126
Fixed Bug#6221, "mysqld_multi doesn't read the init_connect
...
option in my.cnf correctly"
2005-04-26 16:16:38 +03:00
monty@mysql.com
220a01a838
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-04-26 16:03:20 +03:00
jani@ua141d10.elisa.omakaista.fi
a82c7bea66
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-04-26 14:29:20 +03:00
jani@ua141d10.elisa.omakaista.fi
7810721f40
Fixed Bug#9835: mysqld_multi --help won't output help if there are
...
parameter problems.
2005-04-26 14:28:22 +03:00
joerg@mysql.com
74fdb2663c
Final fix for NPTL configuration (bug#2173, bug#5871, and bug#9497).
2005-04-26 13:15:20 +02:00
ramil@mysql.com
cfa24e3d64
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-04-26 16:02:17 +05:00