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
pem@mysql.com
5c4122d3e0
Fixed the last memory leaks in the SP code.
2003-04-03 20:00:52 +02: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
pem@mysql.com
1fc3582b7d
Got rid of the last unecessary Item_strings.
2003-04-03 16:00:09 +02: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
pem@mysql.com
e483c8ff5a
Updated result file.
2003-04-02 21:18:52 +02:00
pem@mysql.com
a43c641fee
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2003-04-02 20:42:56 +02:00
pem@mysql.com
c673fcb813
Getting rid of lots of memory leaks (but not quite all of them yet,
...
some will go away when temporary code is replaced).
2003-04-02 20:42:28 +02: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
guilhem@mysql.com
9df615b7b1
Tiny optimisation for a (boolean || boolean) test, as SQL_LOG_BIN is set to 1 by default
2003-04-02 10:59:21 +02:00
guilhem@mysql.com
654410a3d3
Deprecated the update log (Sprint task #792 ). Now --log-update
...
just turns on --log-bin and prints a warning. SQL_LOG_UPDATE
is handled in two ways (see mysqld.cc for comments).
2003-04-02 00:15:20 +02:00
guilhem@mysql.com
4824d6c66c
Sprint task #856 : make table exclusion rules (in replication)
...
apply to GRANT and REVOKE too. For example if replicate-wild-ignore-table=mysql.%,
GRANT and REVOKE will not be replicated on the slave.
2003-04-01 22:49:40 +02:00
guilhem@mysql.com
1211b9a513
Small-and-safe fix for bug #218 : "LOAD DATA INFILE IGNORE is well
...
logged, but read as LOAD DATA INFILE REPLACE"
This was just bad && instead of &, but nasty consequences.
This should be merged to 4.0 BUT it will not be automatic (some code
has moved from log_event.h to log_event.cc, and log_event.cc has changed);
please Merging Man, do 'bk grep REPLACE_FLAG' in 4.0/sql
to find all the new places.
2003-04-01 18:19:15 +02:00
bar@bar.mysql.r18.ru
8cbad53268
cp1257.xml, Index.xml:
...
cp1257 is Lithuanian sorting
2003-04-01 19:03:02 +05:00
bar@bar.mysql.r18.ru
83cbc2838a
Some collation have been renamed to fit into convension
2003-04-01 18:54:01 +05:00
bar@bar.mysql.r18.ru
11ce18a935
Standard charset names:
...
pclatin1 -> cp850
pclatin2 -> cp852
2003-04-01 17:49:24 +05:00