mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
17578 commits 2784 branches 343 tags 1.6 GiB
Commit graph

3927 commits

Author SHA1 Message Date
jimw@mysql.com
9de31feab9 Merge mysql.com:/home/jimw/my/mysql-4.1-7617 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-02-17 13:53:35 -08:00
jimw@mysql.com
219e29d7ae Merge mysql.com:/home/jimw/my/mysql-4.1-8471 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-02-17 13:53:07 -08:00
jimw@mysql.com
08624c0061 Merge mysql.com:/home/jimw/my/mysql-4.1-8355 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-02-17 13:48:34 -08:00
jimw@mysql.com
9df11a3c5e Merge mysql.com:/home/jimw/my/mysql-4.1-7989 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-02-17 13:47:14 -08:00
jimw@mysql.com
1c22de9032 Log each slow query in a multi-statement query to the slow query log. 
(Bug #8475)
 2005-02-17 11:48:44 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
10ab9e982f Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8147.1
 2005-02-17 17:52:49 +00:00
svoj@mysql.com
349112292f bug#6958 
Fixed that negative arguments to certain integer options wrap around.
 2005-02-17 15:04:04 +04:00
igor@rurik.mysql.com
4fd1869c6b Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2005-02-16 21:20:39 -08:00
igor@rurik.mysql.com
eedde7ba3e select.result, select.test: 
Added a test case for bug #7098.
sql_select.cc:
  Fixed bug #7098.
  When a string field was substituted for an equal constant
  the collation of the constant was changed by mistake for 
  the binary collation.
 2005-02-16 21:17:20 -08:00
kent@mysql.com
c9f6fbff1d Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
 2005-02-17 03:34:30 +01:00
kent@mysql.com
75ebab7861 Windows compatibility changes of the 'rpl_delete_all', 
'ps_1general' and 'fulltext_cache' test cases.
 2005-02-17 02:59:39 +01:00
dean@mysql.com
2baf0a158c Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dellis/bkl/bug-4.1
 2005-02-16 19:37:53 -06:00
acurtis@pcgem.rdg.cyberkinetica.com
a1bf1c926e Bug#8147 
Fix ambigious table error for INSERT..SELECT..UPDATE
 2005-02-17 01:33:59 +00:00
dean@mysql.com
b64fdf882a Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/dellis/mysqlab/bk/mysql-4.0
 2005-02-16 19:15:08 -06:00
pekka@mysql.com
0d03304294 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/pekka/ndb/version/my41-1.2154.30.2
 2005-02-16 12:48:38 +01:00
pekka@mysql.com
7c9a155c4a ndb - fix old decimal type mysql vs ndb 2005-02-16 12:45:59 +01:00
dean@mysql.com
e7f410a14a Merge 2005-02-16 04:04:34 -06:00
dean@mysql.com
87718094aa fulltext.test, fulltext.result: 
Test case for bug#8522, to test for out of bounds memory access in ft_nlq_find_relevance().
 2005-02-16 03:13:29 -06:00
igor@rurik.mysql.com
3100f891d2 Manual merge 2005-02-15 21:03:17 -08:00
igor@rurik.mysql.com
d4779d3534 delete.result, delete.test: 
Added a test case for bug #8392.
sql_delete.cc:
  Fixed bug #8392.
  The bug caused a crash for a delete statement with ORDER BY
  that explicitly referred to the modified table.
 2005-02-15 18:45:42 -08:00
jimw@mysql.com
a6afab6a55 Always lowercase database names from 'host' and 'db' grant tables when they 
are loaded and lower_case_table_names is set, but issue a warning when it is
done. (Bug #7989)
 2005-02-15 13:36:46 -08:00
jimw@mysql.com
dee9795b5b Merge 2005-02-15 12:19:01 -08:00
guilhem@mysql.com
a8380942bf Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-02-15 14:12:26 +01:00
jimw@mysql.com
3d7a384d00 Allow hostnames that are IP addresses with a netmask even when 
running with --skip-name-resolve. (Bug #8471)
 2005-02-14 20:33:14 -08:00
guilhem@mysql.com
55fb16a7a6 1) undoing my fix for BUG#8055 "Trouble with replication from temporary tables and ignores" 
and fixing it another way (per Monty; a simpler solution which does not increase the number
of binlog events is to always execute DROP TEMPORARY TABLE IF EXISTS on slave). A new test rpl_drop_temp.
2) fixing BUG#8436 "Multiple "stacked" SQL statements cause replication to stop" by setting
thd->query_length to the length of the query being executed, not counting the next queries
if this is a multi-query. Should also improve display of SHOW PROCESSLIST. A new test rpl_multi_query.
 2005-02-14 23:47:17 +01:00
sergefp@mysql.com
c30f7feba1 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug8218
 2005-02-14 23:49:01 +03:00
sergefp@mysql.com
021f9849ef Remove redundant DROP TABLE from test case 2005-02-14 23:45:48 +03:00
mats@mysql.com
30bf28202c Bug#8412: For replication to work correctly, the prologue and 
epilogue to an SQL statement should not have an error code even
when the SQL statement itself has an error code.
 2005-02-14 18:39:33 +01:00
svoj@mysql.com
643b602832 Bug#8351 
Fix for crash when using a double quote in boolean fulltext query.
 2005-02-14 18:54:12 +04:00
bell@sanja.is.com.ua
2d3076b69d removed wrong distinct UNION detection (BUG#6565) 2005-02-14 02:06:21 +02:00
acurtis@pcgem.rdg.cyberkinetica.com
4957c4850d Bug#2435 
Alter handling for UNION syntax
  Tests for UNION and parentheses
 2005-02-13 22:35:52 +00:00
sergefp@mysql.com
c0c50efdef Fix for BUG#8218: 
Remove TMP_TABLE_PARAM::copy_funcs_it. TMP_TABLE_PARAM is a member of JOIN which is 
copied via memcpy, and List_iterator_fast TMP_TABLE_PARAM::copy_funcs_it ends up 
pointing to the wrong List.
 2005-02-12 22:58:54 +03:00
bar@mysql.com
9ba7392306 Bug#8235 Connection collation change & table create with default result in crash 2005-02-12 16:27:22 +04:00
serg@serg.mylan
40da910d4c Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-02-12 09:38:15 +01:00
serg@serg.mylan
42bb0901a3 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-02-12 00:10:07 +01:00
serg@serg.mylan
d355174522 make LOAD INDEX to work 2005-02-12 00:05:13 +01:00
igor@rurik.mysql.com
cdb40830d2 Manual merge 2005-02-11 15:00:29 -08:00
igor@rurik.mysql.com
1bb04b0642 distinct.result: 
Adjustment of the result file after the revision of the fix for bug #7520.
 2005-02-11 13:44:54 -08:00
igor@rurik.mysql.com
634424ca16 select.result: 
After revision of the fix for bug #7520.
table.cc:
  Revised the fix for bug #7520.
  Made it compliant with 5.0 code where the bug does not exist.
 2005-02-11 10:39:26 -08:00
igor@rurik.mysql.com
a697e5da15 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2005-02-10 23:48:35 -08:00
igor@rurik.mysql.com
4ef431ad55 select.result: 
Adjusted results of the test case for bug #7520 for 4.1.
 2005-02-10 23:47:57 -08:00
igor@rurik.mysql.com
06ff30f6c0 Merge rurik.mysql.com:/home/igor/dev/mysql-4.0-0 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2005-02-10 22:17:18 -08:00
igor@rurik.mysql.com
8b3d59ad42 select.result, select.test: 
Added a test case for bug #7520.
table.cc:
  Fixed bug #7520.
  The bug was caused by a wrong calculation of the field max_key_length for
  a TABLE structure when there was an index on a blob field.
 2005-02-10 22:15:38 -08:00
jimw@mysql.com
c4187750ff Fix all of the enum and set columns in privilege tables to be 
case-insensitive. (Bug #7989)
 2005-02-10 20:25:14 -08:00
bell@sanja.is.com.ua
70797f571f Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2005-02-09 21:14:06 +02:00
bell@sanja.is.com.ua
90c0024217 reverted patch for BUG#7351 (because of performance ussie) 2005-02-09 21:08:08 +02:00
monty@mysql.com
ab5aed6047 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-02-09 19:22:35 +02:00
jimw@mysql.com
5ebbc834fe Fix removal of tables from cache when the database they are contained 
within is dropped and lower_case_table_names is set. (Bug #8355)
 2005-02-08 15:14:14 -08:00
sergefp@mysql.com
dcc65b77a6 Fix for BUG#8371: wrong rec_per_key value for hash index on temporary table 2005-02-08 23:44:51 +03:00
monty@mysql.com
79ec81071a Better bugfix for "HAVING when refering to RAND()" (Bug #8216) 
Ensure that references in HAVING, ORDER BY or GROUP BY are calculated after fields in SELECT.
This will ensure that any reference to these has a valid value.
Generalized the code for split_sum_func()
 2005-02-08 14:41:09 +02:00
monty@mysql.com
3fe60486e4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-02-07 18:14:31 +02:00
monty@mysql.com
32f91f48e8 Fixed bug in HAVING when refering to RAND() through alias 
(BUG 8216)
 2005-02-07 18:13:57 +02:00
bell@sanja.is.com.ua
d29fb3f192 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2005-02-06 15:08:25 +02:00
bell@sanja.is.com.ua
1853c2fe89 fixed test 'subselect' in case when innodb is not compiled in (thanks HF who niticed it) 2005-02-06 13:06:12 +02:00
guilhem@mysql.com
b97a519d72 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-02-05 15:29:38 +01:00
sergefp@mysql.com
fb113b94e4 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug7816
 2005-02-05 01:53:12 +03:00
guilhem@mysql.com
44c2dcff36 Fix for BUG#8055 "Trouble with replication from temporary tables and ignores": 
when we close the session's temp tables at session end, we automatically write to binlog *one* DROP TEMPORARY TABLE *per tmp table*.
 2005-02-04 22:43:54 +01:00
jimw@mysql.com
b509f2b373 Merge mysql.com:/home/jimw/my/mysql-4.1-6067 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-02-04 10:39:13 -08:00
mysqldev@mysql.com
79b88ead4a Merge bk-internal:/home/bk/mysql-4.1 
into mysql.com:/home/mysqldev/tulin/mysql-4.1
 2005-02-04 18:45:02 +01:00
hf@deer.(none)
40fe0b3971 Embedded version of test fixed 2005-02-04 19:12:15 +04:00
mysqldev@mysql.com
753ea29f86 Merge bk-internal:/home/bk/mysql-4.1 
into mysql.com:/home/mysqldev/tulin/mysql-4.1
 2005-02-04 14:29:52 +01:00
tomas@poseidon.ndb.mysql.com
27a69e573a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2005-02-04 14:27:08 +01:00
tomas@poseidon.ndb.mysql.com
7fd685ffe8 added test to trigger drifferent fragmentations in ndb 
corrected documentation on fragmentation
    set "fragmentation medium" to mean 2 fragments per node instead of 1
    set default fragmentation to small instead of medium
    bug#8284 adjust fragmentation to max_rows
 2005-02-04 14:25:08 +01:00
gluh@gluh.mysql.r18.ru
b0bf195064 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-4.1
 2005-02-04 16:24:00 +03:00
gluh@gluh.mysql.r18.ru
e9ce96c5cd Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-4.1
 2005-02-04 15:47:12 +03:00
gluh@gluh.mysql.r18.ru
34915f7a91 A fix: bug#6931: Date Type column problem when using UNION-Table 
bug#7833:  Wrong datatype of aggregate column is returned
 2005-02-04 15:31:36 +03:00
ramil@mysql.com
0d7228fff2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/ram/work/4.1
 2005-02-04 15:53:14 +04:00
ramil@mysql.com
f76ccd63cb type_float.result.es updated. 2005-02-04 15:35:08 +04:00
timour@mysql.com
e6150c7289 Merge mysql.com:/home/timka/mysql/src/4.1-dbg 
into mysql.com:/home/timka/mysql/src/4.1-bug-8023
 2005-02-04 11:58:59 +02:00
sergefp@mysql.com
38339e1c51 Fix for BUG#7716: in in_string::set() take into account that the value returned 
by item->val_str() may be a substring of the passed string. 
Disallow string=its_substring assignment in String::operator=().
 2005-02-04 09:14:22 +03:00
jimw@mysql.com
c949055035 Fix error in parsing string literals containing a backslash followed 
by a multi-byte character with a second byte of 0x5c (\). (Bug #8903)
 2005-02-03 16:07:32 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
1cb1dcb0f3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8057
 2005-02-03 21:16:36 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
b8ceaa4a1f Bug#8057 
Fix crash with LAST_INSERT_ID() in UPDATE,
  Tests included,
 2005-02-03 21:11:12 +00:00
monty@mysql.com
e791e86444 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-02-02 20:30:57 +02:00
jimw@mysql.com
bcac063558 Fix merge of func_str tests (accidently duplicated a test). 2005-02-02 09:05:52 -08:00
jimw@mysql.com
5f0c4ff140 Merge fixes for #8248, #5569. 2005-02-02 08:21:11 -08:00
monty@mysql.com
b131520f9d Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-02-02 16:50:35 +02:00
igor@rurik.mysql.com
0fb0dab4ca func_str.result, func_str.test: 
Added a test case for bug #7751.
item_strfunc.cc:
  Fixed bug #7751.
  The function Item_func_conv::val_str did not update
  the unsigned_flag value.
 2005-02-01 23:34:31 -08:00
timour@mysql.com
52e904c25c Fix for BUG#8023. 
Allow LIMIT clause after DUAL.
 2005-02-02 08:38:24 +02:00
jimw@mysql.com
e86457cef0 Fix QUOTE() to not reuse the input field for output, which resulted in 
incorrect results when the input was a constant across a multi-row SELECT
statement. (Bug #8248)
 2005-02-01 18:29:10 -08:00
jimw@mysql.com
891e8d076c Fix value of YEAR field when set from a non-numeric string. (Bug #6067) 2005-02-01 15:08:31 -08:00
monty@mysql.com
b87e0c52a7 Proper fix for comparision with ' ' 
(Bug #7788 "Table is full" occurs during a multitable update")
 2005-02-01 16:27:08 +02:00
bell@sanja.is.com.ua
48da18cd45 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2005-02-01 11:05:29 +02:00
jimw@mysql.com
61874f07df Merge mysql.com:/home/jimw/my/mysql-4.1-8134 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-01-31 15:29:55 -08:00
jimw@mysql.com
b4caa3aad5 Merge mysql.com:/home/jimw/my/mysql-4.1-8148 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-01-31 15:28:33 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
ba716c80f1 Bug#7011 
Fix tests after merge from 4.0
 2005-01-31 13:18:36 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
6a354b1b04 Bug#7011 
Merge from 4.0
 2005-01-31 12:48:00 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
500fbf5c0f Bug#7011 
Fix replication for multi-update
  new test - rpl_multi_update2
 2005-01-30 10:24:03 +00:00
jimw@mysql.com
691cd6c50d Fix error in string comparisons with CHAR(31) against the space-padding 
of strings of unequal length. (Bug #8134)
 2005-01-28 17:18:35 -08:00
jimw@mysql.com
f95f820727 Fix test results for mysqldump test. Part of Bug #8148. 2005-01-28 12:13:01 -08:00
dlenev@mysql.com
09b08edcc5 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-tzbug
 2005-01-28 17:43:59 +03:00
dlenev@mysql.com
c80c503a1b Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-tzbug
 2005-01-28 09:32:43 +03:00
pekka@mysql.com
521f736737 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/export/space/pekka/ndb/version/my41
 2005-01-27 18:12:04 +01:00
pekka@mysql.com
5cbadf4358 ndb - make YEAR and TIMESTAMP into ndb types 2005-01-27 17:33:35 +01:00
ingo@mysql.com
896d3a5f05 Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-4100
 2005-01-27 12:10:15 +01:00
ram@gw.mysql.r18.ru
7fda26d7fb Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261
 2005-01-27 14:16:54 +04:00
ingo@mysql.com
c83060628d Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-4100
 2005-01-27 08:32:38 +01:00
dlenev@brandersnatch.localdomain
80282016c2 Fix for bug #7899 "CREATE TABLE .. SELECT .. and CONVERT_TZ() function 
does not work well together". Now using simplier and more correct
implementation of st_lex::unlink_first_table()/link_first_table_back() 
(It also nicely handles case when global table list is created because
of implictly used time zone tables). (2nd attempt)

Fix for bug #7705 "CONVERT_TZ() crashes with subquery/WHERE on index
column". Implemented new approach for caching objects for constant
time zone arguments. Now instead of determining whenever these arguments
are constants and performing time zone lookup at fix_fields() stage, we
do it on first get_date() invocation.

Cleanup of global @@time_zone variable handling.
 2005-01-26 22:25:02 +03:00
igor@rurik.mysql.com
90fe2656c6 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2005-01-26 10:42:46 -08:00
ingo@mysql.com
300337cee7 Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-4100
 2005-01-26 15:31:06 +01:00