mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 21:12:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
21484 commits 2784 branches 343 tags 1.6 GiB
Commit graph

21484 commits

This branch
This branch
All branches
Author SHA1 Message Date
lenz@mysql.com
63b078c53f Merge mysql.com:/space/my/mysql-5.0-build 
into mysql.com:/space/my/mysql-5.0
 2005-03-18 17:32:57 +01:00
kent@mysql.com
b3ba278116 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
 2005-03-18 17:26:03 +01:00
lenz@mysql.com
cf2d609a57 - removed MyISAM RAID from the Linux "Max" RPMs 2005-03-18 17:24:03 +01:00
kent@mysql.com
2e278b158b Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
 2005-03-18 17:20:14 +01:00
joerg@mysql.com
517544590b Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/M41/mysql-4.1
 2005-03-18 17:14:17 +01:00
kent@mysql.com
ba510b0c2e Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-build 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
 2005-03-18 17:13:13 +01:00
pem@mysql.com
3bbbe5eff4 Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2005-03-18 17:07:42 +01:00
joerg@mysql.com
8061260204 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2005-03-18 17:07:41 +01:00
pem@mysql.comhem.se
8af9a0d782 Fixed BUG#6600: Stored procedure crash after repeated calls with check table 2005-03-18 16:52:41 +01:00
kent@mysql.com
348c285d0f mysql-test-run.sh: 
Disabled old feature to disable test cases
 2005-03-18 16:48:18 +01:00
joerg@mysql.com
cbba326273 Merge mysqldev@production.mysql.com:my/mysql-5.0-build 
into mysql.com:/M50/build-5.0.3
 2005-03-18 15:43:11 +01:00
serg@serg.mylan
54fc6fbfe8 set _XOPEN_SOURCE differently depending on __STDC_VERSION__ 
[sigh]
 2005-03-18 14:59:07 +01:00
pem@mysql.comhem.se
00c220eab5 Did some SP test style changes and added explanatory comments, 
and removed a have_innodb.inc inclusion which was left by mistake
in an earlier change.
 2005-03-18 14:33:46 +01:00
joerg@mysql.com
a485a10d46 Merge 2005-03-18 12:54:24 +01:00
joerg@mysql.com
e0d948922b Move mis-placed assignments to their proper position. 2005-03-18 12:44:40 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
5537d21466 Added more tests to grant2. Fixed some previous tests. 
Added new logic to ACL system:

1) If GRANT OPTION (not mysql db):
   Ok to update existing user, but not password.
   Not allowed to make a new user.

2) If UPDATE_ACL to mysql DB:
   Ok to update current user, but not make a new one.

3) If INSERT_ACL to mysql DB:
   Ok to add a new user, but not modify existing.

4) If GRANT OPTION to mysql DB:
   All modifications OK.
 2005-03-18 13:32:28 +02:00
heikki@hundin.mysql.fi
dfc0a5ce4f Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/heikki/mysql-5.0
 2005-03-18 08:20:51 +02:00
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