Commit graph

13634 commits

Author SHA1 Message Date
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
mskold@mysql.com
42df1f0686 ndb_lock.test, ndb_lock.result:
new file
2004-07-21 12:06:46 +02:00
mskold@mysql.com
bb61021420 Fix for bug#4669, Scans do not ignore uncommitted inserts (instead hang on lock) 2004-07-21 11:46:14 +02:00
jan@hundin.mysql.fi
3ca686c5fb Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
2004-07-21 08:52:12 +03: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
mskold@mysql.com
7c49eb219f Additional fix for bug#4650 2004-07-20 21:24:03 +02: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
mskold@mysql.com
ac02b2e15d Fix for bug#4650 Scan does not report timeout of owning transaction 2004-07-20 16:31:18 +02:00
mskold@mysql.com
6082f484a3 Added test for bug#4595 2004-07-20 14:50:22 +02:00
jan@hundin.mysql.fi
0449396a67 Added innodb_locks_unsafe_for_binlog option. This option turns off Innodb
next-key locking. Using this option the locks InnoDB sets on index 
  records do not affect the ``gap'' before that index record. Thus, this option
  allows phantom problem.
2004-07-20 14:15:38 +03: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
mronstrom@mysql.com
73360e5582 Bug #4479
Ensures that the node doesn't crash by overflowing the UNDO log buffer
at local checkpoints. Inserts a real-time break after 512 operations
and when low on UNDO log buffer.
2004-07-20 00:23:49 +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
mskold@mysql.com
9311492f1c Fix for bug#4595 2004-07-19 17:28:07 +02: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
mronstrom@mysql.com
abb093fc4c Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/mikron/mysql-4.1
2004-07-19 14:18:27 +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
magnus@neptunus.(none)
dd0c7facd0 Added new test/result file ndb_types to test creating tables with different column types in NDB 2004-07-19 11:38:28 +02:00
magnus@neptunus.(none)
e8d0f26a92 BUG#4511 Made Discless deprecated 2004-07-19 10:50:50 +02:00
mskold@mysql.com
ce96f0e407 Removed timeout tests 2004-07-19 10:31:55 +02:00
mskold@mysql.com
cf87b5b096 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
2004-07-19 09:09:40 +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
mronstrom@mysql.com
03f430206f Added new testcase for Bug #4479
testBasic -n MassiveTransaction
Inserts as many records as defined in one transaction
using loadTable
2004-07-17 19:31:16 +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
magnus@neptunus.(none)
7eccfc1b95 BUG#4511 2004-07-16 10:42:45 +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