database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity
17,426 Commits 3,153 Branches 363 Tags
3fb088a075ebd3e4fe78d122911103618bd1cbe4
Commit Graph

4839 Commits

Author SHA1 Message Date
dlenev@mysql.com
5627dddb93 Manual merge of fix for bug #6439 "from_unixtime() function returns 
wrong datetime values for too big argument" from 4.0 tree to 4.1 tree.
 2004-11-19 19:19:45 +03:00
bar@mysql.com
3b0fd7fe96 func_str.result: 
This test was moved into func_group.
 2004-11-19 19:35:37 +04:00
dlenev@mysql.com
cb7e272e46 Manual merge of fix for bug #6266 "Invalid DATETIME value is not handled 
properly" with main tree.
 2004-11-19 18:35:36 +03:00
bar@mysql.com
770c9be8c2 Bug #6658 MAX(column) returns incorrect coercibility 
Also, Item_sum_hybrid->charset was removed as redundant,
and switched to use collation.collation instead.
 2004-11-19 19:35:36 +04:00
dlenev@mysql.com
40083741ee Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/dlenev/src/mysql-4.0-bg6439
 2004-11-19 17:54:14 +03:00
bar@mysql.com
6de458c232 Reuse ctype_common.inc instead of retyping 
the same queries.
 2004-11-19 14:33:55 +04:00
bar@mysql.com
f9d1a5a1c6 Incorrect response with partial utf8 index 2004-11-19 14:25:25 +04:00
tomas@poseidon.ndb.mysql.com
287fe9e313 ndb_grant.result, ndb_grant.test: 
new file
 2004-11-19 09:17:36 +00:00
joreland@mysql.com
d7f6078d45 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2004-11-18 20:59:03 +01:00
mskold@mysql.com
7bbee8c95d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-11-18 15:55:18 +01:00
bar@mysql.com
fe3b359b74 Check that the third UNION part with COLLATE 
clause resolves collation conflict for the
first and the second parts pair.
 2004-11-18 16:15:48 +04:00
petr@mysql.com
30789e7aa2 Merge mysql.com:/home/cps/mysql/trees/mysql-5.0 
into mysql.com:/home/cps/mysql/devel/innotask/mysql-5.0-inno-final
 2004-11-18 14:53:21 +03:00
mskold@mysql.com
a4d061a5d9 Fix for bug#4312 ndb table, wrong behaviour on insert .. on duplicate key .. 2004-11-18 12:11:56 +01:00
petr@mysql.com
890211a7c4 WL 2059 Engine-specific status variables framework and WL 1922 
InnoDB status variables
 2004-11-18 13:00:42 +03:00
gluh@gluh.mysql.r18.ru
a68a9fe268 remove unused parts of code 
fix for 'show create schema_table'
fix for usage schema tables in subselect
'wrong schema table charset' fix
 2004-11-18 12:16:06 +03:00
serg@serg.mylan
c7532a698d merged 2004-11-17 20:07:13 +01:00
serg@serg.mylan
e68bd85b77 merged 2004-11-17 18:04:36 +01:00
serg@serg.mylan
19067008b8 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-11-17 17:54:15 +01:00
guilhem@mysql.com
f04832b52d time independent test 2004-11-17 17:06:24 +01:00
mskold@mysql.com
5fc61f2e09 Fixed show table output 2004-11-17 17:05:21 +01:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
8c0d21d186 WL#638 - Fix precedence for parsing NOT ... LIKE expression s 
Rework parser expression rules
  Rework handling for "||" concat/or
  Eliminate some shift/reduce conflicts
  Add support for "xxx IS [ NOT ] truth_value"
 2004-11-17 15:49:10 +00:00
gluh@gluh.mysql.r18.ru
a288f3b3e1 Fix for Auto_increment filed value in 'show table status' 
code cleanup
 2004-11-17 18:48:12 +03:00
guilhem@mysql.com
d34421c127 Fixes for compilation errors in Windows (casts from uint32* to uint*) in repl and charset code. 
Moving the part of user_var.test using UCS2 to ctype_ucs.test
 2004-11-17 16:41:30 +01:00
serg@serg.mylan
37e872de8c merged 2004-11-17 15:28:37 +01:00
serg@serg.mylan
2d8c21f700 test for bug#5528 2004-11-17 13:38:35 +01:00
bell@sanja.is.com.ua
d5b21d03a5 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-global-4.1
 2004-11-17 10:59:04 +02:00
igor@rurik.mysql.com
078597564d Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2004-11-16 15:07:49 -08:00
igor@rurik.mysql.com
e17073c4a2 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2004-11-16 14:01:40 -08:00
igor@rurik.mysql.com
9edff6c591 key_cache.result, key_cache.test: 
Added a test case for bug #6447.
mf_keycache.c:
  Fixed bug #6447. Erronious code in the key_cache_read function
  caused problems when reading key blocks with offset>0 into
  key cache. The code of key_cache_insert and key_cache_write
  was modified similarly.
 2004-11-16 13:58:49 -08:00
bell@sanja.is.com.ua
bc5a9111d7 backport Serg's fix of FT interface (BUG#6523) 2004-11-16 22:58:02 +02:00
sergefp@mysql.com
1cc999fbd4 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-heap-bug
 2004-11-16 21:36:31 +03:00
ram@gw.mysql.r18.ru
dde88ea82b A fix (bug #6449: DO server-crashing bug). 2004-11-16 14:36:25 +04:00
guilhem@mysql.com
7120a875a3 In 5.0 we return 'out of range' instead of 'data truncated'. 2004-11-16 10:12:09 +01:00
bar@mysql.com
629f1bb616 Bug #6552 CHAR column w/o length is legal, BINARY w/o length is not 2004-11-16 12:05:13 +04:00
guilhem@mysql.com
e38dae0bc1 Merge 2004-11-16 00:04:12 +01:00
bell@sanja.is.com.ua
27395a2fb1 fixed joincleunup to avoid double deletin tables, and too earlyfull cleanup in case of EXPLAIN 
fixed cleunup of TMP_TABLE_PARAM
(BUG#6406)
 2004-11-16 00:16:04 +02:00
serg@serg.mylan
8edd5d99e2 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2004-11-15 22:29:50 +01:00
gluh@gluh.mysql.r18.ru
cfc6e6dc4b valgrind error fix 2004-11-16 00:29:49 +03:00
serg@serg.mylan
87840e841c Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2004-11-15 19:27:06 +01:00
bar@mysql.com
8a2ef0a2ca Bug#6608: MySQL server crash in some query with tis620 character set. 
The bug was that the function allocates 'a', then changes the value
of 'a' with the operator ++, and then tries to free 'a'!
 2004-11-15 21:26:16 +04:00
gluh@gluh.mysql.r18.ru
c67d479918 Fixes for information_schema 2004-11-15 19:20:45 +03:00
lars@mysql.com
b7cfe5ecad BUG#6353 V2: 
Replication using replicate-rewrite-db did not work for LOAD DATA INFILE.
Now is does.  There was one place in the code that used current database 
instead of the rewrite database.
 2004-11-15 17:03:54 +01:00
dlenev@mysql.com
5ddc564d89 Proposed fix for bug #6439 "from_unixtime() function returns wrong datetime 
values for too big argument".

Added range checking for from_unixtime() argument, cleaned up code 
a bit.
 2004-11-15 16:11:13 +03:00
dlenev@brandersnatch.localdomain
b02f5aa692 Fix for bug #6266 "Invalid DATETIME value is not handled properly". 
In server we assume that datetime values stored in MYSQL_TIME struct
are normalized (and year is not greater than 9999), so we should 
perform range checks in all places then we convert something to
MYSQL_TIME.
 2004-11-15 15:44:29 +03:00
bell@sanja.is.com.ua
77540c8996 moved procedure list initialization (BUG#6517) 2004-11-15 14:37:40 +02:00
bell@sanja.is.com.ua
25d0f827ce posmerge fixes 2004-11-13 23:26:15 +02:00
bell@sanja.is.com.ua
d76db8b999 marge 2004-11-13 19:45:36 +02:00
bell@sanja.is.com.ua
7210195f1e now my_printf_error is not better then my_error, but my_error call is shorter 
used only one implementation of format parser of (printf)
fixed multistatement
 2004-11-13 19:35:51 +02:00
gluh@gluh.mysql.r18.ru
321f803784 WL#1629: SHOW with WHERE(partially) & 
WL#173:  Create Data Dictionary Tables for SHOW Commands
 2004-11-13 13:56:39 +03:00
monty@mysql.com
6cf9ea2c9a Add back data that bk loosed during automatic merge 2004-11-12 21:42:44 +02:00