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
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
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
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
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
dcd75689d3
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-13 11:47:49 -08:00
monty@mysql.com
7c457a1bd7
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-01-13 20:09:41 +02:00
heikki@hundin.mysql.fi
21666e4207
ha_innodb.cc:
...
Merge from 4.0: Fix a theoretical hang over the adaptive hash latch in InnoDB if one runs INSERT ... SELECT ... (binlog not enabled), or a multi-table UPDATE or DELETE, and only the read tables are InnoDB type, the rest are MyISAM; this also fixes bug #7879 for InnoDB type tables
2005-01-13 20:08:28 +02:00
jimw@mysql.com
7e1f47022c
Merge jwinstead2@wwwtst1.mysql.com:mysql-4.1-7235
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-13 09:24:07 -08:00
jimw@mysql.com
73a9b29c3c
Merge mysql.com:/home/jimw/my/mysql-4.1-bdb-init
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-13 09:07:48 -08:00
jimw@mysql.com
7639e5afaf
Merge jwinstead2@wwwtst1.mysql.com:mysql-4.1-7774
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-13 09:07:21 -08:00
guilhem@mysql.com
a02601ecc5
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-13 15:35:36 +01:00
bar@mysql.com
e3d6e6736b
bug#7284: strnxfrm returns different results for equal strings
2005-01-13 18:12:04 +04:00
dlenev@mysql.com
52baee6346
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-dtbug
2005-01-13 14:46:41 +03:00
jimw@mysql.com
3d2481ba4a
Fix small memory leak that occured when BerkeleyDB failed to initialize.
2005-01-12 17:20:43 -08:00
jimw@mysql.com
0a3fba7f18
Small fix for Field_str::store() to avoid trying to read past beginning
...
of log_10 array.
2005-01-13 00:52:19 +01:00
jimw@mysql.com
51781b0bfc
Fix conversion of floating point values to character fields when the
...
absolute value of the float is less than 1, and also fix calculation of
length for negative values. (Bug #7774 )
2005-01-13 00:41:45 +01:00
konstantin@mysql.com
30c4d10e1a
Add logging of COM_EXECUTE in the general query log.
2005-01-13 02:13:19 +03:00
guilhem@mysql.com
4c105693d7
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-12 22:23:00 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
3e3e140e3d
Minor clean up.
2005-01-12 22:55:10 +02:00
guilhem@mysql.com
4e4f574645
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-12 19:44:19 +01:00
guilhem@mysql.com
44ce4b43ef
Fix for BUG#7793 "mysqlbinlog produces incorrect queries":
...
when printing SET @var in mysqlbinlog, backtick the collation (as BINARY is a reserved word)
2005-01-12 19:42:46 +01:00
konstantin@mysql.com
2cc2844bbb
Merge mysql.com:/home/kostja/work/mysql-4.0-6761
...
into mysql.com:/home/kostja/work/mysql-4.1-root
2005-01-12 19:00:04 +03:00
konstantin@mysql.com
6058edbe18
A fix for Bug#6761 "mysql_list_fields() does not work": test
...
case will be added to client_test in 4.1
2005-01-12 17:04:45 +03:00
marko@hundin.mysql.fi
6289469e97
Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/marko/k/mysql-4.1
2005-01-12 14:08:25 +02:00
serg@serg.mylan
e83f49bd2f
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2005-01-12 12:35:34 +01:00
serg@serg.mylan
b86a512e37
added missing Com_update_multi status variable
2005-01-12 12:18:17 +01:00
dlenev@brandersnatch.localdomain
23c9e0a75a
Fix for bug #7586 "TIMEDIFF for sec+microsec not working properly".
2005-01-12 12:18:36 +03:00
jani@ua141d10.elisa.omakaista.fi
fd79354273
Fixed Bug#2813, "analyse does not quot string values in enams from string".
2005-01-11 19:40:33 +02:00
monty@mysql.com
f4274fe9be
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-01-11 19:35:00 +02:00
bar@mysql.com
2bd854c859
Bug #7730 Server crash using soundex on an utf8 table
...
Don't use my_tolower: it works only for 8bit charsets.
2005-01-11 19:58:53 +04:00
lenz@mysql.com
33795908a0
Merge mysql.com:/space/my/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1-build
2005-01-11 16:02:45 +01:00
lenz@mysql.com
0d08e9b2c2
- Housekeeping: removed a few unreferenced variables, noticed while doing
...
Windows builds
2005-01-11 15:38:03 +01:00
serg@serg.mylan
9a43b64874
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-11 14:29:22 +01:00
dlenev@brandersnatch.localdomain
2f32115092
Fix for bug #7418 "TIMESTAMP not always converted to DATETIME in MAXDB
...
mode".
Changed grammar rule for "type" token. Now we have one branch with
optional length specification for TIMESTAMP type instead of two separate
branches.
2005-01-11 14:26:40 +03:00
konstantin@mysql.com
067d13f632
A fix for linking failure of MySQL client when linking with imap libraries
...
(Bug#7428) (renamed: hash_reset -> my_hash_reset)
2005-01-11 13:53:10 +03:00
konstantin@mysql.com
876a96cd02
make it compile with -ansi -pedantic
2005-01-11 13:12:52 +03:00
serg@serg.mylan
b670f88287
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-11 10:34:38 +01:00
serg@serg.mylan
e9ac8dbc51
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-11 02:36:50 +01:00
jimw@mysql.com
e173b24f75
Merge mysql.com:/home/jwinstead2/mysql-4.1-7762
...
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-11 01:25:46 +01:00
jimw@mysql.com
699cb2c066
Fix style nit
2005-01-11 01:01:35 +01:00
jimw@mysql.com
2347e386d7
Fix double-initalization of mutex in archive storage engine. (Bug #7762 )
2005-01-10 23:59:28 +01:00
serg@serg.mylan
618d01e788
bad merge fixed
2005-01-10 16:03:06 +01:00
monty@mysql.com
56fb6f31ba
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-01-10 15:28:17 +02:00