Commit graph

7290 commits

Author SHA1 Message Date
monty@mashka.mysql.fi
ced6463686 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
2003-03-11 00:39:55 +02:00
monty@mashka.mysql.fi
2d09c5bf9c Portability fixes 2003-03-11 00:30:35 +02:00
Sinisa@sinisa.nasamreza.org
9c8838749f Fix for a bug with ROW(..) <=> ROW(...) 2003-03-10 20:54:18 +02:00
Sinisa@sinisa.nasamreza.org
d6923a6c10 Adding tests for the fixed ORDER BY 0 bug 2003-03-10 17:07:39 +02:00
Sinisa@sinisa.nasamreza.org
dafa51eced Fix for a crashing bug 2003-03-08 22:19:41 +02:00
Sinisa@sinisa.nasamreza.org
3ee8d6e37e Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2003-03-07 21:48:22 +02:00
Sinisa@sinisa.nasamreza.org
4d4ac0ede3 An interim code cleanup.
Major re-write of code yet has to be done, to circumvent
assigning of UNIT to current select and to deal better with 
offset, limit.
2003-03-07 21:47:04 +02:00
venu@myvenu.com
e372311e1a Merge work.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-03-07 10:18:16 -08:00
venu@myvenu.com
dff8f63272 Change -IN_RPM -> --rpm and -WINDOWS -> --windows from mysql_install_db 2003-03-07 10:16:23 -08:00
bar@bar.mysql.r18.ru
391b3ec636 item_func.cc, item_cmpfunc.cc, unireg.cc, table.cc, sql_base.cc:
some default_charset_info were removed
2003-03-07 13:39:53 +04:00
bar@bar.mysql.r18.ru
9994e625ff sql_load.cc:
LOAD DATA INFILE now uses database character set instead of server character set. This is not excellent but at least allows to load for example cyrillic data into cyrillic database if server charset is latin1. In the future we should add a syntax to specify file charset or evern charset of each field.
2003-03-07 12:55:55 +04:00
bar@bar.mysql.r18.ru
4b5bfe990f sql_acl.cc, item.h:
use of new argument
sql_analyse.h:
  macros from mysql_priv.h. Should be deleted soon.
mysql_priv.h:
  _default_charset_info has been removed
item_cmpfunc.h:
  Use cmp_charset
hostname.cc, hash_filo.h:
  Move charset to constructor argument
2003-03-07 12:21:32 +04:00
bar@bar.mysql.r18.ru
d09d2b85fe New syntax to change client collation:
SET COLLATION latin1
SET COLLATION 'latin1'
SET COLLATION DEFAULT
2003-03-07 11:54:26 +04:00
wax@kishkin.ru
b6a117fb2c Merge kishkin.ru:/home/wax/mysql-4n into kishkin.ru:/home/wax/mysql-4nh 2003-03-07 03:44:15 +05:00
Sinisa@sinisa.nasamreza.org
57ed8b11fd merge fixes 2003-03-06 17:31:22 +02:00
Sinisa@sinisa.nasamreza.org
ffa8a47b6d three bug fixes and major code cleanup 2003-03-06 17:02:10 +02:00
lenz@mysql.com
411ed6be0a Merge lgrimmer@work.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2003-03-06 13:56:02 +01:00
lenz@mysql.com
2508a9e845 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2003-03-06 13:52:21 +01:00
lenz@mysql.com
113e499b43 - Changed C++-style comments to C-style comments to make IBM compiler happy 2003-03-06 13:51:37 +01:00
ram@mysql.r18.ru
3286c2d5f2 Added IsClosed() tests for MultiLineString objects.
Added Centroid(), Area() tests for MultiPolygon objects.
2003-03-06 16:25:06 +04:00
ram@mysql.r18.ru
8243eeeefc Bug fix: should use float8get() instead of (double *) type cast.
Code clean-up according 'Coding Standards and Styles'
2003-03-06 15:44:52 +04:00
greg@mysql.com[greg]
daeb031925 novell41b.patch 2003-03-05 18:52:47 -05:00
monty@mashka.mysql.fi
9257a27c82 Fixed character set bug when replicating user variables 2003-03-05 16:10:40 +02:00
bar@bar.mysql.r18.ru
78dff8fc2e Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-03-05 16:43:43 +04:00
bar@bar.mysql.r18.ru
f5d6b4952f New fields in CHARSET_INFO structure to optimize searching for
binary and primary collations in the future
2003-03-05 16:43:10 +04:00
ram@mysql.r18.ru
008b9361bb Bug fix: we should set proper my_errno 2003-03-05 16:07:12 +04:00
bar@bar.mysql.r18.ru
4f930a7c2a SET NAMES has been extended to support optional collation:
SET NAMES <charset name> [COLLATE <collation name>]
2003-03-05 12:37:39 +04:00
lenz@mysql.com
a95c024067 - typo fix (replaced blanks with a tab) 2003-03-05 08:13:37 +01:00
venu@myvenu.com
582e8b929e Merge work.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-03-04 14:33:25 -08:00
venu@myvenu.com
27b336c46b sql_prepare.cc:
Remove the unused code (from previous commit)
2003-03-04 14:31:42 -08:00
venu@myvenu.com
1f88025066 Fix EXPLAIN bug with binary protocol
Added new client tests (EXPLAIN + DECIMAL conv)
2003-03-04 14:22:30 -08:00
lenz@mysql.com
26f9bee733 - added missing file mysql-test/std_data/des_key_file to source and binary
distribution to fix a test failure in test "func_encrypt"
2003-03-04 22:24:00 +01:00
greg@mysql.com
f11d1c66e9 Merge gweir@work.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/greg/bk/mysql-4.1
2003-03-04 12:30:51 -05:00
greg@mysql.com
4309cfc25c Many files:
Change mode to -rwxrwxr-x
2003-03-04 12:30:29 -05:00
bar@bar.mysql.r18.ru
3fbd67e84e Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-03-04 19:54:41 +04:00
bar@bar.mysql.r18.ru
78da2ad7bd SELECT BINARY expr
is now synonim for
SELECT expr COLLATE <expr_charset>_bin
2003-03-04 19:53:53 +04:00
greg@mysql.com[greg]
137bdcec5a novell41.patch 2003-03-04 10:34:32 -05:00
bar@bar.mysql.r18.ru
f95eb82934 stringcmp() and sortcmp() have been unified
into the only one sortcmp() with additional
CHARSET_INFO *cmp_charset argument.
2003-03-04 18:01:59 +04:00
monty@narttu.mysql.fi
143c85057e Fix for reading variables from binary log. 2003-03-04 15:17:29 +02:00
monty@narttu.mysql.fi
d0d071dca9 Fix for using unitialized mutex when running version compiled with --debug 2003-03-04 15:02:49 +02:00
bar@bar.mysql.r18.ru
6cbbbd6948 Fix for SHOW, it didn't display CHARACTER SET and COLLATE clause
for binary collations
2003-03-04 12:33:52 +04:00
bar@bar.mysql.r18.ru
c4dc670d61 Every character set now has binary collation 2003-03-04 11:04:19 +04:00
guilhem@mysql.com
dc634a18e9 Do not give an error when the user does START SLAVE on an already
running slave, just give a warning. Same thing for STOP SLAVE.
This will make scripts writing easier for users.
2003-03-03 23:12:17 +01:00
venu@myvenu.com
6a9273fa95 Merge work.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-03-03 09:51:54 -08:00
ram@mysql.r18.ru
b4c6a20835 Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1
2003-03-03 17:20:48 +04:00
bar@bar.mysql.r18.ru
4ffd74e5de Coercibility is now stored in user vars 2003-03-03 13:16:39 +04:00
bar@bar.mysql.r18.ru
48cdd97866 Strings which appear without charset context,
like number-to-string-convertion-result, now 
takes current database character set, instead of
thread character set. This makes it easy to be
SQL99 conformant and 4.0 compatible.

Item->thd_charset() is renamed to Item->default_charset()
as old name doesn't describe its nature anymore.
2003-03-03 10:53:08 +04:00
venu@myvenu.com
64f0e4289d Fix for the windows src distribution script - SCRUM:
-- To take care of .zip and .tar
  -- Initialization of 'data' directory without any host dependancy data
  -- Incorporate all changes from Monty
2003-03-02 14:05:51 -08:00
wax@kishkin.ru
15e69055a1 URGENT fixed bug in shared memory (handler_count) 2003-03-02 19:35:37 +05:00
bar@bar.mysql.r18.ru
b381cb0423 COLLATE tests 2003-03-02 16:19:26 +04:00