mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 03:51:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
20854 commits 2793 branches 343 tags 1.7 GiB
Commit graph

20854 commits

This branch
This branch
All branches
Author SHA1 Message Date
ramil/ram@mysql.com/myoffice.izhnet.ru
907f5db856 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/ram/work/4.1.b20695
 2006-08-17 11:36:03 +05:00
bar@mysql.com/bar.intranet.mysql.r18.ru
39860d67de Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b9509
 2006-08-16 12:42:22 +05:00
bar@mysql.com/bar.intranet.mysql.r18.ru
b1f9b63a54 Merge mysql.com:/usr/home/bar/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b9509
 2006-08-16 09:31:24 +05:00
mskold/marty@mysql.com/linux.site
bacdcb053e Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-4.1
 2006-08-15 15:58:02 +02:00
mskold/marty@mysql.com/linux.site
6a3143e2a0 ndb_lock.test, ndb_lock.result: 
bug #18184  SELECT ... FOR UPDATE does not work..: New test case
ha_ndbcluster.h, ha_ndbcluster.cc, NdbConnection.hpp:
  Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
 2006-08-15 13:12:27 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
6660f98b64 Fix for bug #20695: Charset introducer overrides charset definition for column. 
- if there are two character set definitions in the column declaration,
    we replace the first one with the second one as we store both in the LEX->charset
    slot. Add a separate slot to the LEX structure to store underscore charset.
  - convert default values to the column charset of STRING, VARSTRING fields 
    if necessary as well.
 2006-08-15 15:24:07 +05:00
bar@mysql.com/bar.intranet.mysql.r18.ru
638300fa9e Merge mysql.com:/usr/home/bar/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b17939
 2006-08-15 14:41:29 +05:00
kroki/tomash@moonlight.intranet
e287562097 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug9678
 2006-08-14 20:03:16 +04:00
kroki/tomash@moonlight.intranet
c746c08af9 BUG#9678: Client library hangs after network communication failure 
Socket timeouts in client library were used only on Windows.

The solution is to use socket timeouts in client library on all
systems were they are supported.

No test case is provided because it is impossible to simulate network
failure in current test suit.
 2006-08-14 20:01:19 +04:00
svoj@april.(none)
a55d18e746 Merge april.(none):/home/svoj/devel/bk/mysql-4.1 
into  april.(none):/home/svoj/devel/mysql/BUG18874/mysql-4.1
 2006-08-14 18:13:50 +05:00
svoj@may.pils.ru
d4bdba176f BUG#18874 - Setting myisam_repair_threads > 1, index cardinality always 1 
Fixed by moving update_key_parts() down to be after write_index().
 2006-08-14 17:05:02 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
dc4b2a4f1d Make the heap_btree test repeatable. 2006-08-14 12:59:54 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
bc1e69d453 Restore alphabetical order of the system variables. 2006-08-14 10:54:24 +05:00
bar@mysql.com/bar.intranet.mysql.r18.ru
130c861fb3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b15276
 2006-08-11 13:21:25 +05:00
bar@mysql.com/bar.intranet.mysql.r18.ru
4a63a64f1e mysqld --collation-server=xxx --character-set-server=yyy 
didn't work as expected: collation_server was set not to xxx,
but to the default collation of character set "yyy".
    
With different argument order it worked as expected:
mysqld --character-set-server=yyy --collation-server=yyy 
    
Fix:
initializate default_collation_name to 0
when processing --character-set-server
only if --collation-server has not been specified
in command line.
 2006-08-11 13:19:44 +05:00
bar@mysql.com/bar.intranet.mysql.r18.ru
8a4c19d915 Bug#7192 Specify --with-collation doesn't work for connections? 
--with-collation worked only on the server side.
Client side ignored this argument, so collation_connection
was not properly set (remained latin1_swedish_ci).
 2006-08-11 13:14:26 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
50ae5b7989 Fix for bug #20709: Collation not used in group by on 4.1. 
myisam/mi_uniue.c:mi_check_unique() should skip trailing spaces comparing 
TEXT and VARTTEXT key segments.
 2006-08-10 15:06:22 +05:00
cmiller@zippy.cornsilk.net
8e4460343f Removed iggy's accidentally checked-in test files. 2006-08-09 13:41:08 -04:00
svoj@may.pils.ru
6d23dd824c Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  may.pils.ru:/home/svoj/devel/mysql/BUG20060/mysql-4.1
 2006-08-09 14:35:45 +05:00
svoj@may.pils.ru
81b70f9798 BUG#20060 - mysqld option "--flush " doesn't work for update statement 
Problem described in this bug report affects MyISAM tables only.

Running mysqld --flush instructs mysqld to sync all changes to disk
after each SQL statement. It worked well for INSERT and DELETE
statements, but it did sync for UPDATE only in case if there was
index change (change of colum that has an index). If no updated column
has an index, data wasn't synced to disk.

This fix makes UPDATE statement to sync data to disk even if there is
no index change (that is only data change) and mysqld is run with
--flush option.
 2006-08-09 14:28:39 +05:00
bar@mysql.com/bar.intranet.mysql.r18.ru
7ff64de172 Merge mysql.com:/usr/home/bar/mysql-4.1.b19741v0 
into  mysql.com:/usr/home/bar/mysql-4.1.b19741
 2006-08-07 13:15:23 +05:00
svoj@may.pils.ru
34c83fba8d Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  may.pils.ru:/home/svoj/devel/mysql/BUG7391/mysql-4.1
 2006-08-03 15:49:41 +05:00
msvensson@neptunus.(none)
5fc215e2e3 Bug#21419 test case lowercase_fs_off fails on Windows 
- Backport patch from 5.0
 2006-08-03 12:16:24 +02:00
msvensson@neptunus.(none)
83167f06a3 Merge neptunus.(none):/home/msvensson/mysql/my41-bug21218 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2006-08-03 11:57:52 +02:00
svoj@may.pils.ru
395d3c3985 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  may.pils.ru:/home/svoj/devel/mysql/BUG7391/mysql-4.1
 2006-08-03 14:08:43 +05:00
svoj@may.pils.ru
67db270c71 BUG#7391 - Cross-database multi-table UPDATE uses active database 
privileges

This problem is 4.1 specific. It doesn't affect 4.0 and was fixed
in 5.x before.

Having any mysql user who is allowed to issue multi table update
statement and any column/table grants, allows this user to update
any table on a server (mysql grant tables are not exception).

check_grant() accepts number of tables (in table list) to be checked
in 5-th param. While checking grants for multi table update, number
of tables must be 1. It must never be 0 (actually we have
DBUG_ASSERT(number > 0) in 5.x in grant_check() function).
 2006-08-03 14:03:08 +05:00
cmiller@zippy.cornsilk.net
dd5eeaf676 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/m41-maint--07OBQ
 2006-08-02 14:57:12 -04:00
cmiller@zippy.cornsilk.net
c9f64f71c8 Bug#9719: DELETE with WHERE on HEAP table just deletes first row of matched 
set.

(Ramil's patch, recreated.)
 2006-08-02 13:06:59 -04:00
iggy@rolltop.ignatz42.dyndns.org
757493d4ec Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_bug20721
 2006-08-02 11:13:55 -04:00
evgen@moonbone.local
7451ffcd0a Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  moonbone.local:/work/tmp_merge-4.1-opt-mysql
 2006-08-02 18:16:05 +04:00
evgen@moonbone.local
cac5ad03b9 Merge moonbone.local:/work/tmp_merge-4.1 
into  moonbone.local:/work/tmp_merge-4.1-opt-mysql
 2006-08-02 16:40:32 +04:00
evgen@moonbone.local
40a1fbdffb Merge moonbone.local:/work/tmp_merge-4.1 
into  moonbone.local:/work/tmp_merge-4.1-opt-mysql
 2006-08-02 16:10:52 +04:00
holyfoot/hf@mysql.com/deer.(none)
2119067eee Merge bk@192.168.21.1:mysql-4.1 
into  mysql.com:/home/hf/work/mysql-4.1.20317
 2006-08-02 16:57:46 +05:00
msvensson@neptunus.(none)
587b9caabb Merge bk-internal:/home/bk/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2006-08-01 15:36:37 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
d9f5416be5 Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
 2006-08-01 06:08:09 +02:00
igreenhoe/greenman@anubis.greendragongames.com
940db2e976 Merge anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/mysql-4.1-maint 
into  anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/pending/bug-4.1-19364
 2006-07-31 12:53:47 -07:00
lars/lthalmann@mysql.com/dl145j.mysql.com
635281619b Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
 2006-07-31 21:30:24 +02:00
msvensson@neptunus.(none)
f1a262bcd5 Merge bk-internal:/home/bk/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2006-07-31 16:07:28 +02:00
msvensson@neptunus.(none)
dce84a7e05 Merge 192.168.0.20:mysql/bug21217/my41-bug21217 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2006-07-31 14:41:29 +02:00
msvensson@neptunus.(none)
1b88a957c5 Merge neptunus.(none):/home/msvensson/mysql/my41-bug21125 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2006-07-31 14:40:21 +02:00
msvensson@shellback.(none)
eaae3b2d2b BUG#21217 "mysqltest" client is inconsistent when to log a line number 
- Init start_lineno to 0
 2006-07-30 19:30:20 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
5d948f5ec4 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0 
into  mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2006-07-29 17:26:06 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
f2ec5d7128 configure.in: 
Corrected typo
 2006-07-29 17:24:48 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
01f5bc3a83 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0 
into  mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2006-07-28 23:40:05 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
2faea98324 Makefile.am, configure.in: 
Man page for mysqld command move to section 8 (bug#21220)
 2006-07-28 23:12:40 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
c188a3bf0a make_binary_distribution.sh: 
Man page for "mysqld" command move to section 8 (bug#21220)
 2006-07-28 23:06:49 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
ef0c9d7588 mysql.spec.sh: 
Man page for "mysqld" command move to section 8 (bug#21220)
 2006-07-28 22:57:57 +02:00
gkodinov/kgeorge@rakia.(none)
351554e121 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-4.1-opt 
into  rakia.(none):/home/kgeorge/mysql/autopush/B20792-4.1-opt
 2006-07-27 10:06:37 +03:00
gkodinov/kgeorge@rakia.(none)
e2a082aa32 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-4.1-opt 
into  rakia.(none):/home/kgeorge/mysql/autopush/B20792-4.1-opt
 2006-07-26 19:55:33 +03:00
gkodinov/kgeorge@macbook.gmz
565d495997 * Bug #20792: Incorrect results from aggregate subquery 
When processing aggregate functions all tables values are reset
to NULLs at the end of each group. 
When doing that if there are no rows found for a group
the const tables must not be reset as they are not recalculated 
by do_select()/sub_select() for each group.
 2006-07-26 19:19:30 +03:00