Commit graph

9683 commits

Author SHA1 Message Date
lenz@mysql.com
735b5ca49d - Fixed BUG 1162 (removed macro names from the changelog)
- Really fixed BUG 998 (disable the checking for installed but
   unpackaged files)
2003-08-29 19:14:42 +02:00
bell@sanja.is.com.ua
0466c25078 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-tmp_field-4.1
2003-08-29 16:27:44 +03:00
bell@sanja.is.com.ua
334841d902 tmp_table_field() renamed to get_tmp_table_field() to avoid redifinition of tmp_table_field(TABLE *t_arg) 2003-08-29 16:24:03 +03:00
kostja@oak.local
dc6366035d comment left after merge was moved to correct
place
2003-08-29 17:14:10 +04:00
monty@narttu.mysql.fi
77a70a0a24 merge with 4.0.15 2003-08-29 13:44:35 +03:00
kostja@oak.local
7a51e36929 removed stale comment
13:58 <monty> konstantin: the comment is missplaced (probably after merge).
          You can remove it
2003-08-29 14:38:39 +04:00
gluh@gluh.mysql.r18.ru
144d0efaaa Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.fix
2003-08-29 11:24:33 +05:00
monty@narttu.mysql.fi
5e04e2370f Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-08-29 04:17:58 +03:00
monty@narttu.mysql.fi
27e331c30a Revert change of lower-case-table handling as this breaks how alias works.
Changes like this should be done to 4.1, not to a stable release
2003-08-29 04:17:30 +03:00
dlenev@dlenev.mshome
6cad89775b Fixed problem with absence of gmtime_r under Windows. 2003-08-29 03:23:18 +04:00
wax@mysql.com
523187296d Merge mysql.com:/home/wax/mysql/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1mm
2003-08-29 02:30:11 +06:00
wax@kishkin.ru
a39f98d637 BUG
correct bugs #833 and #836
2003-08-29 02:28:32 +06:00
jcole@mugatu.spaceapes.com
289ffc97e7 Merge jcole@bk-internal.mysql.com:/home/bk/mysql-4.0
into mugatu.spaceapes.com:/home/jcole/bk/mysql-4.0
2003-08-28 16:06:43 -04:00
jcole@mugatu.spaceapes.com
7a50118793 opt_range.cc: Fixes for out of memory conditions. 2003-08-28 16:06:13 -04:00
monty@narttu.mysql.fi
7d653b2c7c Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-08-28 22:30:11 +03:00
monty@narttu.mysql.fi
a2a1e97226 Portability fixes 2003-08-28 22:18:02 +03:00
jani@rhols221.adsl.netsonic.fi
fc2fe36474 Removed restriction not to be able use non regular files. 2003-08-28 21:27:25 +03:00
bell@sanja.is.com.ua
96cb167d28 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-enum-4.1
2003-08-28 20:38:08 +03:00
bell@sanja.is.com.ua
7a56d62dfb fixed typo 2003-08-28 18:31:38 +03:00
bell@laptop.sanja.is.com.ua
eccab7f821 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2003-08-28 17:27:47 +03:00
ram@mysql.r18.ru
3e9c55590a Fix for the bug #1125 mysqldump -X creates invalid XML 2003-08-28 19:27:46 +05:00
bell@laptop.sanja.is.com.ua
d6761fade4 Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-aggregate-4.1
2003-08-28 17:27:46 +03:00
hf@deer.(none)
84788f7903 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
2003-08-28 19:27:46 +05:00
vva@eagle.mysql.r18.ru
63cf4946a7 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_910/mysql-4.1
2003-08-28 10:27:45 -04:00
vva@eagle.mysql.r18.ru
79be48410d fixed merge mistake 2003-08-28 10:26:56 -04:00
gluh@gluh.mysql.r18.ru
e4951147cf Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE
This commit is related to my previos one(ChangeSet 1.1583 03/08/27 18:03:39).
Note about COMMIT&ROLLBACK:
  Only 'COMMIT' statement updates the binary log. 
  'ROLLBACK' statement doesn't update the binlog.
2003-08-28 18:09:00 +05:00
serg@serg.mylan
31b337feff Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-08-28 13:15:55 +02:00
serg@serg.mylan
d09626d9d6 post-merge fixes 2003-08-28 13:14:54 +02:00
serg@serg.mylan
476a0c0fff Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-08-28 12:39:25 +02:00
serg@serg.mylan
4808a6d9f2 oom protection 2003-08-28 12:37:50 +02:00
bell@laptop.sanja.is.com.ua
ec8d6d05de enum renamed (asked for compilation under windows) 2003-08-28 13:21:30 +03:00
lenz@mysql.com
ee46c6730b Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2003-08-28 11:45:49 +02:00
monty@narttu.mysql.fi
17d8cc22cb merge with 3.23 to get for overrun in ISAM tables with man fields and a blob. 2003-08-28 12:35:36 +03:00
monty@narttu.mysql.fi
c3f54ad94d Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into narttu.mysql.fi:/my/mysql-3.23
2003-08-28 12:29:32 +03:00
monty@narttu.mysql.fi
d5ed93e80e Updated test for ISAM overflow bug 2003-08-28 12:28:51 +03:00
monty@narttu.mysql.fi
cd25e1691c ixed overflow bug in MyISAM and ISAM when using packed tables with a lot of fields and blobs 2003-08-28 12:27:35 +03:00
hf@deer.(none)
bf3e65b128 SCRUM:
Fixed some mess with STDCALL in function's declarations
2003-08-28 13:39:46 +05:00
lenz@mysql.com
2bffad53fe Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2003-08-28 09:28:27 +02:00
monty@narttu.mysql.fi
0031bcfd82 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-08-28 06:13:44 +03:00
monty@narttu.mysql.fi
8a77f97079 Add detection of in_addr_t
Add pack_bits to pack_reclength for dynamic rows.  This solves buffer a possible buffer overflow on update.
(This will probably solve bug #563)
Fix test for available file descriptors in mysqltest
Fixed core dump bug in replication tests when running without transactional table support
2003-08-28 06:08:17 +03:00
vva@eagle.mysql.r18.ru
60fc3ae02b Merge 2003-08-27 21:26:00 -04:00
bell@laptop.sanja.is.com.ua
3d2a3804a1 reset() split in 2 function clear() & add()
aggregate function reinitialization (if no rows was found) made with help of clear()
(fixed BUG#860)
2003-08-28 03:10:14 +03:00
lenz@mysql.com
56fc96dd46 - replaced C++-style comments in .c file (Please try to avoid this, as
it breaks compilation on picky C compilers!)
2003-08-28 01:35:58 +02:00
vva@eagle.mysql.r18.ru
40757beb81 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_910/mysql-4.1
2003-08-27 19:15:27 -04:00
vva@eagle.mysql.r18.ru
cde2b50514 fixed bug #910 (right type of ifnull function) 2003-08-27 19:11:54 -04:00
heikki@hundin.mysql.fi
5c4c294a42 btr0btr.c:
Fix bug: if the user created a prefix column key on a fixed length char column, then InnoDB claimed in CHECK TABLE that the table is corrupt
dict0dict.c:
  Fix bug 1151: if the user created a prefix column primary key on a fixed length char column, then InnoDB crashed in a simple SELECT
2003-08-28 02:00:46 +03:00
monty@narttu.mysql.fi
42171225eb Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
2003-08-27 22:31:16 +03:00
monty@narttu.mysql.fi
60dd8a2c4f hanged UDF interface to use clear() instead of reset() 2003-08-27 22:30:50 +03:00
monty@narttu.mysql.fi
c24e0fcc46 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-08-27 22:13:26 +03:00
monty@narttu.mysql.fi
381202354b Fixed unlikely stack bug when having a BIG expression of type 1+1-1+1-1... in certain combinations. Bug #871 2003-08-27 20:00:18 +03:00