mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
21375 commits 2784 branches 343 tags 1.6 GiB
Commit graph

6161 commits

Author SHA1 Message Date
konstantin@mysql.com
06cfe9a4a4 A test case for Bug#6282 "Packet error with SELECT INTO" 
(the bug itself is no longer repeatable).
 2005-03-23 21:36:15 +03:00
jimw@mysql.com
252bbe9eb9 Merge mysql.com:/home/jimw/my/mysql-5.0-5036 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-03-22 16:09:51 -08:00
kent@mysql.com
b87ebf30bb Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-build 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
 2005-03-22 15:31:56 +01:00
kent@mysql.com
466d3bff25 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-build 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-build
 2005-03-22 15:14:40 +01:00
kent@mysql.com
f3d284c8bc mysql-test-run.sh, mysql-test-run.pl: 
InnoDB needs longer start time for second slave on slow hosts
 2005-03-22 15:12:05 +01:00
jani@ua141d10.elisa.omakaista.fi
40c951314e Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
 2005-03-22 15:58:07 +02:00
jani@ua141d10.elisa.omakaista.fi
01dddf095a - Added new error message. 
- Changed error message in sql_acl.cc
- Added some more tests for GRANT.
 2005-03-22 15:57:24 +02:00
monty@mysql.com
cc56005130 Hack to ensure that CHAR's created in 5.0 are not converted to VARCHAR even if the row type is dynamic 
(For 4.1 tables old 'VARCHAR' fields are converted to true VARCHAR in the next ALTER TABLE)

This ensures that one can use MySQL 5.0 privilege tables with MySQL 4.1
 2005-03-22 15:48:06 +02:00
gbichot@production.mysql.com
fc7234cb4a disabling rpl_timezone.test if --ps-protocol, as binlogging of CONVERT_TZ(,,@@time_zone) 
fails there; until we find reason (me and possibly Konstantin).
 2005-03-22 11:38:51 +01:00
gbichot@production.mysql.com
56495a3691 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into production.mysql.com:/nfstmp1/guilhem/mysql-5.0-prod
 2005-03-22 00:28:33 +01:00
gbichot@production.mysql.com
c766efdc5d Last part of WL#1062: better replication of timezones: no more use 
of SET ONE_SHOT; storing tz info directly in event (if this info is needed),
it's now allowed to have different global tz on master and slave.
 2005-03-22 00:26:12 +01:00
monty@mysql.com
d8b078e423 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-03-21 23:46:11 +02:00
monty@mysql.com
a1ab786091 Cleanups during review of code 
Fixed newly introduced bug in rollup
 2005-03-21 23:41:28 +02:00
kent@mysql.com
82b219d1a1 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-build 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
 2005-03-21 17:08:00 +01:00
kent@mysql.com
7d9d95cee6 init_db.sql: 
Added 'proc' and 'procs_priv' tables, updated others
 2005-03-21 16:37:19 +01:00
kent@mysql.com
e25cc0f061 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-build 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-build
 2005-03-21 16:34:30 +01:00
kent@mysql.com
c3fa95d467 mtr_report.pl: 
Made --timer work
mtr_cases.pl:
  Added option --reorder to get less server restarts
mysql-test-run.pl:
  Added option --reorder to get less server restarts
  Moved do_before_start_master() not to remove binlog files unless restarted
  Made --timer work
  Slave was incorrectly writing log to error log
 2005-03-21 16:01:39 +01:00
dlenev@mysql.com
ea8adbff36 Manual merge of csets from -build tree into main 5.0 tree. 2005-03-21 11:39:47 +03:00
patg@krsna.
0ae33dfd36 Federated Storage Handler - test and result fix. 2005-03-20 23:17:35 -08:00
joerg@mysql.com
eeb42a8d38 Import Heikki's patch which was applied to the main tree only. 2005-03-20 14:38:51 +01:00
igor@rurik.mysql.com
df12e29955 func_group.test, func_group.result: 
Added a test case for bug #9210.
sql_select.cc:
  Fixed bug #9210.
  The function calc_group_buffer did not cover the case
  when the GROUP BY expression was decimal.
  Slightly optimized the other code.
 2005-03-19 23:12:50 -08:00
jimw@mysql.com
146994ed4c Fix 'kill' test to actually test that the connection has 
been killed.
 2005-03-18 16:17:10 -08:00
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
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
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
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