Commit graph

18880 commits

Author SHA1 Message Date
monty@mysql.com
249f914c21 Fix bug in INSERT DELAYED with prepared statements
The bug was that if you have two TL_WRITE_DELAYED at the same time,
mi_lock_databases() could be done in the wrong order and we could write the wrong header to the MyISAM index file.
2005-01-14 00:09:15 +02:00
jimw@mysql.com
2a2f7a0b80 Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-01-13 13:48:25 -08:00
jimw@mysql.com
444c831e6e Update results files 2005-01-13 13:46:59 -08:00
jimw@mysql.com
fdc16dc434 Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-01-13 12:40:34 -08:00
guilhem@mysql.com
d6c99656b0 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-clean
2005-01-13 21:36:28 +01:00
heikki@hundin.mysql.fi
94cc8442b0 ha_innodb.cc:
"Add a comment why data modifying SQL statements MUST always use a locking read in tables that they read: otherwise the execution is not serializable, and in many cases is not well-defined; we also merged the associated bug fix from 4.1"
2005-01-13 21:58:47 +02:00
jimw@mysql.com
d7389eedd1 Fix mysql_install_db to look for libexecdir relative to basedir when
it has been specified. (Bug #7347)
2005-01-13 11:58:10 -08:00
anjuta@arthur.local
8f169155d1 Merge anna@bk-internal.mysql.com:/home/bk/mysql-5.0
into arthur.local:/my/mysql-5.0-clean
2005-01-13 21:56:18 +02:00
jimw@mysql.com
9b798253eb Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-01-13 11:50:10 -08:00
jimw@mysql.com
dcd75689d3 Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-13 11:47:49 -08:00
heikki@hundin.mysql.fi
bdf26a4f9d Merge hundin.mysql.fi:/home/heikki/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-01-13 21:42:37 +02:00
monty@mysql.com
7c457a1bd7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-01-13 20:09:41 +02:00
heikki@hundin.mysql.fi
21666e4207 ha_innodb.cc:
Merge from 4.0:     Fix a theoretical hang over the adaptive hash latch in InnoDB if one runs INSERT ... SELECT ... (binlog not enabled), or a multi-table UPDATE or DELETE, and only the read tables are InnoDB type, the rest are MyISAM; this also fixes bug #7879 for InnoDB type tables
2005-01-13 20:08:28 +02:00
jani@ua141d10.elisa.omakaista.fi
83a57807e8 Applied a patch for Netware. 2005-01-13 19:46:46 +02:00
jimw@mysql.com
80c56602d3 Merge 2005-01-13 09:31:54 -08:00
heikki@hundin.mysql.fi
fca5ee0c63 Merge 2005-01-13 19:27:44 +02:00
jani@ua141d10.elisa.omakaista.fi
3ae7b67a41 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-01-13 19:25:39 +02:00
jani@ua141d10.elisa.omakaista.fi
f3e73e26d7 A patch for Netware. 2005-01-13 19:24:54 +02:00
jimw@mysql.com
7e1f47022c Merge jwinstead2@wwwtst1.mysql.com:mysql-4.1-7235
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-13 09:24:07 -08:00
jimw@mysql.com
d63dc891c1 Add test cases to verify that SHOW CREATE TABLE always outputs the
key algorithm for keys where they were explicitly specified.
2005-01-13 18:22:35 +01:00
heikki@hundin.mysql.fi
76789a4c13 ha_innodb.cc:
Fix a theoretical hang over the adaptive hash latch in InnoDB if one runs INSERT ... SELECT ... (binlog not enabled), or a multi-table UPDATE or DELETE, and only the read tables are InnoDB type, the rest are MyISAM; this also fixes bug #7879 for InnoDB type tables
2005-01-13 19:20:49 +02:00
anjuta@arthur.local
224fcd4717 Merge 2005-01-13 19:14:10 +02:00
jimw@mysql.com
ce1cd9f0ee Merge mysql.com:/home/jimw/my/mysql-4.1-bdb-init
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-01-13 09:09:46 -08:00
jimw@mysql.com
28ee2a67b3 Merge jwinstead2@wwwtst1.mysql.com:mysql-4.1-7774
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-01-13 09:09:10 -08:00
jimw@mysql.com
73a9b29c3c Merge mysql.com:/home/jimw/my/mysql-4.1-bdb-init
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-13 09:07:48 -08:00
jimw@mysql.com
7639e5afaf Merge jwinstead2@wwwtst1.mysql.com:mysql-4.1-7774
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-13 09:07:21 -08:00
anjuta@arthur.local
f23cdbcd4a Bug in InnoDB;
file closing in extra/comp_err.c
2005-01-13 19:03:46 +02:00
konstantin@mysql.com
9e10645cff Fix valgrind warning + post-merge fixes. 2005-01-13 19:03:21 +03:00
konstantin@mysql.com
443cafc232 manual merge 2005-01-13 18:15:58 +03:00
guilhem@mysql.com
c7c5cc80ad Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-clean
2005-01-13 15:59:48 +01:00
guilhem@mysql.com
a02601ecc5 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-13 15:35:36 +01:00
konstantin@mysql.com
a676498977 manual merge 2005-01-13 17:31:49 +03:00
lenz@mysql.com
8474953cdf Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-01-13 15:26:13 +01:00
marko@hundin.mysql.fi
c5708e1d65 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2005-01-13 16:16:05 +02:00
marko@hundin.mysql.fi
284191d19a InnoDB: Detect the availability of the Mac OS X fsync() work-around
at run-time, so that an executable compiled on Mac OS X 10.2 can
be run on Mac OS X 10.2 (without the work-around) and Mac OS X 10.3
and later with the work-aroud enabled.
2005-01-13 16:15:14 +02:00
bar@mysql.com
e3d6e6736b bug#7284: strnxfrm returns different results for equal strings 2005-01-13 18:12:04 +04:00
lenz@mysql.com
9174632ade - keep 5.0.3-alpha version string (after-merge fix) 2005-01-13 15:10:12 +01:00
lenz@mysql.com
b531a5e212 - bumped up the version number in configure.in from 4.1.9 to 4.1.10
- tagged ChangeSet 1.2207 as "mysql-4.1.9"
2005-01-13 14:57:51 +01:00
lenz@mysql.com
de6af31752 - added the 4.1 shared client libraries to the 5.0 shared-compat RPM
(we should consider dropping 3.23 from this one soon)
2005-01-13 14:54:18 +01:00
lenz@mysql.com
3e5e12d5c0 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-5.0-build
2005-01-13 14:54:17 +01:00
gluh@gluh.mysql.r18.ru
2a0948ef54 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-5.0
2005-01-13 16:54:16 +03:00
gluh@gluh.mysql.r18.ru
b4e78f39c2 The function should exit from loop on invalid byte sequence 2005-01-13 16:53:10 +03:00
marko@hundin.mysql.fi
c414f138c7 row0mysql.c:
row_truncate_table_for_mysql(): Reset the auto_increment counter.
2005-01-13 15:14:11 +02:00
jani@ua141d10.elisa.omakaista.fi
9cea2457ec Fixed a problem with a test. Time could be 0 or 1 seconds, depending
on whether running with or without valgrind.
2005-01-13 15:04:57 +02:00
dlenev@mysql.com
77182c4460 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-dtbug
2005-01-13 15:41:21 +03:00
lenz@mysql.com
13f13cef75 - added the 4.0 shared mysqlclient libraries to the 4.1 "shared-compat" RPM 2005-01-13 13:07:35 +01:00
dlenev@mysql.com
52baee6346 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-dtbug
2005-01-13 14:46:41 +03:00
lenz@mysql.com
bbe30db001 - added option "--with-federated" to Do-compile to enable building of the
Federated Storage Engine (as requested by Brian)
- added the federated storage engine to the Max Linux RPM
2005-01-13 12:03:12 +01:00
serg@serg.mylan
78756fe7b1 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-13 11:34:12 +01:00
serg@serg.mylan
ec9f0ef1ca Merge serg.mylan:/usr/home/serg/Abk/mysql-4.0
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-13 11:12:00 +01:00