heikki@hundin.mysql.fi
541c40b000
ha_innobase.cc:
...
Backport of bug fix in 4.0: do not x-lock rows under LOCK TABLES READ unless the table is a temp table
2002-11-19 17:08:07 +02:00
heikki@hundin.mysql.fi
4b73222d5a
row0mysql.c, row0mysql.h, ha_innodb.cc, sql_table.cc, handler.h:
...
Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp
2002-11-19 16:27:26 +02:00
Sinisa@sinisa.nasamreza.org
910245bec6
Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-11-18 23:14:58 +02:00
Sinisa@sinisa.nasamreza.org
d7344d9fa4
small revert
2002-11-18 23:11:45 +02:00
Sinisa@sinisa.nasamreza.org
7fd3221fdf
small change
2002-11-18 22:41:57 +02:00
bell@sanja.is.com.ua
9e15fe17f1
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/work-explain-4.1
2002-11-18 22:20:28 +02:00
bell@sanja.is.com.ua
4e45cc7a9e
Fixed explain error handling
2002-11-18 22:19:15 +02:00
Sinisa@sinisa.nasamreza.org
4cec1660da
fix for message being sent in EXPLAIN ...
2002-11-18 20:58:04 +02:00
Sinisa@sinisa.nasamreza.org
b9a671f267
lot's of fixes with test cases
2002-11-18 18:28:51 +02:00
Sinisa@sinisa.nasamreza.org
ae8eb2d932
Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-11-18 14:24:56 +02:00
bell@sanja.is.com.ua
c0764205cf
fixed subselect explain bug
2002-11-17 22:23:57 +02:00
bell@sanja.is.com.ua
74f229fd61
Merge abelkin@work.mysql.com:/home/bk/mysql-4.0
...
into sanja.is.com.ua:/home/bell/mysql/mysql-4.0
2002-11-17 20:44:16 +02:00
bell@sanja.is.com.ua
64047ea9a7
new status variable (number of queries deleted because of low memory)
2002-11-17 20:41:25 +02:00
serg@serg.mysql.com
0a75fe85d1
merge::records_in_range and optimizer
2002-11-17 18:58:03 +01:00
serg@serg.mysql.com
8796fc2dc5
myisammrg::records_in_range
2002-11-17 18:54:23 +01:00
lenz@mysql.com
996255648b
- Applied required modifications for automake 1.5
...
- "make distcheck" needs to be fixed
2002-11-17 16:45:21 +01:00
monty@mashka.mysql.fi
adfad220f4
Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0
2002-11-16 21:58:09 +02:00
monty@mashka.mysql.fi
1a96948e81
Small improvement to alloc_root
...
Add support for LIMIT # OFFSET #
Changed lock handling: Now all locks should be stored in TABLE_LIST instead of passed to functions.
Don't call query_cache_invalidate() twice in some cases
mysql_change_user() now clears states to be equal to close + connect.
Fixed a bug with multi-table-update and multi-table-delete when used with LOCK TABLES
Fixed a bug with replicate-do and UPDATE
2002-11-16 20:19:10 +02:00
Sinisa@sinisa.nasamreza.org
5a38621cc2
Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-11-16 14:31:48 +02:00
bell@sanja.is.com.ua
72d3103d70
Merge abelkin@work.mysql.com:/home/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1
2002-11-16 14:13:23 +02:00
bell@sanja.is.com.ua
7f4ee30de1
Fixed bugs pointed by "Crash with 'big' derivated table in MySQL-4.1" bugreport
...
- fixed switching from heap to MyISAM table
- fixed error handler
2002-11-16 00:01:48 +02:00
heikki@hundin.mysql.fi
7e7027ae23
ha_innodb.cc:
...
Remove unintentionally pushed printf
2002-11-15 23:10:51 +02:00
heikki@hundin.mysql.fi
1079b93640
ha_innodb.cc:
...
Fix another bug introduced in 4.0.4 in AUTO_INCREMENT and deadlock or lock wait timeout
2002-11-15 22:59:16 +02:00
Sinisa@sinisa.nasamreza.org
1ef2528e86
Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2002-11-15 22:02:19 +02:00
Sinisa@sinisa.nasamreza.org
262c501060
A fix for safe updates
2002-11-15 22:01:28 +02:00
Sinisa@sinisa.nasamreza.org
014073b013
A fix for the bug when MyISAM tmp table has to be created in order
...
to resolve derived table.
Will make a test case for this quite soon.
2002-11-15 19:58:07 +02:00
heikki@hundin.mysql.fi
be6e811f51
ha_innodb.cc:
...
Fix bug intoduced in 4.0.4 in REPLACE and AUTO_INCREMENT: if replace did an update, then auto-inc counter was left 1 too low
2002-11-15 18:46:23 +02:00
Sinisa@sinisa.nasamreza.org
4e6f5f2d12
few small bug fixes ...
2002-11-15 16:37:44 +02:00
Sinisa@sinisa.nasamreza.org
75c7083996
Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-11-15 13:51:25 +02:00
bar@bar.mysql.r18.ru
41554da7ff
move like_range into CHARSET_INFO structure
2002-11-15 11:44:23 +04:00
bar@bar.mysql.r18.ru
6f110035b9
Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
...
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
2002-11-15 11:01:04 +04:00
serg@serg.mysql.com
b4cc92a3d9
Merge serg.mysql.com:/usr/home/serg/Abk/mysql
...
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-11-14 22:42:19 +01:00
serg@serg.mysql.com
822d4bd037
better fix for OPTIMIZE bug
2002-11-14 22:39:46 +01:00
Sinisa@sinisa.nasamreza.org
4143064e58
Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-11-14 22:10:17 +02:00
Sinisa@sinisa.nasamreza.org
93adaa6d28
Actually, I do it in order to pull new stuff
2002-11-14 22:08:25 +02:00
wax@mysql.com
8827109cd0
Merge mysql.com:/home/wax/mysql-4n into mysql.com:/home/wax/mysql-4sm
2002-11-15 00:18:37 +05:00
wax@mysql.com
e91d1b2cbe
Add shared memory protocol and option --protocol
2002-11-15 00:16:30 +05:00
bar@bar.mysql.r18.ru
660f52ab26
wild_case_compate(&String, &String, escape) doesn't exist anymor
2002-11-14 17:25:34 +04:00
bar@bar.mysql.r18.ru
76ed2fc40a
removed unused function
...
some bug fixes
2002-11-14 16:47:48 +04:00
monty@mashka.mysql.fi
aa67a79632
Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0
2002-11-14 12:35:33 +02:00
monty@mashka.mysql.fi
7a70332836
Portability fix when using -DBIG_TABLES
2002-11-14 12:21:36 +02:00
bell@sanja.is.com.ua
979f27ee4a
fixed bug in cyclic reference refinition
2002-11-14 09:43:24 +02:00
serg@serg.mysql.com
31fa2c5084
merged
2002-11-13 23:38:19 +01:00
bell@sanja.is.com.ua
b724f02cd4
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1
2002-11-14 00:26:40 +02:00
bell@sanja.is.com.ua
41d9311621
fixed cyclic reference bug
2002-11-14 00:26:18 +02:00
serg@serg.mysql.com
8a088f2e3c
optimize table corruption fixed, though more clean fix is desired.
...
Fix for another optimize bug is undone, as the new one handles both cases.
test added
2002-11-13 22:55:32 +01:00
serg@serg.mysql.com
9b0aca768d
removed redundant line
2002-11-13 15:57:29 +01:00
bar@bar.mysql.r18.ru
f628df0768
Some macros to make life easier
2002-11-13 17:58:07 +04:00
Sinisa@sinisa.nasamreza.org
84e18e15d0
Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2002-11-13 14:48:28 +02:00
bell@sanja.is.com.ua
9ef972fd2c
Merge abelkin@work.mysql.com:/home/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/mysql-4.1
2002-11-13 13:10:40 +02:00
bell@sanja.is.com.ua
7f514010e5
fixed possible bug
2002-11-13 13:07:58 +02:00
bar@bar.mysql.r18.ru
bb3a5f8500
Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
...
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
2002-11-13 14:37:30 +04:00
bell@sanja.is.com.ua
d8f1d74fe5
fixed bug of derived table in subselect
...
fixed bug in error handling
2002-11-13 11:59:03 +02:00
miguel@hegel.local
3cd36e1452
Typo fix (duplicate functions body)
2002-11-12 22:11:59 -02:00
bell@sanja.is.com.ua
07c9266764
fixed error handling
...
fixed subselects in ORDER bug
2002-11-13 01:14:39 +02:00
monty@mashka.mysql.fi
07b4140c85
Ensure that mysql_home ends in FN_LIBCHAR after realpath()
2002-11-12 23:26:10 +02:00
Sinisa@sinisa.nasamreza.org
abec0225fc
small fix
2002-11-12 17:41:31 +02:00
Sinisa@sinisa.nasamreza.org
c92bbccbc1
Merge
2002-11-12 16:27:52 +02:00
Sinisa@sinisa.nasamreza.org
9ef50038f8
IGNORE_INDEX fix for 4.0
2002-11-12 16:22:26 +02:00
bar@bar.mysql.r18.ru
6b1fe32ad5
Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
...
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
2002-11-12 17:42:08 +04:00
bar@bar.mysql.r18.ru
96448cd1ba
Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
...
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
2002-11-12 17:33:13 +04:00
bar@bar.mysql.r18.ru
a3a5e9d0c6
These functions are now UCS2 compatible:
...
CURDATE()
FROM_DAYS()
CURTIME()
NOW()
SEC_TO_TIME()
FROM_UNIXTIME()
DATE_ADD_INTERVAL()
2002-11-12 17:32:36 +04:00
bell@sanja.is.com.ua
7e7939ee03
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1
2002-11-12 15:27:11 +02:00
Sinisa@sinisa.nasamreza.org
d66889bf4a
Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-11-12 14:41:31 +02:00
Sinisa@sinisa.nasamreza.org
7bd4fb813a
some code cleanup as per CTO's instructions plus a small bug fix with
...
a corresponding test case....
2002-11-12 14:40:32 +02:00
monty@mashka.mysql.fi
d840057ee9
Fix after last merge
2002-11-12 14:09:18 +02:00
bell@sanja.is.com.ua
7187fa9ed4
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1
2002-11-12 14:00:38 +02:00
monty@mashka.mysql.fi
e634770406
merge
2002-11-12 13:28:58 +02:00
bar@bar.mysql.r18.ru
8a7acf8aa6
MONTHNAME() & DAYNAME() are now UCS2 compatible
2002-11-12 14:58:59 +04:00
monty@mashka.mysql.fi
97bb57f765
Extended WEEK() to be able to handle ISO weeks.
...
unlink socket file if mysqld dies on startup
Some optimization of AND expressions
2002-11-12 12:42:42 +02:00
serg@serg.mysql.com
7720348bd2
removed DBUG_ENTER/RETURN tags
2002-11-11 22:43:07 +01:00
Sinisa@sinisa.nasamreza.org
8fa715304f
Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-11-11 17:47:07 +02:00
Sinisa@sinisa.nasamreza.org
c6b0d33619
some bug fixes related to derived tables
2002-11-11 17:45:23 +02:00
bell@sanja.is.com.ua
3fac3a2578
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1
2002-11-11 17:29:25 +02:00
bell@sanja.is.com.ua
62e4aca91b
fixed select_lex & max_join_size parameters with BIG_TABLES
2002-11-11 17:28:58 +02:00
bar@bar.mysql.r18.ru
442509acdd
USER(), DATABASE() and CHARSET() functions are now UCS2 compatible
...
Bug fix in ctype-utf8.c
2002-11-11 18:43:33 +04:00
monty@mashka.mysql.fi
876f3f4d30
Fixed that NULL and 0 returns 0 instead of NULL
...
This is coded to not cause a speed impact on top level AND expressions where we don't care if an AND expression returns 0 or NULL
2002-11-11 15:57:35 +02:00
bar@bar.mysql.r18.ru
d1fd7bdacf
thread charset related improvements
2002-11-11 16:46:11 +04:00
Sinisa@sinisa.nasamreza.org
408d7b2d4c
Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-11-11 14:05:57 +02:00
Sinisa@sinisa.nasamreza.org
89adb79aad
small bug fix
2002-11-11 14:04:50 +02:00
bar@bar.mysql.r18.ru
e8b101a86e
Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
...
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
2002-11-11 13:11:12 +04:00
bar@bar.mysql.r18.ru
098b974483
For coding convenuence cs->mbmaxlen is now 1 for 8bit charsets
2002-11-11 13:10:39 +04:00
bell@sanja.is.com.ua
063ffd2d67
prevent using expernal fields in derived tables
2002-11-11 10:49:41 +02:00
bell@sanja.is.com.ua
46a74ce73b
fix of yet another join_free bug
...
decreased number of check of "!join->select_lex->dependent"
2002-11-11 00:15:38 +02:00
bar@bar.mysql.r18.ru
9567611577
Fix syntax to be more clean:
...
SHOW CREATE DATABASE [WITH IF NOT EXISTS] dbname
2002-11-10 14:45:21 +04:00
serg@serg.mysql.com
520fe4ff89
Merge work:/home/bk/mysql-4.0
...
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-11-09 20:29:22 +01:00
serg@serg.mysql.com
65f276f10c
merged
2002-11-09 19:27:28 +01:00
serg@serg.mysql.com
6b8bf756b1
IGNORE/USE INDEX now work with HA_EXTRA_KEYREAD
2002-11-09 19:15:46 +01:00
heikki@hundin.mysql.fi
648b50660b
ha_innodb.cc:
...
Try to skip over corrupt records in SELECT if innodb_force_recovery > 0; print more page hex dumps in CHECK TABLE
2002-11-09 18:34:52 +02:00
Sinisa@sinisa.nasamreza.org
d96c670c70
Some code optimisations related to EXPLAIN of derived tables and the
...
resulting code cleanup in our main loop.
2002-11-09 15:40:46 +02:00
monty@hundin.mysql.fi
d0ee72c801
Merge work:/my/mysql-4.0 into hundin.mysql.fi:/my/mysql-4.0
2002-11-09 13:40:44 +02:00
monty@hundin.mysql.fi
b0fae584b9
Portability fixes for HP compiler and HPUX11
2002-11-09 13:26:46 +02:00
monty@hundin.mysql.fi
e08ed8a582
Fixed bug in MAX() optimization when used with JOIN and ON expressions
2002-11-09 09:51:03 +02:00
serg@serg.mysql.com
eb96421a11
corrected error message for OPTIMIZE/ANALYZE/etc,
...
also for InnoDB that supports CHECK table but not REPAIR
2002-11-08 22:22:23 +01:00
monty@hundin.mysql.fi
0f14b3c27b
Merge from 3.23 to get fix for GROUP BY bug
2002-11-08 15:12:51 +02:00
monty@hundin.mysql.fi
771f55023e
Merge work:/my/mysql-4.0 into hundin.mysql.fi:/my/mysql-4.0
2002-11-08 15:12:50 +02:00
monty@hundin.mysql.fi
81503e476a
Fixed rare core dump bug when using complicated GROUP BY query that didn't return any results.
...
This only showed up under heavy load.
2002-11-08 09:58:28 +02:00
serg@sergbook.mysql.com
cd6bf73f20
manually merged
2002-11-07 21:56:24 +01:00
Sinisa@sinisa.nasamreza.org
bd6f8e0b5f
Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-11-07 20:14:15 +02:00
Sinisa@sinisa.nasamreza.org
db99aeb241
Small fix to avoid problems in building with --without-debug
2002-11-07 20:11:55 +02:00