msvensson@neptunus.(none)
1be4e65794
Use replace_result to mask portnumber printed from failing connect
2005-10-28 14:03:24 +02:00
msvensson@neptunus.(none)
74c39cc118
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-10-28 13:51:42 +02:00
petr@mysql.com
27cb3d93c9
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
2005-10-28 14:48:39 +04:00
petr@mysql.com
922cdfa025
fix Bug #14103 IM tests fail on SCO
2005-10-28 14:29:46 +04:00
msvensson@neptunus.(none)
68fa03258a
Merge neptunus.(none):/home/msvensson/mysql/bug12985/my50-bug12985
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-10-28 11:45:30 +02:00
msvensson@neptunus.(none)
b1189769c9
Merge neptunus.(none):/home/msvensson/mysql/bug12258/my50-bug12258
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-10-28 11:09:10 +02:00
petr@mysql.com
314a33c864
fix a typo
2005-10-28 13:02:26 +04:00
msvensson@neptunus.(none)
be6f7a3f82
Merge neptunus.(none):/home/msvensson/mysql/ssl_test/my50-ssl_test
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-10-28 11:00:54 +02:00
msvensson@neptunus.(none)
22c0d6489c
After reiview fix
...
- Use msg argument to determine if param is required or not in safe_get_param
2005-10-28 10:58:57 +02:00
jani@ua141d10.elisa.omakaista.fi
74b8b449a4
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-10-28 03:26:56 +03:00
kent@mysql.com
a49940c359
Makefile.am:
...
Added "base64.h" to enable "make dist" to work
2005-10-28 02:17:41 +02:00
jani@ua141d10.elisa.omakaista.fi
ada29913ac
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-10-28 03:16:28 +03:00
jani@ua141d10.elisa.omakaista.fi
af50eff0d2
Merge 4.1 - 5.0
2005-10-28 02:36:19 +03:00
jani@ua141d10.elisa.omakaista.fi
cbe21a8eb6
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-10-27 23:43:20 +03:00
msvensson@neptunus.(none)
bb571de368
BUG#12985 Do-mysqlclient-test: Can't find -lyassl when linking
...
- Remove yassl_libsfrom CLIENT_LIBS var
- Add yassl_libs to libmysql and libmysqld
2005-10-27 21:48:43 +02:00
monty@mysql.com
a9b1ff4095
Add DROP TABLE before trying to create view (in mysqldump)
...
Cleaned up xxxx_gis.test's and made gis_generic.inc independent of ndb
(Note that archive_gis.test fails, but this is independent of this patch)
2005-10-27 22:45:18 +03:00
monty@mysql.com
faba744caf
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-10-27 21:11:41 +03:00
evgen@moonbone.local
a57c08d468
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/13855-bug-4.1-mysql
2005-10-27 18:36:49 +04:00
evgen@moonbone.local
ec009d6963
select.result:
...
After merge fix
2005-10-27 18:36:11 +04:00
evgen@moonbone.local
71b731e92e
Manually merged
2005-10-27 17:44:28 +04:00
aivanov@mysql.com
4a11f3cbd2
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/alexi/dev/mysql-4.1-innobase
2005-10-27 17:27:07 +04:00
SergeyV@selena.
2025b35544
Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into selena.:H:/MYSQL/src/#13377-mysql-5.0a
2005-10-27 17:08:45 +04:00
SergeyV@selena.
77dc254958
Fix for the patch #13377 . Avoids race condition for relay logs close.
...
Code that closes current relay log is moved to purge_relay_logs().
2005-10-27 17:04:01 +04:00
bar@mysql.com
1c64b2c027
conf_to_src.c:
...
Dump MY_CS_CSSORT when it's necessary.
2005-10-27 17:40:21 +05:00
monty@mysql.com
7ea49858b4
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-10-27 15:16:12 +03:00
monty@mysql.com
1b3ed12017
Fixes during review of pushed code
...
Added back missing return in mysql_delete()
2005-10-27 15:15:01 +03:00
petr@mysql.com
77447e167a
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
2005-10-27 16:07:56 +04:00
petr@mysql.com
88e651d8d1
Fix for Bug #14388 "IM eats 99% CPU"
2005-10-27 15:54:01 +04:00
bar@mysql.com
8bd04bf769
conf_to_src.c:
...
Updating to conform the current CHARSET_INFO structure.
2005-10-27 16:48:49 +05:00
bar@mysql.com
dfe9480497
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b13347
2005-10-27 13:41:09 +05:00
ramil@mysql.com
ca31cf8dd3
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b14290
2005-10-27 13:08:58 +05:00
pekka@mysql.com
4bbfd571cf
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/space/pekka/ndb/version/my50
2005-10-27 09:37:47 +02:00
pekka@mysql.com
362677f2af
ndb - base64 compile fix in ndbapi test
2005-10-27 09:36:11 +02:00
ingo@mysql.com
1062276094
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug12166
2005-10-27 07:44:45 +02:00
ramil@mysql.com
8ccf0f3791
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b14290
2005-10-27 10:09:41 +05:00
petr@mysql.com
abea6db45e
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
2005-10-27 04:06:08 +04:00
petr@mysql.com
be6bb43021
Added a comment re Bug#14164
2005-10-27 04:00:31 +04:00
jimw@mysql.com
305b58b8a2
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-10-26 15:47:56 -07:00
jimw@mysql.com
607c129737
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-10-26 14:11:08 -07:00
brian@zim.(none)
ff6cfe6d66
Change in gis test to allow NDB to be able to call generic tests. Fix for Archive so that ALTER TABLE doesn't issue a warning. Also added test case for alter table.
2005-10-26 13:55:08 -07:00
brian@zim.(none)
22644b5f1c
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/brian/mysql/mysql-5.0
2005-10-26 09:08:44 -07:00
aivanov@mysql.com
a9a127e0bc
Removed innobase/my_cnf, innobase/include/makefilewin.i,
...
and innobase/*/makefilewin (which are unused now).
2005-10-26 20:06:08 +04:00
SergeyV@selena.
0eacb6fb35
Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into selena.:H:/MYSQL/src/#14137-mysql-5.0
2005-10-26 19:05:02 +04:00
reggie@big_geek.
de428f6654
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into big_geek.:C:/Work/mysql/mysql-5.0
2005-10-26 09:47:12 -05:00
SergeyV@selena.
14e90138e5
Formatting change for #14137 patch.
2005-10-26 17:45:30 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
0e6b53f172
Imported fix from 5.0.
2005-10-26 16:12:41 +03:00
msvensson@neptunus.(none)
905658fc9a
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug12258/my50-bug12258
2005-10-26 15:06:17 +02:00
msvensson@neptunus.(none)
b8fdad5d26
Merge neptunus.(none):/home/msvensson/mysql/bug12258/my41-bug12258
...
into neptunus.(none):/home/msvensson/mysql/bug12258/my50-bug12258
2005-10-26 14:15:04 +02:00
msvensson@neptunus.(none)
ac895b0342
Bug #12258 mysql_client_test failure on FC4
...
- Fix for gcc 4.0.1, use cast packet arg local variable
2005-10-26 14:14:08 +02:00
ingo@mysql.com
5f51294a3c
1.2048 05/10/20 10:31:16 ingo@mysql.com +1 -0
...
Bug#12166 - Unable to index very large tables
Moved clearing of errors behind the second repair attempt,
but will clear only if no error happened.
No test case. The error can be repeated with little free
space on tmpdir only. I do not know of a way to create this
in a portable way with our test suite.
I did however attach a shell script to the bug report which
can easily be adapted to the situation on the test machine.
2005-10-26 14:01:54 +02:00