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
8358 commits 2784 branches 343 tags 1.6 GiB
Commit graph

1435 commits

Author SHA1 Message Date
ram@mysql.r18.ru
bf45493175 Bugfix for HEAP table rb-index scan. 2003-06-10 12:19:28 +05:00
gluh@gluh.mysql.r18.ru
b68eab61a6 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.revoke
 2003-06-06 17:44:33 +05:00
gluh@gluh.mysql.r18.ru
7d020eae17 REVOKE all privileges and delete user(244) 2003-06-06 17:43:23 +05:00
monty@narttu.mysql.fi
059b1e5612 After merge fixes 2003-06-05 23:19:56 +03:00
monty@narttu.mysql.fi
7a54334443 Merge with 4.0.13 2003-06-05 17:33:38 +03:00
jani@ua126d19.elisa.omakaista.fi
4b55fbe092 Fixed a bug in concat_ws(), which did not add concat separator 
in case of an empty string. Bug ID 586.
 2003-06-05 15:06:19 +03:00
monty@narttu.mysql.fi
dad0664579 merge with public tree 2003-06-05 00:12:45 +03:00
monty@narttu.mysql.fi
f5bb1e0907 After merge fix 2003-06-04 23:17:01 +03:00
monty@narttu.mysql.fi
40109c574a Merge with 4.0.13 2003-06-04 19:21:51 +03:00
monty@narttu.mysql.fi
23145cfed7 Added SQLSTATE to client/server protocol 
bmove_allign -> bmove_align
Added OLAP function ROLLUP
Split mysql_fix_privilege_tables to a script and a .sql data file
Added new (MEMROOT*) functions to avoid calling current_thd() when creating some common objects.
Added table_alias_charset, for easier --lower-case-table-name handling
Better SQL_MODE handling (Setting complex options also sets sub options)
New (faster) assembler string functions for x86
 2003-06-04 18:28:51 +03:00
guilhem@mysql.com
3b974039f7 -- Waiting for Monty's approval before push -- 
Bug 571: play LOAD DATA INFILE the same way on the slave as it was on the master: 
if it was with IGNORE, do it with IGNORE,
if it was with REPLACE, do it with REPLACE,
and (the change) if it was with nothing, do it with nothing (not with IGNORE !!).
Bug 573: print a proper error message in case of duplicate entry in LOAD DATA INFILE
on the slave, i.e. a message where the keyname and key value appear :
'Duplicate entry '1' for key 1' and not 'Duplicate entry '%-.64s' for key %d'
 2003-06-03 15:47:29 +02:00
bar@bar.mysql.r18.ru
f696135c30 Collation & coercibility tests for LTRIM, RTRIM and TRIM 2003-06-03 17:13:19 +05:00
bar@bar.mysql.r18.ru
7342852dd9 "Collation" has been moved to SHOW FULL FIELDS 
SHOW COLLATION columns have been removed:
  D -> Default
  C -> Compiled
  Y -> Yes
 2003-06-02 17:19:06 +05:00
monty@narttu.mysql.fi
f6a365a532 Small fixes (nothing nameworthy) 2003-06-01 23:40:01 +03:00
monty@narttu.mysql.fi
891d7ccd86 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into narttu.mysql.fi:/my/mysql-4.0
 2003-06-01 12:33:23 +03:00
monty@narttu.mysql.fi
02adbe6599 Fixed bug in ALTER TABLE DISABLE KEYS and INSERT DELAYED. Bug #478 2003-06-01 12:32:53 +03:00
bell@sanja.is.com.ua
2848e6c0d4 fixed bug 549 - incorect query cache memory formating on very small query cache sizes 2003-05-31 01:41:11 +03:00
bell@sanja.is.com.ua
56c77cc2d2 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-mem_root-4.1
 2003-05-30 21:09:36 +03:00
bar@bar.mysql.r18.ru
bb611fa0a2 mysqlshow and mysqldump now send their vharacter set to server 
character_set_results is now the same with character_set_client by default
 2003-05-30 23:09:35 +05:00
vva@eagle.mysql.r18.ru
b4014b903b new version of help 2003-05-29 17:47:31 -04:00
bell@sanja.is.com.ua
806ad88222 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-mem_root-4.1
 2003-05-28 16:54:56 +03:00
bell@sanja.is.com.ua
fe6175c40d added mem_root switching for subselect if it is necessary 
(bug #518 fixed)
 2003-05-28 16:52:56 +03:00
bar@bar.mysql.r18.ru
5fa6c4589e CAST(expr AS char) now supports character set with conversion: 
SELECT CAST(_latin1'string' AS CHAR CHARACTER SET latin2)
 2003-05-28 17:57:58 +05:00
bell@sanja.is.com.ua
38caf8655c Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2003-05-28 01:48:47 +03:00
bell@sanja.is.com.ua
a02d89de30 fixed priority checking bug in sub select handling 2003-05-28 00:49:24 +03:00
guilhem@mysql.com
9864ac66c6 A trick (a useless update) to force the slave to wait for TWO rotate events 
before stopping. This is to make the test's result predictable (depending
on the machine the results could formerly be slightly different, though
everything is sane in the code; it's not a bug).
 2003-05-27 23:07:32 +02:00
monty@narttu.mysql.fi
bdb66d24dd ORDER BY optimization 
Fixed new bug when reading field types
 2003-05-27 18:40:37 +03:00
monty@narttu.mysql.fi
da05a3e3f9 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into narttu.mysql.fi:/my/mysql-4.0
 2003-05-27 16:40:39 +03:00
monty@narttu.mysql.fi
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
guilhem@mysql.com
97f9aa2aaf temporary update of the test to satisfy merge; will commit a final update 
soon.
 2003-05-27 14:50:14 +02:00
bar@bar.mysql.r18.ru
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
monty@narttu.mysql.fi
4ead61f873 code cleanup 2003-05-26 15:08:17 +03:00
monty@narttu.mysql.fi
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
monty@narttu.mysql.fi
102c477760 Added testing of LOAD DATA ... STARTING BY 
Added read_only variable
 2003-05-26 11:47:03 +03:00
mysql@home.(none)
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
guilhem@mysql.com
8a1e18f4cb Fix for bug #490 and #491 (see details below) 2003-05-24 16:43:53 +02:00
bar@bar.mysql.r18.ru
2eccde258d Character set sets now check if required non-dynamic charsets were really compiled 2003-05-23 15:10:05 +05:00
bar@bar.mysql.r18.ru
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
bar@bar.mysql.r18.ru
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
bar@bar.mysql.r18.ru
a3db08d44c More tests for system functions 2003-05-23 10:55:49 +05:00
guilhem@mysql.com
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
monty@mashka.mysql.fi
944bc89561 Updated results & after merge fix 2003-05-22 11:58:39 +03:00
monty@mashka.mysql.fi
cb7061ebe4 merge 2003-05-22 02:57:27 +03:00
vva@eagle.mysql.r18.ru
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
vva@eagle.mysql.r18.ru
09348e271a fixed 'STARTING BY' in replication 2003-05-21 14:54:02 -04:00
monty@mashka.mysql.fi
6aa8929cf3 After merge fixes 
Added initialization of all important global variables
 2003-05-21 21:39:58 +03:00
bar@bar.mysql.r18.ru
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
venu@myvenu.com
0c25993d24 Fix merge conflict by changing warning codes to new one 2003-05-21 01:21:06 -07:00
venu@myvenu.com
97a2c472bc Resolve merge conflict 2003-05-21 00:14:56 -07:00
venu@myvenu.com
39cbb547d4 Resolve merge colflict 2003-05-21 00:12:09 -07:00