mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
21514 commits 2791 branches 343 tags 1.7 GiB
Commit graph

10268 commits

Author SHA1 Message Date
gbichot@quadita2.mysql.com
bd74a139dc Merge gbichot@bk-internal.mysql.com://home/bk/mysql-4.1 
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-4.1-4ita
 2005-03-23 19:50:42 +01:00
gbichot@quadita2.mysql.com
19499229ed "After Monty's review" changes to the fix for BUG#8325 "Deadlock in replication thread stops replication": 
s/sleep/safe_sleep (thread safe); sleep 0/1/2/3/4/5/5/5 (get slave less late);
no message on error log (deadlock is too common sometimes), a global counter
instead (SHOW STATUS LIKE 'slave_retried_transactions').
Plus a fix for libmysql/Makefile.shared
 2005-03-23 19:19:36 +01:00
serg@serg.mylan
9a0dd5c7e4 sql/sql_acl.cc 
report correct errror in MODE_NO_AUTO_CREATE_USER
    cleanup
after merge fixes
 2005-03-23 19:18:25 +01:00
heikki@hundin.mysql.fi
7c40ac32ba ha_innodb.cc: 
Fix bug #9314 in InnoDB true VARCHAR: InnoDB stored the 'position' of a row wrong in a column prefix primary key index; this could cause MySQL to complain 'ERROR 1032: Can't find record in ...' in an update of the primary key, and also some ORDER BY or DISTINCT queries
 2005-03-23 18:00:22 +02:00
msvensson@neptunus.(none)
9f05cbfbd7 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-03-23 13:25:31 +01:00
serg@serg.mylan
d6bedfa8e0 merged 2005-03-23 09:42:24 +01:00
msvensson@neptunus.(none)
a430d5a1a5 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-03-23 09:41:01 +01:00
brian@zim.(none)
cfcedd85cd Additional storage engine called "blackhole". Customer request, and for that matter a Zawodny request. With this you can alter table to a type of table that would never store data. Its a /dev/null for a database. 2005-03-22 16:10:39 -08:00
mskold@mysql.com
68e5cf494e Merged 2005-03-22 22:31:51 +01:00
jimw@mysql.com
8372ba4c95 Merge mysql.com:/data0/mysqldev/my/mysql-5.0-build 
into mysql.com:/data0/mysqldev/jimw/mysql-5.0-build
 2005-03-22 21:57:03 +01:00
jimw@mysql.com
3ef3c59ed0 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.

(Fix imported from main 5.0 tree to 5.0.3 build tree.)
 2005-03-22 21:52:01 +01:00
serg@mysql.com
cc440db7db Merge mysql.com:/data0/mysqldev/my/mysql-5.0-build 
into mysql.com:/data0/mysqldev/serg/m50b
 2005-03-22 20:15:56 +01:00
serg@mysql.com
f7cbe9a2cc BUG#9339 - Updating a column does not work if the table has a UTF-8 VARCHAR primary key 
fixed my_charpos() call in Field_varstring::get_key_image
 2005-03-22 20:13:49 +01:00
jimw@mysql.com
df015d61d6 Merge mysql.com:/data0/mysqldev/my/mysql-5.0-build 
into mysql.com:/data0/mysqldev/jimw/mysql-5.0-build
 2005-03-22 20:02:53 +01:00
mskold@mysql.com
2adabcb328 Added better comment for perceived problem with fix for Bug #8753 Invalid schema object version after dropping index 2005-03-22 17:48:28 +01:00
mskold@mysql.com
27dbed4384 Extra fix for perceived problem with fix for Bug #8753 Invalid schema object version after dropping index 2005-03-22 17:42:08 +01:00
serg@serg.mylan
e029e3eb61 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-03-22 16:11:43 +01:00
mysqldev@mysql.com
ad26a667e6 sql_acl.cc, sql_acl.h, sql_parse.cc 
New privilege CREATE USER (CREATE_USER_ACL, Create_user_priv) added
grant2.test:
  new tests (mostly backported from jani's patch)
system_mysql_db.result, sp.result, grant2.result, grant.result:
  results updated
 2005-03-22 15:54:18 +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
msvensson@neptunus.(none)
e1e4a08695 Merge neptunus.(none):/home/msvensson/mysql/bug9072 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-03-22 14:29:34 +01: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
monty@mysql.com
f849ac68a5 Fixed newly introduced bug in ROLLUP 2005-03-22 02:36:31 +02: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
jimw@mysql.com
4c67678f15 Fix Windows compile warnings, declarations of walk functions 2005-03-22 00:00:24 +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
joerg@mysql.com
86574f4836 Merge mysql.com:/M50/build-5.0.3 into mysql.com:/M50/push-5.0 2005-03-21 16:46:11 +01:00
joerg@mysql.com
d9354fb8a6 Code cleanup: should use 'element_count' here, see include/my_tree.h 
(Change done by Ramil and sent via IRC)
 2005-03-21 16:31:15 +01:00
konstantin@mysql.com
d5af61b1a0 Rename decimal -> decimal_t, decimal_digit -> decimal_digit_t 2005-03-21 15:58:34 +03:00
serg@serg.mylan
f4d4df2ca4 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-03-21 13:43:25 +01:00
dlenev@mysql.com
752a787342 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-merges
 2005-03-21 13:28:48 +03:00
msvensson@neptunus.(none)
a5bb4810ff BUG#9072 'Max_error_count' system variable cannot be set to zero 
- Chaned min value in mysqld.cc
 - Added testcase to warnings.test
 2005-03-21 11:07:31 +01:00
konstantin@mysql.com
3e8045c662 Fix a valgrind warning in decimal.c:sanity() 2005-03-21 12:57:42 +03: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
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
konstantin@mysql.com
947065ddab Clean up the warning inside sanity():decimal.c in valgrind-max builds. 2005-03-19 18:39:26 +03:00
jimw@mysql.com
7de90716b0 Fix Windows compile errors. 2005-03-18 16:15:33 -08:00
jimw@mysql.com
ee2b4ec959 Eliminate warnings noticed by VC7. This includes fixing my_mmap() on 
Windows to call CreateFileMapping() with correct arguments, and
propogating the introduction of query_id_t to everywhere query ids are
passed around. (Bug #8826)
 2005-03-18 16:12:25 -08:00
serg@serg.mylan
da27256e12 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-03-18 20:12:31 +01: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
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
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
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
dcd336d79d Fix merge of sql/sql_select.cc using Igor's patch (Bug #9254) 2005-03-17 17:22:40 -08:00
konstantin@mysql.com
371850a459 Cleanup of Item_func_group_concat 2005-03-18 00:41:03 +03:00