database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-06 13:10:12 +03:00
Code Activity
21,744 Commits 3,261 Branches 1,092 Tags
a47bc28876dfe34839c2bc76c33e1639eda075d7
Commit Graph

6356 Commits

Author SHA1 Message Date
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
0a8595df42 Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
 2005-02-06 13:17:12 +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
joreland@mysql.com
abe792307b Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-02-06 10:41:59 +01:00
joreland@mysql.com
fec79d0358 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-02-06 10:39:48 +01:00
guilhem@mysql.com
8c508c25a2 result update after 4.1->5.0 merge 2005-02-05 19:49:02 +01:00
guilhem@mysql.com
a70adb5d2a Merge 2005-02-05 18:07:50 +01:00
jimw@mysql.com
be593c3251 Update test result 2005-02-05 08:54:13 -08:00
jimw@mysql.com
3c10ccd3f7 Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-02-05 07:52:55 -08: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
joreland@mysql.com
2953a79835 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-02-05 07:17:53 +01:00
joreland@mysql.com
7fba2bf3aa Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-02-05 07:16:07 +01:00
sergefp@mysql.com
511a166d55 Fix for BUG#7519: Index statistics is not displayed after ANALYZE for temporary tables: 
Call file->extra() with HA_STATUS_CONST in mysqld_show_keys.
The fix will not be merged into 4.1/5.0 because they don't have this problem already.
 2005-02-05 06:23:23 +03: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
sergefp@mysql.com
72c473ec58 Merge mysql.com:/home/psergey/mysql-4.1-bug7816 
into mysql.com:/home/psergey/mysql-5.0-bug7716
 2005-02-05 01:52:17 +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
14bb626dff Update test results 2005-02-04 12:59:02 -08:00
jimw@mysql.com
8c8553af81 Merge changes 2005-02-04 11:59:02 -08: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
tulin@mysql.com
d017a604fe Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/mysqldev/tulin/mysql-5.0
 2005-02-04 17:32:18 +01:00
kent@mysql.com
d1abda58b3 mysql-test-run.sh: 
USE_RUNNING_SERVER should be set to 0 or 1
 2005-02-04 17:24:18 +01:00
hf@deer.(none)
40fe0b3971 Embedded version of test fixed 2005-02-04 19:12:15 +04:00
msvensson@neptunus.homeip.net
c9d7cd043b Merge neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0 
into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0-cluster-extra
 2005-02-04 15:13:45 +01:00
mats@mysql.com
f6caefef2d Bug#7853 (mysqlbinlog does not accept input from stdin) 
The utility 'mysqlbinlog' now accepts input from stdin. It can 
  now be used to read the output from, e.g., 'zcat' or other utility.
 2005-02-04 14:29:54 +01: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
mysqldev@mysql.com
abf7837fbb resolved merge conflict 2005-02-04 14:27:09 +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
922084c1ec Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/timka/mysql/src/4.1-virgin
 2005-02-04 12:39:59 +02:00
ramil@mysql.com
2442a2d729 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/ram/work/5.0
 2005-02-04 14:39:36 +04:00
ramil@mysql.com
f271a75414 type_ranges.result.es updated. 2005-02-04 14:35:56 +04:00
kent@mysql.com
68aefd155c Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
 2005-02-04 11:00:34 +01: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
msvensson@neptunus.homeip.net
e54ea9189d Merge of query cache from 4.1 to 5.0 2005-02-04 10:56:53 +01:00
ramil@mysql.com
7a00d082cf Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/ram/work/5.0
 2005-02-04 13:55:13 +04:00
ramil@mysql.com
e8ed450e15 type_float.result.es updated 2005-02-04 13:51:37 +04:00
gluh@gluh.mysql.r18.ru
11435fdfad Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-02-04 12:37:18 +03:00
pekka@mysql.com
8e4fca2a55 Merge 2005-02-04 10:35:09 +01:00
kent@mysql.com
b436e0fa8c Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
 2005-02-04 08:59:58 +01: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
joreland@mysql.com
fcdbaf1071 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-02-04 06:10:56 +01:00
joreland@mysql.com
58e336764a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-02-04 06:09:43 +01:00
jimw@mysql.com
f32c61fbaf Handle backslashes correctly in strings that also have doubled quotes when 
we are using the NO_BACKSLASH_ESCAPES SQL mode. (Bug #6368)
 2005-02-03 16:14:02 -08: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