msvensson@neptunus.(none)
4f26b44318
Remove trailing whitespace
2005-11-04 12:00:34 +01:00
kent@mysql.com
4742f585b1
Merge
2005-11-04 02:17:11 +01:00
kent@mysql.com
ee0b6db191
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
2005-11-04 01:15:35 +01:00
msvensson@neptunus.(none)
39b2fb2b3c
Reapplying patch
...
Check for NULLs only if we don't replace column results,
get real results after all checks.
(see bug #14254 : func_crypt.test fails on FreeBSD with --ps-protocol).
Remove two FIXME's
2005-11-03 19:32:19 +01:00
msvensson@neptunus.(none)
32f6ece388
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930
2005-11-03 19:20:47 +01:00
msvensson@neptunus.(none)
718839a1c1
WL#2930 Adding view and cursor 'protocols' to mysqltest
...
- Part2, actually adding the new functionality
2005-11-03 19:00:37 +01:00
tim@siva.hindu.god
198ead8f4e
merge
2005-11-02 08:46:13 +13:00
evgen@moonbone.local
bbe58c7e26
Manually merged
2005-11-01 19:47:53 +03:00
pem@mysql.com
1137a376a7
Fixed bugs in client/mysqltest.c which made lots of "connect" commands in tests fail.
2005-10-31 19:31:05 +01:00
pem@mysql.com
81437a7286
Removed C++-isms from client/mysqltest.c
2005-10-31 17:51:48 +01:00
msvensson@neptunus.(none)
de07ac0c5a
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930
2005-10-31 13:36:03 +01:00
ramil@mysql.com
afbd0fafd3
Check for NULLs only if we don't replace column results,
...
get real results after all checks.
(see bug #14254 : func_crypt.test fails on FreeBSD with --ps-protocol).
2005-10-31 16:28:45 +04:00
msvensson@neptunus.(none)
e5eb7cbf29
WL#2930 Adding view and cursor 'protocols' to mysqltest
...
- Cleanup of mysqltest.c before extending it
2005-10-31 12:25:08 +01:00
jani@ua141d10.elisa.omakaista.fi
da64397b69
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-10-31 12:20:54 +02:00
jani@ua141d10.elisa.omakaista.fi
44aea416f9
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-10-31 11:54:36 +02:00
msvensson@neptunus.(none)
531b847f23
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-10-31 09:14:58 +01:00
paul@frost.snake.net
19544bd01c
Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into frost.snake.net:/Users/paul/bk/mysql-5.0
2005-10-28 14:26:22 -05:00
msvensson@neptunus.(none)
68fa03258a
Merge neptunus.(none):/home/msvensson/mysql/bug12985/my50-bug12985
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-10-28 11:45:30 +02:00
msvensson@neptunus.(none)
be6f7a3f82
Merge neptunus.(none):/home/msvensson/mysql/ssl_test/my50-ssl_test
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-10-28 11:00:54 +02:00
msvensson@neptunus.(none)
22c0d6489c
After reiview fix
...
- Use msg argument to determine if param is required or not in safe_get_param
2005-10-28 10:58:57 +02:00
tim@siva.hindu.god
c704130389
BUG#14358: in mysql.cc, don't neglect to strip delimiter off lines < 9 characters long.
2005-10-28 12:13:34 +13:00
monty@mysql.com
a9b1ff4095
Add DROP TABLE before trying to create view (in mysqldump)
...
Cleaned up xxxx_gis.test's and made gis_generic.inc independent of ndb
(Note that archive_gis.test fails, but this is independent of this patch)
2005-10-27 22:45:18 +03:00
patg@krsna.patg.net
7243b7bb49
BUG# 12123
...
Made change to mysqlimport to set character_set_database to binary to
make importing various charsets/columns work correctly.
2005-10-25 14:50:08 -07:00
paul@frost.snake.net
ea8ab2a114
Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into frost.snake.net:/Users/paul/bk/mysql-5.0
2005-10-25 12:50:03 -05:00
pgalbraith@mysql.com
feca138e46
This cset fixes BUG# 12838, 14061, 12129
...
mysqldump.result:
BUG# 12838
New test results for mysqldump -x on a DB with views
mysqldump.test:
sqldump.test:
BUG# 12838
New test to run mysqldump -x on a DB with views
mysqldump.c:
BUG# 12838
Removed/Changed code which created tables to be put into the dump
(For loading views of views) by creating temp tables and then using
the CREATE TABLE information in those temp tables. The problem with this
is that when mysqldump -x is called, it locks all tables, so the
temp tables could not be created, causing the mysqldump to exit with
failure. The code was changed to use SHOW FIELDS to get the column
names and type to build CREATE TABLE text used to create these tables
that views need in the dump.
2005-10-25 19:04:31 +02:00
lars@mysql.com
fbcf26777e
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
...
into mysql.com:/users/lthalmann/bk/mysql-5.0-hexdump
2005-10-24 17:23:45 +02:00
paul@frost.snake.net
e1f77e5cc8
Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into frost.snake.net:/Users/paul/bk/mysql-5.0
2005-10-21 06:40:52 -05:00
kent@mysql.com
70c816c801
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-20 23:23:33 +02:00
paul@frost.snake.net
5d2c1d4cc2
mysqldump.c:
...
Slight change to help message.
2005-10-19 14:40:10 -05:00
lars@mysql.com
1aae3e1da1
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
...
into mysql.com:/users/lthalmann/bk/mysql-5.0-hexdump
2005-10-19 19:42:14 +02:00
lars@mysql.com
4ccb1c6e36
mysqlbinlog --hexdump patch 4:
...
Rename last_event_info to print_event_info to better reflect the new semantics
2005-10-19 19:31:24 +02:00
patg@krsna.patg.net
b310e430f9
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2
2005-10-18 18:53:54 -07:00
patg@krsna.patg.net
f1bd9c0d0a
Changeset:
...
Changed option text in mysqldump.c
mysqldump.c:
Changed text to read "+00:00" as opposed to "UTC" (per what the code does)
2005-10-18 18:51:07 -07:00
reggie@ugeek.(none)
600c7df8f1
readd the my_cgets call that SergeyV originally put in
2005-10-18 17:53:09 -05:00
msvensson@neptunus.(none)
0684dc1342
Bug #12985 Do-mysqlclient-test: Can't find -lyassl when linking
...
- Use yassl_includes and yassl_libs instead of openssl_includes and openssl_libs
to avoid that mysql_config returns that libyassl and libtaocrypt are needed for linking.
2005-10-18 15:43:59 +02:00
gluh@eagle.intranet.mysql.r18.ru
7ccf861242
Fix for bug#13783 mysqlcheck tries to optimize and analyze information_schema
...
'information_schema' is excluded from list of databases for mysqlcheck command
2005-10-18 14:25:03 +05:00
patg@krsna.patg.net
1423db9f0c
BUG# 13052 Changed text in options to TIMESTAMP
2005-10-17 12:30:01 -07:00
bar@mysql.com
e7fa41ebf7
mysql.cc:
...
After merge fix.
2005-10-14 14:19:15 +05:00
bar@mysql.com
aec79cc463
Merge mysql.com:/usr/home/bar/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-10-14 14:17:15 +05:00
bar@mysql.com
48238e1b90
Merge mysql.com:/usr/home/bar/mysql-4.1.b13487
...
into mysql.com:/usr/home/bar/mysql-4.1
2005-10-14 14:07:22 +05:00
patg@krsna.patg.net
d86f40650f
BUG# 13146
...
Re-application of patch to clean 5.0 tree. Fixed issue with ANSI quotes
when dumping triggers
2005-10-13 13:42:56 -07:00
jimw@mysql.com
b6dcc55969
Fix being able to set default TCP port for command-line utilities
...
by using MYSQL_TCP_PORT variable. (Bug #5792 )
2005-10-13 12:28:43 -07:00
patg@krsna.patg.net
a46dd41255
BUG# 13052
...
Clean application of patch -
- Added --tz-utc to fix issue of dumping timestamp values between
servers with different global time zone settings, particularly
with regard to the day of DST changeover, which without this fix,
would dump duplicate timestamp values.
2005-10-12 22:44:42 -07:00
lars@mysql.com
082a0bc46c
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
...
into mysql.com:/users/lthalmann/bk/mysql-5.0-hexdump
2005-10-12 23:40:54 +02:00
lars@mysql.com
48457e0852
mysqlbin --hexdump patch 3
2005-10-12 23:37:21 +02:00
lars@mysql.com
0378009b5b
Fix of incompatible types
...
len and packet_error needs to be of same type for (len == packet_error) to
check failures
2005-10-12 19:31:24 +02:00
msvensson@neptunus.(none)
7d29c2a4a1
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/ssl_test/my50-ssl_test
2005-10-12 13:59:00 +02:00
msvensson@neptunus.(none)
0ac28d3187
Always test ssl and compress
...
- Updated after review
2005-10-12 13:56:07 +02:00
monty@mysql.com
f5fdf3e87a
Reviewing new pushed code
...
- CHAR() now returns binary string as default
- CHAR(X*65536+Y*256+Z) is now equal to CHAR(X,Y,Z) independent of the character set for CHAR()
- Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait()
(Some old systems returns ETIME and it's safer to test for both values
than to try to write a wrapper for each old system)
- Fixed new introduced bug in NOT BETWEEN X and X
- Ensure we call commit_by_xid or rollback_by_xid for all engines, even if one engine has failed
- Use octet2hex() for all conversion of string to hex
- Simplify and optimize code
2005-10-12 00:58:22 +03:00
lars@mysql.com
7a94010da9
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
...
into mysql.com:/users/lthalmann/bk/mysql-5.0-hexdump
2005-10-11 21:46:40 +02:00