Commit graph

18972 commits

Author SHA1 Message Date
monty@mysql.com
3b0f8cabaf Merge with global tree 2005-01-15 14:39:16 +02:00
monty@mysql.com
0a1076a25f Merge with 4.1 2005-01-15 14:09:45 +02:00
monty@mysql.com
97b28521e6 Added ndb_types.h to ignore 2005-01-15 12:36:20 +02:00
monty@mysql.com
a37e91e435 Changed interface for my_strntod() to make it more general and more portable 2005-01-15 12:28:38 +02:00
monty@mysql.com
f34bc883ab Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-01-15 12:00:56 +02:00
guilhem@mysql.com
de1ff0698b Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-clean
2005-01-15 10:22:05 +01:00
guilhem@mysql.com
09f36a69b9 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-15 10:21:50 +01:00
igor@rurik.mysql.com
cd577f2590 func_gconcat.result, func_gconcat.test:
Added a test case for bug #7769.
item_sum.h:
  Fixed bug #7769: a crash for queries with group_concat and
  having when the query table was empty.
  The bug was due an unsafe dereferencing.
2005-01-15 01:05:00 -08:00
monty@mysql.com
7681e62422 Merge 2005-01-15 03:49:07 +02:00
monty@mysql.com
6d280ac161 Fixed possible access to unintialized memory in filesort when using many buffers 2005-01-15 03:47:06 +02:00
serg@serg.mylan
275a9293e4 protect against malicious server trying to crash command-line client :) 2005-01-14 22:46:04 +01:00
serg@serg.mylan
5ebcb21f12 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-14 19:51:29 +01:00
serg@serg.mylan
367bcf8c40 limit HEAP table size with max_heap_table_size, better estimation for mem_per_row 2005-01-14 19:49:45 +01:00
jimw@mysql.com
a66f6b79be Merge mysql.com:/home/jimw/my/mysql-5.0-6659
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-01-14 10:47:21 -08:00
jimw@mysql.com
bc7f4b2cfe Merge mysql.com:/home/jimw/my/mysql-4.0-clean
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-14 10:45:17 -08:00
jimw@mysql.com
46e444293a Merge mysql.com:/home/jimw/my/mysql-4.0-7347
into mysql.com:/home/jimw/my/mysql-4.0-clean
2005-01-14 10:44:29 -08:00
jimw@mysql.com
bdb36de9ff Merge 2005-01-14 10:40:05 -08:00
jimw@mysql.com
b6d46b3c4c Merge 2005-01-14 10:33:07 -08:00
lenz@mysql.com
ff347ae7a2 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-01-14 19:15:55 +01:00
joerg@mysql.com
790ea71b60 Re-enable running the 'client_test' test case during release builds on the platforms (bug#7909). 2005-01-14 18:57:50 +01:00
lenz@mysql.com
75935d2a8e - replaced obsoleted "BuildPrereq" with "BuildRequires" in the RPM spec file 2005-01-14 18:20:03 +01:00
tomas@poseidon.ndb.mysql.com
8830ec9a1d bumped up ndb version
compatible with 4.1.9
2005-01-14 16:14:50 +01:00
lenz@mysql.com
57b92c2042 - make sure to enable "--without-ndb-debug" when both --debug and
--with-cluster are provided. Yes, this sounds like a contradiction -
  enabling debugging in NBD enables code parts that may still reveal 
  portability issues when compiled with non-gcc compilers. (request by TomasU)
2005-01-14 15:35:32 +01:00
ram@gw.mysql.r18.ru
4b3996d587 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into gw.mysql.r18.ru:/usr/home/ram/work/5.0
2005-01-14 18:32:43 +04:00
ram@gw.mysql.r18.ru
e6510c896b A fix for bit type.
pack_length_in_rec() func has been introduced.
2005-01-14 18:24:32 +04:00
guilhem@mysql.com
2c6738cd7d Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-clean
2005-01-14 15:06:53 +01:00
guilhem@mysql.com
8ee8543aa9 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-14 15:02:05 +01:00
marko@hundin.mysql.fi
080869f995 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/k/mysql-4.1
2005-01-14 15:23:34 +02:00
guilhem@mysql.com
5cafbb6838 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-14 14:23:34 +01:00
dlenev@mysql.com
acd5a8ef5c Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-dtbug
2005-01-14 16:23:33 +03:00
gluh@gluh.mysql.r18.ru
d28aa5cc15 Backport from 5.0 2005-01-14 16:23:32 +03:00
marko@hundin.mysql.fi
045aea9d92 InnoDB: Remove redundant page_no field from dict_index_t.
This completes the patch for fast TRUNCATE TABLE.
2005-01-14 13:54:23 +02:00
marko@hundin.mysql.fi
7ef8a20950 Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/marko/j/mysql-5.0
2005-01-14 13:06:46 +02:00
guilhem@mysql.com
4c41a0d5e4 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-clean
2005-01-14 11:32:17 +01:00
bar@mysql.com
71fe5f7e17 Bug#7284: strnxfrm generates different results for equal strings
additional fix for cp932 and eucjpms, recently implemented by
Shuichi.
2005-01-14 14:16:56 +04:00
guilhem@mysql.com
980d1b658e Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-14 10:59:37 +01:00
dlenev@mysql.com
8be6787640 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-dtbug
2005-01-14 10:09:01 +03:00
jimw@mysql.com
3998da80e9 Output 'MEMORY' as table type for tables using the memory (nee heap) storage
engine, except when running with sql_mode & MYSQL323. (Bug #6659)
2005-01-13 17:38:13 -08:00
anjuta@arthur.local
a8e6b5e68c Merge anna@bk-internal.mysql.com:/home/bk/mysql-5.0
into arthur.local:/my/mysql-5.0-clean
2005-01-14 01:17:01 +02:00
konstantin@mysql.com
ebefcc616a fix C++ comments in C file (fixed in 5.0 already) 2005-01-14 01:59:03 +03:00
monty@mysql.com
2204baa5a3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-01-14 00:10:03 +02:00
monty@mysql.com
249f914c21 Fix bug in INSERT DELAYED with prepared statements
The bug was that if you have two TL_WRITE_DELAYED at the same time,
mi_lock_databases() could be done in the wrong order and we could write the wrong header to the MyISAM index file.
2005-01-14 00:09:15 +02:00
jimw@mysql.com
2a2f7a0b80 Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-01-13 13:48:25 -08:00
jimw@mysql.com
444c831e6e Update results files 2005-01-13 13:46:59 -08:00
jimw@mysql.com
fdc16dc434 Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-01-13 12:40:34 -08:00
guilhem@mysql.com
d6c99656b0 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-clean
2005-01-13 21:36:28 +01:00
heikki@hundin.mysql.fi
94cc8442b0 ha_innodb.cc:
"Add a comment why data modifying SQL statements MUST always use a locking read in tables that they read: otherwise the execution is not serializable, and in many cases is not well-defined; we also merged the associated bug fix from 4.1"
2005-01-13 21:58:47 +02:00
jimw@mysql.com
d7389eedd1 Fix mysql_install_db to look for libexecdir relative to basedir when
it has been specified. (Bug #7347)
2005-01-13 11:58:10 -08:00
anjuta@arthur.local
8f169155d1 Merge anna@bk-internal.mysql.com:/home/bk/mysql-5.0
into arthur.local:/my/mysql-5.0-clean
2005-01-13 21:56:18 +02:00
jimw@mysql.com
9b798253eb Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-01-13 11:50:10 -08:00