mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
10749 commits 2784 branches 343 tags 1.6 GiB
Commit graph

739 commits

Author SHA1 Message Date
bell@sanja.is.com.ua
011d905391 merge 2003-08-12 17:48:58 +03:00
bell@sanja.is.com.ua
0cbbca70b0 fixed layout 2003-08-12 17:40:11 +03:00
monty@mashka.mysql.fi
2263e3e51f Merge with 4.0.14 2003-08-11 22:44:43 +03:00
dlenev@dlenev.mshome
921ac8af8b Implemented UTC_TIME, UTC_DATE and UTC_TIMESTAMP functions (WL#345) 2003-08-11 23:43:01 +04:00
bell@sanja.is.com.ua
cbb3a78d8d merge 2003-08-11 12:00:33 +03:00
monty@mashka.mysql.fi
2fb441fdf7 Remove wrong bug fix when calling create_sort_index. 
Fix possible replication bug with LOAD DATA ... IGNORE LINES #
 2003-08-10 05:14:16 +03:00
serg@serg.mylan
835e00661d Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2003-08-09 23:48:57 +02:00
kostja@oak.local
c23975aace Merge oak.local:/home/kostja/mysql/mysql-4.1-root 
into oak.local:/home/kostja/mysql/mysql-4.1
 2003-08-07 13:29:25 +04:00
serg@serg.mylan
79922d946a table checksum background: 
my_checksum() mysys function
   NISAM checksum code moved from mysys to isam/ - it's obsolete
   MyISAM checksum code moved to mysys
   table's checksum accessible from sql layer
   SHOW TABLE STATUS shows checksum (WL#646)
code cleanup
 2003-08-05 21:14:15 +02:00
bell@sanja.is.com.ua
659650b4ea merge 2003-08-05 09:56:21 +03:00
bell@sanja.is.com.ua
8d0647c6ac merge 2003-08-01 18:24:27 +03:00
kostja@oak.local
50d3291aee manual merge 2003-07-31 17:11:52 +04:00
bell@sanja.is.com.ua
62eaaf22f3 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1
 2003-07-29 20:26:14 +03:00
bell@sanja.is.com.ua
6dea500fb2 prevented finding references in item_list for non-SELECT st_select_lex 
(fixed BUG#943)
 2003-07-29 16:59:46 +03:00
bar@bar.mysql.r18.ru
c2a7768b56 A new separate error message: Unknown collation 'blablabla' 2003-07-29 17:12:14 +05:00
bell@sanja.is.com.ua
ec74bb8d76 independent ALL/ANY subselect on top of WHERE clause (subselect without GROUP BY or aggregate functions) optimisation 
(SCRUM) (WL#1086)
 2003-07-24 15:26:21 +03:00
Sinisa@sinisa.nasamreza.org
e08a00bd02 Fuller implementation of lower case table names. 
Bug record #828
 2003-07-23 17:36:56 +03:00
serg@serg.mylan
2cac8f0768 now GRANT db.* ... compares patterns correctly to prevent privilege escalation 2003-07-22 22:21:23 +02:00
bell@sanja.is.com.ua
af41a59af7 merge 2003-07-22 11:18:51 +03:00
serg@serg.mylan
3ca302dbac bug #715: SELECT YEAR+0 FROM foobar is parsed as 'SELECT' 'YEAR' '+0' => syntax error 2003-07-20 12:26:18 +02:00
serg@serg.mylan
859a4cc116 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2003-07-18 18:06:45 +02:00
kostja@oak.local
7dab500b7a Merge oak.local:/home/kostja/mysql/mysql-4.1-root 
into oak.local:/home/kostja/mysql/mysql-4.1
 2003-07-17 14:55:13 +04:00
bell@sanja.is.com.ua
a6b1a6fe3a merge 2003-07-16 13:58:11 +03:00
bar@bar.mysql.r18.ru
a35fff5bc3 Item_func_null doesn't have a separate Item for the first argument anymore. 
args[0] is used instead. This allowed to resuse a lot of code.
 2003-07-16 11:29:16 +05:00
bar@bar.mysql.r18.ru
91d93f6f61 ELT passes the first argument in args[0] instead of having a separate Item. 2003-07-15 18:11:49 +05:00
serg@serg.mylan
737bade99c Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2003-07-15 14:58:04 +02:00
bar@bar.mysql.r18.ru
4b9c7f8336 Item_func_field doesn't have a separate Item to store the first argument. 
It's now passed as args[0]. This fix allowed to resuse a lot of code.
 2003-07-15 17:33:00 +05:00
serg@serg.mylan
a32f4609b2 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2003-07-14 10:54:22 +02:00
bell@sanja.is.com.ua
a7cd3c66b7 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1
 2003-07-13 13:04:59 +03:00
guilhem@gbichot2
3110561e5d Added SHOW MASTER LOGS as synonym for SHOW BINARY LOGS. 
Added PURGE BINARY LOGS as synonym for PURGE MASTER LOGS.
Removed PURGE LOGS (now PURGE MASTER LOGS).
Added SHOW BDB LOGS as synonym for SHOW LOGS.
Note: tests key_cache.test hanged, rpl_log_pos.test, rpl_rotate_logs.test failed for me.
For the second and third one I guess this will disappear after merging 4.0.
 2003-07-12 23:31:21 +02:00
kostja@oak.local
941a8623ca resolved conflict with pulled changeset 2003-07-09 18:24:43 +04:00
monty@mashka.mysql.fi
8b54bff34c Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mashka.mysql.fi:/home/my/mysql-4.1
 2003-07-08 23:48:04 +03:00
gluh@gluh.mysql.r18.ru
5709ed20ab SAPDB date/time finctions 2003-07-08 15:06:05 +05:00
kostja@oak.local
0f28677af6 Merge oak.local:/home/kostja/mysql/mysql-4.1-root 
into oak.local:/home/kostja/mysql/mysql-4.1
 2003-07-08 12:03:46 +04:00
gluh@gluh.mysql.r18.ru
e6eef74812 Merge gluh@gw:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.DTFUNC
 2003-07-08 12:57:00 +05:00
kostja@oak.local
a232225b69 Preliminary support for options --secure-auth, 
--old-passwords
Support for option --old-protocol was removed.
Some test performed.
Tests for SSL and replication are pending.
More strict following to specification for --old-passwords
is in the TODO.
 2003-07-08 02:36:14 +04:00
monty@mashka.mysql.fi
ebcc7b5a4f Support for variables with components 
Added framework to create/drop and manager buffers for multiple key caches
 2003-07-06 19:09:57 +03:00
serg@serg.mylan
e11efbddfa renamed enum Item_cast as it's not a 'class Item' child 2003-07-06 17:12:45 +02:00
kostja@oak.local
1d20b23247 Bug fixes for authentication 
OLD_PASSWORD made a keyword to allow set password=old_password('abc') constructions.
 2003-07-04 20:52:04 +04:00
bell@sanja.is.com.ua
73fdf52fa2 merged 2003-07-03 11:59:57 +03:00
monty@narttu.mysql.fi
f259f379e4 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into narttu.mysql.fi:/my/mysql-4.0
 2003-07-03 11:56:30 +03:00
monty@narttu.mysql.fi
c21728f8c8 Cleaner implementation if INSERT ... SELECT with same tables 
Tests cleanup (put drop database first in tests)
 2003-07-03 11:55:36 +03:00
bell@sanja.is.com.ua
28207ede02 (SCRUM) 
It looks like samll revolution in SELECT_LEX tree, but it was only natural way to solve problem with name resolution of external fields inside subselect which belongs to global order of union
also it have following advantages:
 - removed mess with current_select type conversion
   - type checking/converting
   - a lot of virtual methods
 - fake select for union execution allocated only once (it was allocated for every subselect with union executing)

changes:
fixed bug with outer fields name resolution of subqueries which belong to global ORDER BY clause
remuved select_lex() function, now thd->lex.current_select always have type SELECT_LEX
new SELECT_LEX (fake_select_lex) will be allocated in case of UNION for using in UNION processing
fake_select_lex allocated for union hold global ORDER BY & LIMIT clauses and have linkage equal to GLOBAL_OPTIONS_TYPE 
new description of SELECT_LEX tree

(SCRUM)
 2003-07-03 02:30:52 +03:00
pem@mysql.com
b3f153507e Added missing (char*) casts in bzero calls. 
(Needed for platforms with the traditional bzero prototype.)
Fixes BUG#460.
 2003-07-03 01:08:34 +02:00
Sinisa@sinisa.nasamreza.org
1df6492c7d Fix for a problem with : 
CREATE / INSERT ... (SELECT ...) UNION (SELECT ...) LIMIT;
 2003-07-02 14:57:40 +03:00
Sinisa@sinisa.nasamreza.org
fb39821e94 Some fixes for CREATE / INSERT FROM UNIO >.. 2003-07-02 01:24:05 +03:00
Sinisa@sinisa.nasamreza.org
b7644c9212 merge changes 2003-07-02 00:26:23 +03:00
kostja@oak.local
7df0475847 First version of new authentification procedure: now authentification is one-stage (instead of two-stage in 4.1) 
For now following tasks have been done:
- PASSWORD() function was rewritten. PASSWORD() now returns SHA1
  hash_stage2; for new passwords user.password contains '*'hash_stage2; sql_yacc.yy also fixed; 

- password.c: new functions were implemented, old rolled back to 4.0 state

- server code was rewritten to use new authorization algorithm (check_user(), change
  user, and other stuff in sql/sql_parse.cc)

- client code was rewritten to use new authorization algorithm
  (mysql_real_connect, myslq_authenticate in sql-common/client.c)

- now server barks on 45-byte-length 4.1.0 passwords and refuses 4.1.0-style
  authentification. Users with 4.1.0 passwords are blocked (sql/sql_acl.cc)

- mysqladmin.c was fixed to work correctly with new passwords

Tests for 4.0-4.1.1, 4.1.1-4.1.1 (with or without db/password) logons was performed;
mysqladmin also was tested. Additional check are nevertheless necessary.
 2003-07-01 23:40:59 +04:00
monty@mashka.mysql.fi
baf9baba2a merge 2003-07-01 15:57:45 +03:00
serg@serg.mylan
9c89341fd6 new syntax: 
CREATE TABLE ...(SELECT ...) UNION ...
  INSERT ...      (SELECT ...) UNION ...
 2003-06-30 22:24:03 +02:00
monty@mashka.mysql.fi
dbebed97e4 Remove FORCE_INIT_OF_VARS when compiling for valgrind/purify to spot wrong LINT_INIT() options 
Fixed bug in ALTER TABLE ... MODIFY integer-column
Added ref_or_null optimization (needed for subqueries)
 2003-06-30 13:23:54 +03:00
bell@sanja.is.com.ua
100a101ab6 Merge 2003-06-30 13:14:18 +03:00
bell@sanja.is.com.ua
00f952849d merging 2003-06-27 23:14:20 +03:00
bell@sanja.is.com.ua
7b77c5a2d3 merged 2003-06-25 23:52:15 +03:00
Sinisa@sinisa.nasamreza.org
66b60b57af Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
 2003-06-25 18:40:31 +03:00
gluh@gluh.mysql.r18.ru
91e3245b67 Merge gluh@gw:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.DTFUNC
 2003-06-23 13:02:28 +05:00
gluh@gluh.mysql.r18.ru
66af4b5c9a Internal commit 2003-06-23 12:56:44 +05:00
bell@sanja.is.com.ua
e17ad368af Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-alloc-4.1
 2003-06-20 13:40:21 +03:00
bell@sanja.is.com.ua
096ae170ae Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-item-4.1
 2003-06-19 15:25:41 +03:00
igor@rurik.mysql.com
98eeaa54f3 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2003-06-19 02:39:46 -07:00
igor@rurik.mysql.com
3ed12d5a74 preload.result, preload.test: 
Removed non-generic info (key used blocks)
preload.result, preload.test, lex.h, sql_yacc.yy:
  Syntax change for preload statement
 2003-06-19 02:34:33 -07:00
gluh@gluh.mysql.r18.ru
289d375f50 SCRUM 
Task ID 894:
Backport default_week_format variable to 4.0
 2003-06-19 14:02:19 +05:00
igor@rurik.mysql.com
5425591503 Merge 2003-06-18 07:31:23 -07:00
Sinisa@sinisa.nasamreza.org
833e3db2a7 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
 2003-06-17 16:24:31 +03:00
Sinisa@sinisa.nasamreza.org
5a414bda8e Two Sprint tasks and two behaviour changes. 2003-06-17 16:20:07 +03:00
serg@serg.mylan
0d02b972db Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2003-06-16 00:13:25 +02:00
serg@serg.mylan
7a08f3653b bad merge fixed 2003-06-16 00:13:23 +02:00
monty@narttu.mysql.fi
e090f2d0cc Fixes for make_win_src_distributions 
Removed compiler warnings
 2003-06-15 23:24:37 +03:00
heikki@hundin.mysql.fi
4da7f485b7 Many files: 
Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed
 2003-06-15 01:04:28 +03:00
igor@rurik.mysql.com
a0f3dcc3c8 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2003-06-12 06:22:35 -07:00
igor@rurik.mysql.com
f547f2769f Many files: 
New feature: preload indexes into key cache.
mi_preload.c:
  new file
Many files:
  Added preload statement.
 2003-06-12 04:29:02 -07: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
heikki@hundin.mysql.fi
255a40c2f0 sql_yacc.yy, sql_parse.cc, sql_lex.h, mysqld.cc, lex.h: 
Add syntax SAVEPOINT id and ROLLBACK TO SAVEPOINT id. This is compatible with DB2 and Oracle but not with SQL Server. Savepoints do not do anything yet, this is just parsing.
 2003-06-06 04:18:58 +03:00
monty@narttu.mysql.fi
7a54334443 Merge with 4.0.13 2003-06-05 17:33:38 +03:00
monty@narttu.mysql.fi
dad0664579 merge with public tree 2003-06-05 00:12:45 +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
4a80a6c7b9 One-line fix for bug 576 (DBUG_ASSERT failure when using CHANGE MASTER TO RELAY_LOG_POS=4). 
Plus a changeset which I had committed but forgot to push (and this changeset is lost on
another computer, so I recreate it here). This changeset is "user-friendly SHOW BINLOG EVENTS
and CHANGE MASTER TO when log positions < 4 are used.
 2003-06-03 23:13:06 +02:00
bar@bar.mysql.r18.ru
1ef8b2e34a LTRIM, RTRIM and TRIM now honors coercibility 
LTRIM, RTRIM and TRIM now work fine with ucs2
 2003-06-03 16:57:14 +05:00
bar@bar.mysql.r18.ru
759214fa41 MY_CS_NONTEXT flag for sprintf() incompatible charsets (ucs2 if the only one now) 
Some default_charset_info were removed
 2003-06-03 14:59:17 +05: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
bar@bar.mysql.r18.ru
81f0fb6e18 character_set_server is now updatable 
character_set_database was added
Code optimization: reuse more code for all character sets variables
 2003-05-30 13:03:56 +05:00
gluh@gluh.mysql.r18.ru
450f168bd4 Fix for bug #529 ("x509" no allowed as field name) 2003-05-29 14:52:25 +05: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
01217497b5 merging 2003-05-26 15:52:19 +03:00
bell@sanja.is.com.ua
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
bell@sanja.is.com.ua
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
monty@mashka.mysql.fi
cb7061ebe4 merge 2003-05-22 02:57:27 +03:00
bell@sanja.is.com.ua
32262a0fd5 fixed subqueries name resolution with INSERT/REPLACE (found during bug 446 investigation) 2003-05-21 23:35:51 +03: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
monty@narttu.mysql.fi
dd2b7918cd Merge with 4.0.13 2003-05-19 16:35:49 +03:00
bell@sanja.is.com.ua
3a30eda921 fixed memory overrun (bug 380) 2003-05-17 10:05:07 +03:00
guilhem@mysql.com
e9c2a37008 LOCAL is an alias of NO_WRITE_TO_BINLOG 2003-05-16 15:28:17 +02:00
guilhem@mysql.com
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
bell@sanja.is.com.ua
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
bell@sanja.is.com.ua
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
monty@mashka.mysql.fi
60dfb25be3 Give warning if MySQL doesn't honor given storage engine 
Allow syntax CREATE TABLE t1 (LIKE t2)
 2003-05-13 11:15:11 +03:00
monty@mashka.mysql.fi
4bde719df7 Safety fix to enable RAID in max binaries 
Better fix for format('nan')
Fix for HAVING COUNT(DISTINCT...)
 2003-05-13 10:54:07 +03:00
serg@serg.mylan
784fb81426 INSERT ... UPDATE ... VALUES() 2003-05-03 01:16:56 +02:00
monty@mashka.mysql.fi
dd377bfba6 Fixed problem when comparing a key for a multi-byte-character set. (bug 152) 
Use 0x.... as strings if 'new' mode. (bug 152)
Don't report -max on windows when InnoDB is enabled. (bug 332)
Reset current_linfo;  This could cause a hang when doing PURGE LOGS.
Fix for row numbers in EXPLAIN (bug 322)
 Fix that USE_FRM works for all table types (bug 97)
 2003-04-27 22:12:08 +03:00
monty@mashka.mysql.fi
bf6cfd2948 Fix for -fbranch-probabilites (bug 268) 
Fix for LEFT/RIGHT/MID with multi-byte-character sets (bug 314)
Fix for new bison 1.875
max_insert_delayed_threads and delayed_insert_timeout now works as documented (bug 211)
Don't show port in SHOW PROCESSLIST for system threads
Fix problem with ORDER BY being discarded for some DISTINCT queries (bug 275)
Fixed bug with NATURAL LEFT JOIN, NATURAL RIGHT JOIN and RIGHT JOIN when
using many joined tables (Bug 212)
 2003-04-26 20:43:28 +03:00
bar@bar.mysql.r18.ru
6d5f527afd Variable names have been renamed: 
client_collation -> collation_client
  result_collation -> collation_results
  connection_collation -> collation_connection
 2003-04-23 18:19:22 +05:00
bell@sanja.is.com.ua
c4637293fd Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-order-4.1
 2003-04-23 11:20:19 +03:00
bar@bar.mysql.r18.ru
a3d08eaaf9 I renamed system variable literal_collation into connection_collation 2003-04-22 12:27:35 +05:00
venu@myvenu.com
b2f0a87b81 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into myvenu.com:/home/venu/work/sql/dev-4.1
 2003-04-16 12:11:32 -07:00
monty@mashka.mysql.fi
6cf83136af Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mashka.mysql.fi:/home/my/mysql-4.1
 2003-04-16 09:26:24 +03:00
monty@mashka.mysql.fi
491589baf8 Add mysys specific error messages 
Make RELAY_THREAD and alias for IO_THREAD
Added new interface for string -> (unsigned) long long.
 2003-04-16 09:25:43 +03:00
wax@kishkin.ru
a17c567f86 replace default separator in group_concat, correct a bug 2003-04-16 00:22:43 +06:00
venu@myvenu.com
24d5cd37d2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into myvenu.com:/home/venu/work/sql/dev-4.1
 2003-04-12 20:07:52 -07:00
bar@bar.mysql.r18.ru
8cf9ada977 Use of CHARSWT_INFO *result_collation 
instead of bool convert_result_charset
SET CHARACTER SET inststead of SET NAMES in tests
 2003-04-08 14:38:17 +05:00
bar@bar.mysql.r18.ru
2cdc21d24a SET NAMES doesn't start recoding 
SET CHARACTER SET does
 2003-04-08 11:33:54 +05:00
bar@bar.mysql.r18.ru
e165845d39 sys_var_collation is now abstract class 
Two separate classes sys_var_client_collation and sys_var_literal_collation have been added
for "literal_collation" and "client_collation" variables.
 2003-04-07 16:10:27 +05:00
bell@sanja.is.com.ua
4cecc44ce7 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1
 2003-04-05 21:51:03 +03:00
mysql@home.(none)
bbf710b35e Some optimization in SET NAMES 2003-04-05 18:56:15 +05:00
bell@sanja.is.com.ua
fa46807825 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1
 2003-04-05 15:17:16 +03:00
mysql@home.(none)
e93e98c239 sql_yacc.yy: 
I wonder how it happend that I compiled this!
 2003-04-05 17:02:34 +05:00
mysql@home.(none)
bc1fe848cb sql_yacc.yy, set_var.h, set_var.cc: 
Optimization of SET NAMES
 2003-04-05 15:59:29 +05:00
bell@sanja.is.com.ua
65c356cfa8 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1
 2003-04-05 09:29:58 +03:00
bell@sanja.is.com.ua
7bd0d02bda fixed st_select_lex initialization 
fixed mustiupdate subselect compatibility

(bug 217)
 2003-04-05 09:29:28 +03:00
venu@myvenu.com
8eeecd9c86 Fix to support update + bianry logs with prepared statements (Dynamic query) 2003-04-04 12:33:17 -05:00
wax@kishkin.ru
74e32241c4 Auto merged 2003-04-02 18:15:16 +06:00
bar@bar.mysql.r18.ru
e805e8c8c7 sql_yacc.yy: 
Fix for possible failure reason on big-endian machines
  ,
 2003-03-28 18:18:26 +04:00
bell@sanja.is.com.ua
439ac36d52 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-show-4.0
 2003-03-28 15:36:42 +02:00
monty@mashka.mysql.fi
ef4db1377f Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mashka.mysql.fi:/home/my/mysql-4.1
 2003-03-27 14:17:51 +02:00
monty@mashka.mysql.fi
7d09120105 After merge fixes 2003-03-27 14:15:42 +02:00
bar@bar.mysql.r18.ru
0989db3e90 More OpenGIS compatibility: 
Point, MultiLine, Poligom, etc, are now not aliases
for Geometry, but separate field types.
 2003-03-27 13:09:09 +04:00
monty@mashka.mysql.fi
3bed7a6131 Merge with 4.0.13 2003-03-26 18:37:38 +02:00
bar@bar.mysql.r18.ru
3a453df6c2 Two separate commands: SHOW COLLATION and SHOW CHARACTER SET 2003-03-25 13:38:05 +04:00
bar@bar.mysql.r18.ru
8f86a0d3f6 sql_yacc.yy: 
Reduce/reduce conflict
  fix.
 2003-03-21 15:44:15 +04:00
bar@bar.mysql.r18.ru
c8954520ba COLLATE precedence bug has been fixed: 
"a LIKE b COLLATE c"  worked as "(a LIKE b) COLLATE c" which is not right
 2003-03-21 12:04:08 +04:00
bell@sanja.is.com.ua
2a410e95db Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.0 
into sanja.is.com.ua:/home/bell/mysql/work-qcfile-4.0
 2003-03-21 10:03:43 +02:00
bar@bar.mysql.r18.ru
682435db72 A separate variable national_charset_info 
Fixes according coercibility tables, p162, SQL Complete
 2003-03-21 11:21:01 +04:00
bar@bar.mysql.r18.ru
6814c8d36a SELECT N'string' 2003-03-20 22:01:03 +04:00
bar@bar.mysql.r18.ru
818ddf850b NATIONAL CHARACTER VARYING(n) 
NATIONAL CHAR VARYING(n)
NCHAR VARYING(n)

are now aliases for

VARCHAR(n) CHARACTER SET utf8
 2003-03-20 20:04:21 +04:00
bar@bar.mysql.r18.ru
f187ed9efb NCHAR(n) and NATIONAL CHARACTER(n) 
is now synonim for
CHARACTER(n) CHARACTER SET utf8
 2003-03-20 19:31:01 +04:00
bar@bar.mysql.r18.ru
77fb60e9fc New syntax for character strings: 
SELECT _latin1 0x345678;
SELECT _latin x'345678';
 2003-03-20 19:11:15 +04:00
monty@narttu.mysql.fi
9f200ede0d Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into narttu.mysql.fi:/my/mysql-4.1
 2003-03-20 02:06:08 +02:00
monty@narttu.mysql.fi
b883a9c01c Merge with 4.0.12 2003-03-19 22:25:44 +02:00
monty@narttu.mysql.fi
386411b5ba Allow optimzation of multi-table-update also for InnoDB tables 
MEMORY is alias for HEAP for CREATE TABLE ... TYPE=HEAP
Fixed bug in multi-table-update where a row could be updated several times
 2003-03-19 00:45:44 +02:00
bar@bar.mysql.r18.ru
8103c4c537 CONVERT class was removed 2003-03-18 17:01:32 +04:00
ram@mysql.r18.ru
031ac2a7b2 SRID support. 
GeomertyFromWKB() function.
SRID() function.
::store() methods for Field_geom.
Code cleanup.
 2003-03-18 15:30:32 +04:00
bar@bar.mysql.r18.ru
9ed0bb2156 sql_yacc.yy: 
SET NAMES BINARY now works
 2003-03-18 10:02:57 +04:00
wax@kishkin.ru
12f1cb55b5 This is full commit of group_concat with support subselects 2003-03-18 04:07:40 +05:00
bar@bar.mysql.r18.ru
04db86f22a 2003-03-17 21:56:34 +04:00
monty@narttu.mysql.fi
e7288f279e After merge fixes 
Don't create temporary objects with no table name
 2003-03-17 15:05:04 +02:00
mysql@home.(none)
c6efa7a8b7 New function my_charset_same() 2003-03-16 17:19:24 +04:00
bar@bar.mysql.r18.ru
b009386fa4 Every charset now have its own parser state arrays 2003-03-14 18:08:12 +04:00
gluh@gluh.mysql.r18.ru
3d61d2d973 Conflicts relsolving 2003-03-11 16:32:17 +04:00