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

2441 commits

Author SHA1 Message Date
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
bell@sanja.is.com.ua
c78ae20589 ALL/ANY/SOME 
decreasing number of rules in sql_yacc.yy to satisfy bison limitation
fixed subselect Items initializer methods
 2002-11-07 23:45:19 +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
monty@hundin.mysql.fi
8d283a3d73 Portability fix (accidently left out from last changeset) 2002-11-07 19:25:27 +02:00
monty@hundin.mysql.fi
aa4e165808 Portability fix extern "C" static -> extern "C" 2002-11-07 12:49:02 +02:00
monty@butch.
890b39bb68 merge 2002-11-07 12:49:01 +02:00
monty@hundin.mysql.fi
db6cbba239 Merge work:/my/mysql-4.0 into hundin.mysql.fi:/my/mysql-4.0 2002-11-07 04:03:44 +02:00
monty@hundin.mysql.fi
65badfff1a Put temporary files in binlog cache when using BEGIN/COMMIT 
Let MySQL 4.0 read 4.1 .frm files without 4.1 specific extensions
New variables @@rand_seed1 and @@rand_seed2 (used by replication)
DROP TEMPORARY TABLE
 2002-11-07 04:02:37 +02:00
monty@butch.
a2bdf9265f Portability fixes for Fortre C++ 5.0 (on Sun) in 32 and 64 bit modes. 2002-11-07 03:54:00 +02:00
bell@sanja.is.com.ua
7e8b8cddfd Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/work-in-4.1
 2002-11-06 22:40:45 +02:00
bell@sanja.is.com.ua
38787c5d65 cleanup & fixing possible bug in select's error handling 2002-11-06 22:38:06 +02:00
bell@sanja.is.com.ua
c0932c7bea Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/work-in-4.1
 2002-11-06 22:35:17 +02:00
serg@sergbook.mysql.com
7ad5882da5 BETWEEN fixed 2002-11-06 16:21:41 +01:00
bar@bar.mysql.r18.ru
2434be61f8 String->copy() now has a charset arg 2002-11-06 17:43:22 +04:00
bar@bar.mysql.r18.ru
86b633379c Some charset code clean-ups 2002-11-06 17:01:12 +04:00
bar@bar.mysql.r18.ru
5d45eae0c5 Merge abarkov@work.mysql.com:/home/bk/mysql-4.1 
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
 2002-11-06 15:51:22 +04:00
bar@bar.mysql.r18.ru
9a9e7ce0f4 Item->thd_charset() - returns a default charset which should be used 
to compose strings appeared without charset context, for example,
in convertion from numer into string type.
 2002-11-06 15:49:53 +04:00
vva@genie.(none)
9c1b89db57 Merge genie.(none):/home/vva/work/mysql.orig/compileable/4.1 
into genie.(none):/home/vva/work/lex_hash/4.1
 2002-11-06 13:45:01 +04:00
peter@mysql.com
8238d98ba9 Merge pzaitsev@work.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/pz/mysql/mysql-4.0-root
 2002-11-06 12:38:52 +03:00
peter@mysql.com
5968a5ea25 Final decimal bug fix changeset (hope) 2002-11-06 12:35:16 +03:00
vva@genie.(none)
491debcc21 Merge genie.(none):/home/vva/work/mysql.orig/compileable/4.1 
into genie.(none):/home/vva/work/lex_hash/4.1
 2002-11-06 13:05:42 +04:00
vva@genie.(none)
01da261574 new version of sql/gen_lex_hash.cc 2002-11-06 13:03:38 +04:00
serg@sergbook.mysql.com
ecfa37baa5 Merge 2002-11-06 09:52:13 +01:00
gluh@gluh.(none)
98579955d6 Merge sgluhov@work.mysql.com:/home/bk/mysql-4.0 
into gluh.(none):/home/gluh/mysql-4.0.bklast
 2002-11-06 12:19:06 +04:00
bar@bar.mysql.r18.ru
8229d282f7 Extensions to support this: 
SHOW CREATE DATABASE [IF NOT EXISTS] dbname

Version dependant parts are displayed in appropriative comments:
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `ucs` /*!40100 DEFAULT CHARACTER SET ucs2*/
 2002-11-06 12:01:38 +04:00
peter@mysql.com
21601b51c3 Merge mysql.com:/home/pz/mysql/mysql-4.0-root 
into mysql.com:/home/pz/mysql/mysql-4.0
 2002-11-06 10:06:18 +03:00
heikki@hundin.mysql.fi
db1693101b Many files: 
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
 2002-11-06 00:41:27 +02:00
monty@hundin.mysql.fi
a6e5f9217c Merge work:/my/mysql-4.0 into hundin.mysql.fi:/my/mysql-4.0 2002-11-06 00:41:26 +02:00
bell@sanja.is.com.ua
6ed210db68 fixed bdb transaction with query cache bug 2002-11-06 00:41:25 +02:00
monty@hundin.mysql.fi
5333cfb429 Removed wrong patch to fix DATE BETWEEN TIMESTAMP1 AND TIMESTAMP2 
Some simple optimizations
 2002-11-05 22:45:42 +02:00
bell@sanja.is.com.ua
e32a982189 test of join_free bug 2002-11-05 21:47:20 +02:00
serg@sergbook.mysql.com
d4783821ba merged 2002-11-05 17:10:31 +01:00
serg@sergbook.mysql.com
6f963dad66 added DBUG_ENTER/RETURN tags, dbug_add_tags.pl bugfix 2002-11-05 16:06:11 +01:00
serg@sergbook.mysql.com
6cd5270972 DBUG_ENTER/RETURN tags added 
perl script to tag all the functions in a C/C++ file automatically
 2002-11-05 15:15:56 +01:00
serg@sergbook.mysql.com
5715252238 Merge work:/home/bk/mysql 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql
 2002-11-05 11:55:17 +01:00
bell@sanja.is.com.ua
a5a3913e36 after merging fix 2002-11-05 11:59:18 +02:00
bell@sanja.is.com.ua
a90b923bef Fixed accidentally inverted assert condition 2002-11-05 11:24:44 +02:00
bell@sanja.is.com.ua
1575f62374 IN subselect erged with current 4.1 (pointer conversion) 2002-11-05 11:21:40 +02:00
gluh@gluh.(none)
7bf903ea10 Error code for ssl connection 
Fix bug when server hang(with SSL, with modified libmysql)
Add options master-ssl-capath and master-ssl-cipher
Add some error checking(SSL)
 2002-11-05 12:05:58 +04:00
bell@sanja.is.com.ua
e0f14c2716 move similar code to inline function 2002-11-05 01:10:05 +02:00
serg@sergbook.mysql.com
27d07047bb TEMPORARY MERGE tables are allowed 2002-11-05 00:00:51 +01:00
monty@hundin.mysql.fi
537f1c2f1e Removed wrong bug fix for problem with timestamp and BETWEEN. 
Will be properly fixed in 4.1 and 5.0
 2002-11-05 00:24:59 +02:00
monty@hundin.mysql.fi
79c31cdf62 Merge work:/my/mysql-3.23 into hundin.mysql.fi:/my/mysql-3.23 2002-11-05 00:08:45 +02:00
monty@hundin.mysql.fi
685dba5bac Fix to get core file on Linux 2002-11-05 00:04:36 +02:00
bell@sanja.is.com.ua
45f098bf60 moved similar code to function 
onversion with check
 2002-11-04 22:12:45 +02:00
bell@sanja.is.com.ua
bb49de5ff5 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/work-pointer-4.1
 2002-11-04 15:45:54 +02:00
bell@sanja.is.com.ua
c94b39134f Fixed error handling bug 2002-11-04 00:56:25 +02:00
serg@sergbook.mysql.com
f7da25ec71 fixed a bug where "MATCH ... AGAINST () >=0" was treated as if it was > 2002-11-02 20:35:32 +01:00
peter@mysql.com
46b504d81f Merge mysql.com:/home/pz/mysql/mysql-4.0-root 
into mysql.com:/home/pz/mysql/mysql-4.0
 2002-11-02 17:30:20 +03:00
monty@hundin.mysql.fi
e52816d779 Merge work:/my/mysql-4.0 into hundin.mysql.fi:/my/mysql-4.0 2002-10-31 16:43:42 +02:00
peter@mysql.com
1b21299569 Merge mysql.com:/home/pz/mysql/mysql-4.0-root 
into mysql.com:/home/pz/mysql/mysql-4.0
 2002-10-31 13:43:41 +03:00
heikki@hundin.mysql.fi
23657e8c33 srv0start.h, srv0start.c, ha_innodb.cc: 
Add check that sizeof(trx_t) is the same in ha_inndob.cc and InnoDB compilation modules
 2002-10-31 12:03:34 +02:00
peter@mysql.com
9bb6dea7ba Merge mysql.com:/home/pz/mysql/mysql-4.0-root 
into mysql.com:/home/pz/mysql/mysql-4.0
 2002-10-31 12:57:57 +03:00
heikki@hundin.mysql.fi
f51bc42cf5 ha_innodb.cc: 
Fix bug: mysqld-debug-max failed standard test because a safe mutex size was seen as 24 bytes in the body of ha_innodb.cc, but 64 bytes in read0read.c
 2002-10-31 11:32:42 +02:00
monty@hundin.mysql.fi
2bcd60e113 Merge 2002-10-31 10:44:20 +02:00
monty@mashka.mysql.fi
9eab6fb888 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2002-10-31 10:44:19 +02:00
nick@mysql.com
3e133ebabb Merge mysql.com:/home/nick/mysql/repository/mysql-4.1 
into mysql.com:/home/nick/mysql/mysql-4.1
 2002-10-30 23:58:52 -07:00
nick@mysql.com
168a489d34 fix commit thinko 2002-10-30 23:48:04 -07:00
bell@sanja.is.com.ua
ee9b1b6ec0 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/work-in-4.1
 2002-10-31 08:40:59 +02:00
bell@sanja.is.com.ua
3e8a5e1d34 IN subselect with ORDER BY, HAVING & sum functions 2002-10-31 02:11:59 +02:00
heikki@hundin.mysql.fi
629576aff6 ha_innobase.cc: 
Backport from 4.0: Fix bug in MySQL-3.23 ORDER BY from a table with no PRIMARY KEY and where the user had added UNIQUE indexes with CREATE INDEX
pars0grm.y:
  Move inclusion of math.h after univ.i also in the .y file; this fix is already done in 4.0
 2002-10-31 00:30:19 +02:00
heikki@hundin.mysql.fi
ab12784d5f ha_innodb.cc: 
Fix bug in MySQL-3.23 ORDER BY from a table with no PRIMARY KEY and where the user had added UNIQUE indexes with CREATE INDEX
 2002-10-31 00:26:04 +02:00
lenz@mysql.com
be932e7345 - Applied fix made in 4.0 tree to fix a bug when comparing a datetime 
column with timestamp values with BETWEEN clause
 2002-10-30 21:55:56 +01:00
Sinisa@sinisa.nasamreza.org
4c1ef311e0 Merge sinisa@work.mysql.com:/home/bk/mysql-4.0 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
 2002-10-30 22:11:16 +02:00
Sinisa@sinisa.nasamreza.org
fbe9577516 A fix for bug when comparing a datetime column with timestamp 
values with BETWEEN clause
 2002-10-30 22:08:34 +02:00
Sinisa@sinisa.nasamreza.org
9b012db53e small fix when building in --without-debug 2002-10-30 19:30:57 +02:00
peter@mysql.com
043ea441d7 Decimal field fix overflow 2002-10-30 19:39:52 +03:00
Sinisa@sinisa.nasamreza.org
26c6d970d9 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2002-10-30 16:59:49 +02:00
peter@mysql.com
bac793e2b1 Merge mysql.com:/home/pz/mysql/mysql-4.0-root 
into mysql.com:/home/pz/mysql/mysql-4.0
 2002-10-30 17:57:27 +03:00
Sinisa@sinisa.nasamreza.org
5fbd7b63c5 changes for mysqladmin debug 
and a bug fix for derived tables
 2002-10-30 16:52:12 +02:00
gluh@gluh.(none)
808d87f810 Some changes for SSL 2002-10-30 18:27:15 +04:00
bell@sanja.is.com.ua
465664a124 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/work-in-4.1
 2002-10-30 16:09:06 +02:00
vva@genie.(none)
4d22168d68 Merge vvagin@work.mysql.com:/home/bk/mysql-4.1 
into genie.(none):/home/vva/work/mysql-4.1.help/mysql-4.1.help_res
 2002-10-30 17:40:26 +04:00
vva@genie.(none)
30a59d34ab addition correction for 'help' command 2002-10-30 17:38:07 +04:00
bar@bar.mysql.r18.ru
c1017541dc Merge abarkov@work.mysql.com:/home/bk/mysql-4.1 
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
 2002-10-30 17:30:09 +04:00
bar@bar.mysql.r18.ru
bca773e6df Use item->charset() instead of item->str_value.charset() 2002-10-30 17:28:40 +04:00
bar@bar.mysql.r18.ru
03e7fc3180 date and time fields now have charset arg in constructor 
my_charset_latin1
 2002-10-30 17:09:37 +04:00
ram@mysql.r18.ru
8bb19facd5 Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1 
into mysql.r18.ru:/usr/home/ram/mysql-4.1
 2002-10-30 16:44:23 +04:00
bar@bar.mysql.r18.ru
b43876b9dd All String->set() now have charset argument 2002-10-30 16:19:43 +04:00
ram@mysql.r18.ru
a7254d1505 Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1 
into mysql.r18.ru:/usr/home/ram/mysql-4.1
 2002-10-30 16:02:02 +04:00
ram@mysql.r18.ru
5e09392faa BDB 4.1.24 2002-10-30 15:57:05 +04:00
peter@mysql.com
e77e55ed66 Merge mysql.com:/home/pz/mysql/mysql-4.0-root 
into mysql.com:/home/pz/mysql/mysql-4.0
 2002-10-30 14:43:43 +03:00
bell@sanja.is.com.ua
1f20cf3b42 removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion (SCRUM) 
fixed some possible bugs
 2002-10-30 13:18:52 +02:00
bar@bar.mysql.r18.ru
637b97991d Use item->set_charset() instead of item->str_value.set_charset() 2002-10-30 15:15:18 +04:00
monty@mashka.mysql.fi
39329fd59a Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2002-10-30 11:58:53 +02:00
bar@bar.mysql.r18.ru
fef10d9bb1 Preparation to thread specific default charset 2002-10-30 13:05:27 +04:00
nick@mysql.com
6d88799e95 Reordered functions--grouped by class now. 
Added comment blocks.
 2002-10-29 23:50:07 -07:00
nick@mysql.com
c20b489167 Merge mysql.com:/home/nick/mysql/repository/mysql-4.1 
into mysql.com:/home/nick/mysql/mysql-4.1
 2002-10-29 15:51:41 -07:00
nick@mysql.com
6ea83e1127 Added comment blocks for all functions 2002-10-29 15:12:47 -07:00
nick@mysql.com
4b7897fc76 Changed binlog name padding from binlog.001 to binlog.000001 2002-10-29 15:11:13 -07:00
monty@mashka.mysql.fi
bb7f37ab2e merge 2002-10-29 23:54:37 +02:00
heikki@hundin.mysql.fi
9153d88c6b Many files: 
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
mysqld.cc:
  Change MySQL default isolation level to REPEATABLE READ; note that InnoDB has always had that default, and BDB and MyISAM always run at SERIALIZABLE level anyway
 2002-10-29 23:16:46 +02:00
monty@mashka.mysql.fi
5343d4c969 Added --skip-safemalloc to mysqltest 
Added bug fix from 3.23 for AIX 4.3.3 and gcc 3.x
Small change in EXCHANGE output
Propagate open-files-limit from mysqld_safe -> mysqld
Fixed speed bug in GROUP BY
Added quotes around database name in CREATE DATABASE db_name (for binary log)
 2002-10-29 22:56:30 +02:00
peter@mysql.com
b8ded6e9da Merge mysql.com:/home/pz/mysql/mysql-4.0-root 
into mysql.com:/home/pz/mysql/mysql-4.0
 2002-10-29 23:44:17 +03:00