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
13112 commits 2784 branches 343 tags 1.6 GiB
Commit graph

13112 commits

This branch
This branch
All branches
Author SHA1 Message Date
serg@serg.mylan
3ba6fd97b4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-06-25 15:12:51 +02:00
serg@serg.mylan
3b59dd1bd0 bug#4008 - merge table cannot determine what key caused "dupl. key" error 2004-06-25 15:12:13 +02:00
konstantin@mysql.com
354e2ba67b Type of MYSQL_BIND::buffer changed to void * 2004-06-25 17:04:33 +04:00
bell@sanja.is.com.ua
6e1eb6a78c Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-explain-4.1
 2004-06-25 14:48:15 +03:00
serg@serg.mylan
02f411124d Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-06-25 13:16:48 +02:00
serg@serg.mylan
2b93adb9c1 Bug#3808 - fulltext index, delete, 2-level tree, the word on the 1st level has different length than the key (latin1_german2_ci) 2004-06-25 13:11:02 +02:00
ram@gw.mysql.r18.ru
fe3bb82b2b Changed a comment. 2004-06-25 15:26:50 +05:00
ram@gw.mysql.r18.ru
65fe5e7289 a fix (bug #4241: system_mysql_db_fix.test fails) 2004-06-25 15:09:26 +05:00
serg@serg.mylan
3452445559 remove ^M's 
compile even without InnoDB
 2004-06-25 11:33:03 +02:00
bell@sanja.is.com.ua
4092635155 fixed EXPLAIN behaviour with prepared statements (BUG#4271) 2004-06-25 11:37:43 +03:00
patg@krsna.patg.net
f6ea88e8a3 Many files: 
new file
 2004-06-25 00:43:14 -07:00
dlenev@brandersnatch.localdomain
1013d3c7ec Small build fix. 
Add my_time.h to list of headers which should be put ot include/ during make dist.
 2004-06-25 10:30:24 +04:00
serg@serg.mylan
db46b47be8 undone 2004-06-25 01:43:41 +02:00
serg@serg.mylan
b511996ff4 workaround for gcc 2.95.3 bug 
anybody knows how to distinguish 2.95.3 from 2.95.4 (which is ok) ?
 2004-06-25 01:25:02 +02:00
serg@serg.mylan
04bd8c9a44 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-06-25 00:56:34 +02:00
serg@serg.mylan
d8984ba396 free open cursors 2004-06-25 00:50:48 +02:00
konstantin@mysql.com
f99224fe2d One more const method. 2004-06-25 01:30:43 +04:00
konstantin@mysql.com
b6cb8cb5f7 Followup to cleanup in handler interface. 2004-06-25 01:29:30 +04:00
serg@serg.mylan
8162e97ada Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-06-24 23:29:29 +02:00
konstantin@mysql.com
dc2b5c2ac2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/kostja/mysql/mysql-4.1-root
 2004-06-25 01:29:28 +04:00
serg@serg.mylan
37314708b7 merged 2004-06-24 23:29:28 +02:00
vva@eagle.mysql.r18.ru
dfd200c835 Merge 2004-06-25 02:29:27 +05:00
vva@eagle.mysql.r18.ru
8e651814e9 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BUG_1851/mysql-4.1
 2004-06-25 02:24:00 +05:00
vva@eagle.mysql.r18.ru
665d1451f2 fixed bug #1851 "mysqldump does not return 
an error code if the output device is filled"
 2004-06-25 01:14:12 +05:00
konstantin@mysql.com
fccfcb98d5 Previous commit didn't make it (tree fix): I'd forgotten semicolon. 2004-06-24 22:47:05 +04:00
konstantin@mysql.com
998fd5a8f0 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/kostja/mysql/mysql-4.1-root
 2004-06-24 22:37:41 +04:00
konstantin@mysql.com
a32bb3c0c4 Fix of broken 4.1 tree: 
Initially my_time.c was added to sql/ link_sources target only.
As it turns out this target is sometimes not called; instead of it
make calls one hard-coded in top-level Makefile.am.
Now adding linking of my_time.c to the top-level Makefile.am
to (hopefully) cover all cases.
 2004-06-24 22:33:40 +04:00
bell@sanja.is.com.ua
88877e6710 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
 2004-06-24 21:29:05 +03:00
konstantin@mysql.com
54615ebcc5 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/kostja/mysql/mysql-4.1-root
 2004-06-24 21:50:30 +04:00
konstantin@mysql.com
2ad9e516c8 A little fix in libmysqld: my_time.c was added twice. 2004-06-24 21:50:04 +04:00
serg@serg.mylan
1c37f8e20e Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-06-24 19:47:53 +02:00
serg@serg.mylan
1ff21a9e64 bug#4089 - JOIN::join_free calling mysql_unlock w/o index_end() before 2004-06-24 19:46:50 +02:00
lenz@mysql.com
28adaa438a Merge mysql.com:/space/my/mysql-4.1 
into mysql.com:/space/my/mysql-4.1-build
 2004-06-24 19:30:34 +02:00
lenz@mysql.com
a39a56ffe6 - start the ndb cluster on different TCP ports when running another 
build thread
 2004-06-24 19:16:44 +02:00
bell@sanja.is.com.ua
c6e2f6ac13 Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-innodb-4.1
 2004-06-24 19:43:47 +03:00
bell@sanja.is.com.ua
85c9d81c4b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-innodb-4.1
 2004-06-24 19:40:18 +03:00
lenz@mysql.com
e2892e4180 - Windows compile fix: added missing file tztime.cpp to the mysqld 
project file
 2004-06-24 18:17:47 +02:00
konstantin@mysql.com
674a1c4e18 - fixed test_frm_bug test to work with increased number of columns in 
result of SHOW TABLE STATUS
 2004-06-24 20:08:42 +04:00
bell@sanja.is.com.ua
de9cefaa77 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-innodb-4.1
 2004-06-24 19:03:58 +03:00
lenz@mysql.com
fbdcf59418 Merge mysql.com:/space/my/mysql-4.1 
into mysql.com:/space/my/mysql-4.1-build
 2004-06-24 18:01:13 +02:00
konstantin@mysql.com
29b88ff539 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/kostja/mysql/mysql-4.1-4030
 2004-06-24 19:09:31 +04:00
konstantin@mysql.com
a30fcdc690 Fix for Bug#4030 "Client side conversion string -> date type doesn't 
work (prepared statements)" and after-review fixes:
- str_to_TIME renamed to str_to_datetime to pair with str_to_time
- functions str_to_time and str_to_TIME moved to sql-common
- send_data_str now supports MYSQL_TYPE_TIME, MYSQL_TIME_DATE,
  MYSQL_TIME_DATETIME types of user input buffers.
- few more comments in the client library
- a test case added.
 2004-06-24 19:08:36 +04:00
bar@mysql.com
62aeb88638 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-4.1
 2004-06-24 18:51:32 +05:00
bar@mysql.com
aa27a7858e "Version" column in SHOW TABLE STATUS. 2004-06-24 18:46:41 +05:00
mskold@mysql.com
8ba4ab195f Merge mskold@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-06-24 15:32:33 +02:00
guilhem@mysql.com
e14aef7820 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-1717
 2004-06-24 15:32:32 +02:00
tomas@poseidon.bredbandsbolaget.se
c218727dd2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1-clean
 2004-06-24 13:32:30 +00:00
tomas@poseidon.bredbandsbolaget.se
17047d83f3 added posr switch to mysql-test-run 2004-06-24 13:28:15 +00:00
mskold@mysql.com
29746be6a8 Cosmetic fixes 2004-06-24 14:49:34 +02:00
guilhem@mysql.com
d8fe091e28 Enabling the --innodb-safe-binlog option in code. If you wish to disable it, 
you just need to change this line of mysqld.cc:
#if MYSQL_VERSION_ID >= 40103
to, say,
#if MYSQL_VERSION_ID > 40103
I am noticing a failure of bdb.test; I believe this is not related to the
code I added yesterday and today, but I am checking. In any case I push this
changeset as it cannot by itself bring more mess that I *may* (or not)
already have brought with previous pushes.
 2004-06-24 14:42:56 +02:00