Commit graph

13374 commits

Author SHA1 Message Date
pem@mysql.comhem.se
e8b7c9cb1a Added missing error message to estonian/errmsg.txt. 2004-07-22 11:32:12 +02:00
magnus@neptunus.(none)
2a90034204 Adding *.hpp files for testScan and testScanInterpreter to sources
Removing old directories for test/ using bk rmdir
2004-07-22 09:37:55 +02:00
konstantin@mysql.com
cd5359ceda a line left from manual merge removed 2004-07-21 19:20:22 -07:00
konstantin@mysql.com
d2c1f3fc37 First step of implementation of WL#1518 "make bundled zlib
usable for unix builds": zlib 1.2.1 imported
2004-07-21 17:36:26 -07:00
miguel@hegel.(none)
58bdb6221c Export the stmt functions on Embedded Server 2004-07-21 19:29:08 -04:00
bell@sanja.is.com.ua
02614a0247 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-07-21 22:48:05 +03:00
bell@sanja.is.com.ua
a1b6f6db0e LEX initialization fixed 2004-07-21 22:44:12 +03:00
serg@serg.mylan
849ab31863 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-07-21 19:17:50 +02:00
serg@serg.mylan
555442bf6a fixed ORDER BY ?
new tests to ensure that prepared statement *really* work
(and that MySQL not picks up some number from arbitrary location
that happens to match the parameter's value)
2004-07-21 19:17:07 +02:00
hf@deer.(none)
cbff743b2d Final patch for WL#1600(warn if max_allowed_packet used) 2004-07-21 21:27:45 +05:00
hf@deer.(none)
5bff13bc72 Merging 2004-07-21 19:10:37 +05:00
guilhem@mysql.com
84d9b862f6 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-874
2004-07-21 00:53:10 +02:00
guilhem@mysql.com
e649dbfcb0 Sanja will probably rework this tomorrow; we need to unify the normal
client code and replication slave code, as far as LOAD DATA INFILE and
other queries' execution is concerned. Duplication of code leads to
replication bugs, because the replication duplicate lags much behind.
Fix for 2 Valgrind errors on slave replicating LOAD DATA INFILE
  - one serious (causing a random test failure in rpl_loaddata in 5.0)
  - one not serious (theoretically a bug but not dangerous): uninited thd->row_count
2004-07-21 00:52:35 +02:00
brian@brian-akers-computer.local
943142e126 Updates for archive storage engine. 2004-07-20 13:25:55 -07:00
tim@sand.box
8ebc968205 Merge tsmith@build.mysql.com:/home/bk/mysql-4.1
into sand.box:/home/tim/m/41/bk
2004-07-20 10:09:55 -06:00
tim@sand.box
dfb3e33850 Get ps_1general test to pass (replace .result with .reject - some text
was changed in the SHOW STORAGE ENGINES results)
2004-07-20 10:06:28 -06:00
serg@serg.mylan
27f9f14e1d Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-07-20 11:14:20 +02:00
serg@serg.mylan
5f3461838b oops, forgot to checkin... 2004-07-20 11:13:23 +02:00
serg@serg.mylan
9de748d1d3 results fixed after merge 2004-07-20 11:00:10 +02:00
serg@serg.mylan
1f0cd873c5 manual merged (blame me!) 2004-07-20 00:53:24 +02:00
konstantin@mysql.com
c9656ba551 Compilation failure on Windows fixed. 2004-07-19 15:12:23 -07:00
serg@serg.mylan
64fa4cc124 merged with 'ul' 2004-07-19 23:46:06 +02:00
paul@ice.snake.net
e2d6d838e1 handler.cc:
Revise output of SHOW ENGINES.
2004-07-19 15:09:21 -05:00
serg@serg.mylan
acfcf76228 make acl_init() more robust -
don't be confused if  new privilege - ENUM ('N','Y') - columns are added (mostly because of downgrade)
  don't expect NOT NULL fields to never contain a NULL :) - somebody may've changed table definition, or we may be reading the wrong column
2004-07-19 16:01:53 +02:00
lenz@mysql.com
1ed37f97a3 - only include the GPL license in the LICENSE text, not the FOSS
exception (it only applies to 4.0 and above)
2004-07-19 12:32:36 +02:00
guilhem@mysql.com
e5c2285782 Fix for BUG#4551 "Temporary InnoDB tables not replicated properly with CREATE TABLE .. SELECT"
The problem was that (for any storage engine), the created temporary table was not removed if CREATE SELECT failed (because
of a constraint violation for example). This was not consistent with the manual and with CREATE SELECT (no TEMPORARY).
2004-07-18 14:34:35 +02:00
guilhem@mysql.com
37bf41a7ae Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-07-17 17:10:52 +02:00
guilhem@mysql.com
88e00cd919 Fixes for
BUG#4506 "mysqlbinlog --position --read-from-remote-server has wrong "# at" lines",
BUG#4553 "Multi-table DROP TABLE replicates improperly for nonexistent table" with a test file.
It was not possible to add a test for BUG#4506 as in the test suite we must use --short-form
which does not display the "# at" lines.
2004-07-17 16:58:16 +02:00
bell@sanja.is.com.ua
5eadafe569 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-subs-4.1
2004-07-17 02:13:02 +03:00
bell@sanja.is.com.ua
f973ac9942 test fix 2004-07-17 02:09:25 +03:00
bell@sanja.is.com.ua
e3791c3dbf Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-07-17 01:08:25 +03:00
bell@sanja.is.com.ua
b6a23bab45 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-subs-4.1
2004-07-16 15:47:28 +03:00
bell@sanja.is.com.ua
67de5c37ff Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-07-16 15:45:06 +03:00
bell@sanja.is.com.ua
e28b73f490 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-subs-4.1
2004-07-16 15:40:05 +03:00
serg@serg.mylan
2c8737035c Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-07-16 13:33:57 +02:00
serg@serg.mylan
0452d59d22 in 4.1 DATABASE() may be NULL 2004-07-16 13:21:58 +02:00
lenz@mysql.com
8b7e07e062 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2004-07-15 21:36:17 +02:00
lenz@mysql.com
20389c1e9a Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2004-07-15 21:19:16 +02:00
lenz@mysql.com
fe2425b725 - Avoid the error message "Can't read index header from..."
when copying a small index file because the value returned
   for $length is < 1024. This can happen if the filehandle
   was open()ed as an UTF-8 encoded file with Unicode characters
   (In this case read() returns characters not bytes)
   (Thanks to Mike Bethune) for this hint)
2004-07-15 21:18:31 +02:00
marko@hundin.mysql.fi
20b60510e9 InnoDB: limit the recursion depth for ON (UPDATE|DELETE) CASCADE
(Bug #4446)
2004-07-15 15:46:22 +03:00
bell@sanja.is.com.ua
8ab5398bf7 check that all system tables deleted added 2004-07-15 14:17:30 +03:00
heikki@hundin.mysql.fi
0614f8c718 btr0cur.c:
Do not add + 1 to the InnoDB index cardinality estimate if the B-tree just contains one page; the fix made in March 2004 caused InnoDB systematically to overestimate the cardinality of empty or small tables by 1
2004-07-15 09:08:51 +03:00
bell@sanja.is.com.ua
3609ab683e stack overflow check added for subqueries processing (BUG#4554) 2004-07-14 23:57:14 +03:00
paul@kite-hub.kitebird.com
791bdf2c48 mysql_fix_privilege_tables.sh:
Language fixups.
2004-07-14 11:33:00 -05:00
lenz@mysql.com
d764fb4240 - fixed file name of the MySQL startup item script to MySQLCOM,
so it's included in the source distribution
2004-07-14 09:10:49 +02:00
lenz@mysql.com
80b363bca0 - Fixed a previous modification to the MySQL Startup Item for
Mac OS X: the name of the startup script itself must match the
   name of the subdirectory it's located in. Changed MySQL->MySQLCOM 
   in the Do-pkg script and renamed the file in BK. (Thanks to Bryan
   McCormack for reporting this)
2004-07-13 22:11:33 +02:00
lenz@mysql.com
6ea13f941f Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2004-07-13 21:50:09 +02:00
lenz@mysql.com
894142b66e - Move checking of the MD5 checksumming to the correct place
- fix calling of my_md5sum
2004-07-13 21:03:30 +02:00
guilhem@mysql.com
9b93534c2f Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-874
2004-07-13 16:51:59 +02:00
guilhem@mysql.com
a009af5e84 WL#1900 "When CHECK TABLE or ANALYZE TABLE of a MyISAM table is killed
by KILL or shutdown, do not mark the table as corrupted".
It is indeed more logical to leave the corruption flag unchanged.
This cannot be extended to REPAIR/OPTIMIZE as they make no backup copy
of the MYI. This patch was tested with KILL and mysqladmin shutdown
while a CHECK TABLE was running. Without the patch, the table becomes
unusable (can't INSERT to it, error 145). With the patch, no.
2004-07-13 16:51:10 +02:00