1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-11 15:22:09 +03:00
Commit Graph

3669 Commits

Author SHA1 Message Date
381492093e Fixed problem with mysql prompt when server disconnect. (Bug 356)
Fixed problem with localtime -> gmt where some times resulted in
different (but correct) timestamps. Now MySQL should use the smallest
possible timestamp value in this case.  (Bug 316)
2003-05-27 16:40:14 +03:00
97f9aa2aaf temporary update of the test to satisfy merge; will commit a final update
soon.
2003-05-27 14:50:14 +02:00
ac3fe4c81d Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-top-4.1
2003-05-26 22:00:03 +03:00
31d0d44919 --with-charset was not up to date
ctype_ucs2 and ctype_ujis were skipped in mistake
2003-05-26 20:22:23 +05:00
01217497b5 merging 2003-05-26 15:52:19 +03:00
4ead61f873 code cleanup 2003-05-26 15:08:17 +03:00
17dfc88105 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-05-26 13:36:43 +03:00
102c477760 Added testing of LOAD DATA ... STARTING BY
Added read_only variable
2003-05-26 11:47:03 +03:00
1a064a43a7 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-top-4.1
2003-05-26 09:28:56 +03:00
f537e3adc6 symlink.result:
Character set in this test results was displayed dispite the fact that the table has the same character set
2003-05-24 23:30:55 +05:00
8a1e18f4cb Fix for bug #490 and #491 (see details below) 2003-05-24 16:43:53 +02:00
2eccde258d Character set sets now check if required non-dynamic charsets were really compiled 2003-05-23 15:10:05 +05:00
a238efaa63 SHOW FIELDS changes, more SQL99 INFORMATION_SCHEMA.COLUMNS compatibility:
Character set is not displayed in "Type" column anymore
In "Collation" column NULL instead of BINARY is now displayd for for non-character data types
2003-05-23 13:10:25 +05:00
8514caa1da CREATE TABLE t1 SELECT left(_latin2'a',1) didn't work, the charset got lost
Collation and coercibility tests for string functions
2003-05-23 11:32:35 +05:00
a3db08d44c More tests for system functions 2003-05-23 10:55:49 +05:00
3ac3252a65 Cleaning DROP TABLE which is important if the tests are run in a certain order.
This is because rpl_relayrotate.test uses InnoDB.
Example of a failing sequence:
rpl_relayrotate.test repl_user_variables.test rpl_relayrotate.test
Explaination in the files.
Btw all other tests which use InnoDB (innodb*.test) already have this final
DROP TABLE.
Removed a wrong comment of mine.
2003-05-22 22:29:44 +02:00
944bc89561 Updated results & after merge fix 2003-05-22 11:58:39 +03:00
6360bea28d Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-top-4.1
2003-05-22 09:52:22 +03:00
cb7061ebe4 merge 2003-05-22 02:57:27 +03:00
32262a0fd5 fixed subqueries name resolution with INSERT/REPLACE (found during bug 446 investigation) 2003-05-21 23:35:51 +03:00
be9024e7ce repair_part2 is made repeatable 2003-05-21 21:58:12 +03:00
d124cd5bd7 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA/mysql-4.0
2003-05-21 14:58:11 -04:00
09348e271a fixed 'STARTING BY' in replication 2003-05-21 14:54:02 -04:00
6aa8929cf3 After merge fixes
Added initialization of all important global variables
2003-05-21 21:39:58 +03:00
8d52377a5c Some SHOW VARIABLES have been renamed:
collation_client  -> character_set_client
collation_results -> character_set_results
character_set     -> character_set_server

SET NAMES now doesn't start client->server conversion
SET CHARACTER SET now starts both client->server and server->client conversion
2003-05-21 17:44:12 +05:00
189d1373b8 Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-05-21 13:59:00 +05:00
0c25993d24 Fix merge conflict by changing warning codes to new one 2003-05-21 01:21:06 -07:00
76900a9f4b Two separate startup arguments for mysqld:
--default-character-set and --default-collation
2003-05-21 12:26:35 +05:00
97a2c472bc Resolve merge conflict 2003-05-21 00:14:56 -07:00
39cbb547d4 Resolve merge colflict 2003-05-21 00:12:09 -07:00
666d46b6ee Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA/mysql-4.1
2003-05-20 17:03:50 -04:00
ec247fd6af changed processing of LOAD DATA in mysqlbinlog 2003-05-20 17:03:18 -04:00
b0062813e5 Version substitution so that tests pass on any build, independently of the
version is '-log', '-debug' etc.
2003-05-20 10:16:26 +02:00
dd2b7918cd Merge with 4.0.13 2003-05-19 16:35:49 +03:00
9e8c3a6fac fixed bugs 442/443 (reduced subselect in ORDER/GROUP clauses) 2003-05-19 15:32:38 +03:00
d58b4bed4c new error message 2003-05-19 15:06:17 +03:00
3a30eda921 fixed memory overrun (bug 380) 2003-05-17 10:05:07 +03:00
50c9a79826 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
2003-05-15 18:36:29 +02:00
4a0e006230 Scrum task 845. Thi is a behaviour change :
now by default, FLUSH, OPTIMIZE, ANALYZE, REPAIR commands are written to the
binlog, unless the new NO_WRITE_TO_BINLOG keyword was used :
OPTIMIZE NO_WRITE_TO_BINLOG table t;

Previously these commands were never written to the binlog, but there are
2 reasons to change this :
- the RENAME TABLE in MERGE table bug (#175) on slave
- the possible "differently optimised queries may lead to different
updates on the master and slave" bug, until we have automatic ORDER BY.

FLUSH LOGS/SLAVE/MASTER/TABLES WITH READ LOCK are never written to the binlog.
New test for the new logging behaviour.
Other small change : reload_acl_and_cache() and reset_slave() don't send their errors themselves,
this is more usual.
2003-05-15 18:35:39 +02:00
2ad56b7a6d Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-top-4.1
2003-05-15 00:39:41 +03:00
c935709140 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
2003-05-15 00:31:32 +03:00
04004534ea Fixed new bug in ORDER BY 2003-05-15 00:31:12 +03:00
a46c0a7cac Portability fix for 64 bit machines 2003-05-14 23:06:06 +03:00
dcb7b452bd Fixed bug in CREATE ... DECIMAL(-1,1). Bug #432 2003-05-14 22:12:55 +03:00
e12cc8ef41 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-top-4.1
2003-05-14 22:01:56 +03:00
1915632163 subselect transformation moved in after-fix_field place
removed "of is null" if it is possible
  (this cset should be SCRUM related, but not approved as scrum task yet)
2003-05-14 21:51:33 +03:00
3e72b423e3 Fix for MacOSX and symlinks
Fix for USE_FRM and crashed index file
2003-05-14 01:27:26 +03:00
da0e28b7d6 Proper replication of CONNECTION_ID() and 4.1 PASSWORD() (bugs 177 and 344),
new test for this.
2003-05-13 22:50:28 +02:00
c4d3270460 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-05-13 22:35:41 +03:00
f0a2ca1a7b Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into hynda.(none):/home/my/bk/mysql-4.0
2003-05-13 22:34:04 +03:00