konstantin@mysql.com
9b5e3745d3
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/kostja/mysql/mysql-4.1-warnings
2004-07-23 18:52:42 -07:00
konstantin@mysql.com
4139c359f8
All templates inlined into AC_DEFINE/AC_DEFINE_UNQUOTED.
...
Use of acconfig.h is deprecated in modern autotools (a cleaner patch).
2004-07-23 18:52:25 -07:00
pem@mysql.comhem.se
29662d14ec
Fix for stored procedures BUG#4726: Stored procedure crash when looping over SELECT with complex WHERE's.
2004-07-23 18:42:24 +02:00
bar@mysql.com
6cad42e3ce
Bug #4555 ALTER TABLE crashes mysqld with enum column collated utf8_unicode_ci
2004-07-23 19:10:06 +05:00
mskold@mysql.com
345e1dc42a
Fixed merge problems, optimized bulk insert
2004-07-23 15:46:56 +02:00
pekka@mysql.com
82c759e254
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into mysql.com:/space/pekka/ndb/version/my41-tux
2004-07-23 14:16:08 +02:00
bar@mysql.com
0f298f02db
sql_db.cc:
...
mysqld crashes on CREATE TABLE in a database with corrupted db.opt file.
Bug#4646
2004-07-23 17:11:45 +05:00
pekka@mysql.com
156bfa48f5
ha_ndbcluster.cc:
...
merge
2004-07-23 13:41:38 +02:00
pekka@mysql.com
56fa7bfd90
Merge
2004-07-23 13:27:26 +02:00
pekka@mysql.com
f14d9c672b
ha_ndbcluster.cc:
...
ndb_supported_type, include all types in switch
2004-07-23 13:21:39 +02:00
mskold@mysql.com
0d56d7ffdf
Changed bulk insert to only be statement wise
2004-07-23 13:13:50 +02:00
magnus@neptunus.(none)
9d3edfb6b2
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/magnus/mysql-4.1
2004-07-23 10:40:27 +02:00
mskold@mysql.com
6216a8bf1b
Fixes after code review of WL#1791 Handler: support update of primary key
2004-07-23 10:33:51 +02:00
magnus@neptunus.(none)
e93dadd4e7
Add include of signal.h to Emulator.cpp
2004-07-23 10:32:23 +02:00
mskold@mysql.com
f08af1382c
Cosmetic fix
2004-07-22 19:14:05 +02:00
mskold@mysql.com
217bd8b6bd
WL#1791 Handler: support update of primary key
2004-07-22 18:35:51 +02:00
pekka@mysql.com
257b113469
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into mysql.com:/space/pekka/ndb/version/my41-tux
2004-07-22 13:16:02 +02:00
pekka@mysql.com
9c3dd2fb8b
ha_ndb blobs 2
2004-07-22 12:38:09 +02:00
pekka@mysql.com
e38792a638
ha_ndb blobs
2004-07-22 12:33:14 +02:00
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
jan@hundin.mysql.fi
939a9bfb59
Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/jan/mysql-4.1
2004-07-22 08:56:23 +03: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
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