monty@mishka.local
4f4bbfc279
Merge with 4.1
2004-12-22 13:54:39 +02:00
wax@kishkin.ru
e81d48fdd9
corrected mysqltest.dsp
...
corrected mysql_test_run_new.dsp
added dependency
corrected path of mysql_test_run_new.dsp
fixed wrong code
added my_create_tables.c
removed command_line
fixed #elif
restored NAME_MAX and MAX_FNAME
added create_system_files()
added compare() for windows
added all files of testes in script
added mysql-test in script
2004-12-14 18:46:55 +05:00
anjuta@arthur.local
a045161e5b
Added pathes to mysqld_error.h and sql_state.h; fixed segfault bug;
2004-12-14 01:54:16 +02:00
anjuta@arthur.local
53db34f992
Added missing errmsg.txt
2004-12-13 23:28:24 +02:00
petr@mysql.com
fd94614f34
merge
2004-12-09 04:22:28 +03:00
Sinisa@sinisa.nasamreza.org
a90da35fe6
Fix for a bug #6996
2004-12-07 19:12:29 +02:00
monty@mysql.com
0de4777187
Merge with 4.1
2004-12-06 11:38:56 +02:00
hf@deer.(none)
71bfbbdcd0
Fixes to make mysql-test-run --embedded-server working
2004-12-02 16:08:17 +04:00
lenz@mysql.com
51e18c217a
- renamed mysqladmin.c -> mysqladmin.cpp to fix the Windows builds
2004-11-22 17:08:06 +01:00
serg@serg.mylan
2d3dd65cc1
merged
2004-11-20 18:36:41 +01:00
tomas@poseidon.ndb.mysql.com
b67491ee41
ignore fix
2004-11-19 09:38:41 +00:00
tomas@poseidon.ndb.mysql.com
73f098836f
added to ignore list
2004-11-19 09:35:12 +00:00
timour@mysql.com
0a11036e1c
Fixed one warning and two errors reported by VC 6.0.
2004-11-18 11:24:18 +02:00
serg@serg.mylan
60e3e821c6
don't delete ac_available_languages_fragment in configure - it may be needed later
2004-11-16 16:52:29 +01:00
serg@serg.mylan
87840e841c
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2004-11-15 19:27:06 +01:00
brian@avenger.(none)
f05daf02ba
Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump)
2004-11-11 18:58:57 -08:00
serg@serg.mylan
aafb2cf6a3
Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2004-11-11 13:44:10 +01:00
monty@mysql.com
0ebc50b851
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2004-11-09 21:47:46 +02:00
monty@mysql.com
3d0f7eca4e
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-11-09 21:45:36 +02:00
serg@sergbook.mylan
c79f4c08d6
Merge sergbook.mylan:/usr/home/serg/Abk/mysql-5.0
...
into sergbook.mylan:/usr/home/serg/Abk/mysql-5.0-xa
2004-11-09 16:44:23 +01:00
monty@mysql.com
1087186657
Merge with 4.1 to get new thd->mem_root handling
2004-11-08 17:53:32 +02:00
serg@sergbook.mylan
342fb28efa
decimal.c:
...
test_ro("999999999999999999999.999", 0, CEILING);
test_da("5", "-6.0");
ignore:
added gdbinit
2004-11-08 10:06:32 +01:00
petr@mysql.com
b2e3626e52
fix for the IM linking problem
2004-11-06 02:14:56 +03:00
joerg@mysql.com
16b280b11d
Ensure that even the (relatively new) "mysql-test/Makefile.am" gets into the source tar-ball.
2004-11-05 15:50:53 +01:00
serg@serg.mylan
353dd4fe35
dbug: DBUG_EXECUTE_IF macro, build user manual automatically, document all features
...
charset2html moved from mysys to extra
ignore: new files added, garbage removed
2004-11-04 22:29:00 +01:00
petr@mysql.com
96aa04bf8e
protability fix
2004-11-04 11:24:14 +03:00
monty@mysql.com
7d3be517a4
Merge on pull
2004-11-03 13:01:38 +02:00
monty@mysql.com
afbe601302
merge with 4.1
2004-10-29 19:26:52 +03:00
timour@mysql.com
b67f86728b
Fix for BUG#6303 + fix for discovered bug with sub-queries when analyzin queries for MIN/MAX optimization (WL#1724).
2004-10-29 18:20:09 +03:00
serg@serg.mylan
0ad752e8af
s/puts/printf/
2004-10-21 15:34:26 +02:00
igor@rurik.mysql.com
a03e5ad8e4
Merge for post-merge fixes for Item_equal patch.
2004-10-19 16:07:10 -07:00
serg@serg.mylan
f7419aaa61
Merge bk-internal:/home/bk/mysql-5.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2004-10-18 14:09:41 +02:00
serg@serg.mylan
bd10f962f2
arbitrary precision decimal numbers
2004-10-18 14:06:46 +02:00
timour@mysql.com
3bb2c4e325
After merge adjustment of tests due to changes in cost estimates.
2004-10-11 20:10:07 +03:00
igor@rurik.mysql.com
71f6ab7a09
Merge for Item_equal.
2004-10-09 10:34:13 -07:00
bell@sanja.is.com.ua
4cb6527421
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-show-5.0
2004-09-10 13:11:33 +03:00
bell@sanja.is.com.ua
a7de21c3e0
thd pointer fixed
2004-09-10 13:09:27 +03:00
dlenev@brandersnatch.localdomain
7c8213ea20
Fixed --with-embedded builds.
...
Added previously missing sql_trigger.cc file to embedded library.
2004-09-10 10:29:08 +04:00
monty@mysql.com
31122efde7
Merge with 4.1
...
(Includes merge of arena code in 4.1 and 5.0)
2004-09-06 15:14:10 +03:00
serg@serg.mylan
7ac525fc1b
union.test: drop table added
2004-09-05 11:27:31 +02:00
serg@serg.mylan
b5b7603542
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-24 22:02:08 +02:00
serg@serg.mylan
0dc5945b19
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-24 21:07:08 +02:00
vva@eagle.mysql.r18.ru
3e6d1022d6
upgrade to libedit-2.6.7
...
(fixed Bug #4462 libedit compile failure)
2004-08-24 20:41:41 +05:00
serg@serg.mylan
62722e7b05
merged
2004-08-20 00:52:43 +02:00
serg@serg.mylan
3f2210c064
after merge fixes
2004-08-19 03:02:09 +02:00
serg@serg.mylan
754fafd28f
copied new my_vsnprintf from 4.1. use "ul" when merging
2004-08-19 02:35:59 +02:00
joreland@mysql.com
556488dcd2
Added more ndb binaries to ignore
2004-08-12 12:37:16 +02:00
joreland@mysql.com
d913e55e1b
Add ndb binaries to ignore list
2004-08-12 07:48:18 +02:00
konstantin@mysql.com
d3e520ce7e
Port of cursors to be pushed into 5.0 tree:
...
- client side part is simple and may be considered stable
- server side part now just joggles with THD state to save execution
state and has no additional locking wisdom.
Lot's of it are to be rewritten.
2004-08-03 03:32:21 -07:00
bell@sanja.is.com.ua
bbe121c0c9
memory leak removing
2004-07-16 15:20:51 +03:00
