monty@mysql.com
2204baa5a3
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-01-14 00:10:03 +02:00
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
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
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
heikki@hundin.mysql.fi
fca5ee0c63
Merge
2005-01-13 19:27:44 +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
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
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
bar@mysql.com
e3d6e6736b
bug#7284: strnxfrm returns different results for equal strings
2005-01-13 18:12:04 +04: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
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
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
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
joreland@mysql.com
ddf9bdab36
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-13 10:29:03 +01:00
joreland@mysql.com
6e35e34fdb
bug#7864 - fix ndb limit 4.5G data memory due to truncation error
2005-01-13 10:28:26 +01:00
mwagner@here.mwagner.org
292ca0959c
libmysqld.def, libmysql.def:
...
Use the invisible tabs (!)
2005-01-12 21:04:31 -06:00
mwagner@here.mwagner.org
ffdeb4f880
libmysqld.def, libmysql.def:
...
Add missing 'get_defaults_files' to fix linking error.
2005-01-12 19:56:49 -06:00
jimw@mysql.com
3d2481ba4a
Fix small memory leak that occured when BerkeleyDB failed to initialize.
2005-01-12 17:20:43 -08:00
jimw@mysql.com
0a3fba7f18
Small fix for Field_str::store() to avoid trying to read past beginning
...
of log_10 array.
2005-01-13 00:52:19 +01:00
jimw@mysql.com
51781b0bfc
Fix conversion of floating point values to character fields when the
...
absolute value of the float is less than 1, and also fix calculation of
length for negative values. (Bug #7774 )
2005-01-13 00:41:45 +01:00
konstantin@mysql.com
30c4d10e1a
Add logging of COM_EXECUTE in the general query log.
2005-01-13 02:13:19 +03:00
serg@serg.mylan
239c2ae44d
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2005-01-12 23:31:31 +01:00
serg@serg.mylan
1d33747d3a
Symlink vulnerability fixed.
...
reported by Javier Fernandez-Sanguino Pena
and Debian Security Audit Team (http://www.debian.org/security/audit )
2005-01-12 23:30:54 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
3e3e140e3d
Minor clean up.
2005-01-12 22:55:10 +02:00
tulin@build.mysql.com
422e37ee04
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into build.mysql.com:/users/tulin/mysql-4.1
2005-01-12 19:00:33 +01:00
konstantin@mysql.com
8b33aad4e4
A test case for Bug#6761 "mysql_list_fields doesn't work"
2005-01-12 20:28:31 +03:00
tulin@build.mysql.com
2d3f842ad0
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into build.mysql.com:/users/tulin/mysql-4.1
2005-01-12 18:20:16 +01:00
tulin@build.mysql.com
3f8d669873
fix shm key
2005-01-12 18:19:30 +01:00
konstantin@mysql.com
2cc2844bbb
Merge mysql.com:/home/kostja/work/mysql-4.0-6761
...
into mysql.com:/home/kostja/work/mysql-4.1-root
2005-01-12 19:00:04 +03:00
konstantin@mysql.com
6058edbe18
A fix for Bug#6761 "mysql_list_fields() does not work": test
...
case will be added to client_test in 4.1
2005-01-12 17:04:45 +03:00
marko@hundin.mysql.fi
69afdf53c7
InnoDB: Use system-supplied tmpfile() on Netware, as there is no
...
open interface for setting the "delete-on-close" flag.
2005-01-12 15:24:49 +02:00
serg@serg.mylan
54b8741482
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-12 13:27:15 +01:00
lenz@mysql.com
373dbb4750
Merge mysql.com:/space/my/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1-merge
2005-01-12 13:08:24 +01:00
lenz@mysql.com
9d9ea66097
- Modified Do-compile to run the test suite with ps-protocol and against
...
the embedded server by default (if included). These additional steps can
be skipped by providing "--skip-embedded-test" and "--skip-ps-test"
2005-01-12 13:06:06 +01:00
serg@serg.mylan
e83f49bd2f
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2005-01-12 12:35:34 +01:00
serg@serg.mylan
cc23dc2d11
merged. ul.
2005-01-12 12:24:23 +01:00
serg@serg.mylan
b86a512e37
added missing Com_update_multi status variable
2005-01-12 12:18:17 +01:00
joreland@mysql.com
eeabd0bb67
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-12 11:20:05 +01:00
joreland@mysql.com
a9dc068a43
ndb - fix 64-bit problem in autotest
2005-01-12 11:17:03 +01:00
tomas@poseidon.ndb.mysql.com
a5c08a718e
ndbcluster.sh:
...
increased timeouts to see if more tests get started automatically
2005-01-11 23:09:10 +01:00
jimw@mysql.com
b89d35fa68
Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-11 21:55:39 +01:00
jimw@mysql.com
6dbea8fc55
Merge mysql.com:/home/jwinstead2/mysql-4.1-6418
...
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-11 21:53:39 +01:00
jimw@mysql.com
39d90b710f
Replace ZLIB_LIBS in mysql_config. (Bug #6418 )
2005-01-11 21:50:30 +01:00
jani@ua141d10.elisa.omakaista.fi
fd79354273
Fixed Bug#2813, "analyse does not quot string values in enams from string".
2005-01-11 19:40:33 +02:00