database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-02 02:53:04 +03:00
Code Activity
21,802 Commits 3,252 Branches 1,092 Tags
a8f80a8001ce632b82d2fdfdac41e2da4c6d25cd
Commit Graph

6373 Commits

Author SHA1 Message Date
bar@mysql.com
70abf0a046 Allow inserting of extra HKSCS and cp950 characters into a Big5 column. 2005-03-25 16:08:54 +04:00
gluh@gluh.mysql.r18.ru
a1e6b80b46 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-25 13:33:28 +03:00
gluh@gluh.mysql.r18.ru
d5e448870d Fix for bug #8941: garbage MAX_ROWS=# from SHOW CREATE TABLE INFORMATION_SCHEMA.* 
-skip the print of 'MAX_ROWS=#' for 'SHOW CRETAE TABLE' with information schema tables
 2005-03-25 12:19:11 +03:00
bar@eagle.intranet.mysql.r18.ru
9fbfa7a9af func_str.result: 
post-merge fix.
  ,
 2005-03-25 11:47:25 +04:00
bar@eagle.intranet.mysql.r18.ru
2a1ad57732 Merge 2005-03-25 10:43:35 +04:00
brian@zim.(none)
6e2caeb0ce Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into zim.(none):/home/brian/mysql/mysql-4.1
 2005-03-24 16:08:48 -08:00
brian@zim.(none)
e65b96693c Collection of changes per Bar and Serg. 2005-03-24 16:07:56 -08:00
msvensson@neptunus.(none)
eaa057e97a Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-03-24 20:17:08 +01:00
gbichot@quadita2.mysql.com
7b0e872695 testing repl of timezone with LOAD DATA INFILE (hourra!) 2005-03-24 16:43:50 +01:00
gbichot@quadita2.mysql.com
62fc95b985 rpl_deadlock.result: 
result update (default value changed from 4.1 to 5.0)
 2005-03-24 16:11:58 +01:00
gbichot@quadita2.mysql.com
32f1e3b029 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
 2005-03-24 15:44:50 +01:00
bar@mysql.com
56b931f818 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-4.1
 2005-03-24 18:11:35 +04:00
bar@mysql.com
29ffcad226 Fixed that LEFT OUTER JOIN was replaced with a regulat join 
in some cases, because "charset(x) = 'string'" was considered
as "x is not null" due to incorrect not_null_tables().
 2005-03-24 18:10:46 +04:00
gbichot@quadita2.mysql.com
5acca04c7c merge from 4.1 2005-03-24 14:32:40 +01:00
gluh@gluh.mysql.r18.ru
6ec480910d Bug #9317: Wrong count for tables in INFORMATION_SCHEMA 
there was no check of result of 
  table->file->write_row() function. When count of rows was
  more than table max_rows(HEAP table) the following recodrs
  were not inserted to the table
  -'schema_table_store_record' function is added. 
    The function checks result of write_row function
    and convert HEAP table to MyISAM if necessary
  - Result check after write_row is added into all 
    I_S function which store the records to I_S tables
 2005-03-24 16:32:11 +03:00
msvensson@neptunus.(none)
ccea1af2ae Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/bug9303
 2005-03-24 14:26:39 +01:00
msvensson@neptunus.(none)
bf2f6ff2d4 BUG#9303 blob field with specified length < 256 does not create tinyblob 2005-03-24 13:48:38 +01:00
msvensson@neptunus.(none)
c4a698ea3e Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-03-24 12:21:55 +01:00
serg@serg.mylan
639c58bff7 mysql-test/r/ps_6bdb.result 
followup - results fixed
 2005-03-24 10:28:02 +01:00
msvensson@neptunus.(none)
ef04608ecf Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-03-24 09:42:52 +01:00
msvensson@neptunus.(none)
50ac19ba37 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-03-23 22:01:19 +01:00
serg@serg.mylan
5c0b772838 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-03-23 21:37:56 +01:00
serg@serg.mylan
091f069671 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-03-23 21:10:01 +01:00
serg@serg.mylan
f21f8f983f client/mysqltest.c 
corrected number of fields for --enable_metadata
sql/sql_union.cc
    fixed a apparent typo in assert
 2005-03-23 20:38:42 +01:00
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
konstantin@mysql.com
39d4db50bd Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/media/sda1/mysql/mysql-5.0-6282
 2005-03-23 21:38:00 +03:00
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
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
paul@kite-hub.kitebird.com
4472235a68 Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-5.0
 2005-03-23 10:47:24 -06:00
paul@kite-hub.kitebird.com
555815734e README: 
Fix typo.
 2005-03-23 10:45:57 -06: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
serg@serg.mylan
8fad60734e Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-03-23 09:27:59 +01:00
bell@sanja.is.com.ua
4554b1f263 fixed union types merging and table related metadata (BUG#8824) 2005-03-23 08:36:48 +02: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
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
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
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
msvensson@neptunus.(none)
7603a84e24 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-03-22 16:16:10 +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
kent@mysql.com
2a53e9d9a6 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-build 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
 2005-03-22 15:57:20 +01:00
mysqldev@mysql.com
45b810c8a7 Merge 2005-03-22 15:55:24 +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
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