database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-18 07:48:43 +03:00
Code Activity
22,715 Commits 3,279 Branches 1,097 Tags
2d515425a33eb97e37e0848f9fc87c481d69f5da
Commit Graph

6655 Commits

Author SHA1 Message Date
heikki@hundin.mysql.fi
ecc3a17457 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/heikki/mysql-5.0
 2005-03-18 19:33:41 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
4ef20658d7 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
 2005-03-18 19:04:09 +02:00
heikki@hundin.mysql.fi
3ee989b2be Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/heikki/mysql-5.0
 2005-03-18 18:56:23 +02: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
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.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
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
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
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
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
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
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
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
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
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
Sinisa@sinisa.nasamreza.org
8bbb282b5d sp.test: 
Fix for a bug with test failing with Classic.
 2005-03-17 19:26:36 +02: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
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
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
gluh@gluh.mysql.r18.ru
edb4dd5366 after merge fix 2005-03-17 18:44:24 +03:00
gluh@gluh.mysql.r18.ru
b435d6e862 Merge 4.1 -> 5.0 2005-03-17 16:51:07 +03:00
gluh@gluh.mysql.r18.ru
08b2c7ecca Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
 2005-03-17 13:25:19 +03:00
serg@serg.mylan
262f6b4f25 Automerge 2005-03-17 10:10:26 +01:00
gluh@gluh.mysql.r18.ru
84cb408445 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
 2005-03-17 11:02:11 +03:00
serg@serg.mylan
41997cf263 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-03-17 08:46:48 +01:00
ramil@mysql.com
261105a007 Merge 2005-03-17 10:59:25 +04:00
ramil@mysql.com
a773916238 A fix (bug #8942: SUBSTRING_INDEX in UPDATE causes internal loop). 2005-03-17 10:24:50 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
1fbb61754b Fixed two bugs in MySQL ACL. 
First one is related to Bug#7905. One should not be allowed to
create new user with password without UPDATE privilege to
MySQL database. Furthermore, executing the same GRANT statement
twice would actually crash the server and corrupt privilege database.

Other bug was that one could update a column, using the existing
value as basis to calculate the new value (e.g. UPDATE t1 SET a=a+1)
without SELECT privilege to the field (a in the above example)

Fixed tests grant.pl and grant2, which were wrong.
 2005-03-17 08:16:56 +02:00
igor@rurik.mysql.com
3103b4cae5 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2005-03-16 17:50:03 -08:00
igor@rurik.mysql.com
45ba13889d olap.result, olap.test: 
Added a test for bug #8615.
sql_select.cc:
  Fixed bug #8615.
  This fix only removed the cause of the reported crash.
  It does not resolve other problems of rollup queries
  with DISTINCT. They were fixed in the previous patch 
  for bug 8616.
 2005-03-16 15:55:04 -08:00
monty@mysql.com
ddec400e18 Merge with global tree 2005-03-17 01:27:04 +02:00
monty@mysql.com
aa6ab3b49c Move handler dependent tests to the specific handler (myisam, bdb, innodb) 
Enabled VARCHAR testing for innodb

NOTE: innodb.test currently fails becasue of a bug in InnoDB. 
I have informed Heikki about this and expect him to fix this ASAP
 2005-03-17 01:22:12 +02:00
serg@serg.mylan
1400af8841 drop database on the right server :) 2005-03-16 23:56:37 +01:00
serg@serg.mylan
f3cf0837d2 log_event.cc: 
#ifdef USING_TRANSACTIONS
ha_innodb.cc:
  comment
rpl_drop_temp.test, rpl_drop_temp.result:
  cleanup
 2005-03-16 23:47:38 +01:00
serg@serg.mylan
1354f104cf Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-03-16 22:40:58 +01:00
monty@mysql.com
f42941073d Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-03-16 22:59:06 +02:00
patg@krsna.
2f47e3e132 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into krsna.:/home/patg/test/mysql-5.0
 2005-03-16 12:56:40 -08:00
dlenev@brandersnatch.localdomain
d8d507926d Fixed binlog.test failure which occured after patch implementing 
WL#874 "Extended LOAD DATA" was pushed.
 2005-03-16 23:12:27 +03:00
patg@krsna.
dcf73493df Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into krsna.:/home/patg/test/mysql-5.0
 2005-03-16 12:05:58 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
4e0b462612 Merge pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8670.2 
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8670.3
 2005-03-16 16:27:07 +00:00
serg@serg.mylan
19279b1b03 merged 2005-03-16 17:13:43 +01:00
patg@krsna.
8e376b37d5 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into krsna.:/home/patg/test/mysql-5.0
 2005-03-16 07:55:56 -08:00
dlenev@brandersnatch.localdomain
357abac3a4 Small fix to innodb.test that Heikki probably simply forgot to commit. 2005-03-16 18:48:13 +03:00
bell@sanja.is.com.ua
80d9cafa8f 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-03-16 17:06:04 +02:00
gluh@gluh.mysql.r18.ru
a93db6c052 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
 2005-03-16 17:37:28 +03:00
dlenev@mysql.com
5f5203b357 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-eld-exp
 2005-03-16 17:14:08 +03:00
monty@mysql.com
594ef41b2d Cleanup during reviews 
Removed some optional arguments
Fixed portability problem in federated tests
 2005-03-16 16:11:01 +02:00