mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 14:02:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
18709 commits 2781 branches 343 tags 1.6 GiB
Commit graph

4239 commits

Author SHA1 Message Date
sergefp@mysql.com
fc75403b4d Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug10151
 2005-06-23 11:03:21 +02:00
sergefp@mysql.com
3196513258 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug10151
 2005-06-22 20:59:32 +02:00
lars@mysql.com
008548150c BUG#9361: Added test cases 2005-06-22 17:12:02 +02:00
evgen@moonbone.local
2235ea9593 Fix bug #9728 decreased functionality in "on duplicate key update" 
Remove changes made by bug fix #8147. They strips list of insert_table_list to
only insert table, which results in error reported in bug #9728.
Added flag to Item to resolve ambigous fields reported in bug #8147.
 2005-06-22 07:18:42 +04:00
elliot@mysql.com
a24336cdcb BUG#10442 Minor changes from code review 2005-06-21 15:40:58 -04:00
elliot@mysql.com
2eb7301081 Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1 
into  mysql.com:/Users/emurphy/src/work/mysql-4.1-bug10442
 2005-06-21 14:28:55 -04:00
evgen@moonbone.local
b625e43485 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  moonbone.local:/work/mysql-4.1-bug-10886
 2005-06-21 22:25:49 +04:00
evgen@moonbone.local
dc381ea960 Fix bug #10886 - INSERT ... SELECT ... ON DUPLICATE KEY UPDATE produces bad results 
Temporary field wasn't restored to default values after ON DUPLICATE KEY
 UPDATE event, which results in wrong data being inserted in new record.
 2005-06-21 22:24:58 +04:00
igor@rurik.mysql.com
3bfe28e9bf Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2005-06-21 06:19:06 -07:00
igor@rurik.mysql.com
bb944aa9dc Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-1
 2005-06-21 04:31:07 -07:00
igor@rurik.mysql.com
2104e9e668 group_by.result, group_by.test: 
Added a test case for bug #11295.
item_buff.cc:
  Fixed bug #11295.
  This a correction for the patch of bug #11088 that takes into
  account a possible NULL values of the BLOB column.
 2005-06-21 04:24:21 -07:00
mskold@mysql.com
2716e772d4 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-06-21 10:35:22 +02:00
jimw@mysql.com
f36ee2a96d Merge bk-internal:/home/bk/mysql-4.1 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-06-20 14:48:04 -07:00
jimw@mysql.com
27eace6304 Merge jwinstead@production.mysql.com:my/mysql-4.1-7858 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-06-20 12:04:22 -07:00
igor@rurik.mysql.com
28214f3da8 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2005-06-20 10:52:38 -07:00
igor@rurik.mysql.com
acc6651d24 group_by.result: 
Added  a test case for bug #11385.
group_by.test:
  Added  a test case for bug #11385.
field.h:
  Fixed bug #11385.
  The bug was due to not defined method decimals for the class
  Field_datetime.
 2005-06-20 10:49:04 -07:00
mskold@mysql.com
777ec78755 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 16:13:34 +02:00
dlenev@mysql.com
b5b3b32d0a Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-bg11060
 2005-06-20 16:07:36 +04:00
dlenev@brandersnatch.localdomain
d07843efd9 Fix for bug #11060 "Server crashes on re-execution of prepared 
INSERT ... SELECT with UNION" (reviewed version).

Altough bug manifest itself only starting from 5.0 it is better to
apply fix to 4.1 to keep some assumptions true and make code more
future-proof.
 2005-06-20 16:07:00 +04:00
sergefp@mysql.com
ef85deab92 Fix for BUG#10151: In Item_func_case::find_item don't assume that parameter str != &(this->str_value) 2005-06-20 11:43:38 +02:00
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
jimw@mysql.com
176143413e Fix hang/crash with Boolean full-text search against an unindexed field for 
which the query contained more words than we allocated space. (Bug #7858)
 2005-06-17 21:44:17 +02:00
elliot@mysql.com
0c71508759 BUG#10442 Fix replication slave crash when a query with multiupdate and 
subselects is used.
 2005-06-17 11:15:29 -04: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
igor@rurik.mysql.com
dd782a8746 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2005-06-17 03:56:24 -07: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
igor@rurik.mysql.com
deaf7f9608 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2005-06-16 09:49:04 -07:00
igor@rurik.mysql.com
2095758a9d group_by.result, group_by.test: 
Added a test case for bug #8614.
sql_select.cc:
  Fixed bug #8614.
  SELECT DISTINCT ... GROUP BY 'const' must be equivalent to
  SELECT ... GROUP BY 'const'.
 2005-06-16 09:45:41 -07:00
lars@mysql.com
869882f321 WL#2076: Added if(...) construct to mysqltest 
Removed SHOW BINLOG EVENTS in test case for ps-protocol and row-based replication
 2005-06-16 16:56:03 +02:00
serg@serg.mylan
b49bb72b7a fix test results - Bug #11328 2005-06-16 10:09:05 +02:00
igor@igor-inspiron.creware.com
754e6c0527 func_if.result, func_if.test: 
Correction for test case of bug #11142.
 2005-06-13 11:38:16 -07: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
cb7961bd9b Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1 
into xiphis.org:/usr/home/antony/work2/p1-bug11028.3
 2005-06-09 16:44:03 +01: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
konstantin@mysql.com
6a5b215443 Fix broken test suite. 2005-06-09 18:00:50 +04:00
gluh@mysql.com
f183ee49eb Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/gluh/MySQL/Merge/4.1
 2005-06-09 15:26:46 +05:00
joreland@mysql.com
7d5960a5a6 update result file for ps7_ndb 2005-06-09 12:26:45 +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
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
monty@mysql.com
eb9e5777ee Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-06-07 18:23:04 +03: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
5514c94865 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2005-06-07 06:48:21 -07: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