Commit graph

7666 commits

Author SHA1 Message Date
hf@genie.(none)
23a5413bbf Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into genie.(none):/home/hf/work/mysql-4.1.lck
2003-03-21 11:54:13 +04: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
hf@genie.(none)
43d3472642 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into genie.(none):/home/hf/work/mysql-4.1.lck
2003-03-21 11:06:15 +04:00
monty@narttu.mysql.fi
e5a949b441 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
2003-03-20 21:35:17 +02:00
monty@narttu.mysql.fi
f8cd1e7906 After merge fixes
Fixed bug in Item::set_name()
Fix for memory leak with geometry type
2003-03-20 21:35:03 +02:00
bar@bar.mysql.r18.ru
93cfdcdf92 item_cmpfunc.cc:
cmp_charset was not initialized
  valgrind fix
  LIKE now works according to coercibility rules
2003-03-20 22:43:40 +04:00
bar@bar.mysql.r18.ru
6814c8d36a SELECT N'string' 2003-03-20 22:01:03 +04:00
ram@mysql.r18.ru
982c49dc19 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.sp
2003-03-20 20:57:07 +04:00
ram@mysql.r18.ru
396438a83b R-tree bug fixes. 2003-03-20 20:55:53 +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
serg@serg.mysql.com
ce016df883 another bad merge fixed 2003-03-20 12:09:20 +01:00
pem@mysql.com
0d95f36a12 Post post merge fix. Made the broken ip test work again. 2003-03-20 11:57:05 +01:00
serg@serg.mysql.com
67fff29100 fixed bad merge (s/rnd/my_rnd/) 2003-03-20 11:48:02 +01:00
pem@mysql.com
30517cef9f Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/pem/work/mysql-4.1
2003-03-20 10:13:23 +01: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
584729430a Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-03-19 21:56:14 +02:00
monty@narttu.mysql.fi
68ca84dbd1 Print right hostname or IP in SHOW PROCESSLIST
Use SESSION TABLE_HANDLER as default table handler if given table handler doesn't exists
2003-03-19 21:43:41 +02:00
monty@narttu.mysql.fi
48a9c1239c Added support for ULONG division with DIV
Fixed non fatal memory leak in slave code.
2003-03-19 21:23:13 +02:00
bar@bar.mysql.r18.ru
5e57d512eb configure.in:
Always compile utf8
2003-03-19 19:33:26 +04:00
bar@bar.mysql.r18.ru
22cb247c74 Strings comparison is now done according to "Collating sequences used for
comparison" table, "SQL Complete, Really", page 162
2003-03-19 19:13:28 +04:00
bar@bar.mysql.r18.ru
3c455e314b Produce an error when arguments are not compatible for CONCAT() 2003-03-19 17:24:46 +04:00
pem@mysql.com
e7814e398e Fixed a few typos, and translated new messages. 2003-03-19 14:13:37 +01:00
lenz@mysql.com
ad32b455bc Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-build
2003-03-19 13:40:24 +01:00
bar@bar.mysql.r18.ru
f63218b39a Getting closer to be more SQL99 in dyadic operations 2003-03-19 15:55:17 +04:00
pem@mysql.com
6822eb5ec0 Post-merge fixes. 2003-03-19 11:36:32 +01:00
monty@narttu.mysql.fi
056e88fe24 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-03-19 00:47:38 +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
lenz@mysql.com
04071da35a - renamed "rnd" to "my_rnd" as the name was too generic (and is an exported
symbol in libmysqlclient) (thanks to Dennis Haney for the initial patch)
 - cleanup: removed client/password.c (not used at all) and
   libmysql/password.c (should rather be a symlink to sql/password.c instead)
 - applied HPUX11 portability fix for char_val declaration to sql/password.c
   (taken from libmysql/password.c)
2003-03-18 22:14:02 +01:00
pem@mysql.com
4a171efd6f Merged 4.1 -> 5.0. 2003-03-18 16:12:50 +01:00
bar@bar.mysql.r18.ru
0f40f15067 Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-03-18 17:02:25 +04:00
ram@mysql.r18.ru
0ccb7c3789 Should use GeometryFromWKB(). 2003-03-18 17:01:38 +04: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
ram@mysql.r18.ru
34681a8036 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.sp
2003-03-18 14:22:25 +04:00
bar@bar.mysql.r18.ru
0137c812dc SHOW CREATE TABLE didn't display field names in the proper charset 2003-03-18 13:42:45 +04:00
monty@narttu.mysql.fi
a916a03916 Fixes to avoid errors from valgrind
Fixed problem with 'wrong packet number' in union
2003-03-18 11:17:48 +02:00
lenz@mysql.com
f39eb5787f - updated version number (4.0.12 -> 4.0.13)
- tagged ChangeSet 1.1671 as mysql-4.0.12
2003-03-18 10:00:29 +01:00
bar@bar.mysql.r18.ru
7549a76c7c Replication were broken because of automatic charset conversion.
As a fix, my_charset_bin is now used in master-slave packets instead
of system_charset_info.
2003-03-18 11:34:19 +04:00
bar@bar.mysql.r18.ru
9ed0bb2156 sql_yacc.yy:
SET NAMES BINARY now works
2003-03-18 10:02:57 +04:00
monty@narttu.mysql.fi
c2fa342d53 Merge with 3.23 to get fix for halloween problem on Update of InnoDB tables 2003-03-18 03:19:20 +02:00
monty@narttu.mysql.fi
052edd98d4 Test of range optimizer in InnoDB 2003-03-18 03:16:12 +02:00
monty@narttu.mysql.fi
85de222334 Fix of 'halloween bug' with UPDATE of InnoDB tables. 2003-03-18 02:51:16 +02:00
guilhem@mysql.com
87e1c552ed New variable rli->ignore_log_space_limit to resolve
a deadlock between I/O and SQL threads in replication
when relay_log_space is too small. This fixes bug #79.
2003-03-17 22:51:56 +01:00
bar@bar.mysql.r18.ru
1600a25a8f ctype_many.result:
new file

  As far as bk could not apply delta,
  I removed it.  Now I'm adding the
  new version into the tree again.
2003-03-17 22:01:57 +04:00
bar@bar.mysql.r18.ru
dae479e580 .del-ctype_many.result~9b541c4def2b5afb:
Delete: mysql-test/r/ctype_many.result

  I could not commit it, bk told it can't apply binary delta
  for textual file.
2003-03-17 22:00:03 +04:00
bar@bar.mysql.r18.ru
04db86f22a 2003-03-17 21:56:34 +04:00
bar@bar.mysql.r18.ru
cb18c7bb2b ctype_collate.result:
Automatic client-server charset recoding has been added
2003-03-17 21:52:03 +04:00