mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 22:12:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
6219 commits 2780 branches 343 tags 1.6 GiB
Commit graph

2638 commits

Author SHA1 Message Date
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
peter@mysql.com
961317599e Merge mysql.com:/home/pz/mysql/mysql-4.1-root 
into mysql.com:/home/pz/mysql/mysql-4.1
 2002-11-08 12:47:53 +03: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
peter@mysql.com
04d140538a Merge mysql.com:/home/pz/mysql/mysql-4.1-root 
into mysql.com:/home/pz/mysql/mysql-4.1
 2002-11-06 18:51:20 +03: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
peter@mysql.com
21066bde1b Merge mysql.com:/home/pz/mysql/mysql-4.1-root 
into mysql.com:/home/pz/mysql/mysql-4.1
 2002-11-06 12:51:07 +03: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
peter@mysql.com
8bcace7043 Merge mysql.com:/home/pz/mysql/mysql-4.1-root 
into mysql.com:/home/pz/mysql/mysql-4.1
 2002-11-05 21:31:03 +03:00
peter@mysql.com
ecedc7ac35 More work on secure authentication. Commit for merge 2002-11-05 20:21:55 +03: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
26a1d8885d Merge mysql.com:/home/pz/mysql/mysql-4.1-root 
into mysql.com:/home/pz/mysql/mysql-4.1
 2002-10-31 13:02:29 +03: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
peter@mysql.com
cc18dc7291 Merge mysql.com:/home/pz/mysql/mysql-4.1-root 
into mysql.com:/home/pz/mysql/mysql-4.1
 2002-10-30 18:03:09 +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
76a166072c Merge mysql.com:/home/pz/mysql/mysql-4.1-root 
into mysql.com:/home/pz/mysql/mysql-4.1
 2002-10-30 14:47:05 +03: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
03f97c1980 Merge mysql.com:/home/pz/mysql/mysql-4.1-root 
into mysql.com:/home/pz/mysql/mysql-4.1
 2002-10-29 23:47:29 +03: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
monty@hundin.mysql.fi
1e0538324d Added back old LARGEFILE handling 
Fixed reference to freed memory in acl_init()/grant_init()
Fixed possible memory leak. (Could only happen in very strange circumstances)
Fixed bug in ALTER TABLE with BDB tables
Updated mysql-test for valgrind
 2002-10-29 21:59:03 +02:00
nick@mysql.com
84779e3999 Merge mysql.com:/home/nick/mysql/repository/mysql-3.23 
into mysql.com:/home/nick/mysql/mysql-3.23
 2002-10-29 12:28:45 -07:00
nick@mysql.com
e10d3ed129 moved RAND initialization from mysqld.cc to sql_class.cc:THD::THD() 2002-10-29 12:28:14 -07:00
Sinisa@sinisa.nasamreza.org
2452182844 Merge bk://work.mysql.com:7001 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
 2002-10-29 14:21:23 +02:00
vva@genie.(none)
1c0f1712ca correct English message 2002-10-29 13:42:31 +04:00
peter@mysql.com
20cbe47a5f Merge mysql.com:/home/pz/mysql/mysql-4.1-root 
into mysql.com:/home/pz/mysql/mysql-4.1
 2002-10-29 12:33:27 +03:00
peter@mysql.com
5a38ed50ae Merge mysql.com:/home/pz/mysql/mysql-4.0-root 
into mysql.com:/home/pz/mysql/mysql-4.0
 2002-10-29 12:30:22 +03:00
vva@genie.(none)
2196aae6b4 correct English in last message 
delete ugly comma
 2002-10-29 12:52:34 +04:00
peter@mysql.com
bdca1d10a0 Merge mysql.com:/home/pz/mysql/mysql-4.1-root 
into mysql.com:/home/pz/mysql/mysql-4.1
 2002-10-29 10:36:43 +03:00
Sinisa@sinisa.nasamreza.org
171f8c014a finally pushing what I could not due to BK problems 2002-10-28 17:04:18 +02:00
vva@genie.(none)
9adf688be6 add help command on server side 2002-10-28 17:44:19 +04:00
peter@mysql.com
a3a0167936 Merge mysql.com:/home/pz/mysql/mysql-4.1-root 
into mysql.com:/home/pz/mysql/mysql-4.1
 2002-10-28 10:48:51 +03:00
bell@sanja.is.com.ua
6bc0286fed 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-27 23:27:57 +02:00
bell@sanja.is.com.ua
07727576b8 IN subselect 2002-10-27 23:27:00 +02:00
bell@sanja.is.com.ua
7777d2b819 fixed union rexecution bug 2002-10-27 21:29:40 +02:00
vva@genie.(none)
8ec9edac55 add absent message that exist in english version 2002-10-27 20:49:45 +04:00
peter@mysql.com
86f0ce87c9 Merge mysql.com:/home/pz/mysql/mysql-4.1-root 
into mysql.com:/home/pz/mysql/mysql-4.1
 2002-10-27 19:38:17 +03:00
serg@serg.mysql.com
295da156d6 fixed bug in HAVING error handling 
small Item_ref optimization
 2002-10-27 16:22:58 +00:00
peter@mysql.com
1545cbccd3 Merge mysql.com:/home/pz/mysql/mysql-4.1-root 
into mysql.com:/home/pz/mysql/mysql-4.1
 2002-10-27 13:13:31 +03:00
serg@serg.mysql.com
3cfa614241 sql_yacc.yy: 
cleanup
 2002-10-26 18:28:19 +00:00
peter@mysql.com
2884b87f7a Merge mysql.com:/home/pz/mysql/mysql-4.0-root 
into mysql.com:/home/pz/mysql/mysql-4.0
 2002-10-26 22:27:22 +04:00
bell@sanja.is.com.ua
c3127c7eb8 code cleanup 
fixed subselect error handling bug
fixed subselect UNION ALL bug
fixed thd->lex.select restoring
explain UNION subselect bug
 2002-10-26 20:18:37 +03:00
serg@serg.mysql.com
6c0dde39ec bad auto-merge fixed 2002-10-25 23:30:15 +00:00
serg@serg.mysql.com
1a1cafce63 merged 2002-10-25 22:07:04 +00:00
serg@serg.mysql.com
0d4770c706 Merge work:/home/bk/mysql-4.0 
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
 2002-10-25 21:31:16 +00:00
serg@serg.mysql.com
dede6634f6 merged 2002-10-25 21:15:52 +00:00
serg@serg.mysql.com
3c570209df typo fixed 2002-10-25 14:21:55 +00:00
serg@serg.mysql.com
2ed2594c24 Merge work:/home/bk/mysql-4.1 
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
 2002-10-25 14:18:30 +00:00
serg@serg.mysql.com
d552ba7d8a support for HA_READ_PREFIX_LAST_OR_PREV in headres 
full support for HA_READ_PREFIX_LAST_OR_PREV in MyISAM
protected by #if NOT_IMPLEMENTED_YET in opt_range.cc as not all table handlers support it
 2002-10-25 14:09:47 +00:00
bar@bar.mysql.r18.ru
440db4c1dc ENUM/SET fields now have charset too 2002-10-25 15:08:47 +05:00
bar@bar.mysql.r18.ru
ff83d1e4c7 Merge abarkov@work.mysql.com:/home/bk/mysql-4.1 
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
 2002-10-25 13:59:08 +05:00
bar@bar.mysql.r18.ru
95aef91521 BINARY charset is now used instead of binary_flag 2002-10-25 13:58:32 +05:00
bar@bar.mysql.r18.ru
5e32ea70f3 cp1251.conf: 
unicode mapping
 2002-10-25 12:10:39 +05:00
nick@mysql.com
b9007ca6a1 Added missing case for Rand_log_event to Log_event::get_type_str() 2002-10-24 20:20:37 -06:00
nick@mysql.com
26b8fc98d9 Merge nleippe@work.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/nick/mysql/repository/mysql-4.1
 2002-10-24 18:42:34 -06:00
nick@mysql.com
7acf036d17 Merge nleippe@work.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/nick/mysql/repository/mysql-4.0
 2002-10-24 18:40:15 -06:00
nick@mysql.com
59c72048fb changed syntax from SHOW MASTER LOGS to SHOW BINARY LOGS 2002-10-24 18:32:42 -06:00
nick@mysql.com
62f36f0221 altered syntax from SLAVE START|STOP to START|STOP SLAVE 2002-10-24 17:46:14 -06:00
nick@mysql.com
6c22ca4454 Added Rand_log_event 2002-10-24 16:48:34 -06:00
nick@mysql.com
325b68453c fixed prev. commit (was commited in disabled state) 2002-10-24 16:04:38 -06:00
bar@bar.mysql.r18.ru
4b05246e29 Merge abarkov@work.mysql.com:/home/bk/mysql-4.1 
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
 2002-10-25 01:50:12 +05:00
bar@bar.mysql.r18.ru
fa0e9d4d3c Index: 
removed "depriciated" as requested by salle
 2002-10-25 01:49:34 +05:00
nick@mysql.com
eba70d6c80 Moved rand initialization from mysqld.cc to sql_class.cc:THD::THD() 2002-10-24 14:33:24 -06:00
bell@sanja.is.com.ua
21ca25debf fixed update with subselect (FOR REVIEW) 2002-10-24 22:59:29 +03:00
lenz@mysql.com
9b769dbd22 - replaced all occurences of HPUX with HPUX10 (to be prepared for eventual 
differences in HPUX11)
 2002-10-24 14:30:25 +02:00
nick@mysql.com
95b0d768bd added new syntax: 
STOP|START SLAVE
rather than SLAVE STOP|START, which is now deprecated and should be deleted in 4.1
 2002-10-24 03:52:51 -06:00
bar@bar.mysql.r18.ru
0ca3212a8c In database/table charset the keyword DEFAULT is now optional, 
and CHARSET is now the same with CHARACTER SET:

CREATE DATABASE name 
  [DEFAULT] {CHAR SET | CHARACTER SET | CHARSET} csname


CREATE TABLE (...)  [DEFAULT] {CHARSET | CHARACTER SET | CHAR SET} [=] csname

To Paul and Arjen:
However this should be recommended in db option to conform SQL99:
CREATE DATABASE dbname DEFAULT CHARACTER SET csname
In table option there is no SQL99 recommended syntax as far as
table charset is MySQL extension.
 2002-10-24 14:22:42 +05:00
monty@hundin.mysql.fi
36afa9a96e Fixed problem with BDB tables and ALTER TABLE 2002-10-24 01:29:29 +03:00
bell@sanja.is.com.ua
96c56eacf3 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/work-distinct-4.1
 2002-10-23 23:40:17 +03:00
bell@sanja.is.com.ua
c2da10ae18 fixed DISTINCT in subselect bug 
small Item_ref fix
 2002-10-23 23:36:11 +03:00
peter@mysql.com
3d32b14de5 Merge mysql.com:/home/pz/mysql/mysql-4.1-root 
into mysql.com:/home/pz/mysql/mysql-4.1
 2002-10-23 23:28:36 +04:00
peter@mysql.com
7a515381e1 Merge mysql.com:/home/pz/mysql/mysql-4.0-root 
into mysql.com:/home/pz/mysql/mysql-4.0
 2002-10-23 23:25:28 +04:00
bar@bar.mysql.r18.ru
607c0c0168 All these syntaxes now work: 
CREATE TABLE a (...) TYPE isam  CHARSET latin1  MAX_ROWS 1000;
CREATE TABLE a (...) TYPE=isam  CHARSET=latin1  MAX_ROWS=1000;
CREATE TABLE a (...) TYPE isam, CHARSET latin1, MAX_ROWS 1000;
CREATE TABLE a (...) TYPE=isam, CHARSET=latin1, MAX_ROWS=1000;
 2002-10-23 19:18:54 +05:00
bar@bar.mysql.r18.ru
ec542a6c1e Both syntaxes are now working: 
CREATE TABLE a (...) TYPE isam  CHARSET latin1  MAX_ROWS 1000;
CREATE TABLE a (...) TYPE=isam  CHARSET=latin1  MAX_ROWS=1000;
 2002-10-23 18:43:59 +05:00
bar@bar.mysql.r18.ru
e46fce4b99 sql_yacc.yy: 
character set binary didn't work
 2002-10-23 16:00:48 +05:00
bar@bar.mysql.r18.ru
6722c2e713 binary charset 2002-10-23 15:39:41 +05:00
bar@bar.mysql.r18.ru
5bcd7e1a47 New cp1256 charset 2002-10-23 13:58:05 +05:00
nick@mysql.com
1d9225e037 Merge mysql.com:/home/nick/mysql/repository/mysql-4.0 
into mysql.com:/home/nick/mysql/mysql-4.0
 2002-10-22 15:18:11 -06:00
nick@mysql.com
d749b832b2 Added Rand_log_event 2002-10-22 15:17:17 -06:00
peter@mysql.com
ae7e164f8e Merge mysql.com:/home/pz/mysql/mysql-4.1-root 
into mysql.com:/home/pz/mysql/mysql-4.1
 2002-10-22 14:06:53 +04:00
serg@serg.mysql.com
31d702dd68 Merge work:/home/bk/mysql-4.1 
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
 2002-10-22 00:30:17 +00:00
serg@serg.mysql.com
43599856b2 make REPAIR killable 2002-10-22 00:25:36 +00:00
Sinisa@sinisa.nasamreza.org
1f1ed3e99d Small addition to COM_DEBUG 2002-10-21 14:08:37 +03:00
peter@mysql.com
bdee968a2a Automerge 2002-10-20 00:11:15 +04:00
peter@mysql.com
4825e3264d Merge to update to recent tree version 2002-10-20 00:09:11 +04:00
peter@mysql.com
37245fd17f More work on secure connection protocol. commited in order to do the sync with new large pushed 
bunch.
 2002-10-19 23:18:31 +04:00
peter@mysql.com
bc9b6c9fa5 Merge mysql.com:/home/pz/mysql/mysql-4.0-root 
into mysql.com:/home/pz/mysql/mysql-4.0
 2002-10-19 22:37:18 +04:00
serg@serg.mysql.com
9e8c87e74d Merge work:/home/bk/mysql-4.0 
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
 2002-10-18 14:54:51 +00:00
serg@serg.mysql.com
dca6c608eb some DBUG_ENTER/RETURN macro added 
safer GWS_PROB, avoid log(0)
 2002-10-18 14:53:46 +00:00
nick@mysql.com
00d47646d5 Moved rand initialization from mysqld.cc to sql_class.cc:THD::THD() 2002-10-17 14:57:01 -06:00
Sinisa@sinisa.nasamreza.org
4175461c00 Small code improvement in multi-table updates 2002-10-17 21:25:24 +03:00
lenz@mysql.com
f00f2a6515 - fixed typo in mysqld.cc: "agaist" -> "against" 2002-10-17 11:08:04 +02:00
monty@hundin.mysql.fi
e37639814b merge 2002-10-17 11:39:11 +03:00
miguel@hegel.br
927472d025 Added optional NT service and fix the TZ variable bug 2002-10-16 21:51:03 -02:00
monty@hundin.mysql.fi
9ecc5783d6 Fix after merge 2002-10-16 22:48:51 +03:00
Sinisa@sinisa.nasamreza.org
0a242026a8 fix of the small bug in UNION's 2002-10-16 22:27:47 +03:00
Sinisa@sinisa.nasamreza.org
6561faa10e Some small accelerations ... 
I intend to do some more accelerations in mysql_execute_command and
in SQLCOM_SELECT part for which I need to fix EXPLAIN with derived
tables plus few additional items. If this proves to be much I wil
just make it a new SCRUM task
 2002-10-16 21:17:57 +03:00
monty@hundin.mysql.fi
3476dc8f9e Merge hundin.mysql.fi:/my/mysql-4.0 into hundin.mysql.fi:/my/mysql-4.1 2002-10-16 19:31:22 +03:00
monty@hundin.mysql.fi
fbf6ab4465 merge with 4.0.5 2002-10-16 19:30:24 +03:00
monty@hundin.mysql.fi
a54df74af0 Fixes after last merge. 
Ignore changed keyblocks when on does DELETE FROM table_name;
 2002-10-16 19:05:10 +03:00
monty@hundin.mysql.fi
b1f99ce4a2 Added THD as parameter to filesort. Removed not used 'special' argument. 2002-10-16 17:21:47 +03:00
Sinisa@sinisa.nasamreza.org
0f663d346f Merge sinisa@work.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2002-10-16 16:57:42 +03:00
Sinisa@sinisa.nasamreza.org
cd5ff6301e some fixes for SELECT INTO @vars .. 2002-10-16 16:55:08 +03:00
monty@hundin.mysql.fi
26b1bbdbd1 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 2002-10-16 16:34:29 +03:00
monty@hundin.mysql.fi
67d3cd643b Merge with 3.23.54 2002-10-16 13:11:25 +03:00
monty@hundin.mysql.fi
b4343ba939 Fixed bug in LEFT JOIN ... WHERE not_null_key_column=NULL; 2002-10-16 10:32:45 +03:00
bell@sanja.is.com.ua
8c547fae57 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/work-distinct-4.1
 2002-10-16 00:43:43 +03:00
bell@sanja.is.com.ua
21dd4a4dd5 fixed subselect explain bug 2002-10-16 00:42:59 +03:00
jani@rhols221.adsl.netsonic.fi
4143937723 Fixed some bugs in mysql, mysqladmin and mysqld. 2002-10-15 23:34:55 +03:00
serg@serg.mysql.com
0b2f4dac0b ha_myisam::repair should not touch file->save_state (directly, that is) 2002-10-15 15:15:53 +00:00
pem@mysql.com
3c1a311348 SCRUM Task 430: Allowing braces in joins by simply removing them. 
Fixed the remaining join variations, (left, right, natural, etc).
(Previous fix only solved "," and "[cross] join".)
 2002-10-15 16:33:06 +02:00
pem@mysql.com
e1303c7b3c Merge pmartin@work.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/pem/work/mysql-4.0
 2002-10-15 16:12:53 +02:00
monty@hundin.mysql.fi
3712931cc6 Fixed bug in ORDER BY ... LIMIT 2002-10-15 16:47:55 +03:00
monty@hundin.mysql.fi
9bd5f1eadc Merge work:/my/mysql-4.1 into hundin.mysql.fi:/my/mysql-4.1 2002-10-15 01:54:51 +03:00
monty@hundin.mysql.fi
0b54a5c3fc Fix error handling in last patch (BLOB's in temporary tables) if 
create_tmp_table fails.
 2002-10-15 01:52:41 +03:00
bell@sanja.is.com.ua
1ddf863391 removed annecessary assignment found by Monty 2002-10-14 22:41:42 +03:00
monty@hundin.mysql.fi
a975cecf42 Merge 2002-10-14 17:50:44 +03:00
bell@sanja.is.com.ua
ac59446ee3 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/work-distinct-4.1
 2002-10-14 17:50:44 +03:00
Sinisa@sinisa.nasamreza.org
96078b5fc5 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2002-10-14 17:50:44 +03:00
monty@hundin.mysql.fi
302a43f095 Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql 2002-10-14 17:13:45 +03:00
monty@hundin.mysql.fi
68963e91b2 Fixed a bug in key optimizing handling where the expression 
WHERE column_name = key_column_name was calculated as true
for NULL values.
 2002-10-14 17:04:12 +03:00
serg@serg.mysql.com
784aeed98b bad merge fixed 2002-10-14 11:55:28 +00:00
serg@serg.mysql.com
fcb8bc061d merged 2002-10-14 11:36:48 +00:00
bell@sanja.is.com.ua
31107251aa fixed cteate temporary field of subselect bug 2002-10-14 14:33:42 +03:00
serg@serg.mysql.com
fd8e2337f5 Merge work:/home/bk/mysql-4.1 
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
 2002-10-14 10:44:17 +00:00
monty@narttu.mysql.fi
3c7f6a9835 merge 2002-10-14 12:07:16 +03:00
peter@mysql.com
79978dcb0e Fix exponent overflow handling for decimal type. Overflow lead to crash 2002-10-13 21:11:01 +04:00
peter@mysql.com
d448caba6e Merge mysql.com:/home/pz/mysql/mysql-4.1-root 
into mysql.com:/home/pz/mysql/mysql-4.1
 2002-10-13 18:44:17 +04:00
bell@sanja.is.com.ua
d9f998164d fixed bug of multi-level EXPLAIN 2002-10-13 14:25:16 +03:00
Sinisa@sinisa.nasamreza.org
7ba2242803 Two bug fixes 2002-10-12 21:36:39 +03:00
serg@serg.mysql.com
68cd8c47fc --tmpdir=dir1:dir2... uses (is_windows ? ";" : ":") as a delimiter 2002-10-12 17:43:40 +00:00
serg@serg.mysql.com
f7ca3212ea Merge work:/home/bk/mysql-4.1 
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
 2002-10-12 17:40:57 +00:00
Sinisa@sinisa.nasamreza.org
9c8871cf51 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2002-10-12 15:52:51 +03:00
monty@hundin.mysql.fi
9b1d5b6f5f Fixed bug where we could reference a freed tmp_table->table_name variable for some 
GROUP BY ... ORDER BY queries.
 2002-10-12 12:38:48 +03:00
pem@mysql.com
8bd61c3fce Task 430: Allowing braces in joins by simply removing them. 
This is a simple fix, allowing a join_table_list in the right reduction of a
normal_join sequence, instead of just a join_table. This makes things like
"t1, (t2 left join t3)" work, but it also allows "join" and "cross join" instead
of ",".

This should fix the bug reported as:
  Subject: ODBC SQL syntax issue 
  From: Ivan Vazharov 
  Date: Mon, 30 Sep 2002 12:02:42 +0200
 2002-10-12 11:07:54 +02:00
bell@sanja.is.com.ua
f6d9e96fbc fixed subselect * bug 2002-10-12 01:09:47 +03:00
Sinisa@sinisa.nasamreza.org
4df2e3bf40 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2002-10-11 21:50:38 +03:00
Sinisa@sinisa.nasamreza.org
97990887cb SCRUM task 2002-10-11 21:49:10 +03:00
bell@sanja.is.com.ua
b79a4c01e7 fixed bug in subselect value storing 2002-10-11 17:00:11 +03:00
peter@mysql.com
dccfa094e6 Merge mysql.com:/home/pz/mysql/mysql-4.1-root 
into mysql.com:/home/pz/mysql/mysql-4.1
 2002-10-10 15:31:04 +04:00
bar@bar.mysql.r18.ru
11a93ede41 Some reorganization to use less memory as well as to hide some implementation 
aspects into *.c files from *.h files. Some steps to get closer to generating
*.c files from *.conf files again.
 2002-10-10 15:52:32 +05:00
peter@mysql.com
5e873b2075 Merge mysql.com:/home/pz/mysql/mysql-4.1-root 
into mysql.com:/home/pz/mysql/mysql-4.1
 2002-10-09 22:02:43 +04:00
heikki@hundin.mysql.fi
95cecad7d8 ha_innobase.cc: 
Fix bug: if skip-innodb was defined SHOW INNODB STATUS crashed
 2002-10-09 19:52:34 +03:00
bar@bar.mysql.r18.ru
50c391538a my_sortcmp -> my_strnncoll 2002-10-09 16:33:35 +05:00
peter@mysql.com
9731dbc3fd Merge mysql.com:/home/pz/mysql/mysql-4.1-root 
into mysql.com:/home/pz/mysql/mysql-4.1
 2002-10-09 14:50:19 +04:00
bar@bar.mysql.r18.ru
954a47b95a Simple charsets now have strncoll() field too 2002-10-09 15:40:57 +05:00
monty@hundin.mysql.fi
352fcd458f Fixed bug in LOCK TABLES on windows. 2002-10-09 12:05:22 +03:00
peter@mysql.com
6e91d6a8e3 Merge mysql.com:/home/pz/mysql/mysql-4.1-root 
into mysql.com:/home/pz/mysql/mysql-4.1
 2002-10-09 10:10:15 +04:00
bell@sanja.is.com.ua
40c0fd1c6c removed 'this' pointer from initialization list of constructors 2002-10-08 23:49:59 +03:00
monty@narttu.mysql.fi
da2abaf887 Portability fixes to be able to compile MySQL with VC++ 2002-10-08 22:28:24 +03:00
serg@serg.mysql.com
e65536b147 --tmpdir=dir1:dir2:... support in myisamchk 2002-10-08 14:34:04 +00:00
lenz@mysql.com
727e3056d9 Merge mysql.com:/my/mysql-4.0 
into mysql.com:/space/my/mysql-4.0-automake
 2002-10-08 16:22:35 +02:00
serg@serg.mysql.com
4842b82e9f Merge work:/home/bk/mysql-4.1 
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
 2002-10-08 14:17:38 +00:00
monty@hundin.mysql.fi
8af1c6f354 Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql 2002-10-08 16:41:50 +03:00
monty@hundin.mysql.fi
367e2d4396 Remove wrong clear of mysql_port when using --skip-show-databases 2002-10-08 16:40:50 +03:00
serg@serg.mysql.com
3217f2cc06 support for --tmpdir=dir1:dir2:... 2002-10-08 12:39:37 +00:00
bell@sanja.is.com.ua
226535865b removed compiler warnings 2002-10-08 15:34:39 +03:00
heikki@hundin.mysql.fi
2d148b977e ha_innobase.cc: 
test
 2002-10-08 15:17:41 +03:00
bell@sanja.is.com.ua
2715d331f7 fixed couple of bugs in field/reference name resolution 
fixed error handling in subselect fix_field
 2002-10-08 14:50:12 +03:00
nick@mysql.com
60e1175e0c touchup to last fix 2002-10-07 16:39:52 -06:00
nick@mysql.com
204335970b Merge mysql.com:/home/nick/mysql/repository/mysql-3.23 
into mysql.com:/home/nick/mysql/mysql-3.23
 2002-10-07 15:44:00 -06:00
nick@mysql.com
ec04d28468 fixed race that caused sig11s on simultaneous FLUSH LOGS 
(possibly also fixes binlog filename corruption problems--hasn't
been reproduced since)
 2002-10-07 15:42:10 -06:00
bell@sanja.is.com.ua
8d252004dc fixed query cache with system database 
FN_NO_CASE_SENCE used instead of __WIN__ in table name handling of quary cache
 2002-10-08 00:26:15 +03:00
bell@sanja.is.com.ua
ff855e0962 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/work-4.1
 2002-10-07 22:22:26 +03:00
bell@sanja.is.com.ua
09bec43b89 fixed error handling bug 2002-10-07 22:21:17 +03:00
ram@mysql.r18.ru
d987b235c2 Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1 
into mysql.r18.ru:/usr/home/ram/mysql-4.1
 2002-10-07 17:51:05 +05:00
ram@mysql.r18.ru
2e1a0c031a auto_increment for heap tables 
test case
 2002-10-07 17:49:03 +05:00
peter@mysql.com
ba8c05dab3 Merge mysql.com:/home/pz/mysql/mysql-4.1-root 
into mysql.com:/home/pz/mysql/mysql-4.1
 2002-10-07 10:23:08 +04:00
bell@sanja.is.com.ua
23de67efae after merging fix 2002-10-07 00:56:21 +03:00
peter@mysql.com
c4ea39d810 Merge mysql.com:/home/pz/mysql/mysql-4.1-root 
into mysql.com:/home/pz/mysql/mysql-4.1
 2002-10-06 13:43:42 +04:00
peter@mysql.com
d21402052c One more commit to do the merge of new 4.1 tree 2002-10-06 13:42:16 +04:00
heikki@hundin.mysql.fi
cc1db6142f btr0cur.c: 
Do not let range estimator to return over 1 / 2 of total rows in table; use longlong in range estimation
btr0cur.h, ha_innobase.cc:
  Use longlong in range estimation, in case there are > 4 billion rows
 2002-10-05 22:23:51 +03:00
bell@sanja.is.com.ua
199f667c19 merging 2002-10-04 14:15:59 +03:00
lenz@mysql.com
fa0c110cd2 Merge mysql.com:/my/mysql-4.0 
into mysql.com:/space/my/mysql-4.0-automake
 2002-10-03 21:12:28 +02:00
peter@mysql.com
de57e9ba35 Merge mysql.com:/home/pz/mysql/mysql-4.1-root 
into mysql.com:/home/pz/mysql/mysql-4.1
 2002-10-03 22:48:53 +04:00
peter@mysql.com
f3c51eec31 One more commit required to merge second pack of Monty's patches 2002-10-03 22:42:13 +04:00
heikki@hundin.mysql.fi
cbd9978b3f ha_innobase.cc: 
Remove unintentionally pushed assert
 2002-10-03 19:48:24 +03:00
monty@mashka.mysql.fi
61488a7b98 Fixed bug that causes select test to fail 
Now MySQL 4.1 is up to date with all patches from 4.0.4 and passes the test suite.
 2002-10-03 19:44:46 +03:00
heikki@hundin.mysql.fi
609524817f ha_innobase.cc, ha_innobase.h: 
Backport from 4.0.4 the bug fix of the crash when a temporary table was created inside LOCK TABLES and used
 2002-10-03 19:10:49 +03:00
bell@sanja.is.com.ua
2883c3a8cc fixing EXPLAIN select types 2002-10-03 18:47:04 +03:00
monty@mashka.mysql.fi
2e52a69b12 Merge work:/my/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1 2002-10-03 16:56:09 +03:00
monty@mashka.mysql.fi
62a26cf891 Update after last merge. Fixes some wrong test results. 2002-10-03 16:54:26 +03:00
bell@sanja.is.com.ua
70ee4943de Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/work-merge_lex-4.1
 2002-10-03 16:37:41 +03:00
bell@sanja.is.com.ua
48b2a76a48 after merging bugfix 2002-10-03 16:35:08 +03:00
ram@mysql.r18.ru
d5ca940a4b Merge mysql.r18.ru:/usr/home/ram/mysql-4.1.last 
into mysql.r18.ru:/usr/home/ram/mysql-4.1
 2002-10-03 17:26:05 +05:00
ram@mysql.r18.ru
032a4a927a Additional key segment (HA_KEYTYPE_END) creation has been moved from handler to hp_create.c 2002-10-03 14:55:02 +05:00
peter@mysql.com
66b1435ee2 Merging... 2002-10-03 00:13:08 +04:00
peter@mysql.com
f1155a98a4 Changeset to deal with 4.1 -> 4.0 merge 2002-10-02 23:43:27 +04:00
monty@mashka.mysql.fi
0f39457613 Merge with 4.0.4 2002-10-02 17:55:12 +03:00
monty@mashka.mysql.fi
a748b35ddd merge with work 2002-10-02 13:45:16 +03:00
monty@mashka.mysql.fi
d69250a969 Fixes and code cleanups after merge with 4.0.3 
Warning handling and initial prepared statement handling (last not complete yet)
Changed a lot of functions that returned 0/1 to my_bool type.
GRANT handling now uses read/write locks instead of mutex
Change basic net functions to use THD instead of NET
(needed for 4.1 protocol)
Use my_sprintf instead of sprintf() + strlen()
Added alloc_query() to be able to chare query initialization code with
prepared statements.
Cleanup handling of SHOW COUNT(*) WARNINGS and SELECT LAST_INSERT_ID()

Note that the following test fails (will be fixed ASAP):
sub_select, union, rpl_rotate_logs and rpl_mystery22
 2002-10-02 13:33:08 +03:00
monty@hundin.mysql.fi
bef1d7d32e Fix for building shared libraries with a patched glibc 
Don't require UPDATE_ACL for REPLACE
 2002-10-02 12:37:32 +03:00
lenz@mysql.com
3cf7acb756 - Applied required modifications for automake 1.5 
- some additional small fixes
 - added "depcomp" for automake 1.5
 2002-10-01 21:57:10 +02:00
bar@bar.mysql.r18.ru
1af778c05b User variables didn't store charset, so this didn't work 
as expected and returned default charset instead:
SET @x = _koi8_ru'test';
SELECT CHARSET(@x);
 2002-10-01 17:23:28 +05:00
bar@bar.mysql.r18.ru
d1d725c5a1 SHOW TABLE STATUS now displays table charset as well 2002-10-01 13:54:59 +05:00
monty@hundin.mysql.fi
2d66b2f519 Revert change to use ha_rows for number of rows as other code depend of this 2002-09-30 14:54:16 +03:00
bell@sanja.is.com.ua
c65515d888 fixed bug in string & date types with group function in subselect 2002-09-28 18:34:56 +03:00
bell@sanja.is.com.ua
6c6726931d fixed Item_subselect constructor 2002-09-27 23:11:51 +03:00
monty@hundin.mysql.fi
5ce2900d48 Merge hundin.mysql.fi:/my/mysql-3.23 
into hundin.mysql.fi:/my/bk/mysql-4.0
 2002-09-27 12:13:28 +03:00
monty@hundin.mysql.fi
649413f773 Don't reset Delayed_insert_threads on FLUSH STATUS 2002-09-27 12:01:26 +03:00
bell@sanja.is.com.ua
859fbb3757 fixed grammar error 2002-09-27 09:11:40 +03:00
monty@hundin.mysql.fi
3a9eb4f621 Fix some ORDER BY ... DESC problems with InnoDB 2002-09-27 08:23:51 +03:00
bell@sanja.is.com.ua
46a22a5be7 new EXPLAIN 
fixed bug in mysql-test/create-test-result
fixed bug in union-subselect engine
 2002-09-26 23:08:22 +03:00
heikki@hundin.mysql.fi
ffdff5f763 ha_innodb.h: 
Put the flag HA_NOT_READ_PREFIX_LAST back to index_flags: seems to fix also the LIKE ... DESC bug
 2002-09-26 21:21:44 +03:00
serg@build.mysql2.com
7a7a0ae842 COUNT(*) for merge can be longlong even if it's long for MyISAM 2002-09-26 17:52:52 +02:00
heikki@hundin.mysql.fi
64c3498f82 ha_innodb.cc: 
Fix an assertion in btr0pcur.c line 203 when an UPDATE is done inside LOCK TABLES
 2002-09-26 14:50:25 +03:00
monty@hundin.mysql.fi
a937a4fa5f Do filesort if handler has the HA_NOT_READ_PREFIX_LAST flag set. 2002-09-26 10:20:49 +03:00
nick@mysql.com
b25d39d5b7 Merge nleippe@work.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/nick/mysql/repository/mysql-4.0
 2002-09-25 18:07:13 -06:00
nick@mysql.com
96e9cd3ae1 fix (work-around) rpl_log test on FreeBSD. 2002-09-25 18:04:08 -06:00
monty@hundin.mysql.fi
e03d4330f8 Merge 2002-09-25 20:48:32 +03:00
monty@hundin.mysql.fi
12ac759d95 Compare hostnames case insensitive 
Accept zero dates without warnings
 2002-09-25 20:42:55 +03:00
heikki@hundin.mysql.fi
cfff5b5025 ha_innodb.h, ha_innodb.cc: 
Remove the flag HA_NOT_READ_PREFIX_LAST because ORDER BY orders wrong then; also remove the diagnostic print to avoid cluttering the error log
 2002-09-25 20:35:12 +03:00
heikki@hundin.mysql.fi
b46d2ca192 ha_innodb.cc, ha_innodb.h: 
Move to the right place the flag which bans use of HA_READ_PREFIX_LAST; add diagnostics and remove the assertion on line 2180 of ha_innodb.cc
 2002-09-25 19:02:46 +03:00
serg@serg.mysql.com
1adc7c554d Merge work:/home/bk/mysql-4.0 
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
 2002-09-25 00:15:06 +00:00
serg@serg.mysql.com
4c1f30cddc fixed bug that causes mysqld crash on REVOKE 2002-09-25 00:14:22 +00:00
lenz@mysql.com
019b5ab7b4 - backported gcc 3.0 linking fix from 4.0 
- some cosmetical fixups (typos, comments)
 2002-09-24 22:24:30 +02:00
monty@hundin.mysql.fi
e8c77e16dc Fix of newly introduced bug in ORDER BY when one has a constant in the select list. 2002-09-24 21:23:56 +03:00
monty@mashka.mysql.fi
efaaf0b4b8 Updated VC++ project files for 4.0.4 
Only write short usage if one starts mysqldump without any options
Added query cache on windows
Added error message if one can't read privilege tables
 2002-09-24 17:11:59 +03:00
serg@serg.mysql.com
4850c94143 followup: s/st_table_list->name/st_table_list->alias/ 2002-09-23 14:38:35 +00:00
monty@mashka.mysql.fi
cb2f04ca63 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2002-09-22 18:04:13 +03:00
monty@mashka.mysql.fi
9c123d0c0b Don't give the anonymous user create temp table or lock tables privileges. 
SET PASSWORD=... closed connection on error.
 2002-09-22 18:02:39 +03:00
monty@mashka.mysql.fi
378d977d28 Merge with 3.23.53 2002-09-22 10:59:33 +03:00
monty@mashka.mysql.fi
6aef4237d7 Fixed bug in previous patch when using a libc with static nss 2002-09-22 10:35:15 +03:00
heikki@hundin.mysql.fi
62b2b08717 row0ins.c, ha_innodb.cc: 
Table hash key len in query cache also includes null char at end
 2002-09-22 01:38:48 +03:00
monty@mashka.mysql.fi
755d4952af Change name -> alias in TABLE_LIST. 
Added missing mutex-lock around critical section in GRANT handling.
 2002-09-21 21:36:23 +03:00
heikki@hundin.mysql.fi
1f64f8d07d ha_innodb.cc: 
Add return statement
 2002-09-21 03:39:27 +03:00
heikki@hundin.mysql.fi
ef8b2fa85f ha_innodb.cc: 
Fix typos in last push
  Fix typo
 2002-09-21 03:15:54 +03:00
heikki@hundin.mysql.fi
cff9c1df1e ha_innodb.cc, ha_innodb.h: 
Fix assertion when a temporary table is created and used inside LOCK TABLES
 2002-09-20 23:26:21 +03:00
monty@mashka.mysql.fi
8a5ef8dc0c Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2002-09-20 14:45:04 +03:00
monty@mashka.mysql.fi
cb8580a2cd Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name. 
This should fix some issues where --lower-case-table-names doesn't work properly under windows.
 2002-09-20 14:05:18 +03:00
heikki@hundin.mysql.fi
9e493e91e9 Many files: 
Modifications for query cache + trxs, fix of q.c.+ foreign keys
os0file.c:
  Use unbuffered i/o in Windows
 2002-09-20 05:11:08 +03:00
bell@sanja.is.com.ua
a30d0261ae Merge abelkin@work.mysql.com:/home/bk/mysql-4.0 
into sanja.is.com.ua:/home/bell/mysql/mysql-4.0
 2002-09-19 20:14:00 +03:00
bell@sanja.is.com.ua
ecc9832c71 fixed typo 2002-09-19 20:10:06 +03:00
monty@mashka.mysql.fi
76d7ab0ad2 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2002-09-19 18:46:35 +03:00
monty@mashka.mysql.fi
ce4b584a85 Increased max possible max_allowed_packet to 1G 
Small optimization to not do external locking of temporary MyISAM tables.
 2002-09-19 17:49:41 +03:00
bell@sanja.is.com.ua
96ebe3816f new function for innodb 
windows case insensitive tables name work around
 2002-09-19 10:36:19 +03:00
monty@mashka.mysql.fi
f638ee6df9 Added code to flush a bulk_insert index. 
This fixes a bug when doing multi-row inserts on table with an auto_increment key that is not in the first key segment.
 2002-09-18 21:04:49 +03:00
monty@mashka.mysql.fi
dfd0f82b93 Update mysql-test results after merge 2002-09-18 02:21:29 +03:00
monty@mashka.mysql.fi
70b1d53883 merge with 3.23.53 (only code cleanup and new test case) 2002-09-18 02:04:56 +03:00
monty@mashka.mysql.fi
74744466b1 Fixed bug with BINARY NULL 2002-09-18 02:00:56 +03:00
monty@mashka.mysql.fi
7f55d92637 fixed so that --ssl and --skip-ssl works with the MySQL clients. 
Fixed core dump bug when sending wrong string to AES_DECRYPT()
 2002-09-17 23:46:53 +03:00
monty@mashka.mysql.fi
c7b6854f70 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2002-09-16 15:56:55 +03:00
monty@mashka.mysql.fi
c85c33a5c1 Added CREATE TEMPORARY TABLES and LOCK TABLES to db and host tables 
Fixed bug in SELECT ... ORDER BY ... LIMIT
Fixed bug in ALTER TABLE and RENAME TABLE with --lower-case-table-names
Fixed hang when using --with-openssl
 2002-09-16 15:55:19 +03:00
monty@mashka.mysql.fi
ff993695a4 Fixed bug in ALTER TABLE and RENAME TABLE when running with lower-case-table-names. 2002-09-16 15:24:54 +03:00
heikki@hundin.mysql.fi
34fe09f08f ha_innodb.h, ha_innodb.cc: 
Reverted the change which allowed use of HA_READ_PREFIX_LAST in InnoDB
 2002-09-15 02:23:53 +03:00