Commit graph

17857 commits

Author SHA1 Message Date
monty@mysql.com
8f7a2bbaee Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-merge
2004-12-31 03:48:47 +02:00
monty@mysql.com
5e03ebbcad After merge fixes
Cleanup of mi_print_error() handling
Deleted 'merge' directory
2004-12-31 03:47:56 +02:00
marko@hundin.mysql.fi
526b996a36 page0page.c:
page_dir_find_owner_slot(): Fix bug in corruption diagnostics.
2004-12-31 00:56:54 +02:00
monty@mysql.com
34d5331cee Merge with global tree 2004-12-31 00:50:30 +02:00
marko@hundin.mysql.fi
b9fdd87624 row0upd.c:
row_upd_clust_rec(): Call btr_cur_get_rec() after
  btr_pcur_restore_position(), not before.  (Bug #7598)
2004-12-31 00:46:33 +02:00
monty@mysql.com
d71c030587 After merge fixes 2004-12-31 00:44:00 +02:00
marko@hundin.mysql.fi
4dbd101c57 Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/marko/j/mysql-5.0
2004-12-30 19:14:38 +02:00
marko@hundin.mysql.fi
3653b08986 InnoDB: Remove crash in in-place update from NULL to non-NULL. (Bug #7591)
rem0rec.c:
  rec_init_offsets(): Make the function comment more accurate.
rem0rec.ic:
  rec_get_nth_field(): Return pointer to the field, even to NULL fields.
  rec_set_nth_field(): Make more accurate debug assertions.
2004-12-30 19:13:31 +02:00
petr@mysql.com
b1387f5dde Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2004-12-30 19:25:51 +03:00
petr@mysql.com
0359879624 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2004-12-30 19:21:10 +03:00
georg@beethoven.site
448d453ac1 Merge from 4.1: fix for bug #7285 (embedded server) 2004-12-30 17:17:21 +01:00
gluh@gluh.mysql.r18.ru
551456b30c Removed unnecessary chahges from previous commit(see ChangeSet 1.1761 04/12/30) 2004-12-30 19:16:44 +03:00
gluh@gluh.mysql.r18.ru
50266af38c wl#1629 SHOW with WHERE(final part, after review)
added syntax:
  'show variables where', 'show status where', 'show open tables where'
2004-12-30 15:20:40 +03:00
marko@hundin.mysql.fi
043c1d3280 InnoDB: fix bug in insert buffer merge of prefix columns in
new-style InnoDB tables. (Bug #7578)
2004-12-29 23:22:25 +02:00
marko@hundin.mysql.fi
7adeebd9a1 InnoDB: Remove dependency on rem0rec.ic from dict0dict.ic (Bug #7464) 2004-12-29 12:09:23 +02:00
petr@mysql.com
1e24a49d45 VC++Files/mysqlmanager deleted 2004-12-29 11:41:58 +03:00
petr@mysql.com
d70f5c1c58 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2004-12-29 01:12:09 +03:00
petr@mysql.com
fdb3b0b6c1 cleanup 2004-12-29 00:13:32 +03:00
pem@mysql.comhem.se
b17326a3d6 Reverted previous name changes of all bug tests in sp.test, but kept the
robustness (dropping things just in case).
2004-12-28 16:58:14 +01:00
marko@hundin.mysql.fi
32757a3466 InnoDB: Fix some bugs in the new record format. (Bug #7493) 2004-12-28 01:34:52 +02:00
serg@serg.mylan
9c12543e18 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2004-12-27 23:21:06 +01:00
serg@serg.mylan
be93bd0087 Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2004-12-27 23:18:25 +01:00
serg@serg.mylan
184cbf6d37 strings/decimal.c
test_d2b2d("123.4", 10, 2, "123.40");
2004-12-27 23:17:09 +01:00
joerg@mysql.com
288b039477 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
2004-12-27 15:33:14 +01:00
joerg@mysql.com
15334b2270 Ensure "bottom-up" order of "inline functions" within 'innobase/include/rem0rec.ic'.
This is a partial solution for bug#7464.
2004-12-27 14:02:30 +01:00
serg@serg.mylan
19e3c001f4 revert "LOCK TABLES ... WHERE ENGINE=INNODB" 2004-12-27 12:08:22 +01:00
gluh@gluh.mysql.r18.ru
25c41ddc58 Fix for bug #7467: sql_lex.c on HPUX fails to compile 2004-12-24 12:42:01 +03:00
gluh@gluh.mysql.r18.ru
ddba51e6ec Fix for bug: #7218: information_schema: errors in "tables" 2004-12-24 12:16:47 +03:00
ingo@mysql.com
7f582c4c64 Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-wl2126
2004-12-23 21:46:10 +01:00
ingo@mysql.com
60e35755ef WL#2126 - Multi_read_range.
Added the required structures and functions for
handing over multiple key ranges to the table handler.
2004-12-23 21:45:10 +01:00
ingo@mysql.com
c39be2d0e7 WL#1895 - Print message to error log in case of detected MyISAM corruption
Changed my_error() to print error messages, which come from
arbitrary registered ranges of error messages. Messages can
be unregistered (and should be at end of the program).
Added registration of handler error messages.
Added a new mi_print_error() macro and a new 
mi_report_error() function, which supply error
messages with a table name.
Added calls to mi_print_error() or mi_report_error()
at all places in MyISAM, where table corruption is detected.
2004-12-23 20:11:38 +01:00
petr@mysql.com
1ea48a2dbf Set default port to the one assigned by IANA 2004-12-23 20:47:03 +03:00
acurtis@pcgem.rdg.cyberkinetica.com
bf40ab8cb1 Fix for embedded 2004-12-23 11:42:57 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
5c53cb39dd Fix compile error, caused by wl#925 variable rename 2004-12-23 11:23:36 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
b051e8bb94 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/wl925.4
2004-12-23 10:49:28 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
b1e30904d5 WL#925 - Privileges for stored routines
Implement fine-grained control over access to stored procedures
  Privileges are cached (same way as existing table/column privs)
2004-12-23 10:46:24 +00:00
gluh@gluh.mysql.r18.ru
4ba850cab0 Bug#7219 information_schema: errors in "columns"
changed field names in 'collations' table(discussed with PGulutzan)
2004-12-23 13:35:34 +03:00
monty@mishka.local
4f4bbfc279 Merge with 4.1 2004-12-22 13:54:39 +02:00
petr@mysql.com
8fb20802dc Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2004-12-22 01:02:48 +03:00
petr@mysql.com
584a7ffda4 Bug #7468 Instance Manager fails to compile: thread_registry.cc
This fix icludes workaround for Irix compiler bug & removs some unused
variables (resulted in warnings)
2004-12-22 01:00:29 +03:00
dlenev@mysql.com
348c2ea808 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-tzbug
2004-12-21 17:47:48 +03:00
jan@hundin.mysql.fi
d035ccb434 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/jan/mysql-5.0
2004-12-21 15:54:04 +02:00
jan@hundin.mysql.fi
d3a979888d Review fixes. 2004-12-21 15:53:01 +02:00
dlenev@mysql.com
95bd66bf54 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-tzbug
2004-12-21 16:23:17 +03:00
ram@gw.mysql.r18.ru
2b4c2fe2a8 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b7283
2004-12-21 16:46:04 +04:00
dlenev@mysql.com
0ef4413f36 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-tzbug
2004-12-21 15:42:19 +03:00
ram@gw.mysql.r18.ru
ef4d6b6675 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b7283
2004-12-21 16:12:46 +04:00
dlenev@mysql.com
d8995eaf18 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0
2004-12-21 13:03:17 +03:00
hf@deer.(none)
98f2a83539 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
2004-12-21 10:31:09 +04:00
hf@deer.(none)
e91a4ce0be Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
2004-12-21 10:26:01 +04:00