mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 14:02:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
21742 commits 2781 branches 343 tags 1.6 GiB
Commit graph

6354 commits

Author SHA1 Message Date
mskold@mysql.com
9f7ad11e34 Added more types 2005-04-01 22:14:30 +02:00
mskold@mysql.com
e95f19afca Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-04-01 20:58:25 +02:00
jimw@mysql.com
1ebcd90364 Fix the new ps_grant test to clean itself up properly. 2005-04-01 09:13:20 -08:00
mskold@mysql.com
cf7c0e43cb Fix for bug#9435: TIMESTAMP columns don't update 2005-04-01 17:59:46 +02:00
monty@mysql.com
9616c9a80d Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-04-01 15:06:35 +03:00
monty@mysql.com
201ee3eb78 Invalid DEFAULT values for CREATE TABLE now generates errors. (Bug #5902) 
CAST() now produces warnings when casting a wrong INTEGER or CHAR values. This also applies to implicite string to number casts. (Bug #5912)
ALTER TABLE now fails in STRICT mode if it generates warnings.
Inserting a zero date in a DATE, DATETIME or TIMESTAMP column during TRADITIONAL mode now produces an error. (Bug #5933)
 2005-04-01 15:04:50 +03:00
bell@sanja.is.com.ua
05c9defefa Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-multi-5.0
 2005-04-01 13:02:29 +03:00
pekka@mysql.com
5b9bd8c0c8 Merge 2005-04-01 10:13:37 +02:00
bell@sanja.is.com.ua
45a79c9056 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-union_merge-5.0
 2005-04-01 02:15:40 +03:00
bell@sanja.is.com.ua
1029e533df postmerge 4.1->5.0 fixes 2005-04-01 02:14:30 +03:00
svoj@mysql.com
47ed989639 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/svoj/devel/mysql/mysql-5.0
 2005-04-01 00:04:35 +05:00
svoj@mysql.com
8cffe4c382 BUG#9521 fix: 
openssl_1 and rpl_openssl results difference
 2005-04-01 00:03:26 +05:00
sergefp@mysql.com
70e677bd0f Make the tests deterministic: change DELETE ... LIMIT to DELETE ... ORDER BY ... LIMIT 2005-03-31 20:23:10 +04:00
serg@serg.mylan
8d1a7a9752 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-03-31 17:50:22 +02:00
serg@serg.mylan
e5a50e1927 decimal_div bug#9501 2005-03-31 17:46:36 +02:00
msvensson@neptunus.(none)
830b088fde Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-03-31 12:57:16 +02:00
pem@mysql.com
bb27307778 Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/bk/mysql-5.0
 2005-03-31 10:54:15 +02:00
msvensson@neptunus.(none)
c732cae6e0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-03-31 10:51:00 +02:00
msvensson@neptunus.(none)
f4e3bcc015 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-03-31 10:47:32 +02:00
gluh@eagle.intranet.mysql.r18.ru
1f38b5bdd1 Fix for bug #9344 INFORMATION_SCHEMA, wrong content, numeric columns 
The columns CHARACTER_MAXIMUM_LENGTH and CHARACTER_OCTET_LENGTH 
  of INFORMATION_SCHEMA.COLUMNS must be NULL for numeric columns
 2005-03-31 13:44:42 +05:00
bell@sanja.is.com.ua
05d4ed14e4 merge 4.1->5.0 2005-03-31 10:39:48 +03:00
jimw@mysql.com
aa4f352230 Remove result.es files and support for them, which requires splitting 
up a couple of tests and adjusting the output of others. Exposes two
bugs (9472 and 9508).
 2005-03-30 17:32:44 -08:00
monty@mysql.com
e9205dc0f0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-03-30 23:42:53 +03:00
monty@mysql.com
b43b7dc128 Enabled more tests of STR_TO_DATE() 
Fixed that datetime gives warning for zero dates in traditional mode
 2005-03-30 23:41:42 +03:00
bell@sanja.is.com.ua
dc87075f86 postmerge fixes 2005-03-30 23:08:03 +03:00
bell@sanja.is.com.ua
c64efa6062 merge 2005-03-30 22:11:08 +03:00
msvensson@neptunus.(none)
2e2ff0459f Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-03-30 17:54:10 +02:00
pem@mysql.comhem.se
8df8afc270 Fixed BUG#6600: Stored procedure crash after repeated calls with check table. 
Sedond attempt: Simply disallow CHECK in SPs, since it can't work.
 2005-03-30 17:43:52 +02:00
monty@mysql.com
fac67f091c Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-03-30 16:01:30 +03:00
monty@mysql.com
332b7ed4a1 Give warnings if wrong date/time/datetime argument for STR_TO_DATE 
Small fixes while doing review of new pushed code
More test cases for decimal
 2005-03-30 16:00:31 +03:00
msvensson@neptunus.(none)
b7ab584096 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-synced
 2005-03-30 14:33:55 +02:00
msvensson@neptunus.(none)
c93ae4f8a1 Merge 2005-03-30 14:32:53 +02:00
msvensson@neptunus.(none)
9471e922f1 Merge neptunus.(none):/home/msvensson/mysql/bug8807 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-synced
 2005-03-30 14:30:32 +02:00
ramil@mysql.com
e9dbf09dfc Merge 2005-03-30 17:07:40 +05:00
sergefp@mysql.com
86e3a378ea Fix for BUG#9213: GROUP BY returns wrong query results: 
Make test_if_skip_sort_order() rebuild tab->ref if it decides to use an index
different from the index join optimizer has choosen.
 2005-03-30 15:57:42 +04:00
msvensson@neptunus.(none)
382a8c0048 BUG#8807 Select crash server 
- Add function Item_param::fix_fields which will update any subselect they are part of and indicate that the subsleect is not const during prepare phase, and thus should not be executed during prepare.
 2005-03-30 12:14:37 +02:00
bar@mysql.com
63d2f81a07 Remove .opt file for faster test running. 2005-03-30 14:10:27 +05:00
bell@sanja.is.com.ua
dcdda90a11 Merge 2005-03-30 10:27:36 +03:00
bell@sanja.is.com.ua
4fdb0f48e7 postreview changes 
fixed bug in IN/ALL/ANY subqeries with HAVING clause (BUG#9350)
 2005-03-30 10:07:08 +03:00
jimw@mysql.com
690183d1a0 Eliminate most of the remaining hardcoded list of tests to skip 
by adding check for embedded server within tests and splitting some
tests into multiple test files.
 2005-03-29 17:17:46 -08:00
jimw@mysql.com
bfa7520356 Clean up InnoDB testing with embedded server. 2005-03-29 16:10:43 -08:00
jimw@mysql.com
46eda5b998 Shift skipping of some tests with embedded server from within 
mysql-test-run to the tests themselves.
 2005-03-29 15:50:16 -08:00
serg@serg.mylan
884abd39fc Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-03-30 00:27:35 +02:00
serg@serg.mylan
ab5c10c100 after merge fix 2005-03-30 00:24:58 +02:00
joerg@mysql.com
27a0de2443 Propagate the new '--with-big-tables' flag from 4.1 to 5.0. 
Incomplete, as the macro body must ne in the new file 'config/ac-macros/misc.m4'
which will follow in a separate changeset.
 2005-03-29 21:06:22 +02:00
kent@mysql.com
4bd90706e4 init_db.sql: 
Updates to be in sync with 'mysql_create_system_tables'
 2005-03-29 19:04:19 +02:00
kent@mysql.com
e2d973bda0 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
 2005-03-29 18:53:44 +02:00
kent@mysql.com
b88ed6c723 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
 2005-03-29 18:48:31 +02:00
mskold@mysql.com
fb65ac1551 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-03-29 17:56:34 +02:00
mskold@mysql.com
f8101348f5 New test result 2005-03-29 15:36:02 +02:00
mskold@mysql.com
c91034fea8 Backport of ChangeSet 1.1700.256.8: Export the variable MASTER_MY_PORT1 from the place where the second master is started 2005-03-29 15:15:28 +02:00
bar@mysql.com
e8b86b0410 type_bit.result: 
after merge fix
  ,
 2005-03-29 17:41:17 +05:00
bar@mysql.com
7131f313be after merge fix 2005-03-29 17:37:10 +05:00
bar@mysql.com
ba115894c5 Better error message. 
Bugs#9057: Incorrect errormsg for too-large char field in table definition
 2005-03-29 15:43:00 +05:00
kent@mysql.com
d917683515 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
 2005-03-29 08:06:43 +02:00
kent@mysql.com
0544c68e1c mysql-test-run.pl: 
Corrected typo
mtr_diff.pl:
  A simplified unified diff in Perl
  new file
 2005-03-29 07:29:38 +02:00
pekka@mysql.com
727015dbb3 Merge 2005-03-28 23:06:19 +02:00
jimw@mysql.com
9c86b35194 Fix reconnect when using prepared statements, and add 
--disable_reconnect and --enable_reconnect to mysqltest
so that it can be tested properly. (Bug #8866)
 2005-03-28 09:59:41 -08:00
bell@sanja.is.com.ua
1659dacab1 fixed mechanism of detection selection from table wich we update 
(BUG##9398, BUG#8703)
fixed wrong join view detection in multi-delete which lead to server crash
 2005-03-28 15:13:31 +03:00
serg@serg.mylan
55d3d94c3b Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-03-28 13:56:27 +02:00
bar@eagle.intranet.mysql.r18.ru
f0d41136df Merge eagle.intranet.mysql.r18.ru:/home/bar/mysql-4.1 
into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0
 2005-03-28 14:23:03 +05:00
bar@mysql.com
9852c6a082 union.test: 
Bug #6519 UNION with collation binary and latin1_swedish_ci fails now
  Prove that this problem was fixed with bug9425 fix too.
 2005-03-28 14:17:47 +05:00
bar@eagle.intranet.mysql.r18.ru
ef81035ff4 Merge eagle.intranet.mysql.r18.ru:/home/bar/mysql-4.1 
into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0
 2005-03-28 14:08:25 +05:00
bar@mysql.com
e60daecc87 Bug#9425 A user variable doesn't always have implicit coercibility 
Coercibility fixes for numeric types and not defined values were done.
 2005-03-28 14:01:57 +05:00
serg@serg.mylan
a2f7cceb82 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-03-28 10:20:41 +02:00
bar@eagle.intranet.mysql.r18.ru
d19fff495b Merge eagle.intranet.mysql.r18.ru:/home/bar/mysql-4.1 
into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0
 2005-03-28 12:34:00 +05:00
bar@mysql.com
06bcfe8886 func_system.test, ctype_utf8.test, func_system.result, ctype_utf8.result: 
Prove that the queries mentioned in
  Bugs#5980: NULL requires a characterset in a union
  works fine after recent changes related to itroducing
  more coercibility level: IRNORABLE and SYSCONST.
 2005-03-28 12:24:12 +05:00
serg@serg.mylan
a2ad96cf9e more wild_compare tests 2005-03-27 15:46:06 +02:00
dlenev@brandersnatch.localdomain
d4b20f4a86 Fix for bugs #5859 "DROP TABLE does not drop triggers" and 
#6559 "DROP DATABASE forgets to drop triggers".

If we drop table we should also drop all triggers associated with it.
To do this we have to check for existence of .TRG file when we are 
dropping table and delete it too.
 2005-03-27 16:15:21 +04:00
serg@serg.mylan
2dd1847bc2 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-03-26 19:49:24 +01:00
gbichot@quadita2.mysql.com
e207736b84 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
 2005-03-26 19:20:13 +01:00
brian@zim.(none)
8e50a98e71 Adding rules for building blackhole, also updating test case. 2005-03-25 13:43:42 -08:00
brian@zim.(none)
3d2554bcef Resolving merge. 2005-03-25 12:39:16 -08:00
brian@zim.(none)
0c21adf370 Fix upgrade/downgrade issue. 2005-03-25 12:36:04 -08:00
brian@zim.(none)
274c3826a8 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into zim.(none):/home/brian/mysql/mysql-4.1
 2005-03-25 12:34:07 -08:00
brian@zim.(none)
7b81a9fd4c Merging support for blackhole up to 5.0. 2005-03-25 10:36:58 -08:00
gbichot@quadita2.mysql.com
9a139ddcd3 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
 2005-03-25 14:55:41 +01:00
gbichot@quadita2.mysql.com
ead47f4701 WWe now store the catalog in Query_log_event in binlog WITHOUT its end zero. 
This saves one byte per Query_log_event on disk compared to 5.0.[0..3]. Compatibility problems with 5.0.x where x<4
are explained in the comments in log_event.cc. Putting back s/my_open(O_TRUNC)/(my_delete+my_create) change which had
been wiped away by somebody doing a wrong 4.1->5.0 merge (which happened just
before 5.0.3 :( ). Applying it to new events for LOAD DATA INFILE.
If slave fails in Execute_load_query_log_event::exec_event(),
don't delete the file (so that it's re-usable at next START SLAVE).
And (youpi!) fix for BUG#3247 "a partially completed LOAD DATA INFILE is not
executed at all on the slave" (storing an Execute_load_query_log_event
to binlog, with its error code, instead of Delete_file_log_event).
 2005-03-25 14:51:17 +01:00
bar@eagle.intranet.mysql.r18.ru
5493b4a03b Many files: 
Moving UCS2 test into ctype_ucs
  Bug#9232 Test failure: mysql_client_test and type_newdecimal
 2005-03-25 17:17:17 +04:00
bar@eagle.intranet.mysql.r18.ru
e76019bc42 Merge eagle.intranet.mysql.r18.ru:/home/bar/mysql-4.1 
into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0
 2005-03-25 16:23:16 +04:00
gluh@gluh.mysql.r18.ru
fe0b425e0a Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-5.0.8941
 2005-03-25 15:09:22 +03:00
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