database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-22 17:44:29 +03:00
Code Activity
31,322 Commits 3,284 Branches 1,099 Tags
ff3a640e8f64b0fb25b51ea732b9f6c22f366bd2
Commit Graph

10662 Commits

Author SHA1 Message Date
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
mskold@mysql.com
f21a737197 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
 2005-02-01 10:05:22 +01:00
jimw@mysql.com
36d5d82ab5 Update client_xml test to avoid timestamp-sensitive part of test. 2005-01-31 18:48:42 -08:00
jimw@mysql.com
85a5c61c5d Merge mysql.com:/home/jimw/my/mysql-4.1-7811 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-01-31 17:51:45 -08:00
jimw@mysql.com
6056009782 Update test results after bug-fix merge. 2005-01-31 17:31:42 -08:00
jimw@mysql.com
b7dda3f7c0 Merge 2005-01-31 16:27:17 -08: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
adb91423ac Bug#7011 
Merge from 4.1
 2005-01-31 15:57:32 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
18084f54c7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug7011.4
 2005-01-31 15:06:04 +00:00
bell@sanja.is.com.ua
471c8e6777 fixed problem with groupping by view (BUG#7116) 2005-01-31 16:24:11 +02:00
wax@mysql.com
2251593a09 Merge mysql.com:/home/wax/mysql/mysql-4.1 
into mysql.com:/home/wax/mysql/mysql-4.1test2
 2005-01-31 19:23:19 +05:00
wax@kishkin.ru
6ba40427ba WL#964 
added client_test.dsp in project
    added CHARACTER SET in tables
    added 5th time zone
    included lstat in if()
    expanded ignore list for windows
    added directory slave1 and slave2
    added options for mysqld and mysqltest
    fixed error in read_option()
    fixed and added enviroment variables for Linux and Windows
    rewrote str_tok()
    added replacment 3th column
    New BitKeeper file ``VC++Files/tests/client_test.dsp''
 2005-01-31 19:18:06 +05:00
gluh@gluh.mysql.r18.ru
a899655e7a Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-01-31 17:13:03 +03: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
gluh@gluh.mysql.r18.ru
89ba364e03 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-01-31 13:36:05 +03:00
kent@mysql.com
89b3897005 Merge 2005-01-31 10:24:33 +01:00
bell@sanja.is.com.ua
e447b88869 fixed problem in view over view setup (BUG#7433) 2005-01-31 10:43:36 +02:00
bell@sanja.is.com.ua
25042ae70c Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-repl-5.0
 2005-01-31 09:36:23 +02: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
kent@mysql.com
b0d2e3c9d9 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
 2005-01-30 00:32:14 +01:00
dlenev@mysql.com
922f0b007c Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-merges
 2005-01-29 19:57:29 +03:00
kent@mysql.com
57fce07b31 mysql-test-run.sh: 
Old Solaris 'test' lack -e
 2005-01-29 15:59:29 +01:00
kent@mysql.com
0b057dd6ee Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
 2005-01-29 12:46:13 +01:00
joreland@mysql.com
08b302894c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-01-29 07:04:04 +01: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
gluh@gluh.mysql.r18.ru
526dbfda22 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-01-28 19:37:04 +03:00
dlenev@mysql.com
10a9434ccd Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-merges
 2005-01-28 19:09:28 +03: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
2276bfa374 Manual merge of fixes for bugs #7899 "CREATE TABLE .. SELECT .. and 
CONVERT_TZ() function does not work well together" and bug #7705 
"CONVERT_TZ() crashes with subquery/WHERE on index column" in 5.0
tree.
 2005-01-28 10:22:50 +03:00
joreland@mysql.com
7200ff359f Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-01-28 07:55:42 +01: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
kent@mysql.com
499a441683 compile-solaris-sparc-purify: 
Added preparation of mysql_client_test(_embedded) and mysqltest(_embedded)
  Added --purify, --purecov, --quantify and --cxxfilt <cxxfiltprog> options
mysql-test-run.sh:
  Report correctly combinations of embedded+ps-protocol etc
  Added initial Purify support
 2005-01-28 00:35:26 +01:00
serg@serg.mylan
3c5060981f query_id and my_xid -> ulonglong 
fix for binlog+autocommit+tclog
comments, style fixes
 2005-01-27 22:38:56 +01:00
pekka@mysql.com
8480b22122 Merge 2005-01-27 18:41:23 +01: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
gluh@gluh.mysql.r18.ru
6afbb3d627 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-01-27 20:01:37 +03:00
pekka@mysql.com
5cbadf4358 ndb - make YEAR and TIMESTAMP into ndb types 2005-01-27 17:33:35 +01:00
gluh@gluh.mysql.r18.ru
9cb334f490 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.last
 2005-01-27 18:23:05 +03:00
bell@sanja.is.com.ua
34b85449bb fixed QC invaluidation and processing with view (BUG#8050) (BUG#8054) 2005-01-27 14:21:37 +02:00
ingo@mysql.com
48488e483a Merge mysql.com:/home/mydev/mysql-4.1-4100 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-01-27 12:18:02 +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
gluh@gluh.mysql.r18.ru
ac14d40dde A fix: information_schema test fails on Mac OSX 2005-01-27 13:16:51 +03:00
joreland@mysql.com
5d967c6603 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-01-27 10:31:45 +01:00
joreland@mysql.com
d470738ca0 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-01-27 10:30:52 +01:00
gluh@gluh.mysql.r18.ru
efeeb3c2e6 Fix after review for 
ChangeSet
  1.1803 05/01/24
  Additional fix for WL#1629: SHOW with WHERE(discussed with PeterG)
 2005-01-27 11:06:44 +03:00
ingo@mysql.com
160541b5d4 Merge mysql.com:/home/mydev/mysql-5.0 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-01-27 08:32:46 +01:00