mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
9239 commits 2784 branches 343 tags 1.6 GiB
Commit graph

2144 commits

Author SHA1 Message Date
wax@kishkin.ru
b34c3934d9 BUG 
correct bug 1085 (a problem with min/max functions)
add tests of bugs 833,836,1085
 2003-09-04 06:44:16 +06:00
serg@serg.mylan
7d2b0a0ce7 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2003-09-03 15:40:19 +02:00
kostja@oak.local
424a647069 post-merge fixes 2003-09-03 16:43:41 +04:00
kostja@oak.local
36dd82c1d5 merge commit, hope that none of bar and dlenev changes were 
lost.
 2003-09-03 14:12:10 +04:00
serg@serg.mylan
755455e15c merged 2003-09-03 12:07:18 +02:00
serg@serg.mylan
2fcab1c2ee CHECKSUM TABLE table1, table2, ... [ QUICK | EXTENDED ] 2003-09-03 11:34:32 +02:00
dlenev@dlenev.mshome
f655ba9866 Updated various tests results which were missed during auto-merge 
with replication over SSL patch.
 2003-09-01 19:13:19 +04:00
dlenev@mysql.com
73ab4be246 Manual merge fixes 2003-09-01 16:14:54 +04:00
dlenev@dlenev.mshome
2486222cd2 Implemented replication over SSL 
Added proper options to CHANGE MASTER TO, new fields to SHOW SLAVE STATUS,
 Honoring this parameters during connection to master.
 Introduced new format of master.info file
 2003-09-01 15:16:20 +04:00
Sinisa@sinisa.nasamreza.org
b0a8931986 Two small fixes 2003-08-30 18:21:24 +03:00
gluh@gluh.mysql.r18.ru
144d0efaaa Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.fix
 2003-08-29 11:24:33 +05:00
bell@laptop.sanja.is.com.ua
d6761fade4 Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-aggregate-4.1
 2003-08-28 17:27:46 +03:00
vva@eagle.mysql.r18.ru
79be48410d fixed merge mistake 2003-08-28 10:26:56 -04:00
gluh@gluh.mysql.r18.ru
e4951147cf Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE 
This commit is related to my previos one(ChangeSet 1.1583 03/08/27 18:03:39).
Note about COMMIT&ROLLBACK:
  Only 'COMMIT' statement updates the binary log. 
  'ROLLBACK' statement doesn't update the binlog.
 2003-08-28 18:09:00 +05:00
vva@eagle.mysql.r18.ru
60fc3ae02b Merge 2003-08-27 21:26:00 -04:00
bell@laptop.sanja.is.com.ua
3d2a3804a1 reset() split in 2 function clear() & add() 
aggregate function reinitialization (if no rows was found) made with help of clear()
(fixed BUG#860)
 2003-08-28 03:10:14 +03:00
vva@eagle.mysql.r18.ru
40757beb81 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BUG_910/mysql-4.1
 2003-08-27 19:15:27 -04:00
vva@eagle.mysql.r18.ru
cde2b50514 fixed bug #910 (right type of ifnull function) 2003-08-27 19:11:54 -04:00
gluh@gluh.mysql.r18.ru
4c076ea6d7 Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE 2003-08-27 18:03:39 +05:00
Sinisa@sinisa.nasamreza.org
566ebb63ce merge fixes 2003-08-27 14:36:38 +03:00
bell@laptop.sanja.is.com.ua
8b8b984da0 Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-collation-4.1
 2003-08-26 23:32:20 +03:00
monty@narttu.mysql.fi
1d0b539263 Fix for bug in ROLLUP when all tables where 'const' tables (Bug #714) 2003-08-26 20:23:48 +03:00
monty@narttu.mysql.fi
7b99412988 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into narttu.mysql.fi:/my/mysql-4.1
 2003-08-26 17:53:42 +03:00
monty@narttu.mysql.fi
753cb8509c Cleanups 
BTREE, HASH and RTREE are not reserved symbols anymore
 2003-08-26 17:52:54 +03:00
bell@laptop.sanja.is.com.ua
31657edc5f Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-collation-4.1
 2003-08-26 16:24:51 +03:00
Sinisa@sinisa.nasamreza.org
58c659a3bd symlink.result: 
Fix for a small error in the merge from 4.0
 2003-08-25 17:07:14 +03:00
bell@laptop.sanja.is.com.ua
5b28d4a9a4 removed --rpl option of ./mysql-test-run 
(./mysql-test-run t/rpl*.test  do same work)
 2003-08-25 16:40:14 +03:00
Sinisa@sinisa.nasamreza.org
4ba1506244 union.result: 
same as above
sql_lex.h:
  same as above 
sql_union.cc:
  same as aobve
sql_select.cc:
  Fixing that SQL_CALC_FOUND_ROWS work properly in UNION's in 4.1
  Plus updating some fields in THD in the proper places 
  plus fixing a wrong result
 2003-08-23 21:21:02 +03:00
serg@serg.mylan
eb3912c05a bug #1078. two innodb+delayed crashes 2003-08-22 18:21:23 +02:00
bar@bar.mysql.r18.ru
8c55440ba4 CAST(expr AS CHAR(10)) is now working 2003-08-21 14:15:25 +05:00
bell@laptop.sanja.is.com.ua
63fc15ceeb merge 2003-08-21 00:41:08 +03:00
bell@laptop.sanja.is.com.ua
87bb62007b merge 2003-08-20 23:39:17 +03:00
bell@laptop.sanja.is.com.ua
11af1f3c9c Merge 2003-08-20 17:45:04 +03:00
bell@laptop.sanja.is.com.ua
dd9cbce47b merge 2003-08-19 20:14:35 +03:00
Sinisa@sinisa.nasamreza.org
be67e7176a Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2003-08-19 16:40:31 +03:00
Sinisa@sinisa.nasamreza.org
faabb1c42c A fix for a bug with long definition of SET or ENUM. 
Barkov approved it already
 2003-08-19 16:35:17 +03:00
monty@mashka.mysql.fi
eb6458cb18 After merge fixes + bugs from last merge 2003-08-19 16:00:12 +03:00
monty@mashka.mysql.fi
10c4acfb4f merge 2003-08-19 00:10:21 +03:00
monty@mashka.mysql.fi
4f7512160b After merge fixes 
Use server character set if --default-character-set is not used
Added convert_string() for more efficient alloc+character-set convert of strings
 2003-08-19 00:08:08 +03:00
bell@sanja.is.com.ua
758129279f Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1
 2003-08-13 10:12:41 +03:00
bell@sanja.is.com.ua
341d5aa036 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-collation-4.1
 2003-08-12 19:21:03 +03:00
bell@sanja.is.com.ua
f1b1f0d742 after merge fix 2003-08-12 18:51:49 +03:00
bell@sanja.is.com.ua
62849952df Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-having_resolve-4.1
 2003-08-12 18:44:48 +03:00
bell@sanja.is.com.ua
011d905391 merge 2003-08-12 17:48:58 +03:00
bell@sanja.is.com.ua
b6a8d68ae4 fixed problem with reference on derived table fields (BUG#1031) 2003-08-12 15:04:49 +03:00
bar@bar.mysql.r18.ru
e5e81f45a0 LIKE didn't work with non-default charset 2003-08-12 16:42:52 +05:00
monty@mashka.mysql.fi
2263e3e51f Merge with 4.0.14 2003-08-11 22:44:43 +03:00
dlenev@mysql.com
c767f0b2a0 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-345
 2003-08-11 23:43:54 +04:00
dlenev@dlenev.mshome
921ac8af8b Implemented UTC_TIME, UTC_DATE and UTC_TIMESTAMP functions (WL#345) 2003-08-11 23:43:01 +04:00
bell@sanja.is.com.ua
b518e93b4a fixed collation of Item_cache family (BUG#951) 2003-08-11 20:48:51 +03:00