Commit graph

13743 commits

Author SHA1 Message Date
guilhem@mysql.com
e14aef7820 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-1717
2004-06-24 15:32:32 +02:00
tomas@poseidon.bredbandsbolaget.se
c218727dd2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1-clean
2004-06-24 13:32:30 +00:00
tomas@poseidon.bredbandsbolaget.se
17047d83f3 added posr switch to mysql-test-run 2004-06-24 13:28:15 +00:00
ingo@mysql.com
18cd61d0d0 bug#3565 - HANDLER and FLUSH TABLE/TABLES deadlock.
Redesigned the handler close functions so that they are usable
at different places where waiting for closing tables is done.
2004-06-24 15:06:56 +02:00
ingo@mysql.com
fa86cada0c bug#2686 - index_merge select on BerkeleyDB table with varchar PK causes mysqld to crash.
Added put_length() to get_length() and unpack_key() to pack_key().
Keys were packed with the minimum size of the length field for the key part and 
unpacked with length size of the base column. 
For the purpose of optimal key packing we have the method pack_key(), while rows are 
packed with pack(). Now keys are unpacked with unpack_key() and no longer with 
unpack() which is used for rows.
2004-06-24 14:54:28 +02:00
mskold@mysql.com
29746be6a8 Cosmetic fixes 2004-06-24 14:49:34 +02:00
guilhem@mysql.com
d8fe091e28 Enabling the --innodb-safe-binlog option in code. If you wish to disable it,
you just need to change this line of mysqld.cc:
#if MYSQL_VERSION_ID >= 40103
to, say,
#if MYSQL_VERSION_ID > 40103
I am noticing a failure of bdb.test; I believe this is not related to the
code I added yesterday and today, but I am checking. In any case I push this
changeset as it cannot by itself bring more mess that I *may* (or not)
already have brought with previous pushes.
2004-06-24 14:42:56 +02:00
sergefp@mysql.com
e4270dd595 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-root
2004-06-24 15:52:52 +04:00
ram@gw.mysql.r18.ru
8ba7841740 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b4198
2004-06-24 16:52:51 +05:00
tomas@poseidon.bredbandsbolaget.se
0f9dc08188 added order by 2004-06-24 11:52:50 +00:00
ingo@mysql.com
d74558eb36 Merge mysql.com:/home/mydev/mysql-4.0
into mysql.com:/home/mydev/mysql-4.0-bug2688
2004-06-24 12:07:00 +02:00
mskold@mysql.com
075d71d546 Modified index flags and added ndbcluster_print_error 2004-06-24 12:04:22 +02:00
joreland@mysql.com
e07e93489e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-06-24 11:48:12 +02:00
lenz@mysql.com
1c88943129 - Windows compile fix: added srv/srv0que.c to the innobase project
file and sql/tztime.cpp to the libmysqld project file
2004-06-24 11:45:06 +02:00
joreland@mysql.com
ca30aaaa63 fixes for solaris build issues with ndb
(the previous commit was in "non" fresh clone :-()
2004-06-24 11:42:44 +02:00
guilhem@mysql.com
802688c6b7 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-1717
2004-06-24 11:39:56 +02:00
guilhem@mysql.com
4a82bd4732 Final part of WL#1717 "innodb/binlog consistency". This is to resolve
a limitation of yesterday's implementation:
if there was an unfinished transaction (COMMIT not typed), and some MyISAM tables were
then updated, and then mysqld crashes, then at restart the server would use the too old
binlog offset known by InnoDB to cut the binlog, thus cutting the successful MyISAM
updates. We fix this by reporting the binlog offset into InnoDB even if InnoDB was not
affected at all by the update.
But the feature is still disabled until we decide if it can go into 4.1.3.
2004-06-24 11:38:57 +02:00
ram@gw.mysql.r18.ru
21018e3420 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b4198
2004-06-24 14:33:36 +05:00
bell@sanja.is.com.ua
d3efbb9d3b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-innodb-4.1
2004-06-24 10:55:48 +03:00
lenz@mysql.com
edb9af25bc - added mysql_tzinfo_to_sql to binary distributions 2004-06-24 09:22:45 +02:00
patg@krsna.patg.net
c9b1946c05 Development.fgl:
add typelib.h to filelist
Clients and Tools.fgl:
  add libmysql.dll to file list
4.0.XX-gpl.ipr:
  Various fixes to installshield project file (added files)
2004-06-23 21:02:37 -07:00
patg@krsna.patg.net
c7e61b8e9a Do-rpm:
Small fix to handle the src rpm file correctly (contains '0', release number in spec file)
2004-06-23 20:26:20 -07:00
bell@sanja.is.com.ua
7483b3cf96 parameter of my_yyoverflow made independed from YYSIZE_T (BUG#4204) 2004-06-24 02:57:57 +03:00
paul@ice.snake.net
3029ae651d Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-23 18:11:09 -05:00
guilhem@mysql.com
7480ef3840 disabling the --innodb-safe-binlog option. It should be fixed to work with MyISAM too,
before being available to users. That will be the case in 4.1.4.
The "bk commit in mysqldoc" corresponding to this feature was not pushed.
Removing the 6 tests, they'll be pushed again later.
2004-06-24 01:06:48 +02:00
dlenev@brandersnatch.localdomain
62e0e3bd24 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-winfix
2004-06-24 02:12:48 +04:00
guilhem@mysql.com
a86b133a44 removing forgotten line (had not noticed as I build with LINT_INIT undefined :( ). 2004-06-24 00:09:29 +02:00
dlenev@brandersnatch.localdomain
a58930d562 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-winfix
2004-06-24 01:55:51 +04:00
guilhem@mysql.com
bccf57fbb2 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-1717
2004-06-23 23:52:49 +02:00
guilhem@mysql.com
c267b19db2 WL#1717 "binlog/innodb consistency".
Final push. Printing some warnings at startup, as --innodb-safe-binlog requires
some other options, to work as expected.
Adding 6 new tests (3 pairs). If they fail on some platforms (so far they have been run only on my Linux),
they should be ignored for the 4.1.3 build (you can just
rm mysql-test/*/rpl_crash_*).
Now going to update doc.
2004-06-23 23:51:40 +02:00
dlenev@brandersnatch.localdomain
afa211f57b Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-winfix
2004-06-24 01:42:43 +04:00
serg@serg.mylan
334eb77356 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-06-23 23:42:42 +02:00
serg@serg.mylan
d5808281e6 followup 2004-06-23 23:41:56 +02:00
dlenev@brandersnatch.localdomain
31cade39cd Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-winfix
2004-06-24 01:38:41 +04:00
joreland@mysql.com
6df958bcb2 Fixes for gcc-3.4.0 2004-06-23 23:33:28 +02:00
dlenev@brandersnatch.localdomain
0d78aa2c55 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-winfix
2004-06-24 01:09:05 +04:00
dlenev@brandersnatch.localdomain
ab8a72c7c7 Fixed compilation on windows. 2004-06-24 01:08:07 +04:00
mwagner@here.mwagner.org
0935a0939a Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into here.mwagner.org:/Volumes/BK/mysql-4.1
2004-06-23 15:39:51 -05:00
serg@serg.mylan
2c48e052d9 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-06-23 21:47:07 +02:00
serg@serg.mylan
fc234f2e4c Bug#4261 - mysqldump omits NULLs with --skip-extended-insert 2004-06-23 21:46:17 +02:00
serg@serg.mylan
9f45c9e399 followup to handler cleanup 2004-06-23 21:26:34 +02:00
mwagner@here.mwagner.org
26609c491e mysql-copyright:
Fixed vim to expandtab's, retab'd code
  Fixed CWD bug in trim_the_fat()
2004-06-23 13:48:16 -05:00
paul@ice.snake.net
5a25e7b820 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-23 12:53:26 -05:00
paul@kite-hub.kitebird.com
7cb8b935b4 mysqldump.c:
Fix typo.
2004-06-23 12:37:34 -05:00
paul@ice.snake.net
248e57347b Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-23 12:32:42 -05:00
mwagner@here.mwagner.org
6cd530b37c mysql-copyright:
Cleaned-up trim_the_fat()
2004-06-23 12:31:10 -05:00
paul@kite-hub.kitebird.com
ea4265ab87 mysqldump.c:
Correct the help text for mysqldump --set-charset option.
2004-06-23 12:21:49 -05:00
lenz@mysql.com
19e9453b00 - using "--with-libedit" is sufficient (--without-readline throws
weird compile errors)
2004-06-23 18:28:50 +02:00
bell@sanja.is.com.ua
2f5c9b7aa5 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-innodb-4.1
2004-06-23 18:58:52 +03:00
paul@ice.snake.net
fe310f9e59 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-23 10:44:54 -05:00