database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-11 05:52:26 +03:00
Code Activity
23,545 Commits 3,174 Branches 363 Tags
f188f6c98a9595812c5bf5f7a8575ef9cccc0b51
Commit Graph

5836 Commits

Author SHA1 Message Date
gluh@mysql.com
ac76e6db6a Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/gluh/MySQL/Bugs/5.0.10964
 2005-06-07 11:31:07 +05:00
monty@mysql.com
068bd3eb97 After merge fixes 2005-06-07 05:43:59 +03:00
monty@mysql.com
775f17667b Merge with 4.1 2005-06-07 00:31:53 +03:00
monty@mysql.com
dec2607e1d Ensure that we reset auto-increment cache if we have to do an UPDATE becasue of REPLACE 
This fixes bug #11080: Multi-row REPLACE fails on a duplicate key error
 2005-06-06 20:41:52 +03:00
bar@mysql.com
abb2d7aa34 ctype_cp1250_ch.result, ctype_cp1250_ch.test: 
Adding test.
ctype-win1250ch.c:
  Bug #9759 Empty result with 'LIKE' and cp1250_czech_cs
  Wrong min_sort_char fix.
 2005-06-06 21:22:23 +05:00
monty@mysql.com
8c1c166487 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-06-06 18:31:38 +03:00
monty@mysql.com
e43cbebc59 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-06-06 16:54:56 +03:00
igor@rurik.mysql.com
6ee824705e Merge rurik.mysql.com:/home/igor/mysql-5.0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-06-06 06:15:09 -07:00
igor@rurik.mysql.com
f2405d71eb sp.test, sp.result: 
Added a test case for bug #6866.
sql_select.cc:
  Fixed bug #6866.
  Bug was due to the fact that on_expr was not backed up
  for the second execution of the stored procedure.
 2005-06-06 06:05:11 -07:00
bar@mysql.com
2df945d87b Bug#8610: The ucs2_turkish_ci collation fails with upper('i') 
UPPER/LOWER now can return a string with different length.

mi_test1.c:
  Adding new arguments.
Many files:
  Changeing caseup/casedn to return a result with different
  length than argument.
sql_string.h:
  Removing unused method,
mysql_priv.h:
  Removing unused method
 2005-06-06 16:54:15 +05:00
monty@mysql.com
db4dc60d5c Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-06-06 14:36:21 +03:00
monty@mysql.com
e18bb16ee5 Fixed wrong key length when using MIN() optimization (non fatal, but caused InnoDB to write warnings to the log file) 
This fixed bug #11039: InnoDB: Warning: using a partial-field key prefix in search
 2005-06-06 14:03:33 +03:00
ramil@mysql.com
592d8f8d41 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/ram/work/5.0.b10539
 2005-06-06 11:30:15 +05:00
ramil@mysql.com
417447ae82 Merge 2005-06-06 10:39:21 +05:00
monty@mysql.com
4b7882dc73 merge 2005-06-05 17:19:50 +03: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
serg@serg.mylan
dc0df7ee5a after mergemerge 2005-06-04 07:15:11 +02:00
jimw@mysql.com
0f8c2e2a4b Merge mysql.com:/home/jimw/my/mysql-5.0-10590 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-06-03 16:06:51 -07: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
5b810bc607 after merge fixes 2005-06-03 21:08:45 +02:00
bar@mysql.com
4876612ae3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/bar/mysql-5.0
 2005-06-03 11:20:43 +05:00
bar@mysql.com
618934fe5f Merge 2005-06-03 09:44:13 +05: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
mskold@mysql.com
6720cb7d69 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-06-02 20:55:32 +02:00
mskold@mysql.com
9cebe281bb Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-06-02 17:06:51 +02:00
igor@igor-inspiron.creware.com
380411607a Merge igor-inspiron.creware.com:/home/igor/mysql-5.0 
into igor-inspiron.creware.com:/home/igor/dev/mysql-5.0-0
 2005-06-02 07:33:31 -07:00
igor@igor-inspiron.creware.com
186e8c5891 item_func.h: 
Fixed bug #9939: a wrong conversion of arguments
  for functions COALESCE and IFNULL.
  The str_op virtual method was added into Item_func_numhybrid.
item_func.cc:
  Fixed bug #9939: a wrong conversion of arguments
  for functions COALESCE and IFNULL.
  The str_op virtual method was added into Item_func_numhybrid.
item_cmpfunc.h, item_cmpfunc.cc:
  Fixed bug #9939: a wrong conversion of arguments
  for functions COALESCE and IFNULL.
  Item_func_coalesce and Item_func_ifnull now
  inherit from a modified Item_func_numhybrid.
case.test, case.result:
  Added test cases for bug #9939.
 2005-06-02 07:27:02 -07:00
evgen@moonbone.local
f89352602c Fix bug #9669 Ordering on IF function with FROM_UNIXTIME function fails 
Integer overflow results in wrong field sortlength.
 2005-06-02 17:00:07 +04:00
mskold@mysql.com
cc524b4fda Removed bug introduced when implementing support for IN and BETWEEN 2005-06-02 14:46:58 +02:00
bar@mysql.com
95484f7996 Merge mysql.com:/usr/home/bar/mysql-4.1.sysvar 
into mysql.com:/usr/home/bar/mysql-5.0
 2005-06-02 17:13:37 +05: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
gluh@eagle.intranet.mysql.r18.ru
477feba00f Fix for bug#10964: Information Schema:Authorization check on(2nd version, after review) 
privilege tables is improper
    added privilege check for USER_PRIVILEGES, SCHEMA_PRIVILEGES,
    TABLE_PRIVILEGES, COLUMN_PRIVILEGES tables
 2005-06-02 15:33:53 +05:00
jimw@mysql.com
5a271e2c12 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-06-01 16:13:24 -07:00
jimw@mysql.com
fb51d6eca5 Update results of test after merge of bugfix 2005-06-01 14:35:02 -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
7ac7bfc3c8 Fix handling of NULL fields in FIELD(). (Bug #10944) 2005-06-01 09:48:25 -07:00
mronstrom@mysql.com
e6f01bf647 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/mikron/bug10837
 2005-06-01 17:40:00 +02:00
mronstrom@mysql.com
5b54fcab6a Renamed bugs.test to default.test 
Moved enabling of warnings to ensure that no warnings are generated
when this test case is executed on a clone where InnoDB is not
activated. This would fail the test case in those clones otherwise.
 2005-06-01 17:36:21 +02:00
pem@mysql.com
f711a3d7c1 Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2005-06-01 15:50:52 +02:00
pem@mysql.comhem.se
5afef58364 Fixed BUG#10969: Stored procedures: crash if default() function 
Return an error if default() is used on a local variable.
  This is actaully a side-effect of BUG#5967: Stored procedure declared
  variable used instead of column (to be fixed later), so this is really a
  workaround until that is fixed.
 2005-06-01 15:42:40 +02:00
monty@mysql.com
a69f432115 Code cleanups during code reviews 
Ensure we get error if INSERT IGNORE ... SELECT fails
Fixed wrong key_part->key_length usage in index_merge
 2005-06-01 16:35:09 +03:00
ramil@mysql.com
086d81207b A fix (bug #10568: Function 'LAST_DAY(date)' does not return NULL for invalid argument). 2005-06-01 17:09:46 +05:00
pem@mysql.comhem.se
85f19d5da5 Fixed BUG#10961: Stored procedures: crash if select * from dual 
Have to catch errors from SELECT when opening a cursor.
 2005-06-01 12:18:41 +02:00
mskold@mysql.com
e8613e53b9 Fixed handling of condition pushdown to storage engine of NO BETWEEN and NOT IN 2005-06-01 11:56:47 +02:00
ingo@mysql.com
0a1e38b7ed Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement. 
Manual merge from 4.1.
 2005-06-01 11:15:21 +02:00
ingo@mysql.com
effd338f67 Merge 2005-05-31 20:55:42 +02:00
ingo@mysql.com
40b53eab23 Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement. 
After merge fix.
 2005-05-31 20:45:41 +02:00
acurtis@xiphis.org
fb10cfd08d Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1 
into xiphis.org:/usr/home/antony/work2/p4-bug10413.2
 2005-05-31 19:21:08 +01:00