Commit graph

2236 commits

Author SHA1 Message Date
peter@mysql.com
04d140538a Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
2002-11-06 18:51:20 +03:00
bar@bar.mysql.r18.ru
2434be61f8 String->copy() now has a charset arg 2002-11-06 17:43:22 +04:00
bar@bar.mysql.r18.ru
86b633379c Some charset code clean-ups 2002-11-06 17:01:12 +04:00
bar@bar.mysql.r18.ru
5d45eae0c5 Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
2002-11-06 15:51:22 +04:00
bar@bar.mysql.r18.ru
9a9e7ce0f4 Item->thd_charset() - returns a default charset which should be used
to compose strings appeared without charset context, for example,
in convertion from numer into string type.
2002-11-06 15:49:53 +04:00
peter@mysql.com
21066bde1b Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
2002-11-06 12:51:07 +03:00
vva@genie.(none)
9c1b89db57 Merge genie.(none):/home/vva/work/mysql.orig/compileable/4.1
into genie.(none):/home/vva/work/lex_hash/4.1
2002-11-06 13:45:01 +04:00
vva@genie.(none)
491debcc21 Merge genie.(none):/home/vva/work/mysql.orig/compileable/4.1
into genie.(none):/home/vva/work/lex_hash/4.1
2002-11-06 13:05:42 +04:00
vva@genie.(none)
01da261574 new version of sql/gen_lex_hash.cc 2002-11-06 13:03:38 +04:00
bar@bar.mysql.r18.ru
8229d282f7 Extensions to support this:
SHOW CREATE DATABASE [IF NOT EXISTS] dbname

Version dependant parts are displayed in appropriative comments:
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `ucs` /*!40100 DEFAULT CHARACTER SET ucs2*/
2002-11-06 12:01:38 +04:00
peter@mysql.com
8bcace7043 Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
2002-11-05 21:31:03 +03:00
peter@mysql.com
ecedc7ac35 More work on secure authentication. Commit for merge 2002-11-05 20:21:55 +03:00
bell@sanja.is.com.ua
a90b923bef Fixed accidentally inverted assert condition 2002-11-05 11:24:44 +02:00
bell@sanja.is.com.ua
e0f14c2716 move similar code to inline function 2002-11-05 01:10:05 +02:00
bell@sanja.is.com.ua
45f098bf60 moved similar code to function
onversion with check
2002-11-04 22:12:45 +02:00
bell@sanja.is.com.ua
bb49de5ff5 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-pointer-4.1
2002-11-04 15:45:54 +02:00
bell@sanja.is.com.ua
c94b39134f Fixed error handling bug 2002-11-04 00:56:25 +02:00
peter@mysql.com
26a1d8885d Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
2002-10-31 13:02:29 +03:00
nick@mysql.com
3e133ebabb Merge mysql.com:/home/nick/mysql/repository/mysql-4.1
into mysql.com:/home/nick/mysql/mysql-4.1
2002-10-30 23:58:52 -07:00
nick@mysql.com
168a489d34 fix commit thinko 2002-10-30 23:48:04 -07:00
Sinisa@sinisa.nasamreza.org
9b012db53e small fix when building in --without-debug 2002-10-30 19:30:57 +02:00
peter@mysql.com
cc18dc7291 Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
2002-10-30 18:03:09 +03:00
Sinisa@sinisa.nasamreza.org
26c6d970d9 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-10-30 16:59:49 +02:00
Sinisa@sinisa.nasamreza.org
5fbd7b63c5 changes for mysqladmin debug
and a bug fix for derived tables
2002-10-30 16:52:12 +02:00
vva@genie.(none)
4d22168d68 Merge vvagin@work.mysql.com:/home/bk/mysql-4.1
into genie.(none):/home/vva/work/mysql-4.1.help/mysql-4.1.help_res
2002-10-30 17:40:26 +04:00
vva@genie.(none)
30a59d34ab addition correction for 'help' command 2002-10-30 17:38:07 +04:00
bar@bar.mysql.r18.ru
c1017541dc Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
2002-10-30 17:30:09 +04:00
bar@bar.mysql.r18.ru
bca773e6df Use item->charset() instead of item->str_value.charset() 2002-10-30 17:28:40 +04:00
bar@bar.mysql.r18.ru
03e7fc3180 date and time fields now have charset arg in constructor
my_charset_latin1
2002-10-30 17:09:37 +04:00
ram@mysql.r18.ru
8bb19facd5 Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/mysql-4.1
2002-10-30 16:44:23 +04:00
bar@bar.mysql.r18.ru
b43876b9dd All String->set() now have charset argument 2002-10-30 16:19:43 +04:00
ram@mysql.r18.ru
a7254d1505 Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/mysql-4.1
2002-10-30 16:02:02 +04:00
ram@mysql.r18.ru
5e09392faa BDB 4.1.24 2002-10-30 15:57:05 +04:00
peter@mysql.com
76a166072c Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
2002-10-30 14:47:05 +03:00
bell@sanja.is.com.ua
1f20cf3b42 removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion (SCRUM)
fixed some possible bugs
2002-10-30 13:18:52 +02:00
bar@bar.mysql.r18.ru
637b97991d Use item->set_charset() instead of item->str_value.set_charset() 2002-10-30 15:15:18 +04:00
bar@bar.mysql.r18.ru
fef10d9bb1 Preparation to thread specific default charset 2002-10-30 13:05:27 +04:00
nick@mysql.com
6d88799e95 Reordered functions--grouped by class now.
Added comment blocks.
2002-10-29 23:50:07 -07:00
nick@mysql.com
c20b489167 Merge mysql.com:/home/nick/mysql/repository/mysql-4.1
into mysql.com:/home/nick/mysql/mysql-4.1
2002-10-29 15:51:41 -07:00
nick@mysql.com
6ea83e1127 Added comment blocks for all functions 2002-10-29 15:12:47 -07:00
nick@mysql.com
4b7897fc76 Changed binlog name padding from binlog.001 to binlog.000001 2002-10-29 15:11:13 -07:00
peter@mysql.com
03f97c1980 Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
2002-10-29 23:47:29 +03:00
vva@genie.(none)
1c0f1712ca correct English message 2002-10-29 13:42:31 +04:00
peter@mysql.com
20cbe47a5f Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
2002-10-29 12:33:27 +03:00
vva@genie.(none)
2196aae6b4 correct English in last message
delete ugly comma
2002-10-29 12:52:34 +04:00
peter@mysql.com
bdca1d10a0 Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
2002-10-29 10:36:43 +03:00
vva@genie.(none)
9adf688be6 add help command on server side 2002-10-28 17:44:19 +04:00
peter@mysql.com
a3a0167936 Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
2002-10-28 10:48:51 +03:00
bell@sanja.is.com.ua
7777d2b819 fixed union rexecution bug 2002-10-27 21:29:40 +02:00
vva@genie.(none)
8ec9edac55 add absent message that exist in english version 2002-10-27 20:49:45 +04:00