Commit graph

657 commits

Author SHA1 Message Date
bar@bar.mysql.r18.ru
1d20c09ce9 New SQL variables "collation_server" and "collation_database" 2003-09-15 16:31:04 +05: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
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
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
60dd8a2c4f hanged UDF interface to use clear() instead of reset() 2003-08-27 22:30:50 +03: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
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
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
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
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