mskold@mysql.com
6fa3cdad5f
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-06-20 09:37:31 +02:00
tulin@dl145c.mysql.com
61c36b1c12
ha_ndbcluster.cc:
...
remove typecheck in ndb handler not needed
2005-06-20 07:53:53 +02:00
mskold@mysql.com
dc5e1444a0
Fix for bug#10936: Cluster engine shows wrong key value for duplicate key error
2005-06-17 14:45:54 +02:00
tulin@dl145c.mysql.com
9b3d0b85a3
sql_select.cc:
...
fixed 64bit bug in lenght store/retrive in cache
2005-06-17 12:36:09 +02:00
konstantin@mysql.com
dcb0e65dcb
Fix Bug#9334 "PS API queries in log file" and
...
Bug#8367 "low log doesn't gives complete information about prepared
statements"
Implement status variables for prepared statements commands (a port of
the patch by Andrey Hristov).
See details in comments to the changed files.
No test case as there is no way to test slow log/general log in
mysqltest.
2005-06-17 00:11:48 +04:00
konstantin@mysql.com
f10b395982
A fix for Bug#9141 "4.1 does not log into slow log
...
ALTER, OPTIMIZE and ANALYZE statements".
In 4.1 we disabled logging of slow admin statements. The fix adds an
option to enable it back.
No test case (slow log is not tested in the test suite), but tested
manually.
+ post-review fixes (word police mainly).
2005-06-16 23:05:38 +04:00
serg@serg.mylan
0fbd67dac8
for consictency, changed to use memcpy_fixed.
2005-06-16 13:39:54 +02:00
serg@serg.mylan
a1d55ea052
cleanup for bug#11167.
...
portability alignment issues.
2005-06-15 22:49:52 +02:00
mskold@mysql.com
152adbaf0b
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-06-14 10:29:47 +02:00
igor@igor-inspiron.creware.com
42271e4240
func_if.result, func_if.test:
...
Added a test case for bug #11142 .
item_cmpfunc.cc:
Fixed bug #11142 .
Implementation of Item_func_nullif::is_null was corrected.
2005-06-13 11:24:26 -07:00
igor@igor-inspiron.creware.com
36ff674468
Merge igor-inspiron.creware.com:/home/igor/mysql-4.1
...
into igor-inspiron.creware.com:/home/igor/dev/mysql-4.1-0
2005-06-13 07:35:46 -07:00
igor@igor-inspiron.creware.com
750fca61f9
ctype_utf8.test, ctype_utf8.result:
...
Added a test case for bug #11167 .
sql_select.cc:
Fixed bug #11167 .
In 4.1 char/varchar fields are limited by 255 characters in
length that make them longer than 255 bytes in size for such
character sets as UTF8. The functions store_record_in_cache
and read_cached_records did not take into account this
Moreover the code did not take into account that the size
of the varchar fields in 5.0 can be up to 65535 bytes
2005-06-13 06:10:19 -07:00
lars@mysql.com
c199d7fd66
Merge mysql.com:/home/bkroot/mysql-4.1
...
into mysql.com:/home/bk/b6883-mysql-4.1
2005-06-13 11:12:10 +02:00
jimw@mysql.com
481f763255
Merge mysql.com:/home/jimw/my/mysql-4.1-9500
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-10 14:44:25 -07:00
jimw@mysql.com
bb8f2663ae
Merge mysql.com:/home/jimw/my/mysql-4.1-10566
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-09 18:03:18 -07:00
acurtis@xiphis.org
304bb0c66d
Bug#11028 Crash on create table like
...
Report error instead of crashing
2005-06-09 16:06:15 +01:00
mskold@mysql.com
39fba6c556
Disallow TL_WRITE_ALLOW_READ being transformed into TL_WRITE_ALLOW_WRITE
2005-06-09 13:28:29 +02:00
gluh@eagle.intranet.mysql.r18.ru
8574ed6fc6
Fix for bug#10732: Set SQL_MODE to NULL gives garbled error message
...
generate proper error message if we use SET ... = NULL for 'set'
variables
2005-06-09 14:39:29 +05:00
jimw@mysql.com
495ee34be0
Fix problem with handling of lower_case_table_name == 2 when
...
the case in the FROM and WHERE clauses didn't agree. (Bug #9500 )
2005-06-08 14:35:16 -07:00
reggie@mdk10.(none)
f86c44ff56
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mdk10.(none):/home/reggie/bk/41test3
2005-06-07 15:45:02 -05:00
serg@serg.mylan
b95c7afcda
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-06-07 22:45:01 +02:00
serg@serg.mylan
30d81b75ff
bug#5373: handler READ NEXT w/o HANDLER READ [FIRST]
...
check table->file->inited to catch incorrect calling sequence.
2005-06-07 22:43:25 +02:00
lars@mysql.com
f952a0d6f1
Merge mysql.com:/home/bkroot/mysql-4.1
...
into mysql.com:/home/bk/b6883-mysql-4.1
2005-06-07 16:31:10 +02:00
igor@rurik.mysql.com
d3f3cc617d
Many files:
...
Fixed bug #9899 : erronious NOT_NULL flag for some attributes
in the EXPLAIN table.
2005-06-07 06:34:13 -07:00
igor@rurik.mysql.com
6cc77486b7
item_buff.cc:
...
Removed an extra space char.
2005-06-07 04:21:19 -07:00
igor@rurik.mysql.com
90dd86907e
sql_select.cc, item_buff.cc, item.h:
...
Fixed bug #11088 : a crash for queries with GROUP BY a BLOB column
+ COUNT(DISTINCT...) due to an attempt to allocate a too large
buffer for the BLOB field.
Now the size of the buffer is limited by max_sort_length.
group_by.test, group_by.result:
Added a test case for bug #11088 .
2005-06-07 03:05:57 -07:00
lars@mysql.com
630dd9a0b7
Merge mysql.com:/home/bkroot/mysql-4.1
...
into mysql.com:/home/bk/b6883-mysql-4.1
2005-06-07 11:54:31 +02:00
lars@mysql.com
cd2fbb01c4
BUG#6883: Changed comment, style
2005-06-07 11:47:59 +02:00
serg@serg.mylan
6a5349028c
a compiler must see '#pragma implementation' *before*
...
'#pragma interface' (that comes with the #include'd header file)
2005-06-05 19:38:52 +02:00
konstantin@mysql.com
f0233c2e3d
Fix show warnings limit 0 and show warnings limit 0, 0.
...
Add test coverage for SHOW WARNINGS LIMIT a, b;
2005-06-04 14:58:32 +04:00
serg@serg.mylan
7a1282b3e5
mergemerged
2005-06-04 07:28:26 +02:00
monty@mysql.com
29fd1f2fd9
Move USE_PRAGMA_IMPLEMENTATION to proper place
...
Ensure that 'null_value' is not accessed before val() is called in FIELD() functions
Fixed initialization of key maps. This fixes some problems with keys when you have more than 64 keys
Fixed that ROLLUP don't always create a temporary table. This fix ensures that func_gconcat.test results are now predictable
2005-06-03 23:46:03 +03:00
serg@serg.mylan
aaa4c11d11
mergemerged
2005-06-03 21:24:13 +02:00
serg@serg.mylan
e4d4baed62
merged
2005-06-03 18:29:36 +02:00
monty@mysql.com
fd17d75923
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-06-03 13:35:58 +03:00
ndbdev@dl145b.mysql.com
25cb14234a
sql_repl.cc:
...
Bug #11064 some read error not detected in replication on 64-bit platform
2005-06-03 11:16:37 +02:00
bar@mysql.com
1002a9416b
ctype_utf8.result, ctype_utf8.test:
...
adding test
field.cc:
bug#10714 Inserting double value into utf8 column crashes server:
sprintf was executed with too big length, which caused
crash on some Windows platforms.
2005-06-03 09:37:53 +05:00
monty@mysql.com
0dd94ed426
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-06-03 01:16:29 +03:00
monty@mysql.com
ed5774f0c3
Removed duplicated and wrong merged code
2005-06-03 01:15:56 +03:00
bar@mysql.com
e686057259
item_func.cc:
...
set_var.cc:
variables.result
variables.test
Bug #10904 Illegal mix of collations between a system variable and a constant
Changing coercibility of system variables to SYSCONST,
to be the same with USER(), DATABASE(), etc.
2005-06-02 16:17:44 +05:00
brian@zim.(none)
efb5ed5bab
Merge
2005-06-01 18:48:29 -07:00
kent@mysql.com
f889f0884c
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-06-02 02:57:18 +02:00
kent@mysql.com
bd48eed988
tztime.cc:
...
Set #pragma implementation" earlier
Many files:
Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
2005-06-02 02:43:32 +02:00
brian@zim.(none)
ba9b9f8993
Mainly cleanups for gcc 4.0. Some small pieces from looking at -Wall. Removed a number of dumb things in ha_tina.
2005-06-01 17:34:10 -07:00
jimw@mysql.com
f5f88703b2
Fix compile error when HAVE_BERKELEY_DB
2005-06-01 16:03:41 -07:00
jimw@mysql.com
b8f3c515ba
Merge mysql.com:/home/jimw/my/mysql-4.1-9660
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-01 13:02:26 -07:00
jimw@mysql.com
4f6db49795
Merge mysql.com:/home/jimw/my/mysql-4.1-10944
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-01 13:00:32 -07:00
jimw@mysql.com
0a2d95e983
Merge mysql.com:/home/jimw/my/mysql-4.1-8135
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-01 12:59:11 -07:00
jimw@mysql.com
7ac7bfc3c8
Fix handling of NULL fields in FIELD(). (Bug #10944 )
2005-06-01 09:48:25 -07:00
lars@mysql.com
2b3c8b9dc5
BUG#6883: Added tests for create/drop temporary table, UNLOCK TABLES
...
If a create table can not do implicit commit, the stmt now fails
CREATE/DROP TEMPORARY TABLE is now flushed to binlog
2005-06-01 15:52:32 +02:00