mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
27394 commits 2784 branches 343 tags 1.6 GiB
Commit graph

27394 commits

This branch
This branch
All branches
Author SHA1 Message Date
petr@mysql.com
314a33c864 fix a typo 2005-10-28 13:02:26 +04: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
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
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
kent@mysql.com
cd0592136a Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-10-26 11:45:41 +02:00
reggie@big_geek.
dec2640dbf changed define from EXTERN_C to EXTERNC so it doesn't conflict with 
another macro defined in the Windows header files.
 2005-10-25 23:51:05 -05:00
kent@mysql.com
a2d7a9da90 mysql-test-run.pl: 
Added MTR_BUILD_THREAD to control the port range
 2005-10-26 01:24:03 +02:00
kent@mysql.com
77ecd8d968 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-10-26 00:03:27 +02:00
kent@mysql.com
5561697158 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-10-25 23:56:08 +02:00
kent@mysql.com
983b7ad153 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/Users/kent/mysql/bk/mysql-4.0
 2005-10-25 23:52:18 +02:00
jimw@mysql.com
a4cc61f213 Merge mysql.com:/home/jimw/my/mysql-5.0-13534 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-10-25 13:42:04 -07:00
brian@zim.(none)
da60b60207 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/mysql-5.0
 2005-10-25 11:03:22 -07:00
sasha@asksasha.com
63bac8c4e4 Merge spachev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  asksasha.com:/reiser-data/mysql-dev/mysql-5.0-bug12974
 2005-10-25 11:25:46 -06:00
pgalbraith@mysql.com
adcc3ac935 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/data0/mysqldev/patg/mysql-5.0-viewfix
 2005-10-25 19:16:08 +02:00
jimw@mysql.com
a01cd74647 Merge mysql.com:/home/jimw/my/mysql-4.1-12925 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-25 10:11:47 -07:00
jimw@mysql.com
e8eed35c6a Fix incorrect casts in my_getopt code that capped the maximum of longlong 
options to the wrong value. (Bug #12925)
 2005-10-25 10:10:53 -07:00