Commit graph

861 commits

Author SHA1 Message Date
igor@rurik.mysql.com
f804b783fb Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2003-06-18 23:16:08 -07:00
lenz@kallisto.local
a7f584da79 - added sql-common subdirectory and sql_common.h to source distribution 2003-06-18 23:13:29 +02:00
igor@rurik.mysql.com
5425591503 Merge 2003-06-18 07:31:23 -07:00
monty@narttu.mysql.fi
1e62d6070a Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
2003-06-14 11:38:09 +03:00
monty@narttu.mysql.fi
a1034db4b9 Cleanup after split of libmysql.c to client.c and libmysql.c. A 4.1 master/slave will now use the 4.1 protocol
Fixed wrong value for SQLSTATE_LENGTH
Added CLIENT_REMEMBER_OPTIONS to mysql_real_connect()
Changed mysql_port and mysql_unix_port to mysqld_xxxx
2003-06-14 11:37:42 +03:00
serg@serg.mylan
9f67e10d0d consistency fix - all help texts for command-line options should end with a dot. 2003-06-13 10:59:02 +02:00
igor@rurik.mysql.com
a0f3dcc3c8 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2003-06-12 06:22:35 -07:00
igor@rurik.mysql.com
f547f2769f Many files:
New feature: preload indexes into key cache.
mi_preload.c:
  new file
Many files:
  Added preload statement.
2003-06-12 04:29:02 -07:00
venu@myvenu.com
d764294f12 Fix for mysql_list_fields & reset stmt buffers from stmt_free_result
Windows build fix
2003-06-08 09:11:14 -07:00
gluh@gluh.mysql.r18.ru
b68eab61a6 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.revoke
2003-06-06 17:44:33 +05:00
gluh@gluh.mysql.r18.ru
7d020eae17 REVOKE all privileges and delete user(244) 2003-06-06 17:43:23 +05:00
bar@bar.mysql.r18.ru
eb0727c142 my_global.h:
ulong was used before the line it have been declared
2003-06-06 10:50:13 +05:00
monty@narttu.mysql.fi
059b1e5612 After merge fixes 2003-06-05 23:19:56 +03:00
monty@narttu.mysql.fi
7a54334443 Merge with 4.0.13 2003-06-05 17:33:38 +03:00
monty@narttu.mysql.fi
772adcbd99 Print error if we can't delete an alarm
More debugging variables
Increment aborted_threads in case of killed or too big packet
2003-06-05 12:29:13 +03:00
monty@narttu.mysql.fi
dad0664579 merge with public tree 2003-06-05 00:12:45 +03:00
monty@narttu.mysql.fi
40109c574a Merge with 4.0.13 2003-06-04 19:21:51 +03:00
monty@narttu.mysql.fi
23145cfed7 Added SQLSTATE to client/server protocol
bmove_allign -> bmove_align
Added OLAP function ROLLUP
Split mysql_fix_privilege_tables to a script and a .sql data file
Added new (MEMROOT*) functions to avoid calling current_thd() when creating some common objects.
Added table_alias_charset, for easier --lower-case-table-name handling
Better SQL_MODE handling (Setting complex options also sets sub options)
New (faster) assembler string functions for x86
2003-06-04 18:28:51 +03:00
monty@narttu.mysql.fi
100a66e6cb Added [mysqld-base-version] as a default group for the mysqld server
Portability fix for Windows 64
2003-06-04 16:05:27 +03:00
venu@myvenu.com
c14de0f584 1. Portability fixups for Connector/ODBC 3.52 & DBD
(Addition of mysql_fetch_column & mysql_stmt_free_result)
 2. Windows build fixups for libmysqld, mysqlbinlog and mysqldemb
2003-06-04 00:17:48 -07:00
venu@myvenu.com
8f57d0e2e4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-06-03 18:45:53 -07:00
venu@myvenu.com
27469ec8b9 Windows build fixups with the latest source 2003-06-03 18:45:07 -07:00
hf@deer.(none)
b175a26f44 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.emb_bind
2003-06-03 15:29:45 +05:00
hf@deer.(none)
9ad3c1cdca SCRUM:
splittiln common client's parts
2003-06-03 15:02:57 +05:00
bar@bar.mysql.r18.ru
759214fa41 MY_CS_NONTEXT flag for sprintf() incompatible charsets (ucs2 if the only one now)
Some default_charset_info were removed
2003-06-03 14:59:17 +05:00
monty@narttu.mysql.fi
f6a365a532 Small fixes (nothing nameworthy) 2003-06-01 23:40:01 +03:00
hf@deer.(none)
02d3d7e8bd SCRUM:
Here is another pack of changes about gathering common client code in
sql-common/client.c.
Now i symlink the client.c from sql/ and libmysql/. These directories
have client_settings.h files to be included to client.c. It contains
defines and declarations to compile client.c in appropriate manner.
Also i've added include/sql_common.h, containing declarations of what
is exported from client.c

I removed as many #ifdef-s from client.c as i dared to. I think it's better
push it with some extra #ifdef-s now (of course, if everythihg besides it is
ok) so other people can check the code.
2003-05-31 15:15:46 +05:00
gluh@gluh.mysql.r18.ru
3317cfdc7d Fix for compiling MySQL-4.0.13 with SSL support on OpenBSD 2003-05-30 18:41:19 +05:00
bar@bar.mysql.r18.ru
67c6703463 --with-collation argument for configure. Now one can for example use this:
./configure --with-charset=latin1 --with-collation=latin1_danish_ci
2003-05-28 16:23:04 +05:00
monty@narttu.mysql.fi
eedca52b23 Fix for 64 bit machines (To remove warnings on Itanium) 2003-05-26 19:11:22 +03:00
monty@mashka.mysql.fi
bd4b9522e4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1-narttu
2003-05-26 19:03:25 +03:00
monty@mashka.mysql.fi
68a159b1fa New 4.1 protocol; SQLSTATE, CLIENT_MULTI_RESULTS, client character set 2003-05-26 19:01:20 +03:00
monty@narttu.mysql.fi
48ecf0e8a7 Fixed core dump bug when shuting down mysqld 2003-05-26 13:10:08 +03:00
bar@bar.mysql.r18.ru
8192d169a2 CHARSET_INFO structure reorganization for easier maintainance 2003-05-23 17:45:52 +05:00
bar@bar.mysql.r18.ru
2b1e1f6494 Variables were rename, binary collation names were added
Fixed that SHOW CHARACTER SET displayed non-dynamic charsets even if they were not really compiled
2003-05-22 17:20:19 +05:00
monty@mashka.mysql.fi
cb7061ebe4 merge 2003-05-22 02:57:27 +03:00
bar@bar.mysql.r18.ru
189d1373b8 Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-05-21 13:59:00 +05:00
bar@bar.mysql.r18.ru
7f771ce2e1 "character_sets" has been removed from SHOW VARIABLES. Use SHOW CHARACTER SET instead.
"character_set_system" has been added to display the system character set
2003-05-21 13:58:30 +05:00
venu@myvenu.com
39cbb547d4 Resolve merge colflict 2003-05-21 00:12:09 -07:00
venu@myvenu.com
08e10a976a Added mysql_fetch_column function
Added MYSQL_TYPE_NULL as a dummy bind case for fetch buffers
Fix for offset based re-fetch using mysql_fetch_column
Misc cleanups for ODBC compatibility
2003-05-20 23:41:15 -07:00
bar@bar.mysql.r18.ru
5b788e660a A separate, better error message when it's impossible to aggregate strings for some operation 2003-05-20 16:36:59 +05:00
monty@narttu.mysql.fi
dd2b7918cd Merge with 4.0.13 2003-05-19 16:35:49 +03:00
mysqldev@build.mysql2.com
eb3ba82ec6 my_global.h:
- QNX 6.2.1 actually defines HAVE_RINT
  - fixed rint(A) #define as it was causing compile errors on QNX
2003-05-16 13:03:47 +02:00
monty@narttu.mysql.fi
c4d3270460 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-05-13 22:35:41 +03:00
jani@hynda.(none)
c9c5841760 - Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339 and 342
- Fix for QNX: UNIX sockets available since 6.2.1
2003-05-13 19:34:51 +03:00
monty@narttu.mysql.fi
13530887cb Fix for UNION and LEFT JOIN (Bug #386)
Fixed wrong logging of Access denied error (Bug #398)
2003-05-13 18:58:26 +03:00
monty@mashka.mysql.fi
60dfb25be3 Give warning if MySQL doesn't honor given storage engine
Allow syntax CREATE TABLE t1 (LIKE t2)
2003-05-13 11:15:11 +03:00
heikki@hundin.mysql.fi
611836e488 my_base.h:
Fix bug: if MIN() or MAX() resulted in a deadlock or a lock wait timeout, MySQL did not return an error, but NULL as the function value
2003-05-07 19:13:56 +03:00
serg@serg.mylan
356b7f62fb count_bits() moved to mysys/ 2003-05-04 18:43:07 +02:00
serg@serg.mylan
f69b6e041c more #ifdef THREAD added 2003-04-30 12:32:43 +02:00