Commit graph

12194 commits

Author SHA1 Message Date
magnus@neptunus.(none)
ab78e4f4bc flags should be sent as second arg to my_error 2004-05-17 09:43:51 +02:00
magnus@neptunus.(none)
4d7edeff8e Updated ndb_basic test 2004-05-17 09:40:35 +02:00
magnus@neptunus.(none)
581819624f Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/magnus/mysql-4.1
2004-05-13 13:28:56 +02:00
magnus@neptunus.(none)
97bf111f1d WL #1729 Handler: error text for NDB errors
- New solution after discussions with Sergei, no handler specific code or error messages should be in sql layer.
next_result, only check for error if check is -1
Improved index_read
2004-05-13 11:56:45 +02:00
magnus@neptunus.(none)
f9ada40715 Fix for sql-bench/test-create 2004-05-13 11:21:56 +02:00
joreland@mysql.com
47b7c5612d Only compile SHM if configured to 2004-05-12 20:58:35 +02:00
tulin@build.mysql.com
de46433337 Merge build.mysql.com:/home/bk/mysql-4.1
into build.mysql.com:/users/tulin/mysql-4.1
2004-05-12 16:16:17 +02:00
tulin@build.mysql.com
aa161b3bcd regression.sh:
fixed typo
2004-05-12 16:15:43 +02:00
bell@sanja.is.com.ua
5384fbc02c Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1
2004-05-12 16:24:11 +03:00
joreland@mysql.com
216c3a3b5f Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-05-12 12:52:06 +02:00
ejonore@mc03.ndb.mysql.com
8dfb87ba24 Fix broken arg fot getrlimit 2004-05-12 12:17:24 +02:00
bell@sanja.is.com.ua
7defcb4703 used item method (Bug #3686) 2004-05-12 12:27:43 +03:00
tomas@mc05.(none)
6fb4bea1ca portability/autoconf fixes 2004-05-12 09:27:59 +02:00
ingo@mysql.com
41f1ed2321 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-wl1687
2004-05-12 08:13:05 +02:00
tomas@mc05.(none)
a5e9e473f8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mc05.(none):/space2/tomas/mysql-4.1
2004-05-12 06:26:53 +02:00
tomas@mc05.(none)
e2fd02e494 portability/autoconf fixes and removed warnings 2004-05-12 06:24:12 +02:00
monty@mysql.com
565aa085a7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-05-12 02:39:32 +03:00
monty@mysql.com
894e8fca6e Portability fixes 2004-05-12 02:38:57 +03:00
brian@brian-akers-computer.local
9b38341a34 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
2004-05-11 16:15:20 -07:00
brian@brian-akers-computer.local
346ae5fe33 Added comments to all methods. Added explanation for a sequential read through a storage engine. 2004-05-11 15:59:20 -07:00
monty@mysql.com
6c4b8d3499 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-05-12 00:30:16 +03:00
monty@mysql.com
116f61c656 Don't automaticly generate a new key for a foreign key constraint if there is already a usable key.
Prefer not automatic keys before automatic keys. If there is two conf
2004-05-12 00:29:52 +03:00
joreland@mysql.com
a5280c8bbf Cset include: ndbdev@ndbmaster.mysql.com|ChangeSet|20040511202610|13901
Cset include: ndbdev@ndbmaster.mysql.com|ChangeSet|20040511202329|47736
Cset include: tomas@mc05.(none)|ChangeSet|20040511192517|11620
Cset include: joreland@mysql.com|ChangeSet|20040511192516|46068
Cset include: tomas@mc05.(none)|ChangeSet|20040511123917|46372
Cset include: tomas@mc05.(none)|ChangeSet|20040511123143|38188
Cset include: tulin@build.mysql.com|ChangeSet|20040510154057|38196
Cset include: joreland@mysql.com|ChangeSet|20040508224854|24167
Cset include: tomas@mc05.(none)|ChangeSet|20040507133412|23798
Cset include: tomas@mc05.(none)|ChangeSet|20040507063942|37686
Cset include: tomas@mc05.(none)|ChangeSet|20040506111114|33079
Cset include: tomas@mc05.(none)|ChangeSet|20040506105341|38394
Cset include: tomas@mc05.(none)|ChangeSet|20040506071539|38751
Cset include: tomas@mc05.(none)|ChangeSet|20040505121947|31340
Cset include: tomas@mc05.(none)|ChangeSet|20040505113759|32666
Cset include: tomas@mc05.(none)|ChangeSet|20040505104200|32652
Cset include: tomas@mc05.(none)|ChangeSet|20040505092956|32651
Cset include: tomas@mc05.(none)|ChangeSet|20040504130019|09791
Cset include: tomas@mc05.(none)|ChangeSet|20040503043335|03888
Cset include: tomas@mc05.(none)|ChangeSet|20040428084951|62492
2004-05-11 22:34:14 +02:00
ndbdev@ndbmaster.mysql.com
3a880e3aac Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into ndbmaster.mysql.com:/ndb/clone-4.1-ndb-daily
2004-05-11 22:26:10 +02:00
ndbdev@ndbmaster.mysql.com
9a12b80a5b Inverted #ifdef on HAVE_MLOCKALL 2004-05-11 22:23:29 +02:00
tomas@mc05.(none)
c9c5260e7a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1
2004-05-11 21:25:17 +02:00
joreland@mysql.com
b886afc033 cpcd - setsid - angle fixes 2004-05-11 21:25:16 +02:00
ingo@mysql.com
98e86c9427 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-wl1687
2004-05-11 16:33:44 +02:00
tsmith@build.mysql.com
6ad9691dc8 Merge build:/home/bk/mysql-4.1
into build.mysql.com:/users/tsmith/m/41/mysql-4.1
2004-05-11 14:44:25 +02:00
tomas@mc05.(none)
d96ada53fd lots of HAVE_ and some ndb_global fixes for ndb subtree 2004-05-11 14:39:17 +02:00
tomas@mc05.(none)
daff95f5c3 updated with HAV_ symbols in ndb_global 2004-05-11 14:31:43 +02:00
magnus@neptunus.(none)
02c9f8cfe0 WL# 1729 Handler: error text for NDB errors
- Close an open scan if index_read is called without closing the previous one.
- Removed some errors that occured during previous merge
2004-05-11 13:59:22 +02:00
ingo@mysql.com
e94cb19624 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-wl1687
2004-05-11 13:38:34 +02:00
magnus@neptunus.(none)
f16aa69d0e Test case for BUG #3657 2004-05-11 13:29:01 +02:00
magnus@neptunus.(none)
67a560407c Update error code on "parent" connection if a new NdbScanOperation could not be returned 2004-05-11 13:27:40 +02:00
ingo@mysql.com
20c7896617 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-wl1687
2004-05-11 12:44:14 +02:00
serg@serg.mylan
6f32682524 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-05-11 12:40:07 +02:00
serg@serg.mylan
423f37b92b out-of-bound array access fixed 2004-05-11 12:39:00 +02:00
marko@hundin.mysql.fi
05a716a75f InnoDB: Replace ut_strdup() with mem_strdup() 2004-05-11 12:51:42 +03:00
lenz@mysql.com
ce471412e3 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2004-05-11 11:00:34 +02:00
magnus@neptunus.(none)
62fe381192 Updated ndb_* test cases
Added two new, ndb_replace and ndb_minmax
2004-05-11 10:40:48 +02:00
bar@bar.intranet.mysql.r18.ru
f16dac0492 Use Windows code page 1252 instead of real ISO 8859-1 2004-05-11 13:32:01 +05:00
ingo@mysql.com
3f3e37cb24 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-wl1687
2004-05-11 09:05:09 +02:00
miguel@hegel.local
6fcfc63962 Removing VC++ compiler warnings 2004-05-10 22:25:51 -03:00
miguel@hegel.local
feb5d24d04 Fix VC++ compiler error (function redifinition) for embedded server 2004-05-10 20:55:52 -03:00
tsmith@build.mysql.com
8746a7dab4 logging_ok:
Logging to logging@openlogging.org accepted
item_cmpfunc.cc, ctype_recoding.test, ctype_recoding.result:
  Call Item_func_conv_charset::fix_fields() in Item_bool_func2::fix_length_and_dec() (but #3704)
2004-05-10 23:19:50 +02:00
monty@mysql.com
87e7438709 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-05-10 23:48:03 +03:00
ingo@mysql.com
7b4cbcf5e6 Update casts from very old my_lock.c source. 2004-05-10 21:52:24 +02:00
lenz@mysql.com
3550d04574 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2004-05-10 20:46:45 +02:00
lenz@mysql.com
2e47fb7076 - Renamed the Mac OS X StartupItem directory from
/Library/StartupItems/MySQL to /Library/StartupItems/MySQLCOM
   to avoid a name space collision with the MySQL Startup Item shipped
   with Mac OS X Server, updated the MySQLStartupItem PKG version
   number to reflect the change.
2004-05-10 20:32:44 +02:00