Commit graph

595 commits

Author SHA1 Message Date
monty@hundin.mysql.fi
aa4e165808 Portability fix extern "C" static -> extern "C" 2002-11-07 12:49:02 +02:00
hf@genie.(none)
25bd1e9a37 Merged by hands 2002-11-07 12:20:08 +04: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
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
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
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
bar@bar.mysql.r18.ru
cebfa22c01 CREATE DATABASE now tries to execute SHOW CREATE DATABASE first 2002-11-05 15:10:13 +04: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
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
vva@genie.(none)
9adf688be6 add help command on server side 2002-10-28 17:44:19 +04: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
1a1cafce63 merged 2002-10-25 22:07:04 +00: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
hf@genie.(none)
8a88791fb1 Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into genie.(none):/home/hf/work/mysql-4.1
2002-10-18 15:55:21 +05:00
jani@rhols221.adsl.netsonic.fi
f11f48a144 Fixed three bugs in mysqlcheck and changed documentation for mysqld_multi 2002-10-17 19:34:02 +03:00
monty@hundin.mysql.fi
fbf6ab4465 merge with 4.0.5 2002-10-16 19:30:24 +03:00
jani@rhols221.adsl.netsonic.fi
4143937723 Fixed some bugs in mysql, mysqladmin and mysqld. 2002-10-15 23:34:55 +03:00
monty@hundin.mysql.fi
a975cecf42 Merge 2002-10-14 17:50:44 +03:00
serg@serg.mysql.com
fcb8bc061d merged 2002-10-14 11:36:48 +00:00
monty@narttu.mysql.fi
3c7f6a9835 merge 2002-10-14 12:07:16 +03:00
hf@genie.(none)
2be6f27219 Changes in order to trim embedded library code 2002-10-13 14:23:55 +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
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@narttu.mysql.fi
da2abaf887 Portability fixes to be able to compile MySQL with VC++ 2002-10-08 22:28:24 +03: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
jani@rhols221.adsl.netsonic.fi
d4fc18bf5f Small fixes in mysql and myisampack 2002-10-04 17:18:41 +03:00
monty@mashka.mysql.fi
0f39457613 Merge with 4.0.4 2002-10-02 17:55:12 +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
jani@hynda.(none)
bed08a376d Fixed a bug in mysql client. 2002-09-30 20:35:21 +03: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@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
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
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
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
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
jcole@mugatu.spaceapes.com
969c6b876e mysqlbinlog.cc:
a few changes to test resolving
2002-09-14 11:26:40 -05:00
jcole@mugatu.spaceapes.com
1f1603ab4a mysqlbinlog.cc:
fixed typo
2002-09-14 11:12:02 -05:00
monty@mashka.mysql.fi
f3a186c905 Portability fixes.
Improve mysql-test to be more robust.
Fix that GRANT doesn't delete SSL options
Change innobase_flush_log_at_trx_commit to uint.
Don't rotate logs if we read a rotate log entry from the master.
2002-09-11 06:40:08 +03:00
monty@mashka.mysql.fi
0281a6b160 Fixed searching after ssl directories.
Fixed that GRANT ... REQUIRE options are not forgot when doing new GRANT
Changed fn_ext to point at first '.' after directory.
FLUSH LOGS removed numerical extension for all future update logs.
Fixed the mysqld --help reports right values for --datadir and --bind-address
--log-binary=a.b.c now properly strips of .b.c
Fix that one can DROP UDF functions that was not loaded at startup
Made AND optional in REQUIRE
Added REQUIRE NONE
2002-09-05 16:17:08 +03:00
monty@mashka.mysql.fi
a01a0840dc Some trivial optimzations
Check if AND/OR expression can be NULL; Fixed bug in GROUP BY and-or-expression where expression could be NULL
Bug fix for SHOW OPEN TABLES when user didn't have privilege to access all open tables.
Better fix for ALTER TABLE on BDB tables.
2002-09-03 15:44:25 +03:00
serg@serg.mysql.com
05f57e20b6 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-08-31 14:23:33 +00:00
monty@narttu.mysql.fi
7134ffec21 Merge with 4.0.3
Some simple optimzations, more comments and indentation changes.
Add ` around database in 'use database' in binary log.
Moved max_error_count and max_warning_count to variables struct.
Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls.
Changed string functions to use character set of first string argument as default return characterset
(Each string function can change the above assumption if needed)
2002-08-30 12:40:40 +03:00
nick@mysql.com
89ea5ee620 Added sync_slave_with_master [connection].
Equivalent to:
save_master_pos; connection slave; sync_with_master;
2002-08-29 12:08:54 -06:00
serg@serg.mysql.com
ffd41ec7d2 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-08-28 17:55:44 +00:00
jani@rhols221.adsl.netsonic.fi
c7d7d8abe3 * Fixed a bug in my_getopt
* Fixed some spelling/language errors in mysqlcheck
* Added some more information in mysql -client internal help.
2002-08-28 13:14:11 +03:00
Sinisa@sinisa.nasamreza.org
926c6cb3fa A small bug fix for the tee command ... 2002-08-27 16:01:25 +03:00
serg@serg.mysql.com
53844daac0 wrong help message corrected 2002-08-27 00:20:25 +00:00