Commit graph

11289 commits

Author SHA1 Message Date
lenz@kallisto.local
b8c47718d4 - removed extraneous Item_ident:: to fix a compile error on HP-UX 2004-02-27 19:08:56 +01:00
heikki@hundin.mysql.fi
a9e361856b btr0cur.c:
Remove unused function btr_cur_update_sec_rec_in_place; besides, it was faulty, because even if strings are alphabetically identified, they can have different lengths
2004-02-27 19:02:51 +02:00
Greg@greg-laptop.
59e8a77f6a Applied fixes to issues discovered during test builds on Windows. 2004-02-27 17:27:07 +01:00
serg@build.mysql.com
d0b0e5bf77 do not use static array of pastpoints in my_strtod - it is not portable
(that is, these numbers are converted to doubles by a local OS strtod,
and on different systems they get different values)
2004-02-27 14:40:08 +01:00
lenz@kallisto.local
743bc4628a - fixed test result: FORMAT(12345.5555,3) really should return "12,345.556" 2004-02-27 10:14:43 +01:00
lenz@kallisto.local
5e5420f6e8 - really remove all traces of odbc 2004-02-26 19:32:42 +01:00
serg@serg.mylan
e58f1ca7f8 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-02-26 00:25:35 +01:00
serg@serg.mylan
4442cf5b6f in netware ':' is also a valid path character 2004-02-24 23:15:38 +01:00
monty@mashka.mysql.fi
3baf20ab04 Code cleanup 2004-02-24 19:30:38 +02:00
monty@mashka.mysql.fi
2fc2d558b0 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
2004-02-24 19:14:41 +02:00
serg@serg.mylan
4f3062d95f minor omission that effectively disabled my_strtod fixed :) 2004-02-24 12:31:33 +01:00
serg@serg.mylan
da9ad42881 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-02-23 22:49:26 +01:00
serg@serg.mylan
01bf966899 missing break added 2004-02-23 22:48:10 +01:00
vva@eagle.mysql.r18.ru
09b44687cb Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_2719/mysql-4.1
2004-02-22 19:07:21 +04:00
guilhem@mysql.com
b2e17ff2f3 found typo 2004-02-22 13:04:42 +01:00
monty@mashka.mysql.fi
1ae05760ac Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
2004-02-22 11:01:28 +02:00
monty@mashka.mysql.fi
7084e3642c Updated results 2004-02-22 10:58:22 +02:00
monty@mashka.mysql.fi
43451f3e5b Merge with 4.0 to get fixed tests 2004-02-22 10:04:08 +02:00
monty@mashka.mysql.fi
fa882fd73c Move tests that uses innodb to innodb.test 2004-02-22 09:58:51 +02:00
monty@mashka.mysql.fi
3b83cce5eb merge with 4.0 2004-02-22 09:50:59 +02:00
monty@mashka.mysql.fi
e74182fe52 Cleanups 2004-02-22 08:54:06 +02:00
monty@mashka.mysql.fi
e1bc99c131 After merge fixes
Fixed wrong test of database name (affected optimization of ORDER BY)
2004-02-22 08:09:32 +02:00
monty@mashka.mysql.fi
349358a95b Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2004-02-22 00:40:50 +02:00
monty@mashka.mysql.fi
fdc4a35c94 change that master_server_id is not a restricted word 2004-02-22 00:38:05 +02:00
Sinisa@sinisa.nasamreza.org
9c636d3beb Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-02-21 20:11:47 +02:00
Sinisa@sinisa.nasamreza.org
a1c35fa72c making one symbol a keyword 2004-02-21 20:10:59 +02:00
guilhem@mysql.com
8bfb87ced5 Fix for BUG#2757
"--read-only gives weird error on update".
It is not fixable in 4.0 because it requires modifying
the sql/share/*/errmsg.txt files. So it is fixed in 4.1 like this:
the ER_SKIP_GRANT_TABLES is replaced by a more generic
ER_OPTION_PREVENTS_STATEMENT which can be used both for
"can't do this because of --skip-grant-tables" and
"can't do this because of --read-only" (for this we don't use
ER_CANT_UPDATE_WITH_READLOCK anymore).
So now the message for --read-only is:
"The MySQL server is running with the --read-only option so
cannot execute this statement".
2004-02-21 15:15:26 +01:00
serg@serg.mylan
4866ca228d typo fixed 2004-02-21 14:32:22 +01:00
serg@serg.mylan
429a165995 c++ comment fixed 2004-02-21 14:25:43 +01:00
serg@serg.mylan
870a7f23d6 ignore:
added scripts/make_win_binary_distribution
2004-02-21 14:00:54 +01:00
serg@serg.mylan
d21f01adf9 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-02-21 11:19:11 +01:00
serg@serg.mylan
3ce4d04ab0 portability fixes
cleanup
2004-02-21 11:18:29 +01:00
heikki@hundin.mysql.fi
e17e1901f2 ha_innodb.cc, data0type.c, data0type.ic, data0type.h:
Change some inline functions to normal functions, so that they can be called in ha_innodb.cc; this removes the the remaining linking problems reported by Paul DuBois
2004-02-21 10:21:29 +02:00
heikki@hundin.mysql.fi
58932546e9 data0type.ic, data0type.h:
Fix linking errors reported by Paul DuBois: UNIV_INLINE was forgotten from some inline functions
2004-02-21 09:47:58 +02:00
serg@serg.mylan
fc16e4ded3 fix for --open-files-limit and broken query_cache_merge.test 2004-02-20 23:42:06 +01:00
serg@serg.mylan
49429da988 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-02-20 23:18:32 +01:00
serg@serg.mylan
7ff24eb01f longer myisam keys 2004-02-20 20:38:34 +01:00
lenz@mysql.com
ac5400060f Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2004-02-20 17:53:22 +01:00
lenz@kallisto.local
1c814b5350 - when removing the readline subdir for the commercial distribution,
configure.in needs to be updated and configure needs to be recreated
   for the build to succed
2004-02-20 17:52:46 +01:00
monty@mashka.mysql.fi
f816e51096 Added missing argument to strxnmov() (Applies for windows debug mode) 2004-02-20 17:58:34 +02:00
monty@mashka.mysql.fi
494e43c1f5 merge with 4.0 to get security fixes and latest bug fixes 2004-02-20 17:43:02 +02:00
greg@mysql.com
49165e60d1 Fix name conflict with alternate capitalization 2004-02-20 14:42:43 -01:00
greg@mysql.com
1b0d050aaf Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/bk/mysql-4.0
2004-02-20 14:42:42 -01:00
marko@hundin.mysql.fi
09053c4041 Remove unused files
.del-odbc0odbc.c~6a372e94945263b5:
  Delete: innobase/odbc/odbc0odbc.c
.del-odbc0dummy.c~761be78656f44ad2:
  Delete: innobase/odbc/odbc0dummy.c
.del-makefilewin~15bf11ba8e0e4efe:
  Delete: innobase/odbc/makefilewin
.del-Makefile.am~f40398b15a266f24:
  Delete: innobase/odbc/Makefile.am
2004-02-20 17:42:41 +02:00
marko@hundin.mysql.fi
ff6d014b2b Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/m/mysql-4.0
2004-02-20 16:40:25 +02:00
marko@hundin.mysql.fi
234e9abf6a Many files:
Removed unused code
.del-os0trash.c~8cae5c1695501117:
  Delete: innobase/os/os0trash.c
dict0crea.c:
  Protect all sprintf(%s) with assertions
2004-02-20 16:34:09 +02:00
bell@sanja.is.com.ua
c6c1efba7e after review changes 2004-02-20 16:24:03 +02:00
bell@sanja.is.com.ua
8a442c4e0d after review fix 2004-02-20 15:37:45 +02:00
serg@serg.mylan
d5ab162422 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-02-20 12:02:59 +01:00
serg@serg.mylan
a35955d60f \| is sed is on-portable 2004-02-20 12:02:34 +01:00