Commit graph

1337 commits

Author SHA1 Message Date
monty@hundin.mysql.fi
0dba86b2e1 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 2002-02-15 02:51:43 +02:00
monty@hundin.mysql.fi
6c4b4ad859 Fix after merge from 3.23 2002-02-15 02:49:02 +02:00
monty@hundin.mysql.fi
e070e9a01f merge with 3.23.49 2002-02-14 18:58:24 +02:00
monty@hundin.mysql.fi
15e9ca785a Fix for gethostbyname_r detection (for solaris). 2002-02-14 18:10:44 +02:00
monty@hundin.mysql.fi
e45cff23b9 Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql 2002-02-14 15:25:26 +02:00
monty@hundin.mysql.fi
b21f2d084f Don't give warnings for empty statements with comments 2002-02-14 15:04:14 +02:00
heikki@hundin.mysql.fi
57ef5c71b9 dict0dict.h, dict0dict.c, row0mysql.c, ha_innobase.cc:
Add some more safety if MySQL tries to drop a table on which there are open handles
2002-02-14 10:24:27 +02:00
heikki@hundin.mysql.fi
c70be0113b row0mysql.c, sql_db.cc:
Try to make sure DROP DATABASE does not cause a deadlock because we now let InnoDB wait MySQL does not have open handles to tables we drop
2002-02-14 03:45:45 +02:00
monty@hundin.mysql.fi
d76fcdc5e9 changed bool -> my_bool 2002-02-14 02:41:29 +02:00
monty@hundin.mysql.fi
0ccb106afc Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql 2002-02-14 02:39:38 +02:00
heikki@hundin.mysql.fi
62c9f03f00 ha_innobase.cc:
DROP DATABASE required that the database name is in lower case to work; put it always to lower case in innobase_drop_database
2002-02-14 00:00:09 +02:00
monty@tik.mysql.fi
2f3cfff0a2 Added --user=userid to mysqld
Fix for ctypes on windows
Cleanup max_queries_per_hour
2002-02-13 22:37:19 +02:00
monty@hundin.mysql.fi
d0fc67f4ac Use NAMES_SEP_CHAR also for enums (Fix for supportwizard) 2002-02-13 22:01:43 +02:00
monty@hundin.mysql.fi
fb44f7ce49 Fix for LOAD DATA LOCAL INFILE patch 2002-02-13 22:01:41 +02:00
monty@tik.mysql.fi
f13a451816 Merge hundin:/my/mysql-3.23 into tik.mysql.fi:/home/my/mysql-3.23 2002-02-13 22:01:40 +02:00
monty@tik.mysql.fi
1f9b1e1915 Made LOAD DATA LOCAL INFILE more secure 2002-02-13 21:53:26 +02:00
monty@hundin.mysql.fi
3286cb0294 Don't print out 'got signal' if not using --warnings 2002-02-13 17:49:21 +02:00
Sinisa@sinisa.nasamreza.org
969ba240c0 reverting wrong fix 2002-02-11 14:47:22 +02:00
monty@hundin.mysql.fi
4abd402b87 merge with 3.23.48 2002-02-11 13:48:59 +02:00
monty@hundin.mysql.fi
1efcc3e35e Updated changelog of 3.23.48 with InnoDB changes. 2002-02-11 12:56:48 +02:00
monty@hundin.mysql.fi
8ae87f8cf2 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 2002-02-11 05:04:09 +02:00
monty@hundin.mysql.fi
fdb253467a Cleanup 2002-02-11 04:55:52 +02:00
monty@hundin.mysql.fi
cf39ab2ff2 Remove uage of static variable from file locks. 2002-02-10 20:28:58 +02:00
monty@hundin.mysql.fi
368731a915 Fixed bug in full join with many NULL fields. 2002-02-10 12:47:37 +02:00
monty@hundin.mysql.fi
2abdcf81af Fix for customer build 2002-02-10 02:28:24 +02:00
sasha@mysql.sashanet.com
df953e6d0a Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/reiser-data/mysql-4.0
2002-02-09 13:59:30 -07:00
sasha@mysql.sashanet.com
8ef07c4ffa updated test suite to be able to run 3.23 master and 4.0 slave
got LOAD DATA INFILE replication from 3.23 master to 4.0 slave to work
for some reason query_cache now fails - will push anyway and document the
failure if I can repeat it.
2002-02-09 13:58:53 -07:00
monty@hundin.mysql.fi
40c77c767b Removed compiler warnings 2002-02-09 04:00:24 +02:00
Sinisa@sinisa.nasamreza.org
59d922a11f small bug fix in max queries per hour 2002-02-08 17:44:50 +02:00
serg@serg.mysql.com
b8592ab67b bugfix for max_user_connections 2002-02-08 10:18:32 +00:00
serg@serg.mysql.com
bd011aba27 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-02-08 09:44:41 +00:00
monty@hundin.mysql.fi
d3cfc86a97 merge 2002-02-08 03:29:29 +02:00
monty@hundin.mysql.fi
d36ac6b669 Fix some bugs introduced with the new my_getopt
Added counting of rollback's and commits
Fixed bug in 'SELECT 0 LIMIT 0'
Fixed bug in 'SELECT SQL_CALC_FOUND_ROWS'
2002-02-08 03:21:34 +02:00
sasha@mysql.sashanet.com
c5dcb2cc57 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/reiser-data/mysql-4.0
2002-02-07 15:30:44 -07:00
sasha@mysql.sashanet.com
6980a24e9d fixes for slave backward compat
fixed bug in LOAD DATA FROM MASTER
fixed rpl000001.result
Slave now replicates 3.23 master, with the exception of LOAD DATA INFILE, 
which is still buggy. Will push this one after the pull/merge
2002-02-07 15:29:46 -07:00
monty@hundin.mysql.fi
1e5a38344c Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql 2002-02-07 21:53:09 +02:00
monty@hundin.mysql.fi
d713fee16b Update to autoconf 2.52
Fix of InnoDB variables in SHOW VARIABLES
Fix for ALTER TABLE and InnoDB
2002-02-07 21:34:35 +02:00
heikki@donna.mysql.fi
44a2ef6cdc ha_innobase.cc:
Remove use of prebuilt->trx, better play safe since we do not know MySQL call order of external_lock
2002-02-05 00:16:38 +02:00
heikki@donna.mysql.fi
aea3c07139 Many files:
Small improvements
row0mysql.c:
  Small improvements + fix the ALTER TABLE problem by introducing a lazy drop table it can use
ha_innobase.cc:
  Some fine-tuning of optimization
2002-02-04 23:55:41 +02:00
heikki@donna.mysql.fi
9c86441ef6 ha_innobase.cc:
Fix the crashes reported by Peter; SHOW CREATE does not call external_lock before calling ::info, and consequently the trx struct in prebuilt is obsolete; setting trx->op_info caused erratic memory corruption in mysqldump
2002-02-03 15:21:15 +02:00
heikki@donna.mysql.fi
4f3e7f68f5 Merge heikki@work.mysql.com:/home/my/mysql
into donna.mysql.fi:/home/heikki/mysqln
2002-02-03 15:15:13 +02:00
Sinisa@sinisa.nasamreza.org
3ec0936d15 BK makes me problems.
I did not know I can't do chmod ...
So, it killed some of my changes. 
But I am smarter, and as I have first saved my work, before BK ruined
it, so here it comes ...
2002-02-01 21:45:23 +02:00
Sinisa@sinisa.nasamreza.org
ee76008d44 Changes for the max queries per hour 2002-02-01 20:53:24 +02:00
Sinisa@sinisa.nasamreza.org
7d5b08b1f0 Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
2002-02-01 20:31:17 +02:00
Sinisa@sinisa.nasamreza.org
20ca7ee268 Changes required for maximum queries per hour 2002-02-01 15:40:38 +02:00
sasha@mysql.sashanet.com
b9637dae05 fixed wrong DBUG_ASSERT() in IO_CACHE
fixed apparent typo in opt_sum.cc
I will push this Changeset although it fails select test - failing select 
is better than the code that does not compile.
2002-01-31 16:17:24 -07:00
sasha@mysql.sashanet.com
65989dacb5 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/reiser-data/mysql-4.0
2002-01-31 11:04:49 -07:00
sasha@mysql.sashanet.com
cef13d5b8e temporary commit to pull Monty's changes 2002-01-31 11:02:11 -07:00
monty@hundin.mysql.fi
4000b036c0 Fixes for new getopt
Bug fix when using --no-deaults
Sets ref_length to right value (faster rnd_pos() handling in InnoDB).
Fixed problem with multi-table-delete and InnoDB
Fixed problem with truncate table, which required a COMMIT before.
Fixed multi-table-delete bug with InnoDB.
Remove not used index from EXPLAIN
2002-01-31 04:36:58 +02:00
monty@hundin.mysql.fi
79796e989f Merge from 3.23.48 tree 2002-01-30 16:37:47 +02:00