Commit graph

7750 commits

Author SHA1 Message Date
venu@myvenu.com
06f075888e Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-04-04 13:25:53 -05:00
venu@myvenu.com
8eeecd9c86 Fix to support update + bianry logs with prepared statements (Dynamic query) 2003-04-04 12:33:17 -05:00
pem@mysql.com
3ee502837a Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/pem/work/mysql-4.1
2003-04-04 14:24:01 +02:00
pem@mysql.com
608cba3f5a Added missing error message (was only added in english/).
Removed extraneous error message from german/errmsg.txt.
2003-04-04 14:23:24 +02:00
bar@bar.mysql.r18.ru
8946f1ea9d Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-04-04 17:22:26 +05:00
bar@bar.mysql.r18.ru
da50242988 Index.xml:
Type
2003-04-04 17:21:48 +05:00
pem@mysql.com
3a00dc73e1 Updating subselect results after SUBSELECT was changed into SUBQUERY. 2003-04-04 13:33:01 +02:00
ram@mysql.r18.ru
d29557cb68 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.sp
2003-04-04 14:10:24 +05:00
ram@mysql.r18.ru
7a856411ec Fixed envelope() function. 2003-04-04 14:09:08 +05:00
arjen@george.bitbike.com
be27b2369b Sync string in EXPLAIN code with phrasing of manual (subquery, not subselect). 2003-04-04 14:06:52 +10:00
arjen@george.bitbike.com
5c9ee452e3 gis.txt deleted - updated text merged into manual (mysqldoc tree). 2003-04-04 12:41:58 +10:00
pem@mysql.com
331c56bc36 And got rid of signess warnings... 2003-04-03 20:19:18 +02:00
pem@mysql.com
f3049df7c8 Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/pem/work/mysql-4.1
2003-04-03 20:19:17 +02:00
pem@mysql.com
f197b179a5 Got rid of silly compiler errors on HP-UX and SGI Irix. 2003-04-03 20:19:16 +02:00
walrus@mysql.com
53859b6e0a Merge akishkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/walrus/bk/41
2003-04-04 00:19:16 +06:00
bar@bar.mysql.r18.ru
3e0464b84d field.cc:
Geometry is now large blob
2003-04-03 23:19:15 +05:00
monty@narttu.mysql.fi
4a4838059f Fixed bug in warning handling (Memory was allocated from wrong MEM_ROOT) 2003-04-03 21:19:14 +03:00
monty@narttu.mysql.fi
22075460d8 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
2003-04-03 21:19:13 +03:00
monty@narttu.mysql.fi
a7708c7904 Merge with 4.0 2003-04-03 21:19:12 +03:00
monty@narttu.mysql.fi
aa4bf1cd8d After merge fix 2003-04-03 21:19:11 +03:00
monty@narttu.mysql.fi
e5cbaeb2ab Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-04-03 21:19:10 +03:00
vva@eagle.mysql.r18.ru
46af747b09 add test file for rpl_loaddata.test 2003-04-03 14:19:09 -04:00
monty@narttu.mysql.fi
d56dc85205 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-04-03 19:55:37 +03:00
vva@eagle.mysql.r18.ru
04b81ac9ac Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0
2003-04-03 12:55:36 -04:00
vva@eagle.mysql.r18.ru
f45be5e6cd added test for replication load data into temporary table with additional options 2003-04-03 12:54:08 -04:00
walrus@mysql.com
7526c71840 test-transactions.sh:
correct misprint in the sub test_update
2003-04-03 21:53:04 +06:00
vva@eagle.mysql.r18.ru
4fb9cb0097 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0
2003-04-03 10:30:41 -04:00
monty@narttu.mysql.fi
957834795e Updated results after merge 2003-04-03 13:21:39 +03:00
ram@mysql.r18.ru
1c9e9bb613 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.sp
2003-04-03 15:18:56 +05:00
ram@mysql.r18.ru
2180fa858b AsWKB() function has been added. 2003-04-03 15:13:14 +05:00
monty@narttu.mysql.fi
8f957e6ab5 Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0 2003-04-03 13:08:28 +03:00
monty@narttu.mysql.fi
e96c75fec0 Fixed bug in memory allocation that could affect 64 bit systems (affected hammer) 2003-04-03 13:07:42 +03:00
bar@bar.mysql.r18.ru
688aaf4152 sql_cache.cc:
Windows compilation fix
2003-04-03 14:52:12 +05:00
monty@narttu.mysql.fi
618857b6eb Merge with 3.23 to get fixes for:
mysqldump --delete-master-logs
Portability fix for hammer
Memory overrun for MyISAM
LOAD DATA LOCAL replication bug fix.
2003-04-03 12:33:13 +03:00
monty@narttu.mysql.fi
3cdc8ae55b Portability fix (for AMD hammer) 2003-04-03 12:10:38 +03:00
monty@narttu.mysql.fi
bf315f30d5 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-04-03 11:29:38 +03:00
monty@narttu.mysql.fi
c1ff07cbb9 Safer stack checking 2003-04-03 11:29:10 +03:00
wax@kishkin.ru
b5af8d771e correct code of warning of group_concat 2003-04-02 21:47:22 +06:00
wax@kishkin.ru
9abea0aa2f mysqld.cc:
missing comma
2003-04-02 20:49:16 +06:00
wax@kishkin.ru
9dd60d91f2 Merge vkishkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into kishkin.ru:/home/wax/mysql-4n
2003-04-02 19:42:25 +06:00
wax@kishkin.ru
8c0de640e3 resolve new updates group_concat 2003-04-02 19:16:19 +06:00
lenz@mysql.com
42dff2e897 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2003-04-02 14:39:20 +02:00
lenz@mysql.com
d97caf59ca - increased bdb_max_lock value to pass sql-bench
- re-enabled OpenSSL for the Max RPM package
2003-04-02 14:38:25 +02:00
wax@kishkin.ru
74e32241c4 Auto merged 2003-04-02 18:15:16 +06:00
wax@kishkin.ru
77eb790ec5 SCRUM
correct sql_alloc, ORDER BY and NULL value in group_concat
add comments
move test msg_arg
add test on NULL
2003-04-02 17:55:53 +06:00
ram@mysql.r18.ru
87ee144f7b Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.sp
2003-04-02 15:39:57 +05:00
ram@mysql.r18.ru
9295366a5e GEOMCOLLFROMWKB(), GEOMETRYCOLLECTIONFROMWKB(),
LINEFROMWKB(), LINESTRINGFROMWKB(), MLINEFROMWKB(), MPOINTFROMWKB(),
MPOLYFROMWKB(), MULTILINESTRINGFROMWKB(), MULTIPOINTFROMWKB(),
MULTIPOLYGONFROMWKB(), POINTFROMWKB(), POLYFROMWKB(), POLYGONFROMWKB()
functions have been added (as synonyms for GEOMFROMWKB()).
2003-04-02 15:38:06 +05:00
arjen@george.bitbike.com
d32785e2a6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into george.bitbike.com:/home/arjen/mysql-4.1
2003-04-02 20:12:57 +10:00
arjen@george.bitbike.com
a7a3a28696 prepare.texi merged into manual (mysqldoc tree), file removed. 2003-04-02 20:12:01 +10:00
monty@narttu.mysql.fi
ec70bac3b9 Fixed problem with const table named with crashed test suite on MacOSX 2003-04-02 13:06:33 +03:00