mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 19:11:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
21568 commits 2790 branches 343 tags 1.7 GiB
Commit graph

21568 commits

This branch
This branch
All branches
Author SHA1 Message Date
igor@rurik.mysql.com
d53423383b Manual merge 2005-03-17 21:47:46 -08:00
igor@rurik.mysql.com
6f5fbaad59 olap.test: 
Added a test case for bug #8617.
sql_select.cc:
  Fixed bug #8617.
  Queries with ROLLUP and LIMIT n returned more than n rows
  if SQL_CALC_FOUND_ROWS was used.
 2005-03-17 20:18:19 -08:00
jimw@mysql.com
845e02d3a7 Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-03-17 17:59:52 -08:00
jimw@mysql.com
a1db46216e Merge mysql.com:/home/jimw/my/mysql-5.0-build 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-03-17 17:27:07 -08:00
jimw@mysql.com
7214c51e72 Merge mysqldev@production.mysql.com:my/mysql-5.0-build 
into mysql.com:/home/jimw/my/mysql-5.0-build
 2005-03-17 17:24:47 -08:00
jimw@mysql.com
dcd336d79d Fix merge of sql/sql_select.cc using Igor's patch (Bug #9254) 2005-03-17 17:22:40 -08:00
heikki@hundin.mysql.fi
3ec4d8a773 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/heikki/mysql-5.0
 2005-03-18 02:25:41 +02:00
lenz@mysql.com
afcedb8847 Merge mysql.com:/space/my/mysql-5.0-build 
into mysql.com:/space/my/mysql-5.0
 2005-03-18 01:25:40 +01:00
jimw@mysql.com
78897b46f0 Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-03-17 15:59:11 -08:00
lenz@mysql.com
ac5cdb6125 - fixed two merge errors 2005-03-18 00:30:20 +01:00
brian@zim.(none)
904e329036 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into zim.(none):/home/brian/mysql/mysql-5.0
 2005-03-17 14:49:36 -08:00
brian@zim.(none)
0a5c73ecd4 Missed this file in the embedded server when MIT Threads were removed. 2005-03-17 14:48:38 -08:00
jimw@mysql.com
7b1b5f1656 Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-03-17 14:24:29 -08:00
jimw@mysql.com
faaf5ba8c4 Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-03-17 13:41:21 -08:00
konstantin@mysql.com
371850a459 Cleanup of Item_func_group_concat 2005-03-18 00:41:03 +03:00
jimw@mysql.com
25a1ca078a Merge mysql.com:/home/jimw/my/mysql-5.0-build 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-03-17 13:38:07 -08:00
konstantin@mysql.com
60e7da0a67 Remove unexistent @MT_INCLUES@ 2005-03-18 00:24:35 +03:00
mysqldev@mysql.com
c59e0fc78b Merge 2005-03-17 22:17:37 +01:00
mysqldev@mysql.com
7d5c7f5ec6 sp.test, sp.result: 
transactional test removed
sp_trans.test, sp_trans.result:
  new file
 2005-03-17 22:15:23 +01:00
lenz@mysql.com
608f957947 Merge mysql.com:/space/my/mysql-5.0-build 
into mysql.com:/space/my/mysql-5.0
 2005-03-17 21:54:10 +01:00
jimw@mysql.com
fec41395fb Merge mysql.com:/home/jimw/my/mysql-5.0-8047 
into mysql.com:/home/jimw/my/mysql-5.0-build
 2005-03-17 12:29:30 -08:00
jimw@mysql.com
0fc802a316 Merge mysql.com:/home/jimw/my/mysql-5.0-8679 
into mysql.com:/home/jimw/my/mysql-5.0-build
 2005-03-17 11:14:35 -08:00
jimw@mysql.com
22e5d9cc0a Fix HP/UX debug compile error. (Bug #8679) 2005-03-17 10:27:23 -08:00
serg@serg.mylan
8170a4735b Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-03-17 19:23:45 +01:00
jimw@mysql.com
d5b7909448 Merge mysqldev@production.mysql.com:my/mysql-5.0-build 
into mysql.com:/home/jimw/my/mysql-5.0-build
 2005-03-17 10:00:45 -08:00
lenz@mysql.com
4ca5b3c73b - Added a missing pair of parenthesis. (already commited by Jani, ChangeSet@1.1819) 2005-03-17 18:49:48 +01:00
paul@frost.snake.net
b280af8f44 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.1
 2005-03-17 11:48:11 -06:00
Sinisa@sinisa.nasamreza.org
7713f28ec2 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into sinisa.nasamreza.org:/mnt/work/petica
 2005-03-17 19:44:52 +02:00
paul@frost.snake.net
cf5f436236 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0 
into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.0
 2005-03-17 11:43:56 -06:00
paul@frost.snake.net
7187121660 Merge frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.0 
into frost.snake.net:/Volumes/frost2/MySQL/bk/merge-4.1
 2005-03-17 11:42:51 -06:00
paul@frost.snake.net
256c04dcd8 Update URL. 2005-03-17 11:40:41 -06:00
serg@serg.mylan
6ab6dc2d1f Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-03-17 18:37:13 +01:00
Sinisa@sinisa.nasamreza.org
256e0a4017 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into sinisa.nasamreza.org:/mnt/work/petica
 2005-03-17 19:33:08 +02:00
paul@frost.snake.net
86f9b77756 Update URL. 2005-03-17 11:33:07 -06:00
Sinisa@sinisa.nasamreza.org
8bbb282b5d sp.test: 
Fix for a bug with test failing with Classic.
 2005-03-17 19:26:36 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
130d1c0877 Added a missing pair of parenthesis. 2005-03-17 19:24:27 +02:00
jimw@mysql.com
3828b47807 Merge mysql.com:/home/jimw/my/mysql-5.0-8866 
into mysql.com:/home/jimw/my/mysql-5.0-build
 2005-03-17 08:26:12 -08:00
heikki@hundin.mysql.fi
6c9334ed1d data0type.ic: 
Revert the change to the space padding of BLOB and TEXT in comparisons; we cannot change the sorting order, because that would make old tables to appear corrupt; better to change LIKE 'a%' processing in MySQL, so that the lower end of the search interval would be 'a', not 'a       '
 2005-03-17 18:17:38 +02:00
heikki@hundin.mysql.fi
6a6a33b6d4 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/heikki/mysql-5.0
 2005-03-17 18:17:37 +02:00
brian@zim.(none)
d713011627 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into zim.(none):/home/brian/mysql/mysql-5.0
 2005-03-17 08:17:36 -08:00
gbichot@quadxeon.mysql.com
7ee2ecbe5d Merge quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.0-4xeon 
into quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.1-4xeon
 2005-03-17 17:00:44 +01:00
serg@serg.mylan
5e4944126d Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-03-17 17:00:31 +01:00
serg@serg.mylan
f66967cf1b sql/ha_federated.cc: update to new prototype 
sql/item_cmpfunc.cc:     typo fixed
 2005-03-17 16:58:23 +01:00
heikki@hundin.mysql.fi
f4660bb1a1 endspace.result: 
Update endspace.result now that InnoDB pads BLOBs properly with spaces in comparisons
 2005-03-17 17:44:28 +02:00
heikki@hundin.mysql.fi
00325b9b7c data0type.ic: 
Fix that 'a' LIKE 'a%' was not true for an InnoDB BLOB or TEXT type column prefix index search: InnoDB assumed that the BLOB and TEXT should not be padded with space in comparisons; this bug is also in 4.1; it may have worked in 4.1 because MySQL may have asked there for strings >= 'a', while in 5.0 it asks for strings >= 'a        '
 2005-03-17 17:44:27 +02:00
heikki@hundin.mysql.fi
4eee23bca0 endspace.result: 
Someone has fixed the calculation of length() for a returned InnoDB VARCHAR value: update endspace.result to have the correct value length('teststring') == 10
 2005-03-17 17:44:26 +02:00
joerg@mysql.com
3ea0d8806d Manual merge. 2005-03-17 16:44:25 +01:00
gluh@gluh.mysql.r18.ru
edb4dd5366 after merge fix 2005-03-17 18:44:24 +03:00
gbichot@quadxeon.mysql.com
3cb85a4740 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.0-4xeon
 2005-03-17 15:51:52 +01:00
gluh@gluh.mysql.r18.ru
b435d6e862 Merge 4.1 -> 5.0 2005-03-17 16:51:07 +03:00