serg@serg.mylan
49e9b153ff
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-03-16 16:35:52 +01:00
bell@sanja.is.com.ua
c9938b9dff
merge
2004-03-16 17:35:49 +02:00
serg@serg.mylan
ceec63f18a
EOVERFLOW moved to my_base.h - it is used not only in strtod.c
...
error message corrected
2004-03-16 16:35:47 +01:00
gluh@gluh.mysql.r18.ru
8ba33d7dd3
Fix for bug#2586 Disallow global/session/local as structured var. instance names
2004-03-16 14:01:05 +04:00
hf@deer.(none)
ec457a96ef
WL#1163 To make spatial code optional
...
myisam spatial code isolated
2004-03-12 18:51:03 +04:00
hf@deer.(none)
f2366bf02c
Spatial code changed to get rid of inconsistent this->* operation
...
Now we use virtual calls instead and redirect VMT pointer of the
geometry object with 'new' operation
2004-03-12 12:04:00 +04:00
monty@mysql.com
4ee44751d9
Fixed memory leak in DROP DATABASE when using RAID tables (Bug #2882 )
2004-03-10 13:46:11 +02:00
monty@mysql.com
8f093d0fb3
Portability fixes
2004-03-05 19:49:50 +02:00
konstantin@oak.local
8cc8b0ea5c
Desperate attempt to push part of prepared statements cleanup which was
...
reviewed in Saint-Petersbourg (including post-review fixes).
2004-03-02 22:39:50 +03:00
monty@mashka.mysql.fi
3b83cce5eb
merge with 4.0
2004-02-22 09:50:59 +02:00
monty@mashka.mysql.fi
e74182fe52
Cleanups
2004-02-22 08:54:06 +02:00
monty@mashka.mysql.fi
349358a95b
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mashka.mysql.fi:/home/my/mysql-4.0
2004-02-22 00:40:50 +02:00
monty@mashka.mysql.fi
fdc4a35c94
change that master_server_id is not a restricted word
2004-02-22 00:38:05 +02:00
Sinisa@sinisa.nasamreza.org
a1c35fa72c
making one symbol a keyword
2004-02-21 20:10:59 +02:00
monty@mashka.mysql.fi
494e43c1f5
merge with 4.0 to get security fixes and latest bug fixes
2004-02-20 17:43:02 +02:00
ram@gw.mysql.r18.ru
b55cf65bbd
fix for the bug #2786 incorrect precedence for XOR operator
2004-02-16 19:43:43 +04:00
monty@mysql.com
050af89dd8
Merge with public tree
2004-02-16 10:31:05 +02:00
monty@mysql.com
f43093ec0e
After merge fixes
...
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
2004-02-16 10:03:25 +02:00
serg@serg.mylan
abc9ef9770
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-02-15 18:35:06 +01:00
serg@serg.mylan
e9c46aaf80
REVOKE ALL PRIVILEGES, GRANT FROM user_list
...
is changed to a more consistent
REVOKE ALL PRIVILEGES, GRANT OPTION FROM user_list.
Bug #2642
2004-02-15 17:59:52 +01:00
bell@sanja.is.com.ua
7626ab603e
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-limit-4.1
2004-02-14 13:06:04 +02:00
serg@serg.mylan
01c2ca5b8a
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-02-13 15:30:00 +01:00
bell@sanja.is.com.ua
5ef05f4284
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-limit-4.1
2004-02-12 22:33:30 +02:00
serg@serg.mylan
67fbc4d2b7
make all "artificial" syntax errors to report a place where they take place ("...syntax error ... near ...")
2004-02-12 18:37:15 +01:00
bar@bar.intranet.mysql.r18.ru
4e77123079
Bug 2701: Function CHARSET() inconsistency
...
CONVERT3 was removed, it was for test purposes,
and rather harmful.
2004-02-11 16:53:39 +04:00
monty@mysql.com
ce14578909
Merge with 4.0.18
2004-02-11 00:06:46 +01:00
monty@mysql.com
06432eac36
Added --compact to mysqlbinlog
...
Fixed output from mysqlbinlog when using --skip-comments
Fixed warnings from valgrind
Fixed ref_length when used with HEAP tables
More efficent need_conversion()
Fixed error handling in UPDATE with not updateable tables
Fixed bug in null handling in CAST to signed/unsigned
2004-02-09 12:31:03 +01:00
bell@sanja.is.com.ua
b61b8bf2e1
correct assignment of default limit (BUG#2600)
2004-02-04 15:26:41 +02:00
bell@sanja.is.com.ua
7593d8a056
fixed parsing mode for derived tables (BUG#2421)
2004-02-02 14:58:36 +02:00
igor@rurik.mysql.com
8a3e00a05b
preload.result, key_cache.result, preload.test, key_cache.test, sql_yacc.yy:
...
Fixed bug #2602 in CACHE INDEX, LOAD INDEX
2004-02-02 00:19:51 -08:00
serg@serg.mylan
c4326bc68e
better fix BUG#2361: ALTER TABLE ... DROP PRIMARY KEY drops a non-primary key
2004-01-28 18:35:52 +01:00
guilhem@gbichot2.local
0f5933e38e
warning comment
2004-01-26 20:16:37 +01:00
guilhem@gbichot2.local
5ea3000d47
fix for BUG#2516: "SLAVE START may crash mysqld"
2004-01-26 19:39:00 +01:00
Sinisa@sinisa.nasamreza.org
887fd04ffa
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2004-01-24 15:57:48 +02:00
hf@deer.(none)
52f2529536
Conflicts resolved
2004-01-23 20:00:10 +04:00
hf@deer.(none)
215a65b1fd
SCRUM
...
wl #1163 (Make spatial code optional)
Patch I cleaned with Serg & Monty's suggestions
2004-01-23 16:02:57 +04:00
Sinisa@sinisa.nasamreza.org
6f1342a61d
Fix for a bug #2422 , where CONVERT(expr, cast) was masked by
...
CONVERT(expr, expr, expr);
2004-01-22 22:13:24 +02:00
bell@sanja.is.com.ua
03d7217f77
Merge
2004-01-20 19:23:28 +02:00
hf@deer.(none)
7dda8c102f
Merge deer.(none):/home/hf/work/mysql-4.1.clean
...
into deer.(none):/home/hf/work/mysql-4.1.1676
2004-01-19 21:06:27 +04:00
acurtis@pcgem.rdg.cyberkinetica.com
aa31e98c90
Fix deprecation warning - database_engine => storage_engine
2004-01-18 22:30:35 +00:00
hf@deer.(none)
6dcda5153b
SCRUM:
...
WL#1163 (Making spatial code optional)
Pack of changes to do in sql/ code.
2004-01-15 21:06:22 +04:00
serg@serg.mylan
90c6ecca93
BUG#2304 - HANDLER and tables in non-current db
2004-01-13 12:31:25 +01:00
bell@sanja.is.com.ua
501ae0bc52
allow UPDATE and DELETE stetements with tables derived from subquery if they are not updated (BUG#2117)
...
allow delete table by alias in multi-delete statement
2004-01-04 23:44:33 +02:00
hf@deer.(none)
bfe134b86f
Fix for prepared statements
...
Here i added Item_*::cleanup() functions,
removed a lot of ~Item_*'s,
added code to restore order_list and group_list
2003-12-30 14:08:19 +04:00
konstantin@oak.local
d37da004f6
THD::lex now points to THD::main_lex like in 5.0
...
All tests pass (client_test included)
2003-12-19 20:52:13 +03:00
monty@mysql.com
eeff10e4c1
merge
2003-12-19 16:34:48 +02:00
monty@mysql.com
031390a9a4
Fixes after merge with 4.0
...
Cleaned up embedded library access and query cache handling
Changed min stack size to 128K (to allow longer MyISAM keys)
Fixed wrong priority for XOR (should be less than NEG to get -1^1 to work)
2003-12-19 16:25:50 +02:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
2b53eef5f0
WorkLog #1323 (part 2)
...
New Statement: SHOW [STORAGE] ENGINES
New System Variable: storage_engine
New mysqld Argument: --default-storage-engine=
2003-12-17 22:52:03 +00:00
monty@mysql.com
e0cc6799ec
Merge with 4.0.17
2003-12-17 17:35:34 +02:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
7cd80807ec
Bug#2075 - fix reduce/reduce
2003-12-11 16:05:51 +00:00
monty@mysql.com
7e92336b1d
Fixed a possible memory leak on MacOSX when using the shared libmysql.so library (Bug #2061 )
...
mysql_server_init() now returns error code if something went wrong (Bug #2062 )
Don't use my_fopen() when reading symlink information as this may cause problems when a lot of files are opened.
Free thread keys with pthread_key_delete() instead of relying on automatic free. (Bug #2062 )
Fixed bug in UNION statement with alias '*'. (Bug #1249 )
Fixed a bug in DELETE ... ORDER BY ... LIMIT where the rows where not deleted in the proper order. (Bug #1024 ).
FOUND_ROWS() could return incorrect number of rows after a query with an impossible WHERE condition.
HOW DATABASES doesn't anymore show .sym files (on windows) that doesn't point to a valid directory. (Bug #1385 )
2003-12-11 06:24:08 +02:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
7f83c17637
Fix for Bug #2075 - negative default values not accepted for integer columns
...
Allow numeric literals have a sign
2003-12-11 00:28:25 +00:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
fcf96dbb18
WorkLog#1323
...
Deprecate the use of TYPE=... Preferred syntax is ENGINE=
2003-12-10 04:31:42 +00:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
55d4248dae
Merge for update
2003-12-02 20:57:34 +00:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
afc619f0a2
WorkLog#1280 - Remove fixed table handler from lex/yacc
2003-12-02 20:23:13 +00:00
hf@deer.(none)
02f382ecaa
Fix for #1189 (Mess with names about CONSTRAINT)
...
Second edition: error message was deleted as Segey suggested
Now name of the constraint will be used as the name of the key
if the last not specified
2003-12-02 19:06:24 +04:00
monty@mysql.com
ede8169d24
Added missing SSL library (Should be in source distribution)
...
Fixed compiler warnings (a lot of hidden variables detected by the Forte compiler)
Added a lot of 'version_xxx' strings to 'show variables'
Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris)
Fixed problem with printing sub selects to debug log
2003-11-28 12:18:13 +02:00
konstantin@oak.local
7c2d0eea45
fix for bug #1946 :
...
"You can always mysql_real_query a query with placeholders
after mysql_prepare()"
2003-11-25 17:41:12 +03:00
lenz@kallisto.local
75ba1891bd
- added a missing comma in sql_yacc.yy (maybe a merge error?)
2003-11-18 22:47:04 +01:00
bell@sanja.is.com.ua
3c1f98661f
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-used_tables-4.1
2003-11-18 22:04:33 +02:00
bell@sanja.is.com.ua
b404412877
changed name of bit on more descriptive (after rewie change)
2003-11-18 22:04:01 +02:00
bell@sanja.is.com.ua
d96b3aa939
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-delete-4.1
2003-11-18 17:48:45 +02:00
bell@sanja.is.com.ua
3ae908c44b
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-used_tables-4.1
2003-11-18 17:48:06 +02:00
monty@mashka.mysql.fi
cab1dc628c
CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS
...
New multi-key-cache handling. This was needed becasue the old one didn't work reliable with MERGE tables.
ALTER TABLE table_name ... CHARACTER SET ... now changes all char/varchar/text columns to the given character set
(One must use ALTER TABLE ... DEFAULT CHARACTER SET ... to change the default character set)
Fixed that have_compress is detected properly (fixes problems with func_compress.test on platforms without zlib)
New syntax for CACHE INDEX ('keys' is optional if no index name is given and one mentions the key cache name only ones)
Removed compiler warnings
Added mysql_set_server_option() to allow clients like PHP to easaily set/reset the multi-statement flag.
2003-11-18 13:47:27 +02:00
bell@sanja.is.com.ua
5327ec1d09
IGNORE option was added for DELETE statement (WL#1334)
2003-11-17 22:45:07 +02:00
bell@sanja.is.com.ua
cb19ad9ac1
fixed using 'uncachable' tag and RAND_TABLE_BIT setting
2003-11-17 20:53:40 +02:00
monty@narttu.mysql.fi
6b79cd5c23
Merge
2003-11-03 22:48:03 +02:00
monty@narttu.mysql.fi
a444a3449f
Simplified 'wrong xxx name' error messages by introducing 'general' ER_WRONG_NAME error
...
Cleaned up (and disabled part of) date/time/datetime format patch. One can't anymore change default read/write date/time/formats.
This is becasue the non standard datetime formats can't be compared as strings and MySQL does still a lot of datetime comparisons as strings
Changed flag argument to str_to_TIME() and get_date() from bool to uint
Removed THD from str_to_xxxx functions and Item class.
Fixed core dump when doing --print-defaults
Move some common string functions to strfunc.cc
Dates as strings are now of type my_charset_bin instead of default_charset()
Introduce IDENT_QUOTED to not have to create an extra copy of simple identifiers (all chars < 128)
Removed xxx_FORMAT_TYPE enums and replaced them with the old TIMESTAMP_xxx enums
Renamed some TIMESTAMP_xxx enums to more appropriate names
Use defines instead of integers for date/time/datetime string lengths
Added to build system and use the new my_strtoll10() function.
2003-11-03 14:01:59 +02:00
bell@sanja.is.com.ua
c56e75e2c1
after review fix
2003-11-03 12:28:36 +02:00
bell@sanja.is.com.ua
0747324ede
merge
2003-10-31 22:14:49 +02:00
serg@serg.mylan
74551a72ec
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-10-31 10:34:34 +01:00
igor@rurik.mysql.com
f29ed57531
Merge
2003-10-30 10:45:28 -08:00
bell@sanja.is.com.ua
ae380c5855
merge
2003-10-28 12:45:37 +02:00
serg@serg.mylan
8cdc27da15
Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1-bug
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-10-25 00:03:44 +02:00
bell@sanja.is.com.ua
faea7e0144
Merge
2003-10-23 21:26:06 +03:00
serg@serg.mylan
b820d2a347
query expansion for fulltext search
2003-10-23 15:21:06 +02:00
bell@sanja.is.com.ua
934fa2a104
Merge
2003-10-22 20:52:47 +03:00
serg@serg.mylan
df69309593
MATCH ... AGAINST ("..." WITH QUERY EXPANSION) syntax
2003-10-22 17:57:09 +02:00
serg@serg.mylan
f944fd4a65
merged
2003-10-21 11:58:43 +02:00
serg@serg.mylan
c60ef8160f
FULLTEXT: correct charset support (UTF included, UCS2 - not)
...
code cleanup
2003-10-20 15:53:48 +02:00
gluh@gluh.mysql.r18.ru
4bed4abb62
Merge commit
2003-10-20 13:45:28 +05:00
gluh@gluh.mysql.r18.ru
62b0b8b800
Scrum task 835 - text-to-datetime conversion function
2003-10-20 13:24:18 +05:00
bell@sanja.is.com.ua
a7bdd19707
subqueries made printable
...
new EXPLAIN parameter to show real query as it was interpreted
(SCRUM) (WL#1274)
2003-10-16 15:54:47 +03:00
gluh@gluh.mysql.r18.ru
9c2867c2d4
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.max
2003-10-15 14:51:56 +05:00
gluh@gluh.mysql.r18.ru
9e401712a0
WL#1106: Switch = --maxdb rather than --sapdb
2003-10-15 14:50:36 +05:00
harrison@bud.lordblink.com
672a7791c4
Add in bit_xor function (approved by Sergei)
2003-10-15 02:11:03 -04:00
heikki@hundin.mysql.fi
f90253a7f8
sql_yacc.yy:
...
Add DISCARD etc. in the keyword: rule of sql_yacc.yy
sql_table.cc:
Add comment that DISCARD/IMPORT TABLESPACE is always the only clause in an ALTER TABLE
2003-10-14 01:52:03 +03:00
heikki@hundin.mysql.fi
5ec87f2449
Many files:
...
ALTER TABLE ... DISCARD/IMPORT TABLESPACE
Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
2003-10-13 11:20:19 +03:00
bell@laptop.sanja.is.com.ua
ddf4d1e529
fixed printability of Items (all items except subselects)
...
(SCRUM) (WL#1274)
2003-10-12 17:56:05 +03:00
bell@laptop.sanja.is.com.ua
afac13d033
Some simple optimisation
...
= ANY and <> ALL converted to (NOT) IN to get advantage of IN optimisation
2003-10-08 17:40:54 +03:00
bell@laptop.sanja.is.com.ua
d5a7a6ec34
merge
2003-10-07 08:51:09 +03:00
bell@laptop.sanja.is.com.ua
e1b53fdd42
Merge
2003-10-06 20:55:06 +03:00
bell@laptop.sanja.is.com.ua
ba26a1aa64
fix error messages
...
fix derived inside subqueries
2003-10-06 13:16:56 +03:00
bell@laptop.sanja.is.com.ua
16733e423e
prohibited using derived tables in UPDATE command (BUG#1477)
...
fixed incorrect table name in test
2003-10-05 21:09:50 +03:00
bell@laptop.sanja.is.com.ua
9db4024b8d
thd pointer storing moved to fix_fields() (WL#1254) (SCRUM)
2003-10-02 22:19:41 +03:00
igor@rurik.mysql.com
17aecac32c
Manual merge after improving concurrency for key cache reassignment
2003-10-01 20:16:36 -07:00
monty@mishka.mysql.fi
c22c1d8a4d
merge
2003-09-24 10:24:56 +03:00
bar@bar.mysql.r18.ru
4cb99ed5bb
Bug fix:
...
http://bugs.mysql.com/bug.php?id=1129
From: Georg Richter
Description: there is a problem with special chars like umlauts in comments
2003-09-16 12:14:40 +05:00
bar@bar.mysql.r18.ru
07a9b89f85
Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
...
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-09-15 16:40:49 +05:00
bar@bar.mysql.r18.ru
1d20c09ce9
New SQL variables "collation_server" and "collation_database"
2003-09-15 16:31:04 +05:00
guilhem@gbichot2
dcab920a40
Accept SLAVE START and STOP, even if deprecated.
2003-09-15 12:43:31 +02:00
bar@bar.mysql.r18.ru
1726b4d89e
New syntax:
...
CREATE TABLE t1(a NVARCHAR(10))
This is for compatibility with MSSQL, DB2, Informix and some other DBMSs.
Note, standard SQL doesn't have "NVARCHAR" syntax.
There are only these syntaxes in SQL2003:
NATIONAL VARCHAR
NCHAR VARCHAR
NATIONAL CHARACTER VARYING
NCHAR VARYING
- Tests were added for all the above syntaxes.
2003-09-15 10:26:48 +05:00
monty@mashka.mysql.fi
c674ffd5f1
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mashka.mysql.fi:/home/my/mysql-4.1
2003-09-14 18:14:43 +03:00
dlenev@mysql.com
2c24b2e9b4
Manual merge after commiting START SLAVE UNTIL
2003-09-14 01:57:09 +04:00
dlenev@dlenev.mshome
c0cfae1c8d
Implemented support for START SLAVE UNTIL (WL#868)
2003-09-14 00:13:41 +04:00
monty@mashka.mysql.fi
f300e3a164
Remove 'extern' references from .cc files
2003-09-13 11:35:29 +03:00
Sinisa@sinisa.nasamreza.org
a424ccee17
Fix for a bug #1231
...
Parse error caused global ORDER BY to be initialized although it should
not have been.
2003-09-12 19:17:30 +03:00
Sinisa@sinisa.nasamreza.org
5e32805713
Fix for a bug #1226 .
...
Happens when braces are used on a single select, which leads
to the uninitialized global parameters structure.
2003-09-09 15:23:38 +03:00
serg@serg.mylan
7d2b0a0ce7
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-09-03 15:40:19 +02:00
kostja@oak.local
36dd82c1d5
merge commit, hope that none of bar and dlenev changes were
...
lost.
2003-09-03 14:12:10 +04:00
serg@serg.mylan
755455e15c
merged
2003-09-03 12:07:18 +02:00
serg@serg.mylan
2fcab1c2ee
CHECKSUM TABLE table1, table2, ... [ QUICK | EXTENDED ]
2003-09-03 11:34:32 +02:00
dlenev@mysql.com
73ab4be246
Manual merge fixes
2003-09-01 16:14:54 +04:00
dlenev@dlenev.mshome
2486222cd2
Implemented replication over SSL
...
Added proper options to CHANGE MASTER TO, new fields to SHOW SLAVE STATUS,
Honoring this parameters during connection to master.
Introduced new format of master.info file
2003-09-01 15:16:20 +04:00
monty@narttu.mysql.fi
27e331c30a
Revert change of lower-case-table handling as this breaks how alias works.
...
Changes like this should be done to 4.1, not to a stable release
2003-08-29 04:17:30 +03:00
monty@narttu.mysql.fi
60dd8a2c4f
hanged UDF interface to use clear() instead of reset()
2003-08-27 22:30:50 +03:00
igor@rurik.mysql.com
055daee79d
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2003-08-26 15:16:29 -07:00
igor@rurik.mysql.com
2090d57929
key_cache.result, sql_lex.h, sql_yacc.yy, set_var.cc, sql_lex.cc:
...
After merge fix
2003-08-26 15:14:13 -07:00
monty@narttu.mysql.fi
7b99412988
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into narttu.mysql.fi:/my/mysql-4.1
2003-08-26 17:53:42 +03:00
monty@narttu.mysql.fi
753cb8509c
Cleanups
...
BTREE, HASH and RTREE are not reserved symbols anymore
2003-08-26 17:52:54 +03:00
igor@rurik.mysql.com
3f6daf6ed2
Manual merge
2003-08-26 00:15:49 -07:00
bell@laptop.sanja.is.com.ua
8c0ba5ded3
Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any-4.1
2003-08-22 19:56:03 +03:00
Sinisa@sinisa.nasamreza.org
ced195f8a9
After merge fixes
2003-08-22 18:43:46 +03:00
serg@serg.mylan
08d7f298ee
fixed a crash on COMPRESS() and other zlib-dependent functions when compiled w/o zlib
...
moved them all from different places to item_strfunc.{h,cc}
checksum table command
Com_xxx status variables updated
2003-08-21 16:15:06 +02:00
bar@bar.mysql.r18.ru
8c55440ba4
CAST(expr AS CHAR(10)) is now working
2003-08-21 14:15:25 +05:00
bell@laptop.sanja.is.com.ua
c514948a30
merge
2003-08-20 22:17:57 +03:00
bell@laptop.sanja.is.com.ua
30913419ec
after merge changing
...
uninitialized value fixed
2003-08-20 17:35:12 +03:00
bell@laptop.sanja.is.com.ua
dd9cbce47b
merge
2003-08-19 20:14:35 +03:00
monty@mashka.mysql.fi
10c4acfb4f
merge
2003-08-19 00:10:21 +03:00
monty@mashka.mysql.fi
4f7512160b
After merge fixes
...
Use server character set if --default-character-set is not used
Added convert_string() for more efficient alloc+character-set convert of strings
2003-08-19 00:08:08 +03:00
serg@serg.mylan
7c5ba4f6fa
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-08-12 19:44:13 +02:00
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